@markw65/monkeyc-optimizer 1.1.82 → 1.1.84

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

package/build/src/api.d.ts

@@ -31,7 +31,7 @@ export declare function findNamesInScope(declStack: StateNode[][], pattern: stri
     readonly parent: StateNode;
     readonly depth: number;
 }])[];
-export declare function mapVarDeclsByType(state: ProgramStateAnalysis, decls: StateNodeDecl[], node: mctree.Node, typeMap: TypeMap | null | undefined): (mctree.Identifier | mctree.EnumStringMember | mctree.AsIdentifier | ProgramStateNode | FunctionStateNode | ModuleStateNode | ClassStateNode | VariableStateNode | import("./optimizer-types").BlockStateNode | TypedefStateNode | EnumStateNode)[];
+export declare function mapVarDeclsByType(state: ProgramStateAnalysis, decls: StateNodeDecl[], node: mctree.Node, typeMap: TypeMap | null | undefined): (mctree.Identifier | mctree.EnumStringMember | mctree.AsIdentifier | ProgramStateNode | FunctionStateNode | ModuleStateNode | ClassStateNode | TypedefStateNode | VariableStateNode | EnumStateNode | import("./optimizer-types").BlockStateNode)[];
 export declare function formatScopedName(node: mctree.ScopedName | mctree.ThisExpression): string;
 export declare function formatAstLongLines(node: mctree.Node): Promise<string>;
 export declare function createDocumentationMap(functionDocumentation: {
@@ -54,6 +54,7 @@ export declare function isLocal(v: VariableStateNode): boolean;
 export declare function isClassVariable(v: VariableStateNode): boolean;
 export declare function resolveDiagnostics(diagnostics?: PreDiagnostic[]): Promise<Diagnostic[]> | undefined;
 export declare function resolveDiagnosticsMap(diagnosticsMap: Record<string, PreDiagnostic[]>): Promise<Record<string, Diagnostic[]>>;
+export declare function clearDiagnostics(state: ProgramState, node: mctree.Node): void;
 export declare function diagnostic(state: ProgramState, node: mctree.Node, message: string | Promise<string> | null, type?: DiagnosticType, extra?: Diagnostic["extra"]): void;
 export declare function diagnosticHelper(diagnostics: Record<string, PreDiagnostic[]>, node: mctree.Node, message: string | Promise<string> | null, type: DiagnosticType | undefined, extra: Diagnostic["extra"] | undefined): void;
 export declare function getSuperClasses(klass: ClassStateNode): Set<StateNode> | null;

package/build/src/optimizer-types.d.ts

@@ -138,6 +138,7 @@ export type ProgramState = {
     allClasses?: ClassStateNode[];
     nestedClasses?: Record<string, ClassStateNode[]>;
     allModules?: Set<ModuleStateNode>;
+    allCached?: Set<TypedefStateNode | VariableStateNode | EnumStateNode>;
     invokeInfo?: FunctionInfo;
     allDeclarations?: Record<string, ByNameStateNodeDecls[]>;
     fnMap?: FilesToOptimizeMap;
@@ -191,7 +192,7 @@ export type Finalized<T, Keys extends keyof T> = T & {
     [key in Keys]-?: NonNullable<T[key]>;
 };
 export type ProgramStateLive = Finalized<ProgramState, "stack" | "top" | "lookup" | "lookupValue" | "lookupType" | "lookupNonlocal" | "stackClone" | "traverse" | "index" | "constants" | "removeNodeComments" | "inType" | "nextExposed" | "lookupRules">;
-export type ProgramStateAnalysis = Finalized<ProgramStateLive, "allClasses" | "nestedClasses" | "allModules" | "allFunctions" | "fnMap" | "allDeclarations" | "invokeInfo">;
+export type ProgramStateAnalysis = Finalized<ProgramStateLive, "allClasses" | "nestedClasses" | "allModules" | "allCached" | "allFunctions" | "fnMap" | "allDeclarations" | "invokeInfo">;
 export type ProgramStateOptimizer = Finalized<ProgramStateAnalysis, "localsStack" | "exposed" | "calledFunctions" | "usedByName">;
 export type ExcludeAnnotationsMap = {
     [key: string]: boolean;

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

@@ -0,0 +1,10 @@
+import { mctree } from "@markw65/prettier-plugin-monkeyc";
+import { ArrayType, ExactOrUnion } from "./types";
+export type ArrayTypeData = NonNullable<ArrayType["value"]>;
+export declare function tupleForEach(t: ArrayTypeData, tupleFn: (v: ExactOrUnion[]) => unknown, arrayFn: (v: ExactOrUnion) => unknown): void;
+export declare function tupleMap<T, U, V>(t: ArrayTypeData, tupleFn: (v: ExactOrUnion[]) => U | null, arrayFn: (v: ExactOrUnion) => V | null, reduceFn: (v: Array<U | V>) => T): T;
+export declare function tupleReduce(v: Array<ExactOrUnion | ExactOrUnion[]>): import("./types").UnionType | import("./types").NumberType | import("./types").LongType | import("./types").FloatType | import("./types").DoubleType | import("./types").CharType | import("./types").StringType | ArrayType | import("./types").DictionaryType | import("./types").MethodType | import("./types").ModuleType | import("./types").FunctionType | import("./types").ClassType | import("./types").ObjectType | import("./types").EnumType | import("./types").SymbolType | import("./types").TypedefType | ExactOrUnion[] | Set<ExactOrUnion | ExactOrUnion[]>;
+export declare function reducedArrayType(t: ArrayTypeData): ExactOrUnion;
+export declare function restrictArrayData(constraint: ArrayTypeData, tracked: ArrayTypeData): ArrayTypeData;
+export declare function checkArrayCovariance(arg: ArrayTypeData, param: ArrayTypeData): boolean;
+export declare function safeReferenceArg(arg: mctree.Expression): boolean;

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

@@ -0,0 +1,2 @@
+import { ExactOrUnion } from "./types";
+export declare function getEffectiveTrackedType(constraint: ExactOrUnion, tracked: ExactOrUnion): ExactOrUnion;

package/build/src/type-flow/interp-call.d.ts

@@ -12,6 +12,7 @@ type SysCallHelperResult = {
     argEffects?: true;
     diagnostic?: string;
 };
-type SysCallHelper = (istate: InterpState, func: FunctionStateNode, calleeObj: ExactOrUnion, getArgs: () => Array<ExactOrUnion>) => SysCallHelperResult;
+type SysCallHelper = (istate: InterpState, func: FunctionStateNode, calleeObj: ExactOrUnion, getArgs: () => Array<ExactOrUnion>, callNode: mctree.CallExpression) => SysCallHelperResult;
 export declare function sysCallInfo(state: ProgramStateAnalysis, func: FunctionStateNode): SysCallHelper | null;
+export declare function extraReferenceTypeChecks(istate: InterpState, report: (sourceType: string, targetType: string) => void, targetType: ExactOrUnion, sourceType: ExactOrUnion, sourceNode: mctree.Expression): void;
 export {};

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

@@ -38,6 +38,7 @@ export declare function evaluateUnaryTypes(op: mctree.UnaryOperator, argument: E
     type: ExactOrUnion;
 } & OpMatch;
 export declare function deEnumerate(t: ExactOrUnion): ExactOrUnion;
+export declare function getLhsConstraint(istate: InterpState, node: mctree.MemberExpression | mctree.Identifier): import("./types").UnionType | import("./types").NumberType | import("./types").LongType | import("./types").FloatType | import("./types").DoubleType | import("./types").CharType | import("./types").StringType | import("./types").ArrayType | import("./types").DictionaryType | import("./types").MethodType | import("./types").ModuleType | import("./types").FunctionType | import("./types").ClassType | ObjectType | import("./types").EnumType | import("./types").SymbolType | import("./types").TypedefType | null | undefined;
 export declare function evaluateNode(istate: InterpState, node: mctree.Node): void;
 export declare function roundToFloat(value: number): number;
 export declare function mustBeIdentical(a: ExactOrUnion, b: ExactOrUnion): boolean;

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

@@ -144,11 +144,8 @@ export interface ObjectType extends AbstractValue {
 export interface EnumType extends AbstractValue {
     type: TypeTag.Enum;
     value?: {
-        enum: EnumStateNode;
+        enum: EnumStateNode | EnumStateNode[];
         value?: ExactOrUnion | undefined;
-    } | {
-        enum?: undefined;
-        value: ExactOrUnion;
     } | undefined;
 }
 export interface SymbolType extends AbstractValue {
@@ -215,11 +212,5 @@ export declare function getStateNodeDeclsWithExactFromType(state: ProgramStateAn
     sn: StateNode;
     exact: boolean;
 }[];
-export declare function isTupleUnion(t: ExactOrUnion[] | ExactOrUnion[][]): t is ExactOrUnion[][];
-export declare function tupleForEach(t: NonNullable<ArrayType["value"]>, tupleFn: (v: ExactOrUnion[]) => unknown, arrayFn: (v: ExactOrUnion) => unknown): void;
-export declare function tupleMap<T, U, V>(t: NonNullable<ArrayType["value"]>, tupleFn: (v: ExactOrUnion[]) => U | null, arrayFn: (v: ExactOrUnion) => V | null, reduceFn: (v: Array<U | V>) => T): T;
-export declare function tupleReduce(v: Array<ExactOrUnion | ExactOrUnion[]>): UnionType | NumberType | LongType | FloatType | DoubleType | CharType | StringType | ArrayType | DictionaryType | MethodType | ModuleType | FunctionType | ClassType | ObjectType | EnumType | SymbolType | TypedefType | ExactOrUnion[] | Set<ExactOrUnion | ExactOrUnion[]>;
-export declare function reducedArrayType(t: Set<ExactOrUnion[] | ExactOrUnion> | ExactOrUnion[] | ExactOrUnion): ExactOrUnion;
-export declare function checkArrayCovariance(arg: NonNullable<ArrayType["value"]>, param: NonNullable<ArrayType["value"]>): boolean;
-export declare function safeReferenceArg(arg: mctree.Expression): boolean;
+export declare function typeFromEnumValue(arg: EnumType["value"] | null): UnionType | NumberType | LongType | FloatType | DoubleType | CharType | StringType | ArrayType | DictionaryType | MethodType | ModuleType | FunctionType | ClassType | ObjectType | EnumType | SymbolType | TypedefType;
 export {};

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

@@ -1,4 +1,5 @@
 import { ExactOrUnion, TypeTag } from "./types";
+export declare function union(to: ExactOrUnion, from: ExactOrUnion): ExactOrUnion;
 export declare function unionInto(to: ExactOrUnion, from: ExactOrUnion): boolean;
 export declare function unionHelper(to: ExactOrUnion, from: ExactOrUnion, widenDepth: number): boolean;
 export declare function clearValuesUnder(v: ExactOrUnion, tag: TypeTag, clearTag?: boolean): void;

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_TLXMWGYI = require("./chunk-TLXMWGYI.cjs");
+var import_chunk_ZWQB5L34 = require("./chunk-ZWQB5L34.cjs");
 var import_chunk_X7QCZR3F = require("./chunk-X7QCZR3F.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_TLXMWGYI.init_worker_task)();
+    (0, import_chunk_ZWQB5L34.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_TLXMWGYI.performTask)(task));
+        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_ZWQB5L34.performTask)(task));
       });
     }
   }

package/package.json

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