@valbuild/server 0.40.0 → 0.42.0

package/README.md

@@ -0,0 +1,11 @@
+# Environment variables
+
+- VAL_API_KEY (Proxy)
+- VAL_SECRET (Proxy)
+- VAL_GIT_COMMIT
+- VAL_GIT_BRANCH
+- VAL_BUILD_URL
+- VAL_ORG_NAME (Proxy)
+- VAL_PROJECT_NAME (Proxy)
+
+![val auth flow](val_auth.png "Val Auth flow")

package/dist/declarations/src/Service.d.ts

@@ -11,7 +11,7 @@ export type ServiceOptions = {
      *
      * @example "./val.config"
      */
-    valConfigPath: string;
+    valConfigPath?: string;
     /**
      * Disable cache for transpilation
      *

package/dist/declarations/src/ValModuleLoader.d.ts

@@ -10,7 +10,8 @@ export declare class ValModuleLoader {
     private readonly disableCache;
     private cache;
     private cacheSize;
-    constructor(projectRoot: string, compilerOptions: ts.CompilerOptions, sourceFileHandler: ValSourceFileHandler, host?: IValFSHost, disableCache?: boolean);
+    constructor(projectRoot: string, compilerOptions: ts.CompilerOptions, // TODO: remove this?
+    sourceFileHandler: ValSourceFileHandler, host?: IValFSHost, disableCache?: boolean);
     getModule(modulePath: string): string;
     resolveModulePath(containingFilePath: string, requestedModuleName: string): string;
     private findMatchingJsFile;

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

@@ -676,6 +676,24 @@ const patchSourceFile = (sourceFile, patch$1) => {
 
 const readValFile = async (id, valConfigPath, runtime) => {
   const context = runtime.newContext();
+
+  // avoid failures when console.log is called
+  const logHandle = context.newFunction("log", () => {
+    // do nothing
+  });
+  const consoleHandle = context.newObject();
+  context.setProp(consoleHandle, "log", logHandle);
+  context.setProp(context.global, "console", consoleHandle);
+  consoleHandle.dispose();
+  logHandle.dispose();
+
+  // avoid failures when process.env is called
+  const envHandle = context.newObject();
+  const processHandle = context.newObject();
+  context.setProp(processHandle, "env", envHandle);
+  context.setProp(context.global, "process", processHandle);
+  envHandle.dispose();
+  processHandle.dispose();
   try {
     const modulePath = `.${id}.val`;
     const code = `import * as valModule from ${JSON.stringify(modulePath)};
@@ -716,6 +734,9 @@ globalThis.valModule = {
         if (valModule.id !== id) {
           fatalErrors.push(`Wrong val.content id! In the file of with: '${id}', found: '${valModule.id}'`);
         }
+        if (encodeURIComponent(valModule.id).replace(/%2F/g, "/") !== valModule.id) {
+          fatalErrors.push(`Invalid val.content id! Must be a web-safe path without escape characters, found: '${valModule.id}', which was encoded as: '${encodeURIComponent(valModule.id).replace("%2F", "/")}'`);
+        }
         if (!(valModule !== null && valModule !== void 0 && valModule.schema)) {
           fatalErrors.push(`Expected val id: '${id}' to have a schema`);
         }
@@ -823,7 +844,9 @@ const MAX_OBJECT_KEY_SIZE = 2 ** 27; // https://stackoverflow.com/questions/1336
 class ValModuleLoader {
   constructor(projectRoot,
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  compilerOptions, sourceFileHandler, host = {
+  compilerOptions,
+  // TODO: remove this?
+  sourceFileHandler, host = {
     ...ts__default["default"].sys,
     writeFile: fs__default["default"].writeFileSync
   }, disableCache = false) {
@@ -925,9 +948,9 @@ class ValModuleLoader {
 }
 
 async function newValQuickJSRuntime(quickJSModule, moduleLoader, {
-  maxStackSize = 1024 * 640,
-  // TODO: these were randomly chosen, we should figure out what the right values are:
-  memoryLimit = 1024 * 640
+  maxStackSize = 1024 * 20,
+  // maximum stack size that works: 1024 * 640 * 8
+  memoryLimit = 1024 * 640 // 640 mbs
 } = {}) {
   const runtime = quickJSModule.newRuntime();
   runtime.setMaxStackSize(maxStackSize);
@@ -948,7 +971,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 */ };"
+          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`) }; "
         };
       }
       if (modulePath.startsWith("next/navigation")) {
@@ -1047,7 +1070,7 @@ async function createService(projectRoot, opts, host = {
   const compilerOptions = getCompilerOptions(projectRoot, host);
   const sourceFileHandler = new ValSourceFileHandler(projectRoot, compilerOptions, host);
   const module = await quickjsEmscripten.newQuickJSWASMModule();
-  const runtime = await newValQuickJSRuntime(module, loader || new ValModuleLoader(projectRoot, compilerOptions, sourceFileHandler, host));
+  const runtime = await newValQuickJSRuntime(module, loader || new ValModuleLoader(projectRoot, compilerOptions, sourceFileHandler, host, opts.disableCache === undefined ? process.env.NODE_ENV === "development" ? false : true : opts.disableCache));
   return new Service(opts, sourceFileHandler, runtime);
 }
 class Service {
@@ -1056,7 +1079,7 @@ class Service {
   }, sourceFileHandler, runtime) {
     this.sourceFileHandler = sourceFileHandler;
     this.runtime = runtime;
-    this.valConfigPath = valConfigPath;
+    this.valConfigPath = valConfigPath || "./val.config";
   }
   async get(moduleId, modulePath) {
     const valModule = await readValFile(moduleId, this.valConfigPath, this.runtime);

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

@@ -676,6 +676,24 @@ const patchSourceFile = (sourceFile, patch$1) => {
 
 const readValFile = async (id, valConfigPath, runtime) => {
   const context = runtime.newContext();
+
+  // avoid failures when console.log is called
+  const logHandle = context.newFunction("log", () => {
+    // do nothing
+  });
+  const consoleHandle = context.newObject();
+  context.setProp(consoleHandle, "log", logHandle);
+  context.setProp(context.global, "console", consoleHandle);
+  consoleHandle.dispose();
+  logHandle.dispose();
+
+  // avoid failures when process.env is called
+  const envHandle = context.newObject();
+  const processHandle = context.newObject();
+  context.setProp(processHandle, "env", envHandle);
+  context.setProp(context.global, "process", processHandle);
+  envHandle.dispose();
+  processHandle.dispose();
   try {
     const modulePath = `.${id}.val`;
     const code = `import * as valModule from ${JSON.stringify(modulePath)};
