@markw65/monkeyc-optimizer 1.1.54 → 1.1.56

package/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 All notable changes to the "monkeyc-optimizer" package will be documented in this file.
 
+### 1.1.56
+
+- Fix regression caused by the fix to #24 (Fixes #26)
+- Fix bug in the post build optimizer for system 7 devices, caused by not handling the new argcincsp bytecode
+
+### 1.1.55
+
+- Allow class typedef lookups from static methods
+- Fix method lookups on enum values
+
 ### 1.1.54
 
 - Fix return types of Dictionary.values() and Dictionary.keys()

package/build/api.cjs

@@ -18,47 +18,47 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var api_exports = {};
 __export(api_exports, {
-  checkCompilerVersion: () => import_chunk_5K64MLXC.checkCompilerVersion,
-  collectNamespaces: () => import_chunk_5K64MLXC.collectNamespaces,
-  createDocumentationMap: () => import_chunk_5K64MLXC.createDocumentationMap,
-  diagnostic: () => import_chunk_5K64MLXC.diagnostic,
-  diagnosticHelper: () => import_chunk_5K64MLXC.diagnosticHelper,
-  findNamesInScope: () => import_chunk_5K64MLXC.findNamesInScope,
-  findUsingForNode: () => import_chunk_5K64MLXC.findUsingForNode,
-  formatAst: () => import_chunk_5K64MLXC.formatAst,
-  formatAstLongLines: () => import_chunk_5K64MLXC.formatAstLongLines,
-  formatScopedName: () => import_chunk_5K64MLXC.formatScopedName,
-  getApiFunctionInfo: () => import_chunk_5K64MLXC.getApiFunctionInfo,
-  getApiMapping: () => import_chunk_5K64MLXC.getApiMapping,
-  getSuperClasses: () => import_chunk_5K64MLXC.getSuperClasses,
+  checkCompilerVersion: () => import_chunk_M3LMSSY7.checkCompilerVersion,
+  collectNamespaces: () => import_chunk_M3LMSSY7.collectNamespaces,
+  createDocumentationMap: () => import_chunk_M3LMSSY7.createDocumentationMap,
+  diagnostic: () => import_chunk_M3LMSSY7.diagnostic,
+  diagnosticHelper: () => import_chunk_M3LMSSY7.diagnosticHelper,
+  findNamesInScope: () => import_chunk_M3LMSSY7.findNamesInScope,
+  findUsingForNode: () => import_chunk_M3LMSSY7.findUsingForNode,
+  formatAst: () => import_chunk_M3LMSSY7.formatAst,
+  formatAstLongLines: () => import_chunk_M3LMSSY7.formatAstLongLines,
+  formatScopedName: () => import_chunk_M3LMSSY7.formatScopedName,
+  getApiFunctionInfo: () => import_chunk_M3LMSSY7.getApiFunctionInfo,
+  getApiMapping: () => import_chunk_M3LMSSY7.getApiMapping,
+  getSuperClasses: () => import_chunk_M3LMSSY7.getSuperClasses,
   hasProperty: () => import_chunk_MBTLUWXR.hasProperty,
-  isClassVariable: () => import_chunk_5K64MLXC.isClassVariable,
-  isLocal: () => import_chunk_5K64MLXC.isLocal,
-  isLookupCandidate: () => import_chunk_5K64MLXC.isLookupCandidate,
-  isStateNode: () => import_chunk_5K64MLXC.isStateNode,
-  lookupByFullName: () => import_chunk_5K64MLXC.lookupByFullName,
-  lookupNext: () => import_chunk_5K64MLXC.lookupNext,
-  lookupResultContains: () => import_chunk_5K64MLXC.lookupResultContains,
-  lookupWithType: () => import_chunk_5K64MLXC.lookupWithType,
-  makeToyboxLink: () => import_chunk_5K64MLXC.makeToyboxLink,
-  mapVarDeclsByType: () => import_chunk_5K64MLXC.mapVarDeclsByType,
-  markInvokeClassMethod: () => import_chunk_5K64MLXC.markInvokeClassMethod,
-  parseSdkVersion: () => import_chunk_5K64MLXC.parseSdkVersion,
-  resolveDiagnostics: () => import_chunk_5K64MLXC.resolveDiagnostics,
-  resolveDiagnosticsMap: () => import_chunk_5K64MLXC.resolveDiagnosticsMap,
-  sameLookupResult: () => import_chunk_5K64MLXC.sameLookupResult,
+  isClassVariable: () => import_chunk_M3LMSSY7.isClassVariable,
+  isLocal: () => import_chunk_M3LMSSY7.isLocal,
+  isLookupCandidate: () => import_chunk_M3LMSSY7.isLookupCandidate,
+  isStateNode: () => import_chunk_M3LMSSY7.isStateNode,
+  lookupByFullName: () => import_chunk_M3LMSSY7.lookupByFullName,
+  lookupNext: () => import_chunk_M3LMSSY7.lookupNext,
+  lookupResultContains: () => import_chunk_M3LMSSY7.lookupResultContains,
+  lookupWithType: () => import_chunk_M3LMSSY7.lookupWithType,
+  makeToyboxLink: () => import_chunk_M3LMSSY7.makeToyboxLink,
+  mapVarDeclsByType: () => import_chunk_M3LMSSY7.mapVarDeclsByType,
+  markInvokeClassMethod: () => import_chunk_M3LMSSY7.markInvokeClassMethod,
+  parseSdkVersion: () => import_chunk_M3LMSSY7.parseSdkVersion,
+  resolveDiagnostics: () => import_chunk_M3LMSSY7.resolveDiagnostics,
+  resolveDiagnosticsMap: () => import_chunk_M3LMSSY7.resolveDiagnosticsMap,
+  sameLookupResult: () => import_chunk_M3LMSSY7.sameLookupResult,
   traverseAst: () => import_chunk_MBTLUWXR.traverseAst,
-  variableDeclarationName: () => import_chunk_5K64MLXC.variableDeclarationName,
-  visitReferences: () => import_chunk_5K64MLXC.visitReferences,
-  visit_resources: () => import_chunk_5K64MLXC.visit_resources,
-  visitorNode: () => import_chunk_5K64MLXC.visitorNode
+  variableDeclarationName: () => import_chunk_M3LMSSY7.variableDeclarationName,
+  visitReferences: () => import_chunk_M3LMSSY7.visitReferences,
+  visit_resources: () => import_chunk_M3LMSSY7.visit_resources,
+  visitorNode: () => import_chunk_M3LMSSY7.visitorNode
 });
 module.exports = __toCommonJS(api_exports);
