@valbuild/core 0.13.3 → 0.13.5

package/dist/valbuild-core.esm.js

@@ -1,5 +1,5 @@
-import { _ as _inherits, a as _createSuper, S as Schema, g as getValPath, n as newSelectorProxy, b as SourceOrExpr, E as Expr, I as ImageSchema, c as _objectSpread2, d as _defineProperty, V as VAL_EXTENSION, i as image, P as Path, e as createValPathOfItem, f as isSelector, h as isSerializedVal, j as file, k as isFile, F as FILE_REF_PROP, l as convertImageSource, m as getSchema } from './index-55916dcd.esm.js';
-export { F as FILE_REF_PROP, G as GenericSelector, S as Schema, V as VAL_EXTENSION, o as expr } from './index-55916dcd.esm.js';
+import { _ as _inherits, a as _createSuper, S as Schema, g as getValPath, n as newSelectorProxy, b as SourceOrExpr, E as Expr, I as ImageSchema, c as _objectSpread2, d as _defineProperty, V as VAL_EXTENSION, i as image, P as Path, e as createValPathOfItem, f as isSelector, h as isSerializedVal, j as file, k as isFile, F as FILE_REF_PROP, l as convertImageSource, m as getSchema, o as isVal } from './index-b861a6d2.esm.js';
+export { F as FILE_REF_PROP, G as GenericSelector, S as Schema, V as VAL_EXTENSION, p as expr } from './index-b861a6d2.esm.js';
 import { _ as _classCallCheck, a as _createClass, b as _typeof, c as _slicedToArray, d as _toConsumableArray } from './createClass-012eebbf.esm.js';
 import { _ as _createForOfIteratorHelper, i as isErr, a as isOk, e as err, o as ok } from './result-b96df128.esm.js';
 import { P as PatchError } from './ops-6fae92a1.esm.js';
@@ -294,264 +294,9 @@ var RichTextSchema = /*#__PURE__*/function (_Schema) {
   }]);
   return RichTextSchema;
 }(Schema);
