@valbuild/core 0.16.0 → 0.17.0

package/src/selector/object.ts

@@ -1,22 +1,5 @@
-import {
-  Selector as UnknownSelector,
-  GenericSelector,
-  SelectorOf,
-  SelectorSource,
-} from ".";
+import { GenericSelector } from "./index";
 import { SourceObject } from "../source";
 
 // TODO: docs
-export type Selector<T extends SourceObject> = GenericSelector<T> & {
-  fold<Tag extends string>(
-    key: Tag
-  ): <U extends SelectorSource>(cases: {
-    [key in T[Tag & keyof T] & string]: (v: UnknownSelector<T>) => U;
-  }) => SelectorOf<U>;
-
-  andThen<U extends SelectorSource>(
-    f: (v: UnknownSelector<NonNullable<T>>) => U
-  ): SelectorOf<U>;
-} & {
-  readonly [key in keyof T]: UnknownSelector<T[key]>;
-};
+export type Selector<T extends SourceObject> = GenericSelector<T>;

package/src/selector/primitive.ts

@@ -1,17 +1,4 @@
-import {
-  Selector as UnknownSelector,
-  GenericSelector,
-  SelectorOf,
-  SelectorSource,
-} from ".";
-import { Source, SourcePrimitive } from "../source";
-import { Selector as BooleanSelector } from "./boolean";
+import { GenericSelector } from "./index";
+import { SourcePrimitive } from "../source";
 
-export type Selector<T extends SourcePrimitive> = GenericSelector<T> & {
-  eq(other: Source): BooleanSelector<boolean>;
-  andThen<U extends SelectorSource>(
-    f: (v: UnknownSelector<NonNullable<T>>) => U
-  ): SelectorOf<U | NullableOf<T>>;
-};
-
-type NullableOf<T extends Source> = T extends null ? null : never;
+export type Selector<T extends SourcePrimitive> = GenericSelector<T>;

package/src/source/{i18n.ts → future/i18n.ts}

@@ -1,6 +1,6 @@
 import { F } from "ts-toolbelt";
