arri 0.0.29 → 0.0.31

package/dist/chunks/index.cjs

@@ -35,14 +35,14 @@ require('node:v8');
 require('consola');
 require('esbuild');
 require('prettier');
-require('../shared/arri.50fd4bf9.cjs');
+require('../shared/arri.0d456112.cjs');
 require('@sinclair/typebox');
 require('h3');
 require('@sinclair/typebox/errors');
 require('@sinclair/typebox/value');
 require('../index.cjs');
 require('ofetch');
-require('../shared/arri.fa2beb45.cjs');
+require('../shared/arri.a8b148d1.cjs');
 require('child_process');
 require('listhen');
 

package/dist/chunks/index.mjs

@@ -33,14 +33,14 @@ import 'node:v8';
 import 'consola';
 import 'esbuild';
 import 'prettier';
-import '../shared/arri.e62071ea.mjs';
+import '../shared/arri.6f4fe9d8.mjs';
 import '@sinclair/typebox';
 import 'h3';
 import '@sinclair/typebox/errors';
 import '@sinclair/typebox/value';
 import '../index.mjs';
 import 'ofetch';
-import '../shared/arri.64252c62.mjs';
+import '../shared/arri.0f1b603c.mjs';
 import 'child_process';
 import 'listhen';
 

package/dist/cli.cjs

@@ -25,7 +25,7 @@ const require$$0$3 = require('stream');
 const consola = require('consola');
 const esbuild = require('esbuild');
 const prettier = require('prettier');
-const app = require('./shared/arri.50fd4bf9.cjs');
+const app = require('./shared/arri.0d456112.cjs');
 const index = require('./index.cjs');
 require('node:stream');
 const ofetch = require('ofetch');
@@ -33,7 +33,7 @@ require('@sinclair/typebox');
 require('h3');
 require('@sinclair/typebox/errors');
 require('@sinclair/typebox/value');
-const dart = require('./shared/arri.fa2beb45.cjs');
+const dart = require('./shared/arri.a8b148d1.cjs');
 const listhen = require('listhen');
 require('child_process');
 
@@ -19950,13 +19950,13 @@ const build = citty.defineCommand({
     if (!config) {
       throw new Error("Unable to find arri config");
     }
-    await startBuild(config);
+    await startBuild(config, args.skipCodegen);
   }
 });
 const logger$1 = consola.createConsola({
   fancy: true
 }).withTag("arri");
