@valbuild/core 0.21.1 → 0.22.0

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

@@ -2,8 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var expr_dist_valbuildCoreExpr = require('../../dist/index-d17f9503.cjs.dev.js');
-var index = require('../../dist/index-31991dd7.cjs.dev.js');
+var expr_dist_valbuildCoreExpr = require('../../dist/index-a0f36fe3.cjs.dev.js');
+var index = require('../../dist/index-43369070.cjs.dev.js');
 require('../../dist/result-48320acd.cjs.dev.js');
 
 

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

@@ -2,8 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var expr_dist_valbuildCoreExpr = require('../../dist/index-067cff4a.cjs.prod.js');
-var index = require('../../dist/index-75b79c89.cjs.prod.js');
+var expr_dist_valbuildCoreExpr = require('../../dist/index-425d164d.cjs.prod.js');
+var index = require('../../dist/index-30eee5ec.cjs.prod.js');
 require('../../dist/result-26f67b40.cjs.prod.js');
 
 

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

@@ -1,3 +1,3 @@
-export { e as evaluate, p as parse } from '../../dist/index-870205b5.esm.js';
-export { C as Call, E as Expr, N as NilSym, s as StringLiteral, t as StringTemplate, r as Sym } from '../../dist/index-4bb14a92.esm.js';
+export { e as evaluate, p as parse } from '../../dist/index-f0475164.esm.js';
+export { C as Call, E as Expr, N as NilSym, s as StringLiteral, t as StringTemplate, r as Sym } from '../../dist/index-499b9e87.esm.js';
 import '../../dist/result-b96df128.esm.js';

package/package.json

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

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

