@dbml/core 5.1.0 → 5.2.0

package/lib/parse/Parser.js

@@ -61,6 +61,9 @@ var Parser = /*#__PURE__*/function () {
           case 'mssql':
             rawDatabase = Parser.parseMSSQLToJSONv2(str);
             break;
+          case 'oracle':
+            rawDatabase = Parser.parseOracleToJSON(str);
+            break;
           case 'json':
             if (_typeof(str) === 'object') {
               rawDatabase = str;
@@ -152,6 +155,11 @@ var Parser = /*#__PURE__*/function () {
     value: function parseSnowflakeToJSON(str) {
       return (0, _ASTGeneration.parse)(str, 'snowflake');
     }
+  }, {
+    key: "parseOracleToJSON",
+    value: function parseOracleToJSON(str) {
+      return (0, _ASTGeneration.parse)(str, 'oracle');
+    }
   }, {
     key: "parse",
     value: function parse(str, format) {

package/lib/parse/buildParser.js

@@ -8,7 +8,7 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default":
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return r; }; var t, r = {}, e = Object.prototype, n = e.hasOwnProperty, o = "function" == typeof Symbol ? Symbol : {}, i = o.iterator || "@@iterator", a = o.asyncIterator || "@@asyncIterator", u = o.toStringTag || "@@toStringTag"; function c(t, r, e, n) { return Object.defineProperty(t, r, { value: e, enumerable: !n, configurable: !n, writable: !n }); } try { c({}, ""); } catch (t) { c = function c(t, r, e) { return t[r] = e; }; } function h(r, e, n, o) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype); return c(a, "_invoke", function (r, e, n) { var o = 1; return function (i, a) { if (3 === o) throw Error("Generator is already running"); if (4 === o) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var u = n.delegate; if (u) { var c = d(u, n); if (c) { if (c === f) continue; return c; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (1 === o) throw o = 4, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = 3; var h = s(r, e, n); if ("normal" === h.type) { if (o = n.done ? 4 : 2, h.arg === f) continue; return { value: h.arg, done: n.done }; } "throw" === h.type && (o = 4, n.method = "throw", n.arg = h.arg); } }; }(r, n, new Context(o || [])), !0), a; } function s(t, r, e) { try { return { type: "normal", arg: t.call(r, e) }; } catch (t) { return { type: "throw", arg: t }; } } r.wrap = h; var f = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var l = {}; c(l, i, function () { return this; }); var p = Object.getPrototypeOf, y = p && p(p(x([]))); y && y !== e && n.call(y, i) && (l = y); var v = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(l); function g(t) { ["next", "throw", "return"].forEach(function (r) { c(t, r, function (t) { return this._invoke(r, t); }); }); } function AsyncIterator(t, r) { function e(o, i, a, u) { var c = s(t[o], t, i); if ("throw" !== c.type) { var h = c.arg, f = h.value; return f && "object" == _typeof(f) && n.call(f, "__await") ? r.resolve(f.__await).then(function (t) { e("next", t, a, u); }, function (t) { e("throw", t, a, u); }) : r.resolve(f).then(function (t) { h.value = t, a(h); }, function (t) { return e("throw", t, a, u); }); } u(c.arg); } var o; c(this, "_invoke", function (t, n) { function i() { return new r(function (r, o) { e(t, n, r, o); }); } return o = o ? o.then(i, i) : i(); }, !0); } function d(r, e) { var n = e.method, o = r.i[n]; if (o === t) return e.delegate = null, "throw" === n && r.i["return"] && (e.method = "return", e.arg = t, d(r, e), "throw" === e.method) || "return" !== n && (e.method = "throw", e.arg = new TypeError("The iterator does not provide a '" + n + "' method")), f; var i = s(o, r.i, e.arg); if ("throw" === i.type) return e.method = "throw", e.arg = i.arg, e.delegate = null, f; var a = i.arg; return a ? a.done ? (e[r.r] = a.value, e.next = r.n, "return" !== e.method && (e.method = "next", e.arg = t), e.delegate = null, f) : a : (e.method = "throw", e.arg = new TypeError("iterator result is not an object"), e.delegate = null, f); } function w(t) { this.tryEntries.push(t); } function m(r) { var e = r[4] || {}; e.type = "normal", e.arg = t, r[4] = e; } function Context(t) { this.tryEntries = [[-1]], t.forEach(w, this), this.reset(!0); } function x(r) { if (null != r) { var e = r[i]; if (e) return e.call(r); if ("function" == typeof r.next) return r; if (!isNaN(r.length)) { var o = -1, a = function e() { for (; ++o < r.length;) if (n.call(r, o)) return e.value = r[o], e.done = !1, e; return e.value = t, e.done = !0, e; }; return a.next = a; } } throw new TypeError(_typeof(r) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, c(v, "constructor", GeneratorFunctionPrototype), c(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = c(GeneratorFunctionPrototype, u, "GeneratorFunction"), r.isGeneratorFunction = function (t) { var r = "function" == typeof t && t.constructor; return !!r && (r === GeneratorFunction || "GeneratorFunction" === (r.displayName || r.name)); }, r.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, c(t, u, "GeneratorFunction")), t.prototype = Object.create(v), t; }, r.awrap = function (t) { return { __await: t }; }, g(AsyncIterator.prototype), c(AsyncIterator.prototype, a, function () { return this; }), r.AsyncIterator = AsyncIterator, r.async = function (t, e, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(h(t, e, n, o), i); return r.isGeneratorFunction(e) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, g(v), c(v, u, "Generator"), c(v, i, function () { return this; }), c(v, "toString", function () { return "[object Generator]"; }), r.keys = function (t) { var r = Object(t), e = []; for (var n in r) e.unshift(n); return function t() { for (; e.length;) if ((n = e.pop()) in r) return t.value = n, t.done = !1, t; return t.done = !0, t; }; }, r.values = x, Context.prototype = { constructor: Context, reset: function reset(r) { if (this.prev = this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(m), !r) for (var e in this) "t" === e.charAt(0) && n.call(this, e) && !isNaN(+e.slice(1)) && (this[e] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0][4]; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(r) { if (this.done) throw r; var e = this; function n(t) { a.type = "throw", a.arg = r, e.next = t; } for (var o = e.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i[4], u = this.prev, c = i[1], h = i[2]; if (-1 === i[0]) return n("end"), !1; if (!c && !h) throw Error("try statement without catch or finally"); if (null != i[0] && i[0] <= u) { if (u < c) return this.method = "next", this.arg = t, n(c), !0; if (u < h) return n(h), !1; } } }, abrupt: function abrupt(t, r) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var n = this.tryEntries[e]; if (n[0] > -1 && n[0] <= this.prev && this.prev < n[2]) { var o = n; break; } } o && ("break" === t || "continue" === t) && o[0] <= r && r <= o[2] && (o = null); var i = o ? o[4] : {}; return i.type = t, i.arg = r, o ? (this.method = "next", this.next = o[2], f) : this.complete(i); }, complete: function complete(t, r) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && r && (this.next = r), f; }, finish: function finish(t) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var e = this.tryEntries[r]; if (e[2] === t) return this.complete(e[4], e[3]), m(e), f; } }, "catch": function _catch(t) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var e = this.tryEntries[r]; if (e[0] === t) { var n = e[4]; if ("throw" === n.type) { var o = n.arg; m(e); } return o; } } throw Error("illegal catch attempt"); }, delegateYield: function delegateYield(r, e, n) { return this.delegate = { i: x(r), r: e, n: n }, "next" === this.method && (this.arg = t), f; } }, r; }
 function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
