@dbml/core 3.15.0-alpha.0 → 4.0.0

package/lib/index.js

@@ -41,7 +41,7 @@ Object.defineProperty(exports, "importer", {
 });
 var _ModelExporter = _interopRequireDefault(require("./export/ModelExporter"));
 var _Parser = _interopRequireDefault(require("./parse/Parser"));
-var _error = require("../lib/parse/error");
+var _error = require("./parse/error");
 var _import = _interopRequireDefault(require("./import"));
 var _export = _interopRequireDefault(require("./export"));
 var _version = require("./utils/version");

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

@@ -14,6 +14,10 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default":
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
+function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
 function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
 function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
 function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
@@ -26,10 +30,6 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
 function _getPrototypeOf(t) { return _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function (t) { return t.__proto__ || Object.getPrototypeOf(t); }, _getPrototypeOf(t); }
 function _inherits(t, e) { if ("function" != typeof e && null !== e) throw new TypeError("Super expression must either be null or a function"); t.prototype = Object.create(e && e.prototype, { constructor: { value: t, writable: !0, configurable: !0 } }), Object.defineProperty(t, "prototype", { writable: !1 }), e && _setPrototypeOf(t, e); }
 function _setPrototypeOf(t, e) { return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, _setPrototypeOf(t, e); }
-function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
-function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
 function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
@@ -37,10 +37,6 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; } /* eslint-disable class-methods-use-this */
 var ADD_DESCRIPTION_FUNCTION_NAME = 'sp_addextendedproperty';
