@markw65/monkeyc-optimizer 1.1.3 → 1.1.5

package/build/sdk-util.cjs

@@ -255,6 +255,9 @@ function withLoc(node, start, end) {
         if (!node.end)
             node.end = start.end;
         node.loc = { ...(node.loc || start.loc), start: start.loc.start };
+        if (end === start && start.origins) {
+            node.origins = start.origins;
+        }
     }
     if (end === false) {
         if (node.loc) {
@@ -287,17 +290,17 @@ function cloneDeep(node) {
     return withLocDeep(node, null);
 }
 function getNodeValue(node) {
-    if (node.type == "BinaryExpression" &&
-        node.operator == "as" &&
-        node.right.type == "TypeSpecList" &&
-        node.right.ts.length == 1 &&
-        typeof node.right.ts[0] == "string") {
+    if (node.type === "BinaryExpression" &&
+        node.operator === "as" &&
+        node.right.type === "TypeSpecList" &&
+        node.right.ts.length === 1 &&
+        typeof node.right.ts[0] === "string") {
         // this is a cast we inserted to retain the type of an enum
         // any arithmetic on it will revert to "Number", or "Long",
         // so just ignore it.
         return getNodeValue(node.left);
     }
-    if (node.type != "Literal") {
+    if (node.type !== "Literal") {
         return [null, null];
     }
     if (node.value === null) {
@@ -387,13 +390,13 @@ function makeScopedName(dotted, l) {
 function getLiteralNode(node) {
     if (node == null)
         return null;
-    if (node.type == "Literal")
+    if (node.type === "Literal")
         return node;
-    if (node.type == "BinaryExpression" && node.operator == "as") {
+    if (node.type === "BinaryExpression" && node.operator === "as") {
         return getLiteralNode(node.left) && node;
     }
-    if (node.type == "UnaryExpression") {
-        if (node.argument.type != "Literal")
+    if (node.type === "UnaryExpression") {
+        if (node.argument.type !== "Literal")
             return null;
         switch (node.operator) {
             case "-": {
@@ -695,7 +698,7 @@ function visit_xml(contents, visitor) {
         if (visitor.pre && visitor.pre(c) === false) {
             return;
         }
-        if (c.type == "element" && c.children) {
+        if (c.type === "element" && c.children) {
             visit_xml(c.children, visitor);
         }
         if (visitor.post)
@@ -736,13 +739,13 @@ async function readPrg(path) {
 
 
 
-const isWin = process.platform == "win32";
+const isWin = process.platform === "win32";
 const appSupport = isWin
     ? `${process.env.APPDATA}`.replace(/\\/g, "/")
-    : process.platform == "linux"
+    : process.platform === "linux"
         ? `${process.env.HOME}/.config`
         : `${process.env.HOME}/Library/Application Support`;
-const connectiq = process.platform == "linux"
+const connectiq = process.platform === "linux"
     ? `${process.env.HOME}/.Garmin/ConnectIQ`
     : `${appSupport}/Garmin/ConnectIQ`;
 function getSdkPath() {

package/build/src/api.d.ts

@@ -30,4 +30,5 @@ export declare function getApiFunctionInfo(state: ProgramState, func: FunctionSt
 export declare function markInvokeClassMethod(state: ProgramStateAnalysis, func: FunctionStateNode): void;
 export declare function isLocal(v: VariableStateNode): boolean;
 export declare function diagnostic(state: ProgramState, node: mctree.Node, message: string | null, type?: DiagnosticType, extra?: Diagnostic["extra"]): void;
+export declare function diagnosticHelper(diagnostics: Record<string, Diagnostic[]>, node: mctree.Node, message: string | null, type: DiagnosticType | undefined, extra: Diagnostic["extra"] | undefined, uniqueLocs: boolean): void;
 export declare function getSuperClasses(klass: ClassStateNode): Set<StateNode> | null;

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

@@ -109,7 +109,7 @@ export interface FunctionStateNode extends BaseStateNode {
 export interface BlockStateNode extends BaseStateNode {
     type: "BlockStatement";
     name: undefined;
-    fullName: undefined;
+    fullName: string;
     node: mctree.BlockStatement | mctree.ForStatement;
     stack?: undefined;
 }
@@ -129,6 +129,7 @@ export interface VariableStateNode extends BaseStateNode {
     fullName: string;
     stack: ProgramStateStack;
     used?: true;
+    resolvedType?: ExactOrUnion | undefined;
 }
 export interface EnumStateNode extends BaseStateNode {
     type: "EnumDeclaration";
@@ -209,6 +210,7 @@ export declare type ProgramState = {
         [key: string]: mctree.Literal;
     };
     diagnostics?: Record<string, Diagnostic[]>;
+    inlineDiagnostics?: Record<string, Diagnostic[]>;
     enumMap?: Map<EnumStringMember, EnumStateNode>;
 };
 export declare type Finalized<T, Keys extends keyof T> = T & {

package/build/src/optimizer.d.ts

@@ -4,6 +4,7 @@ import { launchSimulator, simulateProgram } from "./launch";
 import { manifestProducts } from "./manifest";
 import { BuildConfig, FilesToOptimizeMap, ProgramStateAnalysis } from "./optimizer-types";
 import { xmlUtil } from "./sdk-util";
+import { TypeMap } from "./type-flow/interp";
 import { copyRecursiveAsNeeded } from "./util";
 export * from "./optimizer-types";
 export { copyRecursiveAsNeeded, get_jungle, JungleBuildDependencies, JungleError, JungleResourceMap, launchSimulator, manifestProducts, mctree, ResolvedJungle, simulateProgram, };
@@ -71,6 +72,7 @@ export declare type Analysis = {
     fnMap: RequiredNonNull<FilesToOptimizeMap>;
     paths: string[];
     state: ProgramStateAnalysis;
+    typeMap?: TypeMap | null | undefined;
 };
 export declare function getProjectAnalysis(targets: Target[], analysis: PreAnalysis | null, manifestXML: xmlUtil.Document, options: BuildConfig): Promise<Analysis | PreAnalysis>;
 /**

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

@@ -41,7 +41,15 @@ interface AbstractValue {
     value?: unknown;
 }
 export declare type ExactTypes = NullType | FalseType | TrueType | NumberType | LongType | FloatType | DoubleType | CharType | StringType | ArrayType | DictionaryType | MethodType | ModuleType | FunctionType | ClassType | ObjectType | EnumType | SymbolType | TypedefType;
-declare type WithValue<T> = T extends ExactTypes ? T extends SingletonType ? T : T & {
+declare type ExactPairHelper<T> = T extends ExactTypes ? {
+    type: T["type"];
+    avalue: T["value"];
+    bvalue: T["value"];
+} : never;
+export declare type ExactPairs = ExactPairHelper<ExactTypes>;
+export declare type ValuePairs = ExactPairHelper<ValueTypes>;
+declare type WithValue<T> = T extends ExactTypes ? T extends SingletonType ? T : {
+    type: T["type"];
     value: NonNullable<T["value"]>;
 } : never;
 export declare type ExactData<T extends ExactTypeTags> = T extends SingletonType ? undefined : NonNullable<Extract<ExactTypes, {
@@ -169,13 +177,7 @@ export declare type SingleValue = NonNullable<ValueTypes["value"]>;
 declare type TagValue<TAG> = Extract<ValueTypes, {
     type: TAG;
 }>["value"];
-export declare type ArrayValueType = TagValue<TypeTag.Array>;
-export declare type DictionaryValueType = TagValue<TypeTag.Dictionary>;
-export declare type MethodValueType = TagValue<TypeTag.Method>;
-export declare type ObjectValueType = TagValue<TypeTag.Object>;
 export declare type EnumValueType = TagValue<TypeTag.Enum>;
-export declare type TypedefValueType = TagValue<TypeTag.Typedef>;
-export declare type StateDeclValueType = TagValue<TypeTag.Module> | TagValue<TypeTag.Function> | TagValue<TypeTag.Class>;
 export declare function isExact(v: AbstractValue): v is ExactTypes;
 export declare function isUnion(v: AbstractValue): v is UnionType;
 export declare function isSingleton(v: AbstractValue): v is SingletonType;
@@ -196,7 +198,7 @@ export declare function mustBeFalse(arg: ExactOrUnion): boolean;
 export declare function display(type: ExactOrUnion): string;
 export declare function hasUnionData(tag: TypeTag): boolean;
 export declare function getObjectValue(t: ExactOrUnion): ObjectType["value"] | null;
-export declare function forEachUnionComponent(v: ExactOrUnion, bits: TypeTag, fn: (tag: ExactTypeTags, value: SingleValue | null | undefined) => boolean | void): void;
+export declare function forEachUnionComponent(v: ExactOrUnion, bits: TypeTag, fn: (type: ExactTypes) => boolean | void): void;
 export declare function getUnionComponent<T extends ExactTypeTags>(v: ExactOrUnion, tag: T): ExactData<T> | null;
 export declare function setUnionComponent<T extends ExactTypeTags>(v: ExactOrUnion, tag: T, c: ExactData<T>): void;
 export declare function getStateNodeDeclsFromType(state: ProgramStateAnalysis, object: ExactOrUnion): StateNode[];

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

@@ -4,7 +4,7 @@ import { InterpState } from "./type-flow/interp";
 import { ExactOrUnion } from "./type-flow/types";
 export declare const missingNullWorkaround = true;
 export declare function buildTypeInfo(state: ProgramStateAnalysis, func: FunctionStateNode, optimizeEquivalencies: boolean): InterpState | undefined;
-export declare function findObjectDeclsByProperty(istate: InterpState, object: ExactOrUnion, next: mctree.DottedMemberExpression): StateNode[] | null;
+export declare function findObjectDeclsByProperty(state: ProgramStateAnalysis, object: ExactOrUnion, next: mctree.DottedMemberExpression): [StateNode[], StateNode[]] | readonly [null, null];
 export declare function resolveDottedMember(istate: InterpState, object: ExactOrUnion, next: mctree.DottedMemberExpression): {
     mayThrow: boolean;
     object: ExactOrUnion;

package/build/src/visitor.d.ts

@@ -1,4 +1,5 @@
 import { mctree } from "@markw65/prettier-plugin-monkeyc";
 import { LookupDefinition, ProgramStateAnalysis } from "./optimizer-types";
+import { TypeMap } from "./type-flow/interp";
 export declare function visitorNode(node: mctree.Node): mctree.Node;
-export declare function visitReferences(state: ProgramStateAnalysis, ast: mctree.Program, name: string | null, defn: LookupDefinition[] | null | false, callback: (node: mctree.Node, results: LookupDefinition[], error: boolean) => undefined | false, includeDefs?: boolean, filter?: ((node: mctree.Node) => boolean) | null): void;
+export declare function visitReferences(state: ProgramStateAnalysis, ast: mctree.Program, name: string | null, defn: LookupDefinition[] | null | false, callback: (node: mctree.Node, results: LookupDefinition[], error: boolean) => undefined | false, includeDefs?: boolean, filter?: ((node: mctree.Node) => boolean) | null, typeMap?: TypeMap | null): void;

package/build/util.cjs

@@ -7873,7 +7873,7 @@ function spawnByLine(command, args, lineHandlers, options) {
         rle.on("line", errHandler);
         rl.on("line", lineHandler);
         proc.on("close", (code) => {
-            if (code == 0)
+            if (code === 0)
                 resolve();
             reject(code);
         });

package/package.json

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