@jay-framework/rollup-plugin 0.6.10 → 0.8.0

package/dist/index.d.ts

@@ -43,7 +43,7 @@ declare class JayPluginContext {
 
 declare function jayRuntime(jayOptions?: JayRollupConfig, givenJayContext?: JayPluginContext): {
     name: string;
-    configResolved(config: any): void;
+    configResolved(_config: any): void;
     buildStart(opts: any): void;
     configureServer(_server: ViteDevServer): void;
     resolveId(source: string, importer: string | undefined, options: ResolveIdOptions): Promise<ResolveIdResult>;

package/dist/index.js

@@ -110,20 +110,30 @@ function jayDefinitions() {
   };
 }
 const SANDBOX_ROOT_PREFIX = "jay-sandbox:";
+const SSR_METADATA = /* @__PURE__ */ new Map();
 function getJayMetadata(context, id, { checkPresent = false } = {}) {
-  return jayMetadataFromModuleMetadata(id, context.getModuleInfo(id)?.meta, { checkPresent });
+  const metadataFromPlugin = context.getModuleInfo(id)?.meta?.jay;
+  const metadata = context["ssr"] ? metadataFromPlugin || SSR_METADATA.get(id) : metadataFromPlugin || {};
+  validateJayMetadata(id, metadata, checkPresent);
+  return metadata;
 }
 function jayMetadataFromModuleMetadata(id, meta, { checkPresent = false } = {}) {
   const metadata = meta?.jay ?? {};
-  if (checkPresent) {
-    if (!metadata.originId)
+  validateJayMetadata(id, metadata, checkPresent);
+  return metadata;
+}
+function validateJayMetadata(id, jayMetadata, doValidate) {
+  if (doValidate) {
+    if (!jayMetadata.originId)
       throw new Error(`Unknown Jay originId for ${id}`);
-    if (!metadata.format)
+    if (!jayMetadata.format)
       throw new Error(`Unknown Jay format for ${id}`);
   }
-  return metadata;
 }
 function appendJayMetadata(context, id, metadata, moduleMetadata) {
+  if (context["ssr"]) {
+    SSR_METADATA.set(id, metadata);
+  }
   return { jay: { ...moduleMetadata ?? getJayMetadata(context, id), ...metadata } };
 }
 function getSourceJayMetadata(context, id) {
@@ -132,7 +142,7 @@ function getSourceJayMetadata(context, id) {
   if (!sourcePath)
     throw new Error(`Unknown Jay originId for ${id}`);
   const sourceMetadata = getJayMetadata(context, sourcePath);
-  return sourceMetadata.originId ? sourceMetadata : metadata;
+  return sourceMetadata?.originId ? sourceMetadata : metadata;
 }
 async function getJayFileStructure(jayContext, context, code, id) {
   const meta = getSourceJayMetadata(context, id);
@@ -169,9 +179,12 @@ async function getJayStructureFromJayHtmlSource(jayContext, code, id) {
 async function getJayStructureFromTypeScriptSource(code, id) {
   return await parseGenericTypescriptFile(id, code);
 }
-const require$1 = createRequire(import.meta.url);
-const tsModule$1 = require$1("typescript");
-const { transform } = tsModule$1;
+const s = createRequire(import.meta.url), e = s("typescript"), c = new Proxy(e, {
+  get(t, r) {
+    return t[r];
+  }
+});
+const { transform, EmitHint, createSourceFile, ScriptTarget, ScriptKind } = c;
 function checkDiagnosticsErrors(tsCode) {
   if (tsCode.diagnostics.length > 0) {
     throw new Error(
@@ -238,17 +251,11 @@ function generateCodeFromTsFile(jayContext, mode, jayFile, id, code) {
   }
 }
 function transformTsCode(jayContext, transformers, id, code) {
-  const tsSource = tsModule$1.createSourceFile(
-    id,
-    code,
-    tsModule$1.ScriptTarget.Latest,
-    true,
-    tsModule$1.ScriptKind.TS
-  );
+  const tsSource = createSourceFile(id, code, ScriptTarget.Latest, true, ScriptKind.TS);
   const tsCode = transform(tsSource, transformers);
   checkDiagnosticsErrors(tsCode);
   const outputCode = jayContext.tsPrinter.printNode(
-    tsModule$1.EmitHint.Unspecified,
+    EmitHint.Unspecified,
     tsCode.transformed[0],
     tsSource
   );
@@ -315,25 +322,24 @@ async function loadCssFile(context, jayContext, id, isVite) {
   }
 }
 const JAY_HTML_CSS = ".css";
-async function resolveJayHtml(context, source, importer, options, generationTarget = GenerateTarget.jay) {
+async function resolveJayHtml(context, source, importer, options, root, generationTarget = GenerateTarget.jay) {
   const resolved = await context.resolve(source, importer, { ...options, skipSelf: true });
   if (!resolved || hasExtension(resolved.id, TS_EXTENSION) || hasExtension(resolved.id, TSX_EXTENSION))
     return null;
   const resolvedJayMeta = jayMetadataFromModuleMetadata(resolved.id, resolved.meta);
   const extension = generationTarget === GenerateTarget.react ? TSX_EXTENSION : TS_EXTENSION;
+  let format, originId;
   if (resolvedJayMeta.originId) {
-    const { format, originId } = resolvedJayMeta;
-    const id = `${originId}${extension}`;
-    console.info(`[resolveId] resolved ${id} as ${format}`);
-    return { id, meta: appendJayMetadata(context, id, { format, originId }) };
+    format = resolvedJayMeta.format;
+    originId = resolvedJayMeta.originId;
   } else {
     watchChangesFor(context, resolved.id);
-    const format = SourceFileFormat.JayHtml;
-    const originId = resolved.id;
-    const id = `${originId}${extension}`;
-    console.info(`[resolveId] resolved ${id} as ${format}`);
-    return { id, meta: appendJayMetadata(context, id, { format, originId }) };
+    format = SourceFileFormat.JayHtml;
+    originId = resolved.id;
   }
+  const id = context["ssr"] && originId.startsWith(root) ? `${originId}${extension}`.slice(root.length) : `${originId}${extension}`;
+  console.info(`[resolveId] resolved ${id} as ${format}`);
+  return { id, meta: appendJayMetadata(context, id, { format, originId }) };
 }
 async function resolveJayContract(context, source, importer, options) {
   const resolved = await context.resolve(source, importer, { ...options, skipSelf: true });
@@ -386,16 +392,15 @@ async function removeSandboxPrefixForWorkerRoot(context, source, importer, optio
 }
 function getResolvedId(resolved, mode, originId) {
   const extension = resolved.id.split(".").pop();
-  const id = `${originId}?${mode}.${extension}`;
-  return id;
+  return `${originId}?${mode}.${extension}`;
 }
 function hasCssImportedByJayHtml(source, importer) {
   return hasExtension(source, CSS_EXTENSION) && importer && (hasExtension(importer, JAY_EXTENSION, { withTs: true }) || hasExtension(importer, JAY_EXTENSION + JAY_QUERY_MAIN_SANDBOX, { withTs: true }));
 }
-function resolveCssFile(context, importer) {
+function resolveCssFileImportedByJayHtml(context, importer, root) {
   const originImporter = importer.split("?")[0];
-  const originId = stripTSExtension(originImporter);
-  const id = `${originId}${JAY_HTML_CSS}`;
+  const originId = context["ssr"] ? getJayMetadata(context, originImporter)?.originId : stripTSExtension(originImporter);
+  const id = context["ssr"] && originId.startsWith(root) ? `${originId}${JAY_HTML_CSS}`.slice(root.length) : `${originId}${JAY_HTML_CSS}`;
   return {
     id,
     meta: appendJayMetadata(context, id, {
@@ -407,9 +412,7 @@ function resolveCssFile(context, importer) {
 function isResolvedCssFile(id) {
   return id.endsWith(JAY_HTML_CSS) && id.indexOf(JAY_EXTENSION) > 0;
 }
-const require2 = createRequire(import.meta.url);
-const tsModule = require2("typescript");
-const { NewLineKind } = tsModule;
+const { createPrinter, NewLineKind } = c;
 class JayPluginContext {
   constructor(jayOptions = {}) {
     __publicField(this, "projectRoot");
@@ -421,7 +424,7 @@ class JayPluginContext {
     this.jayOptions = jayOptions;
     this.projectRoot = path.dirname(jayOptions.tsConfigFilePath ?? process.cwd());
     this.outputDir = jayOptions.outputDir && path.join(this.projectRoot, jayOptions.outputDir);
-    this.tsPrinter = tsModule.createPrinter({ newLine: NewLineKind.LineFeed });
+    this.tsPrinter = createPrinter({ newLine: NewLineKind.LineFeed });
     let compilerPatternsParseResult = compileFunctionSplitPatternsBlock(
       (jayOptions.compilerPatternFiles || []).map((fileName) => {
         let fileContent = fs.readFileSync(fileName, { encoding: "utf8" });
@@ -456,9 +459,11 @@ function jayRuntime(jayOptions = {}, givenJayContext) {
   const jayContext = givenJayContext || new JayPluginContext(jayOptions);
   let server;
   let isVite = false;
+  let config;
   return {
     name: "jay:runtime",
-    configResolved(config) {
+    configResolved(_config) {
+      config = _config;
       isVite = true;
     },
     buildStart(opts) {
@@ -473,20 +478,22 @@ function jayRuntime(jayOptions = {}, givenJayContext) {
       server = _server;
     },
     async resolveId(source, importer, options) {
-      if (hasExtension(source, JAY_EXTENSION))
+      if (hasExtension(source, JAY_EXTENSION)) {
         return await resolveJayHtml(
           this,
           source,
           importer,
           options,
+          config?.root,
           jayOptions.generationTarget
         );
+      }
       if (hasExtension(source, JAY_CONTRACT_EXTENSION))
         return await resolveJayContract(this, source, importer, options);
       if (hasJayModeExtension(source))
         return await resolveJayModeFile(this, source, importer, options);
       if (hasCssImportedByJayHtml(source, importer)) {
-        return resolveCssFile(this, importer);
+        return resolveCssFileImportedByJayHtml(this, importer, config?.root);
       }
       if (source.includes(SANDBOX_ROOT_PREFIX) || jayOptions.isWorker && importer === void 0)
         return await removeSandboxPrefixForWorkerRoot(this, source, importer, options);

package/package.json

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