@trpc/server 11.0.0-alpha-tmp-issues-5851-take-two.458 → 11.0.0-alpha-tmp-issues-5851-take-two.462

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 (6) hide show
  1. package/dist/bundle-analysis.json +24 -24
  2. package/dist/unstable-core-do-not-import/stream/jsonl.d.ts.map +1 -1
  3. package/dist/unstable-core-do-not-import/stream/jsonl.js +11 -16
  4. package/dist/unstable-core-do-not-import/stream/jsonl.mjs +11 -16
  5. package/package.json +2 -2
  6. package/src/unstable-core-do-not-import/stream/jsonl.ts +11 -14
package/dist/bundle-analysis.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
- "bundleSize": 131586,
3
- "bundleOrigSize": 180977,
4
- "bundleReduction": 27.29,
2
+ "bundleSize": 131395,
3
+ "bundleOrigSize": 180831,
4
+ "bundleReduction": 27.34,
5
5
  "modules": [
6
6
  {
7
7
  "id": "/src/unstable-core-do-not-import/stream/jsonl.ts",
8
- "size": 17474,
9
- "origSize": 18214,
8
+ "size": 17283,
9
+ "origSize": 18068,
10
10
  "renderedExports": [
11
11
  "isPromise",
12
12
  "jsonlStreamProducer",
@@ -17,8 +17,8 @@
17
17
  "/src/unstable-core-do-not-import.ts",
18
18
  "/src/unstable-core-do-not-import/http/resolveResponse.ts"
19
19
  ],
20
- "percent": 13.28,
21
- "reduction": 4.06
20
+ "percent": 13.15,
21
+ "reduction": 4.34
22
22
  },
23
23
  {
24
24
  "id": "/src/unstable-core-do-not-import/http/resolveResponse.ts",
@@ -31,7 +31,7 @@
31
31
  "dependents": [
32
32
  "/src/unstable-core-do-not-import.ts"
33
33
  ],
34
- "percent": 12.98,
34
+ "percent": 12.99,
35
35
  "reduction": 0
36
36
  },
37
37
  {
@@ -46,7 +46,7 @@
46
46
  "dependents": [
47
47
  "/src/adapters/fastify/fastifyTRPCPlugin.ts"
48
48
  ],
49
- "percent": 10.85,
49
+ "percent": 10.86,
50
50
  "reduction": 0
51
51
  },
52
52
  {
@@ -61,7 +61,7 @@
61
61
  "/src/unstable-core-do-not-import.ts",
62
62
  "/src/unstable-core-do-not-import/http/resolveResponse.ts"
63
63
  ],
64
- "percent": 5.77,
64
+ "percent": 5.78,
65
65
  "reduction": 0
66
66
  },
67
67
  {
@@ -79,7 +79,7 @@
79
79
  "/src/unstable-core-do-not-import.ts",
80
80
  "/src/unstable-core-do-not-import/initTRPC.ts"
81
81
  ],
82
- "percent": 4.85,
82
+ "percent": 4.86,
83
83
  "reduction": 39.77
84
84
  },
85
85
  {
@@ -113,7 +113,7 @@
113
113
  "/src/unstable-core-do-not-import.ts",
114
114
  "/src/unstable-core-do-not-import/http/resolveResponse.ts"
115
115
  ],
116
- "percent": 4.28,
116
+ "percent": 4.29,
117
117
  "reduction": 24.48
118
118
  },
119
119
  {
@@ -161,7 +161,7 @@
161
161
  "dependents": [
162
162
  "/src/adapters/next-app-dir.ts"
163
163
  ],
164
- "percent": 2.38,
164
+ "percent": 2.39,
165
165
  "reduction": 23.5
166
166
  },
167
167
  {
@@ -177,7 +177,7 @@
177
177
  "dependents": [
178
178
  "/src/observable/index.ts"
179
179
  ],
180
- "percent": 2.09,
180
+ "percent": 2.1,
181
181
  "reduction": 0
182
182
  },
183
183
  {
@@ -211,7 +211,7 @@
211
211
  "dependents": [
212
212
  "/src/unstable-core-do-not-import.ts"
213
213
  ],
214
- "percent": 2.05,
214
+ "percent": 2.06,
215
215
  "reduction": 40.91
216
216
  },
