@markw65/monkeyc-optimizer 1.0.11 → 1.0.12

package/README.md

@@ -119,3 +119,7 @@ More fixes found via open source projects.
   - Refactoring to make analysis available in prettier-extension-monkeyc
   - Generate .d.ts, and drop unneeded paths/resolve.alias
   - Pull in a typed version of @markw65/prettier-plugin-monkeyc
+
+### 1.0.12
+
+- Fix connectiq and vscode paths on linux, and better error reporting when they're missing

package/build/optimizer.cjs

@@ -11937,7 +11937,7 @@ 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 && 1653156641658 < opt_time) {
+        if (source_time < opt_time && 1653327101857 < opt_time) {
             return hasTests;
         }
     }

package/build/sdk-util.cjs

@@ -7195,14 +7195,24 @@ const external_util_cjs_namespaceObject = require("./util.cjs");
 const isWin = process.platform == "win32";
 const appSupport = isWin
     ? `${process.env.APPDATA}`.replace(/\\/g, "/")
-    : `${process.env.HOME}/Library/Application Support`;
-const connectiq = `${appSupport}/Garmin/ConnectIQ`;
+    : process.platform == "linux"
+        ? `${process.env.HOME}/.config`
+        : `${process.env.HOME}/Library/Application Support`;
+const connectiq = process.platform == "linux"
+    ? `${process.env.HOME}/.Garmin/ConnectIQ`
+    : `${appSupport}/Garmin/ConnectIQ`;
 function getSdkPath() {
     return promises_namespaceObject.readFile(connectiq + "/current-sdk.cfg")
-        .then((contents) => contents.toString().replace(/^\s*(.*?)\s*$/s, "$1"));
+        .then((contents) => contents.toString().replace(/^\s*(.*?)\s*$/s, "$1"))
+        .catch(() => {
+        throw new Error(`No sdk found at '${connectiq}'. Check your sdk is correctly installed`);
+    });
 }
 async function getDeviceInfo() {
     const files = await (0,external_util_cjs_namespaceObject.globa)(`${connectiq}/Devices/*/compiler.json`);
+    if (!files.length) {
+        throw new Error(`No devices found at '${connectiq}/Devices'. Check your sdk is correctly installed`);
+    }
     return Promise.all(files.map((file) => {
         return promises_namespaceObject.readFile(file).then((data) => {
             const { deviceId, appTypes, deviceFamily } = JSON.parse(data.toString());

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

@@ -2,6 +2,6 @@ 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.Literal | mctree.AsExpression;
+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 optimizeMonkeyC(fnMap: FilesToOptimizeMap): Promise<void>;

package/package.json

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