@jay-framework/rollup-plugin 0.6.6 → 0.6.7

package/dist/index.d.ts

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

package/dist/index.js

@@ -277,6 +277,51 @@ function watchChangesFor(context, sourcePath) {
   context.addWatchFile(sourcePath);
   console.info(`[watch] add ${sourcePath}`);
 }
+function stripTSExtension(id) {
+  return id.replace(compilerShared.TS_EXTENSION, "").replace(compilerShared.TSX_EXTENSION, "");
+}
+async function loadJayFile(context, id) {
+  console.info(`[load] start ${id}`);
+  let { originId } = getJayMetadata(context, id);
+  if (!Boolean(originId))
+    originId = stripTSExtension(id);
+  const code = checkCodeErrors(await readFileAsString(originId));
+  console.info(`[load] end ${id}`);
+  return { code };
+}
+async function loadContractFile(context, id) {
+  console.info(`[load] start ${id}`);
+  let { originId } = getJayMetadata(context, id);
+  if (!Boolean(originId))
+    originId = stripTSExtension(id);
+  const code = await readFileAsString(originId);
+  console.info(`[load] end ${id}`);
+  return { code };
+}
+async function loadCssFile(context, jayContext, id, isVite) {
+  if (isVite) {
+    console.info(`[load] start ${id}`);
+    const { originId } = getJayMetadata(context, id);
+    const code = checkCodeErrors(await readFileAsString(originId));
+    const fileName = path.basename(originId);
+    const dirName = path.dirname(originId);
+    const jayHtml = await compilerJayHtml.parseJayFile(
+      code,
+      fileName,
+      dirName,
+      {
+        relativePath: jayContext.jayOptions.tsConfigFilePath
+      },
+      compilerJayHtml.JAY_IMPORT_RESOLVER
+    );
+    console.info(`[load] end ${id}`);
+    return { code: jayHtml.val.css };
+  } else {
+    console.info(`[load] rollup environment - css not supported - ignoring css ${id}`);
+    return { code: "" };
+  }
+}
+const JAY_HTML_CSS = ".css";
 async function resolveJayHtml(context, source, importer, options, generationTarget = compilerShared.GenerateTarget.jay) {
   const resolved = await context.resolve(source, importer, { ...options, skipSelf: true });
   if (!resolved || compilerShared.hasExtension(resolved.id, compilerShared.TS_EXTENSION) || compilerShared.hasExtension(resolved.id, compilerShared.TSX_EXTENSION))
@@ -351,26 +396,23 @@ function getResolvedId(resolved, mode, originId) {
   const id = `${originId}?${mode}.${extension}`;
   return id;
 }
-function stripTSExtension(id) {
-  return id.replace(compilerShared.TS_EXTENSION, "").replace(compilerShared.TSX_EXTENSION, "");
+function hasCssImportedByJayHtml(source, importer) {
+  return compilerShared.hasExtension(source, compilerShared.CSS_EXTENSION) && importer && (compilerShared.hasExtension(importer, compilerShared.JAY_EXTENSION, { withTs: true }) || compilerShared.hasExtension(importer, compilerShared.JAY_EXTENSION + compilerShared.JAY_QUERY_MAIN_SANDBOX, { withTs: true }));
 }
-async function loadJayFile(context, id) {
-  console.info(`[load] start ${id}`);
-  let { originId } = getJayMetadata(context, id);
-  if (!Boolean(originId))
-    originId = stripTSExtension(id);
-  const code = checkCodeErrors(await readFileAsString(originId));
-  console.info(`[load] end ${id}`);
-  return { code };
+function resolveCssFile(context, importer) {
+  const originImporter = importer.split("?")[0];
+  const originId = stripTSExtension(originImporter);
+  const id = `${originId}${JAY_HTML_CSS}`;
+  return {
+    id,
+    meta: appendJayMetadata(context, id, {
+      format: compilerShared.SourceFileFormat.CSS,
+      originId
+    })
+  };
 }
-async function loadContractFile(context, id) {
-  console.info(`[load] start ${id}`);
-  let { originId } = getJayMetadata(context, id);
-  if (!Boolean(originId))
-    originId = stripTSExtension(id);
-  const code = await readFileAsString(originId);
-  console.info(`[load] end ${id}`);
-  return { code };
+function isResolvedCssFile(id) {
+  return id.endsWith(JAY_HTML_CSS) && id.indexOf(compilerShared.JAY_EXTENSION) > 0;
 }
 class JayPluginContext {
   constructor(jayOptions = {}) {
@@ -417,8 +459,15 @@ const GLOBAL_FUNC_REPOSITORY = "GLOBAL_FUNC_REPOSITORY.ts";
 function jayRuntime(jayOptions = {}, givenJayContext) {
   const jayContext = givenJayContext || new JayPluginContext(jayOptions);
   let server;
+  let isVite = false;
   return {
     name: "jay:runtime",
+    buildStart(opts) {
+      isVite = Boolean(opts.plugins?.some(
+        (plugin) => plugin.name === "vite:build-metadata" || plugin.name?.startsWith("vite:")
+      ));
+      console.log("[buildStart] Vite detected:", isVite);
+    },
     configureServer(_server) {
       server = _server;
     },
@@ -435,6 +484,9 @@ function jayRuntime(jayOptions = {}, givenJayContext) {
         return await resolveJayContract(this, source, importer, options);
       if (compilerShared.hasJayModeExtension(source))
         return await resolveJayModeFile(this, source, importer, options);
+      if (hasCssImportedByJayHtml(source, importer)) {
+        return resolveCssFile(this, importer);
+      }
       if (source.includes(SANDBOX_ROOT_PREFIX) || jayOptions.isWorker && importer === void 0)
         return await removeSandboxPrefixForWorkerRoot(this, source, importer, options);
       if (source === compilerShared.Import.functionRepository.module)
@@ -442,10 +494,12 @@ function jayRuntime(jayOptions = {}, givenJayContext) {
       return null;
     },
     async load(id) {
-      if (compilerShared.hasExtension(id, compilerShared.JAY_EXTENSION, { withTs: true }) || compilerShared.hasJayModeExtension(id, { withTs: true }))
+      if (compilerShared.hasExtension(id, compilerShared.JAY_EXTENSION, { withTs: true }) || compilerShared.hasJayModeExtension(id, { withTs: true })) {
         return await loadJayFile(this, id);
-      else if (compilerShared.hasExtension(id, compilerShared.JAY_CONTRACT_EXTENSION, { withTs: true })) {
+      } else if (compilerShared.hasExtension(id, compilerShared.JAY_CONTRACT_EXTENSION, { withTs: true })) {
         return await loadContractFile(this, id);
+      } else if (isResolvedCssFile(id)) {
+        return await loadCssFile(this, jayContext, id, isVite);
       } else if (id === GLOBAL_FUNC_REPOSITORY) {
         const { functionRepository } = jayContext.globalFunctionsRepository.generateGlobalFile();
         return functionRepository;

package/package.json

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