schemock 0.0.4-alpha.4 → 0.0.4-alpha.5

package/dist/cli/index.d.mts

@@ -225,7 +225,10 @@ interface AnalyzedField {
 interface AnalyzedRelation {
     name: string;
     type: 'hasOne' | 'hasMany' | 'belongsTo' | 'manyToMany';
+    /** Original target as defined in relation (e.g., 'user') */
     target: string;
+    /** Resolved target - actual schema name found (e.g., 'authUser'). Falls back to target if not found. */
+    resolvedTarget: string;
     targetPascal: string;
     foreignKey: string;
     /** For belongsTo - FK is on this entity */

package/dist/cli/index.d.ts

@@ -225,7 +225,10 @@ interface AnalyzedField {
 interface AnalyzedRelation {
     name: string;
     type: 'hasOne' | 'hasMany' | 'belongsTo' | 'manyToMany';
+    /** Original target as defined in relation (e.g., 'user') */
     target: string;
+    /** Resolved target - actual schema name found (e.g., 'authUser'). Falls back to target if not found. */
+    resolvedTarget: string;
     targetPascal: string;
     foreignKey: string;
     /** For belongsTo - FK is on this entity */

package/dist/cli/index.js

@@ -1011,11 +1011,14 @@ function analyzeRelation(name, rel, sourceEntitySingular, localFields, schemaMap
   \x1B[2mTo fix: Add 'foreignKey' option to the relation, e.g.: ${rel.type}('${rel.target}', { foreignKey: 'yourFieldName' })\x1B[0m`
     );
   }
+  const resolvedTargetSchema = findSchemaByName(schemaMap, rel.target);
+  const resolvedTarget = resolvedTargetSchema?.name ?? rel.target;
   const result = {
     name,
     type: rel.type,
     target: rel.target,
-    targetPascal: toPascalCase(singularize(rel.target)),
+    resolvedTarget,
+    targetPascal: toPascalCase(singularize(resolvedTarget)),
     foreignKey,
     eager: rel.eager ?? false,
     inferred: fkInferred
@@ -2379,24 +2382,26 @@ function generateEntityApi(code, schema, allSchemas, hasRLS) {
   code.line();
 }
 function generateRelationLoad(code, schema, rel) {
+  const targetDbName = toSafePropertyName(rel.resolvedTarget);
   if (rel.type === "hasMany") {
-    code.line(`result.${rel.name} = db.${rel.target}.findMany({`);
+    code.line(`result.${rel.name} = db.${targetDbName}.findMany({`);
     code.line(`  where: { ${rel.foreignKey}: { equals: item.id } }`);
     code.line("});");
   } else if (rel.type === "hasOne") {
-    code.line(`result.${rel.name} = db.${rel.target}.findFirst({`);
+    code.line(`result.${rel.name} = db.${targetDbName}.findFirst({`);
     code.line(`  where: { ${rel.foreignKey}: { equals: item.id } }`);
     code.line("});");
   } else if (rel.type === "belongsTo") {
-    code.line(`result.${rel.name} = db.${rel.target}.findFirst({`);
+    code.line(`result.${rel.name} = db.${targetDbName}.findFirst({`);
     code.line(`  where: { id: { equals: (item as Record<string, unknown>).${rel.localField} as string } }`);
     code.line("});");
   } else if (rel.type === "manyToMany") {
-    code.line(`const junctions = db.${rel.through}.findMany({`);
+    const throughDbName = toSafePropertyName(rel.through);
+    code.line(`const junctions = db.${throughDbName}.findMany({`);
     code.line(`  where: { ${rel.foreignKey}: { equals: item.id } }`);
     code.line("});");
     code.line(`result.${rel.name} = junctions`);
-    code.line(`  .map(j => db.${rel.target}.findFirst({`);
+    code.line(`  .map(j => db.${targetDbName}.findFirst({`);
     code.line(`    where: { id: { equals: (j as Record<string, unknown>).${rel.otherKey} as string } }`);
     code.line("  }))");
     code.line("  .filter(Boolean);");
@@ -2429,15 +2434,16 @@ function generateCreateMethod(code, schema, hasJsonFields, jsonFieldsStr, hasRLS
         code.line();
       }
       for (const rel of nestedRels) {
+        const targetDbName = toSafePropertyName(rel.resolvedTarget);
         code.block(`if (${rel.name}) {`, () => {
           if (rel.type === "hasMany") {
             code.block(`for (const nested of ${rel.name}) {`, () => {
               code.line(`// eslint-disable-next-line @typescript-eslint/no-explicit-any`);
-              code.line(`db.${rel.target}.create({ ...nested, ${rel.foreignKey}: item.id } as any);`);
+              code.line(`db.${targetDbName}.create({ ...nested, ${rel.foreignKey}: item.id } as any);`);
             });
           } else {
             code.line(`// eslint-disable-next-line @typescript-eslint/no-explicit-any`);
-            code.line(`db.${rel.target}.create({ ...${rel.name}, ${rel.foreignKey}: item.id } as any);`);
+            code.line(`db.${targetDbName}.create({ ...${rel.name}, ${rel.foreignKey}: item.id } as any);`);
           }
         });
       }