@valbuild/server 0.41.0 → 0.43.0

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/declarations/src/ValServer.d.ts

@@ -40,7 +40,7 @@ export interface ValServer {
         id?: string[];
     }, cookies: ValCookies<VAL_SESSION_COOKIE>): Promise<ValServerJsonResult<ApiGetPatchResponse>>;
     postPatches(body: unknown, cookies: ValCookies<VAL_SESSION_COOKIE>): Promise<ValServerJsonResult<ApiPostPatchResponse>>;
-    postCommit(cookies: ValCookies<VAL_SESSION_COOKIE>): Promise<ValServerJsonResult<{}>>;
+    postCommit(body: unknown, cookies: ValCookies<VAL_SESSION_COOKIE>): Promise<ValServerJsonResult<{}>>;
     getFiles(treePath: string, query: {
         sha256?: string;
     }, cookies: ValCookies<VAL_SESSION_COOKIE>): Promise<ValServerResult<never, ReadableStream<Uint8Array>>>;

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

@@ -698,6 +698,7 @@ const readValFile = async (id, valConfigPath, runtime) => {
     const modulePath = `.${id}.val`;
     const code = `import * as valModule from ${JSON.stringify(modulePath)};
 import { Internal } from "@valbuild/core";
+
 globalThis.valModule = { 
   id: valModule?.default && Internal.getValPath(valModule?.default),
   schema: valModule?.default && Internal.getSchema(valModule?.default)?.serialize(),
@@ -705,7 +706,8 @@ globalThis.valModule = {
   validation: valModule?.default && Internal.getSchema(valModule?.default)?.validate(
     valModule?.default && Internal.getValPath(valModule?.default) || "/",
     valModule?.default && Internal.getSource(valModule?.default)
-  )
+  ),
+  defaultExport: !!valModule?.default,
 };
 `;
     const result = context.evalCode(code,
@@ -728,8 +730,11 @@ globalThis.valModule = {
     } else {
       result.value.dispose();
       const valModule = context.getProp(context.global, "valModule").consume(context.dump);
+      console.log(valModule);
       if (!valModule) {
         fatalErrors.push(`Could not find any modules at: ${id}`);
+      } else if (valModule.defaultExport === false) {
+        fatalErrors.push(`Could not find a default export in: ${id}. Check if file has a export default val.content(...)`);
       } else {
         if (valModule.id !== id) {
           fatalErrors.push(`Wrong val.content id! In the file of with: '${id}', found: '${valModule.id}'`);
@@ -844,7 +849,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) {
@@ -946,9 +953,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);
@@ -1068,7 +1075,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 {
@@ -1389,7 +1396,7 @@ class ProxyValServer {
   }
   async getFiles(treePath, query, cookies) {
     return this.withAuth(cookies, "getFiles", async data => {
-      const url = new URL(`/v1/files/${this.options.valName}/~${treePath}`, this.options.valContentUrl);
+      const url = new URL(`/v1/files/${this.options.valName}${treePath}`, this.options.valContentUrl);
       if (typeof query.sha256 === "string") {
         url.searchParams.append("sha256", query.sha256);
       } else {
@@ -1682,12 +1689,21 @@ class ProxyValServer {
     });
   }
   async getPatches(query, cookies) {
-    const patchIds = query.id || [];
-    const params = patchIds.length > 0 ? `?${patchIds.map(id => `id=${encodeURIComponent(id)}`).join("&")}` : "";
     return this.withAuth(cookies, "getPatches", async ({
       token
     }) => {
-      const url = new URL(`/v1/patches/${this.options.valName}/heads/${this.options.gitBranch}/~${params}`, this.options.valContentUrl);
+      const commit = this.options.gitCommit;
+      if (!commit) {
+        return {
+          status: 400,
+          body: {
+            message: "Could not detect the git commit. Check if env is missing VAL_GIT_COMMIT."
+          }
+        };
+      }
+      const patchIds = query.id || [];
+      const params = patchIds.length > 0 ? `commit=${encodeURIComponent(commit)}&${patchIds.map(id => `id=${encodeURIComponent(id)}`).join("&")}` : `commit=${encodeURIComponent(commit)}`;
+      const url = new URL(`/v1/patches/${this.options.valName}/heads/${this.options.gitBranch}/~?${params}`, this.options.valContentUrl);
       // Proxy patch to val.build
       const fetchRes = await fetch(url, {
         method: "GET",
@@ -1762,14 +1778,28 @@ class ProxyValServer {
       }
     });
   }
-  async postCommit(cookies) {
+  async postCommit(rawBody, cookies) {
+    const commit = this.options.gitCommit;
+    if (!commit) {
+      return {
+        status: 401,
+        json: {
+          message: "Could not detect the git commit. Check if env is missing VAL_GIT_COMMIT."
+        }
+      };
+    }
+    const params = new URLSearchParams({
+      commit
+    });
     return this.withAuth(cookies, "postCommit", async ({
       token
     }) => {
-      const url = new URL(`/api/val/commit/${encodeURIComponent(this.options.gitBranch)}`, this.options.valBuildUrl);
+      const url = new URL(`/v1/commit/${this.options.valName}/heads/${this.options.gitBranch}/~?${params}`, this.options.valContentUrl);
+      const body = JSON.stringify(rawBody);
       const fetchRes = await fetch(url, {
         method: "POST",
-        headers: this.getAuthHeaders(token)
+        headers: this.getAuthHeaders(token, "application/json"),
+        body
       });
       if (fetchRes.status === 200) {
         return {
@@ -2138,7 +2168,8 @@ function createValApiRouter(route, valServerPromise, convert) {
         redirect_to: url.searchParams.get("redirect_to") || undefined
       }));
     } else if (method === "POST" && path === "/commit") {
-      return convert(await valServer.postCommit(getCookies(req, [VAL_SESSION_COOKIE])));
+      const body = await req.json();
+      return convert(await valServer.postCommit(body, getCookies(req, [VAL_SESSION_COOKIE])));
     } else if (method === "GET" && path.startsWith(TREE_PATH_PREFIX)) {
       return withTreePath(path, TREE_PATH_PREFIX)(async treePath => convert(await valServer.getTree(treePath, {
         patch: url.searchParams.get("patch") || undefined,

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

@@ -698,6 +698,7 @@ const readValFile = async (id, valConfigPath, runtime) => {
     const modulePath = `.${id}.val`;
     const code = `import * as valModule from ${JSON.stringify(modulePath)};
 import { Internal } from "@valbuild/core";
+
 globalThis.valModule = { 
   id: valModule?.default && Internal.getValPath(valModule?.default),
   schema: valModule?.default && Internal.getSchema(valModule?.default)?.serialize(),
@@ -705,7 +706,8 @@ globalThis.valModule = {
   validation: valModule?.default && Internal.getSchema(valModule?.default)?.validate(
     valModule?.default && Internal.getValPath(valModule?.default) || "/",
     valModule?.default && Internal.getSource(valModule?.default)
-  )
+  ),
+  defaultExport: !!valModule?.default,
 };
 `;
     const result = context.evalCode(code,
@@ -728,8 +730,11 @@ globalThis.valModule = {
     } else {
       result.value.dispose();
       const valModule = context.getProp(context.global, "valModule").consume(context.dump);
+      console.log(valModule);
       if (!valModule) {
         fatalErrors.push(`Could not find any modules at: ${id}`);
+      } else if (valModule.defaultExport === false) {
+        fatalErrors.push(`Could not find a default export in: ${id}. Check if file has a export default val.content(...)`);
       } else {
         if (valModule.id !== id) {
           fatalErrors.push(`Wrong val.content id! In the file of with: '${id}', found: '${valModule.id}'`);
@@ -844,7 +849,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) {
@@ -946,9 +953,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);
@@ -1068,7 +1075,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 {
@@ -1389,7 +1396,7 @@ class ProxyValServer {
   }
   async getFiles(treePath, query, cookies) {
     return this.withAuth(cookies, "getFiles", async data => {
-      const url = new URL(`/v1/files/${this.options.valName}/~${treePath}`, this.options.valContentUrl);
+      const url = new URL(`/v1/files/${this.options.valName}${treePath}`, this.options.valContentUrl);
       if (typeof query.sha256 === "string") {
         url.searchParams.append("sha256", query.sha256);
       } else {
@@ -1682,12 +1689,21 @@ class ProxyValServer {
     });
   }
   async getPatches(query, cookies) {
-    const patchIds = query.id || [];
-    const params = patchIds.length > 0 ? `?${patchIds.map(id => `id=${encodeURIComponent(id)}`).join("&")}` : "";
     return this.withAuth(cookies, "getPatches", async ({
       token
     }) => {
-      const url = new URL(`/v1/patches/${this.options.valName}/heads/${this.options.gitBranch}/~${params}`, this.options.valContentUrl);
+      const commit = this.options.gitCommit;
+      if (!commit) {
+        return {
+          status: 400,
+          body: {
+            message: "Could not detect the git commit. Check if env is missing VAL_GIT_COMMIT."
+          }
+        };
+      }
+      const patchIds = query.id || [];
+      const params = patchIds.length > 0 ? `commit=${encodeURIComponent(commit)}&${patchIds.map(id => `id=${encodeURIComponent(id)}`).join("&")}` : `commit=${encodeURIComponent(commit)}`;
+      const url = new URL(`/v1/patches/${this.options.valName}/heads/${this.options.gitBranch}/~?${params}`, this.options.valContentUrl);
       // Proxy patch to val.build
       const fetchRes = await fetch(url, {
         method: "GET",
@@ -1762,14 +1778,28 @@ class ProxyValServer {
       }
     });
   }
-  async postCommit(cookies) {
+  async postCommit(rawBody, cookies) {
+    const commit = this.options.gitCommit;
+    if (!commit) {
+      return {
+        status: 401,
+        json: {
+          message: "Could not detect the git commit. Check if env is missing VAL_GIT_COMMIT."
+        }
+      };
+    }
+    const params = new URLSearchParams({
+      commit
+    });
     return this.withAuth(cookies, "postCommit", async ({
       token
     }) => {
-      const url = new URL(`/api/val/commit/${encodeURIComponent(this.options.gitBranch)}`, this.options.valBuildUrl);
+      const url = new URL(`/v1/commit/${this.options.valName}/heads/${this.options.gitBranch}/~?${params}`, this.options.valContentUrl);
+      const body = JSON.stringify(rawBody);
       const fetchRes = await fetch(url, {
         method: "POST",
-        headers: this.getAuthHeaders(token)
+        headers: this.getAuthHeaders(token, "application/json"),
+        body
       });
       if (fetchRes.status === 200) {
         return {
@@ -2138,7 +2168,8 @@ function createValApiRouter(route, valServerPromise, convert) {
         redirect_to: url.searchParams.get("redirect_to") || undefined
       }));
     } else if (method === "POST" && path === "/commit") {
-      return convert(await valServer.postCommit(getCookies(req, [VAL_SESSION_COOKIE])));
+      const body = await req.json();
+      return convert(await valServer.postCommit(body, getCookies(req, [VAL_SESSION_COOKIE])));
     } else if (method === "GET" && path.startsWith(TREE_PATH_PREFIX)) {
       return withTreePath(path, TREE_PATH_PREFIX)(async treePath => convert(await valServer.getTree(treePath, {
         patch: url.searchParams.get("patch") || undefined,

package/dist/valbuild-server.esm.js

@@ -668,6 +668,7 @@ const readValFile = async (id, valConfigPath, runtime) => {
     const modulePath = `.${id}.val`;
     const code = `import * as valModule from ${JSON.stringify(modulePath)};
 import { Internal } from "@valbuild/core";
+
 globalThis.valModule = { 
   id: valModule?.default && Internal.getValPath(valModule?.default),
   schema: valModule?.default && Internal.getSchema(valModule?.default)?.serialize(),
@@ -675,7 +676,8 @@ globalThis.valModule = {
   validation: valModule?.default && Internal.getSchema(valModule?.default)?.validate(
     valModule?.default && Internal.getValPath(valModule?.default) || "/",
     valModule?.default && Internal.getSource(valModule?.default)
-  )
+  ),
+  defaultExport: !!valModule?.default,
 };
 `;
     const result = context.evalCode(code,
@@ -698,8 +700,11 @@ globalThis.valModule = {
     } else {
       result.value.dispose();
       const valModule = context.getProp(context.global, "valModule").consume(context.dump);
+      console.log(valModule);
       if (!valModule) {
         fatalErrors.push(`Could not find any modules at: ${id}`);
+      } else if (valModule.defaultExport === false) {
+        fatalErrors.push(`Could not find a default export in: ${id}. Check if file has a export default val.content(...)`);
       } else {
         if (valModule.id !== id) {
           fatalErrors.push(`Wrong val.content id! In the file of with: '${id}', found: '${valModule.id}'`);
@@ -814,7 +819,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) {
@@ -916,9 +923,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);
@@ -1038,7 +1045,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 {
@@ -1359,7 +1366,7 @@ class ProxyValServer {
   }
   async getFiles(treePath, query, cookies) {
     return this.withAuth(cookies, "getFiles", async data => {
-      const url = new URL(`/v1/files/${this.options.valName}/~${treePath}`, this.options.valContentUrl);
+      const url = new URL(`/v1/files/${this.options.valName}${treePath}`, this.options.valContentUrl);
       if (typeof query.sha256 === "string") {
         url.searchParams.append("sha256", query.sha256);
       } else {
@@ -1652,12 +1659,21 @@ class ProxyValServer {
     });
   }
   async getPatches(query, cookies) {
-    const patchIds = query.id || [];
-    const params = patchIds.length > 0 ? `?${patchIds.map(id => `id=${encodeURIComponent(id)}`).join("&")}` : "";
     return this.withAuth(cookies, "getPatches", async ({
       token
     }) => {
-      const url = new URL(`/v1/patches/${this.options.valName}/heads/${this.options.gitBranch}/~${params}`, this.options.valContentUrl);
+      const commit = this.options.gitCommit;
+      if (!commit) {
+        return {
+          status: 400,
+          body: {
+            message: "Could not detect the git commit. Check if env is missing VAL_GIT_COMMIT."
+          }
+        };
+      }
+      const patchIds = query.id || [];
+      const params = patchIds.length > 0 ? `commit=${encodeURIComponent(commit)}&${patchIds.map(id => `id=${encodeURIComponent(id)}`).join("&")}` : `commit=${encodeURIComponent(commit)}`;
+      const url = new URL(`/v1/patches/${this.options.valName}/heads/${this.options.gitBranch}/~?${params}`, this.options.valContentUrl);
       // Proxy patch to val.build
       const fetchRes = await fetch(url, {
         method: "GET",
@@ -1732,14 +1748,28 @@ class ProxyValServer {
       }
     });
   }
-  async postCommit(cookies) {
+  async postCommit(rawBody, cookies) {
+    const commit = this.options.gitCommit;
+    if (!commit) {
+      return {
+        status: 401,
+        json: {
+          message: "Could not detect the git commit. Check if env is missing VAL_GIT_COMMIT."
+        }
+      };
+    }
+    const params = new URLSearchParams({
+      commit
+    });
     return this.withAuth(cookies, "postCommit", async ({
       token
     }) => {
-      const url = new URL(`/api/val/commit/${encodeURIComponent(this.options.gitBranch)}`, this.options.valBuildUrl);
+      const url = new URL(`/v1/commit/${this.options.valName}/heads/${this.options.gitBranch}/~?${params}`, this.options.valContentUrl);
+      const body = JSON.stringify(rawBody);
       const fetchRes = await fetch(url, {
         method: "POST",
-        headers: this.getAuthHeaders(token)
+        headers: this.getAuthHeaders(token, "application/json"),
+        body
       });
       if (fetchRes.status === 200) {
         return {
@@ -2108,7 +2138,8 @@ function createValApiRouter(route, valServerPromise, convert) {
         redirect_to: url.searchParams.get("redirect_to") || undefined
       }));
     } else if (method === "POST" && path === "/commit") {
-      return convert(await valServer.postCommit(getCookies(req, [VAL_SESSION_COOKIE])));
+      const body = await req.json();
+      return convert(await valServer.postCommit(body, getCookies(req, [VAL_SESSION_COOKIE])));
     } else if (method === "GET" && path.startsWith(TREE_PATH_PREFIX)) {
       return withTreePath(path, TREE_PATH_PREFIX)(async treePath => convert(await valServer.getTree(treePath, {
         patch: url.searchParams.get("patch") || undefined,

package/package.json

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