@markw65/monkeyc-optimizer 1.1.93 → 1.1.95

package/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 All notable changes to the "monkeyc-optimizer" package will be documented in this file.
 
+### 1.1.95
+
+- Fix a regression introduced in `1.1.94`
+- Fix lookup of calls in data flow to ignore locals
+- Revert a fix I put in to match [a Garmin bug](https://forums.garmin.com/developer/connect-iq/i/bug-reports/relative-paths-in-local-variables-in-jungle-files-are-resolved-incorrectly) since that bug was fixed in `Sdk-8.0.0`.
+
+### 1.1.94
+
+- Update to [@markw65/prettier-plugin-monkeyc@1.0.65](https://github.com/markw65/prettier-plugin-monkeyc/blob/main/CHANGELOG.md#1065)
+  - Fix an issue that prevented a blank line after a catch block being preserved
+  - Replace a horribly inefficient regex with a loop to avoid stack overflows when `@markw65/monkeyc-optimizer` tries to write large files.
+
+- Compute and use FunctionInfo during analysis pass
+- Better interference analysis for computed MemberDeclarations
+
 ### 1.1.93
 
 - Update to [@markw65/prettier-plugin-monkeyc@1.0.64](https://github.com/markw65/prettier-plugin-monkeyc/blob/main/CHANGELOG.md#1064)

package/build/api.cjs

@@ -18,52 +18,52 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var api_exports = {};
 __export(api_exports, {
-  checkCompilerVersion: () => import_chunk_BPXB3WQQ.checkCompilerVersion,
-  clearDiagnostics: () => import_chunk_BPXB3WQQ.clearDiagnostics,
-  collectNamespaces: () => import_chunk_BPXB3WQQ.collectNamespaces,
-  createDocumentationMap: () => import_chunk_BPXB3WQQ.createDocumentationMap,
-  declKey: () => import_chunk_BPXB3WQQ.declKey,
-  diagnostic: () => import_chunk_BPXB3WQQ.diagnostic,
-  diagnosticHelper: () => import_chunk_BPXB3WQQ.diagnosticHelper,
-  findNamesInScope: () => import_chunk_BPXB3WQQ.findNamesInScope,
-  findUsingForNode: () => import_chunk_BPXB3WQQ.findUsingForNode,
-  formatAst: () => import_chunk_BPXB3WQQ.formatAst,
-  formatAstLongLines: () => import_chunk_BPXB3WQQ.formatAstLongLines,
-  formatScopedName: () => import_chunk_BPXB3WQQ.formatScopedName,
-  getApiFunctionInfo: () => import_chunk_BPXB3WQQ.getApiFunctionInfo,
-  getApiMapping: () => import_chunk_BPXB3WQQ.getApiMapping,
-  getSuperClasses: () => import_chunk_BPXB3WQQ.getSuperClasses,
-  handleImportUsing: () => import_chunk_BPXB3WQQ.handleImportUsing,
+  checkCompilerVersion: () => import_chunk_LUAKJ7GM.checkCompilerVersion,
+  clearDiagnostics: () => import_chunk_LUAKJ7GM.clearDiagnostics,
+  collectNamespaces: () => import_chunk_LUAKJ7GM.collectNamespaces,
+  createDocumentationMap: () => import_chunk_LUAKJ7GM.createDocumentationMap,
+  declKey: () => import_chunk_LUAKJ7GM.declKey,
+  diagnostic: () => import_chunk_LUAKJ7GM.diagnostic,
+  diagnosticHelper: () => import_chunk_LUAKJ7GM.diagnosticHelper,
+  findNamesInScope: () => import_chunk_LUAKJ7GM.findNamesInScope,
+  findUsingForNode: () => import_chunk_LUAKJ7GM.findUsingForNode,
+  formatAst: () => import_chunk_LUAKJ7GM.formatAst,
+  formatAstLongLines: () => import_chunk_LUAKJ7GM.formatAstLongLines,
+  formatScopedName: () => import_chunk_LUAKJ7GM.formatScopedName,
+  getApiFunctionInfo: () => import_chunk_LUAKJ7GM.getApiFunctionInfo,
+  getApiMapping: () => import_chunk_LUAKJ7GM.getApiMapping,
+  getSuperClasses: () => import_chunk_LUAKJ7GM.getSuperClasses,
+  handleImportUsing: () => import_chunk_LUAKJ7GM.handleImportUsing,
   hasProperty: () => import_chunk_UBAYZSM3.hasProperty,
-  isClassVariable: () => import_chunk_BPXB3WQQ.isClassVariable,
-  isLocal: () => import_chunk_BPXB3WQQ.isLocal,
-  isLookupCandidate: () => import_chunk_BPXB3WQQ.isLookupCandidate,
-  isStateNode: () => import_chunk_BPXB3WQQ.isStateNode,
-  lookupByFullName: () => import_chunk_BPXB3WQQ.lookupByFullName,
-  lookupNext: () => import_chunk_BPXB3WQQ.lookupNext,
-  lookupResultContains: () => import_chunk_BPXB3WQQ.lookupResultContains,
-  lookupWithType: () => import_chunk_BPXB3WQQ.lookupWithType,
-  makeToyboxLink: () => import_chunk_BPXB3WQQ.makeToyboxLink,
-  mapVarDeclsByType: () => import_chunk_BPXB3WQQ.mapVarDeclsByType,
-  markInvokeClassMethod: () => import_chunk_BPXB3WQQ.markInvokeClassMethod,
-  parseSdkVersion: () => import_chunk_BPXB3WQQ.parseSdkVersion,
-  popRootNode: () => import_chunk_BPXB3WQQ.popRootNode,
-  pushRootNode: () => import_chunk_BPXB3WQQ.pushRootNode,
-  resolveDiagnostics: () => import_chunk_BPXB3WQQ.resolveDiagnostics,
-  resolveDiagnosticsMap: () => import_chunk_BPXB3WQQ.resolveDiagnosticsMap,
-  sameLookupResult: () => import_chunk_BPXB3WQQ.sameLookupResult,
+  isClassVariable: () => import_chunk_LUAKJ7GM.isClassVariable,
+  isLocal: () => import_chunk_LUAKJ7GM.isLocal,
+  isLookupCandidate: () => import_chunk_LUAKJ7GM.isLookupCandidate,
+  isStateNode: () => import_chunk_LUAKJ7GM.isStateNode,
+  lookupByFullName: () => import_chunk_LUAKJ7GM.lookupByFullName,
+  lookupNext: () => import_chunk_LUAKJ7GM.lookupNext,
+  lookupResultContains: () => import_chunk_LUAKJ7GM.lookupResultContains,
+  lookupWithType: () => import_chunk_LUAKJ7GM.lookupWithType,
+  makeToyboxLink: () => import_chunk_LUAKJ7GM.makeToyboxLink,
+  mapVarDeclsByType: () => import_chunk_LUAKJ7GM.mapVarDeclsByType,
+  markInvokeClassMethod: () => import_chunk_LUAKJ7GM.markInvokeClassMethod,
+  parseSdkVersion: () => import_chunk_LUAKJ7GM.parseSdkVersion,
+  popRootNode: () => import_chunk_LUAKJ7GM.popRootNode,
+  pushRootNode: () => import_chunk_LUAKJ7GM.pushRootNode,
+  resolveDiagnostics: () => import_chunk_LUAKJ7GM.resolveDiagnostics,
+  resolveDiagnosticsMap: () => import_chunk_LUAKJ7GM.resolveDiagnosticsMap,
+  sameLookupResult: () => import_chunk_LUAKJ7GM.sameLookupResult,
   traverseAst: () => import_chunk_UBAYZSM3.traverseAst,
-  variableDeclarationName: () => import_chunk_BPXB3WQQ.variableDeclarationName,
-  visitReferences: () => import_chunk_BPXB3WQQ.visitReferences,
-  visit_resources: () => import_chunk_BPXB3WQQ.visit_resources,
-  visitorNode: () => import_chunk_BPXB3WQQ.visitorNode
+  variableDeclarationName: () => import_chunk_LUAKJ7GM.variableDeclarationName,
+  visitReferences: () => import_chunk_LUAKJ7GM.visitReferences,
+  visit_resources: () => import_chunk_LUAKJ7GM.visit_resources,
+  visitorNode: () => import_chunk_LUAKJ7GM.visitorNode
 });
 module.exports = __toCommonJS(api_exports);
-var import_chunk_BPXB3WQQ = require("./chunk-BPXB3WQQ.cjs");
+var import_chunk_LUAKJ7GM = require("./chunk-LUAKJ7GM.cjs");
 var import_chunk_IJS7AYMN = require("./chunk-IJS7AYMN.cjs");
 var import_chunk_UBAYZSM3 = require("./chunk-UBAYZSM3.cjs");
 var import_chunk_VS2QQHAK = require("./chunk-VS2QQHAK.cjs");
-(0, import_chunk_BPXB3WQQ.init_api)();
+(0, import_chunk_LUAKJ7GM.init_api)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   checkCompilerVersion,

package/build/{chunk-BPXB3WQQ.cjs → chunk-LUAKJ7GM.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_BPXB3WQQ_exports = {};
-__export(chunk_BPXB3WQQ_exports, {
+var chunk_LUAKJ7GM_exports = {};
+__export(chunk_LUAKJ7GM_exports, {
   EnumTagsConst: () => EnumTagsConst,
   LastTypeTag: () => LastTypeTag,
   ObjectLikeTagsConst: () => ObjectLikeTagsConst,
@@ -140,7 +140,7 @@ __export(chunk_BPXB3WQQ_exports, {
   visitorNode: () => visitorNode,
   xml_util_exports: () => xml_util_exports
 });
-module.exports = __toCommonJS(chunk_BPXB3WQQ_exports);
+module.exports = __toCommonJS(chunk_LUAKJ7GM_exports);
 var import_chunk_IJS7AYMN = require("./chunk-IJS7AYMN.cjs");
 var import_chunk_UBAYZSM3 = require("./chunk-UBAYZSM3.cjs");
 var import_chunk_VS2QQHAK = require("./chunk-VS2QQHAK.cjs");
@@ -3506,7 +3506,7 @@ function recordCalledFunc(func, callee) {
   return null;
 }
 function recordCalledFuncs(func, callees) {
-  callees.forEach((callee) => {
+  (0, import_chunk_IJS7AYMN.forEach)(callees, (callee) => {
     recordCalledFunc(func, callee);
   });
 }
@@ -3594,6 +3594,7 @@ var init_function_info = (0, import_chunk_VS2QQHAK.__esm)({
   "src/function-info.ts"() {
     "use strict";
     (0, import_chunk_UBAYZSM3.init_ast)();
+    (0, import_chunk_IJS7AYMN.init_util)();
   }
 });
 var buildConfigDescription;
@@ -11653,6 +11654,10 @@ function updateAffected(blockState, objectType, baseDecl, assignedPath, affected
 function propagateTypes(state, root, graph, optimizeEquivalencies, copyPropStores, logThisRun) {
   const order = getPostOrder(graph).reverse();
   const queue = new DataflowQueue();
+  const rootFunc = root.type === "FunctionDeclaration" ? root : null;
+  if (rootFunc) {
+    delete rootFunc.next_info;
+  }
   const isStatic = !!(root.attributes & 8);
   const klass = root.stack?.[root.stack?.length - 1].sn;
   const selfClassDecl = klass && klass.type === "ClassDeclaration" ? klass : null;
@@ -12029,10 +12034,29 @@ function propagateTypes(state, root, graph, optimizeEquivalencies, copyPropStore
     root,
     dependencies
   };
-  const modifiableDecl = (decls, callees) => (0, import_chunk_IJS7AYMN.some)(
-    decls,
-    (decl) => decl.type === "VariableDeclarator" && decl.node.kind === "var" && !isLocal(decl) && (!callees || (0, import_chunk_IJS7AYMN.some)(callees, (callee) => functionMayModify(state, callee, decl)))
-  );
+  const modifiableDecl = (decls, callees, node) => {
+    if (!callees) {
+      const lv = node.type === "AssignmentExpression" ? node.left : node.type === "UpdateExpression" ? node.argument : null;
+      if (lv?.type === "MemberExpression" && lv.computed) {
+        if (lv.property.type === "Literal") {
+          return false;
+        }
+        if ((lv.property.type !== "UnaryExpression" || lv.property.operator !== ":") && !couldBe(
+          {
+            type: 131072
+            /* Symbol */
+          },
+          evaluate(istate, lv.property).value
+        )) {
+          return false;
+        }
+      }
+    }
+    return (0, import_chunk_IJS7AYMN.some)(
+      decls,
+      (decl) => decl.type === "VariableDeclarator" && decl.node.kind === "var" && !isLocal(decl) && (!callees || (0, import_chunk_IJS7AYMN.some)(callees, (callee) => functionMayModify(state, callee, decl)))
+    );
+  };
   const mergeSuccState = (top, curState) => {
     top.succs?.forEach((succ) => {
       if (succ.order == null) {
@@ -12457,6 +12481,13 @@ function propagateTypes(state, root, graph, optimizeEquivalencies, copyPropStore
           (0, import_chunk_IJS7AYMN.log)(describeEvent(event).then((eventStr) => `  ${eventStr}`));
         }
         modInterference(curState, event, true, (callees, calleeObj) => {
+          if (rootFunc) {
+            if (callees) {
+              recordCalledFuncs(rootFunc, callees);
+            } else {
+              recordModifiedUnknown(rootFunc);
+            }
+          }
           clearRelatedCopyPropEvents(curState, null, nodeCopyProp);
           if (calleeObj) {
             const objType = getStateType(curState, calleeObj);
@@ -12485,7 +12516,7 @@ function propagateTypes(state, root, graph, optimizeEquivalencies, copyPropStore
             if ((type.value == null || !(type.type & (32768 | 512 | 1024))) && !(0, import_chunk_IJS7AYMN.some)(decl, (d) => d.type === "VariableDeclarator" && !isLocal(d))) {
               return;
             }
-            if (modifiableDecl(decl, callees)) {
+            if (modifiableDecl(decl, callees, event.node)) {
               if (tsv.equivSet) {
                 removeEquiv(curState.map, decl);
               }
@@ -12519,6 +12550,26 @@ function propagateTypes(state, root, graph, optimizeEquivalencies, copyPropStore
         break;
       }
       case "def": {
+        if (rootFunc) {
+          (0, import_chunk_IJS7AYMN.forEach)(event.decl, (decl) => {
+            if (decl.type === "VariableDeclarator") {
+              if (decl.node.kind !== "var") return;
+              if (isLocal(decl)) return;
+              recordModifiedDecl(rootFunc, decl);
+              return;
+            }
+            if (decl.type === "MemberDecl") {
+              const name = isLookupCandidate(decl.node);
+              if (name) {
+                recordModifiedName(rootFunc, name.name);
+                return;
+              }
+            } else if (decl.type !== "Unknown") {
+              return;
+            }
+            recordModifiedUnknown(rootFunc);
+          });
+        }
         const lval = event.node.type === "UpdateExpression" ? event.node.argument : event.node.type === "AssignmentExpression" ? event.node.left : null;
         if (lval) {
           if (nodeCopyProp.size && lval.type === "MemberExpression") {
@@ -13089,6 +13140,9 @@ function propagateTypes(state, root, graph, optimizeEquivalencies, copyPropStore
       }
     );
   }
+  if (rootFunc) {
+    rootFunc.info = rootFunc.next_info ?? false;
+  }
   return {
     istate,
     nodeEquivs,
@@ -18693,16 +18747,18 @@ function buildDataFlowGraph(state, root, wantsLiteral, trackInsertionPoints, wan
     }
     return canon;
   };
-  const findDecl = (node) => {
+  const findDecl = (node, nonLocal = false) => {
     const path8 = [];
+    const root2 = node;
     while (node.type === "MemberExpression" && (wantsAllRefs || !node.computed)) {
       path8.unshift(node);
       node = node.object;
+      nonLocal = false;
     }
     if (node.type !== "Identifier" && node.type !== "ThisExpression") {
       return null;
     }
-    let [, results] = state.lookup(node);
+    let [, results] = nonLocal ? state.lookupNonlocal(node) : state.lookup(node);
     if (!results) {
       return wantsAllRefs ? { type: "Unknown", node: path8.pop() } : null;
     }
@@ -18724,7 +18780,7 @@ function buildDataFlowGraph(state, root, wantsLiteral, trackInsertionPoints, wan
       )) {
         return {
           type: "MemberDecl",
-          node,
+          node: root2,
           base: decl,
           path: path8
         };
@@ -18958,7 +19014,7 @@ function buildDataFlowGraph(state, root, wantsLiteral, trackInsertionPoints, wan
           case "CallExpression": {
             liveDef(null, stmt);
             if (wantsAllRefs) {
-              const calleeDecl = findDecl(node.callee);
+              const calleeDecl = findDecl(node.callee, true);
               if (calleeDecl) {
                 const mod = {
                   type: "mod",
@@ -25824,13 +25880,7 @@ 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.map((v) => {
-          if ("source" in v) {
-            v = { ...v };
-            delete v.source;
-          }
-          return v;
-        });
+        locals[a.names[0]] = a.values;
         return false;
       }
       return true;
@@ -27387,7 +27437,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
       const opt_time = await (0, import_chunk_IJS7AYMN.first_modified)(
         Object.values(fnMap).map((v) => v.output)
       );
-      if (source_time < opt_time && 1769531191295 < opt_time) {
+      if (source_time < opt_time && 1769898389896 < opt_time) {
         return {
           hasTests,
           diagnostics: prevDiagnostics,
@@ -27425,7 +27475,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
             hasTests: hasTests2,
             diagnostics,
             sdkVersion,
-            optimizerVersion: "1.1.93",
+            optimizerVersion: "1.1.95",
             ...Object.fromEntries(
               configOptionsToCheck.map((option) => [option, config[option]])
             )

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_BPXB3WQQ.StateNodeAttributes,
-  buildConfigDescription: () => import_chunk_BPXB3WQQ.buildConfigDescription,
-  buildOptimizedProject: () => import_chunk_BPXB3WQQ.buildOptimizedProject,
+  StateNodeAttributes: () => import_chunk_LUAKJ7GM.StateNodeAttributes,
+  buildConfigDescription: () => import_chunk_LUAKJ7GM.buildConfigDescription,
+  buildOptimizedProject: () => import_chunk_LUAKJ7GM.buildOptimizedProject,
   copyRecursiveAsNeeded: () => import_chunk_IJS7AYMN.copyRecursiveAsNeeded,
-  defaultConfig: () => import_chunk_BPXB3WQQ.defaultConfig,
-  display: () => import_chunk_BPXB3WQQ.display,
-  generateOneConfig: () => import_chunk_BPXB3WQQ.generateOneConfig,
-  generateOptimizedProject: () => import_chunk_BPXB3WQQ.generateOptimizedProject,
-  getConfig: () => import_chunk_BPXB3WQQ.getConfig,
-  getFnMapAnalysis: () => import_chunk_BPXB3WQQ.getFnMapAnalysis,
-  getProjectAnalysis: () => import_chunk_BPXB3WQQ.getProjectAnalysis,
-  get_jungle: () => import_chunk_BPXB3WQQ.get_jungle,
-  isErrorWithLocation: () => import_chunk_BPXB3WQQ.isErrorWithLocation,
-  launchSimulator: () => import_chunk_BPXB3WQQ.launchSimulator,
-  manifestProducts: () => import_chunk_BPXB3WQQ.manifestProducts,
-  mctree: () => import_chunk_BPXB3WQQ.mctree,
-  simulateProgram: () => import_chunk_BPXB3WQQ.simulateProgram
+  defaultConfig: () => import_chunk_LUAKJ7GM.defaultConfig,
+  display: () => import_chunk_LUAKJ7GM.display,
+  generateOneConfig: () => import_chunk_LUAKJ7GM.generateOneConfig,
+  generateOptimizedProject: () => import_chunk_LUAKJ7GM.generateOptimizedProject,
+  getConfig: () => import_chunk_LUAKJ7GM.getConfig,
+  getFnMapAnalysis: () => import_chunk_LUAKJ7GM.getFnMapAnalysis,
+  getProjectAnalysis: () => import_chunk_LUAKJ7GM.getProjectAnalysis,
+  get_jungle: () => import_chunk_LUAKJ7GM.get_jungle,
+  isErrorWithLocation: () => import_chunk_LUAKJ7GM.isErrorWithLocation,
+  launchSimulator: () => import_chunk_LUAKJ7GM.launchSimulator,
+  manifestProducts: () => import_chunk_LUAKJ7GM.manifestProducts,
+  mctree: () => import_chunk_LUAKJ7GM.mctree,
+  simulateProgram: () => import_chunk_LUAKJ7GM.simulateProgram
 });
 module.exports = __toCommonJS(optimizer_exports);
-var import_chunk_BPXB3WQQ = require("./chunk-BPXB3WQQ.cjs");
+var import_chunk_LUAKJ7GM = require("./chunk-LUAKJ7GM.cjs");
 var import_chunk_IJS7AYMN = require("./chunk-IJS7AYMN.cjs");
 var import_chunk_UBAYZSM3 = require("./chunk-UBAYZSM3.cjs");
 var import_chunk_VS2QQHAK = require("./chunk-VS2QQHAK.cjs");
-(0, import_chunk_BPXB3WQQ.init_optimizer)();
+(0, import_chunk_LUAKJ7GM.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_BPXB3WQQ.SectionKinds,
-  appSupport: () => import_chunk_BPXB3WQQ.appSupport,
-  connectiq: () => import_chunk_BPXB3WQQ.connectiq,
-  getDeviceInfo: () => import_chunk_BPXB3WQQ.getDeviceInfo,
-  getFunctionDocumentation: () => import_chunk_BPXB3WQQ.getFunctionDocumentation,
-  getLanguages: () => import_chunk_BPXB3WQQ.getLanguages,
-  getSdkPath: () => import_chunk_BPXB3WQQ.getSdkPath,
-  isWin: () => import_chunk_BPXB3WQQ.isWin,
-  optimizeProgram: () => import_chunk_BPXB3WQQ.optimizeProgram,
-  readPrg: () => import_chunk_BPXB3WQQ.readPrg,
-  readPrgWithOffsets: () => import_chunk_BPXB3WQQ.readPrgWithOffsets,
-  xmlUtil: () => import_chunk_BPXB3WQQ.xml_util_exports
+  SectionKinds: () => import_chunk_LUAKJ7GM.SectionKinds,
+  appSupport: () => import_chunk_LUAKJ7GM.appSupport,
+  connectiq: () => import_chunk_LUAKJ7GM.connectiq,
+  getDeviceInfo: () => import_chunk_LUAKJ7GM.getDeviceInfo,
+  getFunctionDocumentation: () => import_chunk_LUAKJ7GM.getFunctionDocumentation,
+  getLanguages: () => import_chunk_LUAKJ7GM.getLanguages,
+  getSdkPath: () => import_chunk_LUAKJ7GM.getSdkPath,
+  isWin: () => import_chunk_LUAKJ7GM.isWin,
+  optimizeProgram: () => import_chunk_LUAKJ7GM.optimizeProgram,
+  readPrg: () => import_chunk_LUAKJ7GM.readPrg,
+  readPrgWithOffsets: () => import_chunk_LUAKJ7GM.readPrgWithOffsets,
+  xmlUtil: () => import_chunk_LUAKJ7GM.xml_util_exports
 });
 module.exports = __toCommonJS(sdk_util_exports);
-var import_chunk_BPXB3WQQ = require("./chunk-BPXB3WQQ.cjs");
+var import_chunk_LUAKJ7GM = require("./chunk-LUAKJ7GM.cjs");
 var import_chunk_IJS7AYMN = require("./chunk-IJS7AYMN.cjs");
 var import_chunk_UBAYZSM3 = require("./chunk-UBAYZSM3.cjs");
 var import_chunk_VS2QQHAK = require("./chunk-VS2QQHAK.cjs");
-(0, import_chunk_BPXB3WQQ.init_sdk_util)();
+(0, import_chunk_LUAKJ7GM.init_sdk_util)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   SectionKinds,

package/build/src/function-info.d.ts

@@ -7,7 +7,7 @@ export declare function recordModifiedDecls(func: FunctionStateNode, lookupDefs:
 export declare function recordModifiedName(func: FunctionStateNode, name: string): void;
 export declare function recordModifiedUnknown(func: FunctionStateNode): void;
 export declare function recordCalledFunc(func: FunctionStateNode, callee: FunctionStateNode): null;
-export declare function recordCalledFuncs(func: FunctionStateNode, callees: FunctionStateNode[]): void;
+export declare function recordCalledFuncs(func: FunctionStateNode, callees: FunctionStateNode | FunctionStateNode[]): void;
 export declare function functionMayModify(state: ProgramStateAnalysis, func: FunctionStateNode, decl: VariableStateNode): boolean;
 export declare function findCallees(lookupDefs: LookupDefinition[]): FunctionStateNode[] | null;
 export declare function findCalleesForNew(lookupDefs: LookupDefinition[]): FunctionStateNode[];

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_BPXB3WQQ = require("./chunk-BPXB3WQQ.cjs");
+var import_chunk_LUAKJ7GM = require("./chunk-LUAKJ7GM.cjs");
 var import_chunk_IJS7AYMN = require("./chunk-IJS7AYMN.cjs");
 var import_chunk_UBAYZSM3 = require("./chunk-UBAYZSM3.cjs");
 var import_chunk_VS2QQHAK = require("./chunk-VS2QQHAK.cjs");
 var import_node_worker_threads = require("node:worker_threads");
 var require_worker_thread = (0, import_chunk_VS2QQHAK.__commonJS)({
   "src/worker-thread.ts"() {
-    (0, import_chunk_BPXB3WQQ.init_worker_task)();
+    (0, import_chunk_LUAKJ7GM.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_BPXB3WQQ.performTask)(task));
+        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_LUAKJ7GM.performTask)(task));
       });
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@markw65/monkeyc-optimizer",
   "type": "commonjs",
-  "version": "1.1.93",
+  "version": "1.1.95",
   "description": "Source to source optimizer for Garmin Monkey C code",
   "main": "build/optimizer.cjs",
   "types": "build/src/optimizer.d.ts",
@@ -56,7 +56,7 @@
   "author": "markw65",
   "license": "MIT",
   "dependencies": {
-    "@markw65/prettier-plugin-monkeyc": "^1.0.64",
+    "@markw65/prettier-plugin-monkeyc": "^1.0.65",
     "7z-wasm": "^1.2.0"
   },
   "devDependencies": {