@valbuild/server 0.43.1 → 0.45.0

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

@@ -7,12 +7,12 @@ var ts = require('typescript');
 var fp = require('@valbuild/core/fp');
 var core = require('@valbuild/core');
 var patch = require('@valbuild/core/patch');
-var crypto = require('crypto');
 var path = require('path');
 var fs = require('fs');
 var sucrase = require('sucrase');
 var z = require('zod');
 var internal = require('@valbuild/shared/internal');
+var crypto = require('crypto');
 var server = require('@valbuild/ui/server');
 var sizeOf = require('image-size');
 
@@ -37,10 +37,10 @@ function _interopNamespace(e) {
 }
 
 var ts__default = /*#__PURE__*/_interopDefault(ts);
-var crypto__default = /*#__PURE__*/_interopDefault(crypto);
 var path__namespace = /*#__PURE__*/_interopNamespace(path);
 var fs__default = /*#__PURE__*/_interopDefault(fs);
 var z__default = /*#__PURE__*/_interopDefault(z);
+var crypto__default = /*#__PURE__*/_interopDefault(crypto);
 var sizeOf__default = /*#__PURE__*/_interopDefault(sizeOf);
 
 class ValSyntaxError {
@@ -624,8 +624,8 @@ const ops = new TSOps(document => {
 
 // TODO: rename to patchValFiles since we may write multiple files
 const patchValFile = async (id, valConfigPath, patch$1, sourceFileHandler, runtime) => {
-  const timeId = crypto.randomUUID();
-  console.time("patchValFile" + timeId);
+  // const timeId = randomUUID();
+  // console.time("patchValFile" + timeId);
   const filePath = sourceFileHandler.resolveSourceModulePath(valConfigPath, `.${id}.val`);
   const sourceFile = sourceFileHandler.getSourceFile(filePath);
   if (!sourceFile) {
@@ -661,8 +661,9 @@ const patchValFile = async (id, valConfigPath, patch$1, sourceFileHandler, runti
     }
   }
   sourceFileHandler.writeSourceFile(newSourceFile.value);
-  console.timeEnd("patchValFile" + timeId);
+  // console.timeEnd("patchValFile" + timeId);
 };
+
 function convertDataUrlToBase64(dataUrl) {
   const base64 = dataUrl.slice(dataUrl.indexOf(",") + 1);
   return Buffer.from(base64, "base64");
@@ -975,7 +976,7 @@ async function newValQuickJSRuntime(quickJSModule, moduleLoader, {
       }
       if (modulePath === "@valbuild/react/stega") {
         return {
-          value: "export const useVal = () => { throw Error(`Cannot use 'useVal' in this type of file`) }; export const fetchVal = () => { throw Error(`Cannot use 'fetchVal' in this type of file`) }; export const autoTagJSX = () => { /* ignore */ };  export const stegaClean = () => { throw Error(`Cannot use 'stegaClean' in this type of file`) }; "
+          value: "export const useVal = () => { throw Error(`Cannot use 'useVal' in this type of file`) }; export const fetchVal = () => { throw Error(`Cannot use 'fetchVal' in this type of file`) }; export const autoTagJSX = () => { /* ignore */ }; export const stegaClean = () => { throw Error(`Cannot use 'stegaClean' in this type of file`) }; export const stegaDecodeString = () => { throw Error(`Cannot use 'stegaDecodeString' in this type of file`) }; "
         };
       }
       if (modulePath.startsWith("next/navigation")) {
@@ -1003,6 +1004,11 @@ async function newValQuickJSRuntime(quickJSModule, moduleLoader, {
           value: "export const ValNextProvider = new Proxy({}, { get() { return () => { throw new Error(`Cannot import 'ValNextProvider' in this file`) } } } )"
         };
       }
+      if (modulePath.includes("/ValImage")) {
+        return {
+          value: "export const ValImage = new Proxy({}, { get() { return () => { throw new Error(`Cannot import 'ValImage' in this file`) } } } )"
+        };
+      }
       return {
         value: moduleLoader.getModule(modulePath)
       };
@@ -1053,6 +1059,11 @@ async function newValQuickJSRuntime(quickJSModule, moduleLoader, {
           value: requestedName
         };
       }
+      if (requestedName.includes("/ValImage")) {
+        return {
+          value: requestedName
+        };
+      }
       const modulePath = moduleLoader.resolveModulePath(baseModuleName, requestedName);
       return {
         value: modulePath
@@ -1261,7 +1272,7 @@ class LocalValServer {
     return {
       cookies: {
         [internal.VAL_ENABLE_COOKIE_NAME]: {
-          value: null
+          value: "false"
         }
       },
       status: 302,
@@ -1280,8 +1291,9 @@ class LocalValServer {
         }
       };
     }
-    const id = crypto.randomUUID();
-    console.time("patching:" + id);
+
+    // const id = randomUUID();
+    // console.time("patching:" + id);
     for (const moduleId in patchJSON.data) {
       // Then parse/validate
       // TODO: validate all and then fail instead:
@@ -1292,7 +1304,8 @@ class LocalValServer {
       }
       await this.options.service.patch(moduleId, patch$1.value);
     }
-    console.timeEnd("patching:" + id);
+    // console.timeEnd("patching:" + id);
+
     return {
       status: 200,
       json: {} // no patch ids created
@@ -2252,6 +2265,7 @@ class ValFSHost {
 }
 
 // TODO: find a better name? transformFixesToPatch?
+const textEncoder = new TextEncoder();
 async function createFixPatch(config, apply, sourcePath, validationError) {
   async function getImageMetadata() {
     const maybeRef = validationError.value && typeof validationError.value === "object" && core.FILE_REF_PROP in validationError.value && typeof validationError.value[core.FILE_REF_PROP] === "string" ? validationError.value[core.FILE_REF_PROP] : undefined;
@@ -2259,13 +2273,28 @@ async function createFixPatch(config, apply, sourcePath, validationError) {
       // TODO:
       throw Error("Cannot fix image without a file reference");
     }
-    const localFile = path__namespace["default"].join(config.projectRoot, maybeRef);
-    const buffer = fs__default["default"].readFileSync(localFile);
-    const sha256 = await core.Internal.getSHA256Hash(buffer);
+    const filename = path__namespace["default"].join(config.projectRoot, maybeRef);
+    const buffer = fs__default["default"].readFileSync(filename);
     const imageSize = sizeOf__default["default"](buffer);
+    const mimeType = imageSize.type ? internal.imageTypeToMimeType(imageSize.type) : internal.filenameToMimeType(filename);
+    if (!mimeType) {
+      throw Error("Cannot determine mimetype of image");
+    }
+    const {
+      width,
+      height
+    } = imageSize;
+    if (!width || !height) {
+      throw Error("Cannot determine image size");
+    }
+    const sha256 = core.Internal.getSHA256Hash(textEncoder.encode(
+    // TODO: we should probably store the mimetype in the metadata and reuse it here
+    `data:${mimeType};base64,${buffer.toString("base64")}`));
     return {
-      ...imageSize,
-      sha256
+      width,
+      height,
+      sha256,
+      mimeType
     };
   }
   const remainingErrors = [];
@@ -2300,7 +2329,8 @@ async function createFixPatch(config, apply, sourcePath, validationError) {
               value: {
                 width: imageMetadata.width,
                 height: imageMetadata.height,
-                sha256: imageMetadata.sha256
+                sha256: imageMetadata.sha256,
+                mimeType: imageMetadata.mimeType
               }
             });
           } else {

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

@@ -7,12 +7,12 @@ var ts = require('typescript');
 var fp = require('@valbuild/core/fp');
 var core = require('@valbuild/core');
 var patch = require('@valbuild/core/patch');
-var crypto = require('crypto');
 var path = require('path');
 var fs = require('fs');
 var sucrase = require('sucrase');
 var z = require('zod');
 var internal = require('@valbuild/shared/internal');
+var crypto = require('crypto');
 var server = require('@valbuild/ui/server');
 var sizeOf = require('image-size');
 
@@ -37,10 +37,10 @@ function _interopNamespace(e) {
 }
 
 var ts__default = /*#__PURE__*/_interopDefault(ts);
-var crypto__default = /*#__PURE__*/_interopDefault(crypto);
 var path__namespace = /*#__PURE__*/_interopNamespace(path);
 var fs__default = /*#__PURE__*/_interopDefault(fs);
 var z__default = /*#__PURE__*/_interopDefault(z);
+var crypto__default = /*#__PURE__*/_interopDefault(crypto);
 var sizeOf__default = /*#__PURE__*/_interopDefault(sizeOf);
 
 class ValSyntaxError {
@@ -624,8 +624,8 @@ const ops = new TSOps(document => {
 
 // TODO: rename to patchValFiles since we may write multiple files
 const patchValFile = async (id, valConfigPath, patch$1, sourceFileHandler, runtime) => {
-  const timeId = crypto.randomUUID();
-  console.time("patchValFile" + timeId);
+  // const timeId = randomUUID();
+  // console.time("patchValFile" + timeId);
   const filePath = sourceFileHandler.resolveSourceModulePath(valConfigPath, `.${id}.val`);
   const sourceFile = sourceFileHandler.getSourceFile(filePath);
   if (!sourceFile) {
@@ -661,8 +661,9 @@ const patchValFile = async (id, valConfigPath, patch$1, sourceFileHandler, runti
     }
   }
   sourceFileHandler.writeSourceFile(newSourceFile.value);
-  console.timeEnd("patchValFile" + timeId);
+  // console.timeEnd("patchValFile" + timeId);
 };
+
 function convertDataUrlToBase64(dataUrl) {
   const base64 = dataUrl.slice(dataUrl.indexOf(",") + 1);
   return Buffer.from(base64, "base64");
@@ -975,7 +976,7 @@ async function newValQuickJSRuntime(quickJSModule, moduleLoader, {
       }
       if (modulePath === "@valbuild/react/stega") {
         return {
-          value: "export const useVal = () => { throw Error(`Cannot use 'useVal' in this type of file`) }; export const fetchVal = () => { throw Error(`Cannot use 'fetchVal' in this type of file`) }; export const autoTagJSX = () => { /* ignore */ };  export const stegaClean = () => { throw Error(`Cannot use 'stegaClean' in this type of file`) }; "
+          value: "export const useVal = () => { throw Error(`Cannot use 'useVal' in this type of file`) }; export const fetchVal = () => { throw Error(`Cannot use 'fetchVal' in this type of file`) }; export const autoTagJSX = () => { /* ignore */ }; export const stegaClean = () => { throw Error(`Cannot use 'stegaClean' in this type of file`) }; export const stegaDecodeString = () => { throw Error(`Cannot use 'stegaDecodeString' in this type of file`) }; "
         };
       }
       if (modulePath.startsWith("next/navigation")) {
@@ -1003,6 +1004,11 @@ async function newValQuickJSRuntime(quickJSModule, moduleLoader, {
           value: "export const ValNextProvider = new Proxy({}, { get() { return () => { throw new Error(`Cannot import 'ValNextProvider' in this file`) } } } )"
         };
       }
+      if (modulePath.includes("/ValImage")) {
+        return {
+          value: "export const ValImage = new Proxy({}, { get() { return () => { throw new Error(`Cannot import 'ValImage' in this file`) } } } )"
+        };
+      }
       return {
         value: moduleLoader.getModule(modulePath)
       };
@@ -1053,6 +1059,11 @@ async function newValQuickJSRuntime(quickJSModule, moduleLoader, {
           value: requestedName
         };
       }
+      if (requestedName.includes("/ValImage")) {
+        return {
+          value: requestedName
+        };
+      }
       const modulePath = moduleLoader.resolveModulePath(baseModuleName, requestedName);
       return {
         value: modulePath
@@ -1261,7 +1272,7 @@ class LocalValServer {
     return {
       cookies: {
         [internal.VAL_ENABLE_COOKIE_NAME]: {
-          value: null
+          value: "false"
         }
       },
       status: 302,
@@ -1280,8 +1291,9 @@ class LocalValServer {
         }
       };
     }
-    const id = crypto.randomUUID();
-    console.time("patching:" + id);
+
+    // const id = randomUUID();
+    // console.time("patching:" + id);
     for (const moduleId in patchJSON.data) {
       // Then parse/validate
       // TODO: validate all and then fail instead:
@@ -1292,7 +1304,8 @@ class LocalValServer {
       }
       await this.options.service.patch(moduleId, patch$1.value);
     }
-    console.timeEnd("patching:" + id);
+    // console.timeEnd("patching:" + id);
+
     return {
       status: 200,
       json: {} // no patch ids created
@@ -2252,6 +2265,7 @@ class ValFSHost {
 }
 
 // TODO: find a better name? transformFixesToPatch?
+const textEncoder = new TextEncoder();
 async function createFixPatch(config, apply, sourcePath, validationError) {
   async function getImageMetadata() {
     const maybeRef = validationError.value && typeof validationError.value === "object" && core.FILE_REF_PROP in validationError.value && typeof validationError.value[core.FILE_REF_PROP] === "string" ? validationError.value[core.FILE_REF_PROP] : undefined;
@@ -2259,13 +2273,28 @@ async function createFixPatch(config, apply, sourcePath, validationError) {
       // TODO:
       throw Error("Cannot fix image without a file reference");
     }
-    const localFile = path__namespace["default"].join(config.projectRoot, maybeRef);
-    const buffer = fs__default["default"].readFileSync(localFile);
-    const sha256 = await core.Internal.getSHA256Hash(buffer);
+    const filename = path__namespace["default"].join(config.projectRoot, maybeRef);
+    const buffer = fs__default["default"].readFileSync(filename);
     const imageSize = sizeOf__default["default"](buffer);
+    const mimeType = imageSize.type ? internal.imageTypeToMimeType(imageSize.type) : internal.filenameToMimeType(filename);
+    if (!mimeType) {
+      throw Error("Cannot determine mimetype of image");
+    }
+    const {
+      width,
+      height
+    } = imageSize;
+    if (!width || !height) {
+      throw Error("Cannot determine image size");
+    }
+    const sha256 = core.Internal.getSHA256Hash(textEncoder.encode(
+    // TODO: we should probably store the mimetype in the metadata and reuse it here
+    `data:${mimeType};base64,${buffer.toString("base64")}`));
     return {
-      ...imageSize,
-      sha256
+      width,
+      height,
+      sha256,
+      mimeType
     };
   }
   const remainingErrors = [];
@@ -2300,7 +2329,8 @@ async function createFixPatch(config, apply, sourcePath, validationError) {
               value: {
                 width: imageMetadata.width,
                 height: imageMetadata.height,
-                sha256: imageMetadata.sha256
+                sha256: imageMetadata.sha256,
+                mimeType: imageMetadata.mimeType
               }
             });
           } else {

package/dist/valbuild-server.esm.js

@@ -3,13 +3,13 @@ import ts from 'typescript';
 import { result, pipe } from '@valbuild/core/fp';
 import { FILE_REF_PROP, VAL_EXTENSION, derefPatch, Internal, Schema } from '@valbuild/core';
 import { deepEqual, isNotRoot, PatchError, parseAndValidateArrayIndex, applyPatch, parsePatch, sourceToPatchPath } from '@valbuild/core/patch';
-import crypto, { randomUUID } from 'crypto';
 import * as path from 'path';
 import path__default from 'path';
 import fs, { promises } from 'fs';
 import { transform } from 'sucrase';
 import z, { z as z$1 } from 'zod';
-import { VAL_ENABLE_COOKIE_NAME, VAL_STATE_COOKIE as VAL_STATE_COOKIE$1, VAL_SESSION_COOKIE as VAL_SESSION_COOKIE$1 } from '@valbuild/shared/internal';
+import { VAL_ENABLE_COOKIE_NAME, VAL_STATE_COOKIE as VAL_STATE_COOKIE$1, VAL_SESSION_COOKIE as VAL_SESSION_COOKIE$1, imageTypeToMimeType, filenameToMimeType } from '@valbuild/shared/internal';
+import crypto from 'crypto';
 import { createUIRequestHandler } from '@valbuild/ui/server';
 import sizeOf from 'image-size';
 
@@ -594,8 +594,8 @@ const ops = new TSOps(document => {
 
 // TODO: rename to patchValFiles since we may write multiple files
 const patchValFile = async (id, valConfigPath, patch, sourceFileHandler, runtime) => {
-  const timeId = randomUUID();
-  console.time("patchValFile" + timeId);
+  // const timeId = randomUUID();
+  // console.time("patchValFile" + timeId);
   const filePath = sourceFileHandler.resolveSourceModulePath(valConfigPath, `.${id}.val`);
   const sourceFile = sourceFileHandler.getSourceFile(filePath);
   if (!sourceFile) {
@@ -631,8 +631,9 @@ const patchValFile = async (id, valConfigPath, patch, sourceFileHandler, runtime
     }
   }
   sourceFileHandler.writeSourceFile(newSourceFile.value);
-  console.timeEnd("patchValFile" + timeId);
+  // console.timeEnd("patchValFile" + timeId);
 };
+
 function convertDataUrlToBase64(dataUrl) {
   const base64 = dataUrl.slice(dataUrl.indexOf(",") + 1);
   return Buffer.from(base64, "base64");
@@ -945,7 +946,7 @@ async function newValQuickJSRuntime(quickJSModule, moduleLoader, {
       }
       if (modulePath === "@valbuild/react/stega") {
         return {
-          value: "export const useVal = () => { throw Error(`Cannot use 'useVal' in this type of file`) }; export const fetchVal = () => { throw Error(`Cannot use 'fetchVal' in this type of file`) }; export const autoTagJSX = () => { /* ignore */ };  export const stegaClean = () => { throw Error(`Cannot use 'stegaClean' in this type of file`) }; "
+          value: "export const useVal = () => { throw Error(`Cannot use 'useVal' in this type of file`) }; export const fetchVal = () => { throw Error(`Cannot use 'fetchVal' in this type of file`) }; export const autoTagJSX = () => { /* ignore */ }; export const stegaClean = () => { throw Error(`Cannot use 'stegaClean' in this type of file`) }; export const stegaDecodeString = () => { throw Error(`Cannot use 'stegaDecodeString' in this type of file`) }; "
         };
       }
       if (modulePath.startsWith("next/navigation")) {
@@ -973,6 +974,11 @@ async function newValQuickJSRuntime(quickJSModule, moduleLoader, {
           value: "export const ValNextProvider = new Proxy({}, { get() { return () => { throw new Error(`Cannot import 'ValNextProvider' in this file`) } } } )"
         };
       }
+      if (modulePath.includes("/ValImage")) {
+        return {
+          value: "export const ValImage = new Proxy({}, { get() { return () => { throw new Error(`Cannot import 'ValImage' in this file`) } } } )"
+        };
+      }
       return {
         value: moduleLoader.getModule(modulePath)
       };
@@ -1023,6 +1029,11 @@ async function newValQuickJSRuntime(quickJSModule, moduleLoader, {
           value: requestedName
         };
       }
+      if (requestedName.includes("/ValImage")) {
+        return {
+          value: requestedName
+        };
+      }
       const modulePath = moduleLoader.resolveModulePath(baseModuleName, requestedName);
       return {
         value: modulePath
@@ -1231,7 +1242,7 @@ class LocalValServer {
     return {
       cookies: {
         [VAL_ENABLE_COOKIE_NAME]: {
-          value: null
+          value: "false"
         }
       },
       status: 302,
@@ -1250,8 +1261,9 @@ class LocalValServer {
         }
       };
     }
-    const id = randomUUID();
-    console.time("patching:" + id);
+
+    // const id = randomUUID();
+    // console.time("patching:" + id);
     for (const moduleId in patchJSON.data) {
       // Then parse/validate
       // TODO: validate all and then fail instead:
@@ -1262,7 +1274,8 @@ class LocalValServer {
       }
       await this.options.service.patch(moduleId, patch.value);
     }
-    console.timeEnd("patching:" + id);
+    // console.timeEnd("patching:" + id);
+
     return {
       status: 200,
       json: {} // no patch ids created
@@ -2222,6 +2235,7 @@ class ValFSHost {
 }
 
 // TODO: find a better name? transformFixesToPatch?
+const textEncoder = new TextEncoder();
 async function createFixPatch(config, apply, sourcePath, validationError) {
   async function getImageMetadata() {
     const maybeRef = validationError.value && typeof validationError.value === "object" && FILE_REF_PROP in validationError.value && typeof validationError.value[FILE_REF_PROP] === "string" ? validationError.value[FILE_REF_PROP] : undefined;
@@ -2229,13 +2243,28 @@ async function createFixPatch(config, apply, sourcePath, validationError) {
       // TODO:
       throw Error("Cannot fix image without a file reference");
     }
-    const localFile = path__default.join(config.projectRoot, maybeRef);
-    const buffer = fs.readFileSync(localFile);
-    const sha256 = await Internal.getSHA256Hash(buffer);
+    const filename = path__default.join(config.projectRoot, maybeRef);
+    const buffer = fs.readFileSync(filename);
     const imageSize = sizeOf(buffer);
+    const mimeType = imageSize.type ? imageTypeToMimeType(imageSize.type) : filenameToMimeType(filename);
+    if (!mimeType) {
+      throw Error("Cannot determine mimetype of image");
+    }
+    const {
+      width,
+      height
+    } = imageSize;
+    if (!width || !height) {
+      throw Error("Cannot determine image size");
+    }
+    const sha256 = Internal.getSHA256Hash(textEncoder.encode(
+    // TODO: we should probably store the mimetype in the metadata and reuse it here
+    `data:${mimeType};base64,${buffer.toString("base64")}`));
     return {
-      ...imageSize,
-      sha256
+      width,
+      height,
+      sha256,
+      mimeType
     };
   }
   const remainingErrors = [];
@@ -2270,7 +2299,8 @@ async function createFixPatch(config, apply, sourcePath, validationError) {
               value: {
                 width: imageMetadata.width,
                 height: imageMetadata.height,
-                sha256: imageMetadata.sha256
+                sha256: imageMetadata.sha256,
+                mimeType: imageMetadata.mimeType
               }
             });
           } else {

package/package.json

@@ -12,7 +12,7 @@
     "./package.json": "./package.json"
   },
   "types": "dist/valbuild-server.cjs.d.ts",
-  "version": "0.43.1",
+  "version": "0.45.0",
   "scripts": {
     "typecheck": "tsc --noEmit",
     "test": "jest",
@@ -24,9 +24,9 @@
     "concurrently": "^7.6.0"
   },
   "dependencies": {
-    "@valbuild/core": "~0.43.1",
-    "@valbuild/shared": "~0.43.1",
-    "@valbuild/ui": "~0.43.1",
+    "@valbuild/core": "~0.45.0",
+    "@valbuild/shared": "~0.45.0",
+    "@valbuild/ui": "~0.45.0",
     "express": "^4.18.2",
     "image-size": "^1.0.2",
     "queue": "^6.0.2",