@orpc/openapi-client 1.3.0 → 1.4.1

package/dist/adapters/fetch/index.mjs

@@ -1,7 +1,7 @@
 import { LinkFetchClient } from '@orpc/client/fetch';
 import '@orpc/shared';
 import '@orpc/contract';
-import { b as StandardOpenAPILink } from '../../shared/openapi-client.BwEwVdZl.mjs';
+import { b as StandardOpenAPILink } from '../../shared/openapi-client.Bix5hHnT.mjs';
 import '@orpc/client';
 import '@orpc/client/standard';
 import '@orpc/standard-server';

package/dist/adapters/standard/index.mjs

@@ -1,5 +1,5 @@
-import { S as StandardBracketNotationSerializer } from '../../shared/openapi-client.BwEwVdZl.mjs';
-export { a as StandardOpenAPIJsonSerializer, b as StandardOpenAPILink, d as StandardOpenAPISerializer, c as StandardOpenapiLinkCodec, g as getDynamicParams, s as standardizeHTTPPath } from '../../shared/openapi-client.BwEwVdZl.mjs';
+import { S as StandardBracketNotationSerializer } from '../../shared/openapi-client.Bix5hHnT.mjs';
+export { a as StandardOpenAPIJsonSerializer, b as StandardOpenAPILink, d as StandardOpenAPISerializer, c as StandardOpenapiLinkCodec, g as getDynamicParams, s as standardizeHTTPPath } from '../../shared/openapi-client.Bix5hHnT.mjs';
 import { isSchemaIssue } from '@orpc/contract';
 import { isTypescriptObject } from '@orpc/shared';
 import '@orpc/client/standard';

package/dist/shared/{openapi-client.BwEwVdZl.mjs → openapi-client.Bix5hHnT.mjs}

@@ -1,5 +1,5 @@
 import { toHttpPath, getMalformedResponseErrorCode, StandardLink } from '@orpc/client/standard';
-import { isObject, value, get, isAsyncIteratorObject } from '@orpc/shared';
+import { isObject, NullProtoObj, value, get, isAsyncIteratorObject } from '@orpc/shared';
 import { isORPCErrorStatus, isORPCErrorJson, createORPCErrorFromJson, mapEventIterator, toORPCError } from '@orpc/client';
 import { isContractProcedure, fallbackContractConfig, ORPCError } from '@orpc/contract';
 import { mergeStandardHeaders, ErrorEvent } from '@orpc/standard-server';
@@ -35,19 +35,25 @@ class StandardBracketNotationSerializer {
         }
         if (i !== segments.length - 1) {
           if (Array.isArray(currentRef[nextSegment]) && !isValidArrayIndex(segment)) {
-            currentRef[nextSegment] = { ...currentRef[nextSegment] };
+            if (arrayPushStyles.has(currentRef[nextSegment])) {
+              arrayPushStyles.delete(currentRef[nextSegment]);
+              currentRef[nextSegment] = pushStyleArrayToObject(currentRef[nextSegment]);
+            } else {
+              currentRef[nextSegment] = arrayToObject(currentRef[nextSegment]);
+            }
           }
         } else {
           if (Array.isArray(currentRef[nextSegment])) {
             if (segment === "") {
               if (currentRef[nextSegment].length && !arrayPushStyles.has(currentRef[nextSegment])) {
-                currentRef[nextSegment] = { ...currentRef[nextSegment] };
+                currentRef[nextSegment] = arrayToObject(currentRef[nextSegment]);
               }
             } else {
               if (arrayPushStyles.has(currentRef[nextSegment])) {
-                currentRef[nextSegment] = { "": currentRef[nextSegment].at(-1) };
+                arrayPushStyles.delete(currentRef[nextSegment]);
+                currentRef[nextSegment] = pushStyleArrayToObject(currentRef[nextSegment]);
               } else if (!isValidArrayIndex(segment)) {
-                currentRef[nextSegment] = { ...currentRef[nextSegment] };
+                currentRef[nextSegment] = arrayToObject(currentRef[nextSegment]);
               }
             }
           }
@@ -55,12 +61,14 @@ class StandardBracketNotationSerializer {
         currentRef = currentRef[nextSegment];
         nextSegment = segment;
       });
-      if (Array.isArray(currentRef)) {
-        if (nextSegment === "") {
-          arrayPushStyles.add(currentRef);
-          currentRef.push(value);
+      if (Array.isArray(currentRef) && nextSegment === "") {
+        arrayPushStyles.add(currentRef);
+        currentRef.push(value);
+      } else if (nextSegment in currentRef) {
+        if (Array.isArray(currentRef[nextSegment])) {
+          currentRef[nextSegment].push(value);
         } else {
-          currentRef[Number(nextSegment)] = value;
+          currentRef[nextSegment] = [currentRef[nextSegment], value];
         }
       } else {
         currentRef[nextSegment] = value;
@@ -122,6 +130,18 @@ class StandardBracketNotationSerializer {
 function isValidArrayIndex(value) {
   return /^0$|^[1-9]\d*$/.test(value);
 }
+function arrayToObject(array) {
+  const obj = new NullProtoObj();
+  array.forEach((item, i) => {
+    obj[i] = item;
+  });
+  return obj;
+}
+function pushStyleArrayToObject(array) {
+  const obj = new NullProtoObj();
+  obj[""] = array.length === 1 ? array[0] : array;
+  return obj;
+}
 
 class StandardOpenAPIJsonSerializer {
   customSerializers;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/openapi-client",
   "type": "module",
-  "version": "1.3.0",
+  "version": "1.4.1",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -34,13 +34,13 @@
     "dist"
   ],
   "dependencies": {
-    "@orpc/client": "1.3.0",
-    "@orpc/standard-server": "1.3.0",
-    "@orpc/contract": "1.3.0",
-    "@orpc/shared": "1.3.0"
+    "@orpc/client": "1.4.1",
+    "@orpc/contract": "1.4.1",
+    "@orpc/shared": "1.4.1",
+    "@orpc/standard-server": "1.4.1"
   },
   "devDependencies": {
-    "@orpc/server": "1.3.0"
+    "@orpc/server": "1.4.1"
   },
   "scripts": {
     "build": "unbuild",