@valbuild/core 0.17.0 → 0.19.0

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

@@ -4,7 +4,7 @@ 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 { RichTextSource, RichText, TextNode, ParagraphNode, HeadingNode, ListItemNode, ListNode, } from "./source/richtext.js";
+export type { AnyRichTextOptions, Bold, Classes, HeadingNode, ImageNode, Italic, LineThrough, ListItemNode, OrderedListNode, ParagraphNode, RichText, RichTextNode, RichTextOptions, RichTextSource, RichTextSourceNode, RootNode, SourceNode, SpanNode, UnorderedListNode, } 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";
 export type { ValidationErrors, ValidationError, } from "./schema/validation/ValidationError.js";
@@ -21,6 +21,7 @@ import { createValPathOfItem } from "./selector/SelectorProxy.js";
 import { getVal } from "./future/fetchVal.js";
 import { Json } from "./Json.js";
 import { SerializedSchema } from "./schema/index.js";
+import { convertRichTextSource } from "./source/richtext.js";
 export { ValApi } from "./ValApi.js";
 export type ApiTreeResponse = {
     git: {
@@ -42,6 +43,7 @@ declare const Internal: {
         url: string;
         metadata?: import("./schema/image.js").ImageMetadata;
     };
+    convertRichTextSource: typeof convertRichTextSource;
     getSchema: typeof getSchema;
     getValPath: typeof getValPath;
     getVal: typeof getVal;
@@ -50,6 +52,7 @@ declare const Internal: {
     splitModuleIdAndModulePath: typeof splitModuleIdAndModulePath;
     isVal: typeof isVal;
     createValPathOfItem: typeof createValPathOfItem;
+    getSHA256Hash: (bits: Uint8Array) => Promise<string>;
     createPatchJSONPath: (modulePath: ModulePath) => string;
     /**
      * Enables draft mode: updates all Val modules with patches

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

@@ -7,6 +7,8 @@ import { union } from "./schema/union.js";
 import { richtext } from "./schema/richtext.js";
 import { image } from "./schema/image.js";
 import { literal } from "./schema/literal.js";
+import { keyOf } from "./schema/keyOf.js";
+import { record } from "./schema/record.js";
 export type InitSchema = {
     readonly string: typeof string;
     readonly boolean: typeof boolean;
@@ -17,12 +19,14 @@ export type InitSchema = {
     readonly richtext: typeof richtext;
     readonly image: typeof image;
     readonly literal: typeof literal;
+    readonly keyOf: typeof keyOf;
+    readonly record: typeof record;
 };
 export declare function initSchema(): {
     string: <T extends string>(options?: {
         maxLength?: number | undefined;
         minLength?: number | undefined;
-    } | undefined) => import("./schema/index.js").Schema<T>;
+    } | undefined) => import("./schema/string.js").StringSchema<T>;
     boolean: () => import("./schema/index.js").Schema<boolean>;
     array: <S extends import("./schema/index.js").Schema<import("./selector/index.js").SelectorSource>>(schema: S) => import("./schema/index.js").Schema<import("./schema/index.js").SchemaTypeOf<S>[]>;
     object: <Props extends {
@@ -43,7 +47,9 @@ export declare function initSchema(): {
         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>;
-    richtext: () => import("./schema/index.js").Schema<import("./index.js").RichTextSource>;
+    richtext: <O extends import("./index.js").RichTextOptions>(options: O) => import("./schema/index.js").Schema<import("./index.js").RichTextSource<O>>;
     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>;
+    keyOf: <Src extends import("./selector/index.js").GenericSelector<import("./source/index.js").SourceObject | 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 readonly any[] ? number : S_2 extends import("./source/index.js").SourceObject ? keyof S_2 : S_2 extends Record<string, any> ? string : never : never>;
+    record: <S_3 extends import("./schema/index.js").Schema<import("./selector/index.js").SelectorSource>>(schema: S_3) => import("./schema/index.js").Schema<Record<string, import("./schema/index.js").SchemaTypeOf<S_3>>>;
 };

package/dist/declarations/src/patch/deref.d.ts

@@ -1,6 +1,7 @@
 import { result } from "../fp/index.js";
 import { Ops, PatchError } from "./ops.js";
 import { Patch } from "./patch.js";
+import { Operation } from "./operation.js";
 export type DerefPatchResult = {
     dereferencedPatch: Patch;
     fileUpdates: {
@@ -10,4 +11,4 @@ export type DerefPatchResult = {
         [ref: string]: Patch;
     };
 };
-export declare function derefPatch<D, E>(patch: Patch, document: D, ops: Ops<D, E>): result.Result<DerefPatchResult, E | PatchError>;
+export declare function derefPatch<D, E>(patch: Operation[], document: D, ops: Ops<D, E>): result.Result<DerefPatchResult, E | PatchError>;

package/dist/declarations/src/patch/operation.d.ts

@@ -26,6 +26,10 @@ export type OperationJSON = {
     op: "test";
     path: string;
     value: JSONValue;
+} | {
+    op: "file";
+    path: string;
+    value: JSONValue;
 };
 /**
  * Parsed form of JSON patch operation.
@@ -56,4 +60,8 @@ export type Operation = {
     op: "test";
     path: string[];
     value: JSONValue;
+} | {
+    op: "file";
+    path: string[];
+    value: JSONValue;
 };

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

@@ -1,7 +1,7 @@
-import { Schema, SerializedSchema, SourceObject } from "../index.js";
+import { Schema, SerializedSchema } from "./index.js";
 import { ValModuleBrand } from "../module.js";
 import { GenericSelector } from "../selector/index.js";
-import { SourceArray } from "../source/index.js";
+import { SourceArray, SourceObject } from "../source/index.js";
 import { SourcePath } from "../val/index.js";
 import { ValidationErrors } from "./validation/ValidationError.js";
 export type SerializedKeyOfSchema = {

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

@@ -1,17 +1,18 @@
 import { Schema, SerializedSchema } from "./index.js";
-import { RichTextSource } from "../source/richtext.js";
+import { RichTextSource, RichTextOptions } from "../source/richtext.js";
 import { SourcePath } from "../val/index.js";
 import { ValidationErrors } from "./validation/ValidationError.js";
-export type SerializedRichTextSchema = {
+export type SerializedRichTextSchema = RichTextOptions & {
     type: "richtext";
     opt: boolean;
 };
-export declare class RichTextSchema<Src extends RichTextSource | null> extends Schema<Src> {
+export declare class RichTextSchema<O extends RichTextOptions, Src extends RichTextSource<O> | null> extends Schema<Src> {
+    readonly options: O;
     readonly opt: boolean;
+    constructor(options: O, opt?: boolean);
     validate(path: SourcePath, src: Src): ValidationErrors;
     assert(src: Src): boolean;
-    optional(): Schema<RichTextSource | null>;
+    optional(): Schema<RichTextSource<O> | null>;
     serialize(): SerializedSchema;
-    constructor(opt?: boolean);
 }
-export declare const richtext: () => Schema<RichTextSource>;
+export declare const richtext: <O extends RichTextOptions>(options: O) => Schema<RichTextSource<O>>;

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

@@ -9,15 +9,18 @@ export type SerializedStringSchema = {
     type: "string";
     options?: StringOptions;
     opt: boolean;
+    raw: boolean;
 };
 export declare class StringSchema<Src extends string | null> extends Schema<Src> {
     readonly options?: StringOptions | undefined;
     readonly opt: boolean;
-    constructor(options?: StringOptions | undefined, opt?: boolean);
+    readonly isRaw: boolean;
+    constructor(options?: StringOptions | undefined, opt?: boolean, isRaw?: boolean);
     validate(path: SourcePath, src: Src): ValidationErrors;
     assert(src: Src): boolean;
-    optional(): Schema<Src | null>;
+    optional(): StringSchema<Src | null>;
+    raw(): StringSchema<Src>;
     serialize(): SerializedSchema;
 }
-export declare const string: <T extends string>(options?: StringOptions) => Schema<T>;
+export declare const string: <T extends string>(options?: StringOptions) => StringSchema<T>;
 export {};

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

@@ -15,7 +15,7 @@ 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";
+import { AnyRichTextOptions, 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.
@@ -37,10 +37,10 @@ import { RichText, RichTextSource } from "../../source/richtext.js";
  * }));
  *
  */
-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 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<infer O> ? RichText<O> : 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>;
+} | I18nSource<readonly string[], I18nCompatibleSource> | RemoteSource<RemoteCompatibleSource> | FileSource | RichTextSource<AnyRichTextOptions> | GenericSelector<Source>;
 /**
  * @internal
  */

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

@@ -10,11 +10,11 @@ import { Source, SourceArray, SourceObject, SourcePrimitive } from "../source/in
 import { Schema } from "../schema/index.js";
 import type { A } from "ts-toolbelt";
 import { FileSource } from "../source/file.js";
-import { RichText, RichTextSource } from "../source/richtext.js";
-export type Selector<T extends Source> = Source extends T ? GenericSelector<T> : 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;
+import { RichText, RichTextOptions, RichTextSource } from "../source/richtext.js";
+export type Selector<T extends Source> = Source extends T ? GenericSelector<T> : T extends FileSource ? FileSelector : T extends RichTextSource<infer O> ? RichText<O> : 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;
-} | FileSource | RichTextSource | GenericSelector<Source>;
+} | FileSource | RichTextSource<RichTextOptions> | GenericSelector<Source>;
 /**
  * @internal
  */

