@markw65/monkeyc-optimizer 1.1.84 → 1.1.85

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to the "monkeyc-optimizer" package will be documented in this file.
 
+### 1.1.85
+
+- Update to [@markw65/prettier-plugin-monkeyc@1.0.60](https://github.com/markw65/prettier-plugin-monkeyc/blob/main/CHANGELOG.md#1060)
+  - Fixes a crash introduced by stashing ArrayExpression/ObjectExpression types on nodes.
+- Preserve casts on ArrayExpression and ObjectExpression (Fixes #30)
+- Identify more 'obviously safe' reference expressions
+
 ### 1.1.84
 
 - Refactor `extraReferenceTypeChecks` and take account of type constraints (fixes #56)

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_ZWQB5L34.checkCompilerVersion,
-  clearDiagnostics: () => import_chunk_ZWQB5L34.clearDiagnostics,
-  collectNamespaces: () => import_chunk_ZWQB5L34.collectNamespaces,
-  createDocumentationMap: () => import_chunk_ZWQB5L34.createDocumentationMap,
-  declKey: () => import_chunk_ZWQB5L34.declKey,
-  diagnostic: () => import_chunk_ZWQB5L34.diagnostic,
-  diagnosticHelper: () => import_chunk_ZWQB5L34.diagnosticHelper,
-  findNamesInScope: () => import_chunk_ZWQB5L34.findNamesInScope,
-  findUsingForNode: () => import_chunk_ZWQB5L34.findUsingForNode,
-  formatAst: () => import_chunk_ZWQB5L34.formatAst,
-  formatAstLongLines: () => import_chunk_ZWQB5L34.formatAstLongLines,
-  formatScopedName: () => import_chunk_ZWQB5L34.formatScopedName,
-  getApiFunctionInfo: () => import_chunk_ZWQB5L34.getApiFunctionInfo,
-  getApiMapping: () => import_chunk_ZWQB5L34.getApiMapping,
-  getSuperClasses: () => import_chunk_ZWQB5L34.getSuperClasses,
-  handleImportUsing: () => import_chunk_ZWQB5L34.handleImportUsing,
+  checkCompilerVersion: () => import_chunk_OFOOTSQM.checkCompilerVersion,
+  clearDiagnostics: () => import_chunk_OFOOTSQM.clearDiagnostics,
+  collectNamespaces: () => import_chunk_OFOOTSQM.collectNamespaces,
+  createDocumentationMap: () => import_chunk_OFOOTSQM.createDocumentationMap,
+  declKey: () => import_chunk_OFOOTSQM.declKey,
+  diagnostic: () => import_chunk_OFOOTSQM.diagnostic,
+  diagnosticHelper: () => import_chunk_OFOOTSQM.diagnosticHelper,
+  findNamesInScope: () => import_chunk_OFOOTSQM.findNamesInScope,
+  findUsingForNode: () => import_chunk_OFOOTSQM.findUsingForNode,
+  formatAst: () => import_chunk_OFOOTSQM.formatAst,
+  formatAstLongLines: () => import_chunk_OFOOTSQM.formatAstLongLines,
+  formatScopedName: () => import_chunk_OFOOTSQM.formatScopedName,
+  getApiFunctionInfo: () => import_chunk_OFOOTSQM.getApiFunctionInfo,
+  getApiMapping: () => import_chunk_OFOOTSQM.getApiMapping,
+  getSuperClasses: () => import_chunk_OFOOTSQM.getSuperClasses,
+  handleImportUsing: () => import_chunk_OFOOTSQM.handleImportUsing,
   hasProperty: () => import_chunk_JDC43A3I.hasProperty,
-  isClassVariable: () => import_chunk_ZWQB5L34.isClassVariable,
-  isLocal: () => import_chunk_ZWQB5L34.isLocal,
-  isLookupCandidate: () => import_chunk_ZWQB5L34.isLookupCandidate,
-  isStateNode: () => import_chunk_ZWQB5L34.isStateNode,
-  lookupByFullName: () => import_chunk_ZWQB5L34.lookupByFullName,
-  lookupNext: () => import_chunk_ZWQB5L34.lookupNext,
-  lookupResultContains: () => import_chunk_ZWQB5L34.lookupResultContains,
-  lookupWithType: () => import_chunk_ZWQB5L34.lookupWithType,
-  makeToyboxLink: () => import_chunk_ZWQB5L34.makeToyboxLink,
-  mapVarDeclsByType: () => import_chunk_ZWQB5L34.mapVarDeclsByType,
-  markInvokeClassMethod: () => import_chunk_ZWQB5L34.markInvokeClassMethod,
-  parseSdkVersion: () => import_chunk_ZWQB5L34.parseSdkVersion,
-  popRootNode: () => import_chunk_ZWQB5L34.popRootNode,
-  pushRootNode: () => import_chunk_ZWQB5L34.pushRootNode,
-  resolveDiagnostics: () => import_chunk_ZWQB5L34.resolveDiagnostics,
-  resolveDiagnosticsMap: () => import_chunk_ZWQB5L34.resolveDiagnosticsMap,
-  sameLookupResult: () => import_chunk_ZWQB5L34.sameLookupResult,
+  isClassVariable: () => import_chunk_OFOOTSQM.isClassVariable,
+  isLocal: () => import_chunk_OFOOTSQM.isLocal,
+  isLookupCandidate: () => import_chunk_OFOOTSQM.isLookupCandidate,
+  isStateNode: () => import_chunk_OFOOTSQM.isStateNode,
+  lookupByFullName: () => import_chunk_OFOOTSQM.lookupByFullName,
+  lookupNext: () => import_chunk_OFOOTSQM.lookupNext,
+  lookupResultContains: () => import_chunk_OFOOTSQM.lookupResultContains,
+  lookupWithType: () => import_chunk_OFOOTSQM.lookupWithType,
+  makeToyboxLink: () => import_chunk_OFOOTSQM.makeToyboxLink,
+  mapVarDeclsByType: () => import_chunk_OFOOTSQM.mapVarDeclsByType,
+  markInvokeClassMethod: () => import_chunk_OFOOTSQM.markInvokeClassMethod,
+  parseSdkVersion: () => import_chunk_OFOOTSQM.parseSdkVersion,
+  popRootNode: () => import_chunk_OFOOTSQM.popRootNode,
+  pushRootNode: () => import_chunk_OFOOTSQM.pushRootNode,
+  resolveDiagnostics: () => import_chunk_OFOOTSQM.resolveDiagnostics,
+  resolveDiagnosticsMap: () => import_chunk_OFOOTSQM.resolveDiagnosticsMap,
+  sameLookupResult: () => import_chunk_OFOOTSQM.sameLookupResult,
   traverseAst: () => import_chunk_JDC43A3I.traverseAst,
-  variableDeclarationName: () => import_chunk_ZWQB5L34.variableDeclarationName,
-  visitReferences: () => import_chunk_ZWQB5L34.visitReferences,
-  visit_resources: () => import_chunk_ZWQB5L34.visit_resources,
-  visitorNode: () => import_chunk_ZWQB5L34.visitorNode
+  variableDeclarationName: () => import_chunk_OFOOTSQM.variableDeclarationName,
+  visitReferences: () => import_chunk_OFOOTSQM.visitReferences,
+  visit_resources: () => import_chunk_OFOOTSQM.visit_resources,
+  visitorNode: () => import_chunk_OFOOTSQM.visitorNode
 });
 module.exports = __toCommonJS(api_exports);
-var import_chunk_ZWQB5L34 = require("./chunk-ZWQB5L34.cjs");
+var import_chunk_OFOOTSQM = require("./chunk-OFOOTSQM.cjs");
 var import_chunk_X7QCZR3F = require("./chunk-X7QCZR3F.cjs");
 var import_chunk_JDC43A3I = require("./chunk-JDC43A3I.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_ZWQB5L34.init_api)();
+(0, import_chunk_OFOOTSQM.init_api)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   checkCompilerVersion,

package/build/{chunk-ZWQB5L34.cjs → chunk-OFOOTSQM.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_ZWQB5L34_exports = {};
-__export(chunk_ZWQB5L34_exports, {
+var chunk_OFOOTSQM_exports = {};
+__export(chunk_OFOOTSQM_exports, {
   EnumTagsConst: () => EnumTagsConst,
   LastTypeTag: () => LastTypeTag,
   ObjectLikeTagsConst: () => ObjectLikeTagsConst,
@@ -140,7 +140,7 @@ __export(chunk_ZWQB5L34_exports, {
   visitorNode: () => visitorNode,
   xml_util_exports: () => xml_util_exports
 });
-module.exports = __toCommonJS(chunk_ZWQB5L34_exports);
+module.exports = __toCommonJS(chunk_OFOOTSQM_exports);
 var import_chunk_X7QCZR3F = require("./chunk-X7QCZR3F.cjs");
 var import_chunk_JDC43A3I = require("./chunk-JDC43A3I.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
@@ -10102,7 +10102,7 @@ function expandKeys(state, table) {
   return result;
 }
 function extraReferenceTypeChecks(istate, report, targetType, sourceType, sourceNode) {
-  if (safeReferenceArg(sourceNode)) {
+  if (targetType.type === 524287 || safeReferenceArg(istate, sourceNode)) {
     return;
   }
   let constrainedType = null;
@@ -10682,6 +10682,11 @@ function evaluateNode(istate, node) {
     }
     istate.stack.push(item);
   };
+  const argType = (arg, i) => {
+    const n = node;
+    const t = n.originalTypes?.[i] || arg.node.type === "BinaryExpression" && arg.node.operator === "as" && arg.node.right;
+    return t ? typeFromTypespec(istate.state, t) : arg.value;
+  };
   switch (node.type) {
     case "BinaryExpression": {
       if (node.operator === "as") {
@@ -10839,7 +10844,7 @@ function evaluateNode(istate, node) {
           node
         });
       } else {
-        const value2 = args.map((arg) => relaxType(arg.value));
+        const value2 = args.map((arg, i) => relaxType(argType(arg, i)));
         push({
           value: { type: 512, value: value2 },
           embeddedEffects,
@@ -10852,9 +10857,9 @@ function evaluateNode(istate, node) {
       const args = node.properties.length ? stack.splice(-node.properties.length * 2) : [];
       const fields = /* @__PURE__ */ new Map();
       for (let i = 0; i < args.length; i += 2) {
-        const key = args[i];
-        const value2 = args[i + 1];
-        const keyStr = objectLiteralKeyFromType(key.value);
+        const key = argType(args[i], i);
+        const value2 = argType(args[i + 1], i + 1);
+        const keyStr = objectLiteralKeyFromType(key);
         if (!keyStr) {
           const value3 = args.reduce(
             (cur, next, i2) => {
@@ -10884,7 +10889,7 @@ function evaluateNode(istate, node) {
           });
           return;
         }
-        fields.set(keyStr, relaxType(value2.value));
+        fields.set(keyStr, relaxType(value2));
       }
       push({
         value: {
@@ -12837,8 +12842,18 @@ function checkArrayCovariance(arg, param) {
   );
   return ok;
 }
-function safeReferenceArg(arg) {
-  return arg.type === "ArrayExpression" || arg.type === "ObjectExpression" || arg.type === "NewExpression";
+function safeReferenceArg(istate, arg) {
+  if (arg.type === "Literal" || arg.type === "ArrayExpression" || arg.type === "ObjectExpression" || arg.type === "NewExpression" || arg.type === "BinaryExpression" && arg.operator === "as" && safeReferenceArg(istate, arg.left) || arg.type === "ConditionalExpression" && safeReferenceArg(istate, arg.consequent) && safeReferenceArg(istate, arg.alternate)) {
+    return true;
+  }
+  const type = istate.typeMap?.get(arg) ?? evaluate(istate, arg).value;
+  if (type && !couldBe({
+    type: 512 | 1024
+    /* Dictionary */
+  }, type)) {
+    return true;
+  }
+  return false;
 }
 var init_array_type = (0, import_chunk_ABYVSU2C.__esm)({
   "src/type-flow/array-type.ts"() {
@@ -12846,6 +12861,7 @@ var init_array_type = (0, import_chunk_ABYVSU2C.__esm)({
     init_sub_type();
     init_types();
     init_could_be();
+    init_interp();
   }
 });
 function cloneAnt(antMap) {
@@ -17681,6 +17697,9 @@ async function optimizeMonkeyCHelper(fnMap, resourcesMap, manifestXML, config) {
           elem.embeddedEffects = false;
         }
       }
+      if (istate2 !== gistate) {
+        delete istate2.typeChecker;
+      }
       again = true;
     }
     return result;
@@ -17893,6 +17912,29 @@ async function optimizeMonkeyCHelper(fnMap, resourcesMap, manifestXML, config) {
       case "ClassDeclaration":
       case "ModuleDeclaration":
         return ["body"];
+      case "ArrayExpression": {
+        const n = node;
+        if (!n.originalTypes && n.elements.some(
+          (e) => e.type === "BinaryExpression" && e.operator === "as"
+        )) {
+          n.originalTypes = n.elements.map(
+            (e) => e.type === "BinaryExpression" && e.operator === "as" ? e.right : null
+          );
+        }
+        break;
+      }
+      case "ObjectExpression": {
+        const n = node;
+        if (!n.originalTypes && n.properties.some(
+          (e) => e.key.type === "BinaryExpression" && e.key.operator === "as" || e.value.type === "BinaryExpression" && e.value.operator === "as"
+        )) {
+          n.originalTypes = n.properties.flatMap((e) => [
+            e.key.type === "BinaryExpression" && e.key.operator === "as" ? e.key.right : null,
+            e.value.type === "BinaryExpression" && e.value.operator === "as" ? e.value.right : null
+          ]);
+        }
+        break;
+      }
     }
     return ret;
   };
@@ -17932,6 +17974,9 @@ async function optimizeMonkeyCHelper(fnMap, resourcesMap, manifestXML, config) {
       case "BlockStatement":
       case "ForStatement":
         if (locals.map && cleanupUnusedVars(this, node) && !this.inlining) {
+          if (istate !== gistate) {
+            delete istate.typeChecker;
+          }
           again = true;
         }
         break;
@@ -30662,7 +30707,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
       const opt_time = await (0, import_chunk_X7QCZR3F.first_modified)(
         Object.values(fnMap).map((v) => v.output)
       );
-      if (source_time < opt_time && 1733273606476 < opt_time) {
+      if (source_time < opt_time && 1734300554639 < opt_time) {
         return {
           hasTests,
           diagnostics: prevDiagnostics,
@@ -30700,7 +30745,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
             hasTests: hasTests2,
             diagnostics,
             sdkVersion,
-            optimizerVersion: "1.1.84",
+            optimizerVersion: "1.1.85",
             ...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_ZWQB5L34.StateNodeAttributes,
-  buildConfigDescription: () => import_chunk_ZWQB5L34.buildConfigDescription,
-  buildOptimizedProject: () => import_chunk_ZWQB5L34.buildOptimizedProject,
+  StateNodeAttributes: () => import_chunk_OFOOTSQM.StateNodeAttributes,
+  buildConfigDescription: () => import_chunk_OFOOTSQM.buildConfigDescription,
+  buildOptimizedProject: () => import_chunk_OFOOTSQM.buildOptimizedProject,
   copyRecursiveAsNeeded: () => import_chunk_X7QCZR3F.copyRecursiveAsNeeded,
-  defaultConfig: () => import_chunk_ZWQB5L34.defaultConfig,
-  display: () => import_chunk_ZWQB5L34.display,
-  generateOneConfig: () => import_chunk_ZWQB5L34.generateOneConfig,
-  generateOptimizedProject: () => import_chunk_ZWQB5L34.generateOptimizedProject,
-  getConfig: () => import_chunk_ZWQB5L34.getConfig,
-  getFnMapAnalysis: () => import_chunk_ZWQB5L34.getFnMapAnalysis,
-  getProjectAnalysis: () => import_chunk_ZWQB5L34.getProjectAnalysis,
-  get_jungle: () => import_chunk_ZWQB5L34.get_jungle,
-  isErrorWithLocation: () => import_chunk_ZWQB5L34.isErrorWithLocation,
-  launchSimulator: () => import_chunk_ZWQB5L34.launchSimulator,
-  manifestProducts: () => import_chunk_ZWQB5L34.manifestProducts,
-  mctree: () => import_chunk_ZWQB5L34.mctree,
-  simulateProgram: () => import_chunk_ZWQB5L34.simulateProgram
+  defaultConfig: () => import_chunk_OFOOTSQM.defaultConfig,
+  display: () => import_chunk_OFOOTSQM.display,
+  generateOneConfig: () => import_chunk_OFOOTSQM.generateOneConfig,
+  generateOptimizedProject: () => import_chunk_OFOOTSQM.generateOptimizedProject,
+  getConfig: () => import_chunk_OFOOTSQM.getConfig,
+  getFnMapAnalysis: () => import_chunk_OFOOTSQM.getFnMapAnalysis,
+  getProjectAnalysis: () => import_chunk_OFOOTSQM.getProjectAnalysis,
+  get_jungle: () => import_chunk_OFOOTSQM.get_jungle,
+  isErrorWithLocation: () => import_chunk_OFOOTSQM.isErrorWithLocation,
+  launchSimulator: () => import_chunk_OFOOTSQM.launchSimulator,
+  manifestProducts: () => import_chunk_OFOOTSQM.manifestProducts,
+  mctree: () => import_chunk_OFOOTSQM.mctree,
+  simulateProgram: () => import_chunk_OFOOTSQM.simulateProgram
 });
 module.exports = __toCommonJS(optimizer_exports);
-var import_chunk_ZWQB5L34 = require("./chunk-ZWQB5L34.cjs");
+var import_chunk_OFOOTSQM = require("./chunk-OFOOTSQM.cjs");
 var import_chunk_X7QCZR3F = require("./chunk-X7QCZR3F.cjs");
 var import_chunk_JDC43A3I = require("./chunk-JDC43A3I.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_ZWQB5L34.init_optimizer)();
+(0, import_chunk_OFOOTSQM.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_ZWQB5L34.SectionKinds,
-  appSupport: () => import_chunk_ZWQB5L34.appSupport,
-  connectiq: () => import_chunk_ZWQB5L34.connectiq,
-  getDeviceInfo: () => import_chunk_ZWQB5L34.getDeviceInfo,
-  getFunctionDocumentation: () => import_chunk_ZWQB5L34.getFunctionDocumentation,
-  getLanguages: () => import_chunk_ZWQB5L34.getLanguages,
-  getSdkPath: () => import_chunk_ZWQB5L34.getSdkPath,
-  isWin: () => import_chunk_ZWQB5L34.isWin,
-  optimizeProgram: () => import_chunk_ZWQB5L34.optimizeProgram,
-  readPrg: () => import_chunk_ZWQB5L34.readPrg,
-  readPrgWithOffsets: () => import_chunk_ZWQB5L34.readPrgWithOffsets,
-  xmlUtil: () => import_chunk_ZWQB5L34.xml_util_exports
+  SectionKinds: () => import_chunk_OFOOTSQM.SectionKinds,
+  appSupport: () => import_chunk_OFOOTSQM.appSupport,
+  connectiq: () => import_chunk_OFOOTSQM.connectiq,
+  getDeviceInfo: () => import_chunk_OFOOTSQM.getDeviceInfo,
+  getFunctionDocumentation: () => import_chunk_OFOOTSQM.getFunctionDocumentation,
+  getLanguages: () => import_chunk_OFOOTSQM.getLanguages,
+  getSdkPath: () => import_chunk_OFOOTSQM.getSdkPath,
+  isWin: () => import_chunk_OFOOTSQM.isWin,
+  optimizeProgram: () => import_chunk_OFOOTSQM.optimizeProgram,
+  readPrg: () => import_chunk_OFOOTSQM.readPrg,
+  readPrgWithOffsets: () => import_chunk_OFOOTSQM.readPrgWithOffsets,
+  xmlUtil: () => import_chunk_OFOOTSQM.xml_util_exports
 });
 module.exports = __toCommonJS(sdk_util_exports);
-var import_chunk_ZWQB5L34 = require("./chunk-ZWQB5L34.cjs");
+var import_chunk_OFOOTSQM = require("./chunk-OFOOTSQM.cjs");
 var import_chunk_X7QCZR3F = require("./chunk-X7QCZR3F.cjs");
 var import_chunk_JDC43A3I = require("./chunk-JDC43A3I.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_ZWQB5L34.init_sdk_util)();
+(0, import_chunk_OFOOTSQM.init_sdk_util)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   SectionKinds,

package/build/src/type-flow/array-type.d.ts

@@ -1,5 +1,6 @@
 import { mctree } from "@markw65/prettier-plugin-monkeyc";
 import { ArrayType, ExactOrUnion } from "./types";
+import { InterpState } from "./interp";
 export type ArrayTypeData = NonNullable<ArrayType["value"]>;
 export declare function tupleForEach(t: ArrayTypeData, tupleFn: (v: ExactOrUnion[]) => unknown, arrayFn: (v: ExactOrUnion) => unknown): void;
 export declare function tupleMap<T, U, V>(t: ArrayTypeData, tupleFn: (v: ExactOrUnion[]) => U | null, arrayFn: (v: ExactOrUnion) => V | null, reduceFn: (v: Array<U | V>) => T): T;
@@ -7,4 +8,4 @@ export declare function tupleReduce(v: Array<ExactOrUnion | ExactOrUnion[]>): im
 export declare function reducedArrayType(t: ArrayTypeData): ExactOrUnion;
 export declare function restrictArrayData(constraint: ArrayTypeData, tracked: ArrayTypeData): ArrayTypeData;
 export declare function checkArrayCovariance(arg: ArrayTypeData, param: ArrayTypeData): boolean;
-export declare function safeReferenceArg(arg: mctree.Expression): boolean;
+export declare function safeReferenceArg(istate: InterpState, arg: mctree.Expression): boolean;

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_ZWQB5L34 = require("./chunk-ZWQB5L34.cjs");
+var import_chunk_OFOOTSQM = require("./chunk-OFOOTSQM.cjs");
 var import_chunk_X7QCZR3F = require("./chunk-X7QCZR3F.cjs");
 var import_chunk_JDC43A3I = require("./chunk-JDC43A3I.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_ZWQB5L34.init_worker_task)();
+    (0, import_chunk_OFOOTSQM.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_ZWQB5L34.performTask)(task));
+        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_OFOOTSQM.performTask)(task));
       });
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@markw65/monkeyc-optimizer",
   "type": "commonjs",
-  "version": "1.1.84",
+  "version": "1.1.85",
   "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.59"
+    "@markw65/prettier-plugin-monkeyc": "^1.0.60"
   },
   "devDependencies": {
     "@markw65/peggy-optimizer": "^1.0.1",