arri 0.0.5 → 0.0.7

package/dist/shared/{arri.e2731572.cjs → arri.8e602d87.cjs}

@@ -2,6 +2,35 @@
 
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 
+function getDefaultExportFromCjs (x) {
+	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
+}
+
+function getAugmentedNamespace(n) {
+  if (n.__esModule) return n;
+  var f = n.default;
+	if (typeof f == "function") {
+		var a = function a () {
+			if (this instanceof a) {
+        return Reflect.construct(f, arguments, this.constructor);
+			}
+			return f.apply(this, arguments);
+		};
+		a.prototype = f.prototype;
+  } else a = {};
+  Object.defineProperty(a, '__esModule', {value: true});
+	Object.keys(n).forEach(function (k) {
+		var d = Object.getOwnPropertyDescriptor(n, k);
+		Object.defineProperty(a, k, d.get ? d : {
+			enumerable: true,
+			get: function () {
+				return n[k];
+			}
+		});
+	});
+	return a;
+}
+
 var typebox = {};
 
 (function (exports) {
@@ -285,7 +314,7 @@ var typebox = {};
 	    function TConstructor(schema) {
 	        // prettier-ignore
 	        return (TKindOf(schema, 'Constructor') &&
-	            schema.type === 'constructor' &&
+	            schema.type === 'Constructor' &&
 	            IsOptionalString(schema.$id) &&
 	            ValueGuard.IsArray(schema.parameters) &&
 	            schema.parameters.every(schema => TSchema(schema)) &&
@@ -308,7 +337,7 @@ var typebox = {};
 	    function TFunction(schema) {
 	        // prettier-ignore
 	        return (TKindOf(schema, 'Function') &&
-	            schema.type === 'function' &&
+	            schema.type === 'Function' &&
 	            IsOptionalString(schema.$id) &&
 	            ValueGuard.IsArray(schema.parameters) &&
 	            schema.parameters.every(schema => TSchema(schema)) &&
@@ -2277,7 +2306,7 @@ var typebox = {};
 	    /** `[JavaScript]` Creates a Constructor type */
 	    Constructor(parameters, returns, options) {
 	        const [clonedParameters, clonedReturns] = [TypeClone.Rest(parameters), TypeClone.Type(returns)];
-	        return this.Create({ ...options, [exports.Kind]: 'Constructor', type: 'constructor', parameters: clonedParameters, returns: clonedReturns });
+	        return this.Create({ ...options, [exports.Kind]: 'Constructor', type: 'Constructor', parameters: clonedParameters, returns: clonedReturns });
 	    }
 	    /** `[JavaScript]` Creates a Date type */
 	    Date(options = {}) {
@@ -2286,7 +2315,7 @@ var typebox = {};
 	    /** `[JavaScript]` Creates a Function type */
 	    Function(parameters, returns, options) {
 	        const [clonedParameters, clonedReturns] = [TypeClone.Rest(parameters), TypeClone.Type(returns)];
-	        return this.Create({ ...options, [exports.Kind]: 'Function', type: 'function', parameters: clonedParameters, returns: clonedReturns });
+	        return this.Create({ ...options, [exports.Kind]: 'Function', type: 'Function', parameters: clonedParameters, returns: clonedReturns });
 	    }
 	    /** `[JavaScript]` Extracts the InstanceType from the given Constructor type */
 	    InstanceType(schema, options = {}) {
@@ -2343,7 +2372,23 @@ var typebox = {};
 	exports.Type = new JavaScriptTypeBuilder(); 
 } (typebox));
 
+const HASH_RE = /#/g;
+const AMPERSAND_RE = /&/g;
+const EQUAL_RE = /=/g;
 const PLUS_RE = /\+/g;
+const ENC_CARET_RE = /%5e/gi;
+const ENC_BACKTICK_RE = /%60/gi;
+const ENC_PIPE_RE = /%7c/gi;
+const ENC_SPACE_RE = /%20/gi;
+function encode(text) {
+  return encodeURI("" + text).replace(ENC_PIPE_RE, "|");
+}
+function encodeQueryValue(input) {
+  return encode(typeof input === "string" ? input : JSON.stringify(input)).replace(PLUS_RE, "%2B").replace(ENC_SPACE_RE, "+").replace(HASH_RE, "%23").replace(AMPERSAND_RE, "%26").replace(ENC_BACKTICK_RE, "`").replace(ENC_CARET_RE, "^");
+}
+function encodeQueryKey(text) {
+  return encodeQueryValue(text).replace(EQUAL_RE, "%3D");
+}
 function decode(text = "") {
   try {
     return decodeURIComponent("" + text);
@@ -2383,6 +2428,21 @@ function parseQuery(parametersString = "") {
   }
   return object;
 }
+function encodeQueryItem(key, value) {
+  if (typeof value === "number" || typeof value === "boolean") {
+    value = String(value);
+  }
+  if (!value) {
+    return encodeQueryKey(key);
+  }
+  if (Array.isArray(value)) {
+    return value.map((_value) => `${encodeQueryKey(key)}=${encodeQueryValue(_value)}`).join("&");
+  }
+  return `${encodeQueryKey(key)}=${encodeQueryValue(value)}`;
+}
+function stringifyQuery(query) {
+  return Object.keys(query).filter((k) => query[k] !== void 0).map((k) => encodeQueryItem(k, query[k])).filter(Boolean).join("&");
+}
 const PROTOCOL_STRICT_REGEX = /^[\s\w\0+.-]{2,}:([/\\]{1,2})/;
 const PROTOCOL_REGEX = /^[\s\w\0+.-]{2,}:([/\\]{2})?/;
 const PROTOCOL_RELATIVE_REGEX = /^([/\\]\s*){2,}[^/\\]/;
@@ -2412,9 +2472,54 @@ function withoutTrailingSlash(input = "", queryParameters = false) {
   const [s0, ...s] = input.split("?");
   return (s0.slice(0, -1) || "/") + (s.length > 0 ? `?${s.join("?")}` : "");
 }
+function withTrailingSlash(input = "", queryParameters = false) {
+  if (!queryParameters) {
+    return input.endsWith("/") ? input : input + "/";
+  }
+  if (hasTrailingSlash(input, true)) {
+    return input || "/";
+  }
+  const [s0, ...s] = input.split("?");
+  return s0 + "/" + (s.length > 0 ? `?${s.join("?")}` : "");
+}
+function withBase(input, base) {
+  if (isEmptyURL(base) || hasProtocol(input)) {
+    return input;
+  }
+  const _base = withoutTrailingSlash(base);
+  if (input.startsWith(_base)) {
+    return input;
+  }
+  return joinURL(_base, input);
+}
+function withQuery(input, query) {
+  const parsed = parseURL(input);
+  const mergedQuery = { ...parseQuery(parsed.search), ...query };
+  parsed.search = stringifyQuery(mergedQuery);
+  return stringifyParsedURL(parsed);
+}
 function getQuery$1(input) {
   return parseQuery(parseURL(input).search);
 }
+function isEmptyURL(url) {
+  return !url || url === "/";
+}
+function isNonEmptyURL(url) {
+  return url && url !== "/";
+}
+const JOIN_LEADING_SLASH_RE = /^\.?\//;
+function joinURL(base, ...input) {
+  let url = base || "";
+  for (const segment of input.filter((url2) => isNonEmptyURL(url2))) {
+    if (url) {
+      const _segment = segment.replace(JOIN_LEADING_SLASH_RE, "");
+      url = withTrailingSlash(url) + _segment;
+    } else {
+      url = segment;
+    }
+  }
+  return url;
+}
 
 function parseURL(input = "", defaultProto) {
   const _specialProtoMatch = input.match(
@@ -2457,6 +2562,15 @@ function parsePath(input = "") {
     hash
   };
 }
+function stringifyParsedURL(parsed) {
+  const pathname = parsed.pathname || "";
+  const search = parsed.search ? (parsed.search.startsWith("?") ? "" : "?") + parsed.search : "";
+  const hash = parsed.hash || "";
+  const auth = parsed.auth ? parsed.auth + "@" : "";
+  const host = parsed.host || "";
+  const proto = parsed.protocol ? parsed.protocol + "//" : "";
+  return proto + auth + host + pathname + search + hash;
+}
 
 const NODE_TYPES = {
   NORMAL: 0,
@@ -2739,12 +2853,29 @@ function destr(value, options = {}) {
   }
 }
 
+function hasProp(obj, prop) {
+  try {
+    return prop in obj;
+  } catch {
+    return false;
+  }
+}
+
+var __defProp$1 = Object.defineProperty;
+var __defNormalProp$1 = (obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$1 = (obj, key, value) => {
+  __defNormalProp$1(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
 class H3Error extends Error {
   constructor(message, opts = {}) {
     super(message, opts);
-    this.statusCode = 500;
-    this.fatal = false;
-    this.unhandled = false;
+    __publicField$1(this, "statusCode", 500);
+    __publicField$1(this, "fatal", false);
+    __publicField$1(this, "unhandled", false);
+    __publicField$1(this, "statusMessage");
+    __publicField$1(this, "data");
+    __publicField$1(this, "cause");
     if (opts.cause && !this.cause) {
       this.cause = opts.cause;
     }
@@ -2763,7 +2894,7 @@ class H3Error extends Error {
     return obj;
   }
 }
-H3Error.__h3_error__ = true;
+__publicField$1(H3Error, "__h3_error__", true);
 function createError(input) {
   if (typeof input === "string") {
     return new H3Error(input);
@@ -2774,7 +2905,7 @@ function createError(input) {
   const err = new H3Error(input.message ?? input.statusMessage ?? "", {
     cause: input.cause || input
   });
-  if ("stack" in input) {
+  if (hasProp(input, "stack")) {
     try {
       Object.defineProperty(err, "stack", {
         get() {
@@ -2973,7 +3104,7 @@ function readRawBody(event, encoding = "utf8") {
 }
 async function readBody(event, options = {}) {
   const request = event.node.req;
-  if (ParsedBodySymbol in request) {
+  if (hasProp(request, ParsedBodySymbol)) {
     return request[ParsedBodySymbol];
   }
   const contentType = request.headers["content-type"] || "";
@@ -3013,7 +3144,7 @@ function _parseURLEncodedBody(body) {
   const form = new URLSearchParams(body);
   const parsedForm = /* @__PURE__ */ Object.create(null);
   for (const [key, value] of form.entries()) {
-    if (key in parsedForm) {
+    if (hasProp(parsedForm, key)) {
       if (!Array.isArray(parsedForm[key])) {
         parsedForm[key] = [parsedForm[key]];
       }
@@ -3175,7 +3306,7 @@ function sendStream(event, stream) {
     event._handled = true;
     return Promise.resolve();
   }
-  if ("pipeTo" in stream) {
+  if (hasProp(stream, "pipeTo") && typeof stream.pipeTo === "function") {
     return stream.pipeTo(
       new WritableStream({
         write(chunk) {
@@ -3186,7 +3317,7 @@ function sendStream(event, stream) {
       event.node.res.end();
     });
   }
-  if (typeof stream.pipe === "function") {
+  if (hasProp(stream, "pipe") && typeof stream.pipe === "function") {
     return new Promise((resolve, reject) => {
       stream.pipe(event.node.res);
       if (stream.on) {
@@ -3242,6 +3373,90 @@ function isPreflightRequest(event) {
   return event.method === "OPTIONS" && !!origin && !!accessControlRequestMethod;
 }
 
+var __defProp$2 = Object.defineProperty;
+var __defNormalProp$2 = (obj, key, value) => key in obj ? __defProp$2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$2 = (obj, key, value) => {
+  __defNormalProp$2(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
+class H3Event {
+  constructor(req, res) {
+    __publicField$2(this, "__is_event__", true);
+    // Context
+    __publicField$2(this, "node");
+    // Node
+    __publicField$2(this, "web");
+    // Web
+    __publicField$2(this, "context", {});
+    // Shared
+    // Request
+    __publicField$2(this, "_method");
+    __publicField$2(this, "_path");
+    __publicField$2(this, "_headers");
+    __publicField$2(this, "_requestBody");
+    // Response
+    __publicField$2(this, "_handled", false);
+    this.node = { req, res };
+  }
+  // --- Request ---
+  get method() {
+    if (!this._method) {
+      this._method = (this.node.req.method || "GET").toUpperCase();
+    }
+    return this._method;
+  }
+  get path() {
+    return this._path || this.node.req.url || "/";
+  }
+  get headers() {
+    if (!this._headers) {
+      this._headers = _normalizeNodeHeaders(this.node.req.headers);
+    }
+    return this._headers;
+  }
+  // --- Respoonse ---
+  get handled() {
+    return this._handled || this.node.res.writableEnded || this.node.res.headersSent;
+  }
+  respondWith(response) {
+    return Promise.resolve(response).then(
+      (_response) => sendWebResponse(this, _response)
+    );
+  }
+  // --- Utils ---
+  toString() {
+    return `[${this.method}] ${this.path}`;
+  }
+  toJSON() {
+    return this.toString();
+  }
+  // --- Deprecated ---
+  /** @deprecated Please use `event.node.req` instead. **/
+  get req() {
+    return this.node.req;
+  }
+  /** @deprecated Please use `event.node.res` instead. **/
+  get res() {
+    return this.node.res;
+  }
+}
+function createEvent(req, res) {
+  return new H3Event(req, res);
+}
+function _normalizeNodeHeaders(nodeHeaders) {
+  const headers = new Headers();
+  for (const [name, value] of Object.entries(nodeHeaders)) {
+    if (Array.isArray(value)) {
+      for (const item of value) {
+        headers.append(name, item);
+      }
+    } else if (value) {
+      headers.set(name, value);
+    }
+  }
+  return headers;
+}
+
 function defineEventHandler(handler) {
   if (typeof handler === "function") {
     return Object.assign(handler, { __is_handler__: true });
@@ -3278,7 +3493,7 @@ async function _callHandler(event, handler, hooks) {
 }
 const eventHandler = defineEventHandler;
 function isEventHandler(input) {
-  return "__is_handler__" in input;
+  return hasProp(input, "__is_handler__");
 }
 function toEventHandler(input, _, _route) {
   if (!isEventHandler(input)) {
@@ -3565,6 +3780,30 @@ function createRouter(opts = {}) {
   });
   return router;
 }
+function toNodeListener(app) {
+  const toNodeHandle = async function(req, res) {
+    const event = createEvent(req, res);
+    try {
+      await app.handler(event);
+    } catch (_error) {
+      const error = createError(_error);
+      if (!isError(_error)) {
+        error.unhandled = true;
+      }
+      if (app.options.onError) {
+        await app.options.onError(error, event);
+      }
+      if (event.handled) {
+        return;
+      }
+      if (error.unhandled || error.fatal) {
+        console.error("[h3]", error.fatal ? "[fatal]" : "[unhandled]", error);
+      }
+      await sendError(event, error, !!app.options.debug);
+    }
+  };
+  return toNodeHandle;
+}
 
 var value$1 = {};
 
@@ -8055,6 +8294,17 @@ function isProcedureDefinition(input) {
   }
   return isHttpMethod(input.method) && typeof input.path === "string" && (typeof input.params === "string" || typeof input.params === "undefined") && (typeof input.response === "string" || typeof input.response === "undefined");
 }
+function isServiceDefinition(input) {
+  if (typeof input !== "object") {
+    return false;
+  }
+  for (const key of Object.keys(input)) {
+    if (typeof input[key] !== "object") {
+      return false;
+    }
+  }
+  return true;
+}
 function unflattenObject(data) {
   if (Object(data) !== data || Array.isArray(data))
     return data;
@@ -8072,6 +8322,9 @@ function unflattenObject(data) {
   }
   return result[""] || result;
 }
+function unflattenProcedures(procedures) {
+  return unflattenObject(procedures);
+}
 const removeDisallowedChars = (input, disallowedChars) => {
   let result = input;
   for (const char of disallowedChars) {
@@ -8485,12 +8738,16 @@ exports.ArriServer = ArriServer;
 exports.ErrorResponse = ErrorResponse;
 exports.HttpMethodValues = HttpMethodValues;
 exports.camelCase = camelCase;
+exports.commonjsGlobal = commonjsGlobal;
 exports.createRpcDefinition = createRpcDefinition;
 exports.defineError = defineError;
 exports.defineMiddleware = defineMiddleware;
 exports.defineRoute = defineRoute;
 exports.defineRpc = defineRpc;
+exports.destr = destr;
 exports.errorResponseFromValidationErrors = errorResponseFromValidationErrors;
+exports.getAugmentedNamespace = getAugmentedNamespace;
+exports.getDefaultExportFromCjs = getDefaultExportFromCjs;
 exports.getRpcParamDefinition = getRpcParamDefinition;
 exports.getRpcParamName = getRpcParamName;
 exports.getRpcPath = getRpcPath;
@@ -8503,7 +8760,16 @@ exports.isJsonSchemaObject = isJsonSchemaObject;
 exports.isJsonSchemaScalarType = isJsonSchemaScalarType;
 exports.isProcedureDefinition = isProcedureDefinition;
 exports.isRpc = isRpc;
+exports.isServiceDefinition = isServiceDefinition;
+exports.joinURL = joinURL;
+exports.kebabCase = kebabCase;
 exports.pascalCase = pascalCase;
 exports.registerRoute = registerRoute;
 exports.registerRpc = registerRpc;
+exports.removeDisallowedChars = removeDisallowedChars;
+exports.toNodeListener = toNodeListener;
+exports.typebox = typebox;
 exports.unflattenObject = unflattenObject;
+exports.unflattenProcedures = unflattenProcedures;
+exports.withBase = withBase;
+exports.withQuery = withQuery;

package/package.json

@@ -11,17 +11,18 @@
     "arri": "./dist/cli.mjs"
   },
   "dependencies": {
-    "@sinclair/typebox": "^0.31.4",
-    "h3": "^1.8.0",
+    "@sinclair/typebox": "^0.31.5",
+    "h3": "^1.8.1",
     "scule": "^1.0.0",
     "citty": "^0.1.3",
+    "ofetch": "^1.3.3",
     "pathe": "^1.1.1",
     "globby": "^13.2.2",
     "c12": "^1.4.2",
     "chokidar": "^3.5.3",
-    "listhen": "^1.4.0"
+    "listhen": "^1.4.3"
   },
-  "version": "0.0.5",
+  "version": "0.0.7",
   "repository": {
     "url": "https://github.com/modiimedia/arri"
   }

package/dist/shared/{arri.c20aaf19.d.cts → arri.2ff96786.d.cts}

@@ -1,6 +1,13 @@
 import { TObject, Static, TVoid, TSchema } from '@sinclair/typebox';
 import { H3Event, Router, App, AppOptions } from 'h3';
 
+interface ApplicationDefinition {
+    schemaVersion: "0.0.1";
+    description: string;
+    procedures: Record<string, ProcedureDefinition>;
+    models: Record<string, JsonSchemaObject>;
+    errors: Omit<TObject, symbol>;
+}
 interface ProcedureDefinition {
     path: string;
     description?: string;
@@ -11,13 +18,6 @@ interface ProcedureDefinition {
 interface ServiceDefinition {
     [key: string]: ProcedureDefinition | ServiceDefinition;
 }
-interface ApplicationDefinition {
-    schemaVersion: "0.0.1";
-    description: string;
-    procedures: Record<string, ProcedureDefinition>;
-    models: Record<string, JsonSchemaObject>;
-    errors: Omit<TObject, symbol>;
-}
 declare const JsonSchemaScalarTypeValues: readonly ["integer", "number", "bigint", "string", "boolean", "Date"];
 declare const JsonSchemaNullTypeValues: readonly ["null", "undefined"];
 type JsonSchemaType = JsonSchemaScalarType | JsonSchemaNullType | JsonSchemaComplexType;

package/dist/shared/{arri.c20aaf19.d.mts → arri.2ff96786.d.mts}

@@ -1,6 +1,13 @@
 import { TObject, Static, TVoid, TSchema } from '@sinclair/typebox';
 import { H3Event, Router, App, AppOptions } from 'h3';
 
+interface ApplicationDefinition {
+    schemaVersion: "0.0.1";
+    description: string;
+    procedures: Record<string, ProcedureDefinition>;
+    models: Record<string, JsonSchemaObject>;
+    errors: Omit<TObject, symbol>;
+}
 interface ProcedureDefinition {
     path: string;
     description?: string;
@@ -11,13 +18,6 @@ interface ProcedureDefinition {
 interface ServiceDefinition {
     [key: string]: ProcedureDefinition | ServiceDefinition;
 }
-interface ApplicationDefinition {
-    schemaVersion: "0.0.1";
-    description: string;
-    procedures: Record<string, ProcedureDefinition>;
-    models: Record<string, JsonSchemaObject>;
-    errors: Omit<TObject, symbol>;
-}
 declare const JsonSchemaScalarTypeValues: readonly ["integer", "number", "bigint", "string", "boolean", "Date"];
 declare const JsonSchemaNullTypeValues: readonly ["null", "undefined"];
 type JsonSchemaType = JsonSchemaScalarType | JsonSchemaNullType | JsonSchemaComplexType;

package/dist/shared/{arri.c20aaf19.d.ts → arri.2ff96786.d.ts}

@@ -1,6 +1,13 @@
 import { TObject, Static, TVoid, TSchema } from '@sinclair/typebox';
 import { H3Event, Router, App, AppOptions } from 'h3';
 
+interface ApplicationDefinition {
+    schemaVersion: "0.0.1";
+    description: string;
+    procedures: Record<string, ProcedureDefinition>;
+    models: Record<string, JsonSchemaObject>;
+    errors: Omit<TObject, symbol>;
+}
 interface ProcedureDefinition {
     path: string;
     description?: string;
@@ -11,13 +18,6 @@ interface ProcedureDefinition {
 interface ServiceDefinition {
     [key: string]: ProcedureDefinition | ServiceDefinition;
 }
-interface ApplicationDefinition {
-    schemaVersion: "0.0.1";
-    description: string;
-    procedures: Record<string, ProcedureDefinition>;
-    models: Record<string, JsonSchemaObject>;
-    errors: Omit<TObject, symbol>;
-}
 declare const JsonSchemaScalarTypeValues: readonly ["integer", "number", "bigint", "string", "boolean", "Date"];
 declare const JsonSchemaNullTypeValues: readonly ["null", "undefined"];
 type JsonSchemaType = JsonSchemaScalarType | JsonSchemaNullType | JsonSchemaComplexType;