@markw65/monkeyc-optimizer 1.0.9 → 1.0.10

package/README.md

@@ -92,3 +92,11 @@ More fixes found via open source projects.
 - LiteralIntegerRe should be case insensitive
 - Proper fix for promiseAll
 - Auto-include barrels.jungle when its present
+
+### 1.0.10
+
+- Add --execute option to test.js to run the projects after building them
+- Add support for optimizing barrels
+- Add some typing via jsdoc, and turn on ts validation in vscode
+- Bump to @markw65/prettier-plugin-monkeyc:1.0.16 so ts recognizes its exports
+- Add [garmin/connectiq-apps](https://github.com/garmin/connectiq-apps) and fix some minor issues it revealed

package/build/api.cjs

@@ -112,12 +112,8 @@ function collectClassInfo(state) {
   });
 }
 
-async function analyze(fileNames, buildConfig) {
-  const excludeAnnotations =
-    buildConfig && buildConfig.excludeAnnotations
-      ? Object.fromEntries(buildConfig.excludeAnnotations.map((a) => [a, true]))
-      : {};
-
+async function analyze(fnMap) {
+  let excludeAnnotations;
   const allImports = [];
   const state = {
     allFunctions: [],
@@ -125,11 +121,11 @@ async function analyze(fileNames, buildConfig) {
     shouldExclude(node) {
       if (node.attrs && node.attrs.attrs) {
         if (
-          node.attrs.attrs.filter((attr) => {
+          node.attrs.attrs.some((attr) => {
             if (attr.type != "UnaryExpression") return false;
             if (attr.argument.type != "Identifier") return false;
             return hasProperty(excludeAnnotations, attr.argument.name);
-          }).length
+          })
         ) {
           return true;
         }
@@ -172,25 +168,29 @@ async function analyze(fileNames, buildConfig) {
   };
   markApi(state.stack[0]);
 
+  const getAst = (source, monkeyCSource, exclude) => {
+    excludeAnnotations = exclude;
+    const ast = MonkeyC.parsers.monkeyc.parse(monkeyCSource, {
+      grammarSource: source,
+    });
+    ast.source = source;
+    ast.monkeyCSource = monkeyCSource;
+    collectNamespaces(ast, state);
+    return ast;
+  };
   const files = await Promise.all(
-    fileNames.map(async (name) => ({
-      name,
-      monkeyCSource: (await fs.readFile(name))
-        .toString()
-        .replace(/\r\n/g, "\n"),
-    }))
+    Object.entries(fnMap).map(([name, { excludeAnnotations }]) =>
+      fs.readFile(name).then((data) => ({
+        name,
+        ast: getAst(
+          name,
+          data.toString().replace(/\r\n/g, "\n"),
+          excludeAnnotations
+        ),
+      }))
+    )
   );
 
-  files.forEach((f) => {
-    f.ast = MonkeyC.parsers.monkeyc.parse(f.monkeyCSource, {
-      grammarSource: f.name,
-    });
-    f.ast.source = f.name;
-    f.ast.monkeyCSource = f.monkeyCSource;
-    delete f.monkeyCSource;
-    collectNamespaces(f.ast, state);
-  });
-
   delete state.shouldExclude;
   delete state.post;
 
@@ -411,8 +411,8 @@ function evaluateFunction(func, args) {
   }
 }
 
-async function optimizeMonkeyC(fileNames, buildConfig) {
-  const { files, state } = await analyze(fileNames, buildConfig);
+async function optimizeMonkeyC(fnMap) {
+  const { files, state } = await analyze(fnMap);
   const replace = (node, obj) => {
     for (const k of Object.keys(node)) {
       delete node[k];