@dbml/core 3.13.0-alpha.3 → 3.13.1

package/lib/model_structure/database.js

@@ -74,6 +74,9 @@ var Database = /*#__PURE__*/function (_Element) {
     _this.aliases = aliases;
     _this.records = [];
     _this.tablePartials = [];
+
+    // The global array containing references with 1 endpoint being a field injected from a partial to a table
+    // These refs are add to this array when resolving partials in tables (`Table.processPartials()`)
     _this.injectedRawRefs = [];
 
     // The process order is important. Do not change !

package/lib/model_structure/endpoint.js

@@ -104,13 +104,11 @@ 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,
-        injectedPartialId: (_this$injectedPartial = this.injectedPartial) === null || _this$injectedPartial === void 0 ? void 0 : _this$injectedPartial.id
+        relation: this.relation
       };
     }
   }, {

package/lib/model_structure/indexes.js

@@ -119,12 +119,14 @@ var Index = /*#__PURE__*/function (_Element) {
   }, {
     key: "shallowExport",
     value: function shallowExport() {
+      var _this$injectedPartial;
       return {
         name: this.name,
         type: this.type,
         unique: this.unique,
         pk: this.pk,
-        note: this.note
+        note: this.note,
+        injectedPartialId: (_this$injectedPartial = this.injectedPartial) === null || _this$injectedPartial === void 0 ? void 0 : _this$injectedPartial.id
       };
     }
   }, {

package/lib/model_structure/table.js

@@ -214,6 +214,7 @@ var Table = /*#__PURE__*/function (_Element) {
                   }],
                   injectedPartial: tablePartial
                 };
+                // The global array containing references with 1 endpoint being a field injected from a partial to a table
                 _this5.schema.database.injectedRawRefs.push(ref);
               });
             }

package/lib/parse/ANTLR/ASTGeneration/mssql/MssqlASTGen.js

