@orpc/shared 2.0.0-beta.36 → 2.0.0-beta.37

package/dist/index.d.mts

@@ -1,7 +1,7 @@
 import { Arrayable, Promisable } from 'type-fest';
 export { Arrayable, IsEqual, PartialDeep, Promisable, Writable } from 'type-fest';
 import { AsyncIteratorClass } from '@standard-server/shared';
-export { AbortError, AsyncCleanupFn, AsyncIteratorClass, AsyncIteratorClassNextFn, SequentialIdGenerator, getOrBind, isAsyncIteratorObject, isTypescriptObject, parseEmptyableJSON, sequential, sleep, stringifyJSON, toArray } from '@standard-server/shared';
+export { AbortError, AsyncCleanupFn, AsyncIteratorClass, AsyncIteratorClassNextFn, SequentialIdGenerator, getOrBind, isAsyncIteratorObject, isTypescriptObject, parseEmptyableJSON, safeDecodeURIComponent, safeEncodeURIComponent, sequential, sleep, stringifyJSON, toArray } from '@standard-server/shared';
 
 type MaybeOptionalOptions<TOptions> = object extends TOptions ? [options?: TOptions] : [options: TOptions];
 declare function resolveMaybeOptionalOptions<T>(rest: MaybeOptionalOptions<T>): T;
@@ -452,14 +452,5 @@ declare function asyncIteratorToStream<T>(iterator: AsyncIterator<T>): ReadableS
  */
 declare function asyncIteratorToUnproxiedDataStream<T>(iterator: AsyncIterator<T>): ReadableStream<T>;
 
-/**
- * `encodeURIComponent` that never throws, lone surrogates become U+FFFD.
- */
-declare function safeEncodeURIComponent(value: string): string;
-/**
- * `decodeURIComponent` that never throws, malformed input is returned unchanged.
- */
-declare function safeDecodeURIComponent(value: string): string;
-
-export { AsyncIdQueue, NullProtoObj, ORPC_NAME, allAbortSignal, anyAbortSignal, asyncIteratorToStream, asyncIteratorToUnproxiedDataStream, bindMethods, clone, compareSequentialIds, consumeAsyncIterator, defer, findDeepMatches, get, getConstructor, getConstructors, getOwn, getTracer, intercept, isAbortError, isAsyncGeneratorFunction, isCompressibleContentType, isDeepEqual, isNoTransformCacheControl, isPlainObject, isPropertyKey, loadBytes, matchesHttpPath, matchesHttpPathPrefix, mergeHttpPath, mergeTwoLevels, normalizeHttpPath, omit, onAsyncIteratorObjectError, onError, onFinish, onReadableStreamError, onStart, onSuccess, once, override, parseAcceptEncodingQualities, pathToHttpPath, promiseWithResolvers, recordSpanError, replicateAsyncIterator, replicateReadableStream, resolveMaybeOptionalOptions, runInSpanContext, runWithSignal, runWithSpan, safeDecodeURIComponent, safeEncodeURIComponent, set, setOwn, setSpanAttributeIfDefined, setTracer, sortPlugins, splitInHalf, startSpan, streamToAsyncIteratorObject, toSpanAttributeValue, toStringOrBytes, toTracingException, traceAsyncIterator, traceReadableStream, tryOrUndefined, value, varyByAcceptEncoding, wrapAsyncIterator, wrapReadableStream };
+export { AsyncIdQueue, NullProtoObj, ORPC_NAME, allAbortSignal, anyAbortSignal, asyncIteratorToStream, asyncIteratorToUnproxiedDataStream, bindMethods, clone, compareSequentialIds, consumeAsyncIterator, defer, findDeepMatches, get, getConstructor, getConstructors, getOwn, getTracer, intercept, isAbortError, isAsyncGeneratorFunction, isCompressibleContentType, isDeepEqual, isNoTransformCacheControl, isPlainObject, isPropertyKey, loadBytes, matchesHttpPath, matchesHttpPathPrefix, mergeHttpPath, mergeTwoLevels, normalizeHttpPath, omit, onAsyncIteratorObjectError, onError, onFinish, onReadableStreamError, onStart, onSuccess, once, override, parseAcceptEncodingQualities, pathToHttpPath, promiseWithResolvers, recordSpanError, replicateAsyncIterator, replicateReadableStream, resolveMaybeOptionalOptions, runInSpanContext, runWithSignal, runWithSpan, set, setOwn, setSpanAttributeIfDefined, setTracer, sortPlugins, splitInHalf, startSpan, streamToAsyncIteratorObject, toSpanAttributeValue, toStringOrBytes, toTracingException, traceAsyncIterator, traceReadableStream, tryOrUndefined, value, varyByAcceptEncoding, wrapAsyncIterator, wrapReadableStream };
 export type { AnyFunction, AsyncIdQueueCloseOptions, ConsumeAsyncIteratorOptions, InterceptableOptions, Interceptor, InterceptorOptions, IntersectPick, MaybeOptionalOptions, OnFinishState, OrderablePlugin, PromiseWithError, Public, ReadableStreamReadResult, Registry, Segment, StartSpanOptions, ThrowableError, Tracer, TracingAttributeValue, TracingException, TracingExceptionLevel, TracingHeaders, TracingSpan, Value, WrapAsyncIteratorOptions, WrapReadableStreamOptions };

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import { Arrayable, Promisable } from 'type-fest';
 export { Arrayable, IsEqual, PartialDeep, Promisable, Writable } from 'type-fest';
 import { AsyncIteratorClass } from '@standard-server/shared';
