@markw65/monkeyc-optimizer 1.1.42 → 1.1.44

package/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to the "monkeyc-optimizer" package will be documented in this file.
 
+### 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
+
 ### 1.1.42
 
 - Fix a stack overflow caused by the post build array init optimization

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

package/build/{chunk-MWCHENAG.cjs → chunk-56SUGNRA.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_MWCHENAG_exports = {};
-__export(chunk_MWCHENAG_exports, {
+var chunk_56SUGNRA_exports = {};
+__export(chunk_56SUGNRA_exports, {
   EnumTagsConst: () => EnumTagsConst,
   LastTypeTag: () => LastTypeTag,
   ObjectLikeTagsConst: () => ObjectLikeTagsConst,
@@ -133,7 +133,7 @@ __export(chunk_MWCHENAG_exports, {
   visitorNode: () => visitorNode,
   xml_util_exports: () => xml_util_exports
 });
-module.exports = __toCommonJS(chunk_MWCHENAG_exports);
+module.exports = __toCommonJS(chunk_56SUGNRA_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");
@@ -17610,7 +17610,9 @@ function add_one_resource(state, doc, module2, e) {
                   ts: [
                     {
                       type: "TypeSpecPart",
-                      name: (0, import_chunk_MBTLUWXR.makeIdentifier)("Symbol")
+                      name: (0, import_chunk_MBTLUWXR.makeScopedName)(
+                        (state?.sdkVersion ?? 0) >= 7e6 ? "Toybox.Lang.ResourceId" : "Toybox.Lang.Symbol"
+                      )
                     }
                   ]
                 }
@@ -18966,14 +18968,15 @@ function makeToyboxLink(result) {
   return null;
 }
 function lookupByFullName(state, fullName) {
-  return fullName.split(".").reduce(
+  const sn = state.stack?.[0].sn;
+  return sn ? fullName.split(".").reduce(
     (results, part) => {
       return results.flatMap(
         (result) => isStateNode(result) ? result.decls?.[part] || result.type_decls?.[part] : null
-      ).filter((sn) => !!sn);
+      ).filter((sn2) => !!sn2);
     },
-    [state.stack[0].sn]
-  );
+    [sn]
+  ) : [];
 }
 function handleException(state, node, exception) {
   try {
@@ -28321,7 +28324,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 && 1707955700789 < opt_time) {
+      if (source_time < opt_time && 1708019322073 < opt_time) {
         return {
           hasTests,
           diagnostics: prevDiagnostics,
@@ -28360,7 +28363,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
             hasTests: hasTests2,
             diagnostics,
             sdkVersion,
-            optimizerVersion: "1.1.42",
+            optimizerVersion: "1.1.44",
             ...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_MWCHENAG.StateNodeAttributes,
-  buildOptimizedProject: () => import_chunk_MWCHENAG.buildOptimizedProject,
+  StateNodeAttributes: () => import_chunk_56SUGNRA.StateNodeAttributes,
+  buildOptimizedProject: () => import_chunk_56SUGNRA.buildOptimizedProject,
   copyRecursiveAsNeeded: () => import_chunk_SG7ODKRM.copyRecursiveAsNeeded,
-  defaultConfig: () => import_chunk_MWCHENAG.defaultConfig,
-  display: () => import_chunk_MWCHENAG.display,
-  generateOneConfig: () => import_chunk_MWCHENAG.generateOneConfig,
-  generateOptimizedProject: () => import_chunk_MWCHENAG.generateOptimizedProject,
-  getConfig: () => import_chunk_MWCHENAG.getConfig,
-  getProjectAnalysis: () => import_chunk_MWCHENAG.getProjectAnalysis,
-  get_jungle: () => import_chunk_MWCHENAG.get_jungle,
-  isErrorWithLocation: () => import_chunk_MWCHENAG.isErrorWithLocation,
-  launchSimulator: () => import_chunk_MWCHENAG.launchSimulator,
-  manifestProducts: () => import_chunk_MWCHENAG.manifestProducts,
-  mctree: () => import_chunk_MWCHENAG.mctree,
-  simulateProgram: () => import_chunk_MWCHENAG.simulateProgram
+  defaultConfig: () => import_chunk_56SUGNRA.defaultConfig,
+  display: () => import_chunk_56SUGNRA.display,
+  generateOneConfig: () => import_chunk_56SUGNRA.generateOneConfig,
+  generateOptimizedProject: () => import_chunk_56SUGNRA.generateOptimizedProject,
+  getConfig: () => import_chunk_56SUGNRA.getConfig,
+  getProjectAnalysis: () => import_chunk_56SUGNRA.getProjectAnalysis,
+  get_jungle: () => import_chunk_56SUGNRA.get_jungle,
+  isErrorWithLocation: () => import_chunk_56SUGNRA.isErrorWithLocation,
+  launchSimulator: () => import_chunk_56SUGNRA.launchSimulator,
+  manifestProducts: () => import_chunk_56SUGNRA.manifestProducts,
+  mctree: () => import_chunk_56SUGNRA.mctree,
+  simulateProgram: () => import_chunk_56SUGNRA.simulateProgram
 });
 module.exports = __toCommonJS(optimizer_exports);
-var import_chunk_MWCHENAG = require("./chunk-MWCHENAG.cjs");
+var import_chunk_56SUGNRA = require("./chunk-56SUGNRA.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_MWCHENAG.init_optimizer)();
+(0, import_chunk_56SUGNRA.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_MWCHENAG.SectionKinds,
-  appSupport: () => import_chunk_MWCHENAG.appSupport,
-  connectiq: () => import_chunk_MWCHENAG.connectiq,
-  getDeviceInfo: () => import_chunk_MWCHENAG.getDeviceInfo,
-  getFunctionDocumentation: () => import_chunk_MWCHENAG.getFunctionDocumentation,
-  getLanguages: () => import_chunk_MWCHENAG.getLanguages,
-  getSdkPath: () => import_chunk_MWCHENAG.getSdkPath,
-  isWin: () => import_chunk_MWCHENAG.isWin,
-  optimizeProgram: () => import_chunk_MWCHENAG.optimizeProgram,
-  readPrg: () => import_chunk_MWCHENAG.readPrg,
-  readPrgWithOffsets: () => import_chunk_MWCHENAG.readPrgWithOffsets,
-  xmlUtil: () => import_chunk_MWCHENAG.xml_util_exports
+  SectionKinds: () => import_chunk_56SUGNRA.SectionKinds,
+  appSupport: () => import_chunk_56SUGNRA.appSupport,
+  connectiq: () => import_chunk_56SUGNRA.connectiq,
+  getDeviceInfo: () => import_chunk_56SUGNRA.getDeviceInfo,
+  getFunctionDocumentation: () => import_chunk_56SUGNRA.getFunctionDocumentation,
+  getLanguages: () => import_chunk_56SUGNRA.getLanguages,
+  getSdkPath: () => import_chunk_56SUGNRA.getSdkPath,
+  isWin: () => import_chunk_56SUGNRA.isWin,
+  optimizeProgram: () => import_chunk_56SUGNRA.optimizeProgram,
+  readPrg: () => import_chunk_56SUGNRA.readPrg,
+  readPrgWithOffsets: () => import_chunk_56SUGNRA.readPrgWithOffsets,
+  xmlUtil: () => import_chunk_56SUGNRA.xml_util_exports
 });
 module.exports = __toCommonJS(sdk_util_exports);
-var import_chunk_MWCHENAG = require("./chunk-MWCHENAG.cjs");
+var import_chunk_56SUGNRA = require("./chunk-56SUGNRA.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_MWCHENAG.init_sdk_util)();
+(0, import_chunk_56SUGNRA.init_sdk_util)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   SectionKinds,

package/build/src/api.d.ts

@@ -35,7 +35,7 @@ export declare function createDocumentationMap(functionDocumentation: {
     doc: string;
 }[]): Promise<Map<string, string>>;
 export declare function makeToyboxLink(result: StateNodeDecl): string | null;
-export declare function lookupByFullName(state: ProgramStateAnalysis, fullName: string): StateNodeDecl[];
+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;
     decls: {

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_MWCHENAG = require("./chunk-MWCHENAG.cjs");
+var import_chunk_56SUGNRA = require("./chunk-56SUGNRA.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_MWCHENAG.init_worker_task)();
+    (0, import_chunk_56SUGNRA.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_MWCHENAG.performTask)(task));
+        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_56SUGNRA.performTask)(task));
       });
     }
   }

package/package.json

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