@jay-framework/jay-stack-cli 0.18.4 → 0.19.1

package/dist/index.js

@@ -8,7 +8,7 @@ import path from "path";
 import fs, { promises } from "fs";
 import YAML from "yaml";
 import { getLogger, setDevLogger, createDevLogger } from "@jay-framework/logger";
-import { parseJayFile, JAY_IMPORT_RESOLVER, generateElementDefinitionFile, ContractTagType, parseContract, generateElementFile, generateServerElementFile, htmlElementTagNameMap } from "@jay-framework/compiler-jay-html";
+import { parseJayFile, JAY_IMPORT_RESOLVER, generateElementDefinitionFile, ContractTagType, parseContract, generateElementFile, generateServerElementFile, htmlElementTagNameMap, loadLinkedContract, getLinkedContractDir } from "@jay-framework/compiler-jay-html";
 import { JAY_CONTRACT_EXTENSION, JAY_EXTENSION, resolvePluginManifest, LOCAL_PLUGIN_PATH, JayAtomicType, JayEnumType, loadPluginManifest, RuntimeMode, GenerateTarget } from "@jay-framework/compiler-shared";
 import { scanPlugins as scanPlugins$1, listContracts, materializeContracts } from "@jay-framework/stack-server-runtime";
 import { listContracts as listContracts2, materializeContracts as materializeContracts2 } from "@jay-framework/stack-server-runtime";
@@ -4266,17 +4266,44 @@ function checkHeadlessInstanceProps(jayHtml, file) {
   walkElement(jayHtml.body);
   return warnings;
 }
