@valbuild/core 0.19.0 → 0.20.1

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

@@ -47,7 +47,7 @@ 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: <O extends import("./index.js").RichTextOptions>(options: O) => import("./schema/index.js").Schema<import("./index.js").RichTextSource<O>>;
+    richtext: <O extends import("./index.js").RichTextOptions>(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").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>;

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

@@ -15,4 +15,4 @@ export declare class RichTextSchema<O extends RichTextOptions, Src extends RichT
     optional(): Schema<RichTextSource<O> | null>;
     serialize(): SerializedSchema;
 }
-export declare const richtext: <O extends RichTextOptions>(options: O) => Schema<RichTextSource<O>>;
+export declare const richtext: <O extends RichTextOptions>(options?: O | undefined) => Schema<RichTextSource<O>>;

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

@@ -14,7 +14,7 @@ export type SerializedStringSchema = {
 export declare class StringSchema<Src extends string | null> extends Schema<Src> {
     readonly options?: StringOptions | undefined;
     readonly opt: boolean;
-    readonly isRaw: boolean;
+    private readonly isRaw;
     constructor(options?: StringOptions | undefined, opt?: boolean, isRaw?: boolean);
     validate(path: SourcePath, src: Src): ValidationErrors;
     assert(src: Src): boolean;

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

@@ -11,7 +11,7 @@ export type RichTextOptions = {
 };
 export type ParagraphNode<O extends RichTextOptions> = {
     tag: "p";
-    children: (string | SpanNode<O> | ImageNode<O>)[];
+    children: (string | SpanNode<O>)[];
 };
 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;
@@ -30,7 +30,7 @@ export type ImageNode<O extends RichTextOptions> = O["img"] extends true ? {
 } : never;
 export type ListItemNode<O extends RichTextOptions> = {
     tag: "li";
-    children: (string | SpanNode<O> | ImageNode<O> | UnorderedListNode<O> | OrderedListNode<O>)[];
+    children: (string | SpanNode<O> | UnorderedListNode<O> | OrderedListNode<O>)[];
 };
 export type UnorderedListNode<O extends RichTextOptions> = O["ul"] extends true ? {
     tag: "ul";
@@ -63,7 +63,7 @@ export type AnyRichTextOptions = {
 };
 export type RichTextSourceNode<O extends RichTextOptions> = Exclude<RichTextNode<O>, {
     tag: "img";
-}> | ParagraphNode<O> | ListItemNode<O> | ImageNode<O> | SourceNode<O>;
+}> | SourceNode<O>;
 export type RichTextSource<O extends RichTextOptions> = {
     [VAL_EXTENSION]: "richtext";
     children: (HeadingNode<O> | ParagraphNode<O> | UnorderedListNode<O> | OrderedListNode<O> | SourceNode<O>)[];

package/dist/{ops-7ef32b0a.esm.js → ops-22b624eb.esm.js}

@@ -416,7 +416,7 @@ var RichTextSchema = /*#__PURE__*/function (_Schema) {
   return RichTextSchema;
 }(Schema);
 var richtext = function richtext(options) {
-  return new RichTextSchema(options);
+  return new RichTextSchema(options !== null && options !== void 0 ? options : {});
 };
 
 var RecordSchema = /*#__PURE__*/function (_Schema) {

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

@@ -418,7 +418,7 @@ var RichTextSchema = /*#__PURE__*/function (_Schema) {
   return RichTextSchema;
 }(index.Schema);
 var richtext = function richtext(options) {
-  return new RichTextSchema(options);
+  return new RichTextSchema(options !== null && options !== void 0 ? options : {});
 };
 
 var RecordSchema = /*#__PURE__*/function (_Schema) {

package/dist/{ops-ae089ab2.cjs.prod.js → ops-def81fc3.cjs.prod.js}

@@ -418,7 +418,7 @@ var RichTextSchema = /*#__PURE__*/function (_Schema) {
   return RichTextSchema;
 }(index.Schema);
 var richtext = function richtext(options) {
-  return new RichTextSchema(options);
+  return new RichTextSchema(options !== null && options !== void 0 ? options : {});
 };
 
 var RecordSchema = /*#__PURE__*/function (_Schema) {

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var index = require('./index-a6e642dd.cjs.dev.js');
-var ops = require('./ops-2d7e1742.cjs.dev.js');
+var ops = require('./ops-b0a33248.cjs.dev.js');
 var marked = require('marked');
 var expr_dist_valbuildCoreExpr = require('./index-486c7fbf.cjs.dev.js');
 var result = require('./result-48320acd.cjs.dev.js');
@@ -456,6 +456,9 @@ function parseTokens(tokens) {
       }];
     }
     if (token.type === "text") {
+      if ("tokens" in token && Array.isArray(token.tokens)) {
+        return parseTokens(token.tokens);
+      }
       return [token.text];
     }
     if (token.type === "list") {
@@ -480,7 +483,9 @@ function parseTokens(tokens) {
         children: [token.text]
       }];
     }
-    console.error("Could not parse markdown: unsupported token type: ".concat(token.type, ". Found: ").concat(token.raw));
+    // console.error(
+    //   `Could not parse markdown: unsupported token type: ${token.type}. Found: ${token.raw}`
+    // );
     return [token.raw];
   });
 }

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var index = require('./index-8706c87e.cjs.prod.js');
-var ops = require('./ops-ae089ab2.cjs.prod.js');
+var ops = require('./ops-def81fc3.cjs.prod.js');
 var marked = require('marked');
 var expr_dist_valbuildCoreExpr = require('./index-601a7d73.cjs.prod.js');
 var result = require('./result-26f67b40.cjs.prod.js');
