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

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.203",
   "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

@@ -46,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}'`
       },
@@ -69,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: {
@@ -197,7 +201,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/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/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
+};

package/dist/lib/dev/index.js

@@ -19,6 +19,7 @@ import { SETTINGS_FILE_NAME_REGEX } from "../regexes.js";
 import getCodependenciesForFile from "./getCodependenciesForFile.js";
 import removeDeletedDependenciesFromMap from "../build/removeDeletedDependenciesFromMap.js";
 import chalk from "chalk";
+const processIds = [];
 const getDatabaseProcessIds = () => {
   try {
     const databaseProcessIds = [];
@@ -43,7 +44,7 @@ const getDatabaseProcessIds = () => {
     throw new Error(`[dev.getDatabaseProcessIds] ${exception.message}`);
   }
 };
-const handleSignalEvents = (processIds = [], nodeMajorVersion = 0, __dirname = "") => {
+const handleSignalEvents = (processIds2 = [], nodeMajorVersion = 0, __dirname = "") => {
   try {
     const execArgv = ["--no-warnings"];
     if (nodeMajorVersion < 19) {
@@ -62,14 +63,15 @@ const handleSignalEvents = (processIds = [], nodeMajorVersion = 0, __dirname = "
         silent: true
       }
     );
+    process.cleanupProcess = cleanupProcess;
     process.on("SIGINT", async () => {
       const databaseProcessIds = getDatabaseProcessIds();
-      cleanupProcess.send(JSON.stringify({ processIds: [...processIds, ...databaseProcessIds] }));
+      cleanupProcess.send(JSON.stringify({ processIds: [...processIds2, ...databaseProcessIds] }));
       process.exit();
     });
     process.on("SIGTERM", async () => {
       const databaseProcessIds = getDatabaseProcessIds();
-      cleanupProcess.send(JSON.stringify({ processIds: [...processIds, ...databaseProcessIds] }));
+      cleanupProcess.send(JSON.stringify({ processIds: [...processIds2, ...databaseProcessIds] }));
       process.exit();
     });
   } catch (exception) {
@@ -143,7 +145,7 @@ const handleServerProcessMessages = () => {
     throw new Error(`[dev.handleServerProcessMessages] ${exception.message}`);
   }
 };
-const handleServerProcessSTDIO = () => {
+const handleServerProcessSTDIO = (options = {}) => {
   try {
     if (process.serverProcess) {
       process.serverProcess.on("error", (error) => {
@@ -151,7 +153,7 @@ const handleServerProcessSTDIO = () => {
       });
       process.serverProcess.stdout.on("data", (data) => {
         const message = data.toString();
-        if (message && message.includes("App running at:")) {
+        if (message && message.includes("App running at:") && !options?.watch) {
           process.loader.stable(message);
         } else {
           if (message && !message.includes("BUILD_ERROR")) {
@@ -175,11 +177,10 @@ const handleAddOrChangeFile = async (context = {}, path2 = "", options = {}) =>
   try {
     if (context.isAddingOrChangingFile) {
       const codependencies = await getCodependenciesForFile(path2);
-      const fileResults = await buildFiles(
-        [path2, ...codependencies?.existing || []],
-        null,
-        process.env.NODE_ENV
-      );
+      const fileResults = await buildFiles({
+        files: [path2, ...codependencies?.existing || []],
+        environment: process.env.NODE_ENV
+      });
       const fileResultsHaveErrors = fileResults.filter((result) => !!result).map(({ success }) => success).includes(false);
       removeDeletedDependenciesFromMap(codependencies.deleted);
       if (process.serverProcess && fileResultsHaveErrors) {
@@ -252,17 +253,11 @@ const handleCopyDirectory = (context = {}, path2 = "", options = {}) => {
 const handleRestartApplicationProcess = async (options = {}) => {
   try {
     if (process.serverProcess && process.serverProcess.pid) {
-      process.loader.text("Restarting app...");
       process.serverProcess.kill();
-      await startApp({
-        nodeMajorVersion: options?.nodeMajorVersion,
-        port: options?.port,
-        sessionsBeforeHMRUpdate: options?.sessionsBeforeHMRUpdate
-      });
+      await handleStartAppServer(options);
       return Promise.resolve();
     }
-    process.loader.text("Starting app...");
-    startApplicationProcess();
+    await handleStartAppServer(options);
     if (!process.hmrProcess) {
       startHMR();
     }
@@ -270,19 +265,39 @@ const handleRestartApplicationProcess = async (options = {}) => {
     throw new Error(`[dev.handleRestartApplicationProcess] ${exception.message}`);
   }
 };
-const handleNotifyHMRClients = (indexHTMLChanged = false) => {
+const handleStartAppServer = async (options = {}) => {
+  try {
+    const serverProcess = await startApp({
+      watch: options?.watch,
+      nodeMajorVersion: options?.nodeMajorVersion,
+      port: options?.port,
+      sessionsBeforeHMRUpdate: options?.sessionsBeforeHMRUpdate
+    });
+    if (serverProcess) {
+      processIds.push(serverProcess.pid);
+      process.serverProcess = serverProcess;
+      handleServerProcessSTDIO(options);
+      handleServerProcessMessages(options);
+    }
+  } catch (exception) {
+    console.warn(exception);
+    throw new Error(`[dev.handleStartAppServer] ${exception.message}`);
+  }
+};
+const handleNotifyHMRClients = async (indexHTMLChanged = false) => {
   try {
     if (process.hmrProcess) {
-      const settings = loadSettings(process.env.NODE_ENV);
+      const settings = await loadSettings({ environment: process.env.NODE_ENV });
       process.hmrProcess.send(
         JSON.stringify({
           type: "RESTART_SERVER",
-          settings,
+          settings: settings.parsed,
           indexHTMLChanged
         })
       );
     }
   } catch (exception) {
+    console.warn(exception);
     throw new Error(`[dev.handleNotifyHMRClients] ${exception.message}`);
   }
 };
@@ -299,7 +314,7 @@ const getWatchChangeContext = (event = "", path2 = "") => {
     const isAddDirectory = event === "addDir" && isExistingDirectoryInSource && !isExistingDirectoryInBuild;
     const isFileToCopy = !!filesToCopy.find((fileToCopy) => fileToCopy.path === path2);
     const isExistingFileInSource = isFile && fs.existsSync(path2);
-    const isAddingOrChangingFile = event === "add" && isExistingFileInSource;
+    const isAddingOrChangingFile = ["add", "change"].includes(event) && isExistingFileInSource;
     return {
       isHTMLUpdate,
       isUIPath,
@@ -326,7 +341,9 @@ const startFileWatcher = (options = {}) => {
     );
     watcher.on("all", async (event, path2) => {
       checkForRequiredFiles();
-      process.loader.text("Rebuilding app...");
+      if (!options?.watch) {
+        process.loader.text("Rebuilding app...");
+      }
       const watchChangeContext = getWatchChangeContext(event, path2);
       handleCopyDirectory(watchChangeContext, path2, options);
       handleCopyFile(watchChangeContext, path2, options);
@@ -484,18 +501,14 @@ const dev = async (options, { resolve, reject }) => {
       settings: settings.parsed
     });
     await runInitialBuild(settings?.parsed?.config?.build);
-    await startFileWatcher(options);
-    const processIds = [];
-    const serverProcess = await startApp({
-      nodeMajorVersion,
-      port: options?.port
+    await startFileWatcher({
+      ...options,
+      nodeMajorVersion
+    });
+    await handleStartAppServer({
+      ...options,
+      nodeMajorVersion
     });
-    if (serverProcess) {
-      processIds.push(serverProcess.pid);
-      process.serverProcess = serverProcess;
-      handleServerProcessSTDIO();
-      handleServerProcessMessages();
-    }
     if (options?.environment !== "test") {
       const hmrProcess = await startHMR({
         nodeMajorVersion,
@@ -504,7 +517,10 @@ const dev = async (options, { resolve, reject }) => {
       processIds.push(hmrProcess.pid);
       process.hmrProcess = hmrProcess;
       handleHMRProcessSTDIO();
-      handleHMRProcessMessages(options);
+      handleHMRProcessMessages({
+        ...options,
+        nodeMajorVersion
+      });
     }
     handleSignalEvents(
       processIds,
@@ -512,10 +528,20 @@ const dev = async (options, { resolve, reject }) => {
       __dirname
     );
     if (options?.environment === "test") {
-      process.loader.text("Running tests...");
+      process.loader.stop();
+      const databaseProcessIds = getDatabaseProcessIds();
       await runTests({
-        __dirname
+        watch: options?.watch,
+        __dirname,
+        processIds: [
+          ...processIds,
+          ...databaseProcessIds
+        ],
+        cleanupProcess: process.cleanupProcess
       });
+      if (!options?.watch) {
+        process.exit(0);
+      }
     }
     resolve();
   } catch (exception) {

package/dist/lib/dev/runTests.js

@@ -1,39 +1,71 @@
 import child_process from "child_process";
-const handleAvaSTDIO = (ava = {}) => {
+import CLILog from "../CLILog.js";
+const handleAvaSTDERR = (stderr = "", options = {}) => {
+  try {
+    if (stderr?.includes("Using configuration")) {
+      return null;
+    }
+    if (stderr?.includes("No tests found")) {
+      return CLILog("No tests found. Add tests in the /tests folder at the root of your Joystick app.", {
+        level: "danger",
+        docs: "https://cheatcode.co/docs/joystick/test/setup"
+      });
+    }
+    console.log(stderr);
+  } catch (exception) {
+    throw new Error(`[runTests.handleAvaSTDERR] ${exception.message}`);
+  }
+};
+const handleAvaSTDOUT = (stdout = "", options = {}) => {
+  try {
+    if (stdout?.includes("Using configuration")) {
+      return null;
+    }
+    if (stdout?.includes("No tests found in")) {
+      const [message] = stdout?.split(",");
+      return console.log(`${message}
+`);
+    }
+    console.log(stdout);
+  } catch (exception) {
+    throw new Error(`[runTests.handleAvaSTDOUT] ${exception.message}`);
+  }
+};
+const handleAvaSTDIO = (ava = {}, options = {}) => {
   try {
     ava.stdout.on("data", function(data) {
       const string = data.toString();
-      if (!string?.includes("ava")) {
-        console.log(string);
-      }
+      handleAvaSTDOUT(string, options);
     });
     ava.stderr.on("data", function(data) {
       const string = data.toString();
-      if (!string?.includes("ava")) {
-        console.log(string);
-      }
+      handleAvaSTDERR(string, options);
     });
   } catch (exception) {
     throw new Error(`[runTests.handleAvaSTDIO] ${exception.message}`);
   }
 };
-const runAva = (__dirname = "") => {
+const runAva = (options = {}) => {
   try {
-    console.log(`node_modules/.bin/ava --config ${__dirname}/tests.config.js`);
+    const avaPath = `${process.cwd()}/node_modules/.bin/ava`;
     return new Promise((resolve, reject) => {
-      const ava = child_process.exec(`node_modules/.bin/ava --config ${__dirname}/tests.config.js`, {
+      const ava = child_process.exec(`${avaPath} --config ${options?.__dirname}/tests.config.js ${options?.watch ? "--watch" : ""}`, {
         stdio: "inherit",
         env: {
           ...process.env,
+          databases: process.databases,
           FORCE_COLOR: "1"
         }
       }, (error) => {
-        if (error) {
-          return reject();
+        if (!error) {
+          options.cleanupProcess.send(JSON.stringify({ processIds: options?.processIds }));
+          resolve();
+        } else {
+          options.cleanupProcess.send(JSON.stringify({ processIds: options?.processIds }));
+          resolve();
         }
-        return resolve();
       });
-      handleAvaSTDIO(ava);
+      handleAvaSTDIO(ava, options);
     });
   } catch (exception) {
     throw new Error(`[runTests.runAva] ${exception.message}`);
@@ -52,7 +84,7 @@ const validateOptions = (options) => {
 const runTests = async (options, { resolve, reject }) => {
   try {
     validateOptions(options);
-    await runAva(options?.__dirname);
+    await runAva(options);
     resolve();
   } catch (exception) {
     reject(`[runTests] ${exception.message}`);

package/dist/lib/dev/startApp.js

@@ -1,8 +1,10 @@
 import child_process from "child_process";
 import path from "path";
-const handleStartServerProcess = (execArgv = {}, sessionsBeforeHMRUpdate = {}) => {
+const handleStartServerProcess = (execArgv = {}, options = {}) => {
   try {
-    process.loader.text("Starting app...");
+    if (!options?.watch) {
+      process.loader.text("Starting app...");
+    }
     return child_process.fork(
       path.resolve(".joystick/build/index.server.js"),
       [],
@@ -18,7 +20,7 @@ const handleStartServerProcess = (execArgv = {}, sessionsBeforeHMRUpdate = {}) =
           ROOT_URL: process.env.ROOT_URL,
           PORT: process.env.PORT,
           JOYSTICK_SETTINGS: process.env.JOYSTICK_SETTINGS,
-          HMR_SESSIONS: JSON.stringify(sessionsBeforeHMRUpdate)
+          HMR_SESSIONS: options?.sessionsBeforeHMRUpdate || "{}"
         }
       }
     );
@@ -56,7 +58,7 @@ const startApp = (options, { resolve, reject }) => {
   try {
     validateOptions(options);
     const execArgv = getExecArgs(options?.nodeMajorVersion);
-    const serverProcess = handleStartServerProcess(execArgv, options?.sessionsBeforeHMRUpdate);
+    const serverProcess = handleStartServerProcess(execArgv, options);
     return resolve(serverProcess);
   } catch (exception) {
     reject(`[startApp] ${exception.message}`);

package/dist/lib/dev/tests.config.js

@@ -0,0 +1,12 @@
+var tests_config_default = {
+  files: [`tests/**/*.test.js`],
+  // NOTE: Intentionally limit to 1 test at a time to avoid concurrency creating
+  // race conditions in tests that have users or other "global" data that needs
+  // to be cleaned up. The extra time needed is worth it to guarantee that tests
+  // don't step on each other's toes and our code is properly verified.
+  concurrency: 1,
+  cache: false
+};
+export {
+  tests_config_default as default
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joystick.js/cli-canary",
-  "version": "0.0.0-canary.99",
+  "version": "1.0.0-beta.74",
   "type": "module",
   "description": "CLI for the Joystick JavaScript framework.",
   "main": "development.js",
@@ -25,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",

package/src/functions/index.js

@@ -224,21 +224,26 @@ export 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],
+      watch: {
+        set: !!rawArgs.includes('watch'),
+        parent: 'test',
+        value: !!rawArgs.includes('watch'),
         description: 'Run joystick test in watch mode.',
       },
+    },
+    options: {
       watch: {
-        set: !!rawArgs.includes('watch') && !!rawArgs[rawArgs.indexOf('watch') + 1],
-        parent: 'watch',
-        value: !!rawArgs.includes('watch') && rawArgs[rawArgs.indexOf('watch') + 1],
-        description: 'Run joystick test in watch mode.',
+        flags: {
+          '--watch': {
+            set: !!rawArgs.includes('--watch'),
+            value: !!rawArgs.includes('--watch'),
+            parent: 'test'
+          },
+        },
+        description: 'Environment to set for process.env.NODE_ENV.',
       },
     },
-    options: {},
-    function: test(),
+    function: test,
   },
   update: {
     set: !!rawArgs.includes('update'),