arri 0.0.6 → 0.0.7

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

@@ -314,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)) &&
@@ -337,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)) &&
@@ -2306,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 = {}) {
@@ -2315,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 = {}) {
@@ -2372,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);
@@ -2412,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,}[^/\\]/;
@@ -2451,9 +2482,28 @@ function withTrailingSlash(input = "", queryParameters = false) {
   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 !== "/";
 }
@@ -2512,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,
@@ -2794,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;
     }
@@ -2818,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);
@@ -2829,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() {
@@ -3028,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"] || "";
@@ -3068,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]];
       }
@@ -3230,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) {
@@ -3241,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) {
@@ -3297,13 +3373,29 @@ 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) {
-    this["__is_event__"] = true;
+    __publicField$2(this, "__is_event__", true);
+    // Context
+    __publicField$2(this, "node");
+    // Node
+    __publicField$2(this, "web");
     // Web
-    this.context = {};
+    __publicField$2(this, "context", {});
+    // Shared
+    // Request
+    __publicField$2(this, "_method");
+    __publicField$2(this, "_path");
+    __publicField$2(this, "_headers");
+    __publicField$2(this, "_requestBody");
     // Response
-    this._handled = false;
+    __publicField$2(this, "_handled", false);
     this.node = { req, res };
   }
   // --- Request ---
@@ -3401,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)) {
@@ -8202,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;
@@ -8219,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) {
@@ -8654,6 +8760,7 @@ exports.isJsonSchemaObject = isJsonSchemaObject;
 exports.isJsonSchemaScalarType = isJsonSchemaScalarType;
 exports.isProcedureDefinition = isProcedureDefinition;
 exports.isRpc = isRpc;
+exports.isServiceDefinition = isServiceDefinition;
 exports.joinURL = joinURL;
 exports.kebabCase = kebabCase;
 exports.pascalCase = pascalCase;
@@ -8663,3 +8770,6 @@ 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.6",
+  "version": "0.0.7",
   "repository": {
     "url": "https://github.com/modiimedia/arri"
   }

package/dist/shared/{arri.c20aaf19.d.mts → 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.ts → 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.cts → 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;