@orpc/client 0.0.0-next.84e58e0 → 0.0.0-next.85df466

package/README.md

@@ -1,5 +1,5 @@
 <div align="center">
-  <image align="center" src="https://orpc.unnoq.com/logo.webp" width=280 />
+  <image align="center" src="https://orpc.unnoq.com/logo.webp" width=280 alt="oRPC logo" />
 </div>
 
 <h1></h1>

package/dist/adapters/fetch/index.d.mts

@@ -1,7 +1,7 @@
 import { Value } from '@orpc/shared';
 import { ToFetchBodyOptions } from '@orpc/standard-server-fetch';
 import { C as ClientContext, a as ClientOptionsOut, E as EventIteratorReconnectOptions, b as ClientLink } from '../../shared/client.D_CzLDyB.mjs';
-import { RPCSerializer } from '../../rpc/index.mjs';
+import { RPCSerializer } from '../standard/index.mjs';
 
 interface FetchWithContext<TClientContext extends ClientContext> {
     (url: URL, init: RequestInit, options: ClientOptionsOut<TClientContext>, path: readonly string[], input: unknown): Promise<Response>;

package/dist/adapters/fetch/index.d.ts

@@ -1,7 +1,7 @@
 import { Value } from '@orpc/shared';
 import { ToFetchBodyOptions } from '@orpc/standard-server-fetch';
 import { C as ClientContext, a as ClientOptionsOut, E as EventIteratorReconnectOptions, b as ClientLink } from '../../shared/client.D_CzLDyB.js';
-import { RPCSerializer } from '../../rpc/index.js';
+import { RPCSerializer } from '../standard/index.js';
 
 interface FetchWithContext<TClientContext extends ClientContext> {
     (url: URL, init: RequestInit, options: ClientOptionsOut<TClientContext>, path: readonly string[], input: unknown): Promise<Response>;

package/dist/adapters/standard/index.mjs

@@ -0,0 +1,4 @@
+export { R as RPCJsonSerializer, a as RPCSerializer } from '../../shared/client.DHJ8vRIG.mjs';
+import '@orpc/shared';
+import '@orpc/standard-server';
+import '../../shared/client.Ly4zGQrc.mjs';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/client",
   "type": "module",
-  "version": "0.0.0-next.84e58e0",
+  "version": "0.0.0-next.85df466",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -19,15 +19,10 @@
       "import": "./dist/index.mjs",
       "default": "./dist/index.mjs"
     },
-    "./openapi": {
-      "types": "./dist/openapi/index.d.mts",
-      "import": "./dist/openapi/index.mjs",
-      "default": "./dist/openapi/index.mjs"
-    },
-    "./rpc": {
-      "types": "./dist/rpc/index.d.mts",
-      "import": "./dist/rpc/index.mjs",
-      "default": "./dist/rpc/index.mjs"
+    "./standard": {
+      "types": "./dist/adapters/standard/index.d.mts",
+      "import": "./dist/adapters/standard/index.mjs",
+      "default": "./dist/adapters/standard/index.mjs"
     },
     "./fetch": {
       "types": "./dist/adapters/fetch/index.d.mts",
@@ -39,9 +34,9 @@
     "dist"
   ],
   "dependencies": {
-    "@orpc/shared": "0.0.0-next.84e58e0",
-    "@orpc/standard-server": "0.0.0-next.84e58e0",
-    "@orpc/standard-server-fetch": "0.0.0-next.84e58e0"
+    "@orpc/shared": "0.0.0-next.85df466",
+    "@orpc/standard-server": "0.0.0-next.85df466",
+    "@orpc/standard-server-fetch": "0.0.0-next.85df466"
   },
   "devDependencies": {
     "zod": "^3.24.1"

package/dist/openapi/index.d.mts

@@ -1,27 +0,0 @@
-import { Segment } from '@orpc/shared';
-
-type BracketNotationSerialized = [string, unknown][];
-declare class BracketNotationSerializer {
-    serialize(data: unknown, segments?: Segment[], result?: BracketNotationSerialized): BracketNotationSerialized;
-    deserialize(serialized: BracketNotationSerialized): unknown;
-    stringifyPath(segments: readonly Segment[]): string;
-    parsePath(path: string): string[];
-}
-
-type OpenAPIJsonSerialized = [json: unknown, hasBlob: boolean];
-declare class OpenAPIJsonSerializer {
-    serialize(data: unknown, hasBlobRef?: {
-        value: boolean;
-    }): OpenAPIJsonSerialized;
-}
-
-declare class OpenAPISerializer {
-    #private;
-    private readonly jsonSerializer;
-    private readonly bracketNotation;
-    constructor(jsonSerializer?: OpenAPIJsonSerializer, bracketNotation?: BracketNotationSerializer);
-    serialize(data: unknown): unknown;
-    deserialize(data: unknown): unknown;
-}
-
-export { type BracketNotationSerialized, BracketNotationSerializer, type OpenAPIJsonSerialized, OpenAPIJsonSerializer, OpenAPISerializer };

package/dist/openapi/index.d.ts

@@ -1,27 +0,0 @@
-import { Segment } from '@orpc/shared';
-
-type BracketNotationSerialized = [string, unknown][];
-declare class BracketNotationSerializer {
-    serialize(data: unknown, segments?: Segment[], result?: BracketNotationSerialized): BracketNotationSerialized;
-    deserialize(serialized: BracketNotationSerialized): unknown;
-    stringifyPath(segments: readonly Segment[]): string;
-    parsePath(path: string): string[];
-}
-
-type OpenAPIJsonSerialized = [json: unknown, hasBlob: boolean];
-declare class OpenAPIJsonSerializer {
-    serialize(data: unknown, hasBlobRef?: {
-        value: boolean;
-    }): OpenAPIJsonSerialized;
-}
-
-declare class OpenAPISerializer {
-    #private;
-    private readonly jsonSerializer;
-    private readonly bracketNotation;
-    constructor(jsonSerializer?: OpenAPIJsonSerializer, bracketNotation?: BracketNotationSerializer);
-    serialize(data: unknown): unknown;
-    deserialize(data: unknown): unknown;
-}
-
-export { type BracketNotationSerialized, BracketNotationSerializer, type OpenAPIJsonSerialized, OpenAPIJsonSerializer, OpenAPISerializer };

package/dist/openapi/index.mjs

@@ -1,213 +0,0 @@
-import { isObject, isAsyncIteratorObject } from '@orpc/shared';
-import { ErrorEvent } from '@orpc/standard-server';
-import { m as mapEventIterator, t as toORPCError, O as ORPCError } from '../shared/client.Ly4zGQrc.mjs';
-
-class BracketNotationSerializer {
-  serialize(data, segments = [], result = []) {
-    if (Array.isArray(data)) {
-      data.forEach((item, i) => {
-        this.serialize(item, [...segments, i], result);
-      });
-    } else if (isObject(data)) {
-      for (const key in data) {
-        this.serialize(data[key], [...segments, key], result);
-      }
-    } else {
-      result.push([this.stringifyPath(segments), data]);
-    }
-    return result;
-  }
-  deserialize(serialized) {
-    const arrayPushStyles = /* @__PURE__ */ new WeakSet();
-    const ref = { value: [] };
-    for (const [path, value] of serialized) {
-      const segments = this.parsePath(path);
-      let currentRef = ref;
-      let nextSegment = "value";
-      segments.forEach((segment, i) => {
-        if (!Array.isArray(currentRef[nextSegment]) && !isObject(currentRef[nextSegment])) {
-          currentRef[nextSegment] = [];
-        }
-        if (i !== segments.length - 1) {
-          if (Array.isArray(currentRef[nextSegment]) && !isValidArrayIndex(segment)) {
-            currentRef[nextSegment] = { ...currentRef[nextSegment] };
-          }
-        } else {
-          if (Array.isArray(currentRef[nextSegment])) {
-            if (segment === "") {
-              if (currentRef[nextSegment].length && !arrayPushStyles.has(currentRef[nextSegment])) {
-                currentRef[nextSegment] = { ...currentRef[nextSegment] };
-              }
-            } else {
-              if (arrayPushStyles.has(currentRef[nextSegment])) {
-                currentRef[nextSegment] = { "": currentRef[nextSegment].at(-1) };
-              } else if (!isValidArrayIndex(segment)) {
-                currentRef[nextSegment] = { ...currentRef[nextSegment] };
-              }
-            }
-          }
-        }
-        currentRef = currentRef[nextSegment];
-        nextSegment = segment;
-      });
-      if (Array.isArray(currentRef)) {
-        if (nextSegment === "") {
-          arrayPushStyles.add(currentRef);
-          currentRef.push(value);
-        } else {
-          currentRef[Number(nextSegment)] = value;
-        }
-      } else {
-        currentRef[nextSegment] = value;
-      }
-    }
-    return ref.value;
-  }
-  stringifyPath(segments) {
-    return segments.map((segment) => {
-      return segment.toString().replace(/[\\[\]]/g, (match) => {
-        switch (match) {
-          case "\\":
-            return "\\\\";
-          case "[":
-            return "\\[";
-          case "]":
-            return "\\]";
-          /* v8 ignore next 2 */
-          default:
-            return match;
-        }
-      });
-    }).reduce((result, segment, i) => {
-      if (i === 0) {
-        return segment;
-      }
-      return `${result}[${segment}]`;
-    }, "");
-  }
-  parsePath(path) {
-    const segments = [];
-    let inBrackets = false;
-    let currentSegment = "";
-    let backslashCount = 0;
-    for (let i = 0; i < path.length; i++) {
-      const char = path[i];
-      const nextChar = path[i + 1];
-      if (inBrackets && char === "]" && (nextChar === void 0 || nextChar === "[") && backslashCount % 2 === 0) {
-        if (nextChar === void 0) {
-          inBrackets = false;
-        }
-        segments.push(currentSegment);
-        currentSegment = "";
-        i++;
-      } else if (segments.length === 0 && char === "[" && backslashCount % 2 === 0) {
-        inBrackets = true;
-        segments.push(currentSegment);
-        currentSegment = "";
-      } else if (char === "\\") {
-        backslashCount++;
-      } else {
-        currentSegment += "\\".repeat(backslashCount / 2) + char;
-        backslashCount = 0;
-      }
-    }
-    return inBrackets || segments.length === 0 ? [path] : segments;
-  }
-}
-function isValidArrayIndex(value) {
-  return /^0$|^[1-9]\d*$/.test(value);
-}
-
-class OpenAPIJsonSerializer {
-  serialize(data, hasBlobRef = { value: false }) {
-    if (data instanceof Blob) {
-      hasBlobRef.value = true;
-      return [data, hasBlobRef.value];
-    }
-    if (data instanceof Set) {
-      return this.serialize(Array.from(data), hasBlobRef);
-    }
-    if (data instanceof Map) {
-      return this.serialize(Array.from(data.entries()), hasBlobRef);
-    }
-    if (Array.isArray(data)) {
-      const json = data.map((v) => v === void 0 ? null : this.serialize(v, hasBlobRef)[0]);
-      return [json, hasBlobRef.value];
-    }
-    if (isObject(data)) {
-      const json = {};
-      for (const k in data) {
-        json[k] = this.serialize(data[k], hasBlobRef)[0];
-      }
-      return [json, hasBlobRef.value];
-    }
-    if (typeof data === "bigint" || data instanceof RegExp || data instanceof URL) {
-      return [data.toString(), hasBlobRef.value];
-    }
-    if (data instanceof Date) {
-      return [Number.isNaN(data.getTime()) ? null : data.toISOString(), hasBlobRef.value];
-    }
-    if (Number.isNaN(data)) {
-      return [null, hasBlobRef.value];
-    }
-    return [data, hasBlobRef.value];
-  }
-}
-
-class OpenAPISerializer {
-  constructor(jsonSerializer = new OpenAPIJsonSerializer(), bracketNotation = new BracketNotationSerializer()) {
-    this.jsonSerializer = jsonSerializer;
-    this.bracketNotation = bracketNotation;
-  }
-  serialize(data) {
-    if (isAsyncIteratorObject(data)) {
-      return mapEventIterator(data, {
-        value: async (value) => this.#serialize(value, false),
-        error: async (e) => {
-          return new ErrorEvent({
-            data: this.#serialize(toORPCError(e).toJSON(), false),
-            cause: e
-          });
-        }
-      });
-    }
-    return this.#serialize(data, true);
-  }
-  #serialize(data, enableFormData) {
-    if (data instanceof Blob || data === void 0) {
-      return data;
-    }
-    const [json, hasBlob] = this.jsonSerializer.serialize(data);
-    if (!enableFormData || !hasBlob) {
-      return json;
-    }
-    const form = new FormData();
-    for (const [path, value] of this.bracketNotation.serialize(json)) {
-      if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
-        form.append(path, value.toString());
-      } else if (value instanceof Blob) {
-        form.append(path, value);
-      }
-    }
-    return form;
-  }
-  deserialize(data) {
-    if (data instanceof URLSearchParams || data instanceof FormData) {
-      return this.bracketNotation.deserialize(Array.from(data.entries()));
-    }
-    if (isAsyncIteratorObject(data)) {
-      return mapEventIterator(data, {
-        value: async (value) => value,
-        error: async (e) => {
-          if (e instanceof ErrorEvent && ORPCError.isValidJSON(e.data)) {
-            return ORPCError.fromJSON(e.data, { cause: e });
-          }
-          return e;
-        }
-      });
-    }
-    return data;
-  }
-}
-
-export { BracketNotationSerializer, OpenAPIJsonSerializer, OpenAPISerializer };

package/dist/rpc/index.mjs

@@ -1,4 +0,0 @@
-export { R as RPCJsonSerializer, a as RPCSerializer } from '../shared/client.DHJ8vRIG.mjs';
-import '@orpc/shared';
-import '@orpc/standard-server';
-import '../shared/client.Ly4zGQrc.mjs';