@@ -2,10 +2,10 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('../../dist/index-31991dd7.cjs.dev.js');
+var index = require('../../dist/index-43369070.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-0f7617a0.cjs.dev.js');
+var ops = require('../../dist/ops-558f07b7.cjs.dev.js');
 
 function isNotRoot(path) {
   return result.isNonEmpty(path);
@@ -350,7 +350,6 @@ function isProperPathPrefix(prefix, path) {
 function parseOperation(operation) {
   var path = parseJSONPointer(operation.path);
   switch (operation.op) {
-    case "file":
     case "add":
     case "replace":
     case "test":
@@ -363,6 +362,17 @@ function parseOperation(operation) {
           value: operation.value
         };
       }));
+    case "file":
+      return util.pipe(path, result.mapErr(function (error) {
+        return [createIssueAtPath(["path"])(error)];
+      }), result.map(function (path) {
+        return {
+          op: operation.op,
+          path: path,
+          filePath: operation.filePath,
+          value: operation.value
+        };
+      }));
     case "remove":
       return util.pipe(path, result.filterOrElse(result.isNonEmpty, function () {
         return "Cannot remove root";

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

@@ -2,10 +2,10 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('../../dist/index-75b79c89.cjs.prod.js');
+var index = require('../../dist/index-30eee5ec.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-451ffb3f.cjs.prod.js');
+var ops = require('../../dist/ops-b263963e.cjs.prod.js');
 
 function isNotRoot(path) {
   return result.isNonEmpty(path);
@@ -350,7 +350,6 @@ function isProperPathPrefix(prefix, path) {
 function parseOperation(operation) {
   var path = parseJSONPointer(operation.path);
   switch (operation.op) {
-    case "file":
     case "add":
     case "replace":
     case "test":
@@ -363,6 +362,17 @@ function parseOperation(operation) {
           value: operation.value
         };
       }));
+    case "file":
+      return util.pipe(path, result.mapErr(function (error) {
+        return [createIssueAtPath(["path"])(error)];
+      }), result.map(function (path) {
+        return {
+          op: operation.op,
+          path: path,
+          filePath: operation.filePath,
+          value: operation.value
+        };
+      }));
     case "remove":
       return util.pipe(path, result.filterOrElse(result.isNonEmpty, function () {
         return "Cannot remove root";

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

@@ -1,8 +1,8 @@
-import { e as _typeof, j as _slicedToArray, c as _createClass, b as _classCallCheck, u as _toConsumableArray } from '../../dist/index-4bb14a92.esm.js';
+import { e as _typeof, j as _slicedToArray, c as _createClass, b as _classCallCheck, u as _toConsumableArray } from '../../dist/index-499b9e87.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-9b396073.esm.js';
-export { P as PatchError } from '../../dist/ops-9b396073.esm.js';
+import { P as PatchError, s as splitModuleIdAndModulePath } from '../../dist/ops-1225f750.esm.js';
+export { P as PatchError } from '../../dist/ops-1225f750.esm.js';
 
 function isNotRoot(path) {
   return isNonEmpty(path);
@@ -347,7 +347,6 @@ function isProperPathPrefix(prefix, path) {
 function parseOperation(operation) {
   var path = parseJSONPointer(operation.path);
   switch (operation.op) {
-    case "file":
     case "add":
     case "replace":
     case "test":
@@ -360,6 +359,17 @@ function parseOperation(operation) {
           value: operation.value
         };
       }));
+    case "file":
+      return pipe(path, mapErr(function (error) {
+        return [createIssueAtPath(["path"])(error)];
+      }), map(function (path) {
+        return {
+          op: operation.op,
+          path: path,
+          filePath: operation.filePath,
+          value: operation.value
+        };
+      }));
     case "remove":
       return pipe(path, filterOrElse(isNonEmpty, function () {
         return "Cannot remove root";

package/src/ValApi.ts

@@ -12,34 +12,30 @@ export class ValApi {
   getDisableUrl() {
     return `${this.host}/disable`;
   }
+  getEditUrl() {
+    return `${this.host}/static/edit`;
+  }
 
   postPatches(
     moduleId: ModuleId,
     patches: PatchJSON,
-    commit?: string,
     headers?: Record<string, string> | undefined
   ) {
-    let params = "";
-    if (commit) {
-      const p = new URLSearchParams();
-      p.set("commit", commit);
-      params = `?${p.toString()}`;
-    }
-    return fetch(`${this.host}/patches/~${moduleId}${params}`, {
+    return fetch(`${this.host}/patches/~`, {
       headers: headers || {
         "Content-Type": "application/json",
       },
       method: "POST",
-      body: JSON.stringify(patches),
-    }).then(parse<ApiPatchResponse>);
+      body: JSON.stringify({ [moduleId]: patches }),
+    }).then((res) => parse<ApiPatchResponse>(res));
   }
 
   getSession() {
-    return fetch(`${this.host}/session`).then(
+    return fetch(`${this.host}/session`).then((res) =>
       parse<{
         mode: "proxy" | "local";
         member_role: "owner" | "developer" | "editor";
-      }>
+      }>(res)
     );
   }
 
@@ -62,7 +58,7 @@ export class ValApi {
     params.set("source", includeSource.toString());
     return fetch(`${this.host}/tree/~${treePath}?${params.toString()}`, {
       headers,
-    }).then(parse<ApiTreeResponse>);
+    }).then((res) => parse<ApiTreeResponse>(res));
   }
 }
 

package/src/index.ts

@@ -35,11 +35,12 @@ export {
   type SourcePath,
   type JsonOfSource,
 } from "./val";
-export type { Json, JsonPrimitive } from "./Json";
+export type { Json, JsonPrimitive, JsonArray, JsonObject } from "./Json";
 export type {
-  ValidationErrors,
   ValidationError,
+  ValidationErrors,
 } from "./schema/validation/ValidationError";
+import type { ValidationErrors } from "./schema/validation/ValidationError";
 export type { ValidationFix } from "./schema/validation/ValidationFix";
 export * as expr from "./expr/";
 export { FILE_REF_PROP } from "./source/file";
@@ -56,10 +57,18 @@ import { ModuleId, ModulePath, getValPath, isVal } from "./val";
 import { convertFileSource } from "./schema/image";
 import { createValPathOfItem } from "./selector/SelectorProxy";
 import { getVal } from "./future/fetchVal";
-import { Json } from "./Json";
+import type { Json } from "./Json";
 import { SerializedSchema } from "./schema";
 import { getSHA256Hash } from "./getSha256";
 export { ValApi } from "./ValApi";
+export type { SerializedArraySchema } from "./schema/array";
+export type { SerializedObjectSchema } from "./schema/object";
+export type { SerializedRecordSchema } from "./schema/record";
+export type { SerializedStringSchema } from "./schema/string";
+export type { SerializedNumberSchema } from "./schema/number";
+export type { SerializedBooleanSchema } from "./schema/boolean";
+export type { SerializedImageSchema } from "./schema/image";
+export type { SerializedRichTextSchema } from "./schema/richtext";
 
 export type ApiTreeResponse = {
   git: {
@@ -75,6 +84,17 @@ export type ApiTreeResponse = {
         failed?: string[];
       };
       source?: Json;
+      errors?:
+        | false
+        | {
+            invalidModuleId?: ModuleId;
+            validation?: ValidationErrors;
+            fatal?: {
+              message: string;
+              stack?: string;
+              type?: string;
+            }[];
+          };
     }
   >;
 };

package/src/module.ts

@@ -23,6 +23,7 @@ import {
 import { FileSource } from "./source/file";
 import { AnyRichTextOptions, RichText } from "./source/richtext";
 import { RecordSchema, SerializedRecordSchema } from "./schema/record";
+import { RawString } from "./schema/string";
 
 const brand = Symbol("ValModule");
 export type ValModule<T extends SelectorSource> = SelectorOf<T> &
@@ -35,13 +36,26 @@ export type ValModuleBrand = {
 export type TypeOfValModule<T extends ValModule<SelectorSource>> =
   T extends GenericSelector<infer S> ? S : never;
 
+type ReplaceRawStringWithString<T extends SelectorSource> =
+  SelectorSource extends T
+    ? T
+    : T extends RawString
+    ? string
+    : T extends { [key in string]: SelectorSource }
+    ? {
+        [key in keyof T]: ReplaceRawStringWithString<T[key]>;
+      }
+    : T extends SelectorSource[]
+    ? ReplaceRawStringWithString<T[number]>[]
+    : T;
+
 export function content<T extends Schema<SelectorSource>>(
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   id: string,
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   schema: T,
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  source: SchemaTypeOf<T>
+  source: ReplaceRawStringWithString<SchemaTypeOf<T>>
 ): ValModule<SchemaTypeOf<T>> {
   return {
     [GetSource]: source,
@@ -62,6 +76,9 @@ export function getSource(valModule: ValModule<SelectorSource>): Source {
 export function splitModuleIdAndModulePath(
   path: SourcePath
 ): [moduleId: ModuleId, path: ModulePath] {
+  if (path.indexOf(".") === -1) {
+    return [path as unknown as ModuleId, "" as ModulePath];
+  }
   return [
     path.slice(0, path.indexOf(".")) as ModuleId,
     path.slice(path.indexOf(".") + 1) as ModulePath,
@@ -166,14 +183,21 @@ function isImageSchema(
 //   );
 // }
 
-export function resolvePath(
+export function resolvePath<
+  Src extends ValModule<SelectorSource> | Source,
+  Sch extends Schema<SelectorSource> | SerializedSchema
+>(
   path: ModulePath,
-  valModule: ValModule<SelectorSource> | Source,
-  schema: Schema<SelectorSource> | SerializedSchema
-) {
+  valModule: Src,
+  schema: Sch
+): {
+  path: SourcePath;
+  schema: Sch;
+  source: Src;
+} {
   const parts = parsePath(path);
   const origParts = [...parts];
-  let resolvedSchema = schema;
+  let resolvedSchema: Schema<SelectorSource> | SerializedSchema = schema;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   let resolvedSource: any /* TODO: any */ = valModule;
   while (parts.length > 0) {
@@ -184,7 +208,9 @@ export function resolvePath(
     if (isArraySchema(resolvedSchema)) {
       if (Number.isNaN(Number(part))) {
         throw Error(
-          `Invalid path: array schema ${resolvedSchema} must have ${part} a number as path`
+          `Invalid path: array schema ${JSON.stringify(
+            resolvedSchema
+          )} must have a number as path, but got ${part}. Path: ${path}`
         );
       }
       if (
@@ -259,8 +285,8 @@ export function resolvePath(
         path: origParts
           .slice(0, origParts.length - parts.length - 1)
           .map((p) => JSON.stringify(p))
-          .join("."), // TODO: create a function generate path from parts (not sure if this always works)
-        schema: resolvedSchema,
+          .join(".") as SourcePath, // TODO: create a function generate path from parts (not sure if this always works)
+        schema: resolvedSchema as Sch,
         source: resolvedSource,
       };
     } else if (isUnionSchema(resolvedSchema)) {
@@ -287,8 +313,8 @@ export function resolvePath(
         path: origParts
           .slice(0, origParts.length - parts.length - 1)
           .map((p) => JSON.stringify(p))
-          .join("."), // TODO: create a function generate path from parts (not sure if this always works)
-        schema: resolvedSchema,
+          .join(".") as SourcePath, // TODO: create a function generate path from parts (not sure if this always works)
+        schema: resolvedSchema as Sch,
         source: resolvedSource,
       };
     } else {
@@ -311,9 +337,9 @@ export function resolvePath(
           return JSON.stringify(p);
         }
       })
-      .join("."), // TODO: create a function generate path from parts (not sure if this always works)
-    schema: resolvedSchema,
-    source: resolvedSource,
+      .join(".") as SourcePath, // TODO: create a function generate path from parts (not sure if this always works)
+    schema: resolvedSchema as Sch,
+    source: resolvedSource as Src,
   };
 }
 

package/src/patch/deref.test.ts

@@ -57,7 +57,6 @@ describe("deref", () => {
         "/public/val/File\\ Name.jpg": "aWtrZSB25nJzdD8=",
         "/public/val/Some\\ Other\\ image.jpg": "ZnVua2VyIGRldHRlPw==",
       },
-      remotePatches: {},
     };
     expect(actual).toStrictEqual(result.ok(expected));
   });
@@ -136,141 +135,140 @@ describe("deref", () => {
       fileUpdates: {
         "/public/val/File\\ Name.jpg": "ZnVua2VyIGRldHRlPw==",
       },
-      remotePatches: {},
     };
     expect(actual).toStrictEqual(result.ok(expected));
   });
 
-  test("replace remote", () => {
-    const actual = derefPatch(
-      [
-        {
-          op: "replace",
-          path: ["foo", "baz"],
-          value: 2,
-        },
-        {
-          op: "replace",
-          path: ["foo", "$re1", "test1"],
-          value: "next test1 update",
-        },
-        {
-          op: "replace",
-          path: ["foo", "baz"],
-          value: 3,
-        },
-        {
-          op: "replace",
-          path: ["foo", "$re2", "test2", "sub-segment"],
-          value: "next test2 update",
-        },
-      ],
-      {
-        foo: {
-          baz: 1,
-          re1: remote("41f86df3"),
-          re2: remote("96536d44"),
-        },
-      },
-      ops
-    );
-    const expected: DerefPatchResult = {
-      dereferencedPatch: [
-        {
-          op: "replace",
-          path: ["foo", "baz"],
-          value: 2,
-        },
-        {
-          op: "replace",
-          path: ["foo", "baz"],
-          value: 3,
-        },
-      ],
-      fileUpdates: {},
-      remotePatches: {
-        "41f86df3": [
-          {
-            op: "replace",
-            path: ["test1"],
-            value: "next test1 update",
-          },
-        ],
-        "96536d44": [
-          {
-            op: "replace",
-            path: ["test2", "sub-segment"],
-            value: "next test2 update",
-          },
-        ],
-      },
-    };
-    expect(actual).toStrictEqual(result.ok(expected));
-  });
-  test("replace remote with 2 replaces on same ref", () => {
-    const actual = derefPatch(
-      [
-        {
-          op: "replace",
-          path: ["foo", "baz"],
-          value: 2,
-        },
-        {
-          op: "replace",
-          path: ["foo", "$re1", "test1"],
-          value: "next test1 update",
-        },
-        {
-          op: "replace",
-          path: ["foo", "baz"],
-          value: 3,
-        },
-        {
-          op: "replace",
-          path: ["foo", "$re1", "test1"],
-          value: "next test2 update",
-        },
-      ],
-      {
-        foo: {
-          baz: 1,
-          re1: remote("41f86df3"),
-          re2: remote("96536d44"),
-        },
-      },
-      ops
-    );
-    const expected: DerefPatchResult = {
-      dereferencedPatch: [
-        {
-          op: "replace",
-          path: ["foo", "baz"],
-          value: 2,
-        },
-        {
-          op: "replace",
-          path: ["foo", "baz"],
-          value: 3,
-        },
-      ],
-      fileUpdates: {},
-      remotePatches: {
-        "41f86df3": [
-          {
-            op: "replace",
-            path: ["test1"],
-            value: "next test1 update",
-          },
-          {
-            op: "replace",
-            path: ["test1"],
-            value: "next test2 update",
-          },
-        ],
-      },
-    };
-    expect(actual).toStrictEqual(result.ok(expected));
-  });
+  // test("replace remote", () => {
+  //   const actual = derefPatch(
+  //     [
+  //       {
+  //         op: "replace",
+  //         path: ["foo", "baz"],
+  //         value: 2,
+  //       },
+  //       {
+  //         op: "replace",
+  //         path: ["foo", "$re1", "test1"],
+  //         value: "next test1 update",
+  //       },
+  //       {
+  //         op: "replace",
+  //         path: ["foo", "baz"],
+  //         value: 3,
+  //       },
+  //       {
+  //         op: "replace",
+  //         path: ["foo", "$re2", "test2", "sub-segment"],
+  //         value: "next test2 update",
+  //       },
+  //     ],
+  //     {
+  //       foo: {
+  //         baz: 1,
+  //         re1: remote("41f86df3"),
+  //         re2: remote("96536d44"),
+  //       },
+  //     },
+  //     ops
+  //   );
+  //   const expected: DerefPatchResult = {
+  //     dereferencedPatch: [
+  //       {
+  //         op: "replace",
+  //         path: ["foo", "baz"],
+  //         value: 2,
+  //       },
+  //       {
+  //         op: "replace",
+  //         path: ["foo", "baz"],
+  //         value: 3,
+  //       },
+  //     ],
+  //     fileUpdates: {},
+  //     remotePatches: {
+  //       "41f86df3": [
+  //         {
+  //           op: "replace",
+  //           path: ["test1"],
+  //           value: "next test1 update",
+  //         },
+  //       ],
+  //       "96536d44": [
+  //         {
+  //           op: "replace",
+  //           path: ["test2", "sub-segment"],
+  //           value: "next test2 update",
+  //         },
+  //       ],
+  //     },
+  //   };
+  //   expect(actual).toStrictEqual(result.ok(expected));
+  // });
+  // test("replace remote with 2 replaces on same ref", () => {
+  //   const actual = derefPatch(
+  //     [
+  //       {
+  //         op: "replace",
+  //         path: ["foo", "baz"],
+  //         value: 2,
+  //       },
+  //       {
+  //         op: "replace",
+  //         path: ["foo", "$re1", "test1"],
+  //         value: "next test1 update",
+  //       },
+  //       {
+  //         op: "replace",
+  //         path: ["foo", "baz"],
+  //         value: 3,
+  //       },
+  //       {
+  //         op: "replace",
+  //         path: ["foo", "$re1", "test1"],
+  //         value: "next test2 update",
+  //       },
+  //     ],
+  //     {
+  //       foo: {
+  //         baz: 1,
+  //         re1: remote("41f86df3"),
+  //         re2: remote("96536d44"),
+  //       },
+  //     },
+  //     ops
+  //   );
+  //   const expected: DerefPatchResult = {
+  //     dereferencedPatch: [
+  //       {
+  //         op: "replace",
+  //         path: ["foo", "baz"],
+  //         value: 2,
+  //       },
+  //       {
+  //         op: "replace",
+  //         path: ["foo", "baz"],
+  //         value: 3,
+  //       },
+  //     ],
+  //     fileUpdates: {},
+  //     remotePatches: {
+  //       "41f86df3": [
+  //         {
+  //           op: "replace",
+  //           path: ["test1"],
+  //           value: "next test1 update",
+  //         },
+  //         {
+  //           op: "replace",
+  //           path: ["test1"],
+  //           value: "next test2 update",
+  //         },
+  //       ],
+  //     },
+  //   };
+  //   expect(actual).toStrictEqual(result.ok(expected));
+  // });
 
   test("replace chained references fails", () => {
     const actual = derefPatch(