@@ -716,6 +734,9 @@ globalThis.valModule = {
         if (valModule.id !== id) {
           fatalErrors.push(`Wrong val.content id! In the file of with: '${id}', found: '${valModule.id}'`);
         }
+        if (encodeURIComponent(valModule.id).replace(/%2F/g, "/") !== valModule.id) {
+          fatalErrors.push(`Invalid val.content id! Must be a web-safe path without escape characters, found: '${valModule.id}', which was encoded as: '${encodeURIComponent(valModule.id).replace("%2F", "/")}'`);
+        }
         if (!(valModule !== null && valModule !== void 0 && valModule.schema)) {
           fatalErrors.push(`Expected val id: '${id}' to have a schema`);
         }
@@ -823,7 +844,9 @@ const MAX_OBJECT_KEY_SIZE = 2 ** 27; // https://stackoverflow.com/questions/1336
 class ValModuleLoader {
   constructor(projectRoot,
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  compilerOptions, sourceFileHandler, host = {
+  compilerOptions,
+  // TODO: remove this?
+  sourceFileHandler, host = {
     ...ts__default["default"].sys,
     writeFile: fs__default["default"].writeFileSync
   }, disableCache = false) {
@@ -925,9 +948,9 @@ class ValModuleLoader {
 }
 
 async function newValQuickJSRuntime(quickJSModule, moduleLoader, {
-  maxStackSize = 1024 * 640,
-  // TODO: these were randomly chosen, we should figure out what the right values are:
-  memoryLimit = 1024 * 640
+  maxStackSize = 1024 * 20,
+  // maximum stack size that works: 1024 * 640 * 8
+  memoryLimit = 1024 * 640 // 640 mbs
 } = {}) {
   const runtime = quickJSModule.newRuntime();
   runtime.setMaxStackSize(maxStackSize);
@@ -948,7 +971,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 */ };"
+          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`) }; "
         };
       }
       if (modulePath.startsWith("next/navigation")) {
@@ -1047,7 +1070,7 @@ async function createService(projectRoot, opts, host = {
   const compilerOptions = getCompilerOptions(projectRoot, host);
   const sourceFileHandler = new ValSourceFileHandler(projectRoot, compilerOptions, host);
   const module = await quickjsEmscripten.newQuickJSWASMModule();
-  const runtime = await newValQuickJSRuntime(module, loader || new ValModuleLoader(projectRoot, compilerOptions, sourceFileHandler, host));
+  const runtime = await newValQuickJSRuntime(module, loader || new ValModuleLoader(projectRoot, compilerOptions, sourceFileHandler, host, opts.disableCache === undefined ? true : opts.disableCache));
   return new Service(opts, sourceFileHandler, runtime);
 }
 class Service {
@@ -1056,7 +1079,7 @@ class Service {
   }, sourceFileHandler, runtime) {
     this.sourceFileHandler = sourceFileHandler;
     this.runtime = runtime;
-    this.valConfigPath = valConfigPath;
+    this.valConfigPath = valConfigPath || "./val.config";
   }
   async get(moduleId, modulePath) {
     const valModule = await readValFile(moduleId, this.valConfigPath, this.runtime);

package/dist/valbuild-server.esm.js

@@ -646,6 +646,24 @@ const patchSourceFile = (sourceFile, patch) => {
 
 const readValFile = async (id, valConfigPath, runtime) => {
   const context = runtime.newContext();
+
+  // avoid failures when console.log is called
+  const logHandle = context.newFunction("log", () => {
+    // do nothing
+  });
+  const consoleHandle = context.newObject();
+  context.setProp(consoleHandle, "log", logHandle);
+  context.setProp(context.global, "console", consoleHandle);
+  consoleHandle.dispose();
+  logHandle.dispose();
+
+  // avoid failures when process.env is called
+  const envHandle = context.newObject();
+  const processHandle = context.newObject();
+  context.setProp(processHandle, "env", envHandle);
+  context.setProp(context.global, "process", processHandle);
+  envHandle.dispose();
+  processHandle.dispose();
   try {
     const modulePath = `.${id}.val`;
     const code = `import * as valModule from ${JSON.stringify(modulePath)};
@@ -686,6 +704,9 @@ globalThis.valModule = {
         if (valModule.id !== id) {
           fatalErrors.push(`Wrong val.content id! In the file of with: '${id}', found: '${valModule.id}'`);
         }
+        if (encodeURIComponent(valModule.id).replace(/%2F/g, "/") !== valModule.id) {
+          fatalErrors.push(`Invalid val.content id! Must be a web-safe path without escape characters, found: '${valModule.id}', which was encoded as: '${encodeURIComponent(valModule.id).replace("%2F", "/")}'`);
+        }
         if (!(valModule !== null && valModule !== void 0 && valModule.schema)) {
           fatalErrors.push(`Expected val id: '${id}' to have a schema`);
         }
@@ -793,7 +814,9 @@ const MAX_OBJECT_KEY_SIZE = 2 ** 27; // https://stackoverflow.com/questions/1336
 class ValModuleLoader {
   constructor(projectRoot,
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  compilerOptions, sourceFileHandler, host = {
+  compilerOptions,
+  // TODO: remove this?
+  sourceFileHandler, host = {
     ...ts.sys,
     writeFile: fs.writeFileSync
   }, disableCache = false) {
@@ -895,9 +918,9 @@ class ValModuleLoader {
 }
 
 async function newValQuickJSRuntime(quickJSModule, moduleLoader, {
-  maxStackSize = 1024 * 640,
-  // TODO: these were randomly chosen, we should figure out what the right values are:
-  memoryLimit = 1024 * 640
+  maxStackSize = 1024 * 20,
+  // maximum stack size that works: 1024 * 640 * 8
+  memoryLimit = 1024 * 640 // 640 mbs
 } = {}) {
   const runtime = quickJSModule.newRuntime();
   runtime.setMaxStackSize(maxStackSize);
@@ -918,7 +941,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 */ };"
+          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`) }; "
         };
       }
       if (modulePath.startsWith("next/navigation")) {
@@ -1017,7 +1040,7 @@ async function createService(projectRoot, opts, host = {
   const compilerOptions = getCompilerOptions(projectRoot, host);
   const sourceFileHandler = new ValSourceFileHandler(projectRoot, compilerOptions, host);
   const module = await newQuickJSWASMModule();
-  const runtime = await newValQuickJSRuntime(module, loader || new ValModuleLoader(projectRoot, compilerOptions, sourceFileHandler, host));
+  const runtime = await newValQuickJSRuntime(module, loader || new ValModuleLoader(projectRoot, compilerOptions, sourceFileHandler, host, opts.disableCache === undefined ? process.env.NODE_ENV === "development" ? false : true : opts.disableCache));
   return new Service(opts, sourceFileHandler, runtime);
 }
 class Service {
@@ -1026,7 +1049,7 @@ class Service {
   }, sourceFileHandler, runtime) {
     this.sourceFileHandler = sourceFileHandler;
     this.runtime = runtime;
-    this.valConfigPath = valConfigPath;
+    this.valConfigPath = valConfigPath || "./val.config";
   }
   async get(moduleId, modulePath) {
     const valModule = await readValFile(moduleId, this.valConfigPath, this.runtime);

package/package.json

@@ -12,7 +12,7 @@
     "./package.json": "./package.json"
   },
   "types": "dist/valbuild-server.cjs.d.ts",
-  "version": "0.40.0",
+  "version": "0.42.0",
   "scripts": {
     "typecheck": "tsc --noEmit",
     "test": "jest",
@@ -24,9 +24,9 @@
     "concurrently": "^7.6.0"
   },
   "dependencies": {
-    "@valbuild/core": "~0.40.0",
-    "@valbuild/shared": "~0.40.0",
-    "@valbuild/ui": "~0.40.0",
+    "@valbuild/core": "~0.42.0",
+    "@valbuild/shared": "~0.42.0",
+    "@valbuild/ui": "~0.42.0",
     "express": "^4.18.2",
     "image-size": "^1.0.2",
     "queue": "^6.0.2",
@@ -37,7 +37,7 @@
     "zod": "^3.20.6"
   },
   "engines": {
-    "node": ">=18.17.14"
+    "node": ">=18.17.0"
   },
   "files": [
     "dist"