@fncts/schema 0.0.11 → 0.0.12

package/_mjs/utils.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"utils.mjs","names":["memoize","f","cache","Map","a","has","b","set","get","ownKeys","o","tsplus_module_1","from","Reflect","empty","getTemplateLiteralRegex","ast","pattern","head","span","spans","tsplus_module_2","isStringKeyword","type","isNumberKeyword","literal","RegExp","getKeysForIndexSignature","input","parameter","_tag","Object","keys","getOwnPropertySymbols"],"sources":["../_src/utils.ts"],"sourcesContent":[null],"mappings":";;AAIA,OAAM,SAAUA,OAAOA,CAAOC,CAAc;EAC1C,MAAMC,KAAK,GAAG,IAAIC,GAAG,EAAE;EACvB,OAAQC,CAAC,IAAI;IACX,IAAI,CAACF,KAAK,CAACG,GAAG,CAACD,CAAC,CAAC,EAAE;MACjB,MAAME,CAAC,GAAGL,CAAC,CAACG,CAAC,CAAC;MACdF,KAAK,CAACK,GAAG,CAACH,CAAC,EAAEE,CAAC,CAAC;MACf,OAAOA,CAAC;;IAEV,OAAOJ,KAAK,CAACM,GAAG,CAACJ,CAAC,CAAC;EACrB,CAAC;AACH;AAEA,OAAM,SAAUK,OAAOA,CAACC,CAAqB;EAC3C,OAAOA,CAAC,GAAGC,eAAA,CAAAC,IAAA,CAAYC,OAAO,CAACJ,OAAO,CAACC,CAAC,CAAC,CAAC,GAAGC,eAAA,CAAAG,KAAA,EAAc;AAC7D;AAEA,OAAM,SAAUC,uBAAuBA,CAACC,GAAoB;EAC1D,IAAIC,OAAO,GAAG,IAAID,GAAG,CAACE,IAAI,EAAE;EAC5B,KAAK,MAAMC,IAAI,IAAIH,GAAG,CAACI,KAAK,EAAE;IAC5B,IAAIC,eAAA,CAAAC,eAAA,CAAAH,IAAI,CAACI,IAAI,CAAkB,EAAE;MAC/BN,OAAO,IAAI,IAAI;KAChB,MAAM,IAAII,eAAA,CAAAG,eAAA,CAAAL,IAAI,CAACI,IAAI,CAAkB,EAAE;MACtCN,OAAO,IAAI,kBAAkB;;IAE/BA,OAAO,IAAIE,IAAI,CAACM,OAAO;;EAEzBR,OAAO,IAAI,GAAG;EACd,OAAO,IAAIS,MAAM,CAACT,OAAO,CAAC;AAC5B;AAEA,OAAM,SAAUU,wBAAwBA,CACtCC,KAA6C,EAC7CC,SAAsC;EAEtC,QAAQA,SAAS,CAACC,IAAI;IACpB;IACA;MACE,OAAOnB,eAAA,CAAAC,IAAA,CAAYmB,MAAM,CAACC,IAAI,CAACJ,KAAK,CAAC,CAAC;IACxC;MACE,OAAOjB,eAAA,CAAAC,IAAA,CAAYmB,MAAM,CAACE,qBAAqB,CAACL,KAAK,CAAC,CAAC;IACzD;MACE,OAAOD,wBAAwB,CAACC,KAAK,EAAEC,SAAS,CAACjB,IAAW,CAAC;EAAC;AAEpE"}
+{"version":3,"file":"utils.mjs","names":["memoize","f","cache","Map","a","has","b","set","get","ownKeys","o","tsplus_module_1","from","Reflect","empty","getTemplateLiteralRegex","ast","pattern","head","span","spans","tsplus_module_2","isStringKeyword","type","isNumberKeyword","literal","RegExp","getKeysForIndexSignature","input","parameter","_tag","Object","keys","getOwnPropertySymbols"],"sources":["../_src/utils.ts"],"sourcesContent":[null],"mappings":";;AAIA,OAAM,SAAUA,OAAOA,CAAOC,CAAc;EAC1C,MAAMC,KAAK,GAAG,IAAIC,GAAG,EAAE;EACvB,OAAQC,CAAC,IAAI;IACX,IAAI,CAACF,KAAK,CAACG,GAAG,CAACD,CAAC,CAAC,EAAE;MACjB,MAAME,CAAC,GAAGL,CAAC,CAACG,CAAC,CAAC;MACdF,KAAK,CAACK,GAAG,CAACH,CAAC,EAAEE,CAAC,CAAC;MACf,OAAOA,CAAC;IACV;IACA,OAAOJ,KAAK,CAACM,GAAG,CAACJ,CAAC,CAAC;EACrB,CAAC;AACH;AAEA,OAAM,SAAUK,OAAOA,CAACC,CAAqB;EAC3C,OAAOA,CAAC,GAAGC,eAAA,CAAAC,IAAA,CAAYC,OAAO,CAACJ,OAAO,CAACC,CAAC,CAAC,CAAC,GAAGC,eAAA,CAAAG,KAAA,EAAc;AAC7D;AAEA,OAAM,SAAUC,uBAAuBA,CAACC,GAAoB;EAC1D,IAAIC,OAAO,GAAG,IAAID,GAAG,CAACE,IAAI,EAAE;EAC5B,KAAK,MAAMC,IAAI,IAAIH,GAAG,CAACI,KAAK,EAAE;IAC5B,IAAIC,eAAA,CAAAC,eAAA,CAAAH,IAAI,CAACI,IAAI,CAAkB,EAAE;MAC/BN,OAAO,IAAI,IAAI;IACjB,CAAC,MAAM,IAAII,eAAA,CAAAG,eAAA,CAAAL,IAAI,CAACI,IAAI,CAAkB,EAAE;MACtCN,OAAO,IAAI,kBAAkB;IAC/B;IACAA,OAAO,IAAIE,IAAI,CAACM,OAAO;EACzB;EACAR,OAAO,IAAI,GAAG;EACd,OAAO,IAAIS,MAAM,CAACT,OAAO,CAAC;AAC5B;AAEA,OAAM,SAAUU,wBAAwBA,CACtCC,KAA6C,EAC7CC,SAAsC;EAEtC,QAAQA,SAAS,CAACC,IAAI;IACpB;IACA;MACE,OAAOnB,eAAA,CAAAC,IAAA,CAAYmB,MAAM,CAACC,IAAI,CAACJ,KAAK,CAAC,CAAC;IACxC;MACE,OAAOjB,eAAA,CAAAC,IAAA,CAAYmB,MAAM,CAACE,qBAAqB,CAACL,KAAK,CAAC,CAAC;IACzD;MACE,OAAOD,wBAAwB,CAACC,KAAK,EAAEC,SAAS,CAACjB,IAAW,CAAC;EACjE;AACF"}

