@markw65/monkeyc-optimizer 1.1.38 → 1.1.39

package/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to the "monkeyc-optimizer" package will be documented in this file.
 
+### 1.1.39
+
+- Update to [@markw65/prettier-plugin-monkeyc@1.0.54](https://github.com/markw65/prettier-plugin-monkeyc/blob/main/CHANGELOG.md#1054)
+
+  - Fixes the parser to understand tuples
+
+- Add basic type analysis for tuples
+
 ### 1.1.38
 
 - Fix a bug introduced in 1.1.37 that could lead to duplicate diagnostics, and diagnostics with strange contents.

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

package/build/{chunk-IMIM4BE2.cjs → chunk-3H4GE7RU.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_IMIM4BE2_exports = {};
-__export(chunk_IMIM4BE2_exports, {
+var chunk_3H4GE7RU_exports = {};
+__export(chunk_3H4GE7RU_exports, {
   EnumTagsConst: () => EnumTagsConst,
   LastTypeTag: () => LastTypeTag,
   ObjectLikeTagsConst: () => ObjectLikeTagsConst,
@@ -130,7 +130,7 @@ __export(chunk_IMIM4BE2_exports, {
   visitorNode: () => visitorNode,
   xml_util_exports: () => xml_util_exports
 });
-module.exports = __toCommonJS(chunk_IMIM4BE2_exports);
+module.exports = __toCommonJS(chunk_3H4GE7RU_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");
@@ -11077,6 +11077,24 @@ function typeFromSingleTypeSpec(state, type, stack) {
     type = { type: "TypeSpecPart", name: type };
   }
   switch (type.type) {
+    case "ArrayExpression": {
+      return {
+        type: 512,
+        value: type.elements.reduce(
+          (prev, cur) => {
+            unionInto(
+              prev,
+              typeFromTypespec(state, cur)
+            );
+            return prev;
+          },
+          {
+            type: 0
+            /* Never */
+          }
+        )
+      };
+    }
     case "ObjectExpression": {
       const fields = /* @__PURE__ */ new Map();
       type.properties.forEach((property) => {
@@ -28093,7 +28111,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 && 1695857383506 < opt_time) {
+      if (source_time < opt_time && 1706308945548 < opt_time) {
         return {
           hasTests,
           diagnostics: prevDiagnostics,
@@ -28132,7 +28150,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
             hasTests: hasTests2,
             diagnostics,
             sdkVersion,
-            optimizerVersion: "1.1.38",
+            optimizerVersion: "1.1.39",
             ...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_IMIM4BE2.StateNodeAttributes,
-  buildOptimizedProject: () => import_chunk_IMIM4BE2.buildOptimizedProject,
+  StateNodeAttributes: () => import_chunk_3H4GE7RU.StateNodeAttributes,
+  buildOptimizedProject: () => import_chunk_3H4GE7RU.buildOptimizedProject,
   copyRecursiveAsNeeded: () => import_chunk_SG7ODKRM.copyRecursiveAsNeeded,
-  defaultConfig: () => import_chunk_IMIM4BE2.defaultConfig,
-  display: () => import_chunk_IMIM4BE2.display,
-  generateOneConfig: () => import_chunk_IMIM4BE2.generateOneConfig,
-  generateOptimizedProject: () => import_chunk_IMIM4BE2.generateOptimizedProject,
-  getConfig: () => import_chunk_IMIM4BE2.getConfig,
-  getProjectAnalysis: () => import_chunk_IMIM4BE2.getProjectAnalysis,
-  get_jungle: () => import_chunk_IMIM4BE2.get_jungle,
-  isErrorWithLocation: () => import_chunk_IMIM4BE2.isErrorWithLocation,
-  launchSimulator: () => import_chunk_IMIM4BE2.launchSimulator,
-  manifestProducts: () => import_chunk_IMIM4BE2.manifestProducts,
-  mctree: () => import_chunk_IMIM4BE2.mctree,
-  simulateProgram: () => import_chunk_IMIM4BE2.simulateProgram
+  defaultConfig: () => import_chunk_3H4GE7RU.defaultConfig,
+  display: () => import_chunk_3H4GE7RU.display,
+  generateOneConfig: () => import_chunk_3H4GE7RU.generateOneConfig,
+  generateOptimizedProject: () => import_chunk_3H4GE7RU.generateOptimizedProject,
+  getConfig: () => import_chunk_3H4GE7RU.getConfig,
+  getProjectAnalysis: () => import_chunk_3H4GE7RU.getProjectAnalysis,
+  get_jungle: () => import_chunk_3H4GE7RU.get_jungle,
+  isErrorWithLocation: () => import_chunk_3H4GE7RU.isErrorWithLocation,
+  launchSimulator: () => import_chunk_3H4GE7RU.launchSimulator,
+  manifestProducts: () => import_chunk_3H4GE7RU.manifestProducts,
+  mctree: () => import_chunk_3H4GE7RU.mctree,
+  simulateProgram: () => import_chunk_3H4GE7RU.simulateProgram
 });
 module.exports = __toCommonJS(optimizer_exports);
-var import_chunk_IMIM4BE2 = require("./chunk-IMIM4BE2.cjs");
+var import_chunk_3H4GE7RU = require("./chunk-3H4GE7RU.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_IMIM4BE2.init_optimizer)();
+(0, import_chunk_3H4GE7RU.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_IMIM4BE2.SectionKinds,
-  appSupport: () => import_chunk_IMIM4BE2.appSupport,
-  connectiq: () => import_chunk_IMIM4BE2.connectiq,
-  getDeviceInfo: () => import_chunk_IMIM4BE2.getDeviceInfo,
-  getFunctionDocumentation: () => import_chunk_IMIM4BE2.getFunctionDocumentation,
-  getLanguages: () => import_chunk_IMIM4BE2.getLanguages,
-  getSdkPath: () => import_chunk_IMIM4BE2.getSdkPath,
-  isWin: () => import_chunk_IMIM4BE2.isWin,
-  optimizeProgram: () => import_chunk_IMIM4BE2.optimizeProgram,
-  readPrg: () => import_chunk_IMIM4BE2.readPrg,
-  readPrgWithOffsets: () => import_chunk_IMIM4BE2.readPrgWithOffsets,
-  xmlUtil: () => import_chunk_IMIM4BE2.xml_util_exports
+  SectionKinds: () => import_chunk_3H4GE7RU.SectionKinds,
+  appSupport: () => import_chunk_3H4GE7RU.appSupport,
+  connectiq: () => import_chunk_3H4GE7RU.connectiq,
+  getDeviceInfo: () => import_chunk_3H4GE7RU.getDeviceInfo,
+  getFunctionDocumentation: () => import_chunk_3H4GE7RU.getFunctionDocumentation,
+  getLanguages: () => import_chunk_3H4GE7RU.getLanguages,
+  getSdkPath: () => import_chunk_3H4GE7RU.getSdkPath,
+  isWin: () => import_chunk_3H4GE7RU.isWin,
+  optimizeProgram: () => import_chunk_3H4GE7RU.optimizeProgram,
+  readPrg: () => import_chunk_3H4GE7RU.readPrg,
+  readPrgWithOffsets: () => import_chunk_3H4GE7RU.readPrgWithOffsets,
+  xmlUtil: () => import_chunk_3H4GE7RU.xml_util_exports
 });
 module.exports = __toCommonJS(sdk_util_exports);
-var import_chunk_IMIM4BE2 = require("./chunk-IMIM4BE2.cjs");
+var import_chunk_3H4GE7RU = require("./chunk-3H4GE7RU.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_IMIM4BE2.init_sdk_util)();
+(0, import_chunk_3H4GE7RU.init_sdk_util)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   SectionKinds,

package/build/src/type-flow/types.d.ts

@@ -193,7 +193,7 @@ export declare function typeFromTypeStateNodes(state: ProgramStateAnalysis, sns:
 export declare function objectLiteralKeyFromExpr(key: mctree.Expression): string | null;
 export declare function objectLiteralKeyFromType(key: ExactOrUnion): string | null;
 export declare function typeFromObjectLiteralKey(key: string): ValueTypes;
-export declare function typeFromSingleTypeSpec(state: ProgramStateAnalysis, type: mctree.TypeSpecPart | mctree.ObjectExpression, stack?: ProgramStateStack | undefined): ExactOrUnion;
+export declare function typeFromSingleTypeSpec(state: ProgramStateAnalysis, type: mctree.SingleTypeSpec, stack?: ProgramStateStack | undefined): ExactOrUnion;
 export declare function typeFromTypespec(state: ProgramStateAnalysis, ts: mctree.TypeSpecList, stack?: ProgramStateStack | undefined): ExactOrUnion;
 export declare function typeFromLiteral(literal: mctree.Literal): ExactTypes;
 export declare function mcExprFromType(type: ValueTypes): mctree.Expression | null;

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_IMIM4BE2 = require("./chunk-IMIM4BE2.cjs");
+var import_chunk_3H4GE7RU = require("./chunk-3H4GE7RU.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_IMIM4BE2.init_worker_task)();
+    (0, import_chunk_3H4GE7RU.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_IMIM4BE2.performTask)(task));
+        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_3H4GE7RU.performTask)(task));
       });
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@markw65/monkeyc-optimizer",
   "type": "commonjs",
-  "version": "1.1.38",
+  "version": "1.1.39",
   "description": "Source to source optimizer for Garmin Monkey C code",
   "main": "build/optimizer.cjs",
   "types": "build/src/optimizer.d.ts",
@@ -18,6 +18,7 @@
   "scripts": {
     "watch": "node esbuild.mjs --watch",
     "prettier-live": "test -z \"$(git status --untracked-files=no --porcelain || echo dirty)\" && npm install ../prettier-plugin-monkeyc && git commit -am 'prettier-plugin-monkeyc-live'",
+    "prettier-package": "npm install; npm install @markw65/prettier-plugin-monkeyc; git commit -am \"Update to $(npm list @markw65/prettier-plugin-monkeyc | sed -ne 's/^.*\\(@markw65\\/prettier-plugin-monkeyc\\)/\\1/p')\"",
     "build-debug": "node esbuild.mjs",
     "build-release": "node esbuild.mjs --release",
     "prepack": "node esbuild.mjs --release && mkdir -p bin && cp test/cft-font-info.js bin",
@@ -50,7 +51,7 @@
   "license": "MIT",
   "dependencies": {
     "@markw65/peggy-optimizer": "^1.0.1",
-    "@markw65/prettier-plugin-monkeyc": "^1.0.53"
+    "@markw65/prettier-plugin-monkeyc": "^1.0.54"
   },
   "devDependencies": {
     "@types/chai": "^4.3.4",