@joystick.js/cli-canary 0.0.0-canary.88 → 0.0.0-canary.89

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,26 @@ var functions_default = {
     },
     function: start
   },
+  test: {
+    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],
+        description: "Run joystick test in watch mode."
+      }
+    },
+    options: {},
+    function: test()
+  },
   update: {
     set: !!rawArgs.includes("update"),
     description: "Update all Joystick packages to their latest version.",

package/dist/functions/test/index.js

@@ -1,30 +1,11 @@
-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
+  });
 };
-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/dev/index.js

@@ -437,6 +437,9 @@ const dev = async (options, { resolve, reject }) => {
       nodeMajorVersion,
       __dirname
     );
+    if (options?.environment === "test") {
+      process.loader.text("Running tests...");
+    }
     resolve();
   } catch (exception) {
     console.warn(exception);

package/package.json

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

package/src/cli.js

@@ -69,6 +69,15 @@ if (functionsCalled.includes('start')) {
   }
 }
 
+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/src/functions/index.js

@@ -5,6 +5,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;
 
@@ -219,6 +220,26 @@ export default {
     },
     function: start,
   },
+  test: {
+    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],
+        description: 'Run joystick test in watch mode.',
+      },
+    },
+    options: {},
+    function: test(),
+  },
   update: {
     set: !!rawArgs.includes('update'),
     description: 'Update all Joystick packages to their latest version.',

package/src/functions/test/index.js

@@ -1,34 +1,9 @@
-/* eslint-disable consistent-return */
+import dev from "../../lib/dev/index.js";
 
-const actionMethod = () => {
-  try {
-    // Perform a single step in your action here.
-  } catch (exception) {
-    throw new Error(`[test.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(`[test.validateOptions] ${exception.message}`);
-  }
-};
-
-const test = (options, { resolve, reject }) => {
-  try {
-    validateOptions(options);
-    // Call action methods in sequence here.
-    resolve();
-  } catch (exception) {
-    reject(`[test] ${exception.message}`);
-  }
-};
-
-export default (options) =>
-  new Promise((resolve, reject) => {
-    test(options, { resolve, reject });
+export default async (args = {}, options = {}) => {
+  await dev({
+    environment: 'test',
+    process,
+    port: 1977,
   });
-	
+};

package/src/lib/dev/index.js

@@ -267,7 +267,6 @@ const getWatchChangeContext = (event = '', path = '') => {
   try {
     const isHTMLUpdate = path === "index.html";
     const isUIPath = path?.includes("ui/") || path === 'index.css' || isHTMLUpdate;
-    // TODO: Flimsy. May want to wait until HMR and server are up to do the builds/watching.
     const isUIUpdate = (process.hmrProcess && process.hmrProcess.hasConnections && isUIPath) || false;
     const isSettingsUpdate = path?.match(SETTINGS_FILE_NAME_REGEX)?.length > 0;
     const isDirectory = fs.statSync(path).isDirectory();
@@ -525,10 +524,11 @@ const dev = async (options, { resolve, reject }) => {
       __dirname
     );
 
-//
-//    if (options?.environment === 'test') {
-//      await runTests(options);
-//    }
+
+    if (options?.environment === 'test') {
+      process.loader.text('Running tests...');
+      // await runTests(options);
+    }
 
     /*
       TODO:
@@ -540,7 +540,7 @@ const dev = async (options, { resolve, reject }) => {
       - [x] Start databases relative to options.environment (development|test) from settings.<environment>.json.
       - [x] Run the initial build
       - [x] Start the file watcher
-      - [ ] Start the app as normal from the build directory.
+      - [x] Start the app as normal from the build directory.
       - [ ] If environment === 'test', run the tests.
       - [ ] If environment === 'test', after tests, run process.exit(0).
     */