@markw65/monkeyc-optimizer 1.1.41 → 1.1.43

package/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 All notable changes to the "monkeyc-optimizer" package will be documented in this file.
 
+### 1.1.43
+
+- Fix bogus type mismatch errors relating to Rez.Strings.\* under sdk-7.x
+
+### 1.1.42
+
+- Fix a stack overflow caused by the post build array init optimization
+- Fix a bug allowing overridden methods to be inlined
+
 ### 1.1.41
 
 - Add proper support for tuple types (Sdk-7.x)

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_BJHWDTEM.checkCompilerVersion,
-  collectNamespaces: () => import_chunk_BJHWDTEM.collectNamespaces,
-  createDocumentationMap: () => import_chunk_BJHWDTEM.createDocumentationMap,
-  diagnostic: () => import_chunk_BJHWDTEM.diagnostic,
-  diagnosticHelper: () => import_chunk_BJHWDTEM.diagnosticHelper,
-  findNamesInScope: () => import_chunk_BJHWDTEM.findNamesInScope,
-  findUsingForNode: () => import_chunk_BJHWDTEM.findUsingForNode,
-  formatAst: () => import_chunk_BJHWDTEM.formatAst,
-  formatAstLongLines: () => import_chunk_BJHWDTEM.formatAstLongLines,
-  formatScopedName: () => import_chunk_BJHWDTEM.formatScopedName,
-  getApiFunctionInfo: () => import_chunk_BJHWDTEM.getApiFunctionInfo,
-  getApiMapping: () => import_chunk_BJHWDTEM.getApiMapping,
-  getSuperClasses: () => import_chunk_BJHWDTEM.getSuperClasses,
+  checkCompilerVersion: () => import_chunk_SNXXTHNE.checkCompilerVersion,
+  collectNamespaces: () => import_chunk_SNXXTHNE.collectNamespaces,
+  createDocumentationMap: () => import_chunk_SNXXTHNE.createDocumentationMap,
+  diagnostic: () => import_chunk_SNXXTHNE.diagnostic,
+  diagnosticHelper: () => import_chunk_SNXXTHNE.diagnosticHelper,
+  findNamesInScope: () => import_chunk_SNXXTHNE.findNamesInScope,
+  findUsingForNode: () => import_chunk_SNXXTHNE.findUsingForNode,
+  formatAst: () => import_chunk_SNXXTHNE.formatAst,
+  formatAstLongLines: () => import_chunk_SNXXTHNE.formatAstLongLines,
+  formatScopedName: () => import_chunk_SNXXTHNE.formatScopedName,
+  getApiFunctionInfo: () => import_chunk_SNXXTHNE.getApiFunctionInfo,
+  getApiMapping: () => import_chunk_SNXXTHNE.getApiMapping,
+  getSuperClasses: () => import_chunk_SNXXTHNE.getSuperClasses,
   hasProperty: () => import_chunk_MBTLUWXR.hasProperty,
