@markw65/monkeyc-optimizer 1.0.12 → 1.0.15

package/build/sdk-util.cjs

@@ -7215,8 +7215,14 @@ async function getDeviceInfo() {
     }
     return Promise.all(files.map((file) => {
         return promises_namespaceObject.readFile(file).then((data) => {
-            const { deviceId, appTypes, deviceFamily } = JSON.parse(data.toString());
-            return [deviceId, { appTypes, deviceFamily }];
+            const { deviceId, appTypes, deviceFamily, displayName, partNumbers } = JSON.parse(data.toString());
+            const languages = Object.fromEntries(partNumbers
+                .map((part) => part.languages.map((lang) => [lang.code, true]))
+                .flat(1));
+            return [
+                deviceId,
+                { appTypes, deviceFamily, displayName, languages },
+            ];
         });
     })).then((info) => {
         return Object.fromEntries(info);

package/build/src/api.d.ts

@@ -1,8 +1,9 @@
 import { mctree } from "@markw65/prettier-plugin-monkeyc";
 export declare function getApiMapping(state?: ProgramState): Promise<ProgramStateNode | null>;
-export declare function hasProperty(obj: unknown, prop: string): any;
+export declare function hasProperty<T extends null extends T ? unknown : undefined extends T ? unknown : never>(obj: T, prop: string): obj is NonNullable<T>;
+export declare function hasProperty<T>(obj: T, prop: string): boolean;
 export declare function isStateNode(node: StateNodeDecl): node is StateNode;
 export declare function variableDeclarationName(node: mctree.TypedIdentifier): string;
-export declare function collectNamespaces(ast: mctree.Program, state: ProgramState): ProgramStateNode;
-export declare function traverseAst(node: mctree.Node, pre?: (node: mctree.Node) => void | null | false | (keyof mctree.NodeAll)[], post?: (node: mctree.Node) => void | null | false | mctree.Node): false | void | null | mctree.Node;
-export declare function formatAst(node: mctree.Node, monkeyCSource?: string): string;
+export declare function collectNamespaces(ast: mctree.Program, stateIn?: ProgramState): ProgramStateNode;
+export declare function traverseAst(node: mctree.Node, pre?: null | ((node: mctree.Node) => void | null | false | (keyof mctree.NodeAll)[]), post?: (node: mctree.Node) => void | null | false | mctree.Node): false | void | null | mctree.Node;
+export declare function formatAst(node: mctree.Node, monkeyCSource?: string | null): string;

package/build/src/build.d.ts

@@ -1,6 +1,6 @@
-export declare function build_project(product: string, options: BuildConfig, lineCallback?: (line: string) => void): Promise<{
+export declare function build_project(product: string | null, options: BuildConfig, lineCallback?: (line: string) => void): Promise<{
     exe: string;
     args: string[];
     program: string;
-    product: string;
+    product: string | null;
 }>;

package/build/src/jungles.d.ts

@@ -6,7 +6,7 @@ export declare type Target = {
     group?: {
         optimizerConfig: JungleQualifier;
         dir?: string;
-        key?: string;
+        key: string;
     };
 };
 declare type LangResourcePaths = {

package/build/src/manifest.d.ts

@@ -56,8 +56,8 @@ export declare type ManifestXML = {
         $: {
             "xmlns:iq": string;
         };
-        "iq:application": Array<iqApplication>;
-        "iq:barrel": Array<iqBarrel>;
+        "iq:application"?: Array<iqApplication>;
+        "iq:barrel"?: Array<iqBarrel>;
     };
 };
 export declare function readManifest(manifest: string): Promise<ManifestXML>;
@@ -66,6 +66,6 @@ export declare function manifestProducts(manifest: ManifestXML): string[];
 export declare function manifestBarrels(manifest: ManifestXML): string[];
 export declare function manifestDropBarrels(manifest: ManifestXML): void;
 export declare function manifestBarrelName(manifestName: string, manifest: ManifestXML): string;
-export declare function manifestAnnotations(manifest: ManifestXML): string[];
+export declare function manifestAnnotations(manifest: ManifestXML): string[] | undefined;
 export declare function checkManifest(manifest: ManifestXML, products: string[]): Promise<boolean>;
 export {};

package/build/src/mc-rewrite.d.ts

@@ -1,7 +1,7 @@
 import { mctree } from "@markw65/prettier-plugin-monkeyc";
 export declare function getFileSources(fnMap: FilesToOptimizeMap): Promise<void>;
 export declare function getFileASTs(fnMap: FilesToOptimizeMap): Promise<boolean>;
-export declare function analyze(fnMap: FilesToOptimizeMap): Promise<ProgramState>;
-export declare function getLiteralFromDecls(decls: StateNodeDecl[]): mctree.AsExpression | mctree.Literal;
-export declare function getLiteralNode(node: mctree.Node): null | mctree.Literal | mctree.AsExpression;
+export declare function analyze(fnMap: FilesToOptimizeMap): Promise<ProgramStateAnalysis>;
+export declare function getLiteralFromDecls(decls: StateNodeDecl[]): null;
+export declare function getLiteralNode(node: mctree.Node | null | undefined): null | mctree.Literal | mctree.AsExpression;
 export declare function optimizeMonkeyC(fnMap: FilesToOptimizeMap): Promise<void>;

package/build/src/optimizer.d.ts

@@ -1,12 +1,17 @@
-import { get_jungle, Target, ResolvedJungle } from "./jungles";
+import { mctree } from "@markw65/prettier-plugin-monkeyc";
+import { get_jungle, ResolvedJungle, Target } from "./jungles";
 import { launchSimulator, simulateProgram } from "./launch";
+import { manifestProducts } from "./manifest";
 import { copyRecursiveAsNeeded } from "./util";
-import { mctree } from "@markw65/prettier-plugin-monkeyc";
-export { copyRecursiveAsNeeded, launchSimulator, simulateProgram, get_jungle, ResolvedJungle, mctree, };
+export { copyRecursiveAsNeeded, get_jungle, launchSimulator, manifestProducts, mctree, ResolvedJungle, simulateProgram, };
 export declare const defaultConfig: {
     outputPath: string;
     workspace: string;
 };
+export interface ErrorWithLocation extends Error {
+    location?: NonNullable<mctree.Node["loc"]>;
+}
+export declare function isErrorWithLocation(e: Error): e is ErrorWithLocation;
 declare global {
     type BuildConfig = {
         workspace?: string;
@@ -38,58 +43,65 @@ declare global {
     type StateNodeDecls = {
         [key: string]: StateNodeDecl[];
     };
-    type ProgramStateNode = {
+    interface BaseStateNode {
+        type: string;
+        node: mctree.Node | null | undefined;
+        name: string | null | undefined;
+        fullName: string | null | undefined;
+        decls?: StateNodeDecls | undefined;
+        type_decls?: StateNodeDecls | undefined;
+        stack?: ProgramStateStack | undefined;
+    }
+    interface ProgramStateNode extends BaseStateNode {
         type: "Program";
         node: null | undefined;
         name: "$";
         fullName: "$";
-        decls?: StateNodeDecls;
-        stack?: null | undefined;
-    };
-    type ModuleStateNode = {
+        stack?: undefined;
+    }
+    interface ModuleStateNode extends BaseStateNode {
         type: "ModuleDeclaration";
+        node: mctree.ModuleDeclaration;
         name: string;
         fullName: string;
-        node: mctree.ModuleDeclaration;
-        stack?: ProgramStateStack;
-        decls?: StateNodeDecls;
-    };
-    type ClassStateNode = {
+    }
+    interface ClassStateNode extends BaseStateNode {
         type: "ClassDeclaration";
+        node: mctree.ClassDeclaration;
         name: string;
         fullName: string;
-        node: mctree.ClassDeclaration;
-        decls?: StateNodeDecls;
-        stack?: ProgramStateStack;
-        superClass: ClassStateNode[] | true;
-    };
-    type FunctionStateNode = {
+        superClass?: ClassStateNode[] | true;
+    }
+    interface FunctionStateNode extends BaseStateNode {
         type: "FunctionDeclaration";
+        node: mctree.FunctionDeclaration;
         name: string;
         fullName: string;
-        node: mctree.FunctionDeclaration;
         stack?: ProgramStateStack;
         decls?: undefined;
-    };
-    type BlockStateNode = {
+    }
+    interface BlockStateNode extends BaseStateNode {
         type: "BlockStatement";
-        name?: null | undefined;
-        fullName?: null | undefined;
+        name: undefined;
+        fullName: undefined;
         node: mctree.BlockStatement;
-        decls?: StateNodeDecls;
-        stack?: null | undefined;
-    };
+        stack?: undefined;
+    }
     type StateNode = ProgramStateNode | FunctionStateNode | BlockStateNode | ClassStateNode | ModuleStateNode;
     type ProgramStateStack = StateNode[];
     export type ProgramState = {
         allFunctions?: FunctionStateNode[];
         allClasses?: ClassStateNode[];
         stack?: ProgramStateStack;
-        shouldExclude?: (node: any) => any;
-        pre?: (node: mctree.Node) => null | false | (keyof mctree.NodeAll)[];
-        post?: (node: mctree.Node) => null | false | mctree.Node;
-        lookup?: (node: mctree.Node, name?: string | null, stack?: ProgramStateStack) => [string, StateNodeDecl[], ProgramStateStack];
-        traverse?: (node: mctree.Node) => void | boolean | mctree.Node;
+        removeNodeComments?: (node: mctree.Node, ast: mctree.Program) => void;
+        shouldExclude?: (node: mctree.Node) => boolean;
+        pre?: (node: mctree.Node, state: ProgramStateLive) => null | false | (keyof mctree.NodeAll)[];
+        post?: (node: mctree.Node, state: ProgramStateLive) => null | false | mctree.Node;
+        lookup?: (node: mctree.Node, name?: string | null, stack?: ProgramStateStack) => [string, StateNodeDecl[], ProgramStateStack] | [null, null, null];
+        lookupValue?: (node: mctree.Node, name?: string | null, stack?: ProgramStateStack) => [string, StateNodeDecl[], ProgramStateStack] | [null, null, null];
+        lookupType?: (node: mctree.Node, name?: string | null, stack?: ProgramStateStack) => [string, StateNodeDecl[], ProgramStateStack] | [null, null, null];
+        traverse?: (node: mctree.Node) => void | null | false | mctree.Node;
+        inType?: boolean;
         exposed?: {
             [key: string]: true;
         };
@@ -112,6 +124,12 @@ declare global {
             [key: string]: mctree.Literal;
         };
     };
+    type Finalized<T, Keys extends keyof T> = T & {
+        [key in Keys]-?: NonNullable<T[key]>;
+    };
+    export type ProgramStateLive = Finalized<ProgramState, "stack" | "lookup" | "lookupValue" | "lookupType" | "traverse" | "index" | "constants" | "removeNodeComments" | "inType">;
+    export type ProgramStateAnalysis = Finalized<ProgramStateLive, "allClasses" | "allFunctions">;
+    export type ProgramStateOptimizer = Finalized<ProgramStateAnalysis, "localsStack" | "exposed" | "calledFunctions">;
     type ExcludeAnnotationsMap = {
         [key: string]: boolean;
     };
@@ -137,20 +155,17 @@ export declare function buildOptimizedProject(product: string | null, options: B
     exe: string;
     args: string[];
     program: string;
-    product: string;
-    hasTests: boolean;
+    product: string | null;
+    hasTests: boolean | undefined;
 }>;
-/**
- *
- * @param {BuildConfig} options
- * @returns
- */
 export declare function generateOptimizedProject(options: BuildConfig): Promise<{
-    jungleFiles: string;
+    jungleFiles: string | undefined;
     program: string;
+    xml?: undefined;
     hasTests?: undefined;
 } | {
     jungleFiles: string;
+    xml: import("./manifest").ManifestXML;
     program: string;
     hasTests: boolean;
 }>;
@@ -166,7 +181,7 @@ declare type RequiredNonNull<T> = {
 export declare type Analysis = {
     fnMap: RequiredNonNull<FilesToOptimizeMap>;
     paths: string[];
-    state: ProgramState;
+    state: ProgramStateAnalysis;
 };
 export declare function getProjectAnalysis(targets: Target[], analysis: PreAnalysis | null, options: BuildConfig): Promise<Analysis | PreAnalysis>;
 /**

package/build/src/sdk-util.d.ts

@@ -2,13 +2,16 @@ export declare const isWin: boolean;
 export declare const appSupport: string;
 export declare const connectiq: string;
 export declare function getSdkPath(): Promise<string>;
-export declare function getDeviceInfo(): Promise<{
+export declare type DeviceInfo = {
     [key: string]: {
         appTypes: {
             memoryLimit: number;
             type: string;
         }[];
         deviceFamily: string;
+        displayName: string;
+        languages: Record<string, true>;
     };
-}>;
+};
+export declare function getDeviceInfo(): Promise<DeviceInfo>;
 export declare function getLanguages(): Promise<any>;

package/build/src/util.d.ts

@@ -1,6 +1,5 @@
-export declare function globa(pattern: string, options?: {
-    [key: string]: unknown;
-}): Promise<Array<string>>;
+import * as glob from "glob";
+export declare function globa(pattern: string, options?: glob.IOptions): Promise<Array<string>>;
 export declare function last_modified(inputs: string[]): Promise<number>;
 export declare function first_modified(inputs: string[]): Promise<number>;
 export declare function pushUnique<T>(arr: T[], value: T): void;

package/build/util.cjs

@@ -1303,6 +1303,8 @@ function setopts (self, pattern, options) {
   // Note that they are not supported in Glob itself anyway.
   options.nonegate = true
   options.nocomment = true
+  // always treat \ in patterns as escapes, not path separators
+  options.allowWindowsEscape = false
 
   self.minimatch = new Minimatch(pattern, options)
   self.options = self.minimatch.options
@@ -1778,7 +1780,10 @@ Glob.prototype._process = function (pattern, index, inGlobStar, cb) {
   var read
   if (prefix === null)
     read = '.'
-  else if (isAbsolute(prefix) || isAbsolute(pattern.join('/'))) {
+  else if (isAbsolute(prefix) ||
+      isAbsolute(pattern.map(function (p) {
+        return typeof p === 'string' ? p : '[*]'
+      }).join('/'))) {
     if (!prefix || !isAbsolute(prefix))
       prefix = '/' + prefix
     read = prefix
@@ -2278,7 +2283,7 @@ function GlobSync (pattern, options) {
 }
 
 GlobSync.prototype._finish = function () {
-  assert(this instanceof GlobSync)
+  assert.ok(this instanceof GlobSync)
   if (this.realpath) {
     var self = this
     this.matches.forEach(function (matchset, index) {
@@ -2302,7 +2307,7 @@ GlobSync.prototype._finish = function () {
 
 
 GlobSync.prototype._process = function (pattern, index, inGlobStar) {
-  assert(this instanceof GlobSync)
+  assert.ok(this instanceof GlobSync)
 
   // Get the first [n] parts of pattern that are all strings.
   var n = 0
@@ -2339,7 +2344,10 @@ GlobSync.prototype._process = function (pattern, index, inGlobStar) {
   var read
   if (prefix === null)
     read = '.'
-  else if (isAbsolute(prefix) || isAbsolute(pattern.join('/'))) {
+  else if (isAbsolute(prefix) ||
+      isAbsolute(pattern.map(function (p) {
+        return typeof p === 'string' ? p : '[*]'
+      }).join('/'))) {
     if (!prefix || !isAbsolute(prefix))
       prefix = '/' + prefix
     read = prefix
@@ -3940,18 +3948,6 @@ module.exports = require("util");
 /******/ 	}
 /******/ 	
 /************************************************************************/
-/******/ 	/* webpack/runtime/compat get default export */
-/******/ 	(() => {
-/******/ 		// getDefaultExport function for compatibility with non-harmony modules
-/******/ 		__webpack_require__.n = (module) => {
-/******/ 			var getter = module && module.__esModule ?
-/******/ 				() => (module['default']) :
-/******/ 				() => (module);
-/******/ 			__webpack_require__.d(getter, { a: getter });
-/******/ 			return getter;
-/******/ 		};
-/******/ 	})();
-/******/ 	
 /******/ 	/* webpack/runtime/define property getters */
 /******/ 	(() => {
 /******/ 		// define getter functions for harmony exports
@@ -4020,7 +4016,6 @@ var external_fs_ = __webpack_require__(6231);
 const promises_namespaceObject = require("fs/promises");
 // EXTERNAL MODULE: ./node_modules/glob/glob.js
 var glob = __webpack_require__(2884);
-var glob_default = /*#__PURE__*/__webpack_require__.n(glob);
 // EXTERNAL MODULE: external "path"
 var external_path_ = __webpack_require__(1423);
 ;// CONCATENATED MODULE: external "readline"
@@ -4038,7 +4033,7 @@ const external_readline_namespaceObject = require("readline");
 __webpack_require__.g["lastModifiedSource" + ""] = 0;
 function globa(pattern, options) {
     return new Promise((resolve, reject) => {
-        glob_default().glob(pattern, options, (er, files) => {
+        glob.glob(pattern, options || {}, (er, files) => {
             if (er) {
                 reject(files);
             }

package/package.json

@@ -1,13 +1,19 @@
 {
   "name": "@markw65/monkeyc-optimizer",
   "type": "module",
-  "version": "1.0.12",
+  "version": "1.0.15",
   "description": "Source to source optimizer for Garmin Monkey C code",
   "main": "build/optimizer.cjs",
   "types": "build/src/optimizer.d.ts",
   "exports": {
-    ".": "./build/optimizer.cjs",
-    "./*.js": "./build/*.cjs"
+    ".": {
+      "types": "./build/src/optimizer.d.ts",
+      "default": "./build/optimizer.cjs"
+    },
+    "./*.js": {
+      "types": "./build/src/*.d.ts",
+      "default": "./build/*.cjs"
+    }
   },
   "scripts": {
     "watch": "webpack --mode development --watch",
@@ -27,7 +33,7 @@
   "author": "markw65",
   "license": "MIT",
   "dependencies": {
-    "@markw65/prettier-plugin-monkeyc": "^1.0.19"
+    "@markw65/prettier-plugin-monkeyc": "^1.0.21"
   },
   "devDependencies": {
     "@types/glob": "^7.2.0",