@markw65/monkeyc-optimizer 1.1.55 → 1.1.57

package/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 All notable changes to the "monkeyc-optimizer" package will be documented in this file.
 
+### 1.1.57
+
+- Include ConditionalExpression and LogicalExpression in evaluateFunction
+- Fix personality search path (Fixes # 27)
+- Use fully qualified names for enum typedefs (Fixes # 28)
+- Fix auto-inlining of protected functions (Fixes #29)
+
+### 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

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

package/build/{chunk-GWRGLJLB.cjs → chunk-PUEG4GNZ.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_GWRGLJLB_exports = {};
-__export(chunk_GWRGLJLB_exports, {
+var chunk_PUEG4GNZ_exports = {};
+__export(chunk_PUEG4GNZ_exports, {
   EnumTagsConst: () => EnumTagsConst,
   LastTypeTag: () => LastTypeTag,
   ObjectLikeTagsConst: () => ObjectLikeTagsConst,
@@ -133,7 +133,7 @@ __export(chunk_GWRGLJLB_exports, {
   visitorNode: () => visitorNode,
   xml_util_exports: () => xml_util_exports
 });
-module.exports = __toCommonJS(chunk_GWRGLJLB_exports);
+module.exports = __toCommonJS(chunk_PUEG4GNZ_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");
@@ -5560,6 +5560,20 @@ var init_function_info = (0, import_chunk_ABYVSU2C.__esm)({
     (0, import_chunk_MBTLUWXR.init_ast)();
   }
 });
+var StateNodeAttributes;
+var init_optimizer_types = (0, import_chunk_ABYVSU2C.__esm)({
+  "src/optimizer-types.ts"() {
+    "use strict";
+    StateNodeAttributes = /* @__PURE__ */ ((StateNodeAttributes2) => {
+      StateNodeAttributes2[StateNodeAttributes2["NONE"] = 0] = "NONE";
+      StateNodeAttributes2[StateNodeAttributes2["PUBLIC"] = 1] = "PUBLIC";
+      StateNodeAttributes2[StateNodeAttributes2["PROTECTED"] = 2] = "PROTECTED";
+      StateNodeAttributes2[StateNodeAttributes2["PRIVATE"] = 4] = "PRIVATE";
+      StateNodeAttributes2[StateNodeAttributes2["STATIC"] = 8] = "STATIC";
+      return StateNodeAttributes2;
+    })(StateNodeAttributes || {});
+  }
+});
 function renameIdentifier(ident, newName) {
   if (!ident.original) {
     ident.original = ident.name;
@@ -5826,7 +5840,7 @@ function canInline(state, func, args) {
   }
   return safeArgs.every((arg) => arg !== null);
 }
-function inliningLooksUseful(func, node) {
+function inliningLooksUseful(state, func, node) {
   while (true) {
     if (node.type === "BinaryExpression" && node.operator === "as") {
       node = node.left;
@@ -5839,10 +5853,42 @@ function inliningLooksUseful(func, node) {
   if (node.type === "Literal")
     return true;
   if (node.type === "Identifier") {
-    if (func.params.length === 1 && variableDeclarationName(func.params[0]) === node.name) {
+    if (func.node.params.length === 1 && variableDeclarationName(func.node.params[0]) === node.name) {
       return 1;
     }
-    return true;
+    const stack = func.stack;
+    if (!stack)
+      return false;
+    const calleeClass = stack[stack.length - 1].sn;
+    if (calleeClass.type !== "ClassDeclaration") {
+      return true;
+    }
+    const [, results] = state.lookupNonlocal(node, null, stack);
+    if (!results)
+      return false;
+    const attrs = results.reduce(
+      (attrs2, result) => attrs2 | result.results.reduce(
+        (attrs3, sn) => attrs3 | (isStateNode(sn) ? sn.attributes & (4 | 2) : 0),
+        0
+      ),
+      0
+    );
+    if (!attrs)
+      return true;
+    if (state.stack[stack.length - 1] === stack[stack.length - 1]) {
+      return true;
+    }
+    if (attrs & 4)
+      return false;
+    for (let i = state.stack.length; i--; ) {
+      const callerClass = state.stack[i].sn;
+      if (callerClass.type === "ClassDeclaration") {
+        if (getSuperClasses(callerClass)?.has(calleeClass)) {
+          return true;
+        }
+        break;
+      }
+    }
   }
   return false;
 }
@@ -5868,7 +5914,8 @@ function shouldInline(state, func, call, context) {
   if (func.node.body && func.node.body.body.length === 1 && func.node.body.body[0].type === "ReturnStatement" && func.node.body.body[0].argument && func.node.params.length === args.length) {
     inlineAsExpression = true;
     autoInline = inliningLooksUseful(
-      func.node,
+      state,
+      func,
       func.node.body.body[0].argument
     );
   }
@@ -6492,23 +6539,10 @@ var init_inliner = (0, import_chunk_ABYVSU2C.__esm)({
     init_api();
     (0, import_chunk_MBTLUWXR.init_ast)();
     init_function_info();
+    init_optimizer_types();
     init_variable_renamer();
   }
 });
-var StateNodeAttributes;
-var init_optimizer_types = (0, import_chunk_ABYVSU2C.__esm)({
-  "src/optimizer-types.ts"() {
-    "use strict";
-    StateNodeAttributes = /* @__PURE__ */ ((StateNodeAttributes2) => {
-      StateNodeAttributes2[StateNodeAttributes2["NONE"] = 0] = "NONE";
-      StateNodeAttributes2[StateNodeAttributes2["PUBLIC"] = 1] = "PUBLIC";
-      StateNodeAttributes2[StateNodeAttributes2["PROTECTED"] = 2] = "PROTECTED";
-      StateNodeAttributes2[StateNodeAttributes2["PRIVATE"] = 4] = "PRIVATE";
-      StateNodeAttributes2[StateNodeAttributes2["STATIC"] = 8] = "STATIC";
-      return StateNodeAttributes2;
-    })(StateNodeAttributes || {});
-  }
-});
 function pragmaChecker(state, ast, diagnostics) {
   const comments = ast.comments;
   if (!comments)
@@ -16535,6 +16569,8 @@ function evaluateFunction(istate, func, args) {
           case "ReturnStatement":
           case "UnaryExpression":
           case "BinaryExpression":
+          case "ConditionalExpression":
+          case "LogicalExpression":
           case "Literal":
           case "Identifier":
             return;
@@ -17132,7 +17168,7 @@ function cleanup(state, node, ast) {
           })
         );
         if (!enumType.has(null)) {
-          node.enumType = [...enumType].join(" or ");
+          node.enumType = [...enumType].map((t) => t === "Null" ? t : `Toybox.Lang.${t}`).join(" or ");
           node.members.splice(0);
         }
       }
@@ -18250,40 +18286,42 @@ function lookupNext(state, results, decls, property) {
     const items = [];
     const addToItems = (sns) => sns.forEach((module2) => {
       if (!isStateNode(module2)) {
-        if (module2.type === "EnumStringMember") {
-          if (!module2.init) {
-            addToItems(lookupByFullName(state, "Toybox.Lang.Number"));
-          } else if (module2.init.type === "Literal") {
-            const [, type] = (0, import_chunk_MBTLUWXR.getNodeValue)(module2.init);
-            switch (type) {
-              case "Null":
-                return;
-              case "Boolean":
-              case "Char":
-              case "Double":
-              case "Float":
-              case "Long":
-              case "Number":
-              case "String":
-                addToItems(lookupByFullName(state, `Toybox.Lang.${type}`));
-                return;
-            }
-          } else {
-            [
-              "Boolean",
-              "Char",
-              "Double",
-              "Float",
-              "Long",
-              "Number",
-              "String"
-            ].forEach(
-              (type) => addToItems(lookupByFullName(state, `Toybox.Lang.${type}`))
-            );
-            return;
+        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;
         }
-        addToItems(lookupByFullName(state, "Toybox.Lang.Object"));
+        [
+          "Boolean",
+          "Char",
+          "Double",
+          "Float",
+          "Long",
+          "Number",
+          "String"
+        ].forEach(
+          (type) => addToItems(lookupByFullName(state, `Toybox.Lang.${type}`))
+        );
         return;
       }
       const res = checkOne(state, module2, decls, property);
@@ -19318,6 +19356,7 @@ var init_api = (0, import_chunk_ABYVSU2C.__esm)({
     init_types();
     (0, import_chunk_SG7ODKRM.init_util)();
     (0, import_chunk_MBTLUWXR.init_ast)();
+    init_data_flow();
     init_visitor();
   }
 });
@@ -22612,6 +22651,7 @@ function sizeBasedPRE2(func, context) {
       case 24:
         return BigInt(bc.arg) << 8n | BigInt(bc.op);
       case 1:
+      case 74:
         if (incSp != null) {
           incSp = false;
         }
@@ -22674,7 +22714,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)
@@ -22759,7 +22799,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;
@@ -27522,7 +27566,11 @@ async function default_jungle() {
       assign(id, [qname(base)]);
     }
     rassign(`${id}.resourcePath`, [literal(rez)], base);
-    rassign(`${id}.personality`, [literal(rez)], base);
+    rassign(
+      `${id}.personality`,
+      [literal(`${connectiq}/Devices/${id}`), literal(rez)],
+      base
+    );
     languages.forEach(
       (l) => rassign(`${id}.lang.${l.id}`, [literal(`${rez}-${l.id}`)], base)
     );
@@ -28904,17 +28952,9 @@ async function fileInfoFromConfig(workspace, output, buildConfig, extraExcludes,
     buildConfig.sourcePath,
     ".mc"
   );
-  let personality = buildConfig.personality;
-  if (buildConfig.products) {
-    personality = (personality ?? []).concat(
-      buildConfig.products.map(
-        (product) => `${connectiq}/Devices/${product}/personality.mss`
-      )
-    );
-  }
   const { files: personalityFiles } = await filesFromPaths(
     workspace,
-    personality,
+    buildConfig.personality,
     ".mss"
   );
   const excludeAnnotations = Object.assign(
@@ -28998,7 +29038,13 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
         ).then(({ fnMap: fnMap2 }) => fnMap2);
       }).flat()
     );
-    barrelFnMaps.forEach((barrelFnMap) => Object.assign(fnMap, barrelFnMap));
+    barrelFnMaps.forEach(
+      (barrelFnMap) => Object.entries(barrelFnMap).forEach(([key, value2]) => {
+        if (!(0, import_chunk_MBTLUWXR.hasProperty)(fnMap, key)) {
+          fnMap[key] = value2;
+        }
+      })
+    );
   }
   const actualOptimizedFiles = (await (0, import_chunk_SG7ODKRM.globa)(path4.join(output, "**", "*.mc"), { mark: true })).filter((file) => !file.endsWith("/")).sort();
   const {
@@ -29022,7 +29068,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 && 1713229195228 < opt_time) {
+      if (source_time < opt_time && 1713624391103 < opt_time) {
         return {
           hasTests,
           diagnostics: prevDiagnostics,
@@ -29061,7 +29107,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
             hasTests: hasTests2,
             diagnostics,
             sdkVersion,
-            optimizerVersion: "1.1.55",
+            optimizerVersion: "1.1.57",
             ...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_GWRGLJLB.StateNodeAttributes,
-  buildOptimizedProject: () => import_chunk_GWRGLJLB.buildOptimizedProject,
+  StateNodeAttributes: () => import_chunk_PUEG4GNZ.StateNodeAttributes,
+  buildOptimizedProject: () => import_chunk_PUEG4GNZ.buildOptimizedProject,
   copyRecursiveAsNeeded: () => import_chunk_SG7ODKRM.copyRecursiveAsNeeded,
-  defaultConfig: () => import_chunk_GWRGLJLB.defaultConfig,
-  display: () => import_chunk_GWRGLJLB.display,
-  generateOneConfig: () => import_chunk_GWRGLJLB.generateOneConfig,
-  generateOptimizedProject: () => import_chunk_GWRGLJLB.generateOptimizedProject,
-  getConfig: () => import_chunk_GWRGLJLB.getConfig,
-  getProjectAnalysis: () => import_chunk_GWRGLJLB.getProjectAnalysis,
-  get_jungle: () => import_chunk_GWRGLJLB.get_jungle,
-  isErrorWithLocation: () => import_chunk_GWRGLJLB.isErrorWithLocation,
-  launchSimulator: () => import_chunk_GWRGLJLB.launchSimulator,
-  manifestProducts: () => import_chunk_GWRGLJLB.manifestProducts,
-  mctree: () => import_chunk_GWRGLJLB.mctree,
-  simulateProgram: () => import_chunk_GWRGLJLB.simulateProgram
+  defaultConfig: () => import_chunk_PUEG4GNZ.defaultConfig,
+  display: () => import_chunk_PUEG4GNZ.display,
+  generateOneConfig: () => import_chunk_PUEG4GNZ.generateOneConfig,
+  generateOptimizedProject: () => import_chunk_PUEG4GNZ.generateOptimizedProject,
+  getConfig: () => import_chunk_PUEG4GNZ.getConfig,
+  getProjectAnalysis: () => import_chunk_PUEG4GNZ.getProjectAnalysis,
+  get_jungle: () => import_chunk_PUEG4GNZ.get_jungle,
+  isErrorWithLocation: () => import_chunk_PUEG4GNZ.isErrorWithLocation,
+  launchSimulator: () => import_chunk_PUEG4GNZ.launchSimulator,
+  manifestProducts: () => import_chunk_PUEG4GNZ.manifestProducts,
+  mctree: () => import_chunk_PUEG4GNZ.mctree,
+  simulateProgram: () => import_chunk_PUEG4GNZ.simulateProgram
 });
 module.exports = __toCommonJS(optimizer_exports);
-var import_chunk_GWRGLJLB = require("./chunk-GWRGLJLB.cjs");
+var import_chunk_PUEG4GNZ = require("./chunk-PUEG4GNZ.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_GWRGLJLB.init_optimizer)();
+(0, import_chunk_PUEG4GNZ.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_GWRGLJLB.SectionKinds,
-  appSupport: () => import_chunk_GWRGLJLB.appSupport,
-  connectiq: () => import_chunk_GWRGLJLB.connectiq,
-  getDeviceInfo: () => import_chunk_GWRGLJLB.getDeviceInfo,
-  getFunctionDocumentation: () => import_chunk_GWRGLJLB.getFunctionDocumentation,
-  getLanguages: () => import_chunk_GWRGLJLB.getLanguages,
-  getSdkPath: () => import_chunk_GWRGLJLB.getSdkPath,
-  isWin: () => import_chunk_GWRGLJLB.isWin,
-  optimizeProgram: () => import_chunk_GWRGLJLB.optimizeProgram,
-  readPrg: () => import_chunk_GWRGLJLB.readPrg,
-  readPrgWithOffsets: () => import_chunk_GWRGLJLB.readPrgWithOffsets,
-  xmlUtil: () => import_chunk_GWRGLJLB.xml_util_exports
+  SectionKinds: () => import_chunk_PUEG4GNZ.SectionKinds,
+  appSupport: () => import_chunk_PUEG4GNZ.appSupport,
+  connectiq: () => import_chunk_PUEG4GNZ.connectiq,
+  getDeviceInfo: () => import_chunk_PUEG4GNZ.getDeviceInfo,
+  getFunctionDocumentation: () => import_chunk_PUEG4GNZ.getFunctionDocumentation,
+  getLanguages: () => import_chunk_PUEG4GNZ.getLanguages,
+  getSdkPath: () => import_chunk_PUEG4GNZ.getSdkPath,
+  isWin: () => import_chunk_PUEG4GNZ.isWin,
+  optimizeProgram: () => import_chunk_PUEG4GNZ.optimizeProgram,
+  readPrg: () => import_chunk_PUEG4GNZ.readPrg,
+  readPrgWithOffsets: () => import_chunk_PUEG4GNZ.readPrgWithOffsets,
+  xmlUtil: () => import_chunk_PUEG4GNZ.xml_util_exports
 });
 module.exports = __toCommonJS(sdk_util_exports);
-var import_chunk_GWRGLJLB = require("./chunk-GWRGLJLB.cjs");
+var import_chunk_PUEG4GNZ = require("./chunk-PUEG4GNZ.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_GWRGLJLB.init_sdk_util)();
+(0, import_chunk_PUEG4GNZ.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_GWRGLJLB = require("./chunk-GWRGLJLB.cjs");
+var import_chunk_PUEG4GNZ = require("./chunk-PUEG4GNZ.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_GWRGLJLB.init_worker_task)();
+    (0, import_chunk_PUEG4GNZ.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_GWRGLJLB.performTask)(task));
+        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_PUEG4GNZ.performTask)(task));
       });
     }
   }

package/package.json

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