arri 0.12.7 → 0.13.0

package/dist/cli.cjs

@@ -9,9 +9,10 @@ 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.fa32b1ba.cjs');
+const config = require('./shared/arri.165b8604.cjs');
 const globby = require('globby');
 const scule = require('scule');
 const arriCodegenDart = require('arri-codegen-dart');
@@ -45,10 +46,11 @@ const prettier__default = /*#__PURE__*/_interopDefaultCompat(prettier);
 const chokidar__default = /*#__PURE__*/_interopDefaultCompat(chokidar);
 const Degit__default = /*#__PURE__*/_interopDefaultCompat(Degit);
 
-const DEFAULT_SERVER_ENTRY_FILE = "__default_arri_server.js";
-const DEFAULT_CODEGEN_FILE = "__default_arri_codegen.js";
-const SERVER_ENTRY_OUTPUT = "server.js";
-const CODEGEN_OUTPUT = "codegen.js";
+const GEN_APP_FILE = "__arri_app.js";
+const GEN_SERVER_ENTRY_FILE = "__arri_server.js";
+const OUT_APP_FILE = "app.js";
+const OUT_SERVER_ENTRY = "server.js";
+const OUT_CODEGEN = "codegen.js";
 async function setupWorkingDir(config) {
   const arriDir = path__default.resolve(config.rootDir, config.buildDir);
   const outDir = path__default.resolve(config.rootDir, ".output");
@@ -61,12 +63,15 @@ async function setupWorkingDir(config) {
   await fs__default.mkdir(arriDir);
   await fs__default.mkdir(outDir);
 }
-async function createRoutesModule(config) {
+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.srcDir), appModule).split(".");
+  appImportParts.pop();
   const routes = [];
   const existingRoutes = [];
   await Promise.all(
     config.procedureGlobPatterns.map(async (pattern) => {
-      const results = await getVirtualRouteBatch(pattern, config);
+      const results = await getFsRouteBatch(pattern, config);
       for (const result of results) {
         if (!existingRoutes.includes(result.name)) {
           routes.push(result);
@@ -77,22 +82,33 @@ async function createRoutesModule(config) {
   );
   routes.sort((a, b) => a.name < b.name ? -1 : 1);
   const module = await prettier__default.format(
-    `${routes.map(
+    `import app from './${appImportParts.join(".")}';
+        ${routes.map(
       (route) => `import ${route.importName} from '${route.importPath}';`
     ).join("\n")}
         const routes = [${routes.map(
       (route) => `{ id: '${route.name}', route: ${route.importName} }`
     ).join(",\n")}
         ];
-        export default routes`,
+        for(const route of routes) {
+            app.rpc({
+                name: route.id,
+                method: route.route.method,
+                params: route.route.params,
+                response: route.route.response,
+                handler: route.route.handler,
+                postHandler: route.route.postHandler,
+            });
+        }
+        export default app`,
     { parser: "typescript", tabWidth: 4 }
   );
   await fs__default.writeFile(
-    path__default.resolve(config.rootDir, config.buildDir, "routes.js"),
+    path__default.resolve(config.rootDir, config.buildDir, GEN_APP_FILE),
     module
   );
 }
-async function getVirtualRouteBatch(globPattern, config) {
+async function getFsRouteBatch(globPattern, config) {
   if (!config.procedureDir) {
     return [];
   }
@@ -198,19 +214,15 @@ async function startBuild(config, skipCodeGen = false) {
   logger$2.log("Bundling server....");
   await setupWorkingDir(config);
   await Promise.all([
-    createRoutesModule(config),
-    createBuildEntryModule(config),
-    createBuildCodegenModule(config)
+    createAppWithRoutesModule(config),
+    createServerEntryFile(config),
+    createCodegenEntryFile(config),
+    transpileFiles(config)
   ]);
-  await transpileFiles(config);
-  await bundleFiles(config);
+  await bundleAppEntry(config);
   logger$2.log("Finished bundling");
   const clientCount = config.clientGenerators.length;
-  const codegenModule = path__default.resolve(
-    config.rootDir,
-    ".output",
-    CODEGEN_OUTPUT
-  );
+  const codegenModule = path__default.resolve(config.rootDir, ".output", OUT_CODEGEN);
   if (!skipCodeGen) {
     logger$2.log("Generating Arri app definition (__definition.json)");
     node_child_process.execSync(`node ${codegenModule}`, { env: process.env });
@@ -237,48 +249,18 @@ async function startBuild(config, skipCodeGen = false) {
   logger$2.log("Cleaning up files");
   await fs__default.rm(codegenModule);
   logger$2.success(
-    `Build finished! You can start your server by running "node .output/${SERVER_ENTRY_OUTPUT}"`
+    `Build finished! You can start your server by running "node .output/${OUT_SERVER_ENTRY}"`
   );
 }
-async function bundleFiles(config, allowCodegen = true) {
-  if (allowCodegen) {
-    await esbuild.build({
-      ...config.esbuild,
-      entryPoints: [
-        path__default.resolve(
-          config.rootDir,
-          config.buildDir,
-          DEFAULT_CODEGEN_FILE
-        )
-      ],
-      platform: config.esbuild.platform ?? "node",
-      target: config.esbuild.target ?? "node20",
-      packages: "external",
-      bundle: true,
-      format: "esm",
-      sourcemap: false,
-      minifyWhitespace: false,
-      banner: {
-        js: `import { createRequire as topLevelCreateRequire } from 'module';
-const require = topLevelCreateRequire(import.meta.url);`
-      },
-      outfile: path__default.resolve(config.rootDir, ".output", CODEGEN_OUTPUT)
-    });
-  }
-  let buildEntry = path__default.resolve(
+async function bundleAppEntry(config, allowCodegen = true) {
+  const appEntry = path__default.resolve(
     config.rootDir,
     config.buildDir,
-    DEFAULT_SERVER_ENTRY_FILE
+    GEN_APP_FILE
   );
-  if (config.buildEntry) {
-    const parts = config.buildEntry.split(".");
-    parts.pop();
-    const mergedParts = `${parts.join(".")}.js`;
-    buildEntry = path__default.resolve(config.rootDir, config.buildDir, mergedParts);
-  }
   await esbuild.build({
     ...config.esbuild,
-    entryPoints: [buildEntry],
+    entryPoints: [appEntry],
     platform: config.esbuild.platform ?? "node",
     target: config.esbuild.target ?? "node20",
     bundle: true,
@@ -291,11 +273,34 @@ const require = topLevelCreateRequire(import.meta.url);`
 const require = topLevelCreateRequire(import.meta.url);`
     },
     allowOverwrite: true,
-    outfile: path__default.resolve(config.rootDir, ".output", SERVER_ENTRY_OUTPUT)
+    outfile: path__default.resolve(config.rootDir, ".output", OUT_APP_FILE)
   });
 }
-async function createBuildEntryModule(config) {
-  if (config.buildEntry) {
+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.js" })],
+      allowOverwrite: true,
+      outfile: path__default.resolve(config.rootDir, ".output", OUT_SERVER_ENTRY)
+    });
     return;
   }
   const appModule = path__default.resolve(config.rootDir, config.srcDir, config.entry);
@@ -303,34 +308,18 @@ async function createBuildEntryModule(config) {
   appImportParts.pop();
   const virtualEntry = `import { toNodeListener } from 'arri';
 import { listen } from 'listhen';
-import routes from './routes.js';
-import app from './${appImportParts.join(".")}.js';
-
-for (const route of routes) {
-    app.rpc({
-        name: route.id,
-        method: route.route.method,
-        params: route.route.params,
-        response: route.route.response,
-        handler: route.route.handler,
-        postHandler: route.route.postHandler,
-    });
-}
+import app from './${OUT_APP_FILE}';
 
 void listen(toNodeListener(app.h3App), {
     port: process.env.PORT ?? ${config.port},
     public: true,
 });`;
   await fs__default.writeFile(
-    path__default.resolve(
-      config.rootDir,
-      config.buildDir,
-      DEFAULT_SERVER_ENTRY_FILE
-    ),
+    path__default.resolve(config.rootDir, ".output", GEN_SERVER_ENTRY_FILE),
     virtualEntry
   );
 }
-async function createBuildCodegenModule(config) {
+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();
@@ -338,20 +327,7 @@ async function createBuildCodegenModule(config) {
     `
     import { writeFileSync } from 'node:fs';
     import path from 'pathe';
-    import app from './${appImportParts.join(".")}.js';
-    import routes from './routes.js';
-
-    for (const route of routes) {
-        app.rpc({
-            name: route.id,
-            method: route.route.method,
-            path: route.route.path,
-            params: route.route.params,
-            response: route.route.response,
-            handler: route.route.handler,
-            postHandler: route.route.postHandler,
-        });
-    }
+    import app from './${OUT_APP_FILE}';
 
     const __dirname = new URL(".", import.meta.url).pathname;
     const def = app.getAppDefinition();
@@ -362,7 +338,7 @@ async function createBuildCodegenModule(config) {
     { tabWidth: 4, parser: "typescript" }
   );
   await fs__default.writeFile(
-    path__default.resolve(config.rootDir, config.buildDir, DEFAULT_CODEGEN_FILE),
+    path__default.resolve(config.rootDir, ".output", OUT_CODEGEN),
     virtualModule
   );
 }
@@ -464,26 +440,26 @@ const dev = citty.defineCommand({
     await startDevServer(config$1);
   }
 });
-const startListener = (config, showQr = false) => listhen.listenAndWatch(
-  path__default.resolve(config.rootDir, ".output", SERVER_ENTRY_OUTPUT),
-  {
-    public: true,
-    port: config.port,
-    logger: logger$1,
-    qr: showQr
-  }
-);
+const startListener = (config, showQr = false) => listhen.listenAndWatch(path__default.resolve(config.rootDir, ".output", OUT_SERVER_ENTRY), {
+  public: true,
+  port: config.port,
+  logger: logger$1,
+  qr: showQr
+});
 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,
-        DEFAULT_SERVER_ENTRY_FILE
-      )
+      path__default.resolve(config.rootDir, config.buildDir, GEN_APP_FILE)
     ],
-    outfile: path__default.resolve(config.rootDir, ".output", SERVER_ENTRY_OUTPUT),
+    outfile: path__default.resolve(config.rootDir, ".output", OUT_APP_FILE),
     format: "esm",
     bundle: true,
     sourcemap: true,
@@ -495,8 +471,11 @@ async function bundleFilesContext(config) {
 async function startDevServer(config) {
   await setupWorkingDir(config);
   let fileWatcher;
-  await Promise.all([createRoutesModule(config), createEntryModule(config)]);
-  await transpileFiles(config);
+  await Promise.all([
+    createEntryModule(config),
+    createAppWithRoutesModule(config),
+    transpileFiles(config)
+  ]);
   const bundleFiles = await bundleFilesContext(config);
   await bundleFiles.rebuild();
   const listener = await startListener(config, true);
@@ -534,7 +513,7 @@ async function startDevServer(config) {
         if (event === "add" || event === "addDir") {
           return;
         }
-        await createRoutesModule(config);
+        await createAppWithRoutesModule(config);
         let bundleCreated = false;
         try {
           logger$1.log(
@@ -587,28 +566,11 @@ async function createEntryModule(config) {
   appImportParts.pop();
   const virtualEntry = `import { toNodeListener } from 'h3';
 import { listen } from 'listhen';
-import routes from './routes';
-import app from './${appImportParts.join(".")}';
-
-for (const route of routes) {
-    app.rpc({
-        name: route.id,
-        method: route.route.method,
-        path: route.route.path,
-        params: route.route.params,
-        response: route.route.response,
-        handler: route.route.handler,
-        postHandler: route.route.postHandler,
-    });
-}
+import app from './${GEN_APP_FILE}';
 
 export default app.h3App;`;
   await fs__default.writeFile(
-    path__default.resolve(
-      config.rootDir,
-      config.buildDir,
-      DEFAULT_SERVER_ENTRY_FILE
-    ),
+    path__default.resolve(config.rootDir, config.buildDir, GEN_SERVER_ENTRY_FILE),
     virtualEntry
   );
 }

package/dist/cli.mjs

@@ -8,9 +8,10 @@ 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 { n as defaultConfig, m as isResolvedArriConfig, a as DEV_DEFINITION_ENDPOINT } from './shared/arri.4d91d9b0.mjs';
+import { n as defaultConfig, m as isResolvedArriConfig, a as DEV_DEFINITION_ENDPOINT } from './shared/arri.cc0da87a.mjs';
 import { globby } from 'globby';
 import { camelCase, kebabCase } from 'scule';
 import { dartClientGenerator } from 'arri-codegen-dart';
@@ -21,10 +22,11 @@ import Degit from 'degit';
 import 'h3';
 import 'arri-validate';
 
-const DEFAULT_SERVER_ENTRY_FILE = "__default_arri_server.js";
-const DEFAULT_CODEGEN_FILE = "__default_arri_codegen.js";
-const SERVER_ENTRY_OUTPUT = "server.js";
-const CODEGEN_OUTPUT = "codegen.js";
+const GEN_APP_FILE = "__arri_app.js";
+const GEN_SERVER_ENTRY_FILE = "__arri_server.js";
+const OUT_APP_FILE = "app.js";
+const OUT_SERVER_ENTRY = "server.js";
+const OUT_CODEGEN = "codegen.js";
 async function setupWorkingDir(config) {
   const arriDir = path.resolve(config.rootDir, config.buildDir);
   const outDir = path.resolve(config.rootDir, ".output");
@@ -37,12 +39,15 @@ async function setupWorkingDir(config) {
   await fs.mkdir(arriDir);
   await fs.mkdir(outDir);
 }
-async function createRoutesModule(config) {
+async function createAppWithRoutesModule(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 routes = [];
   const existingRoutes = [];
   await Promise.all(
     config.procedureGlobPatterns.map(async (pattern) => {
-      const results = await getVirtualRouteBatch(pattern, config);
+      const results = await getFsRouteBatch(pattern, config);
       for (const result of results) {
         if (!existingRoutes.includes(result.name)) {
           routes.push(result);
@@ -53,22 +58,33 @@ async function createRoutesModule(config) {
   );
   routes.sort((a, b) => a.name < b.name ? -1 : 1);
   const module = await prettier.format(
-    `${routes.map(
+    `import app from './${appImportParts.join(".")}';
+        ${routes.map(
       (route) => `import ${route.importName} from '${route.importPath}';`
     ).join("\n")}
         const routes = [${routes.map(
       (route) => `{ id: '${route.name}', route: ${route.importName} }`
     ).join(",\n")}
         ];
-        export default routes`,
+        for(const route of routes) {
+            app.rpc({
+                name: route.id,
+                method: route.route.method,
+                params: route.route.params,
+                response: route.route.response,
+                handler: route.route.handler,
+                postHandler: route.route.postHandler,
+            });
+        }
+        export default app`,
     { parser: "typescript", tabWidth: 4 }
   );
   await fs.writeFile(
-    path.resolve(config.rootDir, config.buildDir, "routes.js"),
+    path.resolve(config.rootDir, config.buildDir, GEN_APP_FILE),
     module
   );
 }
-async function getVirtualRouteBatch(globPattern, config) {
+async function getFsRouteBatch(globPattern, config) {
   if (!config.procedureDir) {
     return [];
   }
@@ -174,19 +190,15 @@ async function startBuild(config, skipCodeGen = false) {
   logger$2.log("Bundling server....");
   await setupWorkingDir(config);
   await Promise.all([
-    createRoutesModule(config),
-    createBuildEntryModule(config),
-    createBuildCodegenModule(config)
+    createAppWithRoutesModule(config),
+    createServerEntryFile(config),
+    createCodegenEntryFile(config),
+    transpileFiles(config)
   ]);
-  await transpileFiles(config);
-  await bundleFiles(config);
+  await bundleAppEntry(config);
   logger$2.log("Finished bundling");
   const clientCount = config.clientGenerators.length;
-  const codegenModule = path.resolve(
-    config.rootDir,
-    ".output",
-    CODEGEN_OUTPUT
-  );
+  const codegenModule = path.resolve(config.rootDir, ".output", OUT_CODEGEN);
   if (!skipCodeGen) {
     logger$2.log("Generating Arri app definition (__definition.json)");
     execSync(`node ${codegenModule}`, { env: process.env });
@@ -213,48 +225,18 @@ async function startBuild(config, skipCodeGen = false) {
   logger$2.log("Cleaning up files");
   await fs.rm(codegenModule);
   logger$2.success(
-    `Build finished! You can start your server by running "node .output/${SERVER_ENTRY_OUTPUT}"`
+    `Build finished! You can start your server by running "node .output/${OUT_SERVER_ENTRY}"`
   );
 }
-async function bundleFiles(config, allowCodegen = true) {
-  if (allowCodegen) {
-    await build$1({
-      ...config.esbuild,
-      entryPoints: [
-        path.resolve(
-          config.rootDir,
-          config.buildDir,
-          DEFAULT_CODEGEN_FILE
-        )
-      ],
-      platform: config.esbuild.platform ?? "node",
-      target: config.esbuild.target ?? "node20",
-      packages: "external",
-      bundle: true,
-      format: "esm",
-      sourcemap: false,
-      minifyWhitespace: false,
-      banner: {
-        js: `import { createRequire as topLevelCreateRequire } from 'module';
-const require = topLevelCreateRequire(import.meta.url);`
-      },
-      outfile: path.resolve(config.rootDir, ".output", CODEGEN_OUTPUT)
-    });
-  }
-  let buildEntry = path.resolve(
+async function bundleAppEntry(config, allowCodegen = true) {
+  const appEntry = path.resolve(
     config.rootDir,
     config.buildDir,
-    DEFAULT_SERVER_ENTRY_FILE
+    GEN_APP_FILE
   );
-  if (config.buildEntry) {
-    const parts = config.buildEntry.split(".");
-    parts.pop();
-    const mergedParts = `${parts.join(".")}.js`;
-    buildEntry = path.resolve(config.rootDir, config.buildDir, mergedParts);
-  }
   await build$1({
     ...config.esbuild,
-    entryPoints: [buildEntry],
+    entryPoints: [appEntry],
     platform: config.esbuild.platform ?? "node",
     target: config.esbuild.target ?? "node20",
     bundle: true,
@@ -267,11 +249,34 @@ const require = topLevelCreateRequire(import.meta.url);`
 const require = topLevelCreateRequire(import.meta.url);`
     },
     allowOverwrite: true,
-    outfile: path.resolve(config.rootDir, ".output", SERVER_ENTRY_OUTPUT)
+    outfile: path.resolve(config.rootDir, ".output", OUT_APP_FILE)
   });
 }
-async function createBuildEntryModule(config) {
-  if (config.buildEntry) {
+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.js" })],
+      allowOverwrite: true,
+      outfile: path.resolve(config.rootDir, ".output", OUT_SERVER_ENTRY)
+    });
     return;
   }
   const appModule = path.resolve(config.rootDir, config.srcDir, config.entry);
@@ -279,34 +284,18 @@ async function createBuildEntryModule(config) {
   appImportParts.pop();
   const virtualEntry = `import { toNodeListener } from 'arri';
 import { listen } from 'listhen';
-import routes from './routes.js';
-import app from './${appImportParts.join(".")}.js';
-
-for (const route of routes) {
-    app.rpc({
-        name: route.id,
-        method: route.route.method,
-        params: route.route.params,
-        response: route.route.response,
-        handler: route.route.handler,
-        postHandler: route.route.postHandler,
-    });
-}
+import app from './${OUT_APP_FILE}';
 
 void listen(toNodeListener(app.h3App), {
     port: process.env.PORT ?? ${config.port},
     public: true,
 });`;
   await fs.writeFile(
-    path.resolve(
-      config.rootDir,
-      config.buildDir,
-      DEFAULT_SERVER_ENTRY_FILE
-    ),
+    path.resolve(config.rootDir, ".output", GEN_SERVER_ENTRY_FILE),
     virtualEntry
   );
 }
-async function createBuildCodegenModule(config) {
+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();
@@ -314,20 +303,7 @@ async function createBuildCodegenModule(config) {
     `
     import { writeFileSync } from 'node:fs';
     import path from 'pathe';
-    import app from './${appImportParts.join(".")}.js';
-    import routes from './routes.js';
-
-    for (const route of routes) {
-        app.rpc({
-            name: route.id,
-            method: route.route.method,
-            path: route.route.path,
-            params: route.route.params,
-            response: route.route.response,
-            handler: route.route.handler,
-            postHandler: route.route.postHandler,
-        });
-    }
+    import app from './${OUT_APP_FILE}';
 
     const __dirname = new URL(".", import.meta.url).pathname;
     const def = app.getAppDefinition();
@@ -338,7 +314,7 @@ async function createBuildCodegenModule(config) {
     { tabWidth: 4, parser: "typescript" }
   );
   await fs.writeFile(
-    path.resolve(config.rootDir, config.buildDir, DEFAULT_CODEGEN_FILE),
+    path.resolve(config.rootDir, ".output", OUT_CODEGEN),
     virtualModule
   );
 }
@@ -440,26 +416,26 @@ const dev = defineCommand({
     await startDevServer(config);
   }
 });
-const startListener = (config, showQr = false) => listenAndWatch(
-  path.resolve(config.rootDir, ".output", SERVER_ENTRY_OUTPUT),
-  {
-    public: true,
-    port: config.port,
-    logger: logger$1,
-    qr: showQr
-  }
-);
+const startListener = (config, showQr = false) => listenAndWatch(path.resolve(config.rootDir, ".output", OUT_SERVER_ENTRY), {
+  public: true,
+  port: config.port,
+  logger: logger$1,
+  qr: showQr
+});
 async function bundleFilesContext(config) {
+  const serverContent = `import app from './${OUT_APP_FILE}';
+
+export default app.h3App;`;
+  await fs.writeFile(
+    path.resolve(config.rootDir, ".output", OUT_SERVER_ENTRY),
+    serverContent
+  );
   return await esbuild.context({
     ...config.esbuild,
     entryPoints: [
-      path.resolve(
-        config.rootDir,
-        config.buildDir,
-        DEFAULT_SERVER_ENTRY_FILE
-      )
+      path.resolve(config.rootDir, config.buildDir, GEN_APP_FILE)
     ],
-    outfile: path.resolve(config.rootDir, ".output", SERVER_ENTRY_OUTPUT),
+    outfile: path.resolve(config.rootDir, ".output", OUT_APP_FILE),
     format: "esm",
     bundle: true,
     sourcemap: true,
@@ -471,8 +447,11 @@ async function bundleFilesContext(config) {
 async function startDevServer(config) {
   await setupWorkingDir(config);
   let fileWatcher;
-  await Promise.all([createRoutesModule(config), createEntryModule(config)]);
-  await transpileFiles(config);
+  await Promise.all([
+    createEntryModule(config),
+    createAppWithRoutesModule(config),
+    transpileFiles(config)
+  ]);
   const bundleFiles = await bundleFilesContext(config);
   await bundleFiles.rebuild();
   const listener = await startListener(config, true);
@@ -510,7 +489,7 @@ async function startDevServer(config) {
         if (event === "add" || event === "addDir") {
           return;
         }
-        await createRoutesModule(config);
+        await createAppWithRoutesModule(config);
         let bundleCreated = false;
         try {
           logger$1.log(
@@ -563,28 +542,11 @@ async function createEntryModule(config) {
   appImportParts.pop();
   const virtualEntry = `import { toNodeListener } from 'h3';
 import { listen } from 'listhen';
-import routes from './routes';
-import app from './${appImportParts.join(".")}';
-
-for (const route of routes) {
-    app.rpc({
-        name: route.id,
-        method: route.route.method,
-        path: route.route.path,
-        params: route.route.params,
-        response: route.route.response,
-        handler: route.route.handler,
-        postHandler: route.route.postHandler,
-    });
-}
+import app from './${GEN_APP_FILE}';
 
 export default app.h3App;`;
   await fs.writeFile(
-    path.resolve(
-      config.rootDir,
-      config.buildDir,
-      DEFAULT_SERVER_ENTRY_FILE
-    ),
+    path.resolve(config.rootDir, config.buildDir, GEN_SERVER_ENTRY_FILE),
     virtualEntry
   );
 }

package/dist/index.cjs

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

package/dist/index.d.cts

@@ -152,7 +152,7 @@ declare function handleH3Error(err: unknown, event: H3Event, onError: ArriOption
 interface ArriConfig {
     port: number;
     entry: string;
-    buildEntry?: string;
+    serverEntry?: string;
     rootDir?: string;
     srcDir?: string;
     procedureDir?: string | false;

package/dist/index.d.mts

@@ -152,7 +152,7 @@ declare function handleH3Error(err: unknown, event: H3Event, onError: ArriOption
 interface ArriConfig {
     port: number;
     entry: string;
-    buildEntry?: string;
+    serverEntry?: string;
     rootDir?: string;
     srcDir?: string;
     procedureDir?: string | false;

package/dist/index.d.ts

@@ -152,7 +152,7 @@ declare function handleH3Error(err: unknown, event: H3Event, onError: ArriOption
 interface ArriConfig {
     port: number;
     entry: string;
-    buildEntry?: string;
+    serverEntry?: string;
     rootDir?: string;
     srcDir?: string;
     procedureDir?: string | false;

package/dist/index.mjs

@@ -1,4 +1,4 @@
-export { A as ArriApp, p as ArriRouter, a as DEV_DEFINITION_ENDPOINT, D as DEV_ENDPOINT_ROOT, E as ErrorResponse, c as createRpcDefinition, n as defaultConfig, o as defineConfig, h as defineError, q as defineRoute, d as defineRpc, j as errorResponseFromValidationErrors, e as getRpcParamName, g as getRpcPath, f as getRpcResponseName, k as handleH3Error, t as handleRoute, l as isArriConfig, m as isResolvedArriConfig, b as isRpc, i as isRpcParamSchema, s as registerRoute, r as registerRpc } from './shared/arri.4d91d9b0.mjs';
+export { A as ArriApp, p as ArriRouter, a as DEV_DEFINITION_ENDPOINT, D as DEV_ENDPOINT_ROOT, E as ErrorResponse, c as createRpcDefinition, n as defaultConfig, o as defineConfig, h as defineError, q as defineRoute, d as defineRpc, j as errorResponseFromValidationErrors, e as getRpcParamName, g as getRpcPath, f as getRpcResponseName, k as handleH3Error, t as handleRoute, l as isArriConfig, m as isResolvedArriConfig, b as isRpc, i as isRpcParamSchema, s as registerRoute, r as registerRpc } from './shared/arri.cc0da87a.mjs';
 export * from 'h3';
 import 'arri-validate';
 import 'arri-codegen-utils';

package/dist/shared/{arri.fa32b1ba.cjs → arri.165b8604.cjs}

@@ -715,7 +715,7 @@ const defaultConfig = {
   procedureGlobPatterns: ["**/*.rpc.ts"],
   clientGenerators: [],
   buildDir: ".arri",
-  buildEntry: "",
+  serverEntry: "",
   esbuild: {}
 };
 function defineConfig(config) {
@@ -729,7 +729,7 @@ function defineConfig(config) {
     clientGenerators: config.clientGenerators ?? defaultConfig.clientGenerators,
     buildDir: config.buildDir ?? defaultConfig.buildDir,
     esbuild: config.esbuild ?? defaultConfig.esbuild,
-    buildEntry: config.buildEntry ?? ""
+    serverEntry: config.serverEntry ?? ""
   };
 }
 

package/dist/shared/{arri.4d91d9b0.mjs → arri.cc0da87a.mjs}

@@ -713,7 +713,7 @@ const defaultConfig = {
   procedureGlobPatterns: ["**/*.rpc.ts"],
   clientGenerators: [],
   buildDir: ".arri",
-  buildEntry: "",
+  serverEntry: "",
   esbuild: {}
 };
 function defineConfig(config) {
@@ -727,7 +727,7 @@ function defineConfig(config) {
     clientGenerators: config.clientGenerators ?? defaultConfig.clientGenerators,
     buildDir: config.buildDir ?? defaultConfig.buildDir,
     esbuild: config.esbuild ?? defaultConfig.esbuild,
-    buildEntry: config.buildEntry ?? ""
+    serverEntry: config.serverEntry ?? ""
   };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arri",
-  "version": "0.12.7",
+  "version": "0.13.0",
   "type": "module",
   "license": "MIT",
   "author": {
@@ -27,27 +27,28 @@
   "dependencies": {
     "c12": "^1.5.1",
     "chokidar": "^3.5.3",
-    "citty": "^0.1.4",
+    "citty": "^0.1.5",
     "consola": "^3.2.3",
     "degit": "^2.8.4",
-    "esbuild": "^0.19.5",
-    "globby": "^13.2.2",
-    "h3": "^1.8.2",
+    "esbuild": "^0.19.7",
+    "esbuild-plugin-replace": "^1.4.0",
+    "globby": "^14.0.0",
+    "h3": "^1.9.0",
     "jiti": "^1.21.0",
     "ofetch": "^1.3.3",
     "pathe": "^1.1.1",
-    "prettier": "^3.0.3",
-    "scule": "^1.0.0",
-    "arri-codegen-dart": "0.12.7",
-    "arri-codegen-ts": "0.12.7",
-    "arri-validate": "0.12.7",
-    "arri-codegen-utils": "0.12.7"
+    "prettier": "^3.1.0",
+    "scule": "^1.1.0",
+    "arri-codegen-dart": "0.13.0",
+    "arri-codegen-utils": "0.13.0",
+    "arri-codegen-ts": "0.13.0",
+    "arri-validate": "0.13.0"
   },
   "peerDependencies": {
     "listhen": "1.x"
   },
   "devDependencies": {
     "@types/degit": "^2.8.6",
-    "bun-types": "^1.0.11"
+    "bun-types": "^1.0.13"
   }
 }