@an5/orm 1.0.8 → 1.1.0

package/generator/src/index.ts

@@ -1,116 +1,146 @@
-import path from 'path';
-import { SchemaParser } from './parser';
-import { CodeGenerator } from './code-generator';
-import { MetadataGenerator } from './metadata-generator';
-import { PythonGenerator } from './python-generator';
-import { DotnetGenerator } from './dotnet-generator';
-
-import fs from 'fs';
-
-function clearGeneratedFiles(outputDir: string, extension: string) {
-  if (!fs.existsSync(outputDir)) {
-    fs.mkdirSync(outputDir, { recursive: true });
-    return;
-  }
-
-  for (const entry of fs.readdirSync(outputDir)) {
-    const fullPath = path.join(outputDir, entry);
-    const stat = fs.statSync(fullPath);
-    if (stat.isDirectory()) continue;
-    if (entry.endsWith(extension)) {
-      fs.unlinkSync(fullPath);
-    }
-  }
-}
-
-async function main() {
-  let rootDir = process.cwd();
-  let config: any = {};
-  
-  try {
-    let configPath = path.join(rootDir, 'an5Orm.config.js');
-    if (!fs.existsSync(configPath)) {
-      configPath = path.join(rootDir, 'an5Orm.config.cjs');
-    }
-    if (!fs.existsSync(configPath)) {
-      configPath = path.join(rootDir, '..', 'an5Orm.config.js');
-    }
-    if (!fs.existsSync(configPath)) {
-      configPath = path.join(rootDir, '..', 'an5Orm.config.cjs');
-    }
-    if (fs.existsSync(configPath)) {
-      config = require(configPath);
-      rootDir = path.dirname(configPath);
-    } else if (fs.existsSync(path.join(rootDir, '..', 'an5Schema'))) {
-      rootDir = path.resolve(rootDir, '..');
-    }
-  } catch (err) {
-    console.warn('⚠️ Could not load an5Orm.config.js/.cjs, using defaults.', err);
-  }
-
-  const schemaDir = path.resolve(rootDir, config.schemaDir || 'an5Schema');
-  const outputTypesDir = path.resolve(rootDir, config.outputs?.typescript?.outputDir || 'an5Client/typescript');
-  const outputMetadataPath = path.resolve(rootDir, config.outputs?.typescript?.metadataFile || 'an5Client/typescript/an5Metadata.ts');
-  const outputOrmMetadataPath = path.resolve(rootDir, config.outputs?.typescript?.ormMetadataFile || 'an5Orm/an5Metadata.ts');
-  const outputPythonMetadataPath = path.resolve(rootDir, config.outputs?.python?.metadataFile || 'an5Client/python/an5_metadata.py');
-  const outputDotnetDir = path.resolve(rootDir, config.outputs?.dotnet?.outputDir || 'an5Client/dotnet');
-
-  console.log('🚀 Starting ORM generation...');
-
-  try {
-    clearGeneratedFiles(outputTypesDir, '.ts');
-    clearGeneratedFiles(outputDotnetDir, '.cs');
-    if (fs.existsSync(outputMetadataPath)) {
-      fs.unlinkSync(outputMetadataPath);
-    }
-    if (fs.existsSync(outputPythonMetadataPath)) {
-      fs.unlinkSync(outputPythonMetadataPath);
-    }
-
-    const parser = new SchemaParser(schemaDir);
-    const models = await parser.parse();
-    console.log(`📦 Parsed ${models.length} models from schema.`);
-
-    const codeGen = new CodeGenerator(outputTypesDir);
-    codeGen.generate(models);
-    console.log(`✨ Generated modular types in ${outputTypesDir}`);
-
-    const metadataDir = path.dirname(outputMetadataPath);
-    if (!fs.existsSync(metadataDir)) {
-      fs.mkdirSync(metadataDir, { recursive: true });
-    }
-    const metadataGen = new MetadataGenerator(outputMetadataPath);
-    metadataGen.generate(models);
-    console.log(`✨ Generated metadata in ${outputMetadataPath}`);
-
-    const ormMetadataDir = path.dirname(outputOrmMetadataPath);
-    if (!fs.existsSync(ormMetadataDir)) {
-      fs.mkdirSync(ormMetadataDir, { recursive: true });
-    }
-    const ormMetadataGen = new MetadataGenerator(
-      outputOrmMetadataPath,
-      'import type { RelationDef } from "./metadata";'
-    );
-    ormMetadataGen.generate(models);
-    console.log(`✨ Generated ORM-local metadata in ${outputOrmMetadataPath}`);
-
-    const pythonDir = path.dirname(outputPythonMetadataPath);
-    if (!fs.existsSync(pythonDir)) {
-      fs.mkdirSync(pythonDir, { recursive: true });
-    }
-    const pythonGen = new PythonGenerator(outputPythonMetadataPath);
-    pythonGen.generate(models);
-    console.log(`✨ Generated Python metadata in ${outputPythonMetadataPath}`);
-
-    const dotnetGen = new DotnetGenerator(outputDotnetDir);
-    dotnetGen.generate(models);
-    console.log(`✨ Generated .NET models in ${outputDotnetDir}`);
-
-    console.log('✅ ORM generation completed successfully.');
-  } catch (error) {
-    console.error('❌ ORM generation failed:', error);
-    process.exit(1);
-  }
-}
-
-main();
+import path from 'path';
+import { loadConfig, providerFromConfig, ConfigError, formatIssues } from './config';
+import { FieldTypeError, PROVIDER_LABELS } from './field-types';
+import { SchemaParser } from './parser';
+import { CodeGenerator } from './code-generator';
+import { MetadataGenerator } from './metadata-generator';
+import { PythonGenerator } from './python-generator';
+import { DotnetGenerator } from './dotnet-generator';
+import { GolangGenerator } from './golang-generator';
+import { RustGenerator } from './rust-generator';
+
+import fs from 'fs';
+
+function clearGeneratedFiles(outputDir: string, extension: string) {
+  if (!fs.existsSync(outputDir)) {
+    fs.mkdirSync(outputDir, { recursive: true });
+    return;
+  }
+
+  for (const entry of fs.readdirSync(outputDir)) {
+    const fullPath = path.join(outputDir, entry);
+    const stat = fs.statSync(fullPath);
+    if (stat.isDirectory()) continue;
+    if (entry.endsWith(extension)) {
+      fs.unlinkSync(fullPath);
+    }
+  }
+}
+
+function clearGeneratedPythonFiles(outputDir: string) {
+  if (!fs.existsSync(outputDir)) {
+    fs.mkdirSync(outputDir, { recursive: true });
+    return;
+  }
+
+  // Delete generated .py files but preserve hand-maintained adapter.
+  const preserve = new Set(['an5_adapter.py']);
+  for (const entry of fs.readdirSync(outputDir)) {
+    const fullPath = path.join(outputDir, entry);
+    const stat = fs.statSync(fullPath);
+    if (stat.isDirectory()) continue;
+    if (entry.endsWith('.py') && !preserve.has(entry)) {
+      fs.unlinkSync(fullPath);
+    }
+  }
+}
+
+async function main() {
+  // Loaded through the validating loader, so a mistyped key or a wrong type
+  // stops here instead of quietly generating somewhere else.
+  let config: ReturnType<typeof loadConfig>;
+  try {
+    config = loadConfig();
+  } catch (err) {
+    if (err instanceof ConfigError) {
+      console.error(`❌ ${err.message}:`);
+      console.error(formatIssues(err.issues));
+      process.exit(1);
+    }
+    console.warn('⚠️ Could not load an5Orm.config.js/.cjs, using defaults.', err);
+    config = loadConfig(path.join(process.cwd(), 'no-such-dir'));
+  }
+
+  const { rootDir } = config;
+  const schemaDir = config.outputs.schemaDir;
+  const outputTypesDir = config.outputs.typescriptDir;
+  const outputMetadataPath = config.outputs.typescriptMetadataFile;
+  const outputPythonMetadataPath = config.outputs.pythonMetadataFile;
+  const outputDotnetDir = config.outputs.dotnetDir;
+  const outputGolangDir = config.outputs.golangDir;
+  const outputRustDir = config.outputs.rustDir;
+  const generateMetadata = config.config.generation.generateMetadata;
+
+  console.log('🚀 Starting ORM generation...');
+
+  // The target provider comes from the connection string: both the allowed
+  // field types and the SQL follow it, instead of one shared list.
+  const provider = providerFromConfig(config.config, process.env);
+  console.log(`🗄️  Provider: ${PROVIDER_LABELS[provider]} (${provider})`);
+
+  try {
+    clearGeneratedFiles(outputTypesDir, '.ts');
+    clearGeneratedFiles(outputDotnetDir, '.cs');
+    clearGeneratedFiles(outputGolangDir, '.go');
+    clearGeneratedFiles(path.join(outputRustDir, 'src'), '.rs');
+    const pythonDirEarly = path.dirname(outputPythonMetadataPath);
+    clearGeneratedPythonFiles(pythonDirEarly);
+    if (config.config.generation.generateMetadata && fs.existsSync(outputMetadataPath)) {
+      fs.unlinkSync(outputMetadataPath);
+    }
+
+    const parser = new SchemaParser(schemaDir, provider);
+    const models = await parser.parse();
+    console.log(`📦 Parsed ${models.length} models from schema.`);
+
+    const codeGen = new CodeGenerator(outputTypesDir);
+    codeGen.generate(models);
+    console.log(`✨ Generated modular types in ${outputTypesDir}`);
+
+    if (generateMetadata) {
+      const metadataDir = path.dirname(outputMetadataPath);
+      if (!fs.existsSync(metadataDir)) {
+        fs.mkdirSync(metadataDir, { recursive: true });
+      }
+      const metadataGen = new MetadataGenerator(outputMetadataPath);
+      metadataGen.generate(models);
+      console.log(`✨ Generated metadata in ${outputMetadataPath}`);
+    } else {
+      console.log('⏭ Skipping metadata (generation.generateMetadata is false)');
+    }
+
+    const pythonDir = path.dirname(outputPythonMetadataPath);
+    if (!fs.existsSync(pythonDir)) {
+      fs.mkdirSync(pythonDir, { recursive: true });
+    }
+    const pythonGen = new PythonGenerator(outputPythonMetadataPath);
+    pythonGen.generate(models);
+    console.log(`✨ Generated Python metadata and client models in ${pythonDir}`);
+
+    const dotnetGen = new DotnetGenerator(outputDotnetDir);
+    dotnetGen.generate(models);
+    console.log(`✨ Generated .NET models in ${outputDotnetDir}`);
+
+    const golangGen = new GolangGenerator(outputGolangDir);
+    golangGen.generate(models);
+    console.log(`✨ Generated Golang models in ${outputGolangDir}`);
+
+    const rustGen = new RustGenerator(outputRustDir);
+    rustGen.generate(models);
+    console.log(`✨ Generated Rust client in ${outputRustDir}`);
+
+    console.log('✅ ORM generation completed successfully.');
+  } catch (error) {
+    // Print every bad field type with its provider, instead of the parser's
+    // nested error object.
+    if (error instanceof FieldTypeError) {
+      console.error(`❌ ${error.message}:`);
+      console.error(formatIssues(error.issues));
+      process.exit(1);
+    }
+    console.error('❌ ORM generation failed:', error);
+    process.exit(1);
+  }
+}
+
+main();

