@jay-framework/rollup-plugin 0.11.0 → 0.13.0

package/dist/index.js

@@ -7,12 +7,14 @@ var __publicField = (obj, key, value) => {
 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 { getBasePath, JAY_EXTENSION, hasExtension, JAY_CONTRACT_EXTENSION, checkValidationErrors, JAY_DTS_EXTENSION, JAY_CONTRACT_DTS_EXTENSION, SourceFileFormat, getModeFromExtension, GenerateTarget, RuntimeMode, TS_EXTENSION, TSX_EXTENSION, parseJayModuleSpecifier, JAY_QUERY_WORKER_TRUSTED_TS, CSS_EXTENSION, JAY_QUERY_MAIN_SANDBOX, hasJayExtension, hasJayModeExtension, Import } from "@jay-framework/compiler-shared";
+import { getBasePath, JAY_EXTENSION, hasExtension, JAY_CONTRACT_EXTENSION, JAY_ACTION_EXTENSION, checkValidationErrors, JAY_DTS_EXTENSION, JAY_CONTRACT_DTS_EXTENSION, JAY_ACTION_DTS_EXTENSION, SourceFileFormat, getModeFromExtension, GenerateTarget, RuntimeMode, TS_EXTENSION, TSX_EXTENSION, parseJayModuleSpecifier, JAY_QUERY_WORKER_TRUSTED_TS, CSS_EXTENSION, JAY_QUERY_MAIN_SANDBOX, hasJayExtension, 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 { getLogger } from "@jay-framework/logger";
+import fs from "node:fs";
+import { getJayHtmlImports, parseJayFile, JAY_IMPORT_RESOLVER, parseContract, compileContract, parseAction, compileAction, defaultContractResolver, generateSandboxRootFile, generateElementBridgeFile } from "@jay-framework/compiler-jay-html";
 import { createRequire } from "module";
-import fs from "fs";
+import fs$1 from "fs";
 function getFileContext(filename, extension = JAY_EXTENSION) {
   const basePath = getBasePath(filename);
   return {
@@ -35,7 +37,7 @@ async function writeGeneratedFile(jayContext, context, id, code) {
   const filePath = path.resolve(jayContext.outputDir, relativePath, path.basename(id));
   await mkdir(path.dirname(filePath), { recursive: true });
   await writeFile(filePath, code, { encoding: "utf8", flag: "w" });
-  console.info(["[transform] written", filePath].join(" "));
+  getLogger().info(["[transform] written", filePath].join(" "));
   return filePath;
 }
 function checkCodeErrors(code) {
@@ -43,12 +45,40 @@ function checkCodeErrors(code) {
     throw new Error("Empty code file");
   return code;
 }
+function createContractResolver(baseDir, importResolver) {
+  return (contractSubpath) => {
+    const { viewStateName } = defaultContractResolver(contractSubpath);
+    const subpathWithExt = contractSubpath.endsWith(JAY_CONTRACT_EXTENSION) ? contractSubpath : contractSubpath + JAY_CONTRACT_EXTENSION;
+    const candidates = [
+      `./${subpathWithExt}`,
+      `../contracts/${subpathWithExt}`,
+      `./contracts/${subpathWithExt}`,
+      `../${subpathWithExt}`
+    ];
+    for (const candidate of candidates) {
+      const absolutePath = importResolver.resolveLink(baseDir, candidate);
+      if (fs.existsSync(absolutePath)) {
+        const relativePath = path.relative(baseDir, absolutePath);
+        const importPath = relativePath.startsWith(".") ? relativePath : "./" + relativePath;
+        return { importPath, viewStateName };
+      }
+    }
+    try {
+      const absolutePath = importResolver.resolveLink(baseDir, subpathWithExt);
+      const relativePath = path.relative(baseDir, absolutePath);
+      const importPath = relativePath.startsWith(".") ? relativePath : "./" + relativePath;
+      return { importPath, viewStateName };
+    } catch {
+      return { importPath: "./" + subpathWithExt, viewStateName };
+    }
+  };
+}
 function jayDefinitions(projectRoot) {
   return {
     name: "jay:definitions",
     // this name will show up in warnings and errors
     async load(id) {
-      if (hasExtension(id, JAY_EXTENSION) || hasExtension(id, JAY_CONTRACT_EXTENSION)) {
+      if (hasExtension(id, JAY_EXTENSION) || hasExtension(id, JAY_CONTRACT_EXTENSION) || hasExtension(id, JAY_ACTION_EXTENSION)) {
         const code = await readFileAsString(id);
         checkCodeErrors(code);
         return { code };
@@ -107,6 +137,21 @@ function jayDefinitions(projectRoot) {
         );
         context.info(`[transform] generated ${generatedFilename}`);
         return { code: "", map: null };
+      } else if (hasExtension(id, JAY_ACTION_EXTENSION)) {
+        const context = this;
+        const { filename, dirname } = getFileContext(id, JAY_ACTION_EXTENSION);
+        const parsedFile = parseAction(code, filename);
+        const contractResolver = createContractResolver(dirname, JAY_IMPORT_RESOLVER);
+        const tsCode = compileAction(parsedFile, contractResolver);
+        const validatedTsCode = checkValidationErrors(tsCode);
+        const generatedFilename = await writeDefinitionFile(
+          dirname,
+          filename,
+          validatedTsCode,
+          JAY_ACTION_DTS_EXTENSION
+        );
+        context.info(`[transform] generated ${generatedFilename}`);
+        return { code: "", map: null };
       }
       return null;
     }
@@ -269,35 +314,35 @@ async function transformJayFile(jayContext, context, code, id) {
   if (!Boolean(getJayMetadata(context, id).originId))
     return null;
   const mode = getModeFromExtension(id);
-  console.info(`[transform] start ${mode} ${id}`);
+  getLogger().info(`[transform] start ${mode} ${id}`);
   const { meta, jayFile } = await getJayFileStructure(jayContext, context, code, id);
   const tsCode = await generateCodeFromStructure(jayContext, context, code, id, meta, jayFile);
-  console.info(`[transform] end ${mode} ${id}`);
+  getLogger().info(`[transform] end ${mode} ${id}`);
   return { code: tsCode };
 }
 function watchChangesFor(context, sourcePath) {
   if (context.getWatchFiles().includes(sourcePath))
     return;
   context.addWatchFile(sourcePath);
-  console.info(`[watch] add ${sourcePath}`);
+  getLogger().info(`[watch] add ${sourcePath}`);
 }
 function stripTSExtension(id) {
   const basePath = getBasePath(id);
   return basePath.replace(TS_EXTENSION, "").replace(TSX_EXTENSION, "");
 }
 async function loadJayFile(context, id) {
-  console.info(`[load] start ${id}`);
+  getLogger().info(`[load] start ${id}`);
   const metadata = getJayMetadata(context, id);
   let originId = metadata.originId;
   if (!Boolean(originId)) {
     originId = stripTSExtension(id);
   }
   const code = checkCodeErrors(await readFileAsString(originId));
-  console.info(`[load] end ${id}, code length: ${code.length}`);
+  getLogger().info(`[load] end ${id}, code length: ${code.length}`);
   return { code };
 }
 async function loadContractFile(context, id) {
-  console.info(`[load] start ${id}`);
+  getLogger().info(`[load] start ${id}`);
   let { originId } = getJayMetadata(context, id);
   if (!Boolean(originId))
     originId = stripTSExtension(id);
@@ -308,12 +353,12 @@ async function loadContractFile(context, id) {
   if (!tsCode.val) {
     throw new Error(`Failed to compile contract ${id}: ${JSON.stringify(tsCode.validations)}`);
   }
-  console.info(`[load] end ${id}`);
+  getLogger().info(`[load] end ${id}`);
   return { code: tsCode.val };
 }
 async function loadCssFile(context, jayContext, id, isVite) {
   if (isVite) {
-    console.info(`[load] start ${id}`);
+    getLogger().info(`[load] start ${id}`);
     const { originId } = getJayMetadata(context, id);
     const code = checkCodeErrors(await readFileAsString(originId));
     const fileName = path.basename(originId);
@@ -333,10 +378,10 @@ async function loadCssFile(context, jayContext, id, isVite) {
         watchChangesFor(context, cssFile);
       }
     }
-    console.info(`[load] end ${id}`);
+    getLogger().info(`[load] end ${id}`);
     return { code: jayHtml.val?.css };
   } else {
-    console.info(`[load] rollup environment - css not supported - ignoring css ${id}`);
+    getLogger().info(`[load] rollup environment - css not supported - ignoring css ${id}`);
     return { code: "" };
   }
 }
@@ -346,7 +391,7 @@ async function resolveJayHtml(context, source, importer, options, root, generati
   const sourceBasePath = sourceParsed.basePath;
   if (source.endsWith(TS_EXTENSION) || source.endsWith(TSX_EXTENSION)) {
     const originId2 = sourceBasePath.replace(TS_EXTENSION, "").replace(TSX_EXTENSION, "");
-    console.info(`[resolveId] already resolved ${source}, originId: ${originId2}`);
+    getLogger().info(`[resolveId] already resolved ${source}, originId: ${originId2}`);
     return {
       id: source,
       meta: appendJayMetadata(context, source, {
@@ -376,7 +421,7 @@ async function resolveJayHtml(context, source, importer, options, root, generati
   }
   const baseWithQuery = sourceParsed.fullQueryString ? `${originId}${sourceParsed.fullQueryString}` : originId;
   const id = context["ssr"] && originId.startsWith(root) ? `${baseWithQuery}${extension}`.slice(root.length) : `${baseWithQuery}${extension}`;
-  console.info(`[resolveId] resolved ${id} as ${format}`);
+  getLogger().info(`[resolveId] resolved ${id} as ${format}`);
   return { id, meta: appendJayMetadata(context, id, { format, originId }) };
 }
 async function resolveJayContract(context, source, importer, options, root) {
@@ -384,7 +429,7 @@ async function resolveJayContract(context, source, importer, options, root) {
   const sourceBasePath = sourceParsed.basePath;
   if (source.endsWith(TS_EXTENSION) || source.endsWith(TSX_EXTENSION)) {
     const originId2 = sourceBasePath.replace(TS_EXTENSION, "").replace(TSX_EXTENSION, "");
-    console.info(`[resolveId] already resolved contract ${source}, originId: ${originId2}`);
+    getLogger().info(`[resolveId] already resolved contract ${source}, originId: ${originId2}`);
     return {
       id: source,
       meta: appendJayMetadata(context, source, {
@@ -403,7 +448,7 @@ async function resolveJayContract(context, source, importer, options, root) {
   const originId = resolvedParsed.basePath;
   const baseWithQuery = sourceParsed.fullQueryString ? `${originId}${sourceParsed.fullQueryString}` : originId;
   const id = context["ssr"] && originId.startsWith(root) ? `${baseWithQuery}${TS_EXTENSION}`.slice(root.length) : `${baseWithQuery}${TS_EXTENSION}`;
-  console.info(
+  getLogger().info(
     `[resolveId] contract  - id: ${id}, originId: ${originId}, ssr: ${context["ssr"]}`
   );
   return {
@@ -429,7 +474,7 @@ async function resolveJayModeFile(context, source, importer, options) {
   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}`);
+  getLogger().info(`[resolveId] resolved ${id} as ${format}`);
   return { id, meta: appendJayMetadata(context, id, { format, originId }, resolvedJayMeta) };
 }
 async function removeSandboxPrefixForWorkerRoot(context, source, importer, options) {
@@ -442,7 +487,7 @@ async function removeSandboxPrefixForWorkerRoot(context, source, importer, optio
     return null;
   const id = `${resolved.id}${JAY_QUERY_WORKER_TRUSTED_TS}`;
   const originId = id.split("?")[0];
-  console.info(`[resolveId] resolved sandbox root ${id}`);
+  getLogger().info(`[resolveId] resolved sandbox root ${id}`);
   return {
     id,
     meta: appendJayMetadata(context, id, {
@@ -489,7 +534,7 @@ class JayPluginContext {
     this.tsPrinter = createPrinter({ newLine: NewLineKind.LineFeed });
     let compilerPatternsParseResult = compileFunctionSplitPatternsBlock(
       (jayOptions.compilerPatternFiles || []).map((fileName) => {
-        let fileContent = fs.readFileSync(fileName, { encoding: "utf8" });
+        let fileContent = fs$1.readFileSync(fileName, { encoding: "utf8" });
         return createTsSourceFileFromSource(fileName, fileContent);
       })
     );
@@ -501,14 +546,14 @@ class JayPluginContext {
     this.globalFunctionsRepository = new FunctionRepositoryBuilder();
   }
   cacheJayFile(id, jayFile) {
-    console.info("[cache] set", id);
+    getLogger().info(`[cache] set ${id}`);
     this.jayFileCache.set(id, jayFile);
     return jayFile;
   }
   getCachedJayFile(id) {
     const jayFile = this.jayFileCache.get(id);
     if (Boolean(jayFile)) {
-      console.info("[cache] hit", id);
+      getLogger().info(`[cache] hit ${id}`);
     }
     return jayFile;
   }
@@ -534,7 +579,7 @@ function jayRuntime(jayOptions = {}, givenJayContext) {
           (plugin) => plugin.name === "vite:build-metadata" || plugin.name?.startsWith("vite:")
         )
       );
-      console.log("[buildStart] Vite detected:", isVite);
+      getLogger().info("[buildStart] Vite detected: " + isVite);
     },
     configureServer(_server) {
       server = _server;
@@ -582,7 +627,7 @@ function jayRuntime(jayOptions = {}, givenJayContext) {
       return null;
     },
     watchChange(id, change) {
-      console.log(`[watchChange] ${id} ${change.event}`);
+      getLogger().info(`[watchChange] ${id} ${change.event}`);
       jayContext.deleteCachedJayFile(id);
       if (server) {
         const module = server.moduleGraph.getModuleById(id + TS_EXTENSION);

package/package.json

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