@valbuild/core 0.16.0 → 0.17.0

package/ROADMAP.md

@@ -0,0 +1,106 @@
+# Planned features
+
+## i18n
+
+Example:
+
+```tsx
+// file: ./blogs.val.ts
+
+export const schema = s.array(
+  s.i18n(s.object({ title: s.string(), text: s.richtext() }))
+);
+
+export default val.content("/blogs", schema, [
+  {
+    en_US: {
+      title: "Title 1",
+      text: val.richtext("Richtext 1"),
+    },
+    nb_NO: {
+      title: "Tittel 1",
+      text: val.richtext("Riktekst?"),
+    },
+  },
+]);
+
+// file: ./components/ServerComponent.ts
+
+import blogsVal from "./blogs.val";
+
+export async function ServerComponent({ index }: { index: number }) {
+  const blogs = await fetchVal(blogVal, getLocale());
+
+  // NOTE: automatically resolves the locale
+  const title = blogs[index].title; // is a string
+  return <div>{title}</div>;
+}
+```
+
+Missing infrastructure: none in particular.
+
+## remote
+
+Remote makes it possible to move content to cloud storage (and back again). It uses immutable references, so local work, branches still works.
+
+Example:
+
+```tsx
+// file: ./blogs.val.ts
+
+export const schema = s
+  .array(s.object({ title: s.string(), text: s.richtext() }))
+  .remote();
+
+export default val.content(
+  "/blogs",
+  schema,
+  val.remote("4ba7c33b32a60be06b1b26dff8cc5d8d967660ab") // a change in content, will result in a new reference
+);
+
+// file: ./components/ServerComponent.ts
+
+import blogsVal from "./blogs.val";
+
+export async function ServerComponent({ index }: { index: number }) {
+  const blog = await fetchVal(
+    blogVal[index] // only fetch the blog at index
+  );
+  const title = blog.title;
+  return <div>{title}</div>;
+}
+```
+
+Missing infrastructure: cloud support, patch support, selectors proxy needs to be able to switch between remote and source (see selectors/future), editor plugin to improve DX (refactors, ...)?
+
+## oneOf
+
+oneOf makes it possible to reference an item in an array of in another val module.
+
+Example:
+
+```ts
+// file: ./employees.val.ts
+
+export schema = s.array(s.object({ name: s.string() }));
+
+export default val.content('/employees', schema, [{
+  name: 'John Smith',
+}]);
+
+// file: ./contacts.val.ts
+
+import employeesVal from './employees.val';
+
+export schema = s.object({
+  hr: s.oneOf(employeesVal),
+});
+
+export default val.content('/contacts', schema, {
+  hr: employeesVal[0]
+});
+
+
+```
+
+Missing infrastructure: need a change in how patches are applied for source files to handle selectors inside data.

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

@@ -0,0 +1,26 @@
+import { ApiPatchResponse, ApiTreeResponse } from "./index.js";
+import { result } from "./fp/index.js";
+import { PatchJSON } from "./patch/index.js";
+import { ModuleId } from "./val/index.js";
+type FetchError = {
+    message: string;
+    statusCode?: number;
+};
+export declare class ValApi {
+    host: string;
+    constructor(host: string);
+    getDisableUrl(): string;
+    postPatches(moduleId: ModuleId, patches: PatchJSON, commit?: string, headers?: Record<string, string> | undefined): Promise<result.Result<ApiPatchResponse, FetchError>>;
+    getSession(): Promise<result.Result<{
+        mode: "proxy" | "local";
+        member_role: "owner" | "developer" | "editor";
+    }, FetchError>>;
+    getModules({ patch, includeSchema, includeSource, treePath, headers, }: {
+        patch?: boolean;
+        includeSchema?: boolean;
+        includeSource?: boolean;
+        treePath?: string;
+        headers?: Record<string, string> | undefined;
+    }): Promise<result.Result<ApiTreeResponse, FetchError>>;
+}
+export {};

package/dist/declarations/src/expr/eval.d.ts

@@ -1,7 +1,7 @@
 import { Expr } from "./expr.js";
 import { Source } from "../source/index.js";
 import { result } from "../fp/index.js";
