@valbuild/core 0.67.1 → 0.68.0

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

@@ -1,8 +1,8 @@
 export declare abstract class Expr {
-    readonly span?: [number, number?] | undefined;
+    readonly span?: [number, (number | undefined)?] | undefined;
     abstract type: "StringLiteral" | "Sym" | "StringTemplate" | "Call";
     abstract transpile(): string;
-    constructor(span?: [number, number?] | undefined);
+    constructor(span?: [number, (number | undefined)?] | undefined);
 }
 export declare class StringLiteral extends Expr {
     readonly value: string;

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

@@ -2,7 +2,7 @@ import { result } from "../fp/index.js";
 import { Expr } from "./expr.js";
 export declare class ParserError {
     readonly message: string;
-    readonly span?: [number, number?] | undefined;
-    constructor(message: string, span?: [number, number?] | undefined);
+    readonly span?: [number, (number | undefined)?] | undefined;
+    constructor(message: string, span?: [number, (number | undefined)?] | undefined);
 }
 export declare function parse(input: string): result.Result<Expr, ParserError>;

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

@@ -10,7 +10,7 @@ export type { FileSource } from "./source/file.js";
 export type { RawString } from "./schema/string.js";
 export type { ImageSource } from "./source/image.js";
 export type { AllRichTextOptions, Bold, Styles, HeadingNode, ImageNode, Italic, LineThrough, ListItemNode, LinkNode, OrderedListNode, ParagraphNode, BrNode, RichTextNode, RichTextOptions, RichTextSource, BlockNode, SpanNode, UnorderedListNode, } from "./source/richtext.js";
-export { type Val, type SerializedVal, type ModuleFilePath, type PatchId, type ModulePath, type SourcePath, type JsonOfSource, } from "./val/index.js";
+export { type Val, type SerializedVal, type ModuleFilePath, type PatchId, type ModulePath, type SourcePath, type JsonOfSource, type ParentPatchId, } from "./val/index.js";
 export type { Json, JsonPrimitive, JsonArray, JsonObject } from "./Json.js";
 export type { ValidationError, ValidationErrors, } from "./schema/validation/ValidationError.js";
 export type { ValidationFix } from "./schema/validation/ValidationFix.js";
@@ -72,30 +72,7 @@ declare const Internal: {
         [k: string]: string;
     };
     ModuleFilePathSep: string;
-    notFileOp: (op: Operation) => op is {
-        op: "add";
-        path: string[];
-        value: import("./patch/index.js").JSONValue;
-    } | {
-        op: "remove";
-        path: import("./fp/array.js").NonEmptyArray<string>;
-    } | {
-        op: "replace";
-        path: string[];
-        value: import("./patch/index.js").JSONValue;
-    } | {
-        op: "move";
-        from: import("./fp/array.js").NonEmptyArray<string>;
-        path: string[];
-    } | {
-        op: "copy";
-        from: string[];
-        path: string[];
-    } | {
-        op: "test";
-        path: string[];
-        value: import("./patch/index.js").JSONValue;
-    };
+    notFileOp: (op: Operation) => boolean;
     isFileOp: (op: Operation) => op is {
         op: "file";
         path: string[];

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

@@ -20,7 +20,7 @@ export type InitSchema = {
     readonly union: typeof union;
     readonly richtext: typeof richtext;
     /**
-     * Define a image source.
+     * Define an image.
      *
      * Use c.image to create an image source.
      *
@@ -45,30 +45,60 @@ export type InitSchema = {
     readonly date: typeof date;
 };
 export declare function initSchema(): {
-    string: <T extends string>(options?: Record<string, never>) => import("./schema/string.js").StringSchema<T>;
+    string: <T extends string>(options?: Record<string, never> | 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").SelectorOfSchema<S>[]>;
     object: <Props extends {
         [key: string]: import("./schema/index.js").Schema<import("./selector/index.js").SelectorSource>;
     } & {
-        valPath?: never;
-        val?: never;
-        _type?: never;
-        _ref?: never;
-        andThen?: never;
-        assert?: never;
-        fold?: never;
+        valPath?: undefined;
+        val?: undefined;
+        _type?: undefined;
+        _ref?: undefined;
+        andThen?: undefined;
+        assert?: undefined;
+        fold?: undefined;
     }>(schema: Props) => import("./schema/index.js").Schema<{ [key in keyof Props]: import("./schema/index.js").SelectorOfSchema<Props[key]>; }>;
     number: (options?: {
-        max?: number;
-        min?: number;
-    }) => import("./schema/index.js").Schema<number>;
-    union: <Key extends string | import("./schema/index.js").Schema<string>, T extends import("./schema/index.js").Schema<Key extends string ? import("./source/index.js").SourceObject & { [k in Key]: string; } : Key extends import("./schema/index.js").Schema<string> ? string : unknown>[]>(key: Key, ...objects: T) => import("./schema/index.js").Schema<T extends import("./schema/index.js").Schema<infer S extends import("./selector/index.js").SelectorSource>[] ? S extends import("./selector/index.js").SelectorSource ? S | (Key extends import("./schema/index.js").Schema<infer K extends import("./selector/index.js").SelectorSource> ? K : never) : never : never>;
-    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) => import("./schema/index.js").Schema<import("./index.js").ImageSource>;
-    literal: <T extends string>(value: T) => import("./schema/literal.js").LiteralSchema<T>;
-    keyOf: <Src extends import("./selector/index.js").GenericSelector<import("./source/index.js").SourceObject> & import("./module.js").ValModuleBrand>(valModule: Src) => import("./schema/index.js").Schema<Src extends import("./selector/index.js").GenericSelector<infer S extends import("./source/index.js").Source, undefined> ? S extends readonly import("./source/index.js").Source[] ? number : S extends import("./source/index.js").SourceObject ? string extends keyof S ? import("./schema/string.js").RawString : keyof S : S extends Record<string, import("./source/index.js").Source> ? import("./schema/string.js").RawString : never : never>;
-    record: <S extends import("./schema/index.js").Schema<import("./selector/index.js").SelectorSource>>(schema: S) => import("./schema/index.js").Schema<Record<string, import("./schema/index.js").SelectorOfSchema<S>>>;
-    file: (options?: import("./schema/file.js").FileOptions) => import("./schema/index.js").Schema<import("./index.js").FileSource<import("./schema/file.js").FileMetadata>>;
-    date: (options?: Record<string, never>) => import("./schema/date.js").DateSchema<import("./schema/string.js").RawString>;
+        max?: number | undefined;
+        min?: number | undefined;
+    } | undefined) => import("./schema/index.js").Schema<number>;
+    union: <Key extends string | import("./schema/index.js").Schema<string>, T_1 extends import("./schema/index.js").Schema<Key extends string ? {
+        [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 extends import("./schema/index.js").Schema<string> ? string : unknown>[]>(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 | (Key extends import("./schema/index.js").Schema<infer K extends import("./selector/index.js").SelectorSource> ? K : never) : never : never>;
+    richtext: <O extends Partial<{
+        style: Partial<{
+            bold: boolean;
+            italic: boolean;
+            lineThrough: boolean;
+        }>;
+        block: Partial<{
+            h1: boolean;
+            h2: boolean;
+            h3: boolean;
+            h4: boolean;
+            h5: boolean;
+            h6: boolean;
+            ul: boolean;
+            ol: boolean;
+        }>;
+        inline: Partial<{
+            a: boolean;
+            img: boolean;
+        }>;
+    }>>(options?: O | undefined) => 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").ImageSource>;
+    literal: <T_2 extends string>(value: T_2) => import("./schema/literal.js").LiteralSchema<T_2>;
+    keyOf: <Src extends import("./selector/index.js").GenericSelector<import("./source/index.js").SourceObject, 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 import("./source/index.js").Source[] ? number : S_2 extends import("./source/index.js").SourceObject ? string extends keyof S_2 ? import("./schema/string.js").RawString : keyof S_2 : S_2 extends Record<string, import("./source/index.js").Source> ? import("./schema/string.js").RawString : 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").SelectorOfSchema<S_3>>>;
+    file: (options?: import("./schema/file.js").FileOptions | undefined) => import("./schema/index.js").Schema<import("./index.js").FileSource<import("./schema/file.js").FileMetadata>>;
+    date: (options?: Record<string, never> | undefined) => import("./schema/date.js").DateSchema<import("./schema/string.js").RawString>;
 };

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

@@ -2,5 +2,5 @@ export { JSONOps } from "./json.js";
 export { type OperationJSON, type Operation } from "./operation.js";
 export { parsePatch, parseJSONPointer, formatJSONPointer } from "./parse.js";
 export { type JSONValue, type Ops, PatchError } from "./ops.js";
-export { type PatchJSON, type Patch, applyPatch } from "./patch.js";
+export { type PatchJSON, type Patch, applyPatch, type PatchBlock, type ParentRef, } from "./patch.js";
 export { isNotRoot, deepEqual, deepClone, parseAndValidateArrayIndex, sourceToPatchPath, } from "./util.js";

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

@@ -1,6 +1,18 @@
 import { result } from "../fp/index.js";
 import { Ops, PatchError } from "./ops.js";
 import { Operation, OperationJSON } from "./operation.js";
+import { PatchId } from "../val/index.js";
 export type Patch = Operation[];
 export type PatchJSON = OperationJSON[];
+export type ParentRef = {
+    type: "head";
+    headBaseSha: string;
+} | {
+    type: "patch";
+    patchId: PatchId;
+};
+export type PatchBlock = {
+    patch: Patch;
+    parentRef: ParentRef;
+};
 export declare function applyPatch<T, E>(document: T, ops: Ops<T, E>, patch: Operation[]): result.Result<T, E | PatchError>;

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

@@ -23,5 +23,5 @@ export declare class KeyOfSchema<Sel extends GenericSelector<SourceObject>, Src
     nullable(): Schema<Src | null>;
     serialize(): SerializedSchema;
 }
-export declare const keyOf: <Src extends GenericSelector<SourceObject> & ValModuleBrand>(valModule: Src) => Schema<KeyOfSelector<Src>>;
+export declare const keyOf: <Src extends GenericSelector<SourceObject, undefined> & ValModuleBrand>(valModule: Src) => Schema<KeyOfSelector<Src>>;
 export {};

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

@@ -17,4 +17,24 @@ export declare class RichTextSchema<O extends RichTextOptions, Src extends RichT
     nullable(): Schema<Src | null>;
     serialize(): SerializedSchema;
 }
-export declare const richtext: <O extends RichTextOptions>(options?: O) => Schema<RichTextSource<O>>;
+export declare const richtext: <O extends Partial<{
+    style: Partial<{
+        bold: boolean;
+        italic: boolean;
+        lineThrough: boolean;
+    }>;
+    block: Partial<{
+        h1: boolean;
+        h2: boolean;
+        h3: boolean;
+        h4: boolean;
+        h5: boolean;
+        h6: boolean;
+        ul: boolean;
+        ol: boolean;
+    }>;
+    inline: Partial<{
+        a: boolean;
+        img: boolean;
+    }>;
+}>>(options?: O | undefined) => Schema<RichTextSource<O>>;

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

@@ -33,5 +33,15 @@ export declare class UnionSchema<Key extends string | Schema<string>, T extends
     serialize(): SerializedSchema;
     constructor(key: Key, items: T, opt?: boolean);
 }
-export declare const union: <Key extends string | Schema<string>, T extends Schema<Key extends string ? SourceObject & { [k in Key]: string; } : Key extends Schema<string> ? string : unknown>[]>(key: Key, ...objects: T) => Schema<SourceOf<Key, T>>;
+export declare const union: <Key extends string | Schema<string>, T extends Schema<Key extends string ? {
+    [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 extends Schema<string> ? string : unknown>[]>(key: Key, ...objects: T) => Schema<SourceOf<Key, T>>;
 export {};

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

@@ -22,7 +22,7 @@ export type FileSource<Metadata extends FileMetadata | undefined = FileMetadata
 export declare const initFile: (config?: ValConfig) => {
     <Metadata extends {
         readonly [key: string]: Json;
-    }>(ref: `${`/public/${string}`}/${string}`, metadata: Metadata): FileSource<Metadata>;
-    (ref: `${`/public/${string}`}/${string}`, metadata?: undefined): FileSource<undefined>;
+    }>(ref: `/public/${string}/${string}`, metadata: Metadata): FileSource<Metadata>;
+    (ref: `/public/${string}/${string}`, metadata?: undefined): FileSource<undefined>;
 };
 export declare function isFile(obj: unknown): obj is FileSource;

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

@@ -14,6 +14,6 @@ export type ImageSource<Metadata extends ImageMetadata | undefined = ImageMetada
     readonly patch_id?: string;
 };
 export declare const initImage: (config?: ValConfig) => {
-    (ref: `${`/public/${string}`}/${string}`, metadata: ImageMetadata): ImageSource<ImageMetadata>;
-    (ref: `${`/public/${string}`}/${string}`, metadata?: undefined): ImageSource<undefined>;
+    (ref: `/public/${string}/${string}`, metadata: ImageMetadata): ImageSource<ImageMetadata>;
+    (ref: `/public/${string}/${string}`, metadata?: undefined): ImageSource<undefined>;
 };

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

@@ -53,5 +53,11 @@ export type ModuleFilePath = string & {
 export type PatchId = string & {
     [brand]: "PatchId";
 };
+/**
+ * The patchId of the parent patch, or "head" if there is no parent patch.
+ */
+export type ParentPatchId = string & {
+    [brand]: "ParentPatchId";
+};
 export declare function getValPath(valOrSelector: Val<Json> | Selector<Source>): SourcePath | undefined;
 export {};

package/dist/{index-439509d7.esm.js → index-1d65adb5.esm.js}

@@ -630,6 +630,10 @@ function isVal(val) {
  * '/app/blogs.val.ts'
  */
 
+/**
+ * The patchId of the parent patch, or "head" if there is no parent patch.
+ */
+
 function getValPath(valOrSelector) {
   return valOrSelector[Path$1];
 }

package/dist/{index-3d77ee46.cjs.dev.js → index-47055fcc.cjs.dev.js}

@@ -632,6 +632,10 @@ function isVal(val) {
  * '/app/blogs.val.ts'
  */
 
+/**
+ * The patchId of the parent patch, or "head" if there is no parent patch.
+ */
+
 function getValPath(valOrSelector) {
   return valOrSelector[Path$1];
 }

package/dist/{index-b20f2afc.cjs.prod.js → index-6d63e99d.cjs.prod.js}

@@ -632,6 +632,10 @@ function isVal(val) {
  * '/app/blogs.val.ts'
  */
 
+/**
+ * The patchId of the parent patch, or "head" if there is no parent patch.
+ */
+
 function getValPath(valOrSelector) {
   return valOrSelector[Path$1];
 }

package/dist/valbuild-core.cjs.dev.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var expr_dist_valbuildCoreExpr = require('./index-3d77ee46.cjs.dev.js');
+var expr_dist_valbuildCoreExpr = require('./index-47055fcc.cjs.dev.js');
 require('./result-bb1f436e.cjs.dev.js');
 
 

package/dist/valbuild-core.cjs.prod.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var expr_dist_valbuildCoreExpr = require('./index-b20f2afc.cjs.prod.js');
+var expr_dist_valbuildCoreExpr = require('./index-6d63e99d.cjs.prod.js');
 require('./result-787e35f6.cjs.prod.js');
 
 

package/dist/valbuild-core.esm.js

@@ -1,2 +1,2 @@
-export { A as ArraySchema, B as BooleanSchema, D as DateSchema, F as FATAL_ERROR_TYPES, k as FILE_REF_PROP, l as FILE_REF_SUBTYPE_TAG, t as FileSchema, G as GenericSelector, r as ImageSchema, I as Internal, K as KeyOfSchema, L as LiteralSchema, M as ModuleFilePathSep, q as NumberSchema, O as ObjectSchema, R as RecordSchema, u as RichTextSchema, j as Schema, o as StringSchema, U as UnionSchema, V as VAL_EXTENSION, n as derefPatch, v as deserializeSchema, i as expr, h as initVal, m as modules } from './index-439509d7.esm.js';
+export { A as ArraySchema, B as BooleanSchema, D as DateSchema, F as FATAL_ERROR_TYPES, k as FILE_REF_PROP, l as FILE_REF_SUBTYPE_TAG, t as FileSchema, G as GenericSelector, r as ImageSchema, I as Internal, K as KeyOfSchema, L as LiteralSchema, M as ModuleFilePathSep, q as NumberSchema, O as ObjectSchema, R as RecordSchema, u as RichTextSchema, j as Schema, o as StringSchema, U as UnionSchema, V as VAL_EXTENSION, n as derefPatch, v as deserializeSchema, i as expr, h as initVal, m as modules } from './index-1d65adb5.esm.js';
 import './result-168dfc1d.esm.js';

package/expr/dist/valbuild-core-expr.cjs.dev.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var expr_dist_valbuildCoreExpr = require('../../dist/index-3d77ee46.cjs.dev.js');
+var expr_dist_valbuildCoreExpr = require('../../dist/index-47055fcc.cjs.dev.js');
 require('../../dist/result-bb1f436e.cjs.dev.js');
 
 

package/expr/dist/valbuild-core-expr.cjs.prod.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var expr_dist_valbuildCoreExpr = require('../../dist/index-b20f2afc.cjs.prod.js');
+var expr_dist_valbuildCoreExpr = require('../../dist/index-6d63e99d.cjs.prod.js');
 require('../../dist/result-787e35f6.cjs.prod.js');
 
 

package/expr/dist/valbuild-core-expr.esm.js

@@ -1,2 +1,2 @@
-export { C as Call, E as Expr, N as NilSym, S as StringLiteral, e as StringTemplate, f as Sym, g as evaluate, p as parse } from '../../dist/index-439509d7.esm.js';
+export { C as Call, E as Expr, N as NilSym, S as StringLiteral, e as StringTemplate, f as Sym, g as evaluate, p as parse } from '../../dist/index-1d65adb5.esm.js';
 import '../../dist/result-168dfc1d.esm.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@valbuild/core",
-  "version": "0.67.1",
+  "version": "0.68.0",
   "private": false,
   "description": "Val - supercharged hard-coded content",
   "scripts": {

package/patch/dist/valbuild-core-patch.cjs.dev.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var expr_dist_valbuildCoreExpr = require('../../dist/index-3d77ee46.cjs.dev.js');
+var expr_dist_valbuildCoreExpr = require('../../dist/index-47055fcc.cjs.dev.js');
 var result = require('../../dist/result-bb1f436e.cjs.dev.js');
 var util = require('../../dist/util-b213092b.cjs.dev.js');
 

package/patch/dist/valbuild-core-patch.cjs.prod.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var expr_dist_valbuildCoreExpr = require('../../dist/index-b20f2afc.cjs.prod.js');
+var expr_dist_valbuildCoreExpr = require('../../dist/index-6d63e99d.cjs.prod.js');
 var result = require('../../dist/result-787e35f6.cjs.prod.js');
 var util = require('../../dist/util-030d8a1f.cjs.prod.js');
 

package/patch/dist/valbuild-core-patch.esm.js

@@ -1,5 +1,5 @@
-import { _ as _typeof, a as _slicedToArray, P as PatchError, s as splitModuleFilePathAndModulePath, b as _createClass, c as _classCallCheck, d as _toConsumableArray } from '../../dist/index-439509d7.esm.js';
-export { P as PatchError } from '../../dist/index-439509d7.esm.js';
+import { _ as _typeof, a as _slicedToArray, P as PatchError, s as splitModuleFilePathAndModulePath, b as _createClass, c as _classCallCheck, d as _toConsumableArray } from '../../dist/index-1d65adb5.esm.js';
+export { P as PatchError } from '../../dist/index-1d65adb5.esm.js';
 import { f as isNonEmpty, e as err, o as ok, m as map, g as flatMap, i as isErr, h as flatMapReduce, j as filterOrElse, k as mapErr, l as map$1, n as all, p as flatten, q as allT } from '../../dist/result-168dfc1d.esm.js';
 import { p as pipe } from '../../dist/util-18613e99.esm.js';