217
217
  {
@@ -225,7 +225,7 @@
225
225
  "dependents": [
226
226
  "/src/adapters/node-http/index.ts"
227
227
  ],
228
- "percent": 2.04,
228
+ "percent": 2.05,
229
229
  "reduction": 7.31
230
230
  },
231
231
  {
@@ -275,7 +275,7 @@
275
275
  "dependents": [
276
276
  "/src/adapters/fetch/index.ts"
277
277
  ],
278
- "percent": 1.71,
278
+ "percent": 1.72,
279
279
  "reduction": 2.17
280
280
  },
281
281
  {
@@ -418,12 +418,12 @@
418
418
  "/src/unstable-core-do-not-import/http/getHTTPStatusCode.ts",
419
419
  "/src/unstable-core-do-not-import/http/parseConnectionParams.ts",
420
420
  "/src/unstable-core-do-not-import/http/resolveResponse.ts",
421
- "/src/unstable-core-do-not-import/rpc/parseTRPCMessage.ts",
422
421
  "/src/unstable-core-do-not-import/error/TRPCError.ts",
423
422
  "/src/unstable-core-do-not-import/stream/sse.ts",
424
423
  "/src/unstable-core-do-not-import/transformer.ts",
425
424
  "/src/unstable-core-do-not-import/middleware.ts",
426
425
  "/src/unstable-core-do-not-import/router.ts",
426
+ "/src/unstable-core-do-not-import/rpc/parseTRPCMessage.ts",
427
427
  "/src/unstable-core-do-not-import/http/contentType.ts",
428
428
  "/src/unstable-core-do-not-import/procedureBuilder.ts",
429
429
  "/src/unstable-core-do-not-import/stream/jsonl.ts"
@@ -564,7 +564,7 @@
564
564
  "/src/unstable-core-do-not-import.ts",
565
565
  "/src/unstable-core-do-not-import/http/resolveResponse.ts"
566
566
  ],
567
- "percent": 0.47,
567
+ "percent": 0.48,
568
568
  "reduction": 43.49
569
569
  },
570
570
  {
@@ -722,9 +722,9 @@
722
722
  "reduction": 100
723
723
  },
724
724
  {
725
- "id": "/src/rpc.ts",
725
+ "id": "/src/index.ts",
726
726
  "size": 0,
727
- "origSize": 36,
727
+ "origSize": 32,
728
728
  "renderedExports": [],
729
729
  "removedExports": [],
730
730
  "dependents": [],
@@ -732,9 +732,9 @@
732
732
  "reduction": 100
733
733
  },
