registerTypedef: prevent typedef-as-string overwrite if it already exists as object (#53)

* registerTypedef: prevent typedef-as-string overwrite if it already exists as object

* Ignore @typedef's that only refer to themselves in another file + add test

Author: kungfooman

src-runtime/registerTypedef.mjs

@@ -7,6 +7,11 @@ const typedefs = {};
  * @param {Record<string, object>} typedef - The parsed typedef from source.
  */
 function registerTypedef(name, typedef) {
+  // If it already exists as object but now it's a string
+  if (typeof typedefs[name] === 'object' && typeof typedef === 'string') {
+    // console.log("registerTypedef> ignore", name, typedef);
+    return;
+  }
   typedefs[name] = typedef;
 }
 export {typedefs, registerTypedef};

src-transpiler/parseJSDocTypedef.mjs

@@ -55,7 +55,10 @@ function parseJSDocTypedef(typedefs, warn, comment, expandType) {
       // Drop description
       name = name.split(' ')[0];
       lastTypedef = expandType(def);
-      typedefs[name] = lastTypedef;
+      // Ignore @typedef's that only refer to themselves in another file (see typedef-overwrite test)
+      if (lastTypedef !== name) {
+        typedefs[name] = lastTypedef;
+      }
     } else if (line.startsWith('@property')) {
       // class @property
       if (!lastTypedef) {

test/typechecking/typedef-overwrite-input.mjs

@@ -0,0 +1,8 @@
+/**
+ * @typedef {Int8Array | Uint8Array | Uint8ClampedArray | Int16Array | Uint16Array | Int32Array | Uint32Array | Float32Array | Float64Array} TypedArray
+ * @typedef {BigInt64Array | BigUint64Array} BigTypedArray
+ * @typedef {TypedArray | BigTypedArray} AnyTypedArray
+ */
+/**
+ * @typedef {import('./utils/maths.js').TypedArray} TypedArray
+ */

test/typechecking/typedef-overwrite-output.mjs

@@ -0,0 +1,28 @@
+registerTypedef('TypedArray', {
+  "type": "union",
+  "members": [
+    "Int8Array",
+    "Uint8Array",
+    "Uint8ClampedArray",
+    "Int16Array",
+    "Uint16Array",
+    "Int32Array",
+    "Uint32Array",
+    "Float32Array",
+    "Float64Array"
+  ]
+});
+registerTypedef('BigTypedArray', {
+  "type": "union",
+  "members": [
+    "BigInt64Array",
+    "BigUint64Array"
+  ]
+});
+registerTypedef('AnyTypedArray', {
+  "type": "union",
+  "members": [
+    "TypedArray",
+    "BigTypedArray"
+  ]
+});