package/dist/declarations/src/source/future/remote.d.ts

@@ -1,11 +1,11 @@
 import { SourcePrimitive, VAL_EXTENSION, PhantomType } from "../index.js";
 import { FileSource } from "../file.js";
 import { I18nCompatibleSource, I18nSource } from "./i18n.js";
-import { RichTextSource } from "../richtext.js";
+import { AnyRichTextOptions, RichTextSource } from "../richtext.js";
 /**
  * Remote sources cannot include other remote sources.
  */
-export type RemoteCompatibleSource = SourcePrimitive | RemoteObject | RemoteArray | RichTextSource | FileSource | I18nSource<string[], I18nCompatibleSource>;
+export type RemoteCompatibleSource = SourcePrimitive | RemoteObject | RemoteArray | RichTextSource<AnyRichTextOptions> | FileSource | I18nSource<string[], I18nCompatibleSource>;
 export type RemoteObject = {
     [key in string]: RemoteCompatibleSource;
 };

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

@@ -1,8 +1,8 @@
 import { FileSource } from "./file.js";
 import { I18nSource, I18nCompatibleSource } from "./future/i18n.js";
 import { RemoteSource, RemoteCompatibleSource } from "./future/remote.js";
-import { RichTextSource } from "./richtext.js";
-export type Source = SourcePrimitive | SourceObject | SourceArray | I18nSource<string[], I18nCompatibleSource> | RemoteSource<RemoteCompatibleSource> | FileSource | RichTextSource;
+import { RichTextOptions, RichTextSource } from "./richtext.js";
+export type Source = SourcePrimitive | SourceObject | SourceArray | I18nSource<string[], I18nCompatibleSource> | RemoteSource<RemoteCompatibleSource> | FileSource | RichTextSource<RichTextOptions>;
 export type SourceObject = {
     [key in string]: Source;
 } & {
@@ -17,7 +17,7 @@ export type SourceObject = {
 export type SourceArray = readonly Source[];
 export type SourcePrimitive = string | number | boolean | null;
 export declare const VAL_EXTENSION: "_type";
-export declare function getValExtension(source: Source): false | "" | 0 | "richtext" | "remote" | "file" | "i18n" | null | undefined;
+export declare function getValExtension(source: Source): false | "" | 0 | "remote" | "file" | "richtext" | "i18n" | null | undefined;
 /**
  * A phantom type parameter is one that doesn't show up at runtime, but is checked statically (and only) at compile time.
  *

package/dist/declarations/src/source/richtext.d.ts

@@ -1,63 +1,79 @@
+import { FileSource } from "./file.js";
 import { VAL_EXTENSION } from "./index.js";
-import { SourcePath } from "../val/index.js";
-type Node = {
-    version?: 1;
+export type RichTextOptions = {
+    headings?: ("h1" | "h2" | "h3" | "h4" | "h5" | "h6")[];
+    img?: boolean;
+    ul?: boolean;
+    ol?: boolean;
+    lineThrough?: boolean;
+    bold?: boolean;
+    italic?: boolean;
 };
-type NodeType = Node & {
-    format?: FormatType;
-    direction?: DirectionType;
-    indent?: number;
+export type ParagraphNode<O extends RichTextOptions> = {
+    tag: "p";
+    children: (string | SpanNode<O> | ImageNode<O>)[];
 };
-type FormatType = "left" | "start" | "center" | "right" | "end" | "justify" | "";
-type DirectionType = "ltr" | "rtl" | null;
-export type TextNode = Node & {
-    type: "text";
-    format?: FormatType | number;
-    detail?: number;
-    mode?: "normal" | "code" | "quote";
-    style?: string;
-    text: string;
-    direction?: DirectionType;
-    indent?: number;
+export type LineThrough<O extends RichTextOptions> = O["lineThrough"] extends true ? "line-through" : never;
+export type Italic<O extends RichTextOptions> = O["italic"] extends true ? "italic" : never;
+export type Bold<O extends RichTextOptions> = O["bold"] extends true ? "bold" : never;
+export type Classes<O extends RichTextOptions> = LineThrough<O> | Italic<O> | Bold<O>;
+export type SpanNode<O extends RichTextOptions> = {
+    tag: "span";
+    classes: Classes<O>[];
+    children: [string | SpanNode<O>];
 };
-export type ParagraphNode<VN = TextNode> = NodeType & {
-    children: (TextNode | VN)[];
-    type: "paragraph";
+export type ImageNode<O extends RichTextOptions> = O["img"] extends true ? {
+    tag: "img";
+    src: string;
+    height?: number;
+    width?: number;
+} : never;
+export type ListItemNode<O extends RichTextOptions> = {
+    tag: "li";
+    children: (string | SpanNode<O> | ImageNode<O> | UnorderedListNode<O> | OrderedListNode<O>)[];
 };
-export type HeadingNode<HT extends HeadingTags = HeadingTags> = NodeType & {
-    children: TextNode[];
-    type: "heading";
-    tag: HT;
+export type UnorderedListNode<O extends RichTextOptions> = O["ul"] extends true ? {
+    tag: "ul";
+    dir?: "ltr" | "rtl";
+    children: ListItemNode<O>[];
+} : never;
+export type OrderedListNode<O extends RichTextOptions> = O["ol"] extends true ? {
+    tag: "ol";
+    dir?: "ltr" | "rtl";
+    children: ListItemNode<O>[];
+} : never;
+export type HeadingNode<O extends RichTextOptions> = O["headings"] extends any[] ? {
+    tag: O["headings"][number];
+    children: (string | SpanNode<O>)[];
+} : never;
+type ImageSource = FileSource<{
+    width: number;
+    height: number;
+    sha256: string;
+}>;
+export type SourceNode<O extends RichTextOptions> = O["img"] extends true ? ImageSource : never;
+export type AnyRichTextOptions = {
+    headings: ("h1" | "h2" | "h3" | "h4" | "h5" | "h6")[];
+    img: true;
+    ul: true;
+    ol: true;
+    lineThrough: true;
+    bold: true;
+    italic: true;
 };
-export type ListItemNode<VN = TextNode> = NodeType & {
-    children: (TextNode | VN)[];
-    type: "listitem";
-    value: number;
-    checked?: boolean;
+export type RichTextSourceNode<O extends RichTextOptions> = Exclude<RichTextNode<O>, {
+    tag: "img";
+}> | ParagraphNode<O> | ListItemNode<O> | ImageNode<O> | SourceNode<O>;
+export type RichTextSource<O extends RichTextOptions> = {
+    [VAL_EXTENSION]: "richtext";
+    children: (HeadingNode<O> | ParagraphNode<O> | UnorderedListNode<O> | OrderedListNode<O> | SourceNode<O>)[];
 };
-export type ListNode<VN = TextNode> = NodeType & {
-    children: ListItemNode<VN>[];
-    type: "list";
-    tag: "ol" | "ul";
-    listType: "number" | "bullet" | "check";
-    start?: number;
+export type RichTextNode<O extends RichTextOptions> = string | HeadingNode<O> | ParagraphNode<O> | UnorderedListNode<O> | OrderedListNode<O> | ListItemNode<O> | SpanNode<O> | ImageNode<O>;
+export type RootNode<O extends RichTextOptions> = HeadingNode<O> | ParagraphNode<O> | UnorderedListNode<O> | OrderedListNode<O> | ImageNode<O>;
+export type RichText<O extends RichTextOptions> = {
+    [VAL_EXTENSION]: "richtext";
+    children: RootNode<O>[];
 };
-type HeadingTags = "h1" | "h2" | "h3" | "h4" | "h5" | "h6";
-export type RootNode<HT extends HeadingTags, VN> = Node & {
-    children: (HeadingNode<HT> | ParagraphNode<VN> | ListNode<VN>)[];
-    type?: "root";
-    format?: FormatType;
-    direction?: DirectionType;
-    indent?: number;
-};
-declare const brand: unique symbol;
-export type RichText<HT extends HeadingTags = HeadingTags, VN extends TextNode = TextNode> = RootNode<HT, VN> & {
-    [brand]: "richtext";
-    valPath: SourcePath;
-};
-export type RichTextSource = RichText & {
-    readonly [VAL_EXTENSION]: "richtext";
-};
-export declare function richtext(data: RootNode<HeadingTags, TextNode> | string): RichTextSource;
-export declare function isRichText(obj: unknown): obj is RichTextSource;
+export declare function convertRichTextSource<O extends RichTextOptions>(src: RichTextSource<O>): RichText<O>;
+export declare function richtext<O extends RichTextOptions, Nodes extends never | ImageSource>(templateStrings: TemplateStringsArray, ...expr: Nodes[]): RichTextSource<O>;
 export {};

package/dist/{index-3e3e839e.esm.js → index-5d1ab97c.esm.js}

@@ -1,4 +1,4 @@
-import { f as _objectSpread2, j as _slicedToArray, c as _createClass, b as _classCallCheck, q as Sym, C as Call, r as StringLiteral, s as StringTemplate, e as _typeof, l as isSerializedVal, F as FILE_REF_PROP, V as VAL_EXTENSION, m as convertFileSource, d as _defineProperty, S as Schema, E as Expr, t as _toConsumableArray, N as NilSym } from './index-369caccf.esm.js';
+import { j as _objectSpread2, k as _slicedToArray, c as _createClass, b as _classCallCheck, r as Sym, C as Call, s as StringLiteral, t as StringTemplate, e as _typeof, n as isSerializedVal, F as FILE_REF_PROP, V as VAL_EXTENSION, f as convertFileSource, d as _defineProperty, S as Schema, E as Expr, u as _toConsumableArray, N as NilSym } from './index-bccf1907.esm.js';
 import { i as isErr, e as err, o as ok, a as isOk } from './result-b96df128.esm.js';
 
 var WHITE_SPACE = ["\n", "\r", "\t", " "];

package/dist/{index-369caccf.esm.js → index-bccf1907.esm.js}

@@ -547,4 +547,4 @@ function getValPath(valOrSelector) {
   return valOrSelector[Path];
 }
 
-export { Call as C, Expr as E, FILE_REF_PROP as F, GetSource as G, ImageSchema as I, NilSym as N, Path as P, Schema as S, VAL_EXTENSION as V, _inherits as _, _createSuper as a, _classCallCheck as b, _createClass as c, _defineProperty as d, _typeof as e, _objectSpread2 as f, getValPath as g, file as h, image as i, _slicedToArray as j, isFile as k, isSerializedVal as l, convertFileSource as m, getSchema as n, isVal as o, GenericSelector as p, Sym as q, StringLiteral as r, StringTemplate as s, _toConsumableArray as t, GetSchema as u };
+export { Call as C, Expr as E, FILE_REF_PROP as F, GetSchema as G, ImageSchema as I, NilSym as N, Path as P, Schema as S, VAL_EXTENSION as V, _inherits as _, _createSuper as a, _classCallCheck as b, _createClass as c, _defineProperty as d, _typeof as e, convertFileSource as f, getValPath as g, file as h, image as i, _objectSpread2 as j, _slicedToArray as k, isFile as l, GetSource as m, isSerializedVal as n, getSchema as o, isVal as p, GenericSelector as q, Sym as r, StringLiteral as s, StringTemplate as t, _toConsumableArray as u };

package/dist/{ops-f3015423.cjs.dev.js → ops-2d7e1742.cjs.dev.js}

@@ -382,75 +382,132 @@ var union = function union(key) {
 var RichTextSchema = /*#__PURE__*/function (_Schema) {
   index._inherits(RichTextSchema, _Schema);
   var _super = index._createSuper(RichTextSchema);
-  function RichTextSchema() {
+  function RichTextSchema(options) {
     var _this;
-    var opt = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+    var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     index._classCallCheck(this, RichTextSchema);
     _this = _super.call(this);
+    _this.options = options;
     _this.opt = opt;
     return _this;
   }
   index._createClass(RichTextSchema, [{
     key: "validate",
     value: function validate(path, src) {
+      return false; //TODO
+    }
+  }, {
+    key: "assert",
+    value: function assert(src) {
+      return true; // TODO
+    }
+  }, {
+    key: "optional",
+    value: function optional() {
+      return new RichTextSchema(this.options, true);
+    }
+  }, {
+    key: "serialize",
+    value: function serialize() {
+      return {
+        type: "richtext",
+        opt: this.opt
+      };
+    }
+  }]);
+  return RichTextSchema;
+}(index.Schema);
+var richtext = function richtext(options) {
+  return new RichTextSchema(options);
+};
+
+var RecordSchema = /*#__PURE__*/function (_Schema) {
+  index._inherits(RecordSchema, _Schema);
+  var _super = index._createSuper(RecordSchema);
+  function RecordSchema(item) {
+    var _this;
+    var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    index._classCallCheck(this, RecordSchema);
+    _this = _super.call(this);
+    _this.item = item;
+    _this.opt = opt;
+    return _this;
+  }
+  index._createClass(RecordSchema, [{
+    key: "validate",
+    value: function validate(path, src) {
+      var _this2 = this;
+      var error = false;
       if (this.opt && (src === null || src === undefined)) {
         return false;
       }
-      if (src === null || src === undefined) {
-        return index._defineProperty({}, path, [{
-          message: "Expected non-nullable got '".concat(src, "'")
-        }]);
-      }
-      if (index._typeof(src) !== "object" && !Array.isArray(src)) {
-        return index._defineProperty({}, path, [{
-          message: "Expected 'object' (that is not of an array) or 'string', got '".concat(index._typeof(src), "'"),
-          value: src
-        }]);
-      }
-      if (src[index.VAL_EXTENSION] !== "richtext") {
-        return index._defineProperty({}, path, [{
-          message: "Expected _type key with value 'richtext' got '".concat(src[index.VAL_EXTENSION], "'"),
-          value: src
-        }]);
-      }
-      if (src.type !== "root") {
+      if (index._typeof(src) !== "object") {
         return index._defineProperty({}, path, [{
-          message: "Expected type key with value 'root' got '".concat(src.type, "'"),
-          value: src
+          message: "Expected 'object', got '".concat(index._typeof(src), "'")
         }]);
       }
-      if (index._typeof(src.children) !== "object" && !Array.isArray(src.children)) {
+      if (Array.isArray(src)) {
         return index._defineProperty({}, path, [{
-          message: "Expected children to be an array, but got '".concat(src.type, "'"),
-          value: src
+          message: "Expected 'object', got 'array'"
         }]);
       }
-      return false;
+      Object.entries(src).forEach(function (_ref3) {
+        var _ref4 = index._slicedToArray(_ref3, 2),
+          key = _ref4[0],
+          elem = _ref4[1];
+        var subPath = createValPathOfItem(path, key);
+        if (!subPath) {
+          error = _this2.appendValidationError(error, path, "Internal error: could not create path at ".concat(!path && typeof path === "string" ? "<empty string>" : path, " at key ").concat(elem),
+          // Should! never happen
+          src);
+        } else {
+          var subError = _this2.item.validate(subPath, elem);
+          if (subError && error) {
+            error = index._objectSpread2(index._objectSpread2({}, subError), error);
+          } else if (subError) {
+            error = subError;
+          }
+        }
+      });
+      return error;
     }
   }, {
     key: "assert",
     value: function assert(src) {
-      // TODO:
-      return true;
+      if (this.opt && (src === null || src === undefined)) {
+        return true;
+      }
+      if (!src) {
+        return false;
+      }
+      for (var _i = 0, _Object$entries = Object.entries(src); _i < _Object$entries.length; _i++) {
+        var _Object$entries$_i = index._slicedToArray(_Object$entries[_i], 2),
+          _item = _Object$entries$_i[1];
+        if (!this.item.assert(_item)) {
+          return false;
+        }
+      }
+      return index._typeof(src) === "object" && !Array.isArray(src);
     }
   }, {
     key: "optional",
     value: function optional() {
-      return new RichTextSchema(true);
+      return new RecordSchema(this.item, true);
     }
   }, {
     key: "serialize",
     value: function serialize() {
       return {
-        type: "richtext",
+        type: "record",
+        item: this.item.serialize(),
         opt: this.opt
       };
     }
   }]);
-  return RichTextSchema;
+  return RecordSchema;
 }(index.Schema);
-var richtext = function richtext() {
-  return new RichTextSchema();
+var record = function record(schema) {
+  return new RecordSchema(schema);
 };
 
 function content(
@@ -477,6 +534,9 @@ function splitModuleIdAndModulePath(path) {
 function isObjectSchema(schema) {
   return schema instanceof ObjectSchema || index._typeof(schema) === "object" && "type" in schema && schema.type === "object";
 }
+function isRecordSchema(schema) {
+  return schema instanceof RecordSchema || index._typeof(schema) === "object" && "type" in schema && schema.type === "record";
+}
 function isArraySchema(schema) {
   return schema instanceof ArraySchema || index._typeof(schema) === "object" && "type" in schema && schema.type === "array";
 }
@@ -535,6 +595,18 @@ function resolvePath(path, valModule, schema) {
       }
       resolvedSource = resolvedSource[part];
       resolvedSchema = resolvedSchema.item;
+    } else if (isRecordSchema(resolvedSchema)) {
+      if (typeof part !== "string") {
+        throw Error("Invalid path: record schema ".concat(resolvedSchema, " must have path: ").concat(part, " as string"));
+      }
+      if (index._typeof(resolvedSource) !== "object" && !Array.isArray(resolvedSource)) {
+        throw Error("Schema type error: expected source to be type of record, but got ".concat(index._typeof(resolvedSource)));
+      }
+      if (!resolvedSource[part]) {
+        throw Error("Invalid path: record source did not have key ".concat(part, " from path: ").concat(path));
+      }
+      resolvedSource = resolvedSource[part];
+      resolvedSchema = resolvedSchema.item;
     } else if (isObjectSchema(resolvedSchema)) {
       if (index._typeof(resolvedSource) !== "object") {
         throw Error("Schema type error: expected source to be type of object, but got ".concat(index._typeof(resolvedSource)));
@@ -678,6 +750,7 @@ exports.getSource = getSource;
 exports.isSelector = isSelector;
 exports.newSelectorProxy = newSelectorProxy;
 exports.object = object;
+exports.record = record;
 exports.resolvePath = resolvePath;
 exports.richtext = richtext;
 exports.splitModuleIdAndModulePath = splitModuleIdAndModulePath;