package/_src/AST.ts

@@ -154,7 +154,10 @@ export type LiteralValue = string | number | boolean | null | bigint;
 
 export class Literal extends AST {
   readonly _tag = ASTTag.Literal;
-  constructor(readonly literal: LiteralValue, readonly annotations: ASTAnnotationMap = ASTAnnotationMap.empty) {
+  constructor(
+    readonly literal: LiteralValue,
+    readonly annotations: ASTAnnotationMap = ASTAnnotationMap.empty,
+  ) {
     super();
   }
 
@@ -184,7 +187,10 @@ export function isLiteral(self: AST): self is Literal {
 
 export class UniqueSymbol extends AST {
   readonly _tag = ASTTag.UniqueSymbol;
-  constructor(readonly symbol: symbol, readonly annotations: ASTAnnotationMap = ASTAnnotationMap.empty) {
+  constructor(
+    readonly symbol: symbol,
+    readonly annotations: ASTAnnotationMap = ASTAnnotationMap.empty,
+  ) {
     super();
   }
 
@@ -518,7 +524,10 @@ export function createEnum(
 }
 
 export class TemplateLiteralSpan {
-  constructor(readonly type: StringKeyword | NumberKeyword, readonly literal: string) {}
+  constructor(
+    readonly type: StringKeyword | NumberKeyword,
+    readonly literal: string,
+  ) {}
 }
 
 /*
@@ -564,7 +573,10 @@ export function createTemplateLiteral(
  */
 
 export class Element {
-  constructor(readonly type: AST, readonly isOptional: boolean) {}
+  constructor(
+    readonly type: AST,
+    readonly isOptional: boolean,
+  ) {}
 }
 
 /**
@@ -726,7 +738,10 @@ export function createTypeLiteral(
 
 export class Union extends AST {
   readonly _tag = ASTTag.Union;
-  constructor(readonly types: Vector<AST>, readonly annotations: ASTAnnotationMap = ASTAnnotationMap.empty) {
+  constructor(
+    readonly types: Vector<AST>,
+    readonly annotations: ASTAnnotationMap = ASTAnnotationMap.empty,
+  ) {
     super();
   }
 
@@ -764,7 +779,10 @@ export function createUnion(candidates: Vector<AST>, annotations: ASTAnnotationM
 
 export class Lazy extends AST {
   readonly _tag = ASTTag.Lazy;
-  constructor(readonly getAST: () => AST, readonly annotations: ASTAnnotationMap = ASTAnnotationMap.empty) {
+  constructor(
+    readonly getAST: () => AST,
+    readonly annotations: ASTAnnotationMap = ASTAnnotationMap.empty,
+  ) {
     super();
   }
 

package/_src/ASTAnnotation.ts

@@ -15,7 +15,11 @@ export class ASTAnnotation<V> implements Hashable, Equatable {
   declare [ASTAnnotationVariance]: {
     readonly _V: (_: never) => V;
   };
-  constructor(readonly tag: Tag<V>, readonly identifier: string, readonly combine: (v1: V, v2: V) => V) {}
+  constructor(
+    readonly tag: Tag<V>,
+    readonly identifier: string,
+    readonly combine: (v1: V, v2: V) => V,
+  ) {}
   get [Symbol.hash]() {
     return Hashable.combine(Hashable.string(this.identifier), Hashable.unknown(this.tag));
   }

package/_src/ParseError.ts

@@ -32,7 +32,10 @@ export type ParseError =
  */
 export class TypeError {
   readonly _tag = ParseErrorTag.Type;
-  constructor(readonly expected: AST, readonly actual: unknown) {}
+  constructor(
+    readonly expected: AST,
+    readonly actual: unknown,
+  ) {}
 }
 
 /**
@@ -48,7 +51,10 @@ export function typeError(expected: AST, actual: unknown): ParseError {
  */
 export class IndexError {
   readonly _tag = ParseErrorTag.Index;
-  constructor(readonly index: number, readonly errors: Vector<ParseError>) {}
+  constructor(
+    readonly index: number,
+    readonly errors: Vector<ParseError>,
+  ) {}
 }
 
 /**
@@ -64,7 +70,11 @@ export function indexError(index: number, errors: Vector<ParseError>): ParseErro
  */
 export class KeyError {
   readonly _tag = ParseErrorTag.Key;
-  constructor(readonly keyAST: AST, readonly key: any, readonly errors: Vector<ParseError>) {}
+  constructor(
+    readonly keyAST: AST,
+    readonly key: any,
+    readonly errors: Vector<ParseError>,
+  ) {}
 }
 
 /**

package/_src/Parser.ts

@@ -1,5 +1,6 @@
+/* eslint-disable simple-import-sort/exports */
 // codegen:start { preset: barrel, include: ./Parser/*.ts }
-export * from "./Parser/api.js";
-export * from "./Parser/definition.js";
 export * from "./Parser/interpreter.js";
+export * from "./Parser/definition.js";
+export * from "./Parser/api.js";
 // codegen:end

package/_src/Schema/api/conc.ts

@@ -46,7 +46,7 @@ export function concParser<A>(value: Schema<A>): Parser<Conc<A>> {
     const out: Array<A> = [];
     let i               = 0;
     for (const v of u) {
-      const t = value.decode(u);
+      const t = value.decode(v);
       Either.concrete(t);
       if (t.isLeft()) {
         errors.push(ParseError.IndexError(i, t.left));

package/_src/Schema/derivations.ts

@@ -66,11 +66,13 @@ export function deriveStruct<A extends Record<string, any>>(
 ): Schema<A> {
   const maybeFieldsKeys: Vector<PropertyKey> = ownKeys(maybeFields);
   let propertySignatures                     = ownKeys(requiredFields).map((key) =>
+    // @ts-expect-error
     AST.createPropertySignature(key, requiredFields[key]!.ast, false, true),
   );
 
   if (optionalFields) {
     propertySignatures = propertySignatures.concat(
+      // @ts-expect-error
       ownKeys(optionalFields).map((key) => AST.createPropertySignature(key, optionalFields[key]!.ast, true, true)),
     );
   }
@@ -89,6 +91,7 @@ export function deriveStruct<A extends Record<string, any>>(
         maybeFieldsKeys.map((key) =>
           AST.createPropertySignature(
             key,
+            // @ts-expect-error
             AST.createUnion(Vector(AST.undefinedKeyword, AST.createLiteral(null), maybeFields![key]!.ast)),
             true,
             true,
@@ -103,6 +106,7 @@ export function deriveStruct<A extends Record<string, any>>(
     AST.createTypeLiteral(
       propertySignatures.concat(
         maybeFieldsKeys.map((key) =>
+          // @ts-expect-error
           AST.createPropertySignature(key, Schema.maybe(maybeFields![key]!).ast, true, true),
         ),
       ),

package/_src/Schema.ts

@@ -1,17 +1,19 @@
+/* eslint-disable simple-import-sort/exports */
 // codegen:start { preset: barrel, include: ./Schema/*.ts }
-export * from "./Schema/api.js";
-export * from "./Schema/definition.js";
 export * from "./Schema/derivations.js";
+export * from "./Schema/definition.js";
+export * from "./Schema/api.js";
 // codegen:end
 
+/* eslint-disable simple-import-sort/exports */
 // codegen:start { preset: barrel, include: ./Schema/api/*.ts }
-export * from "./Schema/api/conc.js";
-export * from "./Schema/api/either.js";
-export * from "./Schema/api/hashMap.js";
-export * from "./Schema/api/hashSet.js";
-export * from "./Schema/api/immutableArray.js";
-export * from "./Schema/api/list.js";
 export * from "./Schema/api/maybe.js";
+export * from "./Schema/api/list.js";
+export * from "./Schema/api/immutableArray.js";
+export * from "./Schema/api/hashSet.js";
+export * from "./Schema/api/hashMap.js";
+export * from "./Schema/api/either.js";
+export * from "./Schema/api/conc.js";
 // codegen:end
 
 export type {} from "./Parser.js";

package/_src/global.ts

@@ -50,11 +50,11 @@ import { ParseResult } from "@fncts/schema/ParseResult";
 /**
  * @tsplus global
  */
-import { OptionalSchema, Schema } from "@fncts/schema/Schema/definition";
+import {} from "@fncts/schema/Schema";
 /**
  * @tsplus global
  */
-import {} from "@fncts/schema/Schema"
+import { OptionalSchema, Schema } from "@fncts/schema/Schema/definition";
 /**
  * @tsplus global
  */

package/global.d.ts

@@ -49,11 +49,11 @@ import { ParseResult } from "@fncts/schema/ParseResult";
 /**
  * @tsplus global
  */
-import { OptionalSchema, Schema } from "@fncts/schema/Schema/definition";
+import {} from "@fncts/schema/Schema";
 /**
  * @tsplus global
  */
-import {} from "@fncts/schema/Schema";
+import { OptionalSchema, Schema } from "@fncts/schema/Schema/definition";
 /**
  * @tsplus global
  */

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@fncts/schema",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "dependencies": {
-    "@fncts/base": "0.0.32",
-    "@fncts/typelevel": "0.0.15"
+    "@fncts/base": "0.0.33",
+    "@fncts/typelevel": "0.0.16"
   },
   "exports": {
     "./*": {