@stonyx/orm 0.2.1-beta.41 → 0.2.1-beta.42

package/package.json

@@ -4,7 +4,7 @@
     "stonyx-async",
     "stonyx-module"
   ],
-  "version": "0.2.1-beta.41",
+  "version": "0.2.1-beta.42",
   "description": "",
   "main": "src/main.js",
   "type": "module",

package/src/belongs-to.js

@@ -11,7 +11,7 @@ export default function belongsTo(modelName) {
   const pendingHasManyQueue = relationships.get('pending');
   const pendingBelongsToQueue = relationships.get('pendingBelongsTo');
 
-  return (sourceRecord, rawData, options) => {
+  const fn = (sourceRecord, rawData, options) => {
     if (!rawData) return null;
 
     const { __name: sourceModelName } = sourceRecord.__model;
@@ -60,4 +60,7 @@ export default function belongsTo(modelName) {
 
     return output;
   }
+
+  Object.defineProperty(fn, '__relatedModelName', { value: modelName });
+  return fn;
 }

package/src/has-many.js

@@ -16,7 +16,7 @@ export default function hasMany(modelName) {
   const globalRelationships = relationships.get('global');
   const pendingRelationships = relationships.get('pending');
 
-  return (sourceRecord, rawData, options) => {
+  const fn = (sourceRecord, rawData, options) => {
     const { __name: sourceModelName } = sourceRecord.__model;
     const relationshipId = sourceRecord.id;
     const relationship = getRelationships('hasMany', sourceModelName, modelName, relationshipId);
@@ -58,4 +58,7 @@ export default function hasMany(modelName) {
 
     return output;
   }
+
+  Object.defineProperty(fn, '__relatedModelName', { value: modelName });
+  return fn;
 }

package/src/mysql/schema-introspector.js

@@ -8,13 +8,18 @@ import { AggregateProperty } from '../aggregates.js';
 function getRelationshipInfo(property) {
   if (typeof property !== 'function') return null;
   const fnStr = property.toString();
+  const modelName = property.__relatedModelName || null;
 
-  if (fnStr.includes(`getRelationships('belongsTo',`)) return 'belongsTo';
-  if (fnStr.includes(`getRelationships('hasMany',`)) return 'hasMany';
+  if (fnStr.includes(`getRelationships('belongsTo',`)) return { type: 'belongsTo', modelName };
+  if (fnStr.includes(`getRelationships('hasMany',`)) return { type: 'hasMany', modelName };
 
   return null;
 }
 
+function sanitizeTableName(name) {
+  return name.replace(/[-/]/g, '_');
+}
+
 export function introspectModels() {
   const { models } = Orm.instance;
   const schemas = {};
@@ -35,12 +40,12 @@ export function introspectModels() {
     for (const [key, property] of Object.entries(model)) {
       if (key.startsWith('__')) continue;
 
-      const relType = getRelationshipInfo(property);
+      const relInfo = getRelationshipInfo(property);
 
-      if (relType === 'belongsTo') {
-        relationships.belongsTo[key] = true;
-      } else if (relType === 'hasMany') {
-        relationships.hasMany[key] = true;
+      if (relInfo?.type === 'belongsTo') {
+        relationships.belongsTo[key] = relInfo.modelName;
+      } else if (relInfo?.type === 'hasMany') {
+        relationships.hasMany[key] = relInfo.modelName;
       } else if (property?.constructor?.name === 'ModelProperty') {
         if (key === 'id') {
           idType = property.type;
@@ -51,17 +56,16 @@ export function introspectModels() {
     }
 
     // Build foreign keys from belongsTo relationships
-    for (const relName of Object.keys(relationships.belongsTo)) {
-      const modelName = camelCaseToKebabCase(relName);
+    for (const [relName, targetModelName] of Object.entries(relationships.belongsTo)) {
       const fkColumn = `${relName}_id`;
       foreignKeys[fkColumn] = {
-        references: getPluralName(modelName),
+        references: sanitizeTableName(getPluralName(targetModelName)),
         column: 'id',
       };
     }
 
     schemas[name] = {
-      table: getPluralName(name),
+      table: sanitizeTableName(getPluralName(name)),
       idType,
       columns,
       foreignKeys,
@@ -74,7 +78,8 @@ export function introspectModels() {
 }
 
 export function buildTableDDL(name, schema, allSchemas = {}) {
-  const { table, idType, columns, foreignKeys } = schema;
+  const { idType, columns, foreignKeys } = schema;
+  const table = sanitizeTableName(schema.table);
   const lines = [];
 
   // Primary key
@@ -101,7 +106,8 @@ export function buildTableDDL(name, schema, allSchemas = {}) {
 
   // Foreign key constraints
   for (const [fkCol, fkDef] of Object.entries(foreignKeys)) {
-    lines.push(`  FOREIGN KEY (\`${fkCol}\`) REFERENCES \`${fkDef.references}\`(\`${fkDef.column}\`) ON DELETE SET NULL`);
+    const refTable = sanitizeTableName(fkDef.references);
+    lines.push(`  FOREIGN KEY (\`${fkCol}\`) REFERENCES \`${refTable}\`(\`${fkDef.column}\`) ON DELETE SET NULL`);
   }
 
   return `CREATE TABLE IF NOT EXISTS \`${table}\` (\n${lines.join(',\n')}\n)`;
@@ -131,8 +137,8 @@ export function getTopologicalOrder(schemas) {
     if (!schema) return;
 
     // Visit dependencies (belongsTo targets) first
-    for (const relName of Object.keys(schema.relationships.belongsTo)) {
-      visit(camelCaseToKebabCase(relName));
+    for (const targetModelName of Object.values(schema.relationships.belongsTo)) {
+      visit(targetModelName);
     }
 
     order.push(name);
@@ -172,18 +178,17 @@ export function introspectViews() {
         continue;
       }
 
-      const relType = getRelationshipInfo(property);
+      const relInfo = getRelationshipInfo(property);
 
-      if (relType === 'belongsTo') {
-        relationships.belongsTo[key] = true;
-        const modelName = camelCaseToKebabCase(key);
+      if (relInfo?.type === 'belongsTo') {
+        relationships.belongsTo[key] = relInfo.modelName;
         const fkColumn = `${key}_id`;
         foreignKeys[fkColumn] = {
-          references: getPluralName(modelName),
+          references: sanitizeTableName(getPluralName(relInfo.modelName)),
           column: 'id',
         };
-      } else if (relType === 'hasMany') {
-        relationships.hasMany[key] = true;
+      } else if (relInfo?.type === 'hasMany') {
+        relationships.hasMany[key] = relInfo.modelName;
       } else if (property?.constructor?.name === 'ModelProperty') {
         const transforms = Orm.instance.transforms;
         columns[key] = getMysqlType(property.type, transforms[property.type]);
@@ -191,7 +196,7 @@ export function introspectViews() {
     }
 
     schemas[name] = {
-      viewName: getPluralName(name),
+      viewName: sanitizeTableName(getPluralName(name)),
       source,
       groupBy: viewClass.groupBy || undefined,
       columns,
@@ -213,9 +218,9 @@ export function buildViewDDL(name, viewSchema, modelSchemas = {}) {
 
   const sourceModelName = viewSchema.source;
   const sourceSchema = modelSchemas[sourceModelName];
-  const sourceTable = sourceSchema
+  const sourceTable = sanitizeTableName(sourceSchema
     ? sourceSchema.table
-    : getPluralName(sourceModelName);
+    : getPluralName(sourceModelName));
 
   const selectColumns = [];
   const joins = [];
@@ -241,8 +246,7 @@ export function buildViewDDL(name, viewSchema, modelSchemas = {}) {
     } else {
       // Relationship aggregate
       const relName = aggProp.relationship;
-      const relModelName = camelCaseToKebabCase(relName);
-      const relTable = getPluralName(relModelName);
+      const relTable = sanitizeTableName(getPluralName(relName));
 
       if (aggProp.aggregateType === 'count') {
         selectColumns.push(`${aggProp.mysqlFunction}(\`${relTable}\`.\`id\`) AS \`${key}\``);
@@ -281,7 +285,7 @@ export function buildViewDDL(name, viewSchema, modelSchemas = {}) {
     groupBy = `\nGROUP BY \`${sourceTable}\`.\`id\``;
   }
 
-  const viewName = viewSchema.viewName;
+  const viewName = sanitizeTableName(viewSchema.viewName);
   const sql = `CREATE OR REPLACE VIEW \`${viewName}\` AS\nSELECT\n  ${selectColumns.join(',\n  ')}\nFROM \`${sourceTable}\`${joinClauses ? '\n  ' + joinClauses : ''}${groupBy}`;
 
   return sql;