@markw65/monkeyc-optimizer 1.1.61 → 1.1.63

package/CHANGELOG.md

@@ -2,6 +2,19 @@
 
 All notable changes to the "monkeyc-optimizer" package will be documented in this file.
 
+### 1.1.63
+
+- Fixes #31 again, after the fix for #35 broke it
+- Adds some example code in the README, describing how to use the project without `@markw65/prettier-extension-monkeyc`, or `VSCode`
+
+### 1.1.62
+
+- Update to [@markw65/prettier-plugin-monkeyc@1.0.58](https://github.com/markw65/prettier-plugin-monkeyc/blob/main/CHANGELOG.md#1058)
+  - Fix an indentation issue with interfaces
+- Track uninitialized fields in class initializers (Part of fix for #35)
+- Fix lookups for MemberExpressions with literal objects (Rest of fix for #35)
+- Don't report parameters as missing symbols in interface functions (Fixes #36)
+
 ### 1.1.61
 
 - Disable more post-build optimizations to allow apps to verify.

package/README.md

@@ -4,7 +4,7 @@ This package provides a set of utilities for working with Garmin Monkey-C projec
 
 #### Optimization and analysis
 
-Its primary purpose is to serve as the optimization and analysis engine behind [prettier-extension-monkeyc](https://marketplace.visualstudio.com/items?itemName=markw65.prettier-extension-monkeyc). Although it could be used separately to optimize and analyze Monkey-C projects, most of the API is not expected to be stable (ie it will change as required by `prettier-extension-monkeyc`).
+Its primary purpose is to serve as the optimization and analysis engine behind [prettier-extension-monkeyc](https://marketplace.visualstudio.com/items?itemName=markw65.prettier-extension-monkeyc), but it's [API](#api) can also be used to optimize code directly.
 
 #### Font analysis
 
@@ -13,3 +13,85 @@ It also provides a tool to report information about the builtin fonts on a devic
 ## Release Notes
 
 See [Change Log](CHANGELOG.md)
+
+## API
+
+First you will need to [install nodejs/npm](https://nodejs.org/en/download).
+
+Then you can install the package. From the directory where you want to use it:
+
+```
+npm install -D @markw65/monkeyc-optimizer
+```
+
+Then you need some javascript (or typescript) to invoke it. Here's a sample
+
+```js
+import { buildOptimizedProject, getConfig } from "@markw65/monkeyc-optimizer";
+import { optimizeProgram } from "@markw65/monkeyc-optimizer/sdk-util.js";
+import * as path from "node:path";
+
+const jungleFiles = process.argv[2];
+const workspace = path.dirname(jungleFiles);
+
+getConfig({
+  // These are largely the same options that can be passed to tasks in
+  // @markw65/prettier-extension-monkeyc (see the descriptions there)
+  // getConfig will read a number of options (such as developerKeyPath)
+  // from the vscode user settings, and the project settings, but anything
+  // passed in here will override those values.
+  //
+  // The root that output paths are relative to
+  // Defaults to the current directory
+  workspace,
+  // Where to put the files built by MonkeyC.
+  // Defaults to bin. Relative paths are relative to workspace
+  buildDir: "bin",
+  // Where to put the files generated by the source-to-source optimizer
+  // Defaults to bin/optimized. Relative paths are relative to workspace
+  outputPath: "bin/optimized",
+  // Semi-colon separated list of jungle files
+  jungleFiles,
+  // If true, don't actually run the MonkeyC compiler, just return the
+  // command to do so.
+  returnCommand: false,
+}).then((options) =>
+  // Passing null instead of a device id will build an .iq file
+  buildOptimizedProject("fr955", options)
+    .then((result) => {
+      // The return value includes:
+      //
+      // exe - the executable to run to build the generated code ('java')
+      // args - the arguments to pass to exe
+      // diagnostics - collection of diagnostics raised by monkeyc-optimizer
+      // program - the program that was generated by monkeyc (or that would
+      //           be generated, if returnCommand is true)
+      // product - the device that was targeted.
+      // hasTests - true if any functions marked by (:test) were found
+
+      // If you passed `returnCommand: true` above, you would want
+      // to execute (exe, args) here
+      console.log(`Built: ${result.program}`);
+      return result;
+    })
+    .then((result) =>
+      optimizeProgram(
+        // program to optimize
+        result.program,
+        options.developerKeyPath,
+        // output program. default will insert ".opt" before the input's extension
+        // so foo.prg => foo.opt.prg, and foo.iq => foo.opt.iq
+        undefined,
+        // A few of the BuildConfig options apply to the post build optimizer
+        options
+      )
+    )
+    .then(({ output }) => console.log(`Optimized: ${output}`))
+);
+```
+
+If you save the above as `optimize.mjs`, you can then optimize a project via:
+
+```
+node optimize.mjs path-to-my-project-monkey.jungle
+```

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

package/build/{chunk-KCCFA2PP.cjs → chunk-Y2ZRISYL.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_KCCFA2PP_exports = {};
-__export(chunk_KCCFA2PP_exports, {
+var chunk_Y2ZRISYL_exports = {};
+__export(chunk_Y2ZRISYL_exports, {
   EnumTagsConst: () => EnumTagsConst,
   LastTypeTag: () => LastTypeTag,
   ObjectLikeTagsConst: () => ObjectLikeTagsConst,
@@ -133,7 +133,7 @@ __export(chunk_KCCFA2PP_exports, {
   visitorNode: () => visitorNode,
   xml_util_exports: () => xml_util_exports
 });
-module.exports = __toCommonJS(chunk_KCCFA2PP_exports);
+module.exports = __toCommonJS(chunk_Y2ZRISYL_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");
@@ -12477,8 +12477,14 @@ function clearAssocPaths(blockState, decl, v) {
   }
 }
 function cloneTypeState(blockState) {
-  const { map: map2, trackedMemberDecls, liveCopyPropEvents, ...rest } = blockState;
-  const clone = { map: new Map(map2), ...rest };
+  const { map: map2, inited, trackedMemberDecls, liveCopyPropEvents, ...rest } = blockState;
+  const clone = {
+    map: new Map(map2),
+    ...rest
+  };
+  if (inited) {
+    clone.inited = new Set(inited);
+  }
   clone.map.forEach((value2, key) => {
     if (value2.equivSet) {
       if (key === Array.from(value2.equivSet)[0]) {
@@ -12675,6 +12681,7 @@ function mergeTypeState(blockStates, index, from, nodeCopyProp) {
     tov.curType = result;
     changes = true;
   });
+  to.inited?.forEach((k) => from.inited.has(k) || to.inited?.delete(k));
   return changes;
 }
 function typeStateEntry(value2, key) {
@@ -12788,13 +12795,16 @@ function updateAffected(blockState, objectType, baseDecl, assignedPath, affected
 function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStores, logThisRun) {
   const order = getPostOrder(graph).reverse();
   const queue = new DataflowQueue();
-  let selfClassDecl = null;
   const isStatic = !!(func.attributes & 8);
   const klass = func.stack?.[func.stack?.length - 1].sn;
-  if (klass && klass.type === "ClassDeclaration") {
-    selfClassDecl = klass;
-  }
-  const isInitialize = selfClassDecl && func.name === "initialize";
+  const selfClassDecl = klass && klass.type === "ClassDeclaration" ? klass : null;
+  const uninitClassDecls = selfClassDecl && func.name === "initialize" && selfClassDecl.decls ? new Set(
+    Object.values(selfClassDecl.decls).filter(
+      (decls) => decls.some(
+        (decl) => decl.type === "VariableDeclarator" && decl.node.kind === "var" && !decl.node.init
+      )
+    ).flat()
+  ) : null;
   order.forEach((block, i) => {
     block.order = i;
   });
@@ -13040,7 +13050,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
     }
     return [cur, updateAny];
   }
-  function typeConstraint(decls) {
+  function typeConstraint(decls, blockState) {
     return (0, import_chunk_SG7ODKRM.reduce)(
       decls,
       (cur, decl) => {
@@ -13055,7 +13065,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
           cur,
           decl.type === "Literal" ? typeFromLiteral(decl) : typeFromTypeStateNode(state, decl, true)
         );
-        if (isInitialize && decl.type === "VariableDeclarator" && !decl.node.init && decl.node.kind === "var" && decl.stack[decl.stack.length - 1].sn === selfClassDecl) {
+        if (blockState.inited && !blockState.inited.has(decl) && decl.type === "VariableDeclarator" && !decl.node.init && decl.node.kind === "var" && decl.stack[decl.stack.length - 1].sn === selfClassDecl) {
           cur.type |= 1;
         }
         return cur;
@@ -13112,7 +13122,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
     if (Array.isArray(decl) || decl.type !== "MemberDecl" && decl.type !== "Unknown") {
       let tsVal = blockState.map.get(decl);
       if (!tsVal) {
-        tsVal = { curType: typeConstraint(decl) };
+        tsVal = { curType: typeConstraint(decl, blockState) };
         blockState.map.set(decl, tsVal);
       }
       return tsVal;
@@ -13592,7 +13602,9 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
               }
               (0, import_node_assert3.default)(!tsv.copyPropItem);
               clearRelatedCopyPropEvents(curState, decl, nodeCopyProp);
-              curState.map.set(decl, { curType: typeConstraint(decl) });
+              curState.map.set(decl, {
+                curType: typeConstraint(decl, curState)
+              });
             } else if (type.type & (32768 | 512 | 1024) && (calleeEffects == null ? calleeEffects = !callees || !(0, import_chunk_SG7ODKRM.every)(callees, (callee) => callee.info === false) : calleeEffects)) {
               if (type.value != null && type.type & 32768) {
                 const odata = getObjectValue(tsv.curType);
@@ -13701,7 +13713,9 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
                 clearAssocPaths(curState, decls, value2);
               }
               (0, import_node_assert3.default)(!value2.copyPropItem);
-              curState.map.set(decls, { curType: typeConstraint(decls) });
+              curState.map.set(decls, {
+                curType: typeConstraint(decls, curState)
+              });
               clearRelatedCopyPropEvents(curState, decls, nodeCopyProp);
             }
           });
@@ -13779,6 +13793,12 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
             locals.add(event.decl);
           }
         }
+        if (uninitClassDecls?.size) {
+          (0, import_chunk_SG7ODKRM.forEach)(
+            event.decl,
+            (decl) => uninitClassDecls.has(decl) && curState.inited?.add(decl)
+          );
+        }
         if (logThisRun) {
           (0, import_chunk_SG7ODKRM.log)(
             describeEvent(event).then(
@@ -13818,6 +13838,8 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
   };
   blockStates[0] = { map: /* @__PURE__ */ new Map(), visits: 0 };
   const head = blockStates[0];
+  if (uninitClassDecls?.size)
+    head.inited = /* @__PURE__ */ new Set();
   func.node.params.forEach((param) => {
     setStateEvent(
       head,
@@ -18063,6 +18085,8 @@ function visitReferences(state, ast, name, defn, callback, includeDefs = false,
                 );
               }
             }
+          } else if (state.inType && node.operator === "as") {
+            return ["right"];
           }
           break;
         case "CallExpression":
@@ -18560,6 +18584,20 @@ function lookup(state, decls, node, name, maybeStack, nonlocal, ignoreImports) {
       }
       return [null, null];
     }
+    case "Literal": {
+      const [, type] = (0, import_chunk_MBTLUWXR.getNodeValue)(node);
+      if (type === "Null")
+        break;
+      return [
+        name ?? `${node.value}`,
+        [
+          {
+            parent: null,
+            results: lookupByFullName(state, `Toybox.Lang.${type}`)
+          }
+        ]
+      ];
+    }
   }
   return [false, false];
 }
@@ -19414,6 +19452,7 @@ function getSuperClasses(klass) {
 var init_api = (0, import_chunk_ABYVSU2C.__esm)({
   "src/api.ts"() {
     (0, import_chunk_MBTLUWXR.init_ast)();
+    init_data_flow();
     init_mc_rewrite();
     init_negative_fixups();
     init_optimizer_types();
@@ -19422,8 +19461,6 @@ 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();
   }
 });
@@ -29181,7 +29218,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 && 1715644798288 < opt_time) {
+      if (source_time < opt_time && 1716827034287 < opt_time) {
         return {
           hasTests,
           diagnostics: prevDiagnostics,
@@ -29220,7 +29257,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
             hasTests: hasTests2,
             diagnostics,
             sdkVersion,
-            optimizerVersion: "1.1.61",
+            optimizerVersion: "1.1.63",
             ...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_KCCFA2PP.StateNodeAttributes,
-  buildOptimizedProject: () => import_chunk_KCCFA2PP.buildOptimizedProject,
+  StateNodeAttributes: () => import_chunk_Y2ZRISYL.StateNodeAttributes,
+  buildOptimizedProject: () => import_chunk_Y2ZRISYL.buildOptimizedProject,
   copyRecursiveAsNeeded: () => import_chunk_SG7ODKRM.copyRecursiveAsNeeded,
-  defaultConfig: () => import_chunk_KCCFA2PP.defaultConfig,
-  display: () => import_chunk_KCCFA2PP.display,
-  generateOneConfig: () => import_chunk_KCCFA2PP.generateOneConfig,
-  generateOptimizedProject: () => import_chunk_KCCFA2PP.generateOptimizedProject,
-  getConfig: () => import_chunk_KCCFA2PP.getConfig,
-  getProjectAnalysis: () => import_chunk_KCCFA2PP.getProjectAnalysis,
-  get_jungle: () => import_chunk_KCCFA2PP.get_jungle,
-  isErrorWithLocation: () => import_chunk_KCCFA2PP.isErrorWithLocation,
-  launchSimulator: () => import_chunk_KCCFA2PP.launchSimulator,
-  manifestProducts: () => import_chunk_KCCFA2PP.manifestProducts,
-  mctree: () => import_chunk_KCCFA2PP.mctree,
-  simulateProgram: () => import_chunk_KCCFA2PP.simulateProgram
+  defaultConfig: () => import_chunk_Y2ZRISYL.defaultConfig,
+  display: () => import_chunk_Y2ZRISYL.display,
+  generateOneConfig: () => import_chunk_Y2ZRISYL.generateOneConfig,
+  generateOptimizedProject: () => import_chunk_Y2ZRISYL.generateOptimizedProject,
+  getConfig: () => import_chunk_Y2ZRISYL.getConfig,
+  getProjectAnalysis: () => import_chunk_Y2ZRISYL.getProjectAnalysis,
+  get_jungle: () => import_chunk_Y2ZRISYL.get_jungle,
+  isErrorWithLocation: () => import_chunk_Y2ZRISYL.isErrorWithLocation,
+  launchSimulator: () => import_chunk_Y2ZRISYL.launchSimulator,
+  manifestProducts: () => import_chunk_Y2ZRISYL.manifestProducts,
+  mctree: () => import_chunk_Y2ZRISYL.mctree,
+  simulateProgram: () => import_chunk_Y2ZRISYL.simulateProgram
 });
 module.exports = __toCommonJS(optimizer_exports);
-var import_chunk_KCCFA2PP = require("./chunk-KCCFA2PP.cjs");
+var import_chunk_Y2ZRISYL = require("./chunk-Y2ZRISYL.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_KCCFA2PP.init_optimizer)();
+(0, import_chunk_Y2ZRISYL.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_KCCFA2PP.SectionKinds,
-  appSupport: () => import_chunk_KCCFA2PP.appSupport,
-  connectiq: () => import_chunk_KCCFA2PP.connectiq,
-  getDeviceInfo: () => import_chunk_KCCFA2PP.getDeviceInfo,
-  getFunctionDocumentation: () => import_chunk_KCCFA2PP.getFunctionDocumentation,
-  getLanguages: () => import_chunk_KCCFA2PP.getLanguages,
-  getSdkPath: () => import_chunk_KCCFA2PP.getSdkPath,
-  isWin: () => import_chunk_KCCFA2PP.isWin,
-  optimizeProgram: () => import_chunk_KCCFA2PP.optimizeProgram,
-  readPrg: () => import_chunk_KCCFA2PP.readPrg,
-  readPrgWithOffsets: () => import_chunk_KCCFA2PP.readPrgWithOffsets,
-  xmlUtil: () => import_chunk_KCCFA2PP.xml_util_exports
+  SectionKinds: () => import_chunk_Y2ZRISYL.SectionKinds,
+  appSupport: () => import_chunk_Y2ZRISYL.appSupport,
+  connectiq: () => import_chunk_Y2ZRISYL.connectiq,
+  getDeviceInfo: () => import_chunk_Y2ZRISYL.getDeviceInfo,
+  getFunctionDocumentation: () => import_chunk_Y2ZRISYL.getFunctionDocumentation,
+  getLanguages: () => import_chunk_Y2ZRISYL.getLanguages,
+  getSdkPath: () => import_chunk_Y2ZRISYL.getSdkPath,
+  isWin: () => import_chunk_Y2ZRISYL.isWin,
+  optimizeProgram: () => import_chunk_Y2ZRISYL.optimizeProgram,
+  readPrg: () => import_chunk_Y2ZRISYL.readPrg,
+  readPrgWithOffsets: () => import_chunk_Y2ZRISYL.readPrgWithOffsets,
+  xmlUtil: () => import_chunk_Y2ZRISYL.xml_util_exports
 });
 module.exports = __toCommonJS(sdk_util_exports);
-var import_chunk_KCCFA2PP = require("./chunk-KCCFA2PP.cjs");
+var import_chunk_Y2ZRISYL = require("./chunk-Y2ZRISYL.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_KCCFA2PP.init_sdk_util)();
+(0, import_chunk_Y2ZRISYL.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_KCCFA2PP = require("./chunk-KCCFA2PP.cjs");
+var import_chunk_Y2ZRISYL = require("./chunk-Y2ZRISYL.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_KCCFA2PP.init_worker_task)();
+    (0, import_chunk_Y2ZRISYL.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_KCCFA2PP.performTask)(task));
+        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_Y2ZRISYL.performTask)(task));
       });
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@markw65/monkeyc-optimizer",
   "type": "commonjs",
-  "version": "1.1.61",
+  "version": "1.1.63",
   "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.57"
+    "@markw65/prettier-plugin-monkeyc": "^1.0.58"
   },
   "devDependencies": {
     "@markw65/peggy-optimizer": "^1.0.1",