arri 0.31.0 → 0.32.1

package/dist/cli.cjs

@@ -7,18 +7,19 @@ const fs = require('node:fs');
 const fs$1 = require('node:fs/promises');
 const arriCodegenUtils = require('arri-codegen-utils');
 const c12 = require('c12');
-const consola = require('consola');
 const esbuild = require('esbuild');
 const esbuildPluginReplace = require('esbuild-plugin-replace');
 const path = require('pathe');
 const prettier = require('prettier');
-const config = require('./shared/arri.7b317e03.cjs');
+const config = require('./shared/arri.7b5179bf.cjs');
+const consola = require('consola');
 const globby = require('globby');
 const scule = require('scule');
 const ofetch = require('ofetch');
 const listhen = require('@joshmossas/listhen');
 const chokidar = require('chokidar');
 const Degit = require('degit');
+const enquirer = require('enquirer');
 require('h3');
 require('arri-validate');
 require('h3-sse');
@@ -39,13 +40,14 @@ function _interopNamespaceCompat(e) {
 
 const fs__default$1 = /*#__PURE__*/_interopDefaultCompat(fs);
 const fs__default = /*#__PURE__*/_interopDefaultCompat(fs$1);
-const consola__default = /*#__PURE__*/_interopDefaultCompat(consola);
 const esbuild__namespace = /*#__PURE__*/_interopNamespaceCompat(esbuild);
 const path__default = /*#__PURE__*/_interopDefaultCompat(path);
 const prettier__default = /*#__PURE__*/_interopDefaultCompat(prettier);
 const chokidar__default = /*#__PURE__*/_interopDefaultCompat(chokidar);
 const Degit__default = /*#__PURE__*/_interopDefaultCompat(Degit);
+const enquirer__default = /*#__PURE__*/_interopDefaultCompat(enquirer);
 
+const logger = consola.createConsola().withTag("arri");
 const GEN_APP_FILE = "__arri_app.js";
 const GEN_SERVER_ENTRY_FILE = "__arri_server.js";
 const OUT_APP_FILE = "app.mjs";
@@ -205,9 +207,13 @@ const build = citty.defineCommand({
     await startBuild(config$1, args.skipCodegen);
   }
 });
