@jay-framework/rollup-plugin 0.9.0 → 0.10.0

package/dist/index.d.ts

@@ -5,7 +5,7 @@ import { GenerateTarget, CompilerSourceFile } from '@jay-framework/compiler-shar
 import * as ts from 'typescript';
 import { ViteDevServer } from 'vite';
 
-declare function jayDefinitions(): {
+declare function jayDefinitions(projectRoot: string): {
     name: string;
     load(id: string): Promise<LoadResult>;
     transform(code: string, id: string): Promise<TransformResult>;

package/dist/index.js

@@ -7,16 +7,17 @@ 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 { 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 { 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 { 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) {
+  const basePath = getBasePath(filename);
   return {
-    filename: path.basename(filename).replace(extension, ""),
-    dirname: path.dirname(filename)
+    filename: path.basename(basePath).replace(extension, ""),
+    dirname: path.dirname(basePath)
   };
 }
 async function readFileAsString(filePath) {
@@ -42,7 +43,7 @@ function checkCodeErrors(code) {
     throw new Error("Empty code file");
   return code;
 }
-function jayDefinitions() {
+function jayDefinitions(projectRoot) {
   return {
     name: "jay:definitions",
     // this name will show up in warnings and errors
@@ -59,7 +60,7 @@ function jayDefinitions() {
         const context = this;
         const { filename, dirname } = getFileContext(id);
         const imports = getJayHtmlImports(code).filter(
-          (module) => module.endsWith("jay-html.d")
+          (module) => module && module.endsWith("jay-html.d")
         );
         await Promise.all(
           imports.map(
@@ -74,7 +75,8 @@ function jayDefinitions() {
           filename,
           dirname,
           {},
-          JAY_IMPORT_RESOLVER
+          JAY_IMPORT_RESOLVER,
+          projectRoot
         );
         const tsCode = checkValidationErrors(
           generateElementDefinitionFile(parsedFile)
@@ -96,10 +98,11 @@ function jayDefinitions() {
           `${dirname}/${filename}`,
           JAY_IMPORT_RESOLVER
         );
+        const validatedTsCode = checkValidationErrors(tsCode);
         const generatedFilename = await writeDefinitionFile(
           dirname,
           filename,
-          tsCode.val,
+          validatedTsCode,
           JAY_CONTRACT_DTS_EXTENSION
         );
         context.info(`[transform] generated ${generatedFilename}`);
@@ -113,7 +116,7 @@ const SANDBOX_ROOT_PREFIX = "jay-sandbox:";
 const SSR_METADATA = /* @__PURE__ */ new Map();
 function getJayMetadata(context, id, { checkPresent = false } = {}) {
   const metadataFromPlugin = context.getModuleInfo(id)?.meta?.jay;
-  const metadata = context["ssr"] ? metadataFromPlugin || SSR_METADATA.get(id) : metadataFromPlugin || {};
+  const metadata = context["ssr"] ? metadataFromPlugin || SSR_METADATA.get(id) || {} : metadataFromPlugin || {};
   validateJayMetadata(id, metadata, checkPresent);
   return metadata;
 }
@@ -173,7 +176,8 @@ async function getJayStructureFromJayHtmlSource(jayContext, code, id) {
     {
       relativePath: jayContext.jayOptions.tsConfigFilePath
     },
-    JAY_IMPORT_RESOLVER
+    JAY_IMPORT_RESOLVER,
+    jayContext.projectRoot
   );
 }
 async function getJayStructureFromTypeScriptSource(code, id) {
@@ -278,15 +282,18 @@ function watchChangesFor(context, sourcePath) {
   console.info(`[watch] add ${sourcePath}`);
 }
 function stripTSExtension(id) {
-  return id.replace(TS_EXTENSION, "").replace(TSX_EXTENSION, "");
+  const basePath = getBasePath(id);
+  return basePath.replace(TS_EXTENSION, "").replace(TSX_EXTENSION, "");
 }
 async function loadJayFile(context, id) {
   console.info(`[load] start ${id}`);
-  let { originId } = getJayMetadata(context, id);
-  if (!Boolean(originId))
+  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}`);
+  console.info(`[load] end ${id}, code length: ${code.length}`);
   return { code };
 }
 async function loadContractFile(context, id) {
@@ -294,9 +301,15 @@ async function loadContractFile(context, id) {
   let { originId } = getJayMetadata(context, id);
   if (!Boolean(originId))
     originId = stripTSExtension(id);
-  const code = await readFileAsString(originId);
+  const yamlCode = await readFileAsString(originId);
+  const { filename, dirname } = getFileContext(id, JAY_CONTRACT_EXTENSION);
+  const parsedFile = parseContract(yamlCode, filename);
+  const tsCode = await compileContract(parsedFile, `${dirname}/${filename}`, JAY_IMPORT_RESOLVER);
+  if (!tsCode.val) {
+    throw new Error(`Failed to compile contract ${id}: ${JSON.stringify(tsCode.validations)}`);
+  }
   console.info(`[load] end ${id}`);
-  return { code };
+  return { code: tsCode.val };
 }
 async function loadCssFile(context, jayContext, id, isVite) {
   if (isVite) {
@@ -312,7 +325,8 @@ async function loadCssFile(context, jayContext, id, isVite) {
       {
         relativePath: jayContext.jayOptions.tsConfigFilePath
       },
-      JAY_IMPORT_RESOLVER
+      JAY_IMPORT_RESOLVER,
+      jayContext.projectRoot
     );
     console.info(`[load] end ${id}`);
     return { code: jayHtml.val.css };
@@ -323,9 +337,27 @@ async function loadCssFile(context, jayContext, id, isVite) {
 }
 const JAY_HTML_CSS = ".css";
 async function resolveJayHtml(context, source, importer, options, root, generationTarget = GenerateTarget.jay) {
-  const resolved = await context.resolve(source, importer, { ...options, skipSelf: true });
+  const sourceParsed = parseJayModuleSpecifier(source);
+  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}`);
+    return {
+      id: source,
+      meta: appendJayMetadata(context, source, {
+        format: SourceFileFormat.JayHtml,
+        originId: originId2
+      })
+    };
+  }
+  const resolved = await context.resolve(sourceBasePath, importer, {
+    ...options,
+    skipSelf: true
+  });
   if (!resolved || hasExtension(resolved.id, TS_EXTENSION) || hasExtension(resolved.id, TSX_EXTENSION))
     return null;
+  const resolvedParsed = parseJayModuleSpecifier(resolved.id);
+  const resolvedBasePath = resolvedParsed.basePath;
   const resolvedJayMeta = jayMetadataFromModuleMetadata(resolved.id, resolved.meta);
   const extension = generationTarget === GenerateTarget.react ? TSX_EXTENSION : TS_EXTENSION;
   let format, originId;
@@ -333,23 +365,48 @@ async function resolveJayHtml(context, source, importer, options, root, generati
     format = resolvedJayMeta.format;
     originId = resolvedJayMeta.originId;
   } else {
-    watchChangesFor(context, resolved.id);
+    watchChangesFor(context, resolvedBasePath);
     format = SourceFileFormat.JayHtml;
-    originId = resolved.id;
+    originId = resolvedBasePath;
   }
-  const id = context["ssr"] && originId.startsWith(root) ? `${originId}${extension}`.slice(root.length) : `${originId}${extension}`;
+  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}`);
   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 });
-  const id = `${resolved.id}${TS_EXTENSION}`;
-  console.info(`[resolveId] resolved ${id}`);
+async function resolveJayContract(context, source, importer, options, root) {
+  const sourceParsed = parseJayModuleSpecifier(source);
+  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}`);
+    return {
+      id: source,
+      meta: appendJayMetadata(context, source, {
+        format: SourceFileFormat.JayContract,
+        originId: originId2
+      })
+    };
+  }
+  const resolved = await context.resolve(sourceBasePath, importer, {
+    ...options,
+    skipSelf: true
+  });
+  if (!resolved)
+    return null;
+  const resolvedParsed = parseJayModuleSpecifier(resolved.id);
+  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(
+    `[resolveId] contract  - id: ${id}, originId: ${originId}, ssr: ${context["ssr"]}`
+  );
   return {
     id,
     meta: appendJayMetadata(context, id, {
       format: SourceFileFormat.JayContract,
-      originId: resolved.id
+      originId
+      // Use basePath without query params for file loading
     })
   };
 }
@@ -478,7 +535,7 @@ function jayRuntime(jayOptions = {}, givenJayContext) {
       server = _server;
     },
     async resolveId(source, importer, options) {
-      if (hasExtension(source, JAY_EXTENSION)) {
+      if (hasJayExtension(source, JAY_EXTENSION)) {
         return await resolveJayHtml(
           this,
           source,
@@ -488,8 +545,8 @@ function jayRuntime(jayOptions = {}, givenJayContext) {
           jayOptions.generationTarget
         );
       }
-      if (hasExtension(source, JAY_CONTRACT_EXTENSION))
-        return await resolveJayContract(this, source, importer, options);
+      if (hasJayExtension(source, JAY_CONTRACT_EXTENSION))
+        return await resolveJayContract(this, source, importer, options, config?.root);
       if (hasJayModeExtension(source))
         return await resolveJayModeFile(this, source, importer, options);
       if (hasCssImportedByJayHtml(source, importer)) {
@@ -502,9 +559,9 @@ function jayRuntime(jayOptions = {}, givenJayContext) {
       return null;
     },
     async load(id) {
-      if (hasExtension(id, JAY_EXTENSION, { withTs: true }) || hasJayModeExtension(id, { withTs: true })) {
+      if (hasJayExtension(id, JAY_EXTENSION, { withTs: true }) || hasJayModeExtension(id, { withTs: true })) {
         return await loadJayFile(this, id);
-      } else if (hasExtension(id, JAY_CONTRACT_EXTENSION, { withTs: true })) {
+      } else if (hasJayExtension(id, JAY_CONTRACT_EXTENSION, { withTs: true })) {
         return await loadContractFile(this, id);
       } else if (isResolvedCssFile(id)) {
         return await loadCssFile(this, jayContext, id, isVite);
@@ -515,23 +572,8 @@ function jayRuntime(jayOptions = {}, givenJayContext) {
       return null;
     },
     async transform(code, id) {
-      if (hasExtension(id, JAY_EXTENSION, { withTs: true }) || hasJayModeExtension(id, { withTs: true }))
+      if (hasJayExtension(id, JAY_EXTENSION, { withTs: true }) || hasJayModeExtension(id, { withTs: true }))
         return await transformJayFile(jayContext, this, code, id);
-      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}`,
-          JAY_IMPORT_RESOLVER
-        );
-        if (tsCode.val)
-          return Promise.resolve({
-            code: tsCode.val
-          });
-        else
-          return Promise.reject(tsCode.validations);
-      }
       return null;
     },
     watchChange(id, change) {

package/package.json

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