@markw65/monkeyc-optimizer 1.1.78 → 1.1.80

package/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 All notable changes to the "monkeyc-optimizer" package will be documented in this file.
 
+### 1.1.80
+
+- Proper fix for union of distinct enum values (the fix in 1.1.79 didn't always work)
+
+### 1.1.79
+
+- Keep better track of enum value types in unions of distinct enums
+- Fix an issue that could cause huge amounts of wasted memory, and time, when intersecting class, module or function types.
+
 ### 1.1.78
 
 - Consistently use the name of the project directory to name the prg file

package/build/api.cjs

@@ -18,51 +18,51 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var api_exports = {};
 __export(api_exports, {
-  checkCompilerVersion: () => import_chunk_Y3DFSFGP.checkCompilerVersion,
-  collectNamespaces: () => import_chunk_Y3DFSFGP.collectNamespaces,
-  createDocumentationMap: () => import_chunk_Y3DFSFGP.createDocumentationMap,
-  declKey: () => import_chunk_Y3DFSFGP.declKey,
-  diagnostic: () => import_chunk_Y3DFSFGP.diagnostic,
-  diagnosticHelper: () => import_chunk_Y3DFSFGP.diagnosticHelper,
-  findNamesInScope: () => import_chunk_Y3DFSFGP.findNamesInScope,
-  findUsingForNode: () => import_chunk_Y3DFSFGP.findUsingForNode,
-  formatAst: () => import_chunk_Y3DFSFGP.formatAst,
-  formatAstLongLines: () => import_chunk_Y3DFSFGP.formatAstLongLines,
-  formatScopedName: () => import_chunk_Y3DFSFGP.formatScopedName,
-  getApiFunctionInfo: () => import_chunk_Y3DFSFGP.getApiFunctionInfo,
-  getApiMapping: () => import_chunk_Y3DFSFGP.getApiMapping,
-  getSuperClasses: () => import_chunk_Y3DFSFGP.getSuperClasses,
-  handleImportUsing: () => import_chunk_Y3DFSFGP.handleImportUsing,
+  checkCompilerVersion: () => import_chunk_3KM4FHVN.checkCompilerVersion,
+  collectNamespaces: () => import_chunk_3KM4FHVN.collectNamespaces,
+  createDocumentationMap: () => import_chunk_3KM4FHVN.createDocumentationMap,
+  declKey: () => import_chunk_3KM4FHVN.declKey,
+  diagnostic: () => import_chunk_3KM4FHVN.diagnostic,
+  diagnosticHelper: () => import_chunk_3KM4FHVN.diagnosticHelper,
+  findNamesInScope: () => import_chunk_3KM4FHVN.findNamesInScope,
+  findUsingForNode: () => import_chunk_3KM4FHVN.findUsingForNode,
+  formatAst: () => import_chunk_3KM4FHVN.formatAst,
+  formatAstLongLines: () => import_chunk_3KM4FHVN.formatAstLongLines,
+  formatScopedName: () => import_chunk_3KM4FHVN.formatScopedName,
+  getApiFunctionInfo: () => import_chunk_3KM4FHVN.getApiFunctionInfo,
+  getApiMapping: () => import_chunk_3KM4FHVN.getApiMapping,
+  getSuperClasses: () => import_chunk_3KM4FHVN.getSuperClasses,
+  handleImportUsing: () => import_chunk_3KM4FHVN.handleImportUsing,
   hasProperty: () => import_chunk_JDC43A3I.hasProperty,
-  isClassVariable: () => import_chunk_Y3DFSFGP.isClassVariable,
-  isLocal: () => import_chunk_Y3DFSFGP.isLocal,
-  isLookupCandidate: () => import_chunk_Y3DFSFGP.isLookupCandidate,
-  isStateNode: () => import_chunk_Y3DFSFGP.isStateNode,
-  lookupByFullName: () => import_chunk_Y3DFSFGP.lookupByFullName,
-  lookupNext: () => import_chunk_Y3DFSFGP.lookupNext,
-  lookupResultContains: () => import_chunk_Y3DFSFGP.lookupResultContains,
-  lookupWithType: () => import_chunk_Y3DFSFGP.lookupWithType,
-  makeToyboxLink: () => import_chunk_Y3DFSFGP.makeToyboxLink,
-  mapVarDeclsByType: () => import_chunk_Y3DFSFGP.mapVarDeclsByType,
-  markInvokeClassMethod: () => import_chunk_Y3DFSFGP.markInvokeClassMethod,
-  parseSdkVersion: () => import_chunk_Y3DFSFGP.parseSdkVersion,
-  popRootNode: () => import_chunk_Y3DFSFGP.popRootNode,
-  pushRootNode: () => import_chunk_Y3DFSFGP.pushRootNode,
-  resolveDiagnostics: () => import_chunk_Y3DFSFGP.resolveDiagnostics,
-  resolveDiagnosticsMap: () => import_chunk_Y3DFSFGP.resolveDiagnosticsMap,
-  sameLookupResult: () => import_chunk_Y3DFSFGP.sameLookupResult,
+  isClassVariable: () => import_chunk_3KM4FHVN.isClassVariable,
+  isLocal: () => import_chunk_3KM4FHVN.isLocal,
+  isLookupCandidate: () => import_chunk_3KM4FHVN.isLookupCandidate,
+  isStateNode: () => import_chunk_3KM4FHVN.isStateNode,
+  lookupByFullName: () => import_chunk_3KM4FHVN.lookupByFullName,
+  lookupNext: () => import_chunk_3KM4FHVN.lookupNext,
+  lookupResultContains: () => import_chunk_3KM4FHVN.lookupResultContains,
+  lookupWithType: () => import_chunk_3KM4FHVN.lookupWithType,
+  makeToyboxLink: () => import_chunk_3KM4FHVN.makeToyboxLink,
+  mapVarDeclsByType: () => import_chunk_3KM4FHVN.mapVarDeclsByType,
+  markInvokeClassMethod: () => import_chunk_3KM4FHVN.markInvokeClassMethod,
+  parseSdkVersion: () => import_chunk_3KM4FHVN.parseSdkVersion,
+  popRootNode: () => import_chunk_3KM4FHVN.popRootNode,
+  pushRootNode: () => import_chunk_3KM4FHVN.pushRootNode,
+  resolveDiagnostics: () => import_chunk_3KM4FHVN.resolveDiagnostics,
+  resolveDiagnosticsMap: () => import_chunk_3KM4FHVN.resolveDiagnosticsMap,
+  sameLookupResult: () => import_chunk_3KM4FHVN.sameLookupResult,
   traverseAst: () => import_chunk_JDC43A3I.traverseAst,
-  variableDeclarationName: () => import_chunk_Y3DFSFGP.variableDeclarationName,
-  visitReferences: () => import_chunk_Y3DFSFGP.visitReferences,
-  visit_resources: () => import_chunk_Y3DFSFGP.visit_resources,
-  visitorNode: () => import_chunk_Y3DFSFGP.visitorNode
+  variableDeclarationName: () => import_chunk_3KM4FHVN.variableDeclarationName,
+  visitReferences: () => import_chunk_3KM4FHVN.visitReferences,
+  visit_resources: () => import_chunk_3KM4FHVN.visit_resources,
+  visitorNode: () => import_chunk_3KM4FHVN.visitorNode
 });
 module.exports = __toCommonJS(api_exports);
-var import_chunk_Y3DFSFGP = require("./chunk-Y3DFSFGP.cjs");
+var import_chunk_3KM4FHVN = require("./chunk-3KM4FHVN.cjs");
 var import_chunk_NHZRKHZO = require("./chunk-NHZRKHZO.cjs");
 var import_chunk_JDC43A3I = require("./chunk-JDC43A3I.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_Y3DFSFGP.init_api)();
+(0, import_chunk_3KM4FHVN.init_api)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   checkCompilerVersion,

package/build/{chunk-Y3DFSFGP.cjs → chunk-3KM4FHVN.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_Y3DFSFGP_exports = {};
-__export(chunk_Y3DFSFGP_exports, {
+var chunk_3KM4FHVN_exports = {};
+__export(chunk_3KM4FHVN_exports, {
   EnumTagsConst: () => EnumTagsConst,
   LastTypeTag: () => LastTypeTag,
   ObjectLikeTagsConst: () => ObjectLikeTagsConst,
@@ -139,7 +139,7 @@ __export(chunk_Y3DFSFGP_exports, {
   visitorNode: () => visitorNode,
   xml_util_exports: () => xml_util_exports
 });
-module.exports = __toCommonJS(chunk_Y3DFSFGP_exports);
+module.exports = __toCommonJS(chunk_3KM4FHVN_exports);
 var import_chunk_NHZRKHZO = require("./chunk-NHZRKHZO.cjs");
 var import_chunk_JDC43A3I = require("./chunk-JDC43A3I.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
@@ -7858,6 +7858,12 @@ function mergeSingle(pair) {
       const toE = pair.avalue;
       const fromE = pair.bvalue;
       if (toE.enum !== fromE.enum) {
+        if (toE.value && fromE.value) {
+          const result = cloneType(toE.value);
+          unionInto(result, fromE.value);
+          const e = { value: result };
+          return [e, true];
+        }
         return [null, true];
       }
       if (!toE.value) {
@@ -8286,32 +8292,34 @@ function intersectionValue(pair) {
     }
     case 4096:
     case 8192: {
-      const common = [];
+      const common = /* @__PURE__ */ new Set();
       (0, import_chunk_NHZRKHZO.forEach)(
         pair.avalue,
-        (sna) => (0, import_chunk_NHZRKHZO.some)(pair.bvalue, (snb) => sna === snb) && common.push(sna)
+        (sna) => (0, import_chunk_NHZRKHZO.some)(pair.bvalue, (snb) => sna === snb) && common.add(sna)
       );
-      if (!common.length)
+      if (!common.size)
         return null;
-      return common.length === 1 ? common[0] : common;
+      const arr = Array.from(common);
+      return arr.length === 1 ? arr[0] : arr;
     }
     case 16384: {
-      const common = [];
+      const common = /* @__PURE__ */ new Set();
       (0, import_chunk_NHZRKHZO.forEach)(pair.avalue, (sna) => {
         const superA = getSuperClasses(sna);
         (0, import_chunk_NHZRKHZO.forEach)(pair.bvalue, (snb) => {
           if (sna === snb || superA && superA.has(snb)) {
-            common.push(sna);
+            common.add(sna);
           }
           const superB = getSuperClasses(snb);
           if (superB && superB.has(sna)) {
-            common.push(snb);
+            common.add(snb);
           }
         });
       });
-      if (!common.length)
+      if (!common.size)
         return null;
-      return common.length === 1 ? common[0] : common;
+      const arr = Array.from(common);
+      return arr.length === 1 ? arr[0] : arr;
     }
     case 32768: {
       const klass = intersection(pair.avalue.klass, pair.bvalue.klass);
@@ -30198,7 +30206,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
       const opt_time = await (0, import_chunk_NHZRKHZO.first_modified)(
         Object.values(fnMap).map((v) => v.output)
       );
-      if (source_time < opt_time && 1730668639817 < opt_time) {
+      if (source_time < opt_time && 1731196989092 < opt_time) {
         return {
           hasTests,
           diagnostics: prevDiagnostics,
@@ -30236,7 +30244,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
             hasTests: hasTests2,
             diagnostics,
             sdkVersion,
-            optimizerVersion: "1.1.78",
+            optimizerVersion: "1.1.80",
             ...Object.fromEntries(
               configOptionsToCheck.map((option) => [option, config[option]])
             )

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_Y3DFSFGP.StateNodeAttributes,
-  buildConfigDescription: () => import_chunk_Y3DFSFGP.buildConfigDescription,
-  buildOptimizedProject: () => import_chunk_Y3DFSFGP.buildOptimizedProject,
+  StateNodeAttributes: () => import_chunk_3KM4FHVN.StateNodeAttributes,
+  buildConfigDescription: () => import_chunk_3KM4FHVN.buildConfigDescription,
+  buildOptimizedProject: () => import_chunk_3KM4FHVN.buildOptimizedProject,
   copyRecursiveAsNeeded: () => import_chunk_NHZRKHZO.copyRecursiveAsNeeded,
-  defaultConfig: () => import_chunk_Y3DFSFGP.defaultConfig,
-  display: () => import_chunk_Y3DFSFGP.display,
-  generateOneConfig: () => import_chunk_Y3DFSFGP.generateOneConfig,
-  generateOptimizedProject: () => import_chunk_Y3DFSFGP.generateOptimizedProject,
-  getConfig: () => import_chunk_Y3DFSFGP.getConfig,
-  getFnMapAnalysis: () => import_chunk_Y3DFSFGP.getFnMapAnalysis,
-  getProjectAnalysis: () => import_chunk_Y3DFSFGP.getProjectAnalysis,
-  get_jungle: () => import_chunk_Y3DFSFGP.get_jungle,
-  isErrorWithLocation: () => import_chunk_Y3DFSFGP.isErrorWithLocation,
-  launchSimulator: () => import_chunk_Y3DFSFGP.launchSimulator,
-  manifestProducts: () => import_chunk_Y3DFSFGP.manifestProducts,
-  mctree: () => import_chunk_Y3DFSFGP.mctree,
-  simulateProgram: () => import_chunk_Y3DFSFGP.simulateProgram
+  defaultConfig: () => import_chunk_3KM4FHVN.defaultConfig,
+  display: () => import_chunk_3KM4FHVN.display,
+  generateOneConfig: () => import_chunk_3KM4FHVN.generateOneConfig,
+  generateOptimizedProject: () => import_chunk_3KM4FHVN.generateOptimizedProject,
+  getConfig: () => import_chunk_3KM4FHVN.getConfig,
+  getFnMapAnalysis: () => import_chunk_3KM4FHVN.getFnMapAnalysis,
+  getProjectAnalysis: () => import_chunk_3KM4FHVN.getProjectAnalysis,
+  get_jungle: () => import_chunk_3KM4FHVN.get_jungle,
+  isErrorWithLocation: () => import_chunk_3KM4FHVN.isErrorWithLocation,
+  launchSimulator: () => import_chunk_3KM4FHVN.launchSimulator,
+  manifestProducts: () => import_chunk_3KM4FHVN.manifestProducts,
+  mctree: () => import_chunk_3KM4FHVN.mctree,
+  simulateProgram: () => import_chunk_3KM4FHVN.simulateProgram
 });
 module.exports = __toCommonJS(optimizer_exports);
-var import_chunk_Y3DFSFGP = require("./chunk-Y3DFSFGP.cjs");
+var import_chunk_3KM4FHVN = require("./chunk-3KM4FHVN.cjs");
 var import_chunk_NHZRKHZO = require("./chunk-NHZRKHZO.cjs");
 var import_chunk_JDC43A3I = require("./chunk-JDC43A3I.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_Y3DFSFGP.init_optimizer)();
+(0, import_chunk_3KM4FHVN.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_Y3DFSFGP.SectionKinds,
-  appSupport: () => import_chunk_Y3DFSFGP.appSupport,
-  connectiq: () => import_chunk_Y3DFSFGP.connectiq,
-  getDeviceInfo: () => import_chunk_Y3DFSFGP.getDeviceInfo,
-  getFunctionDocumentation: () => import_chunk_Y3DFSFGP.getFunctionDocumentation,
-  getLanguages: () => import_chunk_Y3DFSFGP.getLanguages,
-  getSdkPath: () => import_chunk_Y3DFSFGP.getSdkPath,
-  isWin: () => import_chunk_Y3DFSFGP.isWin,
-  optimizeProgram: () => import_chunk_Y3DFSFGP.optimizeProgram,
-  readPrg: () => import_chunk_Y3DFSFGP.readPrg,
-  readPrgWithOffsets: () => import_chunk_Y3DFSFGP.readPrgWithOffsets,
-  xmlUtil: () => import_chunk_Y3DFSFGP.xml_util_exports
+  SectionKinds: () => import_chunk_3KM4FHVN.SectionKinds,
+  appSupport: () => import_chunk_3KM4FHVN.appSupport,
+  connectiq: () => import_chunk_3KM4FHVN.connectiq,
+  getDeviceInfo: () => import_chunk_3KM4FHVN.getDeviceInfo,
+  getFunctionDocumentation: () => import_chunk_3KM4FHVN.getFunctionDocumentation,
+  getLanguages: () => import_chunk_3KM4FHVN.getLanguages,
+  getSdkPath: () => import_chunk_3KM4FHVN.getSdkPath,
+  isWin: () => import_chunk_3KM4FHVN.isWin,
+  optimizeProgram: () => import_chunk_3KM4FHVN.optimizeProgram,
+  readPrg: () => import_chunk_3KM4FHVN.readPrg,
+  readPrgWithOffsets: () => import_chunk_3KM4FHVN.readPrgWithOffsets,
+  xmlUtil: () => import_chunk_3KM4FHVN.xml_util_exports
 });
 module.exports = __toCommonJS(sdk_util_exports);
-var import_chunk_Y3DFSFGP = require("./chunk-Y3DFSFGP.cjs");
+var import_chunk_3KM4FHVN = require("./chunk-3KM4FHVN.cjs");
 var import_chunk_NHZRKHZO = require("./chunk-NHZRKHZO.cjs");
 var import_chunk_JDC43A3I = require("./chunk-JDC43A3I.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_Y3DFSFGP.init_sdk_util)();
+(0, import_chunk_3KM4FHVN.init_sdk_util)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   SectionKinds,

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_Y3DFSFGP = require("./chunk-Y3DFSFGP.cjs");
+var import_chunk_3KM4FHVN = require("./chunk-3KM4FHVN.cjs");
 var import_chunk_NHZRKHZO = require("./chunk-NHZRKHZO.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_Y3DFSFGP.init_worker_task)();
+    (0, import_chunk_3KM4FHVN.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_Y3DFSFGP.performTask)(task));
+        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_3KM4FHVN.performTask)(task));
       });
     }
   }

package/package.json

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