-const logger$2 = consola.createConsola().withTag("arri");
 async function startBuild(config, skipCodeGen = false) {
-  logger$2.log("Bundling server....");
+  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}`);
+    process.exit(1);
+  }
   await setupWorkingDir(config);
   await Promise.all([
     createAppWithRoutesModule(config),
@@ -216,11 +222,11 @@ async function startBuild(config, skipCodeGen = false) {
     transpileFiles(config)
   ]);
   await bundleAppEntry(config);
-  logger$2.log("Finished bundling");
-  const clientCount = config.clientGenerators.length;
+  logger.log("Finished bundling");
+  const clientCount = config.generators.length;
   const codegenModule = path__default.resolve(config.rootDir, ".output", OUT_CODEGEN);
   if (!skipCodeGen) {
-    logger$2.log("Generating Arri app definition (__definition.json)");
+    logger.log("Generating Arri app definition (__definition.json)");
     node_child_process.execSync(`node ${codegenModule}`, { env: process.env });
     const defJson = path__default.resolve(
       config.rootDir,
@@ -229,22 +235,22 @@ async function startBuild(config, skipCodeGen = false) {
     );
     const def = JSON.parse(fs.readFileSync(defJson, { encoding: "utf-8" }));
     if (arriCodegenUtils.isAppDefinition(def) && clientCount > 0) {
-      logger$2.log(`Generating ${clientCount} clients`);
+      logger.log(`Generating ${clientCount} clients`);
       await Promise.all(
-        config.clientGenerators.map((plugin) => plugin.generator(def))
+        config.generators.map((plugin) => plugin.generator(def))
       );
-      logger$2.log(`${clientCount} clients generated`);
+      logger.log(`${clientCount} clients generated`);
     } else {
-      logger$2.warn(
+      logger.warn(
         "No client generators specified. Skipping client codegen."
       );
     }
   } else {
-    logger$2.log("Skipping codegen");
+    logger.log("Skipping codegen");
   }
-  logger$2.log("Cleaning up files");
+  logger.log("Cleaning up files");
   await fs__default.rm(codegenModule);
-  logger$2.success(
+  logger.success(
     `Build finished! You can start your server by running "node .output/${OUT_SERVER_ENTRY}"`
   );
 }
@@ -403,13 +409,17 @@ const codegen = citty.defineCommand({
     }
     const configPath = path__default.resolve(args.config);
     const { config: config$1 } = await c12.loadConfig({ configFile: configPath });
-    if (!config.isResolvedArriConfig(config$1)) {
+    if (!config.isArriConfig(config$1)) {
       throw new Error(`Invalid arri config at ${args.config}`);
     }
-    consola__default.info(`Generating ${config$1.clientGenerators.length} clients`);
+    if (!config$1.generators?.length) {
+      logger.warn(`No generators specified in ${args.config}`);
+      process.exit(1);
+    }
+    logger.info(`Generating ${config$1.generators?.length} client(s)`);
     await Promise.allSettled(
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      config$1.clientGenerators.map(
+      config$1.generators.map(
         (gen) => gen.generator(
           def ?? {
             arriSchemaVersion: "0.0.4",
@@ -419,10 +429,10 @@ const codegen = citty.defineCommand({
         )
       )
     );
+    process.exit(0);
   }
 });
 
-const logger$1 = consola.createConsola().withTag("arri");
 const dev = citty.defineCommand({
   meta: {
     name: "dev",
@@ -444,13 +454,21 @@ const dev = citty.defineCommand({
     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: logger$1,
+  logger,
   qr: showQr,
   https: config.https,
   http2: config.http2
@@ -525,17 +543,17 @@ async function startDevServer(config) {
         await createAppWithRoutesModule(config);
         let bundleCreated = false;
         try {
-          logger$1.log(
+          logger.log(
             "Change detected. Bundling files and restarting server...."
           );
           await transpileFiles(config);
           await bundleFiles.rebuild();
           bundleCreated = true;
         } catch (err) {
-          logger$1.error("ERROR", err);
+          logger.error("ERROR", err);
           bundleCreated = false;
         }
-        if (bundleCreated && config.clientGenerators.length) {
+        if (bundleCreated && config.generators.length) {
           setTimeout(async () => {
             await generateClients(config);
             bundleCreated = false;
@@ -559,14 +577,14 @@ async function generateClients(config$1) {
     if (!arriCodegenUtils.isAppDefinition(result)) {
       return;
     }
-    logger$1.log(`Generating client code...`);
-    const clientCount = config$1.clientGenerators.length;
+    logger.log(`Generating client code...`);
+    const clientCount = config$1.generators.length;
     await Promise.all(
-      config$1.clientGenerators.map(
-        (generator) => generator.generator(result)
+      config$1.generators.map(
+        (generator) => generator.generator(result, true)
       )
     );
-    logger$1.success(
+    logger.success(
       `Generated ${clientCount} client${clientCount === 1 ? "" : "s"}`
     );
   } catch (err) {
@@ -587,7 +605,6 @@ export default app.h3App;`;
   );
 }
 
