@joystick.js/cli-canary 0.0.0-canary.21 → 0.0.0-canary.210

package/_package.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": "1.0.0-beta.74",
   "type": "module",
   "description": "CLI for the Joystick JavaScript framework.",
   "main": "development.js",
@@ -26,6 +25,7 @@
     "@babel/code-frame": "^7.15.8",
     "acorn": "^8.5.0",
     "ascii-table": "^0.0.9",
+    "ava": "^5.3.1",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.2",
     "command-exists": "^1.2.9",
@@ -52,4 +52,4 @@
     "ws": "^8.2.3",
     "xmlhttprequest": "^1.8.0"
   }
-}
+}

package/dist/cli.js

@@ -53,6 +53,13 @@ if (functionsCalled.includes("start")) {
     functions.start.function(args, options);
   }
 }
+if (functionsCalled.includes("test")) {
+  const args = getArgs(functions.test.args);
+  const options = getOptions(functions.test.options);
+  if (functions.test.function && typeof functions.test.function === "function") {
+    functions.test.function(args, options);
+  }
+}
 if (functionsCalled.includes("update")) {
   const args = getArgs(functions.update.args);
   const options = getOptions(functions.update.options);

package/dist/functions/index.js

@@ -4,6 +4,7 @@ import logout from "./logout/index.js";
 import start from "./start/index.js";
 import update from "./update/index.js";
 import use from "./use/index.js";
+import test from "./test/index.js";
 const [_node, _bin, ...rawArgs] = process.argv;
 var functions_default = {
   build: {
@@ -216,6 +217,31 @@ var functions_default = {
     },
     function: start
   },
+  test: {
+    set: !!rawArgs.includes("test"),
+    description: "Start an existing Joystick app and run its tests.",
+    args: {
+      watch: {
+        set: !!rawArgs.includes("watch"),
+        parent: "test",
+        value: !!rawArgs.includes("watch"),
+        description: "Run joystick test in watch mode."
+      }
+    },
+    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"),
     description: "Update all Joystick packages to their latest version.",

package/dist/functions/start/index.js

@@ -2,7 +2,8 @@ import dev from "../../lib/dev/index.js";
 var start_default = async (args = {}, options = {}) => {
   await dev({
     environment: args?.environment || "development",
-    process
+    process,
+    port: options?.port ? parseInt(options?.port) : 2600
   });
 };
 export {

package/dist/functions/start/setComponentId.js

@@ -1,7 +1,7 @@
 import fs from "fs";
 import generateId from "./generateId.js";
 var setComponentId_default = (file = "") => {
-  const componentMapPath = process.env.NODE_ENV === "development" ? `./.joystick/build/componentMap.json` : `./.build/componentMap.json`;
+  const componentMapPath = ["development", "test"].includes(process.env.NODE_ENV) ? `./.joystick/build/componentMap.json` : `./.build/componentMap.json`;
   const componentMapExists = fs.existsSync(componentMapPath);
   const componentMap = componentMapExists ? JSON.parse(fs.readFileSync(componentMapPath, "utf-8")) : {};
   const parts = [...file?.matchAll(/\/\/ ui+.*/gi)]?.map((match) => {

package/dist/functions/test/index.js

@@ -1,30 +1,12 @@
-const actionMethod = () => {
-  try {
-  } catch (exception) {
-    throw new Error(`[test.actionMethod] ${exception.message}`);
-  }
+import dev from "../../lib/dev/index.js";
+var test_default = async (args = {}, options = {}) => {
+  await dev({
+    environment: "test",
+    process,
+    port: 1977,
+    watch: options?.watch
+  });
 };
-const validateOptions = (options) => {
-  try {
-    if (!options)
-      throw new Error("options object is required.");
-    if (!options.someOption)
-      throw new Error("options.someOption is required.");
-  } catch (exception) {
-    throw new Error(`[test.validateOptions] ${exception.message}`);
-  }
-};
-const test = (options, { resolve, reject }) => {
-  try {
-    validateOptions(options);
-    resolve();
-  } catch (exception) {
-    reject(`[test] ${exception.message}`);
-  }
-};
-var test_default = (options) => new Promise((resolve, reject) => {
-  test(options, { resolve, reject });
-});
 export {
   test_default as default
 };

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

@@ -8,6 +8,37 @@ import browserPathExclusions from "./browserPathExclusions.js";
 import nodePaths from "./nodePaths.js";
 import nodePathExclusions from "./nodePathExclusions.js";
 import buildPlugins from "./buildPlugins.js";
+import getCodeFrame from "./getCodeFrame.js";
+import onWarn from "./onWarn.js";
+const handleBuildException = (exception = {}, file = "") => {
+  try {
+    const error = exception?.errors && exception?.errors[0];
+    const snippet = fs.existsSync(file) ? getCodeFrame(file, {
+      line: error?.location?.line,
+      column: error?.location?.column
+    }) : null;
+    onWarn({
+      file,
+      stack: exception?.stack,
+      line: error?.location?.line,
+      column: error?.location?.column,
+      snippet,
+      lineWithError: error?.location?.lineText?.trim(),
+      message: error?.text
+    });
+    return snippet;
+  } catch (exception2) {
+    throw new Error(`[actionName.handleBuildException] ${exception2.message}`);
+  }
+};
+const handleParseFilePathFromException = (exception = {}) => {
+  try {
+    const rawErrorMessage = exception?.message?.split(":");
+    return rawErrorMessage[1] && rawErrorMessage[1]?.replace("\n", "") || "";
+  } catch (exception2) {
+    throw new Error(`[actionName.handleParseFilePathFromException] ${exception2.message}`);
+  }
+};
 const handleBuildForNode = (nodePaths2 = [], options = {}) => {
   try {
     return esbuild.build({
@@ -15,8 +46,10 @@ const handleBuildForNode = (nodePaths2 = [], options = {}) => {
       format: "esm",
       bundle: false,
       entryPoints: nodePaths2?.map((file) => file.path),
+      entryNames: "[dir]/[name]",
       // TODO: Make sure we don't need outbase here so the paths map correctly.
       outdir: options?.outputPath || "./.joystick/build",
+      outbase: "./",
       define: {
         "process.env.NODE_ENV": `'${options?.environment}'`
       },
@@ -38,6 +71,8 @@ const handleBuildForBrowser = (browserPaths2 = [], options = {}) => {
       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: {
@@ -60,7 +95,7 @@ const handleCopyFiles = (files = [], outputPath = "") => {
     for (let i = 0; i < files?.length; i += 1) {
       const file = files[i];
       const fileContents = fs.readFileSync(file.path);
-      fs.writeFileSync(
+      fs.outputFileSync(
         `${outputPath || "./.joystick/build"}/${file.path}`,
         fileContents
       );
@@ -71,7 +106,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);
@@ -82,7 +117,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);
@@ -161,16 +196,40 @@ const buildFiles = async (options, { resolve, reject }) => {
     const browserFiles = filesWithPlatform?.filter((file) => file?.platform === "browser");
     const nodeFiles = filesWithPlatform?.filter((file) => file?.platform === "node");
     handleCopyFiles(copyFiles, options?.outputPath);
-    await Promise.all([
-      handleBuildForBrowser(browserFiles, options),
-      handleBuildForNode(nodeFiles, options)
+    const fileResults = await Promise.all([
+      handleBuildForBrowser(browserFiles, options).then(() => {
+        return { success: true };
+      }).catch((exception) => {
+        const file = handleParseFilePathFromException(exception);
+        const snippet = handleBuildException(exception, file);
+        return {
+          success: false,
+          path: file,
+          error: {
+            stack: exception?.stack,
+            snippet
+          }
+        };
+      }),
+      handleBuildForNode(nodeFiles, options).catch((exception) => {
+        const file = handleParseFilePathFromException(exception);
+        const snippet = handleBuildException(exception, file);
+        return {
+          success: false,
+          path: file,
+          error: {
+            stack: exception?.stack,
+            snippet
+          }
+        };
+      })
     ]);
     if (options?.environment !== "development") {
       await Promise.all([browserFiles, nodeFiles].map((file) => {
         return minifyFile(`${options?.outputPath || "./.joystick/build"}/${file.path}`);
       }));
     }
-    resolve();
+    resolve(fileResults);
   } catch (exception) {
     reject(`[buildFiles] ${exception.message}`);
   }

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 = setComponentId(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"
@@ -114,21 +122,24 @@ var buildPlugins_default = {
       });
       build.onEnd(() => {
         return new Promise((resolve) => {
-          const shouldSetComponentId = [
-            getPlatformSafePath("ui/"),
-            getPlatformSafePath("email/")
-          ].some((bootstrapTarget) => {
-            return build.initialOptions.outfile.includes(bootstrapTarget);
-          });
-          if (shouldSetComponentId) {
-            const file = fs.readFileSync(build.initialOptions.outfile, "utf-8");
-            const joystickUIMatches = file?.match(JOYSTICK_COMPONENT_REGEX) || [];
-            if (joystickUIMatches?.length > 0) {
-              let contents = setComponentId(file)?.replace(
-                /\.component\(\/\*\*\//g,
-                ".component("
-              );
-              fs.writeFileSync(build.initialOptions.outfile, contents);
+          for (let i = 0; i < build?.initialOptions?.entryPoints?.length; i += 1) {
+            const entryPoint = build?.initialOptions?.entryPoints[i];
+            const shouldSetComponentId = [
+              getPlatformSafePath("ui/"),
+              getPlatformSafePath("email/")
+            ].some((bootstrapTarget) => {
+              return entryPoint.includes(bootstrapTarget);
+            });
+            if (shouldSetComponentId) {
+              const file = fs.readFileSync(`${build?.initialOptions?.outdir}/${entryPoint}`, "utf-8");
+              const joystickUIMatches = file?.match(JOYSTICK_COMPONENT_REGEX) || [];
+              if (joystickUIMatches?.length > 0) {
+                let contents = setComponentId(file)?.replace(
+                  /\.component\(\/\*\*\//g,
+                  ".component("
+                );
+                fs.writeFileSync(`${build?.initialOptions?.outdir}/${entryPoint}`, contents);
+              }
             }
           }
           resolve();

package/dist/lib/build/getCodeFrame.js

@@ -1,9 +1,8 @@
 import fs from "fs";
 import { codeFrameColumns } from "@babel/code-frame";
-var getCodeFrame_default = (id = "", location = {}) => {
-  const file = fs.readFileSync(id, "utf-8");
-  const frame = codeFrameColumns(file, { start: location });
-  return frame;
+var getCodeFrame_default = (path = "", location = {}) => {
+  const file = fs.readFileSync(path, "utf-8");
+  return codeFrameColumns(file, { start: location });
 };
 export {
   getCodeFrame_default as default

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/build/setComponentId.js

@@ -1,7 +1,7 @@
 import fs from "fs";
 import generateId from "../generateId.js";
 var setComponentId_default = (file = "") => {
-  const componentMapPath = process.env.NODE_ENV === "development" ? `./.joystick/build/componentMap.json` : `./.build/componentMap.json`;
+  const componentMapPath = ["development", "test"].includes(process.env.NODE_ENV) ? `./.joystick/build/componentMap.json` : `./.build/componentMap.json`;
   const componentMapExists = fs.existsSync(componentMapPath);
   const componentMap = componentMapExists ? JSON.parse(fs.readFileSync(componentMapPath, "utf-8")) : {};
   const parts = [...file?.matchAll(/\/\/ ui+.*/gi)]?.map((match) => {

package/dist/lib/dev/cleanup.js

@@ -1,30 +1,18 @@
-const actionMethod = () => {
-  try {
-  } catch (exception) {
-    throw new Error(`[cleanup.actionMethod] ${exception.message}`);
-  }
-};
-const validateOptions = (options) => {
-  try {
-    if (!options)
-      throw new Error("options object is required.");
-    if (!options.someOption)
-      throw new Error("options.someOption is required.");
-  } catch (exception) {
-    throw new Error(`[cleanup.validateOptions] ${exception.message}`);
-  }
+import ps from "ps-node";
+process.title = "joystick_cleanup";
+const killProcess = (pid = 0) => {
+  return new Promise((resolve) => {
+    ps.kill(pid, () => {
+      resolve();
+    });
+  });
 };
-const cleanup = (options, { resolve, reject }) => {
-  try {
-    validateOptions(options);
-    resolve();
-  } catch (exception) {
-    reject(`[cleanup] ${exception.message}`);
+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);
   }
-};
-var cleanup_default = (options) => new Promise((resolve, reject) => {
-  cleanup(options, { resolve, reject });
+  process.exit();
 });
-export {
-  cleanup_default as default
-};

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
+};