@jay-framework/plugin-validator 0.23.1 → 0.24.1

package/dist/index.js

@@ -1995,6 +1995,96 @@ async function validatePackageJson(context, result) {
     });
   }
 }
+function isBareFunctionExport(exportName, context) {
+  const sourcePath = resolveExportSourceFile(exportName, context);
+  if (!sourcePath) return false;
+  let sourceCode;
+  try {
+    sourceCode = fs.readFileSync(sourcePath, "utf-8");
+  } catch {
+    return false;
+  }
+  const sourceFile = ts.createSourceFile(
+    sourcePath,
+    sourceCode,
+    ts.ScriptTarget.Latest,
+    true,
+    ts.ScriptKind.TS
+  );
+  for (const statement of sourceFile.statements) {
+    if (ts.isFunctionDeclaration(statement) && hasExportModifier(statement) && statement.name?.text === exportName) {
+      return true;
+    }
+  }
+  return false;
+}
+function resolveModulePathWithJsToTs(basePath) {
+  const result = resolveModulePath(basePath);
+  if (result) return result;
+  if (basePath.endsWith(".js")) {
+    return resolveModulePath(basePath.slice(0, -3) + ".ts");
+  }
+  return void 0;
+}
+function resolveExportSourceFile(exportName, context) {
+  const modulePath = context.manifest.module || "index";
+  const entryBase = path.join(context.pluginPath, modulePath);
+  const libEntryBase = path.join(context.pluginPath, "lib", modulePath);
+  const sourceEntry = resolveModulePath(entryBase) || resolveModulePath(libEntryBase);
+  if (!sourceEntry || !sourceEntry.endsWith(".ts")) return void 0;
+  return followExportChain(exportName, sourceEntry);
+}
+function followExportChain(exportName, filePath) {
+  let sourceCode;
+  try {
+    sourceCode = fs.readFileSync(filePath, "utf-8");
+  } catch {
+    return void 0;
+  }
+  const sourceFile = ts.createSourceFile(
+    filePath,
+    sourceCode,
+    ts.ScriptTarget.Latest,
+    true,
+    ts.ScriptKind.TS
+  );
+  const starReexportModules = [];
+  for (const statement of sourceFile.statements) {
+    if (ts.isExportDeclaration(statement) && statement.moduleSpecifier) {
+      if (!ts.isStringLiteral(statement.moduleSpecifier)) continue;
+      const moduleSpec = statement.moduleSpecifier.text;
+      if (!statement.exportClause) {
+        starReexportModules.push(moduleSpec);
+        continue;
+      }
+      if (ts.isNamedExports(statement.exportClause)) {
+        for (const element of statement.exportClause.elements) {
+          if (element.name.text === exportName) {
+            const resolvedBase = path.resolve(path.dirname(filePath), moduleSpec);
+            return resolveModulePathWithJsToTs(resolvedBase);
+          }
+        }
+      }
+    }
+    if (ts.isFunctionDeclaration(statement) && hasExportModifier(statement)) {
+      if (statement.name?.text === exportName) return filePath;
+    }
+    if (ts.isVariableStatement(statement) && hasExportModifier(statement)) {
+      for (const decl of statement.declarationList.declarations) {
+        if (ts.isIdentifier(decl.name) && decl.name.text === exportName) return filePath;
+      }
+    }
+  }
+  for (const moduleSpec of starReexportModules) {
+    if (!moduleSpec.startsWith(".")) continue;
+    const resolvedBase = path.resolve(path.dirname(filePath), moduleSpec);
+    const resolved = resolveModulePathWithJsToTs(resolvedBase);
+    if (!resolved) continue;
+    const found = followExportChain(exportName, resolved);
+    if (found) return found;
+  }
+  return void 0;
+}
 async function validateDynamicContracts(context, result) {
   const { dynamic_contracts } = context.manifest;
   if (!dynamic_contracts) return;
@@ -2021,6 +2111,13 @@ async function validateDynamicContracts(context, result) {
             suggestion: `Create generator file at ${generatorPath}.ts`
           });
         }
+      } else if (isBareFunctionExport(config.generator, context)) {
+        result.errors.push({
+          type: "export-mismatch",
+          message: `Generator "${config.generator}" for ${prefix} is a bare function — it must be a DynamicContractGenerator object`,
+          location: "plugin.yaml dynamic_contracts",
+          suggestion: `Use makeContractGenerator().generateWith(...) from @jay-framework/fullstack-component instead of exporting a plain function`
+        });
       }
     }
     if (config.component) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jay-framework/plugin-validator",
-  "version": "0.23.1",
+  "version": "0.24.1",
   "type": "module",
   "license": "Apache-2.0",
   "description": "Validation tool for Jay Stack plugins",
@@ -25,14 +25,14 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@jay-framework/compiler-jay-html": "^0.23.1",
-    "@jay-framework/compiler-shared": "^0.23.1",
-    "@jay-framework/typescript-bridge": "^0.23.1",
+    "@jay-framework/compiler-jay-html": "^0.24.1",
+    "@jay-framework/compiler-shared": "^0.24.1",
+    "@jay-framework/typescript-bridge": "^0.24.1",
     "chalk": "^4.1.2",
     "yaml": "^2.3.4"
   },
   "devDependencies": {
-    "@jay-framework/dev-environment": "^0.23.1",
+    "@jay-framework/dev-environment": "^0.24.1",
     "@types/node": "^22.15.21",
     "rimraf": "^5.0.5",
     "tsup": "^8.0.1",