@spfn/core 0.1.0-alpha.65 → 0.1.0-alpha.68

package/dist/codegen/generators/index.d.ts

@@ -1,16 +1,16 @@
-import { c as createContractGenerator } from '../../generator-DHiAqhKv.js';
-export { C as ContractGeneratorConfig } from '../../generator-DHiAqhKv.js';
+import { c as createContractGenerator } from '../../index-DHiAqhKv.js';
+export { C as ContractGeneratorConfig } from '../../index-DHiAqhKv.js';
 
 /**
- * SPFN Core Generators Registry
+ * Built-in Generators Export
  *
- * Exports generators for use with package-based naming convention
- * e.g., @spfn/core:contract
+ * Provides a registry of all built-in generators
  */
 
 /**
- * Generators registry
- * Maps generator names to their factory functions
+ * Registry of available generators
+ *
+ * Used by package-based generator loading (e.g., "@spfn/core:contract")
  */
 declare const generators: {
     contract: typeof createContractGenerator;

package/dist/codegen/generators/index.js

@@ -1,14 +1,13 @@
-import { join, dirname } from 'path';
+import { join } from 'path';
 import { existsSync, mkdirSync, accessSync, constants, writeFileSync, unlinkSync, createWriteStream, statSync, readdirSync, renameSync, readFileSync } from 'fs';
 import { readdir, stat, mkdir, writeFile } from 'fs/promises';
 import * as ts from 'typescript';
 import pino from 'pino';
 
-// src/codegen/generators/contract/generator.ts
-async function scanContracts(contractsDir) {
+// src/codegen/built-in/contract/index.ts
+async function scanContracts(contractsDir, packagePrefix) {
   const contractFiles = await scanContractFiles(contractsDir);
   const mappings = [];
-  const packagePrefix = getPackagePrefix(contractsDir);
   for (let i = 0; i < contractFiles.length; i++) {
     const filePath = contractFiles[i];
     const exports = extractContractExports(filePath);
@@ -19,10 +18,14 @@ async function scanContracts(contractsDir) {
           `Contract '${contractExport.name}' in ${filePath} must use absolute path. Found: '${contractExport.path}'. Use '/your-path' instead.`
         );
       }
-      const finalPath = packagePrefix ? `${packagePrefix}${contractExport.path}` : contractExport.path;
+      if (packagePrefix && !contractExport.path.startsWith(packagePrefix)) {
+        throw new Error(
+          `Contract '${contractExport.name}' in ${filePath} must include package prefix. Expected path to start with '${packagePrefix}', but found: '${contractExport.path}'. Example: path: '${packagePrefix}/${contractExport.path}'`
+        );
+      }
       mappings.push({
         method: contractExport.method,
-        path: finalPath,
+        path: contractExport.path,
         contractName: contractExport.name,
         contractImportPath: getImportPath(filePath),
         routeFile: "",
@@ -172,24 +175,6 @@ function extractContractData(objectLiteral) {
 function isContractName(name) {
   return name.indexOf("Contract") !== -1 || name.indexOf("contract") !== -1 || name.endsWith("Schema") || name.endsWith("schema");
 }
-function getPackagePrefix(contractsDir) {
-  try {
-    let currentDir = dirname(contractsDir);
-    for (let i = 0; i < 5; i++) {
-      const packageJsonPath = join(currentDir, "package.json");
-      try {
-        const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
-        if (packageJson.spfn?.prefix) {
-          return packageJson.spfn.prefix;
-        }
-      } catch {
-      }
-      currentDir = dirname(currentDir);
-    }
-  } catch {
-  }
-  return "";
-}
 function getImportPath(filePath) {
   const srcIndex = filePath.indexOf("/src/");
   if (srcIndex === -1) {
@@ -206,7 +191,7 @@ function getImportPath(filePath) {
   return "@/" + cleanPath;
 }
 
-// src/codegen/scanners/route-scanner.ts
+// src/codegen/built-in/contract/helpers.ts
 function groupByResource(mappings) {
   const grouped = {};
   for (let i = 0; i < mappings.length; i++) {
@@ -220,7 +205,11 @@ function groupByResource(mappings) {
   return grouped;
 }
 function extractResourceName(path) {
-  const segments = path.slice(1).split("/").filter((s) => s && s !== "*");
+  let processedPath = path;
+  if (!processedPath.startsWith("/")) {
+    processedPath = "/" + processedPath;
+  }
+  const segments = processedPath.slice(1).split("/").filter((s) => s && s !== "*");
   const staticSegments = [];
   for (let i = 0; i < segments.length; i++) {
     const seg = segments[i];
@@ -258,6 +247,8 @@ function toCamelCase(str, capitalize) {
   }
   return result.join("");
 }
+
+// src/codegen/built-in/contract/emitter.ts
 async function generateClient(mappings, options) {
   const startTime = Date.now();
   const grouped = groupByResource(mappings);
@@ -382,6 +373,12 @@ function countUniqueContractFiles(mappings) {
   }
   return files.size;
 }
+function toKebabCase(str) {
+  if (str.length === 0) {
+    return str;
+  }
+  return str.replace(/([a-z])([A-Z])/g, "$1-$2").toLowerCase();
+}
 async function generateSplitClient(_mappings, grouped, options) {
   const outputPath = options.outputPath;
   const outputDir = outputPath.endsWith(".ts") || outputPath.endsWith(".js") ? outputPath.replace(/\.[jt]s$/, "") : outputPath;
@@ -391,7 +388,8 @@ async function generateSplitClient(_mappings, grouped, options) {
     const resourceName = resourceNames[i];
     const routes = grouped[resourceName];
     const code = generateResourceFile(resourceName, routes, options);
-    const filePath = `${outputDir}/${resourceName}.ts`;
+    const kebabName = toKebabCase(resourceName);
+    const filePath = `${outputDir}/${kebabName}.ts`;
     await writeFile(filePath, code, "utf-8");
   }
   const indexCode = generateIndexFile(resourceNames, options);
@@ -480,14 +478,16 @@ function generateIndexFile(resourceNames, options) {
 `;
   for (let i = 0; i < resourceNames.length; i++) {
     const resourceName = resourceNames[i];
-    code += `export * from './${resourceName}.js';
+    const kebabName = toKebabCase(resourceName);
+    code += `export * from './${kebabName}.js';
 `;
   }
   code += `
 `;
   for (let i = 0; i < resourceNames.length; i++) {
     const resourceName = resourceNames[i];
-    code += `import { ${resourceName} } from './${resourceName}.js';
+    const kebabName = toKebabCase(resourceName);
+    code += `import { ${resourceName} } from './${kebabName}.js';
 `;
   }
   code += `
@@ -1281,7 +1281,7 @@ function initializeLogger() {
 }
 var logger = initializeLogger();
 
-// src/codegen/generators/contract/generator.ts
+// src/codegen/built-in/contract/index.ts
 var contractLogger = logger.child("contract-gen");
 var DEFAULT_CONTRACTS_DIR = "src/lib/contracts";
 var DEFAULT_OUTPUT_PATH = "src/lib/api";
@@ -1343,6 +1343,8 @@ function createContractGenerator(config = {}) {
       const cwd = options.cwd;
       const fullContractsDir = join(cwd, contractsDir);
       const fullOutputPath = join(cwd, outputPath);
+      const prefix = readPrefixFromPackageJson(cwd);
+      const apiName = generateApiName(prefix);
       try {
         if (!existsSync(fullContractsDir)) {
           if (options.debug) {
@@ -1364,6 +1366,7 @@ function createContractGenerator(config = {}) {
             outputPath: fullOutputPath,
             changedFilePath: changedFile.path,
             baseUrl: config.baseUrl,
+            apiName,
             debug: options.debug
           });
           if (success) {
@@ -1376,7 +1379,7 @@ function createContractGenerator(config = {}) {
             contractLogger.info("Incremental update failed, doing full regen");
           }
         }
-        const allContracts = await scanContracts(fullContractsDir);
+        const allContracts = await scanContracts(fullContractsDir, prefix);
         if (allContracts.length === 0) {
           if (options.debug) {
             contractLogger.warn("No contracts found");
@@ -1384,8 +1387,6 @@ function createContractGenerator(config = {}) {
           contractCache = null;
           return;
         }
-        const prefix = readPrefixFromPackageJson(cwd);
-        const apiName = generateApiName(prefix);
         const clientOptions = createClientOptions(fullContractsDir, fullOutputPath, config.baseUrl, apiName);
         const stats = await generateClient(allContracts, clientOptions);
         contractCache = {
@@ -1409,7 +1410,7 @@ function createContractGenerator(config = {}) {
   };
 }
 async function attemptIncrementalUpdate(options) {
-  const { cwd, contractsDir, outputPath, changedFilePath, baseUrl, debug } = options;
+  const { cwd, contractsDir, outputPath, changedFilePath, baseUrl, apiName, debug } = options;
   if (!contractCache) {
     return false;
   }
@@ -1434,7 +1435,7 @@ async function attemptIncrementalUpdate(options) {
       }
       return true;
     }
-    const clientOptions = createClientOptions(contractsDir, outputPath, baseUrl);
+    const clientOptions = createClientOptions(contractsDir, outputPath, baseUrl, apiName);
     const stats = await generateClient(updatedContracts, clientOptions);
     contractCache = {
       contracts: updatedContracts,