-export { AbortError, AsyncCleanupFn, AsyncIteratorClass, AsyncIteratorClassNextFn, SequentialIdGenerator, getOrBind, isAsyncIteratorObject, isTypescriptObject, parseEmptyableJSON, sequential, sleep, stringifyJSON, toArray } from '@standard-server/shared';
+export { AbortError, AsyncCleanupFn, AsyncIteratorClass, AsyncIteratorClassNextFn, SequentialIdGenerator, getOrBind, isAsyncIteratorObject, isTypescriptObject, parseEmptyableJSON, safeDecodeURIComponent, safeEncodeURIComponent, sequential, sleep, stringifyJSON, toArray } from '@standard-server/shared';
 
 type MaybeOptionalOptions<TOptions> = object extends TOptions ? [options?: TOptions] : [options: TOptions];
 declare function resolveMaybeOptionalOptions<T>(rest: MaybeOptionalOptions<T>): T;
@@ -452,14 +452,5 @@ declare function asyncIteratorToStream<T>(iterator: AsyncIterator<T>): ReadableS
  */
 declare function asyncIteratorToUnproxiedDataStream<T>(iterator: AsyncIterator<T>): ReadableStream<T>;
 
-/**
- * `encodeURIComponent` that never throws, lone surrogates become U+FFFD.
- */
-declare function safeEncodeURIComponent(value: string): string;
-/**
- * `decodeURIComponent` that never throws, malformed input is returned unchanged.
- */
-declare function safeDecodeURIComponent(value: string): string;
-
-export { AsyncIdQueue, NullProtoObj, ORPC_NAME, allAbortSignal, anyAbortSignal, asyncIteratorToStream, asyncIteratorToUnproxiedDataStream, bindMethods, clone, compareSequentialIds, consumeAsyncIterator, defer, findDeepMatches, get, getConstructor, getConstructors, getOwn, getTracer, intercept, isAbortError, isAsyncGeneratorFunction, isCompressibleContentType, isDeepEqual, isNoTransformCacheControl, isPlainObject, isPropertyKey, loadBytes, matchesHttpPath, matchesHttpPathPrefix, mergeHttpPath, mergeTwoLevels, normalizeHttpPath, omit, onAsyncIteratorObjectError, onError, onFinish, onReadableStreamError, onStart, onSuccess, once, override, parseAcceptEncodingQualities, pathToHttpPath, promiseWithResolvers, recordSpanError, replicateAsyncIterator, replicateReadableStream, resolveMaybeOptionalOptions, runInSpanContext, runWithSignal, runWithSpan, safeDecodeURIComponent, safeEncodeURIComponent, set, setOwn, setSpanAttributeIfDefined, setTracer, sortPlugins, splitInHalf, startSpan, streamToAsyncIteratorObject, toSpanAttributeValue, toStringOrBytes, toTracingException, traceAsyncIterator, traceReadableStream, tryOrUndefined, value, varyByAcceptEncoding, wrapAsyncIterator, wrapReadableStream };
+export { AsyncIdQueue, NullProtoObj, ORPC_NAME, allAbortSignal, anyAbortSignal, asyncIteratorToStream, asyncIteratorToUnproxiedDataStream, bindMethods, clone, compareSequentialIds, consumeAsyncIterator, defer, findDeepMatches, get, getConstructor, getConstructors, getOwn, getTracer, intercept, isAbortError, isAsyncGeneratorFunction, isCompressibleContentType, isDeepEqual, isNoTransformCacheControl, isPlainObject, isPropertyKey, loadBytes, matchesHttpPath, matchesHttpPathPrefix, mergeHttpPath, mergeTwoLevels, normalizeHttpPath, omit, onAsyncIteratorObjectError, onError, onFinish, onReadableStreamError, onStart, onSuccess, once, override, parseAcceptEncodingQualities, pathToHttpPath, promiseWithResolvers, recordSpanError, replicateAsyncIterator, replicateReadableStream, resolveMaybeOptionalOptions, runInSpanContext, runWithSignal, runWithSpan, set, setOwn, setSpanAttributeIfDefined, setTracer, sortPlugins, splitInHalf, startSpan, streamToAsyncIteratorObject, toSpanAttributeValue, toStringOrBytes, toTracingException, traceAsyncIterator, traceReadableStream, tryOrUndefined, value, varyByAcceptEncoding, wrapAsyncIterator, wrapReadableStream };
 export type { AnyFunction, AsyncIdQueueCloseOptions, ConsumeAsyncIteratorOptions, InterceptableOptions, Interceptor, InterceptorOptions, IntersectPick, MaybeOptionalOptions, OnFinishState, OrderablePlugin, PromiseWithError, Public, ReadableStreamReadResult, Registry, Segment, StartSpanOptions, ThrowableError, Tracer, TracingAttributeValue, TracingException, TracingExceptionLevel, TracingHeaders, TracingSpan, Value, WrapAsyncIteratorOptions, WrapReadableStreamOptions };

