@joystick.js/cli-canary 0.0.0-canary.127 → 0.0.0-canary.129

package/dist/functions/index.js

@@ -221,16 +221,10 @@ 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],
+        set: !!rawArgs.includes("watch"),
         parent: "watch",
-        value: !!rawArgs.includes("watch") && rawArgs[rawArgs.indexOf("watch") + 1],
+        value: !!rawArgs.includes("watch"),
         description: "Run joystick test in watch mode."
       }
     },

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: args?.watch
   });
 };
 export {

package/dist/lib/dev/index.js

@@ -516,6 +516,7 @@ const dev = async (options, { resolve, reject }) => {
       process.loader.stop();
       const databaseProcessIds = getDatabaseProcessIds();
       await runTests({
+        watch: options?.watch,
         __dirname,
         processIds: [
           ...processIds,
@@ -523,7 +524,9 @@ const dev = async (options, { resolve, reject }) => {
         ],
         cleanupProcess: process.cleanupProcess
       });
-      process.exit(0);
+      if (!options?.watch) {
+        process.exit(0);
+      }
     }
     resolve();
   } catch (exception) {

package/dist/lib/dev/runTests.js

@@ -51,8 +51,9 @@ const handleAvaSTDIO = (ava = {}, options = {}) => {
 const runAva = (options = {}) => {
   try {
     const avaPath = `${process.cwd()}/node_modules/.bin/ava`;
+    conasole.log("OPTIONS IN AVA", options);
     return new Promise((resolve, reject) => {
-      const ava = child_process.exec(`${avaPath} --config ${options?.__dirname}/tests.config.js`, {
+      const ava = child_process.exec(`${avaPath} --config ${options?.__dirname}/tests.config.js ${options?.watch ? "--watch" : ""}`, {
         stdio: "inherit",
         env: {
           ...process.env,

package/package.json

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

package/src/functions/index.js

@@ -224,16 +224,10 @@ 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],
-        description: 'Run joystick test in watch mode.',
-      },
       watch: {
-        set: !!rawArgs.includes('watch') && !!rawArgs[rawArgs.indexOf('watch') + 1],
+        set: !!rawArgs.includes('watch'),
         parent: 'watch',
-        value: !!rawArgs.includes('watch') && rawArgs[rawArgs.indexOf('watch') + 1],
+        value: !!rawArgs.includes('watch'),
         description: 'Run joystick test in watch mode.',
       },
     },

package/src/functions/test/index.js

@@ -5,5 +5,6 @@ export default async (args = {}, options = {}) => {
     environment: 'test',
     process,
     port: 1977,
+    watch: args?.watch,
   });
 };

package/src/lib/dev/index.js

@@ -621,6 +621,7 @@ const dev = async (options, { resolve, reject }) => {
       const databaseProcessIds = getDatabaseProcessIds();
 
       await runTests({
+        watch: options?.watch,
         __dirname,
         processIds: [
           ...processIds,
@@ -629,8 +630,10 @@ const dev = async (options, { resolve, reject }) => {
         cleanupProcess: process.cleanupProcess,
       });
 
-      // TODO: Handle a watch mode here in case they pass it.
-      process.exit(0);
+      if (!options?.watch) {
+        // NOTE: Kick out of the process after tests run if we're not in watch mode.
+        process.exit(0);
+      }
     }
 
     /*

package/src/lib/dev/runTests.js

@@ -73,10 +73,12 @@ const runAva = (options = {}) => {
     // add Ava as a dependency to their app in order to write tests.
     const avaPath = `${process.cwd()}/node_modules/.bin/ava`;
     
+    conasole.log('OPTIONS IN AVA', options);
+    
     return new Promise((resolve, reject) => {
       // NOTE: Despite using the app's node_modules path to reference Ava, we still want to reference
       // the internal path here for the default test config in /lib/dev/tests.config.js.
-      const ava = child_process.exec(`${avaPath} --config ${options?.__dirname}/tests.config.js`, {
+      const ava = child_process.exec(`${avaPath} --config ${options?.__dirname}/tests.config.js ${options?.watch ? '--watch' : ''}`, {
         stdio: 'inherit',
         env: {
           ...(process.env),