@spfn/core 0.1.0-alpha.63 → 0.1.0-alpha.64

package/dist/codegen/generators/index.js

@@ -1,12 +1,12 @@
-import { join, dirname } from 'path';
+import { join } from 'path';
 import { existsSync, mkdirSync, accessSync, constants, writeFileSync, unlinkSync, createWriteStream, statSync, readdirSync, renameSync, readFileSync } from 'fs';
-import { mkdir, writeFile, readdir, stat } from 'fs/promises';
+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(routesDir) {
-  const contractFiles = await scanContractFiles(routesDir);
+async function scanContracts(contractsDir) {
+  const contractFiles = await scanContractFiles(contractsDir);
   const mappings = [];
   for (let i = 0; i < contractFiles.length; i++) {
     const filePath = contractFiles[i];
@@ -24,7 +24,6 @@ async function scanContracts(routesDir) {
         contractName: contractExport.name,
         contractImportPath: getImportPath(filePath),
         routeFile: "",
-        // Not needed anymore
         contractFile: filePath,
         hasQuery: contractExport.hasQuery,
         hasBody: contractExport.hasBody,
@@ -37,19 +36,14 @@ async function scanContracts(routesDir) {
 async function scanContractFiles(dir, files = []) {
   try {
     const entries = await readdir(dir);
-    const isLibContracts = dir.includes("/lib/contracts");
     for (let i = 0; i < entries.length; i++) {
       const entry = entries[i];
       const fullPath = join(dir, entry);
       const fileStat = await stat(fullPath);
       if (fileStat.isDirectory()) {
         await scanContractFiles(fullPath, files);
-      } else if (isLibContracts) {
-        if ((entry.endsWith(".ts") || entry.endsWith(".js") || entry.endsWith(".mjs")) && !entry.endsWith(".d.ts") && !entry.endsWith(".test.ts") && !entry.endsWith(".test.js") && !entry.endsWith(".test.mjs")) {
-          files.push(fullPath);
-        }
       } else {
-        if (entry === "contract.ts") {
+        if ((entry.endsWith(".ts") || entry.endsWith(".js") || entry.endsWith(".mjs")) && !entry.endsWith(".d.ts") && !entry.endsWith(".test.ts") && !entry.endsWith(".test.js") && !entry.endsWith(".test.mjs")) {
           files.push(fullPath);
         }
       }
@@ -176,7 +170,7 @@ function extractContractData(objectLiteral) {
 function isContractName(name) {
   return name.indexOf("Contract") !== -1 || name.indexOf("contract") !== -1 || name.endsWith("Schema") || name.endsWith("schema");
 }
-function getImportPath(filePath, _scanDir) {
+function getImportPath(filePath) {
   const srcIndex = filePath.indexOf("/src/");
   if (srcIndex === -1) {
     throw new Error(`Cannot determine import path for ${filePath}: /src/ directory not found`);
@@ -250,13 +244,7 @@ async function generateClient(mappings, options) {
   const startTime = Date.now();
   const grouped = groupByResource(mappings);
   const resourceNames = Object.keys(grouped);
-  if (options.splitByResource === false) {
-    const code = generateClientCode(mappings, grouped, options);
-    await mkdir(dirname(options.outputPath), { recursive: true });
-    await writeFile(options.outputPath, code, "utf-8");
-  } else {
-    await generateSplitClient(mappings, grouped, options);
-  }
+  await generateSplitClient(mappings, grouped, options);
   return {
     routesScanned: mappings.length,
     contractsFound: mappings.length,
@@ -266,17 +254,6 @@ async function generateClient(mappings, options) {
     duration: Date.now() - startTime
   };
 }
-function generateClientCode(mappings, grouped, options) {
-  let code = "";
-  code += generateHeader();
-  code += generateImports(mappings);
-  {
-    code += generateTypes(mappings);
-  }
-  code += generateApiObject(grouped, options);
-  code += generateFooter();
-  return code;
-}
 function generateHeader() {
   return `/**
  * Auto-generated API Client
@@ -289,28 +266,6 @@ function generateHeader() {
 
 `;
 }
-function generateImports(mappings, options) {
-  let code = "";
-  code += `import { client } from '@spfn/core/client';
-`;
-  {
-    code += `import type { InferContract } from '@spfn/core';
-`;
-  }
-  code += `
-`;
-  const importGroups = groupContractsByImportPath(mappings);
-  const importPaths = Object.keys(importGroups);
-  for (let i = 0; i < importPaths.length; i++) {
-    const importPath = importPaths[i];
-    const contracts = importGroups[importPath];
-    code += `import { ${contracts.join(", ")} } from '${importPath}';
-`;
-  }
-  code += `
-`;
-  return code;
-}
 function groupContractsByImportPath(mappings) {
   const groups = {};
   for (let i = 0; i < mappings.length; i++) {
@@ -329,38 +284,6 @@ function groupContractsByImportPath(mappings) {
   }
   return result;
 }
-function generateTypes(mappings, _options) {
-  let code = "";
-  code += `// ============================================
-`;
-  code += `// Auto-generated Types
-`;
-  code += `// ============================================
-
-`;
-  for (let i = 0; i < mappings.length; i++) {
-    const mapping = mappings[i];
-    const typeName = generateTypeName(mapping);
-    const contractType = `typeof ${mapping.contractName}`;
-    code += `export type ${typeName}Response = InferContract<${contractType}>['response'];
-`;
-    if (mapping.hasQuery) {
-      code += `export type ${typeName}Query = InferContract<${contractType}>['query'];
-`;
-    }
-    if (mapping.hasParams || mapping.path.includes(":")) {
-      code += `export type ${typeName}Params = InferContract<${contractType}>['params'];
-`;
-    }
-    if (mapping.hasBody) {
-      code += `export type ${typeName}Body = InferContract<${contractType}>['body'];
-`;
-    }
-    code += `
-`;
-  }
-  return code;
-}
 function generateTypeName(mapping) {
   let name = mapping.contractName;
   if (name.endsWith("Contract")) {
@@ -371,42 +294,13 @@ function generateTypeName(mapping) {
   }
   return name;
 }
-function generateApiObject(grouped, options) {
-  let code = "";
-  code += `/**
- * Type-safe API client
- */
-export const api = {
-`;
-  const resourceNames = Object.keys(grouped);
-  for (let i = 0; i < resourceNames.length; i++) {
-    const resourceName = resourceNames[i];
-    const routes = grouped[resourceName];
-    code += `    ${resourceName}: {
-`;
-    for (let j = 0; j < routes.length; j++) {
-      const route = routes[j];
-      code += generateMethodCode(route, options);
-    }
-    code += `    }`;
-    if (i < resourceNames.length - 1) {
-      code += `,`;
-    }
-    code += `
-`;
-  }
-  code += `} as const;
-
-`;
-  return code;
-}
 function generateMethodCode(mapping, options) {
   const methodName = generateMethodName(mapping);
   const hasParams = mapping.hasParams || mapping.path.includes(":");
   const hasQuery = mapping.hasQuery || false;
   const hasBody = mapping.hasBody || false;
   let code = "";
-  if (options.includeJsDoc !== false) {
+  {
     code += `        /**
 `;
     code += `         * ${mapping.method} ${mapping.path}
@@ -461,27 +355,6 @@ function generateMethodName(mapping) {
   }
   return method;
 }
-function generateFooter() {
-  return `/**
- * Export client instance for advanced usage
- *
- * Use this to add interceptors or customize the client:
- *
- * @example
- * \`\`\`ts
- * import { client } from './api';
- * import { createAuthInterceptor } from '@spfn/auth/nextjs';
- * import { NextJSCookieProvider } from '@spfn/auth/nextjs';
- *
- * client.use(createAuthInterceptor({
- *   cookieProvider: new NextJSCookieProvider(),
- *   encryptionKey: process.env.ENCRYPTION_KEY!
- * }));
- * \`\`\`
- */
-export { client };
-`;
-}
 function countUniqueContractFiles(mappings) {
   const files = /* @__PURE__ */ new Set();
   for (let i = 0; i < mappings.length; i++) {
@@ -499,7 +372,7 @@ async function generateSplitClient(_mappings, grouped, options) {
   for (let i = 0; i < resourceNames.length; i++) {
     const resourceName = resourceNames[i];
     const routes = grouped[resourceName];
-    const code = generateResourceFile(resourceName, routes, options);
+    const code = generateResourceFile(resourceName, routes);
     const filePath = `${outputDir}/${resourceName}.ts`;
     await writeFile(filePath, code, "utf-8");
   }
@@ -568,7 +441,7 @@ function generateResourceFile(resourceName, routes, options) {
 `;
   for (let i = 0; i < routes.length; i++) {
     const route = routes[i];
-    code += generateMethodCode(route, options);
+    code += generateMethodCode(route);
   }
   code += `} as const;
 `;
@@ -1408,10 +1281,7 @@ function createContractGenerator(config = {}) {
           return;
         }
         const stats = await generateClient(allContracts, {
-          // For backwards compatibility
-          outputPath,
-          includeJsDoc: true
-        });
+          outputPath});
         if (options.debug) {
           contractLogger.info("Client generated", {
             endpoints: stats.methodsGenerated,