-const logger = consola.createConsola();
 const init = citty.defineCommand({
   meta: {
     name: "Init",
@@ -604,9 +621,44 @@ const init = citty.defineCommand({
       default: false,
       alias: "f",
       description: "Force created a project when if a directory already exists"
+    },
+    type: {
+      type: "string",
+      description: `"app" | "plugin"`
     }
   },
   async run(context) {
+    let type;
+    switch (context.args.type?.toLowerCase()) {
+      case "app":
+        type = "app";
+        break;
+      case "plugin":
+        type = "plugin";
+        break;
+    }
+    if (!type) {
+      const { projectType } = await enquirer__default.prompt([
+        {
+          type: "select",
+          name: "projectType",
+          message: "What kind of project do you want to initialize?",
+          choices: ["application", "generator plugin"]
+        }
+      ]);
+      switch (projectType) {
+        case "application":
+          type = "app";
+          break;
+        case "generator plugin":
+          type = "plugin";
+          break;
+        default:
+          throw new Error(
+            `Unknown project type "${projectType}"`
+          );
+      }
+    }
     const dir = path__default.resolve(context.args.dir);
     if (!fs__default$1.existsSync(dir)) {
       fs__default$1.mkdirSync(dir);
@@ -618,42 +670,71 @@ const init = citty.defineCommand({
       );
       process.exit(1);
     }
-    const degit = Degit__default("https://github.com/modiimedia/arri-starters", {
-      force: context.args.force
-    });
-    await degit.clone(dir);
-    fs.rmSync(path__default.resolve(dir, "pnpm-lock.yaml"));
-    const packageJson = JSON.parse(
-      fs.readFileSync(path__default.resolve(dir, "package.json"), {
-        encoding: "utf-8"
-      })
-    );
-    packageJson.name = scule.kebabCase(context.args.dir);
-    packageJson.description = "An RPC server created with Arri RPC";
-    packageJson.private = true;
-    delete packageJson.license;
-    delete packageJson.main;
-    delete packageJson.author;
-    delete packageJson.tags;
-    fs.writeFileSync(
-      path__default.resolve(dir, "package.json"),
-      await prettier__default.format(JSON.stringify(packageJson), {
-        parser: "json",
-        tabWidth: 4,
-        semi: true,
-        endOfLine: "lf",
-        trailingComma: "all"
-      })
-    );
-    consola__default.log(
-      `Project initialized in ${context.args.dir}. To get started:
-cd ${context.args.dir}
-npm install
-npm run dev`
-    );
+    switch (type) {
+      case "app":
+        await initApp(context.args.dir, context.args.force);
+        break;
+      case "plugin":
+        await initPlugin(context.args.dir, context.args.force);
+        break;
+      default:
+        logger.error(`Unknown app type: '${type}'"`);
+        break;
+    }
     process.exit(0);
   }
 });
+async function initApp(dir, force) {
+  const degit = Degit__default("modiimedia/arri-starters/app-starter-ts", {
+    force
+  });
+  await degit.clone(dir);
+  fs.rmSync(path__default.resolve(dir, "pnpm-lock.yaml"));
+  const packageJson = JSON.parse(
+    fs.readFileSync(path__default.resolve(dir, "package.json"), {
+      encoding: "utf-8"
+    })
+  );
+  packageJson.name = scule.kebabCase(dir);
+  packageJson.description = "An RPC server created with Arri RPC";
+  packageJson.private = true;
+  delete packageJson.license;
+  delete packageJson.main;
+  delete packageJson.author;
+  delete packageJson.tags;
+  fs.writeFileSync(
+    path__default.resolve(dir, "package.json"),
+    await prettier__default.format(JSON.stringify(packageJson), {
+      parser: "json",
+      tabWidth: 4,
+      semi: true,
+      endOfLine: "lf",
+      trailingComma: "all"
+    })
+  );
+  logger.success(`Project initialized in ${dir}!`);
+  logger.info(`To get started:
+- cd ${dir}
+- pnpm install
+- pnpm run dev`);
+}
+async function initPlugin(dir, force) {
+  const name = scule.kebabCase(dir);
+  const degit = Degit__default("modiimedia/arri-starters/generator-starter", {
+    force
+  });
+  await degit.clone(dir);
+  fs.rmSync(path__default.resolve(dir, "pnpm-lock.yaml"));
+  let packageJson = fs.readFileSync(path__default.resolve(dir, "package.json"), {
+    encoding: "utf8"
+  });
+  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:
+- cd ${dir}
+- pnpm install`);
+}
 
 const main = citty.defineCommand({
   subCommands: {

package/dist/cli.mjs

@@ -5,23 +5,25 @@ import fs$1, { existsSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
 import fs from 'node:fs/promises';
 import { removeDisallowedChars, isAppDefinition } from 'arri-codegen-utils';
 import { loadConfig } from 'c12';
-import consola, { createConsola } from 'consola';
 import * as esbuild from 'esbuild';
 import { build as build$1 } from 'esbuild';
 import { replace } from 'esbuild-plugin-replace';
 import path from 'pathe';
 import prettier from 'prettier';
-import { o as defaultConfig, n as isResolvedArriConfig, a as DEV_DEFINITION_ENDPOINT } from './shared/arri.e9a56e75.mjs';
+import { o as defaultConfig, m as isArriConfig, n as isResolvedArriConfig, a as DEV_DEFINITION_ENDPOINT } from './shared/arri.bbe2aa44.mjs';
+import { createConsola } from 'consola';
 import { globby } from 'globby';
 import { camelCase, kebabCase } from 'scule';
 import { ofetch } from 'ofetch';
 import { listenAndWatch } from '@joshmossas/listhen';
 import chokidar from 'chokidar';
 import Degit from 'degit';
+import enquirer from 'enquirer';
 import 'h3';
 import 'arri-validate';
 import 'h3-sse';
 
+const logger = createConsola().withTag("arri");
 const GEN_APP_FILE = "__arri_app.js";
 const GEN_SERVER_ENTRY_FILE = "__arri_server.js";
 const OUT_APP_FILE = "app.mjs";
@@ -181,9 +183,13 @@ const build = defineCommand({
     await startBuild(config, args.skipCodegen);
   }
 });
-const logger$2 = createConsola().withTag("arri");
 async function startBuild(config, skipCodeGen = false) {
-  logger$2.log("Bundling server....");
+  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),
@@ -192,11 +198,11 @@ async function startBuild(config, skipCodeGen = false) {
     transpileFiles(config)
   ]);
   await bundleAppEntry(config);
-  logger$2.log("Finished bundling");
-  const clientCount = config.clientGenerators.length;
+  logger.log("Finished bundling");
+  const clientCount = config.generators.length;
   const codegenModule = path.resolve(config.rootDir, ".output", OUT_CODEGEN);
   if (!skipCodeGen) {
-    logger$2.log("Generating Arri app definition (__definition.json)");
+    logger.log("Generating Arri app definition (__definition.json)");
     execSync(`node ${codegenModule}`, { env: process.env });
     const defJson = path.resolve(
       config.rootDir,
@@ -205,22 +211,22 @@ async function startBuild(config, skipCodeGen = false) {
     );
     const def = JSON.parse(readFileSync(defJson, { encoding: "utf-8" }));
     if (isAppDefinition(def) && clientCount > 0) {
-      logger$2.log(`Generating ${clientCount} clients`);
+      logger.log(`Generating ${clientCount} clients`);
       await Promise.all(
-        config.clientGenerators.map((plugin) => plugin.generator(def))
+        config.generators.map((plugin) => plugin.generator(def))
       );
-      logger$2.log(`${clientCount} clients generated`);
+      logger.log(`${clientCount} clients generated`);
     } else {
-      logger$2.warn(
+      logger.warn(
         "No client generators specified. Skipping client codegen."
       );
     }
   } else {
-    logger$2.log("Skipping codegen");
+    logger.log("Skipping codegen");
   }
-  logger$2.log("Cleaning up files");
+  logger.log("Cleaning up files");
   await fs.rm(codegenModule);
-  logger$2.success(
+  logger.success(
     `Build finished! You can start your server by running "node .output/${OUT_SERVER_ENTRY}"`
   );
 }
@@ -379,13 +385,17 @@ const codegen = defineCommand({
     }
     const configPath = path.resolve(args.config);
     const { config } = await loadConfig({ configFile: configPath });
-    if (!isResolvedArriConfig(config)) {
+    if (!isArriConfig(config)) {
       throw new Error(`Invalid arri config at ${args.config}`);
     }
-    consola.info(`Generating ${config.clientGenerators.length} clients`);
+    if (!config.generators?.length) {
+      logger.warn(`No generators specified in ${args.config}`);
+      process.exit(1);
+    }
+    logger.info(`Generating ${config.generators?.length} client(s)`);
     await Promise.allSettled(
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      config.clientGenerators.map(
+      config.generators.map(
         (gen) => gen.generator(
           def ?? {
             arriSchemaVersion: "0.0.4",
@@ -395,10 +405,10 @@ const codegen = defineCommand({
         )
       )
     );
+    process.exit(0);
   }
 });
 
-const logger$1 = createConsola().withTag("arri");
 const dev = defineCommand({
   meta: {
     name: "dev",
@@ -420,13 +430,21 @@ const dev = defineCommand({
     if (!isResolvedArriConfig(config)) {
       throw new Error("Unable to find config");
     }
+    const appEntry = path.resolve(
+      config.rootDir,
+      config.srcDir,
+      config.entry
+    );
+    if (!existsSync(appEntry)) {
+      throw new Error(`Unable to find entry at ${appEntry}`);
+    }
     await startDevServer(config);
   }
 });
 const startListener = (config, showQr = false) => listenAndWatch(path.resolve(config.rootDir, ".output", OUT_SERVER_ENTRY), {
   public: true,
   port: config.port,
-  logger: logger$1,
+  logger,
   qr: showQr,
   https: config.https,
   http2: config.http2
@@ -501,17 +519,17 @@ async function startDevServer(config) {
         await createAppWithRoutesModule(config);
         let bundleCreated = false;
         try {
-          logger$1.log(
+          logger.log(
             "Change detected. Bundling files and restarting server...."
           );
           await transpileFiles(config);
           await bundleFiles.rebuild();
           bundleCreated = true;
         } catch (err) {
-          logger$1.error("ERROR", err);
+          logger.error("ERROR", err);
           bundleCreated = false;
         }
-        if (bundleCreated && config.clientGenerators.length) {
+        if (bundleCreated && config.generators.length) {
           setTimeout(async () => {
             await generateClients(config);
             bundleCreated = false;
@@ -535,14 +553,14 @@ async function generateClients(config) {
     if (!isAppDefinition(result)) {
       return;
     }
-    logger$1.log(`Generating client code...`);
-    const clientCount = config.clientGenerators.length;
+    logger.log(`Generating client code...`);
+    const clientCount = config.generators.length;
     await Promise.all(
-      config.clientGenerators.map(
-        (generator) => generator.generator(result)
+      config.generators.map(
+        (generator) => generator.generator(result, true)
       )
     );
-    logger$1.success(
+    logger.success(
       `Generated ${clientCount} client${clientCount === 1 ? "" : "s"}`
     );
   } catch (err) {
@@ -563,7 +581,6 @@ export default app.h3App;`;
   );
 }
 
-const logger = createConsola();
 const init = defineCommand({
   meta: {
     name: "Init",
@@ -580,9 +597,44 @@ const init = defineCommand({
       default: false,
       alias: "f",
       description: "Force created a project when if a directory already exists"
+    },
+    type: {
+      type: "string",
+      description: `"app" | "plugin"`
     }
   },
   async run(context) {
+    let type;
+    switch (context.args.type?.toLowerCase()) {
+      case "app":
+        type = "app";
+        break;
+      case "plugin":
+        type = "plugin";
+        break;
+    }
+    if (!type) {
+      const { projectType } = await enquirer.prompt([
+        {
+          type: "select",
+          name: "projectType",
+          message: "What kind of project do you want to initialize?",
+          choices: ["application", "generator plugin"]
+        }
+      ]);
+      switch (projectType) {
+        case "application":
+          type = "app";
+          break;
+        case "generator plugin":
+          type = "plugin";
+          break;
+        default:
+          throw new Error(
+            `Unknown project type "${projectType}"`
+          );
+      }
+    }
     const dir = path.resolve(context.args.dir);
     if (!fs$1.existsSync(dir)) {
       fs$1.mkdirSync(dir);
@@ -594,42 +646,71 @@ const init = defineCommand({
       );
       process.exit(1);
     }
-    const degit = Degit("https://github.com/modiimedia/arri-starters", {
-      force: context.args.force
-    });
-    await degit.clone(dir);
-    rmSync(path.resolve(dir, "pnpm-lock.yaml"));
-    const packageJson = JSON.parse(
-      readFileSync(path.resolve(dir, "package.json"), {
-        encoding: "utf-8"
-      })
-    );
-    packageJson.name = kebabCase(context.args.dir);
-    packageJson.description = "An RPC server created with Arri RPC";
-    packageJson.private = true;
-    delete packageJson.license;
-    delete packageJson.main;
-    delete packageJson.author;
-    delete packageJson.tags;
-    writeFileSync(
-      path.resolve(dir, "package.json"),
-      await prettier.format(JSON.stringify(packageJson), {
-        parser: "json",
-        tabWidth: 4,
-        semi: true,
-        endOfLine: "lf",
-        trailingComma: "all"
-      })
-    );
-    consola.log(
-      `Project initialized in ${context.args.dir}. To get started:
-cd ${context.args.dir}
-npm install
-npm run dev`
-    );
+    switch (type) {
+      case "app":
+        await initApp(context.args.dir, context.args.force);
+        break;
+      case "plugin":
+        await initPlugin(context.args.dir, context.args.force);
+        break;
+      default:
+        logger.error(`Unknown app type: '${type}'"`);
+        break;
+    }
     process.exit(0);
   }
 });
+async function initApp(dir, force) {
+  const degit = Degit("modiimedia/arri-starters/app-starter-ts", {
+    force
+  });
+  await degit.clone(dir);
+  rmSync(path.resolve(dir, "pnpm-lock.yaml"));
+  const packageJson = JSON.parse(
+    readFileSync(path.resolve(dir, "package.json"), {
+      encoding: "utf-8"
+    })
+  );
+  packageJson.name = kebabCase(dir);
+  packageJson.description = "An RPC server created with Arri RPC";
+  packageJson.private = true;
+  delete packageJson.license;
+  delete packageJson.main;
+  delete packageJson.author;
+  delete packageJson.tags;
+  writeFileSync(
+    path.resolve(dir, "package.json"),
+    await prettier.format(JSON.stringify(packageJson), {
+      parser: "json",
+      tabWidth: 4,
+      semi: true,
+      endOfLine: "lf",
+      trailingComma: "all"
+    })
+  );
+  logger.success(`Project initialized in ${dir}!`);
+  logger.info(`To get started:
+- cd ${dir}
+- pnpm install
+- pnpm run dev`);
+}
+async function initPlugin(dir, force) {
+  const name = kebabCase(dir);
+  const degit = Degit("modiimedia/arri-starters/generator-starter", {
+    force
+  });
+  await degit.clone(dir);
+  rmSync(path.resolve(dir, "pnpm-lock.yaml"));
+  let packageJson = readFileSync(path.resolve(dir, "package.json"), {
+    encoding: "utf8"
+  });
+  packageJson = packageJson.replace(`"arri-generator-name"`, `"${name}"`);
+  writeFileSync(path.resolve(dir, "package.json"), packageJson);
+  logger.success(`Project initialized in ${dir}!`);
+  logger.info(`To get started:
+- cd ${dir}
+- pnpm install`);
+}
 
 const main = defineCommand({
   subCommands: {

package/dist/index.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-const config = require('./shared/arri.7b317e03.cjs');
+const config = require('./shared/arri.7b5179bf.cjs');
 const h3 = require('h3');
 require('arri-codegen-utils');
 require('arri-validate');

package/dist/index.d.cts

@@ -212,8 +212,8 @@ interface ArriOptions {
 }
 
 interface ArriConfig {
-    port: number;
-    entry: string;
+    port?: number;
+    entry?: string;
     serverEntry?: string;
     rootDir?: string;
     srcDir?: string;
@@ -222,7 +222,7 @@ interface ArriConfig {
      * this defaults to ["***\/*\*.rpc.ts"]
      */
     procedureGlobPatterns?: string[];
-    clientGenerators?: Array<ClientGenerator<any>>;
+    generators?: Array<ClientGenerator<any>>;
     buildDir?: string;
     esbuild?: Omit<BuildOptions, "outfile" | "outdir" | "entryNames" | "entryPoints">;
     https?: {

package/dist/index.d.mts

@@ -212,8 +212,8 @@ interface ArriOptions {
 }
 
 interface ArriConfig {
-    port: number;
-    entry: string;
+    port?: number;
+    entry?: string;
     serverEntry?: string;
     rootDir?: string;
     srcDir?: string;
@@ -222,7 +222,7 @@ interface ArriConfig {
      * this defaults to ["***\/*\*.rpc.ts"]
      */
     procedureGlobPatterns?: string[];
-    clientGenerators?: Array<ClientGenerator<any>>;
+    generators?: Array<ClientGenerator<any>>;
     buildDir?: string;
     esbuild?: Omit<BuildOptions, "outfile" | "outdir" | "entryNames" | "entryPoints">;
     https?: {

package/dist/index.d.ts

@@ -212,8 +212,8 @@ interface ArriOptions {
 }
 
 interface ArriConfig {
-    port: number;
-    entry: string;
+    port?: number;
+    entry?: string;
     serverEntry?: string;
     rootDir?: string;
     srcDir?: string;
@@ -222,7 +222,7 @@ interface ArriConfig {
      * this defaults to ["***\/*\*.rpc.ts"]
      */
     procedureGlobPatterns?: string[];
-    clientGenerators?: Array<ClientGenerator<any>>;
+    generators?: Array<ClientGenerator<any>>;
     buildDir?: string;
     esbuild?: Omit<BuildOptions, "outfile" | "outdir" | "entryNames" | "entryPoints">;
     https?: {

package/dist/index.mjs

@@ -1,4 +1,4 @@
-export { A as ArriApp, q as ArriRouter, a as DEV_DEFINITION_ENDPOINT, D as DEV_ENDPOINT_ROOT, E as ErrorResponse, y as EventStreamConnection, c as createAppDefinition, e as createHttpRpcDefinition, o as defaultConfig, p as defineConfig, j as defineError, w as defineEventStreamRpc, s as defineRoute, d as defineRpc, k as errorResponseFromValidationErrors, f as getRpcParamName, g as getRpcPath, h as getRpcResponseName, l as handleH3Error, u as handleRoute, m as isArriConfig, x as isEventStreamRpc, n as isResolvedArriConfig, b as isRpc, i as isRpcParamSchema, z as registerEventStreamRpc, t as registerRoute, r as registerRpc, v as validateRpcRequestInput } from './shared/arri.e9a56e75.mjs';
+export { A as ArriApp, q as ArriRouter, a as DEV_DEFINITION_ENDPOINT, D as DEV_ENDPOINT_ROOT, E as ErrorResponse, y as EventStreamConnection, c as createAppDefinition, e as createHttpRpcDefinition, o as defaultConfig, p as defineConfig, j as defineError, w as defineEventStreamRpc, s as defineRoute, d as defineRpc, k as errorResponseFromValidationErrors, f as getRpcParamName, g as getRpcPath, h as getRpcResponseName, l as handleH3Error, u as handleRoute, m as isArriConfig, x as isEventStreamRpc, n as isResolvedArriConfig, b as isRpc, i as isRpcParamSchema, z as registerEventStreamRpc, t as registerRoute, r as registerRpc, v as validateRpcRequestInput } from './shared/arri.bbe2aa44.mjs';
 export * from 'h3';
 import 'arri-codegen-utils';
 import 'arri-validate';

package/dist/shared/{arri.7b317e03.cjs → arri.7b5179bf.cjs}

@@ -951,27 +951,41 @@ class ArriApp {
 }
 
 function isArriConfig(input) {
-  if (typeof input !== "object" || !input) {
+  if (typeof input !== "object" || input === null) {
     return false;
   }
-  return "port" in input && typeof input.port === "number" && !Number.isNaN(input.port) && "entry" in input && typeof input.entry === "string";
+  if ("generators" in input) {
+    if (!Array.isArray(input)) {
+      return false;
+    }
+  }
+  if ("port" in input && typeof input.port !== "number") {
+    return false;
+  }
+  if (Number.isNaN(input.port)) {
+    return false;
+  }
+  if ("entry" in input && typeof input.entry !== "string") {
+    return false;
+  }
+  return true;
 }
 function isResolvedArriConfig(input) {
   if (!isArriConfig(input)) {
     return false;
   }
-  return typeof input.rootDir === "string" && typeof input.srcDir === "string" && (typeof input.procedureDir === "string" || typeof input.procedureDir === "boolean") && Array.isArray(input.procedureGlobPatterns) && Array.isArray(input.clientGenerators) && typeof input.buildDir === "string" && typeof input.esbuild === "object" && input.esbuild && !Array.isArray(input.esbuild);
+  return typeof input.rootDir === "string" && typeof input.srcDir === "string" && (typeof input.procedureDir === "string" || typeof input.procedureDir === "boolean") && Array.isArray(input.procedureGlobPatterns) && Array.isArray(input.generators) && typeof input.buildDir === "string" && typeof input.esbuild === "object" && input.esbuild && !Array.isArray(input.esbuild);
 }
 const defaultConfig = {
   port: 3e3,
   rootDir: ".",
   srcDir: "src",
   entry: "app.ts",
+  serverEntry: "",
   procedureDir: "procedures",
   procedureGlobPatterns: ["**/*.rpc.ts"],
-  clientGenerators: [],
+  generators: [],
   buildDir: ".arri",
-  serverEntry: "",
   esbuild: {},
   https: false,
   http2: false
@@ -984,7 +998,7 @@ function defineConfig(config) {
     entry: config.entry ?? defaultConfig.entry,
     procedureDir: config.procedureDir ?? defaultConfig.procedureDir,
     procedureGlobPatterns: config.procedureGlobPatterns ?? defaultConfig.procedureGlobPatterns,
-    clientGenerators: config.clientGenerators ?? defaultConfig.clientGenerators,
+    generators: config.generators ?? defaultConfig.generators,
     buildDir: config.buildDir ?? defaultConfig.buildDir,
     esbuild: config.esbuild ?? defaultConfig.esbuild,
     serverEntry: config.serverEntry ?? "",

package/dist/shared/{arri.e9a56e75.mjs → arri.bbe2aa44.mjs}

@@ -949,27 +949,41 @@ class ArriApp {
 }
 
 function isArriConfig(input) {
-  if (typeof input !== "object" || !input) {
+  if (typeof input !== "object" || input === null) {
     return false;
   }
-  return "port" in input && typeof input.port === "number" && !Number.isNaN(input.port) && "entry" in input && typeof input.entry === "string";
+  if ("generators" in input) {
+    if (!Array.isArray(input)) {
+      return false;
+    }
+  }
+  if ("port" in input && typeof input.port !== "number") {
+    return false;
+  }
+  if (Number.isNaN(input.port)) {
+    return false;
+  }
+  if ("entry" in input && typeof input.entry !== "string") {
+    return false;
+  }
+  return true;
 }
 function isResolvedArriConfig(input) {
   if (!isArriConfig(input)) {
     return false;
   }
-  return typeof input.rootDir === "string" && typeof input.srcDir === "string" && (typeof input.procedureDir === "string" || typeof input.procedureDir === "boolean") && Array.isArray(input.procedureGlobPatterns) && Array.isArray(input.clientGenerators) && typeof input.buildDir === "string" && typeof input.esbuild === "object" && input.esbuild && !Array.isArray(input.esbuild);
+  return typeof input.rootDir === "string" && typeof input.srcDir === "string" && (typeof input.procedureDir === "string" || typeof input.procedureDir === "boolean") && Array.isArray(input.procedureGlobPatterns) && Array.isArray(input.generators) && typeof input.buildDir === "string" && typeof input.esbuild === "object" && input.esbuild && !Array.isArray(input.esbuild);
 }
 const defaultConfig = {
   port: 3e3,
   rootDir: ".",
   srcDir: "src",
   entry: "app.ts",
+  serverEntry: "",
   procedureDir: "procedures",
   procedureGlobPatterns: ["**/*.rpc.ts"],
-  clientGenerators: [],
+  generators: [],
   buildDir: ".arri",
-  serverEntry: "",
   esbuild: {},
   https: false,
   http2: false
@@ -982,7 +996,7 @@ function defineConfig(config) {
     entry: config.entry ?? defaultConfig.entry,
     procedureDir: config.procedureDir ?? defaultConfig.procedureDir,
     procedureGlobPatterns: config.procedureGlobPatterns ?? defaultConfig.procedureGlobPatterns,
-    clientGenerators: config.clientGenerators ?? defaultConfig.clientGenerators,
+    generators: config.generators ?? defaultConfig.generators,
     buildDir: config.buildDir ?? defaultConfig.buildDir,
     esbuild: config.esbuild ?? defaultConfig.esbuild,
     serverEntry: config.serverEntry ?? "",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arri",
-  "version": "0.31.0",
+  "version": "0.32.1",
   "type": "module",
   "license": "MIT",
   "author": {
@@ -31,6 +31,7 @@
     "citty": "^0.1.6",
     "consola": "^3.2.3",
     "degit": "^2.8.4",
+    "enquirer": "^2.4.1",
     "esbuild": "^0.20.1",
     "esbuild-plugin-replace": "^1.4.0",
     "globby": "^14.0.1",
@@ -42,10 +43,10 @@
     "prettier": "^3.2.5",
     "scule": "^1.3.0",
     "uncrypto": "^0.1.3",
-    "arri-codegen-dart": "0.31.0",
-    "arri-codegen-ts": "0.31.0",
-    "arri-codegen-utils": "0.31.0",
-    "arri-validate": "0.31.0"
+    "arri-codegen-dart": "0.32.1",
+    "arri-validate": "0.32.1",
+    "arri-codegen-ts": "0.32.1",
+    "arri-codegen-utils": "0.32.1"
   },
   "devDependencies": {
     "@types/degit": "^2.8.6",