@dbml/core 2.5.2 → 2.5.4

package/lib/parse/mssql/base_parsers.js

@@ -1,20 +1,15 @@
 "use strict";
 
 var P = require('parsimmon');
-
 var _require = require('./utils'),
-    makeList = _require.makeList,
-    streamline = _require.streamline;
-
+  makeList = _require.makeList,
+  streamline = _require.streamline;
 var KP = require('./keyword_parsers');
-
 var wss = require('./whitespaces');
-
 var _pIgnore = P(function (input, i) {
   var j = i;
   var isEnclosed = false;
   var encloseChar = '';
-
   while (j < input.length && (isEnclosed || !input.slice(j, j + 2).match(/GO|;/i))) {
     if (isEnclosed && input[j].match(/\]|'|"/i) && input[j] === encloseChar) {
       isEnclosed = false;
@@ -23,18 +18,14 @@ var _pIgnore = P(function (input, i) {
       encloseChar = input[j];
       if (input[j] === '[') encloseChar = ']';
     }
-
     if (!input[j].match(/\s/)) j += 1;
-
     while (j < input.length && input[j].match(/\s/)) {
       j += 1;
     }
   }
-
   if (input.slice(j, j + 2).match(/GO/i)) j -= 1;
   return P.makeSuccess(j + 1, '');
 });
-
 var Lang = P.createLanguage({
   pIgnore: function pIgnore() {
     return _pIgnore;

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

@@ -1,7 +1,6 @@
 "use strict";
 
 var _ = require('lodash');
-
 function makeDataType(typeName, args) {
   var argsString = args ? args.join(',') : null;
   return {
@@ -13,7 +12,6 @@ function makeDataType(typeName, args) {
     }
   };
 }
-
 function makeColumn(fieldName, dataType, fieldSettings) {
   var value = {};
   value[dataType.type] = dataType.value;
@@ -27,7 +25,6 @@ function makeColumn(fieldName, dataType, fieldSettings) {
     value: value
   };
 }
-
 module.exports = {
   makeColumn: makeColumn,
   makeDataType: makeDataType

package/lib/parse/mssql/column_definition/index.js

@@ -1,30 +1,22 @@
 "use strict";
 
 var P = require('parsimmon');
-
 var KP = require('../keyword_parsers');
-
 var _require = require('../base_parsers'),
-    pDotDelimitedName = _require.pDotDelimitedName,
-    pIdentifier = _require.pIdentifier,
-    pNumberList = _require.pNumberList,
-    pOptionList = _require.pOptionList;
-
+  pDotDelimitedName = _require.pDotDelimitedName,
+  pIdentifier = _require.pIdentifier,
+  pNumberList = _require.pNumberList,
+  pOptionList = _require.pOptionList;
 var _require2 = require('../utils'),
-    makeNode = _require2.makeNode,
-    makeList = _require2.makeList,
-    streamline = _require2.streamline;
-
+  makeNode = _require2.makeNode,
+  makeList = _require2.makeList,
+  streamline = _require2.streamline;
 var _require3 = require('../index_definition'),
-    pColumnIndex = _require3.pColumnIndex;
-
+  pColumnIndex = _require3.pColumnIndex;
 var _require4 = require('../constraint_definition'),
-    pColumnConstraint = _require4.pColumnConstraint;
-
+  pColumnConstraint = _require4.pColumnConstraint;
 var pExpression = require('../expression');
-
 var A = require('./actions');
-
 var Lang = P.createLanguage({
   ColumnsDefinition: function ColumnsDefinition(r) {
     return P.alt(r.ComputedColumnDefinition.result(null), r.ColumnSetDefinition.result(null), r.ColumnDefinition);

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

@@ -1,14 +1,13 @@
 "use strict";
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return 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 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 _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 makeDefaultConstraint(_keyword, constExpression) {
   var value = {};
-
   if (constExpression.type) {
     switch (constExpression.type) {
       case 'string':
@@ -16,7 +15,6 @@ function makeDefaultConstraint(_keyword, constExpression) {
       case 'boolean':
         value.type = constExpression.type;
         break;
-
       default:
         value.type = 'expression';
         break;
@@ -24,14 +22,12 @@ function makeDefaultConstraint(_keyword, constExpression) {
   } else {
     value.type = 'expression';
   }
-
   value.value = constExpression.value;
   return {
     type: 'dbdefault',
     value: value
   };
 }
-
 function makeConstraintCheckEnum(fieldName, _ununsed, values) {
   var valuesProp = [];
   values.forEach(function (value) {
@@ -46,7 +42,6 @@ function makeConstraintCheckEnum(fieldName, _ununsed, values) {
       name: "".concat(fieldName, "_enum"),
       values: valuesProp,
       fieldName: fieldName // for alter table add enum
-
     }
   };
 }
@@ -60,7 +55,6 @@ function makeTableConstraint(constraintName, option) {
     })
   };
 }
-
 module.exports = {
   makeConstraintCheckEnum: makeConstraintCheckEnum,
   makeDefaultConstraint: makeDefaultConstraint,

package/lib/parse/mssql/constraint_definition/index.js

@@ -1,31 +1,23 @@
 "use strict";
 
 var P = require('parsimmon');
-
 var KP = require('../keyword_parsers');
-
 var pExpression = require('../expression');
-
 var _require = require('../base_parsers'),
-    pIdentifier = _require.pIdentifier,
-    pConst = _require.pConst,
-    pFunction = _require.pFunction;
-
+  pIdentifier = _require.pIdentifier,
+  pConst = _require.pConst,
+  pFunction = _require.pFunction;
 var _require2 = require('../utils'),
-    makeList = _require2.makeList,
-    streamline = _require2.streamline,
-    makeNode = _require2.makeNode;
-
+  makeList = _require2.makeList,
+  streamline = _require2.streamline,
+  makeNode = _require2.makeNode;
 var _require3 = require('../fk_definition'),
-    pColumnConstraintFK = _require3.pColumnConstraintFK,
-    pTableConstraintFK = _require3.pTableConstraintFK;
-
+  pColumnConstraintFK = _require3.pColumnConstraintFK,
+  pTableConstraintFK = _require3.pTableConstraintFK;
 var _require4 = require('../index_definition'),
-    pColumnConstraintIndex = _require4.pColumnConstraintIndex,
-    pTableConstraintIndex = _require4.pTableConstraintIndex;
-
+  pColumnConstraintIndex = _require4.pColumnConstraintIndex,
+  pTableConstraintIndex = _require4.pTableConstraintIndex;
 var A = require('./actions');
-
 var Lang = P.createLanguage({
   TableConstraint: function TableConstraint(r) {
     return P.seqMap(r.ConstraintName.fallback(null), r.TableConstraintOption, A.makeTableConstraint).thru(makeNode());
@@ -57,10 +49,10 @@ var Lang = P.createLanguage({
   ConstraintDefault: function ConstraintDefault(r) {
     return P.seqMap(KP.KeywordDefault, r.ConstExpr, A.makeDefaultConstraint);
   },
-  ConstExpr: function ConstExpr() {
-    return P.seq(KP.LParen.fallback(null), P.alt(pFunction, pConst, KP.KeywordNull.thru(streamline('boolean'))), KP.RParen.fallback(null)).map(function (value) {
+  ConstExpr: function ConstExpr(r) {
+    return P.alt(P.seq(KP.LParen, r.ConstExpr, KP.RParen).map(function (value) {
       return value[1];
-    });
+    }), pFunction, pConst, KP.KeywordNull.thru(streamline('boolean')));
   },
   ConstraintName: function ConstraintName() {
     return P.seq(KP.KeywordConstraint, pIdentifier).map(function (value) {

package/lib/parse/mssql/expression.js

@@ -1,44 +1,34 @@
 "use strict";
 
 var P = require('parsimmon');
-
 var _ = require('lodash');
-
 var _require = require('./base_parsers'),
-    pFunction = _require.pFunction,
-    pDotDelimitedName = _require.pDotDelimitedName,
-    pConst = _require.pConst;
-
+  pFunction = _require.pFunction,
+  pDotDelimitedName = _require.pDotDelimitedName,
+  pConst = _require.pConst;
 var _require2 = require('./keyword_parsers'),
-    LParen = _require2.LParen,
-    RParen = _require2.RParen;
-
+  LParen = _require2.LParen,
+  RParen = _require2.RParen;
 var wss = require('./whitespaces');
-
 var _require3 = require('./utils'),
-    streamline = _require3.streamline;
-
+  streamline = _require3.streamline;
 function tokenizeParen(parser) {
   return parser.many().map(function (value) {
     return value.join('');
   }).fallback(null).thru(streamline('token'));
 }
-
 function enclose(parser) {
   var ManyRParen = RParen.thru(tokenizeParen);
   var ManyLParen = LParen.thru(tokenizeParen);
   return P.seq(ManyLParen, parser, ManyRParen);
 }
-
 function enclosedOrNot(parser) {
   return P.alt(enclose(parser), parser);
 }
-
 var Lang = P.createLanguage({
   ExpressionFinal: function ExpressionFinal(r) {
     return r.Expression.map(function (values) {
       var flattened = _.flattenDeep(values);
-
       return flattened.map(function (value) {
         return value ? value.value : '';
       }).join('');

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

@@ -1,10 +1,8 @@
 "use strict";
 
 var _ = require('lodash');
-
 var _require = require('../utils'),
-    getFullTableName = _require.getFullTableName;
-
+  getFullTableName = _require.getFullTableName;
 function makeEndPoint(tableName, columnName, relation) {
   return {
     tableName: tableName.name,
@@ -13,19 +11,16 @@ function makeEndPoint(tableName, columnName, relation) {
     relation: relation
   };
 }
-
 function setOption(value, fkOptions) {
   fkOptions.forEach(function (option) {
     if (option.type.match(/ON[^\S\r\n]DELETE/i)) {
       value.onDelete = option.setting;
     }
-
     if (option.type.match(/ON[^\S\r\n]UPDATE/i)) {
       value.onUpdate = option.setting;
     }
   });
 }
-
 function makeColumnConstraintFK(_unused, tableName, columnName, fkOptions) {
   var value = {};
   var fullTableName = getFullTableName(tableName);
@@ -36,7 +31,6 @@ function makeColumnConstraintFK(_unused, tableName, columnName, fkOptions) {
     value: [value]
   };
 }
-
 function makeTableEndpoint(columnNames) {
   return {
     type: 'endpoint',
@@ -45,11 +39,9 @@ function makeTableEndpoint(columnNames) {
     }
   };
 }
-
 function makeTableConstraintFK(_keyword1, endpoint1, _keyword2, tableName, endpoint2, fkOptions) {
   var value = {};
   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
@@ -60,7 +52,6 @@ function makeTableConstraintFK(_keyword1, endpoint1, _keyword2, tableName, endpo
       }
     };
   }
-
   endpoint1.value.relation = '*';
   endpoint2.value.relation = '1';
   endpoint2.value.tableName = fullTableName.name;
@@ -72,14 +63,12 @@ function makeTableConstraintFK(_keyword1, endpoint1, _keyword2, tableName, endpo
     value: value
   };
 }
-
 function makeOnSetting(type, setting) {
   return {
     type: type,
     setting: setting.toLowerCase().trim().split(/[ ]+/).join(' ')
   };
 }
-
 module.exports = {
   makeOnSetting: makeOnSetting,
   makeColumnConstraintFK: makeColumnConstraintFK,

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

@@ -1,20 +1,15 @@
 "use strict";
 
 var P = require('parsimmon');
-
 var KP = require('../keyword_parsers');
-
 var _require = require('../base_parsers'),
-    pDotDelimitedName = _require.pDotDelimitedName,
-    pIdentifier = _require.pIdentifier,
-    pColumnNames = _require.pColumnNames;
-
+  pDotDelimitedName = _require.pDotDelimitedName,
+  pIdentifier = _require.pIdentifier,
+  pColumnNames = _require.pColumnNames;
 var _require2 = require('../utils'),
-    makeList = _require2.makeList,
-    makeNode = _require2.makeNode;
-
+  makeList = _require2.makeList,
+  makeNode = _require2.makeNode;
 var A = require('./actions');
-
 var Lang = P.createLanguage({
   TableConstraintFK: function TableConstraintFK(r) {
     return P.seqMap(KP.KeywordForeignKey.fallback(null), r.TableEndpoint, KP.KeywordReferences, pDotDelimitedName, r.TableEndpoint.fallback(null), r.FKOptions.fallback(null), A.makeTableConstraintFK);

package/lib/parse/mssql/index.js

@@ -1,7 +1,6 @@
 "use strict";
 
 var mssqlParser = require('./statements');
-
 mssqlParser.parseWithPegError = function (input) {
   try {
     return mssqlParser.tryParse(input);
@@ -15,10 +14,9 @@ mssqlParser.parseWithPegError = function (input) {
     pegJSError.found = input[pegJSError.location.start.offset];
     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
-
+    pegJSError.message = "Expected ".concat(expectedString, " but \"").concat(pegJSError.found, "\" found.");
+    // eslint-disable-next-line no-console
     throw pegJSError;
   }
 };
-
 module.exports = mssqlParser;

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

@@ -19,7 +19,6 @@ function makeIndex(columnNames, isUnique, isPk) {
     }
   };
 }
-
 function makeColumnIndex(_keyword, indexName) {
   return {
     type: 'indexes',
@@ -29,24 +28,19 @@ function makeColumnIndex(_keyword, indexName) {
     }
   };
 }
-
 function makeTableIndex(_keyword, indexName, isUnique, _clustered, _columnstore, columnNames) {
   return makeIndex(columnNames, isUnique, null, indexName);
 }
-
 function makeTableConstraintIndex(keyword, _keyword, columnNames) {
   var isPk = null;
   var isUnique = null;
-
   if (keyword.type === 'pk') {
     isPk = true;
   } else if (keyword.type === 'unique') {
     isUnique = true;
   }
-
   return makeIndex(columnNames, isUnique, isPk);
 }
-
 module.exports = {
   makeTableIndex: makeTableIndex,
   makeTableConstraintIndex: makeTableConstraintIndex,

package/lib/parse/mssql/index_definition/index.js

@@ -1,23 +1,18 @@
 "use strict";
 
 var P = require('parsimmon');
-
 var KP = require('../keyword_parsers');
-
 var _require = require('../base_parsers'),
-    pIdentifier = _require.pIdentifier,
-    pKeywordClusteredOrNon = _require.pKeywordClusteredOrNon,
-    pFunction = _require.pFunction,
-    pOptionList = _require.pOptionList,
-    pColumnNames = _require.pColumnNames,
-    pKeywordPKOrUnique = _require.pKeywordPKOrUnique,
-    pOption = _require.pOption;
-
+  pIdentifier = _require.pIdentifier,
+  pKeywordClusteredOrNon = _require.pKeywordClusteredOrNon,
+  pFunction = _require.pFunction,
+  pOptionList = _require.pOptionList,
+  pColumnNames = _require.pColumnNames,
+  pKeywordPKOrUnique = _require.pKeywordPKOrUnique,
+  pOption = _require.pOption;
 var _require2 = require('../utils'),
-    makeNode = _require2.makeNode;
-
+  makeNode = _require2.makeNode;
 var A = require('./actions');
-
 var Lang = P.createLanguage({
   TableIndex: function TableIndex(r) {
     return P.seqMap(KP.KeywordIndex, pIdentifier, KP.KeywordUnique.fallback(null), pKeywordClusteredOrNon.fallback(null), KP.KeywordColumnStore.fallback(null), pColumnNames, A.makeTableIndex).thru(makeNode()).skip(r.IgnoredIndexOptions);

package/lib/parse/mssql/keyword_parsers.js

@@ -1,9 +1,8 @@
 "use strict";
 
 var _require = require('./keyword_utils'),
-    keyword = _require.keyword,
-    word = _require.word;
-
+  keyword = _require.keyword,
+  word = _require.word;
 exports.KeywordIdentity = keyword(/IDENTITY/i);
 exports.KeywordIndex = keyword(/INDEX/i);
 exports.KeywordWith = keyword(/WITH/i);

package/lib/parse/mssql/keyword_utils.js

@@ -1,20 +1,16 @@
 "use strict";
 
 var P = require('parsimmon');
-
 var wss = require('./whitespaces');
-
 exports.word = function (string) {
   return P.string(string).skip(wss).desc("\"".concat(string, "\""));
 };
-
 function replaceWhitespaceWithRegexp(regexp) {
   var string = String(regexp);
   string = string.replace(/[\s]+/g, '\\s+');
   var lastSlash = string.lastIndexOf('/');
   return new RegExp(string.slice(1, lastSlash), string.slice(lastSlash + 1));
 }
-
 exports.keyword = function (regexp) {
   var newRegexp = regexp;
   var desc = regexp.source;

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

@@ -1,7 +1,6 @@
 "use strict";
 
 var _ = require('lodash');
-
 function findTable(ast, tableName, schemaName) {
   var realSchemaName = schemaName || 'public';
   var table = ast.tables.find(function (t) {
@@ -10,25 +9,21 @@ function findTable(ast, tableName, schemaName) {
   });
   return table;
 }
-
 function findField(table, fieldName) {
   return table.fields.find(function (_field) {
     return _field.name === fieldName;
   });
 }
-
 function handleIndexes(index, ast) {
   var table = findTable(ast, index.tableName, index.schemaName);
   table.indexes.push(index);
   index.tableName = null;
 }
-
 function pushOut(values, astProp) {
   values.forEach(function (value) {
     astProp.push(value);
   });
 }
-
 function handleTable(table, ast) {
   pushOut(table.enums, ast.enums);
   pushOut(table.refs, ast.refs);
@@ -38,7 +33,6 @@ function handleTable(table, ast) {
   table.enums = null;
   table.refs = null;
 }
-
 function handleDefaults(dbdefault, ast) {
   var table = findTable(ast, dbdefault.tableName, dbdefault.schemaName);
   var field = findField(table, dbdefault.fieldName);
@@ -46,7 +40,6 @@ function handleDefaults(dbdefault, ast) {
   dbdefault.tableName = null;
   field.dbdefault = dbdefault;
 }
-
 function handleEnums(_enum, ast) {
   var table = findTable(ast, _enum.tableName, _enum.schemaName);
   var field = findField(table, _enum.fieldName);
@@ -58,23 +51,18 @@ function handleEnums(_enum, ast) {
     return "'".concat(value.name, "'");
   }).join(', ');
 }
-
 function handleTableNote(comment, ast) {
   var schemaName = comment.schemaName;
   if (schemaName === 'dbo') schemaName = null; // treat `dbo` as public schema
-
   var foundTable = findTable(ast, comment.tableName, schemaName);
   if (foundTable) foundTable.note = comment.note ? {
     value: comment.note
   } : null;
 }
-
 function handleFieldNote(comment, ast) {
   var schemaName = comment.schemaName;
   if (schemaName === 'dbo') schemaName = null; // treat `dbo` as public schema
-
   var foundTable = findTable(ast, comment.tableName, schemaName);
-
   if (foundTable) {
     var foundField = findField(foundTable, comment.columnName);
     if (foundField) foundField.note = comment.note ? {
@@ -82,11 +70,9 @@ function handleFieldNote(comment, ast) {
     } : null;
   }
 }
-
 function handleComment(comment, ast) {
   if (comment.type === 'table') handleTableNote(comment, ast);else if (comment.type === 'column') handleFieldNote(comment, ast);
 }
-
 function handleStatement(_statements) {
   var ast = {
     tables: [],
@@ -94,44 +80,34 @@ function handleStatement(_statements) {
     indexes: [],
     enums: []
   };
-
   var statements = _.flatten(_statements);
-
   statements.forEach(function (statement) {
     if (!statement) return;
-
     switch (statement.type) {
       case 'tables':
         handleTable(statement.value, ast);
         break;
       // from alter table add
-
       case 'indexes':
         handleIndexes(statement.value, ast);
         break;
-
       case 'dbdefault':
         handleDefaults(statement.value, ast);
         break;
-
       case 'enums':
         handleEnums(statement.value, ast);
         break;
-
       case 'comment':
         handleComment(statement.value, ast);
         break;
-
       default:
         break;
     }
-
     if (statement.type && ast[statement.type]) ast[statement.type].push(statement.value);
   });
   ast.indexes = null;
   return ast;
 }
-
 module.exports = {
   handleStatement: handleStatement
 };

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

@@ -1,18 +1,12 @@
 "use strict";
 
 var P = require('parsimmon');
-
 var KP = require('../keyword_parsers');
-
 var S = require('./statement_types');
-
 var wss = require('../whitespaces');
-
 var A = require('./actions');
-
 var _require = require('../base_parsers'),
-    pIgnore = _require.pIgnore;
-
+  pIgnore = _require.pIgnore;
 var Lang = P.createLanguage({
   Statements: function Statements(r) {
     return wss.then(r.Seperator).then(P.sepBy(r.StatementTypes, r.Seperator)).skip(r.Seperator).map(A.handleStatement);