@markw65/monkeyc-optimizer 1.1.95 → 1.1.96

package/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 All notable changes to the "monkeyc-optimizer" package will be documented in this file.
 
+### 1.1.96
+
+- Update to [@markw65/prettier-plugin-monkeyc@1.0.66](https://github.com/markw65/prettier-plugin-monkeyc/blob/main/CHANGELOG.md#1066)
+  - Insert a single space after the comma in a list of exclusions if there was at least one space already.
+- Fix [Minor documentation issue regarding running the optimizer via the command line](https://github.com/markw65/monkeyc-optimizer/issues/68)
+- Fix ["Export Optimized Project" fails with "doc.processRefs is not a function"](https://github.com/markw65/monkeyc-optimizer/issues/69)
+- Fix ["Export Optimized Project" fails if extended code takes up more than one page](https://github.com/markw65/monkeyc-optimizer/issues/70)
+- Fix ["Undefined symbol" due to variable resolution issue in jungle file](https://github.com/markw65/monkeyc-optimizer/issues/71)
+
 ### 1.1.95
 
 - Fix a regression introduced in `1.1.94`

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_LUAKJ7GM.checkCompilerVersion,
-  clearDiagnostics: () => import_chunk_LUAKJ7GM.clearDiagnostics,
-  collectNamespaces: () => import_chunk_LUAKJ7GM.collectNamespaces,
-  createDocumentationMap: () => import_chunk_LUAKJ7GM.createDocumentationMap,
-  declKey: () => import_chunk_LUAKJ7GM.declKey,
-  diagnostic: () => import_chunk_LUAKJ7GM.diagnostic,
-  diagnosticHelper: () => import_chunk_LUAKJ7GM.diagnosticHelper,
-  findNamesInScope: () => import_chunk_LUAKJ7GM.findNamesInScope,
-  findUsingForNode: () => import_chunk_LUAKJ7GM.findUsingForNode,
-  formatAst: () => import_chunk_LUAKJ7GM.formatAst,
-  formatAstLongLines: () => import_chunk_LUAKJ7GM.formatAstLongLines,
-  formatScopedName: () => import_chunk_LUAKJ7GM.formatScopedName,
-  getApiFunctionInfo: () => import_chunk_LUAKJ7GM.getApiFunctionInfo,
-  getApiMapping: () => import_chunk_LUAKJ7GM.getApiMapping,
-  getSuperClasses: () => import_chunk_LUAKJ7GM.getSuperClasses,
-  handleImportUsing: () => import_chunk_LUAKJ7GM.handleImportUsing,
+  checkCompilerVersion: () => import_chunk_4C4RQPFP.checkCompilerVersion,
+  clearDiagnostics: () => import_chunk_4C4RQPFP.clearDiagnostics,
+  collectNamespaces: () => import_chunk_4C4RQPFP.collectNamespaces,
+  createDocumentationMap: () => import_chunk_4C4RQPFP.createDocumentationMap,
+  declKey: () => import_chunk_4C4RQPFP.declKey,
+  diagnostic: () => import_chunk_4C4RQPFP.diagnostic,
+  diagnosticHelper: () => import_chunk_4C4RQPFP.diagnosticHelper,
+  findNamesInScope: () => import_chunk_4C4RQPFP.findNamesInScope,
+  findUsingForNode: () => import_chunk_4C4RQPFP.findUsingForNode,
+  formatAst: () => import_chunk_4C4RQPFP.formatAst,
+  formatAstLongLines: () => import_chunk_4C4RQPFP.formatAstLongLines,
+  formatScopedName: () => import_chunk_4C4RQPFP.formatScopedName,
+  getApiFunctionInfo: () => import_chunk_4C4RQPFP.getApiFunctionInfo,
+  getApiMapping: () => import_chunk_4C4RQPFP.getApiMapping,
+  getSuperClasses: () => import_chunk_4C4RQPFP.getSuperClasses,
+  handleImportUsing: () => import_chunk_4C4RQPFP.handleImportUsing,
   hasProperty: () => import_chunk_UBAYZSM3.hasProperty,
-  isClassVariable: () => import_chunk_LUAKJ7GM.isClassVariable,
-  isLocal: () => import_chunk_LUAKJ7GM.isLocal,
-  isLookupCandidate: () => import_chunk_LUAKJ7GM.isLookupCandidate,
-  isStateNode: () => import_chunk_LUAKJ7GM.isStateNode,
-  lookupByFullName: () => import_chunk_LUAKJ7GM.lookupByFullName,
-  lookupNext: () => import_chunk_LUAKJ7GM.lookupNext,
-  lookupResultContains: () => import_chunk_LUAKJ7GM.lookupResultContains,
-  lookupWithType: () => import_chunk_LUAKJ7GM.lookupWithType,
-  makeToyboxLink: () => import_chunk_LUAKJ7GM.makeToyboxLink,
-  mapVarDeclsByType: () => import_chunk_LUAKJ7GM.mapVarDeclsByType,
-  markInvokeClassMethod: () => import_chunk_LUAKJ7GM.markInvokeClassMethod,
-  parseSdkVersion: () => import_chunk_LUAKJ7GM.parseSdkVersion,
-  popRootNode: () => import_chunk_LUAKJ7GM.popRootNode,
-  pushRootNode: () => import_chunk_LUAKJ7GM.pushRootNode,
-  resolveDiagnostics: () => import_chunk_LUAKJ7GM.resolveDiagnostics,
-  resolveDiagnosticsMap: () => import_chunk_LUAKJ7GM.resolveDiagnosticsMap,
-  sameLookupResult: () => import_chunk_LUAKJ7GM.sameLookupResult,
+  isClassVariable: () => import_chunk_4C4RQPFP.isClassVariable,
+  isLocal: () => import_chunk_4C4RQPFP.isLocal,
+  isLookupCandidate: () => import_chunk_4C4RQPFP.isLookupCandidate,
+  isStateNode: () => import_chunk_4C4RQPFP.isStateNode,
+  lookupByFullName: () => import_chunk_4C4RQPFP.lookupByFullName,
+  lookupNext: () => import_chunk_4C4RQPFP.lookupNext,
+  lookupResultContains: () => import_chunk_4C4RQPFP.lookupResultContains,
+  lookupWithType: () => import_chunk_4C4RQPFP.lookupWithType,
+  makeToyboxLink: () => import_chunk_4C4RQPFP.makeToyboxLink,
+  mapVarDeclsByType: () => import_chunk_4C4RQPFP.mapVarDeclsByType,
+  markInvokeClassMethod: () => import_chunk_4C4RQPFP.markInvokeClassMethod,
+  parseSdkVersion: () => import_chunk_4C4RQPFP.parseSdkVersion,
+  popRootNode: () => import_chunk_4C4RQPFP.popRootNode,
+  pushRootNode: () => import_chunk_4C4RQPFP.pushRootNode,
+  resolveDiagnostics: () => import_chunk_4C4RQPFP.resolveDiagnostics,
+  resolveDiagnosticsMap: () => import_chunk_4C4RQPFP.resolveDiagnosticsMap,
+  sameLookupResult: () => import_chunk_4C4RQPFP.sameLookupResult,
   traverseAst: () => import_chunk_UBAYZSM3.traverseAst,
-  variableDeclarationName: () => import_chunk_LUAKJ7GM.variableDeclarationName,
-  visitReferences: () => import_chunk_LUAKJ7GM.visitReferences,
-  visit_resources: () => import_chunk_LUAKJ7GM.visit_resources,
-  visitorNode: () => import_chunk_LUAKJ7GM.visitorNode
+  variableDeclarationName: () => import_chunk_4C4RQPFP.variableDeclarationName,
+  visitReferences: () => import_chunk_4C4RQPFP.visitReferences,
+  visit_resources: () => import_chunk_4C4RQPFP.visit_resources,
+  visitorNode: () => import_chunk_4C4RQPFP.visitorNode
 });
 module.exports = __toCommonJS(api_exports);
-var import_chunk_LUAKJ7GM = require("./chunk-LUAKJ7GM.cjs");
+var import_chunk_4C4RQPFP = require("./chunk-4C4RQPFP.cjs");
 var import_chunk_IJS7AYMN = require("./chunk-IJS7AYMN.cjs");
 var import_chunk_UBAYZSM3 = require("./chunk-UBAYZSM3.cjs");
 var import_chunk_VS2QQHAK = require("./chunk-VS2QQHAK.cjs");
-(0, import_chunk_LUAKJ7GM.init_api)();
+(0, import_chunk_4C4RQPFP.init_api)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   checkCompilerVersion,

package/build/{chunk-LUAKJ7GM.cjs → chunk-4C4RQPFP.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_LUAKJ7GM_exports = {};
-__export(chunk_LUAKJ7GM_exports, {
+var chunk_4C4RQPFP_exports = {};
+__export(chunk_4C4RQPFP_exports, {
   EnumTagsConst: () => EnumTagsConst,
   LastTypeTag: () => LastTypeTag,
   ObjectLikeTagsConst: () => ObjectLikeTagsConst,
@@ -140,7 +140,7 @@ __export(chunk_LUAKJ7GM_exports, {
   visitorNode: () => visitorNode,
   xml_util_exports: () => xml_util_exports
 });
-module.exports = __toCommonJS(chunk_LUAKJ7GM_exports);
+module.exports = __toCommonJS(chunk_4C4RQPFP_exports);
 var import_chunk_IJS7AYMN = require("./chunk-IJS7AYMN.cjs");
 var import_chunk_UBAYZSM3 = require("./chunk-UBAYZSM3.cjs");
 var import_chunk_VS2QQHAK = require("./chunk-VS2QQHAK.cjs");
@@ -23261,9 +23261,14 @@ function markLocals(context) {
   context.debugXml.body.children("localVars").children("entry").elements.forEach((entry) => {
     const { startPc, endPc, stackId, name, arg } = entry.attr;
     (0, import_node_assert16.default)(startPc && endPc && stackId && name);
-    const spc = Number(startPc.value.value) & PC_OFFSET_MASK;
-    const epc = (Number(endPc.value.value) & PC_OFFSET_MASK) + 1;
+    const spcRaw = Number(startPc.value.value);
+    const epcRaw = Number(endPc.value.value) + 1;
     const sid = Number(stackId.value.value);
+    if ((spcRaw & SECTION_PC_MASK) !== TEXT_SECTION_PC || (epcRaw & SECTION_PC_MASK) !== TEXT_SECTION_PC) {
+      return;
+    }
+    const spc = spcRaw & PC_OFFSET_MASK;
+    const epc = epcRaw & PC_OFFSET_MASK;
     let locals = localMap.get(spc);
     if (!locals) {
       locals = [];
@@ -23292,9 +23297,7 @@ function markLocals(context) {
     }
     const locals = localMap.get(bc.offset);
     locals?.forEach((localInfo) => {
-      if (live.has(localInfo.sid)) {
-        (0, import_node_assert16.default)(!live.has(localInfo.sid));
-      }
+      (0, import_node_assert16.default)(!live.has(localInfo.sid));
       live.set(localInfo.sid, localInfo);
       const e = ends.get(localInfo.epc);
       if (e == null) {
@@ -25888,11 +25891,11 @@ function evaluate_locals(assignments) {
     const newLength = Object.keys(locals).length;
     if (newLength === localsLength) break;
     localsLength = newLength;
-    const process_list = (values) => {
+    const process_list = (names, values) => {
       for (let i = values.length; i--; ) {
         const v = values[i];
         if (v.type === "Compound") {
-          process_list(v.values);
+          process_list(null, v.values);
           if (v.values.every((s) => s.type === "Literal")) {
             values[i] = {
               type: "Literal",
@@ -25901,12 +25904,15 @@ function evaluate_locals(assignments) {
           }
         } else if (v.type === "QualifiedName" && v.names.length === 1 && (0, import_chunk_UBAYZSM3.hasProperty)(locals, v.names[0])) {
           values.splice(i, 1, ...locals[v.names[0]]);
+          if (names?.length === 1 && values.every((v2) => v2.type === "Literal")) {
+            locals[names[0]] = values;
+          }
         } else if (v.type === "SubList") {
-          process_list(v.values);
+          process_list(null, v.values);
         }
       }
     };
-    assignments.forEach((a) => process_list(a.values));
+    assignments.forEach((a) => process_list(a.names, a.values));
   }
   return assignments;
 }
@@ -27437,7 +27443,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
       const opt_time = await (0, import_chunk_IJS7AYMN.first_modified)(
         Object.values(fnMap).map((v) => v.output)
       );
-      if (source_time < opt_time && 1769898389896 < opt_time) {
+      if (source_time < opt_time && 1772064318337 < opt_time) {
         return {
           hasTests,
           diagnostics: prevDiagnostics,
@@ -27475,7 +27481,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
             hasTests: hasTests2,
             diagnostics,
             sdkVersion,
-            optimizerVersion: "1.1.95",
+            optimizerVersion: "1.1.96",
             ...Object.fromEntries(
               configOptionsToCheck.map((option) => [option, config[option]])
             )
@@ -27655,12 +27661,16 @@ function restoreQualifier(qualifier) {
   }
   if (qualifier.barrelMap) {
     Object.values(qualifier.barrelMap).forEach((barrel) => {
+      Object.values(barrel.resources).forEach((res) => restoreDocument(res));
       restoreQualifier(barrel.qualifier);
       restoreDocument(barrel.xml);
     });
   }
 }
 function restoreDocument(obj) {
+  if (obj instanceof xml_util_exports.Document) {
+    return;
+  }
   Object.setPrototypeOf(obj, xml_util_exports.Document.prototype);
   const doc = obj;
   if (doc.body.elements) {
@@ -28143,6 +28153,7 @@ async function optimizePackage(filepath, devKey, output, config) {
   } finally {
     stopPool();
   }
+  return { output };
 }
 function optimizePrgAndDebug(prgName, prgBuffer, prgOffset, prgLength, xmlName, xmlBuffer, xmlOffset, xmlLength, key, config) {
   const xmlString = Buffer.from(xmlBuffer, xmlOffset, xmlLength).toString();

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_LUAKJ7GM.StateNodeAttributes,
-  buildConfigDescription: () => import_chunk_LUAKJ7GM.buildConfigDescription,
-  buildOptimizedProject: () => import_chunk_LUAKJ7GM.buildOptimizedProject,
+  StateNodeAttributes: () => import_chunk_4C4RQPFP.StateNodeAttributes,
+  buildConfigDescription: () => import_chunk_4C4RQPFP.buildConfigDescription,
+  buildOptimizedProject: () => import_chunk_4C4RQPFP.buildOptimizedProject,
   copyRecursiveAsNeeded: () => import_chunk_IJS7AYMN.copyRecursiveAsNeeded,
-  defaultConfig: () => import_chunk_LUAKJ7GM.defaultConfig,
-  display: () => import_chunk_LUAKJ7GM.display,
-  generateOneConfig: () => import_chunk_LUAKJ7GM.generateOneConfig,
-  generateOptimizedProject: () => import_chunk_LUAKJ7GM.generateOptimizedProject,
-  getConfig: () => import_chunk_LUAKJ7GM.getConfig,
-  getFnMapAnalysis: () => import_chunk_LUAKJ7GM.getFnMapAnalysis,
-  getProjectAnalysis: () => import_chunk_LUAKJ7GM.getProjectAnalysis,
-  get_jungle: () => import_chunk_LUAKJ7GM.get_jungle,
-  isErrorWithLocation: () => import_chunk_LUAKJ7GM.isErrorWithLocation,
-  launchSimulator: () => import_chunk_LUAKJ7GM.launchSimulator,
-  manifestProducts: () => import_chunk_LUAKJ7GM.manifestProducts,
-  mctree: () => import_chunk_LUAKJ7GM.mctree,
-  simulateProgram: () => import_chunk_LUAKJ7GM.simulateProgram
+  defaultConfig: () => import_chunk_4C4RQPFP.defaultConfig,
+  display: () => import_chunk_4C4RQPFP.display,
+  generateOneConfig: () => import_chunk_4C4RQPFP.generateOneConfig,
+  generateOptimizedProject: () => import_chunk_4C4RQPFP.generateOptimizedProject,
+  getConfig: () => import_chunk_4C4RQPFP.getConfig,
+  getFnMapAnalysis: () => import_chunk_4C4RQPFP.getFnMapAnalysis,
+  getProjectAnalysis: () => import_chunk_4C4RQPFP.getProjectAnalysis,
+  get_jungle: () => import_chunk_4C4RQPFP.get_jungle,
+  isErrorWithLocation: () => import_chunk_4C4RQPFP.isErrorWithLocation,
+  launchSimulator: () => import_chunk_4C4RQPFP.launchSimulator,
+  manifestProducts: () => import_chunk_4C4RQPFP.manifestProducts,
+  mctree: () => import_chunk_4C4RQPFP.mctree,
+  simulateProgram: () => import_chunk_4C4RQPFP.simulateProgram
 });
 module.exports = __toCommonJS(optimizer_exports);
-var import_chunk_LUAKJ7GM = require("./chunk-LUAKJ7GM.cjs");
+var import_chunk_4C4RQPFP = require("./chunk-4C4RQPFP.cjs");
 var import_chunk_IJS7AYMN = require("./chunk-IJS7AYMN.cjs");
 var import_chunk_UBAYZSM3 = require("./chunk-UBAYZSM3.cjs");
 var import_chunk_VS2QQHAK = require("./chunk-VS2QQHAK.cjs");
-(0, import_chunk_LUAKJ7GM.init_optimizer)();
+(0, import_chunk_4C4RQPFP.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_LUAKJ7GM.SectionKinds,
-  appSupport: () => import_chunk_LUAKJ7GM.appSupport,
-  connectiq: () => import_chunk_LUAKJ7GM.connectiq,
-  getDeviceInfo: () => import_chunk_LUAKJ7GM.getDeviceInfo,
-  getFunctionDocumentation: () => import_chunk_LUAKJ7GM.getFunctionDocumentation,
-  getLanguages: () => import_chunk_LUAKJ7GM.getLanguages,
-  getSdkPath: () => import_chunk_LUAKJ7GM.getSdkPath,
-  isWin: () => import_chunk_LUAKJ7GM.isWin,
-  optimizeProgram: () => import_chunk_LUAKJ7GM.optimizeProgram,
-  readPrg: () => import_chunk_LUAKJ7GM.readPrg,
-  readPrgWithOffsets: () => import_chunk_LUAKJ7GM.readPrgWithOffsets,
-  xmlUtil: () => import_chunk_LUAKJ7GM.xml_util_exports
+  SectionKinds: () => import_chunk_4C4RQPFP.SectionKinds,
+  appSupport: () => import_chunk_4C4RQPFP.appSupport,
+  connectiq: () => import_chunk_4C4RQPFP.connectiq,
+  getDeviceInfo: () => import_chunk_4C4RQPFP.getDeviceInfo,
+  getFunctionDocumentation: () => import_chunk_4C4RQPFP.getFunctionDocumentation,
+  getLanguages: () => import_chunk_4C4RQPFP.getLanguages,
+  getSdkPath: () => import_chunk_4C4RQPFP.getSdkPath,
+  isWin: () => import_chunk_4C4RQPFP.isWin,
+  optimizeProgram: () => import_chunk_4C4RQPFP.optimizeProgram,
+  readPrg: () => import_chunk_4C4RQPFP.readPrg,
+  readPrgWithOffsets: () => import_chunk_4C4RQPFP.readPrgWithOffsets,
+  xmlUtil: () => import_chunk_4C4RQPFP.xml_util_exports
 });
 module.exports = __toCommonJS(sdk_util_exports);
-var import_chunk_LUAKJ7GM = require("./chunk-LUAKJ7GM.cjs");
+var import_chunk_4C4RQPFP = require("./chunk-4C4RQPFP.cjs");
 var import_chunk_IJS7AYMN = require("./chunk-IJS7AYMN.cjs");
 var import_chunk_UBAYZSM3 = require("./chunk-UBAYZSM3.cjs");
 var import_chunk_VS2QQHAK = require("./chunk-VS2QQHAK.cjs");
-(0, import_chunk_LUAKJ7GM.init_sdk_util)();
+(0, import_chunk_4C4RQPFP.init_sdk_util)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   SectionKinds,

package/build/src/readprg.d.ts

@@ -12,7 +12,9 @@ export declare function readPrgWithOffsets(view: DataView): {
     view: DataView<ArrayBufferLike>;
     sections: Record<number, SectionInfo>;
 };
-export declare function optimizeProgram(filepath: string, devKey?: string | undefined, output?: string, config?: BuildConfig): Promise<void | {
+export declare function optimizeProgram(filepath: string, devKey?: string | undefined, output?: string, config?: BuildConfig): Promise<{
+    output: string;
+} | {
     signature: Buffer<ArrayBuffer> | undefined;
     output: string;
 }>;

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_LUAKJ7GM = require("./chunk-LUAKJ7GM.cjs");
+var import_chunk_4C4RQPFP = require("./chunk-4C4RQPFP.cjs");
 var import_chunk_IJS7AYMN = require("./chunk-IJS7AYMN.cjs");
 var import_chunk_UBAYZSM3 = require("./chunk-UBAYZSM3.cjs");
 var import_chunk_VS2QQHAK = require("./chunk-VS2QQHAK.cjs");
 var import_node_worker_threads = require("node:worker_threads");
 var require_worker_thread = (0, import_chunk_VS2QQHAK.__commonJS)({
   "src/worker-thread.ts"() {
-    (0, import_chunk_LUAKJ7GM.init_worker_task)();
+    (0, import_chunk_4C4RQPFP.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_LUAKJ7GM.performTask)(task));
+        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_4C4RQPFP.performTask)(task));
       });
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@markw65/monkeyc-optimizer",
   "type": "commonjs",
-  "version": "1.1.95",
+  "version": "1.1.96",
   "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.65",
+    "@markw65/prettier-plugin-monkeyc": "^1.0.66",
     "7z-wasm": "^1.2.0"
   },
   "devDependencies": {