-import { SourcePrimitive, VAL_EXTENSION } from ".";
-import { FileSource } from "./file";
+import { SourcePrimitive, VAL_EXTENSION } from "..";
+import { FileSource } from "../file";
 
 /**
  * I18n sources cannot have nested remote sources.

package/src/source/{remote.ts → future/remote.ts}

@@ -1,7 +1,7 @@
-import { SourcePrimitive, VAL_EXTENSION, PhantomType } from ".";
-import { FileSource } from "./file";
+import { SourcePrimitive, VAL_EXTENSION, PhantomType } from "..";
+import { FileSource } from "../file";
 import { I18nCompatibleSource, I18nSource } from "./i18n";
-import { RichTextSource } from "./richtext";
+import { RichTextSource } from "../richtext";
 
 /**
  * Remote sources cannot include other remote sources.

package/src/source/index.ts

@@ -1,6 +1,6 @@
 import { FileSource } from "./file";
-import { I18nSource, I18nCompatibleSource } from "./i18n";
-import { RemoteSource, RemoteCompatibleSource } from "./remote";
+import { I18nSource, I18nCompatibleSource } from "./future/i18n";
+import { RemoteSource, RemoteCompatibleSource } from "./future/remote";
 import { RichTextSource } from "./richtext";
 
 export type Source =
@@ -15,6 +15,7 @@ export type Source =
 export type SourceObject = { [key in string]: Source } & {
   // TODO: update these restricted parameters:
   fold?: never;
+  assert?: never;
   andThen?: never;
   _ref?: never;
   _type?: never;

package/src/val/array.ts

@@ -1,6 +1,6 @@
 import { SourcePath, Val as UnknownVal } from ".";
 import { JsonArray } from "../Json";
-import { Path } from "../selector";
+import { Path } from "../selector/index";
 
 export type Val<T extends JsonArray> = {
   readonly [key in keyof T]: UnknownVal<T[key]>;

package/src/val/index.ts

@@ -4,8 +4,8 @@ import { Val as ArrayVal } from "./array";
 import { Val as PrimitiveVal } from "./primitive";
 import { Json, JsonArray, JsonObject, JsonPrimitive } from "../Json";
 import { Path, Selector } from "../selector";
-import { I18nSource } from "../source/i18n";
-import { RemoteSource } from "../source/remote";
+import { I18nSource } from "../source/future/i18n";
+import { RemoteSource } from "../source/future/remote";
 import { FileSource } from "../source/file";
 
 export type SerializedVal = {

package/src/val/object.ts

@@ -1,6 +1,6 @@
 import { SourcePath, Val as UnknownVal } from ".";
 import { JsonObject } from "../Json";
-import { Path } from "../selector";
+import { Path } from "../selector/index";
 
 export type Val<T extends JsonObject> = Omit<
   {

package/dist/declarations/src/fetchVal.d.ts

@@ -1,5 +0,0 @@
-import { GenericSelector, SelectorOf, SelectorSource } from "./selector/index.js";
-import { JsonOfSource, Val } from "./val/index.js";
-export declare function fetchVal<T extends SelectorSource>(selector: T, locale?: string): SelectorOf<T> extends GenericSelector<infer S> ? Promise<Val<JsonOfSource<S>>> : never;
-export declare function getVal<T extends SelectorSource>(selector: T, locale?: string): SelectorOf<T> extends GenericSelector<infer S> ? Val<JsonOfSource<S>> : never;
-export declare function serializedValOfSelectorSource<T extends SelectorSource>(selector: T): any;

package/dist/declarations/src/schema/i18n.d.ts

@@ -1,22 +0,0 @@
-import { Schema, SchemaTypeOf, SerializedSchema } from "./index.js";
-import { I18nCompatibleSource, I18nSource } from "../source/i18n.js";
-import { SourcePath } from "../val/index.js";
-import { ValidationErrors } from "./validation/ValidationError.js";
-export type SerializedI18nSchema = {
-    type: "i18n";
-    locales: readonly string[];
-    item: SerializedSchema;
-    opt: boolean;
-};
-export declare class I18nSchema<Locales extends readonly string[]> extends Schema<I18nSource<Locales, SchemaTypeOf<Schema<I18nCompatibleSource>>>> {
-    readonly locales: Locales;
-    readonly item: Schema<SchemaTypeOf<Schema<I18nCompatibleSource>>>;
-    readonly opt: boolean;
-    constructor(locales: Locales, item: Schema<SchemaTypeOf<Schema<I18nCompatibleSource>>>, opt?: boolean);
-    validate(path: SourcePath, src: I18nSource<Locales, SchemaTypeOf<Schema<I18nCompatibleSource>>>): ValidationErrors;
-    assert(src: I18nSource<Locales, SchemaTypeOf<Schema<I18nCompatibleSource>>>): boolean;
-    optional(): Schema<I18nSource<Locales, SchemaTypeOf<Schema<I18nCompatibleSource>>> | null>;
-    serialize(): SerializedSchema;
-}
-export type I18n<Locales extends readonly string[]> = <S extends Schema<I18nCompatibleSource>>(schema: S) => Schema<I18nSource<Locales, SchemaTypeOf<S>>>;
-export declare const i18n: <Locales extends readonly string[]>(locales: Locales) => <S extends Schema<I18nCompatibleSource>>(schema: S) => Schema<I18nSource<Locales, SchemaTypeOf<S>>>;

package/dist/declarations/src/schema/oneOf.d.ts

@@ -1,23 +0,0 @@
-import { Schema, SerializedSchema } from "./index.js";
-import { ValModuleBrand } from "../module.js";
-import { GenericSelector } from "../selector/index.js";
-import { Source, SourceArray } from "../source/index.js";
-import { SourcePath } from "../val/index.js";
-import { ValidationErrors } from "./validation/ValidationError.js";
-export type SerializedOneOfSchema = {
-    type: "oneOf";
-    selector: SourcePath;
-    opt: boolean;
-};
-type OneOfSelector<Sel extends GenericSelector<SourceArray>> = Sel extends GenericSelector<infer S> ? S extends (infer IS)[] ? IS extends Source ? GenericSelector<IS> : never : never : never;
-export declare class OneOfSchema<Sel extends GenericSelector<SourceArray>> extends Schema<OneOfSelector<Sel>> {
-    readonly selector: Sel;
-    readonly opt: boolean;
-    constructor(selector: Sel, opt?: boolean);
-    validate(path: SourcePath, src: OneOfSelector<Sel>): ValidationErrors;
-    assert(src: OneOfSelector<Sel>): boolean;
-    optional(): Schema<OneOfSelector<Sel> | null>;
-    serialize(): SerializedSchema;
-}
-export declare const oneOf: <Src extends GenericSelector<SourceArray, undefined> & ValModuleBrand>(valModule: Src) => Schema<OneOfSelector<Src>>;
-export {};