-  isClassVariable: () => import_chunk_BJHWDTEM.isClassVariable,
-  isLocal: () => import_chunk_BJHWDTEM.isLocal,
-  isLookupCandidate: () => import_chunk_BJHWDTEM.isLookupCandidate,
-  isStateNode: () => import_chunk_BJHWDTEM.isStateNode,
-  lookupByFullName: () => import_chunk_BJHWDTEM.lookupByFullName,
-  lookupNext: () => import_chunk_BJHWDTEM.lookupNext,
-  lookupResultContains: () => import_chunk_BJHWDTEM.lookupResultContains,
-  lookupWithType: () => import_chunk_BJHWDTEM.lookupWithType,
-  makeToyboxLink: () => import_chunk_BJHWDTEM.makeToyboxLink,
-  mapVarDeclsByType: () => import_chunk_BJHWDTEM.mapVarDeclsByType,
-  markInvokeClassMethod: () => import_chunk_BJHWDTEM.markInvokeClassMethod,
-  parseSdkVersion: () => import_chunk_BJHWDTEM.parseSdkVersion,
-  resolveDiagnostics: () => import_chunk_BJHWDTEM.resolveDiagnostics,
-  resolveDiagnosticsMap: () => import_chunk_BJHWDTEM.resolveDiagnosticsMap,
-  sameLookupResult: () => import_chunk_BJHWDTEM.sameLookupResult,
+  isClassVariable: () => import_chunk_SNXXTHNE.isClassVariable,
+  isLocal: () => import_chunk_SNXXTHNE.isLocal,
+  isLookupCandidate: () => import_chunk_SNXXTHNE.isLookupCandidate,
+  isStateNode: () => import_chunk_SNXXTHNE.isStateNode,
+  lookupByFullName: () => import_chunk_SNXXTHNE.lookupByFullName,
+  lookupNext: () => import_chunk_SNXXTHNE.lookupNext,
+  lookupResultContains: () => import_chunk_SNXXTHNE.lookupResultContains,
+  lookupWithType: () => import_chunk_SNXXTHNE.lookupWithType,
+  makeToyboxLink: () => import_chunk_SNXXTHNE.makeToyboxLink,
+  mapVarDeclsByType: () => import_chunk_SNXXTHNE.mapVarDeclsByType,
+  markInvokeClassMethod: () => import_chunk_SNXXTHNE.markInvokeClassMethod,
+  parseSdkVersion: () => import_chunk_SNXXTHNE.parseSdkVersion,
+  resolveDiagnostics: () => import_chunk_SNXXTHNE.resolveDiagnostics,
+  resolveDiagnosticsMap: () => import_chunk_SNXXTHNE.resolveDiagnosticsMap,
+  sameLookupResult: () => import_chunk_SNXXTHNE.sameLookupResult,
   traverseAst: () => import_chunk_MBTLUWXR.traverseAst,
-  variableDeclarationName: () => import_chunk_BJHWDTEM.variableDeclarationName,
-  visitReferences: () => import_chunk_BJHWDTEM.visitReferences,
-  visit_resources: () => import_chunk_BJHWDTEM.visit_resources,
-  visitorNode: () => import_chunk_BJHWDTEM.visitorNode
+  variableDeclarationName: () => import_chunk_SNXXTHNE.variableDeclarationName,
+  visitReferences: () => import_chunk_SNXXTHNE.visitReferences,
+  visit_resources: () => import_chunk_SNXXTHNE.visit_resources,
+  visitorNode: () => import_chunk_SNXXTHNE.visitorNode
 });
 module.exports = __toCommonJS(api_exports);
