arri 0.44.0 → 0.45.0

package/dist/cli.cjs

@@ -5,182 +5,29 @@ const citty = require('citty');
 const node_child_process = require('node:child_process');
 const fs = require('node:fs');
 const fs$1 = require('node:fs/promises');
-const arriCodegenUtils = require('arri-codegen-utils');
+const codegenUtils = require('@arrirpc/codegen-utils');
 const c12 = require('c12');
 const esbuild = require('esbuild');
 const esbuildPluginReplace = require('esbuild-plugin-replace');
 const path = require('pathe');
 const prettier = require('prettier');
-const config = require('./shared/arri.0628c07d.cjs');
-const consola = require('consola');
-const globby = require('globby');
-const scule = require('scule');
+const dev = require('./shared/arri.547ce62e.cjs');
 const ofetch = require('ofetch');
-const listhen = require('@joshmossas/listhen');
 const Degit = require('degit');
 const enquirer = require('enquirer');
-require('h3');
-require('arri-validate');
-require('h3-sse');
+const scule = require('scule');
+require('@joshmossas/listhen');
+require('consola');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
 
-function _interopNamespaceCompat(e) {
-    if (e && typeof e === 'object' && 'default' in e) return e;
-    const n = Object.create(null);
-    if (e) {
-        for (const k in e) {
-            n[k] = e[k];
-        }
-    }
-    n.default = e;
-    return n;
-}
-
 const fs__default$1 = /*#__PURE__*/_interopDefaultCompat(fs);
 const fs__default = /*#__PURE__*/_interopDefaultCompat(fs$1);
-const esbuild__namespace = /*#__PURE__*/_interopNamespaceCompat(esbuild);
 const path__default = /*#__PURE__*/_interopDefaultCompat(path);
 const prettier__default = /*#__PURE__*/_interopDefaultCompat(prettier);
 const Degit__default = /*#__PURE__*/_interopDefaultCompat(Degit);
 const enquirer__default = /*#__PURE__*/_interopDefaultCompat(enquirer);
 
