@joystick.js/cli-canary 0.0.0-canary.1 → 0.0.0-canary.10

package/dist/functions/start/buildFile.js

@@ -3,7 +3,7 @@ import svg from "esbuild-plugin-svg";
 import fs from "fs";
 import plugins from "./buildPlugins.js";
 import onWarn from "./onWarn.js";
-import getCodeFrame from "../../lib/getCodeFrame.js";
+import getCodeFrame from "../../lib/build/getCodeFrame.js";
 const configs = {
   node: (inputPath, outputPath = null, environment = "development") => ({
     entryPoints: [inputPath],

package/dist/functions/start/databases/mongodb/checkConnection.js

@@ -3,11 +3,8 @@ import chalk from "chalk";
 import fs from "fs";
 import buildConnectionString from "./buildConnectionString.js";
 var checkConnection_default = async (connection = {}, options = {}) => {
-  const connectionString = buildConnectionString(connection);
-  console.log({
-    connectionString
-  });
   try {
+    const connectionString = buildConnectionString(connection2);
     const connectionOptions = {
       connectTimeoutMS: 3e3,
       socketTimeoutMS: 3e3,

package/dist/functions/start/databases/mongodb/index.js

@@ -18,7 +18,7 @@ const warnMongoDBMissing = () => {
  After you've installed MongoDB, run joystick start again, or, remove MongoDB from your config.databases array in your settings.development.json file to skip starting it up.`,
     {
       level: "danger",
-      docs: "https://github.com/cheatcode/joystick#databases"
+      docs: "https://cheatcode.co/docs/joystick/cli/databases#mongodb"
     }
   );
 };

package/dist/functions/start/index.js

@@ -1,22 +1,4 @@
-import child_process from "child_process";
-import path, { dirname } from "path";
-import { fileURLToPath } from "url";
-import ps from "ps-node";
-import { killPortProcess } from "kill-port-process";
-import fs from "fs";
-import chokidar from "chokidar";
-import Loader from "../../lib/loader.js";
-import getFilesToBuild from "./getFilesToBuild.js";
-import buildFiles from "./buildFiles.js";
-import filesToCopy from "./filesToCopy.js";
-import checkIfPortAvailable from "./checkIfPortAvailable.js";
-import getCodependenciesForFile from "./getCodependenciesForFile.js";
-import isValidJSONString from "../../lib/isValidJSONString.js";
-import startDatabaseProvider from "./databases/startProvider.js";
-import CLILog from "../../lib/CLILog.js";
-import removeDeletedDependenciesFromMap from "./removeDeletedDependenciesFromMap.js";
-import validateDatabasesFromSettings from "../../lib/validateDatabasesFromSettings.js";
-import wait from "../../lib/wait.js";
+import dev from "../../lib/dev/index.js";
 const majorVersion = parseInt(
   process?.version?.split(".")[0]?.replace("v", ""),
   10
@@ -505,30 +487,10 @@ const checkIfJoystickProject = () => {
   return fs.existsSync(`${process.cwd()}/.joystick`);
 };
 var start_default = async (args = {}, options = {}) => {
-  process.loader = new Loader({ defaultMessage: "Starting app..." });
-  const port = options?.port ? parseInt(options?.port) : 2600;
-  const databasePortStart = port + 10;
-  const isJoystickProject = checkIfJoystickProject();
-  if (!isJoystickProject) {
-    CLILog(
-      "This is not a Joystick project. A .joystick folder could not be found.",
-      {
-        level: "danger",
-        docs: "https://github.com/cheatcode/joystick"
-      }
-    );
-    process.exit(0);
-  }
-  await killPortProcess([port, port + 1]);
-  process.title = "joystick";
-  process.env.LOGS_PATH = options?.logs || null;
-  process.env.NODE_ENV = options?.environment || "development";
-  process.env.PORT = options?.port ? parseInt(options?.port) : 2600;
-  process.env.IS_DEBUG_MODE = options?.debug;
-  const settings = loadSettings(process.env.NODE_ENV);
-  await startDatabases(databasePortStart);
-  startWatcher(settings?.config?.build);
-  handleSignalEvents([]);
+  await dev({
+    environment: options?.environment,
+    process
+  });
 };
 export {
   start_default as default

package/dist/functions/start/onWarn.js

@@ -1,7 +1,7 @@
 import chalk from "chalk";
 import { OBJECT_REGEX } from "../../lib/regexes.js";
 import rainbowRoad from "../../lib/rainbowRoad.js";
-import getCodeFrame from "../../lib/getCodeFrame.js";
+import getCodeFrame from "../../lib/build/getCodeFrame.js";
 const removeLocationDataFromStackTrace = (stackTrace = "") => {
   return stackTrace.replace(OBJECT_REGEX, "");
 };

package/dist/functions/test/index.js

@@ -0,0 +1,30 @@
+const actionMethod = () => {
+  try {
+  } 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);
+    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/functions/use/index.js

@@ -3,7 +3,7 @@ import child_process from "child_process";
 var use_default = async (args = {}) => {
   if (args?.version === "canary") {
     await replaceInFiles({
-      files: ["./index.server.js", "./api/**/*.js", "lib/node/**/*.js"],
+      files: ["**/*.js"],
       from: /(@joystick.js\/node)(?!-)/g,
       to: "@joystick.js/node-canary",
       optionsForFiles: {
@@ -14,7 +14,7 @@ var use_default = async (args = {}) => {
       }
     });
     await replaceInFiles({
-      files: ["./index.client.js", "./ui/**/*.js", "lib/**/*.js"],
+      files: ["**/*.js"],
       from: /(@joystick.js\/ui)(?!-)/g,
       to: "@joystick.js/ui-canary",
       optionsForFiles: {
@@ -30,7 +30,7 @@ var use_default = async (args = {}) => {
   }
   if (args?.version === "production") {
     await replaceInFiles({
-      files: ["./index.server.js", "./api/**/*.js", "lib/node/**/*.js"],
+      files: ["**/*.js"],
       from: /(@joystick.js\/node-canary)/g,
       to: "@joystick.js/node",
       optionsForFiles: {
@@ -41,7 +41,7 @@ var use_default = async (args = {}) => {
       }
     });
     await replaceInFiles({
-      files: ["./index.client.js", "./ui/**/*.js", "lib/**/*.js"],
+      files: ["**/*.js"],
       from: /(@joystick.js\/ui-canary)/g,
       to: "@joystick.js/ui",
       optionsForFiles: {

package/dist/lib/build/browserPathExclusions.js

@@ -0,0 +1,7 @@
+import getPlatformSafePath from "../getPlatformSafePath.js";
+var browserPathExclusions_default = [
+  getPlatformSafePath("lib/node")
+];
+export {
+  browserPathExclusions_default as default
+};

package/dist/lib/build/browserPaths.js

@@ -0,0 +1,11 @@
+import getPlatformSafePath from "../getPlatformSafePath.js";
+var browserPaths_default = [
+  getPlatformSafePath("email/"),
+  getPlatformSafePath("lib/"),
+  getPlatformSafePath("lib/browser"),
+  getPlatformSafePath("ui/"),
+  "index.client.js"
+];
+export {
+  browserPaths_default as default
+};

package/dist/lib/build/buildFile.js

@@ -0,0 +1,84 @@
+import esbuild from "esbuild";
+import fs from "fs";
+import onWarn from "./onWarn.js";
+import getCodeFrame from "./getCodeFrame.js";
+import buildConfigs from "./buildConfigs.js";
+const handleBuildException = (exception = {}, file = "") => {
+  try {
+    console.warn(exception);
+    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(`[buildFile.handleBuildException] ${exception2.message}`);
+  }
+};
+const getConfig = (platform = "", file = "", outputPath = "", environment = "development") => {
+  try {
+    return buildConfigs[platform] && buildConfigs[platform](file, outputPath, environment);
+  } catch (exception) {
+    throw new Error(`[buildFile.getConfig] ${exception.message}`);
+  }
+};
+const validateOptions = (options) => {
+  try {
+    if (!options)
+      throw new Error("options object is required.");
+    if (!options.platform)
+      throw new Error("options.platform is required.");
+    if (!options.file)
+      throw new Error("options.file is required.");
+    if (!options.outputPath)
+      throw new Error("options.outputPath is required.");
+    if (!options.environment)
+      throw new Error("options.environment is required.");
+  } catch (exception) {
+    throw new Error(`[buildFile.validateOptions] ${exception.message}`);
+  }
+};
+const buildFile = async (options, { resolve, reject }) => {
+  try {
+    validateOptions(options);
+    const config = getConfig(
+      options?.platform,
+      options?.file,
+      options?.outputPath,
+      options?.environment
+    );
+    if (config) {
+      esbuild.build(config).then(() => {
+        return resolve({ success: true });
+      }).catch((exception) => {
+        const snippet = handleBuildException(exception, options?.file);
+        return resolve({
+          success: false,
+          path: options?.file,
+          error: {
+            stack: exception?.stack,
+            snippet
+          }
+        });
+      });
+    }
+  } catch (exception) {
+    reject(`[buildFile] ${exception.message}`);
+  }
+};
+var buildFile_default = (options) => new Promise((resolve, reject) => {
+  buildFile(options, { resolve, reject });
+});
+export {
+  buildFile_default as default
+};

package/dist/lib/build/buildFiles.js

@@ -0,0 +1,183 @@
+import fs from "fs-extra";
+import esbuild from "esbuild";
+import svg from "esbuild-plugin-svg";
+import filesToCopy from "../filesToCopy.js";
+import minifyFile from "../build/minifyFile.js";
+import browserPaths from "./browserPaths.js";
+import browserPathExclusions from "./browserPathExclusions.js";
+import nodePaths from "./nodePaths.js";
+import nodePathExclusions from "./nodePathExclusions.js";
+import buildPlugins from "./buildPlugins.js";
+const handleBuildForNode = (nodePaths2 = [], options = {}) => {
+  try {
+    return esbuild.build({
+      platform: "node",
+      format: "esm",
+      bundle: false,
+      entryPoints: nodePaths2?.map((file) => file.path),
+      // TODO: Make sure we don't need outbase here so the paths map correctly.
+      outdir: options?.outputPath || "./.joystick/build",
+      define: {
+        "process.env.NODE_ENV": `'${options?.environment}'`
+      },
+      logLevel: "silent",
+      plugins: [
+        buildPlugins.warnNodeEnvironment,
+        buildPlugins.generateFileDependencyMap
+      ]
+    });
+  } catch (exception) {
+    throw new Error(`[buildFiles.handleBuildForNode] ${exception.message}`);
+  }
+};
+const handleBuildForBrowser = (browserPaths2 = [], options = {}) => {
+  try {
+    return esbuild.build({
+      target: "es2020",
+      platform: "browser",
+      format: "esm",
+      bundle: true,
+      entryPoints: browserPaths2?.map((file) => file.path),
+      // TODO: Make sure we don't need outbase here so the paths map correctly.
+      outdir: options?.outputPath || "./.joystick/build",
+      define: {
+        "process.env.NODE_ENV": `'${options?.environment}'`
+      },
+      logLevel: "silent",
+      plugins: [
+        buildPlugins.warnNodeEnvironment,
+        buildPlugins.generateFileDependencyMap,
+        buildPlugins.bootstrapComponent,
+        svg()
+      ]
+    });
+  } catch (exception) {
+    throw new Error(`[buildFiles.handleBuildForBrowser] ${exception.message}`);
+  }
+};
+const handleCopyFiles = (files = [], outputPath = "") => {
+  try {
+    for (let i = 0; i < files?.length; i += 1) {
+      const file = files[i];
+      const fileContents = fs.readFileSync(file.path);
+      fs.writeFileSync(
+        `${outputPath || "./.joystick/build"}/${file.path}`,
+        fileContents
+      );
+    }
+  } catch (exception) {
+    throw new Error(`[buildFiles.handleCopyFiles] ${exception.message}`);
+  }
+};
+const isNodePath = (path = "") => {
+  try {
+    return nodePaths.some((nodePath) => {
+      return path.includes(nodePath);
+    }) && !nodePathExclusions.some((nodeExclusionPath) => {
+      return path.includes(nodeExclusionPath);
+    });
+  } catch (exception) {
+    throw new Error(`[buildFiles.isNodePath] ${exception.message}`);
+  }
+};
+const isBrowserPath = (path = "") => {
+  try {
+    return browserPaths.some((browserPath) => {
+      return path.includes(browserPath);
+    }) && !browserPathExclusions.some((browserExclusionPath) => {
+      return path.includes(browserExclusionPath);
+    });
+  } catch (exception) {
+    throw new Error(`[buildFiles.isBrowserPath] ${exception.message}`);
+  }
+};
+const isNotJavaScript = (path = "") => {
+  try {
+    const extension = path.split(".").pop();
+    return extension && !extension.match(/js$/);
+  } catch (exception) {
+    throw new Error(`[buildFiles.isNotJavaScript] ${exception.message}`);
+  }
+};
+const isCopyPath = (path = "") => {
+  try {
+    const hasCopyRegexMatch = filesToCopy.some((fileToCopy) => {
+      return fileToCopy.regex.test(path);
+    });
+    return isNotJavaScript(path) || hasCopyRegexMatch;
+  } catch (exception) {
+    throw new Error(`[buildFiles.isCopyPath] ${exception.message}`);
+  }
+};
+const getFilePlatform = (path = "") => {
+  try {
+    let platform = "";
+    const isCopy = isCopyPath(path);
+    const isBrowser = isBrowserPath(path);
+    const isNode = isNodePath(path);
+    if (isCopy) {
+      platform = "copy";
+    }
+    if (isBrowser) {
+      platform = "browser";
+    }
+    if (isNode) {
+      platform = "node";
+    }
+    return platform;
+  } catch (exception) {
+    throw new Error(`[buildFiles.getFilePlatform] ${exception.message}`);
+  }
+};
+const getFilesWithPlatform = (files = []) => {
+  try {
+    return files?.map((file = "") => {
+      return {
+        path: file,
+        platform: getFilePlatform(file)
+      };
+    });
+  } catch (exception) {
+    throw new Error(`[buildFiles.getFilesWithPlatform] ${exception.message}`);
+  }
+};
+const validateOptions = (options) => {
+  try {
+    if (!options)
+      throw new Error("options object is required.");
+    if (!options.files)
+      throw new Error("options.files is required.");
+    if (!options.environment)
+      throw new Error("options.environment is required.");
+  } catch (exception) {
+    throw new Error(`[buildFiles.validateOptions] ${exception.message}`);
+  }
+};
+const buildFiles = async (options, { resolve, reject }) => {
+  try {
+    validateOptions(options);
+    const filesWithPlatform = getFilesWithPlatform(options?.files);
+    const copyFiles = filesWithPlatform?.filter((file) => file?.platform === "copy");
+    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)
+    ]);
+    if (options?.environment !== "development") {
+      await Promise.all([browserFiles, nodeFiles].map((file) => {
+        return minifyFile(`${options?.outputPath || "./.joystick/build"}/${file.path}`);
+      }));
+    }
+    resolve();
+  } catch (exception) {
+    reject(`[buildFiles] ${exception.message}`);
+  }
+};
+var buildFiles_default = (options) => new Promise((resolve, reject) => {
+  buildFiles(options, { resolve, reject });
+});
+export {
+  buildFiles_default as default
+};

package/dist/lib/build/buildPlugins.js

@@ -0,0 +1,183 @@
+import fs from "fs";
+import chalk from "chalk";
+import updateFileMap from "./updateFileMap.js";
+import {
+  JOYSTICK_UI_REGEX,
+  EXPORT_DEFAULT_REGEX,
+  JOYSTICK_COMPONENT_REGEX,
+  JOYSTICK_COMMENT_REGEX
+} from "../regexes.js";
+import generateId from "../generateId.js";
+import getPlatformSafePath from "../getPlatformSafePath.js";
+import setComponentId from "./setComponentId.js";
+var buildPlugins_default = {
+  bootstrapComponent: {
+    name: "bootstrapComponent",
+    setup(build) {
+      const ssrId = generateId();
+      build.onLoad({ filter: /\.js$/ }, (args = {}) => {
+        try {
+          const shouldSetSSRId = [getPlatformSafePath("ui/")].some(
+            (bootstrapTarget) => {
+              return args.path.includes(bootstrapTarget);
+            }
+          );
+          const isLayoutComponent = [getPlatformSafePath("ui/layouts")].some(
+            (bootstrapTarget) => {
+              return args.path.includes(bootstrapTarget);
+            }
+          );
+          const isPageComponent = [getPlatformSafePath("ui/pages")].some(
+            (bootstrapTarget) => {
+              return args.path.includes(bootstrapTarget);
+            }
+          );
+          const isEmailComponent = [getPlatformSafePath("email/")].some(
+            (bootstrapTarget) => {
+              return args.path.includes(bootstrapTarget);
+            }
+          );
+          if (shouldSetSSRId || isLayoutComponent || isPageComponent || isEmailComponent) {
+            const code = fs.readFileSync(
+              getPlatformSafePath(args.path),
+              "utf-8"
+            );
+            const joystickUIMatches = code.match(JOYSTICK_UI_REGEX) || [];
+            const joystickUIMatch = joystickUIMatches && joystickUIMatches[0];
+            const exportDefaultMatches = code.match(EXPORT_DEFAULT_REGEX) || [];
+            const exportDefaultMatch = exportDefaultMatches && exportDefaultMatches[0];
+            if (joystickUIMatch && !exportDefaultMatch) {
+              console.log(" ");
+              console.warn(
+                chalk.yellowBright(
+                  `All Joystick components in the ui directory must have an export default statement (e.g., export default MyComponent, export default MyLayout, or export default MyPage). Please check the file at ${args.path}.`
+                )
+              );
+              console.log(" ");
+              return;
+            }
+            let contents = setComponentId(code)?.replace(
+              /\.component\(\/\*\*\//g,
+              ".component("
+            );
+            contents = contents.replace(JOYSTICK_COMMENT_REGEX, "");
+            const exportDefaultMatchParts = exportDefaultMatch && exportDefaultMatch.split(" ") || [];
+            const componentName = exportDefaultMatchParts.pop();
+            if (componentName && isLayoutComponent) {
+              contents = contents.replace(
+                `${exportDefaultMatch};`,
+                `if (
+                  typeof window !== 'undefined' &&
+                  window.__joystick_ssr__ === true &&
+                  window.__joystick_layout_page__ &&
+                  ui &&
+                  ui.mount
+                ) {
+                  (async () => {
+                    const layoutComponentFile = await import(window.__joystick_layout__);
+                    const pageComponentFile = await import(window.window.__joystick_layout_page_url__);
+                    const layout = layoutComponentFile.default;
+                    const page = pageComponentFile.default;
+                    ui.mount(layout, Object.assign({ ...window.__joystick_ssr_props__ }, { page }), document.getElementById('app'));
+                  })();
+                }
+
+              export default ${componentName};
+                `
+              );
+            }
+            if (componentName && isPageComponent) {
+              contents = contents.replace(
+                `${exportDefaultMatch};`,
+                `if (
+                  typeof window !== 'undefined' &&
+                  window.__joystick_ssr__ === true &&
+                  !window.__joystick_layout_page__ &&
+                  ui &&
+                  ui.mount
+                ) {
+                  ui.mount(${componentName}, window.__joystick_ssr_props__ || {}, document.getElementById('app'));
+                }
+
+                export default ${componentName};
+                `
+              );
+            }
+            return {
+              contents,
+              loader: "js"
+            };
+          }
+        } catch (exception) {
+          console.warn(exception);
+        }
+      });
+      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);
+            }
+          }
+          resolve();
+        });
+      });
+    }
+  },
+  generateFileDependencyMap: {
+    name: "generateFileDependencyMap",
+    setup(build) {
+      build.onLoad({ filter: /\.js$/ }, (args) => {
+        try {
+          const canAddToMap = ![
+            "node_modules",
+            ".joystick",
+            "?",
+            "commonjsHelpers.js"
+          ].some((excludedPath) => {
+            return getPlatformSafePath(args.path).includes(excludedPath);
+          });
+          if (canAddToMap) {
+            const code = fs.readFileSync(
+              getPlatformSafePath(args.path),
+              "utf-8"
+            );
+            updateFileMap(getPlatformSafePath(args.path), code);
+          }
+        } catch (exception) {
+          console.warn(exception);
+        }
+      });
+    }
+  },
+  warnNodeEnvironment: {
+    name: "warnNodeEnvironment",
+    setup(build) {
+      build.onLoad({ filter: /\.js$/ }, (args = {}) => {
+        const code = fs.readFileSync(args.path, "utf-8");
+        if (code?.match(/process.env.NODE_ENV\s+=\s/gi)?.length) {
+          console.warn(
+            chalk.yellowBright(
+              "\n[WARNING] process.env.NODE_ENV should only be set via a CLI flag in development or via external environment variables in production.\n"
+            )
+          );
+        }
+      });
+    }
+  }
+};
+export {
+  buildPlugins_default as default
+};

package/dist/lib/build/minifyFile.js

@@ -0,0 +1,12 @@
+import fs from "fs";
+import esbuild from "esbuild";
+var minifyFile_default = async (path = "") => {
+  if (fs.existsSync(path)) {
+    const file = fs.readFileSync(path, "utf-8");
+    const minified = await esbuild.transform(file, { minify: true });
+    fs.writeFileSync(path, minified.code);
+  }
+};
+export {
+  minifyFile_default as default
+};

package/dist/lib/build/nodePathExclusions.js

@@ -0,0 +1,7 @@
+import getPlatformSafePath from "../getPlatformSafePath.js";
+var nodePathExclusions_default = [
+  getPlatformSafePath("lib/browser")
+];
+export {
+  nodePathExclusions_default as default
+};

package/dist/lib/build/nodePaths.js

@@ -0,0 +1,11 @@
+import getPlatformSafePath from "../getPlatformSafePath.js";
+var nodePaths_default = [
+  getPlatformSafePath("api/"),
+  getPlatformSafePath("routes/"),
+  getPlatformSafePath("fixtures/"),
+  getPlatformSafePath("lib/node"),
+  "index.server.js"
+];
+export {
+  nodePaths_default as default
+};