@markw65/monkeyc-optimizer 1.1.30 → 1.1.31

package/README.md

@@ -902,3 +902,10 @@ No functional change, just fixes a typo that broke the typescript exports.
 - Bug fixes
   - Fixes an issue where exporting a project that uses barrels could fail.
   - Fixes a type analysis bug that could result in the type checker incorrectly thinking two types were disjoint.
+
+### 1.1.31
+
+- Better error reporting when getApiMapping fails
+- Update getApiMapping to handle api.mir from sdk-6.2.0
+- Update various tests to work with sdk-6.2.0 (including marking one test as an expected failure)
+- Add a test to catch the export-project-using-barrels bug that was fixed in 1.1.30

package/build/api.cjs

@@ -18,44 +18,44 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var api_exports = {};
 __export(api_exports, {
-  checkCompilerVersion: () => import_chunk_QINU6R5E.checkCompilerVersion,
-  collectNamespaces: () => import_chunk_QINU6R5E.collectNamespaces,
-  createDocumentationMap: () => import_chunk_QINU6R5E.createDocumentationMap,
-  diagnostic: () => import_chunk_QINU6R5E.diagnostic,
-  diagnosticHelper: () => import_chunk_QINU6R5E.diagnosticHelper,
-  findNamesInScope: () => import_chunk_QINU6R5E.findNamesInScope,
-  findUsingForNode: () => import_chunk_QINU6R5E.findUsingForNode,
-  formatAst: () => import_chunk_QINU6R5E.formatAst,
-  formatAstLongLines: () => import_chunk_QINU6R5E.formatAstLongLines,
-  getApiFunctionInfo: () => import_chunk_QINU6R5E.getApiFunctionInfo,
-  getApiMapping: () => import_chunk_QINU6R5E.getApiMapping,
-  getSuperClasses: () => import_chunk_QINU6R5E.getSuperClasses,
+  checkCompilerVersion: () => import_chunk_6OD3V3XN.checkCompilerVersion,
+  collectNamespaces: () => import_chunk_6OD3V3XN.collectNamespaces,
+  createDocumentationMap: () => import_chunk_6OD3V3XN.createDocumentationMap,
+  diagnostic: () => import_chunk_6OD3V3XN.diagnostic,
+  diagnosticHelper: () => import_chunk_6OD3V3XN.diagnosticHelper,
+  findNamesInScope: () => import_chunk_6OD3V3XN.findNamesInScope,
+  findUsingForNode: () => import_chunk_6OD3V3XN.findUsingForNode,
+  formatAst: () => import_chunk_6OD3V3XN.formatAst,
+  formatAstLongLines: () => import_chunk_6OD3V3XN.formatAstLongLines,
+  getApiFunctionInfo: () => import_chunk_6OD3V3XN.getApiFunctionInfo,
+  getApiMapping: () => import_chunk_6OD3V3XN.getApiMapping,
+  getSuperClasses: () => import_chunk_6OD3V3XN.getSuperClasses,
   hasProperty: () => import_chunk_MBTLUWXR.hasProperty,
-  isClassVariable: () => import_chunk_QINU6R5E.isClassVariable,
-  isLocal: () => import_chunk_QINU6R5E.isLocal,
-  isLookupCandidate: () => import_chunk_QINU6R5E.isLookupCandidate,
-  isStateNode: () => import_chunk_QINU6R5E.isStateNode,
-  lookupByFullName: () => import_chunk_QINU6R5E.lookupByFullName,
-  lookupNext: () => import_chunk_QINU6R5E.lookupNext,
-  lookupResultContains: () => import_chunk_QINU6R5E.lookupResultContains,
-  lookupWithType: () => import_chunk_QINU6R5E.lookupWithType,
-  makeToyboxLink: () => import_chunk_QINU6R5E.makeToyboxLink,
-  mapVarDeclsByType: () => import_chunk_QINU6R5E.mapVarDeclsByType,
-  markInvokeClassMethod: () => import_chunk_QINU6R5E.markInvokeClassMethod,
-  parseSdkVersion: () => import_chunk_QINU6R5E.parseSdkVersion,
-  sameLookupResult: () => import_chunk_QINU6R5E.sameLookupResult,
+  isClassVariable: () => import_chunk_6OD3V3XN.isClassVariable,
+  isLocal: () => import_chunk_6OD3V3XN.isLocal,
+  isLookupCandidate: () => import_chunk_6OD3V3XN.isLookupCandidate,
+  isStateNode: () => import_chunk_6OD3V3XN.isStateNode,
+  lookupByFullName: () => import_chunk_6OD3V3XN.lookupByFullName,
+  lookupNext: () => import_chunk_6OD3V3XN.lookupNext,
+  lookupResultContains: () => import_chunk_6OD3V3XN.lookupResultContains,
+  lookupWithType: () => import_chunk_6OD3V3XN.lookupWithType,
+  makeToyboxLink: () => import_chunk_6OD3V3XN.makeToyboxLink,
+  mapVarDeclsByType: () => import_chunk_6OD3V3XN.mapVarDeclsByType,
+  markInvokeClassMethod: () => import_chunk_6OD3V3XN.markInvokeClassMethod,
+  parseSdkVersion: () => import_chunk_6OD3V3XN.parseSdkVersion,
+  sameLookupResult: () => import_chunk_6OD3V3XN.sameLookupResult,
   traverseAst: () => import_chunk_MBTLUWXR.traverseAst,
-  variableDeclarationName: () => import_chunk_QINU6R5E.variableDeclarationName,
-  visitReferences: () => import_chunk_QINU6R5E.visitReferences,
-  visit_resources: () => import_chunk_QINU6R5E.visit_resources,
-  visitorNode: () => import_chunk_QINU6R5E.visitorNode
+  variableDeclarationName: () => import_chunk_6OD3V3XN.variableDeclarationName,
+  visitReferences: () => import_chunk_6OD3V3XN.visitReferences,
+  visit_resources: () => import_chunk_6OD3V3XN.visit_resources,
+  visitorNode: () => import_chunk_6OD3V3XN.visitorNode
 });
 module.exports = __toCommonJS(api_exports);