734
734
  {
735
- "id": "/src/index.ts",
735
+ "id": "/src/rpc.ts",
736
736
  "size": 0,
737
- "origSize": 32,
737
+ "origSize": 36,
738
738
  "renderedExports": [],
739
739
  "removedExports": [],
740
740
  "dependents": [],
@@ -813,8 +813,8 @@
813
813
  "renderedExports": [],
814
814
  "removedExports": [],
815
815
  "dependents": [
816
- "/src/adapters/express.ts",
817
816
  "/src/adapters/next.ts",
817
+ "/src/adapters/express.ts",
818
818
  "/src/adapters/standalone.ts",
819
819
  "/src/adapters/fastify/fastifyRequestHandler.ts"
820
820
  ],
package/dist/unstable-core-do-not-import/stream/jsonl.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"jsonl.d.ts","sourceRoot":"","sources":["../../../src/unstable-core-do-not-import/stream/jsonl.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"jsonl.d.ts","sourceRoot":"","sources":["../../../src/unstable-core-do-not-import/stream/jsonl.ts"],"names":[],"mappings":"AAMA;;;GAGG;AACH,MAAM,MAAM,sBAAsB,GAAG;IACnC,SAAS,EAAE,MAAM,2BAA2B,CAAC,UAAU,CAAC,CAAC;CAC1D,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACtC,EAAE,CACA,SAAS,EAAE,MAAM,GAAG,MAAM,EAC1B,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,GACjC,yBAAyB,CAAC;CAC9B,CAAC;AAGF,QAAA,MAAM,wBAAwB,IAAI,CAAC;AACnC,KAAK,wBAAwB,GAAG,OAAO,wBAAwB,CAAC;AAChE,QAAA,MAAM,+BAA+B,IAAI,CAAC;AAC1C,KAAK,+BAA+B,GAAG,OAAO,+BAA+B,CAAC;AAE9E,QAAA,MAAM,wBAAwB,IAAI,CAAC;AACnC,KAAK,wBAAwB,GAAG,OAAO,wBAAwB,CAAC;AAChE,QAAA,MAAM,uBAAuB,IAAI,CAAC;AAClC,KAAK,uBAAuB,GAAG,OAAO,uBAAuB,CAAC;AAE9D,QAAA,MAAM,0BAA0B,IAAI,CAAC;AACrC,KAAK,0BAA0B,GAAG,OAAO,0BAA0B,CAAC;AACpE,QAAA,MAAM,2BAA2B,IAAI,CAAC;AACtC,KAAK,2BAA2B,GAAG,OAAO,2BAA2B,CAAC;AACtE,QAAA,MAAM,2BAA2B,IAAI,CAAC;AACtC,KAAK,2BAA2B,GAAG,OAAO,2BAA2B,CAAC;AAEtE,KAAK,kBAAkB,GAEnB,IAAI,GAEJ,MAAM,GAEN,MAAM,CAAC;AAEX,KAAK,UAAU,GAAG,MAAM,GAAG;IAAE,YAAY,EAAE,IAAI,CAAA;CAAE,CAAC;AAClD,KAAK,cAAc,GACf,wBAAwB,GACxB,+BAA+B,CAAC;AACpC,KAAK,eAAe,GAAG;IACrB,GAAG,EAAE,kBAAkB;IACvB,IAAI,EAAE,cAAc;IACpB,OAAO,EAAE,UAAU;CACpB,CAAC;AACF,KAAK,eAAe,GAAG;IAErB;QAAC,OAAO;KAAC;IAET,GAAG,eAAe,EAAE;CACrB,CAAC;AAGF,KAAK,YAAY,GACb;IACE,UAAU,EAAE,UAAU;IACtB,MAAM,EAAE,wBAAwB;IAChC,KAAK,EAAE,eAAe;CACvB,GACD,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,uBAAuB,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;AAC9E,KAAK,aAAa,GACd,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,0BAA0B,CAAC,GAC5D;IACE,UAAU,EAAE,UAAU;IACtB,MAAM,EAAE,2BAA2B;IACnC,KAAK,EAAE,eAAe;CACvB,GACD;IACE,UAAU,EAAE,UAAU;IACtB,MAAM,EAAE,2BAA2B;IACnC,KAAK,EAAE,OAAO;CACf,CAAC;AACN,KAAK,SAAS,GAAG,YAAY,GAAG,aAAa,CAAC;AAE9C,wBAAgB,SAAS,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,OAAO,CAAC,OAAO,CAAC,CAMnE;AAED,KAAK,SAAS,GAAG,CAAC,KAAK,EAAE,GAAG,KAAK,GAAG,CAAC;AACrC,KAAK,WAAW,GAAG,CAAC,KAAK,EAAE,GAAG,KAAK,GAAG,CAAC;AAEvC,KAAK,SAAS,GAAG,SAAS,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;AAC9C,MAAM,MAAM,eAAe,GAAG,CAAC,IAAI,EAAE;IACnC,KAAK,EAAE,OAAO,CAAC;IACf,IAAI,EAAE,SAAS,CAAC;CACjB,KAAK,IAAI,CAAC;AACX,MAAM,WAAW,eAAe;IAC9B,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,EAAE,CAAC;IAC1C,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,OAAO,CAAC;QAAC,IAAI,EAAE,SAAS,CAAA;KAAE,KAAK,OAAO,CAAC;IACrE,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAuLD;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,eAAe,8BA2BxD;AAED,cAAM,sBAAuB,SAAQ,KAAK;gBAC5B,KAAK,CAAC,EAAE,OAAO;CAK5B;AAMD,MAAM,MAAM,eAAe,GAAG,CAAC,IAAI,EAAE;IAAE,KAAK,EAAE,OAAO,CAAA;CAAE,KAAK,IAAI,CAAC;AAgFjE;;;GAGG;AACH,wBAAsB,mBAAmB,CAAC,KAAK,EAAE,IAAI,EAAE;IACrD,IAAI,EAAE,yBAAyB,GAAG,sBAAsB,CAAC;IACzD,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,OAAO,CAAA;KAAE,KAAK,KAAK,CAAC;IAClD,eAAe,EAAE,eAAe,GAAG,IAAI,CAAC;CACzC;;;kBAmBa,OAAO;;IA4MpB"}
package/dist/unstable-core-do-not-import/stream/jsonl.js CHANGED
@@ -332,13 +332,13 @@ function createConsumerStream(from) {
332
332
  let headDeferred = createDeferred.createDeferred();
333
333
  const chunkDeferred = new Map();
334
334
  const controllers = new Map();
335
- const maybeAbortStream = ()=>{
335
+ const maybeAbort = ()=>{
336
336
  if (chunkDeferred.size === 0 && Array.from(controllers.values()).every((it)=>it.returned)) {
337
337
  // nothing is listening to the stream anymore
338
338
  opts.abortController?.abort();
339
339
  }
340
340
  };
341
- function hydrateChunkDefinition(value, path) {
341
+ function hydrateChunkDefinition(value) {
342
342
  const [_path, type, chunkId] = value;
343
343
  const { readable , controller } = createReadableStream.createReadableStream();
344
344
  const wrapper = {
@@ -371,7 +371,7 @@ function createConsumerStream(from) {
371
371
  const [_chunkId, status, data] = value;
372
372
  switch(status){
373
373
  case PROMISE_STATUS_FULFILLED:
374
- resolve(hydrate(data, path));
374
+ resolve(hydrate(data));
375
375
  break;
376
376
  case PROMISE_STATUS_REJECTED:
377
377
  reject(opts.formatError?.({
@@ -382,7 +382,7 @@ function createConsumerStream(from) {
382
382
  }).catch(reject).finally(()=>{
383
383
  // reader.releaseLock();
384
384
  controllers.delete(chunkId);
385
- maybeAbortStream();
385
+ maybeAbort();
386
386
  });
387
387
  });
388
388
  }
@@ -409,18 +409,18 @@ function createConsumerStream(from) {
409
409
  case ASYNC_ITERABLE_STATUS_VALUE:
410
410
  return {
411
411
  done: false,
412
- value: hydrate(data, path)
412
+ value: hydrate(data)
413
413
  };
414
414
  case ASYNC_ITERABLE_STATUS_DONE:
415
415
  controllers.delete(chunkId);
416
- maybeAbortStream();
416
+ maybeAbort();
417
417
  return {
418
418
  done: true,
419
419
  value: undefined
420
420
  };
421
421
  case ASYNC_ITERABLE_STATUS_ERROR:
422
422
  controllers.delete(chunkId);
423
- maybeAbortStream();
423
+ maybeAbort();
424
424
  throw opts.formatError?.({
425
425
  error: data
426
426
  }) ?? new AsyncError(data);
@@ -428,7 +428,7 @@ function createConsumerStream(from) {
428
428
  },
429
429
  return: async ()=>{
430
430
  wrapper.returned = true;
431
- maybeAbortStream();
431
+ maybeAbort();
432
432
  return {
433
433
  done: true,
434
434
  value: undefined
@@ -441,14 +441,11 @@ function createConsumerStream(from) {
441
441
  }
442
442
  }
443
443
  }
444
- function hydrate(value, path) {
444
+ function hydrate(value) {
445
445
  const [[data], ...asyncProps] = value;
446
446
  for (const value1 of asyncProps){
447
447
  const [key] = value1;
448
- const hydrated = hydrateChunkDefinition(value1, key === null ? path : [
449
- ...path,
450
- key
451
- ]);
448
+ const hydrated = hydrateChunkDefinition(value1);
452
449
  if (key === null) {
453
450
  return hydrated;
454
451
  }
@@ -474,9 +471,7 @@ function createConsumerStream(from) {
474
471
  if (headDeferred) {
475
472
  const head = chunkOrHead;
476
473
  for (const [key, value] of Object.entries(chunkOrHead)){
477
- const parsed = hydrate(value, [
478
- key
479
- ]);
474
+ const parsed = hydrate(value);
480
475
  head[key] = parsed;
481
476
  }
482
477
  headDeferred.resolve(head);
package/dist/unstable-core-do-not-import/stream/jsonl.mjs CHANGED
@@ -330,13 +330,13 @@ function createConsumerStream(from) {
330
330
  let headDeferred = createDeferred();
331
331
  const chunkDeferred = new Map();
332
332
  const controllers = new Map();
333
- const maybeAbortStream = ()=>{
333
+ const maybeAbort = ()=>{
334
334
  if (chunkDeferred.size === 0 && Array.from(controllers.values()).every((it)=>it.returned)) {
335
335
  // nothing is listening to the stream anymore
336
336
  opts.abortController?.abort();
337
337
  }
338
338
  };
339
- function hydrateChunkDefinition(value, path) {
339
+ function hydrateChunkDefinition(value) {
340
340
  const [_path, type, chunkId] = value;
341
341
  const { readable , controller } = createReadableStream();
342
342
  const wrapper = {
@@ -369,7 +369,7 @@ function createConsumerStream(from) {
369
369
  const [_chunkId, status, data] = value;
370
370
  switch(status){
371
371
  case PROMISE_STATUS_FULFILLED:
372
- resolve(hydrate(data, path));
372
+ resolve(hydrate(data));
373
373
  break;
374
374
  case PROMISE_STATUS_REJECTED:
375
375
  reject(opts.formatError?.({
@@ -380,7 +380,7 @@ function createConsumerStream(from) {
380
380
  }).catch(reject).finally(()=>{
381
381
  // reader.releaseLock();
382
382
  controllers.delete(chunkId);
383
- maybeAbortStream();
383
+ maybeAbort();
384
384
  });
385
385
  });
386
386
  }
@@ -407,18 +407,18 @@ function createConsumerStream(from) {
407
407
  case ASYNC_ITERABLE_STATUS_VALUE:
408
408
  return {
409
409
  done: false,
410
- value: hydrate(data, path)
410
+ value: hydrate(data)
411
411
  };
412
412
  case ASYNC_ITERABLE_STATUS_DONE:
413
413
  controllers.delete(chunkId);
414
- maybeAbortStream();
414
+ maybeAbort();
415
415
  return {
416
416
  done: true,
417
417
  value: undefined
418
418
  };
419
419
  case ASYNC_ITERABLE_STATUS_ERROR:
420
420
  controllers.delete(chunkId);
421
- maybeAbortStream();
421
+ maybeAbort();
422
422
  throw opts.formatError?.({
423
423
  error: data
424
424
  }) ?? new AsyncError(data);
@@ -426,7 +426,7 @@ function createConsumerStream(from) {
426
426
  },
427
427
  return: async ()=>{
428
428
  wrapper.returned = true;
429
- maybeAbortStream();
429
+ maybeAbort();
430
430
  return {
431
431
  done: true,
432
432
  value: undefined
@@ -439,14 +439,11 @@ function createConsumerStream(from) {
439
439
  }
440
440
  }
441
441
  }
442
- function hydrate(value, path) {
442
+ function hydrate(value) {
443
443
  const [[data], ...asyncProps] = value;
444
444
  for (const value1 of asyncProps){
445
445
  const [key] = value1;
446
- const hydrated = hydrateChunkDefinition(value1, key === null ? path : [
447
- ...path,
448
- key
449
- ]);
446
+ const hydrated = hydrateChunkDefinition(value1);
450
447
  if (key === null) {
451
448
  return hydrated;
452
449
  }
@@ -472,9 +469,7 @@ function createConsumerStream(from) {
472
469
  if (headDeferred) {
473
470
  const head = chunkOrHead;
474
471
  for (const [key, value] of Object.entries(chunkOrHead)){
475
- const parsed = hydrate(value, [
476
- key
477
- ]);
472
+ const parsed = hydrate(value);
478
473
  head[key] = parsed;
479
474
  }
480
475
  headDeferred.resolve(head);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@trpc/server",
3
- "version": "11.0.0-alpha-tmp-issues-5851-take-two.458+a4c9a078a",
3
+ "version": "11.0.0-alpha-tmp-issues-5851-take-two.462+47ea836b8",
4
4
  "description": "The tRPC server library",
5
5
  "author": "KATT",
6
6
  "license": "MIT",
@@ -149,5 +149,5 @@
149
149
  "funding": [
150
150
  "https://trpc.io/sponsor"
151
151
  ],
152
- "gitHead": "a4c9a078a9c1ef9bfe1f6c9d94bbe28b61fc9a54"
152
+ "gitHead": "47ea836b8c460e1606487c1d1dc558800d2eadd2"
153
153
  }
package/src/unstable-core-do-not-import/stream/jsonl.ts CHANGED
@@ -447,7 +447,7 @@ export async function jsonlStreamConsumer<THead>(opts: {
447
447
  const chunkDeferred = new Map<ChunkIndex, Deferred<ControllerWrapper>>();
448
448
  const controllers = new Map<ChunkIndex, ControllerWrapper>();
449
449
 
450
- const maybeAbortStream = () => {
450
+ const maybeAbort = () => {
451
451
  if (
452
452
  chunkDeferred.size === 0 &&
453
453
  Array.from(controllers.values()).every((it) => it.returned)
@@ -457,7 +457,7 @@ export async function jsonlStreamConsumer<THead>(opts: {
457
457
  }
458
458
  };
459
459
 
460
- function hydrateChunkDefinition(value: ChunkDefinition, path: PathArray) {
460
+ function hydrateChunkDefinition(value: ChunkDefinition) {
461
461
  const [_path, type, chunkId] = value;
462
462
 
463
463
  const { readable, controller } = createReadableStream<ChunkData>();
@@ -495,7 +495,7 @@ export async function jsonlStreamConsumer<THead>(opts: {
495
495
  const [_chunkId, status, data] = value as PromiseChunk;
496
496
  switch (status) {
497
497
  case PROMISE_STATUS_FULFILLED:
498
- resolve(hydrate(data, path));
498
+ resolve(hydrate(data));
499
499
 
500
500
  break;
501
501
  case PROMISE_STATUS_REJECTED:
@@ -510,7 +510,7 @@ export async function jsonlStreamConsumer<THead>(opts: {
510
510
  // reader.releaseLock();
511
511
  controllers.delete(chunkId);
512
512
 
513
- maybeAbortStream();
513
+ maybeAbort();
514
514
  });
515
515
  });
516
516
  }
@@ -538,18 +538,18 @@ export async function jsonlStreamConsumer<THead>(opts: {
538
538
  case ASYNC_ITERABLE_STATUS_VALUE:
539
539
  return {
540
540
  done: false,
541
- value: hydrate(data, path),
541
+ value: hydrate(data),
542
542
  };
543
543
  case ASYNC_ITERABLE_STATUS_DONE:
544
544
  controllers.delete(chunkId);
545
- maybeAbortStream();
545
+ maybeAbort();
546
546
  return {
547
547
  done: true,
548
548
  value: undefined,
549
549
  };
550
550
  case ASYNC_ITERABLE_STATUS_ERROR:
551
551
  controllers.delete(chunkId);
552
- maybeAbortStream();
552
+ maybeAbort();
553
553
  throw (
554
554
  opts.formatError?.({ error: data }) ??
555
555
  new AsyncError(data)
@@ -558,7 +558,7 @@ export async function jsonlStreamConsumer<THead>(opts: {
558
558
  },
559
559
  return: async () => {
560
560
  wrapper.returned = true;
561
- maybeAbortStream();
561
+ maybeAbort();
562
562
  return {
563
563
  done: true,
564
564
  value: undefined,
@@ -572,15 +572,12 @@ export async function jsonlStreamConsumer<THead>(opts: {
572
572
  }
573
573
  }
574
574
 
575
- function hydrate(value: DehydratedValue, path: PathArray): unknown {
575
+ function hydrate(value: DehydratedValue): unknown {
576
576
  const [[data], ...asyncProps] = value;
577
577
 
578
578
  for (const value of asyncProps) {
579
579
  const [key] = value;
580
- const hydrated = hydrateChunkDefinition(
581
- value,
582
- key === null ? path : [...path, key],
583
- );
580
+ const hydrated = hydrateChunkDefinition(value);
584
581
 
585
582
  if (key === null) {
586
583
  return hydrated;
@@ -613,7 +610,7 @@ export async function jsonlStreamConsumer<THead>(opts: {
613
610
  const head = chunkOrHead as Record<number | string, unknown>;
614
611
 
615
612
  for (const [key, value] of Object.entries(chunkOrHead)) {
616
- const parsed = hydrate(value as any, [key]);
613
+ const parsed = hydrate(value as any);
617
614
  head[key] = parsed;
618
615
  }
619
616
  headDeferred.resolve(head as THead);