-var richtext = function richtext() {
+var richtext$1 = function richtext() {
   return new RichTextSchema();
 };
-{
-  content("/test/richtext1", richtext(), {
-    children: [{
-      children: [{
-        detail: 0,
-        format: 0,
-        mode: "normal",
-        style: "",
-        text: "Heading 1",
-        type: "text",
-        version: 1
-      }],
-      direction: "ltr",
-      format: "",
-      indent: 0,
-      type: "heading",
-      version: 1,
-      tag: "h1"
-    }, {
-      children: [{
-        detail: 0,
-        format: 0,
-        mode: "normal",
-        style: "",
-        text: "Heading 2",
-        type: "text",
-        version: 1
-      }],
-      direction: "ltr",
-      format: "",
-      indent: 0,
-      type: "heading",
-      version: 1,
-      tag: "h2"
-    }, {
-      children: [],
-      direction: "ltr",
-      format: "",
-      indent: 0,
-      type: "paragraph",
-      version: 1
-    }, {
-      children: [{
-        detail: 0,
-        format: 0,
-        mode: "normal",
-        style: "",
-        text: "Normal",
-        type: "text",
-        version: 1
-      }],
-      direction: "ltr",
-      format: "",
-      indent: 0,
-      type: "paragraph",
-      version: 1
-    }, {
-      children: [{
-        detail: 0,
-        format: 0,
-        mode: "normal",
-        style: "font-size: 20px;",
-        text: "Normal Font size 20",
-        type: "text",
-        version: 1
-      }],
-      direction: "ltr",
-      format: "",
-      indent: 0,
-      type: "paragraph",
-      version: 1
-    }, {
-      children: [{
-        detail: 0,
-        format: 0,
-        mode: "normal",
-        style: "font-family: serif;",
-        text: "Normal font type serif",
-        type: "text",
-        version: 1
-      }],
-      direction: "ltr",
-      format: "",
-      indent: 0,
-      type: "paragraph",
-      version: 1
-    }, {
-      children: [{
-        detail: 0,
-        format: 1,
-        mode: "normal",
-        style: "font-family: serif;",
-        text: "Serif and bold",
-        type: "text",
-        version: 1
-      }],
-      direction: "ltr",
-      format: "",
-      indent: 0,
-      type: "paragraph",
-      version: 1
-    }, {
-      children: [{
-        detail: 0,
-        format: 2,
-        mode: "normal",
-        style: "",
-        text: "Arial and italic",
-        type: "text",
-        version: 1
-      }],
-      direction: "ltr",
-      format: "",
-      indent: 0,
-      type: "paragraph",
-      version: 1
-    }, {
-      children: [],
-      direction: null,
-      format: "",
-      indent: 0,
-      type: "paragraph",
-      version: 1
-    }, {
-      children: [{
-        children: [{
-          detail: 0,
-          format: 0,
-          mode: "normal",
-          style: "",
-          text: "Num list 1",
-          type: "text",
-          version: 1
-        }],
-        direction: "ltr",
-        format: "",
-        indent: 0,
-        type: "listitem",
-        version: 1,
-        value: 1
-      }, {
-        children: [{
-          detail: 0,
-          format: 0,
-          mode: "normal",
-          style: "",
-          text: "Num list 2",
-          type: "text",
-          version: 1
-        }
-        // TODO: image
-        // {
-        //   altText: "",
-        //   height: 0,
-        //   maxWidth: 0,
-        //   src: "https://picsum.photos/id/237/200/300",
-        //   type: "image",
-        //   version: 1,
-        //   width: 0,
-        // },
-        ],
-
-        direction: "ltr",
-        format: "",
-        indent: 0,
-        type: "listitem",
-        version: 1,
-        value: 2
-      }],
-      direction: "ltr",
-      format: "",
-      indent: 0,
-      type: "list",
-      version: 1,
-      listType: "number",
-      start: 1,
-      tag: "ol"
-    }, {
-      children: [],
-      direction: null,
-      format: "",
-      indent: 0,
-      type: "paragraph",
-      version: 1
-    }, {
-      children: [{
-        children: [{
-          detail: 0,
-          format: 0,
-          mode: "normal",
-          style: "",
-          text: "Bullet list 1",
-          type: "text",
-          version: 1
-        }],
-        direction: "ltr",
-        format: "",
-        indent: 0,
-        type: "listitem",
-        version: 1,
-        value: 1
-      }, {
-        children: [{
-          detail: 0,
-          format: 0,
-          mode: "normal",
-          style: "",
-          text: "Bullet list 2",
-          type: "text",
-          version: 1
-        }],
-        direction: "ltr",
-        format: "",
-        indent: 0,
-        type: "listitem",
-        version: 1,
-        value: 2
-      }],
-      direction: "ltr",
-      format: "",
-      indent: 0,
-      type: "list",
-      version: 1,
-      listType: "bullet",
-      start: 1,
-      tag: "ul"
-    }, {
-      children: [],
-      direction: null,
-      format: "",
-      indent: 0,
-      type: "paragraph",
-      version: 1
-    }, {
-      children: [],
-      direction: "ltr",
-      format: "",
-      indent: 0,
-      type: "paragraph",
-      version: 1
-    }, {
-      children: [],
-      direction: null,
-      format: "",
-      indent: 0,
-      type: "paragraph",
-      version: 1
-    }],
-    direction: "ltr",
-    format: "",
-    indent: 0,
-    type: "root",
-    version: 1
-  });
-}
 
 function content(
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -938,7 +683,7 @@ function initSchema(locales) {
     number: number,
     union: union,
     oneOf: oneOf,
-    richtext: richtext,
+    richtext: richtext$1,
     image: image,
     literal: literal,
     i18n: i18n$1(locales)
@@ -1105,6 +850,20 @@ function isRemote(obj) {
   return _typeof(obj) === "object" && obj !== null && VAL_EXTENSION in obj && obj[VAL_EXTENSION] === "remote" && REMOTE_REF_PROP in obj && typeof obj[REMOTE_REF_PROP] === "string";
 }
 
+function richtext(data) {
+  if (typeof data === "string") {
+    var _ref;
+    return _ref = {}, _defineProperty(_ref, VAL_EXTENSION, "richtext"), _defineProperty(_ref, "type", "root"), _defineProperty(_ref, "children", [{
+      type: "paragraph",
+      children: [{
+        type: "text",
+        text: data
+      }]
+    }]), _ref;
+  }
+  return _objectSpread2(_objectSpread2({}, data), {}, _defineProperty({}, VAL_EXTENSION, "richtext"));
+}
+
 var initVal = function initVal(options) {
   var locales = options === null || options === void 0 ? void 0 : options.locales;
   var s = initSchema(locales === null || locales === void 0 ? void 0 : locales.required);
@@ -1117,7 +876,8 @@ var initVal = function initVal(options) {
         remote: remote,
         getPath: getValPath,
         key: getValPath,
-        file: file
+        file: file,
+        richtext: richtext
       },
       fetchVal: fetchVal,
       s: s
@@ -1131,7 +891,8 @@ var initVal = function initVal(options) {
       remote: remote,
       getPath: getValPath,
       key: getValPath,
-      file: file
+      file: file,
+      richtext: richtext
     },
     fetchVal: fetchVal,
     s: _objectSpread2(_objectSpread2({}, s), {}, {
@@ -1259,7 +1020,9 @@ var Internal = {
   getVal: getVal,
   getRawSource: getRawSource,
   resolvePath: resolvePath,
-  splitModuleIdAndModulePath: splitModuleIdAndModulePath
+  splitModuleIdAndModulePath: splitModuleIdAndModulePath,
+  fetchVal: fetchVal,
+  isVal: isVal
 };
 
-export { Internal, derefPatch, fetchVal, initVal };
+export { Internal, derefPatch, initVal };

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-b49a2c60.cjs.dev.js');
+var expr_dist_valbuildCoreExpr = require('../../dist/index-2f65eaa1.cjs.dev.js');
 require('../../dist/createClass-a436dbfe.cjs.dev.js');
 require('../../dist/result-48320acd.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-2f1631cf.cjs.prod.js');
+var expr_dist_valbuildCoreExpr = require('../../dist/index-104b3b67.cjs.prod.js');
 require('../../dist/createClass-de7426aa.cjs.prod.js');
 require('../../dist/result-26f67b40.cjs.prod.js');
 

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

@@ -1,3 +1,3 @@
-export { C as Call, E as Expr, N as NilSym, q as StringLiteral, r as StringTemplate, s as Sym, t as evaluate, p as parse } from '../../dist/index-55916dcd.esm.js';
+export { C as Call, E as Expr, N as NilSym, r as StringLiteral, s as StringTemplate, t as Sym, u as evaluate, q as parse } from '../../dist/index-b861a6d2.esm.js';
 import '../../dist/createClass-012eebbf.esm.js';
 import '../../dist/result-b96df128.esm.js';

package/package.json

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

package/src/index.ts

@@ -1,18 +1,28 @@
 export { initVal } from "./initVal";
-export { fetchVal } from "./fetchVal";
 export type { InitVal } from "./initVal";
 export { Schema, type SerializedSchema } from "./schema";
 export type { ValModule, SerializedModule } from "./module";
 export type { SourceObject, SourcePrimitive, Source } from "./source";
 export type { FileSource } from "./source/file";
 export type { RemoteSource } from "./source/remote";
+export type {
+  RichTextSource,
+  RichText,
+  TextNode,
+  ParagraphNode,
+  HeadingNode,
+  ListItemNode,
+  ListNode,
+} from "./source/richtext";
 export {
   type Val,
   type SerializedVal,
   type ModuleId,
   type ModulePath,
   type SourcePath,
+  type JsonOfSource,
 } from "./val";
+export { type Json } from "./Json";
 export * as expr from "./expr/";
 export { FILE_REF_PROP } from "./source/file";
 export { VAL_EXTENSION } from "./source";
@@ -29,18 +39,9 @@ import {
   splitModuleIdAndModulePath,
 } from "./module";
 import { getSchema } from "./selector";
-import { getValPath } from "./val";
-export type {
-  RichText,
-  TextNode,
-  ParagraphNode,
-  HeadingNode,
-  ImageNode,
-  ListItemNode,
-  ListNode,
-  RootNode,
-} from "./schema/richtext";
+import { getValPath, isVal } from "./val";
 import { convertImageSource } from "./schema/image";
+import { fetchVal } from "./fetchVal";
 
 const Internal = {
   convertImageSource,
@@ -50,6 +51,8 @@ const Internal = {
   getRawSource,
   resolvePath,
   splitModuleIdAndModulePath,
+  fetchVal,
+  isVal,
 };
 
 export { Internal };

package/src/initVal.ts

@@ -10,13 +10,15 @@ import { JsonOfSource } from "./val";
 import { fetchVal } from "./fetchVal";
 import { remote } from "./source/remote";
 import { file } from "./source/file";
+import { richtext } from "./source/richtext";
 
 type ValConstructor = {
   content: typeof content;
-  getPath: typeof getPath; // TODO: in the react initVal we should also add a key function here which returns the path for use as react keys
+  getPath: typeof getPath;
   key: typeof getPath;
   remote: typeof remote;
   file: typeof file;
+  richtext: typeof richtext;
 };
 export type InitVal<Locales extends readonly string[] | undefined> = [
   Locales
@@ -72,6 +74,7 @@ export const initVal = <
         getPath,
         key: getPath,
         file,
+        richtext,
       },
       fetchVal: fetchVal,
       s,
@@ -85,6 +88,7 @@ export const initVal = <
       getPath,
       key: getPath,
       file,
+      richtext,
     },
     fetchVal: fetchVal,
     s: {

package/src/module.ts

@@ -15,17 +15,14 @@ import { I18nSchema, SerializedI18nSchema } from "./schema/i18n";
 import { UnionSchema, SerializedUnionSchema } from "./schema/union";
 import { OneOfSchema, SerializedOneOfSchema } from "./schema/oneOf";
 import { Json } from "./Json";
-import {
-  RichText,
-  RichTextSchema,
-  SerializedRichTextSchema,
-} from "./schema/richtext";
+import { RichTextSchema, SerializedRichTextSchema } from "./schema/richtext";
 import {
   ImageMetadata,
   ImageSchema,
   SerializedImageSchema,
 } from "./schema/image";
 import { FileSource } from "./source/file";
+import { RichText } from "./source/richtext";
 
 const brand = Symbol("ValModule");
 export type ValModule<T extends SelectorSource> = SelectorOf<T> &