@markw65/monkeyc-optimizer 1.1.74 → 1.1.76

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 All notable changes to the "monkeyc-optimizer" package will be documented in this file.
 
+### 1.1.76
+
+- Fix member expression lookup when base type is exact
+- Fix path-resolution inside locals in jungle files
+
+### 1.1.75
+
+- Fix issues using personality files from barrels
+- Fix issues with enums values as the base of member expressions
+- Handle `new` expressions as references to the `initialize` method
+- Classes without an explicit `initialize` method get an implicit, empty `initialize`, rather than inheriting the parent's
+- Fix `subtypeOf` for function types.
+- Update tests to work with sdk-7.2.1 and later
+
 ### 1.1.74
 
 - Add refs from drawable-ids to the corresponding drawable (Fixes prettier-extension-monkeyc#20)

package/build/api.cjs

@@ -18,55 +18,57 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var api_exports = {};
 __export(api_exports, {
-  checkCompilerVersion: () => import_chunk_7OAMZRC7.checkCompilerVersion,
-  collectNamespaces: () => import_chunk_7OAMZRC7.collectNamespaces,
-  createDocumentationMap: () => import_chunk_7OAMZRC7.createDocumentationMap,
-  diagnostic: () => import_chunk_7OAMZRC7.diagnostic,
-  diagnosticHelper: () => import_chunk_7OAMZRC7.diagnosticHelper,
-  findNamesInScope: () => import_chunk_7OAMZRC7.findNamesInScope,
-  findUsingForNode: () => import_chunk_7OAMZRC7.findUsingForNode,
-  formatAst: () => import_chunk_7OAMZRC7.formatAst,
-  formatAstLongLines: () => import_chunk_7OAMZRC7.formatAstLongLines,
-  formatScopedName: () => import_chunk_7OAMZRC7.formatScopedName,
-  getApiFunctionInfo: () => import_chunk_7OAMZRC7.getApiFunctionInfo,
-  getApiMapping: () => import_chunk_7OAMZRC7.getApiMapping,
-  getSuperClasses: () => import_chunk_7OAMZRC7.getSuperClasses,
-  handleImportUsing: () => import_chunk_7OAMZRC7.handleImportUsing,
+  checkCompilerVersion: () => import_chunk_3OBK4E4Q.checkCompilerVersion,
+  collectNamespaces: () => import_chunk_3OBK4E4Q.collectNamespaces,
+  createDocumentationMap: () => import_chunk_3OBK4E4Q.createDocumentationMap,
+  declKey: () => import_chunk_3OBK4E4Q.declKey,
+  diagnostic: () => import_chunk_3OBK4E4Q.diagnostic,
+  diagnosticHelper: () => import_chunk_3OBK4E4Q.diagnosticHelper,
+  findNamesInScope: () => import_chunk_3OBK4E4Q.findNamesInScope,
+  findUsingForNode: () => import_chunk_3OBK4E4Q.findUsingForNode,
+  formatAst: () => import_chunk_3OBK4E4Q.formatAst,
+  formatAstLongLines: () => import_chunk_3OBK4E4Q.formatAstLongLines,
+  formatScopedName: () => import_chunk_3OBK4E4Q.formatScopedName,
+  getApiFunctionInfo: () => import_chunk_3OBK4E4Q.getApiFunctionInfo,
+  getApiMapping: () => import_chunk_3OBK4E4Q.getApiMapping,
+  getSuperClasses: () => import_chunk_3OBK4E4Q.getSuperClasses,
+  handleImportUsing: () => import_chunk_3OBK4E4Q.handleImportUsing,
   hasProperty: () => import_chunk_JDC43A3I.hasProperty,
-  isClassVariable: () => import_chunk_7OAMZRC7.isClassVariable,
-  isLocal: () => import_chunk_7OAMZRC7.isLocal,
-  isLookupCandidate: () => import_chunk_7OAMZRC7.isLookupCandidate,
-  isStateNode: () => import_chunk_7OAMZRC7.isStateNode,
-  lookupByFullName: () => import_chunk_7OAMZRC7.lookupByFullName,
-  lookupNext: () => import_chunk_7OAMZRC7.lookupNext,
-  lookupResultContains: () => import_chunk_7OAMZRC7.lookupResultContains,
-  lookupWithType: () => import_chunk_7OAMZRC7.lookupWithType,
-  makeToyboxLink: () => import_chunk_7OAMZRC7.makeToyboxLink,
-  mapVarDeclsByType: () => import_chunk_7OAMZRC7.mapVarDeclsByType,
-  markInvokeClassMethod: () => import_chunk_7OAMZRC7.markInvokeClassMethod,
-  parseSdkVersion: () => import_chunk_7OAMZRC7.parseSdkVersion,
-  popRootNode: () => import_chunk_7OAMZRC7.popRootNode,
-  pushRootNode: () => import_chunk_7OAMZRC7.pushRootNode,
-  resolveDiagnostics: () => import_chunk_7OAMZRC7.resolveDiagnostics,
-  resolveDiagnosticsMap: () => import_chunk_7OAMZRC7.resolveDiagnosticsMap,
-  sameLookupResult: () => import_chunk_7OAMZRC7.sameLookupResult,
+  isClassVariable: () => import_chunk_3OBK4E4Q.isClassVariable,
+  isLocal: () => import_chunk_3OBK4E4Q.isLocal,
+  isLookupCandidate: () => import_chunk_3OBK4E4Q.isLookupCandidate,
+  isStateNode: () => import_chunk_3OBK4E4Q.isStateNode,
+  lookupByFullName: () => import_chunk_3OBK4E4Q.lookupByFullName,
+  lookupNext: () => import_chunk_3OBK4E4Q.lookupNext,
+  lookupResultContains: () => import_chunk_3OBK4E4Q.lookupResultContains,
+  lookupWithType: () => import_chunk_3OBK4E4Q.lookupWithType,
+  makeToyboxLink: () => import_chunk_3OBK4E4Q.makeToyboxLink,
+  mapVarDeclsByType: () => import_chunk_3OBK4E4Q.mapVarDeclsByType,
+  markInvokeClassMethod: () => import_chunk_3OBK4E4Q.markInvokeClassMethod,
+  parseSdkVersion: () => import_chunk_3OBK4E4Q.parseSdkVersion,
+  popRootNode: () => import_chunk_3OBK4E4Q.popRootNode,
+  pushRootNode: () => import_chunk_3OBK4E4Q.pushRootNode,
+  resolveDiagnostics: () => import_chunk_3OBK4E4Q.resolveDiagnostics,
+  resolveDiagnosticsMap: () => import_chunk_3OBK4E4Q.resolveDiagnosticsMap,
+  sameLookupResult: () => import_chunk_3OBK4E4Q.sameLookupResult,
   traverseAst: () => import_chunk_JDC43A3I.traverseAst,
-  variableDeclarationName: () => import_chunk_7OAMZRC7.variableDeclarationName,
-  visitReferences: () => import_chunk_7OAMZRC7.visitReferences,
-  visit_resources: () => import_chunk_7OAMZRC7.visit_resources,
-  visitorNode: () => import_chunk_7OAMZRC7.visitorNode
+  variableDeclarationName: () => import_chunk_3OBK4E4Q.variableDeclarationName,
+  visitReferences: () => import_chunk_3OBK4E4Q.visitReferences,
+  visit_resources: () => import_chunk_3OBK4E4Q.visit_resources,
+  visitorNode: () => import_chunk_3OBK4E4Q.visitorNode
 });
 module.exports = __toCommonJS(api_exports);
-var import_chunk_7OAMZRC7 = require("./chunk-7OAMZRC7.cjs");
+var import_chunk_3OBK4E4Q = require("./chunk-3OBK4E4Q.cjs");
 var import_chunk_NHZRKHZO = require("./chunk-NHZRKHZO.cjs");
 var import_chunk_JDC43A3I = require("./chunk-JDC43A3I.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_7OAMZRC7.init_api)();
+(0, import_chunk_3OBK4E4Q.init_api)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   checkCompilerVersion,
   collectNamespaces,
   createDocumentationMap,
+  declKey,
   diagnostic,
   diagnosticHelper,
   findNamesInScope,

package/build/{chunk-7OAMZRC7.cjs → chunk-3OBK4E4Q.cjs}

@@ -26,8 +26,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var chunk_7OAMZRC7_exports = {};
-__export(chunk_7OAMZRC7_exports, {
+var chunk_3OBK4E4Q_exports = {};
+__export(chunk_3OBK4E4Q_exports, {
   EnumTagsConst: () => EnumTagsConst,
   LastTypeTag: () => LastTypeTag,
   ObjectLikeTagsConst: () => ObjectLikeTagsConst,
@@ -44,6 +44,7 @@ __export(chunk_7OAMZRC7_exports, {
   connectiq: () => connectiq,
   couldBe: () => couldBe,
   createDocumentationMap: () => createDocumentationMap,
+  declKey: () => declKey,
   defaultConfig: () => defaultConfig,
   diagnostic: () => diagnostic,
   diagnosticHelper: () => diagnosticHelper,
@@ -138,7 +139,7 @@ __export(chunk_7OAMZRC7_exports, {
   visitorNode: () => visitorNode,
   xml_util_exports: () => xml_util_exports
 });
-module.exports = __toCommonJS(chunk_7OAMZRC7_exports);
+module.exports = __toCommonJS(chunk_3OBK4E4Q_exports);
 var import_chunk_NHZRKHZO = require("./chunk-NHZRKHZO.cjs");
 var import_chunk_JDC43A3I = require("./chunk-JDC43A3I.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
@@ -8725,7 +8726,7 @@ function subtypeOfValue(pair) {
     case 8192: {
       const asd = pair.avalue;
       const bsd = pair.bvalue;
-      return (0, import_chunk_NHZRKHZO.some)(asd, (sna) => (0, import_chunk_NHZRKHZO.some)(bsd, (snb) => sna === snb));
+      return (0, import_chunk_NHZRKHZO.every)(asd, (sna) => (0, import_chunk_NHZRKHZO.some)(bsd, (snb) => sna === snb));
     }
     case 16384: {
       const asd = pair.avalue;
@@ -9273,89 +9274,84 @@ function printBlockTrailer(block) {
     `Succs: ${(block.succs || []).map((block2) => block2.order).join(", ")} ExSucc: ${block.exsucc ? block.exsucc.order : ""}`
   );
 }
-function filterDecls(decls, possible, name) {
+function filterDecls(state, decls, next) {
+  const possible = (0, import_chunk_JDC43A3I.hasProperty)(state.allDeclarations, next.name) && state.allDeclarations[next.name];
   if (!possible)
     return [null, null];
-  const result = decls.reduce(
-    (cur, decl) => {
-      let declSups;
-      const found = possible.reduce((flag, poss) => {
-        if (decl === poss || poss.type === "ClassDeclaration" && getSuperClasses(poss)?.has(decl)) {
-          if (!cur[0]) {
-            cur = [/* @__PURE__ */ new Set(), /* @__PURE__ */ new Set()];
-          }
-          cur[0].add(poss);
-          cur[1].add(poss);
-          return true;
-        } else if (declSups !== void 0 ? declSups?.has(poss) : decl.type === "ClassDeclaration" && (declSups = getSuperClasses(decl))?.has(poss)) {
-          if (!cur[0]) {
-            cur = [/* @__PURE__ */ new Set([decl]), /* @__PURE__ */ new Set([poss])];
-          } else {
-            cur[0].add(decl);
-            if (Array.from(cur[1]).every((d) => {
-              if (decl === d)
-                return false;
-              if (!declSups.has(d))
-                return true;
-              if (d.type === "ClassDeclaration" && getSuperClasses(d)?.has(poss)) {
-                return false;
-              }
-              if (poss.type === "ClassDeclaration" && getSuperClasses(poss)?.has(d)) {
-                cur[1].delete(d);
-              }
-              return true;
-            })) {
-              cur[1].add(poss);
-            }
+  const result = decls.reduce((cur, { sn: decl, exact }) => {
+    let declSups;
+    const getDeclSups = () => declSups !== void 0 ? declSups : decl.type === "ClassDeclaration" ? declSups = getSuperClasses(decl) : null;
+    const found = possible.reduce((flag, poss) => {
+      if (decl === poss || !exact && poss.type === "ClassDeclaration" && getSuperClasses(poss)?.has(decl)) {
+        if (!cur) {
+          cur = [/* @__PURE__ */ new Set(), /* @__PURE__ */ new Set(), /* @__PURE__ */ new Set()];
+        }
+        cur[0].add(poss);
+        cur[1].add(poss);
+        if (cur[2].size && decl === poss && decl.type === "ClassDeclaration") {
+          const posSupers = getSuperClasses(decl);
+          if (posSupers) {
+            cur[2].forEach((s) => posSupers.has(s) && cur[2].delete(s));
           }
-          return true;
         }
-        return flag;
-      }, false);
-      if (!found) {
-        let d = [decl];
-        do {
-          d.forEach((d2) => {
-            const stack = d2.stack;
-            possible.forEach((poss) => {
-              for (let i = stack.length; i--; ) {
-                const sn = stack[i].sn;
-                if (sn.decls === poss.decls) {
-                  if (!cur[0]) {
-                    cur = [/* @__PURE__ */ new Set(), /* @__PURE__ */ new Set()];
-                  }
-                  cur[0].add(decl);
-                  cur[1].add(poss);
-                  break;
-                }
-                if ((0, import_chunk_JDC43A3I.hasProperty)(sn.decls, name)) {
-                  break;
+        return true;
+      } else if (poss.type === "ClassDeclaration" && getDeclSups()?.has(poss)) {
+        if (!cur) {
+          cur = [/* @__PURE__ */ new Set(), /* @__PURE__ */ new Set(), /* @__PURE__ */ new Set()];
+        }
+        cur[0].add(decl);
+        const supers = Array.from(cur[2]);
+        if (!supers.some((s) => getSuperClasses(s)?.has(poss))) {
+          const posSupers = getSuperClasses(poss);
+          posSupers && supers.forEach((s) => posSupers.has(s) && cur[2].delete(s));
+          cur[2].add(poss);
+        }
+        return true;
+      }
+      return flag;
+    }, false);
+    if (!found) {
+      let d = [decl];
+      do {
+        d.forEach((d2) => {
+          const stack = d2.stack;
+          possible.forEach((poss) => {
+            for (let i = stack.length; i--; ) {
+              const sn = stack[i].sn;
+              if (sn.decls === poss.decls) {
+                if (!cur) {
+                  cur = [/* @__PURE__ */ new Set(), /* @__PURE__ */ new Set(), /* @__PURE__ */ new Set()];
                 }
+                cur[0].add(decl);
+                cur[1].add(poss);
+                break;
+              }
+              if ((0, import_chunk_JDC43A3I.hasProperty)(sn.decls, next.name)) {
+                break;
               }
-            });
-          });
-          d = d.flatMap((d2) => {
-            if (d2.type !== "ClassDeclaration" || !d2.superClass || d2.superClass === true) {
-              return [];
             }
-            return d2.superClass;
           });
-        } while (d.length);
-      }
-      return cur;
-    },
-    [null, null]
-  );
-  if (!result[0])
+        });
+        d = d.flatMap((d2) => {
+          if (d2.type !== "ClassDeclaration" || !d2.superClass || d2.superClass === true) {
+            return [];
+          }
+          return d2.superClass;
+        });
+      } while (d.length);
+    }
+    return cur;
+  }, null);
+  if (!result)
     return [null, null];
+  result[2].forEach((c) => result[1].add(c));
   return [Array.from(result[0]), Array.from(result[1])];
 }
 function findObjectDeclsByProperty(state, object, next) {
-  const decls = getStateNodeDeclsFromType(state, object);
+  const decls = getStateNodeDeclsWithExactFromType(state, object);
   if (!decls)
     return [null, null];
-  const possibleDecls = (0, import_chunk_JDC43A3I.hasProperty)(state.allDeclarations, next.name) && state.allDeclarations[next.name];
-  return filterDecls(decls, possibleDecls, next.name);
+  return filterDecls(state, decls, next);
 }
 function refineObjectTypeByDecls(istate, object, trueDecls) {
   const refinedType = typeFromTypeStateNodes(istate.state, trueDecls);
@@ -10588,8 +10584,9 @@ function pushScopedNameType(istate, node, object) {
   if (istate.typeMap) {
     result = istate.typeMap.get(node);
     if (!result && object && node.type === "MemberExpression" && !node.computed) {
-      istate.typeMap.set(node.object, object.value);
-      const resolved = resolveDottedMember(istate, object.value, node);
+      const objectType = deEnumerate(object.value);
+      istate.typeMap.set(node.object, objectType);
+      const resolved = resolveDottedMember(istate, objectType, node);
       if (resolved) {
         result = resolved.property;
         if (resolved.mayThrow) {
@@ -10944,7 +10941,7 @@ function evaluateNode(istate, node) {
       if (!isLookupCandidate(node)) {
         const property = popIstate(istate, node.property);
         const object = popIstate(istate, node.object);
-        const objectType = object.value;
+        const objectType = deEnumerate(object.value);
         let byteArray = false;
         if (objectType.type & 32768 && objectType.value) {
           const odata = getObjectValue(objectType);
@@ -11115,29 +11112,26 @@ function evaluateNode(istate, node) {
       if (isExact(klass.value) && klass.value.type === 16384) {
         obj.value = { klass: klass.value };
         if (istate.checkTypes && klass.value.value) {
-          const results = lookupNext(
-            istate.state,
-            [
-              {
-                parent: null,
-                results: Array.isArray(klass.value.value) ? klass.value.value : [klass.value.value]
-              }
-            ],
-            "decls",
-            { type: "Identifier", name: "initialize" }
+          const callees = (0, import_chunk_NHZRKHZO.map)(
+            klass.value.value,
+            (klass2) => klass2.decls?.initialize
+          ).flat().filter(
+            (result) => result?.type === "FunctionDeclaration"
           );
-          if (results) {
-            const callees = results.flatMap(
-              (lookupDef) => lookupDef.results.filter(
-                (result) => result.type === "FunctionDeclaration"
-              )
-            );
+          if (callees.length) {
             checkCallArgs(
               istate,
               node,
               callees,
               args.map(({ value: value2 }) => value2)
             );
+          } else if (args.length) {
+            diagnostic(
+              istate.state,
+              node,
+              `initialize method expected no args, but got ${args.length}`,
+              istate.checkTypes
+            );
           }
         }
       }
@@ -12209,6 +12203,9 @@ function setUnionComponent(v, tag, c) {
   }
 }
 function getStateNodeDeclsFromType(state, object) {
+  return getStateNodeDeclsWithExactFromType(state, object).map(({ sn }) => sn);
+}
+function getStateNodeDeclsWithExactFromType(state, object) {
   const decls = [];
   if (object.value != null && object.type & (4096 | 16384 | 32768)) {
     forEachUnionComponent(
@@ -12220,20 +12217,15 @@ function getStateNodeDeclsFromType(state, object) {
         switch (type.type) {
           case 32768:
             if (type.value.klass.type === 16384 && type.value.klass.value) {
-              if (Array.isArray(type.value.klass.value)) {
-                decls.push(...type.value.klass.value);
-              } else {
-                decls.push(type.value.klass.value);
-              }
+              (0, import_chunk_NHZRKHZO.forEach)(
+                type.value.klass.value,
+                (sn) => decls.push({ sn, exact: false })
+              );
             }
             break;
           case 4096:
           case 16384:
-            if (Array.isArray(type.value)) {
-              decls.push(...type.value);
-            } else {
-              decls.push(type.value);
-            }
+            (0, import_chunk_NHZRKHZO.forEach)(type.value, (sn) => decls.push({ sn, exact: true }));
             break;
         }
       }
@@ -12253,7 +12245,7 @@ function getStateNodeDeclsFromType(state, object) {
       }
       const name = `Toybox.Lang.${typeTagName(bit)}`;
       const sns = lookupByFullName(state, name);
-      sns.forEach((sn) => isStateNode(sn) && decls.push(sn));
+      sns.forEach((sn) => isStateNode(sn) && decls.push({ sn, exact: true }));
       bits = next;
     } while (bits);
   }
@@ -13572,11 +13564,23 @@ function propagateTypes(state, root, graph, optimizeEquivalencies, copyPropStore
   function getStateType(blockState, decl) {
     return getStateEntry(blockState, decl).curType;
   }
-  function getStateEntry(blockState, decl) {
+  function getStateEntry(blockState, decl, node) {
     if (Array.isArray(decl) || decl.type !== "MemberDecl" && decl.type !== "Unknown") {
       let tsVal = blockState.map.get(decl);
       if (!tsVal) {
-        tsVal = { curType: typeConstraint(decl, blockState) };
+        const t = typeConstraint(decl, blockState);
+        if (node?.type === "MemberExpression" && !node.computed) {
+          const baseType = typeMap.get(node.object);
+          if (baseType) {
+            const r = evaluate(istate, node).value;
+            if (subtypeOf(r, t)) {
+              tsVal = { curType: r };
+            }
+          }
+        }
+        if (!tsVal) {
+          tsVal = { curType: t };
+        }
         blockState.map.set(decl, tsVal);
       }
       return tsVal;
@@ -13989,7 +13993,7 @@ function propagateTypes(state, root, graph, optimizeEquivalencies, copyPropStore
         break;
       }
       case "ref": {
-        const curEntry = getStateEntry(curState, event.decl);
+        const curEntry = getStateEntry(curState, event.decl, event.node);
         typeMap.set(event.node, curEntry.curType);
         nodeEquivs.delete(event.node);
         if (curEntry.equivSet) {
@@ -16923,8 +16927,10 @@ function collectClassInfo(state) {
 }
 function getFileSources(fnMap) {
   return Promise.all(
-    Object.entries(fnMap).map(([name, value2]) => {
-      return value2.monkeyCSource || fs.readFile(name).then(
+    Object.values(fnMap).map((value2) => {
+      if (value2.monkeyCSource)
+        return value2.monkeyCSource;
+      return fs.readFile(value2.name).then(
         (data) => value2.monkeyCSource = data.toString().replace(/\r\n/g, "\n")
       );
     })
@@ -16934,12 +16940,12 @@ function getFileSources(fnMap) {
 }
 function getFileASTs(fnMap) {
   return getFileSources(fnMap).then(
-    () => Object.entries(fnMap).reduce((ok, [name, value2]) => {
+    () => Object.values(fnMap).reduce((ok, value2) => {
       if (!value2.ast && !value2.parserError) {
         const options = {
-          filepath: name
+          filepath: value2.name
         };
-        if (/\.mss$/i.test(name)) {
+        if (/\.mss$/i.test(value2.name)) {
           options.mss = value2.barrel;
         }
         try {
@@ -17026,12 +17032,12 @@ async function analyze(fnMap, resourcesMap, manifestXML, config, allowParseError
   markApi = false;
   const state = preState;
   await getFileASTs(fnMap);
-  Object.entries(fnMap).forEach(([name, value2]) => {
+  Object.values(fnMap).forEach((value2) => {
     const { ast, parserError } = value2;
     if (!ast) {
       if (allowParseErrors)
         return;
-      throw parserError || new Error(`Failed to parse ${name}`);
+      throw parserError || new Error(`Failed to parse ${value2.name}`);
     }
     hasTests = false;
     collectNamespaces(ast, state);
@@ -17732,8 +17738,8 @@ async function optimizeMonkeyCHelper(fnMap, resourcesMap, manifestXML, config) {
   }
   const diagnostics = state.diagnostics && await resolveDiagnosticsMap(state.diagnostics);
   if (state.config?.checkBuildPragmas) {
-    Object.entries(fnMap).forEach(([name, f]) => {
-      pragmaChecker(state, f.ast, diagnostics?.[name]);
+    Object.values(fnMap).forEach((f) => {
+      pragmaChecker(state, f.ast, diagnostics?.[f.name]);
     });
   }
   return {
@@ -18637,6 +18643,9 @@ function visitorNode(node) {
   if (node.type === "BinaryExpression" && node.operator === "has" && node.right.type === "UnaryExpression" && node.right.operator === ":") {
     return node.right.argument;
   }
+  if (node.type === "NewExpression") {
+    return visitorNode(node.callee);
+  }
   return node;
 }
 function visitReferences(state, ast, name, defn, callback, includeDefs = false, filter = null, typeMap = null, findSingleDefinition = false) {
@@ -18724,6 +18733,42 @@ function visitReferences(state, ast, name, defn, callback, includeDefs = false,
             return ["arguments"];
           }
           break;
+        case "NewExpression": {
+          const [name2, results] = lookup2(node.callee, true);
+          if (!results)
+            break;
+          const initializers = /* @__PURE__ */ new Map();
+          results.forEach((result) => {
+            result.results.forEach((klass) => {
+              if (klass.type !== "ClassDeclaration")
+                return;
+              const inits = klass.decls?.["initialize"];
+              inits?.forEach((init) => {
+                if (init.type === "FunctionDeclaration") {
+                  const existing = initializers.get(klass);
+                  if (existing) {
+                    existing.push(init);
+                  } else {
+                    initializers.set(klass, [init]);
+                  }
+                }
+              });
+            });
+          });
+          if (initializers.size) {
+            checkResults(
+              [
+                name2,
+                Array.from(initializers).map(([parent, results2]) => ({
+                  parent,
+                  results: results2
+                }))
+              ],
+              node
+            );
+          }
+          break;
+        }
         case "Identifier":
           if (!name || node.name === name) {
             return checkResults(lookup2(node), node);
@@ -28548,7 +28593,13 @@ function evaluate_locals(assignments) {
   while (true) {
     assignments = assignments.filter((a) => {
       if (a.names.length === 1 && a.values.every((v) => v.type === "Literal")) {
-        locals[a.names[0]] = a.values;
+        locals[a.names[0]] = a.values.map((v) => {
+          if ("source" in v) {
+            v = { ...v };
+            delete v.source;
+          }
+          return v;
+        });
         return false;
       }
       return true;
@@ -30029,6 +30080,7 @@ async function fileInfoFromConfig(workspace, buildDir, output, buildConfig, extr
       ).concat(personalityFiles).map((file) => [
         file,
         {
+          name: file,
           output: path4.join(
             output,
             relative_path_no_dotdot(path4.relative(workspace, file))
@@ -30102,7 +30154,9 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
     );
     barrelFnMaps.forEach(
       (barrelFnMap) => Object.entries(barrelFnMap).forEach(([key2, value2]) => {
-        if (!(0, import_chunk_JDC43A3I.hasProperty)(fnMap, key2)) {
+        if (fnMap[key2]) {
+          fnMap[key2 + "::" + value2.barrel] = value2;
+        } else {
           fnMap[key2] = value2;
         }
       })
@@ -30130,7 +30184,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
       const opt_time = await (0, import_chunk_NHZRKHZO.first_modified)(
         Object.values(fnMap).map((v) => v.output)
       );
-      if (source_time < opt_time && 1723999677373 < opt_time) {
+      if (source_time < opt_time && 1726690662875 < opt_time) {
         return {
           hasTests,
           diagnostics: prevDiagnostics,
@@ -30168,7 +30222,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
             hasTests: hasTests2,
             diagnostics,
             sdkVersion,
-            optimizerVersion: "1.1.74",
+            optimizerVersion: "1.1.76",
             ...Object.fromEntries(
               configOptionsToCheck.map((option) => [option, config[option]])
             )
@@ -30233,9 +30287,13 @@ async function getProjectAnalysisHelper(targets, analysis, manifestXML, options)
     (results) => results.reduce((cur, result) => {
       if (!cur)
         return result;
-      Object.entries(result.fnMap).forEach(
-        ([key, value2]) => cur.fnMap[key] || (cur.fnMap[key] = value2)
-      );
+      Object.entries(result.fnMap).forEach(([key, value2]) => {
+        if (cur.fnMap[key]) {
+          cur.fnMap[key + "::" + value2.barrel] = value2;
+        } else {
+          cur.fnMap[key] = value2;
+        }
+      });
       cur.paths.push(...result.paths);
       return cur;
     }, null)
@@ -30283,8 +30341,8 @@ async function getFnMapAnalysis(fnMap, resourcesMap, manifestXML, options) {
   const typeMap = await analyze_module_types(state);
   const diagnostics = state.diagnostics && await resolveDiagnosticsMap(state.diagnostics);
   if (state.config?.checkBuildPragmas) {
-    Object.entries(fnMap).forEach(
-      ([name, f]) => f.ast && pragmaChecker(state, f.ast, diagnostics?.[name])
+    Object.values(fnMap).forEach(
+      (f) => f.ast && pragmaChecker(state, f.ast, diagnostics?.[f.name])
     );
   }
   return { fnMap, state, typeMap };
@@ -30999,6 +31057,7 @@ var init_sdk_util = (0, import_chunk_ABYVSU2C.__esm)({
   connectiq,
   couldBe,
   createDocumentationMap,
+  declKey,
   defaultConfig,
   diagnostic,
   diagnosticHelper,

package/build/optimizer.cjs

@@ -18,30 +18,30 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var optimizer_exports = {};
 __export(optimizer_exports, {
-  StateNodeAttributes: () => import_chunk_7OAMZRC7.StateNodeAttributes,
-  buildConfigDescription: () => import_chunk_7OAMZRC7.buildConfigDescription,
-  buildOptimizedProject: () => import_chunk_7OAMZRC7.buildOptimizedProject,
+  StateNodeAttributes: () => import_chunk_3OBK4E4Q.StateNodeAttributes,
+  buildConfigDescription: () => import_chunk_3OBK4E4Q.buildConfigDescription,
+  buildOptimizedProject: () => import_chunk_3OBK4E4Q.buildOptimizedProject,
   copyRecursiveAsNeeded: () => import_chunk_NHZRKHZO.copyRecursiveAsNeeded,
-  defaultConfig: () => import_chunk_7OAMZRC7.defaultConfig,
-  display: () => import_chunk_7OAMZRC7.display,
-  generateOneConfig: () => import_chunk_7OAMZRC7.generateOneConfig,
-  generateOptimizedProject: () => import_chunk_7OAMZRC7.generateOptimizedProject,
-  getConfig: () => import_chunk_7OAMZRC7.getConfig,
-  getFnMapAnalysis: () => import_chunk_7OAMZRC7.getFnMapAnalysis,
-  getProjectAnalysis: () => import_chunk_7OAMZRC7.getProjectAnalysis,
-  get_jungle: () => import_chunk_7OAMZRC7.get_jungle,
-  isErrorWithLocation: () => import_chunk_7OAMZRC7.isErrorWithLocation,
-  launchSimulator: () => import_chunk_7OAMZRC7.launchSimulator,
-  manifestProducts: () => import_chunk_7OAMZRC7.manifestProducts,
-  mctree: () => import_chunk_7OAMZRC7.mctree,
-  simulateProgram: () => import_chunk_7OAMZRC7.simulateProgram
+  defaultConfig: () => import_chunk_3OBK4E4Q.defaultConfig,
+  display: () => import_chunk_3OBK4E4Q.display,
+  generateOneConfig: () => import_chunk_3OBK4E4Q.generateOneConfig,
+  generateOptimizedProject: () => import_chunk_3OBK4E4Q.generateOptimizedProject,
+  getConfig: () => import_chunk_3OBK4E4Q.getConfig,
+  getFnMapAnalysis: () => import_chunk_3OBK4E4Q.getFnMapAnalysis,
+  getProjectAnalysis: () => import_chunk_3OBK4E4Q.getProjectAnalysis,
+  get_jungle: () => import_chunk_3OBK4E4Q.get_jungle,
+  isErrorWithLocation: () => import_chunk_3OBK4E4Q.isErrorWithLocation,
+  launchSimulator: () => import_chunk_3OBK4E4Q.launchSimulator,
+  manifestProducts: () => import_chunk_3OBK4E4Q.manifestProducts,
+  mctree: () => import_chunk_3OBK4E4Q.mctree,
+  simulateProgram: () => import_chunk_3OBK4E4Q.simulateProgram
 });
 module.exports = __toCommonJS(optimizer_exports);
-var import_chunk_7OAMZRC7 = require("./chunk-7OAMZRC7.cjs");
+var import_chunk_3OBK4E4Q = require("./chunk-3OBK4E4Q.cjs");
 var import_chunk_NHZRKHZO = require("./chunk-NHZRKHZO.cjs");
 var import_chunk_JDC43A3I = require("./chunk-JDC43A3I.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_7OAMZRC7.init_optimizer)();
+(0, import_chunk_3OBK4E4Q.init_optimizer)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   StateNodeAttributes,

package/build/sdk-util.cjs

@@ -18,25 +18,25 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var sdk_util_exports = {};
 __export(sdk_util_exports, {
-  SectionKinds: () => import_chunk_7OAMZRC7.SectionKinds,
-  appSupport: () => import_chunk_7OAMZRC7.appSupport,
-  connectiq: () => import_chunk_7OAMZRC7.connectiq,
-  getDeviceInfo: () => import_chunk_7OAMZRC7.getDeviceInfo,
-  getFunctionDocumentation: () => import_chunk_7OAMZRC7.getFunctionDocumentation,
-  getLanguages: () => import_chunk_7OAMZRC7.getLanguages,
-  getSdkPath: () => import_chunk_7OAMZRC7.getSdkPath,
-  isWin: () => import_chunk_7OAMZRC7.isWin,
-  optimizeProgram: () => import_chunk_7OAMZRC7.optimizeProgram,
-  readPrg: () => import_chunk_7OAMZRC7.readPrg,
-  readPrgWithOffsets: () => import_chunk_7OAMZRC7.readPrgWithOffsets,
-  xmlUtil: () => import_chunk_7OAMZRC7.xml_util_exports
+  SectionKinds: () => import_chunk_3OBK4E4Q.SectionKinds,
+  appSupport: () => import_chunk_3OBK4E4Q.appSupport,
+  connectiq: () => import_chunk_3OBK4E4Q.connectiq,
+  getDeviceInfo: () => import_chunk_3OBK4E4Q.getDeviceInfo,
+  getFunctionDocumentation: () => import_chunk_3OBK4E4Q.getFunctionDocumentation,
+  getLanguages: () => import_chunk_3OBK4E4Q.getLanguages,
+  getSdkPath: () => import_chunk_3OBK4E4Q.getSdkPath,
+  isWin: () => import_chunk_3OBK4E4Q.isWin,
+  optimizeProgram: () => import_chunk_3OBK4E4Q.optimizeProgram,
+  readPrg: () => import_chunk_3OBK4E4Q.readPrg,
+  readPrgWithOffsets: () => import_chunk_3OBK4E4Q.readPrgWithOffsets,
+  xmlUtil: () => import_chunk_3OBK4E4Q.xml_util_exports
 });
 module.exports = __toCommonJS(sdk_util_exports);
-var import_chunk_7OAMZRC7 = require("./chunk-7OAMZRC7.cjs");
+var import_chunk_3OBK4E4Q = require("./chunk-3OBK4E4Q.cjs");
 var import_chunk_NHZRKHZO = require("./chunk-NHZRKHZO.cjs");
 var import_chunk_JDC43A3I = require("./chunk-JDC43A3I.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_7OAMZRC7.init_sdk_util)();
+(0, import_chunk_3OBK4E4Q.init_sdk_util)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   SectionKinds,

package/build/src/api.d.ts

@@ -19,6 +19,7 @@ export declare function isStateNode(node: {
 export declare function variableDeclarationName(node: mctree.TypedIdentifier | mctree.InstanceofIdentifier): string;
 type DeclKind = "decls" | "type_decls";
 export declare function sameLookupResult(a: LookupDefinition[], b: LookupDefinition[]): boolean;
+export declare function declKey(decl: StateNodeDecl): string | mctree.Identifier | mctree.Program | mctree.VariableDeclarator | mctree.EnumStringMember | mctree.BlockStatement | mctree.ForStatement | mctree.ClassDeclaration | mctree.EnumDeclaration | mctree.FunctionDeclaration | mctree.TypedefDeclaration | mctree.AsIdentifier | undefined;
 export declare function lookupResultContains(a: LookupDefinition[], b: LookupDefinition[]): boolean;
 export declare function isLookupCandidate(node: mctree.MemberExpression): false | mctree.Identifier;
 export declare function lookupNext(state: ProgramStateLive, results: LookupDefinition[], decls: DeclKind, property: mctree.Identifier): LookupDefinition[] | null;

package/build/src/optimizer-types.d.ts

@@ -197,6 +197,7 @@ export type ExcludeAnnotationsMap = {
 };
 export type FilesToOptimizeMap = {
     [key: string]: {
+        name: string;
         output: string;
         barrel: string;
         excludeAnnotations: ExcludeAnnotationsMap;

package/build/src/type-flow/types.d.ts

@@ -211,4 +211,8 @@ export declare function forEachUnionComponent(v: ExactOrUnion, bits: TypeTag, fn
 export declare function getUnionComponent<T extends ExactTypeTags>(v: ExactOrUnion, tag: T): ExactData<T> | null;
 export declare function setUnionComponent<T extends ExactTypeTags>(v: ExactOrUnion, tag: T, c: ExactData<T>): void;
 export declare function getStateNodeDeclsFromType(state: ProgramStateAnalysis, object: ExactOrUnion): StateNode[];
+export declare function getStateNodeDeclsWithExactFromType(state: ProgramStateAnalysis, object: ExactOrUnion): {
+    sn: StateNode;
+    exact: boolean;
+}[];
 export {};

package/build/worker-thread.cjs

@@ -21,17 +21,17 @@ __export(worker_thread_exports, {
   default: () => worker_thread_default
 });
 module.exports = __toCommonJS(worker_thread_exports);
-var import_chunk_7OAMZRC7 = require("./chunk-7OAMZRC7.cjs");
+var import_chunk_3OBK4E4Q = require("./chunk-3OBK4E4Q.cjs");
 var import_chunk_NHZRKHZO = require("./chunk-NHZRKHZO.cjs");
 var import_chunk_JDC43A3I = require("./chunk-JDC43A3I.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
 var import_node_worker_threads = require("node:worker_threads");
 var require_worker_thread = (0, import_chunk_ABYVSU2C.__commonJS)({
   "src/worker-thread.ts"() {
-    (0, import_chunk_7OAMZRC7.init_worker_task)();
+    (0, import_chunk_3OBK4E4Q.init_worker_task)();
     if (import_node_worker_threads.parentPort) {
       import_node_worker_threads.parentPort.on("message", async (task) => {
-        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_7OAMZRC7.performTask)(task));
+        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_3OBK4E4Q.performTask)(task));
       });
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@markw65/monkeyc-optimizer",
   "type": "commonjs",
-  "version": "1.1.74",
+  "version": "1.1.76",
   "description": "Source to source optimizer for Garmin Monkey C code",
   "main": "build/optimizer.cjs",
   "types": "build/src/optimizer.d.ts",