@markw65/monkeyc-optimizer 1.1.85 → 1.1.87

package/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to the "monkeyc-optimizer" package will be documented in this file.
 
+### 1.1.87
+
+- Update post build optimizer to work with sdk-7.4.3. The manifest file was changed a little with this release, so I had to update the optimizer to match.
+
+### 1.1.86
+
+- Leaving stashed type lists on ArrayExpression and ObjectExpression could confuse the prettier printer, and result in errors when outputing the optimized files. Remove all of them after optimization is done.
+
 ### 1.1.85
 
 - Update to [@markw65/prettier-plugin-monkeyc@1.0.60](https://github.com/markw65/prettier-plugin-monkeyc/blob/main/CHANGELOG.md#1060)

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

package/build/{chunk-OFOOTSQM.cjs → chunk-N2N7HF67.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_OFOOTSQM_exports = {};
-__export(chunk_OFOOTSQM_exports, {
+var chunk_N2N7HF67_exports = {};
+__export(chunk_N2N7HF67_exports, {
   EnumTagsConst: () => EnumTagsConst,
   LastTypeTag: () => LastTypeTag,
   ObjectLikeTagsConst: () => ObjectLikeTagsConst,
@@ -140,7 +140,7 @@ __export(chunk_OFOOTSQM_exports, {
   visitorNode: () => visitorNode,
   xml_util_exports: () => xml_util_exports
 });
-module.exports = __toCommonJS(chunk_OFOOTSQM_exports);
+module.exports = __toCommonJS(chunk_N2N7HF67_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");
@@ -18234,6 +18234,16 @@ async function optimizeMonkeyCHelper(fnMap, resourcesMap, manifestXML, config) {
       pragmaChecker(state, f.ast, diagnostics?.[f.name]);
     });
   }
+  Object.values(fnMap).forEach((f) => {
+    (0, import_chunk_JDC43A3I.traverseAst)(f.ast, (node) => {
+      if (node.type === "ObjectExpression" || node.type === "ArrayExpression") {
+        const n = node;
+        if (n.originalTypes) {
+          delete n.originalTypes;
+        }
+      }
+    });
+  });
   return {
     diagnostics,
     sdkVersion: state.sdkVersion
@@ -30707,7 +30717,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 && 1734300554639 < opt_time) {
+      if (source_time < opt_time && 1734629819655 < opt_time) {
         return {
           hasTests,
           diagnostics: prevDiagnostics,
@@ -30745,7 +30755,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
             hasTests: hasTests2,
             diagnostics,
             sdkVersion,
-            optimizerVersion: "1.1.85",
+            optimizerVersion: "1.1.87",
             ...Object.fromEntries(
               configOptionsToCheck.map((option) => [option, config[option]])
             )
@@ -31252,8 +31262,17 @@ function optimizePackage(filepath, devKey, output, config) {
   const outName = path5.basename(output, ".iq") + ".prg";
   const rename = (name) => path5.basename(name) === inName ? path5.join(path5.dirname(name), outName) : name;
   const poolStarted = startPool();
-  return getDevKey(devKey).then(
-    (key) => new Promise((resolve5, reject) => {
+  return Promise.all([
+    getDevKey(devKey),
+    getDeviceInfo().then(
+      (deviceInfo) => Object.fromEntries(
+        Object.entries(deviceInfo).flatMap(
+          ([id, info]) => info.partNumbers.map((part) => [part.number, id])
+        )
+      )
+    )
+  ]).then(
+    ([key, deviceInfo]) => new Promise((resolve5, reject) => {
       let manifest = null;
       const sigs = /* @__PURE__ */ new Map();
       const zipfile = new yazl.ZipFile();
@@ -31319,7 +31338,7 @@ function optimizePackage(filepath, devKey, output, config) {
           if (/\/$/.test(entry.fileName)) {
             unzip.readEntry();
           } else {
-            if (entry.fileName === "manifest.sig") {
+            if (entry.fileName.startsWith("manifest.sig")) {
               unzip.readEntry();
               return;
             }
@@ -31372,7 +31391,7 @@ function optimizePackage(filepath, devKey, output, config) {
             });
           }
         });
-        unzip.on("end", () => {
+        unzip.on("end", async () => {
           try {
             if (!manifest) {
               throw new Error("No manifest file found");
@@ -31382,12 +31401,18 @@ function optimizePackage(filepath, devKey, output, config) {
             if (body instanceof Error) {
               throw body;
             }
-            Promise.all(promises).then(() => {
+            await Promise.all(promises).then(() => {
               body.children("iq:application").children("iq:products").children("iq:product").attrs().forEach((attr) => {
-                const id = attr.id?.value.value;
+                const part = attr.partNumber?.value.value;
+                if (!part) {
+                  throw new Error(
+                    `Missing partNumber for product in manifest`
+                  );
+                }
+                const id = deviceInfo[part];
                 if (!id) {
                   throw new Error(
-                    `Product with missing id found in manifest`
+                    `No id found for partNumber '${part}' in manifest`
                   );
                 }
                 const filename = attr.filename?.value.value;
@@ -31410,6 +31435,7 @@ function optimizePackage(filepath, devKey, output, config) {
                 }
                 attr.filename.value.value = newName;
                 attr.sig.value.value = sig2.toString("hex").toUpperCase();
+                delete attr.sig2;
               });
               const contents = Buffer.from(xml_util_exports.writeXml(xml));
               zipfile.addBuffer(contents, "manifest.xml");
@@ -31502,7 +31528,14 @@ async function getDeviceInfo() {
         const ciqVersions = partNumbers.map((part) => part.connectIQVersion);
         return [
           deviceId,
-          { appTypes, deviceFamily, displayName, languages, ciqVersions }
+          {
+            appTypes,
+            deviceFamily,
+            displayName,
+            languages,
+            ciqVersions,
+            partNumbers
+          }
         ];
       });
     })

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_OFOOTSQM.StateNodeAttributes,
-  buildConfigDescription: () => import_chunk_OFOOTSQM.buildConfigDescription,
-  buildOptimizedProject: () => import_chunk_OFOOTSQM.buildOptimizedProject,
+  StateNodeAttributes: () => import_chunk_N2N7HF67.StateNodeAttributes,
+  buildConfigDescription: () => import_chunk_N2N7HF67.buildConfigDescription,
+  buildOptimizedProject: () => import_chunk_N2N7HF67.buildOptimizedProject,
   copyRecursiveAsNeeded: () => import_chunk_X7QCZR3F.copyRecursiveAsNeeded,
-  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
+  defaultConfig: () => import_chunk_N2N7HF67.defaultConfig,
+  display: () => import_chunk_N2N7HF67.display,
+  generateOneConfig: () => import_chunk_N2N7HF67.generateOneConfig,
+  generateOptimizedProject: () => import_chunk_N2N7HF67.generateOptimizedProject,
+  getConfig: () => import_chunk_N2N7HF67.getConfig,
+  getFnMapAnalysis: () => import_chunk_N2N7HF67.getFnMapAnalysis,
+  getProjectAnalysis: () => import_chunk_N2N7HF67.getProjectAnalysis,
+  get_jungle: () => import_chunk_N2N7HF67.get_jungle,
+  isErrorWithLocation: () => import_chunk_N2N7HF67.isErrorWithLocation,
+  launchSimulator: () => import_chunk_N2N7HF67.launchSimulator,
+  manifestProducts: () => import_chunk_N2N7HF67.manifestProducts,
+  mctree: () => import_chunk_N2N7HF67.mctree,
+  simulateProgram: () => import_chunk_N2N7HF67.simulateProgram
 });
 module.exports = __toCommonJS(optimizer_exports);
-var import_chunk_OFOOTSQM = require("./chunk-OFOOTSQM.cjs");
+var import_chunk_N2N7HF67 = require("./chunk-N2N7HF67.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_OFOOTSQM.init_optimizer)();
+(0, import_chunk_N2N7HF67.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_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
+  SectionKinds: () => import_chunk_N2N7HF67.SectionKinds,
+  appSupport: () => import_chunk_N2N7HF67.appSupport,
+  connectiq: () => import_chunk_N2N7HF67.connectiq,
+  getDeviceInfo: () => import_chunk_N2N7HF67.getDeviceInfo,
+  getFunctionDocumentation: () => import_chunk_N2N7HF67.getFunctionDocumentation,
+  getLanguages: () => import_chunk_N2N7HF67.getLanguages,
+  getSdkPath: () => import_chunk_N2N7HF67.getSdkPath,
+  isWin: () => import_chunk_N2N7HF67.isWin,
+  optimizeProgram: () => import_chunk_N2N7HF67.optimizeProgram,
+  readPrg: () => import_chunk_N2N7HF67.readPrg,
+  readPrgWithOffsets: () => import_chunk_N2N7HF67.readPrgWithOffsets,
+  xmlUtil: () => import_chunk_N2N7HF67.xml_util_exports
 });
 module.exports = __toCommonJS(sdk_util_exports);
-var import_chunk_OFOOTSQM = require("./chunk-OFOOTSQM.cjs");
+var import_chunk_N2N7HF67 = require("./chunk-N2N7HF67.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_OFOOTSQM.init_sdk_util)();
+(0, import_chunk_N2N7HF67.init_sdk_util)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   SectionKinds,

package/build/src/sdk-util.d.ts

@@ -5,6 +5,15 @@ export declare const isWin: boolean;
 export declare const appSupport: string;
 export declare const connectiq: string;
 export declare function getSdkPath(): Promise<string>;
+export type PartNumber = {
+    connectIQVersion: string;
+    firmwareVersion: string;
+    languages: Array<{
+        code: string;
+        fontSet: string;
+    }>;
+    number: string;
+};
 export type DeviceInfo = {
     [key: string]: {
         appTypes: {
@@ -15,6 +24,7 @@ export type DeviceInfo = {
         displayName: string;
         languages: Record<string, true>;
         ciqVersions: Array<string>;
+        partNumbers: PartNumber[];
     };
 };
 export declare function getDeviceInfo(): Promise<DeviceInfo>;

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_OFOOTSQM = require("./chunk-OFOOTSQM.cjs");
+var import_chunk_N2N7HF67 = require("./chunk-N2N7HF67.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_OFOOTSQM.init_worker_task)();
+    (0, import_chunk_N2N7HF67.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_OFOOTSQM.performTask)(task));
+        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_N2N7HF67.performTask)(task));
       });
     }
   }

package/package.json

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