-var import_chunk_QINU6R5E = require("./chunk-QINU6R5E.cjs");
+var import_chunk_6OD3V3XN = require("./chunk-6OD3V3XN.cjs");
 var import_chunk_PVBIKZYZ = require("./chunk-PVBIKZYZ.cjs");
 var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_QINU6R5E.init_api)();
+(0, import_chunk_6OD3V3XN.init_api)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   checkCompilerVersion,

package/build/{chunk-QINU6R5E.cjs → chunk-6OD3V3XN.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_QINU6R5E_exports = {};
-__export(chunk_QINU6R5E_exports, {
+var chunk_6OD3V3XN_exports = {};
+__export(chunk_6OD3V3XN_exports, {
   EnumTagsConst: () => EnumTagsConst,
   LastTypeTag: () => LastTypeTag,
   ObjectLikeTagsConst: () => ObjectLikeTagsConst,
@@ -122,7 +122,7 @@ __export(chunk_QINU6R5E_exports, {
   visitorNode: () => visitorNode,
   xml_util_exports: () => xml_util_exports
 });
-module.exports = __toCommonJS(chunk_QINU6R5E_exports);
+module.exports = __toCommonJS(chunk_6OD3V3XN_exports);
 var import_chunk_PVBIKZYZ = require("./chunk-PVBIKZYZ.cjs");
 var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
@@ -19213,52 +19213,47 @@ async function getApiMapping(state, resourcesMap, manifestXML) {
       state.sdkVersion = parseSdkVersion(match[1]);
     }
   }
-  const api = (await fs2.readFile(`${sdk}bin/api.mir`)).toString().replace(/\r\n/g, "\n").replace(/^(\s*type)\s/gm, "$1def ");
-  try {
-    const ast = parser.parse(api, null, {
-      filepath: "api.mir"
-    });
-    if (resourcesMap) {
-      const rezAst = state ? state.rezAst || { type: "Program", body: [] } : ast;
-      add_resources_to_ast(state, rezAst, resourcesMap, manifestXML);
-      if (state) {
-        state.rezAst = rezAst;
-        state.manifestXML = manifestXML;
-      }
-    }
-    const result = collectNamespaces(ast, state);
-    if (state && state.rezAst) {
-      collectNamespaces(state.rezAst, state);
-    }
-    negativeFixups.forEach((fixup) => {
-      const vs = fixup.split(".").reduce((state2, part) => {
-        const decls = isStateNode(state2) && state2.decls?.[part];
-        if (!Array.isArray(decls) || decls.length !== 1 || !decls[0]) {
-          throw `Failed to find and fix negative constant ${fixup}`;
-        }
-        return decls[0];
-      }, result);
-      const value2 = isStateNode(vs) ? vs.node : vs;
-      if (!value2 || value2.type !== "EnumStringMember" && (value2.type !== "VariableDeclarator" || value2.kind !== "const")) {
-        throw `Negative constant ${fixup} did not refer to a constant`;
-      }
-      const init = (0, import_chunk_MBTLUWXR.getLiteralNode)(value2.init);
-      if (!init || init.type !== "Literal") {
-        throw `Negative constant ${fixup} was not a Literal`;
-      }
-      if (typeof init.value !== "number") {
-        console.log(`Negative fixup ${fixup} was not a number!`);
-      } else if (init.value > 0) {
-        init.value = -init.value;
-        init.raw = "-" + init.raw;
-      } else {
-      }
-    });
-    return result;
-  } catch (e) {
-    console.error(`${e}`);
-    return null;
-  }
+  const api = (await fs2.readFile(`${sdk}bin/api.mir`)).toString().replace(/\r\n/g, "\n").replace(/^(\s*static)?\s*<init>\s*\{\s*\}\s*?\n/gm, "").replace(/^(\s*type)\s/gm, "$1def ");
+  const ast = parser.parse(api, null, {
+    filepath: "api.mir"
+  });
+  if (resourcesMap) {
+    const rezAst = state ? state.rezAst || { type: "Program", body: [] } : ast;
+    add_resources_to_ast(state, rezAst, resourcesMap, manifestXML);
+    if (state) {
+      state.rezAst = rezAst;
+      state.manifestXML = manifestXML;
+    }
+  }
+  const result = collectNamespaces(ast, state);
+  if (state && state.rezAst) {
+    collectNamespaces(state.rezAst, state);
+  }
+  negativeFixups.forEach((fixup) => {
+    const vs = fixup.split(".").reduce((state2, part) => {
+      const decls = isStateNode(state2) && state2.decls?.[part];
+      if (!Array.isArray(decls) || decls.length !== 1 || !decls[0]) {
+        throw `Failed to find and fix negative constant ${fixup}`;
+      }
+      return decls[0];
+    }, result);
+    const value2 = isStateNode(vs) ? vs.node : vs;
+    if (!value2 || value2.type !== "EnumStringMember" && (value2.type !== "VariableDeclarator" || value2.kind !== "const")) {
+      throw `Negative constant ${fixup} did not refer to a constant`;
+    }
+    const init = (0, import_chunk_MBTLUWXR.getLiteralNode)(value2.init);
+    if (!init || init.type !== "Literal") {
+      throw `Negative constant ${fixup} was not a Literal`;
+    }
+    if (typeof init.value !== "number") {
+      console.log(`Negative fixup ${fixup} was not a number!`);
+    } else if (init.value > 0) {
+      init.value = -init.value;
+      init.raw = "-" + init.raw;
+    } else {
+    }
+  });
+  return result;
 }
 function isStateNode(node) {
   return (0, import_chunk_MBTLUWXR.hasProperty)(node, "node");
@@ -29847,7 +29842,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
     const opt_time = await (0, import_chunk_PVBIKZYZ.first_modified)(
       Object.values(fnMap).map((v) => v.output)
     );
-    if (source_time < opt_time && 1686169752423 < opt_time) {
+    if (source_time < opt_time && 1687277028413 < opt_time) {
       return {
         hasTests,
         diagnostics: prevDiagnostics,
@@ -29884,7 +29879,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
             hasTests: hasTests2,
             diagnostics,
             sdkVersion,
-            optimizerVersion: "1.1.30",
+            optimizerVersion: "1.1.31",
             ...Object.fromEntries(
               configOptionsToCheck.map((option) => [option, config[option]])
             )

package/build/optimizer.cjs

@@ -18,29 +18,29 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var optimizer_exports = {};
 __export(optimizer_exports, {
-  StateNodeAttributes: () => import_chunk_QINU6R5E.StateNodeAttributes,
-  buildOptimizedProject: () => import_chunk_QINU6R5E.buildOptimizedProject,
+  StateNodeAttributes: () => import_chunk_6OD3V3XN.StateNodeAttributes,
+  buildOptimizedProject: () => import_chunk_6OD3V3XN.buildOptimizedProject,
   copyRecursiveAsNeeded: () => import_chunk_PVBIKZYZ.copyRecursiveAsNeeded,
-  defaultConfig: () => import_chunk_QINU6R5E.defaultConfig,
-  display: () => import_chunk_QINU6R5E.display,
-  generateApiMirTests: () => import_chunk_QINU6R5E.generateApiMirTests,
-  generateOneConfig: () => import_chunk_QINU6R5E.generateOneConfig,
-  generateOptimizedProject: () => import_chunk_QINU6R5E.generateOptimizedProject,
-  getConfig: () => import_chunk_QINU6R5E.getConfig,
-  getProjectAnalysis: () => import_chunk_QINU6R5E.getProjectAnalysis,
-  get_jungle: () => import_chunk_QINU6R5E.get_jungle,
-  isErrorWithLocation: () => import_chunk_QINU6R5E.isErrorWithLocation,
-  launchSimulator: () => import_chunk_QINU6R5E.launchSimulator,
-  manifestProducts: () => import_chunk_QINU6R5E.manifestProducts,
-  mctree: () => import_chunk_QINU6R5E.mctree,
-  simulateProgram: () => import_chunk_QINU6R5E.simulateProgram
+  defaultConfig: () => import_chunk_6OD3V3XN.defaultConfig,
+  display: () => import_chunk_6OD3V3XN.display,
+  generateApiMirTests: () => import_chunk_6OD3V3XN.generateApiMirTests,
+  generateOneConfig: () => import_chunk_6OD3V3XN.generateOneConfig,
+  generateOptimizedProject: () => import_chunk_6OD3V3XN.generateOptimizedProject,
+  getConfig: () => import_chunk_6OD3V3XN.getConfig,
+  getProjectAnalysis: () => import_chunk_6OD3V3XN.getProjectAnalysis,
+  get_jungle: () => import_chunk_6OD3V3XN.get_jungle,
+  isErrorWithLocation: () => import_chunk_6OD3V3XN.isErrorWithLocation,
+  launchSimulator: () => import_chunk_6OD3V3XN.launchSimulator,
+  manifestProducts: () => import_chunk_6OD3V3XN.manifestProducts,
+  mctree: () => import_chunk_6OD3V3XN.mctree,
+  simulateProgram: () => import_chunk_6OD3V3XN.simulateProgram
 });
 module.exports = __toCommonJS(optimizer_exports);
-var import_chunk_QINU6R5E = require("./chunk-QINU6R5E.cjs");
+var import_chunk_6OD3V3XN = require("./chunk-6OD3V3XN.cjs");
 var import_chunk_PVBIKZYZ = require("./chunk-PVBIKZYZ.cjs");
 var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_QINU6R5E.init_optimizer)();
+(0, import_chunk_6OD3V3XN.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_QINU6R5E.SectionKinds,
-  appSupport: () => import_chunk_QINU6R5E.appSupport,
-  connectiq: () => import_chunk_QINU6R5E.connectiq,
-  getDeviceInfo: () => import_chunk_QINU6R5E.getDeviceInfo,
-  getFunctionDocumentation: () => import_chunk_QINU6R5E.getFunctionDocumentation,
-  getLanguages: () => import_chunk_QINU6R5E.getLanguages,
-  getSdkPath: () => import_chunk_QINU6R5E.getSdkPath,
-  isWin: () => import_chunk_QINU6R5E.isWin,
-  optimizeProgram: () => import_chunk_QINU6R5E.optimizeProgram,
-  readPrg: () => import_chunk_QINU6R5E.readPrg,
-  readPrgWithOffsets: () => import_chunk_QINU6R5E.readPrgWithOffsets,
-  xmlUtil: () => import_chunk_QINU6R5E.xml_util_exports
+  SectionKinds: () => import_chunk_6OD3V3XN.SectionKinds,
+  appSupport: () => import_chunk_6OD3V3XN.appSupport,
+  connectiq: () => import_chunk_6OD3V3XN.connectiq,
+  getDeviceInfo: () => import_chunk_6OD3V3XN.getDeviceInfo,
+  getFunctionDocumentation: () => import_chunk_6OD3V3XN.getFunctionDocumentation,
+  getLanguages: () => import_chunk_6OD3V3XN.getLanguages,
+  getSdkPath: () => import_chunk_6OD3V3XN.getSdkPath,
+  isWin: () => import_chunk_6OD3V3XN.isWin,
+  optimizeProgram: () => import_chunk_6OD3V3XN.optimizeProgram,
+  readPrg: () => import_chunk_6OD3V3XN.readPrg,
+  readPrgWithOffsets: () => import_chunk_6OD3V3XN.readPrgWithOffsets,
+  xmlUtil: () => import_chunk_6OD3V3XN.xml_util_exports
 });
 module.exports = __toCommonJS(sdk_util_exports);
-var import_chunk_QINU6R5E = require("./chunk-QINU6R5E.cjs");
+var import_chunk_6OD3V3XN = require("./chunk-6OD3V3XN.cjs");
 var import_chunk_PVBIKZYZ = require("./chunk-PVBIKZYZ.cjs");
 var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_QINU6R5E.init_sdk_util)();
+(0, import_chunk_6OD3V3XN.init_sdk_util)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   SectionKinds,

package/build/src/api.d.ts

@@ -9,7 +9,7 @@ export { visitorNode, visitReferences } from "./visitor";
 export { traverseAst, hasProperty, visit_resources };
 export declare function parseSdkVersion(version: string | undefined): number;
 export declare function checkCompilerVersion(version: string, sdkVer: number): boolean | undefined;
-export declare function getApiMapping(state?: ProgramState, resourcesMap?: Record<string, JungleResourceMap>, manifestXML?: xmlUtil.Document): Promise<ProgramStateNode | null>;
+export declare function getApiMapping(state?: ProgramState, resourcesMap?: Record<string, JungleResourceMap>, manifestXML?: xmlUtil.Document): Promise<ProgramStateNode>;
 export declare function isStateNode(node: {
     type: string;
 }): node is StateNode;

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_QINU6R5E = require("./chunk-QINU6R5E.cjs");
+var import_chunk_6OD3V3XN = require("./chunk-6OD3V3XN.cjs");
 var import_chunk_PVBIKZYZ = require("./chunk-PVBIKZYZ.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_QINU6R5E.init_worker_task)();
+    (0, import_chunk_6OD3V3XN.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_QINU6R5E.performTask)(task));
+        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_6OD3V3XN.performTask)(task));
       });
     }
   }

package/package.json

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