@an5/orm 1.0.3 → 1.0.4

package/dist/generator/src/python-generator.js

@@ -25,7 +25,7 @@ class PythonGenerator {
         pyContent += 'MODEL_FIELDS = {\n';
         for (const model of models) {
             const props = this.getAllPropertyVariations(model.name);
-            const fieldsStr = `{ ${model.fields.map(f => `"${f.name}": "${f.type}${f.isOptional ? '?' : ''}"`).join(', ')} }`;
+            const fieldsStr = this.formatFields(model);
             for (const prop of props) {
                 pyContent += `    "${prop}": ${fieldsStr},\n`;
             }
@@ -68,6 +68,14 @@ class PythonGenerator {
         }
         return Array.from(variations);
     }
+    formatFields(model) {
+        if (model.fields.length === 0)
+            return '[]';
+        const fields = model.fields.map(f => {
+            return `        { "name": "${f.name}", "type": "${f.type}${f.isOptional ? '?' : ''}", "sql": "${f.sqlType}", "isOptional": ${f.isOptional ? 'True' : 'False'}, "hasDefault": ${f.hasDefault ? 'True' : 'False'}, "isId": ${f.isId ? 'True' : 'False'} }`;
+        });
+        return `[\n${fields.join(',\n')}\n    ]`;
+    }
     toCamelCase(str) {
         if (!str)
             return '';

package/generator/src/python-generator.ts

@@ -20,13 +20,13 @@ export class PythonGenerator {
     pyContent += '}\n\n';
 
     // 2. MODEL_FIELDS
-    pyContent += 'MODEL_FIELDS = {\n';
-    for (const model of models) {
-      const props = this.getAllPropertyVariations(model.name);
-      const fieldsStr = `{ ${model.fields.map(f => `"${f.name}": "${f.type}${f.isOptional ? '?' : ''}"`).join(', ')} }`;
-      for (const prop of props) {
-        pyContent += `    "${prop}": ${fieldsStr},\n`;
-      }
+    pyContent += 'MODEL_FIELDS = {\n';
+    for (const model of models) {
+      const props = this.getAllPropertyVariations(model.name);
+      const fieldsStr = this.formatFields(model);
+      for (const prop of props) {
+        pyContent += `    "${prop}": ${fieldsStr},\n`;
+      }
     }
     pyContent += '}\n\n';
 
@@ -54,7 +54,7 @@ export class PythonGenerator {
     fs.writeFileSync(this.outputPath, pyContent);
   }
 
-  private getAllPropertyVariations(modelName: string): string[] {
+  private getAllPropertyVariations(modelName: string): string[] {
     const variations = new Set<string>();
     
     // 1. camelCase (User -> user, McpServer -> mcpServer)
@@ -73,9 +73,19 @@ export class PythonGenerator {
     }
 
     return Array.from(variations);
-  }
-
-  private toCamelCase(str: string): string {
+  }
+
+  private formatFields(model: Model): string {
+    if (model.fields.length === 0) return '[]';
+
+    const fields = model.fields.map(f => {
+      return `        { "name": "${f.name}", "type": "${f.type}${f.isOptional ? '?' : ''}", "sql": "${f.sqlType}", "isOptional": ${f.isOptional ? 'True' : 'False'}, "hasDefault": ${f.hasDefault ? 'True' : 'False'}, "isId": ${f.isId ? 'True' : 'False'} }`;
+    });
+
+    return `[\n${fields.join(',\n')}\n    ]`;
+  }
+
+  private toCamelCase(str: string): string {
     if (!str) return '';
     return str[0].toLowerCase() + str.slice(1);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@an5/orm",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "The lightweight ORM for SQL Server with support for TypeScript, Python, and .NET (C#).",
   "license": "MIT",
   "main": "dist/index.js",
@@ -35,7 +35,7 @@
     "test:generator": "node test/generator.test.js"
   },
   "dependencies": {
-    "@an5/adapters": "^0.1.2",
+    "@an5/adapters": "^0.2.0",
     "bcryptjs": "^2.4.3",
     "dotenv": "^16.4.5",
     "mssql": "^12.5.5"