@valbuild/server 0.49.0 → 0.51.0

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

@@ -320,7 +320,6 @@ const printer = ts__default["default"].createPrinter({
   newLine: newLine
   // neverAsciiEscape: true,
 });
-
 function replaceNodeValue(document, node, value) {
   const replacementText = printer.printNode(ts__default["default"].EmitHint.Unspecified, toExpression(value), document);
   const span = ts__default["default"].createTextSpanFromBounds(node.getStart(document, false), node.end);
@@ -663,7 +662,6 @@ const patchValFile = async (id, valConfigPath, patch$1, sourceFileHandler, runti
   sourceFileHandler.writeSourceFile(newSourceFile.value);
   // console.timeEnd("patchValFile" + timeId);
 };
-
 function convertDataUrlToBase64(dataUrl) {
   const base64 = dataUrl.slice(dataUrl.indexOf(",") + 1);
   return Buffer.from(base64, "base64");
@@ -888,7 +886,6 @@ class ValModuleLoader {
         }
       }
     }
-
     return compiledCode;
   }
   resolveModulePath(containingFilePath, requestedModuleName) {
@@ -1004,6 +1001,11 @@ async function newValQuickJSRuntime(quickJSModule, moduleLoader, {
           value: "export const ValImage = new Proxy({}, { get() { return () => { throw new Error(`Cannot import 'ValImage' in this file`) } } } )"
         };
       }
+      if (modulePath.includes("/ValApp")) {
+        return {
+          value: "export const ValApp = new Proxy({}, { get() { return () => { throw new Error(`Cannot import 'ValApp' in this file`) } } } )"
+        };
+      }
       return {
         value: moduleLoader.getModule(modulePath)
       };
@@ -1059,6 +1061,11 @@ async function newValQuickJSRuntime(quickJSModule, moduleLoader, {
           value: requestedName
         };
       }
+      if (requestedName.includes("/ValApp")) {
+        return {
+          value: requestedName
+        };
+      }
       const modulePath = moduleLoader.resolveModulePath(baseModuleName, requestedName);
       return {
         value: modulePath
@@ -1218,7 +1225,7 @@ class LocalValServer {
           if (treePath && !path__namespace["default"].join(dir, file).replace(rootDir, "").startsWith(treePath)) {
             continue;
           }
-          moduleIds.push(path__namespace["default"].join(dir, file).replace(rootDir, "").replace(".val.js", "").replace(".val.ts", ""));
+          moduleIds.push(path__namespace["default"].join(dir, file).replace(rootDir, "").replace(".val.js", "").replace(".val.ts", "").split(path__namespace["default"].sep).join("/"));
         }
       }
     };
@@ -1308,7 +1315,6 @@ class LocalValServer {
       json: {} // no patch ids created
     };
   }
-
   badRequest() {
     return {
       status: 400,
@@ -1382,7 +1388,6 @@ function decodeJwt(token, secretKey) {
 function getExpire() {
   return Math.floor(Date.now() / 1000) + 60 * 60 * 24 * 4; // 4 days
 }
-
 const JwtHeaderSchema = z.z.object({
   alg: z.z.literal("HS256"),
   typ: z.z.literal("JWT")
@@ -1468,7 +1473,6 @@ class ProxyValServer {
           }
         }
       },
-
       status: 302,
       redirectTo: appAuthorizeUrl
     };
@@ -1554,7 +1558,6 @@ class ProxyValServer {
           }
         }
       },
-
       redirectTo: callbackReqSuccess.redirect_uri || "/"
     };
   }
