@dxos/effect 0.8.4-main.67995b8 → 0.8.4-main.70d3990

package/dist/lib/node-esm/index.mjs

@@ -1,13 +1,19 @@
 import { createRequire } from 'node:module';const require = createRequire(import.meta.url);
 
 // src/ast.ts
-import { Option, pipe, SchemaAST, Schema } from "effect";
-import { isUndefinedKeyword } from "effect/SchemaAST";
+import * as Function from "effect/Function";
+import * as Option from "effect/Option";
+import * as Schema from "effect/Schema";
+import * as SchemaAST from "effect/SchemaAST";
 import { invariant } from "@dxos/invariant";
 import { isNonNullable } from "@dxos/util";
 var __dxlog_file = "/__w/dxos/dxos/packages/common/effect/src/ast.ts";
+var isTupleType2 = (node) => {
+  return SchemaAST.isTupleType(node) && node.elements.length > 0;
+};
 var getSimpleType = (node) => {
-  if (SchemaAST.isDeclaration(node) || SchemaAST.isObjectKeyword(node) || SchemaAST.isTypeLiteral(node) || isDiscriminatedUnion(node)) {
+  if (SchemaAST.isDeclaration(node) || SchemaAST.isObjectKeyword(node) || SchemaAST.isTypeLiteral(node) || // TODO(wittjosiah): Tuples are actually arrays.
+  isTupleType2(node) || isDiscriminatedUnion(node)) {
     return "object";
   }
   if (SchemaAST.isStringKeyword(node)) {
@@ -48,12 +54,12 @@ var isSimpleType = (node) => !!getSimpleType(node);
     }
   };
 })(SimpleType || (SimpleType = {}));