-var CHECK_CONSTRAINT_CONDITION_TYPE = {
-  RAW: 'raw',
-  ENUM: 'enum'
-};
 var getSchemaAndTableName = function getSchemaAndTableName(names) {
   var tableName = (0, _lodash.last)(names);
   var schemaName = names.length > 1 ? (0, _lodash.nth)(names, -2) : undefined;
@@ -107,7 +103,6 @@ var splitColumnDefTableConstraints = function splitColumnDefTableConstraints(col
 };
 var parseFieldsAndInlineRefsFromFieldsData = function parseFieldsAndInlineRefsFromFieldsData(fieldsData, tableName, schemaName) {
   var _fieldsData$reduce = fieldsData.reduce(function (acc, fieldData) {
-      var _acc$;
       var inlineRefs = fieldData.inline_refs.map(function (inlineRef) {
         inlineRef.endpoints[0].tableName = tableName;
         inlineRef.endpoints[0].schemaName = schemaName;
@@ -116,17 +111,14 @@ var parseFieldsAndInlineRefsFromFieldsData = function parseFieldsAndInlineRefsFr
       });
       acc[0].push(inlineRefs);
       acc[1].push(fieldData.field);
-      (_acc$ = acc[2]).push.apply(_acc$, _toConsumableArray(fieldData.enumCheckConstraints));
       return acc;
     }, [[], [], []]),
-    _fieldsData$reduce2 = _slicedToArray(_fieldsData$reduce, 3),
+    _fieldsData$reduce2 = _slicedToArray(_fieldsData$reduce, 2),
     resInlineRefs = _fieldsData$reduce2[0],
-    fields = _fieldsData$reduce2[1],
-    enumCheckConstraints = _fieldsData$reduce2[2];
+    fields = _fieldsData$reduce2[1];
   return {
     inlineRefs: resInlineRefs,
-    fields: fields,
-    enumCheckConstraints: enumCheckConstraints
+    fields: fields
   };
 };
 var MssqlASTGen = exports["default"] = /*#__PURE__*/function (_TSqlParserVisitor) {
@@ -605,51 +597,19 @@ var MssqlASTGen = exports["default"] = /*#__PURE__*/function (_TSqlParserVisitor
         tableCheckConstraints = _splitColumnDefTableC.checkConstraints;
       var _parseFieldsAndInline = parseFieldsAndInlineRefsFromFieldsData(fieldsData, tableName, schemaName),
         inlineRefs = _parseFieldsAndInline.inlineRefs,
-        fields = _parseFieldsAndInline.fields,
-        columnEnumCheckConstraints = _parseFieldsAndInline.enumCheckConstraints;
+        fields = _parseFieldsAndInline.fields;
       (_this$data$refs = this.data.refs).push.apply(_this$data$refs, _toConsumableArray((0, _lodash.flatten)(inlineRefs)));
       (_this$data$refs2 = this.data.refs).push.apply(_this$data$refs2, _toConsumableArray(tableRefs.map(function (tableRef) {
         tableRef.endpoints[0].tableName = tableName;
         tableRef.endpoints[0].schemaName = schemaName;
         return tableRef;
       })));
-      var allCheckConstraints = columnEnumCheckConstraints.concat(tableCheckConstraints);
-      var rawTableConstraints = [];
-      allCheckConstraints.forEach(function (checkConstraint) {
-        if (checkConstraint.isRaw) {
-          var constraintObj = {
-            expression: checkConstraint.expression
-          };
-          if (checkConstraint.name) {
-            constraintObj.name = checkConstraint.name;
-          }
-          rawTableConstraints.push(constraintObj);
-          return;
-        }
-        var field = fields.find(function (fieldItem) {
-          return fieldItem.name === checkConstraint.column;
-        });
-        if (!field) return;
-        var enumObject = new _AST.Enum({
-          name: "".concat(tableName, "_").concat(field.name, "_enum"),
-          values: checkConstraint.columnValues.map(function (value) {
-            return {
-              name: value
-            };
-          }),
-          schemaName: schemaName
-        });
-        _this8.data.enums.push(enumObject);
-        // TODO: Handle multiple enums for the same field
-        field.type.type_name = enumObject.name;
-        field.type.schemaName = enumObject.schemaName;
-      });
       var table = new _AST.Table({
         name: tableName,
         schemaName: schemaName,
         fields: fields,
         indexes: tableIndices.concat(indexes),
-        constraints: rawTableConstraints
+        constraints: tableCheckConstraints
       });
       this.data.tables.push(table);
     }
@@ -729,8 +689,7 @@ var MssqlASTGen = exports["default"] = /*#__PURE__*/function (_TSqlParserVisitor
         kind: _constants.TABLE_CONSTRAINT_KIND.FIELD,
         value: {
           field: field,
-          inline_refs: [],
-          enumCheckConstraints: []
+          inline_refs: []
         }
       };
       var columnDefinitions = ctx.column_definition_element().map(function (columnDef) {
@@ -767,25 +726,18 @@ var MssqlASTGen = exports["default"] = /*#__PURE__*/function (_TSqlParserVisitor
           case _constants.COLUMN_CONSTRAINT_KIND.CHECK:
             {
               var _columnDef$value = columnDef.value,
-                columnDefType = _columnDef$value.type,
-                value = _columnDef$value.value,
+                _expression = _columnDef$value.expression,
                 name = _columnDef$value.name;
-              if (columnDefType === CHECK_CONSTRAINT_CONDITION_TYPE.ENUM) {
-                // If it's an ENUM type (simple IN clause without NOT), queue it for enum extraction
-                definition.value.enumCheckConstraints.push(value);
-              } else if (columnDefType === CHECK_CONSTRAINT_CONDITION_TYPE.RAW) {
-                // For RAW constraints (complex expressions), add directly to field.constraints array
-                if (!field.constraints) {
-                  field.constraints = [];
-                }
-                var constraintObj = {
-                  expression: value
-                };
-                if (name) {
-                  constraintObj.name = name;
-                }
-                field.constraints.push(constraintObj);
+              if (!field.constraints) {
+                field.constraints = [];
+              }
+              var constraintObj = {
+                expression: _expression
+              };
+              if (name) {
+                constraintObj.name = name;
               }
+              field.constraints.push(constraintObj);
               break;
             }
           default:
@@ -894,8 +846,6 @@ var MssqlASTGen = exports["default"] = /*#__PURE__*/function (_TSqlParserVisitor
           }
         };
       }
-
-      // we do not handle check constraint since it is complicated and hard to extract enum from it
       if (ctx.check_constraint()) {
         var constraintName = ctx.id_() ? ctx.id_().accept(this) : null;
         var checkConstraintResult = ctx.check_constraint().accept(this);
@@ -926,24 +876,8 @@ var MssqlASTGen = exports["default"] = /*#__PURE__*/function (_TSqlParserVisitor
   }, {
     key: "visitSearch_condition",
     value: function visitSearch_condition(ctx) {
-      // we will parse the enum from the most basic condition - map to the old behavior
-      // others, we will get the check constraint to ensure the constraint is applied - enhance the old behavior
-      if (!ctx.predicate() || ctx.NOT().length) {
-        return {
-          type: CHECK_CONSTRAINT_CONDITION_TYPE.RAW,
-          value: (0, _helpers.getOriginalText)(ctx)
-        };
-      }
-      var predicate = ctx.predicate().accept(this);
-      if (!predicate) {
-        return {
-          type: CHECK_CONSTRAINT_CONDITION_TYPE.RAW,
-          value: (0, _helpers.getOriginalText)(ctx)
-        };
-      }
       return {
-        type: CHECK_CONSTRAINT_CONDITION_TYPE.ENUM,
-        value: predicate
+        expression: (0, _helpers.getOriginalText)(ctx)
       };
     }
 
@@ -1143,22 +1077,11 @@ var MssqlASTGen = exports["default"] = /*#__PURE__*/function (_TSqlParserVisitor
       }
       if (ctx.check_constraint()) {
         var checkConstraint = ctx.check_constraint().accept(this);
-
-        // If it's an ENUM type (simple IN clause), return for enum extraction
-        if (checkConstraint.type === CHECK_CONSTRAINT_CONDITION_TYPE.ENUM) {
-          return {
-            kind: _constants.TABLE_CONSTRAINT_KIND.CHECK,
-            value: checkConstraint.value
-          };
-        }
-
-        // For RAW constraints, return them too so they can be added to table.constraints
         return {
           kind: _constants.TABLE_CONSTRAINT_KIND.CHECK,
           value: {
-            expression: checkConstraint.value,
-            name: name,
-            isRaw: true // Mark as raw constraint
+            expression: checkConstraint.expression,
+            name: name
           }
         };
       }
@@ -1223,11 +1146,7 @@ var MssqlASTGen = exports["default"] = /*#__PURE__*/function (_TSqlParserVisitor
   }, {
     key: "visitAlter_table",
     value: function visitAlter_table(ctx) {
-      var _this$data$refs3,
-        _this$data$refs4,
-        _table$fields,
-        _table$indexes,
-        _this16 = this;
+      var _this$data$refs3, _this$data$refs4, _table$fields, _table$indexes;
       // table_name() returns an array because there are multiple table_name in the clause (REFERENCES table_name ...)
       var names = ctx.table_name()[0].accept(this);
       var _getSchemaAndTableNam3 = getSchemaAndTableName(names),
@@ -1264,37 +1183,13 @@ var MssqlASTGen = exports["default"] = /*#__PURE__*/function (_TSqlParserVisitor
         field.dbdefault = columnDefault.defaultValue;
       });
       checkConstraints.forEach(function (checkConstraint) {
-        // Handle RAW table-level constraints (complex expressions that won't become enums)
-        if (checkConstraint.isRaw) {
-          var constraintObj = {
-            expression: checkConstraint.expression
-          };
-          if (checkConstraint.name) {
-            constraintObj.name = checkConstraint.name;
-          }
-          table.constraints.push(constraintObj);
-          return;
+        var constraintObj = {
+          expression: checkConstraint.expression
+        };
+        if (checkConstraint.name) {
+          constraintObj.name = checkConstraint.name;
         }
-
-        // Handle ENUM constraints: simple IN clauses like CHECK (status IN ('a', 'b', 'c'))
-        // These get converted to actual Enum objects and the field type is updated
-        var field = table.fields.find(function (fieldItem) {
-          return fieldItem.name === checkConstraint.column;
-        });
-        if (!field) return;
-        var enumObject = new _AST.Enum({
-          name: "".concat(tableName, "_").concat(field.name, "_enum"),
-          values: checkConstraint.columnValues.map(function (value) {
-            return {
-              name: value
-            };
-          }),
-          schemaName: schemaName
-        });
-        _this16.data.enums.push(enumObject);
-        // TODO: handle multiple enums for the same field
-        field.type.type_name = enumObject.name;
-        field.type.schemaName = enumObject.schemaName;
+        table.constraints.push(constraintObj);
       });
     }
 
@@ -1438,12 +1333,12 @@ var MssqlASTGen = exports["default"] = /*#__PURE__*/function (_TSqlParserVisitor
   }, {
     key: "visitFunc_proc_name_server_database_schema",
     value: function visitFunc_proc_name_server_database_schema(ctx) {
-      var _this17 = this;
+      var _this16 = this;
       if (ctx.func_proc_name_database_schema()) {
         return ctx.func_proc_name_database_schema().accept(this);
       }
       return ctx.id_().map(function (id) {
-        return id.accept(_this17);
+        return id.accept(_this16);
       });
     }
 
@@ -1454,12 +1349,12 @@ var MssqlASTGen = exports["default"] = /*#__PURE__*/function (_TSqlParserVisitor
   }, {
     key: "visitFunc_proc_name_database_schema",
     value: function visitFunc_proc_name_database_schema(ctx) {
-      var _this18 = this;
+      var _this17 = this;
       if (ctx.func_proc_name_schema()) {
         return ctx.func_proc_name_schema().accept(this);
       }
       return ctx.id_().map(function (id) {
-        return id.accept(_this18);
+        return id.accept(_this17);
       });
     }
 
@@ -1469,9 +1364,9 @@ var MssqlASTGen = exports["default"] = /*#__PURE__*/function (_TSqlParserVisitor
   }, {
     key: "visitFunc_proc_name_schema",
     value: function visitFunc_proc_name_schema(ctx) {
-      var _this19 = this;
+      var _this18 = this;
       return ctx.id_().map(function (id) {
-        return id.accept(_this19);
+        return id.accept(_this18);
       });
     }
 
@@ -1482,14 +1377,14 @@ var MssqlASTGen = exports["default"] = /*#__PURE__*/function (_TSqlParserVisitor
   }, {
     key: "visitExecute_statement_arg",
     value: function visitExecute_statement_arg(ctx) {
-      var _this20 = this;
+      var _this19 = this;
       if (ctx.execute_statement_arg_unnamed()) {
         return ctx.execute_statement_arg_unnamed().map(function (item) {
-          return item.accept(_this20);
+          return item.accept(_this19);
         });
       }
       return ctx.execute_statement_arg_named().map(function (item) {
-        return item.accept(_this20);
+        return item.accept(_this19);
       });
     }
 

package/lib/parse/ANTLR/parsers/postgresql/PostgreSQLParser.g4

@@ -5401,7 +5401,7 @@ plsql_unreserved_keyword
    //| COLUMN_NAME
    | COMMIT
    | CONSTANT
-   //| CONSTRAINT
+   //| CONSTRAINT // TDD 72
    //| CONSTRAINT_NAME
    | CONTINUE_P
    | CURRENT_P

package/lib/parse/schemarb/parser.pegjs

@@ -25,7 +25,7 @@
   function addCheckConstraintToTable(tableName, expression, name) {
     const table = data.tables.find(t => t.name === tableName);
     if (!table) {
-      error("Table " + tableName + " not found");
+      error("Table ${tableName} not found");
     }
     if (!table.constraints) {
       table.constraints = [];

package/lib/parse/schemarbParser.js

@@ -2464,7 +2464,7 @@ function peg$parse(input, options) {
       return t.name === tableName;
     });
     if (!table) {
-      error("Table " + tableName + " not found");
+      error("Table ${tableName} not found");
     }
     if (!table.constraints) {
       table.constraints = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dbml/core",
-  "version": "3.15.0-alpha.0",
+  "version": "4.0.0",
   "description": "> TODO: description",
   "author": "Holistics <dev@holistics.io>",
   "license": "Apache-2.0",
@@ -32,7 +32,7 @@
     "prepublish": "npm run build"
   },
   "dependencies": {
-    "@dbml/parse": "^3.15.0-alpha.0",
+    "@dbml/parse": "^4.0.0",
     "antlr4": "^4.13.1",
     "lodash": "^4.17.15",
     "parsimmon": "^1.13.0",
@@ -62,7 +62,7 @@
       "^lodash-es$": "lodash"
     }
   },
-  "gitHead": "b8718ceac53a179f91856011a03b360c9c40854c",
+  "gitHead": "defacb4ec78893de46225948499feea5bf2932e2",
   "engines": {
     "node": ">=16"
   }

package/types/model_structure/constraint.d.ts

@@ -7,7 +7,7 @@ import TablePartial from './tablePartial';
 interface RawConstraint {
     token: Token;
     name: string;
-    expression: any;
+    expression: string;
     table: Table;
     column?: Field | null;
     injectedPartial?: TablePartial | null;
@@ -15,7 +15,7 @@ interface RawConstraint {
 
 declare class Constraint extends Element {
     name: string;
-    expression: any;
+    expression: string;
     table: Table;
     column: Field | null;
     injectedPartial: TablePartial | null;
@@ -24,7 +24,7 @@ declare class Constraint extends Element {
     generateId(): void;
     export(): {
         name: string;
-        expression: any;
+        expression: string;
     };
     exportParentIds(): {
         tableId: number;
@@ -33,7 +33,7 @@ declare class Constraint extends Element {
     };
     shallowExport(): {
         name: string;
-        expression: any;
+        expression: string;
     };
     normalize(model: NormalizedDatabase): void;
 }
@@ -42,7 +42,7 @@ export interface NormalizedConstraint {
     [_id: number]: {
         id: number;
         name: string;
-        expression: any;
+        expression: string;
         tableId: number;
         columnId: number | null;
         injectedPartialId: number | null;