@markw65/monkeyc-optimizer 1.1.13 → 1.1.15

package/build/optimizer.cjs

@@ -1,4 +1,4 @@
-0 && (module.exports = {buildOptimizedProject,copyRecursiveAsNeeded,defaultConfig,display,generateApiMirTests,generateOptimizedProject,getProjectAnalysis,get_jungle,isErrorWithLocation,launchSimulator,manifestProducts,mctree,simulateProgram});
+0 && (module.exports = {buildOptimizedProject,copyRecursiveAsNeeded,defaultConfig,display,generateApiMirTests,generateOptimizedProject,getConfig,getProjectAnalysis,get_jungle,isErrorWithLocation,launchSimulator,manifestProducts,mctree,simulateProgram});
 /******/ (() => { // webpackBootstrap
 /******/ 	var __webpack_modules__ = ({
 
@@ -3416,6 +3416,7 @@ __webpack_require__.d(__webpack_exports__, {
   "display": () => (/* reexport */ display),
   "generateApiMirTests": () => (/* binding */ generateApiMirTests),
   "generateOptimizedProject": () => (/* binding */ generateOptimizedProject),
+  "getConfig": () => (/* binding */ getConfig),
   "getProjectAnalysis": () => (/* binding */ getProjectAnalysis),
   "get_jungle": () => (/* reexport */ get_jungle),
   "isErrorWithLocation": () => (/* binding */ isErrorWithLocation),
@@ -4523,7 +4524,13 @@ async function launchSimulator(force = true) {
         if (!force && (await checkIfSimulatorRunning()))
             return;
         const sdk = await (0,external_sdk_util_cjs_namespaceObject.getSdkPath)();
-        const child = (0,external_child_process_namespaceObject.execFile)(external_path_.resolve(sdk, "bin", external_sdk_util_cjs_namespaceObject.isWin ? "simulator" : "connectiq"));
+        const child = force || process.platform !== "darwin"
+            ? (0,external_child_process_namespaceObject.execFile)(external_path_.resolve(sdk, "bin", external_sdk_util_cjs_namespaceObject.isWin ? "simulator" : "connectiq"))
+            : (0,external_child_process_namespaceObject.execFile)("/usr/bin/open", [
+                "-g",
+                "-a",
+                external_path_.resolve(sdk, "bin", "ConnectIQ.App", "Contents/MacOS/simulator"),
+            ]);
         child.unref();
         for (let i = 0;; i++) {
             if (await checkIfSimulatorRunning())
@@ -5380,8 +5387,9 @@ function inlineRequested(state, func) {
     return false;
 }
 function shouldInline(state, func, call, context) {
-    if (state.inlining)
+    if (state.inlining || (state.localsStack?.length ?? 0) <= 1) {
         return false;
+    }
     let autoInline = false;
     let inlineAsExpression = false;
     const args = call.arguments;
@@ -15641,33 +15649,6 @@ async function optimizeMonkeyC(fnMap, resourcesMap, manifestXML, config) {
         return result;
     };
     const topLocals = () => state.localsStack[state.localsStack.length - 1];
-    /*
-     * Might this function be called from somewhere, including
-     * callbacks from the api (eg getSettingsView, etc).
-     */
-    const maybeCalled = (func) => {
-        if (!func.body) {
-            // this is an api.mir function. It can be called
-            return true;
-        }
-        if ((0,external_api_cjs_namespaceObject.hasProperty)(state.exposed, func.id.name))
-            return true;
-        if (func.attrs &&
-            func.attrs.attributes &&
-            func.attrs.attributes.elements.some((attr) => {
-                if (attr.type !== "UnaryExpression")
-                    return false;
-                if (attr.argument.type !== "Identifier")
-                    return false;
-                return attr.argument.name === "test";
-            })) {
-            return true;
-        }
-        if ((0,external_api_cjs_namespaceObject.hasProperty)(state.calledFunctions, func.id.name)) {
-            return (state.calledFunctions[func.id.name].find((f) => f === func) !== null);
-        }
-        return false;
-    };
     /*
      * Does elm (a class) have a maybeCalled function called name,
      * anywhere in its superClass chain.
@@ -15677,7 +15658,7 @@ async function optimizeMonkeyC(fnMap, resourcesMap, manifestXML, config) {
             elm.superClass.some((sc) => ((0,external_api_cjs_namespaceObject.hasProperty)(sc.decls, name) &&
                 sc.decls[name].some((f) => (0,external_api_cjs_namespaceObject.isStateNode)(f) &&
                     f.type === "FunctionDeclaration" &&
-                    maybeCalled(f.node))) ||
+                    maybeCalled(state, f.node))) ||
                 (sc.superClass && checkInherited(sc, name))));
     const renamer = (idnode) => {
         const ident = idnode.type === "Identifier" ? idnode : idnode.left;
@@ -15878,7 +15859,7 @@ async function optimizeMonkeyC(fnMap, resourcesMap, manifestXML, config) {
                     }
                     istate = is;
                 }
-                if (parent.type === "ClassDeclaration" && !maybeCalled(node)) {
+                if (parent.type === "ClassDeclaration" && !maybeCalled(state, node)) {
                     let used = false;
                     if (node.id.name === "initialize") {
                         used = true;
@@ -16080,15 +16061,31 @@ async function optimizeMonkeyC(fnMap, resourcesMap, manifestXML, config) {
     Object.values(fnMap).forEach((f) => {
         (0,external_api_cjs_namespaceObject.collectNamespaces)(f.ast, state);
     });
-    state.usedByName = {};
-    state.calledFunctions = {};
-    state.exposed = state.nextExposed;
-    state.nextExposed = {};
-    Object.values(fnMap).forEach((f) => {
-        (0,external_api_cjs_namespaceObject.collectNamespaces)(f.ast, state);
-    });
-    state.exposed = state.nextExposed;
-    state.nextExposed = {};
+    const cleanupAll = () => Object.values(fnMap).reduce((changes, f) => {
+        traverseAst(f.ast, undefined, (node) => {
+            const ret = cleanup(state, node, f.ast);
+            if (ret === false) {
+                changes = true;
+                state.removeNodeComments(node, f.ast);
+            }
+            else if (ret) {
+                changes = true;
+            }
+            return ret;
+        });
+        return changes;
+    }, false);
+    do {
+        state.usedByName = {};
+        state.calledFunctions = {};
+        state.exposed = state.nextExposed;
+        state.nextExposed = {};
+        Object.values(fnMap).forEach((f) => {
+            (0,external_api_cjs_namespaceObject.collectNamespaces)(f.ast, state);
+        });
+        state.exposed = state.nextExposed;
+        state.nextExposed = {};
+    } while (cleanupAll() && state.config?.iterateOptimizer);
     delete state.pre;
     delete state.post;
     if (state.config?.minimizeModules ?? true) {
@@ -16097,108 +16094,7 @@ async function optimizeMonkeyC(fnMap, resourcesMap, manifestXML, config) {
         });
     }
     Object.values(state.allFunctions).forEach((fns) => fns.forEach((fn) => sizeBasedPRE(state, fn)));
-    const cleanup = (node) => {
-        switch (node.type) {
-            case "ThisExpression":
-                node.text = "self";
-                break;
-            case "EnumStringBody":
-                if (node.members.every((m) => {
-                    const name = "name" in m ? m.name : m.id.name;
-                    return ((0,external_api_cjs_namespaceObject.hasProperty)(state.index, name) &&
-                        !(0,external_api_cjs_namespaceObject.hasProperty)(state.exposed, name) &&
-                        !(0,external_api_cjs_namespaceObject.hasProperty)(state.usedByName, name));
-                })) {
-                    node.enumType = [
-                        ...new Set(node.members.map((m) => {
-                            if (!("init" in m))
-                                return "Number";
-                            const [node, type] = getNodeValue(m.init);
-                            if (!node) {
-                                throw new Error("Failed to get type for eliminated enum");
-                            }
-                            return type;
-                        })),
-                    ].join(" or ");
-                    node.members.splice(0);
-                }
-                break;
-            case "EnumDeclaration":
-                if (!node.body.members.length) {
-                    if (!node.id)
-                        return false;
-                    if (!node.body.enumType) {
-                        throw new Error("Missing enumType on optimized enum");
-                    }
-                    return {
-                        type: "TypedefDeclaration",
-                        id: node.id,
-                        ts: {
-                            type: "UnaryExpression",
-                            argument: {
-                                type: "TypeSpecList",
-                                ts: [
-                                    node.body.enumType,
-                                ],
-                            },
-                            prefix: true,
-                            operator: " as",
-                        },
-                    };
-                }
-                break;
-            case "VariableDeclaration": {
-                node.declarations = node.declarations.filter((d) => {
-                    const name = (0,external_api_cjs_namespaceObject.variableDeclarationName)(d.id);
-                    return (!(0,external_api_cjs_namespaceObject.hasProperty)(state.index, name) ||
-                        (0,external_api_cjs_namespaceObject.hasProperty)(state.exposed, name) ||
-                        (0,external_api_cjs_namespaceObject.hasProperty)(state.usedByName, name));
-                });
-                if (!node.declarations.length) {
-                    return false;
-                }
-                break;
-            }
-            case "ClassElement":
-                if (!node.item) {
-                    return false;
-                }
-                break;
-            case "FunctionDeclaration":
-                if (!maybeCalled(node)) {
-                    if (node.attrs &&
-                        node.attrs.attributes &&
-                        node.attrs.attributes.elements.some((attr) => attr.type === "UnaryExpression" && attr.argument.name === "keep")) {
-                        break;
-                    }
-                    return false;
-                }
-                break;
-            case "ClassDeclaration":
-            case "ModuleDeclaration":
-                // none of the attributes means anything on classes and
-                // modules, and the new compiler complains about some
-                // of them. Just drop them all.
-                if (node.attrs && node.attrs.access) {
-                    if (node.attrs.attributes) {
-                        delete node.attrs.access;
-                    }
-                    else {
-                        delete node.attrs;
-                    }
-                }
-        }
-        return null;
-    };
-    Object.entries(fnMap).forEach(([, f]) => {
-        traverseAst(f.ast, undefined, (node) => {
-            const ret = cleanup(node);
-            if (ret === false) {
-                state.removeNodeComments(node, f.ast);
-            }
-            return ret;
-        });
-    });
+    cleanupAll();
     config.checkCompilerLookupRules = checkLookupRules;
     reportMissingSymbols(state, config);
     if (state.inlineDiagnostics) {
@@ -16224,6 +16120,129 @@ async function optimizeMonkeyC(fnMap, resourcesMap, manifestXML, config) {
     });
     return state.diagnostics;
 }
+/*
+ * Might this function be called from somewhere, including
+ * callbacks from the api (eg getSettingsView, etc).
+ */
+function maybeCalled(state, func) {
+    if (!func.body) {
+        // this is an api.mir function. It can be called
+        return true;
+    }
+    if ((0,external_api_cjs_namespaceObject.hasProperty)(state.exposed, func.id.name))
+        return true;
+    if (func.attrs &&
+        func.attrs.attributes &&
+        func.attrs.attributes.elements.some((attr) => {
+            if (attr.type !== "UnaryExpression")
+                return false;
+            if (attr.argument.type !== "Identifier")
+                return false;
+            return attr.argument.name === "test";
+        })) {
+        return true;
+    }
+    if ((0,external_api_cjs_namespaceObject.hasProperty)(state.calledFunctions, func.id.name)) {
+        return state.calledFunctions[func.id.name].find((f) => f === func) !== null;
+    }
+    return false;
+}
+function cleanup(state, node, ast) {
+    switch (node.type) {
+        case "ThisExpression":
+            node.text = "self";
+            break;
+        case "EnumStringBody":
+            if (node.members.every((m) => {
+                const name = "name" in m ? m.name : m.id.name;
+                return ((0,external_api_cjs_namespaceObject.hasProperty)(state.index, name) &&
+                    !(0,external_api_cjs_namespaceObject.hasProperty)(state.exposed, name) &&
+                    !(0,external_api_cjs_namespaceObject.hasProperty)(state.usedByName, name));
+            })) {
+                node.enumType = [
+                    ...new Set(node.members.map((m) => {
+                        if (!("init" in m))
+                            return "Number";
+                        const [node, type] = getNodeValue(m.init);
+                        if (!node) {
+                            throw new Error("Failed to get type for eliminated enum");
+                        }
+                        return type;
+                    })),
+                ].join(" or ");
+                node.members.splice(0);
+            }
+            break;
+        case "EnumDeclaration":
+            if (!node.body.members.length) {
+                if (!node.id)
+                    return false;
+                if (!node.body.enumType) {
+                    throw new Error("Missing enumType on optimized enum");
+                }
+                state.removeNodeComments(node, ast);
+                return withLocDeep({
+                    type: "TypedefDeclaration",
+                    id: node.id,
+                    ts: {
+                        type: "UnaryExpression",
+                        argument: {
+                            type: "TypeSpecList",
+                            ts: [
+                                node.body.enumType,
+                            ],
+                        },
+                        prefix: true,
+                        operator: " as",
+                    },
+                }, node, node);
+            }
+            break;
+        case "VariableDeclarator": {
+            const name = (0,external_api_cjs_namespaceObject.variableDeclarationName)(node.id);
+            return !(0,external_api_cjs_namespaceObject.hasProperty)(state.index, name) ||
+                (0,external_api_cjs_namespaceObject.hasProperty)(state.exposed, name) ||
+                (0,external_api_cjs_namespaceObject.hasProperty)(state.usedByName, name)
+                ? null
+                : false;
+        }
+        case "VariableDeclaration": {
+            if (!node.declarations.length) {
+                return false;
+            }
+            break;
+        }
+        case "ClassElement":
+            if (!node.item) {
+                return false;
+            }
+            break;
+        case "FunctionDeclaration":
+            if (!maybeCalled(state, node)) {
+                if (node.attrs &&
+                    node.attrs.attributes &&
+                    node.attrs.attributes.elements.some((attr) => attr.type === "UnaryExpression" && attr.argument.name === "keep")) {
+                    break;
+                }
+                return false;
+            }
+            break;
+        case "ClassDeclaration":
+        case "ModuleDeclaration":
+            // none of the attributes means anything on classes and
+            // modules, and the new compiler complains about some
+            // of them. Just drop them all.
+            if (node.attrs && node.attrs.access) {
+                if (node.attrs.attributes) {
+                    delete node.attrs.access;
+                }
+                else {
+                    delete node.attrs;
+                }
+            }
+    }
+    return null;
+}
 function optimizeCall(istate, node, context) {
     const state = istate.state;
     const [name, results] = state.lookupNonlocal(node.callee);
@@ -16745,6 +16764,7 @@ const configOptionsToCheck = [
     "extensionVersion",
     "typeCheckLevel",
     "covarianceWarnings",
+    "iterateOptimizer",
 ];
 /**
  * @param {BuildConfig} config
@@ -16803,7 +16823,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
         // 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 && 1676335488374 < opt_time) {
+        if (source_time < opt_time && 1677202119524 < opt_time) {
             return { hasTests, diagnostics: prevDiagnostics };
         }
     }
@@ -16830,7 +16850,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
             return promises_namespaceObject.writeFile(external_path_.join(output, "build-info.json"), JSON.stringify({
                 hasTests,
                 diagnostics,
-                optimizerVersion: "1.1.13",
+                optimizerVersion: "1.1.15",
                 ...Object.fromEntries(configOptionsToCheck.map((option) => [option, config[option]])),
             }))
                 .then(() => ({ hasTests, diagnostics }));