-var import_chunk_5K64MLXC = require("./chunk-5K64MLXC.cjs");
+var import_chunk_M3LMSSY7 = require("./chunk-M3LMSSY7.cjs");
 var import_chunk_SG7ODKRM = require("./chunk-SG7ODKRM.cjs");
 var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_5K64MLXC.init_api)();
+(0, import_chunk_M3LMSSY7.init_api)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   checkCompilerVersion,

package/build/{chunk-5K64MLXC.cjs → chunk-M3LMSSY7.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_5K64MLXC_exports = {};
-__export(chunk_5K64MLXC_exports, {
+var chunk_M3LMSSY7_exports = {};
+__export(chunk_M3LMSSY7_exports, {
   EnumTagsConst: () => EnumTagsConst,
   LastTypeTag: () => LastTypeTag,
   ObjectLikeTagsConst: () => ObjectLikeTagsConst,
@@ -133,7 +133,7 @@ __export(chunk_5K64MLXC_exports, {
   visitorNode: () => visitorNode,
   xml_util_exports: () => xml_util_exports
 });
-module.exports = __toCommonJS(chunk_5K64MLXC_exports);
+module.exports = __toCommonJS(chunk_M3LMSSY7_exports);
 var import_chunk_SG7ODKRM = require("./chunk-SG7ODKRM.cjs");
 var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
@@ -18247,13 +18247,53 @@ function isLookupCandidate(node) {
 }
 function lookupNext(state, results, decls, property) {
   return results.reduce((current, lookupDef) => {
-    const items = lookupDef.results.map((module2) => {
+    const items = [];
+    const addToItems = (sns) => sns.forEach((module2) => {
       if (!isStateNode(module2)) {
-        return null;
+        if (module2.type !== "EnumStringMember")
+          return;
+        if (!module2.init) {
+          addToItems(lookupByFullName(state, "Toybox.Lang.Number"));
+          return;
+        }
+        if (module2.init.type === "Literal") {
+          const [, type] = (0, import_chunk_MBTLUWXR.getNodeValue)(module2.init);
+          switch (type) {
+            case "Null":
+              break;
+            case "Boolean":
+            case "Char":
+            case "Double":
+            case "Float":
+            case "Long":
+            case "Number":
+            case "String":
+              addToItems(lookupByFullName(state, `Toybox.Lang.${type}`));
+              break;
+            default:
+              unhandledType(type);
+          }
+          return;
+        }
+        [
+          "Boolean",
+          "Char",
+          "Double",
+          "Float",
+          "Long",
+          "Number",
+          "String"
+        ].forEach(
+          (type) => addToItems(lookupByFullName(state, `Toybox.Lang.${type}`))
+        );
+        return;
       }
       const res = checkOne(state, module2, decls, property);
-      return res ? { parent: module2, results: res } : null;
-    }).filter((r) => r != null);
+      if (res) {
+        items.push({ parent: module2, results: res });
+      }
+    });
+    addToItems(lookupDef.results);
     if (!items.length)
       return current;
     return current ? current.concat(items) : items;
@@ -18327,8 +18367,8 @@ function lookup(state, decls, node, name, maybeStack, nonlocal, ignoreImports) {
           case "ClassDeclaration":
             if (inStatic && state.config?.enforceStatic !== "NO") {
               inStatic = false;
-              if ((0, import_chunk_MBTLUWXR.hasProperty)(si.decls, node.name)) {
-                const r = si.decls[node.name].filter((s) => {
+              if ((0, import_chunk_MBTLUWXR.hasProperty)(si[decls], node.name)) {
+                const r = si[decls][node.name].filter((s) => {
                   switch (s.type) {
                     case "FunctionDeclaration":
                     case "VariableDeclarator":
@@ -19279,6 +19319,8 @@ var init_api = (0, import_chunk_ABYVSU2C.__esm)({
     init_type_flow_util();
     init_types();
     (0, import_chunk_SG7ODKRM.init_util)();
+    (0, import_chunk_MBTLUWXR.init_ast)();
+    init_data_flow();
     init_visitor();
   }
 });
@@ -22573,6 +22615,7 @@ function sizeBasedPRE2(func, context) {
       case 24:
         return BigInt(bc.arg) << 8n | BigInt(bc.op);
       case 1:
+      case 74:
         if (incSp != null) {
           incSp = false;
         }
@@ -22635,7 +22678,7 @@ function sizeBasedPRE2(func, context) {
       }
     });
   });
-  let nextSlot = func.argc + (incSp?.arg ?? 0);
+  let nextSlot = func.argc + (incSp?.op === 1 ? incSp.arg : incSp?.arg.incsp ?? 0);
   const bytecode = (op, arg) => {
     const bc = { op, arg, size: opcodeSize(op), offset: context.nextOffset++ };
     if (arg == null)
@@ -22720,7 +22763,11 @@ function sizeBasedPRE2(func, context) {
     }
   });
   if (incSp) {
-    incSp.arg += insertionBlocks.size;
+    if (incSp.op === 1) {
+      incSp.arg += insertionBlocks.size;
+    } else {
+      incSp.arg.incsp += insertionBlocks.size;
+    }
   } else {
     const startBlock = func.blocks.get(func.offset);
     const index = startBlock.bytecodes.length === 0 || startBlock.bytecodes[0].op !== 53 ? 0 : 1;
@@ -28983,7 +29030,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
       const opt_time = await (0, import_chunk_SG7ODKRM.first_modified)(
         Object.values(fnMap).map((v) => v.output)
       );
-      if (source_time < opt_time && 1713154555665 < opt_time) {
+      if (source_time < opt_time && 1713286417604 < opt_time) {
         return {
           hasTests,
           diagnostics: prevDiagnostics,
@@ -29022,7 +29069,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
             hasTests: hasTests2,
             diagnostics,
             sdkVersion,
-            optimizerVersion: "1.1.54",
+            optimizerVersion: "1.1.56",
             ...Object.fromEntries(
               configOptionsToCheck.map((option) => [option, config[option]])
             )

package/build/optimizer.cjs

@@ -18,28 +18,28 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var optimizer_exports = {};
 __export(optimizer_exports, {
-  StateNodeAttributes: () => import_chunk_5K64MLXC.StateNodeAttributes,
-  buildOptimizedProject: () => import_chunk_5K64MLXC.buildOptimizedProject,
+  StateNodeAttributes: () => import_chunk_M3LMSSY7.StateNodeAttributes,
+  buildOptimizedProject: () => import_chunk_M3LMSSY7.buildOptimizedProject,
   copyRecursiveAsNeeded: () => import_chunk_SG7ODKRM.copyRecursiveAsNeeded,
-  defaultConfig: () => import_chunk_5K64MLXC.defaultConfig,
-  display: () => import_chunk_5K64MLXC.display,
-  generateOneConfig: () => import_chunk_5K64MLXC.generateOneConfig,
-  generateOptimizedProject: () => import_chunk_5K64MLXC.generateOptimizedProject,
-  getConfig: () => import_chunk_5K64MLXC.getConfig,
-  getProjectAnalysis: () => import_chunk_5K64MLXC.getProjectAnalysis,
-  get_jungle: () => import_chunk_5K64MLXC.get_jungle,
-  isErrorWithLocation: () => import_chunk_5K64MLXC.isErrorWithLocation,
-  launchSimulator: () => import_chunk_5K64MLXC.launchSimulator,
-  manifestProducts: () => import_chunk_5K64MLXC.manifestProducts,
-  mctree: () => import_chunk_5K64MLXC.mctree,
-  simulateProgram: () => import_chunk_5K64MLXC.simulateProgram
+  defaultConfig: () => import_chunk_M3LMSSY7.defaultConfig,
+  display: () => import_chunk_M3LMSSY7.display,
+  generateOneConfig: () => import_chunk_M3LMSSY7.generateOneConfig,
+  generateOptimizedProject: () => import_chunk_M3LMSSY7.generateOptimizedProject,
+  getConfig: () => import_chunk_M3LMSSY7.getConfig,
+  getProjectAnalysis: () => import_chunk_M3LMSSY7.getProjectAnalysis,
+  get_jungle: () => import_chunk_M3LMSSY7.get_jungle,
+  isErrorWithLocation: () => import_chunk_M3LMSSY7.isErrorWithLocation,
+  launchSimulator: () => import_chunk_M3LMSSY7.launchSimulator,
+  manifestProducts: () => import_chunk_M3LMSSY7.manifestProducts,
+  mctree: () => import_chunk_M3LMSSY7.mctree,
+  simulateProgram: () => import_chunk_M3LMSSY7.simulateProgram
 });
 module.exports = __toCommonJS(optimizer_exports);
-var import_chunk_5K64MLXC = require("./chunk-5K64MLXC.cjs");
+var import_chunk_M3LMSSY7 = require("./chunk-M3LMSSY7.cjs");
 var import_chunk_SG7ODKRM = require("./chunk-SG7ODKRM.cjs");
 var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_5K64MLXC.init_optimizer)();
+(0, import_chunk_M3LMSSY7.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_5K64MLXC.SectionKinds,
-  appSupport: () => import_chunk_5K64MLXC.appSupport,
-  connectiq: () => import_chunk_5K64MLXC.connectiq,
-  getDeviceInfo: () => import_chunk_5K64MLXC.getDeviceInfo,
-  getFunctionDocumentation: () => import_chunk_5K64MLXC.getFunctionDocumentation,
-  getLanguages: () => import_chunk_5K64MLXC.getLanguages,
-  getSdkPath: () => import_chunk_5K64MLXC.getSdkPath,
-  isWin: () => import_chunk_5K64MLXC.isWin,
-  optimizeProgram: () => import_chunk_5K64MLXC.optimizeProgram,
-  readPrg: () => import_chunk_5K64MLXC.readPrg,
-  readPrgWithOffsets: () => import_chunk_5K64MLXC.readPrgWithOffsets,
-  xmlUtil: () => import_chunk_5K64MLXC.xml_util_exports
+  SectionKinds: () => import_chunk_M3LMSSY7.SectionKinds,
+  appSupport: () => import_chunk_M3LMSSY7.appSupport,
+  connectiq: () => import_chunk_M3LMSSY7.connectiq,
+  getDeviceInfo: () => import_chunk_M3LMSSY7.getDeviceInfo,
+  getFunctionDocumentation: () => import_chunk_M3LMSSY7.getFunctionDocumentation,
+  getLanguages: () => import_chunk_M3LMSSY7.getLanguages,
+  getSdkPath: () => import_chunk_M3LMSSY7.getSdkPath,
+  isWin: () => import_chunk_M3LMSSY7.isWin,
+  optimizeProgram: () => import_chunk_M3LMSSY7.optimizeProgram,
+  readPrg: () => import_chunk_M3LMSSY7.readPrg,
+  readPrgWithOffsets: () => import_chunk_M3LMSSY7.readPrgWithOffsets,
+  xmlUtil: () => import_chunk_M3LMSSY7.xml_util_exports
 });
 module.exports = __toCommonJS(sdk_util_exports);
-var import_chunk_5K64MLXC = require("./chunk-5K64MLXC.cjs");
+var import_chunk_M3LMSSY7 = require("./chunk-M3LMSSY7.cjs");
 var import_chunk_SG7ODKRM = require("./chunk-SG7ODKRM.cjs");
 var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_5K64MLXC.init_sdk_util)();
+(0, import_chunk_M3LMSSY7.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_5K64MLXC = require("./chunk-5K64MLXC.cjs");
+var import_chunk_M3LMSSY7 = require("./chunk-M3LMSSY7.cjs");
 var import_chunk_SG7ODKRM = require("./chunk-SG7ODKRM.cjs");
 var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.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_5K64MLXC.init_worker_task)();
+    (0, import_chunk_M3LMSSY7.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_5K64MLXC.performTask)(task));
+        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_M3LMSSY7.performTask)(task));
       });
     }
   }

package/package.json

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