@valbuild/shared 0.72.4 → 0.73.1

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

@@ -1,4 +1,5 @@
-import { Internal, VAL_EXTENSION, FILE_REF_PROP, FILE_REF_SUBTYPE_TAG } from '@valbuild/core';
+import { Internal, FILE_REF_PROP, VAL_EXTENSION, FILE_REF_SUBTYPE_TAG } from '@valbuild/core';
+import { Buffer } from 'buffer';
 import { z } from 'zod';
 import { fromZodError } from 'zod-validation-error';
 
@@ -112,7 +113,7 @@ function _createForOfIteratorHelper(r, e) {
   };
 }
 
-function remirrorToRichTextSource(node, configDirectory) {
+function remirrorToRichTextSource(node, configDirectory, remoteOptions) {
   var files = {};
   var blocks = [];
   var i = 0;
@@ -121,7 +122,7 @@ function remirrorToRichTextSource(node, configDirectory) {
   try {
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
       var child = _step.value;
-      var block = convertBlock([(i++).toString()], child, files, configDirectory);
+      var block = convertBlock([(i++).toString()], child, files, configDirectory, remoteOptions);
       blocks.push(block);
     }
   } catch (err) {
@@ -134,7 +135,7 @@ function remirrorToRichTextSource(node, configDirectory) {
     files: files
   };
 }
-function convertBlock(path, node, files, configDirectory) {
+function convertBlock(path, node, files, configDirectory, remoteOptions) {
   if (node.type === "heading") {
     var _node$attrs, _node$content;
     var depth = ((_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.level) || 1;
@@ -144,21 +145,21 @@ function convertBlock(path, node, files, configDirectory) {
     return {
       tag: "h".concat(depth),
       children: ((_node$content = node.content) === null || _node$content === void 0 ? void 0 : _node$content.map(function (child, i) {
-        return convertHeadingChild(path.concat("children", i.toString()), child, files, configDirectory);
+        return convertHeadingChild(path.concat("children", i.toString()), child, files, configDirectory, remoteOptions);
       })) || []
     };
   } else if (node.type === "paragraph") {
-    return convertParagraph(path, node, files, configDirectory);
+    return convertParagraph(path, node, files, configDirectory, remoteOptions);
   } else if (node.type === "bulletList") {
-    return convertBulletList(path, node, files, configDirectory);
+    return convertBulletList(path, node, files, configDirectory, remoteOptions);
   } else if (node.type === "orderedList") {
-    return convertOrderedList(path, node, files, configDirectory);
+    return convertOrderedList(path, node, files, configDirectory, remoteOptions);
   } else {
     var exhaustiveCheck = node;
     throw new Error("Unhandled node type: ".concat("type" in exhaustiveCheck ? "exhaustiveCheck.type" : "unknown"));
   }
 }
-function convertHeadingChild(path, node, files, configDirectory) {
+function convertHeadingChild(path, node, files, configDirectory, remoteOptions) {
   if (node.type === "text") {
     return convertTextNode(node);
   } else if (node.type === "hardBreak") {
@@ -166,13 +167,13 @@ function convertHeadingChild(path, node, files, configDirectory) {
       tag: "br"
     };
   } else if (node.type === "image") {
-    return convertImageNode(path, node, files, configDirectory);
+    return convertImageNode(path, node, files, configDirectory, remoteOptions);
   } else {
     var exhaustiveCheck = node;
     throw new Error("Unexpected heading child type: ".concat(JSON.stringify(exhaustiveCheck, null, 2)));
   }
 }
-function convertParagraph(path, child, files, configDirectory) {
+function convertParagraph(path, child, files, configDirectory, remoteOptions) {
   var _child$content;
   return {
     tag: "p",
@@ -184,7 +185,7 @@ function convertParagraph(path, child, files, configDirectory) {
           tag: "br"
         };
       } else if (child.type === "image") {
-        return convertImageNode(path.concat("children", i.toString()), child, files, configDirectory);
+        return convertImageNode(path.concat("children", i.toString()), child, files, configDirectory, remoteOptions);
       }
       var exhaustiveCheck = child;
       throw new Error("Unexpected paragraph child type: ".concat(JSON.stringify(exhaustiveCheck, null, 2)));
@@ -243,17 +244,17 @@ function convertTextNode(node) {
     throw new Error("Unexpected node type: ".concat(exhaustiveCheck));
   }
 }
-function convertListItem(path, child, files, configDirectory) {
+function convertListItem(path, child, files, configDirectory, remoteOptions) {
   var _child$content2;
   return {
     tag: "li",
     children: ((_child$content2 = child.content) === null || _child$content2 === void 0 ? void 0 : _child$content2.map(function (child, i) {
       if (child.type === "paragraph") {
-        return convertParagraph(path.concat("children", i.toString()), child, files, configDirectory);
+        return convertParagraph(path.concat("children", i.toString()), child, files, configDirectory, remoteOptions);
       } else if (child.type === "bulletList") {
-        return convertBulletList(path.concat("children", i.toString()), child, files, configDirectory);
+        return convertBulletList(path.concat("children", i.toString()), child, files, configDirectory, remoteOptions);
       } else if (child.type === "orderedList") {
-        return convertOrderedList(path.concat("children", i.toString()), child, files, configDirectory);
+        return convertOrderedList(path.concat("children", i.toString()), child, files, configDirectory, remoteOptions);
       } else {
         var exhaustiveCheck = child;
         throw new Error("Unexpected list child type: ".concat(exhaustiveCheck));
@@ -261,13 +262,13 @@ function convertListItem(path, child, files, configDirectory) {
     })) || []
   };
 }
-function convertBulletList(path, node, files, configDirectory) {
+function convertBulletList(path, node, files, configDirectory, remoteOptions) {
   var _node$content2;
   return {
     tag: "ul",
     children: ((_node$content2 = node.content) === null || _node$content2 === void 0 ? void 0 : _node$content2.map(function (child, i) {
       if (child.type === "listItem") {
-        return convertListItem(path.concat("children", i.toString()), child, files, configDirectory);
+        return convertListItem(path.concat("children", i.toString()), child, files, configDirectory, remoteOptions);
       } else {
         var exhaustiveCheck = child.type;
         throw new Error("Unexpected bullet list child type: ".concat(exhaustiveCheck));
@@ -275,13 +276,13 @@ function convertBulletList(path, node, files, configDirectory) {
     })) || []
   };
 }
-function convertOrderedList(path, node, files, configDirectory) {
+function convertOrderedList(path, node, files, configDirectory, remoteOptions) {
   var _node$content3;
   return {
     tag: "ol",
     children: ((_node$content3 = node.content) === null || _node$content3 === void 0 ? void 0 : _node$content3.map(function (child, i) {
       if (child.type === "listItem") {
-        return convertListItem(path.concat("children", i.toString()), child, files, configDirectory);
+        return convertListItem(path.concat("children", i.toString()), child, files, configDirectory, remoteOptions);
       } else {
         var exhaustiveCheck = child.type;
         throw new Error("Unexpected ordered list child type: ".concat(exhaustiveCheck));
@@ -290,9 +291,10 @@ function convertOrderedList(path, node, files, configDirectory) {
   };
 }
 var textEncoder = new TextEncoder();
-function convertImageNode(path, node, files, configDirectory) {
+function convertImageNode(path, node, files, configDirectory, remoteOptions) {
   if (node.attrs && node.attrs.src.startsWith("data:")) {
-    var sha256 = Internal.getSHA256Hash(textEncoder.encode(node.attrs.src));
+    var binaryData = Buffer.from(node.attrs.src.split(",")[1], "base64");
+    var fullFileHash = Internal.getSHA256Hash(new Uint8Array(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));
@@ -301,7 +303,7 @@ function convertImageNode(path, node, files, configDirectory) {
       width: typeof node.attrs.width === "number" ? node.attrs.width : 0,
       height: typeof node.attrs.height === "number" ? node.attrs.height : 0,
       mimeType: mimeType
-    }, sha256);
+    }, fullFileHash);
     var dir = configDirectory !== null && configDirectory !== void 0 && configDirectory.endsWith("/") ? configDirectory : "".concat(configDirectory, "/");
     var filePath = "".concat(dir).concat(fileName);
     var existingFilesEntry = files[filePath];
@@ -316,26 +318,41 @@ function convertImageNode(path, node, files, configDirectory) {
         patchPaths: [thisPath]
       };
     }
+    var remoteFileHash = Internal.remote.hashToRemoteFileHash(fullFileHash);
+    var ref = remoteOptions ? Internal.remote.createRemoteRef(remoteOptions.remoteHost, _objectSpread2(_objectSpread2({}, remoteOptions), {}, {
+      fileHash: remoteFileHash,
+      validationHash: Internal.remote.getValidationHash(remoteOptions.coreVersion, remoteOptions.schema, mimeType, {
+        width: typeof node.attrs.width === "number" ? node.attrs.width : 0,
+        height: typeof node.attrs.height === "number" ? node.attrs.height : 0
+      }, remoteFileHash, textEncoder),
+      filePath: filePath.slice(1)
+    })) : filePath;
     return {
       tag: "img",
-      src: _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, VAL_EXTENSION, "file"), FILE_REF_PROP, filePath), FILE_REF_SUBTYPE_TAG, "image"), "metadata", {
-        width: typeof node.attrs.width === "number" ? node.attrs.width : 0,
-        height: typeof node.attrs.height === "number" ? node.attrs.height : 0,
-        mimeType: mimeType
+      src: _objectSpread2(_objectSpread2(_defineProperty({}, FILE_REF_PROP, ref), remoteOptions ? _defineProperty({}, VAL_EXTENSION, "remote") : _defineProperty(_defineProperty({}, VAL_EXTENSION, "file"), FILE_REF_SUBTYPE_TAG, "image")), {}, {
+        metadata: {
+          width: typeof node.attrs.width === "number" ? node.attrs.width : 0,
+          height: typeof node.attrs.height === "number" ? node.attrs.height : 0,
+          mimeType: mimeType
+        }
       })
     };
   } else if (node.attrs) {
     var url = node.attrs.src;
     var patchId = getParam("patch_id", url);
     var noParamsUrl = url.split("?")[0];
+    var remote = false;
     if (patchId) {
+      remote = getParam("remote", url) === "true";
       if (noParamsUrl.startsWith("/api/val/files/public")) {
         noParamsUrl = noParamsUrl.slice("/api/val/files".length);
       } else {
         console.error("Patched image URL does not start with /api/val/files: " + url);
       }
     } else {
-      if (!noParamsUrl.startsWith("/public")) {
+      if (remoteOptions && noParamsUrl.startsWith(remoteOptions.remoteHost)) {
+        remote = true;
+      } else if (!noParamsUrl.startsWith("/public")) {
         noParamsUrl = "/public".concat(noParamsUrl);
       } else {
         console.error("Unpatched image URL starts with /public: " + url);
@@ -343,11 +360,13 @@ function convertImageNode(path, node, files, configDirectory) {
     }
     var tag = {
       tag: "img",
-      src: _objectSpread2(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, VAL_EXTENSION, "file"), FILE_REF_PROP, noParamsUrl), FILE_REF_SUBTYPE_TAG, "image"), "metadata", {
-        width: typeof node.attrs.width === "number" ? node.attrs.width : 0,
-        height: typeof node.attrs.height === "number" ? node.attrs.height : 0,
-        mimeType: noParamsUrl && Internal.filenameToMimeType(noParamsUrl) || ""
-      }), patchId ? {
+      src: _objectSpread2(_objectSpread2({}, remote ? _defineProperty(_defineProperty({}, VAL_EXTENSION, "remote"), FILE_REF_PROP, noParamsUrl) : _defineProperty(_defineProperty(_defineProperty({}, VAL_EXTENSION, "file"), FILE_REF_SUBTYPE_TAG, "image"), FILE_REF_PROP, noParamsUrl)), {}, {
+        metadata: {
+          width: typeof node.attrs.width === "number" ? node.attrs.width : 0,
+          height: typeof node.attrs.height === "number" ? node.attrs.height : 0,
+          mimeType: noParamsUrl && Internal.filenameToMimeType(noParamsUrl) || ""
+        }
+      }, patchId ? {
         patch_id: patchId
       } : {})
     };
@@ -621,10 +640,15 @@ function convertLinkNodeToRemirror(linkNode) {
 function convertImageNodeToRemirror(imageNode) {
   var _fileSource$metadata, _fileSource$metadata2;
   var fileSource = imageNode.src;
-  if (!(VAL_EXTENSION in fileSource) || fileSource[VAL_EXTENSION] !== "file") {
+  if (!(VAL_EXTENSION in fileSource) || fileSource[VAL_EXTENSION] !== "file" && fileSource[VAL_EXTENSION] !== "remote") {
     throw Error("Expected file source in image node");
   }
-  var fileVal = Internal.convertFileSource(fileSource);
+  var fileVal;
+  if (fileSource[VAL_EXTENSION] === "remote") {
+    fileVal = Internal.convertRemoteSource(fileSource);
+  } else {
+    fileVal = Internal.convertFileSource(fileSource);
+  }
   return {
     type: "image",
     attrs: {
@@ -1084,7 +1108,8 @@ var OperationJSONT = z.discriminatedUnion("op", [z.object({
   op: z.literal("file"),
   path: z.string(),
   filePath: z.string(),
-  value: z.string()
+  value: z.string(),
+  remote: z["boolean"]()
 }).strict()]);
 var PatchJSON = z.array(OperationJSONT);
 /**
@@ -1118,7 +1143,8 @@ var OperationT = z.discriminatedUnion("op", [z.object({
   path: z.array(z.string()),
   filePath: z.string(),
   nestedFilePath: z.array(z.string()).optional(),
-  value: z.string()
+  value: z.string(),
+  remote: z["boolean"]()
 }).strict()]);
 var Patch = z.array(OperationT);
 var PatchId = z.string().refine(function (_id) {
@@ -1198,6 +1224,17 @@ var SerializedUnionSchema = z.lazy(function () {
     opt: z["boolean"]()
   })]);
 });
+var ImageOptions = z.object({
+  ext: z.union([z.tuple([z.literal("jpg")]), z.tuple([z.literal("webp")])]).optional(),
+  directory: z.string().optional(),
+  prefix: z.string().optional(),
+  accept: z.string().optional()
+});
+var SerializedImageSchema = z.object({
+  type: z.literal("image"),
+  options: ImageOptions.optional(),
+  opt: z["boolean"]()
+});
 var RichTextOptions = z.object({
   style: z.object({
     bold: z["boolean"]().optional(),
@@ -1216,7 +1253,7 @@ var RichTextOptions = z.object({
   }).optional(),
   inline: z.object({
     a: z["boolean"]().optional(),
-    img: z["boolean"]().optional()
+    img: z.union([z["boolean"](), SerializedImageSchema]).optional()
   }).optional()
 });
 var SerializedRichTextSchema = z.object({
@@ -1252,17 +1289,6 @@ var SerializedDateSchema = z.object({
   type: z.literal("date"),
   opt: z["boolean"]()
 });
-var ImageOptions = z.object({
-  ext: z.union([z.tuple([z.literal("jpg")]), z.tuple([z.literal("webp")])]).optional(),
-  directory: z.string().optional(),
-  prefix: z.string().optional(),
-  accept: z.string().optional()
-});
-var SerializedImageSchema = z.object({
-  type: z.literal("image"),
-  options: ImageOptions.optional(),
-  opt: z["boolean"]()
-});
 var SerializedSchema = z.union([SerializedStringSchema, SerializedLiteralSchema, SerializedBooleanSchema, SerializedNumberSchema, SerializedObjectSchema, SerializedArraySchema, SerializedUnionSchema, SerializedRichTextSchema, SerializedRecordSchema, SerializedKeyOfSchema, SerializedFileSchema, SerializedDateSchema, SerializedImageSchema]);
 
 var ModuleFilePath = z.string().refine(function (_path) {
@@ -1285,7 +1311,7 @@ var ValConfig = z.object({
   gitCommit: z.string().optional(),
   gitBranch: z.string().optional()
 });
-var ValidationFixZ = z.union([z.literal("image:change-extension"), z.literal("image:add-metadata"), z.literal("image:check-metadata"), z.literal("file:change-extension"), z.literal("file:add-metadata"), z.literal("file:check-metadata"), z.literal("keyof:check-keys")]);
+var ValidationFixZ = z.union([z.literal("image:change-extension"), z.literal("image:add-metadata"), z.literal("image:check-metadata"), z.literal("image:check-remote"), z.literal("image:upload-remote"), z.literal("image:download-remote"), z.literal("file:change-extension"), z.literal("file:add-metadata"), z.literal("file:check-metadata"), z.literal("file:check-remote"), z.literal("file:upload-remote"), z.literal("file:download-remote"), z.literal("keyof:check-keys")]);
 var ValidationError = z.object({
   message: z.string(),
   value: z.unknown().optional(),
@@ -1555,6 +1581,42 @@ var Api = {
       })
     }
   },
+  "/remote/settings": {
+    GET: {
+      req: {
+        cookies: {
+          val_session: z.string().optional()
+        }
+      },
+      res: z.union([z.object({
+        status: z.literal(200),
+        json: z.object({
+          publicProjectId: z.string(),
+          coreVersion: z.string(),
+          remoteFileBuckets: z.array(z.object({
+            bucket: z.string()
+          }))
+        })
+      }), z.object({
+        status: z.literal(400),
+        json: z.object({
+          errorCode: z.union([z.literal("project-not-configured"), z.literal("error-could-not-get-settings"), z.literal("project-not-configured"), z.literal("pat-error"), z.literal("api-key-missing")]),
+          message: z.string()
+        })
+      }), z.object({
+        status: z.literal(401),
+        json: z.object({
+          errorCode: z.literal("unauthorized").optional(),
+          message: z.string()
+        })
+      }), z.object({
+        status: z.literal(500),
+        json: z.object({
+          message: z.string()
+        })
+      })])
+    }
+  },
   "/stat": {
     POST: {
       req: {
@@ -1846,13 +1908,16 @@ var Api = {
         })
       }), z.object({
         status: z.literal(400),
-        json: z.object({
+        json: z.union([z.object({
           message: z.string(),
           details: z.union([z.object({
             sourceFilePatchErrors: z.record(ModuleFilePath, z.array(GenericError)),
             binaryFilePatchErrors: z.record(GenericError)
           }), z.array(GenericError)])
-        })
+        }), z.object({
+          message: z.string(),
+          errorCode: z.union([z.literal("project-not-configured"), z.literal("pat-error")])
+        })])
       })])
     }
   },
@@ -1861,7 +1926,8 @@ var Api = {
       req: {
         path: z.string(),
         query: {
-          patch_id: PatchId.optional()
+          patch_id: PatchId.optional(),
+          remote: z.string().optional()
         }
       },
       res: z.union([unauthorizedResponse, notFoundResponse, z.object({
@@ -2031,10 +2097,10 @@ var createValClient = function createValClient(host) {
                       console.log("Server responded with an error", json);
                       return _context.abrupt("return", {
                         status: 500,
-                        json: {
-                          message: json.message,
-                          type: "unknown"
-                        }
+                        json: _objectSpread2({
+                          type: "unknown",
+                          message: json.message
+                        }, json)
                       });
                     case 10:
                       responseResult = (_apiEndpoint$res = apiEndpoint.res) === null || _apiEndpoint$res === void 0 ? void 0 : _apiEndpoint$res.safeParse(valClientResult);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@valbuild/shared",
-  "version": "0.72.4",
+  "version": "0.73.1",
   "private": false,
   "description": "Val shared types and utilities",
   "scripts": {
@@ -29,7 +29,7 @@
     "exports": true
   },
   "dependencies": {
-    "@valbuild/core": "~0.72.4",
+    "@valbuild/core": "~0.73.1",
     "zod": "^3.22.4",
     "zod-validation-error": "^3.3.0"
   },