@@ -456,6 +456,9 @@ function parseTokens(tokens) {
       }];
     }
     if (token.type === "text") {
+      if ("tokens" in token && Array.isArray(token.tokens)) {
+        return parseTokens(token.tokens);
+      }
       return [token.text];
     }
     if (token.type === "list") {
@@ -480,7 +483,9 @@ function parseTokens(tokens) {
         children: [token.text]
       }];
     }
-    console.error("Could not parse markdown: unsupported token type: ".concat(token.type, ". Found: ").concat(token.raw));
+    // console.error(
+    //   `Could not parse markdown: unsupported token type: ${token.type}. Found: ${token.raw}`
+    // );
     return [token.raw];
   });
 }

package/dist/valbuild-core.esm.js

@@ -1,6 +1,6 @@
 import { _ as _inherits, a as _createSuper, b as _classCallCheck, c as _createClass, d as _defineProperty, e as _typeof, S as Schema, G as GetSchema, g as getValPath, i as image, V as VAL_EXTENSION, f as convertFileSource, h as file, j as _objectSpread2, k as _slicedToArray, l as isFile, F as FILE_REF_PROP, P as Path, m as GetSource, n as isSerializedVal, o as getSchema, p as isVal } from './index-bccf1907.esm.js';
 export { F as FILE_REF_PROP, q as GenericSelector, S as Schema, V as VAL_EXTENSION } from './index-bccf1907.esm.js';
-import { a as array, o as object, u as union, r as richtext$1, b as record, c as content, P as PatchError, n as newSelectorProxy, d as createValPathOfItem, i as isSelector, g as getSource, e as resolvePath, s as splitModuleIdAndModulePath } from './ops-7ef32b0a.esm.js';
+import { a as array, o as object, u as union, r as richtext$1, b as record, c as content, P as PatchError, n as newSelectorProxy, d as createValPathOfItem, i as isSelector, g as getSource, e as resolvePath, s as splitModuleIdAndModulePath } from './ops-22b624eb.esm.js';
 import * as marked from 'marked';
 export { i as expr } from './index-5d1ab97c.esm.js';
 import { _ as _createForOfIteratorHelper, i as isErr, a as isOk, e as err, o as ok, r as result } from './result-b96df128.esm.js';
@@ -433,6 +433,9 @@ function parseTokens(tokens) {
       }];
     }
     if (token.type === "text") {
+      if ("tokens" in token && Array.isArray(token.tokens)) {
+        return parseTokens(token.tokens);
+      }
       return [token.text];
     }
     if (token.type === "list") {
@@ -457,7 +460,9 @@ function parseTokens(tokens) {
         children: [token.text]
       }];
     }
