updated plugins to work correctly by calling jsdoc twice, once to col…

…lect symbols, once to generate docs

.gitignore

@@ -8,5 +8,5 @@ docs/recur-tester.html
 tools/vzic/
 tools/tzdb/
 tools/libical/
+tools/jsdoc-symbols-temp.json
 coverage/
-temp.json

jsdoc-prepare.json

@@ -0,0 +1,10 @@
+{
+  "source": {
+    "include": "lib/ical",
+    "includePattern": ".js$"
+  },
+  "plugins": ["tools/jsdoc-collect-types.cjs", "node_modules/jsdoc-tsimport-plugin/index.js"],
+  "opts": {
+    "destination": "docs/api/"
+  }
+}

jsdoc.json

@@ -3,7 +3,7 @@
     "include": "lib/ical",
     "includePattern": ".js$"
   },
-  "plugins": ["plugins/markdown", "tools/jsdoc-collect-types.cjs", "tools/jsdoc-ical.cjs", "node_modules/jsdoc-tsimport-plugin/index.js"],
+  "plugins": ["plugins/markdown", "tools/jsdoc-ical.cjs", "node_modules/jsdoc-tsimport-plugin/index.js"],
   "opts": {
     "encoding": "utf8",
     "readme": "README.md",

package.json

@@ -61,7 +61,7 @@
     "test-all": "npm run test-unit && npm run test-acceptance && npm run test-performance && npm run test-browser",
     "build": "rollup -c",
     "lint": "eslint",
-    "jsdoc": "rm -rf docs/api && jsdoc --configure jsdoc.json --verbose",
+    "jsdoc": "rm -rf docs/api && jsdoc --configure jsdoc-prepare.json && rm -rf docs/api && jsdoc --configure jsdoc.json --verbose",
     "validator": "node tools/scriptutils.js replace-unpkg tools/validator.html docs/validator.html",
     "recurtester": "node tools/scriptutils.js replace-unpkg tools/recur-tester.html docs/recur-tester.html",
     "ghpages": "npm run jsdoc && npm run validator && npm run recurtester"

tools/jsdoc-collect-types.cjs

@@ -22,6 +22,8 @@ exports.handlers = {
     if (doclet.kind === "typedef" && doclet.scope === "static" && doclet.longname.startsWith("ICAL.")) {
       typedefs.add({name: doclet.name, full: doclet.longname})
     }
-    fs.writeFileSync("./temp.json", JSON.stringify({gIcalClasses: Array.from(gIcalClasses), typedefs: Array.from(typedefs)}));
+  },
+  processingComplete: function() {
+    fs.writeFileSync("./tools/jsdoc-symbols-temp.json", JSON.stringify({gIcalClasses: Array.from(gIcalClasses), typedefs: Array.from(typedefs)}));
   }
 };

tools/jsdoc-ical.cjs

@@ -10,7 +10,8 @@
  */
 
 const fs = require("node:fs");
-const { gIcalClasses, typedefs } = JSON.parse(fs.readFileSync("./temp.json", "utf-8"));
+let gIcalClasses = [];
+let typedefs = [];
 
 function addPrefix(objNames) {
   if (objNames?.length) {
@@ -50,6 +51,9 @@ function augmentTypes(obj) {
 }
 
 exports.handlers = {
+  parseBegin: function() {
+    ({ gIcalClasses, typedefs } = JSON.parse(fs.readFileSync("./tools/jsdoc-symbols-temp.json", "utf-8")));
+  },
   newDoclet: function({ doclet }) {
     if (doclet.type) {
       augmentTypes(doclet.type);