arri 0.45.5 → 0.45.7

package/dist/cli.cjs

@@ -11,12 +11,13 @@ const esbuild = require('esbuild');
 const esbuildPluginReplace = require('esbuild-plugin-replace');
 const path = require('pathe');
 const prettier = require('prettier');
-const dev = require('./shared/arri.50f2646c.cjs');
+const dev = require('./shared/arri.bb661ad6.cjs');
 const ofetch = require('ofetch');
 const Degit = require('degit');
 const enquirer = require('enquirer');
 const scule = require('scule');
 require('@joshmossas/listhen');
+require('h3');
 require('consola');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }

package/dist/cli.mjs

@@ -9,12 +9,13 @@ 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 dev } from './shared/arri.87c198d9.mjs';
+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 dev } from './shared/arri.4fd43a7c.mjs';
 import { ofetch } from 'ofetch';
 import Degit from 'degit';
 import enquirer from 'enquirer';
 import { kebabCase } from 'scule';
 import '@joshmossas/listhen';
+import 'h3';
 import 'consola';
 
 const build = defineCommand({

package/dist/index.cjs

@@ -1,16 +1,17 @@
 'use strict';
 
+const dev = require('./shared/arri.bb661ad6.cjs');
 const codegenDart = require('@arrirpc/codegen-dart');
-const codegenTs = require('@arrirpc/codegen-ts');
 const codegenKotlin = require('@arrirpc/codegen-kotlin');
+const codegenTs = require('@arrirpc/codegen-ts');
 const codegenUtils = require('@arrirpc/codegen-utils');
-const dev = require('./shared/arri.50f2646c.cjs');
 require('node:fs');
 require('node:fs/promises');
 require('@joshmossas/listhen');
 require('c12');
 require('citty');
 require('esbuild');
+require('h3');
 require('ofetch');
 require('pathe');
 require('consola');
@@ -19,12 +20,12 @@ require('scule');
 
 
 
-exports.dartClientGenerator = codegenDart.dartClientGenerator;
-exports.typescriptClientGenerator = codegenTs.typescriptClientGenerator;
-exports.kotlinClientGenerator = codegenKotlin.kotlinClientGenerator;
-exports.createAppDefinition = codegenUtils.createAppDefinition;
 exports.DEV_DEFINITION_ENDPOINT = dev.DEV_DEFINITION_ENDPOINT;
 exports.defaultConfig = dev.defaultConfig;
 exports.defineConfig = dev.defineConfig;
 exports.isArriConfig = dev.isArriConfig;
 exports.isResolvedArriConfig = dev.isResolvedArriConfig;
+exports.dartClientGenerator = codegenDart.dartClientGenerator;
+exports.kotlinClientGenerator = codegenKotlin.kotlinClientGenerator;
+exports.typescriptClientGenerator = codegenTs.typescriptClientGenerator;
+exports.createAppDefinition = codegenUtils.createAppDefinition;

package/dist/index.d.cts

@@ -1,9 +1,11 @@
-export { dartClientGenerator } from '@arrirpc/codegen-dart';
-export { typescriptClientGenerator } from '@arrirpc/codegen-ts';
-export { kotlinClientGenerator } from '@arrirpc/codegen-kotlin';
 import { ClientGenerator } from '@arrirpc/codegen-utils';
 export { AppDefinition, createAppDefinition } from '@arrirpc/codegen-utils';
 import { BuildOptions } from 'esbuild';
+export { dartClientGenerator } from '@arrirpc/codegen-dart';
+export { kotlinClientGenerator } from '@arrirpc/codegen-kotlin';
+export { typescriptClientGenerator } from '@arrirpc/codegen-ts';
+
+declare const DEV_DEFINITION_ENDPOINT = "/__arri_dev__/__definition";
 
 interface ArriConfig {
     port?: number;
@@ -38,6 +40,4 @@ type ResolvedArriConfig = Required<ArriConfig>;
 declare const defaultConfig: Required<ArriConfig>;
 declare function defineConfig(config: ArriConfig): ResolvedArriConfig;
 
-declare const DEV_DEFINITION_ENDPOINT = "/__arri_dev__/__definition";
-
 export { type ArriConfig, DEV_DEFINITION_ENDPOINT, type ResolvedArriConfig, defaultConfig, defineConfig, isArriConfig, isResolvedArriConfig };

package/dist/index.d.mts

@@ -1,9 +1,11 @@
-export { dartClientGenerator } from '@arrirpc/codegen-dart';
-export { typescriptClientGenerator } from '@arrirpc/codegen-ts';
-export { kotlinClientGenerator } from '@arrirpc/codegen-kotlin';
 import { ClientGenerator } from '@arrirpc/codegen-utils';
 export { AppDefinition, createAppDefinition } from '@arrirpc/codegen-utils';
 import { BuildOptions } from 'esbuild';
+export { dartClientGenerator } from '@arrirpc/codegen-dart';
+export { kotlinClientGenerator } from '@arrirpc/codegen-kotlin';
+export { typescriptClientGenerator } from '@arrirpc/codegen-ts';
+
+declare const DEV_DEFINITION_ENDPOINT = "/__arri_dev__/__definition";
 
 interface ArriConfig {
     port?: number;
@@ -38,6 +40,4 @@ type ResolvedArriConfig = Required<ArriConfig>;
 declare const defaultConfig: Required<ArriConfig>;
 declare function defineConfig(config: ArriConfig): ResolvedArriConfig;
 
-declare const DEV_DEFINITION_ENDPOINT = "/__arri_dev__/__definition";
-
 export { type ArriConfig, DEV_DEFINITION_ENDPOINT, type ResolvedArriConfig, defaultConfig, defineConfig, isArriConfig, isResolvedArriConfig };

package/dist/index.d.ts

@@ -1,9 +1,11 @@
-export { dartClientGenerator } from '@arrirpc/codegen-dart';
-export { typescriptClientGenerator } from '@arrirpc/codegen-ts';
-export { kotlinClientGenerator } from '@arrirpc/codegen-kotlin';
 import { ClientGenerator } from '@arrirpc/codegen-utils';
 export { AppDefinition, createAppDefinition } from '@arrirpc/codegen-utils';
 import { BuildOptions } from 'esbuild';
+export { dartClientGenerator } from '@arrirpc/codegen-dart';
+export { kotlinClientGenerator } from '@arrirpc/codegen-kotlin';
+export { typescriptClientGenerator } from '@arrirpc/codegen-ts';
+
+declare const DEV_DEFINITION_ENDPOINT = "/__arri_dev__/__definition";
 
 interface ArriConfig {
     port?: number;
@@ -38,6 +40,4 @@ type ResolvedArriConfig = Required<ArriConfig>;
 declare const defaultConfig: Required<ArriConfig>;
 declare function defineConfig(config: ArriConfig): ResolvedArriConfig;
 
-declare const DEV_DEFINITION_ENDPOINT = "/__arri_dev__/__definition";
-
 export { type ArriConfig, DEV_DEFINITION_ENDPOINT, type ResolvedArriConfig, defaultConfig, defineConfig, isArriConfig, isResolvedArriConfig };

package/dist/index.mjs

@@ -1,14 +1,15 @@
+export { D as DEV_DEFINITION_ENDPOINT, d as defaultConfig, b as defineConfig, i as isArriConfig, a as isResolvedArriConfig } from './shared/arri.4fd43a7c.mjs';
 export { dartClientGenerator } from '@arrirpc/codegen-dart';
-export { typescriptClientGenerator } from '@arrirpc/codegen-ts';
 export { kotlinClientGenerator } from '@arrirpc/codegen-kotlin';
+export { typescriptClientGenerator } from '@arrirpc/codegen-ts';
 export { createAppDefinition } from '@arrirpc/codegen-utils';
-export { D as DEV_DEFINITION_ENDPOINT, d as defaultConfig, b as defineConfig, i as isArriConfig, a as isResolvedArriConfig } from './shared/arri.87c198d9.mjs';
 import 'node:fs';
 import 'node:fs/promises';
 import '@joshmossas/listhen';
 import 'c12';
 import 'citty';
 import 'esbuild';
+import 'h3';
 import 'ofetch';
 import 'pathe';
 import 'consola';

package/dist/shared/{arri.87c198d9.mjs → arri.4fd43a7c.mjs}

@@ -5,73 +5,13 @@ import { listenAndWatch } from '@joshmossas/listhen';
 import { loadConfig } from 'c12';
 import { defineCommand } from 'citty';
 import * as esbuild from 'esbuild';
+import 'h3';
 import { ofetch } from 'ofetch';
 import path from 'pathe';
 import { createConsola } from 'consola';
 import prettier from 'prettier';
 import { camelCase, kebabCase } from 'scule';
 
-function isArriConfig(input) {
-  if (typeof input !== "object" || input === null) {
-    return false;
-  }
-  if ("generators" in input) {
-    if (!Array.isArray(input.generators)) {
-      return false;
-    }
-  }
-  if ("port" in input) {
-    if (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.generators);
-}
-const defaultConfig = {
-  port: 3e3,
-  rootDir: ".",
-  srcDir: "src",
-  entry: "app.ts",
-  serverEntry: "",
-  procedureDir: "procedures",
-  procedureGlobPatterns: ["**/*.rpc.ts"],
-  generators: [],
-  buildDir: ".arri",
-  esbuild: {},
-  https: false,
-  http2: false,
-  devServer: {}
-};
-function defineConfig(config) {
-  return {
-    port: config.port ?? defaultConfig.port,
-    rootDir: config.rootDir ?? defaultConfig.rootDir,
-    srcDir: config.srcDir ?? defaultConfig.srcDir,
-    entry: config.entry ?? defaultConfig.entry,
-    procedureDir: config.procedureDir ?? defaultConfig.procedureDir,
-    procedureGlobPatterns: config.procedureGlobPatterns ?? defaultConfig.procedureGlobPatterns,
-    generators: config.generators ?? defaultConfig.generators,
-    buildDir: config.buildDir ?? defaultConfig.buildDir,
-    esbuild: config.esbuild ?? defaultConfig.esbuild,
-    serverEntry: config.serverEntry ?? "",
-    https: config.https ?? false,
-    http2: config.http2 ?? false,
-    devServer: config.devServer ?? {}
-  };
-}
-
 const logger = createConsola().withTag("arri");
 const GEN_APP_FILE = "__arri_app.ts";
 const GEN_SERVER_ENTRY_FILE = "__arri_server.ts";
@@ -158,7 +98,6 @@ async function getFsRouteBatch(glob, globPattern, config) {
     if (meta) {
       const importParts = path.relative(path.resolve(config.rootDir, config.buildDir), file).split(".");
       importParts.pop();
-      importParts.push("js");
       routes.push({
         name: meta.id,
         importName: camelCase(meta.id.split(".").join("_")),
@@ -209,6 +148,67 @@ function isInsideDir(dir, parentDir) {
   return false;
 }
 
+function isArriConfig(input) {
+  if (typeof input !== "object" || input === null) {
+    return false;
+  }
+  if ("generators" in input) {
+    if (!Array.isArray(input.generators)) {
+      return false;
+    }
+  }
+  if ("port" in input) {
+    if (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.generators);
+}
+const defaultConfig = {
+  port: 3e3,
+  rootDir: ".",
+  srcDir: "src",
+  entry: "app.ts",
+  serverEntry: "",
+  procedureDir: "procedures",
+  procedureGlobPatterns: ["**/*.rpc.ts"],
+  generators: [],
+  buildDir: ".arri",
+  esbuild: {},
+  https: false,
+  http2: false,
+  devServer: {}
+};
+function defineConfig(config) {
+  return {
+    port: config.port ?? defaultConfig.port,
+    rootDir: config.rootDir ?? defaultConfig.rootDir,
+    srcDir: config.srcDir ?? defaultConfig.srcDir,
+    entry: config.entry ?? defaultConfig.entry,
+    procedureDir: config.procedureDir ?? defaultConfig.procedureDir,
+    procedureGlobPatterns: config.procedureGlobPatterns ?? defaultConfig.procedureGlobPatterns,
+    generators: config.generators ?? defaultConfig.generators,
+    buildDir: config.buildDir ?? defaultConfig.buildDir,
+    esbuild: config.esbuild ?? defaultConfig.esbuild,
+    serverEntry: config.serverEntry ?? "",
+    https: config.https ?? false,
+    http2: config.http2 ?? false,
+    devServer: config.devServer ?? {}
+  };
+}
+
 const DEV_ENDPOINT_ROOT = `/__arri_dev__`;
 const DEV_DEFINITION_ENDPOINT = `${DEV_ENDPOINT_ROOT}/__definition`;
 const dev = defineCommand({

package/dist/shared/{arri.50f2646c.cjs → arri.bb661ad6.cjs}

@@ -7,6 +7,7 @@ const listhen = require('@joshmossas/listhen');
 const c12 = require('c12');
 const citty = require('citty');
 const esbuild = require('esbuild');
+require('h3');
 const ofetch = require('ofetch');
 const path = require('pathe');
 const consola = require('consola');
@@ -32,67 +33,6 @@ const esbuild__namespace = /*#__PURE__*/_interopNamespaceCompat(esbuild);
 const path__default = /*#__PURE__*/_interopDefaultCompat(path);
 const prettier__default = /*#__PURE__*/_interopDefaultCompat(prettier);
 
-function isArriConfig(input) {
-  if (typeof input !== "object" || input === null) {
-    return false;
-  }
-  if ("generators" in input) {
-    if (!Array.isArray(input.generators)) {
-      return false;
-    }
-  }
-  if ("port" in input) {
-    if (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.generators);
-}
-const defaultConfig = {
-  port: 3e3,
-  rootDir: ".",
-  srcDir: "src",
-  entry: "app.ts",
-  serverEntry: "",
-  procedureDir: "procedures",
-  procedureGlobPatterns: ["**/*.rpc.ts"],
-  generators: [],
-  buildDir: ".arri",
-  esbuild: {},
-  https: false,
-  http2: false,
-  devServer: {}
-};
-function defineConfig(config) {
-  return {
-    port: config.port ?? defaultConfig.port,
-    rootDir: config.rootDir ?? defaultConfig.rootDir,
-    srcDir: config.srcDir ?? defaultConfig.srcDir,
-    entry: config.entry ?? defaultConfig.entry,
-    procedureDir: config.procedureDir ?? defaultConfig.procedureDir,
-    procedureGlobPatterns: config.procedureGlobPatterns ?? defaultConfig.procedureGlobPatterns,
-    generators: config.generators ?? defaultConfig.generators,
-    buildDir: config.buildDir ?? defaultConfig.buildDir,
-    esbuild: config.esbuild ?? defaultConfig.esbuild,
-    serverEntry: config.serverEntry ?? "",
-    https: config.https ?? false,
-    http2: config.http2 ?? false,
-    devServer: config.devServer ?? {}
-  };
-}
-
 const logger = consola.createConsola().withTag("arri");
 const GEN_APP_FILE = "__arri_app.ts";
 const GEN_SERVER_ENTRY_FILE = "__arri_server.ts";
@@ -179,7 +119,6 @@ async function getFsRouteBatch(glob, globPattern, config) {
     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("_")),
@@ -230,6 +169,67 @@ function isInsideDir(dir, parentDir) {
   return false;
 }
 
+function isArriConfig(input) {
+  if (typeof input !== "object" || input === null) {
+    return false;
+  }
+  if ("generators" in input) {
+    if (!Array.isArray(input.generators)) {
+      return false;
+    }
+  }
+  if ("port" in input) {
+    if (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.generators);
+}
+const defaultConfig = {
+  port: 3e3,
+  rootDir: ".",
+  srcDir: "src",
+  entry: "app.ts",
+  serverEntry: "",
+  procedureDir: "procedures",
+  procedureGlobPatterns: ["**/*.rpc.ts"],
+  generators: [],
+  buildDir: ".arri",
+  esbuild: {},
+  https: false,
+  http2: false,
+  devServer: {}
+};
+function defineConfig(config) {
+  return {
+    port: config.port ?? defaultConfig.port,
+    rootDir: config.rootDir ?? defaultConfig.rootDir,
+    srcDir: config.srcDir ?? defaultConfig.srcDir,
+    entry: config.entry ?? defaultConfig.entry,
+    procedureDir: config.procedureDir ?? defaultConfig.procedureDir,
+    procedureGlobPatterns: config.procedureGlobPatterns ?? defaultConfig.procedureGlobPatterns,
+    generators: config.generators ?? defaultConfig.generators,
+    buildDir: config.buildDir ?? defaultConfig.buildDir,
+    esbuild: config.esbuild ?? defaultConfig.esbuild,
+    serverEntry: config.serverEntry ?? "",
+    https: config.https ?? false,
+    http2: config.http2 ?? false,
+    devServer: config.devServer ?? {}
+  };
+}
+
 const DEV_ENDPOINT_ROOT = `/__arri_dev__`;
 const DEV_DEFINITION_ENDPOINT = `${DEV_ENDPOINT_ROOT}/__definition`;
 const dev = citty.defineCommand({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arri",
-  "version": "0.45.5",
+  "version": "0.45.7",
   "type": "module",
   "license": "MIT",
   "author": {
@@ -32,17 +32,18 @@
     "consola": "^3.2.3",
     "degit": "^2.8.4",
     "enquirer": "^2.4.1",
-    "esbuild": "^0.21.3",
+    "esbuild": "^0.21.4",
     "esbuild-plugin-replace": "^1.4.0",
     "globby": "^14.0.1",
+    "h3": "^1.11.1",
     "ofetch": "^1.3.4",
     "pathe": "^1.1.2",
     "prettier": "^3.2.5",
     "scule": "^1.3.0",
-    "@arrirpc/codegen-dart": "0.45.5",
-    "@arrirpc/codegen-utils": "0.45.5",
-    "@arrirpc/codegen-ts": "0.45.5",
-    "@arrirpc/codegen-kotlin": "0.45.5"
+    "@arrirpc/codegen-dart": "0.45.7",
+    "@arrirpc/codegen-kotlin": "0.45.7",
+    "@arrirpc/codegen-ts": "0.45.7",
+    "@arrirpc/codegen-utils": "0.45.7"
   },
   "devDependencies": {
     "@types/degit": "^2.8.6"