@dbml/core 2.6.1 → 3.1.0

package/lib/parse/Parser.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
+var _parse = require("@dbml/parse");
 var _database = _interopRequireDefault(require("../model_structure/database"));
 var _mysqlParser = _interopRequireDefault(require("./mysqlParser"));
 var _postgresParser = _interopRequireDefault(require("./postgresParser"));
@@ -19,51 +20,19 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 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); }
 var Parser = /*#__PURE__*/function () {
-  function Parser() {
+  function Parser(DBMLCompiler) {
     _classCallCheck(this, Parser);
+    this.DBMLCompiler = DBMLCompiler || new _parse.Compiler();
   }
-  _createClass(Parser, null, [{
-    key: "parseJSONToDatabase",
-    value: function parseJSONToDatabase(rawDatabase) {
-      var database = new _database["default"](rawDatabase);
-      return database;
-    }
-  }, {
-    key: "parseMySQLToJSON",
-    value: function parseMySQLToJSON(str) {
-      return _mysqlParser["default"].parse(str);
-    }
-  }, {
-    key: "parsePostgresToJSONv2",
-    value: function parsePostgresToJSONv2(str) {
-      return (0, _ASTGeneration.parse)(str, 'postgres');
-    }
-  }, {
-    key: "parsePostgresToJSON",
-    value: function parsePostgresToJSON(str) {
-      return _postgresParser["default"].parse(str);
-    }
-  }, {
-    key: "parseDBMLToJSON",
-    value: function parseDBMLToJSON(str) {
-      return _dbmlParser["default"].parse(str);
-    }
-  }, {
-    key: "parseSchemaRbToJSON",
-    value: function parseSchemaRbToJSON(str) {
-      return _schemarbParser["default"].parse(str);
-    }
-  }, {
-    key: "parseMSSQLToJSON",
-    value: function parseMSSQLToJSON(str) {
-      return _mssqlParser["default"].parseWithPegError(str);
-    }
-  }, {
+  _createClass(Parser, [{
     key: "parse",
     value: function parse(str, format) {
       var rawDatabase = {};
       switch (format) {
         case 'mysql':
+          rawDatabase = Parser.parseMySQLToJSONv2(str);
+          break;
+        case 'mysqlLegacy':
           rawDatabase = Parser.parseMySQLToJSON(str);
           break;
         case 'postgres':
@@ -75,6 +44,31 @@ var Parser = /*#__PURE__*/function () {
         case 'dbml':
           rawDatabase = Parser.parseDBMLToJSON(str);
           break;
+        case 'dbmlv2':
+          {
+            this.DBMLCompiler.setSource(str);
+            var errors = this.DBMLCompiler.parse.errors();
+            if (errors.length > 0) {
+              throw errors.map(function (error) {
+                return {
+                  message: error.diagnostic,
+                  location: {
+                    start: {
+                      line: error.nodeOrToken.startPos.line + 1,
+                      column: error.nodeOrToken.startPos.column + 1
+                    },
+                    end: {
+                      line: error.nodeOrToken.endPos.line + 1,
+                      column: error.nodeOrToken.endPos.column + 1
+                    }
+                  },
+                  code: error.code
+                };
+              });
+            }
+            rawDatabase = this.DBMLCompiler.parse.rawDb();
+            break;
+          }
         case 'schemarb':
           rawDatabase = Parser.parseSchemaRbToJSON(str);
           break;
@@ -94,6 +88,47 @@ var Parser = /*#__PURE__*/function () {
       var schema = Parser.parseJSONToDatabase(rawDatabase);
       return schema;
     }
+  }], [{
+    key: "parseJSONToDatabase",
+    value: function parseJSONToDatabase(rawDatabase) {
+      var database = new _database["default"](rawDatabase);
+      return database;
+    }
+  }, {
+    key: "parseMySQLToJSONv2",
+    value: function parseMySQLToJSONv2(str) {
+      return (0, _ASTGeneration.parse)(str, 'mysql');
+    }
+  }, {
+    key: "parseMySQLToJSON",
+    value: function parseMySQLToJSON(str) {
+      return _mysqlParser["default"].parse(str);
+    }
+  }, {
+    key: "parsePostgresToJSONv2",
+    value: function parsePostgresToJSONv2(str) {
+      return (0, _ASTGeneration.parse)(str, 'postgres');
+    }
+  }, {
+    key: "parsePostgresToJSON",
+    value: function parsePostgresToJSON(str) {
+      return _postgresParser["default"].parse(str);
+    }
+  }, {
+    key: "parseDBMLToJSON",
+    value: function parseDBMLToJSON(str) {
+      return _dbmlParser["default"].parse(str);
+    }
+  }, {
+    key: "parseSchemaRbToJSON",
+    value: function parseSchemaRbToJSON(str) {
+      return _schemarbParser["default"].parse(str);
+    }
+  }, {
+    key: "parseMSSQLToJSON",
+    value: function parseMSSQLToJSON(str) {
+      return _mssqlParser["default"].parseWithPegError(str);
+    }
   }]);
   return Parser;
 }();

package/package.json

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

package/types/parse/Parser.d.ts

@@ -1,5 +1,7 @@
+import { Compiler } from '@dbml/parse';
 import Database, { RawDatabase } from '../model_structure/database';
 declare class Parser {
+    constructor(DBMLCompiler: Compiler?);
     static parseJSONToDatabase(rawDatabase: RawDatabase): Database;
     static parseMySQLToJSON(str: string): RawDatabase;
     static parsePostgresToJSON(str: string): RawDatabase;
@@ -7,6 +9,6 @@ declare class Parser {
     static parseDBMLToJSON(str: string): RawDatabase;
     static parseSchemaRbToJSON(str: string): RawDatabase;
     static parseMSSQLToJSON(str: string): RawDatabase;
-    static parse(str: string, format: 'mysql' | 'postgres' | 'dbml' | 'schemarb' | 'mssql' | 'json'): Database;
+    parse(str: string, format: 'mysql' | 'postgres' | 'dbml' | 'dbmlv2' | 'schemarb' | 'mssql' | 'json'): Database;
 }
 export default Parser;