arri 0.58.1 → 0.59.0

package/dist/cli.mjs

@@ -1,25 +1,19 @@
 #! /usr/bin/env node
-import { defineCommand, runMain } from 'citty';
-import { execSync } from 'node:child_process';
-import fs$1, { existsSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
-import fs from 'node:fs/promises';
-import { isAppDefinition, kebabCase } from '@arrirpc/codegen-utils';
+import { defineCommand, runCommand, runMain } from 'citty';
 import { loadConfig } from 'c12';
-import { build as build$1 } from 'esbuild';
-import { replace } from 'esbuild-plugin-replace';
-import path from 'pathe';
-import prettier from 'prettier';
-import { d as defaultConfig, l as logger, s as setupWorkingDir, c as createAppWithRoutesModule, O as OUT_CODEGEN, e as OUT_SERVER_ENTRY, G as GEN_APP_FILE, f as OUT_APP_FILE, i as isArriConfig, g as getArriPackageMetadata, h as dev } from './shared/arri.c8a11d3d.mjs';
+import { a as isArriConfig, l as logger, g as getArriPackageMetadata, e as dev } from './shared/arri.f4637ba5.mjs';
+import fs, { rmSync, readFileSync, writeFileSync } from 'node:fs';
+import { isAppDefinition, kebabCase } from '@arrirpc/codegen-utils';
 import { ofetch } from '@joshmossas/ofetch';
 import { watch } from 'chokidar';
+import path from 'pathe';
 import Degit from 'degit';
 import enquirer from 'enquirer';
+import prettier from 'prettier';
 import { a } from '@arrirpc/schema';
 import consola from 'consola';
 import { readFile, writeFile } from 'fs/promises';
 import { fileURLToPath } from 'node:url';
-import '@joshmossas/listhen';
-import 'h3';
 
 const build = defineCommand({
   meta: {
@@ -37,181 +31,35 @@ const build = defineCommand({
       default: false
     }
   },
-  async run({ args }) {
+  async run({ args, rawArgs }) {
     const { config } = await loadConfig({
-      configFile: args.config,
-      defaultConfig
+      configFile: args.config
     });
     if (!config) {
       throw new Error("Unable to find arri config");
     }
-    const appEntry = path.resolve(
-      config.rootDir,
-      config.srcDir,
-      config.entry
-    );
-    if (!existsSync(appEntry)) {
-      throw new Error(`Unable to find entry at ${appEntry}`);
+    if (!isArriConfig(config)) {
+      throw new Error(`Invalid arri config at ${args.config}`);
     }
-    await startBuild(config, args.skipCodegen);
-  }
-});
-async function startBuild(config, skipCodeGen = false) {
-  logger.log("Bundling server....");
-  const appEntry = path.resolve(config.rootDir, config.srcDir, config.entry);
-  if (!existsSync(path.resolve(config.rootDir, config.srcDir, config.entry))) {
-    logger.error(`Unabled to find entry at ${appEntry}`);
-    process.exit(1);
-  }
-  await setupWorkingDir(config);
-  await Promise.all([
-    createAppWithRoutesModule(config),
-    createServerEntryFile(config),
-    createCodegenEntryFile(config)
-  ]);
-  await bundleAppEntry(config);
-  logger.log("Finished bundling");
-  const clientCount = config.generators.length;
-  const codegenModule = path.resolve(config.rootDir, ".output", OUT_CODEGEN);
-  if (!skipCodeGen) {
-    logger.log("Generating Arri app definition (__definition.json)");
-    execSync(`node ${codegenModule}`, { env: process.env });
-    const defJson = path.resolve(
-      config.rootDir,
-      ".output",
-      "__definition.json"
-    );
-    const def = JSON.parse(readFileSync(defJson, { encoding: "utf-8" }));
-    if (isAppDefinition(def) && clientCount > 0) {
-      const startTime = (/* @__PURE__ */ new Date()).getTime();
-      logger.log(`Generating ${clientCount} client(s)...`);
-      await Promise.all(
-        config.generators.map((plugin) => plugin.generator(def))
-      );
-      logger.log(
-        `${clientCount} client(s) generated in ${( new Date()).getTime() - startTime}ms`
-      );
-    } else {
-      logger.warn(
-        "No client generators specified. Skipping client codegen."
+    if (!config.server) {
+      throw new Error(
+        "No server specified in config file. Cannot run build."
       );
     }
-  } else {
-    logger.log("Skipping codegen");
-  }
-  logger.log("Cleaning up files");
-  await fs.rm(codegenModule);
-  logger.success(
-    `Build finished! You can start your server by running "node .output/${OUT_SERVER_ENTRY}"`
-  );
-}
-async function bundleAppEntry(config, _allowCodegen = true) {
-  const appEntry = path.resolve(
-    config.rootDir,
-    config.buildDir,
-    GEN_APP_FILE
-  );
-  await build$1({
-    ...config.esbuild,
-    entryPoints: [appEntry],
-    platform: config.esbuild.platform ?? "node",
-    target: config.esbuild.target ?? "node20",
-    bundle: true,
-    packages: "external",
-    format: "esm",
-    sourcemap: config.esbuild.sourcemap ?? true,
-    minify: config.esbuild.minify ?? true,
-    banner: {
-      js: `import { createRequire as topLevelCreateRequire } from 'module';
-const require = topLevelCreateRequire(import.meta.url);`
-    },
-    allowOverwrite: true,
-    outfile: path.resolve(config.rootDir, ".output", OUT_APP_FILE)
-  });
-}
-async function createServerEntryFile(config) {
-  if (config.serverEntry) {
-    const buildEntry = path.resolve(
-      config.rootDir,
-      config.srcDir,
-      config.serverEntry
-    );
-    await build$1({
-      ...config.esbuild,
-      entryPoints: [buildEntry],
-      platform: config.esbuild.platform ?? "node",
-      target: config.esbuild.target ?? "node20",
-      bundle: false,
-      packages: "external",
-      format: "esm",
-      sourcemap: true,
-      minifyWhitespace: true,
-      banner: {
-        js: `import { createRequire as topLevelCreateRequire } from 'module';
-const require = topLevelCreateRequire(import.meta.url);`
-      },
-      plugins: [replace({ "virtual:arri/app": "./app.mjs" })],
-      allowOverwrite: true,
-      outfile: path.resolve(config.rootDir, ".output", OUT_SERVER_ENTRY)
+    const subArgs = config.server.buildArgs ?? {};
+    subArgs.skipCodegen = {
+      type: "boolean",
+      default: false
+    };
+    const subCommand = defineCommand({
+      args: subArgs,
+      async run({ args: args2 }) {
+        await config.server?.buildFn(args2, config.generators);
+      }
     });
-    return;
+    await runCommand(subCommand, { rawArgs });
   }
-  const appModule = path.resolve(config.rootDir, config.srcDir, config.entry);
-  const appImportParts = path.relative(path.resolve(config.rootDir, config.srcDir), appModule).split(".");
-  appImportParts.pop();
-  let httpsString = ``;
-  if (config.https === true) {
-    httpsString = `https: true,`;
-  } else if (typeof config.https === "object") {
-    httpsString = `https: { cert: '${config.https.cert}', key: '${config.https.key}', passphrase: ${config.https.passphrase ? `'${config.https.passphrase}'` : "undefined"}},`;
-  }
-  const virtualEntry = `import { toNodeListener } from '@arrirpc/server';
-import { listen } from '@joshmossas/listhen';
-import app from './${OUT_APP_FILE}';
-
-void listen(toNodeListener(app.h3App), {
-    port: process.env.PORT ?? ${config.port},
-    public: true,
-    ws: {
-        resolve(info) {
-            if (app.h3App.websocket?.resolve) {
-                return app.h3App.websocket.resolve(info);
-            }
-            return app.h3App.websocket?.hooks ?? app.h3App.handler?.__websocket__ ?? {};
-        }
-    },
-    http2: ${config.http2 ?? false},
-    ${httpsString}
-});`;
-  await fs.writeFile(
-    path.resolve(config.rootDir, ".output", OUT_SERVER_ENTRY),
-    virtualEntry
-  );
-}
-async function createCodegenEntryFile(config) {
-  const appModule = path.resolve(config.rootDir, config.srcDir, config.entry);
-  const appImportParts = path.relative(path.resolve(config.rootDir, config.srcDir), appModule).split(".");
-  appImportParts.pop();
-  const virtualModule = await prettier.format(
-    `
-    import { writeFileSync } from 'node:fs';
-    import path from 'pathe';
-    import app from './${OUT_APP_FILE}';
-
-    const __dirname = new URL(".", import.meta.url).pathname;
-    const def = app.getAppDefinition();
-    writeFileSync(
-        path.resolve(__dirname, "../.output", "__definition.json"),
-        JSON.stringify(def),
-    );
-    process.exit(0);`,
-    { tabWidth: 4, parser: "typescript" }
-  );
-  await fs.writeFile(
-    path.resolve(config.rootDir, ".output", OUT_CODEGEN),
-    virtualModule
-  );
-}
+});
 
 const codegen = defineCommand({
   meta: {
@@ -236,7 +84,7 @@ const codegen = defineCommand({
     }
   },
   async run({ args }) {
-    if (!fs$1.existsSync(path.resolve(args.config))) {
+    if (!fs.existsSync(path.resolve(args.config))) {
       logger.error(
         `Unable to load arri config at ${args.config}. Please specify a valid config path with --config`
       );
@@ -320,7 +168,7 @@ const codegen = defineCommand({
   }
 });
 async function getAppDefinitionFromFile(file) {
-  if (!fs$1.existsSync(file)) {
+  if (!fs.existsSync(file)) {
     throw new Error(`Unable to find ${file}`);
   }
   const isTs = file.endsWith(".ts");
@@ -335,7 +183,7 @@ async function getAppDefinitionFromFile(file) {
     return schemaResult.config;
   } else {
     const parsingResult = JSON.parse(
-      fs$1.readFileSync(file, { encoding: "utf-8" })
+      fs.readFileSync(file, { encoding: "utf-8" })
     );
     if (!isAppDefinition(parsingResult)) {
       throw new Error(`Invalid App Definition at ${file}`);
@@ -413,10 +261,10 @@ const init = defineCommand({
       }
     }
     const dir = path.resolve(context.args.dir);
-    if (!fs$1.existsSync(dir)) {
-      fs$1.mkdirSync(dir);
+    if (!fs.existsSync(dir)) {
+      fs.mkdirSync(dir);
     }
-    const dirFiles = fs$1.readdirSync(dir);
+    const dirFiles = fs.readdirSync(dir);
     if (dirFiles.length && !context.args.force) {
       logger.error(
         `"${context.args.dir}" is a non-empty directory. To continue with this operation rerun "arri init" with the --force flag.`