@dxos/effect 0.8.4-main.f9ba587 → 0.8.4-main.fffef41

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 (52) hide show
  1. package/dist/lib/browser/index.mjs +163 -51
  2. package/dist/lib/browser/index.mjs.map +4 -4
  3. package/dist/lib/browser/meta.json +1 -1
  4. package/dist/lib/node-esm/index.mjs +163 -51
  5. package/dist/lib/node-esm/index.mjs.map +4 -4
  6. package/dist/lib/node-esm/meta.json +1 -1
  7. package/dist/types/src/ast.d.ts +2 -1
  8. package/dist/types/src/ast.d.ts.map +1 -1
  9. package/dist/types/src/context.d.ts +2 -1
  10. package/dist/types/src/context.d.ts.map +1 -1
  11. package/dist/types/src/errors.d.ts +31 -1
  12. package/dist/types/src/errors.d.ts.map +1 -1
  13. package/dist/types/src/index.d.ts +2 -0
  14. package/dist/types/src/index.d.ts.map +1 -1
  15. package/dist/types/src/interrupt.test.d.ts +2 -0
  16. package/dist/types/src/interrupt.test.d.ts.map +1 -0
  17. package/dist/types/src/jsonPath.d.ts +1 -1
  18. package/dist/types/src/jsonPath.d.ts.map +1 -1
  19. package/dist/types/src/layers.test.d.ts +2 -0
  20. package/dist/types/src/layers.test.d.ts.map +1 -0
  21. package/dist/types/src/otel.d.ts +17 -0
  22. package/dist/types/src/otel.d.ts.map +1 -0
  23. package/dist/types/src/otel.test.d.ts +2 -0
  24. package/dist/types/src/otel.test.d.ts.map +1 -0
  25. package/dist/types/src/resource.d.ts +8 -0
  26. package/dist/types/src/resource.d.ts.map +1 -0
  27. package/dist/types/src/resource.test.d.ts +2 -0
  28. package/dist/types/src/resource.test.d.ts.map +1 -0
  29. package/dist/types/src/testing.d.ts +67 -0
  30. package/dist/types/src/testing.d.ts.map +1 -0
  31. package/dist/types/src/url.d.ts +3 -1
  32. package/dist/types/src/url.d.ts.map +1 -1
  33. package/dist/types/tsconfig.tsbuildinfo +1 -1
  34. package/package.json +16 -7
  35. package/src/ast.test.ts +4 -3
  36. package/src/ast.ts +51 -16
  37. package/src/context.ts +2 -1
  38. package/src/errors.test.ts +1 -1
  39. package/src/errors.ts +87 -25
  40. package/src/index.ts +2 -0
  41. package/src/interrupt.test.ts +33 -0
  42. package/src/jsonPath.test.ts +1 -1
  43. package/src/jsonPath.ts +3 -1
  44. package/src/layers.test.ts +110 -0
  45. package/src/otel.test.ts +126 -0
  46. package/src/otel.ts +45 -0
  47. package/src/resource.test.ts +32 -0
  48. package/src/resource.ts +30 -0
  49. package/src/sanity.test.ts +24 -11
  50. package/src/testing.ts +110 -0
  51. package/src/url.test.ts +1 -1
  52. package/src/url.ts +5 -2
@@ -1,13 +1,19 @@
1
1
  import { createRequire } from 'node:module';const require = createRequire(import.meta.url);
2
2
 
3
3
  // src/ast.ts
4
- import { Option, pipe, SchemaAST, Schema } from "effect";
5
- import { isUndefinedKeyword } from "effect/SchemaAST";
4
+ import * as Function from "effect/Function";
5
+ import * as Option from "effect/Option";
6
+ import * as Schema from "effect/Schema";
7
+ import * as SchemaAST from "effect/SchemaAST";
6
8
  import { invariant } from "@dxos/invariant";
7
9
  import { isNonNullable } from "@dxos/util";
8
10
  var __dxlog_file = "/__w/dxos/dxos/packages/common/effect/src/ast.ts";
