@markw65/monkeyc-optimizer 1.1.94 → 1.1.95

package/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 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)

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_5SB3QASN.checkCompilerVersion,
-  clearDiagnostics: () => import_chunk_5SB3QASN.clearDiagnostics,
-  collectNamespaces: () => import_chunk_5SB3QASN.collectNamespaces,
-  createDocumentationMap: () => import_chunk_5SB3QASN.createDocumentationMap,
-  declKey: () => import_chunk_5SB3QASN.declKey,
-  diagnostic: () => import_chunk_5SB3QASN.diagnostic,
-  diagnosticHelper: () => import_chunk_5SB3QASN.diagnosticHelper,
-  findNamesInScope: () => import_chunk_5SB3QASN.findNamesInScope,
-  findUsingForNode: () => import_chunk_5SB3QASN.findUsingForNode,
-  formatAst: () => import_chunk_5SB3QASN.formatAst,
-  formatAstLongLines: () => import_chunk_5SB3QASN.formatAstLongLines,
-  formatScopedName: () => import_chunk_5SB3QASN.formatScopedName,
-  getApiFunctionInfo: () => import_chunk_5SB3QASN.getApiFunctionInfo,
-  getApiMapping: () => import_chunk_5SB3QASN.getApiMapping,
-  getSuperClasses: () => import_chunk_5SB3QASN.getSuperClasses,
-  handleImportUsing: () => import_chunk_5SB3QASN.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_5SB3QASN.isClassVariable,
-  isLocal: () => import_chunk_5SB3QASN.isLocal,
-  isLookupCandidate: () => import_chunk_5SB3QASN.isLookupCandidate,
-  isStateNode: () => import_chunk_5SB3QASN.isStateNode,
-  lookupByFullName: () => import_chunk_5SB3QASN.lookupByFullName,
-  lookupNext: () => import_chunk_5SB3QASN.lookupNext,
-  lookupResultContains: () => import_chunk_5SB3QASN.lookupResultContains,
-  lookupWithType: () => import_chunk_5SB3QASN.lookupWithType,
-  makeToyboxLink: () => import_chunk_5SB3QASN.makeToyboxLink,
-  mapVarDeclsByType: () => import_chunk_5SB3QASN.mapVarDeclsByType,
-  markInvokeClassMethod: () => import_chunk_5SB3QASN.markInvokeClassMethod,
-  parseSdkVersion: () => import_chunk_5SB3QASN.parseSdkVersion,
-  popRootNode: () => import_chunk_5SB3QASN.popRootNode,
-  pushRootNode: () => import_chunk_5SB3QASN.pushRootNode,
-  resolveDiagnostics: () => import_chunk_5SB3QASN.resolveDiagnostics,
-  resolveDiagnosticsMap: () => import_chunk_5SB3QASN.resolveDiagnosticsMap,
-  sameLookupResult: () => import_chunk_5SB3QASN.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_5SB3QASN.variableDeclarationName,
-  visitReferences: () => import_chunk_5SB3QASN.visitReferences,
-  visit_resources: () => import_chunk_5SB3QASN.visit_resources,
-  visitorNode: () => import_chunk_5SB3QASN.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_5SB3QASN = require("./chunk-5SB3QASN.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_5SB3QASN.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-5SB3QASN.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_5SB3QASN_exports = {};
-__export(chunk_5SB3QASN_exports, {
+var chunk_LUAKJ7GM_exports = {};
+__export(chunk_LUAKJ7GM_exports, {
   EnumTagsConst: () => EnumTagsConst,
   LastTypeTag: () => LastTypeTag,
   ObjectLikeTagsConst: () => ObjectLikeTagsConst,
@@ -140,7 +140,7 @@ __export(chunk_5SB3QASN_exports, {
   visitorNode: () => visitorNode,
   xml_util_exports: () => xml_util_exports
 });
-module.exports = __toCommonJS(chunk_5SB3QASN_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");
@@ -12037,27 +12037,24 @@ function propagateTypes(state, root, graph, optimizeEquivalencies, copyPropStore
   const modifiableDecl = (decls, callees, node) => {
     if (!callees) {
       const lv = node.type === "AssignmentExpression" ? node.left : node.type === "UpdateExpression" ? node.argument : null;
-      if (!lv) return true;
-      if (lv.type === "MemberExpression") {
-        if (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;
-          }
+      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) && (0, import_chunk_IJS7AYMN.some)(callees, (callee) => functionMayModify(state, callee, decl))
+      (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) => {
@@ -18750,17 +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;
     }
@@ -19016,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",
@@ -25882,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;
@@ -27445,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 && 1769823563413 < opt_time) {
+      if (source_time < opt_time && 1769898389896 < opt_time) {
         return {
           hasTests,
           diagnostics: prevDiagnostics,
@@ -27483,7 +27475,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
             hasTests: hasTests2,
             diagnostics,
             sdkVersion,
-            optimizerVersion: "1.1.94",
+            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_5SB3QASN.StateNodeAttributes,
-  buildConfigDescription: () => import_chunk_5SB3QASN.buildConfigDescription,
-  buildOptimizedProject: () => import_chunk_5SB3QASN.buildOptimizedProject,
+  StateNodeAttributes: () => import_chunk_LUAKJ7GM.StateNodeAttributes,
+  buildConfigDescription: () => import_chunk_LUAKJ7GM.buildConfigDescription,
+  buildOptimizedProject: () => import_chunk_LUAKJ7GM.buildOptimizedProject,
   copyRecursiveAsNeeded: () => import_chunk_IJS7AYMN.copyRecursiveAsNeeded,
-  defaultConfig: () => import_chunk_5SB3QASN.defaultConfig,
-  display: () => import_chunk_5SB3QASN.display,
-  generateOneConfig: () => import_chunk_5SB3QASN.generateOneConfig,
-  generateOptimizedProject: () => import_chunk_5SB3QASN.generateOptimizedProject,
-  getConfig: () => import_chunk_5SB3QASN.getConfig,
-  getFnMapAnalysis: () => import_chunk_5SB3QASN.getFnMapAnalysis,
-  getProjectAnalysis: () => import_chunk_5SB3QASN.getProjectAnalysis,
-  get_jungle: () => import_chunk_5SB3QASN.get_jungle,
-  isErrorWithLocation: () => import_chunk_5SB3QASN.isErrorWithLocation,
-  launchSimulator: () => import_chunk_5SB3QASN.launchSimulator,
-  manifestProducts: () => import_chunk_5SB3QASN.manifestProducts,
-  mctree: () => import_chunk_5SB3QASN.mctree,
-  simulateProgram: () => import_chunk_5SB3QASN.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_5SB3QASN = require("./chunk-5SB3QASN.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_5SB3QASN.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_5SB3QASN.SectionKinds,
-  appSupport: () => import_chunk_5SB3QASN.appSupport,
-  connectiq: () => import_chunk_5SB3QASN.connectiq,
-  getDeviceInfo: () => import_chunk_5SB3QASN.getDeviceInfo,
-  getFunctionDocumentation: () => import_chunk_5SB3QASN.getFunctionDocumentation,
-  getLanguages: () => import_chunk_5SB3QASN.getLanguages,
-  getSdkPath: () => import_chunk_5SB3QASN.getSdkPath,
-  isWin: () => import_chunk_5SB3QASN.isWin,
-  optimizeProgram: () => import_chunk_5SB3QASN.optimizeProgram,
-  readPrg: () => import_chunk_5SB3QASN.readPrg,
-  readPrgWithOffsets: () => import_chunk_5SB3QASN.readPrgWithOffsets,
-  xmlUtil: () => import_chunk_5SB3QASN.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_5SB3QASN = require("./chunk-5SB3QASN.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_5SB3QASN.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/worker-thread.cjs

@@ -21,17 +21,17 @@ __export(worker_thread_exports, {
   default: () => worker_thread_default
 });
 module.exports = __toCommonJS(worker_thread_exports);
-var import_chunk_5SB3QASN = require("./chunk-5SB3QASN.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_5SB3QASN.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_5SB3QASN.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.94",
+  "version": "1.1.95",
   "description": "Source to source optimizer for Garmin Monkey C code",
   "main": "build/optimizer.cjs",
   "types": "build/src/optimizer.d.ts",