package/generator/src/metadata-generator.ts

@@ -1,101 +1,116 @@
-import fs from 'fs';
-import path from 'path';
-import { Model } from './types';
-
-export class MetadataGenerator {
-  constructor(
-    private outputPath: string,
-    private relationImport: string = 'import type { RelationDef } from "@an5/orm";'
-  ) {}
-
-  public generate(models: Model[]) {
-    let metaContent = '// This file is auto-generated. Do not edit directly.\n\n';
-    metaContent += `${this.relationImport}\n\n`;
-
-    metaContent += 'export const modelToTable: Record<string, string> = {\n';
-    for (const model of models) {
-      const props = this.getAllPropertyVariations(model.name);
-      const fullTableName = `[${model.schemaName}].[${model.tableName}]`;
-      for (const prop of props) {
-        metaContent += `  ${prop}: "${fullTableName}",\n`;
-      }
-    }
-    metaContent += '};\n\n';
-
-    metaContent += 'export const modelDescriptions: Record<string, string | undefined> = {\n';
-    for (const model of models) {
-      const props = this.getAllPropertyVariations(model.name);
-      for (const prop of props) {
-        metaContent += `  ${prop}: ${model.description ? JSON.stringify(model.description) : 'undefined'},\n`;
-      }
-    }
-    metaContent += '};\n\n';
-
-    metaContent += 'export const modelFields: Record<string, Record<string, { ts: string; sql: string; description?: string }>> = {\n';
-    for (const model of models) {
-      const props = this.getAllPropertyVariations(model.name);
-      const fieldsStr = `{ ${model.fields.map(f => `${f.name}: ${this.formatFieldMetadata(f)}`).join(', ')} }`;
-      for (const prop of props) {
-        metaContent += `  ${prop}: ${fieldsStr},\n`;
-      }
-    }
-    metaContent += '};\n\n';
-
-    metaContent += 'export const relationMap: Record<string, Record<string, RelationDef>> = {\n';
-    for (const model of models) {
-      const props = this.getAllPropertyVariations(model.name);
-      let relationsContent = `  {\n`;
-      for (const rel of model.relations) {
-        relationsContent += `    ${rel.name}: { modelName: "${this.toCamelCase(rel.type)}", relationType: "${rel.isArray ? 'many' : 'one'}", foreignKey: "${rel.foreignKey || 'id'}", localKey: "${rel.localKey || 'id'}" },\n`;
-      }
-      relationsContent += `  }`;
-
-      for (const prop of props) {
-        metaContent += `  ${prop}: ${relationsContent},\n`;
-      }
-    }
-    metaContent += '};\n';
-
-    fs.writeFileSync(this.outputPath, metaContent);
-  }
-
-  private getAllPropertyVariations(modelName: string): string[] {
-    const variations = new Set<string>();
-    
-    // 1. Standard camelCase (e.g. User -> user, McpServer -> mcpServer)
-    variations.add(this.toCamelCase(modelName));
-
-    // 2. Handle known acronyms at start (e.g. LLMProvider -> lLMProvider)
-    // This is already handled by toCamelCase if it only lowercases the first letter.
-    // But we might want 'llmProvider' as well.
-    const acronyms = ['LLM', 'AI', 'MCP', 'IT', 'QC', 'HR', 'MR', 'WH', 'SSIS', 'API', 'URL', 'ID', 'JSON'];
-    
-    for (const acronym of acronyms) {
-      if (modelName.startsWith(acronym)) {
-        // e.g. LLMProvider -> llmProvider
-        variations.add(acronym.toLowerCase() + modelName.slice(acronym.length));
-        
-        // e.g. LLMProvider -> lLMProvider (Prisma style)
-        variations.add(acronym[0].toLowerCase() + acronym.slice(1) + modelName.slice(acronym.length));
-      }
-    }
-
-    return Array.from(variations);
-  }
-
-  private formatFieldMetadata(field: Model['fields'][number]): string {
-    const entries = [
-      `ts: ${JSON.stringify(`${field.type}${field.isOptional ? '?' : ''}`)}`,
-      `sql: ${JSON.stringify(field.sqlType)}`,
-    ];
-    if (field.description) {
-      entries.push(`description: ${JSON.stringify(field.description)}`);
-    }
-    return `{ ${entries.join(', ')} }`;
-  }
-
-  private toCamelCase(str: string): string {
-    if (!str) return '';
-    return str[0].toLowerCase() + str.slice(1);
-  }
-}
+import fs from 'fs';
+import path from 'path';
+import { Model, bracketedTableName } from './types';
+
+export class MetadataGenerator {
+  constructor(
+    private outputPath: string,
+    private relationImport: string = 'import type { RelationDef } from "@an5/orm";'
+  ) {}
+
+  public generate(models: Model[]) {
+    let metaContent = '// This file is auto-generated. Do not edit directly.\n\n';
+    metaContent += `${this.relationImport}\n\n`;
+
+    metaContent += 'export const modelToTable: Record<string, string> = {\n';
+    for (const model of models) {
+      const props = this.getAllPropertyVariations(model.name);
+      const fullTableName = bracketedTableName(model);
+      for (const prop of props) {
+        metaContent += `  ${prop}: "${fullTableName}",\n`;
+      }
+    }
+    metaContent += '};\n\n';
+
+    metaContent += 'export const modelDescriptions: Record<string, string | undefined> = {\n';
+    for (const model of models) {
+      const props = this.getAllPropertyVariations(model.name);
+      for (const prop of props) {
+        metaContent += `  ${prop}: ${model.description ? JSON.stringify(model.description) : 'undefined'},\n`;
+      }
+    }
+    metaContent += '};\n\n';
+
+    metaContent += 'export const modelFields: Record<string, Record<string, { ts: string; sql: string; description?: string }>> = {\n';
+    for (const model of models) {
+      const props = this.getAllPropertyVariations(model.name);
+      const fieldsStr = `{ ${model.fields.map(f => `${f.name}: ${this.formatFieldMetadata(f)}`).join(', ')} }`;
+      for (const prop of props) {
+        metaContent += `  ${prop}: ${fieldsStr},\n`;
+      }
+    }
+    metaContent += '};\n\n';
+
+    metaContent += 'export const relationMap: Record<string, Record<string, RelationDef>> = {\n';
+    for (const model of models) {
+      const props = this.getAllPropertyVariations(model.name);
+      let relationsContent = `  {\n`;
+      for (const rel of model.relations) {
+        relationsContent += `    ${rel.name}: { modelName: "${this.toCamelCase(rel.type)}", relationType: "${rel.isArray ? 'many' : 'one'}", foreignKey: "${rel.foreignKey || 'id'}", localKey: "${rel.localKey || 'id'}" },\n`;
+      }
+      relationsContent += `  }`;
+
+      for (const prop of props) {
+        metaContent += `  ${prop}: ${relationsContent},\n`;
+      }
+    }
+    metaContent += '};\n';
+
+    fs.writeFileSync(this.outputPath, metaContent);
+  }
+
+  private getAllPropertyVariations(modelName: string): string[] {
+    const variations = new Set<string>();
+
+    // 1. PascalCase (User)
+    variations.add(modelName);
+
+    // 2. camelCase (user)
+    variations.add(this.toCamelCase(modelName));
+
+    // 3. Plural PascalCase (Users)
+    variations.add(modelName + 's');
+
+    // 4. Plural camelCase (users)
+    variations.add(this.toCamelCase(modelName) + 's');
+
+    // 5. snake_case (user, mc_server)
+    variations.add(this.toSnakeCase(modelName));
+    variations.add(this.toSnakeCase(modelName) + 's');
+
+    const acronyms = ['LLM', 'AI', 'MCP', 'IT', 'QC', 'HR', 'MR', 'WH', 'SSIS', 'API', 'URL', 'ID', 'JSON'];
+    for (const acronym of acronyms) {
+      if (modelName.startsWith(acronym)) {
+        variations.add(acronym.toLowerCase() + modelName.slice(acronym.length));
+        variations.add(acronym[0].toLowerCase() + acronym.slice(1) + modelName.slice(acronym.length));
+        variations.add(acronym.toLowerCase() + modelName.slice(acronym.length) + 's');
+      }
+    }
+
+    return Array.from(variations);
+  }
+
+  private toSnakeCase(str: string): string {
+    if (!str) return '';
+    return str
+      .replace(/([A-Z]+)([A-Z][a-z])/g, '$1_$2')
+      .replace(/([a-z\d])([A-Z])/g, '$1_$2')
+      .toLowerCase();
+  }
+
+  private formatFieldMetadata(field: Model['fields'][number]): string {
+    const entries = [
+      `ts: ${JSON.stringify(`${field.type}${field.isOptional ? '?' : ''}`)}`,
+      `sql: ${JSON.stringify(field.sqlType)}`,
+    ];
+    if (field.description) {
+      entries.push(`description: ${JSON.stringify(field.description)}`);
+    }
+    return `{ ${entries.join(', ')} }`;
+  }
+
+  private toCamelCase(str: string): string {
+    if (!str) return '';
+    return str[0].toLowerCase() + str.slice(1);
+  }
+}