-function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; } /* eslint-disable */ /* eslint-enable */
+function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
 _bluebird["default"].promisifyAll(_fs["default"]);
 function buildParserFile(_x, _x2) {
   return _buildParserFile.apply(this, arguments);

package/lib/parse/databaseGenerator.js

@@ -60,13 +60,13 @@ var createIndexes = function createIndexes(rawIndexes) {
   return rawIndexes.map(function (rawIndex) {
     var name = rawIndex.name,
       unique = rawIndex.unique,
-      primary = rawIndex.primary,
+      pk = rawIndex.pk,
       type = rawIndex.type,
       columns = rawIndex.columns;
     var index = new _AST.Index({
       name: name,
       unique: unique,
-      pk: primary,
+      pk: pk,
       type: type,
       columns: columns
     });

package/lib/parse/error.js

@@ -26,7 +26,6 @@ var CompilerError = exports.CompilerError = /*#__PURE__*/function () {
   }], [{
     key: "create",
     value: function create(nestedDiags) {
-      // eslint-disable-next-line no-use-before-define
       return new CompilerError(flattenDiag(nestedDiags));
     }
   }]);

package/lib/parse/mssql/fk_definition/actions.js

@@ -44,7 +44,7 @@ function makeTableConstraintFK(_keyword1, endpoint1, _keyword2, tableName, endpo
   var fullTableName = getFullTableName(tableName);
   if (!endpoint2) {
     // Omits columns list, see: https://docs.microsoft.com/en-us/sql/t-sql/statements/create-table-transact-sql?view=sql-server-ver16#foreign-key-constraints
-    // eslint-disable-next-line no-param-reassign
+
     endpoint2 = {
       type: 'endpoint',
       value: {

package/lib/parse/mssql/index.js

@@ -15,7 +15,6 @@ mssqlParser.parseWithPegError = function (input) {
     var lastExpected = err.result.expected.pop();
     var expectedString = "".concat(err.result.expected.join(', '), ", or ").concat(lastExpected);
     pegJSError.message = "Expected ".concat(expectedString, " but \"").concat(pegJSError.found, "\" found.");
-    // eslint-disable-next-line no-console
     throw pegJSError;
   }
 };

package/lib/parse/mssql/statements/statement_types/alter_table/actions.js

@@ -17,7 +17,6 @@ function addTableName(tableName, result) {
 function handleAlterTableResult(_keyword, tableName, results) {
   if (!results) return null;
   var fullName = getFullTableName(tableName);
-  // eslint-disable-next-line consistent-return
   results.forEach(function (result) {
     if (result) {
       switch (result.type) {

package/lib/parse/mssql/statements/statement_types/alter_table/add/actions.js

@@ -2,8 +2,6 @@
 
 var _require = require('../../../../constraint_definition'),
   makeTableConstraint = _require.makeTableConstraint;
-
-// eslint-disable-next-line no-unused-vars
 function makeDefault(_keyword, constExpression, _for, fieldName, _withValues) {
   var value = {};
   if (constExpression.type) {

package/lib/parse/mssql/statements/statement_types/comments/index.js

@@ -19,10 +19,10 @@ var Lang = P.createLanguage({
     return P.seq(KP.Semicolon.atMost(1), KP.KeywordGo);
   },
   StartString: function StartString() {
-    return P.alt(KP.SingleQuote, P.string("N'"));
+    return P.alt(KP.SingleQuote, P.string('N\''));
   },
   ManyDoubleSingleQuote: function ManyDoubleSingleQuote() {
-    return P.string("''");
+    return P.string('\'\'');
   },
   NoSingleQuote: function NoSingleQuote() {
     return P.regex(/[^']/);

package/lib/parse/mssql/utils.js

@@ -34,7 +34,6 @@ exports.makeList = function (parser) {
 exports.streamline = function (type) {
   return function (parser) {
     return parser.skip(wss).map(function (value) {
-      // eslint-disable-next-line no-param-reassign
       if (value !== 0 && !value) value = '';
       return {
         type: type,

package/package.json

@@ -1,6 +1,7 @@
 {
+  "$schema": "https://json.schemastore.org/package",
   "name": "@dbml/core",
-  "version": "5.1.0",
+  "version": "5.2.0",
   "description": "> TODO: description",
   "author": "Holistics <dev@holistics.io>",
   "license": "Apache-2.0",
@@ -29,10 +30,12 @@
     "build:lib": "babel src --out-dir lib --copy-files",
     "build:parser": "npx babel-node src/parse/buildParser.js",
     "build": "npm run build:parser && npm run build:lib",
-    "prepublish": "npm run build"
+    "prepublish": "npm run build",
+    "lint": "eslint .",
+    "lint:fix": "eslint --fix ."
   },
   "dependencies": {
-    "@dbml/parse": "^5.1.0",
+    "@dbml/parse": "^5.2.0",
     "antlr4": "^4.13.1",
     "lodash": "^4.17.15",
     "parsimmon": "^1.13.0",
@@ -44,11 +47,19 @@
     "@babel/node": "^7.20.7",
     "@babel/preset-env": "^7.21.4",
     "@glen/jest-raw-loader": "^2.0.0",
+    "@stylistic/eslint-plugin": "^5.5.0",
+    "@typescript-eslint/eslint-plugin": "^8.46.3",
+    "@typescript-eslint/parser": "^8.46.3",
     "babel-jest": "^29.5.0",
     "bluebird": "^3.5.5",
+    "eslint": "^9.39.1",
+    "eslint-plugin-jest": "^29.0.1",
+    "globals": "^16.5.0",
     "jest": "^29.5.0",
     "jest-bench": "^29.4.1",
-    "pegjs-require-import": "0.0.6"
+    "pegjs-require-import": "0.0.6",
+    "typescript": "^5.9.3",
+    "typescript-eslint": "^8.46.3"
   },
   "jest": {
     "setupFiles": [
@@ -62,7 +73,7 @@
       "^lodash-es$": "lodash"
     }
   },
-  "gitHead": "376dca507512a3fe549f630e6f22d7d339939183",
+  "gitHead": "20d556a6e6baad8a989c730e2afd3b65dedcea89",
   "engines": {
     "node": ">=16"
   }

package/types/import/index.d.ts

@@ -1,4 +1,4 @@
-declare function _import(str: string, format: 'dbml' | 'mysql' | 'postgres' | 'json' | 'mssql' | 'postgresLegacy' | 'mssqlLegacy'): string;
+declare function _import(str: string, format: 'dbml' | 'mysql' | 'postgres' | 'json' | 'mssql' | 'postgresLegacy' | 'mssqlLegacy' | 'oracle'): string;
 
 /**
  * @param {any} schemaJson

package/types/parse/Parser.d.ts

@@ -7,7 +7,8 @@ declare type ParseFormat = 'json'
     | 'dbml' | 'dbmlv2'
     | 'mssql' | 'mssqlLegacy'
     | 'schemarb'
-    | 'snowflake';
+    | 'snowflake'
+    | 'oracle';
 
 declare class Parser {
     public DBMLCompiler: Compiler;
@@ -23,6 +24,7 @@ declare class Parser {
     static parseMSSQLToJSON(str: string): RawDatabase;
     static parseMSSQLToJSONv2(str: string): RawDatabase;
     static parseSnowflakeToJSON(str: string): RawDatabase;
+    static parseOracleToJSON(str: string): RawDatabase;
     /**
      * Should use parse() instance method instead of this static method whenever possible
      */