-const logger = consola.createConsola().withTag("arri");
-const GEN_APP_FILE = "__arri_app.ts";
-const GEN_SERVER_ENTRY_FILE = "__arri_server.ts";
-const OUT_APP_FILE = "app.mjs";
-const OUT_SERVER_ENTRY = "server.mjs";
-const OUT_CODEGEN = "codegen.mjs";
-async function setupWorkingDir(config) {
-  const arriDir = path__default.resolve(config.rootDir, config.buildDir);
-  const outDir = path__default.resolve(config.rootDir, ".output");
-  if (fs.existsSync(arriDir)) {
-    await fs__default.rm(arriDir, { recursive: true, force: true });
-  }
-  if (fs.existsSync(outDir)) {
-    await fs__default.rm(outDir, { recursive: true, force: true });
-  }
-  await fs__default.mkdir(arriDir);
-  await fs__default.mkdir(outDir);
-}
-async function createAppWithRoutesModule(config) {
-  const appModule = path__default.resolve(config.rootDir, config.srcDir, config.entry);
-  const appImportParts = path__default.relative(path__default.resolve(config.rootDir, config.buildDir), appModule).split(".");
-  appImportParts.pop();
-  const routes = [];
-  const existingRoutes = [];
-  await Promise.all(
-    config.procedureGlobPatterns.map(async (pattern) => {
-      const results = await getFsRouteBatch(pattern, config);
-      for (const result of results) {
-        if (!existingRoutes.includes(result.name)) {
-          routes.push(result);
-          existingRoutes.push(result.name);
-        }
-      }
-    })
-  );
-  routes.sort((a, b) => a.name < b.name ? -1 : 1);
-  const module = await prettier__default.format(
-    `import sourceMapSupport from 'source-map-support';
-        sourceMapSupport.install();
-        import app from '${appImportParts.join(".")}';
-        ${routes.map(
-      (route) => `import ${route.importName} from '${route.importPath}';`
-    ).join("\n")}
-        const routes: {id: string; route: any}[] = [${routes.map(
-      (route) => `{ id: '${route.name}', route: ${route.importName} }`
-    ).join(",\n")}
-        ];
-        for(const route of routes) {
-            if(route.route.transport === 'http') {
-                app.rpc({
-                    name: route.id,
-                    ...route.route,
-                });
-                continue;
-            }
-            if (route.route.transport === 'ws') {
-                app.wsRpc({
-                    name: route.id,
-                    ...route.route,
-                });
-                continue;
-            }
-        }
-        export default app`,
-    { parser: "typescript", tabWidth: 4 }
-  );
-  await fs__default.writeFile(
-    path__default.resolve(config.rootDir, config.buildDir, GEN_APP_FILE),
-    module
-  );
-}
-async function getFsRouteBatch(globPattern, config) {
-  if (!config.procedureDir) {
-    return [];
-  }
-  const target = `${config.rootDir}/${config.srcDir}/${config.procedureDir}/${globPattern}`.split("//").join("/").split("//").join("/");
-  const files = await globby.globby(target, {
-    onlyFiles: true
-  });
-  const routes = [];
-  for (const file of files) {
-    const meta = getRpcMetaFromPath(config, file);
-    if (meta) {
-      const importParts = path__default.relative(path__default.resolve(config.rootDir, config.buildDir), file).split(".");
-      importParts.pop();
-      importParts.push("js");
-      routes.push({
-        name: meta.id,
-        importName: scule.camelCase(meta.id.split(".").join("_")),
-        importPath: `./${importParts.join(".")}`
-      });
-    }
-  }
-  return routes;
-}
-const disallowedNameChars = "~`!@#$%^&*()-+=[]{}\\|:;\"'<>,./";
-const getRpcMetaFromPath = (config, filePath) => {
-  if (!config.procedureDir) {
-    return void 0;
-  }
-  const resolvedFilePath = filePath.split("./").join("/");
-  const parts = resolvedFilePath.split("/");
-  const reversedParts = [...parts].reverse();
-  const nameParts = [];
-  for (const part of reversedParts) {
-    if (part === config.procedureDir) {
-      break;
-    }
-    nameParts.push(part);
-  }
-  const fileName = nameParts.reverse().pop() ?? "";
-  const serviceParts = nameParts.filter((part) => part.trim().length > 0).map((part) => arriCodegenUtils.removeDisallowedChars(part, disallowedNameChars));
-  const fileNameParts = fileName.split(".");
-  if (!fileNameParts.length) {
-    return void 0;
-  }
-  const rpcName = arriCodegenUtils.removeDisallowedChars(
-    fileNameParts[0],
-    disallowedNameChars
-  );
-  const httpParts = [
-    ...serviceParts.map((part) => scule.kebabCase(part)),
-    scule.kebabCase(rpcName)
-  ];
-  return {
-    id: [...serviceParts, rpcName].join("."),
-    httpPath: `/${httpParts.join("/")}`
-  };
-};
-function isInsideDir(dir, parentDir) {
-  if (path__default.resolve(dir).startsWith(path__default.resolve(parentDir))) {
-    return true;
-  }
-  return false;
-}
-
 const build = citty.defineCommand({
   args: {
     config: {
@@ -195,43 +42,43 @@ const build = citty.defineCommand({
     }
   },
   async run({ args }) {
-    const { config: config$1 } = await c12.loadConfig({
+    const { config } = await c12.loadConfig({
       configFile: args.config,
-      defaultConfig: config.defaultConfig
+      defaultConfig: dev.defaultConfig
     });
-    if (!config$1) {
+    if (!config) {
       throw new Error("Unable to find arri config");
     }
     const appEntry = path__default.resolve(
-      config$1.rootDir,
-      config$1.srcDir,
-      config$1.entry
+      config.rootDir,
+      config.srcDir,
+      config.entry
     );
     if (!fs.existsSync(appEntry)) {
       throw new Error(`Unable to find entry at ${appEntry}`);
     }
-    await startBuild(config$1, args.skipCodegen);
+    await startBuild(config, args.skipCodegen);
   }
 });
 async function startBuild(config, skipCodeGen = false) {
-  logger.log("Bundling server....");
+  dev.logger.log("Bundling server....");
   const appEntry = path__default.resolve(config.rootDir, config.srcDir, config.entry);
   if (!fs.existsSync(path__default.resolve(config.rootDir, config.srcDir, config.entry))) {
-    logger.error(`Unabled to find entry at ${appEntry}`);
+    dev.logger.error(`Unabled to find entry at ${appEntry}`);
     process.exit(1);
   }
-  await setupWorkingDir(config);
+  await dev.setupWorkingDir(config);
   await Promise.all([
-    createAppWithRoutesModule(config),
+    dev.createAppWithRoutesModule(config),
     createServerEntryFile(config),
     createCodegenEntryFile(config)
   ]);
   await bundleAppEntry(config);
-  logger.log("Finished bundling");
+  dev.logger.log("Finished bundling");
   const clientCount = config.generators.length;
-  const codegenModule = path__default.resolve(config.rootDir, ".output", OUT_CODEGEN);
+  const codegenModule = path__default.resolve(config.rootDir, ".output", dev.OUT_CODEGEN);
   if (!skipCodeGen) {
-    logger.log("Generating Arri app definition (__definition.json)");
+    dev.logger.log("Generating Arri app definition (__definition.json)");
     node_child_process.execSync(`node ${codegenModule}`, { env: process.env });
     const defJson = path__default.resolve(
       config.rootDir,
@@ -239,31 +86,31 @@ async function startBuild(config, skipCodeGen = false) {
       "__definition.json"
     );
     const def = JSON.parse(fs.readFileSync(defJson, { encoding: "utf-8" }));
-    if (arriCodegenUtils.isAppDefinition(def) && clientCount > 0) {
-      logger.log(`Generating ${clientCount} clients`);
+    if (codegenUtils.isAppDefinition(def) && clientCount > 0) {
+      dev.logger.log(`Generating ${clientCount} clients`);
       await Promise.all(
         config.generators.map((plugin) => plugin.generator(def))
       );
-      logger.log(`${clientCount} clients generated`);
+      dev.logger.log(`${clientCount} clients generated`);
     } else {
-      logger.warn(
+      dev.logger.warn(
         "No client generators specified. Skipping client codegen."
       );
     }
   } else {
-    logger.log("Skipping codegen");
+    dev.logger.log("Skipping codegen");
   }
-  logger.log("Cleaning up files");
+  dev.logger.log("Cleaning up files");
   await fs__default.rm(codegenModule);
-  logger.success(
-    `Build finished! You can start your server by running "node .output/${OUT_SERVER_ENTRY}"`
+  dev.logger.success(
+    `Build finished! You can start your server by running "node .output/${dev.OUT_SERVER_ENTRY}"`
   );
 }
 async function bundleAppEntry(config, allowCodegen = true) {
   const appEntry = path__default.resolve(
     config.rootDir,
     config.buildDir,
-    GEN_APP_FILE
+    dev.GEN_APP_FILE
   );
   await esbuild.build({
     ...config.esbuild,
@@ -280,7 +127,7 @@ async function bundleAppEntry(config, allowCodegen = true) {
 const require = topLevelCreateRequire(import.meta.url);`
     },
     allowOverwrite: true,
-    outfile: path__default.resolve(config.rootDir, ".output", OUT_APP_FILE)
+    outfile: path__default.resolve(config.rootDir, ".output", dev.OUT_APP_FILE)
   });
 }
 async function createServerEntryFile(config) {
@@ -306,7 +153,7 @@ const require = topLevelCreateRequire(import.meta.url);`
       },
       plugins: [esbuildPluginReplace.replace({ "virtual:arri/app": "./app.mjs" })],
       allowOverwrite: true,
-      outfile: path__default.resolve(config.rootDir, ".output", OUT_SERVER_ENTRY)
+      outfile: path__default.resolve(config.rootDir, ".output", dev.OUT_SERVER_ENTRY)
     });
     return;
   }
@@ -321,7 +168,7 @@ const require = topLevelCreateRequire(import.meta.url);`
   }
   const virtualEntry = `import { toNodeListener } from 'arri';
 import { listen } from '@joshmossas/listhen';
-import app from './${OUT_APP_FILE}';
+import app from './${dev.OUT_APP_FILE}';
 
 void listen(toNodeListener(app.h3App), {
     port: process.env.PORT ?? ${config.port},
@@ -338,7 +185,7 @@ void listen(toNodeListener(app.h3App), {
     ${httpsString}
 });`;
   await fs__default.writeFile(
-    path__default.resolve(config.rootDir, ".output", OUT_SERVER_ENTRY),
+    path__default.resolve(config.rootDir, ".output", dev.OUT_SERVER_ENTRY),
     virtualEntry
   );
 }
@@ -350,7 +197,7 @@ async function createCodegenEntryFile(config) {
     `
     import { writeFileSync } from 'node:fs';
     import path from 'pathe';
-    import app from './${OUT_APP_FILE}';
+    import app from './${dev.OUT_APP_FILE}';
 
     const __dirname = new URL(".", import.meta.url).pathname;
     const def = app.getAppDefinition();
@@ -361,7 +208,7 @@ async function createCodegenEntryFile(config) {
     { tabWidth: 4, parser: "typescript" }
   );
   await fs__default.writeFile(
-    path__default.resolve(config.rootDir, ".output", OUT_CODEGEN),
+    path__default.resolve(config.rootDir, ".output", dev.OUT_CODEGEN),
     virtualModule
   );
 }
@@ -386,7 +233,7 @@ const codegen = citty.defineCommand({
     let def;
     if (isUrl) {
       const result = await ofetch.ofetch(args.schema);
-      if (!arriCodegenUtils.isAppDefinition(result)) {
+      if (!codegenUtils.isAppDefinition(result)) {
         throw new Error(`Invalid App Definition at ${args.schema}`);
       }
       def = result;
@@ -398,7 +245,7 @@ const codegen = citty.defineCommand({
         const schemaResult = await c12.loadConfig({
           configFile: args.schema
         });
-        if (!arriCodegenUtils.isAppDefinition(schemaResult.config)) {
+        if (!codegenUtils.isAppDefinition(schemaResult.config)) {
           throw new Error(`Invalid App Definition at ${args.schema}`);
         }
         def = schemaResult.config;
@@ -406,7 +253,7 @@ const codegen = citty.defineCommand({
         const jsonString = JSON.parse(
           fs__default$1.readFileSync(args.schema, { encoding: "utf-8" })
         );
-        if (!arriCodegenUtils.isAppDefinition(jsonString)) {
+        if (!codegenUtils.isAppDefinition(jsonString)) {
           throw new Error(`Invalid App Definition at ${args.schema}`);
         }
         def = jsonString;
@@ -421,23 +268,23 @@ const codegen = citty.defineCommand({
       );
     }
     const configPath = path__default.resolve(args.config);
-    const { config: config$1 } = await c12.loadConfig({ configFile: configPath });
-    if (!config.isArriConfig(config$1)) {
+    const { config } = await c12.loadConfig({ configFile: configPath });
+    if (!dev.isArriConfig(config)) {
       throw new Error(`Invalid arri config at ${args.config}`);
     }
-    if (!config$1.generators?.length) {
-      logger.warn(`No generators specified in ${args.config}`);
+    if (!config.generators?.length) {
+      dev.logger.warn(`No generators specified in ${args.config}`);
       process.exit(1);
     }
-    logger.info(`Generating ${config$1.generators?.length} client(s)`);
+    dev.logger.info(`Generating ${config.generators?.length} client(s)`);
     await Promise.allSettled(
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      config$1.generators.map(
+      config.generators.map(
         (gen) => gen.generator(
           def ?? {
             arriSchemaVersion: "0.0.4",
             procedures: {},
-            models: {}
+            definitions: {}
           }
         )
       )
@@ -446,195 +293,6 @@ const codegen = citty.defineCommand({
   }
 });
 
-const dev = citty.defineCommand({
-  meta: {
-    name: "dev",
-    description: "Start the arri dev server"
-  },
-  args: {
-    config: {
-      type: "string",
-      description: "Path to the arri config file",
-      alias: "c",
-      default: "./arri.config.ts"
-    }
-  },
-  async run({ args }) {
-    process.env.ARRI_DEV_MODE = "true";
-    const { config: config$1 } = await c12.loadConfig({
-      configFile: path__default.resolve(args.config)
-    });
-    if (!config.isResolvedArriConfig(config$1)) {
-      throw new Error("Unable to find config");
-    }
-    const appEntry = path__default.resolve(
-      config$1.rootDir,
-      config$1.srcDir,
-      config$1.entry
-    );
-    if (!fs.existsSync(appEntry)) {
-      throw new Error(`Unable to find entry at ${appEntry}`);
-    }
-    await startDevServer(config$1);
-  }
-});
-const startListener = (config, showQr = false) => listhen.listenAndWatch(path__default.resolve(config.rootDir, ".output", OUT_SERVER_ENTRY), {
-  public: true,
-  port: config.port,
-  logger,
-  qr: showQr,
-  https: config.https,
-  http2: config.http2,
-  ws: true
-});
-async function bundleFilesContext(config) {
-  const serverContent = `import app from './${OUT_APP_FILE}';
-
-export default app.h3App;`;
-  await fs__default.writeFile(
-    path__default.resolve(config.rootDir, ".output", OUT_SERVER_ENTRY),
-    serverContent
-  );
-  return await esbuild__namespace.context({
-    ...config.esbuild,
-    entryPoints: [
-      path__default.resolve(config.rootDir, config.buildDir, GEN_APP_FILE)
-    ],
-    outfile: path__default.resolve(config.rootDir, ".output", OUT_APP_FILE),
-    format: "esm",
-    bundle: true,
-    packages: "external",
-    sourcemap: config.esbuild.sourcemap ?? true,
-    target: config.esbuild.target ?? "node20",
-    platform: config.esbuild.platform ?? "node"
-  });
-}
-async function startDevServer(config) {
-  await setupWorkingDir(config);
-  const watcher = await import('chokidar');
-  let fileWatcher;
-  await Promise.all([
-    createEntryModule(config),
-    createAppWithRoutesModule(config)
-  ]);
-  const context = await bundleFilesContext(config);
-  await context.rebuild();
-  const listener = await startListener(config, true);
-  setTimeout(async () => {
-    await generateClients(config);
-  }, 1e3);
-  const cleanExit = async () => {
-    process.exit();
-  };
-  process.on("exit", async () => {
-    await Promise.allSettled([
-      listener.close(),
-      fileWatcher?.close(),
-      context.dispose()
-    ]);
-  });
-  process.on("SIGINT", cleanExit);
-  process.on("SIGTERM", cleanExit);
-  async function load(isRestart, reason) {
-    if (fileWatcher) {
-      await fileWatcher.close();
-    }
-    const srcDir = path__default.resolve(config.rootDir ?? "", config.srcDir);
-    const dirsToWatch = [srcDir];
-    if (config.esbuild.alias) {
-      for (const key of Object.keys(config.esbuild.alias)) {
-        const alias = config.esbuild.alias[key];
-        if (alias) {
-          if (!isInsideDir(alias, srcDir)) {
-            dirsToWatch.push(alias);
-          }
-        }
-      }
-    }
-    if (config.devServer.additionalWatchDirs?.length) {
-      for (const dir of config.devServer.additionalWatchDirs) {
-        dirsToWatch.push(dir);
-      }
-    }
-    const buildDir = path__default.resolve(config.rootDir, config.buildDir);
-    const outDir = path__default.resolve(config.rootDir, ".output");
-    fileWatcher = watcher.watch(dirsToWatch, {
-      ignoreInitial: true,
-      ignored: [
-        buildDir,
-        outDir,
-        "**/.output",
-        "**/dist/**",
-        "**/node_modules/**",
-        "**/.git/**"
-      ]
-    });
-    fileWatcher.on("all", async (eventName, path2) => {
-      if (eventName === "addDir" || eventName === "add") {
-        return;
-      }
-      await createAppWithRoutesModule(config);
-      let bundleCreated = false;
-      try {
-        logger.log(
-          "Change detected. Bundling files and restarting server...."
-        );
-        await context.rebuild();
-        bundleCreated = true;
-      } catch (err) {
-        logger.error("ERROR", err);
-        bundleCreated = false;
-      }
-      if (bundleCreated && config.generators.length) {
-        setTimeout(async () => {
-          await generateClients(config);
-          bundleCreated = false;
-        }, 1e3);
-      }
-    });
-  }
-  await load();
-}
-async function generateClients(config$1) {
-  try {
-    const protocol = config$1.https === true || typeof config$1.https === "object" ? "https" : "http";
-    if (protocol === "https") {
-      process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0";
-    }
-    const result = await ofetch.ofetch(
-      `${protocol}://127.0.0.1:${config$1.port}${config.DEV_DEFINITION_ENDPOINT}`
-    );
-    if (!arriCodegenUtils.isAppDefinition(result)) {
-      return;
-    }
-    logger.log(`Generating client code...`);
-    const clientCount = config$1.generators.length;
-    await Promise.allSettled(
-      config$1.generators.map(
-        (generator) => generator.generator(result, true)
-      )
-    );
-    logger.success(
-      `Generated ${clientCount} client${clientCount === 1 ? "" : "s"}`
-    );
-  } catch (err) {
-    logger.error(err);
-  }
-}
-async function createEntryModule(config) {
-  const appModule = path__default.resolve(config.rootDir, config.srcDir, config.entry);
-  const appImportParts = path__default.relative(path__default.resolve(config.rootDir, config.srcDir), appModule).split(".");
-  appImportParts.pop();
-  const virtualEntry = `import { toNodeListener } from 'h3';
-import app from './${GEN_APP_FILE}';
-
-export default app.h3App;`;
-  await fs__default.writeFile(
-    path__default.resolve(config.rootDir, config.buildDir, GEN_SERVER_ENTRY_FILE),
-    virtualEntry
-  );
-}
-
 const init = citty.defineCommand({
   meta: {
     name: "Init",
@@ -695,7 +353,7 @@ const init = citty.defineCommand({
     }
     const dirFiles = fs__default$1.readdirSync(dir);
     if (dirFiles.length && !context.args.force) {
-      logger.error(
+      dev.logger.error(
         `"${context.args.dir}" is a non-empty directory. To continue with this operation rerun "arri init" with the --force flag.`
       );
       process.exit(1);
@@ -708,7 +366,7 @@ const init = citty.defineCommand({
         await initPlugin(context.args.dir, context.args.force);
         break;
       default:
-        logger.error(`Unknown app type: '${type}'"`);
+        dev.logger.error(`Unknown app type: '${type}'"`);
         break;
     }
     process.exit(0);
@@ -742,8 +400,8 @@ async function initApp(dir, force) {
       trailingComma: "all"
     })
   );
-  logger.success(`Project initialized in ${dir}!`);
-  logger.info(`To get started:
+  dev.logger.success(`Project initialized in ${dir}!`);
+  dev.logger.info(`To get started:
 - cd ${dir}
 - pnpm install
 - pnpm run dev`);
@@ -760,8 +418,8 @@ async function initPlugin(dir, force) {
   });
   packageJson = packageJson.replace(`"arri-generator-name"`, `"${name}"`);
   fs.writeFileSync(path__default.resolve(dir, "package.json"), packageJson);
-  logger.success(`Project initialized in ${dir}!`);
-  logger.info(`To get started:
+  dev.logger.success(`Project initialized in ${dir}!`);
+  dev.logger.info(`To get started:
 - cd ${dir}
 - pnpm install`);
 }
@@ -769,7 +427,7 @@ async function initPlugin(dir, force) {
 const main = citty.defineCommand({
   subCommands: {
     build,
-    dev,
+    dev: dev.dev,
     codegen,
     init
   }