@markw65/monkeyc-optimizer 1.1.29 → 1.1.30

package/README.md

@@ -896,3 +896,9 @@ No functional change, just fixes a typo that broke the typescript exports.
 
 - Enhancements
   - various methods used by the extension for completion and hover info have been updated to give more accurate results.
+
+### 1.1.30
+
+- 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.

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

package/build/{chunk-PUYLJGKM.cjs → chunk-QINU6R5E.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_PUYLJGKM_exports = {};
-__export(chunk_PUYLJGKM_exports, {
+var chunk_QINU6R5E_exports = {};
+__export(chunk_QINU6R5E_exports, {
   EnumTagsConst: () => EnumTagsConst,
   LastTypeTag: () => LastTypeTag,
   ObjectLikeTagsConst: () => ObjectLikeTagsConst,
@@ -122,7 +122,7 @@ __export(chunk_PUYLJGKM_exports, {
   visitorNode: () => visitorNode,
   xml_util_exports: () => xml_util_exports
 });
-module.exports = __toCommonJS(chunk_PUYLJGKM_exports);
+module.exports = __toCommonJS(chunk_QINU6R5E_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");
@@ -13200,6 +13200,9 @@ function couldBeHelper(a, b, shallow) {
     if (a.value == null || b.value == null || a.value === b.value) {
       return true;
     }
+    if (common & SingletonTypeTagsConst) {
+      return true;
+    }
     if (common & ValueTypeTagsConst && common & UnionDataTypeTagsConst) {
       return true;
     }
@@ -29844,7 +29847,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 && 1685575802667 < opt_time) {
+    if (source_time < opt_time && 1686169752423 < opt_time) {
       return {
         hasTests,
         diagnostics: prevDiagnostics,
@@ -29881,7 +29884,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
             hasTests: hasTests2,
             diagnostics,
             sdkVersion,
-            optimizerVersion: "1.1.29",
+            optimizerVersion: "1.1.30",
             ...Object.fromEntries(
               configOptionsToCheck.map((option) => [option, config[option]])
             )
@@ -30104,6 +30107,26 @@ var init_optimizer = (0, import_chunk_ABYVSU2C.__esm)({
     ];
   }
 });
+function restoreQualifier(qualifier) {
+  if (qualifier.resourceMap) {
+    Object.values(qualifier.resourceMap).forEach((doc) => restoreDocument(doc));
+  }
+  if (qualifier.barrelMap) {
+    Object.values(qualifier.barrelMap).forEach((barrel) => {
+      restoreQualifier(barrel.qualifier);
+      restoreDocument(barrel.xml);
+    });
+  }
+}
+function restoreDocument(obj) {
+  Object.setPrototypeOf(obj, xml_util_exports.Document.prototype);
+  const doc = obj;
+  if (doc.body.elements) {
+    Object.setPrototypeOf(doc.body, xml_util_exports.Nodes.prototype);
+  } else {
+    Object.setPrototypeOf(doc.body, Error.prototype);
+  }
+}
 async function performTask(task) {
   const type = task.type;
   const handler = Object.prototype.hasOwnProperty.call(workerTaskHandlers, type) && workerTaskHandlers[type];
@@ -30127,13 +30150,9 @@ var init_worker_task = (0, import_chunk_ABYVSU2C.__esm)({
         return generateOptimizedProject(data.options);
       },
       generateOneConfig(data) {
-        if (data.buildConfig.resourceMap) {
-          Object.values(data.buildConfig.resourceMap).forEach(
-            (doc) => Object.setPrototypeOf(doc, xml_util_exports.Document.prototype)
-          );
-        }
+        restoreQualifier(data.buildConfig);
         if (data.manifestXML) {
-          Object.setPrototypeOf(data.manifestXML, xml_util_exports.Document.prototype);
+          restoreDocument(data.manifestXML);
         }
         return generateOneConfig(
           data.buildConfig,

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

package/build/src/worker-task.d.ts

@@ -83,6 +83,6 @@ export declare const workerTaskHandlers: {
     }>;
 };
 type RemovePromise<T> = T extends Promise<infer U> ? U : T;
-export type WorkerTaskResult<T> = T extends WorkerTask ? RemovePromise<ReturnType<typeof workerTaskHandlers[T["type"]]>> : never;
+export type WorkerTaskResult<T> = T extends WorkerTask ? RemovePromise<ReturnType<(typeof workerTaskHandlers)[T["type"]]>> : never;
 export declare function performTask<T extends WorkerTask>(task: T): Promise<WorkerTaskResult<T>>;
 export {};

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_PUYLJGKM = require("./chunk-PUYLJGKM.cjs");
+var import_chunk_QINU6R5E = require("./chunk-QINU6R5E.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_PUYLJGKM.init_worker_task)();
+    (0, import_chunk_QINU6R5E.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_PUYLJGKM.performTask)(task));
+        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_QINU6R5E.performTask)(task));
       });
     }
   }

package/package.json

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