xansql 1.0.8 → 1.0.9

package/core/classes/{ModelFormatter.cjs → ModelFactory.cjs}

@@ -7,65 +7,86 @@ var core_XansqlError = require('../XansqlError.cjs');
 /**
  * this class will format the models and assign relationships
  */
-class ModelFormatter {
+class ModelFactgory {
     constructor(xansql) {
         this.isFormated = false;
-        this.restricted_columns = [
-        // custom
-        // "OPTIONAL", "NULLABLE", "META", "METAARRAY", "SCHEMA", "ARRAY",
-        // "EQUALS", "NOT", "LT", "LTE", "GT", "GTE", "IN", "NOTIN", "BETWEEN", "NOTBETWEEN", "CONTAINS", "NOTCONTAINS", "STARTSWITH", "ENDSWITH", "ISNULL", "ISNOTNULL", "ISEMPTY", "ISNOTEMPTY", "ISTRUE", "ISFALSE",
-        // "AGGREGATE",
-        ];
+        this.restricted_columns = [];
+        this.models = new Map();
         this.xansql = xansql;
     }
     restrictedColumn(column) {
         return this.restricted_columns.includes(column.toUpperCase());
     }
-    format() {
-        if (this.isFormated)
-            return this.xansql.ModelFactory;
-        this.isFormated = true;
-        const models = this.xansql.ModelFactory;
-        // sort models by foreign key dependencies
-        const sortedTables = [];
-        for (let table of models.keys()) {
-            const model = models.get(table);
-            const schema = model.schema;
-            for (let column in schema) {
-                let field = schema[column];
+    /**
+     * Topological sort with cycle detection
+     */
+    sortModelsByDependencies(models) {
+        const graph = new Map();
+        const visiting = new Set();
+        const visited = new Set();
+        const result = [];
+        // build dependency graph
+        for (const [table, model] of models) {
+            const deps = new Set();
+            for (const column in model.schema) {
+                const field = model.schema[column];
                 if (core_classes_ForeignInfo.isSchema(field)) {
-                    const foreignInfo = core_classes_ForeignInfo.get(model, column);
-                    const foreignTable = foreignInfo.table;
-                    const indexOfMainTable = sortedTables.indexOf(table);
-                    const indexOfForeignTable = sortedTables.indexOf(foreignTable);
-                    if (indexOfForeignTable === -1) {
-                        // foreign table not in sorted list, add it before main table
-                        sortedTables.splice(indexOfMainTable, 0, foreignTable);
-                    }
-                    else if (indexOfForeignTable > indexOfMainTable) {
-                        // foreign table is after main table, move it before
-                        sortedTables.splice(indexOfForeignTable, 1);
-                        sortedTables.splice(indexOfMainTable, 0, foreignTable);
-                    }
+                    deps.add(field.table);
                 }
             }
-            if (!sortedTables.includes(table)) {
-                sortedTables.push(table);
+            graph.set(table, deps);
+        }
+        const visit = (table) => {
+            if (visiting.has(table)) {
+                throw new core_XansqlError({
+                    message: `Circular foreign key detected involving "${table}"`,
+                    model: table
+                });
             }
+            if (visited.has(table))
+                return;
+            visiting.add(table);
+            const deps = graph.get(table);
+            if (deps) {
+                for (const dep of deps) {
+                    if (!models.has(dep)) {
+                        throw new core_XansqlError({
+                            message: `Foreign model "${dep}" not found while sorting "${table}"`,
+                            model: table
+                        });
+                    }
+                    visit(dep);
+                }
+            }
+            visiting.delete(table);
+            visited.add(table);
+            result.push(table);
+        };
+        for (const table of models.keys()) {
+            visit(table);
         }
-        // update models based with sorted tables
+        return result;
+    }
+    format() {
+        if (this.isFormated) {
+            return this.models;
+        }
+        const models = this.models;
+        // Proper, safe table sorting
+        const sortedTables = this.sortModelsByDependencies(models);
+        // rebuild model map in correct order
         const sortedModels = new Map();
-        for (let table of sortedTables) {
+        for (const table of sortedTables) {
             const model = models.get(table);
             sortedModels.set(table, model);
         }
-        // assign relationships
         models.clear();
-        for (let [table, model] of sortedModels) {
+        for (const [table, model] of sortedModels) {
             models.set(table, model);
         }
-        for (let model of models.values()) {
-            for (let column in model.schema) {
+        // relationship wiring
+        for (const model of models.values()) {
+            for (const column in model.schema) {
                 if (this.restrictedColumn(column)) {
                     throw new core_XansqlError({
                         message: `Column name "${column}" in model "${model.table}" is restricted and cannot be used.`,
@@ -73,7 +94,7 @@ class ModelFormatter {
                         column,
                     });
                 }
-                let field = model.schema[column];
+                const field = model.schema[column];
                 if (core_classes_ForeignInfo.isSchema(field)) {
                     this.formatIsSchema(model, column);
                 }
@@ -82,19 +103,21 @@ class ModelFormatter {
                 }
             }
         }
+        this.isFormated = true;
         return models;
     }
     formatIsSchema(model, column) {
-        const models = this.xansql.ModelFactory;
-        let field = model.schema[column];
+        const models = this.models;
+        const field = model.schema[column];
         const FModel = models.get(field.table);
         if (!FModel) {
             throw new core_XansqlError({
-                message: `Foreign model ${field.table} not found for ${model.table}.${column}`,
+                message: `Foreign model "${field.table}" not found for ${model.table}.${column}`,
                 model: model.table,
                 column
             });
         }
+        // ensure reciprocal field exists
         if (field.column in FModel.schema) {
             const foreignCol = FModel.schema[field.column];
             if (core_classes_ForeignInfo.isArray(foreignCol)) {
@@ -117,26 +140,29 @@ class ModelFormatter {
         }
         else {
             const n = xt_index.schema(model.table, column).nullable();
-            n.dynamic = true; // to identify that this is a dynamically added field
+            n.dynamic = true;
             FModel.schema[field.column] = xt_index.array(n);
             models.set(FModel.table, FModel);
         }
     }
     formatIsArray(model, column) {
-        const models = this.xansql.ModelFactory;
-        let field = model.schema[column];
+        var _a, _b, _c, _d;
+        const models = this.models;
+        const field = model.schema[column];
         const FSchemaField = field.type;
         const FModel = models.get(FSchemaField.table);
         if (!FModel) {
             throw new core_XansqlError({
-                message: `Foreign model ${FSchemaField.table} not found for ${model.table}.${column}`,
+                message: `Foreign model "${FSchemaField.table}" not found for ${model.table}.${column}`,
                 model: model.table,
                 column
             });
         }
         if (FSchemaField.column in FModel.schema) {
             const foreignCol = FModel.schema[FSchemaField.column];
-            if (!core_classes_ForeignInfo.isSchema(foreignCol) || foreignCol.table !== model.table || foreignCol.column !== column) {
+            if (!core_classes_ForeignInfo.isSchema(foreignCol) ||
+                foreignCol.table !== model.table ||
+                foreignCol.column !== column) {
                 throw new core_XansqlError({
                     message: `Foreign column ${FSchemaField.table}.${FSchemaField.column} does not reference back to ${model.table}.${column}`,
                     model: model.table,
@@ -146,20 +172,20 @@ class ModelFormatter {
         }
         else {
             const n = xt_index.schema(model.table, column);
-            if (FSchemaField.meta.nullable)
+            if ((_a = FSchemaField.meta) === null || _a === void 0 ? void 0 : _a.nullable)
                 n.nullable();
-            if (FSchemaField.meta.optional)
+            if ((_b = FSchemaField.meta) === null || _b === void 0 ? void 0 : _b.optional)
                 n.optional();
-            if (FSchemaField.meta.default !== undefined)
+            if (((_c = FSchemaField.meta) === null || _c === void 0 ? void 0 : _c.default) !== undefined)
                 n.default(FSchemaField.meta.default);
-            if (FSchemaField.meta.transform)
+            if ((_d = FSchemaField.meta) === null || _d === void 0 ? void 0 : _d.transform)
                 n.transform(FSchemaField.meta.transform);
-            n.dynamic = true; // to identify that this is a dynamically added field
+            n.dynamic = true;
             FModel.schema[FSchemaField.column] = n;
             models.set(FModel.table, FModel);
         }
     }
 }
 
-module.exports = ModelFormatter;
-//# sourceMappingURL=ModelFormatter.cjs.map
+module.exports = ModelFactgory;
+//# sourceMappingURL=ModelFactory.cjs.map

package/core/classes/ModelFactory.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"ModelFactory.cjs","sources":["../../../src/core/classes/ModelFactory.ts"],"sourcesContent":["import xt from \"../../xt\";\nimport Model from \"../../model\";\nimport XqlSchema from \"../../xt/fields/Schema\";\nimport Xansql from \"../Xansql\";\nimport Foreign from \"./ForeignInfo\";\nimport XansqlError from \"../XansqlError\";\n\n/**\n * this class will format the models and assign relationships\n */\nclass ModelFactgory {\n   private xansql: Xansql;\n   private isFormated: boolean = false;\n   private restricted_columns: string[] = [];\n   readonly models: Map<string, Model> = new Map();\n\n   constructor(xansql: Xansql) {\n      this.xansql = xansql;\n   }\n\n   private restrictedColumn(column: string): boolean {\n      return this.restricted_columns.includes(column.toUpperCase());\n   }\n\n   /**\n    * Topological sort with cycle detection\n    */\n   private sortModelsByDependencies(models: Map<string, Model>): string[] {\n      const graph = new Map<string, Set<string>>();\n      const visiting = new Set<string>();\n      const visited = new Set<string>();\n      const result: string[] = [];\n\n      // build dependency graph\n      for (const [table, model] of models) {\n         const deps = new Set<string>();\n         for (const column in model.schema) {\n            const field: any = model.schema[column];\n            if (Foreign.isSchema(field)) {\n               deps.add(field.table);\n            }\n         }\n         graph.set(table, deps);\n      }\n\n      const visit = (table: string) => {\n         if (visiting.has(table)) {\n            throw new XansqlError({\n               message: `Circular foreign key detected involving \"${table}\"`,\n               model: table\n            });\n         }\n\n         if (visited.has(table)) return;\n\n         visiting.add(table);\n\n         const deps = graph.get(table);\n         if (deps) {\n            for (const dep of deps) {\n               if (!models.has(dep)) {\n                  throw new XansqlError({\n                     message: `Foreign model \"${dep}\" not found while sorting \"${table}\"`,\n                     model: table\n                  });\n               }\n               visit(dep);\n            }\n         }\n\n         visiting.delete(table);\n         visited.add(table);\n         result.push(table);\n      };\n\n      for (const table of models.keys()) {\n         visit(table);\n      }\n\n      return result;\n   }\n\n   format() {\n      if (this.isFormated) {\n         return this.models;\n      }\n      const models = this.models;\n\n      // Proper, safe table sorting\n      const sortedTables = this.sortModelsByDependencies(models);\n\n      // rebuild model map in correct order\n      const sortedModels = new Map<string, Model>();\n      for (const table of sortedTables) {\n         const model = models.get(table) as Model;\n         sortedModels.set(table, model);\n      }\n\n      models.clear();\n      for (const [table, model] of sortedModels) {\n         models.set(table, model);\n      }\n\n      // relationship wiring\n      for (const model of models.values()) {\n         for (const column in model.schema) {\n            if (this.restrictedColumn(column)) {\n               throw new XansqlError({\n                  message: `Column name \"${column}\" in model \"${model.table}\" is restricted and cannot be used.`,\n                  model: model.table,\n                  column,\n               });\n            }\n\n            const field: any = model.schema[column];\n\n            if (Foreign.isSchema(field)) {\n               this.formatIsSchema(model, column);\n            } else if (Foreign.isArray(field)) {\n               this.formatIsArray(model, column);\n            }\n         }\n      }\n\n      this.isFormated = true;\n      return models;\n   }\n\n   private formatIsSchema(model: Model, column: string) {\n      const models = this.models;\n      const field: any = model.schema[column];\n\n      const FModel = models.get(field.table);\n      if (!FModel) {\n         throw new XansqlError({\n            message: `Foreign model \"${field.table}\" not found for ${model.table}.${column}`,\n            model: model.table,\n            column\n         });\n      }\n\n      // ensure reciprocal field exists\n      if (field.column in FModel.schema) {\n         const foreignCol = FModel.schema[field.column];\n\n         if (Foreign.isArray(foreignCol)) {\n            const foreignType = (foreignCol as any).type as XqlSchema;\n            if (foreignType.table !== model.table || foreignType.column !== column) {\n               throw new XansqlError({\n                  message: `Foreign column ${field.table}.${field.column} does not reference back to ${model.table}.${column}`,\n                  model: model.table,\n                  column\n               });\n            }\n         } else {\n            throw new XansqlError({\n               message: `Foreign column ${field.table}.${field.column} is not an array referencing back to ${model.table}.${column}`,\n               model: model.table,\n               column\n            });\n         }\n      } else {\n         const n = xt.schema(model.table, column).nullable();\n         (n as any).dynamic = true;\n         FModel.schema[field.column] = xt.array(n);\n         models.set(FModel.table, FModel);\n      }\n   }\n\n   private formatIsArray(model: Model, column: string) {\n      const models = this.models;\n      const field: any = model.schema[column];\n      const FSchemaField = (field as any).type as XqlSchema;\n\n      const FModel = models.get(FSchemaField.table);\n      if (!FModel) {\n         throw new XansqlError({\n            message: `Foreign model \"${FSchemaField.table}\" not found for ${model.table}.${column}`,\n            model: model.table,\n            column\n         });\n      }\n\n      if (FSchemaField.column in FModel.schema) {\n         const foreignCol = FModel.schema[FSchemaField.column] as any;\n\n         if (\n            !Foreign.isSchema(foreignCol) ||\n            foreignCol.table !== model.table ||\n            foreignCol.column !== column\n         ) {\n            throw new XansqlError({\n               message: `Foreign column ${FSchemaField.table}.${FSchemaField.column} does not reference back to ${model.table}.${column}`,\n               model: model.table,\n               column\n            });\n         }\n      } else {\n         const n = xt.schema(model.table, column);\n\n         if (FSchemaField.meta?.nullable) n.nullable();\n         if (FSchemaField.meta?.optional) n.optional();\n         if (FSchemaField.meta?.default !== undefined) n.default(FSchemaField.meta.default);\n         if (FSchemaField.meta?.transform) n.transform(FSchemaField.meta.transform);\n\n         (n as any).dynamic = true;\n         FModel.schema[FSchemaField.column] = n;\n         models.set(FModel.table, FModel);\n      }\n   }\n}\n\nexport default ModelFactgory;\n"],"names":["Foreign","XansqlError","xt"],"mappings":"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"}

package/core/classes/{ModelFormatter.d.ts → ModelFactory.d.ts}

@@ -3,14 +3,19 @@ import Xansql from "../Xansql";
 /**
  * this class will format the models and assign relationships
  */
-declare class ModelFormatter {
+declare class ModelFactgory {
     private xansql;
     private isFormated;
     private restricted_columns;
+    readonly models: Map<string, Model>;
     constructor(xansql: Xansql);
     private restrictedColumn;
+    /**
+     * Topological sort with cycle detection
+     */
+    private sortModelsByDependencies;
     format(): Map<string, Model>;
     private formatIsSchema;
     private formatIsArray;
 }
-export default ModelFormatter;
+export default ModelFactgory;

package/core/classes/{ModelFormatter.mjs → ModelFactory.mjs}

@@ -5,65 +5,86 @@ import XansqlError from '../XansqlError.mjs';
 /**
  * this class will format the models and assign relationships
  */
-class ModelFormatter {
+class ModelFactgory {
     constructor(xansql) {
         this.isFormated = false;
-        this.restricted_columns = [
-        // custom
-        // "OPTIONAL", "NULLABLE", "META", "METAARRAY", "SCHEMA", "ARRAY",
-        // "EQUALS", "NOT", "LT", "LTE", "GT", "GTE", "IN", "NOTIN", "BETWEEN", "NOTBETWEEN", "CONTAINS", "NOTCONTAINS", "STARTSWITH", "ENDSWITH", "ISNULL", "ISNOTNULL", "ISEMPTY", "ISNOTEMPTY", "ISTRUE", "ISFALSE",
-        // "AGGREGATE",
-        ];
+        this.restricted_columns = [];
+        this.models = new Map();
         this.xansql = xansql;
     }
     restrictedColumn(column) {
         return this.restricted_columns.includes(column.toUpperCase());
     }
-    format() {
-        if (this.isFormated)
-            return this.xansql.ModelFactory;
-        this.isFormated = true;
-        const models = this.xansql.ModelFactory;
-        // sort models by foreign key dependencies
-        const sortedTables = [];
-        for (let table of models.keys()) {
-            const model = models.get(table);
-            const schema = model.schema;
-            for (let column in schema) {
-                let field = schema[column];
+    /**
+     * Topological sort with cycle detection
+     */
+    sortModelsByDependencies(models) {
+        const graph = new Map();
+        const visiting = new Set();
+        const visited = new Set();
+        const result = [];
+        // build dependency graph
+        for (const [table, model] of models) {
+            const deps = new Set();
+            for (const column in model.schema) {
+                const field = model.schema[column];
                 if (Foreign.isSchema(field)) {
-                    const foreignInfo = Foreign.get(model, column);
-                    const foreignTable = foreignInfo.table;
-                    const indexOfMainTable = sortedTables.indexOf(table);
-                    const indexOfForeignTable = sortedTables.indexOf(foreignTable);
-                    if (indexOfForeignTable === -1) {
-                        // foreign table not in sorted list, add it before main table
-                        sortedTables.splice(indexOfMainTable, 0, foreignTable);
-                    }
-                    else if (indexOfForeignTable > indexOfMainTable) {
-                        // foreign table is after main table, move it before
-                        sortedTables.splice(indexOfForeignTable, 1);
-                        sortedTables.splice(indexOfMainTable, 0, foreignTable);
-                    }
+                    deps.add(field.table);
                 }
             }
-            if (!sortedTables.includes(table)) {
-                sortedTables.push(table);
+            graph.set(table, deps);
+        }
+        const visit = (table) => {
+            if (visiting.has(table)) {
+                throw new XansqlError({
+                    message: `Circular foreign key detected involving "${table}"`,
+                    model: table
+                });
             }
+            if (visited.has(table))
+                return;
+            visiting.add(table);
+            const deps = graph.get(table);
+            if (deps) {
+                for (const dep of deps) {
+                    if (!models.has(dep)) {
+                        throw new XansqlError({
+                            message: `Foreign model "${dep}" not found while sorting "${table}"`,
+                            model: table
+                        });
+                    }
+                    visit(dep);
+                }
+            }
+            visiting.delete(table);
+            visited.add(table);
+            result.push(table);
+        };
+        for (const table of models.keys()) {
+            visit(table);
         }
-        // update models based with sorted tables
+        return result;
+    }
+    format() {
+        if (this.isFormated) {
+            return this.models;
+        }
+        const models = this.models;
+        // Proper, safe table sorting
+        const sortedTables = this.sortModelsByDependencies(models);
+        // rebuild model map in correct order
         const sortedModels = new Map();
-        for (let table of sortedTables) {
+        for (const table of sortedTables) {
             const model = models.get(table);
             sortedModels.set(table, model);
         }
-        // assign relationships
         models.clear();
-        for (let [table, model] of sortedModels) {
+        for (const [table, model] of sortedModels) {
             models.set(table, model);
         }
-        for (let model of models.values()) {
-            for (let column in model.schema) {
+        // relationship wiring
+        for (const model of models.values()) {
+            for (const column in model.schema) {
                 if (this.restrictedColumn(column)) {
                     throw new XansqlError({
                         message: `Column name "${column}" in model "${model.table}" is restricted and cannot be used.`,
@@ -71,7 +92,7 @@ class ModelFormatter {
                         column,
                     });
                 }
-                let field = model.schema[column];
+                const field = model.schema[column];
                 if (Foreign.isSchema(field)) {
                     this.formatIsSchema(model, column);
                 }
@@ -80,19 +101,21 @@ class ModelFormatter {
                 }
             }
         }
+        this.isFormated = true;
         return models;
     }
     formatIsSchema(model, column) {
-        const models = this.xansql.ModelFactory;
-        let field = model.schema[column];
+        const models = this.models;
+        const field = model.schema[column];
         const FModel = models.get(field.table);
         if (!FModel) {
             throw new XansqlError({
-                message: `Foreign model ${field.table} not found for ${model.table}.${column}`,
+                message: `Foreign model "${field.table}" not found for ${model.table}.${column}`,
                 model: model.table,
                 column
             });
         }
+        // ensure reciprocal field exists
         if (field.column in FModel.schema) {
             const foreignCol = FModel.schema[field.column];
             if (Foreign.isArray(foreignCol)) {
@@ -115,26 +138,29 @@ class ModelFormatter {
         }
         else {
             const n = xt.schema(model.table, column).nullable();
-            n.dynamic = true; // to identify that this is a dynamically added field
+            n.dynamic = true;
             FModel.schema[field.column] = xt.array(n);
             models.set(FModel.table, FModel);
         }
     }
     formatIsArray(model, column) {
-        const models = this.xansql.ModelFactory;
-        let field = model.schema[column];
+        var _a, _b, _c, _d;
+        const models = this.models;
+        const field = model.schema[column];
         const FSchemaField = field.type;
         const FModel = models.get(FSchemaField.table);
         if (!FModel) {
             throw new XansqlError({
-                message: `Foreign model ${FSchemaField.table} not found for ${model.table}.${column}`,
+                message: `Foreign model "${FSchemaField.table}" not found for ${model.table}.${column}`,
                 model: model.table,
                 column
             });
         }
         if (FSchemaField.column in FModel.schema) {
             const foreignCol = FModel.schema[FSchemaField.column];
-            if (!Foreign.isSchema(foreignCol) || foreignCol.table !== model.table || foreignCol.column !== column) {
+            if (!Foreign.isSchema(foreignCol) ||
+                foreignCol.table !== model.table ||
+                foreignCol.column !== column) {
                 throw new XansqlError({
                     message: `Foreign column ${FSchemaField.table}.${FSchemaField.column} does not reference back to ${model.table}.${column}`,
                     model: model.table,
@@ -144,20 +170,20 @@ class ModelFormatter {
         }
         else {
             const n = xt.schema(model.table, column);
-            if (FSchemaField.meta.nullable)
+            if ((_a = FSchemaField.meta) === null || _a === void 0 ? void 0 : _a.nullable)
                 n.nullable();
-            if (FSchemaField.meta.optional)
+            if ((_b = FSchemaField.meta) === null || _b === void 0 ? void 0 : _b.optional)
                 n.optional();
-            if (FSchemaField.meta.default !== undefined)
+            if (((_c = FSchemaField.meta) === null || _c === void 0 ? void 0 : _c.default) !== undefined)
                 n.default(FSchemaField.meta.default);
-            if (FSchemaField.meta.transform)
+            if ((_d = FSchemaField.meta) === null || _d === void 0 ? void 0 : _d.transform)
                 n.transform(FSchemaField.meta.transform);
-            n.dynamic = true; // to identify that this is a dynamically added field
+            n.dynamic = true;
             FModel.schema[FSchemaField.column] = n;
             models.set(FModel.table, FModel);
         }
     }
 }
 
-export { ModelFormatter as default };
-//# sourceMappingURL=ModelFormatter.mjs.map
+export { ModelFactgory as default };
+//# sourceMappingURL=ModelFactory.mjs.map

package/core/classes/ModelFactory.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"ModelFactory.mjs","sources":["../../../src/core/classes/ModelFactory.ts"],"sourcesContent":["import xt from \"../../xt\";\nimport Model from \"../../model\";\nimport XqlSchema from \"../../xt/fields/Schema\";\nimport Xansql from \"../Xansql\";\nimport Foreign from \"./ForeignInfo\";\nimport XansqlError from \"../XansqlError\";\n\n/**\n * this class will format the models and assign relationships\n */\nclass ModelFactgory {\n   private xansql: Xansql;\n   private isFormated: boolean = false;\n   private restricted_columns: string[] = [];\n   readonly models: Map<string, Model> = new Map();\n\n   constructor(xansql: Xansql) {\n      this.xansql = xansql;\n   }\n\n   private restrictedColumn(column: string): boolean {\n      return this.restricted_columns.includes(column.toUpperCase());\n   }\n\n   /**\n    * Topological sort with cycle detection\n    */\n   private sortModelsByDependencies(models: Map<string, Model>): string[] {\n      const graph = new Map<string, Set<string>>();\n      const visiting = new Set<string>();\n      const visited = new Set<string>();\n      const result: string[] = [];\n\n      // build dependency graph\n      for (const [table, model] of models) {\n         const deps = new Set<string>();\n         for (const column in model.schema) {\n            const field: any = model.schema[column];\n            if (Foreign.isSchema(field)) {\n               deps.add(field.table);\n            }\n         }\n         graph.set(table, deps);\n      }\n\n      const visit = (table: string) => {\n         if (visiting.has(table)) {\n            throw new XansqlError({\n               message: `Circular foreign key detected involving \"${table}\"`,\n               model: table\n            });\n         }\n\n         if (visited.has(table)) return;\n\n         visiting.add(table);\n\n         const deps = graph.get(table);\n         if (deps) {\n            for (const dep of deps) {\n               if (!models.has(dep)) {\n                  throw new XansqlError({\n                     message: `Foreign model \"${dep}\" not found while sorting \"${table}\"`,\n                     model: table\n                  });\n               }\n               visit(dep);\n            }\n         }\n\n         visiting.delete(table);\n         visited.add(table);\n         result.push(table);\n      };\n\n      for (const table of models.keys()) {\n         visit(table);\n      }\n\n      return result;\n   }\n\n   format() {\n      if (this.isFormated) {\n         return this.models;\n      }\n      const models = this.models;\n\n      // Proper, safe table sorting\n      const sortedTables = this.sortModelsByDependencies(models);\n\n      // rebuild model map in correct order\n      const sortedModels = new Map<string, Model>();\n      for (const table of sortedTables) {\n         const model = models.get(table) as Model;\n         sortedModels.set(table, model);\n      }\n\n      models.clear();\n      for (const [table, model] of sortedModels) {\n         models.set(table, model);\n      }\n\n      // relationship wiring\n      for (const model of models.values()) {\n         for (const column in model.schema) {\n            if (this.restrictedColumn(column)) {\n               throw new XansqlError({\n                  message: `Column name \"${column}\" in model \"${model.table}\" is restricted and cannot be used.`,\n                  model: model.table,\n                  column,\n               });\n            }\n\n            const field: any = model.schema[column];\n\n            if (Foreign.isSchema(field)) {\n               this.formatIsSchema(model, column);\n            } else if (Foreign.isArray(field)) {\n               this.formatIsArray(model, column);\n            }\n         }\n      }\n\n      this.isFormated = true;\n      return models;\n   }\n\n   private formatIsSchema(model: Model, column: string) {\n      const models = this.models;\n      const field: any = model.schema[column];\n\n      const FModel = models.get(field.table);\n      if (!FModel) {\n         throw new XansqlError({\n            message: `Foreign model \"${field.table}\" not found for ${model.table}.${column}`,\n            model: model.table,\n            column\n         });\n      }\n\n      // ensure reciprocal field exists\n      if (field.column in FModel.schema) {\n         const foreignCol = FModel.schema[field.column];\n\n         if (Foreign.isArray(foreignCol)) {\n            const foreignType = (foreignCol as any).type as XqlSchema;\n            if (foreignType.table !== model.table || foreignType.column !== column) {\n               throw new XansqlError({\n                  message: `Foreign column ${field.table}.${field.column} does not reference back to ${model.table}.${column}`,\n                  model: model.table,\n                  column\n               });\n            }\n         } else {\n            throw new XansqlError({\n               message: `Foreign column ${field.table}.${field.column} is not an array referencing back to ${model.table}.${column}`,\n               model: model.table,\n               column\n            });\n         }\n      } else {\n         const n = xt.schema(model.table, column).nullable();\n         (n as any).dynamic = true;\n         FModel.schema[field.column] = xt.array(n);\n         models.set(FModel.table, FModel);\n      }\n   }\n\n   private formatIsArray(model: Model, column: string) {\n      const models = this.models;\n      const field: any = model.schema[column];\n      const FSchemaField = (field as any).type as XqlSchema;\n\n      const FModel = models.get(FSchemaField.table);\n      if (!FModel) {\n         throw new XansqlError({\n            message: `Foreign model \"${FSchemaField.table}\" not found for ${model.table}.${column}`,\n            model: model.table,\n            column\n         });\n      }\n\n      if (FSchemaField.column in FModel.schema) {\n         const foreignCol = FModel.schema[FSchemaField.column] as any;\n\n         if (\n            !Foreign.isSchema(foreignCol) ||\n            foreignCol.table !== model.table ||\n            foreignCol.column !== column\n         ) {\n            throw new XansqlError({\n               message: `Foreign column ${FSchemaField.table}.${FSchemaField.column} does not reference back to ${model.table}.${column}`,\n               model: model.table,\n               column\n            });\n         }\n      } else {\n         const n = xt.schema(model.table, column);\n\n         if (FSchemaField.meta?.nullable) n.nullable();\n         if (FSchemaField.meta?.optional) n.optional();\n         if (FSchemaField.meta?.default !== undefined) n.default(FSchemaField.meta.default);\n         if (FSchemaField.meta?.transform) n.transform(FSchemaField.meta.transform);\n\n         (n as any).dynamic = true;\n         FModel.schema[FSchemaField.column] = n;\n         models.set(FModel.table, FModel);\n      }\n   }\n}\n\nexport default ModelFactgory;\n"],"names":[],"mappings":"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"}

package/core/types.d.ts

@@ -48,9 +48,9 @@ export type XansqlFileConfig = {
 };
 export type XansqlDialect = {
     engine: XansqlDialectEngine;
+    file?: XansqlFileConfig;
     execute: (sql: string, xansql: Xansql) => Promise<ExecuterResult | null>;
     getSchema: (xansql: Xansql) => Promise<XansqlDialectSchemaType | void>;
-    file?: XansqlFileConfig;
 };
 export type XansqlSocket = {
     open: (socket: WebSocket) => Promise<void>;

package/dialect/MysqlDialect.cjs

@@ -1,14 +1,16 @@
 'use strict';
 
+var tslib = require('tslib');
 var mysql = require('mysql2/promise');
 
-const MysqlDialect = (config) => {
+const MysqlDialect = (_a) => {
+    var { file } = _a, config = tslib.__rest(_a, ["file"]);
     const pool = mysql.createPool(typeof config === 'string' ? { uri: config } : config);
-    const execute = async (sql, params = []) => {
+    const execute = async (sql) => {
         var _a, _b;
         const conn = await pool.getConnection();
         try {
-            const [rows] = await conn.query(sql, params);
+            const [rows] = await conn.query(sql);
             const result = rows;
             return {
                 results: result,
@@ -66,7 +68,8 @@ const MysqlDialect = (config) => {
     return {
         engine: 'mysql',
         execute,
-        getSchema
+        getSchema,
+        file
     };
 };
 

package/dialect/MysqlDialect.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"MysqlDialect.cjs","sources":["../../src/dialect/MysqlDialect.ts"],"sourcesContent":["import { PoolOptions } from 'mysql2';\nimport mysql from 'mysql2/promise';\nimport { ExecuterResult } from '../core/types';\n\nconst MysqlDialect = (config: string | PoolOptions) => {\n   const pool = mysql.createPool(\n      typeof config === 'string' ? { uri: config } : config\n   );\n\n   const execute = async (sql: string, params: any[] = []): Promise<ExecuterResult> => {\n      const conn = await pool.getConnection();\n      try {\n         const [rows] = await conn.query(sql, params);\n         const result: any = rows;\n\n         return {\n            results: result,\n            insertId: result?.insertId ?? 0,\n            affectedRows: result?.affectedRows ?? 0\n         };\n      } finally {\n         conn.release();\n      }\n   };\n\n   const getSchema = async () => {\n      const conn = await pool.getConnection();\n\n      try {\n         const [tables] = await conn.query<any[]>(\n            `SELECT table_name as name\n             FROM information_schema.tables \n             WHERE table_schema = DATABASE();`\n         );\n\n         const schema: Record<string, any[]> = {};\n\n         for (const t of tables) {\n            const table = t.name;\n            schema[table] = [];\n\n            // Columns\n            const [columns] = await conn.query<any[]>(\n               `SELECT \n                  COLUMN_NAME as name,\n                  COLUMN_TYPE as type,\n                  IS_NULLABLE,\n                  COLUMN_DEFAULT,\n                  COLUMN_KEY\n                FROM information_schema.columns\n                WHERE table_schema = DATABASE()\n                  AND table_name = ?`,\n               [table]\n            );\n\n            // Indexes\n            const [indexes] = await conn.query<any[]>(\n               `SHOW INDEX FROM \\`${table}\\``\n            );\n\n            for (const col of columns) {\n               const colName = col.name;\n\n               const isIndexed = indexes.some(i => i.Column_name === colName);\n               const isUnique = indexes.some(i => i.Column_name === colName && i.Non_unique === 0);\n\n               schema[table].push({\n                  name: colName,\n                  type: col.type,\n                  notnull: col.IS_NULLABLE === \"NO\",\n                  default_value: col.COLUMN_DEFAULT,\n                  pk: col.COLUMN_KEY === \"PRI\",\n                  index: isIndexed,\n                  unique: isUnique,\n               });\n            }\n         }\n\n         return schema;\n      } finally {\n         conn.release();\n      }\n   };\n\n   return {\n      engine: 'mysql' as const,\n      execute,\n      getSchema\n   };\n};\n\nexport default MysqlDialect;\n"],"names":[],"mappings":";;;;AAIA,MAAM,YAAY,GAAG,CAAC,MAA4B,KAAI;IACnD,MAAM,IAAI,GAAG,KAAK,CAAC,UAAU,CAC1B,OAAO,MAAM,KAAK,QAAQ,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,MAAM,CACvD;IAED,MAAM,OAAO,GAAG,OAAO,GAAW,EAAE,MAAA,GAAgB,EAAE,KAA6B;;AAChF,QAAA,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE;AACvC,QAAA,IAAI;AACD,YAAA,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC;YAC5C,MAAM,MAAM,GAAQ,IAAI;YAExB,OAAO;AACJ,gBAAA,OAAO,EAAE,MAAM;gBACf,QAAQ,EAAE,CAAA,EAAA,GAAA,MAAM,KAAA,IAAA,IAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,MAAA,IAAA,IAAA,EAAA,KAAA,KAAA,CAAA,GAAA,EAAA,GAAI,CAAC;gBAC/B,YAAY,EAAE,CAAA,EAAA,GAAA,MAAM,KAAA,IAAA,IAAN,MAAM,uBAAN,MAAM,CAAE,YAAY,MAAA,IAAA,IAAA,EAAA,KAAA,KAAA,CAAA,GAAA,EAAA,GAAI;aACxC;QACJ;gBAAU;YACP,IAAI,CAAC,OAAO,EAAE;QACjB;AACH,IAAA,CAAC;AAED,IAAA,MAAM,SAAS,GAAG,YAAW;AAC1B,QAAA,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE;AAEvC,QAAA,IAAI;YACD,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,KAAK,CAC9B,CAAA;;AAEkC,6CAAA,CAAA,CACpC;YAED,MAAM,MAAM,GAA0B,EAAE;AAExC,YAAA,KAAK,MAAM,CAAC,IAAI,MAAM,EAAE;AACrB,gBAAA,MAAM,KAAK,GAAG,CAAC,CAAC,IAAI;AACpB,gBAAA,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE;;gBAGlB,MAAM,CAAC,OAAO,CAAC,GAAG,MAAM,IAAI,CAAC,KAAK,CAC/B,CAAA;;;;;;;;AAQsB,oCAAA,CAAA,EACtB,CAAC,KAAK,CAAC,CACT;;AAGD,gBAAA,MAAM,CAAC,OAAO,CAAC,GAAG,MAAM,IAAI,CAAC,KAAK,CAC/B,CAAA,kBAAA,EAAqB,KAAK,CAAA,EAAA,CAAI,CAChC;AAED,gBAAA,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE;AACxB,oBAAA,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI;AAExB,oBAAA,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,WAAW,KAAK,OAAO,CAAC;oBAC9D,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,WAAW,KAAK,OAAO,IAAI,CAAC,CAAC,UAAU,KAAK,CAAC,CAAC;AAEnF,oBAAA,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC;AAChB,wBAAA,IAAI,EAAE,OAAO;wBACb,IAAI,EAAE,GAAG,CAAC,IAAI;AACd,wBAAA,OAAO,EAAE,GAAG,CAAC,WAAW,KAAK,IAAI;wBACjC,aAAa,EAAE,GAAG,CAAC,cAAc;AACjC,wBAAA,EAAE,EAAE,GAAG,CAAC,UAAU,KAAK,KAAK;AAC5B,wBAAA,KAAK,EAAE,SAAS;AAChB,wBAAA,MAAM,EAAE,QAAQ;AAClB,qBAAA,CAAC;gBACL;YACH;AAEA,YAAA,OAAO,MAAM;QAChB;gBAAU;YACP,IAAI,CAAC,OAAO,EAAE;QACjB;AACH,IAAA,CAAC;IAED,OAAO;AACJ,QAAA,MAAM,EAAE,OAAgB;QACxB,OAAO;QACP;KACF;AACJ;;;;"}
+{"version":3,"file":"MysqlDialect.cjs","sources":["../../src/dialect/MysqlDialect.ts"],"sourcesContent":["import { PoolOptions } from 'mysql2';\nimport mysql from 'mysql2/promise';\nimport { ExecuterResult, XansqlDialectEngine, XansqlFileConfig } from '../core/types';\n\nconst MysqlDialect = ({ file, ...config }: PoolOptions & { file?: XansqlFileConfig }) => {\n   const pool = mysql.createPool(typeof config === 'string' ? { uri: config } : config);\n\n   const execute = async (sql: string): Promise<ExecuterResult> => {\n      const conn = await pool.getConnection();\n      try {\n         const [rows] = await conn.query(sql);\n         const result: any = rows;\n\n         return {\n            results: result,\n            insertId: result?.insertId ?? 0,\n            affectedRows: result?.affectedRows ?? 0\n         };\n      } finally {\n         conn.release();\n      }\n   };\n\n   const getSchema = async () => {\n      const conn = await pool.getConnection();\n\n      try {\n         const [tables] = await conn.query<any[]>(\n            `SELECT table_name as name\n             FROM information_schema.tables \n             WHERE table_schema = DATABASE();`\n         );\n\n         const schema: Record<string, any[]> = {};\n\n         for (const t of tables) {\n            const table = t.name;\n            schema[table] = [];\n\n            // Columns\n            const [columns] = await conn.query<any[]>(\n               `SELECT \n                  COLUMN_NAME as name,\n                  COLUMN_TYPE as type,\n                  IS_NULLABLE,\n                  COLUMN_DEFAULT,\n                  COLUMN_KEY\n                FROM information_schema.columns\n                WHERE table_schema = DATABASE()\n                  AND table_name = ?`,\n               [table]\n            );\n\n            // Indexes\n            const [indexes] = await conn.query<any[]>(\n               `SHOW INDEX FROM \\`${table}\\``\n            );\n\n            for (const col of columns) {\n               const colName = col.name;\n\n               const isIndexed = indexes.some(i => i.Column_name === colName);\n               const isUnique = indexes.some(i => i.Column_name === colName && i.Non_unique === 0);\n\n               schema[table].push({\n                  name: colName,\n                  type: col.type,\n                  notnull: col.IS_NULLABLE === \"NO\",\n                  default_value: col.COLUMN_DEFAULT,\n                  pk: col.COLUMN_KEY === \"PRI\",\n                  index: isIndexed,\n                  unique: isUnique,\n               });\n            }\n         }\n\n         return schema;\n      } finally {\n         conn.release();\n      }\n   };\n\n   return {\n      engine: 'mysql' as XansqlDialectEngine,\n      execute,\n      getSchema,\n      file\n   };\n};\n\nexport default MysqlDialect;\n"],"names":["__rest"],"mappings":"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"}

package/dialect/MysqlDialect.d.ts

@@ -1,8 +1,11 @@
 import { PoolOptions } from 'mysql2';
-import { ExecuterResult } from '../core/types';
-declare const MysqlDialect: (config: string | PoolOptions) => {
-    engine: "mysql";
-    execute: (sql: string, params?: any[]) => Promise<ExecuterResult>;
+import { ExecuterResult, XansqlDialectEngine, XansqlFileConfig } from '../core/types';
+declare const MysqlDialect: ({ file, ...config }: PoolOptions & {
+    file?: XansqlFileConfig;
+}) => {
+    engine: XansqlDialectEngine;
+    execute: (sql: string) => Promise<ExecuterResult>;
     getSchema: () => Promise<Record<string, any[]>>;
+    file: XansqlFileConfig;
 };
 export default MysqlDialect;

package/dialect/MysqlDialect.mjs

@@ -1,12 +1,14 @@
+import { __rest } from 'tslib';
 import mysql from 'mysql2/promise';
 
-const MysqlDialect = (config) => {
+const MysqlDialect = (_a) => {
+    var { file } = _a, config = __rest(_a, ["file"]);
     const pool = mysql.createPool(typeof config === 'string' ? { uri: config } : config);
-    const execute = async (sql, params = []) => {
+    const execute = async (sql) => {
         var _a, _b;
         const conn = await pool.getConnection();
         try {
-            const [rows] = await conn.query(sql, params);
+            const [rows] = await conn.query(sql);
             const result = rows;
             return {
                 results: result,
@@ -64,7 +66,8 @@ const MysqlDialect = (config) => {
     return {
         engine: 'mysql',
         execute,
-        getSchema
+        getSchema,
+        file
     };
 };