@orpc/client 0.0.0-next.f17a1a0 → 0.0.0-next.f4d410a

package/dist/{chunk-OGAGXWCU.js → shared/client.XAn8cDTM.mjs}

@@ -1,6 +1,7 @@
-// src/error.ts
-import { isObject } from "@orpc/shared";
-var COMMON_ORPC_ERROR_DEFS = {
+import { isObject, isTypescriptObject, retry } from '@orpc/shared';
+import { getEventMeta, withEventMeta } from '@orpc/standard-server';
+
+const COMMON_ORPC_ERROR_DEFS = {
   BAD_REQUEST: {
     status: 400,
     message: "Bad Request"
@@ -84,7 +85,7 @@ function fallbackORPCErrorStatus(code, status) {
 function fallbackORPCErrorMessage(code, message) {
   return message || COMMON_ORPC_ERROR_DEFS[code]?.message || code;
 }
-var ORPCError = class _ORPCError extends Error {
+class ORPCError extends Error {
   defined;
   code;
   status;
@@ -110,7 +111,7 @@ var ORPCError = class _ORPCError extends Error {
     };
   }
   static fromJSON(json, options) {
-    return new _ORPCError(json.code, {
+    return new ORPCError(json.code, {
       ...options,
       ...json
     });
@@ -125,7 +126,7 @@ var ORPCError = class _ORPCError extends Error {
     }
     return "defined" in json && typeof json.defined === "boolean" && "code" in json && typeof json.code === "string" && "status" in json && typeof json.status === "number" && "message" in json && typeof json.message === "string";
   }
-};
+}
 function isDefinedError(error) {
   return error instanceof ORPCError && error.defined;
 }
@@ -136,8 +137,7 @@ function toORPCError(error) {
   });
 }
 
-// src/event-iterator-state.ts
-var iteratorStates = /* @__PURE__ */ new WeakMap();
+const iteratorStates = /* @__PURE__ */ new WeakMap();
 function registerEventIteratorState(iterator, state) {
   iteratorStates.set(iterator, state);
 }
@@ -147,7 +147,8 @@ function updateEventIteratorStatus(state, status) {
     state.listeners.forEach((cb) => cb(status));
   }
 }
-function onEventIteratorStatusChange(iterator, callback, notifyImmediately = true) {
+function onEventIteratorStatusChange(iterator, callback, options = {}) {
+  const notifyImmediately = options.notifyImmediately ?? true;
   const state = iteratorStates.get(iterator);
   if (!state) {
     throw new Error("Iterator is not registered.");
@@ -164,9 +165,6 @@ function onEventIteratorStatusChange(iterator, callback, notifyImmediately = tru
   };
 }
 
-// src/event-iterator.ts
-import { getEventMeta, isEventMetaContainer, withEventMeta } from "@orpc/server-standard";
-import { retry } from "@orpc/shared";
 function mapEventIterator(iterator, maps) {
   return async function* () {
     try {
@@ -175,7 +173,7 @@ function mapEventIterator(iterator, maps) {
         let mappedValue = await maps.value(value, done);
         if (mappedValue !== value) {
           const meta = getEventMeta(value);
-          if (meta && isEventMetaContainer(mappedValue)) {
+          if (meta && isTypescriptObject(mappedValue)) {
             mappedValue = withEventMeta(mappedValue, meta);
           }
         }
@@ -188,7 +186,7 @@ function mapEventIterator(iterator, maps) {
       let mappedError = await maps.error(error);
       if (mappedError !== error) {
         const meta = getEventMeta(error);
-        if (meta && isEventMetaContainer(mappedError)) {
+        if (meta && isTypescriptObject(mappedError)) {
           mappedError = withEventMeta(mappedError, meta);
         }
       }
@@ -198,7 +196,7 @@ function mapEventIterator(iterator, maps) {
     }
   }();
 }
-var MAX_ALLOWED_RETRY_TIMES = 99;
+const MAX_ALLOWED_RETRY_TIMES = 99;
 function createAutoRetryEventIterator(initial, reconnect, initialLastEventId) {
   const state = {
     status: "connected",
@@ -232,7 +230,7 @@ function createAutoRetryEventIterator(initial, reconnect, initialLastEventId) {
             retryTimes += 1;
             if (retryTimes > MAX_ALLOWED_RETRY_TIMES) {
               throw exit(new Error(
-                `Exceeded maximum retry attempts (${MAX_ALLOWED_RETRY_TIMES}) for event source. Possible infinite retry loop detected. Please review the retry logic.`,
+                `Exceeded maximum retry attempts (${MAX_ALLOWED_RETRY_TIMES}) for event iterator. Possible infinite retry loop detected. Please review the retry logic.`,
                 { cause: currentError }
               ));
             }
@@ -265,17 +263,4 @@ function createAutoRetryEventIterator(initial, reconnect, initialLastEventId) {
   return iterator;
 }
 
-export {
-  COMMON_ORPC_ERROR_DEFS,
-  fallbackORPCErrorStatus,
-  fallbackORPCErrorMessage,
-  ORPCError,
-  isDefinedError,
-  toORPCError,
-  registerEventIteratorState,
-  updateEventIteratorStatus,
-  onEventIteratorStatusChange,
-  mapEventIterator,
-  createAutoRetryEventIterator
-};
-//# sourceMappingURL=chunk-OGAGXWCU.js.map
+export { COMMON_ORPC_ERROR_DEFS as C, ORPCError as O, fallbackORPCErrorMessage as a, createAutoRetryEventIterator as c, fallbackORPCErrorStatus as f, isDefinedError as i, mapEventIterator as m, onEventIteratorStatusChange as o, registerEventIteratorState as r, toORPCError as t, updateEventIteratorStatus as u };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/client",
   "type": "module",
-  "version": "0.0.0-next.f17a1a0",
+  "version": "0.0.0-next.f4d410a",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -15,44 +15,34 @@
   ],
   "exports": {
     ".": {
-      "types": "./dist/src/index.d.ts",
-      "import": "./dist/index.js",
-      "default": "./dist/index.js"
+      "types": "./dist/index.d.mts",
+      "import": "./dist/index.mjs",
+      "default": "./dist/index.mjs"
     },
-    "./openapi": {
-      "types": "./dist/src/openapi/index.d.ts",
-      "import": "./dist/openapi.js",
-      "default": "./dist/openapi.js"
-    },
-    "./rpc": {
-      "types": "./dist/src/rpc/index.d.ts",
-      "import": "./dist/rpc.js",
-      "default": "./dist/rpc.js"
+    "./standard": {
+      "types": "./dist/adapters/standard/index.d.mts",
+      "import": "./dist/adapters/standard/index.mjs",
+      "default": "./dist/adapters/standard/index.mjs"
     },
     "./fetch": {
-      "types": "./dist/src/adapters/fetch/index.d.ts",
-      "import": "./dist/fetch.js",
-      "default": "./dist/fetch.js"
-    },
-    "./🔒/*": {
-      "types": "./dist/src/*.d.ts"
+      "types": "./dist/adapters/fetch/index.d.mts",
+      "import": "./dist/adapters/fetch/index.mjs",
+      "default": "./dist/adapters/fetch/index.mjs"
     }
   },
   "files": [
-    "!**/*.map",
-    "!**/*.tsbuildinfo",
     "dist"
   ],
   "dependencies": {
-    "@orpc/server-standard": "^0.4.0",
-    "@orpc/server-standard-fetch": "^0.4.0",
-    "@orpc/shared": "0.0.0-next.f17a1a0"
+    "@orpc/shared": "0.0.0-next.f4d410a",
+    "@orpc/standard-server": "0.0.0-next.f4d410a",
+    "@orpc/standard-server-fetch": "0.0.0-next.f4d410a"
   },
   "devDependencies": {
-    "zod": "^3.24.1"
+    "zod": "^3.24.2"
   },
   "scripts": {
-    "build": "tsup --onSuccess='tsc -b --noCheck'",
+    "build": "unbuild",
     "build:watch": "pnpm run build --watch",
     "type:check": "tsc -b"
   }

package/dist/chunk-4FUUNP74.js

@@ -1,212 +0,0 @@
-import {
-  ORPCError,
-  mapEventIterator,
-  toORPCError
-} from "./chunk-OGAGXWCU.js";
-
-// src/rpc/json-serializer.ts
-import { isObject } from "@orpc/shared";
-var RPCJsonSerializer = class {
-  serialize(data, segments = [], meta = [], maps = [], blobs = []) {
-    if (data instanceof Blob) {
-      maps.push(segments);
-      blobs.push(data);
-      return [data, meta, maps, blobs];
-    }
-    if (typeof data === "bigint") {
-      meta.push([0, segments]);
-      return [data.toString(), meta, maps, blobs];
-    }
-    if (data instanceof Date) {
-      meta.push([1, segments]);
-      if (Number.isNaN(data.getTime())) {
-        return [null, meta, maps, blobs];
-      }
-      return [data.toISOString(), meta, maps, blobs];
-    }
-    if (Number.isNaN(data)) {
-      meta.push([2, segments]);
-      return [null, meta, maps, blobs];
-    }
-    if (data instanceof URL) {
-      meta.push([4, segments]);
-      return [data.toString(), meta, maps, blobs];
-    }
-    if (data instanceof RegExp) {
-      meta.push([5, segments]);
-      return [data.toString(), meta, maps, blobs];
-    }
-    if (data instanceof Set) {
-      const result = this.serialize(Array.from(data), segments, meta, maps, blobs);
-      meta.push([6, segments]);
-      return result;
-    }
-    if (data instanceof Map) {
-      const result = this.serialize(Array.from(data.entries()), segments, meta, maps, blobs);
-      meta.push([7, segments]);
-      return result;
-    }
-    if (Array.isArray(data)) {
-      const json = data.map((v, i) => {
-        if (v === void 0) {
-          meta.push([3, [...segments, i]]);
-          return v;
-        }
-        return this.serialize(v, [...segments, i], meta, maps, blobs)[0];
-      });
-      return [json, meta, maps, blobs];
-    }
-    if (isObject(data)) {
-      const json = {};
-      for (const k in data) {
-        json[k] = this.serialize(data[k], [...segments, k], meta, maps, blobs)[0];
-      }
-      return [json, meta, maps, blobs];
-    }
-    return [data, meta, maps, blobs];
-  }
-  deserialize(json, meta, maps, getBlob) {
-    const ref = { data: json };
-    if (maps && getBlob) {
-      maps.forEach((segments, i) => {
-        let currentRef = ref;
-        let preSegment = "data";
-        segments.forEach((segment) => {
-          currentRef = currentRef[preSegment];
-          preSegment = segment;
-        });
-        currentRef[preSegment] = getBlob(i);
-      });
-    }
-    for (const [type, segments] of meta) {
-      let currentRef = ref;
-      let preSegment = "data";
-      segments.forEach((segment) => {
-        currentRef = currentRef[preSegment];
-        preSegment = segment;
-      });
-      switch (type) {
-        case 0:
-          currentRef[preSegment] = BigInt(currentRef[preSegment]);
-          break;
-        case 1:
-          currentRef[preSegment] = new Date(currentRef[preSegment] ?? "Invalid Date");
-          break;
-        case 2:
-          currentRef[preSegment] = Number.NaN;
-          break;
-        case 3:
-          currentRef[preSegment] = void 0;
-          break;
-        case 4:
-          currentRef[preSegment] = new URL(currentRef[preSegment]);
-          break;
-        case 5: {
-          const [, pattern, flags] = currentRef[preSegment].match(/^\/(.*)\/([a-z]*)$/);
-          currentRef[preSegment] = new RegExp(pattern, flags);
-          break;
-        }
-        case 6:
-          currentRef[preSegment] = new Set(currentRef[preSegment]);
-          break;
-        case 7:
-          currentRef[preSegment] = new Map(currentRef[preSegment]);
-          break;
-        /* v8 ignore next 3 */
-        default: {
-          const _expected = type;
-        }
-      }
-    }
-    return ref.data;
-  }
-};
-
-// src/rpc/serializer.ts
-import { ErrorEvent, isAsyncIteratorObject } from "@orpc/server-standard";
-var RPCSerializer = class {
-  constructor(jsonSerializer = new RPCJsonSerializer()) {
-    this.jsonSerializer = jsonSerializer;
-  }
-  serialize(data) {
-    if (isAsyncIteratorObject(data)) {
-      return mapEventIterator(data, {
-        value: async (value) => this.#serialize(value, false),
-        error: async (e) => {
-          if (e instanceof ErrorEvent) {
-            return new ErrorEvent({
-              data: this.#serialize(e.data, false),
-              cause: e
-            });
-          }
-          return new ErrorEvent({
-            data: this.#serialize(toORPCError(e).toJSON(), false),
-            cause: e
-          });
-        }
-      });
-    }
-    return this.#serialize(data, true);
-  }
-  #serialize(data, enableFormData) {
-    if (data === void 0 || data instanceof Blob) {
-      return data;
-    }
-    const [json, meta_, maps, blobs] = this.jsonSerializer.serialize(data);
-    const meta = meta_.length === 0 ? void 0 : meta_;
-    if (!enableFormData || blobs.length === 0) {
-      return {
-        json,
-        meta
-      };
-    }
-    const form = new FormData();
-    form.set("data", JSON.stringify({ json, meta, maps }));
-    blobs.forEach((blob, i) => {
-      form.set(i.toString(), blob);
-    });
-    return form;
-  }
-  deserialize(data) {
-    if (isAsyncIteratorObject(data)) {
-      return mapEventIterator(data, {
-        value: async (value) => this.#deserialize(value),
-        error: async (e) => {
-          if (!(e instanceof ErrorEvent)) {
-            return e;
-          }
-          const deserialized = this.#deserialize(e.data);
-          if (ORPCError.isValidJSON(deserialized)) {
-            return ORPCError.fromJSON(deserialized, { cause: e });
-          }
-          return new ErrorEvent({
-            data: deserialized,
-            cause: e
-          });
-        }
-      });
-    }
-    return this.#deserialize(data);
-  }
-  #deserialize(data) {
-    if (data === void 0 || data instanceof Blob) {
-      return data;
-    }
-    if (!(data instanceof FormData)) {
-      return this.jsonSerializer.deserialize(data.json, data.meta ?? []);
-    }
-    const serialized = JSON.parse(data.get("data"));
-    return this.jsonSerializer.deserialize(
-      serialized.json,
-      serialized.meta ?? [],
-      serialized.maps,
-      (i) => data.get(i.toString())
-    );
-  }
-};
-
-export {
-  RPCJsonSerializer,
-  RPCSerializer
-};
-//# sourceMappingURL=chunk-4FUUNP74.js.map

package/dist/fetch.js

@@ -1,128 +0,0 @@
-import {
-  RPCSerializer
-} from "./chunk-4FUUNP74.js";
-import {
-  ORPCError,
-  createAutoRetryEventIterator
-} from "./chunk-OGAGXWCU.js";
-
-// src/adapters/fetch/rpc-link.ts
-import { isAsyncIteratorObject } from "@orpc/server-standard";
-import { toFetchBody, toStandardBody } from "@orpc/server-standard-fetch";
-import { trim, value } from "@orpc/shared";
-var InvalidEventSourceRetryResponse = class extends Error {
-};
-var RPCLink = class {
-  fetch;
-  rpcSerializer;
-  maxUrlLength;
-  fallbackMethod;
-  method;
-  headers;
-  url;
-  eventSourceMaxNumberOfRetries;
-  eventSourceRetryDelay;
-  eventSourceRetry;
-  constructor(options) {
-    this.fetch = options.fetch ?? globalThis.fetch.bind(globalThis);
-    this.rpcSerializer = options.rpcSerializer ?? new RPCSerializer();
-    this.maxUrlLength = options.maxUrlLength ?? 2083;
-    this.fallbackMethod = options.fallbackMethod ?? "POST";
-    this.url = options.url;
-    this.eventSourceMaxNumberOfRetries = options.eventSourceMaxNumberOfRetries ?? 5;
-    this.method = options.method ?? this.fallbackMethod;
-    this.headers = options.headers ?? {};
-    this.eventSourceRetry = options.eventSourceRetry ?? true;
-    this.eventSourceRetryDelay = options.eventSourceRetryDelay ?? (({ retryTimes, lastRetry }) => lastRetry ?? 1e3 * 2 ** retryTimes);
-  }
-  async call(path, input, options) {
-    const output = await this.performCall(path, input, options);
-    if (!isAsyncIteratorObject(output)) {
-      return output;
-    }
-    return createAutoRetryEventIterator(output, async (reconnectOptions) => {
-      if (options.signal?.aborted || reconnectOptions.retryTimes > this.eventSourceMaxNumberOfRetries) {
-        return null;
-      }
-      if (!await value(this.eventSourceRetry, reconnectOptions, options, path, input)) {
-        return null;
-      }
-      const delay = await value(this.eventSourceRetryDelay, reconnectOptions, options, path, input);
-      await new Promise((resolve) => setTimeout(resolve, delay));
-      const updatedOptions = { ...options, lastEventId: reconnectOptions.lastEventId };
-      const maybeIterator = await this.performCall(path, input, updatedOptions);
-      if (!isAsyncIteratorObject(maybeIterator)) {
-        throw new InvalidEventSourceRetryResponse("Invalid EventSource retry response");
-      }
-      return maybeIterator;
-    }, void 0);
-  }
-  async performCall(path, input, options) {
-    const encoded = await this.encodeRequest(path, input, options);
-    const fetchBody = toFetchBody(encoded.body, encoded.headers);
-    if (options.lastEventId !== void 0) {
-      encoded.headers.set("last-event-id", options.lastEventId);
-    }
-    const response = await this.fetch(encoded.url, {
-      method: encoded.method,
-      headers: encoded.headers,
-      body: fetchBody,
-      signal: options.signal
-    }, options, path, input);
-    const body = await toStandardBody(response);
-    const deserialized = (() => {
-      try {
-        return this.rpcSerializer.deserialize(body);
-      } catch (error) {
-        if (response.ok) {
-          throw new ORPCError("INTERNAL_SERVER_ERROR", {
-            message: "Invalid RPC response",
-            cause: error
-          });
-        }
-        throw new ORPCError(response.status.toString(), {
-          message: response.statusText
-        });
-      }
-    })();
-    if (!response.ok) {
-      if (ORPCError.isValidJSON(deserialized)) {
-        throw ORPCError.fromJSON(deserialized);
-      }
-      throw new ORPCError("INTERNAL_SERVER_ERROR", {
-        message: "Invalid RPC error response",
-        cause: deserialized
-      });
-    }
-    return deserialized;
-  }
-  async encodeRequest(path, input, options) {
-    const expectedMethod = await value(this.method, options, path, input);
-    const headers = new Headers(await value(this.headers, options, path, input));
-    const url = new URL(`${trim(this.url, "/")}/${path.map(encodeURIComponent).join("/")}`);
-    const serialized = this.rpcSerializer.serialize(input);
-    if (expectedMethod === "GET" && !(serialized instanceof FormData) && !(serialized instanceof Blob) && !isAsyncIteratorObject(serialized)) {
-      const getUrl = new URL(url);
-      getUrl.searchParams.append("data", JSON.stringify(serialized) ?? "");
-      if (getUrl.toString().length <= this.maxUrlLength) {
-        return {
-          body: void 0,
-          method: expectedMethod,
-          headers,
-          url: getUrl
-        };
-      }
-    }
-    return {
-      url,
-      method: expectedMethod === "GET" ? this.fallbackMethod : expectedMethod,
-      headers,
-      body: serialized
-    };
-  }
-};
-export {
-  InvalidEventSourceRetryResponse,
-  RPCLink
-};
-//# sourceMappingURL=fetch.js.map