@jay-framework/rollup-plugin 0.15.5 → 0.16.0

package/dist/index.d.ts

@@ -25,6 +25,10 @@ interface JayRollupConfig {
     isWorker?: boolean;
     compilerPatternFiles?: string[];
     generationTarget?: GenerateTarget;
+    /** Pages source root directory (for mapping pre-rendered paths back to source) */
+    pagesRoot?: string;
+    /** Build output directory (for detecting pre-rendered files) */
+    buildFolder?: string;
 }
 
 declare class JayPluginContext {
@@ -35,10 +39,18 @@ declare class JayPluginContext {
     readonly compilerPatterns: CompiledPattern[];
     readonly jayFileCache: Map<string, CompilerSourceFile>;
     readonly globalFunctionsRepository: FunctionRepositoryBuilder;
+    private readonly preRenderedPrefix;
+    private readonly pagesRoot;
     constructor(jayOptions?: JayRollupConfig);
     cacheJayFile(id: string, jayFile: CompilerSourceFile): CompilerSourceFile;
     getCachedJayFile(id: string): CompilerSourceFile;
     deleteCachedJayFile(id: string): boolean;
+    /**
+     * Map a file path to its source directory. For pre-rendered files
+     * (under build/pre-rendered/), maps back to the original source pages directory.
+     * For source files, returns path.dirname(filePath) unchanged.
+     */
+    resolveSourceDir(filePath: string): string;
 }
 
 declare function jayRuntime(jayOptions?: JayRollupConfig, givenJayContext?: JayPluginContext): {

package/dist/index.js

@@ -217,6 +217,7 @@ async function getJayFile(jayContext, meta, code) {
 }
 async function getJayStructureFromJayHtmlSource(jayContext, code, id) {
   const { filename, dirname } = getFileContext(id);
+  const sourceDir = jayContext.resolveSourceDir(id);
   return await parseJayFile(
     code,
     filename,
@@ -225,7 +226,8 @@ async function getJayStructureFromJayHtmlSource(jayContext, code, id) {
       relativePath: jayContext.jayOptions.tsConfigFilePath
     },
     JAY_IMPORT_RESOLVER,
-    jayContext.projectRoot
+    jayContext.projectRoot,
+    sourceDir !== dirname ? sourceDir : void 0
   );
 }
 async function getJayStructureFromTypeScriptSource(code, id) {
@@ -375,6 +377,7 @@ async function loadCssFile(context, jayContext, id, isVite) {
     const code = checkCodeErrors(await readFileAsString(originId));
     const fileName = path.basename(originId);
     const dirName = path.dirname(originId);
+    const sourceDir = jayContext.resolveSourceDir(originId);
     const jayHtml = await parseJayFile(
       code,
       fileName,
@@ -383,7 +386,8 @@ async function loadCssFile(context, jayContext, id, isVite) {
         relativePath: jayContext.jayOptions.tsConfigFilePath
       },
       JAY_IMPORT_RESOLVER,
-      jayContext.projectRoot
+      jayContext.projectRoot,
+      sourceDir !== dirName ? sourceDir : void 0
     );
     if (jayHtml.val?.linkedCssFiles) {
       for (const cssFile of jayHtml.val.linkedCssFiles) {
@@ -540,9 +544,15 @@ class JayPluginContext {
     __publicField(this, "compilerPatterns");
     __publicField(this, "jayFileCache", /* @__PURE__ */ new Map());
     __publicField(this, "globalFunctionsRepository");
+    __publicField(this, "preRenderedPrefix");
+    __publicField(this, "pagesRoot");
     this.jayOptions = jayOptions;
     this.projectRoot = path.dirname(jayOptions.tsConfigFilePath ?? process.cwd());
     this.outputDir = jayOptions.outputDir && path.join(this.projectRoot, jayOptions.outputDir);
+    if (jayOptions.buildFolder && jayOptions.pagesRoot) {
+      this.preRenderedPrefix = path.resolve(jayOptions.buildFolder, "pre-rendered");
+      this.pagesRoot = path.resolve(jayOptions.pagesRoot);
+    }
     this.tsPrinter = createPrinter({ newLine: NewLineKind.LineFeed });
     let compilerPatternsParseResult = compileFunctionSplitPatternsBlock(
       (jayOptions.compilerPatternFiles || []).map((fileName) => {
@@ -572,6 +582,19 @@ class JayPluginContext {
   deleteCachedJayFile(id) {
     return this.jayFileCache.delete(id);
   }
+  /**
+   * Map a file path to its source directory. For pre-rendered files
+   * (under build/pre-rendered/), maps back to the original source pages directory.
+   * For source files, returns path.dirname(filePath) unchanged.
+   */
+  resolveSourceDir(filePath) {
+    const dir = path.dirname(filePath);
+    if (this.preRenderedPrefix && this.pagesRoot && dir.startsWith(this.preRenderedPrefix)) {
+      const routeRelative = path.relative(this.preRenderedPrefix, dir);
+      return path.join(this.pagesRoot, routeRelative);
+    }
+    return dir;
+  }
 }
 const GLOBAL_FUNC_REPOSITORY = "GLOBAL_FUNC_REPOSITORY.ts";
 function jayRuntime(jayOptions = {}, givenJayContext) {
@@ -640,7 +663,7 @@ function jayRuntime(jayOptions = {}, givenJayContext) {
     },
     watchChange(id, change) {
       getLogger().info(`[watchChange] ${id} ${change.event}`);
-      jayContext.deleteCachedJayFile(id);
+      jayContext.jayFileCache.clear();
       if (server) {
         const variants = [id + TS_EXTENSION, id + JAY_QUERY_HYDRATE + TS_EXTENSION];
         let invalidated = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jay-framework/rollup-plugin",
-  "version": "0.15.5",
+  "version": "0.16.0",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "type": "module",
@@ -27,17 +27,17 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@jay-framework/compiler": "^0.15.5",
-    "@jay-framework/compiler-jay-html": "^0.15.5",
-    "@jay-framework/logger": "^0.15.5",
+    "@jay-framework/compiler": "^0.16.0",
+    "@jay-framework/compiler-jay-html": "^0.16.0",
+    "@jay-framework/logger": "^0.16.0",
     "fast-glob": "^3.3.2",
     "typescript": "^5.3.3"
   },
   "devDependencies": {
-    "@jay-framework/component": "^0.15.5",
-    "@jay-framework/dev-environment": "^0.15.5",
-    "@jay-framework/runtime": "^0.15.5",
-    "@jay-framework/secure": "^0.15.5",
+    "@jay-framework/component": "^0.16.0",
+    "@jay-framework/dev-environment": "^0.16.0",
+    "@jay-framework/runtime": "^0.16.0",
+    "@jay-framework/secure": "^0.16.0",
     "@types/node": "^20.11.5",
     "rimraf": "^5.0.5",
     "rollup": "^4.9.5",