@joystick.js/cli-canary 0.0.0-canary.73 → 0.0.0-canary.75

package/dist/lib/build/buildFiles.js

@@ -102,7 +102,7 @@ const handleCopyFiles = (files = [], outputPath = "") => {
 };
 const isNodePath = (path = "") => {
   try {
-    return nodePaths.some((nodePath) => {
+    return !isNotJavaScript(path) && nodePaths.some((nodePath) => {
       return path.includes(nodePath);
     }) && !nodePathExclusions.some((nodeExclusionPath) => {
       return path.includes(nodeExclusionPath);
@@ -113,7 +113,7 @@ const isNodePath = (path = "") => {
 };
 const isBrowserPath = (path = "") => {
   try {
-    return browserPaths.some((browserPath) => {
+    return !isNotJavaScript(path) && browserPaths.some((browserPath) => {
       return path.includes(browserPath);
     }) && !browserPathExclusions.some((browserExclusionPath) => {
       return path.includes(browserExclusionPath);
@@ -149,10 +149,10 @@ const getFilePlatform = (path = "") => {
     if (isCopy) {
       platform = "copy";
     }
-    if (isBrowser && !isCopy) {
+    if (isBrowser) {
       platform = "browser";
     }
-    if (isNode && !isCopy) {
+    if (isNode) {
       platform = "node";
     }
     return platform;

package/dist/lib/dev/cleanup.js

@@ -1,7 +1,28 @@
-const actionMethod = () => {
+import ps from "ps-node";
+const killProcess = (pid = 0) => {
   try {
+    return new Promise((resolve) => {
+      ps.kill(pid, () => {
+        resolve();
+      });
+    });
   } catch (exception) {
-    throw new Error(`[cleanup.actionMethod] ${exception.message}`);
+    throw new Error(`[cleanup.killProcess] ${exception.message}`);
+  }
+};
+const handleCLIProcessMessages = () => {
+  try {
+    process.on("message", async (message = "{}") => {
+      const parsedMessage = JSON.parse(message);
+      const processIds = parsedMessage?.processIds;
+      for (let i = 0; i < processIds?.length; i += 1) {
+        const processId = processIds[i];
+        await killProcess(processId);
+      }
+      process.exit();
+    });
+  } catch (exception) {
+    throw new Error(`[cleanup.handleCLIProcessMessages] ${exception.message}`);
   }
 };
 const validateOptions = (options) => {
@@ -17,14 +38,18 @@ const validateOptions = (options) => {
 const cleanup = (options, { resolve, reject }) => {
   try {
     validateOptions(options);
+    process.title = "joystick_cleanup";
+    handleCLIProcessMessages();
     resolve();
   } catch (exception) {
     reject(`[cleanup] ${exception.message}`);
   }
 };
-var cleanup_default = (options) => new Promise((resolve, reject) => {
-  cleanup(options, { resolve, reject });
-});
+var cleanup_default = (async (options) => {
+  await new Promise((resolve, reject) => {
+    cleanup(options, { resolve, reject });
+  });
+})();
 export {
   cleanup_default as default
 };

package/dist/lib/dev/index.js

@@ -438,6 +438,7 @@ const dev = async (options, { resolve, reject }) => {
       nodeMajorVersion,
       __dirname
     );
+    await cleanup();
     resolve();
   } catch (exception) {
     console.warn(exception);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joystick.js/cli-canary",
-  "version": "0.0.0-canary.73",
+  "version": "0.0.0-canary.75",
   "type": "module",
   "description": "CLI for the Joystick JavaScript framework.",
   "main": "development.js",

package/src/lib/build/buildFiles.js

@@ -115,7 +115,7 @@ const handleCopyFiles = (files = [], outputPath = '') => {
 
 const isNodePath = (path = '') => {
   try {
-    return nodePaths.some((nodePath) => {
+    return !isNotJavaScript(path) && nodePaths.some((nodePath) => {
       return path.includes(nodePath);
     }) &&
     !nodePathExclusions.some((nodeExclusionPath) => {
@@ -128,7 +128,7 @@ const isNodePath = (path = '') => {
 
 const isBrowserPath = (path = '') => {
   try {
-    return browserPaths.some((browserPath) => {
+    return !isNotJavaScript(path) && browserPaths.some((browserPath) => {
       return path.includes(browserPath);
     }) &&
     !browserPathExclusions.some((browserExclusionPath) => {
@@ -172,11 +172,11 @@ const getFilePlatform = (path = '') => {
       platform = "copy";
     }
 
-    if (isBrowser && !isCopy) {
+    if (isBrowser) {
       platform = "browser";
     }
 
-    if (isNode && !isCopy) {
+    if (isNode) {
       platform = "node";
     }
 

package/src/lib/dev/cleanup.js

@@ -1,10 +1,32 @@
-/* eslint-disable consistent-return */
+import ps from "ps-node";
 
-const actionMethod = () => {
+const killProcess = (pid = 0) => {
   try {
-    // Perform a single step in your action here.
+    return new Promise((resolve) => {
+      ps.kill(pid, () => {
+        resolve();
+      });
+    });
   } catch (exception) {
-    throw new Error(`[cleanup.actionMethod] ${exception.message}`);
+    throw new Error(`[cleanup.killProcess] ${exception.message}`);
+  }
+};
+
+const handleCLIProcessMessages = () => {
+  try {
+    process.on('message', async (message = '{}') => {
+      const parsedMessage = JSON.parse(message);
+      const processIds = parsedMessage?.processIds;
+
+      for (let i = 0; i < processIds?.length; i += 1) {
+        const processId = processIds[i];
+        await killProcess(processId);
+      }
+
+      process.exit();
+    });
+  } catch (exception) {
+    throw new Error(`[cleanup.handleCLIProcessMessages] ${exception.message}`);
   }
 };
 
@@ -20,15 +42,23 @@ const validateOptions = (options) => {
 const cleanup = (options, { resolve, reject }) => {
   try {
     validateOptions(options);
-    // Call action methods in sequence here.
+
+    process.title = "joystick_cleanup";
+
+    handleCLIProcessMessages();
+
     resolve();
   } catch (exception) {
     reject(`[cleanup] ${exception.message}`);
   }
 };
 
-export default (options) =>
-  new Promise((resolve, reject) => {
-    cleanup(options, { resolve, reject });
-  });
+// NOTE: Use an async iife because this module is called via child_process.fork();
+export default (
+  async (options) => {
+    await new Promise((resolve, reject) => {
+      cleanup(options, { resolve, reject });
+    });
+  }
+)();
 

package/src/lib/dev/index.js

@@ -525,6 +525,8 @@ const dev = async (options, { resolve, reject }) => {
       nodeMajorVersion,
       __dirname
     );
+
+    await cleanup();
 //
 //    if (options?.environment === 'test') {
 //      await runTests(options);