@dbml/core 3.4.1 → 3.4.3

package/lib/export/DbmlExporter.js

@@ -192,9 +192,9 @@ var DbmlExporter = /*#__PURE__*/function () {
         var tableSettingStr = _this.getTableSettings(table);
         var indexStr = '';
         if (!_lodash["default"].isEmpty(tableContent.indexContents)) {
-          indexStr = "\nIndexes {\n".concat(tableContent.indexContents.map(function (indexLine) {
-            return "  ".concat(indexLine);
-          }).join('\n'), "\n}");
+          indexStr = "\n  Indexes {\n".concat(tableContent.indexContents.map(function (indexLine) {
+            return "    ".concat(indexLine);
+          }).join('\n'), "\n  }");
         }
         var tableNote = table.note ? "  Note: ".concat(DbmlExporter.escapeNote(table.note), "\n") : '';
         var tableStr = "Table ".concat((0, _utils.shouldPrintSchema)(schema, model) ? "\"".concat(schema.name, "\".") : '', "\"").concat(table.name, "\"").concat(tableSettingStr, " {\n").concat(tableContent.fieldContents.map(function (line) {

package/lib/model_structure/indexColumn.js

@@ -29,12 +29,14 @@ var IndexColumn = /*#__PURE__*/function (_Element) {
     var _this;
     var type = _ref.type,
       value = _ref.value,
-      index = _ref.index;
+      index = _ref.index,
+      token = _ref.token;
     _classCallCheck(this, IndexColumn);
     _this = _super.call(this);
     _this.type = type;
     _this.value = value;
     _this.index = index;
+    _this.token = token;
     _this.dbState = _this.index.dbState;
     _this.generateId();
     return _this;

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

@@ -920,7 +920,7 @@ var PostgresASTGen = /*#__PURE__*/function (_PostgreSQLParserVisi) {
         var schemaName = names.length > 1 ? names[names.length - 2] : undefined;
         var cmds = ctx.alter_table_cmds().accept(this);
         return cmds.map(function (cmd) {
-          if (!cmd) return;
+          if (!cmd) return null;
           var kind = null;
           switch (cmd.kind) {
             case _constants.TABLE_CONSTRAINT_KIND.FK:
@@ -929,6 +929,39 @@ var PostgresASTGen = /*#__PURE__*/function (_PostgreSQLParserVisi) {
               cmd.value.endpoints[0].schemaName = schemaName;
               _this8.data.refs.push(cmd.value);
               break;
+            case _constants.TABLE_CONSTRAINT_KIND.UNIQUE:
+            case _constants.TABLE_CONSTRAINT_KIND.PK:
+            case _constants.TABLE_CONSTRAINT_KIND.INDEX:
+              {
+                if (cmd.value.columns.length === 0) break;
+                if (!(cmd.value.pk || cmd.value.unique)) break;
+                // eslint-disable-next-line prefer-destructuring
+                kind = cmd.kind;
+                var table = findTable(_this8.data.tables, schemaName, tableName);
+                if (!table) break;
+                if (cmd.value.columns.length === 1 && (cmd.value.unique || cmd.value.pk)) {
+                  var key = cmd.value.columns[0].value;
+                  var fieldToUpdate = table.fields.find(function (f) {
+                    return f.name === key;
+                  });
+                  if (fieldToUpdate) {
+                    // If we have an exact match, this is a column, if not, might be an expression
+                    fieldToUpdate[cmd.value.unique ? 'unique' : 'pk'] = true;
+                    break;
+                  }
+                }
+                // multi column constraint -> need to create new index
+                var index = new _AST.Index({
+                  name: cmd.value.name,
+                  columns: cmd.value.columns,
+                  note: cmd.value.note,
+                  pk: cmd.value.pk,
+                  type: cmd.value.type,
+                  unique: cmd.value.unique
+                });
+                table.indexes.push(index);
+                break;
+              }
             default:
               break;
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dbml/core",
-  "version": "3.4.1",
+  "version": "3.4.3",
   "description": "> TODO: description",
   "author": "Holistics <dev@holistics.io>",
   "license": "Apache-2.0",
@@ -32,7 +32,7 @@
     "prepublish": "npm run build"
   },
   "dependencies": {
-    "@dbml/parse": "^3.4.1",
+    "@dbml/parse": "^3.4.3",
     "antlr4": "^4.13.1",
     "lodash": "^4.17.15",
     "parsimmon": "^1.13.0",
@@ -59,5 +59,5 @@
       "\\.(?!json$)[^.]*$": "@glen/jest-raw-loader"
     }
   },
-  "gitHead": "cbec59d485564023f5d2d95e10ad6379cc8d00fb"
+  "gitHead": "57885a9d08f8b5bc33aa629432a6ecf8e839d71a"
 }

package/lib/model_structure/note.js

@@ -1,72 +0,0 @@
-"use strict";
-
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-var _element = _interopRequireDefault(require("./element"));
-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; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
-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); }
-var Note = /*#__PURE__*/function (_Element) {
-  _inherits(Note, _Element);
-  var _super = _createSuper(Note);
-  function Note() {
-    var _this;
-    var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
-      name = _ref.name,
-      content = _ref.content,
-      headerColor = _ref.headerColor,
-      token = _ref.token,
-      _ref$database = _ref.database,
-      database = _ref$database === void 0 ? {} : _ref$database;
-    _classCallCheck(this, Note);
-    _this = _super.call(this, token);
-    _this.name = name;
-    _this.content = content;
-    _this.headerColor = headerColor;
-    _this.database = database;
-    _this.dbState = _this.database.dbState;
-    _this.generateId();
-    return _this;
-  }
-  _createClass(Note, [{
-    key: "generateId",
-    value: function generateId() {
-      this.id = this.dbState.generateId('noteId');
-    }
-  }, {
-    key: "export",
-    value: function _export() {
-      return {
-        name: this.name,
-        content: this.content,
-        headerColor: this.headerColor
-      };
-    }
-  }, {
-    key: "normalize",
-    value: function normalize(model) {
-      model.notes = _objectSpread(_objectSpread({}, model.notes), {}, _defineProperty({}, this.id, _objectSpread({
-        id: this.id
-      }, this["export"]())));
-    }
-  }]);
-  return Note;
-}(_element["default"]);
-var _default = Note;
-exports["default"] = _default;