@orpc/openapi-client 1.3.0 → 1.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/dist/adapters/fetch/index.mjs +1 -1
  2. package/dist/adapters/standard/index.mjs +2 -2
  3. package/dist/shared/{openapi-client.BwEwVdZl.mjs → openapi-client.Bix5hHnT.mjs} +30 -10
  4. package/package.json +6 -6
package/dist/adapters/fetch/index.mjs CHANGED
@@ -1,7 +1,7 @@
1
1
  import { LinkFetchClient } from '@orpc/client/fetch';
2
2
  import '@orpc/shared';
3
3
  import '@orpc/contract';
4
- import { b as StandardOpenAPILink } from '../../shared/openapi-client.BwEwVdZl.mjs';
4
+ import { b as StandardOpenAPILink } from '../../shared/openapi-client.Bix5hHnT.mjs';
5
5
  import '@orpc/client';
6
6
  import '@orpc/client/standard';
7
7
  import '@orpc/standard-server';
package/dist/adapters/standard/index.mjs CHANGED
@@ -1,5 +1,5 @@
1
- import { S as StandardBracketNotationSerializer } from '../../shared/openapi-client.BwEwVdZl.mjs';
2
- 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';
1
+ import { S as StandardBracketNotationSerializer } from '../../shared/openapi-client.Bix5hHnT.mjs';
2
+ 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';
3
3
  import { isSchemaIssue } from '@orpc/contract';
4
4
  import { isTypescriptObject } from '@orpc/shared';
5
5
  import '@orpc/client/standard';
package/dist/shared/{openapi-client.BwEwVdZl.mjs → openapi-client.Bix5hHnT.mjs} RENAMED
@@ -1,5 +1,5 @@
1
1
  import { toHttpPath, getMalformedResponseErrorCode, StandardLink } from '@orpc/client/standard';
2
- import { isObject, value, get, isAsyncIteratorObject } from '@orpc/shared';
2
+ import { isObject, NullProtoObj, value, get, isAsyncIteratorObject } from '@orpc/shared';
3
3
  import { isORPCErrorStatus, isORPCErrorJson, createORPCErrorFromJson, mapEventIterator, toORPCError } from '@orpc/client';
4
4
  import { isContractProcedure, fallbackContractConfig, ORPCError } from '@orpc/contract';
5
5
  import { mergeStandardHeaders, ErrorEvent } from '@orpc/standard-server';
@@ -35,19 +35,25 @@ class StandardBracketNotationSerializer {
35
35
  }
36
36
  if (i !== segments.length - 1) {
37
37
  if (Array.isArray(currentRef[nextSegment]) && !isValidArrayIndex(segment)) {
38
- currentRef[nextSegment] = { ...currentRef[nextSegment] };
38
+ if (arrayPushStyles.has(currentRef[nextSegment])) {
39
+ arrayPushStyles.delete(currentRef[nextSegment]);
40
+ currentRef[nextSegment] = pushStyleArrayToObject(currentRef[nextSegment]);
41
+ } else {
42
+ currentRef[nextSegment] = arrayToObject(currentRef[nextSegment]);
43
+ }
39
44
  }
40
45
  } else {
41
46
  if (Array.isArray(currentRef[nextSegment])) {
42
47
  if (segment === "") {
43
48
  if (currentRef[nextSegment].length && !arrayPushStyles.has(currentRef[nextSegment])) {
44
- currentRef[nextSegment] = { ...currentRef[nextSegment] };
49
+ currentRef[nextSegment] = arrayToObject(currentRef[nextSegment]);
45
50
  }
46
51
  } else {
47
52
  if (arrayPushStyles.has(currentRef[nextSegment])) {
48
- currentRef[nextSegment] = { "": currentRef[nextSegment].at(-1) };
53
+ arrayPushStyles.delete(currentRef[nextSegment]);
54
+ currentRef[nextSegment] = pushStyleArrayToObject(currentRef[nextSegment]);
49
55
  } else if (!isValidArrayIndex(segment)) {
50
- currentRef[nextSegment] = { ...currentRef[nextSegment] };
56
+ currentRef[nextSegment] = arrayToObject(currentRef[nextSegment]);
51
57
  }
52
58
  }
53
59
  }
@@ -55,12 +61,14 @@ class StandardBracketNotationSerializer {
55
61
  currentRef = currentRef[nextSegment];
56
62
  nextSegment = segment;
57
63
  });
58
- if (Array.isArray(currentRef)) {
59
- if (nextSegment === "") {
60
- arrayPushStyles.add(currentRef);
61
- currentRef.push(value);
64
+ if (Array.isArray(currentRef) && nextSegment === "") {
65
+ arrayPushStyles.add(currentRef);
66
+ currentRef.push(value);
67
+ } else if (nextSegment in currentRef) {
68
+ if (Array.isArray(currentRef[nextSegment])) {
69
+ currentRef[nextSegment].push(value);
62
70
  } else {
63
- currentRef[Number(nextSegment)] = value;
71
+ currentRef[nextSegment] = [currentRef[nextSegment], value];
64
72
  }
65
73
  } else {
66
74
  currentRef[nextSegment] = value;
@@ -122,6 +130,18 @@ class StandardBracketNotationSerializer {
122
130
  function isValidArrayIndex(value) {
123
131
  return /^0$|^[1-9]\d*$/.test(value);
124
132
  }
133
+ function arrayToObject(array) {
134
+ const obj = new NullProtoObj();
135
+ array.forEach((item, i) => {
136
+ obj[i] = item;
137
+ });
138
+ return obj;
139
+ }
140
+ function pushStyleArrayToObject(array) {
141
+ const obj = new NullProtoObj();
142
+ obj[""] = array.length === 1 ? array[0] : array;
143
+ return obj;
144
+ }
125
145
 
126
146
  class StandardOpenAPIJsonSerializer {
127
147
  customSerializers;
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@orpc/openapi-client",
3
3
  "type": "module",
4
- "version": "1.3.0",
4
+ "version": "1.4.0",
5
5
  "license": "MIT",
6
6
  "homepage": "https://orpc.unnoq.com",
7
7
  "repository": {
@@ -34,13 +34,13 @@
34
34
  "dist"
35
35
  ],
36
36
  "dependencies": {
37
- "@orpc/client": "1.3.0",
38
- "@orpc/standard-server": "1.3.0",
39
- "@orpc/contract": "1.3.0",
40
- "@orpc/shared": "1.3.0"
37
+ "@orpc/shared": "1.4.0",
38
+ "@orpc/client": "1.4.0",
39
+ "@orpc/contract": "1.4.0",
40
+ "@orpc/standard-server": "1.4.0"
41
41
  },
42
42
  "devDependencies": {
43
- "@orpc/server": "1.3.0"
43
+ "@orpc/server": "1.4.0"
44
44
  },
45
45
  "scripts": {
46
46
  "build": "unbuild",