@valbuild/shared 0.91.4 → 0.92.0

package/internal/dist/valbuild-shared-internal.cjs.prod.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var core = require('@valbuild/core');
-var buffer = require('buffer');
+var utils = require('../../dist/utils-32bcaca2.cjs.prod.js');
 var zod = require('zod');
 var zodValidationError = require('zod-validation-error');
 
@@ -307,8 +307,8 @@ var convertToNumber = function convertToNumber(value) {
 var textEncoder = new TextEncoder();
 function convertImageNode(path, node, files, configDirectory, remoteOptions) {
   if (node.attrs && node.attrs.src.startsWith("data:")) {
-    var binaryData = buffer.Buffer.from(node.attrs.src.split(",")[1], "base64");
-    var fullFileHash = core.Internal.getSHA256Hash(new Uint8Array(binaryData));
+    var binaryData = utils.base64DataUrlToUint8Array(node.attrs.src);
+    var fullFileHash = core.Internal.getSHA256Hash(binaryData);
     var mimeType = core.Internal.getMimeType(node.attrs.src);
     if (mimeType === undefined) {
       throw new Error("Could not detect Mime Type for image: ".concat(node.attrs.src));
@@ -906,14 +906,14 @@ function _asyncToGenerator(n) {
 }
 
 var JSONValue = zod.z.lazy(function () {
-  return zod.z.union([zod.z.string(), zod.z.number(), zod.z["boolean"](), zod.z["null"](), zod.z.array(JSONValue), zod.z.record(JSONValue)]);
+  return zod.z.union([zod.z.string(), zod.z.number(), zod.z["boolean"](), zod.z["null"](), zod.z.array(JSONValue), zod.z.record(zod.z.string(), JSONValue)]);
 });
 var FileOperation = function FileOperation(path) {
   return zod.z.object({
     op: zod.z.literal("file"),
     path: path,
     filePath: zod.z.string(),
-    value: zod.z.string(),
+    value: JSONValue,
     remote: zod.z["boolean"](),
     nestedFilePath: zod.z.array(zod.z.string()).optional(),
     metadata: JSONValue.optional() // TODO: remove optional
@@ -954,6 +954,7 @@ var OperationJSON = zod.z.discriminatedUnion("op", [zod.z.object({
   value: JSONValue
 }).strict(), FileOperation(zod.z.string()).strict()]);
 var PatchJSON = zod.z.array(OperationJSON);
+var nonEmptyArray = zod.z.tuple([zod.z.string()], zod.z.string());
 /**
  * Raw JSON patch operation.
  */
@@ -963,14 +964,14 @@ var Operation = zod.z.discriminatedUnion("op", [zod.z.object({
   value: JSONValue
 }).strict(), zod.z.object({
   op: zod.z.literal("remove"),
-  path: zod.z.array(zod.z.string()).nonempty()
+  path: nonEmptyArray
 }).strict(), zod.z.object({
   op: zod.z.literal("replace"),
   path: zod.z.array(zod.z.string()),
   value: JSONValue
 }).strict(), zod.z.object({
   op: zod.z.literal("move"),
-  from: zod.z.array(zod.z.string()).nonempty(),
+  from: nonEmptyArray,
   path: zod.z.array(zod.z.string())
 }).strict(), zod.z.object({
   op: zod.z.literal("copy"),
@@ -1035,7 +1036,7 @@ var SerializedNumberSchema = zod.z.object({
 var SerializedObjectSchema = zod.z.lazy(function () {
   return zod.z.object({
     type: zod.z.literal("object"),
-    items: zod.z.record(SerializedSchema),
+    items: zod.z.record(zod.z.string(), SerializedSchema),
     opt: zod.z["boolean"]()
   });
 });
@@ -1070,26 +1071,28 @@ var SerializedImageSchema = zod.z.object({
   options: ImageOptions.optional(),
   opt: zod.z["boolean"]()
 });
-var RichTextOptions = zod.z.object({
-  style: zod.z.object({
-    bold: zod.z["boolean"]().optional(),
-    italic: zod.z["boolean"]().optional(),
-    lineThrough: zod.z["boolean"]().optional()
-  }).optional(),
-  block: zod.z.object({
-    h1: zod.z["boolean"]().optional(),
-    h2: zod.z["boolean"]().optional(),
-    h3: zod.z["boolean"]().optional(),
-    h4: zod.z["boolean"]().optional(),
-    h5: zod.z["boolean"]().optional(),
-    h6: zod.z["boolean"]().optional(),
-    ul: zod.z["boolean"]().optional(),
-    ol: zod.z["boolean"]().optional()
-  }).optional(),
-  inline: zod.z.object({
-    a: zod.z["boolean"]().optional(),
-    img: zod.z.union([zod.z["boolean"](), SerializedImageSchema]).optional()
-  }).optional()
+var RichTextOptions = zod.z.lazy(function () {
+  return zod.z.object({
+    style: zod.z.object({
+      bold: zod.z["boolean"]().optional(),
+      italic: zod.z["boolean"]().optional(),
+      lineThrough: zod.z["boolean"]().optional()
+    }).optional(),
+    block: zod.z.object({
+      h1: zod.z["boolean"]().optional(),
+      h2: zod.z["boolean"]().optional(),
+      h3: zod.z["boolean"]().optional(),
+      h4: zod.z["boolean"]().optional(),
+      h5: zod.z["boolean"]().optional(),
+      h6: zod.z["boolean"]().optional(),
+      ul: zod.z["boolean"]().optional(),
+      ol: zod.z["boolean"]().optional()
+    }).optional(),
+    inline: zod.z.object({
+      a: zod.z.union([zod.z["boolean"](), SerializedRouteSchema, SerializedStringSchema]).optional(),
+      img: zod.z.union([zod.z["boolean"](), SerializedImageSchema]).optional()
+    }).optional()
+  });
 });
 var SerializedRichTextSchema = zod.z.object({
   type: zod.z.literal("richtext"),
@@ -1803,9 +1806,9 @@ var Api = {
           schemaSha: zod.z.string(),
           sourcesSha: zod.z.string(),
           modules: zod.z.record(ModuleFilePath, zod.z.object({
-            render: zod.z.any(),
+            render: zod.z.any().optional(),
             // TODO: improve this type
-            source: zod.z.any(),
+            source: zod.z.any().optional(),
             //.optional(), // TODO: Json zod type
             patches: zod.z.object({
               applied: zod.z.array(PatchId),
@@ -1891,7 +1894,7 @@ var Api = {
           message: zod.z.string(),
           details: zod.z.union([zod.z.object({
             sourceFilePatchErrors: zod.z.record(ModuleFilePath, zod.z.array(GenericError)),
-            binaryFilePatchErrors: zod.z.record(GenericError)
+            binaryFilePatchErrors: zod.z.record(zod.z.string(), GenericError)
           }), zod.z.array(GenericError)]).optional()
         }), zod.z.object({
           message: zod.z.string(),
@@ -1945,6 +1948,24 @@ var Api = {
  * Do not change this without updating the ValRouter query parsing logic
  * */
 
+function _typeof(o) {
+  "@babel/helpers - typeof";
+
+  return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) {
+    return typeof o;
+  } : function (o) {
+    return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o;
+  }, _typeof(o);
+}
+
+function getErrorMessageFromUnknownJson(json, fallback) {
+  if (_typeof(json) === "object" && json !== null && "message" in json && typeof json.message === "string") {
+    return json.message;
+  }
+  return fallback;
+}
+var DEFAULT_ERROR_MESSAGE = "Unknown error with unknown message from server";
+
 var createValClient = function createValClient(host, config // We want to use this in the future
 ) {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -2029,7 +2050,7 @@ var createValClient = function createValClient(host, config // We want to use th
                 message: "There was an issue validating your data. This is most likely a Val bug.",
                 type: "client_side_validation_error",
                 details: {
-                  validationError: zodValidationError.fromZodError(reqBodyResult.error).toString(),
+                  validationError: zodValidationError.fromError(reqBodyResult.error).toString(),
                   data: anyReq.body
                 }
               }
@@ -2046,7 +2067,7 @@ var createValClient = function createValClient(host, config // We want to use th
             }).then(/*#__PURE__*/function () {
               var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(res) {
                 var _apiEndpoint$res;
-                var contentTypeHeaders, json, valClientResult, responseResult;
+                var contentTypeHeaders, json, valClientResult, message, responseResult;
                 return _regenerator().w(function (_context) {
                   while (1) switch (_context.n) {
                     case 0:
@@ -2096,12 +2117,13 @@ var createValClient = function createValClient(host, config // We want to use th
                         break;
                       }
                       console.error("Server responded with an error", json);
+                      message = getErrorMessageFromUnknownJson(json, "Unknown error");
                       return _context.a(2, {
                         status: 500,
-                        json: _objectSpread2({
+                        json: {
                           type: "unknown",
-                          message: json.message
-                        }, json)
+                          message: message
+                        }
                       });
                     case 4:
                       responseResult = (_apiEndpoint$res = apiEndpoint.res) === null || _apiEndpoint$res === void 0 ? void 0 : _apiEndpoint$res.safeParse(valClientResult);
@@ -2115,7 +2137,7 @@ var createValClient = function createValClient(host, config // We want to use th
                           message: "Response could not be validated. This could also be a result of mismatched Val versions.",
                           type: "client_side_validation_error",
                           details: {
-                            validationError: zodValidationError.fromZodError(responseResult.error).toString(),
+                            validationError: zodValidationError.fromError(responseResult.error).toString(),
                             data: valClientResult
                           }
                         }
@@ -2288,7 +2310,7 @@ function getNextAppRouterSitemapTree(srcFolder, paths) {
           root.page = {
             fullPath: fullPath
           };
-          root.sourcePath = core.Internal.joinModuleFilePathAndModulePath(moduleFilePath, fullPath);
+          root.sourcePath = core.Internal.joinModuleFilePathAndModulePath(moduleFilePath, "\"".concat(fullPath, "\""));
           root.moduleFilePath = moduleFilePath;
           return 0; // continue
         }
@@ -2533,6 +2555,7 @@ function createRegExpFromPattern(pattern) {
 }
 
 exports.Api = Api;
+exports.DEFAULT_ERROR_MESSAGE = DEFAULT_ERROR_MESSAGE;
 exports.ParentRef = ParentRef$1;
 exports.Patch = Patch;
 exports.PatchBlock = PatchBlock;
@@ -2560,6 +2583,7 @@ exports.ValDeployment = ValDeployment;
 exports.createRegExpFromPattern = createRegExpFromPattern;
 exports.createValClient = createValClient;
 exports.filterRoutesByPatterns = filterRoutesByPatterns;
+exports.getErrorMessageFromUnknownJson = getErrorMessageFromUnknownJson;
 exports.getNextAppRouterSitemapTree = getNextAppRouterSitemapTree;
 exports.getNextAppRouterSourceFolder = getNextAppRouterSourceFolder;
 exports.getPatternFromModuleFilePath = getPatternFromModuleFilePath;

package/internal/dist/valbuild-shared-internal.esm.js

@@ -1,7 +1,7 @@
 import { Internal, FILE_REF_PROP, VAL_EXTENSION, FILE_REF_SUBTYPE_TAG } from '@valbuild/core';
-import { Buffer } from 'buffer';
+import { b as base64DataUrlToUint8Array } from '../../dist/utils-00f3e1df.esm.js';
 import { z } from 'zod';
-import { fromZodError } from 'zod-validation-error';
+import { fromError } from 'zod-validation-error';
 
 function _toPrimitive(t, r) {
   if ("object" != typeof t || !t) return t;
@@ -303,8 +303,8 @@ var convertToNumber = function convertToNumber(value) {
 var textEncoder = new TextEncoder();
 function convertImageNode(path, node, files, configDirectory, remoteOptions) {
   if (node.attrs && node.attrs.src.startsWith("data:")) {
-    var binaryData = Buffer.from(node.attrs.src.split(",")[1], "base64");
-    var fullFileHash = Internal.getSHA256Hash(new Uint8Array(binaryData));
+    var binaryData = base64DataUrlToUint8Array(node.attrs.src);
+    var fullFileHash = Internal.getSHA256Hash(binaryData);
     var mimeType = Internal.getMimeType(node.attrs.src);
     if (mimeType === undefined) {
       throw new Error("Could not detect Mime Type for image: ".concat(node.attrs.src));
@@ -902,14 +902,14 @@ function _asyncToGenerator(n) {
 }
 
 var JSONValue = z.lazy(function () {
-  return z.union([z.string(), z.number(), z["boolean"](), z["null"](), z.array(JSONValue), z.record(JSONValue)]);
+  return z.union([z.string(), z.number(), z["boolean"](), z["null"](), z.array(JSONValue), z.record(z.string(), JSONValue)]);
 });
 var FileOperation = function FileOperation(path) {
   return z.object({
     op: z.literal("file"),
     path: path,
     filePath: z.string(),
-    value: z.string(),
+    value: JSONValue,
     remote: z["boolean"](),
     nestedFilePath: z.array(z.string()).optional(),
     metadata: JSONValue.optional() // TODO: remove optional
@@ -950,6 +950,7 @@ var OperationJSON = z.discriminatedUnion("op", [z.object({
   value: JSONValue
 }).strict(), FileOperation(z.string()).strict()]);
 var PatchJSON = z.array(OperationJSON);
+var nonEmptyArray = z.tuple([z.string()], z.string());
 /**
  * Raw JSON patch operation.
  */
@@ -959,14 +960,14 @@ var Operation = z.discriminatedUnion("op", [z.object({
   value: JSONValue
 }).strict(), z.object({
   op: z.literal("remove"),
-  path: z.array(z.string()).nonempty()
+  path: nonEmptyArray
 }).strict(), z.object({
   op: z.literal("replace"),
   path: z.array(z.string()),
   value: JSONValue
 }).strict(), z.object({
   op: z.literal("move"),
-  from: z.array(z.string()).nonempty(),
+  from: nonEmptyArray,
   path: z.array(z.string())
 }).strict(), z.object({
   op: z.literal("copy"),
@@ -1031,7 +1032,7 @@ var SerializedNumberSchema = z.object({
 var SerializedObjectSchema = z.lazy(function () {
   return z.object({
     type: z.literal("object"),
-    items: z.record(SerializedSchema),
+    items: z.record(z.string(), SerializedSchema),
     opt: z["boolean"]()
   });
 });
@@ -1066,26 +1067,28 @@ var SerializedImageSchema = z.object({
   options: ImageOptions.optional(),
   opt: z["boolean"]()
 });
-var RichTextOptions = z.object({
-  style: z.object({
-    bold: z["boolean"]().optional(),
-    italic: z["boolean"]().optional(),
-    lineThrough: z["boolean"]().optional()
-  }).optional(),
-  block: z.object({
-    h1: z["boolean"]().optional(),
-    h2: z["boolean"]().optional(),
-    h3: z["boolean"]().optional(),
-    h4: z["boolean"]().optional(),
-    h5: z["boolean"]().optional(),
-    h6: z["boolean"]().optional(),
-    ul: z["boolean"]().optional(),
-    ol: z["boolean"]().optional()
-  }).optional(),
-  inline: z.object({
-    a: z["boolean"]().optional(),
-    img: z.union([z["boolean"](), SerializedImageSchema]).optional()
-  }).optional()
+var RichTextOptions = z.lazy(function () {
+  return z.object({
+    style: z.object({
+      bold: z["boolean"]().optional(),
+      italic: z["boolean"]().optional(),
+      lineThrough: z["boolean"]().optional()
+    }).optional(),
+    block: z.object({
+      h1: z["boolean"]().optional(),
+      h2: z["boolean"]().optional(),
+      h3: z["boolean"]().optional(),
+      h4: z["boolean"]().optional(),
+      h5: z["boolean"]().optional(),
+      h6: z["boolean"]().optional(),
+      ul: z["boolean"]().optional(),
+      ol: z["boolean"]().optional()
+    }).optional(),
+    inline: z.object({
+      a: z.union([z["boolean"](), SerializedRouteSchema, SerializedStringSchema]).optional(),
+      img: z.union([z["boolean"](), SerializedImageSchema]).optional()
+    }).optional()
+  });
 });
 var SerializedRichTextSchema = z.object({
   type: z.literal("richtext"),
@@ -1799,9 +1802,9 @@ var Api = {
           schemaSha: z.string(),
           sourcesSha: z.string(),
           modules: z.record(ModuleFilePath, z.object({
-            render: z.any(),
+            render: z.any().optional(),
             // TODO: improve this type
-            source: z.any(),
+            source: z.any().optional(),
             //.optional(), // TODO: Json zod type
             patches: z.object({
               applied: z.array(PatchId),
@@ -1887,7 +1890,7 @@ var Api = {
           message: z.string(),
           details: z.union([z.object({
             sourceFilePatchErrors: z.record(ModuleFilePath, z.array(GenericError)),
-            binaryFilePatchErrors: z.record(GenericError)
+            binaryFilePatchErrors: z.record(z.string(), GenericError)
           }), z.array(GenericError)]).optional()
         }), z.object({
           message: z.string(),
@@ -1941,6 +1944,24 @@ var Api = {
  * Do not change this without updating the ValRouter query parsing logic
  * */
 
+function _typeof(o) {
+  "@babel/helpers - typeof";
+
+  return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) {
+    return typeof o;
+  } : function (o) {
+    return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o;
+  }, _typeof(o);
+}
+
+function getErrorMessageFromUnknownJson(json, fallback) {
+  if (_typeof(json) === "object" && json !== null && "message" in json && typeof json.message === "string") {
+    return json.message;
+  }
+  return fallback;
+}
+var DEFAULT_ERROR_MESSAGE = "Unknown error with unknown message from server";
+
 var createValClient = function createValClient(host, config // We want to use this in the future
 ) {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -2025,7 +2046,7 @@ var createValClient = function createValClient(host, config // We want to use th
                 message: "There was an issue validating your data. This is most likely a Val bug.",
                 type: "client_side_validation_error",
                 details: {
-                  validationError: fromZodError(reqBodyResult.error).toString(),
+                  validationError: fromError(reqBodyResult.error).toString(),
                   data: anyReq.body
                 }
               }
@@ -2042,7 +2063,7 @@ var createValClient = function createValClient(host, config // We want to use th
             }).then(/*#__PURE__*/function () {
               var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(res) {
                 var _apiEndpoint$res;
-                var contentTypeHeaders, json, valClientResult, responseResult;
+                var contentTypeHeaders, json, valClientResult, message, responseResult;
                 return _regenerator().w(function (_context) {
                   while (1) switch (_context.n) {
                     case 0:
@@ -2092,12 +2113,13 @@ var createValClient = function createValClient(host, config // We want to use th
                         break;
                       }
                       console.error("Server responded with an error", json);
+                      message = getErrorMessageFromUnknownJson(json, "Unknown error");
                       return _context.a(2, {
                         status: 500,
-                        json: _objectSpread2({
+                        json: {
                           type: "unknown",
-                          message: json.message
-                        }, json)
+                          message: message
+                        }
                       });
                     case 4:
                       responseResult = (_apiEndpoint$res = apiEndpoint.res) === null || _apiEndpoint$res === void 0 ? void 0 : _apiEndpoint$res.safeParse(valClientResult);
@@ -2111,7 +2133,7 @@ var createValClient = function createValClient(host, config // We want to use th
                           message: "Response could not be validated. This could also be a result of mismatched Val versions.",
                           type: "client_side_validation_error",
                           details: {
-                            validationError: fromZodError(responseResult.error).toString(),
+                            validationError: fromError(responseResult.error).toString(),
                             data: valClientResult
                           }
                         }
@@ -2284,7 +2306,7 @@ function getNextAppRouterSitemapTree(srcFolder, paths) {
           root.page = {
             fullPath: fullPath
           };
-          root.sourcePath = Internal.joinModuleFilePathAndModulePath(moduleFilePath, fullPath);
+          root.sourcePath = Internal.joinModuleFilePathAndModulePath(moduleFilePath, "\"".concat(fullPath, "\""));
           root.moduleFilePath = moduleFilePath;
           return 0; // continue
         }
@@ -2528,4 +2550,4 @@ function createRegExpFromPattern(pattern) {
   }
 }
 
-export { Api, ParentRef$1 as ParentRef, Patch, PatchBlock, PatchId, PatchJSON, RemirrorBr, RemirrorBulletList, RemirrorHeading, RemirrorImage, RemirrorJSON, RemirrorLinkMark, RemirrorListItem, RemirrorOrderedList, RemirrorParagraph, RemirrorText, RemirrorTextMark, SharedValConfig, VAL_CONFIG_SESSION_STORAGE_KEY, VAL_ENABLE_COOKIE_NAME, VAL_SESSION_COOKIE, VAL_STATE_COOKIE, VAL_THEME_SESSION_STORAGE_KEY, ValCommit, ValDeployment, createRegExpFromPattern, createValClient, filterRoutesByPatterns, getNextAppRouterSitemapTree, getNextAppRouterSourceFolder, getPatternFromModuleFilePath, parseRoutePattern, remirrorToRichTextSource, richTextToRemirror, urlOf, validateRoutePatterns };
+export { Api, DEFAULT_ERROR_MESSAGE, ParentRef$1 as ParentRef, Patch, PatchBlock, PatchId, PatchJSON, RemirrorBr, RemirrorBulletList, RemirrorHeading, RemirrorImage, RemirrorJSON, RemirrorLinkMark, RemirrorListItem, RemirrorOrderedList, RemirrorParagraph, RemirrorText, RemirrorTextMark, SharedValConfig, VAL_CONFIG_SESSION_STORAGE_KEY, VAL_ENABLE_COOKIE_NAME, VAL_SESSION_COOKIE, VAL_STATE_COOKIE, VAL_THEME_SESSION_STORAGE_KEY, ValCommit, ValDeployment, createRegExpFromPattern, createValClient, filterRoutesByPatterns, getErrorMessageFromUnknownJson, getNextAppRouterSitemapTree, getNextAppRouterSourceFolder, getPatternFromModuleFilePath, parseRoutePattern, remirrorToRichTextSource, richTextToRemirror, urlOf, validateRoutePatterns };

package/package.json

@@ -1,16 +1,12 @@
 {
   "name": "@valbuild/shared",
-  "version": "0.91.4",
+  "version": "0.92.0",
   "private": false,
   "description": "Val shared types and utilities",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/valbuild/val.git"
   },
-  "scripts": {
-    "typecheck": "tsc --noEmit",
-    "test": "jest"
-  },
   "main": "dist/valbuild-shared.cjs.js",
   "module": "dist/valbuild-shared.esm.js",
   "exports": {
@@ -33,13 +29,20 @@
     "exports": true
   },
   "dependencies": {
-    "@valbuild/core": "~0.91.4",
-    "zod": "^3.22.4",
-    "zod-validation-error": "^3.3.0"
+    "zod": "^4.3.5",
+    "zod-validation-error": "^5.0.0",
+    "@valbuild/core": "0.92.0"
   },
   "files": [
     "dist",
     "internal/dist",
     "internal/package.json"
-  ]
-}
+  ],
+  "devDependencies": {
+    "typescript": "^5.9.3"
+  },
+  "scripts": {
+    "typecheck": "tsc --noEmit",
+    "test": "jest"
+  }
+}