-import { Path, SourceOrExpr } from "../selector/index.js";
+import { Path, SourceOrExpr } from "../selector/future/index.js";
 import { SourcePath } from "../val/index.js";
 import { Json } from "../Json.js";
 export declare class EvalError {

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

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

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

@@ -4,7 +4,6 @@ export { Schema, type SerializedSchema } from "./schema/index.js";
 export type { ValModule, SerializedModule } from "./module.js";
 export type { SourceObject, SourcePrimitive, Source } from "./source/index.js";
 export type { FileSource } from "./source/file.js";
-export type { RemoteSource } from "./source/remote.js";
 export type { RichTextSource, RichText, TextNode, ParagraphNode, HeadingNode, ListItemNode, ListNode, } from "./source/richtext.js";
 export { type Val, type SerializedVal, type ModuleId, type ModulePath, type SourcePath, type JsonOfSource, } from "./val/index.js";
 export type { Json, JsonPrimitive } from "./Json.js";
@@ -13,26 +12,54 @@ export type { ValidationFix } from "./schema/validation/ValidationFix.js";
 export * as expr from "./expr/index.js";
 export { FILE_REF_PROP } from "./source/file.js";
 export { VAL_EXTENSION, type SourceArray } from "./source/index.js";
-export type { I18nSource } from "./source/i18n.js";
 export { derefPatch } from "./patch/deref.js";
 export { type SelectorSource, type SelectorOf, GenericSelector, } from "./selector/index.js";
-import { getVal } from "./fetchVal.js";
-import { getRawSource, resolvePath, splitModuleIdAndModulePath } from "./module.js";
+import { getSource, resolvePath, splitModuleIdAndModulePath } from "./module.js";
 import { getSchema } from "./selector/index.js";
-import { getValPath, isVal } from "./val/index.js";
-import { fetchVal } from "./fetchVal.js";
+import { ModuleId, ModulePath, getValPath, isVal } from "./val/index.js";
+import { createValPathOfItem } from "./selector/SelectorProxy.js";
+import { getVal } from "./future/fetchVal.js";
+import { Json } from "./Json.js";
+import { SerializedSchema } from "./schema/index.js";
+export { ValApi } from "./ValApi.js";
+export type ApiTreeResponse = {
+    git: {
+        commit?: string;
+        branch?: string;
+    };
+    modules: Record<ModuleId, {
+        schema?: SerializedSchema;
+        patches?: {
+            applied: string[];
+            failed?: string[];
+        };
+        source?: Json;
+    }>;
+};
+export type ApiPatchResponse = Record<ModuleId, string[]>;
 declare const Internal: {
-    convertImageSource: (src: import("./source/file.js").FileSource<import("./schema/image.js").ImageMetadata>) => {
+    convertFileSource: (src: import("./source/file.js").FileSource<import("./schema/image.js").ImageMetadata>) => {
         url: string;
         metadata?: import("./schema/image.js").ImageMetadata;
     };
     getSchema: typeof getSchema;
     getValPath: typeof getValPath;
     getVal: typeof getVal;
-    getRawSource: typeof getRawSource;
+    getSource: typeof getSource;
     resolvePath: typeof resolvePath;
     splitModuleIdAndModulePath: typeof splitModuleIdAndModulePath;
-    fetchVal: typeof fetchVal;
     isVal: typeof isVal;
+    createValPathOfItem: typeof createValPathOfItem;
+    createPatchJSONPath: (modulePath: ModulePath) => string;
+    /**
+     * Enables draft mode: updates all Val modules with patches
+     */
+    VAL_DRAFT_MODE_COOKIE: string;
+    /**
+     * Enables Val: show the overlay / menu
+     */
+    VAL_ENABLE_COOKIE_NAME: string;
+    VAL_STATE_COOKIE: string;
+    VAL_SESSION_COOKIE: string;
 };
 export { Internal };

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

@@ -1,12 +1,9 @@
-import { F } from "ts-toolbelt";
 import { array } from "./schema/array.js";
 import { number } from "./schema/number.js";
 import { object } from "./schema/object.js";
 import { string } from "./schema/string.js";
 import { boolean } from "./schema/boolean.js";
-import { oneOf } from "./schema/oneOf.js";
 import { union } from "./schema/union.js";
-import { I18n } from "./schema/i18n.js";
 import { richtext } from "./schema/richtext.js";
 import { image } from "./schema/image.js";
 import { literal } from "./schema/literal.js";
@@ -17,15 +14,11 @@ export type InitSchema = {
     readonly object: typeof object;
     readonly number: typeof number;
     readonly union: typeof union;
-    readonly oneOf: typeof oneOf;
     readonly richtext: typeof richtext;
     readonly image: typeof image;
     readonly literal: typeof literal;
 };
-export type InitSchemaLocalized<Locales extends readonly string[]> = {
-    readonly i18n: I18n<Locales>;
-};
-export declare function initSchema<Locales extends readonly string[]>(locales: F.Narrow<Locales>): {
+export declare function initSchema(): {
     string: <T extends string>(options?: {
         maxLength?: number | undefined;
         minLength?: number | undefined;
@@ -43,15 +36,14 @@ export declare function initSchema<Locales extends readonly string[]>(locales: F
         [x: string]: import("./source/index.js").Source;
     } & {
         fold?: undefined;
+        assert?: undefined;
         andThen?: undefined;
         _ref?: undefined;
         _type?: undefined;
         val?: undefined;
         valPath?: undefined;
     } & { [k in Key]: string; }>[]>(key: Key, ...objects: T_1) => import("./schema/index.js").Schema<T_1 extends import("./schema/index.js").Schema<infer S_1 extends import("./selector/index.js").SelectorSource>[] ? S_1 extends import("./selector/index.js").SelectorSource ? S_1 : never : never>;
-    oneOf: <Src extends import("./selector/index.js").GenericSelector<import("./source/index.js").SourceArray, undefined> & import("./module.js").ValModuleBrand>(valModule: Src) => import("./schema/index.js").Schema<Src extends import("./selector/index.js").GenericSelector<infer S_2 extends import("./source/index.js").Source, undefined> ? S_2 extends (infer IS)[] ? IS extends import("./source/index.js").Source ? import("./selector/index.js").GenericSelector<IS, undefined> : never : never : never>;
     richtext: () => import("./schema/index.js").Schema<import("./index.js").RichTextSource>;
     image: (options?: import("./schema/image.js").ImageOptions | undefined) => import("./schema/index.js").Schema<import("./index.js").FileSource<import("./schema/image.js").ImageMetadata>>;
     literal: <T_2 extends string>(value: T_2) => import("./schema/index.js").Schema<T_2>;
-    i18n: <S_3 extends import("./schema/index.js").Schema<import("./source/i18n.js").I18nCompatibleSource>>(schema: S_3) => import("./schema/index.js").Schema<import("./index.js").I18nSource<import("ts-toolbelt/out/Any/Try").Try<Locales, [], (Locales extends [] ? [] : never) | (Locales extends import("ts-toolbelt/out/Function/_Internal").Narrowable ? Locales : never) | { [K in keyof Locales]: Locales[K] extends Function ? Locales[K] : (Locales[K] extends infer T_3 ? T_3 extends Locales[K] ? T_3 extends [] ? [] : never : never : never) | (Locales[K] extends infer T_4 ? T_4 extends Locales[K] ? T_4 extends import("ts-toolbelt/out/Function/_Internal").Narrowable ? T_4 : never : never : never) | (Locales[K] extends infer T_5 ? { [K_1 in keyof T_5]: Locales[K][K_1] extends Function ? Locales[K][K_1] : (Locales[K][K_1] extends infer T_6 ? T_6 extends Locales[K][K_1] ? T_6 extends [] ? [] : never : never : never) | (Locales[K][K_1] extends infer T_7 ? T_7 extends Locales[K][K_1] ? T_7 extends import("ts-toolbelt/out/Function/_Internal").Narrowable ? T_7 : never : never : never) | (Locales[K][K_1] extends infer T_8 ? { [K_2 in keyof T_8]: Locales[K][K_1][K_2] extends Function ? Locales[K][K_1][K_2] : (Locales[K][K_1][K_2] extends infer T_9 ? T_9 extends Locales[K][K_1][K_2] ? T_9 extends [] ? [] : never : never : never) | (Locales[K][K_1][K_2] extends infer T_10 ? T_10 extends Locales[K][K_1][K_2] ? T_10 extends import("ts-toolbelt/out/Function/_Internal").Narrowable ? T_10 : never : never : never) | (Locales[K][K_1][K_2] extends infer T_11 ? { [K_3 in keyof T_11]: Locales[K][K_1][K_2][K_3] extends Function ? Locales[K][K_1][K_2][K_3] : (Locales[K][K_1][K_2][K_3] extends infer T_12 ? T_12 extends Locales[K][K_1][K_2][K_3] ? T_12 extends [] ? [] : never : never : never) | (Locales[K][K_1][K_2][K_3] extends infer T_13 ? T_13 extends Locales[K][K_1][K_2][K_3] ? T_13 extends import("ts-toolbelt/out/Function/_Internal").Narrowable ? T_13 : never : never : never) | (Locales[K][K_1][K_2][K_3] extends infer T_14 ? { [K_4 in keyof T_14]: Locales[K][K_1][K_2][K_3][K_4] extends Function ? Locales[K][K_1][K_2][K_3][K_4] : (Locales[K][K_1][K_2][K_3][K_4] extends infer T_15 ? T_15 extends Locales[K][K_1][K_2][K_3][K_4] ? T_15 extends [] ? [] : never : never : never) | (Locales[K][K_1][K_2][K_3][K_4] extends infer T_16 ? T_16 extends Locales[K][K_1][K_2][K_3][K_4] ? T_16 extends import("ts-toolbelt/out/Function/_Internal").Narrowable ? T_16 : never : never : never) | (Locales[K][K_1][K_2][K_3][K_4] extends infer T_17 ? { [K_5 in keyof T_17]: Locales[K][K_1][K_2][K_3][K_4][K_5] extends Function ? Locales[K][K_1][K_2][K_3][K_4][K_5] : (Locales[K][K_1][K_2][K_3][K_4][K_5] extends infer T_18 ? T_18 extends Locales[K][K_1][K_2][K_3][K_4][K_5] ? T_18 extends [] ? [] : never : never : never) | (Locales[K][K_1][K_2][K_3][K_4][K_5] extends infer T_19 ? T_19 extends Locales[K][K_1][K_2][K_3][K_4][K_5] ? T_19 extends import("ts-toolbelt/out/Function/_Internal").Narrowable ? T_19 : never : never : never) | (Locales[K][K_1][K_2][K_3][K_4][K_5] extends infer T_20 ? { [K_6 in keyof T_20]: Locales[K][K_1][K_2][K_3][K_4][K_5][K_6] extends Function ? Locales[K][K_1][K_2][K_3][K_4][K_5][K_6] : (Locales[K][K_1][K_2][K_3][K_4][K_5][K_6] extends infer T_21 ? T_21 extends Locales[K][K_1][K_2][K_3][K_4][K_5][K_6] ? T_21 extends [] ? [] : never : never : never) | (Locales[K][K_1][K_2][K_3][K_4][K_5][K_6] extends infer T_22 ? T_22 extends Locales[K][K_1][K_2][K_3][K_4][K_5][K_6] ? T_22 extends import("ts-toolbelt/out/Function/_Internal").Narrowable ? T_22 : never : never : never) | (Locales[K][K_1][K_2][K_3][K_4][K_5][K_6] extends infer T_23 ? { [K_7 in keyof T_23]: Locales[K][K_1][K_2][K_3][K_4][K_5][K_6][K_7] extends Function ? Locales[K][K_1][K_2][K_3][K_4][K_5][K_6][K_7] : (Locales[K][K_1][K_2][K_3][K_4][K_5][K_6][K_7] extends infer T_24 ? T_24 extends Locales[K][K_1][K_2][K_3][K_4][K_5][K_6][K_7] ? T_24 extends [] ? [] : never : never : never) | (Locales[K][K_1][K_2][K_3][K_4][K_5][K_6][K_7] extends infer T_25 ? T_25 extends Locales[K][K_1][K_2][K_3][K_4][K_5][K_6][K_7] ? T_25 extends import("ts-toolbelt/out/Function/_Internal").Narrowable ? T_25 : never : never : never) | (Locales[K][K_1][K_2][K_3][K_4][K_5][K_6][K_7] extends infer T_26 ? { [K_8 in keyof T_26]: Locales[K][K_1][K_2][K_3][K_4][K_5][K_6][K_7][K_8] extends Function ? Locales[K][K_1][K_2][K_3][K_4][K_5][K_6][K_7][K_8] : (Locales[K][K_1][K_2][K_3][K_4][K_5][K_6][K_7][K_8] extends infer T_27 ? T_27 extends Locales[K][K_1][K_2][K_3][K_4][K_5][K_6][K_7][K_8] ? T_27 extends [] ? [] : never : never : never) | (Locales[K][K_1][K_2][K_3][K_4][K_5][K_6][K_7][K_8] extends infer T_28 ? T_28 extends Locales[K][K_1][K_2][K_3][K_4][K_5][K_6][K_7][K_8] ? T_28 extends import("ts-toolbelt/out/Function/_Internal").Narrowable ? T_28 : never : never : never) | (Locales[K][K_1][K_2][K_3][K_4][K_5][K_6][K_7][K_8] extends infer T_29 ? { [K_9 in keyof T_29]: Locales[K][K_1][K_2][K_3][K_4][K_5][K_6][K_7][K_8][K_9] extends Function ? Locales[K][K_1][K_2][K_3][K_4][K_5][K_6][K_7][K_8][K_9] : (Locales[K][K_1][K_2][K_3][K_4][K_5][K_6][K_7][K_8][K_9] extends infer T_30 ? T_30 extends Locales[K][K_1][K_2][K_3][K_4][K_5][K_6][K_7][K_8][K_9] ? T_30 extends [] ? [] : never : never : never) | (Locales[K][K_1][K_2][K_3][K_4][K_5][K_6][K_7][K_8][K_9] extends infer T_31 ? T_31 extends Locales[K][K_1][K_2][K_3][K_4][K_5][K_6][K_7][K_8][K_9] ? T_31 extends import("ts-toolbelt/out/Function/_Internal").Narrowable ? T_31 : never : never : never) | (Locales[K][K_1][K_2][K_3][K_4][K_5][K_6][K_7][K_8][K_9] extends infer T_32 ? { [K_10 in keyof T_32]: Locales[K][K_1][K_2][K_3][K_4][K_5][K_6][K_7][K_8][K_9][K_10] extends Function ? Locales[K][K_1][K_2][K_3][K_4][K_5][K_6][K_7][K_8][K_9][K_10] : (Locales[K][K_1][K_2][K_3][K_4][K_5][K_6][K_7][K_8][K_9][K_10] extends infer T_33 ? T_33 extends Locales[K][K_1][K_2][K_3][K_4][K_5][K_6][K_7][K_8][K_9][K_10] ? T_33 extends [] ? [] : never : never : never) | (Locales[K][K_1][K_2][K_3][K_4][K_5][K_6][K_7][K_8][K_9][K_10] extends infer T_34 ? T_34 extends Locales[K][K_1][K_2][K_3][K_4][K_5][K_6][K_7][K_8][K_9][K_10] ? T_34 extends import("ts-toolbelt/out/Function/_Internal").Narrowable ? T_34 : never : never : never) | any; } : never); } : never); } : never); } : never); } : never); } : never); } : never); } : never); } : never); } : never); }>, import("./schema/index.js").SchemaTypeOf<S_3>>>;
 };

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

@@ -1,35 +1,17 @@
 import { content } from "./module.js";
-import { I18n } from "./source/i18n.js";
-import { InitSchema, InitSchemaLocalized } from "./initSchema.js";
+import { InitSchema } from "./initSchema.js";
 import { getValPath as getPath } from "./val/index.js";
-import { remote } from "./source/remote.js";
 import { file } from "./source/file.js";
 import { richtext } from "./source/richtext.js";
 type ValConstructor = {
     content: typeof content;
     getPath: typeof getPath;
-    remote: typeof remote;
     file: typeof file;
     richtext: typeof richtext;
 };
-export type InitVal<Locales extends readonly string[] | undefined> = [
-    Locales
-] extends [readonly string[]] ? {
-    val: ValConstructor & {
-        i18n: I18n<Locales>;
-    };
-    s: InitSchema & InitSchemaLocalized<Locales>;
-} : {
+export type InitVal = {
     val: ValConstructor;
     s: InitSchema;
 };
-type NarrowStrings<A> = (A extends [] ? [] : never) | (A extends string ? A : never) | {
-    [K in keyof A]: NarrowStrings<A[K]>;
-};
-export declare const initVal: <Locales extends readonly string[] | undefined>(options?: {
-    readonly locales?: {
-        readonly required: NarrowStrings<Locales>;
-        readonly default: NarrowStrings<Locales extends readonly string[] ? Locales[number] : never>;
-    } | undefined;
-} | undefined) => InitVal<Locales>;
+export declare const initVal: () => InitVal;
 export {};

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

@@ -3,10 +3,6 @@ import { GenericSelector, SelectorOf, SelectorSource } from "./selector/index.js
 import { Source } from "./source/index.js";
 import { ModuleId, ModulePath, SourcePath } from "./val/index.js";
 import { Json } from "./Json.js";
-import { SerializedRichTextSchema } from "./schema/richtext.js";
-import { ImageMetadata, ImageSchema, SerializedImageSchema } from "./schema/image.js";
-import { FileSource } from "./source/file.js";
-import { RichText } from "./source/richtext.js";
 declare const brand: unique symbol;
 export type ValModule<T extends SelectorSource> = SelectorOf<T> & ValModuleBrand;
 export type ValModuleBrand = {
@@ -14,20 +10,12 @@ export type ValModuleBrand = {
 };
 export type TypeOfValModule<T extends ValModule<SelectorSource>> = T extends GenericSelector<infer S> ? S : never;
 export declare function content<T extends Schema<SelectorSource>>(id: string, schema: T, source: SchemaTypeOf<T>): ValModule<SchemaTypeOf<T>>;
-export declare function getRawSource(valModule: ValModule<SelectorSource>): Source;
+export declare function getSource(valModule: ValModule<SelectorSource>): Source;
 export declare function splitModuleIdAndModulePath(path: SourcePath): [moduleId: ModuleId, path: ModulePath];
 export declare function getSourceAtPath(modulePath: ModulePath, valModule: ValModule<SelectorSource> | Source): any;
 export declare function resolvePath(path: ModulePath, valModule: ValModule<SelectorSource> | Source, schema: Schema<SelectorSource> | SerializedSchema): {
     path: string;
-    schema: SerializedImageSchema | ImageSchema<FileSource<ImageMetadata> | null>;
-    source: any;
-} | {
-    path: string;
-    schema: SerializedRichTextSchema | Schema<RichText<"h1" | "h2" | "h3" | "h4" | "h5" | "h6", import("./source/richtext.js").TextNode>>;
-    source: any;
-} | {
-    path: ModulePath;
-    schema: Schema<SelectorSource> | SerializedSchema;
+    schema: SerializedSchema | Schema<SelectorSource>;
     source: any;
 };
 export declare function parsePath(input: ModulePath): string[];

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

@@ -27,7 +27,7 @@ export declare class ImageSchema<Src extends FileSource<ImageMetadata> | null> e
     serialize(): SerializedSchema;
 }
 export declare const image: (options?: ImageOptions) => Schema<FileSource<ImageMetadata>>;
-export declare const convertImageSource: (src: FileSource<ImageMetadata>) => {
+export declare const convertFileSource: (src: FileSource<ImageMetadata>) => {
     url: string;
     metadata?: ImageMetadata;
 };

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

@@ -1,25 +1,23 @@
 import { SelectorSource } from "../selector/index.js";
-import { RemoteCompatibleSource, RemoteSource } from "../source/remote.js";
 import { SourcePath } from "../val/index.js";
 import { SerializedArraySchema } from "./array.js";
 import { SerializedBooleanSchema } from "./boolean.js";
-import { SerializedI18nSchema } from "./i18n.js";
 import { SerializedImageSchema } from "./image.js";
+import { SerializedKeyOfSchema } from "./keyOf.js";
 import { SerializedLiteralSchema } from "./literal.js";
 import { SerializedNumberSchema } from "./number.js";
 import { SerializedObjectSchema } from "./object.js";
-import { SerializedOneOfSchema } from "./oneOf.js";
+import { SerializedRecordSchema } from "./record.js";
 import { SerializedRichTextSchema } from "./richtext.js";
 import { SerializedStringSchema } from "./string.js";
 import { SerializedUnionSchema } from "./union.js";
 import { ValidationErrors } from "./validation/ValidationError.js";
-export type SerializedSchema = SerializedStringSchema | SerializedLiteralSchema | SerializedBooleanSchema | SerializedNumberSchema | SerializedObjectSchema | SerializedOneOfSchema | SerializedArraySchema | SerializedUnionSchema | SerializedRichTextSchema | SerializedImageSchema | SerializedI18nSchema;
+export type SerializedSchema = SerializedStringSchema | SerializedLiteralSchema | SerializedBooleanSchema | SerializedNumberSchema | SerializedObjectSchema | SerializedArraySchema | SerializedUnionSchema | SerializedRichTextSchema | SerializedRecordSchema | SerializedKeyOfSchema | SerializedImageSchema;
 export declare abstract class Schema<Src extends SelectorSource> {
     abstract validate(path: SourcePath, src: Src): ValidationErrors;
     abstract assert(src: Src): boolean;
     abstract optional(): Schema<Src | null>;
     abstract serialize(): SerializedSchema;
-    remote(): Src extends RemoteCompatibleSource ? Schema<RemoteSource<Src>> : never;
     /** MUTATES! since internal and perf sensitive */
     protected appendValidationError(current: ValidationErrors, path: SourcePath, message: string, value?: unknown): ValidationErrors;
 }

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

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

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

@@ -0,0 +1,19 @@
+import { Schema, SchemaTypeOf, SerializedSchema } from "./index.js";
+import { SelectorSource } from "../selector/index.js";
+import { SourcePath } from "../val/index.js";
+import { ValidationErrors } from "./validation/ValidationError.js";
+export type SerializedRecordSchema = {
+    type: "record";
+    item: SerializedSchema;
+    opt: boolean;
+};
+export declare class RecordSchema<T extends Schema<SelectorSource>> extends Schema<Record<string, SchemaTypeOf<T>>> {
+    readonly item: T;
+    readonly opt: boolean;
+    constructor(item: T, opt?: boolean);
+    validate(path: SourcePath, src: Record<string, SchemaTypeOf<T>>): ValidationErrors;
+    assert(src: Record<string, SchemaTypeOf<T>>): boolean;
+    optional(): Schema<Record<string, SchemaTypeOf<T>> | null>;
+    serialize(): SerializedRecordSchema;
+}
+export declare const record: <S extends Schema<SelectorSource>>(schema: S) => Schema<Record<string, SchemaTypeOf<S>>>;

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

@@ -28,6 +28,7 @@ export declare const union: <Key extends string, T extends Schema<{
     [x: string]: import("../source/index.js").Source;
 } & {
     fold?: undefined;
+    assert?: undefined;
     andThen?: undefined;
     _ref?: undefined;
     _type?: undefined;

package/dist/declarations/src/selector/SelectorProxy.d.ts

@@ -0,0 +1,7 @@
+import { GenericSelector } from "./index.js";
+import { Source } from "../source/index.js";
+import { SourcePath } from "../val/index.js";
+export declare function isSelector(source: any): source is GenericSelector<Source>;
+export declare function newSelectorProxy(source: any, path?: SourcePath, moduleSchema?: any): any;
+export declare function createValPathOfItem(arrayPath: SourcePath | undefined, prop: string | number | symbol): SourcePath | undefined;
+export declare function selectorToVal(s: any): any;

package/dist/declarations/src/selector/array.d.ts

@@ -1,17 +1,6 @@
-import { Selector as UnknownSelector, GenericSelector, SelectorOf, SelectorSource } from "./index.js";
-import { Schema } from "../schema/index.js";
+import { GenericSelector } from "./index.js";
 import { Source, SourceArray } from "../source/index.js";
-import { Selector as BooleanSelector } from "./boolean.js";
-import { Selector as NumberSelector } from "./number.js";
 export type UndistributedSourceArray<T extends SourceArray> = [T] extends [
     infer U
 ] ? U extends Source[] ? Selector<U> : never : never;
-export type Selector<T extends SourceArray> = GenericSelector<T> & {
-    readonly [key: number]: UnknownSelector<T[number]>;
-} & {
-    length: NumberSelector<number>;
-    filter(predicate: (v: UnknownSelector<T[number]>) => BooleanSelector<boolean> | boolean): Selector<T>;
-    filter<U extends Source>(schema: Schema<U>): Selector<U[]>;
-    map<U extends SelectorSource>(f: (v: UnknownSelector<T[number]>, i: UnknownSelector<number>) => U): SelectorOf<U[]>;
-    andThen<U extends SelectorSource>(f: (v: UnknownSelector<NonNullable<T>>) => U): SelectorOf<U | T>;
-};
+export type Selector<T extends SourceArray> = GenericSelector<T>;

package/dist/declarations/src/selector/file.d.ts

@@ -1,9 +1,6 @@
-import { Selector as UnknownSelector, GenericSelector, SelectorOf, SelectorSource } from "./index.js";
+import { Selector as UnknownSelector, GenericSelector } from "./index.js";
 export type FileSelector = GenericSelector<{
     url: string;
 }> & {
     readonly url: UnknownSelector<string>;
-    andThen<U extends SelectorSource>(f: (v: UnknownSelector<NonNullable<{
-        url: string;
-    }>>) => U): SelectorOf<U> | UnknownSelector<boolean>;
 };

package/dist/declarations/src/selector/future/array.d.ts

@@ -0,0 +1,17 @@
+import { Selector as UnknownSelector, GenericSelector, SelectorOf, SelectorSource } from "./index.js";
+import { Schema } from "../../schema/index.js";
+import { Source, SourceArray } from "../../source/index.js";
+import { Selector as BooleanSelector } from "./boolean.js";
+import { Selector as NumberSelector } from "./number.js";
+export type UndistributedSourceArray<T extends SourceArray> = [T] extends [
+    infer U
+] ? U extends Source[] ? Selector<U> : never : never;
+export type Selector<T extends SourceArray> = GenericSelector<T> & {
+    readonly [key: number]: UnknownSelector<T[number]>;
+} & {
+    length: NumberSelector<number>;
+    filter(predicate: (v: UnknownSelector<T[number]>) => BooleanSelector<boolean> | boolean): Selector<T>;
+    filter<U extends Source>(schema: Schema<U>): Selector<U[]>;
+    map<U extends SelectorSource>(f: (v: UnknownSelector<T[number]>, i: UnknownSelector<number>) => U): SelectorOf<U[]>;
+    andThen<U extends SelectorSource>(f: (v: UnknownSelector<NonNullable<T>>) => U): SelectorOf<U | T>;
+};

package/dist/declarations/src/selector/future/boolean.d.ts

@@ -0,0 +1,2 @@
+import { Selector as PrimitiveSelector } from "./primitive.js";
+export type Selector<T extends boolean> = PrimitiveSelector<T>;

package/dist/declarations/src/selector/future/file.d.ts

@@ -0,0 +1,9 @@
+import { Selector as UnknownSelector, GenericSelector, SelectorOf, SelectorSource } from "./index.js";
+export type FileSelector = GenericSelector<{
+    url: string;
+}> & {
+    readonly url: UnknownSelector<string>;
+    andThen<U extends SelectorSource>(f: (v: UnknownSelector<NonNullable<{
+        url: string;
+    }>>) => U): SelectorOf<U> | UnknownSelector<boolean>;
+};

package/dist/declarations/src/selector/{i18n.d.ts → future/i18n.d.ts}

@@ -1,6 +1,6 @@
-import { SourceArray, SourceObject, SourcePrimitive } from "../source/index.js";
+import { SourceArray, SourceObject, SourcePrimitive } from "../../source/index.js";
 import { Selector as UnknownSelector } from "./index.js";
-import { FileSource } from "../source/file.js";
+import { FileSource } from "../../source/file.js";
 declare const brand: unique symbol;
 export type I18nSelector<Locales extends readonly string[], T extends SourcePrimitive | SourceObject | SourceArray | FileSource> = UnknownSelector<T> & {
     readonly [brand]: "I18nSelector";

package/dist/declarations/src/selector/future/index.d.ts

@@ -0,0 +1,81 @@
+import { I18nSelector } from "./i18n.js";
+import { Selector as ObjectSelector } from "./object.js";
+import { UndistributedSourceArray as ArraySelector } from "./array.js";
+import { Selector as NumberSelector } from "./number.js";
+import { Selector as StringSelector } from "./string.js";
+import { Selector as BooleanSelector } from "./boolean.js";
+import { Selector as PrimitiveSelector } from "./primitive.js";
+import { FileSelector } from "./file.js";
+import { SourcePath } from "../../val/index.js";
+import { Source, SourceArray, SourceObject, SourcePrimitive } from "../../source/index.js";
+import { Schema } from "../../schema/index.js";
+import { Expr } from "../../expr/expr.js";
+import { RemoteSelector } from "./remote.js";
+import { A } from "ts-toolbelt";
+import { I18nSource, I18nCompatibleSource } from "../../source/future/i18n.js";
+import { RemoteCompatibleSource, RemoteSource } from "../../source/future/remote.js";
+import { FileSource } from "../../source/file.js";
+import { RichText, RichTextSource } from "../../source/richtext.js";
+/**
+ * Selectors can be used to select parts of a Val module.
+ * Unlike queries, joins, aggregates etc is and will not be supported.
+ *
+ * They are designed to be be used as if they were "normal" JSON data,
+ * though some concessions had to be made because of TypeScript limitations.
+ *
+ * Selectors works equally on source content, defined in code, and remote content.
+ *
+ * @example
+ * // Select the title of a document
+ * const titles = useVal(docsVal.map((doc) => doc.title));
+ *
+ * @example
+ * // Match on a union type
+ * const titles = useVal(docsVal.map((doc) => doc.fold("type")({
+ *   newsletter: (newsletter) => newsletter.title,
+ *   email: (email) => email.subject,
+ * }));
+ *
+ */
+export type Selector<T extends Source> = Source extends T ? GenericSelector<T> : T extends I18nSource<infer L, infer S> ? I18nSelector<L, S> : T extends RemoteSource<infer S> ? S extends RemoteCompatibleSource ? RemoteSelector<S> : GenericSelector<Source, "Could not determine remote source"> : T extends FileSource ? FileSelector : T extends RichTextSource ? RichText : T extends SourceObject ? ObjectSelector<T> : T extends SourceArray ? ArraySelector<T> : T extends string ? StringSelector<T> : T extends number ? NumberSelector<T> : T extends boolean ? BooleanSelector<T> : T extends null ? PrimitiveSelector<null> : never;
+export type SelectorSource = SourcePrimitive | undefined | readonly SelectorSource[] | {
+    [key: string]: SelectorSource;
+} | I18nSource<readonly string[], I18nCompatibleSource> | RemoteSource<RemoteCompatibleSource> | FileSource | RichTextSource | GenericSelector<Source>;
+/**
+ * @internal
+ */
+export declare const GetSchema: unique symbol;
+/**
+/**
+ * @internal
+ */
+export declare const Path: unique symbol;
+/**
+ * @internal
+ */
+export declare const SourceOrExpr: unique symbol;
+/**
+ * @internal
+ */
+export declare const ValError: unique symbol;
+export declare abstract class GenericSelector<out T extends Source, Error extends string | undefined = undefined> {
+    readonly [Path]: SourcePath | undefined;
+    readonly [SourceOrExpr]: T | Expr;
+    readonly [ValError]: Error | undefined;
+    readonly [GetSchema]: Schema<T> | undefined;
+    constructor(valOrExpr: T, path: SourcePath | undefined, schema?: Schema<T>, error?: Error);
+    assert<U extends Source, E extends Source = null>(schema: Schema<U>, other?: () => E): SelectorOf<U | E>;
+}
+export type SourceOf<T extends SelectorSource> = Source extends T ? Source : T extends Source ? T : T extends undefined ? null : T extends GenericSelector<infer S> ? S : T extends readonly (infer S)[] ? S extends SelectorSource ? {
+    [key in keyof T]: SourceOf<A.Try<T[key], SelectorSource>>;
+} : never : T extends {
+    [key: string]: SelectorSource;
+} ? {
+    [key in keyof T]: SourceOf<A.Try<T[key], SelectorSource>>;
+} : never;
+/**
+ * Use this type to convert types that accepts both Source and Selectors
+ *
+ * An example would be where literals are supported like in most higher order functions (e.g. map in array)
+ **/
+export type SelectorOf<U extends SelectorSource> = Source extends U ? GenericSelector<Source> : SourceOf<U> extends infer S ? S extends Source ? Selector<S> : GenericSelector<Source, "Could not determine selector of source"> : GenericSelector<Source, "Could not determine source">;

package/dist/declarations/src/selector/future/number.d.ts

@@ -0,0 +1,2 @@
+import { Selector as PrimitiveSelector } from "./primitive.js";
+export type Selector<T extends number> = PrimitiveSelector<T>;

package/dist/declarations/src/selector/future/object.d.ts

@@ -0,0 +1,10 @@
+import { Selector as UnknownSelector, GenericSelector, SelectorOf, SelectorSource } from "./index.js";
+import { SourceObject } from "../../source/index.js";
+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]>;
+};