npm - @jay-framework/rollup-plugin - Versions diffs - 0.6.6 → 0.6.8 - Mend

@jay-framework/rollup-plugin 0.6.6 → 0.6.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/dist/index.d.ts CHANGED Viewed

@@ -1,9 +1,8 @@
 import { CompiledPattern, FunctionRepositoryBuilder } from '@jay-framework/compiler';
 export * from '@jay-framework/compiler';
 import { LoadResult, TransformResult, CustomPluginOptions, ResolveIdResult } from 'rollup';
-import * as ts from 'typescript';
-import { CompilerOptions } from 'typescript';
 import { GenerateTarget, CompilerSourceFile } from '@jay-framework/compiler-shared';
+import * as ts from 'typescript';
 import { ViteDevServer } from 'vite';
 declare function jayDefinitions(): {
@@ -21,7 +20,7 @@ interface ResolveIdOptions {
 interface JayRollupConfig {
     tsConfigFilePath?: string;
-    tsCompilerOptionsOverrides?: CompilerOptions;
+    tsCompilerOptionsOverrides?: ts.CompilerOptions;
     outputDir?: string;
     isWorker?: boolean;
     compilerPatternFiles?: string[];
@@ -44,6 +43,8 @@ declare class JayPluginContext {
 declare function jayRuntime(jayOptions?: JayRollupConfig, givenJayContext?: JayPluginContext): {
     name: string;
+    configResolved(config: any): void;
+    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 CHANGED Viewed

@@ -1,48 +1,30 @@
-"use strict";
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => {
   __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
   return value;
 };
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const compiler = require("@jay-framework/compiler");
-const path = require("node:path");
-const compilerShared = require("@jay-framework/compiler-shared");
-const promises = require("node:fs/promises");
-const promises$1 = require("fs/promises");
-const compilerJayHtml = require("@jay-framework/compiler-jay-html");
-const ts = require("typescript");
-const fs = require("fs");
-function _interopNamespaceDefault(e) {
-  const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
-  if (e) {
-    for (const k in e) {
-      if (k !== "default") {
-        const d = Object.getOwnPropertyDescriptor(e, k);
-        Object.defineProperty(n, k, d.get ? d : {
-          enumerable: true,
-          get: () => e[k]
-        });
-      }
-    }
-  }
-  n.default = e;
-  return Object.freeze(n);
-}
-const ts__namespace = /* @__PURE__ */ _interopNamespaceDefault(ts);
-function getFileContext(filename, extension = compilerShared.JAY_EXTENSION) {
+import { generateElementDefinitionFile, parseGenericTypescriptFile, generateImportsFileFromJayFile, generateElementFile, transformComponent, transformComponentBridge, compileFunctionSplitPatternsBlock, createTsSourceFileFromSource, FunctionRepositoryBuilder } from "@jay-framework/compiler";
+export * from "@jay-framework/compiler";
+import path from "node:path";
+import { JAY_EXTENSION, hasExtension, JAY_CONTRACT_EXTENSION, checkValidationErrors, JAY_DTS_EXTENSION, JAY_CONTRACT_DTS_EXTENSION, SourceFileFormat, getModeFromExtension, GenerateTarget, RuntimeMode, TS_EXTENSION, TSX_EXTENSION, JAY_QUERY_WORKER_TRUSTED_TS, CSS_EXTENSION, JAY_QUERY_MAIN_SANDBOX, hasJayModeExtension, Import } from "@jay-framework/compiler-shared";
+import { readFile, mkdir } from "node:fs/promises";
+import { writeFile } from "fs/promises";
+import { getJayHtmlImports, parseJayFile, JAY_IMPORT_RESOLVER, parseContract, compileContract, generateSandboxRootFile, generateElementBridgeFile } from "@jay-framework/compiler-jay-html";
+import { createRequire } from "module";
+import fs from "fs";
+function getFileContext(filename, extension = JAY_EXTENSION) {
   return {
     filename: path.basename(filename).replace(extension, ""),
     dirname: path.dirname(filename)
   };
 }
 async function readFileAsString(filePath) {
-  return (await promises.readFile(filePath)).toString();
+  return (await readFile(filePath)).toString();
 }
 async function writeDefinitionFile(dirname, filename, source, extension) {
   const name = path.resolve(dirname, `${filename}${extension}`);
-  await promises$1.writeFile(name, source, { encoding: "utf8", flag: "w" });
+  await writeFile(name, source, { encoding: "utf8", flag: "w" });
   return name;
 }
 async function writeGeneratedFile(jayContext, context, id, code) {
@@ -50,8 +32,8 @@ async function writeGeneratedFile(jayContext, context, id, code) {
     return;
   const relativePath = path.dirname(path.relative(jayContext.projectRoot, id));
   const filePath = path.resolve(jayContext.outputDir, relativePath, path.basename(id));
-  await promises.mkdir(path.dirname(filePath), { recursive: true });
-  await promises$1.writeFile(filePath, code, { encoding: "utf8", flag: "w" });
+  await mkdir(path.dirname(filePath), { recursive: true });
+  await writeFile(filePath, code, { encoding: "utf8", flag: "w" });
   console.info(["[transform] written", filePath].join(" "));
   return filePath;
 }
@@ -65,7 +47,7 @@ function jayDefinitions() {
     name: "jay:definitions",
     // this name will show up in warnings and errors
     async load(id) {
-      if (compilerShared.hasExtension(id, compilerShared.JAY_EXTENSION) || compilerShared.hasExtension(id, compilerShared.JAY_CONTRACT_EXTENSION)) {
+      if (hasExtension(id, JAY_EXTENSION) || hasExtension(id, JAY_CONTRACT_EXTENSION)) {
         const code = await readFileAsString(id);
         checkCodeErrors(code);
         return { code };
@@ -73,50 +55,52 @@ function jayDefinitions() {
       return null;
     },
     async transform(code, id) {
-      if (compilerShared.hasExtension(id, compilerShared.JAY_EXTENSION)) {
+      if (hasExtension(id, JAY_EXTENSION)) {
         const context = this;
         const { filename, dirname } = getFileContext(id);
-        const imports = compilerJayHtml.getJayHtmlImports(code).filter(
-          (module2) => module2.endsWith("jay-html.d")
+        const imports = getJayHtmlImports(code).filter(
+          (module) => module.endsWith("jay-html.d")
         );
         await Promise.all(
           imports.map(
             (imported) => context.load({
-              id: path.resolve(dirname, imported.slice(0, -2)),
+              id: path.resolve(dirname, String(imported).slice(0, -2)),
               resolveDependencies: true
             })
           )
         );
-        const parsedFile = await compilerJayHtml.parseJayFile(
+        const parsedFile = await parseJayFile(
           code,
           filename,
           dirname,
           {},
-          compilerJayHtml.JAY_IMPORT_RESOLVER
+          JAY_IMPORT_RESOLVER
+        );
+        const tsCode = checkValidationErrors(
+          generateElementDefinitionFile(parsedFile)
         );
-        const tsCode = compilerShared.checkValidationErrors(compiler.generateElementDefinitionFile(parsedFile));
         const generatedFilename = await writeDefinitionFile(
           dirname,
           filename,
           tsCode,
-          compilerShared.JAY_DTS_EXTENSION
+          JAY_DTS_EXTENSION
         );
         context.info(`[transform] generated ${generatedFilename}`);
         return { code: "", map: null };
-      } else if (compilerShared.hasExtension(id, compilerShared.JAY_CONTRACT_EXTENSION)) {
+      } else if (hasExtension(id, JAY_CONTRACT_EXTENSION)) {
         const context = this;
-        const { filename, dirname } = getFileContext(id, compilerShared.JAY_CONTRACT_EXTENSION);
-        const parsedFile = compilerJayHtml.parseContract(code, filename);
-        const tsCode = await compilerJayHtml.compileContract(
+        const { filename, dirname } = getFileContext(id, JAY_CONTRACT_EXTENSION);
+        const parsedFile = parseContract(code, filename);
+        const tsCode = await compileContract(
           parsedFile,
           `${dirname}/${filename}`,
-          compilerJayHtml.JAY_IMPORT_RESOLVER
+          JAY_IMPORT_RESOLVER
         );
         const generatedFilename = await writeDefinitionFile(
           dirname,
           filename,
           tsCode.val,
-          compilerShared.JAY_CONTRACT_DTS_EXTENSION
+          JAY_CONTRACT_DTS_EXTENSION
         );
         context.info(`[transform] generated ${generatedFilename}`);
         return { code: "", map: null };
@@ -155,16 +139,16 @@ async function getJayFileStructure(jayContext, context, code, id) {
   const sourceJayFile = jayContext.getCachedJayFile(meta.originId);
   if (Boolean(sourceJayFile))
     return { meta, jayFile: sourceJayFile };
-  const jayFile = compilerShared.checkValidationErrors(await getJayFile(jayContext, meta, code));
+  const jayFile = checkValidationErrors(await getJayFile(jayContext, meta, code));
   jayContext.cacheJayFile(meta.originId, jayFile);
   return { meta, jayFile };
 }
 async function getJayFile(jayContext, meta, code) {
   const { originId: id, format } = meta;
   switch (format) {
-    case compilerShared.SourceFileFormat.JayHtml:
+    case SourceFileFormat.JayHtml:
       return await getJayStructureFromJayHtmlSource(jayContext, code, id);
-    case compilerShared.SourceFileFormat.TypeScript:
+    case SourceFileFormat.TypeScript:
       return await getJayStructureFromTypeScriptSource(code, id);
     default:
       throw new Error(`Unknown Jay format ${format}`);
@@ -172,19 +156,22 @@ async function getJayFile(jayContext, meta, code) {
 }
 async function getJayStructureFromJayHtmlSource(jayContext, code, id) {
   const { filename, dirname } = getFileContext(id);
-  return await compilerJayHtml.parseJayFile(
+  return await parseJayFile(
     code,
     filename,
     dirname,
     {
       relativePath: jayContext.jayOptions.tsConfigFilePath
     },
-    compilerJayHtml.JAY_IMPORT_RESOLVER
+    JAY_IMPORT_RESOLVER
   );
 }
 async function getJayStructureFromTypeScriptSource(code, id) {
-  return await compiler.parseGenericTypescriptFile(id, code);
+  return await parseGenericTypescriptFile(id, code);
 }
+const require$1 = createRequire(import.meta.url);
+const tsModule$1 = require$1("typescript");
+const { transform } = tsModule$1;
 function checkDiagnosticsErrors(tsCode) {
   if (tsCode.diagnostics.length > 0) {
     throw new Error(
@@ -194,21 +181,21 @@ function checkDiagnosticsErrors(tsCode) {
 }
 async function generateCodeFromStructure(jayContext, context, code, id, meta, jayFile) {
   const { format } = meta;
-  const mode = compilerShared.getModeFromExtension(id);
-  const generationTarget = jayContext.jayOptions.generationTarget || compilerShared.GenerateTarget.jay;
-  const tsCode = format === compilerShared.SourceFileFormat.JayHtml ? generateCodeFromJayHtmlFile(mode, jayFile, generationTarget) : generateCodeFromTsFile(jayContext, mode, jayFile, id, code);
+  const mode = getModeFromExtension(id);
+  const generationTarget = jayContext.jayOptions.generationTarget || GenerateTarget.jay;
+  const tsCode = format === SourceFileFormat.JayHtml ? generateCodeFromJayHtmlFile(mode, jayFile, generationTarget) : generateCodeFromTsFile(jayContext, mode, jayFile, id, code);
   await writeGeneratedFile(jayContext, context, id, tsCode);
   return tsCode;
 }
 function generateCodeFromJayHtmlFile(mode, jayFile, generationTarget) {
   switch (mode) {
-    case compilerShared.RuntimeMode.MainTrusted:
-    case compilerShared.RuntimeMode.MainSandbox:
-      return compilerShared.checkValidationErrors(compiler.generateElementFile(jayFile, mode, generationTarget));
-    case compilerShared.RuntimeMode.WorkerSandbox:
-      return compilerJayHtml.generateElementBridgeFile(jayFile);
-    case compilerShared.RuntimeMode.WorkerTrusted:
-      return hasSandboxImport(jayFile) ? compilerJayHtml.generateSandboxRootFile(jayFile) : compiler.generateImportsFileFromJayFile(jayFile);
+    case RuntimeMode.MainTrusted:
+    case RuntimeMode.MainSandbox:
+      return checkValidationErrors(generateElementFile(jayFile, mode, generationTarget));
+    case RuntimeMode.WorkerSandbox:
+      return generateElementBridgeFile(jayFile);
+    case RuntimeMode.WorkerTrusted:
+      return hasSandboxImport(jayFile) ? generateSandboxRootFile(jayFile) : generateImportsFileFromJayFile(jayFile);
   }
 }
 function hasSandboxImport(jayFile) {
@@ -216,15 +203,15 @@ function hasSandboxImport(jayFile) {
 }
 function generateCodeFromTsFile(jayContext, mode, jayFile, id, code) {
   switch (mode) {
-    case compilerShared.RuntimeMode.MainTrusted:
+    case RuntimeMode.MainTrusted:
       return code;
-    case compilerShared.RuntimeMode.MainSandbox: {
+    case RuntimeMode.MainSandbox: {
       if (!code.includes("makeJayComponent"))
         return code;
       return transformTsCode(
         jayContext,
         [
-          compiler.transformComponentBridge(
+          transformComponentBridge(
             mode,
             jayContext.compilerPatterns,
             jayContext.globalFunctionsRepository
@@ -234,13 +221,13 @@ function generateCodeFromTsFile(jayContext, mode, jayFile, id, code) {
         code
       );
     }
-    case compilerShared.RuntimeMode.WorkerTrusted:
-      return compiler.generateImportsFileFromJayFile(jayFile);
-    case compilerShared.RuntimeMode.WorkerSandbox:
+    case RuntimeMode.WorkerTrusted:
+      return generateImportsFileFromJayFile(jayFile);
+    case RuntimeMode.WorkerSandbox:
       return transformTsCode(
         jayContext,
         [
-          compiler.transformComponent(
+          transformComponent(
             jayContext.compilerPatterns,
             jayContext.globalFunctionsRepository
           )
@@ -251,11 +238,17 @@ function generateCodeFromTsFile(jayContext, mode, jayFile, id, code) {
   }
 }
 function transformTsCode(jayContext, transformers, id, code) {
-  const tsSource = ts__namespace.createSourceFile(id, code, ts__namespace.ScriptTarget.Latest, true, ts__namespace.ScriptKind.TS);
-  const tsCode = ts.transform(tsSource, transformers);
+  const tsSource = tsModule$1.createSourceFile(
+    id,
+    code,
+    tsModule$1.ScriptTarget.Latest,
+    true,
+    tsModule$1.ScriptKind.TS
+  );
+  const tsCode = transform(tsSource, transformers);
   checkDiagnosticsErrors(tsCode);
   const outputCode = jayContext.tsPrinter.printNode(
-    ts__namespace.EmitHint.Unspecified,
+    tsModule$1.EmitHint.Unspecified,
     tsCode.transformed[0],
     tsSource
   );
@@ -264,7 +257,7 @@ function transformTsCode(jayContext, transformers, id, code) {
 async function transformJayFile(jayContext, context, code, id) {
   if (!Boolean(getJayMetadata(context, id).originId))
     return null;
-  const mode = compilerShared.getModeFromExtension(id);
+  const mode = getModeFromExtension(id);
   console.info(`[transform] start ${mode} ${id}`);
   const { meta, jayFile } = await getJayFileStructure(jayContext, context, code, id);
   const tsCode = await generateCodeFromStructure(jayContext, context, code, id, meta, jayFile);
@@ -277,12 +270,57 @@ function watchChangesFor(context, sourcePath) {
   context.addWatchFile(sourcePath);
   console.info(`[watch] add ${sourcePath}`);
 }
-async function resolveJayHtml(context, source, importer, options, generationTarget = compilerShared.GenerateTarget.jay) {
+function stripTSExtension(id) {
+  return id.replace(TS_EXTENSION, "").replace(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 parseJayFile(
+      code,
+      fileName,
+      dirName,
+      {
+        relativePath: jayContext.jayOptions.tsConfigFilePath
+      },
+      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 = 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))
+  if (!resolved || hasExtension(resolved.id, TS_EXTENSION) || hasExtension(resolved.id, TSX_EXTENSION))
     return null;
   const resolvedJayMeta = jayMetadataFromModuleMetadata(resolved.id, resolved.meta);
-  const extension = generationTarget === compilerShared.GenerateTarget.react ? compilerShared.TSX_EXTENSION : compilerShared.TS_EXTENSION;
+  const extension = generationTarget === GenerateTarget.react ? TSX_EXTENSION : TS_EXTENSION;
   if (resolvedJayMeta.originId) {
     const { format, originId } = resolvedJayMeta;
     const id = `${originId}${extension}`;
@@ -290,7 +328,7 @@ async function resolveJayHtml(context, source, importer, options, generationTarg
     return { id, meta: appendJayMetadata(context, id, { format, originId }) };
   } else {
     watchChangesFor(context, resolved.id);
-    const format = compilerShared.SourceFileFormat.JayHtml;
+    const format = SourceFileFormat.JayHtml;
     const originId = resolved.id;
     const id = `${originId}${extension}`;
     console.info(`[resolveId] resolved ${id} as ${format}`);
@@ -299,12 +337,12 @@ async function resolveJayHtml(context, source, importer, options, generationTarg
 }
 async function resolveJayContract(context, source, importer, options) {
   const resolved = await context.resolve(source, importer, { ...options, skipSelf: true });
-  const id = `${resolved.id}${compilerShared.TS_EXTENSION}`;
+  const id = `${resolved.id}${TS_EXTENSION}`;
   console.info(`[resolveId] resolved ${id}`);
   return {
     id,
     meta: appendJayMetadata(context, id, {
-      format: compilerShared.SourceFileFormat.JayContract,
+      format: SourceFileFormat.JayContract,
       originId: resolved.id
     })
   };
@@ -320,7 +358,7 @@ async function resolveJayModeFile(context, source, importer, options) {
   if (!resolved)
     return null;
   const resolvedJayMeta = jayMetadataFromModuleMetadata(resolved.id, resolved.meta);
-  const format = resolvedJayMeta.format || compilerShared.SourceFileFormat.TypeScript;
+  const format = resolvedJayMeta.format || SourceFileFormat.TypeScript;
   const originId = resolvedJayMeta.originId || resolved.id;
   const id = getResolvedId(resolved, mode, originId);
   console.info(`[resolveId] resolved ${id} as ${format}`);
@@ -334,14 +372,14 @@ async function removeSandboxPrefixForWorkerRoot(context, source, importer, optio
   });
   if (!resolved)
     return null;
-  const id = `${resolved.id}${compilerShared.JAY_QUERY_WORKER_TRUSTED_TS}`;
+  const id = `${resolved.id}${JAY_QUERY_WORKER_TRUSTED_TS}`;
   const originId = id.split("?")[0];
   console.info(`[resolveId] resolved sandbox root ${id}`);
   return {
     id,
     meta: appendJayMetadata(context, id, {
       originId,
-      format: compilerShared.SourceFileFormat.TypeScript,
+      format: SourceFileFormat.TypeScript,
       isWorkerRoot: true
     })
   };
@@ -351,27 +389,27 @@ 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 hasExtension(source, CSS_EXTENSION) && importer && (hasExtension(importer, JAY_EXTENSION, { withTs: true }) || hasExtension(importer, JAY_EXTENSION + 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: 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(JAY_EXTENSION) > 0;
 }
+const require2 = createRequire(import.meta.url);
+const tsModule = require2("typescript");
+const { NewLineKind } = tsModule;
 class JayPluginContext {
   constructor(jayOptions = {}) {
     __publicField(this, "projectRoot");
@@ -383,11 +421,11 @@ 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 = ts__namespace.createPrinter({ newLine: ts__namespace.NewLineKind.LineFeed });
-    let compilerPatternsParseResult = compiler.compileFunctionSplitPatternsBlock(
+    this.tsPrinter = tsModule.createPrinter({ newLine: NewLineKind.LineFeed });
+    let compilerPatternsParseResult = compileFunctionSplitPatternsBlock(
       (jayOptions.compilerPatternFiles || []).map((fileName) => {
         let fileContent = fs.readFileSync(fileName, { encoding: "utf8" });
-        return compiler.createTsSourceFileFromSource(fileName, fileContent);
+        return createTsSourceFileFromSource(fileName, fileContent);
       })
     );
     if (compilerPatternsParseResult.validations.length > 0)
@@ -395,7 +433,7 @@ class JayPluginContext {
         "failed to parse or validate compilerPatternFiles. \n" + compilerPatternsParseResult.validations.join("\n")
       );
     this.compilerPatterns = compilerPatternsParseResult.val;
-    this.globalFunctionsRepository = new compiler.FunctionRepositoryBuilder();
+    this.globalFunctionsRepository = new FunctionRepositoryBuilder();
   }
   cacheJayFile(id, jayFile) {
     console.info("[cache] set", id);
@@ -417,13 +455,25 @@ 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",
+    configResolved(config) {
+      isVite = true;
+    },
+    buildStart(opts) {
+      isVite = 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;
     },
     async resolveId(source, importer, options) {
-      if (compilerShared.hasExtension(source, compilerShared.JAY_EXTENSION))
+      if (hasExtension(source, JAY_EXTENSION))
         return await resolveJayHtml(
           this,
           source,
@@ -431,21 +481,26 @@ function jayRuntime(jayOptions = {}, givenJayContext) {
           options,
           jayOptions.generationTarget
         );
-      if (compilerShared.hasExtension(source, compilerShared.JAY_CONTRACT_EXTENSION))
+      if (hasExtension(source, JAY_CONTRACT_EXTENSION))
         return await resolveJayContract(this, source, importer, options);
-      if (compilerShared.hasJayModeExtension(source))
+      if (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)
+      if (source === Import.functionRepository.module)
         return Promise.resolve(GLOBAL_FUNC_REPOSITORY);
       return null;
     },
     async load(id) {
-      if (compilerShared.hasExtension(id, compilerShared.JAY_EXTENSION, { withTs: true }) || compilerShared.hasJayModeExtension(id, { withTs: true }))
+      if (hasExtension(id, JAY_EXTENSION, { withTs: true }) || hasJayModeExtension(id, { withTs: true })) {
         return await loadJayFile(this, id);
-      else if (compilerShared.hasExtension(id, compilerShared.JAY_CONTRACT_EXTENSION, { withTs: true })) {
+      } else if (hasExtension(id, 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;
@@ -453,15 +508,15 @@ function jayRuntime(jayOptions = {}, givenJayContext) {
       return null;
     },
     async transform(code, id) {
-      if (compilerShared.hasExtension(id, compilerShared.JAY_EXTENSION, { withTs: true }) || compilerShared.hasJayModeExtension(id, { withTs: true }))
+      if (hasExtension(id, JAY_EXTENSION, { withTs: true }) || hasJayModeExtension(id, { withTs: true }))
         return await transformJayFile(jayContext, this, code, id);
-      else if (compilerShared.hasExtension(id, compilerShared.JAY_CONTRACT_EXTENSION, { withTs: true })) {
-        const { filename, dirname } = getFileContext(id, compilerShared.JAY_CONTRACT_EXTENSION);
-        const parsedFile = compilerJayHtml.parseContract(code, filename);
-        const tsCode = await compilerJayHtml.compileContract(
+      else if (hasExtension(id, JAY_CONTRACT_EXTENSION, { withTs: true })) {
+        const { filename, dirname } = getFileContext(id, JAY_CONTRACT_EXTENSION);
+        const parsedFile = parseContract(code, filename);
+        const tsCode = await compileContract(
           parsedFile,
           `${dirname}/${filename}`,
-          compilerJayHtml.JAY_IMPORT_RESOLVER
+          JAY_IMPORT_RESOLVER
         );
         if (tsCode.val)
           return Promise.resolve({
@@ -476,9 +531,9 @@ function jayRuntime(jayOptions = {}, givenJayContext) {
       console.log(`[watchChange] ${id} ${change.event}`);
       jayContext.deleteCachedJayFile(id);
       if (server) {
-        const module2 = server.moduleGraph.getModuleById(id + compilerShared.TS_EXTENSION);
-        if (module2) {
-          server.moduleGraph.invalidateModule(module2);
+        const module = server.moduleGraph.getModuleById(id + TS_EXTENSION);
+        if (module) {
+          server.moduleGraph.invalidateModule(module);
           server.ws.send({
             type: "full-reload"
           });
@@ -487,13 +542,8 @@ function jayRuntime(jayOptions = {}, givenJayContext) {
     }
   };
 }
-exports.JayPluginContext = JayPluginContext;
-exports.jayDefinitions = jayDefinitions;
-exports.jayRuntime = jayRuntime;
-Object.keys(compiler).forEach((k) => {
-  if (k !== "default" && !Object.prototype.hasOwnProperty.call(exports, k))
-    Object.defineProperty(exports, k, {
-      enumerable: true,
-      get: () => compiler[k]
-    });
-});
+export {
+  JayPluginContext,
+  jayDefinitions,
+  jayRuntime
+};

package/package.json CHANGED Viewed

@@ -1,8 +1,9 @@
 {
   "name": "@jay-framework/rollup-plugin",
-  "version": "0.6.6",
+  "version": "0.6.8",
   "license": "Apache-2.0",
   "main": "dist/index.js",
+  "type": "module",
   "keywords": [
     "jay",
     "secure",
@@ -17,7 +18,7 @@
     "build:watch": "npm run build:js -- --watch & npm run build:types -- --watch",
     "build:watch:sandbox-counter": "vite -c test/jayRuntime/fixtures/counter/source/vite.config.ts",
     "build:js": "vite build",
-    "build:types": "tsup lib/index.ts --dts-only --format cjs",
+    "build:types": "tsup lib/index.ts --dts-only --format esm",
     "build:check-types": "tsc",
     "build:executable-bin": "chmod +x dist/index.js",
     "clean": "rimraf dist && rimraf test/jayRuntime/fixtures/counter/dist && rimraf test/jayRuntime/fixtures/exec/dist",
@@ -26,16 +27,16 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@jay-framework/compiler": "^0.6.6",
-    "@jay-framework/compiler-jay-html": "^0.6.6",
+    "@jay-framework/compiler": "^0.6.8",
+    "@jay-framework/compiler-jay-html": "^0.6.8",
     "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.8",
+    "@jay-framework/dev-environment": "^0.6.8",
+    "@jay-framework/runtime": "^0.6.8",
+    "@jay-framework/secure": "^0.6.8",
     "@types/node": "^20.11.5",
     "rimraf": "^5.0.5",
     "rollup": "^4.9.5",