11
+ var isTupleType2 = (node) => {
12
+ return SchemaAST.isTupleType(node) && node.elements.length > 0;
13
+ };
9
14
  var getSimpleType = (node) => {
10
- if (SchemaAST.isDeclaration(node) || SchemaAST.isObjectKeyword(node) || SchemaAST.isTypeLiteral(node) || isDiscriminatedUnion(node)) {
15
+ if (SchemaAST.isDeclaration(node) || SchemaAST.isObjectKeyword(node) || SchemaAST.isTypeLiteral(node) || // TODO(wittjosiah): Tuples are actually arrays.
16
+ isTupleType2(node) || isDiscriminatedUnion(node)) {
11
17
  return "object";
12
18
  }
13
19
  if (SchemaAST.isStringKeyword(node)) {
@@ -48,12 +54,12 @@ var isSimpleType = (node) => !!getSimpleType(node);
48
54
  }
49
55
  };
50
56
  })(SimpleType || (SimpleType = {}));
51
- var VisitResult = /* @__PURE__ */ function(VisitResult2) {
57
+ var VisitResult = /* @__PURE__ */ (function(VisitResult2) {
52
58
  VisitResult2[VisitResult2["CONTINUE"] = 0] = "CONTINUE";
53
59
  VisitResult2[VisitResult2["SKIP"] = 1] = "SKIP";
54
60
  VisitResult2[VisitResult2["EXIT"] = 2] = "EXIT";
55
61
  return VisitResult2;
56
- }({});
62
+ })({});
57
63
  var defaultTest = isSimpleType;
