@dbml/core 2.4.4 → 2.5.1

package/lib/model_structure/database.js

@@ -85,7 +85,8 @@ var Database = /*#__PURE__*/function (_Element) {
 
     _this.hasDefaultSchema = false;
     _this.schemas = [];
-    _this.note = project.note;
+    _this.note = project.note ? project.note.value : null;
+    _this.noteToken = project.note ? project.note.token : null;
     _this.databaseType = project.database_type;
     _this.name = project.name;
     _this.aliases = aliases; // The process order is important. Do not change !
@@ -190,7 +191,9 @@ var Database = /*#__PURE__*/function (_Element) {
       if (!schema) {
         schema = new _schema["default"]({
           name: schemaName,
-          note: schemaName === _config.DEFAULT_SCHEMA_NAME ? "Default ".concat(_lodash["default"].capitalize(_config.DEFAULT_SCHEMA_NAME), " Schema") : '',
+          note: {
+            value: schemaName === _config.DEFAULT_SCHEMA_NAME ? "Default ".concat(_lodash["default"].capitalize(_config.DEFAULT_SCHEMA_NAME), " Schema") : null
+          },
           database: this
         });
         this.pushSchema(schema);

package/lib/model_structure/enum.js

@@ -65,7 +65,8 @@ var Enum = /*#__PURE__*/function (_Element) {
     }
 
     _this.name = name;
-    _this.note = note;
+    _this.note = note ? note.value : null;
+    _this.noteToken = note ? note.token : null;
     _this.values = [];
     _this.fields = [];
     _this.schema = schema;

package/lib/model_structure/enumValue.js

@@ -60,7 +60,8 @@ var EnumValue = /*#__PURE__*/function (_Element) {
     }
 
     _this.name = name;
-    _this.note = note;
+    _this.note = note ? note.value : null;
+    _this.noteToken = note ? note.token : null;
     _this._enum = _enum;
     _this.dbState = _this._enum.dbState;
 

package/lib/model_structure/field.js

@@ -53,7 +53,7 @@ var Field = /*#__PURE__*/function (_Element) {
         unique = _ref.unique,
         pk = _ref.pk,
         token = _ref.token,
-        not_null = _ref.not_null,
+        notNull = _ref.not_null,
         note = _ref.note,
         dbdefault = _ref.dbdefault,
         increment = _ref.increment,
@@ -77,8 +77,9 @@ var Field = /*#__PURE__*/function (_Element) {
     _this.type = type;
     _this.unique = unique;
     _this.pk = pk;
-    _this.not_null = not_null;
-    _this.note = note;
+    _this.not_null = notNull;
+    _this.note = note ? note.value : null;
+    _this.noteToken = note ? note.token : null;
     _this.dbdefault = dbdefault;
     _this.increment = increment;
     _this.endpoints = [];

package/lib/model_structure/indexes.js

@@ -64,7 +64,8 @@ var Index = /*#__PURE__*/function (_Element) {
     _this.name = name;
     _this.type = type;
     _this.unique = unique;
-    _this.note = note;
+    _this.note = note ? note.value : null;
+    _this.noteToken = note ? note.token : null;
     _this.pk = pk;
     _this.columns = [];
     _this.table = table;

package/lib/model_structure/schema.js

@@ -11,8 +11,6 @@ var _element = _interopRequireDefault(require("./element"));
 
 var _enum2 = _interopRequireDefault(require("./enum"));
 
-var _config = require("./config");
-
 var _utils = require("./utils");
 
 var _tableGroup = _interopRequireDefault(require("./tableGroup"));
@@ -81,7 +79,8 @@ var Schema = /*#__PURE__*/function (_Element) {
     _this.tableGroups = [];
     _this.refs = [];
     _this.name = name;
-    _this.note = note;
+    _this.note = note ? note.value : null;
+    _this.noteToken = note ? note.token : null;
     _this.alias = alias;
     _this.database = database;
     _this.dbState = _this.database.dbState;
@@ -186,7 +185,13 @@ var Schema = /*#__PURE__*/function (_Element) {
       if (this.refs.some(function (r) {
         return r.equals(ref);
       })) {
-        ref.error('Reference with same endpoints duplicated');
+        var endpoint1 = ref.endpoints[0];
+        var fieldList1 = endpoint1.fieldNames.map(JSON.stringify).join(', ');
+        var endpoint2 = ref.endpoints[1];
+        var fieldList2 = endpoint2.fieldNames.map(JSON.stringify).join(', ');
+        var ref1 = "\"".concat(endpoint1.schemaName ? "".concat(endpoint1.schemaName, "\".\"") : '').concat(endpoint1.tableName, "\"(").concat(fieldList1, ")");
+        var ref2 = "\"".concat(endpoint2.schemaName ? "".concat(endpoint2.schemaName, "\".\"") : '').concat(endpoint2.tableName, "\"(").concat(fieldList2, ")");
+        ref.error("Reference with the same endpoints already exists: ".concat(ref1, " references ").concat(ref2));
       }
     }
   }, {

package/lib/model_structure/table.js

@@ -71,7 +71,8 @@ var Table = /*#__PURE__*/function (_Element) {
     _this = _super.call(this, token);
     _this.name = name;
     _this.alias = alias;
-    _this.note = note;
+    _this.note = note ? note.value : null;
+    _this.noteToken = note ? note.token : null;
     _this.headerColor = headerColor;
     _this.fields = [];
     _this.indexes = [];

package/lib/parse/dbml/parser.pegjs

@@ -556,9 +556,19 @@ IndexName
   = "name:"i _ val:StringLiteral { return val.value }
 ObjectNoteElement
   = note: ObjectNote { return note }
-  / "note"i _ "{" _ val:StringLiteral _ "}" { return val.value }
+  / "note"i _ "{" _ val:StringLiteral _ "}" {
+    return {
+      value: val.value,
+      token: location(),
+    }
+  }
 ObjectNote
-  = "note:"i _ val:StringLiteral { return val.value }
+  = "note:"i _ val:StringLiteral {
+    return {
+      value: val.value,
+      token: location(),
+    }
+  }
 IndexType
   = "type:"i _ val:(btree/hash) { return val }
 RefInline