@jay-framework/rollup-plugin 0.12.0 → 0.14.0

package/dist/index.js

@@ -7,13 +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, parseJayModuleSpecifier, RuntimeMode, TS_EXTENSION, TSX_EXTENSION, JAY_QUERY_WORKER_TRUSTED_TS, CSS_EXTENSION, JAY_QUERY_MAIN_SANDBOX, JAY_QUERY_HYDRATE, hasJayExtension, hasJayModeExtension, Import } from "@jay-framework/compiler-shared";
 import { readFile, mkdir } from "node:fs/promises";
 import { writeFile } from "fs/promises";
 import { getLogger } from "@jay-framework/logger";
-import { getJayHtmlImports, parseJayFile, JAY_IMPORT_RESOLVER, parseContract, compileContract, generateSandboxRootFile, generateElementBridgeFile } from "@jay-framework/compiler-jay-html";
+import fs from "node:fs";
+import { getJayHtmlImports, parseJayFile, JAY_IMPORT_RESOLVER, parseContract, compileContract, parseAction, compileAction, defaultContractResolver, generateSandboxRootFile, generateElementBridgeFile, generateElementHydrateFile } 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 {
@@ -32,7 +33,10 @@ async function writeDefinitionFile(dirname, filename, source, extension) {
 async function writeGeneratedFile(jayContext, context, id, code) {
   if (!jayContext.outputDir)
     return;
-  const relativePath = path.dirname(path.relative(jayContext.projectRoot, id));
+  let relativePath = path.dirname(path.relative(jayContext.projectRoot, id));
+  if (relativePath.startsWith("build" + path.sep)) {
+    relativePath = relativePath.slice(("build" + path.sep).length);
+  }
   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" });
@@ -44,12 +48,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 };
@@ -108,6 +140,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;
     }
@@ -201,14 +248,23 @@ async function generateCodeFromStructure(jayContext, context, code, id, meta, ja
   const { format } = meta;
   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);
+  const isHydrate = parseJayModuleSpecifier(id).isHydrate === true;
+  const tsCode = format === SourceFileFormat.JayHtml ? generateCodeFromJayHtmlFile(
+    mode,
+    jayFile,
+    generationTarget,
+    isHydrate
+  ) : generateCodeFromTsFile(jayContext, mode, jayFile, id, code);
   await writeGeneratedFile(jayContext, context, id, tsCode);
   return tsCode;
 }
-function generateCodeFromJayHtmlFile(mode, jayFile, generationTarget) {
+function generateCodeFromJayHtmlFile(mode, jayFile, generationTarget, isHydrate = false) {
   switch (mode) {
     case RuntimeMode.MainTrusted:
     case RuntimeMode.MainSandbox:
+      if (isHydrate) {
+        return checkValidationErrors(generateElementHydrateFile(jayFile, mode));
+      }
       return checkValidationErrors(generateElementFile(jayFile, mode, generationTarget));
     case RuntimeMode.WorkerSandbox:
       return generateElementBridgeFile(jayFile);
@@ -458,7 +514,7 @@ function getResolvedId(resolved, mode, originId) {
   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 }));
+  return hasExtension(source, CSS_EXTENSION) && importer && (hasExtension(importer, JAY_EXTENSION, { withTs: true }) || hasExtension(importer, JAY_EXTENSION + JAY_QUERY_MAIN_SANDBOX, { withTs: true }) || hasExtension(importer, JAY_EXTENSION + JAY_QUERY_HYDRATE, { withTs: true }));
 }
 function resolveCssFileImportedByJayHtml(context, importer, root) {
   const originImporter = importer.split("?")[0];
@@ -490,7 +546,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);
       })
     );

package/package.json

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