@markw65/monkeyc-optimizer 1.1.77 → 1.1.78

package/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 All notable changes to the "monkeyc-optimizer" package will be documented in this file.
 
+### 1.1.78
+
+- Consistently use the name of the project directory to name the prg file
+- Fix a bug that reported errors for conversions between enums of different types
+
 ### 1.1.77
 
 - Fix an infinite recursion issue with nested classes

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

package/build/{chunk-G6WICLD7.cjs → chunk-Y3DFSFGP.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_G6WICLD7_exports = {};
-__export(chunk_G6WICLD7_exports, {
+var chunk_Y3DFSFGP_exports = {};
+__export(chunk_Y3DFSFGP_exports, {
   EnumTagsConst: () => EnumTagsConst,
   LastTypeTag: () => LastTypeTag,
   ObjectLikeTagsConst: () => ObjectLikeTagsConst,
@@ -139,7 +139,7 @@ __export(chunk_G6WICLD7_exports, {
   visitorNode: () => visitorNode,
   xml_util_exports: () => xml_util_exports
 });
-module.exports = __toCommonJS(chunk_G6WICLD7_exports);
+module.exports = __toCommonJS(chunk_Y3DFSFGP_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");
@@ -12303,7 +12303,7 @@ function couldBeHelper(a, b, shallow) {
     if (result)
       return true;
   }
-  if (a.type & 65536 && b.type & EnumTagsConst || b.type & 65536 && a.type & EnumTagsConst) {
+  if (a.type & 65536 && b.type & (EnumTagsConst | 65536) || b.type & 65536 && a.type & (EnumTagsConst | 65536)) {
     return true;
   }
   if (a.type & 32768 && b.type & ObjectLikeTagsConst && getObjectValue(a) == null) {
@@ -29801,7 +29801,7 @@ async function generateOptimizedProject(options) {
     return {
       jungleFiles: config.jungleFiles,
       xml,
-      program: path4.basename(path4.dirname(manifest)),
+      program: path4.basename(path4.basename(workspace)),
       hasTests: !!config.testBuild
     };
   }
@@ -30030,7 +30030,7 @@ async function generateOptimizedProject(options) {
   return {
     jungleFiles,
     xml,
-    program: path4.basename(path4.dirname(manifest)),
+    program: path4.basename(path4.basename(workspace)),
     hasTests,
     diagnostics
   };
@@ -30198,7 +30198,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 && 1727624657655 < opt_time) {
+      if (source_time < opt_time && 1730668639817 < opt_time) {
         return {
           hasTests,
           diagnostics: prevDiagnostics,
@@ -30236,7 +30236,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
             hasTests: hasTests2,
             diagnostics,
             sdkVersion,
-            optimizerVersion: "1.1.77",
+            optimizerVersion: "1.1.78",
             ...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_G6WICLD7.StateNodeAttributes,
-  buildConfigDescription: () => import_chunk_G6WICLD7.buildConfigDescription,
-  buildOptimizedProject: () => import_chunk_G6WICLD7.buildOptimizedProject,
+  StateNodeAttributes: () => import_chunk_Y3DFSFGP.StateNodeAttributes,
+  buildConfigDescription: () => import_chunk_Y3DFSFGP.buildConfigDescription,
+  buildOptimizedProject: () => import_chunk_Y3DFSFGP.buildOptimizedProject,
   copyRecursiveAsNeeded: () => import_chunk_NHZRKHZO.copyRecursiveAsNeeded,
-  defaultConfig: () => import_chunk_G6WICLD7.defaultConfig,
-  display: () => import_chunk_G6WICLD7.display,
-  generateOneConfig: () => import_chunk_G6WICLD7.generateOneConfig,
-  generateOptimizedProject: () => import_chunk_G6WICLD7.generateOptimizedProject,
-  getConfig: () => import_chunk_G6WICLD7.getConfig,
-  getFnMapAnalysis: () => import_chunk_G6WICLD7.getFnMapAnalysis,
-  getProjectAnalysis: () => import_chunk_G6WICLD7.getProjectAnalysis,
-  get_jungle: () => import_chunk_G6WICLD7.get_jungle,
-  isErrorWithLocation: () => import_chunk_G6WICLD7.isErrorWithLocation,
-  launchSimulator: () => import_chunk_G6WICLD7.launchSimulator,
-  manifestProducts: () => import_chunk_G6WICLD7.manifestProducts,
-  mctree: () => import_chunk_G6WICLD7.mctree,
-  simulateProgram: () => import_chunk_G6WICLD7.simulateProgram
+  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
 });
 module.exports = __toCommonJS(optimizer_exports);
-var import_chunk_G6WICLD7 = require("./chunk-G6WICLD7.cjs");
+var import_chunk_Y3DFSFGP = require("./chunk-Y3DFSFGP.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_G6WICLD7.init_optimizer)();
+(0, import_chunk_Y3DFSFGP.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_G6WICLD7.SectionKinds,
-  appSupport: () => import_chunk_G6WICLD7.appSupport,
-  connectiq: () => import_chunk_G6WICLD7.connectiq,
-  getDeviceInfo: () => import_chunk_G6WICLD7.getDeviceInfo,
-  getFunctionDocumentation: () => import_chunk_G6WICLD7.getFunctionDocumentation,
-  getLanguages: () => import_chunk_G6WICLD7.getLanguages,
-  getSdkPath: () => import_chunk_G6WICLD7.getSdkPath,
-  isWin: () => import_chunk_G6WICLD7.isWin,
-  optimizeProgram: () => import_chunk_G6WICLD7.optimizeProgram,
-  readPrg: () => import_chunk_G6WICLD7.readPrg,
-  readPrgWithOffsets: () => import_chunk_G6WICLD7.readPrgWithOffsets,
-  xmlUtil: () => import_chunk_G6WICLD7.xml_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
 });
 module.exports = __toCommonJS(sdk_util_exports);
-var import_chunk_G6WICLD7 = require("./chunk-G6WICLD7.cjs");
+var import_chunk_Y3DFSFGP = require("./chunk-Y3DFSFGP.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_G6WICLD7.init_sdk_util)();
+(0, import_chunk_Y3DFSFGP.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_G6WICLD7 = require("./chunk-G6WICLD7.cjs");
+var import_chunk_Y3DFSFGP = require("./chunk-Y3DFSFGP.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_G6WICLD7.init_worker_task)();
+    (0, import_chunk_Y3DFSFGP.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_G6WICLD7.performTask)(task));
+        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_Y3DFSFGP.performTask)(task));
       });
     }
   }

package/package.json

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