package/dist/index.mjs

@@ -1,5 +1,5 @@
-import { AbortError, AsyncIteratorClass, getOrBind, isTypescriptObject, isAsyncIteratorObject } from '@standard-server/shared';
-export { AbortError, AsyncIteratorClass, SequentialIdGenerator, getOrBind, isAsyncIteratorObject, isTypescriptObject, parseEmptyableJSON, sequential, sleep, stringifyJSON, toArray } from '@standard-server/shared';
+import { safeDecodeURIComponent, safeEncodeURIComponent, AbortError, AsyncIteratorClass, getOrBind, isTypescriptObject, isAsyncIteratorObject } from '@standard-server/shared';
+export { AbortError, AsyncIteratorClass, SequentialIdGenerator, getOrBind, isAsyncIteratorObject, isTypescriptObject, parseEmptyableJSON, safeDecodeURIComponent, safeEncodeURIComponent, sequential, sleep, stringifyJSON, toArray } from '@standard-server/shared';
 
 function resolveMaybeOptionalOptions(rest) {
   return rest[0] ?? {};
@@ -142,25 +142,6 @@ function tryOrUndefined(fn) {
   }
 }
 
-const LONE_SURROGATE_REGEX = /[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?<![\uD800-\uDBFF])[\uDC00-\uDFFF]/g;
-function safeEncodeURIComponent(value) {
-  try {
-    return encodeURIComponent(value);
-  } catch {
-    return encodeURIComponent(value.replace(LONE_SURROGATE_REGEX, "\uFFFD"));
-  }
-}
-function safeDecodeURIComponent(value) {
-  if (!value.includes("%")) {
-    return value;
-  }
-  try {
-    return decodeURIComponent(value);
-  } catch {
-    return value;
-  }
-}
-
 function pathToHttpPath(path) {
   return `/${path.map(safeEncodeURIComponent).join("/")}`;
 }
