feat: Switch back to search.js

Closes #1339
TypeStrong · Nov 2, 2020 · f0af1f1 · f0af1f1
1 parent 8f9f923
commit f0af1f1
Show file tree

Hide file tree

Showing 47 changed files with 54 additions and 10 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -30,7 +30,7 @@
     "progress": "^2.0.3",
     "semver": "^7.3.2",
     "shelljs": "^0.8.4",
-    "typedoc-default-themes": "0.12.0-beta.5"
+    "typedoc-default-themes": "0.12.0-beta.6"
   },
   "peerDependencies": {
     "typescript": "3.9.x || 4.0.x"

diff --git a/src/lib/models/reflections/abstract.ts b/src/lib/models/reflections/abstract.ts
@@ -61,6 +61,8 @@ export enum ReflectionKind {
     Event = 1 << 23,
     Reference = 1 << 24,
 
+    All = Reference * 2 - 1,
+
     ClassOrInterface = Class | Interface,
     VariableOrProperty = Variable | Property,
     FunctionOrMethod = ReflectionKind.Function | Method,

diff --git a/src/lib/output/plugins/JavascriptIndexPlugin.ts b/src/lib/output/plugins/JavascriptIndexPlugin.ts
@@ -34,10 +34,9 @@ export class JavascriptIndexPlugin extends RendererComponent {
         const rows: any[] = [];
         const kinds: Record<ReflectionKind, string | undefined> = {};
 
-        for (const key in event.project.reflections) {
-            const reflection: DeclarationReflection = <DeclarationReflection>(
-                event.project.reflections[key]
-            );
+        for (const reflection of event.project.getReflectionsByKind(
+            ReflectionKind.All
+        )) {
             if (!(reflection instanceof DeclarationReflection)) {
                 continue;
             }
@@ -92,14 +91,14 @@ export class JavascriptIndexPlugin extends RendererComponent {
             event.outputDirectory,
             "assets",
             "js",
-            "search.json"
+            "search.js"
         );
         const jsonData = JSON.stringify({
             kinds,
             rows,
             index,
         });
 
-        writeFile(jsonFileName, jsonData, false);
+        writeFile(jsonFileName, `window.searchData = ${jsonData}`, false);
     }
 }
diff --git a/src/test/renderer/specs/classes/access.privateclass.html b/src/test/renderer/specs/classes/access.privateclass.html
@@ -7,6 +7,7 @@
 	<meta name="description" content="Documentation for typedoc">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="stylesheet" href="../assets/css/main.css">
+	<script async src="../assets/js/search.js" id="search-script"></script>
 </head>
 <body>
 <header>

diff --git a/src/test/renderer/specs/classes/classes.baseclass.html b/src/test/renderer/specs/classes/classes.baseclass.html
@@ -7,6 +7,7 @@
 	<meta name="description" content="Documentation for typedoc">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="stylesheet" href="../assets/css/main.css">
+	<script async src="../assets/js/search.js" id="search-script"></script>
 </head>
 <body>
 <header>

diff --git a/src/test/renderer/specs/classes/classes.genericclass.html b/src/test/renderer/specs/classes/classes.genericclass.html
@@ -7,6 +7,7 @@
 	<meta name="description" content="Documentation for typedoc">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="stylesheet" href="../assets/css/main.css">
+	<script async src="../assets/js/search.js" id="search-script"></script>
 </head>
 <body>
 <header>

diff --git a/src/test/renderer/specs/classes/classes.nongenericclass.html b/src/test/renderer/specs/classes/classes.nongenericclass.html
@@ -7,6 +7,7 @@
 	<meta name="description" content="Documentation for typedoc">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="stylesheet" href="../assets/css/main.css">
+	<script async src="../assets/js/search.js" id="search-script"></script>
 </head>
 <body>
 <header>

diff --git a/src/test/renderer/specs/classes/classes.subclassa.html b/src/test/renderer/specs/classes/classes.subclassa.html
@@ -7,6 +7,7 @@
 	<meta name="description" content="Documentation for typedoc">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="stylesheet" href="../assets/css/main.css">
+	<script async src="../assets/js/search.js" id="search-script"></script>
 </head>
 <body>
 <header>

diff --git a/src/test/renderer/specs/classes/classes.subclassb.html b/src/test/renderer/specs/classes/classes.subclassb.html
@@ -7,6 +7,7 @@
 	<meta name="description" content="Documentation for typedoc">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="stylesheet" href="../assets/css/main.css">
+	<script async src="../assets/js/search.js" id="search-script"></script>
 </head>
 <body>
 <header>

diff --git a/src/test/renderer/specs/classes/default_export.defaultexportedclass.html b/src/test/renderer/specs/classes/default_export.defaultexportedclass.html
@@ -7,6 +7,7 @@
 	<meta name="description" content="Documentation for typedoc">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="stylesheet" href="../assets/css/main.css">
+	<script async src="../assets/js/search.js" id="search-script"></script>
 </head>
 <body>
 <header>

diff --git a/src/test/renderer/specs/classes/default_export.exportedclassname.html b/src/test/renderer/specs/classes/default_export.exportedclassname.html
@@ -7,6 +7,7 @@
 	<meta name="description" content="Documentation for typedoc">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="stylesheet" href="../assets/css/main.css">
+	<script async src="../assets/js/search.js" id="search-script"></script>
 </head>
 <body>
 <header>

diff --git a/src/test/renderer/specs/classes/flattened.flattenedclass.html b/src/test/renderer/specs/classes/flattened.flattenedclass.html
@@ -7,6 +7,7 @@
 	<meta name="description" content="Documentation for typedoc">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="stylesheet" href="../assets/css/main.css">
+	<script async src="../assets/js/search.js" id="search-script"></script>
 </head>
 <body>
 <header>

diff --git a/src/test/renderer/specs/classes/mixin.base.html b/src/test/renderer/specs/classes/mixin.base.html
@@ -7,6 +7,7 @@
 	<meta name="description" content="Documentation for typedoc">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="stylesheet" href="../assets/css/main.css">
+	<script async src="../assets/js/search.js" id="search-script"></script>
 </head>
 <body>
 <header>

diff --git a/src/test/renderer/specs/classes/mixin.someclasswithmixin.html b/src/test/renderer/specs/classes/mixin.someclasswithmixin.html
@@ -7,6 +7,7 @@
 	<meta name="description" content="Documentation for typedoc">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="stylesheet" href="../assets/css/main.css">
+	<script async src="../assets/js/search.js" id="search-script"></script>
 </head>
 <body>
 <header>

diff --git a/src/test/renderer/specs/classes/single_export.export__.html b/src/test/renderer/specs/classes/single_export.export__.html
@@ -7,6 +7,7 @@
 	<meta name="description" content="Documentation for typedoc">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="stylesheet" href="../assets/css/main.css">
+	<script async src="../assets/js/search.js" id="search-script"></script>
 </head>
 <body>
 <header>

diff --git a/src/test/renderer/specs/enums/enumerations.directions.html b/src/test/renderer/specs/enums/enumerations.directions.html
@@ -7,6 +7,7 @@
 	<meta name="description" content="Documentation for typedoc">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="stylesheet" href="../assets/css/main.css">
+	<script async src="../assets/js/search.js" id="search-script"></script>
 </head>
 <body>
 <header>

diff --git a/src/test/renderer/specs/enums/enumerations.size.html b/src/test/renderer/specs/enums/enumerations.size.html
@@ -7,6 +7,7 @@
 	<meta name="description" content="Documentation for typedoc">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="stylesheet" href="../assets/css/main.css">
+	<script async src="../assets/js/search.js" id="search-script"></script>
 </head>
 <body>
 <header>

diff --git a/src/test/renderer/specs/index.html b/src/test/renderer/specs/index.html
@@ -7,6 +7,7 @@
 	<meta name="description" content="Documentation for typedoc">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="stylesheet" href="assets/css/main.css">
+	<script async src="assets/js/search.js" id="search-script"></script>
 </head>
 <body>
 <header>

diff --git a/src/test/renderer/specs/interfaces/classes.nameinterface.html b/src/test/renderer/specs/interfaces/classes.nameinterface.html
@@ -7,6 +7,7 @@
 	<meta name="description" content="Documentation for typedoc">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="stylesheet" href="../assets/css/main.css">
+	<script async src="../assets/js/search.js" id="search-script"></script>
 </head>
 <body>
 <header>

diff --git a/src/test/renderer/specs/interfaces/classes.printinterface.html b/src/test/renderer/specs/interfaces/classes.printinterface.html
@@ -7,6 +7,7 @@
 	<meta name="description" content="Documentation for typedoc">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="stylesheet" href="../assets/css/main.css">
+	<script async src="../assets/js/search.js" id="search-script"></script>
 </head>
 <body>
 <header>

diff --git a/src/test/renderer/specs/interfaces/classes.printnameinterface.html b/src/test/renderer/specs/interfaces/classes.printnameinterface.html
@@ -7,6 +7,7 @@
 	<meta name="description" content="Documentation for typedoc">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="stylesheet" href="../assets/css/main.css">
+	<script async src="../assets/js/search.js" id="search-script"></script>
 </head>
 <body>
 <header>

diff --git a/src/test/renderer/specs/interfaces/generics.a.html b/src/test/renderer/specs/interfaces/generics.a.html
@@ -7,6 +7,7 @@
 	<meta name="description" content="Documentation for typedoc">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="stylesheet" href="../assets/css/main.css">
+	<script async src="../assets/js/search.js" id="search-script"></script>
 </head>
 <body>
 <header>

diff --git a/src/test/renderer/specs/interfaces/generics.ab.html b/src/test/renderer/specs/interfaces/generics.ab.html
@@ -7,6 +7,7 @@
 	<meta name="description" content="Documentation for typedoc">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="stylesheet" href="../assets/css/main.css">
+	<script async src="../assets/js/search.js" id="search-script"></script>
 </head>
 <body>
 <header>

diff --git a/src/test/renderer/specs/interfaces/generics.abnumber.html b/src/test/renderer/specs/interfaces/generics.abnumber.html
@@ -7,6 +7,7 @@
 	<meta name="description" content="Documentation for typedoc">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="stylesheet" href="../assets/css/main.css">
+	<script async src="../assets/js/search.js" id="search-script"></script>
 </head>
 <body>
 <header>

diff --git a/src/test/renderer/specs/interfaces/generics.abstring.html b/src/test/renderer/specs/interfaces/generics.abstring.html
@@ -7,6 +7,7 @@
 	<meta name="description" content="Documentation for typedoc">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="stylesheet" href="../assets/css/main.css">
+	<script async src="../assets/js/search.js" id="search-script"></script>
 </head>
 <body>
 <header>

diff --git a/src/test/renderer/specs/interfaces/generics.b.html b/src/test/renderer/specs/interfaces/generics.b.html
@@ -7,6 +7,7 @@
 	<meta name="description" content="Documentation for typedoc">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="stylesheet" href="../assets/css/main.css">
+	<script async src="../assets/js/search.js" id="search-script"></script>
 </head>
 <body>
 <header>

diff --git a/src/test/renderer/specs/interfaces/mixin.mixin1type.html b/src/test/renderer/specs/interfaces/mixin.mixin1type.html
@@ -7,6 +7,7 @@
 	<meta name="description" content="Documentation for typedoc">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="stylesheet" href="../assets/css/main.css">
+	<script async src="../assets/js/search.js" id="search-script"></script>
 </head>
 <body>
 <header>

diff --git a/src/test/renderer/specs/interfaces/mixin.mixin2.html b/src/test/renderer/specs/interfaces/mixin.mixin2.html
@@ -7,6 +7,7 @@
 	<meta name="description" content="Documentation for typedoc">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="stylesheet" href="../assets/css/main.css">
+	<script async src="../assets/js/search.js" id="search-script"></script>
 </head>
 <body>
 <header>

diff --git a/src/test/renderer/specs/modules.html b/src/test/renderer/specs/modules.html
@@ -7,6 +7,7 @@
 	<meta name="description" content="Documentation for typedoc">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="stylesheet" href="assets/css/main.css">
+	<script async src="assets/js/search.js" id="search-script"></script>
 </head>
 <body>
 <header>

diff --git a/src/test/renderer/specs/modules/access.html b/src/test/renderer/specs/modules/access.html
@@ -7,6 +7,7 @@
 	<meta name="description" content="Documentation for typedoc">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="stylesheet" href="../assets/css/main.css">
+	<script async src="../assets/js/search.js" id="search-script"></script>
 </head>
 <body>
 <header>

diff --git a/src/test/renderer/specs/modules/access.privatemodule.html b/src/test/renderer/specs/modules/access.privatemodule.html
@@ -7,6 +7,7 @@
 	<meta name="description" content="Documentation for typedoc">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="stylesheet" href="../assets/css/main.css">
+	<script async src="../assets/js/search.js" id="search-script"></script>
 </head>
 <body>
 <header>

diff --git a/src/test/renderer/specs/modules/classes.html b/src/test/renderer/specs/modules/classes.html
@@ -7,6 +7,7 @@
 	<meta name="description" content="Documentation for typedoc">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="stylesheet" href="../assets/css/main.css">
+	<script async src="../assets/js/search.js" id="search-script"></script>
 </head>
 <body>
 <header>

diff --git a/src/test/renderer/specs/modules/default_export.html b/src/test/renderer/specs/modules/default_export.html
@@ -7,6 +7,7 @@
 	<meta name="description" content="Documentation for typedoc">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="stylesheet" href="../assets/css/main.css">
+	<script async src="../assets/js/search.js" id="search-script"></script>
 </head>
 <body>
 <header>

diff --git a/src/test/renderer/specs/modules/enumerations.html b/src/test/renderer/specs/modules/enumerations.html
@@ -7,6 +7,7 @@
 	<meta name="description" content="Documentation for typedoc">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="stylesheet" href="../assets/css/main.css">
+	<script async src="../assets/js/search.js" id="search-script"></script>
 </head>
 <body>
 <header>

diff --git a/src/test/renderer/specs/modules/flattened.html b/src/test/renderer/specs/modules/flattened.html
@@ -7,6 +7,7 @@
 	<meta name="description" content="Documentation for typedoc">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="stylesheet" href="../assets/css/main.css">
+	<script async src="../assets/js/search.js" id="search-script"></script>
 </head>
 <body>
 <header>

diff --git a/src/test/renderer/specs/modules/functions.html b/src/test/renderer/specs/modules/functions.html
@@ -7,6 +7,7 @@
 	<meta name="description" content="Documentation for typedoc">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="stylesheet" href="../assets/css/main.css">
+	<script async src="../assets/js/search.js" id="search-script"></script>
 </head>
 <body>
 <header>

diff --git a/src/test/renderer/specs/modules/functions.modulefunction.html b/src/test/renderer/specs/modules/functions.modulefunction.html
@@ -7,6 +7,7 @@
 	<meta name="description" content="Documentation for typedoc">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="stylesheet" href="../assets/css/main.css">
+	<script async src="../assets/js/search.js" id="search-script"></script>
 </head>
 <body>
 <header>

diff --git a/src/test/renderer/specs/modules/generics.html b/src/test/renderer/specs/modules/generics.html
@@ -7,6 +7,7 @@
 	<meta name="description" content="Documentation for typedoc">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="stylesheet" href="../assets/css/main.css">
+	<script async src="../assets/js/search.js" id="search-script"></script>
 </head>
 <body>
 <header>

diff --git a/src/test/renderer/specs/modules/mixin.html b/src/test/renderer/specs/modules/mixin.html
@@ -7,6 +7,7 @@
 	<meta name="description" content="Documentation for typedoc">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="stylesheet" href="../assets/css/main.css">
+	<script async src="../assets/js/search.js" id="search-script"></script>
 </head>
 <body>
 <header>

diff --git a/src/test/renderer/specs/modules/mod.html b/src/test/renderer/specs/modules/mod.html
@@ -7,6 +7,7 @@
 	<meta name="description" content="Documentation for typedoc">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="stylesheet" href="../assets/css/main.css">
+	<script async src="../assets/js/search.js" id="search-script"></script>
 </head>
 <body>
 <header>

diff --git a/src/test/renderer/specs/modules/mod2.html b/src/test/renderer/specs/modules/mod2.html
@@ -7,6 +7,7 @@
 	<meta name="description" content="Documentation for typedoc">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="stylesheet" href="../assets/css/main.css">
+	<script async src="../assets/js/search.js" id="search-script"></script>
 </head>
 <body>
 <header>

diff --git a/src/test/renderer/specs/modules/modules.html b/src/test/renderer/specs/modules/modules.html
@@ -7,6 +7,7 @@
 	<meta name="description" content="Documentation for typedoc">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="stylesheet" href="../assets/css/main.css">
+	<script async src="../assets/js/search.js" id="search-script"></script>
 </head>
 <body>
 <header>

diff --git a/src/test/renderer/specs/modules/modules.mymodule.html b/src/test/renderer/specs/modules/modules.mymodule.html
@@ -7,6 +7,7 @@
 	<meta name="description" content="Documentation for typedoc">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="stylesheet" href="../assets/css/main.css">
+	<script async src="../assets/js/search.js" id="search-script"></script>
 </head>
 <body>
 <header>

diff --git a/src/test/renderer/specs/modules/modules.mymodule.mysubmodule.html b/src/test/renderer/specs/modules/modules.mymodule.mysubmodule.html
@@ -7,6 +7,7 @@
 	<meta name="description" content="Documentation for typedoc">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="stylesheet" href="../assets/css/main.css">
+	<script async src="../assets/js/search.js" id="search-script"></script>
 </head>
 <body>
 <header>

diff --git a/src/test/renderer/specs/modules/single_export.html b/src/test/renderer/specs/modules/single_export.html
@@ -7,6 +7,7 @@
 	<meta name="description" content="Documentation for typedoc">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="stylesheet" href="../assets/css/main.css">
+	<script async src="../assets/js/search.js" id="search-script"></script>
 </head>
 <body>
 <header>