@@ -2156,7 +2159,7 @@ function createValApiRouter(route, valServerPromise, convert) {
     }
     const path = url.pathname.slice(route.length);
     if (path.startsWith("/static")) {
-      return convert(await uiRequestHandler(path.slice("/static".length)));
+      return convert(await uiRequestHandler(path.slice("/static".length), url.href));
     } else if (path === "/session") {
       return convert(await valServer.session(getCookies(req, [VAL_SESSION_COOKIE])));
     } else if (path === "/authorize") {

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

@@ -320,7 +320,6 @@ const printer = ts__default["default"].createPrinter({
   newLine: newLine
   // neverAsciiEscape: true,
 });
-
 function replaceNodeValue(document, node, value) {
   const replacementText = printer.printNode(ts__default["default"].EmitHint.Unspecified, toExpression(value), document);
   const span = ts__default["default"].createTextSpanFromBounds(node.getStart(document, false), node.end);
@@ -663,7 +662,6 @@ const patchValFile = async (id, valConfigPath, patch$1, sourceFileHandler, runti
   sourceFileHandler.writeSourceFile(newSourceFile.value);
   // console.timeEnd("patchValFile" + timeId);
 };
-
 function convertDataUrlToBase64(dataUrl) {
   const base64 = dataUrl.slice(dataUrl.indexOf(",") + 1);
   return Buffer.from(base64, "base64");
@@ -888,7 +886,6 @@ class ValModuleLoader {
         }
       }
     }
-
     return compiledCode;
   }
   resolveModulePath(containingFilePath, requestedModuleName) {
@@ -1004,6 +1001,11 @@ async function newValQuickJSRuntime(quickJSModule, moduleLoader, {
           value: "export const ValImage = new Proxy({}, { get() { return () => { throw new Error(`Cannot import 'ValImage' in this file`) } } } )"
         };
       }
+      if (modulePath.includes("/ValApp")) {
+        return {
+          value: "export const ValApp = new Proxy({}, { get() { return () => { throw new Error(`Cannot import 'ValApp' in this file`) } } } )"
+        };
+      }
       return {
         value: moduleLoader.getModule(modulePath)
       };
@@ -1059,6 +1061,11 @@ async function newValQuickJSRuntime(quickJSModule, moduleLoader, {
           value: requestedName
         };
       }
+      if (requestedName.includes("/ValApp")) {
+        return {
+          value: requestedName
+        };
+      }
       const modulePath = moduleLoader.resolveModulePath(baseModuleName, requestedName);
       return {
         value: modulePath
@@ -1218,7 +1225,7 @@ class LocalValServer {
           if (treePath && !path__namespace["default"].join(dir, file).replace(rootDir, "").startsWith(treePath)) {
             continue;
           }
-          moduleIds.push(path__namespace["default"].join(dir, file).replace(rootDir, "").replace(".val.js", "").replace(".val.ts", ""));
+          moduleIds.push(path__namespace["default"].join(dir, file).replace(rootDir, "").replace(".val.js", "").replace(".val.ts", "").split(path__namespace["default"].sep).join("/"));
         }
       }
     };
@@ -1308,7 +1315,6 @@ class LocalValServer {
       json: {} // no patch ids created
     };
   }
-
   badRequest() {
     return {
       status: 400,
@@ -1382,7 +1388,6 @@ function decodeJwt(token, secretKey) {
 function getExpire() {
   return Math.floor(Date.now() / 1000) + 60 * 60 * 24 * 4; // 4 days
 }
-
 const JwtHeaderSchema = z.z.object({
   alg: z.z.literal("HS256"),
   typ: z.z.literal("JWT")
@@ -1468,7 +1473,6 @@ class ProxyValServer {
           }
         }
       },
-
       status: 302,
       redirectTo: appAuthorizeUrl
     };
@@ -1554,7 +1558,6 @@ class ProxyValServer {
           }
         }
       },
-
       redirectTo: callbackReqSuccess.redirect_uri || "/"
     };
   }