-async function startBuild(config) {
+async function startBuild(config, skipCodeGen = false) {
   logger$1.log("Bundling server....");
   await setupWorkingDir(config);
   await Promise.all([
@@ -19973,7 +19973,7 @@ async function startBuild(config) {
     config.buildDir,
     "codegen.js"
   );
-  if (clientCount > 0) {
+  if (clientCount > 0 && !skipCodeGen) {
     logger$1.log("Generating clients");
     node_child_process.execSync(`node ${codegenModule}`);
     const defJson = path__default$1.resolve(
@@ -20010,7 +20010,9 @@ async function bundleFiles$1(config) {
     sourcemap: true,
     minifyWhitespace: true,
     banner: {
-      js: "import { createRequire as topLevelCreateRequire } from 'module';\n const require = topLevelCreateRequire(import.meta.url);"
+      js: `import { createRequire as topLevelCreateRequire } from 'module';
+            const require = topLevelCreateRequire(import.meta.url);
+            const __dirname = new URL(".", import.meta.url).pathname;`
     },
     outdir: path__default$1.resolve(config.rootDir, ".output")
   });

package/dist/cli.mjs

@@ -23,7 +23,7 @@ import require$$0$3 from 'stream';
 import { createConsola } from 'consola';
 import { build as build$1 } from 'esbuild';
 import prettier from 'prettier';
-import { j as camelCase, r as removeDisallowedChars, o as kebabCase, k as isApplicationDef, D as DEV_DEFINITION_ENDPOINT } from './shared/arri.e62071ea.mjs';
+import { j as camelCase, r as removeDisallowedChars, o as kebabCase, k as isApplicationDef, D as DEV_DEFINITION_ENDPOINT } from './shared/arri.6f4fe9d8.mjs';
 import { defaultConfig } from './index.mjs';
 import 'node:stream';
 import { ofetch } from 'ofetch';
@@ -31,7 +31,7 @@ import '@sinclair/typebox';
 import 'h3';
 import '@sinclair/typebox/errors';
 import '@sinclair/typebox/value';
-import { a as dartClientGenerator } from './shared/arri.64252c62.mjs';
+import { a as dartClientGenerator } from './shared/arri.0f1b603c.mjs';
 import { listenAndWatch } from 'listhen';
 import 'child_process';
 
@@ -19929,13 +19929,13 @@ const build = defineCommand({
     if (!config) {
       throw new Error("Unable to find arri config");
     }
-    await startBuild(config);
+    await startBuild(config, args.skipCodegen);
   }
 });
 const logger$1 = createConsola({
   fancy: true
 }).withTag("arri");
-async function startBuild(config) {
+async function startBuild(config, skipCodeGen = false) {
   logger$1.log("Bundling server....");
   await setupWorkingDir(config);
   await Promise.all([
@@ -19952,7 +19952,7 @@ async function startBuild(config) {
     config.buildDir,
     "codegen.js"
   );
-  if (clientCount > 0) {
+  if (clientCount > 0 && !skipCodeGen) {
     logger$1.log("Generating clients");
     execSync(`node ${codegenModule}`);
     const defJson = path$e.resolve(
@@ -19989,7 +19989,9 @@ async function bundleFiles$1(config) {
     sourcemap: true,
     minifyWhitespace: true,
     banner: {
-      js: "import { createRequire as topLevelCreateRequire } from 'module';\n const require = topLevelCreateRequire(import.meta.url);"
+      js: `import { createRequire as topLevelCreateRequire } from 'module';
+            const require = topLevelCreateRequire(import.meta.url);
+            const __dirname = new URL(".", import.meta.url).pathname;`
     },
     outdir: path$e.resolve(config.rootDir, ".output")
   });

package/dist/codegen.cjs

@@ -2,8 +2,8 @@
 
 const require$$0 = require('fs');
 const prettier = require('prettier');
-const app = require('./shared/arri.50fd4bf9.cjs');
-const dart = require('./shared/arri.fa2beb45.cjs');
+const app = require('./shared/arri.0d456112.cjs');
+const dart = require('./shared/arri.a8b148d1.cjs');
 require('@sinclair/typebox');
 require('h3');
 require('@sinclair/typebox/errors');

package/dist/codegen.mjs

@@ -1,9 +1,9 @@
 import { writeFileSync } from 'fs';
 import { format } from 'prettier';
-import { u as unflattenObject, i as isServiceDef, p as pascalCase, a as isProcedureDef, b as isJsonSchemaScalarType, c as isJsonSchemaNullType, d as isJsonSchemaObject, e as isJsonSchemaRecord, f as isJsonSchemaEnum, g as isJsonSchemaArray, h as unflattenProcedures, j as camelCase } from './shared/arri.e62071ea.mjs';
-export { m as JsonSchemaComplexTypeValues, l as JsonSchemaNullTypeValues, J as JsonSchemaScalarTypeValues, k as isApplicationDef, n as normalizeWhitespace, r as removeDisallowedChars, s as setNestedObjectProperty } from './shared/arri.e62071ea.mjs';
-import { d as defineClientGeneratorPlugin } from './shared/arri.64252c62.mjs';
-export { j as classListTransformer, i as classTransformer, c as createDartClient, a as dartClientGenerator, f as dartModelFromJsonSchema, h as dartParsedJsonField, e as dartProcedureFromServiceDefinition, g as dartPropertyTypeFromSchema, b as dartServiceFromServiceDefinition, k as isDartType, l as isDartTypeWithNullables, t as transformers } from './shared/arri.64252c62.mjs';
+import { u as unflattenObject, i as isServiceDef, p as pascalCase, a as isProcedureDef, b as isJsonSchemaScalarType, c as isJsonSchemaNullType, d as isJsonSchemaObject, e as isJsonSchemaRecord, f as isJsonSchemaEnum, g as isJsonSchemaArray, h as unflattenProcedures, j as camelCase } from './shared/arri.6f4fe9d8.mjs';
+export { m as JsonSchemaComplexTypeValues, l as JsonSchemaNullTypeValues, J as JsonSchemaScalarTypeValues, k as isApplicationDef, n as normalizeWhitespace, r as removeDisallowedChars, s as setNestedObjectProperty } from './shared/arri.6f4fe9d8.mjs';
+import { d as defineClientGeneratorPlugin } from './shared/arri.0f1b603c.mjs';
+export { j as classListTransformer, i as classTransformer, c as createDartClient, a as dartClientGenerator, f as dartModelFromJsonSchema, h as dartParsedJsonField, e as dartProcedureFromServiceDefinition, g as dartPropertyTypeFromSchema, b as dartServiceFromServiceDefinition, k as isDartType, l as isDartTypeWithNullables, t as transformers } from './shared/arri.0f1b603c.mjs';
 import '@sinclair/typebox';
 import 'h3';
 import '@sinclair/typebox/errors';

package/dist/index.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-const app = require('./shared/arri.50fd4bf9.cjs');
+const app = require('./shared/arri.0d456112.cjs');
 require('@sinclair/typebox');
 require('h3');
 require('@sinclair/typebox/errors');

package/dist/index.mjs

@@ -1,4 +1,4 @@
-export { A as Arri, D as DEV_DEFINITION_ENDPOINT, q as DEV_ENDPOINT_ROOT, K as ErrorResponse, H as HttpMethodValues, x as createRpcDefinition, L as defineError, G as defineMiddleware, F as defineRoute, w as defineRpc, M as errorResponseFromValidationErrors, B as getRpcParamDefinition, z as getRpcParamName, y as getRpcPath, C as getRpcResponseName, t as isHttpMethod, v as isRpc, I as registerRoute, E as registerRpc } from './shared/arri.e62071ea.mjs';
+export { A as Arri, D as DEV_DEFINITION_ENDPOINT, q as DEV_ENDPOINT_ROOT, K as ErrorResponse, H as HttpMethodValues, x as createRpcDefinition, L as defineError, G as defineMiddleware, F as defineRoute, w as defineRpc, M as errorResponseFromValidationErrors, B as getRpcParamDefinition, z as getRpcParamName, y as getRpcPath, C as getRpcResponseName, t as isHttpMethod, v as isRpc, I as registerRoute, E as registerRpc } from './shared/arri.6f4fe9d8.mjs';
 import '@sinclair/typebox';
 import 'h3';
 import '@sinclair/typebox/errors';

package/dist/shared/{arri.50fd4bf9.cjs → arri.0d456112.cjs}

@@ -623,6 +623,9 @@ function registerRpc(router, path, procedure, middleware, opts) {
       if (opts.onError) {
         await opts.onError(err, context, event);
       }
+      if (!event.handled) {
+        h3.sendError(event, err);
+      }
     }
     return "";
   });
@@ -714,6 +717,9 @@ function registerRoute(router, route, middleware, prefix, opts) {
       if (opts?.onError) {
         await opts.onError(err, context, event);
       }
+      if (!event.handled) {
+        h3.sendError(event, err);
+      }
     }
     return "";
   });
@@ -772,17 +778,58 @@ class Arri {
     this.onBeforeResponse = opts.onBeforeResponse;
     this.rpcRoutePrefix = opts?.rpcRoutePrefix ?? "";
     this.rpcDefinitionPath = opts?.rpcDefinitionPath ?? "__definition";
-    this.h3Router.get(
-      this.rpcRoutePrefix ? `/${this.rpcRoutePrefix}/${this.rpcDefinitionPath}`.split("//").join("/") : `/${this.rpcDefinitionPath}`,
-      h3.eventHandler((_) => this.getAppDefinition())
-    );
     this.h3App.use(this.h3Router);
+    this.registerRoute({
+      path: this.rpcRoutePrefix ? `/${this.rpcRoutePrefix}/${this.rpcDefinitionPath}`.split("//").join("/") : `/${this.rpcDefinitionPath}`,
+      method: "get",
+      handler: () => this.getAppDefinition()
+    });
     if (process.env.ARRI_DEV_MODE === "true") {
-      this.h3Router.get(
-        DEV_DEFINITION_ENDPOINT,
-        h3.eventHandler((_) => this.getAppDefinition())
-      );
+      this.registerRoute({
+        path: DEV_DEFINITION_ENDPOINT,
+        method: "get",
+        handler: () => this.getAppDefinition()
+      });
     }
+    this.h3Router.use(
+      "/**",
+      h3.eventHandler(async (event) => {
+        const error = defineError(404);
+        const query = h3.getQuery(event);
+        const disallowedBodyMethods = ["GET", "HEAD", "OPTION"];
+        const canBody = !disallowedBodyMethods.includes(event.method);
+        const context = {
+          type: "route",
+          params: event.context.params,
+          query,
+          // eslint-disable-next-line @typescript-eslint/no-confusing-void-expression
+          body: canBody ? await h3.readBody(event).catch((_) => void 0) : void 0
+        };
+        try {
+          if (this.middlewares.length) {
+            for (const m of this.middlewares) {
+              await m(context, event);
+            }
+          }
+        } catch (_) {
+        }
+        if (this.onError) {
+          await this.onError(
+            error,
+            {
+              type: "route",
+              params: void 0,
+              query: void 0,
+              body: void 0
+            },
+            event
+          );
+        }
+        if (!event.handled) {
+          h3.sendError(event, error);
+        }
+      })
+    );
   }
   registerMiddleware(middleware) {
     this.middlewares.push(middleware);

package/dist/shared/{arri.64252c62.mjs → arri.0f1b603c.mjs}

@@ -1,6 +1,6 @@
 import { execSync } from 'child_process';
 import { writeFileSync } from 'fs';
-import { h as unflattenProcedures, i as isServiceDef, p as pascalCase, j as camelCase, a as isProcedureDef, d as isJsonSchemaObject, f as isJsonSchemaEnum, c as isJsonSchemaNullType, b as isJsonSchemaScalarType, e as isJsonSchemaRecord, g as isJsonSchemaArray } from './arri.e62071ea.mjs';
+import { h as unflattenProcedures, i as isServiceDef, p as pascalCase, j as camelCase, a as isProcedureDef, d as isJsonSchemaObject, f as isJsonSchemaEnum, c as isJsonSchemaNullType, b as isJsonSchemaScalarType, e as isJsonSchemaRecord, g as isJsonSchemaArray } from './arri.6f4fe9d8.mjs';
 
 function defineClientGeneratorPlugin(plugin) {
   return plugin;

package/dist/shared/{arri.e62071ea.mjs → arri.6f4fe9d8.mjs}

@@ -1,5 +1,5 @@
 import { Type, TypeGuard } from '@sinclair/typebox';
-import { createError, eventHandler, isPreflightRequest, readValidatedBody, getValidatedQuery, setResponseHeader, send, createRouter, createApp } from 'h3';
+import { createError, eventHandler, isPreflightRequest, readValidatedBody, getValidatedQuery, setResponseHeader, send, sendError, createRouter, createApp, getQuery, readBody } from 'h3';
 import { ValueErrorType } from '@sinclair/typebox/errors';
 import { Value } from '@sinclair/typebox/value';
 
@@ -621,6 +621,9 @@ function registerRpc(router, path, procedure, middleware, opts) {
       if (opts.onError) {
         await opts.onError(err, context, event);
       }
+      if (!event.handled) {
+        sendError(event, err);
+      }
     }
     return "";
   });
@@ -712,6 +715,9 @@ function registerRoute(router, route, middleware, prefix, opts) {
       if (opts?.onError) {
         await opts.onError(err, context, event);
       }
+      if (!event.handled) {
+        sendError(event, err);
+      }
     }
     return "";
   });
@@ -770,17 +776,58 @@ class Arri {
     this.onBeforeResponse = opts.onBeforeResponse;
     this.rpcRoutePrefix = opts?.rpcRoutePrefix ?? "";
     this.rpcDefinitionPath = opts?.rpcDefinitionPath ?? "__definition";
-    this.h3Router.get(
-      this.rpcRoutePrefix ? `/${this.rpcRoutePrefix}/${this.rpcDefinitionPath}`.split("//").join("/") : `/${this.rpcDefinitionPath}`,
-      eventHandler((_) => this.getAppDefinition())
-    );
     this.h3App.use(this.h3Router);
+    this.registerRoute({
+      path: this.rpcRoutePrefix ? `/${this.rpcRoutePrefix}/${this.rpcDefinitionPath}`.split("//").join("/") : `/${this.rpcDefinitionPath}`,
+      method: "get",
+      handler: () => this.getAppDefinition()
+    });
     if (process.env.ARRI_DEV_MODE === "true") {
-      this.h3Router.get(
-        DEV_DEFINITION_ENDPOINT,
-        eventHandler((_) => this.getAppDefinition())
-      );
+      this.registerRoute({
+        path: DEV_DEFINITION_ENDPOINT,
+        method: "get",
+        handler: () => this.getAppDefinition()
+      });
     }
+    this.h3Router.use(
+      "/**",
+      eventHandler(async (event) => {
+        const error = defineError(404);
+        const query = getQuery(event);
+        const disallowedBodyMethods = ["GET", "HEAD", "OPTION"];
+        const canBody = !disallowedBodyMethods.includes(event.method);
+        const context = {
+          type: "route",
+          params: event.context.params,
+          query,
+          // eslint-disable-next-line @typescript-eslint/no-confusing-void-expression
+          body: canBody ? await readBody(event).catch((_) => void 0) : void 0
+        };
+        try {
+          if (this.middlewares.length) {
+            for (const m of this.middlewares) {
+              await m(context, event);
+            }
+          }
+        } catch (_) {
+        }
+        if (this.onError) {
+          await this.onError(
+            error,
+            {
+              type: "route",
+              params: void 0,
+              query: void 0,
+              body: void 0
+            },
+            event
+          );
+        }
+        if (!event.handled) {
+          sendError(event, error);
+        }
+      })
+    );
   }
   registerMiddleware(middleware) {
     this.middlewares.push(middleware);

package/dist/shared/{arri.fa2beb45.cjs → arri.a8b148d1.cjs}

@@ -2,7 +2,7 @@
 
 const child_process = require('child_process');
 const require$$0 = require('fs');
-const app = require('./arri.50fd4bf9.cjs');
+const app = require('./arri.0d456112.cjs');
 
 function defineClientGeneratorPlugin(plugin) {
   return plugin;

package/package.json

@@ -25,7 +25,7 @@
     "chokidar": "^3.5.3",
     "listhen": "^1.4.4"
   },
-  "version": "0.0.29",
+  "version": "0.0.31",
   "repository": {
     "url": "https://github.com/modiimedia/arri"
   }