@joystick.js/cli-canary 0.0.0-canary.201 → 0.0.0-canary.2011

package/package.json

@@ -1,55 +1,36 @@
 {
   "name": "@joystick.js/cli-canary",
-  "version": "0.0.0-canary.201",
   "type": "module",
-  "description": "CLI for the Joystick JavaScript framework.",
-  "main": "development.js",
+  "version": "0.0.0-canary.2011",
+  "canary_version": "0.0.0-canary.2010",
+  "description": "The CLI for Joystick.",
+  "main": "dist/index.js",
   "bin": {
-    "joystick": "./dist/index.js"
+    "joystick-canary": "./dist/index.js"
   },
   "scripts": {
-    "build": "node .build/index.js",
-    "canary:release": "export NODE_ENV=development && npm run build && node canary.js",
-    "production:release": "export NODE_ENV=production && npm run build && node release.js",
-    "win:development:release": "SET NODE_ENV=development&& npm run build && node release.js",
+    "build": "node ./.build/index.js",
+    "release": "node increment_version.js && npm run build && npm publish",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "keywords": [],
   "author": "",
-  "license": "ISC",
-  "devDependencies": {
-    "cross-env": "^7.0.3",
-    "semver": "^7.3.5"
-  },
+  "license": "SAUCR",
   "dependencies": {
-    "@babel/code-frame": "^7.15.8",
-    "acorn": "^8.5.0",
+    "@babel/code-frame": "^7.23.5",
+    "acorn": "^8.11.2",
     "ascii-table": "^0.0.9",
-    "ava": "^5.3.1",
-    "chalk": "^4.1.2",
-    "chokidar": "^3.5.2",
-    "command-exists": "^1.2.9",
-    "cross-port-killer": "^1.4.0",
-    "currency-formatter": "^1.5.9",
-    "esbuild": "^0.17.19",
+    "ava": "^6.3.0",
+    "chalk": "^5.3.0",
+    "chokidar": "^3.5.3",
+    "esbuild": "^0.25.2",
     "esbuild-plugin-svg": "^0.1.0",
-    "form-data": "^4.0.0",
-    "fs-extra": "^10.0.0",
-    "inquirer": "^8.2.0",
-    "kill-port-process": "^3.1.0",
-    "lodash": "^4.17.21",
-    "mongo-uri-tool": "^1.0.1",
-    "mongodb": "^4.1.3",
-    "netstats": "^0.0.6",
-    "node-fetch": "^3.2.0",
-    "node-watch": "^0.7.2",
-    "pg": "^8.7.3",
-    "port-pid": "^0.0.7",
-    "ps-node": "^0.1.6",
-    "replace-in-files": "^3.0.0",
-    "selective-whitespace": "^1.0.4",
-    "systeminformation": "^5.11.0",
-    "ws": "^8.2.3",
-    "xmlhttprequest": "^1.8.0"
+    "form-data": "^4.0.2",
+    "inquirer": "^9.2.12",
+    "mongodb": "^6.16.0",
+    "node-fetch": "^3.3.2",
+    "pg": "^8.11.3",
+    "query-string": "^8.1.0",
+    "ws": "^8.18.1"
   }
 }

package/src/cli.js

@@ -1,97 +1,115 @@
 import chalk from 'chalk';
-import help from './lib/help.js';
-import functions from './functions/index.js';
-import getArgs from './lib/getArgs.js';
-import getOptions from './lib/getOptions.js';
+import commands from './commands/index.js';
+import parse_args from './lib/parse_args.js';
+import parse_options from './lib/parse_options.js';
 
-const functionNames = Object.keys(functions);
-const functionsCalled = process.argv.filter((arg) => functionNames.includes(arg));
+const command_names = Object.keys(commands);
+const commands_called = process.argv.filter((arg) => command_names.includes(arg));
 
-const showHelp = process.argv.some((arg) => ['-h', '--help'].includes(arg));
+const show_help = process.argv.some((arg) => ['-h', '--help'].includes(arg));
 
-if (showHelp || functionsCalled.length === 0) {
-  help();
+if (show_help || commands_called.length === 0) {
+  commands.help.command();
   process.exit(0);
 }
 
-if (functionsCalled.length > 1) {
-  console.log(chalk.red('Only one function can be called at a time.'));
+if (commands_called.length > 1) {
+  console.log(chalk.red('Only one command can be called at a time.'));
   process.exit(0); 
 }
 
-if (functionsCalled.includes('build')) {
-  const args = getArgs(functions.build.args);
-  const options = getOptions(functions.build.options);
+if (commands_called.includes('build')) {
+  const args = parse_args(commands.build.args);
+  const options = parse_options(commands.build.options);
 
-  if (functions.build.function && typeof functions.build.function === 'function') {
-    functions.build.function(args, options);
+  if (commands.build.command) {
+    commands.build.command(args, options);
   }
 }
 
-if (functionsCalled.includes('create')) {
-  const args = getArgs(functions.create.args);
-  const options = getOptions(functions.create.options);
+if (commands_called.includes('create')) {
+  const args = parse_args(commands.create.args);
+  const options = parse_options(commands.create.options);
     
   if (!args.name) {
     console.log(chalk.red('Must pass a <name> for your app to joystick create. Run joystick --help for examples.'));
     process.exit(0);
   }
 
-  if (functions.create.function && typeof functions.create.function === 'function') {
-    functions.create.function(args, options);
+  if (commands.create.command) {
+    commands.create.command(args, options);
   }
 }
 
-if (functionsCalled.includes('logout')) {
-  const args = getArgs(functions.logout.args);
-  const options = getOptions(functions.logout.options);
+if (commands_called.includes('help')) {
+  const args = parse_args(commands.help.args);
+  const options = parse_options(commands.help.options);
 
-  if (functions.logout.function && typeof functions.logout.function === 'function') {
-    functions.logout.function(args, options);
+  if (commands.help.command) {
+    commands.help.command(args, options);
   }
 }
 
-if (functionsCalled.includes('push')) {
-  const args = getArgs(functions.push.args);
-  const options = getOptions(functions.push.options);
+if (commands_called.includes('logout')) {
+  const args = parse_args(commands.logout.args);
+  const options = parse_options(commands.logout.options);
 
-  if (functions.push.function && typeof functions.push.function === 'function') {
-    functions.push.function(args, options);
+  if (commands.logout.command) {
+    commands.logout.command(args, options);
   }
 }
 
-if (functionsCalled.includes('start')) {
-  const args = getArgs(functions.start.args);
-  const options = getOptions(functions.start.options);
+if (commands_called.includes('push')) {
+  const args = parse_args(commands.push.args);
+  const options = parse_options(commands.push.options);
 
-  if (functions.start.function && typeof functions.start.function === 'function') {
-    functions.start.function(args, options);
+  if (commands.push.command) {
+    commands.push.command(args, options);
   }
 }
 
-if (functionsCalled.includes('test')) {
-  const args = getArgs(functions.test.args);
-  const options = getOptions(functions.test.options);
+// NOTE: Temporary. Eventually will replace block above.
+// if (commands_called.includes('push_v2')) {
+//   const args = parse_args(commands.push_v2.args);
+//   const options = parse_options(commands.push_v2.options);
 
-  if (functions.test.function && typeof functions.test.function === 'function') {
-    functions.test.function(args, options);
+//   if (commands.push_v2.command) {
+//     commands.push_v2.command(args, options);
+//   }
+// }
+
+if (commands_called.includes('start')) {
+  const args = parse_args(commands.start.args);
+  const options = parse_options(commands.start.options);
+
+  if (commands.start.command) {
+    commands.start.command(args, options);
+  }
+}
+
+if (commands_called.includes('test')) {
+  const args = parse_args(commands.test.args);
+  const options = parse_options(commands.test.options);
+
+  if (commands.test.command) {
+    commands.test.command(args, options);
   }
 }
 
-if (functionsCalled.includes('update')) {
-  const args = getArgs(functions.update.args);
-  const options = getOptions(functions.update.options);
+if (commands_called.includes('update')) {
+  const args = parse_args(commands.update.args);
+  const options = parse_options(commands.update.options);
 
-  if (functions.update.function && typeof functions.update.function === 'function') {
-    functions.update.function(args, options);
+  if (commands.update.command) {
+    commands.update.command(args, options);
   }
 }
 
-if (functionsCalled.includes('use')) {
-  const args = getArgs(functions.use.args);
-  const options = getOptions(functions.use.options);
+if (commands_called.includes('use')) {
+  const args = parse_args(commands.use.args);
+  const options = parse_options(commands.use.options);
 
-  if (functions.use.function && typeof functions.use.function === 'function') {
-    functions.use.function(args, options);
+  if (commands.use.command) {
+    commands.use.command(args, options);
   }
 }

package/src/commands/build/definition.js

@@ -0,0 +1,58 @@
+import build from './index.js';
+
+const [_node, _bin, ...raw_args] = process.argv;
+
+const definition = {
+  description: 'Build an existing Joystick app.',
+  args: {},
+  options: {
+    environment: {
+      flags: {
+        '-e': {
+          set: !!raw_args.includes('-e'),
+          value: !!raw_args.includes('-e') && raw_args[raw_args.indexOf('-e') + 1],
+          parent: 'build',
+        },
+        '--environment': {
+          set: !!raw_args.includes('--environment'),
+          value: !!raw_args.includes('--environment') && raw_args[raw_args.indexOf('--environment') + 1],
+          parent: 'build',
+        },
+      },
+      description: 'The NODE_ENV you want to use for your build (default: production).',
+    },
+    outputPath: {
+      flags: {
+        '-o': {
+          set: !!raw_args.includes('-o'),
+          value: !!raw_args.includes('-o') && raw_args[raw_args.indexOf('-o') + 1],
+          parent: 'build',
+        },
+        '--outputPath': {
+          set: !!raw_args.includes('--outputPath'),
+          value: !!raw_args.includes('--outputPath') && raw_args[raw_args.indexOf('--outputPath') + 1],
+          parent: 'build',
+        },
+      },
+      description: 'The path you want to build the output to.',
+    },
+    type: {
+      flags: {
+        '-t': {
+          set: !!raw_args.includes('-t'),
+          value: !!raw_args.includes('-t') && raw_args[raw_args.indexOf('-t') + 1],
+          parent: 'build',
+        },
+        '--type': {
+          set: !!raw_args.includes('--type'),
+          value: !!raw_args.includes('--type') && raw_args[raw_args.indexOf('--type') + 1],
+          parent: 'build',
+        },
+      },
+      description: 'The type of build you want to generate (tar or folder).',
+    },
+  },
+  command: build,
+};
+
+export default definition;

package/src/commands/build/index.js

@@ -0,0 +1,7 @@
+import build_app from '../../lib/build/index.js';
+
+const build = (_args = {}, options = {}) => {
+	build_app(options);
+};
+
+export default build;

package/src/commands/create/build_package_json.js

@@ -0,0 +1,20 @@
+const build_package_json = (project_name = "") => {
+  const package_json = {
+    type: "module",
+    name: project_name,
+    version: "0.0.1",
+    description: "",
+    main: "index.js",
+    scripts: {
+      start: "joystick start",
+      test: "joystick test",
+    },
+    keywords: [],
+    author: "",
+    license: "ISC",
+  };
+
+  return JSON.stringify(package_json, null, 2);
+};
+
+export default build_package_json;

package/src/commands/create/definition.js

@@ -0,0 +1,35 @@
+import create from './index.js';
+
+const [_node, _bin, ...raw_args] = process.argv;
+
+const definition = {
+  description: 'Create a new Joystick app.',
+  args: {
+    name: {
+      set: !!raw_args.includes('create') && !!raw_args[raw_args.indexOf('create') + 1],
+      parent: 'create',
+      value: !!raw_args.includes('create') && raw_args[raw_args.indexOf('create') + 1],
+      description: 'The name of the app to create.',
+    },
+  },
+  options: {
+    release: {
+      flags: {
+        '-r': {
+          set: !!raw_args.includes('-r'),
+          value: !!raw_args.includes('-r') && raw_args[raw_args.indexOf('-r') + 1],
+          parent: 'create',
+        },
+        '--release': {
+          set: !!raw_args.includes('--release'),
+          value: !!raw_args.includes('--release') && raw_args[raw_args.indexOf('--release') + 1],
+          parent: 'create',
+        },
+      },
+      description: 'The release of Joystick to use (production or canary).',
+    },
+  },
+  command: create,
+};
+
+export default definition;

package/src/commands/create/index.js

@@ -0,0 +1,71 @@
+import fs from 'fs';
+import chalk from 'chalk';
+import child_process from 'child_process';
+import util from 'util';
+import build_package_json from "./build_package_json.js";
+import cli_log from '../../lib/cli_log.js';
+import Loader from "../../lib/loader.js";
+import node_path_polyfills from '../../lib/node_path_polyfills.js';
+import replace_in_files from '../../lib/replace_in_files.js';
+
+const { cp: copy_directory, writeFile, mkdir } = fs.promises;
+const exec = util.promisify(child_process.exec);
+
+const create_package_json = (project_name = "") => {
+  return writeFile(`./${project_name}/package.json`, build_package_json(project_name));
+};
+
+const create = async (args = {}, options = {}) => {
+  process.loader = new Loader();
+  process.loader.print("Creating app...");
+
+  if (options?.release && !['production', 'canary'].includes(options.release)) {
+    cli_log('Must pass either production or canary for --release.', {
+      level: 'danger',
+      docs: 'https://docs.cheatcode.co/joystick/cli/create',
+    });
+    process.exit(0);
+  }
+
+  await copy_directory(`${node_path_polyfills?.__package}/commands/create/template`, `./${args.name}`, { recursive: true });
+  await create_package_json(args.name);
+  
+  await mkdir(`./${args?.name}/.joystick`, { recursive: true });
+  await mkdir(`./${args?.name}/fixtures`, { recursive: true });
+  await mkdir(`./${args?.name}/indexes`, { recursive: true });
+  await mkdir(`./${args?.name}/lib`, { recursive: true });
+  await mkdir(`./${args?.name}/private`, { recursive: true });
+  await mkdir(`./${args?.name}/queues`, { recursive: true });
+  await mkdir(`./${args?.name}/routes`, { recursive: true });
+  await mkdir(`./${args?.name}/uploaders`, { recursive: true });
+  await mkdir(`./${args?.name}/tests`, { recursive: true });
+  await mkdir(`./${args?.name}/websockets`, { recursive: true });
+
+  if (options?.release === 'canary') {
+    await replace_in_files(`${process.cwd()}/${args?.name}`, {
+      match: [/\.js$/],
+      exclude: [/node_modules/],
+      replace_regex: /(@joystick.js\/node)(?!-)/g,
+      replace_with: '@joystick.js/node-canary',
+    });
+
+    await replace_in_files(`${process.cwd()}/${args?.name}`, {
+      match: [/\.js$/],
+      exclude: [/node_modules/],
+      replace_regex: /(@joystick.js\/ui)(?!-)/g,
+      replace_with: '@joystick.js/ui-canary',
+    });
+  }
+
+  // NOTE: Pure aesthetics. Above step completes so quickly that it almost looks like
+  // it's skipped. Add a buffer of 1s here to make for a better dev experience.
+  setTimeout(async () => {
+    process.loader.print("Installing dependencies...");
+    await exec(`cd ./${args?.name} && npm install --save @joystick.js/ui${options?.release === 'canary' ? '-canary' : ''}@latest @joystick.js/node${options?.release === 'canary' ? '-canary' : ''}@latest @joystick.js/test${options?.release === 'canary' ? '-canary' : ''}@latest`);
+    console.log(
+      `${chalk.green("Project created! To get started, run:")}\ncd ${args?.name} && joystick${options?.release === 'canary' ? '-canary' : ''} start`
+    );
+  }, 1000);
+};
+
+export default create;

package/src/commands/create/template/api/index.js

@@ -0,0 +1,6 @@
+const api = {
+  getters: {},
+  setters: {},
+};
+
+export default api;

package/src/commands/create/template/email/base.css

@@ -0,0 +1,9 @@
+body {
+  margin: 0;
+  padding: 30px;
+  font-family: "Helvetica Neue", "Helvetica", "Arial", sans-serif;
+  background: #fff;
+  color: #222;
+  font-size: 15px;
+  line-height: 23px;
+}

package/src/commands/create/template/email/base.html

@@ -0,0 +1,10 @@
+<html>
+  <head>
+    <title>${subject}</title>
+    ${css}
+  </head>
+  <body>
+    <span class="preheader">${preheader}</span>
+    <div id="email"></div>
+  </body>
+</html>

package/src/commands/create/template/email/reset_password.js

@@ -0,0 +1,20 @@
+import ui from '@joystick.js/ui';
+
+const ResetPassword = ui.component({
+  css: {
+    min: {
+      width: {
+        0: `
+        `,
+      },
+    },
+  },
+  render: ({ props }) => {
+    return `
+      <div>
+      </div>
+    `;
+  },
+});
+
+export default ResetPassword;

package/src/commands/create/template/i18n/en-US.js

@@ -0,0 +1,14 @@
+const en_US = {
+  'ui/pages/index/index.js': {
+    buttons: {
+      get_started: 'Get Started',
+      view_on_github: '<span>{{stars}}</span> View on Github',
+    }
+  },
+  'ui/pages/error/index.js': {
+    page_not_found: 'Page Not Found',
+    double_check_url: 'Double-check the URL and try again.'
+  },
+};
+
+export default en_US;

package/src/commands/create/template/index.client.js

@@ -0,0 +1 @@
+// Add analytics, metrics, etc. here.

package/src/commands/create/template/index.css

@@ -0,0 +1,34 @@
+:root {
+  --brand: #ffcc00;
+}
+
+*,
+*:before,
+*:after {
+  margin: 0;
+  padding: 0;
+  position: relative;
+  box-sizing: border-box;
+  min-width: 0;
+}
+
+body {
+  min-height: 100dvh;
+  font-family: "Helvetica Neue", "Helvetica", "Arial", sans-serif;
+  font-size: 16px;
+  line-height: 1.5em;
+  background: #000;
+}
+
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+  text-wrap: balance;
+}
+
+p {
+  text-wrap: pretty;
+}

package/src/{functions/create/templates → commands/create/template}/index.html

@@ -2,8 +2,8 @@
 <html class="no-js" lang="en">
   <head>
     <meta charset="utf-8">
-    <title>Joystick</title>
-    <meta name="description" content="An awesome JavaScript app that's under development.">
+    <title>App</title>
+    <meta name="description" content="A new Joystick app.">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="theme-color" content="#FFCC00">
     <link rel="apple-touch-icon" href="/apple-touch-icon-152x152.png">
@@ -13,7 +13,6 @@
   </head>
   <body>
     <div id="app"></div>
-    ${scripts}
     <script>
       if ("serviceWorker" in navigator) {
         navigator.serviceWorker.register("/service-worker.js");

package/src/{functions/create/templates → commands/create/template}/index.server.js

@@ -1,19 +1,19 @@
-import node from "@joystick.js/node";
-import api from "./api";
+import joystick from "@joystick.js/node";
+import api from "./api/index.js";
 
-node.app({
+joystick.app({
   api,
   routes: {
-    "/": (req, res) => {
+    "/": (req = {}, res = {}) => {
       res.render("ui/pages/index/index.js", {
         layout: "ui/layouts/app/index.js",
       });
     },
-    "*": (req, res) => {
+    "*": (req = {}, res = {}) => {
       res.render("ui/pages/error/index.js", {
         layout: "ui/layouts/app/index.js",
         props: {
-          statusCode: 404,
+          status_code: 404,
         },
       });
     },

package/src/{functions/create/templates → commands/create/template}/public/manifest.json

@@ -3,12 +3,12 @@
   "short_name": "app",
   "start_url": ".",
   "display": "standalone",
-  "background_color": "#fff",
-  "theme_color": "#ffcc00",
-  "description": "An awesome JavaScript app that's under development.",
+  "background_color": "#000000",
+  "theme_color": "#000000",
+  "description": "A new Joystick app.",
   "icons": [{
     "src": "favicon.ico",
-    "sizes": "64x64",
+    "sizes": "32x32",
     "type": "image/x-icon"
   }, {
     "purpose": "any",