-var VisitResult = /* @__PURE__ */ function(VisitResult2) {
+var VisitResult = /* @__PURE__ */ (function(VisitResult2) {
   VisitResult2[VisitResult2["CONTINUE"] = 0] = "CONTINUE";
   VisitResult2[VisitResult2["SKIP"] = 1] = "SKIP";
   VisitResult2[VisitResult2["EXIT"] = 2] = "EXIT";
   return VisitResult2;
-}({});
+})({});
 var defaultTest = isSimpleType;
 var visit = (node, testOrVisitor, visitor) => {
   if (!visitor) {
@@ -63,8 +69,8 @@ var visit = (node, testOrVisitor, visitor) => {
   }
 };
 var visitNode = (node, test, visitor, path = [], depth = 0) => {
-  const _result = test?.(node, path, depth);
-  const result = _result === void 0 ? 0 : typeof _result === "boolean" ? _result ? 0 : 1 : _result;
+  const $result = test?.(node, path, depth);
+  const result = $result === void 0 ? 0 : typeof $result === "boolean" ? $result ? 0 : 1 : $result;
   if (result === 2) {
     return result;
   }
@@ -117,6 +123,12 @@ var findNode = (node, test) => {
         return child;
       }
     }
+    for (const prop of getIndexSignatures(node)) {
+      const child = findNode(prop.type, test);
+      if (child) {
+        return child;
+      }
+    }
   } else if (SchemaAST.isTupleType(node)) {
     for (const [_, element] of node.elements.entries()) {
       const child = findNode(element.type, test);
@@ -125,12 +137,13 @@ var findNode = (node, test) => {
       }
     }
   } else if (SchemaAST.isUnion(node)) {
-    if (isOption(node)) {
-      for (const type of node.types) {
-        const child = findNode(type, test);
-        if (child) {
-          return child;
-        }
+    if (isLiteralUnion(node)) {
+      return void 0;
+    }
+    for (const type of node.types) {
+      const child = findNode(type, test);
+      if (child) {
+        return child;
       }
     }
   } else if (SchemaAST.isRefinement(node)) {
@@ -143,7 +156,7 @@ var findProperty = (schema, path) => {
     const typeNode = findNode(node, SchemaAST.isTypeLiteral);
     invariant(typeNode, void 0, {
       F: __dxlog_file,
-      L: 247,
+      L: 265,
       S: void 0,
       A: [
         "typeNode",
@@ -168,16 +181,16 @@ var defaultAnnotations = {
   ["NumberKeyword"]: SchemaAST.numberKeyword,
   ["BooleanKeyword"]: SchemaAST.booleanKeyword
 };
-var getAnnotation = (annotationId, noDefault = true) => (node) => {
-  const id = pipe(SchemaAST.getIdentifierAnnotation(node), Option.getOrUndefined);
-  const value = pipe(SchemaAST.getAnnotation(annotationId)(node), Option.getOrUndefined);
+var getAnnotation2 = (annotationId, noDefault = true) => (node) => {
+  const id = Function.pipe(SchemaAST.getIdentifierAnnotation(node), Option.getOrUndefined);
+  const value = Function.pipe(SchemaAST.getAnnotation(annotationId)(node), Option.getOrUndefined);
   if (noDefault && (value === defaultAnnotations[node._tag]?.annotations[annotationId] || value === id)) {
     return void 0;
   }
   return value;
 };
 var findAnnotation = (node, annotationId, noDefault = true) => {
-  const getAnnotationById = getAnnotation(annotationId, noDefault);
+  const getAnnotationById = getAnnotation2(annotationId, noDefault);
   const getBaseAnnotation = (node2) => {
     const value = getAnnotationById(node2);
     if (value !== void 0) {
@@ -203,7 +216,7 @@ var isDiscriminatedUnion = (node) => {
 var getDiscriminatingProps = (node) => {
   invariant(SchemaAST.isUnion(node), void 0, {
     F: __dxlog_file,
-    L: 344,
+    L: 362,
     S: void 0,
     A: [
       "SchemaAST.isUnion(node)",
@@ -221,7 +234,7 @@ var getDiscriminatingProps = (node) => {
 var getDiscriminatedType = (node, value = {}) => {
   invariant(SchemaAST.isUnion(node), void 0, {
     F: __dxlog_file,
-    L: 368,
+    L: 386,
     S: void 0,
     A: [
       "SchemaAST.isUnion(node)",
@@ -230,7 +243,7 @@ var getDiscriminatedType = (node, value = {}) => {
   });
   invariant(value, void 0, {
     F: __dxlog_file,
-    L: 369,
+    L: 387,
     S: void 0,
     A: [
       "value",
@@ -245,7 +258,7 @@ var getDiscriminatedType = (node, value = {}) => {
     const match = SchemaAST.getPropertySignatures(type).filter((prop) => props?.includes(prop.name.toString())).every((prop) => {
       invariant(SchemaAST.isLiteral(prop.type), void 0, {
         F: __dxlog_file,
-        L: 380,
+        L: 398,
         S: void 0,
         A: [
           "SchemaAST.isLiteral(prop.type)",
@@ -263,7 +276,7 @@ var getDiscriminatedType = (node, value = {}) => {
       const literal = SchemaAST.getPropertySignatures(type).find((p) => p.name.toString() === prop);
       invariant(SchemaAST.isLiteral(literal.type), void 0, {
         F: __dxlog_file,
-        L: 398,
+        L: 416,
         S: void 0,
         A: [
           "SchemaAST.isLiteral(literal.type)",
@@ -283,7 +296,7 @@ var getDiscriminatedType = (node, value = {}) => {
 var mapAst = (ast, f) => {
   switch (ast._tag) {
     case "TypeLiteral": {
-      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);
+      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);
     }
     case "Union": {
       return SchemaAST.Union.make(ast.types.map(f), ast.annotations);
@@ -301,15 +314,32 @@ var mapAst = (ast, f) => {
   }
 };
 var isArrayType = (node) => {
-  return SchemaAST.isTupleType(node) || SchemaAST.isUnion(node) && node.types.some(isArrayType) && node.types.some(isUndefinedKeyword) && node.types.length === 2;
+  return SchemaAST.isTupleType(node) || SchemaAST.isUnion(node) && node.types.some(isArrayType) && node.types.some(SchemaAST.isUndefinedKeyword) && node.types.length === 2;
+};
+var getIndexSignatures = (ast) => {
+  const annotation = SchemaAST.getSurrogateAnnotation(ast);
+  if (Option.isSome(annotation)) {
+    return getIndexSignatures(annotation.value);
+  }
+  switch (ast._tag) {
+    case "TypeLiteral":
+      return ast.indexSignatures.slice();
+    case "Suspend":
+      return getIndexSignatures(ast.f());
+    case "Refinement":
+      return getIndexSignatures(ast.from);
+  }
+  return [];
 };
 var SimpleType;
 
-// src/jsonPath.ts
-import { Schema as Schema2, Option as Option2 } from "effect";
+// src/json-path.ts
+import * as Option2 from "effect/Option";
+import * as Schema2 from "effect/Schema";
 import { JSONPath } from "jsonpath-plus";
 import { invariant as invariant2 } from "@dxos/invariant";
-var __dxlog_file2 = "/__w/dxos/dxos/packages/common/effect/src/jsonPath.ts";
+import { getDeep, setDeep } from "@dxos/util";
+var __dxlog_file2 = "/__w/dxos/dxos/packages/common/effect/src/json-path.ts";
 var PATH_REGEX = /^($|[a-zA-Z_$][\w$]*(?:\.[a-zA-Z_$][\w$]*|\[\d+\](?:\.)?)*$)/;
 var PROP_REGEX = /^\w+$/;
 var JsonPath = Schema2.String.pipe(Schema2.pattern(PATH_REGEX)).annotations({
@@ -332,7 +362,7 @@ var createJsonPath = (path) => {
   }).join("");
   invariant2(isJsonPath(candidatePath), `Invalid JsonPath: ${candidatePath}`, {
     F: __dxlog_file2,
-    L: 63,
+    L: 69,
     S: void 0,
     A: [
       "isJsonPath(candidatePath)",
@@ -345,7 +375,7 @@ var fromEffectValidationPath = (effectPath) => {
   const jsonPath = effectPath.replace(/\.\[(\d+)\]/g, "[$1]");
   invariant2(isJsonPath(jsonPath), `Invalid JsonPath: ${jsonPath}`, {
     F: __dxlog_file2,
-    L: 74,
+    L: 80,
     S: void 0,
     A: [
       "isJsonPath(jsonPath)",
@@ -366,9 +396,17 @@ var getField = (object, path) => {
     json: object
   })[0];
 };
+var getValue = (obj, path) => {
+  return getDeep(obj, splitJsonPath(path).map((p) => p.replace(/[[\]]/g, "")));
+};
+var setValue = (obj, path, value) => {
+  return setDeep(obj, splitJsonPath(path).map((p) => p.replace(/[[\]]/g, "")), value);
+};
 
 // src/url.ts
-import { SchemaAST as SchemaAST2, Option as Option3, pipe as pipe2 } from "effect";
+import * as Function2 from "effect/Function";
+import * as Option3 from "effect/Option";
+import * as SchemaAST2 from "effect/SchemaAST";
 import { decamelize } from "@dxos/util";
 var ParamKeyAnnotationId = Symbol.for("@dxos/schema/annotation/ParamKey");
 var getParamKeyAnnotation = SchemaAST2.getAnnotation(ParamKeyAnnotationId);
@@ -376,6 +414,7 @@ var ParamKeyAnnotation = (value) => (self) => self.annotations({
   [ParamKeyAnnotationId]: value
 });
 var UrlParser = class {
+  _schema;
   constructor(_schema) {
     this._schema = _schema;
   }
@@ -410,7 +449,7 @@ var UrlParser = class {
       if (value !== void 0) {
         const field = this._schema.fields[key];
         if (field) {
-          const { key: serializedKey } = pipe2(getParamKeyAnnotation(field.ast), Option3.getOrElse(() => ({
+          const { key: serializedKey } = Function2.pipe(getParamKeyAnnotation(field.ast), Option3.getOrElse(() => ({
             key: decamelize(key)
           })));
           url.searchParams.set(serializedKey, String(value));
@@ -422,20 +461,25 @@ var UrlParser = class {
 };
 
 // src/context.ts
-import { Effect } from "effect";
+import * as Effect from "effect/Effect";
 import { Context } from "@dxos/context";
 var __dxlog_file3 = "/__w/dxos/dxos/packages/common/effect/src/context.ts";
 var contextFromScope = () => Effect.gen(function* () {
   const ctx = new Context(void 0, {
     F: __dxlog_file3,
-    L: 12
+    L: 13
   });
   yield* Effect.addFinalizer(() => Effect.promise(() => ctx.dispose()));
   return ctx;
 });
 
 // src/errors.ts
-import { Cause, Chunk, Effect as Effect2, Exit, GlobalValue, Option as Option4 } from "effect";
+import * as Cause from "effect/Cause";
+import * as Chunk from "effect/Chunk";
+import * as Effect2 from "effect/Effect";
+import * as Exit from "effect/Exit";
+import * as GlobalValue from "effect/GlobalValue";
+import * as Option4 from "effect/Option";
 var spanSymbol = Symbol.for("effect/SpanAnnotation");
 var originalSymbol = Symbol.for("effect/OriginalAnnotation");
 var spanToTrace = GlobalValue.globalValue("effect/Tracer/spanToTrace", () => /* @__PURE__ */ new WeakMap());
@@ -505,19 +549,15 @@ var prettyErrorStack = (error, appendStacks = []) => {
   });
   return error;
 };
-var runAndForwardErrors = async (effect, options) => {
-  const exit = await Effect2.runPromiseExit(effect, options);
-  if (Exit.isSuccess(exit)) {
-    return exit.value;
-  }
-  if (Cause.isEmpty(exit.cause)) {
-    throw new Error("Fiber failed without a cause");
-  } else if (Cause.isInterrupted(exit.cause)) {
-    throw new Error("Fiber was interrupted");
+var causeToError = (cause) => {
+  if (Cause.isEmpty(cause)) {
+    return new Error("Fiber failed without a cause");
+  } else if (Cause.isInterruptedOnly(cause)) {
+    return new Error("Fiber was interrupted");
   } else {
     const errors = [
-      ...Chunk.toArray(Cause.failures(exit.cause)),
-      ...Chunk.toArray(Cause.defects(exit.cause))
+      ...Chunk.toArray(Cause.failures(cause)),
+      ...Chunk.toArray(Cause.defects(cause))
     ];
     const getStackFrames = () => {
       const o = {};
@@ -527,15 +567,37 @@ var runAndForwardErrors = async (effect, options) => {
     const stackFrames = getStackFrames();
     const newErrors = errors.map((error) => prettyErrorStack(error, stackFrames));
     if (newErrors.length === 1) {
-      throw newErrors[0];
+      return newErrors[0];
     } else {
-      throw new AggregateError(newErrors);
+      return new AggregateError(newErrors);
     }
   }
 };
+var throwCause = (cause) => {
+  throw causeToError(cause);
+};
+var unwrapExit = (exit) => {
+  if (Exit.isSuccess(exit)) {
+    return exit.value;
+  }
+  return throwCause(exit.cause);
+};
+var runAndForwardErrors = async (effect, options) => {
+  const exit = await Effect2.runPromiseExit(effect, options);
+  return unwrapExit(exit);
+};
+var promiseWithCauseCapture = (evaluate) => Effect2.promise(async (signal) => {
+  try {
+    const result = await evaluate(signal);
+    return Effect2.succeed(result);
+  } catch (err) {
+    return Effect2.die(err);
+  }
+}).pipe(Effect2.flatten);
 
 // src/testing.ts
-import { Effect as Effect3 } from "effect";
+import * as Context2 from "effect/Context";
+import * as Effect3 from "effect/Effect";
 (function(TestHelpers2) {
   TestHelpers2.runIf = (condition) => (effect, ctx) => Effect3.gen(function* () {
     if (!condition) {
@@ -551,12 +613,22 @@ import { Effect as Effect3 } from "effect";
       return yield* effect;
     }
   });
+  TestHelpers2.taggedTest = (tag) => (effect, ctx) => Effect3.gen(function* () {
+    if (!process.env.DX_TEST_TAGS?.includes(tag)) {
+      ctx.skip();
+    } else {
+      return yield* effect;
+    }
+  });
+  TestHelpers2.provideTestContext = (effect, ctx) => Effect3.provideService(effect, TestContextService, ctx);
 })(TestHelpers || (TestHelpers = {}));
+var TestContextService = class extends Context2.Tag("@dxos/effect/TestContextService")() {
+};
 var TestHelpers;
 
 // src/resource.ts
-import { Effect as Effect4 } from "effect";
-var accuireReleaseResource = (getResource) => Effect4.acquireRelease(Effect4.gen(function* () {
+import * as Effect4 from "effect/Effect";
+var acquireReleaseResource = (getResource) => Effect4.acquireRelease(Effect4.gen(function* () {
   const resource = getResource();
   yield* Effect4.promise(async () => {
     resource.open?.();
@@ -572,22 +644,25 @@ export {
   JsonProp,
   ParamKeyAnnotation,
   SimpleType,
+  TestContextService,
   TestHelpers,
   UrlParser,
   VisitResult,
-  accuireReleaseResource,
+  acquireReleaseResource,
+  causeToError,
   contextFromScope,
   createJsonPath,
   findAnnotation,
   findNode,
   findProperty,
   fromEffectValidationPath,
-  getAnnotation,
+  getAnnotation2 as getAnnotation,
   getDiscriminatedType,
   getDiscriminatingProps,
   getField,
   getParamKeyAnnotation,
   getSimpleType,
+  getValue,
   isArrayType,
   isDiscriminatedUnion,
   isJsonPath,
@@ -595,8 +670,12 @@ export {
   isOption,
   isSimpleType,
   mapAst,
+  promiseWithCauseCapture,
   runAndForwardErrors,
+  setValue,
   splitJsonPath,
+  throwCause,
+  unwrapExit,
   visit
 };
 //# sourceMappingURL=index.mjs.map