-    console.error("Could not parse markdown: unsupported token type: ".concat(token.type, ". Found: ").concat(token.raw));
+    // console.error(
+    //   `Could not parse markdown: unsupported token type: ${token.type}. Found: ${token.raw}`
+    // );
     return [token.raw];
   });
 }

package/package.json

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

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

@@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var index = require('../../dist/index-a6e642dd.cjs.dev.js');
 var result = require('../../dist/result-48320acd.cjs.dev.js');
 var util = require('../../dist/util-b213092b.cjs.dev.js');
-var ops = require('../../dist/ops-2d7e1742.cjs.dev.js');
+var ops = require('../../dist/ops-b0a33248.cjs.dev.js');
 
 function isNotRoot(path) {
   return result.isNonEmpty(path);

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

@@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var index = require('../../dist/index-8706c87e.cjs.prod.js');
 var result = require('../../dist/result-26f67b40.cjs.prod.js');
 var util = require('../../dist/util-030d8a1f.cjs.prod.js');
-var ops = require('../../dist/ops-ae089ab2.cjs.prod.js');
+var ops = require('../../dist/ops-def81fc3.cjs.prod.js');
 
 function isNotRoot(path) {
   return result.isNonEmpty(path);

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

@@ -1,8 +1,8 @@
 import { e as _typeof, k as _slicedToArray, c as _createClass, b as _classCallCheck, u as _toConsumableArray } from '../../dist/index-bccf1907.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-b96df128.esm.js';
 import { p as pipe } from '../../dist/util-18613e99.esm.js';
-import { P as PatchError, s as splitModuleIdAndModulePath } from '../../dist/ops-7ef32b0a.esm.js';
-export { P as PatchError } from '../../dist/ops-7ef32b0a.esm.js';
+import { P as PatchError, s as splitModuleIdAndModulePath } from '../../dist/ops-22b624eb.esm.js';
+export { P as PatchError } from '../../dist/ops-22b624eb.esm.js';
 
 function isNotRoot(path) {
   return isNonEmpty(path);

package/src/schema/richtext.ts

@@ -38,7 +38,7 @@ export class RichTextSchema<
 }
 
 export const richtext = <O extends RichTextOptions>(
-  options: O
+  options?: O
 ): Schema<RichTextSource<O>> => {
-  return new RichTextSchema<O, RichTextSource<O>>(options);
+  return new RichTextSchema<O, RichTextSource<O>>(options ?? ({} as O));
 };

package/src/schema/string.ts

@@ -19,7 +19,7 @@ export class StringSchema<Src extends string | null> extends Schema<Src> {
   constructor(
     readonly options?: StringOptions,
     readonly opt: boolean = false,
-    readonly isRaw: boolean = false
+    private readonly isRaw: boolean = false
   ) {
     super();
   }

package/src/source/richtext.ts

@@ -19,7 +19,7 @@ export type RichTextOptions = {
 
 export type ParagraphNode<O extends RichTextOptions> = {
   tag: "p";
-  children: (string | SpanNode<O> | ImageNode<O>)[];
+  children: (string | SpanNode<O>)[];
   // AnchorNode<O>
 };
 
@@ -79,7 +79,6 @@ export type ListItemNode<O extends RichTextOptions> = {
     | string
     | SpanNode<O>
     // | AnchorNode<O>
-    | ImageNode<O>
     | UnorderedListNode<O>
     | OrderedListNode<O>
   )[];
@@ -140,9 +139,6 @@ export type AnyRichTextOptions = {
 
 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> = {
@@ -230,6 +226,9 @@ function parseTokens<O extends RichTextOptions>(
       ];
     }
     if (token.type === "text") {
+      if ("tokens" in token && Array.isArray(token.tokens)) {
+        return parseTokens(token.tokens);
+      }
       return [token.text];
     }
     if (token.type === "list") {
@@ -261,9 +260,9 @@ function parseTokens<O extends RichTextOptions>(
         },
       ];
     }
-    console.error(
-      `Could not parse markdown: unsupported token type: ${token.type}. Found: ${token.raw}`
-    );
+    // console.error(
+    //   `Could not parse markdown: unsupported token type: ${token.type}. Found: ${token.raw}`
+    // );
     return [token.raw];
   });
 }