@dxos/effect 0.8.1-staging.9eaf14f → 0.8.2-main.10c050d

package/dist/types/src/ast.d.ts

@@ -1,11 +1,11 @@
-import { SchemaAST as AST, Schema as S } from 'effect';
+import { SchemaAST, Schema } from 'effect';
 import { type JsonPath, type JsonProp } from './jsonPath';
 export type SimpleType = 'object' | 'string' | 'number' | 'boolean' | 'enum' | 'literal';
 /**
  * Get the base type; e.g., traverse through refinements.
  */
-export declare const getSimpleType: (node: AST.AST) => SimpleType | undefined;
-export declare const isSimpleType: (node: AST.AST) => boolean;
+export declare const getSimpleType: (node: SchemaAST.AST) => SimpleType | undefined;
+export declare const isSimpleType: (node: SchemaAST.AST) => boolean;
 export declare namespace SimpleType {
     /**
      * Returns the default empty value for a given SimpleType.
@@ -25,8 +25,8 @@ export declare enum VisitResult {
     EXIT = 2
 }
 export type Path = (string | number)[];
-export type TestFn = (node: AST.AST, path: Path, depth: number) => VisitResult | boolean | undefined;
-export type VisitorFn = (node: AST.AST, path: Path, depth: number) => void;
+export type TestFn = (node: SchemaAST.AST, path: Path, depth: number) => VisitResult | boolean | undefined;
+export type VisitorFn = (node: SchemaAST.AST, path: Path, depth: number) => void;
 /**
  * Visit leaf nodes.
  * Refs:
@@ -34,52 +34,52 @@ export type VisitorFn = (node: AST.AST, path: Path, depth: number) => void;
  * - https://github.com/syntax-tree/unist-util-is?tab=readme-ov-file#test
  */
 export declare const visit: {
-    (node: AST.AST, visitor: VisitorFn): void;
-    (node: AST.AST, test: TestFn, visitor: VisitorFn): void;
+    (node: SchemaAST.AST, visitor: VisitorFn): void;
+    (node: SchemaAST.AST, test: TestFn, visitor: VisitorFn): void;
 };
 /**
  * Recursively descend into AST to find first node that passes the test.
  */
-export declare const findNode: (node: AST.AST, test: (node: AST.AST) => boolean) => AST.AST | undefined;
+export declare const findNode: (node: SchemaAST.AST, test: (node: SchemaAST.AST) => boolean) => SchemaAST.AST | undefined;
 /**
  * Get the AST node for the given property (dot-path).
  */
-export declare const findProperty: (schema: S.Schema.AnyNoContext, path: JsonPath | JsonProp) => AST.AST | undefined;
+export declare const findProperty: (schema: Schema.Schema.AnyNoContext, path: JsonPath | JsonProp) => SchemaAST.AST | undefined;
 /**
  * Get annotation or return undefined.
  * @param annotationId
  * @param noDefault If true, then return undefined for effect library defined values.
  */
-export declare const getAnnotation: <T>(annotationId: symbol, noDefault?: boolean) => (node: AST.AST) => T | undefined;
+export declare const getAnnotation: <T>(annotationId: symbol, noDefault?: boolean) => (node: SchemaAST.AST) => T | undefined;
 /**
  * Recursively descend into AST to find first matching annotations.
  * Optionally skips default annotations for basic types (e.g., 'a string').
  */
-export declare const findAnnotation: <T>(node: AST.AST, annotationId: symbol, noDefault?: boolean) => T | undefined;
+export declare const findAnnotation: <T>(node: SchemaAST.AST, annotationId: symbol, noDefault?: boolean) => T | undefined;
 /**
- * Effect S.optional creates a union type with undefined as the second type.
+ * Effect Schema.optional creates a union type with undefined as the second type.
  */
-export declare const isOption: (node: AST.AST) => boolean;
+export declare const isOption: (node: SchemaAST.AST) => boolean;
 /**
  * Determines if the node is a union of literal types.
  */
-export declare const isLiteralUnion: (node: AST.AST) => boolean;
+export declare const isLiteralUnion: (node: SchemaAST.AST) => boolean;
 /**
  * Determines if the node is a discriminated union.
  */
-export declare const isDiscriminatedUnion: (node: AST.AST) => boolean;
+export declare const isDiscriminatedUnion: (node: SchemaAST.AST) => boolean;
 /**
  * Get the discriminating properties for the given union type.
  */
-export declare const getDiscriminatingProps: (node: AST.AST) => string[] | undefined;
+export declare const getDiscriminatingProps: (node: SchemaAST.AST) => string[] | undefined;
 /**
  * Get the discriminated type for the given value.
  */
-export declare const getDiscriminatedType: (node: AST.AST, value?: Record<string, any>) => AST.AST | undefined;
+export declare const getDiscriminatedType: (node: SchemaAST.AST, value?: Record<string, any>) => SchemaAST.AST | undefined;
 /**
  * Maps AST nodes.
- * The user is responsible for recursively calling {@link mapAst} on the AST.
+ * The user is responsible for recursively calling {@link mapAst} on the SchemaAST.
  * NOTE: Will evaluate suspended ASTs.
  */
-export declare const mapAst: (ast: AST.AST, f: (ast: AST.AST, key: keyof any | undefined) => AST.AST) => AST.AST;
+export declare const mapAst: (ast: SchemaAST.AST, f: (ast: SchemaAST.AST, key: keyof any | undefined) => SchemaAST.AST) => SchemaAST.AST;
 //# sourceMappingURL=ast.d.ts.map

package/dist/types/src/ast.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ast.d.ts","sourceRoot":"","sources":["../../../src/ast.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ast.d.ts","sourceRoot":"","sources":["../../../src/ast.ts"],"names":[],"mappings":"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"}

package/dist/types/src/jsonPath.d.ts

@@ -1,4 +1,4 @@
-import { Schema as S } from 'effect';
+import { Schema } from 'effect';
 export type JsonProp = string & {
     __JsonPath: true;
     __JsonProp: true;
@@ -9,8 +9,8 @@ export type JsonPath = string & {
 /**
  * https://www.ietf.org/archive/id/draft-goessner-dispatch-jsonpath-00.html
  */
-export declare const JsonPath: S.Schema<JsonPath>;
-export declare const JsonProp: S.Schema<JsonProp>;
+export declare const JsonPath: Schema.Schema<JsonPath>;
+export declare const JsonProp: Schema.Schema<JsonProp>;
 export declare const isJsonPath: (value: unknown) => value is JsonPath;
 /**
  * Creates a JsonPath from an array of path segments.

package/dist/types/src/jsonPath.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jsonPath.d.ts","sourceRoot":"","sources":["../../../src/jsonPath.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,IAAI,CAAC,EAAE,MAAM,QAAQ,CAAC;AAMrC,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG;IAAE,UAAU,EAAE,IAAI,CAAC;IAAC,UAAU,EAAE,IAAI,CAAA;CAAE,CAAC;AACvE,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG;IAAE,UAAU,EAAE,IAAI,CAAA;CAAE,CAAC;AAKrD;;GAEG;AACH,eAAO,MAAM,QAAQ,EAAkD,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;AAC1F,eAAO,MAAM,QAAQ,EAA0D,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;AAElG,eAAO,MAAM,UAAU,UAAW,OAAO,KAAG,KAAK,IAAI,QAEpD,CAAC;AAEF;;;;;;;;;;;;;;;;;;GAkBG;AACH,eAAO,MAAM,cAAc,SAAU,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,KAAG,QAa1D,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,wBAAwB,eAAgB,MAAM,KAAG,QAK7D,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,aAAa,SAAU,QAAQ,KAAG,MAAM,EAUpD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,QAAQ,WAAY,GAAG,QAAQ,QAAQ,KAAG,GAGtD,CAAC"}
+{"version":3,"file":"jsonPath.d.ts","sourceRoot":"","sources":["../../../src/jsonPath.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAU,MAAM,QAAQ,CAAC;AAKxC,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG;IAAE,UAAU,EAAE,IAAI,CAAC;IAAC,UAAU,EAAE,IAAI,CAAA;CAAE,CAAC;AACvE,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG;IAAE,UAAU,EAAE,IAAI,CAAA;CAAE,CAAC;AAKrD;;GAEG;AACH,eAAO,MAAM,QAAQ,EAGR,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;AACrC,eAAO,MAAM,QAAQ,EAAoE,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;AAEjH,eAAO,MAAM,UAAU,GAAI,OAAO,OAAO,KAAG,KAAK,IAAI,QAEpD,CAAC;AAEF;;;;;;;;;;;;;;;;;;GAkBG;AACH,eAAO,MAAM,cAAc,GAAI,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,KAAG,QAa1D,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,wBAAwB,GAAI,YAAY,MAAM,KAAG,QAK7D,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,aAAa,GAAI,MAAM,QAAQ,KAAG,MAAM,EAUpD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,QAAQ,GAAI,QAAQ,GAAG,EAAE,MAAM,QAAQ,KAAG,GAGtD,CAAC"}

package/dist/types/src/url.d.ts

@@ -1,16 +1,16 @@
-import { SchemaAST as AST, type Schema as S, Option } from 'effect';
+import { SchemaAST, type Schema, Option } from 'effect';
 type ParamKeyAnnotationValue = {
     key: string;
 };
-export declare const getParamKeyAnnotation: (annotated: AST.Annotated) => Option.Option<ParamKeyAnnotationValue>;
-export declare const ParamKeyAnnotation: (value: ParamKeyAnnotationValue) => <S extends S.Annotable.All>(self: S) => S.Annotable.Self<S>;
+export declare const getParamKeyAnnotation: (annotated: SchemaAST.Annotated) => Option.Option<ParamKeyAnnotationValue>;
+export declare const ParamKeyAnnotation: (value: ParamKeyAnnotationValue) => <S extends Schema.Annotable.All>(self: S) => Schema.Annotable.Self<S>;
 /**
  * HTTP params parser.
  * Supports custom key serialization.
  */
 export declare class UrlParser<T extends Record<string, any>> {
     private readonly _schema;
-    constructor(_schema: S.Struct<T>);
+    constructor(_schema: Schema.Struct<T>);
     /**
      * Parse URL params.
      */

package/dist/types/src/url.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"url.d.ts","sourceRoot":"","sources":["../../../src/url.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,IAAI,GAAG,EAAE,KAAK,MAAM,IAAI,CAAC,EAAE,MAAM,EAAQ,MAAM,QAAQ,CAAC;AAM1E,KAAK,uBAAuB,GAAG;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC;AAE/C,eAAO,MAAM,qBAAqB,EAAE,CAAC,SAAS,EAAE,GAAG,CAAC,SAAS,KAAK,MAAM,CAAC,MAAM,CAAC,uBAAuB,CACrC,CAAC;AAEnE,eAAO,MAAM,kBAAkB,UACrB,uBAAuB,MAC9B,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,GAAG,QAAQ,CAAC,KAAG,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CACH,CAAC;AAExD;;;GAGG;AACH,qBAAa,SAAS,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IACtC,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAAP,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;IAEjD;;OAEG;IACH,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,CAAC;IAsBtB;;OAEG;IACH,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,GAAG,GAAG;CAoBrC"}
+{"version":3,"file":"url.d.ts","sourceRoot":"","sources":["../../../src/url.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,KAAK,MAAM,EAAE,MAAM,EAAQ,MAAM,QAAQ,CAAC;AAM9D,KAAK,uBAAuB,GAAG;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC;AAE/C,eAAO,MAAM,qBAAqB,EAAE,CAAC,SAAS,EAAE,SAAS,CAAC,SAAS,KAAK,MAAM,CAAC,MAAM,CAAC,uBAAuB,CACrC,CAAC;AAEzE,eAAO,MAAM,kBAAkB,GAC5B,OAAO,uBAAuB,MAC9B,CAAC,SAAS,MAAM,CAAC,SAAS,CAAC,GAAG,EAAE,MAAM,CAAC,KAAG,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CACb,CAAC;AAExD;;;GAGG;AACH,qBAAa,SAAS,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IACtC,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAAP,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;IAEtD;;OAEG;IACH,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,CAAC;IAsBtB;;OAEG;IACH,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,GAAG,GAAG;CAoBrC"}

package/dist/types/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"version":"5.7.3"}
+{"version":"5.8.3"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/effect",
-  "version": "0.8.1-staging.9eaf14f",
+  "version": "0.8.2-main.10c050d",
   "description": "Effect utils.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -24,13 +24,13 @@
   ],
   "dependencies": {
     "jsonpath-plus": "10.2.0",
-    "@dxos/invariant": "0.8.1-staging.9eaf14f",
-    "@dxos/node-std": "0.8.1-staging.9eaf14f",
-    "@dxos/util": "0.8.1-staging.9eaf14f"
+    "@dxos/invariant": "0.8.2-main.10c050d",
+    "@dxos/node-std": "0.8.2-main.10c050d",
+    "@dxos/util": "0.8.2-main.10c050d"
   },
   "devDependencies": {
-    "effect": "3.13.3",
-    "@dxos/log": "0.8.1-staging.9eaf14f"
+    "effect": "3.14.21",
+    "@dxos/log": "0.8.2-main.10c050d"
   },
   "peerDependencies": {
     "effect": "^3.13.3"

package/src/ast.test.ts

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { SchemaAST as AST, Schema as S } from 'effect';
+import { SchemaAST, Schema } from 'effect';
 import { describe, test } from 'vitest';
 
 import { invariant } from '@dxos/invariant';
@@ -21,8 +21,8 @@ import {
 } from './ast';
 import { type JsonPath, type JsonProp } from './jsonPath';
 
-const ZipCode = S.String.pipe(
-  S.pattern(/^\d{5}$/, {
+const ZipCode = Schema.String.pipe(
+  Schema.pattern(/^\d{5}$/, {
     typeId: Symbol.for('@example/schema/ZipCode'),
     identifier: 'ZipCode',
     title: 'ZIP code',
@@ -30,24 +30,24 @@ const ZipCode = S.String.pipe(
   }),
 );
 
-const LatLng = S.Struct({
-  lat: S.Number,
-  lng: S.Number,
+const LatLng = Schema.Struct({
+  lat: Schema.Number,
+  lng: Schema.Number,
 });
 
-const Contact = S.Struct({
-  name: S.String,
-  address: S.Struct({
+const Contact = Schema.Struct({
+  name: Schema.String,
+  address: Schema.Struct({
     zip: ZipCode,
-    location: S.optional(LatLng),
+    location: Schema.optional(LatLng),
   }),
 });
 
-const getTitle = getAnnotation(AST.TitleAnnotationId);
+const getTitle = getAnnotation(SchemaAST.TitleAnnotationId);
 
 describe('AST', () => {
   test('validation', ({ expect }) => {
-    const validate = S.validateSync(ZipCode);
+    const validate = Schema.validateSync(ZipCode);
     validate('11205');
 
     expect(() => validate(null)).to.throw();
@@ -57,9 +57,9 @@ describe('AST', () => {
   });
 
   test('findNode', ({ expect }) => {
-    const TestSchema = S.Struct({
-      name: S.optional(S.String),
-    }).pipe(S.mutable);
+    const TestSchema = Schema.Struct({
+      name: Schema.optional(Schema.String),
+    }).pipe(Schema.mutable);
 
     const prop = findProperty(TestSchema, 'name' as JsonProp);
     invariant(prop);
@@ -82,7 +82,7 @@ describe('AST', () => {
     {
       const prop = findProperty(Contact, 'address.location.lat' as JsonPath);
       invariant(prop);
-      expect(AST.isNumberKeyword(prop)).to.be.true;
+      expect(SchemaAST.isNumberKeyword(prop)).to.be.true;
     }
     {
       const prop = findProperty(Contact, 'address.city' as JsonPath);
@@ -91,33 +91,30 @@ describe('AST', () => {
   });
 
   test('findAnnotation', ({ expect }) => {
-    const TestSchema = S.NonEmptyString.pipe(S.pattern(/^\d{5}$/)).annotations({
-      [AST.TitleAnnotationId]: 'original title',
+    const TestSchema = Schema.NonEmptyString.pipe(Schema.pattern(/^\d{5}$/)).annotations({
+      title: 'original title',
     });
 
-    const ContactSchema = S.Struct({
-      p1: TestSchema.annotations({ [AST.TitleAnnotationId]: 'new title' }),
-      p2: TestSchema.annotations({ [AST.TitleAnnotationId]: 'new title' }).pipe(S.optional),
-      p3: S.optional(TestSchema.annotations({ [AST.TitleAnnotationId]: 'new title' })),
+    const ContactSchema = Schema.Struct({
+      p1: TestSchema.annotations({ title: 'new title' }),
+      p2: TestSchema.annotations({ title: 'new title' }).pipe(Schema.optional),
+      p3: Schema.optional(TestSchema.annotations({ title: 'new title' })),
     });
 
     for (const p of ['p1', 'p2', 'p3']) {
       const prop = findProperty(ContactSchema, p as JsonPath);
       invariant(prop);
-      const value = findAnnotation(prop, AST.TitleAnnotationId);
+      const value = findAnnotation(prop, SchemaAST.TitleAnnotationId);
       expect(value, `invalid title for ${p}`).to.eq('new title');
     }
   });
 
   test('findAnnotation skips defaults', ({ expect }) => {
-    const annotation = findAnnotation(
-      S.String.annotations({ [AST.TitleAnnotationId]: 'test' }).ast,
-      AST.TitleAnnotationId,
-    );
+    const annotation = findAnnotation(Schema.String.annotations({ title: 'test' }).ast, SchemaAST.TitleAnnotationId);
     expect(annotation).to.eq('test');
 
-    const annotationIds = [AST.TitleAnnotationId, AST.DescriptionAnnotationId];
-    const schemas = [S.Object, S.String, S.Number, S.Boolean];
+    const annotationIds = [SchemaAST.TitleAnnotationId, SchemaAST.DescriptionAnnotationId];
+    const schemas = [Schema.Object, Schema.String, Schema.Number, Schema.Boolean];
     for (const schema of schemas) {
       for (const annotationId of annotationIds) {
         const annotation = findAnnotation(schema.ast, annotationId);
@@ -127,12 +124,12 @@ describe('AST', () => {
   });
 
   test('visit', ({ expect }) => {
-    const TestSchema = S.Struct({
-      name: S.NonEmptyString,
-      emails: S.optional(S.mutable(S.Array(S.String))),
-      address: S.optional(
-        S.Struct({
-          zip: S.String,
+    const TestSchema = Schema.Struct({
+      name: Schema.NonEmptyString,
+      emails: Schema.optional(Schema.mutable(Schema.Array(Schema.String))),
+      address: Schema.optional(
+        Schema.Struct({
+          zip: Schema.String,
         }),
       ),
     });
@@ -142,12 +139,12 @@ describe('AST', () => {
   });
 
   test('discriminated unions', ({ expect }) => {
-    const TestUnionSchema = S.Union(
-      S.Struct({ kind: S.Literal('a'), label: S.String }),
-      S.Struct({ kind: S.Literal('b'), count: S.Number, active: S.Boolean }),
+    const TestUnionSchema = Schema.Union(
+      Schema.Struct({ kind: Schema.Literal('a'), label: Schema.String }),
+      Schema.Struct({ kind: Schema.Literal('b'), count: Schema.Number, active: Schema.Boolean }),
     );
 
-    type TestUnionType = S.Schema.Type<typeof TestUnionSchema>;
+    type TestUnionType = Schema.Schema.Type<typeof TestUnionSchema>;
 
     {
       expect(isOption(TestUnionSchema.ast)).to.be.false;
@@ -158,7 +155,7 @@ describe('AST', () => {
     }
 
     {
-      invariant(AST.isUnion(TestUnionSchema.ast));
+      invariant(SchemaAST.isUnion(TestUnionSchema.ast));
       const [a, b] = TestUnionSchema.ast.types;
 
       const obj1: TestUnionType = {
@@ -175,8 +172,8 @@ describe('AST', () => {
       expect(getDiscriminatedType(TestUnionSchema.ast, obj1)?.toJSON()).to.deep.eq(a.toJSON());
       expect(getDiscriminatedType(TestUnionSchema.ast, obj2)?.toJSON()).to.deep.eq(b.toJSON());
       expect(getDiscriminatedType(TestUnionSchema.ast)?.toJSON()).to.deep.eq(
-        S.Struct({
-          kind: S.Literal('a', 'b'),
+        Schema.Struct({
+          kind: Schema.Literal('a', 'b'),
         }).ast.toJSON(),
       );
     }