+function resolveLinkedTags(tags, contractDir) {
+  return tags.map((tag) => {
+    if (tag.link) {
+      const linked = loadLinkedContract(tag.link, contractDir, JAY_IMPORT_RESOLVER);
+      if (linked) {
+        const childDir = getLinkedContractDir(tag.link, contractDir, JAY_IMPORT_RESOLVER);
+        return { ...tag, tags: resolveLinkedTags(linked.tags, childDir) };
+      }
+    }
+    if (tag.tags) {
+      return { ...tag, tags: resolveLinkedTags(tag.tags, contractDir) };
+    }
+    return tag;
+  });
+}
+function resolveContractLinks(contract, contractPath) {
+  if (!contractPath)
+    return contract;
+  const contractDir = path.dirname(contractPath);
+  return { ...contract, tags: resolveLinkedTags(contract.tags, contractDir) };
+}
 async function runPluginValidators(projectRoot, parsedFiles, errors, warnings) {
-  const scannedPlugins = await scanPlugins$1({ projectRoot });
+  const scannedPlugins = await scanPlugins$1({ projectRoot, includeDevDeps: true });
+  const loadedValidators = [];
   for (const [, plugin] of scannedPlugins) {
     if (!plugin.manifest.validators)
       continue;
     for (const validatorDef of plugin.manifest.validators) {
       let validatorFn;
       try {
-        const handlerPath = path.resolve(plugin.pluginPath, validatorDef.handler);
-        const handlerModule = await import(handlerPath);
-        validatorFn = handlerModule.validate;
+        let handlerModule;
+        if (plugin.isLocal) {
+          const handlerPath = path.resolve(plugin.pluginPath, validatorDef.handler);
+          handlerModule = await import(handlerPath);
+        } else {
+          handlerModule = await import(plugin.packageName);
+        }
+        validatorFn = plugin.isLocal ? handlerModule.validate ?? handlerModule.default : handlerModule[validatorDef.handler];
         if (typeof validatorFn !== "function") {
           errors.push({
             file: `plugin:${plugin.name}`,
@@ -4294,26 +4321,35 @@ async function runPluginValidators(projectRoot, parsedFiles, errors, warnings) {
         continue;
       }
       const source = `${plugin.name}/${validatorDef.name}`;
+      loadedValidators.push(source);
       for (const { relativePath, parsed } of parsedFiles) {
+        const pageContractPath = parsed.contractRef ? path.resolve(
+          path.dirname(path.resolve(projectRoot, relativePath)),
+          parsed.contractRef
+        ) : void 0;
+        const resolvedPageContract = parsed.contract ? resolveContractLinks(parsed.contract, pageContractPath) : void 0;
         const ctx = {
           filePath: relativePath,
           body: parsed.body,
-          contract: parsed.contract ? {
-            name: parsed.contract.name,
-            tags: parsed.contract.tags,
-            props: parsed.contract.props,
-            params: parsed.contract.params
+          contract: resolvedPageContract ? {
+            name: resolvedPageContract.name,
+            tags: resolvedPageContract.tags,
+            props: resolvedPageContract.props,
+            params: resolvedPageContract.params
           } : void 0,
-          headlessImports: parsed.headlessImports.map((imp) => ({
-            key: imp.key,
-            contractName: imp.contractName,
-            contract: imp.contract ? {
-              name: imp.contract.name,
-              tags: imp.contract.tags,
-              props: imp.contract.props,
-              params: imp.contract.params
-            } : void 0
-          })),
+          headlessImports: parsed.headlessImports.map((imp) => {
+            const resolvedContract = imp.contract ? resolveContractLinks(imp.contract, imp.contractPath) : void 0;
+            return {
+              key: imp.key,
+              contractName: imp.contractName,
+              contract: resolvedContract ? {
+                name: resolvedContract.name,
+                tags: resolvedContract.tags,
+                props: resolvedContract.props,
+                params: resolvedContract.params
+              } : void 0
+            };
+          }),
           projectRoot
         };
         try {
@@ -4347,6 +4383,7 @@ async function runPluginValidators(projectRoot, parsedFiles, errors, warnings) {
       }
     }
   }
+  return loadedValidators;
 }
 async function validateJayFiles(options = {}) {
   const config = loadConfig();
@@ -4487,14 +4524,15 @@ async function validateJayFiles(options = {}) {
       }
     }
   }
-  await runPluginValidators(projectRoot, parsedFiles, errors, warnings);
+  const pluginValidators = await runPluginValidators(projectRoot, parsedFiles, errors, warnings);
   return {
     valid: errors.length === 0,
     jayHtmlFilesScanned: jayHtmlFiles.length,
     contractFilesScanned: contractFiles.length,
     errors,
     warnings,
-    coverage
+    coverage,
+    pluginValidators
   };
 }
 function printJayValidationResult(result, options) {
@@ -4504,65 +4542,87 @@ function printJayValidationResult(result, options) {
     return;
   }
   logger.important("");
-  if (result.valid) {
-    logger.important(chalk.green("✅ Jay Stack validation successful!\n"));
+  const coreErrors = result.errors.filter((e2) => e2.stage !== "plugin");
+  const coreWarnings = result.warnings.filter((w) => !w.source);
+  logger.important(chalk.bold("📦 jay-stack (core)"));
+  if (coreErrors.length === 0) {
     logger.important(
-      `Scanned ${result.jayHtmlFilesScanned} .jay-html files, ${result.contractFilesScanned} .jay-contract files`
+      chalk.green(
+        `   ✅ ${result.jayHtmlFilesScanned} .jay-html files, ${result.contractFilesScanned} .jay-contract files — no errors`
+      )
     );
-    logger.important("No errors found.");
   } else {
-    logger.important(chalk.red("❌ Jay Stack validation failed\n"));
-    logger.important("Errors:");
-    for (const error of result.errors) {
-      const prefix = error.source ? `[${error.source}] ` : "";
-      logger.important(chalk.red(`  ❌ ${error.file}`));
-      logger.important(chalk.gray(`     ${prefix}${error.message}`));
+    for (const error of coreErrors) {
+      logger.important(chalk.red(`   ❌ ${error.file}`));
+      logger.important(chalk.gray(`      ${error.message}`));
       if (error.suggestion) {
-        logger.important(chalk.blue(`     Suggestion: ${error.suggestion}`));
+        logger.important(chalk.blue(`      Suggestion: ${error.suggestion}`));
       }
-      logger.important("");
     }
-    const validFiles = result.jayHtmlFilesScanned + result.contractFilesScanned - result.errors.length;
-    logger.important(
-      chalk.red(`${result.errors.length} error(s) found, ${validFiles} file(s) valid.`)
-    );
   }
-  if (result.warnings.length > 0) {
+  for (const warning of coreWarnings) {
+    logger.important(chalk.yellow(`   ⚠ ${warning.file}`));
+    logger.important(chalk.gray(`     ${warning.message}`));
+    if (warning.suggestion) {
+      logger.important(chalk.blue(`     Suggestion: ${warning.suggestion}`));
+    }
+  }
+  const pluginErrors = result.errors.filter((e2) => e2.stage === "plugin");
+  const pluginWarnings = result.warnings.filter((w) => !!w.source);
+  for (const validatorName of result.pluginValidators) {
+    const errs = pluginErrors.filter((e2) => e2.source === validatorName);
+    const warns = pluginWarnings.filter((w) => w.source === validatorName);
     logger.important("");
-    logger.important(chalk.yellow("Warnings:"));
-    for (const warning of result.warnings) {
-      const prefix = warning.source ? `[${warning.source}] ` : "";
-      logger.important(chalk.yellow(`  ⚠ ${warning.file}`));
-      logger.important(chalk.gray(`    ${prefix}${warning.message}`));
+    logger.important(chalk.bold(`📦 ${validatorName}`));
+    if (errs.length === 0 && warns.length === 0) {
+      logger.important(chalk.green("   ✅ No issues found"));
+    }
+    for (const error of errs) {
+      logger.important(chalk.red(`   ❌ ${error.file}`));
+      logger.important(chalk.gray(`      ${error.message}`));
+      if (error.suggestion) {
+        logger.important(chalk.blue(`      Suggestion: ${error.suggestion}`));
+      }
+    }
+    for (const warning of warns) {
+      logger.important(chalk.yellow(`   ⚠ ${warning.file}`));
+      logger.important(chalk.gray(`      ${warning.message}`));
       if (warning.suggestion) {
-        logger.important(chalk.blue(`    Suggestion: ${warning.suggestion}`));
+        logger.important(chalk.blue(`      Suggestion: ${warning.suggestion}`));
       }
-      logger.important("");
     }
   }
   if (result.coverage.length > 0) {
     logger.important("");
-    logger.important("Tag Coverage:");
+    logger.important(chalk.bold("📦 Tag Coverage"));
     for (const fileCov of result.coverage) {
-      logger.important(`  ${fileCov.file}`);
+      logger.important(`   ${fileCov.file}`);
       for (const contract of fileCov.contracts) {
         const label = contract.key ? `${contract.key} (${contract.contractName})` : contract.contractName;
         logger.important(
-          `    ${label}: ${contract.usedTags}/${contract.totalTags} tags used`
+          `     ${label}: ${contract.usedTags}/${contract.totalTags} tags used`
         );
         if (contract.unusedTags.length > 0) {
-          logger.important(chalk.gray(`      Unused: ${contract.unusedTags.join(", ")}`));
+          logger.important(
+            chalk.gray(`       Unused: ${contract.unusedTags.join(", ")}`)
+          );
         }
         if (contract.requiredUnusedTags.length > 0) {
           logger.important(
             chalk.yellow(
-              `      ⚠ Required unused: ${contract.requiredUnusedTags.join(", ")}`
+              `       ⚠ Required unused: ${contract.requiredUnusedTags.join(", ")}`
             )
           );
         }
       }
     }
   }
+  logger.important("");
+  if (result.valid) {
+    logger.important(chalk.green("Validation passed."));
+  } else {
+    logger.important(chalk.red(`Validation failed — ${result.errors.length} error(s).`));
+  }
 }
 async function runValidate(scanPath, options) {
   const result = await validateJayFiles({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jay-framework/jay-stack-cli",
-  "version": "0.18.4",
+  "version": "0.19.1",
   "license": "Apache-2.0",
   "type": "module",
   "main": "dist/index.js",
@@ -24,15 +24,15 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@jay-framework/compiler-jay-html": "^0.18.4",
-    "@jay-framework/compiler-shared": "^0.18.4",
-    "@jay-framework/dev-server": "^0.18.4",
-    "@jay-framework/editor-server": "^0.18.4",
-    "@jay-framework/fullstack-component": "^0.18.4",
-    "@jay-framework/logger": "^0.18.4",
-    "@jay-framework/plugin-validator": "^0.18.4",
-    "@jay-framework/production-server": "^0.18.4",
-    "@jay-framework/stack-server-runtime": "^0.18.4",
+    "@jay-framework/compiler-jay-html": "^0.19.1",
+    "@jay-framework/compiler-shared": "^0.19.1",
+    "@jay-framework/dev-server": "^0.19.1",
+    "@jay-framework/editor-server": "^0.19.1",
+    "@jay-framework/fullstack-component": "^0.19.1",
+    "@jay-framework/logger": "^0.19.1",
+    "@jay-framework/plugin-validator": "^0.19.1",
+    "@jay-framework/production-server": "^0.19.1",
+    "@jay-framework/stack-server-runtime": "^0.19.1",
     "chalk": "^4.1.2",
     "commander": "^14.0.0",
     "express": "^5.0.1",
@@ -43,7 +43,7 @@
     "yaml": "^2.3.4"
   },
   "devDependencies": {
-    "@jay-framework/dev-environment": "^0.18.4",
+    "@jay-framework/dev-environment": "^0.19.1",
     "@types/express": "^5.0.2",
     "@types/node": "^22.15.21",
     "nodemon": "^3.0.3",