@markw65/monkeyc-optimizer 1.1.43 → 1.1.45

package/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to the "monkeyc-optimizer" package will be documented in this file.
 
+### 1.1.45
+
+- Add `extraExcludes` option so that builds can be configured without modifying monkey.jungle
+
+### 1.1.44
+
+- Proper fix for type mismatch errors relating to Rez.Strings under sdk-7.x, with tests. Previous fix introduced diagnostics with sdk-6.x at TypeCheckLevel=Strict
+
 ### 1.1.43
 
 - Fix bogus type mismatch errors relating to Rez.Strings.\* under sdk-7.x

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

package/build/{chunk-SNXXTHNE.cjs → chunk-CYZJPYWZ.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_SNXXTHNE_exports = {};
-__export(chunk_SNXXTHNE_exports, {
+var chunk_CYZJPYWZ_exports = {};
+__export(chunk_CYZJPYWZ_exports, {
   EnumTagsConst: () => EnumTagsConst,
   LastTypeTag: () => LastTypeTag,
   ObjectLikeTagsConst: () => ObjectLikeTagsConst,
@@ -133,7 +133,7 @@ __export(chunk_SNXXTHNE_exports, {
   visitorNode: () => visitorNode,
   xml_util_exports: () => xml_util_exports
 });
-module.exports = __toCommonJS(chunk_SNXXTHNE_exports);
+module.exports = __toCommonJS(chunk_CYZJPYWZ_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");
@@ -17611,7 +17611,7 @@ function add_one_resource(state, doc, module2, e) {
                     {
                       type: "TypeSpecPart",
                       name: (0, import_chunk_MBTLUWXR.makeScopedName)(
-                        state && lookupByFullName(state, "Toybox.Lang.ResourceId") ? "Toybox.Lang.ResourceId" : "Toybox.Lang.Symbol"
+                        (state?.sdkVersion ?? 0) >= 7e6 ? "Toybox.Lang.ResourceId" : "Toybox.Lang.Symbol"
                       )
                     }
                   ]
@@ -18939,10 +18939,10 @@ async function createDocumentationMap(functionDocumentation) {
   });
   return docMap;
 }
-function makeToyboxLink(result) {
+function makeToyboxLink(result, root) {
   const make_link = (fullName, fragment) => {
     const path7 = fullName.split(".");
-    return `https://developer.garmin.com/connect-iq/api-docs/${path7.slice(1, fragment ? -1 : void 0).join("/")}.html` + (fragment ? `#${path7.slice(-1)[0]}-${fragment}` : "");
+    return `${root ?? "https://developer.garmin.com/connect-iq/api-docs/"}${path7.slice(1, fragment ? -1 : void 0).join("/")}.html` + (fragment ? `#${path7.slice(-1)[0]}-${fragment}` : "");
   };
   switch (result.type) {
     case "ClassDeclaration":
@@ -27321,6 +27321,26 @@ function identify_optimizer_groups(targets, options) {
       return null;
     }
   };
+  if (options.extraExcludes) {
+    const toAdd = [];
+    const toRemove = [];
+    options.extraExcludes.split(";").forEach((exclude) => {
+      if (exclude.startsWith("-")) {
+        toRemove.push(exclude.slice(1));
+      } else {
+        toAdd.push(exclude);
+      }
+    });
+    targets.forEach((target) => {
+      const ex = Object.fromEntries(
+        (target.qualifier.excludeAnnotations?.concat(toAdd) ?? toAdd).map(
+          (x) => [x, true]
+        )
+      );
+      toRemove.forEach((r) => delete ex[r]);
+      target.qualifier.excludeAnnotations = Object.keys(ex);
+    });
+  }
   const ignoredExcludeAnnotations = ignoreStrOption(
     options.ignoredExcludeAnnotations
   );
@@ -28324,7 +28344,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 && 1707958781012 < opt_time) {
+      if (source_time < opt_time && 1708217121885 < opt_time) {
         return {
           hasTests,
           diagnostics: prevDiagnostics,
@@ -28363,7 +28383,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
             hasTests: hasTests2,
             diagnostics,
             sdkVersion,
-            optimizerVersion: "1.1.43",
+            optimizerVersion: "1.1.45",
             ...Object.fromEntries(
               configOptionsToCheck.map((option) => [option, config[option]])
             )
@@ -28551,7 +28571,8 @@ var init_optimizer = (0, import_chunk_ABYVSU2C.__esm)({
       "extensionVersion",
       "typeCheckLevel",
       "covarianceWarnings",
-      "iterateOptimizer"
+      "iterateOptimizer",
+      "extraExcludes"
     ];
   }
 });

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

package/build/src/api.d.ts

@@ -34,7 +34,7 @@ export declare function createDocumentationMap(functionDocumentation: {
     parent: string;
     doc: string;
 }[]): Promise<Map<string, string>>;
-export declare function makeToyboxLink(result: StateNodeDecl): string | null;
+export declare function makeToyboxLink(result: StateNodeDecl, root?: string): string | null;
 export declare function lookupByFullName(state: ProgramState, fullName: string): StateNodeDecl[];
 export declare function findUsingForNode(state: ProgramStateLive, stack: ProgramStateStack, i: number, node: mctree.Identifier): ModuleStateNode | {
     name: string;

package/build/src/optimizer-types.d.ts

@@ -23,6 +23,7 @@ export type BuildConfig = {
     skipOptimization?: boolean;
     checkManifest?: boolean;
     device?: string;
+    extraExcludes?: string;
     ignoredExcludeAnnotations?: string;
     ignoredAnnotations?: string;
     ignoredSourcePaths?: 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_SNXXTHNE = require("./chunk-SNXXTHNE.cjs");
+var import_chunk_CYZJPYWZ = require("./chunk-CYZJPYWZ.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_SNXXTHNE.init_worker_task)();
+    (0, import_chunk_CYZJPYWZ.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_SNXXTHNE.performTask)(task));
+        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_CYZJPYWZ.performTask)(task));
       });
     }
   }

package/package.json

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