arri 0.58.0 → 0.59.0

package/README.md

@@ -74,9 +74,11 @@ For full details visit the [server docs](https://github.com/modiimedia/arri/blob
 import { defineConfig } from "arri";
 
 export default defineConfig({
-    srcDir: "src",
-    entry: "app.ts",
-    port: 3000,
+    server: servers.tsServer({
+        srcDir: "src",
+        entry: "app.ts",
+        port: 3000,
+    }),
     generators: [
         // client generators go here (can be imported from arri)
     ],

package/dist/cli.cjs

@@ -2,36 +2,29 @@
 'use strict';
 
 const citty = require('citty');
-const node_child_process = require('node:child_process');
+const c12 = require('c12');
+const common = require('./shared/arri.7f2f73b2.cjs');
 const fs = require('node:fs');
-const fs$1 = require('node:fs/promises');
 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 dev = require('./shared/arri.09919c6d.cjs');
+const ofetch = require('@joshmossas/ofetch');
 const chokidar = require('chokidar');
-const ofetch = require('ofetch');
+const path = require('pathe');
 const Degit = require('degit');
 const enquirer = require('enquirer');
+const prettier = require('prettier');
 const schema = require('@arrirpc/schema');
 const consola = require('consola');
 const promises = require('fs/promises');
 const node_url = require('node:url');
-require('@joshmossas/listhen');
-require('h3');
 
 var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
 
-const fs__default$1 = /*#__PURE__*/_interopDefaultCompat(fs);
-const fs__default = /*#__PURE__*/_interopDefaultCompat(fs$1);
+const fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
 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 prettier__default = /*#__PURE__*/_interopDefaultCompat(prettier);
 const consola__default = /*#__PURE__*/_interopDefaultCompat(consola);
 
 const build = citty.defineCommand({
@@ -50,181 +43,35 @@ const build = citty.defineCommand({
       default: false
     }
   },
-  async run({ args }) {
+  async run({ args, rawArgs }) {
     const { config } = await c12.loadConfig({
-      configFile: args.config,
-      defaultConfig: dev.defaultConfig
+      configFile: args.config
     });
     if (!config) {
       throw new Error("Unable to find arri config");
     }
-    const appEntry = path__default.resolve(
-      config.rootDir,
-      config.srcDir,
-      config.entry
-    );
-    if (!fs.existsSync(appEntry)) {
-      throw new Error(`Unable to find entry at ${appEntry}`);
+    if (!common.isArriConfig(config)) {
+      throw new Error(`Invalid arri config at ${args.config}`);
     }
-    await startBuild(config, args.skipCodegen);
-  }
-});
-async function startBuild(config, skipCodeGen = false) {
-  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))) {
-    dev.logger.error(`Unabled to find entry at ${appEntry}`);
-    process.exit(1);
-  }
-  await dev.setupWorkingDir(config);
-  await Promise.all([
-    dev.createAppWithRoutesModule(config),
-    createServerEntryFile(config),
-    createCodegenEntryFile(config)
-  ]);
-  await bundleAppEntry(config);
-  dev.logger.log("Finished bundling");
-  const clientCount = config.generators.length;
-  const codegenModule = path__default.resolve(config.rootDir, ".output", dev.OUT_CODEGEN);
-  if (!skipCodeGen) {
-    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,
-      ".output",
-      "__definition.json"
-    );
-    const def = JSON.parse(fs.readFileSync(defJson, { encoding: "utf-8" }));
-    if (codegenUtils.isAppDefinition(def) && clientCount > 0) {
-      const startTime = (/* @__PURE__ */ new Date()).getTime();
-      dev.logger.log(`Generating ${clientCount} client(s)...`);
-      await Promise.all(
-        config.generators.map((plugin) => plugin.generator(def))
-      );
-      dev.logger.log(
-        `${clientCount} client(s) generated in ${( new Date()).getTime() - startTime}ms`
-      );
-    } else {
-      dev.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 {
-    dev.logger.log("Skipping codegen");
-  }
-  dev.logger.log("Cleaning up files");
-  await fs__default.rm(codegenModule);
-  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,
-    dev.GEN_APP_FILE
-  );
-  await esbuild.build({
-    ...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__default.resolve(config.rootDir, ".output", dev.OUT_APP_FILE)
-  });
-}
-async function createServerEntryFile(config) {
-  if (config.serverEntry) {
-    const buildEntry = path__default.resolve(
-      config.rootDir,
-      config.srcDir,
-      config.serverEntry
-    );
-    await esbuild.build({
-      ...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: [esbuildPluginReplace.replace({ "virtual:arri/app": "./app.mjs" })],
-      allowOverwrite: true,
-      outfile: path__default.resolve(config.rootDir, ".output", dev.OUT_SERVER_ENTRY)
+    const subArgs = config.server.buildArgs ?? {};
+    subArgs.skipCodegen = {
+      type: "boolean",
+      default: false
+    };
+    const subCommand = citty.defineCommand({
+      args: subArgs,
+      async run({ args: args2 }) {
+        await config.server?.buildFn(args2, config.generators);
+      }
     });
-    return;
+    await citty.runCommand(subCommand, { rawArgs });
   }
-  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();
-  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 './${dev.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__default.writeFile(
-    path__default.resolve(config.rootDir, ".output", dev.OUT_SERVER_ENTRY),
-    virtualEntry
-  );
-}
-async function createCodegenEntryFile(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 virtualModule = await prettier__default.format(
-    `
-    import { writeFileSync } from 'node:fs';
-    import path from 'pathe';
-    import app from './${dev.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__default.writeFile(
-    path__default.resolve(config.rootDir, ".output", dev.OUT_CODEGEN),
-    virtualModule
-  );
-}
+});
 
 const codegen = citty.defineCommand({
   meta: {
@@ -249,8 +96,8 @@ const codegen = citty.defineCommand({
     }
   },
   async run({ args }) {
-    if (!fs__default$1.existsSync(path__default.resolve(args.config))) {
-      dev.logger.error(
+    if (!fs__default.existsSync(path__default.resolve(args.config))) {
+      common.logger.error(
         `Unable to load arri config at ${args.config}. Please specify a valid config path with --config`
       );
       process.exit(1);
@@ -258,12 +105,12 @@ const codegen = citty.defineCommand({
     const { config } = await c12.loadConfig({
       configFile: path__default.resolve(args.config)
     });
-    if (!dev.isArriConfig(config)) {
-      dev.logger.error(`Invalid arri config at ${args.config}`);
+    if (!common.isArriConfig(config)) {
+      common.logger.error(`Invalid arri config at ${args.config}`);
       process.exit(1);
     }
     if (!config.generators?.length) {
-      dev.logger.error(`No generators specified in ${args.config}`);
+      common.logger.error(`No generators specified in ${args.config}`);
       process.exit(1);
     }
     const isUrl = args.schema.startsWith("http://") || args.schema.startsWith("https://");
@@ -283,7 +130,7 @@ const codegen = citty.defineCommand({
         if (!args.watch) {
           throw err;
         }
-        dev.logger.error(err);
+        common.logger.error(err);
       }
     }
     if (!def && !args.watch) {
@@ -292,48 +139,48 @@ const codegen = citty.defineCommand({
     if (def) {
       const initialStartTime = /* @__PURE__ */ new Date();
       await runGenerators(def, config.generators ?? []);
-      dev.logger.success(
+      common.logger.success(
         `Generators completed in ${( new Date()).getTime() - initialStartTime.getTime()}ms`
       );
     }
     if (!args.watch)
       process.exit(0);
     const watcher = chokidar.watch(args.schema, { ignoreInitial: true });
-    dev.logger.info(`Watching ${args.schema} for changes...`);
+    common.logger.info(`Watching ${args.schema} for changes...`);
     watcher.on("add", async (_, __) => {
       try {
-        dev.logger.info(`Change detected`);
+        common.logger.info(`Change detected`);
         const startTime = /* @__PURE__ */ new Date();
         await runGenerators(
           await getAppDefinitionFromFile(args.schema),
           config.generators ?? []
         );
-        dev.logger.success(
+        common.logger.success(
           `Generators completed in ${( new Date()).getTime() - startTime.getTime()}ms`
         );
       } catch (err) {
-        dev.logger.error(err);
+        common.logger.error(err);
       }
     });
     watcher.on("change", async (_, __) => {
       try {
-        dev.logger.info(`Change detected in AppDefinition file.`);
+        common.logger.info(`Change detected in AppDefinition file.`);
         const startTime = /* @__PURE__ */ new Date();
         await runGenerators(
           await getAppDefinitionFromFile(args.schema),
           config.generators ?? []
         );
-        dev.logger.success(
+        common.logger.success(
           `Generators completed in ${( new Date()).getTime() - startTime.getTime()}ms`
         );
       } catch (err) {
-        dev.logger.error(err);
+        common.logger.error(err);
       }
     });
   }
 });
 async function getAppDefinitionFromFile(file) {
-  if (!fs__default$1.existsSync(file)) {
+  if (!fs__default.existsSync(file)) {
     throw new Error(`Unable to find ${file}`);
   }
   const isTs = file.endsWith(".ts");
@@ -348,7 +195,7 @@ async function getAppDefinitionFromFile(file) {
     return schemaResult.config;
   } else {
     const parsingResult = JSON.parse(
-      fs__default$1.readFileSync(file, { encoding: "utf-8" })
+      fs__default.readFileSync(file, { encoding: "utf-8" })
     );
     if (!codegenUtils.isAppDefinition(parsingResult)) {
       throw new Error(`Invalid App Definition at ${file}`);
@@ -357,7 +204,7 @@ async function getAppDefinitionFromFile(file) {
   }
 }
 async function runGenerators(def, generators) {
-  dev.logger.info(`Generating ${generators?.length} client(s)`);
+  common.logger.info(`Generating ${generators?.length} client(s)`);
   await Promise.allSettled(
     generators.map(
       (gen) => gen.generator(
@@ -426,12 +273,12 @@ const init = citty.defineCommand({
       }
     }
     const dir = path__default.resolve(context.args.dir);
-    if (!fs__default$1.existsSync(dir)) {
-      fs__default$1.mkdirSync(dir);
+    if (!fs__default.existsSync(dir)) {
+      fs__default.mkdirSync(dir);
     }
-    const dirFiles = fs__default$1.readdirSync(dir);
+    const dirFiles = fs__default.readdirSync(dir);
     if (dirFiles.length && !context.args.force) {
-      dev.logger.error(
+      common.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);
@@ -444,7 +291,7 @@ const init = citty.defineCommand({
         await initPlugin(context.args.dir, context.args.force);
         break;
       default:
-        dev.logger.error(`Unknown app type: '${type}'"`);
+        common.logger.error(`Unknown app type: '${type}'"`);
         break;
     }
     process.exit(0);
@@ -460,7 +307,7 @@ async function initApp(dir, force) {
     }
   ]);
   if (eslint) {
-    dev.logger.warn(
+    common.logger.warn(
       `The Arri eslint starter uses the Eslint flat config syntax. If you are using VSCode you will need to enable "eslint.experimental.useFlatConfig" in your workspace settings. Please follow https://github.com/microsoft/vscode-eslint/issues/1644 for details.`
     );
   }
@@ -493,8 +340,8 @@ async function initApp(dir, force) {
       trailingComma: "all"
     })
   );
-  dev.logger.success(`Project initialized in ${dir}!`);
-  dev.logger.info(`To get started:
+  common.logger.success(`Project initialized in ${dir}!`);
+  common.logger.info(`To get started:
 - cd ${dir}
 - pnpm install
 - pnpm run dev`);
@@ -522,8 +369,8 @@ async function initPlugin(dir, force) {
       trailingComma: "all"
     })
   );
-  dev.logger.success(`Project initialized in ${dir}!`);
-  dev.logger.info(`To get started:
+  common.logger.success(`Project initialized in ${dir}!`);
+  common.logger.info(`To get started:
 - cd ${dir}
 - pnpm install`);
 }
@@ -541,12 +388,12 @@ const list = citty.defineCommand({
     }
   },
   async run({ args }) {
-    const arriInfo = await dev.getArriPackageMetadata();
+    const arriInfo = await common.getArriPackageMetadata();
     if (args.tags) {
       const output2 = Object.keys(arriInfo["dist-tags"]).map(
         (tag) => `- ${tag} (${arriInfo["dist-tags"][tag]})`
       );
-      dev.logger.log(output2.join("\n"));
+      common.logger.log(output2.join("\n"));
       return;
     }
     const tagMap = {};
@@ -561,7 +408,7 @@ const list = citty.defineCommand({
       }
       return `- ${version}`;
     });
-    dev.logger.log(output.join("\n"));
+    common.logger.log(output.join("\n"));
   }
 });
 
@@ -578,7 +425,7 @@ const use = citty.defineCommand({
     }
   },
   async run({ args }) {
-    const arriInfo = await dev.getArriPackageMetadata();
+    const arriInfo = await common.getArriPackageMetadata();
     const version = arriInfo["dist-tags"][args.version] ?? args.version;
     if (!arriInfo.versions[version]) {
       throw new Error(
@@ -886,7 +733,7 @@ const main = citty.defineCommand({
   subCommands: {
     build,
     codegen,
-    dev: dev.dev,
+    dev: common.dev,
     init,
     list,
     use,