@dbml/core 3.13.0-alpha.0 → 3.13.0-alpha.2

package/lib/model_structure/database.js

@@ -75,21 +75,26 @@ var Database = /*#__PURE__*/function (_Element) {
     _this.records = [];
     _this.tablePartials = [];
     _this.injectedRawRefs = [];
+
+    // The process order is important. Do not change !
     _this.processNotes(notes);
     _this.processRecords(records);
     _this.processTablePartials(tablePartials);
-    // The process order is important. Do not change !
     _this.processSchemas(schemas);
     _this.processSchemaElements(enums, _config.ENUM);
     _this.processSchemaElements(tables, _config.TABLE);
     _this.processSchemaElements(notes, _config.NOTE);
     _this.processSchemaElements(refs, _config.REF);
     _this.processSchemaElements(tableGroups, _config.TABLE_GROUP);
-    _this.injectedRawRefs.forEach(function (ref) {
+    _this.injectedRawRefs.forEach(function (rawRef) {
       var schema = _this.findOrCreateSchema(_config.DEFAULT_SCHEMA_NAME);
-      schema.pushRef(new _ref3["default"](_objectSpread(_objectSpread({}, ref), {}, {
+      var ref = new _ref3["default"](_objectSpread(_objectSpread({}, rawRef), {}, {
         schema: schema
-      })));
+      }));
+      if (schema.refs.some(function (r) {
+        return r.equals(ref);
+      })) return;
+      schema.pushRef(ref);
     });
     return _this;
   }
@@ -346,7 +351,8 @@ var Database = /*#__PURE__*/function (_Element) {
         indexes: {},
         indexColumns: {},
         fields: {},
-        records: {}
+        records: {},
+        tablePartials: {}
       };
       this.schemas.forEach(function (schema) {
         return schema.normalize(normalizedModel);
@@ -355,7 +361,10 @@ var Database = /*#__PURE__*/function (_Element) {
         return note.normalize(normalizedModel);
       });
       this.records.forEach(function (record) {
-        return normalizedModel.records[record.id] = _objectSpread({}, record);
+        normalizedModel.records[record.id] = _objectSpread({}, record);
+      });
+      this.tablePartials.forEach(function (tablePartial) {
+        return tablePartial.normalize(normalizedModel);
       });
       return normalizedModel;
     }

package/lib/model_structure/dbState.js

@@ -26,6 +26,7 @@ var DbState = /*#__PURE__*/function () {
     this.fieldId = 1;
     this.indexColumnId = 1;
     this.recordId = 1;
+    this.tablePartialId = 1;
   }
   _createClass(DbState, [{
     key: "generateId",

package/lib/model_structure/endpoint.js

@@ -104,11 +104,13 @@ var Endpoint = /*#__PURE__*/function (_Element) {
   }, {
     key: "shallowExport",
     value: function shallowExport() {
+      var _this$injectedPartial;
       return {
         schemaName: this.schemaName,
         tableName: this.tableName,
         fieldNames: this.fieldNames,
-        relation: this.relation
+        relation: this.relation,
+        injectedPartialId: (_this$injectedPartial = this.injectedPartial) === null || _this$injectedPartial === void 0 ? void 0 : _this$injectedPartial.id
       };
     }
   }, {

package/lib/model_structure/field.js

@@ -44,7 +44,9 @@ var Field = /*#__PURE__*/function (_Element) {
       _ref$noteToken = _ref.noteToken,
       noteToken = _ref$noteToken === void 0 ? null : _ref$noteToken,
       _ref$injectedPartial = _ref.injectedPartial,
-      injectedPartial = _ref$injectedPartial === void 0 ? null : _ref$injectedPartial;
+      injectedPartial = _ref$injectedPartial === void 0 ? null : _ref$injectedPartial,
+      _ref$injectedToken = _ref.injectedToken,
+      injectedToken = _ref$injectedToken === void 0 ? null : _ref$injectedToken;
     _classCallCheck(this, Field);
     _this = _super.call(this, token);
     if (!name) {
@@ -65,7 +67,9 @@ var Field = /*#__PURE__*/function (_Element) {
     _this.increment = increment;
     _this.endpoints = [];
     _this.table = table;
-    _this.injectedPartial = injectedPartial, _this.dbState = _this.table.dbState;
+    _this.injectedPartial = injectedPartial;
+    _this.injectedToken = injectedToken;
+    _this.dbState = _this.table.dbState;
     _this.generateId();
     _this.bindType();
     return _this;
@@ -127,6 +131,7 @@ var Field = /*#__PURE__*/function (_Element) {
   }, {
     key: "shallowExport",
     value: function shallowExport() {
+      var _this$injectedPartial;
       return {
         name: this.name,
         type: this.type,
@@ -135,7 +140,8 @@ var Field = /*#__PURE__*/function (_Element) {
         not_null: this.not_null,
         note: this.note,
         dbdefault: this.dbdefault,
-        increment: this.increment
+        increment: this.increment,
+        injectedPartialId: (_this$injectedPartial = this.injectedPartial) === null || _this$injectedPartial === void 0 ? void 0 : _this$injectedPartial.id
       };
     }
   }, {

package/lib/model_structure/ref.js

@@ -101,11 +101,13 @@ var Ref = /*#__PURE__*/function (_Element) {
   }, {
     key: "shallowExport",
     value: function shallowExport() {
+      var _this$injectedPartial;
       return {
         name: this.name,
         color: this.color,
         onDelete: this.onDelete,
-        onUpdate: this.onUpdate
+        onUpdate: this.onUpdate,
+        injectedPartialId: (_this$injectedPartial = this.injectedPartial) === null || _this$injectedPartial === void 0 ? void 0 : _this$injectedPartial.id
       };
     }
   }, {

package/lib/model_structure/table.js

@@ -68,8 +68,10 @@ var Table = /*#__PURE__*/function (_Element) {
     _this.dbState = _this.schema.dbState;
     _this.generateId();
     _this.processFields(fields);
-    _this.processIndexes(indexes);
+    // Process partials after fields to get injected fields' orders
+    // Process partials before indexes for indexes to properly check all owned and injected columns
     _this.processPartials();
+    _this.processIndexes(indexes);
     return _this;
   }
   _createClass(Table, [{
@@ -149,16 +151,19 @@ var Table = /*#__PURE__*/function (_Element) {
       var _this$partials,
         _this5 = this;
       if (!((_this$partials = this.partials) !== null && _this$partials !== void 0 && _this$partials.length)) return;
-
       /**
        * When encountering conflicting columns or settings with identical names, the following resolution order is applied:
        * 1. Local Table Definition: If a definition exists within the local table, it takes precedence.
        * 2. Last Partial Definition: If no local definition is found,
-       *  the definition from the most recently processed partial containing the conflicting name is used.
+       *  the definition from the last partial (in dbml source) containing the conflicting name is used.
        *
-       * Indexes with identical column tuples and attributes will be merged into a single index.
+       * each partial has the following structure:
+       * {
+       *   name: string,
+       *   order: number, // determine where the partials fields will be injected in comparison with the table fields and other partials
+       *   token, // token of the partial definition
+       * }
        */
-
       var existingFieldNames = new Set(this.fields.map(function (f) {
         return f.name;
       }));
@@ -170,9 +175,15 @@ var Table = /*#__PURE__*/function (_Element) {
       var sortedPartials = this.partials.sort(function (a, b) {
         return b.order - a.order;
       });
+
+      // insert placeholder into table.fields
+      sortedPartials.toReversed().forEach(function (partial) {
+        _this5.fields.splice(partial.order, 0, 'dummy');
+      });
       sortedPartials.forEach(function (partial) {
         var tablePartial = _this5.schema.database.findTablePartial(partial.name);
         if (!tablePartial) _this5.error("Table partial ".concat(partial.name, " not found"), partial.token);
+        partial.id = tablePartial.id;
         if (tablePartial.fields) {
           var _this5$fields;
           // ignore fields that already exist in the table, or have been added by a later partial
@@ -185,17 +196,21 @@ var Table = /*#__PURE__*/function (_Element) {
             // convert inline_refs from injected fields to refs
             if (rawField.inline_refs) {
               rawField.inline_refs.forEach(function (iref) {
+                var _this5$schema;
                 var ref = {
+                  token: rawField.token,
                   endpoints: [{
                     tableName: _this5.name,
-                    schemaName: _this5.schema.name,
+                    schemaName: (_this5$schema = _this5.schema) === null || _this5$schema === void 0 ? void 0 : _this5$schema.name,
                     fieldNames: [rawField.name],
-                    relation: ['-', '<'].includes(iref.relation) ? '1' : '*'
+                    relation: ['-', '<'].includes(iref.relation) ? '1' : '*',
+                    token: rawField.token
                   }, {
                     tableName: iref.tableName,
                     schemaName: iref.schemaName,
                     fieldNames: iref.fieldNames,
-                    relation: ['-', '>'].includes(iref.relation) ? '1' : '*'
+                    relation: ['-', '>'].includes(iref.relation) ? '1' : '*',
+                    token: iref.token
                   }],
                   injectedPartial: tablePartial
                 };
@@ -203,11 +218,15 @@ var Table = /*#__PURE__*/function (_Element) {
               });
             }
             return new _field["default"](_objectSpread(_objectSpread({}, rawField), {}, {
+              noteToken: null,
               table: _this5,
-              injectedPartial: tablePartial
+              injectedPartial: tablePartial,
+              injectedToken: partial.token
             }));
           });
-          (_this5$fields = _this5.fields).splice.apply(_this5$fields, [partial.order, 0].concat(_toConsumableArray(fields)));
+          (_this5$fields = _this5.fields).splice.apply(_this5$fields, [partial.order, 1].concat(_toConsumableArray(fields)));
+        } else {
+          _this5.fields.splice(partial.order, 1); // still need to remove the dummy element, even when there's no field in the partial
         }
 
         // merge settings
@@ -228,14 +247,6 @@ var Table = /*#__PURE__*/function (_Element) {
             injectedPartial: tablePartial
           })));
         });
-
-        // uniqWith(this.indexes, (a, b) => {
-        //   return 
-        //   isEqual(a.columns, b.columns) &&
-        //   a.unique === b.unique &&
-        //   a.pk === b.pk &&
-        //   a.type === b.type
-        // });
       });
     }
   }, {
@@ -282,7 +293,8 @@ var Table = /*#__PURE__*/function (_Element) {
         name: this.name,
         alias: this.alias,
         note: this.note,
-        headerColor: this.headerColor
+        headerColor: this.headerColor,
+        partials: this.partials
       };
     }
   }, {

package/lib/model_structure/tablePartial.js

@@ -7,10 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 exports["default"] = void 0;
 var _lodash = require("lodash");
 var _element = _interopRequireDefault(require("./element"));
-var _field = _interopRequireDefault(require("./field"));
-var _indexes = _interopRequireDefault(require("./indexes"));
-var _config = require("./config");
-var _utils = require("./utils");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -54,9 +50,6 @@ var TablePartial = /*#__PURE__*/function (_Element) {
     _this.indexes = indexes;
     _this.dbState = dbState;
     _this.generateId();
-
-    // this.processFields(fields);
-    // this.processIndexes(indexes);
     return _this;
   }
   _createClass(TablePartial, [{
@@ -64,74 +57,10 @@ var TablePartial = /*#__PURE__*/function (_Element) {
     value: function generateId() {
       this.id = this.dbState.generateId('tablePartialId');
     }
-
-    // processFields (rawFields) {
-    //   rawFields.forEach((field) => {
-    //     this.pushField(new Field({ ...field, table: this }));
-    //   });
-    // }
-
-    // pushField (field) {
-    //   this.checkField(field);
-    //   this.fields.push(field);
-    // }
-
-    // checkField (field) {
-    //   if (this.fields.some(f => f.name === field.name)) {
-    //     field.error(`Field "${field.name}" existed in table partial "${this.name}"`);
-    //   }
-    // }
-
-    // processIndexes (rawIndexes) {
-    //   rawIndexes.forEach((index) => {
-    //     this.pushIndex(new Index({ ...index, table: this }));
-    //   });
-    // }
-
-    // pushIndex (index) {
-    //   this.checkIndex(index);
-    //   this.indexes.push(index);
-    // }
-
-    // checkIndex (index) {
-    //   index.columns.forEach((column) => {
-    //     if (column.type === 'column' && !(this.findField(column.value))) {
-    //       index.error(`Column "${column.value}" do not exist in table partial "${this.name}"`);
-    //     }
-    //   });
-    // }
-
-    // findField (fieldName) {
-    //   return this.fields.find(f => f.name === fieldName);
-    // }
   }, {
     key: "export",
     value: function _export() {
-      return _objectSpread(_objectSpread({}, this.shallowExport()), this.exportChild());
-    }
-  }, {
-    key: "exportChild",
-    value: function exportChild() {
-      return {
-        fields: this.fields.map(function (f) {
-          return f["export"]();
-        }),
-        indexes: this.indexes.map(function (i) {
-          return i["export"]();
-        })
-      };
-    }
-  }, {
-    key: "exportChildIds",
-    value: function exportChildIds() {
-      return {
-        fieldIds: this.fields.map(function (f) {
-          return f.id;
-        }),
-        indexIds: this.indexes.map(function (i) {
-          return i.id;
-        })
-      };
+      return _objectSpread({}, this.shallowExport());
     }
   }, {
     key: "shallowExport",
@@ -139,21 +68,17 @@ var TablePartial = /*#__PURE__*/function (_Element) {
       return {
         name: this.name,
         note: this.note,
-        headerColor: this.headerColor
+        headerColor: this.headerColor,
+        fields: this.fields,
+        indexes: this.indexes
       };
     }
   }, {
     key: "normalize",
     value: function normalize(model) {
-      model.tables[this.id] = _objectSpread(_objectSpread({
+      model.tablePartials[this.id] = _objectSpread({
         id: this.id
-      }, this.shallowExport()), this.exportChildIds());
-      this.fields.forEach(function (field) {
-        return field.normalize(model);
-      });
-      this.indexes.forEach(function (index) {
-        return index.normalize(model);
-      });
+      }, this.shallowExport());
     }
   }]);
   return TablePartial;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dbml/core",
-  "version": "3.13.0-alpha.0",
+  "version": "3.13.0-alpha.2",
   "description": "> TODO: description",
   "author": "Holistics <dev@holistics.io>",
   "license": "Apache-2.0",
@@ -32,7 +32,7 @@
     "prepublish": "npm run build"
   },
   "dependencies": {
-    "@dbml/parse": "^3.13.0-alpha.0",
+    "@dbml/parse": "^3.13.0-alpha.2",
     "antlr4": "^4.13.1",
     "lodash": "^4.17.15",
     "parsimmon": "^1.13.0",
@@ -59,7 +59,7 @@
       "\\.(?!json$)[^.]*$": "@glen/jest-raw-loader"
     }
   },
-  "gitHead": "6b6edb8bc9804cd65849451820f1d43072d8c01c",
+  "gitHead": "2a00c9bde5b128f5463344b6567248c3a1d7f7a1",
   "engines": {
     "node": ">=16"
   }