@@ -554,8 +535,8 @@ function findDeepMatches(check, payload, segments = [], maps = [], values = [])
       findDeepMatches(check, v, [...segments, i], maps, values);
     });
   } else if (isPlainObject(payload)) {
-    for (const [key, value] of Object.entries(payload)) {
-      findDeepMatches(check, value, [...segments, key], maps, values);
+    for (const key of Object.keys(payload)) {
+      findDeepMatches(check, payload[key], [...segments, key], maps, values);
     }
   }
   return { maps, values };
@@ -630,14 +611,14 @@ function mergeTwoLevels(first, second) {
     return second;
   }
   const result = { ...first, ...second };
-  for (const key in second) {
+  for (const key of Object.keys(second)) {
     if (!Object.hasOwn(first, key)) {
       continue;
     }
     const firstValue = first[key];
     const secondValue = second[key];
     if (isPlainObject(firstValue) && isPlainObject(secondValue)) {
-      setOwn(result, key, { ...firstValue, ...secondValue });
+      result[key] = { ...firstValue, ...secondValue };
     }
   }
   return result;
@@ -672,8 +653,8 @@ function cloneWithVisited(value, visited) {
     }
     const result = {};
     visited.set(value, result);
-    for (const [key, item] of Object.entries(value)) {
-      setOwn(result, key, cloneWithVisited(item, visited));
+    for (const key of Object.keys(value)) {
+      setOwn(result, key, cloneWithVisited(value[key], visited));
     }
     for (const sym of Object.getOwnPropertySymbols(value)) {
       setOwn(result, sym, cloneWithVisited(value[sym], visited));
@@ -955,71 +936,51 @@ function sortPlugins(plugins) {
       indices.push(i);
     }
   }
-  const graph = Array.from(
-    { length: pluginCount },
-    () => /* @__PURE__ */ new Set()
-  );
+  const dependencies = Array.from({ length: pluginCount }, () => []);
   for (let i = 0; i < pluginCount; i++) {
     const plugin = plugins[i];
-    const beforeList = plugin.before;
-    if (beforeList !== void 0) {
-      for (const beforeId of beforeList) {
+    if (plugin.before !== void 0) {
+      for (const beforeId of plugin.before) {
         const beforeIndices = pluginIdToIndices.get(beforeId);
-        if (beforeIndices === void 0)
-          continue;
-        for (const beforeIndex of beforeIndices) {
-          const beforeGraph = graph[beforeIndex];
-          if (beforeGraph !== void 0) {
-            beforeGraph.add(i);
+        if (beforeIndices !== void 0) {
+          for (const beforeIndex of beforeIndices) {
+            dependencies[beforeIndex].push(i);
           }
         }
       }
     }
-    const afterList = plugin.after;
-    if (afterList !== void 0) {
-      const currentGraph = graph[i];
-      if (currentGraph !== void 0) {
-        for (const afterId of afterList) {
-          const afterIndices = pluginIdToIndices.get(afterId);
-          if (afterIndices === void 0)
-            continue;
+    if (plugin.after !== void 0) {
+      for (const afterId of plugin.after) {
+        const afterIndices = pluginIdToIndices.get(afterId);
+        if (afterIndices !== void 0) {
           for (const afterIndex of afterIndices) {
-            currentGraph.add(afterIndex);
+            dependencies[i].push(afterIndex);
           }
         }
       }
     }
   }
   const sorted = [];
-  const visiting = /* @__PURE__ */ new Set();
-  const visited = /* @__PURE__ */ new Set();
-  function visit(index) {
-    if (visited.has(index))
-      return;
-    if (visiting.has(index)) {
-      const plugin2 = plugins[index];
-      const pluginId = plugin2 !== void 0 ? plugin2.name : "unknown";
-      throw new Error(`Circular dependency detected involving plugin "${pluginId}"`);
-    }
-    visiting.add(index);
-    const deps = graph[index];
-    if (deps !== void 0) {
-      for (const depIndex of deps) {
-        visit(depIndex);
-      }
-    }
-    visiting.delete(index);
-    visited.add(index);
-    const plugin = plugins[index];
-    if (plugin !== void 0) {
-      sorted.push(plugin);
+  const placed = /* @__PURE__ */ new Set();
+  while (sorted.length < pluginCount) {
+    const next = plugins.findIndex((_, i) => !placed.has(i) && dependencies[i].every((dependency) => placed.has(dependency)));
+    if (next === -1) {
+      throw new Error(`Circular dependency detected involving plugin "${findCyclicPlugin(plugins, dependencies, placed).name}"`);
     }
-  }
-  for (let i = 0; i < pluginCount; i++) {
-    visit(i);
+    placed.add(next);
+    sorted.push(plugins[next]);
   }
   return sorted;
 }
+function findCyclicPlugin(plugins, dependencies, placed) {
+  const seen = /* @__PURE__ */ new Set();
+  let current = plugins.findIndex((_, i) => !placed.has(i));
+  while (!seen.has(current)) {
+    seen.add(current);
+    current = dependencies[current].find((dependency) => !placed.has(dependency));
+  }
+  return plugins[current];
+}
 
 function allAbortSignal(signals) {
   const realSignals = signals.filter((signal) => signal !== void 0);
@@ -1090,4 +1051,4 @@ async function runWithSignal(signal, fn) {
   }
 }
 
-export { AsyncIdQueue, NullProtoObj, ORPC_NAME, allAbortSignal, anyAbortSignal, asyncIteratorToStream, asyncIteratorToUnproxiedDataStream, bindMethods, clone, compareSequentialIds, consumeAsyncIterator, defer, findDeepMatches, get, getConstructor, getConstructors, getOwn, getTracer, intercept, isAbortError, isAsyncGeneratorFunction, isCompressibleContentType, isDeepEqual, isNoTransformCacheControl, isPlainObject, isPropertyKey, loadBytes, matchesHttpPath, matchesHttpPathPrefix, mergeHttpPath, mergeTwoLevels, normalizeHttpPath, omit, onAsyncIteratorObjectError, onError, onFinish, onReadableStreamError, onStart, onSuccess, once, override, parseAcceptEncodingQualities, pathToHttpPath, promiseWithResolvers, recordSpanError, replicateAsyncIterator, replicateReadableStream, resolveMaybeOptionalOptions, runInSpanContext, runWithSignal, runWithSpan, safeDecodeURIComponent, safeEncodeURIComponent, set, setOwn, setSpanAttributeIfDefined, setTracer, sortPlugins, splitInHalf, startSpan, streamToAsyncIteratorObject, toSpanAttributeValue, toStringOrBytes, toTracingException, traceAsyncIterator, traceReadableStream, tryOrUndefined, value, varyByAcceptEncoding, wrapAsyncIterator, wrapReadableStream };
+export { AsyncIdQueue, NullProtoObj, ORPC_NAME, allAbortSignal, anyAbortSignal, asyncIteratorToStream, asyncIteratorToUnproxiedDataStream, bindMethods, clone, compareSequentialIds, consumeAsyncIterator, defer, findDeepMatches, get, getConstructor, getConstructors, getOwn, getTracer, intercept, isAbortError, isAsyncGeneratorFunction, isCompressibleContentType, isDeepEqual, isNoTransformCacheControl, isPlainObject, isPropertyKey, loadBytes, matchesHttpPath, matchesHttpPathPrefix, mergeHttpPath, mergeTwoLevels, normalizeHttpPath, omit, onAsyncIteratorObjectError, onError, onFinish, onReadableStreamError, onStart, onSuccess, once, override, parseAcceptEncodingQualities, pathToHttpPath, promiseWithResolvers, recordSpanError, replicateAsyncIterator, replicateReadableStream, resolveMaybeOptionalOptions, runInSpanContext, runWithSignal, runWithSpan, set, setOwn, setSpanAttributeIfDefined, setTracer, sortPlugins, splitInHalf, startSpan, streamToAsyncIteratorObject, toSpanAttributeValue, toStringOrBytes, toTracingException, traceAsyncIterator, traceReadableStream, tryOrUndefined, value, varyByAcceptEncoding, wrapAsyncIterator, wrapReadableStream };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/shared",
   "type": "module",
-  "version": "2.0.0-beta.36",
+  "version": "2.0.0-beta.37",
   "description": "Internal utilities shared across oRPC packages",
   "license": "MIT",
   "funding": [
@@ -30,7 +30,7 @@
     "dist"
   ],
   "dependencies": {
-    "@standard-server/shared": "~0.9.0",
+    "@standard-server/shared": "~0.9.2",
     "radash": "^12.1.1",
     "type-fest": "^5.3.1"
   },