-var import_chunk_BJHWDTEM = require("./chunk-BJHWDTEM.cjs");
+var import_chunk_SNXXTHNE = require("./chunk-SNXXTHNE.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_BJHWDTEM.init_api)();
+(0, import_chunk_SNXXTHNE.init_api)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   checkCompilerVersion,

package/build/{chunk-BJHWDTEM.cjs → chunk-SNXXTHNE.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_BJHWDTEM_exports = {};
-__export(chunk_BJHWDTEM_exports, {
+var chunk_SNXXTHNE_exports = {};
+__export(chunk_SNXXTHNE_exports, {
   EnumTagsConst: () => EnumTagsConst,
   LastTypeTag: () => LastTypeTag,
   ObjectLikeTagsConst: () => ObjectLikeTagsConst,
@@ -133,7 +133,7 @@ __export(chunk_BJHWDTEM_exports, {
   visitorNode: () => visitorNode,
   xml_util_exports: () => xml_util_exports
 });
-module.exports = __toCommonJS(chunk_BJHWDTEM_exports);
+module.exports = __toCommonJS(chunk_SNXXTHNE_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");
@@ -17152,19 +17152,21 @@ function optimizeCall(istate, node, context) {
   if (state.currentFunction) {
     recordCalledFuncs(state.currentFunction, callees);
   }
-  if (callees.length === 1 && callees[0].type === "FunctionDeclaration") {
+  if (callees.length === 1) {
     const callee = callees[0].node;
-    if (!context && callee.optimizable && !callee.hasOverride && node.arguments.every((n) => (0, import_chunk_MBTLUWXR.getNodeValue)(n)[0] !== null)) {
-      const ret = evaluateFunction(istate, callee, node.arguments);
-      if (ret) {
-        inlineDiagnostic(state, callees[0], node, null);
-        return (0, import_chunk_MBTLUWXR.withLoc)(ret, node, node);
+    if (callees[0].type === "FunctionDeclaration" && !callee.hasOverride) {
+      if (!context && callee.optimizable && node.arguments.every((n) => (0, import_chunk_MBTLUWXR.getNodeValue)(n)[0] !== null)) {
+        const ret = evaluateFunction(istate, callee, node.arguments);
+        if (ret) {
+          inlineDiagnostic(state, callees[0], node, null);
+          return (0, import_chunk_MBTLUWXR.withLoc)(ret, node, node);
+        }
       }
-    }
-    if (shouldInline(state, callees[0], node, context)) {
-      const ret = inlineFunction(state, callees[0], node, context);
-      if (ret) {
-        return ret;
+      if (shouldInline(state, callees[0], node, context)) {
+        const ret = inlineFunction(state, callees[0], node, context);
+        if (ret) {
+          return ret;
+        }
       }
     }
   }
@@ -17608,7 +17610,9 @@ function add_one_resource(state, doc, module2, e) {
                   ts: [
                     {
                       type: "TypeSpecPart",
-                      name: (0, import_chunk_MBTLUWXR.makeIdentifier)("Symbol")
+                      name: (0, import_chunk_MBTLUWXR.makeScopedName)(
+                        state && lookupByFullName(state, "Toybox.Lang.ResourceId") ? "Toybox.Lang.ResourceId" : "Toybox.Lang.Symbol"
+                      )
                     }
                   ]
                 }
@@ -18964,14 +18968,15 @@ function makeToyboxLink(result) {
   return null;
 }
 function lookupByFullName(state, fullName) {
-  return fullName.split(".").reduce(
+  const sn = state.stack?.[0].sn;
+  return sn ? fullName.split(".").reduce(
     (results, part) => {
       return results.flatMap(
         (result) => isStateNode(result) ? result.decls?.[part] || result.type_decls?.[part] : null
-      ).filter((sn) => !!sn);
+      ).filter((sn2) => !!sn2);
     },
-    [state.stack[0].sn]
-  );
+    [sn]
+  ) : [];
 }
 function handleException(state, node, exception) {
   try {
@@ -21399,6 +21404,14 @@ ${blockToString(block, context)}`
     loop2.taken = loopOffset2;
     return true;
   }
+  const max = Math.floor(
+    (100 - interpState.stack.length - interpState.locals.length) / 2
+  );
+  if (max < 0)
+    return false;
+  if (putvStarts.length > max) {
+    putvStarts.splice(max);
+  }
   if (!tryLocal(3) && putvStarts.length < 4)
     return false;
   if (local >= 0) {
@@ -21407,7 +21420,9 @@ ${blockToString(block, context)}`
   dupsToFix.forEach((x, n) => {
     const bc = block.bytecodes[n];
     (0, import_node_assert8.default)(bc.op === 46 && bc.arg >= 2);
-    bc.arg += (putvStarts.length - x - 1) * 2;
+    if (putvStarts.length > x) {
+      bc.arg += (putvStarts.length - x - 1) * 2;
+    }
   });
   for (let i2 = putvStarts.length; i2-- > 1; ) {
     block.bytecodes.splice(putvStarts[i2], 2);
@@ -28309,7 +28324,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 && 1707701537178 < opt_time) {
+      if (source_time < opt_time && 1707958781012 < opt_time) {
         return {
           hasTests,
           diagnostics: prevDiagnostics,
@@ -28348,7 +28363,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
             hasTests: hasTests2,
             diagnostics,
             sdkVersion,
-            optimizerVersion: "1.1.41",
+            optimizerVersion: "1.1.43",
             ...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_BJHWDTEM.StateNodeAttributes,
-  buildOptimizedProject: () => import_chunk_BJHWDTEM.buildOptimizedProject,
+  StateNodeAttributes: () => import_chunk_SNXXTHNE.StateNodeAttributes,
+  buildOptimizedProject: () => import_chunk_SNXXTHNE.buildOptimizedProject,
   copyRecursiveAsNeeded: () => import_chunk_SG7ODKRM.copyRecursiveAsNeeded,
-  defaultConfig: () => import_chunk_BJHWDTEM.defaultConfig,
-  display: () => import_chunk_BJHWDTEM.display,
-  generateOneConfig: () => import_chunk_BJHWDTEM.generateOneConfig,
-  generateOptimizedProject: () => import_chunk_BJHWDTEM.generateOptimizedProject,
-  getConfig: () => import_chunk_BJHWDTEM.getConfig,
-  getProjectAnalysis: () => import_chunk_BJHWDTEM.getProjectAnalysis,
-  get_jungle: () => import_chunk_BJHWDTEM.get_jungle,
-  isErrorWithLocation: () => import_chunk_BJHWDTEM.isErrorWithLocation,
-  launchSimulator: () => import_chunk_BJHWDTEM.launchSimulator,
-  manifestProducts: () => import_chunk_BJHWDTEM.manifestProducts,
-  mctree: () => import_chunk_BJHWDTEM.mctree,
-  simulateProgram: () => import_chunk_BJHWDTEM.simulateProgram
+  defaultConfig: () => import_chunk_SNXXTHNE.defaultConfig,
+  display: () => import_chunk_SNXXTHNE.display,
+  generateOneConfig: () => import_chunk_SNXXTHNE.generateOneConfig,
+  generateOptimizedProject: () => import_chunk_SNXXTHNE.generateOptimizedProject,
+  getConfig: () => import_chunk_SNXXTHNE.getConfig,
+  getProjectAnalysis: () => import_chunk_SNXXTHNE.getProjectAnalysis,
+  get_jungle: () => import_chunk_SNXXTHNE.get_jungle,
+  isErrorWithLocation: () => import_chunk_SNXXTHNE.isErrorWithLocation,
+  launchSimulator: () => import_chunk_SNXXTHNE.launchSimulator,
+  manifestProducts: () => import_chunk_SNXXTHNE.manifestProducts,
+  mctree: () => import_chunk_SNXXTHNE.mctree,
+  simulateProgram: () => import_chunk_SNXXTHNE.simulateProgram
 });
 module.exports = __toCommonJS(optimizer_exports);
-var import_chunk_BJHWDTEM = require("./chunk-BJHWDTEM.cjs");
+var import_chunk_SNXXTHNE = require("./chunk-SNXXTHNE.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_BJHWDTEM.init_optimizer)();
+(0, import_chunk_SNXXTHNE.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_BJHWDTEM.SectionKinds,
-  appSupport: () => import_chunk_BJHWDTEM.appSupport,
-  connectiq: () => import_chunk_BJHWDTEM.connectiq,
-  getDeviceInfo: () => import_chunk_BJHWDTEM.getDeviceInfo,
-  getFunctionDocumentation: () => import_chunk_BJHWDTEM.getFunctionDocumentation,
-  getLanguages: () => import_chunk_BJHWDTEM.getLanguages,
-  getSdkPath: () => import_chunk_BJHWDTEM.getSdkPath,
-  isWin: () => import_chunk_BJHWDTEM.isWin,
-  optimizeProgram: () => import_chunk_BJHWDTEM.optimizeProgram,
-  readPrg: () => import_chunk_BJHWDTEM.readPrg,
-  readPrgWithOffsets: () => import_chunk_BJHWDTEM.readPrgWithOffsets,
-  xmlUtil: () => import_chunk_BJHWDTEM.xml_util_exports
+  SectionKinds: () => import_chunk_SNXXTHNE.SectionKinds,
+  appSupport: () => import_chunk_SNXXTHNE.appSupport,
+  connectiq: () => import_chunk_SNXXTHNE.connectiq,
+  getDeviceInfo: () => import_chunk_SNXXTHNE.getDeviceInfo,
+  getFunctionDocumentation: () => import_chunk_SNXXTHNE.getFunctionDocumentation,
+  getLanguages: () => import_chunk_SNXXTHNE.getLanguages,
+  getSdkPath: () => import_chunk_SNXXTHNE.getSdkPath,
+  isWin: () => import_chunk_SNXXTHNE.isWin,
+  optimizeProgram: () => import_chunk_SNXXTHNE.optimizeProgram,
+  readPrg: () => import_chunk_SNXXTHNE.readPrg,
+  readPrgWithOffsets: () => import_chunk_SNXXTHNE.readPrgWithOffsets,
+  xmlUtil: () => import_chunk_SNXXTHNE.xml_util_exports
 });
 module.exports = __toCommonJS(sdk_util_exports);
-var import_chunk_BJHWDTEM = require("./chunk-BJHWDTEM.cjs");
+var import_chunk_SNXXTHNE = require("./chunk-SNXXTHNE.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_BJHWDTEM.init_sdk_util)();
+(0, import_chunk_SNXXTHNE.init_sdk_util)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   SectionKinds,

package/build/src/api.d.ts

@@ -35,7 +35,7 @@ export declare function createDocumentationMap(functionDocumentation: {
     doc: string;
 }[]): Promise<Map<string, string>>;
 export declare function makeToyboxLink(result: StateNodeDecl): string | null;
-export declare function lookupByFullName(state: ProgramStateAnalysis, fullName: string): StateNodeDecl[];
+export declare function lookupByFullName(state: ProgramState, fullName: string): StateNodeDecl[];
 export declare function findUsingForNode(state: ProgramStateLive, stack: ProgramStateStack, i: number, node: mctree.Identifier): ModuleStateNode | {
     name: string;
     decls: {

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_BJHWDTEM = require("./chunk-BJHWDTEM.cjs");
+var import_chunk_SNXXTHNE = require("./chunk-SNXXTHNE.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_BJHWDTEM.init_worker_task)();
+    (0, import_chunk_SNXXTHNE.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_BJHWDTEM.performTask)(task));
+        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_SNXXTHNE.performTask)(task));
       });
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@markw65/monkeyc-optimizer",
   "type": "commonjs",
-  "version": "1.1.41",
+  "version": "1.1.43",
   "description": "Source to source optimizer for Garmin Monkey C code",
   "main": "build/optimizer.cjs",
   "types": "build/src/optimizer.d.ts",
@@ -22,7 +22,7 @@
     "build-debug": "node esbuild.mjs",
     "build-release": "node esbuild.mjs --release",
     "prepack": "node esbuild.mjs --release && mkdir -p bin && cp test/cft-font-info.js bin",
-    "test": "npm run test-mocha && npm run test-analysis && npm run test-optimized && npm run test-unopt && npm run test-post-only && npm run test-remote && npm run test-remote-tests && npm run test-personality",
+    "test": "npm run test-mocha && npm run test-analysis && npm run test-optimized && npm run test-unopt && npm run test-post-only && npm run test-tiny && npm run test-remote && npm run test-remote-tests && npm run test-personality",
     "test-mocha": "npx mocha --timeout 999999 build/mocha.cjs",
     "test-remote": "node ./test/test.js --showInfo --postOptimize --product=pick-one --github",
     "test-remote-tests": "node ./test/test.js --showInfo --postOptimize --product=pick-one --run-tests --github",
@@ -32,6 +32,7 @@
     "test-garmin-opt": "node test/test.js --typeCheckLevel Strict --skipOptimization --garminOptLevel=2 --run-tests --product=fenix5 --product=fr235 --jungle ./test/OptimizerTests/monkey.jungle",
     "test-personality": "node test/test-personality.js",
     "test-analysis": "node test/test.js --showInfo --typeCheckLevel Strict --product=fr955 --sourceFile 'test/analysis/*.mc'",
+    "test-tiny": "node test/test.js --postOptimize --showInfo --typeCheckLevel Strict --run-tests --product=pick-one --jungle test/tiny/array-overflow/monkey.jungle",
     "eslint": "npx eslint ."
   },
   "bin": {