@joystick.js/cli-canary 0.0.0-canary.99 → 1.0.0-beta.75

package/{_package.json → canary.json}

@@ -1,7 +1,6 @@
 {
-  "name": "@joystick.js/cli",
-  "version": "1.0.0-beta.71",
-  "developmentVersion": "1.0.0-beta.1695",
+  "name": "@joystick.js/cli-canary",
+  "version": "0.0.0-canary.239",
   "type": "module",
   "description": "CLI for the Joystick JavaScript framework.",
   "main": "development.js",

package/dist/functions/index.js

@@ -221,21 +221,26 @@ var functions_default = {
     set: !!rawArgs.includes("test"),
     description: "Start an existing Joystick app and run its tests.",
     args: {
-      w: {
-        set: !!rawArgs.includes("w") && !!rawArgs[rawArgs.indexOf("w") + 1],
-        parent: "w",
-        value: !!rawArgs.includes("w") && rawArgs[rawArgs.indexOf("w") + 1],
-        description: "Run joystick test in watch mode."
-      },
       watch: {
-        set: !!rawArgs.includes("watch") && !!rawArgs[rawArgs.indexOf("watch") + 1],
-        parent: "watch",
-        value: !!rawArgs.includes("watch") && rawArgs[rawArgs.indexOf("watch") + 1],
+        set: !!rawArgs.includes("watch"),
+        parent: "test",
+        value: !!rawArgs.includes("watch"),
         description: "Run joystick test in watch mode."
       }
     },
-    options: {},
-    function: test()
+    options: {
+      watch: {
+        flags: {
+          "--watch": {
+            set: !!rawArgs.includes("--watch"),
+            value: !!rawArgs.includes("--watch"),
+            parent: "test"
+          }
+        },
+        description: "Environment to set for process.env.NODE_ENV."
+      }
+    },
+    function: test
   },
   update: {
     set: !!rawArgs.includes("update"),

package/dist/functions/start/index.js

@@ -1,23 +1,4 @@
 import dev from "../../lib/dev/index.js";
-const startHMRProcess = () => {
-  const execArgv = ["--no-warnings"];
-  if (majorVersion < 19) {
-    execArgv.push("--experimental-specifier-resolution=node");
-  }
-  const hmrProcess = child_process.fork(
-    path.resolve(`${__dirname}/hmrServer.js`),
-    [],
-    {
-      execArgv,
-      // NOTE: Pipe stdin, stdout, and stderr. IPC establishes a message channel so we
-      // communicate with the child_process.
-      silent: true
-    }
-  );
-  process.hmrProcess = hmrProcess;
-  handleHMRProcessSTDIO();
-  handleHMRProcessMessages();
-};
 var start_default = async (args = {}, options = {}) => {
   await dev({
     environment: args?.environment || "development",

package/dist/functions/test/index.js

@@ -3,7 +3,8 @@ var test_default = async (args = {}, options = {}) => {
   await dev({
     environment: "test",
     process,
-    port: 1977
+    port: 1977,
+    watch: options?.watch
   });
 };
 export {

package/dist/lib/build/browserPathExclusions.js

@@ -1,6 +1,7 @@
 import getPlatformSafePath from "../getPlatformSafePath.js";
 var browserPathExclusions_default = [
-  getPlatformSafePath("lib/node")
+  getPlatformSafePath("lib/node"),
+  getPlatformSafePath("tests/")
 ];
 export {
   browserPathExclusions_default as default

package/dist/lib/build/buildFiles.js

@@ -12,6 +12,10 @@ import getCodeFrame from "./getCodeFrame.js";
 import onWarn from "./onWarn.js";
 const handleBuildException = (exception = {}, file = "") => {
   try {
+    console.warn({
+      exception,
+      file
+    });
     const error = exception?.errors && exception?.errors[0];
     const snippet = fs.existsSync(file) ? getCodeFrame(file, {
       line: error?.location?.line,
@@ -28,7 +32,7 @@ const handleBuildException = (exception = {}, file = "") => {
     });
     return snippet;
   } catch (exception2) {
-    throw new Error(`[actionName.handleBuildException] ${exception2.message}`);
+    throw new Error(`[buildFiles.handleBuildException] ${exception2.message}`);
   }
 };
 const handleParseFilePathFromException = (exception = {}) => {
@@ -36,18 +40,20 @@ const handleParseFilePathFromException = (exception = {}) => {
     const rawErrorMessage = exception?.message?.split(":");
     return rawErrorMessage[1] && rawErrorMessage[1]?.replace("\n", "") || "";
   } catch (exception2) {
-    throw new Error(`[actionName.handleParseFilePathFromException] ${exception2.message}`);
+    throw new Error(`[buildFiles.handleParseFilePathFromException] ${exception2.message}`);
   }
 };
 const handleBuildForNode = (nodePaths2 = [], options = {}) => {
   try {
     return esbuild.build({
+      allowOverwrite: true,
       platform: "node",
       format: "esm",
       bundle: false,
       entryPoints: nodePaths2?.map((file) => file.path),
-      // TODO: Make sure we don't need outbase here so the paths map correctly.
+      entryNames: "[dir]/[name]",
       outdir: options?.outputPath || "./.joystick/build",
+      outbase: "./",
       define: {
         "process.env.NODE_ENV": `'${options?.environment}'`
       },
@@ -64,11 +70,14 @@ const handleBuildForNode = (nodePaths2 = [], options = {}) => {
 const handleBuildForBrowser = (browserPaths2 = [], options = {}) => {
   try {
     return esbuild.build({
+      allowOverwrite: true,
       target: "es2020",
       platform: "browser",
       format: "esm",
       bundle: true,
       entryPoints: browserPaths2?.map((file) => file.path),
+      entryNames: "[dir]/[name]",
+      outbase: "./",
       // TODO: Make sure we don't need outbase here so the paths map correctly.
       outdir: options?.outputPath || "./.joystick/build",
       define: {
@@ -197,7 +206,6 @@ const buildFiles = async (options, { resolve, reject }) => {
         return { success: true };
       }).catch((exception) => {
         const file = handleParseFilePathFromException(exception);
-        console.log(file, exception);
         const snippet = handleBuildException(exception, file);
         return {
           success: false,

package/dist/lib/build/buildPlugins.js

@@ -5,11 +5,13 @@ import {
   JOYSTICK_UI_REGEX,
   EXPORT_DEFAULT_REGEX,
   JOYSTICK_COMPONENT_REGEX,
-  JOYSTICK_COMMENT_REGEX
+  JOYSTICK_COMMENT_REGEX,
+  EXAMPLE_CODE_REGEX
 } from "../regexes.js";
 import generateId from "../generateId.js";
 import getPlatformSafePath from "../getPlatformSafePath.js";
 import setComponentId from "./setComponentId.js";
+import replaceExamples from "./replaceExamples.js";
 var buildPlugins_default = {
   bootstrapComponent: {
     name: "bootstrapComponent",
@@ -17,7 +19,7 @@ var buildPlugins_default = {
       const ssrId = generateId();
       build.onLoad({ filter: /\.js$/ }, (args = {}) => {
         try {
-          const shouldSetSSRId = [getPlatformSafePath("ui/")].some(
+          const shouldSetComponentId = [getPlatformSafePath("ui/")].some(
             (bootstrapTarget) => {
               return args.path.includes(bootstrapTarget);
             }
@@ -37,7 +39,7 @@ var buildPlugins_default = {
               return args.path.includes(bootstrapTarget);
             }
           );
-          if (shouldSetSSRId || isLayoutComponent || isPageComponent || isEmailComponent) {
+          if (shouldSetComponentId || isLayoutComponent || isPageComponent || isEmailComponent) {
             const code = fs.readFileSync(
               getPlatformSafePath(args.path),
               "utf-8"
@@ -56,7 +58,9 @@ var buildPlugins_default = {
               console.log(" ");
               return;
             }
-            let contents = setComponentId(code)?.replace(
+            const examples = code.match(EXAMPLE_CODE_REGEX) || [];
+            let contents = replaceExamples(code);
+            contents = contents?.replace(
               /\.component\(\/\*\*\//g,
               ".component("
             );
@@ -103,6 +107,10 @@ var buildPlugins_default = {
                 `
               );
             }
+            for (let i = 0; i < examples?.length; i += 1) {
+              const exampleToRestore = examples[i];
+              contents = contents.replace(`%example:${i}%`, exampleToRestore);
+            }
             return {
               contents,
               loader: "js"
@@ -125,11 +133,17 @@ var buildPlugins_default = {
             if (shouldSetComponentId) {
               const file = fs.readFileSync(`${build?.initialOptions?.outdir}/${entryPoint}`, "utf-8");
               const joystickUIMatches = file?.match(JOYSTICK_COMPONENT_REGEX) || [];
+              const examples = file.match(EXAMPLE_CODE_REGEX) || [];
+              let contents = replaceExamples(file);
               if (joystickUIMatches?.length > 0) {
-                let contents = setComponentId(file)?.replace(
+                contents = setComponentId(contents)?.replace(
                   /\.component\(\/\*\*\//g,
                   ".component("
                 );
+                for (let i2 = 0; i2 < examples?.length; i2 += 1) {
+                  const exampleToRestore = examples[i2];
+                  contents = contents.replace(`%example:${i2}%`, exampleToRestore);
+                }
                 fs.writeFileSync(`${build?.initialOptions?.outdir}/${entryPoint}`, contents);
               }
             }

package/dist/lib/build/nodePaths.js

@@ -4,6 +4,7 @@ var nodePaths_default = [
   getPlatformSafePath("routes/"),
   getPlatformSafePath("fixtures/"),
   getPlatformSafePath("lib/node"),
+  getPlatformSafePath("tests/"),
   "index.server.js"
 ];
 export {

package/dist/lib/build/replaceExamples.js

@@ -0,0 +1,13 @@
+import { EXAMPLE_CODE_REGEX } from "../regexes.js";
+var replaceExamples_default = (code = "") => {
+  let exampleIndex = 0;
+  return code.replace(
+    EXAMPLE_CODE_REGEX,
+    () => {
+      return `%example:${exampleIndex++}%`;
+    }
+  );
+};
+export {
+  replaceExamples_default as default
+};

package/dist/lib/checkIfPortOccupied.js

@@ -0,0 +1,27 @@
+import net from "net";
+const resetClient = (client = {}) => {
+  client.end();
+  client.destroy();
+  client.unref();
+};
+var checkIfPortOccupied_default = (port = 2600) => {
+  return new Promise((resolve) => {
+    const client = new net.Socket();
+    client.once("connect", () => {
+      resetClient(client);
+      resolve(true);
+    });
+    client.once("error", () => {
+      resetClient(client);
+      resolve(false);
+    });
+    client.connect({
+      port,
+      host: "127.0.0.1"
+    }, function() {
+    });
+  });
+};
+export {
+  checkIfPortOccupied_default as default
+};

package/dist/lib/dev/getFilesToBuild.js

@@ -30,7 +30,7 @@ var getFilesToBuild_default = (excludedPaths = [], context = null) => {
       return path.includes(excludedPath);
     });
   }).filter((path) => {
-    return !fs.lstatSync(path).isDirectory();
+    return fs.existsSync(path) && !fs.lstatSync(path).isDirectory();
   });
 };
 export {

package/dist/lib/dev/hmrServer.js

@@ -0,0 +1,66 @@
+import fs from "fs";
+import { WebSocketServer } from "ws";
+import generateId from "../generateId.js";
+var hmrServer_default = (() => {
+  const websocketServer = new WebSocketServer({
+    port: parseInt(process.env.PORT, 10) + 1,
+    path: "/_joystick/hmr"
+  });
+  process.on("message", (message) => {
+    if (typeof process.HMR_CONNECTIONS === "object") {
+      const parsedMessage = JSON.parse(message);
+      const connections = Object.values(process.HMR_CONNECTIONS);
+      for (let i = 0; i < connections?.length; i += 1) {
+        const connection = connections[i];
+        if (connection?.connection?.send) {
+          connection.connection.send(
+            JSON.stringify({
+              type: "FILE_CHANGE",
+              settings: {
+                global: parsedMessage?.settings?.global,
+                public: parsedMessage?.settings?.public
+              },
+              indexHTMLChanged: parsedMessage?.indexHTMLChanged
+            })
+          );
+        }
+      }
+    }
+  });
+  websocketServer.on("connection", function connection(websocketConnection) {
+    const connectionId = generateId();
+    process.HMR_CONNECTIONS = {
+      ...process.HMR_CONNECTIONS || {},
+      [connectionId]: {
+        connection: websocketConnection,
+        watchlist: []
+      }
+    };
+    if (Object.keys(process.HMR_CONNECTIONS || {})?.length > 0) {
+      process.send({ type: "HAS_HMR_CONNECTIONS" });
+    }
+    websocketConnection.on("message", (message) => {
+      const parsedMessage = JSON.parse(message);
+      if (parsedMessage?.type === "HMR_UPDATE_COMPLETE") {
+        process.send({ type: "HMR_UPDATE_COMPLETED", sessions: parsedMessage?.sessions });
+      }
+      if (parsedMessage?.type === "HMR_WATCHLIST") {
+        process.HMR_CONNECTIONS[connectionId]?.watchlist?.push(
+          ...parsedMessage?.tags || []
+        );
+      }
+    });
+    websocketConnection.on("close", () => {
+      if (process.HMR_CONNECTIONS[connectionId]) {
+        delete process.HMR_CONNECTIONS[connectionId];
+        if (Object.keys(process.HMR_CONNECTIONS || {})?.length === 0) {
+          process.send({ type: "HAS_NO_HMR_CONNECTIONS" });
+        }
+      }
+    });
+  });
+  return true;
+})();
+export {
+  hmrServer_default as default
+};