@@ -2156,7 +2159,7 @@ function createValApiRouter(route, valServerPromise, convert) {
     }
     const path = url.pathname.slice(route.length);
     if (path.startsWith("/static")) {
-      return convert(await uiRequestHandler(path.slice("/static".length)));
+      return convert(await uiRequestHandler(path.slice("/static".length), url.href));
     } else if (path === "/session") {
       return convert(await valServer.session(getCookies(req, [VAL_SESSION_COOKIE])));
     } else if (path === "/authorize") {

package/dist/valbuild-server.esm.js

@@ -290,7 +290,6 @@ const printer = ts.createPrinter({
   newLine: newLine
   // neverAsciiEscape: true,
 });
-
 function replaceNodeValue(document, node, value) {
   const replacementText = printer.printNode(ts.EmitHint.Unspecified, toExpression(value), document);
   const span = ts.createTextSpanFromBounds(node.getStart(document, false), node.end);
@@ -633,7 +632,6 @@ const patchValFile = async (id, valConfigPath, patch, sourceFileHandler, runtime
   sourceFileHandler.writeSourceFile(newSourceFile.value);
   // console.timeEnd("patchValFile" + timeId);
 };
-
 function convertDataUrlToBase64(dataUrl) {
   const base64 = dataUrl.slice(dataUrl.indexOf(",") + 1);
   return Buffer.from(base64, "base64");
@@ -858,7 +856,6 @@ class ValModuleLoader {
         }
       }
     }
-
     return compiledCode;
   }
   resolveModulePath(containingFilePath, requestedModuleName) {
@@ -974,6 +971,11 @@ async function newValQuickJSRuntime(quickJSModule, moduleLoader, {
           value: "export const ValImage = new Proxy({}, { get() { return () => { throw new Error(`Cannot import 'ValImage' in this file`) } } } )"
         };
       }
+      if (modulePath.includes("/ValApp")) {
+        return {
+          value: "export const ValApp = new Proxy({}, { get() { return () => { throw new Error(`Cannot import 'ValApp' in this file`) } } } )"
+        };
+      }
       return {
         value: moduleLoader.getModule(modulePath)
       };
@@ -1029,6 +1031,11 @@ async function newValQuickJSRuntime(quickJSModule, moduleLoader, {
           value: requestedName
         };
       }
+      if (requestedName.includes("/ValApp")) {
+        return {
+          value: requestedName
+        };
+      }
       const modulePath = moduleLoader.resolveModulePath(baseModuleName, requestedName);
       return {
         value: modulePath
@@ -1188,7 +1195,7 @@ class LocalValServer {
           if (treePath && !path__default.join(dir, file).replace(rootDir, "").startsWith(treePath)) {
             continue;
           }
-          moduleIds.push(path__default.join(dir, file).replace(rootDir, "").replace(".val.js", "").replace(".val.ts", ""));
+          moduleIds.push(path__default.join(dir, file).replace(rootDir, "").replace(".val.js", "").replace(".val.ts", "").split(path__default.sep).join("/"));
         }
       }
     };
@@ -1278,7 +1285,6 @@ class LocalValServer {
       json: {} // no patch ids created
     };
   }
-
   badRequest() {
     return {
       status: 400,
@@ -1352,7 +1358,6 @@ function decodeJwt(token, secretKey) {
 function getExpire() {
   return Math.floor(Date.now() / 1000) + 60 * 60 * 24 * 4; // 4 days
 }
-
 const JwtHeaderSchema = z$1.object({
   alg: z$1.literal("HS256"),
   typ: z$1.literal("JWT")
@@ -1438,7 +1443,6 @@ class ProxyValServer {
           }
         }
       },
-
       status: 302,
       redirectTo: appAuthorizeUrl
     };
@@ -1524,7 +1528,6 @@ class ProxyValServer {
           }
         }
       },
-
       redirectTo: callbackReqSuccess.redirect_uri || "/"
     };
   }
@@ -2126,7 +2129,7 @@ function createValApiRouter(route, valServerPromise, convert) {
     }
     const path = url.pathname.slice(route.length);
     if (path.startsWith("/static")) {
-      return convert(await uiRequestHandler(path.slice("/static".length)));
+      return convert(await uiRequestHandler(path.slice("/static".length), url.href));
     } else if (path === "/session") {
       return convert(await valServer.session(getCookies(req, [VAL_SESSION_COOKIE])));
     } else if (path === "/authorize") {

package/package.json

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