@markw65/monkeyc-optimizer 1.0.35 → 1.0.37

package/README.md

@@ -414,3 +414,9 @@ Bug Fixes
 
 - 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.35](https://github.com/markw65/prettier-plugin-monkeyc#1035).
+  - 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/optimizer.cjs

@@ -10956,6 +10956,8 @@ async function get_jungle(jungles, options) {
     return result;
 }
 
+;// CONCATENATED MODULE: external "net"
+const external_net_namespaceObject = require("net");
 ;// CONCATENATED MODULE: external "child_process"
 const external_child_process_namespaceObject = require("child_process");
 ;// CONCATENATED MODULE: ./src/launch.ts
@@ -10963,10 +10965,27 @@ const external_child_process_namespaceObject = require("child_process");
 
 
 
+
 function launchSimulator() {
-    return (0,external_sdk_util_cjs_namespaceObject.getSdkPath)().then((sdk) => {
-        const child = (0,external_child_process_namespaceObject.execFile)(external_path_.resolve(sdk, "bin", external_sdk_util_cjs_namespaceObject.isWin ? "simulator" : "connectiq"));
-        child.unref();
+    return checkIfSimulatorRunning().then((running) => running
+        ? Promise.resolve()
+        : (0,external_sdk_util_cjs_namespaceObject.getSdkPath)().then((sdk) => {
+            const child = (0,external_child_process_namespaceObject.execFile)(external_path_.resolve(sdk, "bin", external_sdk_util_cjs_namespaceObject.isWin ? "simulator" : "connectiq"));
+            child.unref();
+        }));
+}
+function checkIfSimulatorRunning() {
+    return Promise.all([1234, 1235, 1236, 1237, 1238].map(checkIfSimulatorRunningOn)).then((results) => results.some((v) => v));
+}
+function checkIfSimulatorRunningOn(port) {
+    return new Promise((resolve) => {
+        let listening = false;
+        const socket = new external_net_namespaceObject.Socket();
+        socket.on("data", (data) => (listening = data.toString().includes("A garmin device")));
+        socket.on("error", () => resolve(false));
+        socket.on("end", () => resolve(listening));
+        socket.connect(port, "localhost");
+        socket.end();
     });
 }
 function simulateProgram(prg, device, test = false, logger) {
@@ -15438,6 +15457,7 @@ const configOptionsToCheck = [
     "ignoredSourcePaths",
     "checkInvalidSymbols",
     "sizeBasedPRE",
+    "extensionVersion",
 ];
 /**
  * @param {BuildConfig} config
@@ -15489,7 +15509,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 && 1662140077916 < opt_time) {
+        if (source_time < opt_time && 1666558228929 < opt_time) {
             return { hasTests, diagnostics: prevDiagnostics };
         }
     }
@@ -15514,6 +15534,7 @@ async function generateOneConfig(buildConfig, dependencyFiles, config) {
             return promises_namespaceObject.writeFile(external_path_.join(output, "build-info.json"), JSON.stringify({
                 hasTests,
                 diagnostics,
+                optimizerVersion: "1.0.37",
                 ...Object.fromEntries(configOptionsToCheck.map((option) => [option, config[option]])),
             }))
                 .then(() => ({ hasTests, diagnostics }));

package/build/src/launch.d.ts

@@ -1,3 +1,5 @@
 import { LineHandler } from "./util";
 export declare function launchSimulator(): Promise<void>;
+export declare function checkIfSimulatorRunning(): Promise<boolean>;
+export declare function checkIfSimulatorRunningOn(port: number): Promise<boolean>;
 export declare function simulateProgram(prg: string, device: string, test?: boolean, logger?: LineHandler | LineHandler[]): Promise<void>;

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

@@ -26,6 +26,7 @@ export declare type BuildConfig = {
     checkInvalidSymbols?: DiagnosticType | "OFF";
     sizeBasedPRE?: boolean | string;
     prettier?: Record<string, unknown>;
+    extensionVersion?: string;
     _cache?: {
         barrels?: Record<string, ResolvedJungle>;
         barrelMap?: Record<string, Record<string, ResolvedJungle>>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@markw65/monkeyc-optimizer",
   "type": "module",
-  "version": "1.0.35",
+  "version": "1.0.37",
   "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.34"
+    "@markw65/prettier-plugin-monkeyc": "^1.0.35"
   },
   "devDependencies": {
     "@types/glob": "^7.2.0",