@@ -505,10 +505,22 @@ var MssqlASTGen = /*#__PURE__*/function (_TSqlParserVisitor) {
   }, {
     key: "visitData_type",
     value: function visitData_type(ctx) {
-      var id = ctx.id_().accept(this);
       if (ctx.MAX()) {
-        return "".concat(id, "(MAX)");
+        var type = '';
+        if (ctx.SQUARE_BRACKET_ID()) {
+          type = ctx.SQUARE_BRACKET_ID().getText().slice(1, -1);
+        } else {
+          var typeNode = ctx.VARCHAR() || ctx.NVARCHAR() || ctx.BINARY_KEYWORD() || ctx.VARBINARY_KEYWORD() || ctx.SQUARE_BRACKET_ID();
+          type = typeNode.getText();
+        }
+        return "".concat(type, "(MAX)");
+      }
+      if (ctx.DOUBLE()) {
+        var _double = ctx.DOUBLE().getText();
+        var precision = ctx.PRECISION() ? " ".concat(ctx.PRECISION().getText()) : '';
+        return "".concat(_double).concat(precision);
       }
+      var id = ctx.id_().accept(this);
       if (ctx.IDENTITY()) {
         if (ctx.DECIMAL().length) {
           var seedAndInc = ctx.DECIMAL().map(function (decimal) {
@@ -518,12 +530,6 @@ var MssqlASTGen = /*#__PURE__*/function (_TSqlParserVisitor) {
         }
         return "".concat(id, " IDENTITY");
       }
-      if (ctx.DOUBLE()) {
-        if (ctx.PRECISION()) {
-          return "".concat(id, "(").concat(ctx.PRECISION().getText(), ")");
-        }
-        return id;
-      }
       if (ctx.DECIMAL().length) {
         var scaleAndPrec = ctx.DECIMAL().map(function (decimal) {
           return decimal.getText();
@@ -607,11 +613,10 @@ var MssqlASTGen = /*#__PURE__*/function (_TSqlParserVisitor) {
       })));
 
       // these check constraints represent enums
-      var enums = [];
       var checkConstraints = columnCheckConstraints.concat(tableCheckConstraints);
       checkConstraints.forEach(function (checkConstraint) {
-        var field = fields.find(function (field) {
-          return field.name === checkConstraint.column;
+        var field = fields.find(function (fieldItem) {
+          return fieldItem.name === checkConstraint.column;
         });
         if (!field) return;
         var enumObject = new _AST.Enum({
@@ -750,11 +755,11 @@ var MssqlASTGen = /*#__PURE__*/function (_TSqlParserVisitor) {
           case _constants.COLUMN_CONSTRAINT_KIND.CHECK:
             {
               var _columnDef$value = columnDef.value,
-                _type = _columnDef$value.type,
+                columnDefType = _columnDef$value.type,
                 value = _columnDef$value.value;
 
               // we keep the current behavior: when a field has a check constraints cannot be converted to enum, we will ignore it
-              if (_type !== CHECK_CONSTRAINT_CONDITION_TYPE.ENUM) return;
+              if (columnDefType !== CHECK_CONSTRAINT_CONDITION_TYPE.ENUM) return;
               definition.value.checkConstraints.push(value);
               break;
             }
@@ -1217,8 +1222,8 @@ var MssqlASTGen = /*#__PURE__*/function (_TSqlParserVisitor) {
         field.dbdefault = columnDefault.defaultValue;
       });
       checkConstraints.forEach(function (checkConstraint) {
-        var field = table.fields.find(function (field) {
-          return field.name === checkConstraint.column;
+        var field = table.fields.find(function (fieldItem) {
+          return fieldItem.name === checkConstraint.column;
         });
         if (!field) return;
         var enumObject = new _AST.Enum({
@@ -1338,28 +1343,28 @@ var MssqlASTGen = /*#__PURE__*/function (_TSqlParserVisitor) {
           acc[name] = arg.value;
           return acc;
         }, {});
-        if (!argsObj['name'].includes('Description')) {
+        if (!argsObj.name.includes('Description')) {
           return;
         }
 
         // https://learn.microsoft.com/en-us/sql/relational-databases/system-stored-procedures/sp-addextendedproperty-transact-sql?view=sql-server-ver16#----level0type
-        var level0Type = argsObj['level0type'].toLowerCase();
+        var level0Type = argsObj.level0type.toLowerCase();
         if (!level0Type.includes('schema')) return;
-        var schemaName = argsObj['level0name'] !== 'dbo' ? argsObj['level0name'] : undefined;
-        var level1Type = argsObj['level1type'].toLowerCase();
-        var tableName = level1Type.includes('table') ? argsObj['level1name'] : null;
+        var schemaName = argsObj.level0name !== 'dbo' ? argsObj.level0name : undefined;
+        var level1Type = argsObj.level1type.toLowerCase();
+        var tableName = level1Type.includes('table') ? argsObj.level1name : null;
         var table = this.data.tables.find(function (t) {
           return t.name === tableName && t.schemaName === schemaName;
         });
         if (!table) return;
-        if (!argsObj['level2type']) {
+        if (!argsObj.level2type) {
           table.note = {
             value: argsObj.value
           };
           return;
         }
-        var level2Type = argsObj['level2type'].toLowerCase();
-        var columnName = level2Type.includes('column') ? argsObj['level2name'] : null;
+        var level2Type = argsObj.level2type.toLowerCase();
+        var columnName = level2Type.includes('column') ? argsObj.level2name : null;
         var field = table.fields.find(function (f) {
           return f.name === columnName;
         });
@@ -1380,11 +1385,10 @@ var MssqlASTGen = /*#__PURE__*/function (_TSqlParserVisitor) {
       var _this19 = this;
       if (ctx.func_proc_name_database_schema()) {
         return ctx.func_proc_name_database_schema().accept(this);
-      } else {
-        return ctx.id_().map(function (id) {
-          return id.accept(_this19);
-        });
       }
+      return ctx.id_().map(function (id) {
+        return id.accept(_this19);
+      });
     }
 
     // func_proc_name_database_schema
@@ -1397,11 +1401,10 @@ var MssqlASTGen = /*#__PURE__*/function (_TSqlParserVisitor) {
       var _this20 = this;
       if (ctx.func_proc_name_schema()) {
         return ctx.func_proc_name_schema().accept(this);
-      } else {
-        return ctx.id_().map(function (id) {
-          return id.accept(_this20);
-        });
       }
+      return ctx.id_().map(function (id) {
+        return id.accept(_this20);
+      });
     }
 
     // func_proc_name_schema

package/lib/parse/ANTLR/ASTGeneration/postgres/PostgreSQLLexerBase.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.HandleLessLessGreaterGreater = HandleLessLessGreaterGreater;
+exports.charIsLetter = charIsLetter;
 exports.checkLA = checkLA;
 exports["default"] = void 0;
 exports.isTag = isTag;
@@ -40,4 +41,5 @@ exports["default"] = PostgreSQLLexerBase;
 function checkLA() {}
 function HandleLessLessGreaterGreater() {}
 function pushTag() {}
-function isTag() {}
+function isTag() {}
+function charIsLetter() {}

package/lib/parse/ANTLR/ASTGeneration/postgres/PostgresASTGen.js

@@ -34,7 +34,7 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } /* eslint-disable class-methods-use-this */
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } /* eslint-disable no-param-reassign */ /* eslint-disable consistent-return */ /* eslint-disable class-methods-use-this */
 var COMMAND_KIND = {
   REF: 'ref'
 };
@@ -106,7 +106,10 @@ var PostgresASTGen = /*#__PURE__*/function (_PostgreSQLParserVisi) {
     value: function visitStmt(ctx) {
       if (ctx.createstmt()) {
         var table = ctx.createstmt().accept(this);
-        return this.data.tables.push(table);
+
+        // filter out null table that can cause error in model_structure stage
+        if (table) this.data.tables.push(table);
+        return;
       }
       if (ctx.indexstmt()) {
         /** @type {Index} */
@@ -115,8 +118,8 @@ var PostgresASTGen = /*#__PURE__*/function (_PostgreSQLParserVisi) {
           tableName = _indexStmt$pathName.tableName,
           schemaName = _indexStmt$pathName.schemaName;
         var _table = findTable(this.data.tables, schemaName, tableName);
-        if (!_table) return;
-        return _table.indexes.push(indexStmt.index);
+        if (_table) _table.indexes.push(indexStmt.index);
+        return;
       }
       if (ctx.altertablestmt()) {
         ctx.altertablestmt().accept(this);
@@ -132,7 +135,6 @@ var PostgresASTGen = /*#__PURE__*/function (_PostgreSQLParserVisi) {
       }
       if (ctx.insertstmt()) {
         ctx.insertstmt().accept(this);
-        return;
       }
     }
 
@@ -465,10 +467,12 @@ var PostgresASTGen = /*#__PURE__*/function (_PostgreSQLParserVisi) {
     key: "visitC_expr_expr",
     value: function visitC_expr_expr(ctx) {
       if (ctx.aexprconst()) return ctx.aexprconst().accept(this);
-      if (ctx.a_expr()) return {
-        value: ctx.a_expr().getText(),
-        type: _constants.DATA_TYPE.EXPRESSION
-      };
+      if (ctx.a_expr()) {
+        return {
+          value: ctx.a_expr().getText(),
+          type: _constants.DATA_TYPE.EXPRESSION
+        };
+      }
       return {
         value: ctx.getText(),
         type: _constants.DATA_TYPE.EXPRESSION
@@ -589,11 +593,9 @@ var PostgresASTGen = /*#__PURE__*/function (_PostgreSQLParserVisi) {
   }, {
     key: "visitUnreserved_keyword",
     value: function visitUnreserved_keyword(ctx) {
-      return ctx.getChild(0).getText();
+      return ctx.getText();
     }
-  }, {
-    key: "visitIdentifier",
-    value:
+
     /*
      Identifier opt_uescape
      | QuotedIdentifier
@@ -602,7 +604,9 @@ var PostgresASTGen = /*#__PURE__*/function (_PostgreSQLParserVisi) {
      | plsqlidentifier
      | plsql_unreserved_keyword
      */
-    function visitIdentifier(ctx) {
+  }, {
+    key: "visitIdentifier",
+    value: function visitIdentifier(ctx) {
       if (ctx.Identifier()) {
         return ctx.Identifier().getText();
       }
@@ -705,18 +709,24 @@ var PostgresASTGen = /*#__PURE__*/function (_PostgreSQLParserVisi) {
     key: "visitSimpletypename",
     value: function visitSimpletypename(ctx) {
       if (ctx.generictype()) return ctx.generictype().accept(this);
-      if (ctx.character()) return {
-        type: ctx.character().accept(this),
-        schemaName: null
-      };
-      if (ctx.numeric()) return {
-        type: ctx.numeric().accept(this),
-        schemaName: null
-      };
-      if (ctx.constdatetime()) return {
-        type: ctx.constdatetime().accept(this),
-        schemaName: null
-      };
+      if (ctx.character()) {
+        return {
+          type: ctx.character().accept(this),
+          schemaName: null
+        };
+      }
+      if (ctx.numeric()) {
+        return {
+          type: ctx.numeric().accept(this),
+          schemaName: null
+        };
+      }
+      if (ctx.constdatetime()) {
+        return {
+          type: ctx.constdatetime().accept(this),
+          schemaName: null
+        };
+      }
       return {
         type: ctx.getText(),
         schemaName: null
@@ -1023,7 +1033,6 @@ var PostgresASTGen = /*#__PURE__*/function (_PostgreSQLParserVisi) {
   }, {
     key: "visitCommentstmt",
     value: function visitCommentstmt(ctx) {
-      var note = ctx.comment_text().accept(this);
       if (ctx.object_type_any_name()) {
         var objectType = ctx.object_type_any_name().accept(this);
         if (!objectType) return;
@@ -1033,9 +1042,9 @@ var PostgresASTGen = /*#__PURE__*/function (_PostgreSQLParserVisi) {
           var schemaName = names.length > 1 ? names[names.length - 2] : undefined;
           var table = findTable(this.data.tables, schemaName, tableName);
           if (!table) return;
-          var _note = ctx.comment_text().accept(this);
+          var note = ctx.comment_text().accept(this);
           table.note = {
-            value: escapeStr(_note)
+            value: escapeStr(note)
           };
         }
       }
@@ -1049,9 +1058,9 @@ var PostgresASTGen = /*#__PURE__*/function (_PostgreSQLParserVisi) {
           return field.name === fieldName;
         });
         if (!field) return;
-        var _note2 = ctx.comment_text().accept(this);
+        var _note = ctx.comment_text().accept(this);
         field.note = {
-          value: escapeStr(_note2)
+          value: escapeStr(_note)
         };
       }
     }

package/lib/parse/ANTLR/parsers/postgresql/PostgreSQLLexer.js

@@ -864,7 +864,7 @@ PostgreSQLLexer.prototype.OperatorEndingWithPlusMinus_sempred = function (localc
 PostgreSQLLexer.prototype.IdentifierStartChar_sempred = function (localctx, predIndex) {
   switch (predIndex) {
     case 6:
-      return charIsLetter();
+      return (0, _PostgreSQLLexerBase2.charIsLetter)();
     case 7:
       return;
       CheckIfUtf32Letter();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dbml/core",
-  "version": "3.13.0-alpha.3",
+  "version": "3.13.1",
   "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.3",
+    "@dbml/parse": "^3.13.1",
     "antlr4": "^4.13.1",
     "lodash": "^4.17.15",
     "parsimmon": "^1.13.0",
@@ -59,7 +59,7 @@
       "\\.(?!json$)[^.]*$": "@glen/jest-raw-loader"
     }
   },
-  "gitHead": "65d1cf56fcad06c42f625c9214c17c1b4c54b249",
+  "gitHead": "8baea3c6a612f433f188efd6df5d24d1d5e16f2c",
   "engines": {
     "node": ">=16"
   }

package/types/model_structure/indexes.d.ts

@@ -3,6 +3,7 @@ import DbState from './dbState';
 import Element, { RawNote, Token } from './element';
 import IndexColumn from './indexColumn';
 import Table from './table';
+import TablePartial from './tablePartial';
 interface RawIndex {
     columns: IndexColumn;
     type: any;
@@ -23,6 +24,7 @@ declare class Index extends Element {
     noteToken: Token;
     table: Table;
     dbState: DbState;
+    injectedPartial: TablePartial;
     constructor({ columns, type, unique, pk, token, name, note, table }: RawIndex);
     generateId(): void;
     processIndexColumns(rawColumns: any): void;
@@ -38,6 +40,7 @@ declare class Index extends Element {
         unique: boolean;
         pk: string;
         note: string;
+        injectedPartialId?: number;
     };
     exportChild(): {
         columns: {
@@ -57,6 +60,7 @@ declare class Index extends Element {
         unique: boolean;
         pk: string;
         note: string;
+        injectedPartialId?: number;
     };
     normalize(model: NormalizedDatabase): void;
 }

package/types/tablePartial.d.ts

@@ -1,38 +0,0 @@
-export default TablePartial;
-declare class TablePartial extends Element {
-    constructor({ name, note, fields, indexes, token, headerColor, noteToken, dbState, }?: {
-        name: any;
-        note: any;
-        fields?: any[];
-        indexes?: any[];
-        token: any;
-        headerColor: any;
-        noteToken?: any;
-        dbState: any;
-    });
-    name: any;
-    note: any;
-    noteToken: any;
-    headerColor: any;
-    fields: any[];
-    indexes: any[];
-    dbState: any;
-    generateId(): void;
-    id: any;
-    export(): {
-        name: any;
-        note: any;
-        headerColor: any;
-        fields: any[];
-        indexes: any[];
-    };
-    shallowExport(): {
-        name: any;
-        note: any;
-        headerColor: any;
-        fields: any[];
-        indexes: any[];
-    };
-    normalize(model: any): void;
-}
-import Element from './element';