@dbml/core 3.6.2 → 3.7.1

package/lib/parse/ANTLR/ASTGeneration/AST.js

@@ -10,6 +10,7 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 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); }
+/* eslint-disable camelcase */
 /* eslint-disable max-classes-per-file */
 var Index = /*#__PURE__*/function () {
   /**

package/lib/parse/ANTLR/ASTGeneration/snowflake/SnowflakeASTGen.js

@@ -711,7 +711,7 @@ var SnowflakeASTGen = /*#__PURE__*/function (_SnowflakeParserVisit) {
     key: "visitLiteral",
     value: function visitLiteral(ctx) {
       if (ctx.STRING()) return {
-        value: (0, _helpers.getOriginalText)(ctx),
+        value: sanitizeComment(ctx),
         type: 'string'
       };
       if (ctx.DECIMAL() || ctx.REAL || ctx.FLOAT) return {

package/lib/parse/databaseGenerator.js

@@ -0,0 +1,118 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.generateDatabase = void 0;
+var _database = _interopRequireDefault(require("../model_structure/database"));
+var _AST = require("./ANTLR/ASTGeneration/AST");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+var parseJSONToDatabase = function parseJSONToDatabase(rawDatabase) {
+  return new _database["default"](rawDatabase);
+};
+var createRefs = function createRefs(rawRefs) {
+  return rawRefs.map(function (rawRef) {
+    var name = rawRef.name,
+      endpoints = rawRef.endpoints,
+      onDelete = rawRef.onDelete,
+      onUpdate = rawRef.onUpdate;
+    var eps = endpoints.map(function (ep) {
+      return new _AST.Endpoint(ep);
+    });
+    return new _AST.Ref({
+      name: name,
+      endpoints: eps,
+      onDelete: onDelete,
+      onUpdate: onUpdate
+    }).toJSON();
+  });
+};
+var createEnums = function createEnums(rawEnums) {
+  return rawEnums.map(function (rawEnum) {
+    var name = rawEnum.name,
+      schemaName = rawEnum.schemaName,
+      values = rawEnum.values;
+    return new _AST.Enum({
+      name: name,
+      schemaName: schemaName,
+      values: values
+    });
+  });
+};
+var createFields = function createFields(rawFields, fieldsConstraints) {
+  return rawFields.map(function (field) {
+    var constraints = fieldsConstraints[field.name] || {};
+    var f = new _AST.Field({
+      name: field.name,
+      type: field.type,
+      dbdefault: field.dbdefault,
+      not_null: field.not_null,
+      increment: field.increment,
+      pk: constraints.pk,
+      unique: constraints.unique,
+      note: field.note
+    });
+    return f;
+  });
+};
+var createIndexes = function createIndexes(rawIndexes) {
+  return rawIndexes.map(function (rawIndex) {
+    var name = rawIndex.name,
+      unique = rawIndex.unique,
+      primary = rawIndex.primary,
+      type = rawIndex.type,
+      columns = rawIndex.columns;
+    var index = new _AST.Index({
+      name: name,
+      unique: unique,
+      pk: primary,
+      type: type,
+      columns: columns
+    });
+    return index;
+  });
+};
+var createTables = function createTables(rawTables, rawFields, rawIndexes, tableConstraints) {
+  return rawTables.map(function (rawTable) {
+    var name = rawTable.name,
+      schemaName = rawTable.schemaName,
+      note = rawTable.note;
+    var key = schemaName ? "".concat(schemaName, ".").concat(name) : "".concat(name);
+    var constraints = tableConstraints[key] || {};
+    var fields = createFields(rawFields[key], constraints);
+    var indexes = createIndexes(rawIndexes[key] || []);
+    return new _AST.Table({
+      name: name,
+      schemaName: schemaName,
+      fields: fields,
+      indexes: indexes,
+      note: note
+    });
+  });
+};
+var generateDatabase = function generateDatabase(schemaJson) {
+  var rawTables = schemaJson.tables,
+    rawFields = schemaJson.fields,
+    rawIndexes = schemaJson.indexes,
+    rawRefs = schemaJson.refs,
+    rawEnums = schemaJson.enums,
+    tableConstraints = schemaJson.tableConstraints;
+  try {
+    var tables = createTables(rawTables, rawFields, rawIndexes, tableConstraints);
+    var enums = createEnums(rawEnums);
+    var refs = createRefs(rawRefs);
+    var rawDatabase = {
+      schemas: [],
+      tables: tables,
+      refs: refs,
+      enums: enums,
+      tableGroups: [],
+      aliases: [],
+      project: {}
+    };
+    return parseJSONToDatabase(rawDatabase);
+  } catch (err) {
+    throw new Error(err);
+  }
+};
+exports.generateDatabase = generateDatabase;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dbml/core",
-  "version": "3.6.2",
+  "version": "3.7.1",
   "description": "> TODO: description",
   "author": "Holistics <dev@holistics.io>",
   "license": "Apache-2.0",
@@ -32,10 +32,14 @@
     "prepublish": "npm run build"
   },
   "dependencies": {
-    "@dbml/parse": "^3.6.2",
+    "@dbml/parse": "^3.7.1",
+    "@tediousjs/connection-string": "^0.5.0",
     "antlr4": "^4.13.1",
     "lodash": "^4.17.15",
+    "mssql": "^11.0.1",
+    "mysql2": "^3.11.0",
     "parsimmon": "^1.13.0",
+    "pg": "^8.12.0",
     "pluralize": "^8.0.0"
   },
   "devDependencies": {
@@ -59,5 +63,8 @@
       "\\.(?!json$)[^.]*$": "@glen/jest-raw-loader"
     }
   },
-  "gitHead": "d3d82a3e8260f733098edc5fbfdbd3f8a381c6e3"
+  "gitHead": "71d7e2cd00ba5d60d2e36c465d43ce1d91189274",
+  "engines": {
+    "node": ">=18"
+  }
 }

package/types/import/index.d.ts

@@ -1,5 +1,7 @@
 declare function _import(str: string, format: 'dbml' | 'mysql' | 'postgres' | 'json' | 'mssql' | 'postgresLegacy'): string;
+declare async function generateDbml(connection: any, format: 'mysql' | 'postgres' | 'mssql'): string;
 declare const _default: {
     import: typeof _import;
+    generateDbml: typeof generateDbml;
 };
 export default _default;

package/lib/parse/DatabaseConnector.js

@@ -1,87 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-var _database = _interopRequireDefault(require("../model_structure/database"));
-var _ConnectionASTGeneration = require("./connection/ConnectionASTGeneration");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-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); }
-function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator["return"] && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, "catch": function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-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); }
-var DatabaseConnector = /*#__PURE__*/function () {
-  function DatabaseConnector(connection) {
-    _classCallCheck(this, DatabaseConnector);
-    this.connection = connection;
-  }
-  _createClass(DatabaseConnector, [{
-    key: "fetch",
-    value: function () {
-      var _fetch = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(format) {
-        var rawDatabase, schema;
-        return _regeneratorRuntime().wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              rawDatabase = {};
-              _context.t0 = format;
-              _context.next = _context.t0 === 'postgres' ? 4 : 8;
-              break;
-            case 4:
-              _context.next = 6;
-              return DatabaseConnector.fetchPostgresToJSON(this.connection);
-            case 6:
-              rawDatabase = _context.sent;
-              return _context.abrupt("break", 9);
-            case 8:
-              return _context.abrupt("break", 9);
-            case 9:
-              schema = DatabaseConnector.parseJSONToDatabase(rawDatabase);
-              return _context.abrupt("return", schema);
-            case 11:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee, this);
-      }));
-      function fetch(_x) {
-        return _fetch.apply(this, arguments);
-      }
-      return fetch;
-    }()
-  }], [{
-    key: "parseJSONToDatabase",
-    value: function parseJSONToDatabase(rawDatabase) {
-      var database = new _database["default"](rawDatabase);
-      return database;
-    }
-  }, {
-    key: "fetchPostgresToJSON",
-    value: function () {
-      var _fetchPostgresToJSON = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(connection) {
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              return _context2.abrupt("return", (0, _ConnectionASTGeneration.fetch)(connection, 'postgres'));
-            case 1:
-            case "end":
-              return _context2.stop();
-          }
-        }, _callee2);
-      }));
-      function fetchPostgresToJSON(_x2) {
-        return _fetchPostgresToJSON.apply(this, arguments);
-      }
-      return fetchPostgresToJSON;
-    }()
-  }]);
-  return DatabaseConnector;
-}();
-var _default = DatabaseConnector;
-exports["default"] = _default;