@valbuild/server 0.60.24 → 0.60.27

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

@@ -4,5 +4,5 @@ import { type ValSyntaxErrorTree } from "./patch/ts/syntax.js";
 import { ValSourceFileHandler } from "./ValSourceFileHandler.js";
 import { QuickJSRuntime } from "quickjs-emscripten";
 import ts from "typescript";
-export declare const patchValFile: (id: string, valConfigPath: string, patch: Patch, sourceFileHandler: ValSourceFileHandler, runtime: QuickJSRuntime) => Promise<void>;
+export declare const patchValFile: (id: string, rootDir: string, patch: Patch, sourceFileHandler: ValSourceFileHandler, runtime: QuickJSRuntime) => Promise<void>;
 export declare const patchSourceFile: (sourceFile: ts.SourceFile | string, patch: Patch) => result.Result<ts.SourceFile, ValSyntaxErrorTree | PatchError>;

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

@@ -633,6 +633,10 @@ class TSOps {
   }
 }
 
+function getSyntheticContainingPath(rootDir) {
+  return path__namespace["default"].join(rootDir, "<val>"); // TODO: this is the synthetic path used when evaluating / patching modules. I am not sure <val> is the best choice: val.ts / js better? But that is weird too. At least now it is clear(er) that it is indeed a synthetic file (i.e. not an actual file)
+}
+
 const ops$1 = new TSOps(document => {
   return fp.pipe(analyzeValModule(document), fp.result.map(({
     source
@@ -640,10 +644,10 @@ const ops$1 = new TSOps(document => {
 });
 
 // TODO: rename to patchValFiles since we may write multiple files
-const patchValFile = async (id, valConfigPath, patch$1, sourceFileHandler, runtime) => {
+const patchValFile = async (id, rootDir, patch$1, sourceFileHandler, runtime) => {
   // const timeId = randomUUID();
   // console.time("patchValFile" + timeId);
-  const filePath = sourceFileHandler.resolveSourceModulePath(valConfigPath, `.${id}.val`);
+  const filePath = sourceFileHandler.resolveSourceModulePath(getSyntheticContainingPath(rootDir), `.${id}.val`);
   const sourceFile = sourceFileHandler.getSourceFile(filePath);
   if (!sourceFile) {
     throw Error(`Source file ${filePath} not found`);
@@ -741,9 +745,7 @@ globalThis.valModule = {
   defaultExport: !!valModule?.default,
 };
 `;
-    const result = context.evalCode(code,
-    // Synthetic module name
-    path__namespace["default"].join(rootDirPath, "<val>"));
+    const result = context.evalCode(code, getSyntheticContainingPath(rootDirPath));
     const fatalErrors = [];
     if (result.error) {
       const error = result.error.consume(context.dump);

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

@@ -633,6 +633,10 @@ class TSOps {
   }
 }
 
+function getSyntheticContainingPath(rootDir) {
+  return path__namespace["default"].join(rootDir, "<val>"); // TODO: this is the synthetic path used when evaluating / patching modules. I am not sure <val> is the best choice: val.ts / js better? But that is weird too. At least now it is clear(er) that it is indeed a synthetic file (i.e. not an actual file)
+}
+
 const ops$1 = new TSOps(document => {
   return fp.pipe(analyzeValModule(document), fp.result.map(({
     source
@@ -640,10 +644,10 @@ const ops$1 = new TSOps(document => {
 });
 
 // TODO: rename to patchValFiles since we may write multiple files
-const patchValFile = async (id, valConfigPath, patch$1, sourceFileHandler, runtime) => {
+const patchValFile = async (id, rootDir, patch$1, sourceFileHandler, runtime) => {
   // const timeId = randomUUID();
   // console.time("patchValFile" + timeId);
-  const filePath = sourceFileHandler.resolveSourceModulePath(valConfigPath, `.${id}.val`);
+  const filePath = sourceFileHandler.resolveSourceModulePath(getSyntheticContainingPath(rootDir), `.${id}.val`);
   const sourceFile = sourceFileHandler.getSourceFile(filePath);
   if (!sourceFile) {
     throw Error(`Source file ${filePath} not found`);
@@ -741,9 +745,7 @@ globalThis.valModule = {
   defaultExport: !!valModule?.default,
 };
 `;
-    const result = context.evalCode(code,
-    // Synthetic module name
-    path__namespace["default"].join(rootDirPath, "<val>"));
+    const result = context.evalCode(code, getSyntheticContainingPath(rootDirPath));
     const fatalErrors = [];
     if (result.error) {
       const error = result.error.consume(context.dump);

package/dist/valbuild-server.esm.js

@@ -603,6 +603,10 @@ class TSOps {
   }
 }
 
+function getSyntheticContainingPath(rootDir) {
+  return path__default.join(rootDir, "<val>"); // TODO: this is the synthetic path used when evaluating / patching modules. I am not sure <val> is the best choice: val.ts / js better? But that is weird too. At least now it is clear(er) that it is indeed a synthetic file (i.e. not an actual file)
+}
+
 const ops$1 = new TSOps(document => {
   return pipe(analyzeValModule(document), result.map(({
     source
@@ -610,10 +614,10 @@ const ops$1 = new TSOps(document => {
 });
 
 // TODO: rename to patchValFiles since we may write multiple files
-const patchValFile = async (id, valConfigPath, patch, sourceFileHandler, runtime) => {
+const patchValFile = async (id, rootDir, patch, sourceFileHandler, runtime) => {
   // const timeId = randomUUID();
   // console.time("patchValFile" + timeId);
-  const filePath = sourceFileHandler.resolveSourceModulePath(valConfigPath, `.${id}.val`);
+  const filePath = sourceFileHandler.resolveSourceModulePath(getSyntheticContainingPath(rootDir), `.${id}.val`);
   const sourceFile = sourceFileHandler.getSourceFile(filePath);
   if (!sourceFile) {
     throw Error(`Source file ${filePath} not found`);
@@ -711,9 +715,7 @@ globalThis.valModule = {
   defaultExport: !!valModule?.default,
 };
 `;
-    const result = context.evalCode(code,
-    // Synthetic module name
-    path__default.join(rootDirPath, "<val>"));
+    const result = context.evalCode(code, getSyntheticContainingPath(rootDirPath));
     const fatalErrors = [];
     if (result.error) {
       const error = result.error.consume(context.dump);

package/package.json

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