@an5/orm 1.0.7 → 1.0.9

package/generator/src/index.ts

@@ -4,6 +4,7 @@ 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 fs from 'fs';
 
@@ -53,12 +54,14 @@ async function main() {
   const outputMetadataPath = path.resolve(rootDir, config.outputs?.typescript?.metadataFile || 'an5Client/typescript/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');
+  const outputGolangDir = path.resolve(rootDir, config.outputs?.golang?.outputDir || 'an5Client/golang');
 
   console.log('🚀 Starting ORM generation...');
 
   try {
     clearGeneratedFiles(outputTypesDir, '.ts');
     clearGeneratedFiles(outputDotnetDir, '.cs');
+    clearGeneratedFiles(outputGolangDir, '.go');
     if (fs.existsSync(outputMetadataPath)) {
       fs.unlinkSync(outputMetadataPath);
     }
@@ -88,12 +91,16 @@ async function main() {
     }
     const pythonGen = new PythonGenerator(outputPythonMetadataPath);
     pythonGen.generate(models);
-    console.log(`✨ Generated Python metadata in ${outputPythonMetadataPath}`);
+    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}`);
+
     console.log('✅ ORM generation completed successfully.');
   } catch (error) {
     console.error('❌ ORM generation failed:', error);

package/generator/src/metadata-generator.ts

@@ -3,10 +3,14 @@ import path from 'path';
 import { Model } from './types';
 
 export class MetadataGenerator {
-  constructor(private outputPath: string) {}
+  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) {
@@ -37,8 +41,6 @@ export class MetadataGenerator {
     }
     metaContent += '};\n\n';
 
-    metaContent += 'export interface RelationDef {\n  modelName: string;\n  relationType: "many" | "one";\n  foreignKey: string;\n  localKey: string;\n}\n\n';
-
     metaContent += 'export const relationMap: Record<string, Record<string, RelationDef>> = {\n';
     for (const model of models) {
       const props = this.getAllPropertyVariations(model.name);
@@ -59,28 +61,43 @@ export class MetadataGenerator {
 
   private getAllPropertyVariations(modelName: string): string[] {
     const variations = new Set<string>();
-    
-    // 1. Standard camelCase (e.g. User -> user, McpServer -> mcpServer)
+
+    // 1. PascalCase (User)
+    variations.add(modelName);
+
+    // 2. camelCase (user)
     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.
+    // 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)) {
-        // 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));
+        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 ? '?' : ''}`)}`,

package/generator/src/python-generator.ts

@@ -6,6 +6,120 @@ export class PythonGenerator {
   constructor(private outputPath: string) {}
 
   public generate(models: Model[]) {
+    const outputDir = path.dirname(this.outputPath);
+    if (!fs.existsSync(outputDir)) {
+      fs.mkdirSync(outputDir, { recursive: true });
+    }
+
+    // 1. Generate an5_metadata.py
+    this.generateMetadata(models);
+
+    // 2. Generate an5_models.py
+    this.generateModels(models, outputDir);
+
+    // 3. Generate an5_orm_types.py - type-safe ORM filter/args dataclasses
+    this.generateOrmTypes(models, outputDir);
+
+    // 4. Generate an5_client.py
+    this.generateClient(models, outputDir);
+
+    // 5. Generate __init__.py
+    this.generateInit(models, outputDir);
+  }
+
+  private getPyFilterType(fieldType: string): string {
+    const lower = fieldType.toLowerCase();
+    if (['datetime', 'datetime2', 'date', 'smalldatetime', 'datetimeoffset', 'timestamp'].includes(lower)) return 'DateTimeFilter';
+    if (['bool', 'boolean', 'bit'].includes(lower)) return 'BoolFilter';
+    if (['int', 'integer', 'smallint', 'tinyint', 'bigint', 'number'].includes(lower)) return 'IntFilter';
+    if (['float', 'real', 'double', 'decimal', 'numeric', 'money'].includes(lower)) return 'NumberFilter';
+    return 'StringFilter';
+  }
+
+  private generateOrmTypes(models: Model[], outputDir: string) {
+    let content = '# This file is auto-generated. Do not edit directly.\n';
+    content += '"""\nAN5 ORM typed filter/args dataclasses for type-safe queries.\n\nUsage example::\n\n    db.user.find_many(where=UserWhereInput(name=StringFilter(contains="John")),\n                      order_by=UserOrderByInput(created_at="desc"),\n                      take=10)\n"""\n';
+    content += 'from __future__ import annotations\n';
+    content += 'from dataclasses import dataclass, field\n';
+    content += 'from typing import List, Optional, Any\n';
+    content += 'from datetime import datetime\n\n';
+
+    // Base filter types
+    content += '# ─── Base filter types ────────────────────────────────────────────────────────\n\n';
+    content += `@dataclass\nclass StringFilter:\n    """Type-safe filter for string fields."""\n    equals: Optional[str] = None\n    not_: Optional[str] = None\n    contains: Optional[str] = None\n    starts_with: Optional[str] = None\n    ends_with: Optional[str] = None\n    in_: Optional[List[str]] = None\n    not_in: Optional[List[str]] = None\n    gt: Optional[str] = None\n    gte: Optional[str] = None\n    lt: Optional[str] = None\n    lte: Optional[str] = None\n\n`;
+
+    content += `@dataclass\nclass IntFilter:\n    """Type-safe filter for integer fields."""\n    equals: Optional[int] = None\n    not_: Optional[int] = None\n    in_: Optional[List[int]] = None\n    not_in: Optional[List[int]] = None\n    gt: Optional[int] = None\n    gte: Optional[int] = None\n    lt: Optional[int] = None\n    lte: Optional[int] = None\n\n`;
+
+    content += `@dataclass\nclass NumberFilter:\n    """Type-safe filter for float/decimal fields."""\n    equals: Optional[float] = None\n    not_: Optional[float] = None\n    in_: Optional[List[float]] = None\n    not_in: Optional[List[float]] = None\n    gt: Optional[float] = None\n    gte: Optional[float] = None\n    lt: Optional[float] = None\n    lte: Optional[float] = None\n\n`;
+
+    content += `@dataclass\nclass BoolFilter:\n    """Type-safe filter for boolean fields."""\n    equals: Optional[bool] = None\n\n`;
+
+    content += `@dataclass\nclass DateTimeFilter:\n    """Type-safe filter for datetime fields."""\n    equals: Optional[datetime] = None\n    not_: Optional[datetime] = None\n    in_: Optional[List[datetime]] = None\n    not_in: Optional[List[datetime]] = None\n    gt: Optional[datetime] = None\n    gte: Optional[datetime] = None\n    lt: Optional[datetime] = None\n    lte: Optional[datetime] = None\n\n`;
+
+    // Per-model types
+    for (const model of models) {
+      const name = this.capitalize(model.name);
+      content += `# ─── ${name} ORM Types ────────────────────────────────────────────────────────\n\n`;
+
+      // WhereInput
+      content += `@dataclass\nclass ${name}WhereInput:\n    """Type-safe WHERE filter for ${name} queries."""\n`;
+      content += `    AND: Optional[List['${name}WhereInput']] = None\n`;
+      content += `    OR: Optional[List['${name}WhereInput']] = None\n`;
+      content += `    NOT: Optional['${name}WhereInput'] = None\n`;
+      for (const f of model.fields) {
+        const ft = this.getPyFilterType(f.type);
+        content += `    ${this.toSnakeCase(f.name)}: Optional[${ft}] = None\n`;
+      }
+      content += '\n';
+
+      // OrderByInput
+      content += `@dataclass\nclass ${name}OrderByInput:\n    """Type-safe ORDER BY for ${name} queries. Value: 'asc' or 'desc'."""\n`;
+      for (const f of model.fields) {
+        content += `    ${this.toSnakeCase(f.name)}: Optional[str] = None\n`;
+      }
+      content += '\n';
+
+      // CreateInput
+      const requiredFields = model.fields.filter(f => !f.isId && !f.isOptional && !f.hasDefault);
+      const optionalFields = model.fields.filter(f => !f.isId && (f.isOptional || f.hasDefault));
+      content += `@dataclass\nclass ${name}CreateInput:\n    """Typed data for creating a new ${name} record."""\n`;
+      for (const f of requiredFields) {
+        content += `    ${this.toSnakeCase(f.name)}: ${this.mapPyType(f.type)}\n`;
+      }
+      for (const f of optionalFields) {
+        content += `    ${this.toSnakeCase(f.name)}: Optional[${this.mapPyType(f.type)}] = None\n`;
+      }
+      if (requiredFields.length === 0 && optionalFields.length === 0) content += '    pass\n';
+      content += '\n';
+
+      // UpdateInput
+      const updateFields = model.fields.filter(f => !f.isId);
+      content += `@dataclass\nclass ${name}UpdateInput:\n    """Typed data for updating an existing ${name} record."""\n`;
+      for (const f of updateFields) {
+        content += `    ${this.toSnakeCase(f.name)}: Optional[${this.mapPyType(f.type)}] = None\n`;
+      }
+      if (updateFields.length === 0) content += '    pass\n';
+      content += '\n';
+
+      // FindManyArgs
+      content += `@dataclass\nclass ${name}FindManyArgs:\n    """ORM-style args for ${name}.find_many()."""\n`;
+      content += `    where: Optional[${name}WhereInput] = None\n`;
+      content += `    order_by: Optional[${name}OrderByInput] = None\n`;
+      content += `    take: Optional[int] = None\n`;
+      content += `    skip: int = 0\n`;
+      content += `    select: Optional[List[str]] = None\n\n`;
+
+      // FindFirstArgs
+      content += `@dataclass\nclass ${name}FindFirstArgs:\n    """ORM-style args for ${name}.find_first()."""\n`;
+      content += `    where: Optional[${name}WhereInput] = None\n`;
+      content += `    order_by: Optional[${name}OrderByInput] = None\n`;
+      content += `    select: Optional[List[str]] = None\n\n`;
+    }
+
+    fs.writeFileSync(path.join(outputDir, 'an5_orm_types.py'), content);
+  }
+
+  private generateMetadata(models: Model[]) {
     let pyContent = '# This file is auto-generated. Do not edit directly.\n\n';
 
     // 1. MODEL_TO_TABLE
@@ -64,13 +178,204 @@ export class PythonGenerator {
     fs.writeFileSync(this.outputPath, pyContent);
   }
 
+  private mapPyType(fieldType: string): string {
+    const lower = fieldType.toLowerCase();
+    if (['int', 'integer', 'smallint', 'tinyint', 'bigint', 'number'].includes(lower)) {
+      return 'int';
+    }
+    if (['float', 'real', 'double', 'decimal', 'numeric', 'money'].includes(lower)) {
+      return 'float';
+    }
+    if (['bool', 'boolean', 'bit'].includes(lower)) {
+      return 'bool';
+    }
+    if (['datetime', 'datetime2', 'date', 'smalldatetime', 'datetimeoffset', 'timestamp'].includes(lower)) {
+      return 'datetime';
+    }
+    if (['bytes', 'binary', 'varbinary'].includes(lower)) {
+      return 'bytes';
+    }
+    return 'str';
+  }
+
+  private generateModels(models: Model[], outputDir: string) {
+    let content = '# This file is auto-generated. Do not edit directly.\n';
+    content += 'from dataclasses import dataclass, field\n';
+    content += 'from typing import Optional, List, Any, TypedDict\n';
+    content += 'from datetime import datetime\n\n';
+
+    for (const model of models) {
+      if (model.description) {
+        content += `"""${model.description}"""\n`;
+      }
+      content += `@dataclass\nclass ${model.name}:\n`;
+
+      if (model.fields.length === 0 && model.relations.length === 0) {
+        content += '    pass\n\n';
+        continue;
+      }
+
+      // Required fields first
+      const required = model.fields.filter(f => !f.isOptional && !f.hasDefault);
+      const optionals = model.fields.filter(f => f.isOptional || f.hasDefault);
+
+      for (const f of required) {
+        const pyType = this.mapPyType(f.type);
+        const snakeName = this.toSnakeCase(f.name);
+        content += `    ${snakeName}: ${pyType}\n`;
+      }
+
+      for (const f of optionals) {
+        const pyType = this.mapPyType(f.type);
+        const snakeName = this.toSnakeCase(f.name);
+        content += `    ${snakeName}: Optional[${pyType}] = None\n`;
+      }
+
+      // Relations
+      for (const rel of model.relations) {
+        const relName = this.toSnakeCase(rel.name);
+        if (rel.isArray) {
+          content += `    ${relName}: List[Any] = field(default_factory=list)\n`;
+        } else {
+          content += `    ${relName}: Optional[Any] = None\n`;
+        }
+      }
+
+      content += '\n';
+
+      // TypedDict row shape: mirrors what the runtime actually returns
+      // (plain dicts), so `AdapterTableClient["<Model>Row"]` delegates
+      // type-check. Required keys stay required via a total=True base;
+      // everything else is optional (total=False), keeping partial
+      // selects valid without extra dependencies.
+      const rowRequired = model.fields.filter(f => !f.isOptional && !f.hasDefault);
+      const rowOptional = model.fields.filter(f => f.isOptional || f.hasDefault);
+      content += `class _${model.name}Required(TypedDict):\n`;
+      content += `    """Required keys of a ${model.name} row."""\n`;
+      if (rowRequired.length === 0) {
+        content += '    pass\n';
+      }
+      for (const f of rowRequired) {
+        content += `    ${this.toSnakeCase(f.name)}: ${this.mapPyType(f.type)}\n`;
+      }
+      content += `\nclass ${model.name}Row(_${model.name}Required, total=False):\n`;
+      content += `    """Row shape returned for ${model.name} queries."""\n`;
+      if (rowOptional.length === 0 && model.relations.length === 0) {
+        content += '    pass\n';
+      }
+      for (const f of rowOptional) {
+        content += `    ${this.toSnakeCase(f.name)}: ${this.mapPyType(f.type)}\n`;
+      }
+      for (const rel of model.relations) {
+        const relName = this.toSnakeCase(rel.name);
+        content += rel.isArray ? `    ${relName}: List[Any]\n` : `    ${relName}: Any\n`;
+      }
+      content += '\n';
+    }
+
+    fs.writeFileSync(path.join(outputDir, 'an5_models.py'), content);
+  }
+
+  private generateClient(models: Model[], outputDir: string) {
+    let content = '# This file is auto-generated. Do not edit directly.\n';
+    content += 'import os\n';
+    content += 'from typing import Dict, List, Optional, Any, Callable, TYPE_CHECKING\n\n';
+
+    content += 'try:\n';
+    content += '    from an5_adapter import An5Adapter, AdapterTableClient, create_an5_adapter, set_adapter_metadata\n';
+    content += 'except ImportError:\n';
+    content += '    from .an5_adapter import An5Adapter, AdapterTableClient, create_an5_adapter, set_adapter_metadata\n\n';
+
+    content += 'try:\n';
+    content += '    from .an5_metadata import MODEL_TO_TABLE, MODEL_FIELDS\n';
+    content += 'except ImportError:\n';
+    content += '    from an5_metadata import MODEL_TO_TABLE, MODEL_FIELDS\n\n';
+
+    if (models.length > 0) {
+      const rowTypes = models.map(m => `${m.name}Row`).join(', ');
+      content += 'if TYPE_CHECKING:\n';
+      content += '    try:\n';
+      content += `        from an5_models import ${rowTypes}\n`;
+      content += '    except ImportError:\n';
+      content += `        from .an5_models import ${rowTypes}\n\n`;
+    }
+
+    content += 'class An5Client:\n';
+    content += '    """AN5 Python ORM Client - type-safe database access.\n\n';
+    content += '    Usage:\n';
+    content += '        db = An5Client()\n';
+    content += '        users = db.user.find_many(where={"name": {"contains": "John"}}, order_by={"created_at": "asc"}, take=10)\n';
+    content += '        user  = db.user.find_first(where={"id": "abc"})\n';
+    content += '        new   = db.user.create(data={"name": "Alice", "email": "alice@example.com"})\n';
+    content += '    """\n';
+    content += '    def __init__(self, connection_string: Optional[str] = None):\n';
+    content += '        conn_str = (connection_string or \n';
+    content += '                    os.getenv("DATABASE_URL") or \n';
+    content += '                    "Server=localhost;Database=master;Trusted_Connection=True;TrustServerCertificate=True;")\n';
+    content += '        set_adapter_metadata({"model_to_table": MODEL_TO_TABLE, "model_fields": MODEL_FIELDS})\n';
+    content += '        self.adapter: An5Adapter = create_an5_adapter(conn_str)\n\n';
+
+    for (const model of models) {
+      const propName = this.toSnakeCase(model.name) + 's';
+      const singleName = this.toSnakeCase(model.name);
+      content += `        client = AdapterTableClient(self.adapter, "${model.name}")\n`;
+      content += `        self.${model.name}: AdapterTableClient["${model.name}Row"] = client\n`;
+      content += `        self.${model.name}s: AdapterTableClient["${model.name}Row"] = client\n`;
+      content += `        self.${singleName}: AdapterTableClient["${model.name}Row"] = client\n`;
+      content += `        self.${propName}: AdapterTableClient["${model.name}Row"] = client\n`;
+    }
+
+    content += '\n';
+    content += '    def __getattr__(self, name: str) -> AdapterTableClient[Any]:\n';
+    content += '        return self.adapter.table(name)\n\n';
+    content += '    def query_raw(self, sql: str, *params) -> List[Dict]:\n';
+    content += '        return self.adapter.query_raw(sql, *params)\n\n';
+    content += '    def execute_raw(self, sql: str, *params) -> int:\n';
+    content += '        return self.adapter.execute_raw(sql, *params)\n\n';
+    content += '    def transaction(self, fn: Callable) -> Any:\n';
+    content += '        return self.adapter.transaction(fn)\n';
+
+    fs.writeFileSync(path.join(outputDir, 'an5_client.py'), content);
+  }
+
+  private generateInit(models: Model[], outputDir: string) {
+    let content = '# This file is auto-generated. Do not edit directly.\n';
+    content += 'from .an5_metadata import MODEL_TO_TABLE, MODEL_DESCRIPTIONS, MODEL_FIELDS, RELATION_MAP\n';
+    content += 'from .an5_models import *\n';
+    content += 'from .an5_orm_types import (\n';
+    content += '    StringFilter, IntFilter, NumberFilter, BoolFilter, DateTimeFilter,\n';
+    for (const m of models) {
+      const name = this.capitalize(m.name);
+      content += `    ${name}WhereInput, ${name}OrderByInput,\n`;
+      content += `    ${name}CreateInput, ${name}UpdateInput,\n`;
+      content += `    ${name}FindManyArgs, ${name}FindFirstArgs,\n`;
+    }
+    content += ')\n';
+    content += 'from .an5_client import An5Client\n\n';
+    content += '__all__ = [\n';
+    content += '    "MODEL_TO_TABLE",\n';
+    content += '    "MODEL_DESCRIPTIONS",\n';
+    content += '    "MODEL_FIELDS",\n';
+    content += '    "RELATION_MAP",\n';
+    content += '    "An5Client",\n';
+    content += '    "StringFilter", "IntFilter", "NumberFilter", "BoolFilter", "DateTimeFilter",\n';
+
+    for (const m of models) {
+      const name = this.capitalize(m.name);
+      content += `    "${m.name}",\n`;
+      content += `    "${name}WhereInput", "${name}OrderByInput",\n`;
+      content += `    "${name}CreateInput", "${name}UpdateInput",\n`;
+      content += `    "${name}FindManyArgs", "${name}FindFirstArgs",\n`;
+    }
+    content += ']\n';
+
+    fs.writeFileSync(path.join(outputDir, '__init__.py'), content);
+  }
+
   private getAllPropertyVariations(modelName: string): string[] {
     const variations = new Set<string>();
-    
-    // 1. camelCase (User -> user, McpServer -> mcpServer)
+
     variations.add(this.toCamelCase(modelName));
-    
-    // 2. snake_case (User -> user, McpServer -> mcp_server)
     variations.add(this.toSnakeCase(modelName));
 
     const acronyms = ['LLM', 'AI', 'MCP', 'IT', 'QC', 'HR', 'MR', 'WH', 'SSIS', 'API', 'URL', 'ID', 'JSON'];
@@ -111,4 +416,9 @@ export class PythonGenerator {
       .replace(/([a-z\d])([A-Z])/g, '$1_$2')
       .toLowerCase();
   }
+
+  private capitalize(str: string): string {
+    if (!str) return '';
+    return str[0].toUpperCase() + str.slice(1);
+  }
 }

package/package.json

@@ -1,14 +1,10 @@
 {
   "name": "@an5/orm",
-  "version": "1.0.7",
-  "description": "The lightweight ORM for SQL Server with support for TypeScript, Python, and .NET (C#).",
+  "version": "1.0.9",
+  "description": "The lightweight ORM for SQL Server with support for TypeScript, Python, .NET (C#), and Go.",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
-  "bin": {
-    "an5": "./dist/cli.js",
-    "an5-orm": "./dist/cli.js"
-  },
   "files": [
     "dist/**/*.{js,d.ts}",
     "generator/src/**/*.ts",
@@ -21,6 +17,9 @@
     "url": "https://github.com/an5ORM/an5Orm.git"
   },
   "scripts": {
+    "build": "tsc -p tsconfig.json",
+    "pretest": "npm run build",
+    "prepack": "npm run build",
     "generate": "npx tsx generator/src/index.ts",
     "db:push": "npx tsx push.ts",
     "db:pull": "npx tsx pull.ts",
@@ -29,15 +28,18 @@
     "db:migrate": "npx tsx migrate.ts",
     "db:migrate:diff": "npx tsx migrate.ts diff",
     "db:migrate:generate": "npx tsx migrate.ts generate",
+    "db:migrate:apply": "npx tsx migrate.ts apply",
+    "db:migrate:rollback": "npx tsx migrate.ts rollback",
     "db:migrate:status": "npx tsx migrate.ts status",
     "release:cli": "npx tsx scripts/release-cli.ts",
     "release": "node scripts/release.js",
-    "test": "node test/smoke.test.js",
+    "test": "node test/smoke.test.js && node test/unit.test.js",
     "test:unit": "node test/unit.test.js",
-    "test:generator": "npm run generate && node test/generator.test.js"
+    "test:generator": "npm run generate && node test/generator.test.js",
+    "test:integration:live": "node test/live-db.integration.test.js"
   },
   "dependencies": {
-    "@an5/adapters": "^0.2.3",
+    "@an5/adapters": "^0.2.6",
     "bcryptjs": "^2.4.3",
     "dotenv": "^16.4.5",
     "mssql": "^12.5.5"
@@ -47,7 +49,7 @@
     "@types/mssql": "^9.1.8",
     "@types/node": "^20.19.43",
     "tsx": "^4.7.1",
-    "typescript": "^6.0.3"
+    "typescript": "^7.0.2"
   },
   "publishConfig": {
     "access": "public"

package/dist/cleanup.d.ts

@@ -1,2 +0,0 @@
-import "dotenv/config";
-//# sourceMappingURL=cleanup.d.ts.map

package/dist/cleanup.js

@@ -1,120 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-require("dotenv/config");
-const an5_adapters_1 = require("@an5/adapters");
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const rootDir = process.cwd();
-let config = {};
-try {
-    let configPath = path_1.default.join(rootDir, "an5Orm.config.js");
-    if (!fs_1.default.existsSync(configPath)) {
-        configPath = path_1.default.join(rootDir, "an5Orm.config.cjs");
-    }
-    if (fs_1.default.existsSync(configPath)) {
-        config = require(configPath);
-    }
-}
-catch (err) {
-    console.warn("⚠️ Could not load config file in cleanup.ts, using defaults.");
-}
-const schemaDir = path_1.default.resolve(rootDir, config.schemaDir || "an5Schema");
-let _adapter = null;
-async function getDb() {
-    if (!_adapter) {
-        _adapter = new an5_adapters_1.An5Adapter({ connectionString: process.env.DATABASE_URL });
-        await _adapter.$connect();
-    }
-    return _adapter;
-}
-async function cleanup() {
-    console.log("🧹 Starting database cleanup...");
-    let schemaText = "";
-    if (fs_1.default.existsSync(schemaDir)) {
-        const files = fs_1.default.readdirSync(schemaDir).filter(f => f.endsWith(".an5"));
-        for (const file of files) {
-            schemaText += fs_1.default.readFileSync(path_1.default.join(schemaDir, file), "utf8") + "\n";
-        }
-    }
-    else {
-        const schemaPath = path_1.default.join(__dirname, "schema.an5");
-        if (fs_1.default.existsSync(schemaPath)) {
-            schemaText = fs_1.default.readFileSync(schemaPath, "utf8");
-        }
-        else {
-            console.error("No schema found!");
-            process.exit(1);
-        }
-    }
-    const lines = schemaText.split("\n");
-    const validTables = new Set();
-    for (let line of lines) {
-        line = line.trim();
-        if (line.startsWith("model ")) {
-            const modelName = line.split(" ")[1].replace("{", "").trim();
-            // Default table name is model name + 's' (lowercase)
-            validTables.add(modelName.toLowerCase() + "s");
-        }
-        if (line.startsWith("@@map")) {
-            const mapMatch = line.match(/@@map\("(.+)"\)/);
-            if (mapMatch) {
-                // The last model's default name should be replaced by the map name
-                // Since we add the default name first, we need to be careful.
-                // Actually, let's just add the map name.
-                validTables.add(mapMatch[1]);
-            }
-        }
-    }
-    // Also include the capitalization variations from an5Metadata if we can, 
-    // but schema.an5 is the source of truth.
-    console.log("Valid tables from schema:", Array.from(validTables));
-    const dbTables = await (await getDb()).$queryRawUnsafe(`
-    SELECT name FROM sys.tables WHERE is_ms_shipped = 0
-  `);
-    const tablesToDrop = dbTables
-        .map(t => t.name)
-        .filter(name => !validTables.has(name) && !validTables.has(name.toLowerCase()));
-    if (tablesToDrop.length === 0) {
-        console.log("✅ No extra tables found. Database is clean.");
-        process.exit(0);
-    }
-    console.log("Tables to be DROPPED:", tablesToDrop);
-    for (const table of tablesToDrop) {
-        console.log(`Dropping table [${table}]...`);
-        try {
-            // We need to handle foreign key constraints. 
-            // For a thorough cleanup, we might need to drop constraints first.
-            // But for now, we'll try a simple DROP TABLE.
-            await (await getDb()).$executeRawUnsafe(`DROP TABLE [${table}]`);
-            console.log(`✅ Dropped [${table}]`);
-        }
-        catch (err) {
-            console.error(`❌ Failed to drop [${table}]: ${err.message}`);
-            if (err.message.includes("FOREIGN KEY constraint")) {
-                console.log(`Attempting to find and drop constraints for [${table}]...`);
-                const constraints = await (await getDb()).$queryRawUnsafe(`
-            SELECT fk.name AS constraint_name, OBJECT_NAME(fk.parent_object_id) AS table_name
-            FROM sys.foreign_keys AS fk
-            WHERE OBJECT_NAME(fk.referenced_object_id) = @p_0 OR OBJECT_NAME(fk.parent_object_id) = @p_0
-          `, table);
-                for (const c of constraints) {
-                    console.log(`Dropping constraint [${c.constraint_name}] on [${c.table_name}]...`);
-                    await (await getDb()).$executeRawUnsafe(`ALTER TABLE [${c.table_name}] DROP CONSTRAINT [${c.constraint_name}]`);
-                }
-                // Try dropping again
-                await (await getDb()).$executeRawUnsafe(`DROP TABLE [${table}]`);
-                console.log(`✅ Dropped [${table}] after removing constraints.`);
-            }
-        }
-    }
-    console.log("✅ Cleanup completed.");
-    process.exit(0);
-}
-cleanup().catch(err => {
-    console.error("❌ Cleanup failed:", err);
-    process.exit(1);
-});
-//# sourceMappingURL=cleanup.js.map