@markw65/monkeyc-optimizer 1.0.33 → 1.0.36

package/README.md

@@ -393,3 +393,30 @@ Bug Fixes
 
 - Bug fixes
   - Fix PRE to not merge values with different types. ie Number, Long, Float and Double literals should all be treated separately, even when the compare the same.
+
+### 1.0.34
+
+- Bug fixes
+
+  - Fix parser to allow white space to separate attributes, in addition to comma
+  - Fix optimizer to respect prettier options when formatting the optimized code
+
+- Testing
+  - rewrite test harness in typescript
+  - fix up tests to work with compiler2 again, and also with compiler2 at -O0
+
+### 1.0.35
+
+- Testing
+
+  - Add a new open source project
+  - Fixup tests to work with compiler2beta2
+
+- Bug fixes
+  - Fixed a bug that caused the optimizer to fail if a top level variable declared in a case statement had an initializer with side effects. This didn't produce incorrect results, the optimizer simply bailed out with an obscure error, and refused to optimize the project.
+
+### 1.0.36
+
+- Update to [@markw65/prettier-plugin-monkeyc@1.0.34](https://github.com/markw65/prettier-plugin-monkeyc#1034).
+  - Fixes [prettier-plugin-monkeyc#1](https://github.com/markw65/prettier-plugin-monkeyc/issues/1)
+  - Fixes [monkeyc-optimizer#1](https://github.com/markw65/monkeyc-optimizer/issues/1)

package/build/api.cjs

@@ -2920,18 +2920,35 @@ function unused_exprs_cleanupUnusedVars(state, node) {
         });
         if (toRemove) {
             const varDeclarations = new Map();
-            traverseAst(node, null, (node) => {
+            const stack = [];
+            traverseAst(node, (node) => {
                 switch (node.type) {
+                    case "SwitchCase":
+                        stack.push(node.consequent);
+                        break;
+                    case "BlockStatement":
+                        stack.push(node.body);
+                        break;
+                }
+            }, (node) => {
+                switch (node.type) {
+                    case "SwitchCase":
+                    case "BlockStatement":
+                        stack.pop();
+                        break;
                     case "VariableDeclaration": {
                         node.declarations.forEach((decl, i) => {
                             const name = variableDeclarationName(decl.id);
                             if (hasProperty(toRemove, name)) {
-                                const indices = varDeclarations.get(node);
-                                if (indices) {
-                                    indices.push(i);
+                                const info = varDeclarations.get(node);
+                                if (info) {
+                                    info.indices.push(i);
                                 }
                                 else {
-                                    varDeclarations.set(node, [i]);
+                                    varDeclarations.set(node, {
+                                        parent: stack[stack.length - 1],
+                                        indices: [i],
+                                    });
                                 }
                             }
                         });
@@ -2979,10 +2996,10 @@ function unused_exprs_cleanupUnusedVars(state, node) {
                 }
                 return null;
             });
-            varDeclarations.forEach((indices, decl) => {
+            varDeclarations.forEach((info, decl) => {
                 let index = -1;
-                for (let ii = indices.length, j = decl.declarations.length; ii--;) {
-                    const i = indices[ii];
+                for (let ii = info.indices.length, j = decl.declarations.length; ii--;) {
+                    const i = info.indices[ii];
                     const vdecl = decl.declarations[i];
                     const name = variableDeclarationName(vdecl.id);
                     if (hasProperty(toRemove, name)) {
@@ -2994,7 +3011,7 @@ function unused_exprs_cleanupUnusedVars(state, node) {
                                 continue;
                             }
                             if (index < 0) {
-                                index = parent.node.body.findIndex((s) => s === decl);
+                                index = info.parent.findIndex((s) => s === decl);
                                 if (index < 0) {
                                     throw new Error(`Failed to find variable declaration for ${variableDeclarationName(vdecl.id)}`);
                                 }
@@ -3015,7 +3032,7 @@ function unused_exprs_cleanupUnusedVars(state, node) {
                                 decl.end = vdecl.start;
                             }
                             decl.declarations.splice(i);
-                            parent.node.body.splice(index + 1, 0, ...rep);
+                            info.parent.splice(index + 1, 0, ...rep);
                             j = i;
                             continue;
                         }
@@ -5059,7 +5076,7 @@ function api_collectNamespaces(ast, stateIn) {
     }
     return state.stack[0];
 }
-function api_formatAst(node, monkeyCSource = null) {
+function api_formatAst(node, monkeyCSource = null, options = null) {
     /*
      * The estree printer sometimes looks at the parent node without
      * checking that there *is* a parent node (eg it assumes all
@@ -5087,6 +5104,7 @@ function api_formatAst(node, monkeyCSource = null) {
     // looking for in the source.
     const source = (monkeyCSource || "") + "\n" + (0,prettier_plugin_monkeyc_namespaceObject.serializeMonkeyC)(node);
     return external_prettier_namespaceObject.format(source, {
+        ...(options || {}),
         parser: "monkeyc-json",
         plugins: [(prettier_plugin_monkeyc_default())],
         endOfLine: "lf",

package/build/optimizer.cjs

@@ -10024,6 +10024,8 @@ const external_crypto_namespaceObject = require("crypto");
 const promises_namespaceObject = require("fs/promises");
 // EXTERNAL MODULE: external "path"
 var external_path_ = __webpack_require__(1423);
+;// CONCATENATED MODULE: external "prettier"
+const external_prettier_namespaceObject = require("prettier");
 ;// CONCATENATED MODULE: external "./api.cjs"
 const external_api_cjs_namespaceObject = require("./api.cjs");
 ;// CONCATENATED MODULE: external "./sdk-util.cjs"
@@ -13612,18 +13614,35 @@ function cleanupUnusedVars(state, node) {
         });
         if (toRemove) {
             const varDeclarations = new Map();
-            traverseAst(node, null, (node) => {
+            const stack = [];
+            traverseAst(node, (node) => {
                 switch (node.type) {
+                    case "SwitchCase":
+                        stack.push(node.consequent);
+                        break;
+                    case "BlockStatement":
+                        stack.push(node.body);
+                        break;
+                }
+            }, (node) => {
+                switch (node.type) {
+                    case "SwitchCase":
+                    case "BlockStatement":
+                        stack.pop();
+                        break;
                     case "VariableDeclaration": {
                         node.declarations.forEach((decl, i) => {
                             const name = (0,external_api_cjs_namespaceObject.variableDeclarationName)(decl.id);
                             if (hasProperty(toRemove, name)) {
-                                const indices = varDeclarations.get(node);
-                                if (indices) {
-                                    indices.push(i);
+                                const info = varDeclarations.get(node);
+                                if (info) {
+                                    info.indices.push(i);
                                 }
                                 else {
-                                    varDeclarations.set(node, [i]);
+                                    varDeclarations.set(node, {
+                                        parent: stack[stack.length - 1],
+                                        indices: [i],
+                                    });
                                 }
                             }
                         });
@@ -13671,10 +13690,10 @@ function cleanupUnusedVars(state, node) {
                 }
                 return null;
             });
-            varDeclarations.forEach((indices, decl) => {
+            varDeclarations.forEach((info, decl) => {
                 let index = -1;
-                for (let ii = indices.length, j = decl.declarations.length; ii--;) {
-                    const i = indices[ii];
+                for (let ii = info.indices.length, j = decl.declarations.length; ii--;) {
+                    const i = info.indices[ii];
                     const vdecl = decl.declarations[i];
                     const name = (0,external_api_cjs_namespaceObject.variableDeclarationName)(vdecl.id);
                     if (hasProperty(toRemove, name)) {
@@ -13686,7 +13705,7 @@ function cleanupUnusedVars(state, node) {
                                 continue;
                             }
                             if (index < 0) {
-                                index = parent.node.body.findIndex((s) => s === decl);
+                                index = info.parent.findIndex((s) => s === decl);
                                 if (index < 0) {
                                     throw new Error(`Failed to find variable declaration for ${(0,external_api_cjs_namespaceObject.variableDeclarationName)(vdecl.id)}`);
                                 }
@@ -13707,7 +13726,7 @@ function cleanupUnusedVars(state, node) {
                                 decl.end = vdecl.start;
                             }
                             decl.declarations.splice(i);
-                            parent.node.body.splice(index + 1, 0, ...rep);
+                            info.parent.splice(index + 1, 0, ...rep);
                             j = i;
                             continue;
                         }
@@ -15047,6 +15066,7 @@ function optimizeCall(state, node, context) {
 
 
 
+
 function relative_path_no_dotdot(relative) {
     return relative.replace(/^(\.\.[\\/])+/, (str) => `__${"dot".repeat(str.length / 3)}__${str.slice(-1)}`);
 }
@@ -15469,28 +15489,35 @@ async function generateOneConfig(buildConfig, dependencyFiles, config) {
         // the oldest optimized file, we don't need to regenerate
         const source_time = await (0,external_util_cjs_namespaceObject.last_modified)(Object.keys(fnMap).concat(dependencyFiles));
         const opt_time = await (0,external_util_cjs_namespaceObject.first_modified)(Object.values(fnMap).map((v) => v.output));
-        if (source_time < opt_time && 1658088370253 < opt_time) {
+        if (source_time < opt_time && 1662763619992 < opt_time) {
             return { hasTests, diagnostics: prevDiagnostics };
         }
     }
     await promises_namespaceObject.rm(output, { recursive: true, force: true });
     await promises_namespaceObject.mkdir(output, { recursive: true });
     const diagnostics = await optimizeMonkeyC(fnMap, Object.keys(buildConfig.barrelMap || {}), config);
-    return Promise.all(Object.values(fnMap).map(async (info) => {
-        const name = info.output;
-        const dir = external_path_.dirname(name);
-        await promises_namespaceObject.mkdir(dir, { recursive: true });
-        const opt_source = (0,external_api_cjs_namespaceObject.formatAst)(info.ast, info.monkeyCSource);
-        await promises_namespaceObject.writeFile(name, opt_source);
-        return info.hasTests;
-    })).then((results) => {
-        const hasTests = results.some((v) => v);
-        return promises_namespaceObject.writeFile(external_path_.join(output, "build-info.json"), JSON.stringify({
-            hasTests,
-            diagnostics,
-            ...Object.fromEntries(configOptionsToCheck.map((option) => [option, config[option]])),
-        }))
-            .then(() => ({ hasTests, diagnostics }));
+    return external_prettier_namespaceObject.resolveConfig(config.workspace, {
+        useCache: false,
+        editorconfig: true,
+    }).then((prettierConfig) => {
+        const options = { ...prettierConfig, ...(config.prettier || {}) };
+        return Promise.all(Object.values(fnMap).map(async (info) => {
+            const name = info.output;
+            const dir = external_path_.dirname(name);
+            await promises_namespaceObject.mkdir(dir, { recursive: true });
+            options.filepath = name;
+            const opt_source = (0,external_api_cjs_namespaceObject.formatAst)(info.ast, info.monkeyCSource, options);
+            await promises_namespaceObject.writeFile(name, opt_source);
+            return info.hasTests;
+        })).then((results) => {
+            const hasTests = results.some((v) => v);
+            return promises_namespaceObject.writeFile(external_path_.join(output, "build-info.json"), JSON.stringify({
+                hasTests,
+                diagnostics,
+                ...Object.fromEntries(configOptionsToCheck.map((option) => [option, config[option]])),
+            }))
+                .then(() => ({ hasTests, diagnostics }));
+        });
     });
 }
 async function getProjectAnalysis(targets, analysis, options) {

package/build/sdk-util.cjs

@@ -1,4 +1,4 @@
-0 && (module.exports = {appSupport,connectiq,getDeviceInfo,getLanguages,getSdkPath,isWin});
+0 && (module.exports = {SectionKinds,appSupport,connectiq,getDeviceInfo,getLanguages,getSdkPath,isWin,readPrg});
 /******/ (() => { // webpackBootstrap
 /******/ 	var __webpack_modules__ = ({
 
@@ -7171,12 +7171,14 @@ __webpack_require__.r(__webpack_exports__);
 
 // EXPORTS
 __webpack_require__.d(__webpack_exports__, {
+  "SectionKinds": () => (/* reexport */ SectionKinds),
   "appSupport": () => (/* binding */ appSupport),
   "connectiq": () => (/* binding */ connectiq),
   "getDeviceInfo": () => (/* binding */ getDeviceInfo),
   "getLanguages": () => (/* binding */ getLanguages),
   "getSdkPath": () => (/* binding */ getSdkPath),
-  "isWin": () => (/* binding */ isWin)
+  "isWin": () => (/* binding */ isWin),
+  "readPrg": () => (/* reexport */ readPrg)
 });
 
 ;// CONCATENATED MODULE: external "fs/promises"
@@ -7187,11 +7189,38 @@ const external_path_namespaceObject = require("path");
 var xml2js = __webpack_require__(5055);
 ;// CONCATENATED MODULE: external "./util.cjs"
 const external_util_cjs_namespaceObject = require("./util.cjs");
+;// CONCATENATED MODULE: ./src/readprg.ts
+
+var SectionKinds;
+(function (SectionKinds) {
+    SectionKinds[SectionKinds["TEXT"] = -1059145026] = "TEXT";
+    SectionKinds[SectionKinds["DATA"] = -629491010] = "DATA";
+})(SectionKinds || (SectionKinds = {}));
+async function readPrg(path) {
+    const data = await promises_namespaceObject.readFile(path);
+    const view = new DataView(data.buffer);
+    const sections = {};
+    let offset = 0;
+    while (view.byteLength - offset > 8) {
+        const type = view.getInt32(offset);
+        offset += 4;
+        const length = view.getInt32(offset);
+        offset += 4;
+        if (length > view.byteLength - offset) {
+            throw new Error(`Invalid length for section ${type}`);
+        }
+        sections[type] = length;
+        offset += length;
+    }
+    return sections;
+}
+
 ;// CONCATENATED MODULE: ./src/sdk-util.ts
 
 
 
 
+
 const isWin = process.platform == "win32";
 const appSupport = isWin
     ? `${process.env.APPDATA}`.replace(/\\/g, "/")

package/build/src/api.d.ts

@@ -9,7 +9,7 @@ export declare function variableDeclarationName(node: mctree.TypedIdentifier | m
 export declare function sameLookupResult(a: LookupDefinition[], b: LookupDefinition[]): boolean;
 export declare function isLookupCandidate(node: mctree.MemberExpression): false | mctree.Identifier;
 export declare function collectNamespaces(ast: mctree.Program, stateIn?: ProgramState): ProgramStateNode;
-export declare function formatAst(node: mctree.Node, monkeyCSource?: string | null): string;
+export declare function formatAst(node: mctree.Node, monkeyCSource?: string | null, options?: Record<string, unknown> | null): string;
 export declare function findUsingForNode(state: ProgramStateLive, stack: ProgramStateStack, i: number, node: mctree.Identifier, isType: boolean): StateNodeDecl[] | null;
 export declare function getApiFunctionInfo(func: FunctionStateNode): FunctionInfo;
 export declare function markInvokeClassMethod(func: FunctionStateNode): void;

package/build/src/driver.d.ts

@@ -0,0 +1,2 @@
+export declare function driver(): Promise<void>;
+export declare function error(message: string): never;

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

@@ -6,7 +6,7 @@ export declare function analyze(fnMap: FilesToOptimizeMap, barrelList?: string[]
 export declare function getLiteralFromDecls(lookupDefns: LookupDefinition[]): mctree.Literal | mctree.AsExpression | null;
 export declare function getLiteralNode(node: mctree.Node | null | undefined): null | mctree.Literal | mctree.AsExpression;
 export declare function optimizeMonkeyC(fnMap: FilesToOptimizeMap, barrelList?: string[], config?: BuildConfig): Promise<Record<string, {
-    type: "ERROR" | "WARNING" | "INFO";
+    type: import("./optimizer-types").DiagnosticType;
     loc: {
         start: mctree.Position;
         end: mctree.Position;

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

@@ -1,6 +1,6 @@
 import { mctree } from "@markw65/prettier-plugin-monkeyc";
 import { ResolvedJungle } from "./jungles";
-declare type DiagnosticType = "ERROR" | "WARNING" | "INFO";
+export declare type DiagnosticType = "ERROR" | "WARNING" | "INFO";
 export declare type BuildConfig = {
     workspace?: string;
     jungleFiles?: string;
@@ -25,6 +25,7 @@ export declare type BuildConfig = {
     checkBuildPragmas?: boolean;
     checkInvalidSymbols?: DiagnosticType | "OFF";
     sizeBasedPRE?: boolean | string;
+    prettier?: Record<string, unknown>;
     _cache?: {
         barrels?: Record<string, ResolvedJungle>;
         barrelMap?: Record<string, Record<string, ResolvedJungle>>;

package/build/src/optimizer.d.ts

@@ -30,7 +30,7 @@ export declare function buildOptimizedProject(product: string | null, options: B
     product: string | null;
     hasTests: boolean;
     diagnostics: Record<string, {
-        type: "ERROR" | "WARNING" | "INFO";
+        type: import("./optimizer-types").DiagnosticType;
         loc: {
             start: mctree.Position;
             end: mctree.Position;
@@ -50,7 +50,7 @@ export declare function generateOptimizedProject(options: BuildConfig): Promise<
     program: string;
     hasTests: boolean;
     diagnostics: Record<string, {
-        type: "ERROR" | "WARNING" | "INFO";
+        type: import("./optimizer-types").DiagnosticType;
         loc: {
             start: mctree.Position;
             end: mctree.Position;

package/build/src/projects.d.ts

@@ -0,0 +1,21 @@
+import { BuildConfig } from "./optimizer-types";
+export declare type RemoteProject = string | {
+    root: string;
+    options?: BuildConfig;
+    rename?: {
+        from: string;
+        to: string;
+    }[];
+    build?: boolean;
+    comment?: string;
+    exclude?: string;
+    include?: string;
+    sourcePath?: string;
+    jungleContent?: string[];
+};
+export declare const githubProjects: RemoteProject[];
+export declare function fetchGitProjects(projects: RemoteProject[]): Promise<(string | {
+    jungle: string;
+    build: boolean | null;
+    options: BuildConfig | null;
+})[]>;

package/build/src/readprg.d.ts

@@ -0,0 +1,5 @@
+export declare enum SectionKinds {
+    TEXT = -1059145026,
+    DATA = -629491010
+}
+export declare function readPrg(path: string): Promise<Record<number, number>>;

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

@@ -1,3 +1,4 @@
+export { readPrg, SectionKinds } from "./readprg";
 export declare const isWin: boolean;
 export declare const appSupport: string;
 export declare const connectiq: string;

package/build/src/util.d.ts

@@ -9,5 +9,5 @@ export declare function spawnByLine(command: string, args: string[], lineHandler
     [key: string]: unknown;
 }): Promise<void>;
 export declare function readByLine(file: string, lineHandler: LineHandler): Promise<unknown>;
-export declare function promiseAll<T>(promiseFn: (i: number) => Promise<T>, parallelism: number): Promise<T[]>;
+export declare function promiseAll<T>(promiseFn: (i: number) => Promise<T> | null, parallelism: number): Promise<T[]>;
 export declare function copyRecursiveAsNeeded(source: string, target: string, filter?: (src: string, tgt: string) => boolean): Promise<void>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@markw65/monkeyc-optimizer",
   "type": "module",
-  "version": "1.0.33",
+  "version": "1.0.36",
   "description": "Source to source optimizer for Garmin Monkey C code",
   "main": "build/optimizer.cjs",
   "types": "build/src/optimizer.d.ts",
@@ -37,7 +37,7 @@
   "author": "markw65",
   "license": "MIT",
   "dependencies": {
-    "@markw65/prettier-plugin-monkeyc": "^1.0.33"
+    "@markw65/prettier-plugin-monkeyc": "^1.0.35"
   },
   "devDependencies": {
     "@types/glob": "^7.2.0",