58
64
  var visit = (node, testOrVisitor, visitor) => {
59
65
  if (!visitor) {
@@ -63,8 +69,8 @@ var visit = (node, testOrVisitor, visitor) => {
63
69
  }
64
70
  };
65
71
  var visitNode = (node, test, visitor, path = [], depth = 0) => {
66
- const _result = test?.(node, path, depth);
67
- const result = _result === void 0 ? 0 : typeof _result === "boolean" ? _result ? 0 : 1 : _result;
72
+ const $result = test?.(node, path, depth);
73
+ const result = $result === void 0 ? 0 : typeof $result === "boolean" ? $result ? 0 : 1 : $result;
68
74
  if (result === 2) {
69
75
  return result;
70
76
  }
@@ -117,6 +123,12 @@ var findNode = (node, test) => {
117
123
  return child;
118
124
  }
119
125
  }
126
+ for (const prop of getIndexSignatures(node)) {
127
+ const child = findNode(prop.type, test);
128
+ if (child) {
129
+ return child;
130
+ }
131
+ }
120
132
  } else if (SchemaAST.isTupleType(node)) {
121
133
  for (const [_, element] of node.elements.entries()) {
122
134
  const child = findNode(element.type, test);
@@ -125,12 +137,13 @@ var findNode = (node, test) => {
125
137
  }
126
138
  }
127
139
  } else if (SchemaAST.isUnion(node)) {
128
- if (isOption(node)) {
129
- for (const type of node.types) {
130
- const child = findNode(type, test);
131
- if (child) {
132
- return child;
133
- }
140
+ if (isLiteralUnion(node)) {
141
+ return void 0;
142
+ }
143
+ for (const type of node.types) {
144
+ const child = findNode(type, test);
145
+ if (child) {
146
+ return child;
134
147
  }
135
148
  }
136
149
  } else if (SchemaAST.isRefinement(node)) {
@@ -143,7 +156,7 @@ var findProperty = (schema, path) => {
143
156
  const typeNode = findNode(node, SchemaAST.isTypeLiteral);
144
157
  invariant(typeNode, void 0, {
145
158
  F: __dxlog_file,
146
- L: 247,
159
+ L: 265,
147
160
  S: void 0,
148
161
  A: [
149
162
  "typeNode",
@@ -168,16 +181,16 @@ var defaultAnnotations = {
168
181
  ["NumberKeyword"]: SchemaAST.numberKeyword,
169
182
  ["BooleanKeyword"]: SchemaAST.booleanKeyword
170
183
  };
171
- var getAnnotation = (annotationId, noDefault = true) => (node) => {
172
- const id = pipe(SchemaAST.getIdentifierAnnotation(node), Option.getOrUndefined);
173
- const value = pipe(SchemaAST.getAnnotation(annotationId)(node), Option.getOrUndefined);
184
+ var getAnnotation2 = (annotationId, noDefault = true) => (node) => {
185
+ const id = Function.pipe(SchemaAST.getIdentifierAnnotation(node), Option.getOrUndefined);
186
+ const value = Function.pipe(SchemaAST.getAnnotation(annotationId)(node), Option.getOrUndefined);
174
187
  if (noDefault && (value === defaultAnnotations[node._tag]?.annotations[annotationId] || value === id)) {
175
188
  return void 0;
176
189
  }
177
190
  return value;
178
191
  };
179
192
  var findAnnotation = (node, annotationId, noDefault = true) => {
180
- const getAnnotationById = getAnnotation(annotationId, noDefault);
193
+ const getAnnotationById = getAnnotation2(annotationId, noDefault);
181
194
  const getBaseAnnotation = (node2) => {
182
195
  const value = getAnnotationById(node2);
183
196
  if (value !== void 0) {
@@ -203,7 +216,7 @@ var isDiscriminatedUnion = (node) => {
203
216
  var getDiscriminatingProps = (node) => {
204
217
  invariant(SchemaAST.isUnion(node), void 0, {
205
218
  F: __dxlog_file,
206
- L: 344,
219
+ L: 362,
207
220
  S: void 0,
208
221
  A: [
209
222
  "SchemaAST.isUnion(node)",
@@ -221,7 +234,7 @@ var getDiscriminatingProps = (node) => {
221
234
  var getDiscriminatedType = (node, value = {}) => {
222
235
  invariant(SchemaAST.isUnion(node), void 0, {
223
236
  F: __dxlog_file,
224
- L: 368,
237
+ L: 386,
225
238
  S: void 0,
226
239
  A: [
227
240
  "SchemaAST.isUnion(node)",
@@ -230,7 +243,7 @@ var getDiscriminatedType = (node, value = {}) => {
230
243
  });
231
244
  invariant(value, void 0, {
232
245
  F: __dxlog_file,
233
- L: 369,
246
+ L: 387,
234
247
  S: void 0,
235
248
  A: [
236
249
  "value",
@@ -245,7 +258,7 @@ var getDiscriminatedType = (node, value = {}) => {
245
258
  const match = SchemaAST.getPropertySignatures(type).filter((prop) => props?.includes(prop.name.toString())).every((prop) => {
246
259
  invariant(SchemaAST.isLiteral(prop.type), void 0, {
247
260
  F: __dxlog_file,
248
- L: 380,
261
+ L: 398,
249
262
  S: void 0,
250
263
  A: [
251
264
  "SchemaAST.isLiteral(prop.type)",
@@ -263,7 +276,7 @@ var getDiscriminatedType = (node, value = {}) => {
263
276
  const literal = SchemaAST.getPropertySignatures(type).find((p) => p.name.toString() === prop);
264
277
  invariant(SchemaAST.isLiteral(literal.type), void 0, {
265
278
  F: __dxlog_file,
266
- L: 398,
279
+ L: 416,
267
280
  S: void 0,
268
281
  A: [
269
282
  "SchemaAST.isLiteral(literal.type)",
@@ -283,7 +296,7 @@ var getDiscriminatedType = (node, value = {}) => {
283
296
  var mapAst = (ast, f) => {
284
297
  switch (ast._tag) {
285
298
  case "TypeLiteral": {
286
- return new SchemaAST.TypeLiteral(ast.propertySignatures.map((prop) => new SchemaAST.PropertySignature(prop.name, f(prop.type, prop.name), prop.isOptional, prop.isReadonly, prop.annotations)), ast.indexSignatures);
299
+ return new SchemaAST.TypeLiteral(ast.propertySignatures.map((prop) => new SchemaAST.PropertySignature(prop.name, f(prop.type, prop.name), prop.isOptional, prop.isReadonly, prop.annotations)), ast.indexSignatures, ast.annotations);
287
300
  }
288
301
  case "Union": {
289
302
  return SchemaAST.Union.make(ast.types.map(f), ast.annotations);
@@ -301,12 +314,28 @@ var mapAst = (ast, f) => {
301
314
  }
302
315
  };
303
316
  var isArrayType = (node) => {
304
- return SchemaAST.isTupleType(node) || SchemaAST.isUnion(node) && node.types.some(isArrayType) && node.types.some(isUndefinedKeyword) && node.types.length === 2;
317
+ return SchemaAST.isTupleType(node) || SchemaAST.isUnion(node) && node.types.some(isArrayType) && node.types.some(SchemaAST.isUndefinedKeyword) && node.types.length === 2;
318
+ };
319
+ var getIndexSignatures = (ast) => {
320
+ const annotation = SchemaAST.getSurrogateAnnotation(ast);
321
+ if (Option.isSome(annotation)) {
322
+ return getIndexSignatures(annotation.value);
323
+ }
324
+ switch (ast._tag) {
325
+ case "TypeLiteral":
326
+ return ast.indexSignatures.slice();
327
+ case "Suspend":
328
+ return getIndexSignatures(ast.f());
329
+ case "Refinement":
330
+ return getIndexSignatures(ast.from);
331
+ }
332
+ return [];
305
333
  };
306
334
  var SimpleType;
307
335
 
308
336
  // src/jsonPath.ts
309
- import { Schema as Schema2, Option as Option2 } from "effect";
337
+ import * as Option2 from "effect/Option";
338
+ import * as Schema2 from "effect/Schema";
310
339
  import { JSONPath } from "jsonpath-plus";
311
340
  import { invariant as invariant2 } from "@dxos/invariant";
312
341
  var __dxlog_file2 = "/__w/dxos/dxos/packages/common/effect/src/jsonPath.ts";
@@ -332,7 +361,7 @@ var createJsonPath = (path) => {
332
361
  }).join("");
333
362
  invariant2(isJsonPath(candidatePath), `Invalid JsonPath: ${candidatePath}`, {
334
363
  F: __dxlog_file2,
335
- L: 63,
364
+ L: 65,
336
365
  S: void 0,
337
366
  A: [
338
367
  "isJsonPath(candidatePath)",
@@ -345,7 +374,7 @@ var fromEffectValidationPath = (effectPath) => {
345
374
  const jsonPath = effectPath.replace(/\.\[(\d+)\]/g, "[$1]");
346
375
  invariant2(isJsonPath(jsonPath), `Invalid JsonPath: ${jsonPath}`, {
347
376
  F: __dxlog_file2,
348
- L: 74,
377
+ L: 76,
349
378
  S: void 0,
350
379
  A: [
351
380
  "isJsonPath(jsonPath)",
@@ -368,7 +397,9 @@ var getField = (object, path) => {
368
397
  };
369
398
 
370
399
  // src/url.ts
371
- import { SchemaAST as SchemaAST2, Option as Option3, pipe as pipe2 } from "effect";
400
+ import * as Function2 from "effect/Function";
401
+ import * as Option3 from "effect/Option";
402
+ import * as SchemaAST2 from "effect/SchemaAST";
372
403
  import { decamelize } from "@dxos/util";
373
404
  var ParamKeyAnnotationId = Symbol.for("@dxos/schema/annotation/ParamKey");
374
405
  var getParamKeyAnnotation = SchemaAST2.getAnnotation(ParamKeyAnnotationId);
@@ -376,6 +407,7 @@ var ParamKeyAnnotation = (value) => (self) => self.annotations({
376
407
  [ParamKeyAnnotationId]: value
377
408
  });
378
409
  var UrlParser = class {
410
+ _schema;
379
411
  constructor(_schema) {
380
412
  this._schema = _schema;
381
413
  }
@@ -410,7 +442,7 @@ var UrlParser = class {
410
442
  if (value !== void 0) {
411
443
  const field = this._schema.fields[key];
412
444
  if (field) {
413
- const { key: serializedKey } = pipe2(getParamKeyAnnotation(field.ast), Option3.getOrElse(() => ({
445
+ const { key: serializedKey } = Function2.pipe(getParamKeyAnnotation(field.ast), Option3.getOrElse(() => ({
414
446
  key: decamelize(key)
415
447
  })));
416
448
  url.searchParams.set(serializedKey, String(value));
@@ -422,21 +454,27 @@ var UrlParser = class {
422
454
  };
423
455
 
424
456
  // src/context.ts
425
- import { Effect } from "effect";
457
+ import * as Effect from "effect/Effect";
426
458
  import { Context } from "@dxos/context";
427
459
  var __dxlog_file3 = "/__w/dxos/dxos/packages/common/effect/src/context.ts";
428
460
  var contextFromScope = () => Effect.gen(function* () {
429
461
  const ctx = new Context(void 0, {
430
462
  F: __dxlog_file3,
431
- L: 12
463
+ L: 13
432
464
  });
433
465
  yield* Effect.addFinalizer(() => Effect.promise(() => ctx.dispose()));
434
466
  return ctx;
435
467
  });
436
468
 
437
469
  // src/errors.ts
438
- import { Cause, Chunk, Effect as Effect2, Exit, GlobalValue, Option as Option4 } from "effect";
470
+ import * as Cause from "effect/Cause";
471
+ import * as Chunk from "effect/Chunk";
472
+ import * as Effect2 from "effect/Effect";
473
+ import * as Exit from "effect/Exit";
474
+ import * as GlobalValue from "effect/GlobalValue";
475
+ import * as Option4 from "effect/Option";
439
476
  var spanSymbol = Symbol.for("effect/SpanAnnotation");
477
+ var originalSymbol = Symbol.for("effect/OriginalAnnotation");
440
478
  var spanToTrace = GlobalValue.globalValue("effect/Tracer/spanToTrace", () => /* @__PURE__ */ new WeakMap());
441
479
  var locationRegex = /\((.*)\)/g;
442
480
  var prettyErrorStack = (error, appendStacks = []) => {
@@ -490,26 +528,29 @@ var prettyErrorStack = (error, appendStacks = []) => {
490
528
  }
491
529
  }
492
530
  out.push(...appendStacks);
531
+ if (error[originalSymbol]) {
532
+ error = error[originalSymbol];
533
+ }
534
+ if (error.cause) {
535
+ error.cause = prettyErrorStack(error.cause);
536
+ }
493
537
  Object.defineProperty(error, "stack", {
494
538
  value: out.join("\n"),
495
539
  writable: true,
496
540
  enumerable: false,
497
541
  configurable: true
498
542
  });
543
+ return error;
499
544
  };
500
- var runAndForwardErrors = async (effect, options) => {
501
- const exit = await Effect2.runPromiseExit(effect, options);
502
- if (Exit.isSuccess(exit)) {
503
- return exit.value;
504
- }
505
- if (Cause.isEmpty(exit.cause)) {
506
- throw new Error("Fiber failed without a cause");
507
- } else if (Cause.isInterrupted(exit.cause)) {
508
- throw new Error("Fiber was interrupted");
545
+ var causeToError = (cause) => {
546
+ if (Cause.isEmpty(cause)) {
547
+ return new Error("Fiber failed without a cause");
548
+ } else if (Cause.isInterruptedOnly(cause)) {
549
+ return new Error("Fiber was interrupted");
509
550
  } else {
510
551
  const errors = [
511
- ...Chunk.toArray(Cause.failures(exit.cause)),
512
- ...Chunk.toArray(Cause.defects(exit.cause))
552
+ ...Chunk.toArray(Cause.failures(cause)),
553
+ ...Chunk.toArray(Cause.defects(cause))
513
554
  ];
514
555
  const getStackFrames = () => {
515
556
  const o = {};
@@ -517,30 +558,98 @@ var runAndForwardErrors = async (effect, options) => {
517
558
  return o.stack.split("\n").slice(1);
518
559
  };
519
560
  const stackFrames = getStackFrames();
520
- for (const error of errors) {
521
- prettyErrorStack(error, stackFrames);
522
- }
523
- if (errors.length === 1) {
524
- throw errors[0];
561
+ const newErrors = errors.map((error) => prettyErrorStack(error, stackFrames));
562
+ if (newErrors.length === 1) {
563
+ return newErrors[0];
525
564
  } else {
526
- throw new AggregateError(errors);
565
+ return new AggregateError(newErrors);
527
566
  }
528
567
  }
529
568
  };
569
+ var throwCause = (cause) => {
570
+ throw causeToError(cause);
571
+ };
572
+ var unwrapExit = (exit) => {
573
+ if (Exit.isSuccess(exit)) {
574
+ return exit.value;
575
+ }
576
+ return throwCause(exit.cause);
577
+ };
578
+ var runAndForwardErrors = async (effect, options) => {
579
+ const exit = await Effect2.runPromiseExit(effect, options);
580
+ return unwrapExit(exit);
581
+ };
582
+ var promiseWithCauseCapture = (evaluate) => Effect2.promise(async (signal) => {
583
+ try {
584
+ const result = await evaluate(signal);
585
+ return Effect2.succeed(result);
586
+ } catch (err) {
587
+ return Effect2.die(err);
588
+ }
589
+ }).pipe(Effect2.flatten);
590
+
591
+ // src/testing.ts
592
+ import * as Context2 from "effect/Context";
593
+ import * as Effect3 from "effect/Effect";
594
+ (function(TestHelpers2) {
595
+ TestHelpers2.runIf = (condition) => (effect, ctx) => Effect3.gen(function* () {
596
+ if (!condition) {
597
+ ctx.skip();
598
+ } else {
599
+ return yield* effect;
600
+ }
601
+ });
602
+ TestHelpers2.skipIf = (condition) => (effect, ctx) => Effect3.gen(function* () {
603
+ if (condition) {
604
+ ctx.skip();
605
+ } else {
606
+ return yield* effect;
607
+ }
608
+ });
609
+ TestHelpers2.taggedTest = (tag) => (effect, ctx) => Effect3.gen(function* () {
610
+ if (!process.env.DX_TEST_TAGS?.includes(tag)) {
611
+ ctx.skip();
612
+ } else {
613
+ return yield* effect;
614
+ }
615
+ });
616
+ TestHelpers2.provideTestContext = (effect, ctx) => Effect3.provideService(effect, TestContextService, ctx);
617
+ })(TestHelpers || (TestHelpers = {}));
618
+ var TestContextService = class extends Context2.Tag("@dxos/effect/TestContextService")() {
619
+ };
620
+ var TestHelpers;
621
+
622
+ // src/resource.ts
623
+ import * as Effect4 from "effect/Effect";
624
+ var acquireReleaseResource = (getResource) => Effect4.acquireRelease(Effect4.gen(function* () {
625
+ const resource = getResource();
626
+ yield* Effect4.promise(async () => {
627
+ resource.open?.();
628
+ return void 0;
629
+ });
630
+ return resource;
631
+ }), (resource) => Effect4.promise(async () => {
632
+ resource.close?.();
633
+ return void 0;
634
+ }));
530
635
  export {
531
636
  JsonPath,
532
637
  JsonProp,
533
638
  ParamKeyAnnotation,
534
639
  SimpleType,
640
+ TestContextService,
641
+ TestHelpers,
535
642
  UrlParser,
536
643
  VisitResult,
644
+ acquireReleaseResource,
645
+ causeToError,
537
646
  contextFromScope,
538
647
  createJsonPath,
539
648
  findAnnotation,
540
649
  findNode,
541
650
  findProperty,
542
651
  fromEffectValidationPath,
543
- getAnnotation,
652
+ getAnnotation2 as getAnnotation,
544
653
  getDiscriminatedType,
545
654
  getDiscriminatingProps,
546
655
  getField,
@@ -553,8 +662,11 @@ export {
553
662
  isOption,
554
663
  isSimpleType,
555
664
  mapAst,
665
+ promiseWithCauseCapture,
556
666
  runAndForwardErrors,
557
667
  splitJsonPath,
668
+ throwCause,
669
+ unwrapExit,
558
670
  visit
559
671
  };
560
672
  //# sourceMappingURL=index.mjs.map