@dbml/connector 5.6.0-alpha.0 → 5.6.0-alpha.2

package/dist/index.mjs

@@ -1,6 +1,5 @@
 import { Client } from "pg";
 import sql from "mssql";
-import { flatten } from "lodash";
 import snowflake from "snowflake-sdk";
 import { BigQuery } from "@google-cloud/bigquery";
 import { readFile } from "fs/promises";
@@ -13,9 +12,9 @@ var __defProp = Object.defineProperty, __getOwnPropDesc = Object.getOwnPropertyD
 	});
 	return t && __defProp(n, Symbol.toStringTag, { value: "Module" }), n;
 }, __copyProps = (e, t, n, r) => {
-	if (t && typeof t == "object" || typeof t == "function") for (var i = __getOwnPropNames(t), a = 0, o = i.length, s; a < o; a++) s = i[a], !__hasOwnProp.call(e, s) && s !== n && __defProp(e, s, {
-		get: ((e) => t[e]).bind(null, s),
-		enumerable: !(r = __getOwnPropDesc(t, s)) || r.enumerable
+	if (t && typeof t == "object" || typeof t == "function") for (var i = __getOwnPropNames(t), a = 0, o = i.length, d; a < o; a++) d = i[a], !__hasOwnProp.call(e, d) && d !== n && __defProp(e, d, {
+		get: ((e) => t[e]).bind(null, d),
+		enumerable: !(r = __getOwnPropDesc(t, d)) || r.enumerable
 	});
 	return e;
 }, __toCommonJS = (e) => __hasOwnProp.call(e, "module.exports") ? e["module.exports"] : __copyProps(__defProp({}, "__esModule", { value: !0 }), e), __require = /* @__PURE__ */ ((e) => typeof require < "u" ? require : typeof Proxy < "u" ? new Proxy(e, { get: (e, t) => (typeof require < "u" ? require : e)[t] }) : e)(function(e) {
@@ -1879,12 +1878,12 @@ var getValidatedClient$2 = async (t) => {
 			case "utf-8": return A(this, t, n);
 			case "ascii": return N(this, t, n);
 			case "latin1":
-			case "binary": return Gr(this, t, n);
+			case "binary": return Ei(this, t, n);
 			case "base64": return k(this, t, n);
 			case "ucs2":
 			case "ucs-2":
 			case "utf16le":
-			case "utf-16le": return Kr(this, t, n);
+			case "utf-16le": return Di(this, t, n);
 			default:
 				if (r) throw TypeError("Unknown encoding: " + e);
 				e = (e + "").toLowerCase(), r = !0;
@@ -1994,13 +1993,13 @@ var getValidatedClient$2 = async (t) => {
 		return X(J(t, e.length - n), e, n, r);
 	}
 	function E(e, t, n, r) {
-		return X(Xr(t), e, n, r);
+		return X(ji(t), e, n, r);
 	}
 	function D(e, t, n, r) {
 		return X(Y(t), e, n, r);
 	}
 	function O(e, t, n, r) {
-		return X(Zr(t, e.length - n), e, n, r);
+		return X(Mi(t, e.length - n), e, n, r);
 	}
 	s.prototype.write = function(e, t, n, r) {
 		if (t === void 0) r = "utf8", n = this.length, t = 0;
@@ -2074,7 +2073,7 @@ var getValidatedClient$2 = async (t) => {
 		for (let i = t; i < n; ++i) r += String.fromCharCode(e[i] & 127);
 		return r;
 	}
-	function Gr(e, t, n) {
+	function Ei(e, t, n) {
 		let r = "";
 		n = Math.min(e.length, n);
 		for (let i = t; i < n; ++i) r += String.fromCharCode(e[i]);
@@ -2084,10 +2083,10 @@ var getValidatedClient$2 = async (t) => {
 		let r = e.length;
 		(!t || t < 0) && (t = 0), (!n || n < 0 || n > r) && (n = r);
 		let i = "";
-		for (let r = t; r < n; ++r) i += Qr[e[r]];
+		for (let r = t; r < n; ++r) i += Ni[e[r]];
 		return i;
 	}
-	function Kr(e, t, n) {
+	function Di(e, t, n) {
 		let r = e.slice(t, n), i = "";
 		for (let e = 0; e < r.length - 1; e += 2) i += String.fromCharCode(r[e] + r[e + 1] * 256);
 		return i;
@@ -2347,7 +2346,7 @@ var getValidatedClient$2 = async (t) => {
 		for (; n >= r + 4; n -= 3) t = `_${e.slice(n - 3, n)}${t}`;
 		return `${e.slice(0, n)}${t}`;
 	}
-	function qr(e, t, n) {
+	function Oi(e, t, n) {
 		K(t, "offset"), (e[t] === void 0 || e[t + n] === void 0) && q(t, e.length - (n + 1));
 	}
 	function G(e, t, n, r, i, a) {
@@ -2355,7 +2354,7 @@ var getValidatedClient$2 = async (t) => {
 			let r = typeof t == "bigint" ? "n" : "", i;
 			throw i = a > 3 ? t === 0 || t === BigInt(0) ? `>= 0${r} and < 2${r} ** ${(a + 1) * 8}${r}` : `>= -(2${r} ** ${(a + 1) * 8 - 1}${r}) and < 2 ** ${(a + 1) * 8 - 1}${r}` : `>= ${t}${r} and <= ${n}${r}`, new H.ERR_OUT_OF_RANGE("value", i, e);
 		}
-		qr(r, i, a);
+		Oi(r, i, a);
 	}
 	function K(e, t) {
 		if (typeof e != "number") throw new H.ERR_INVALID_ARG_TYPE(t, "number", e);
@@ -2363,9 +2362,9 @@ var getValidatedClient$2 = async (t) => {
 	function q(e, t, n) {
 		throw Math.floor(e) === e ? t < 0 ? new H.ERR_BUFFER_OUT_OF_BOUNDS() : new H.ERR_OUT_OF_RANGE(n || "offset", `>= ${n ? 1 : 0} and <= ${t}`, e) : (K(e, n), new H.ERR_OUT_OF_RANGE(n || "offset", "an integer", e));
 	}
-	var Jr = /[^+/0-9A-Za-z-_]/g;
-	function Yr(e) {
-		if (e = e.split("=")[0], e = e.trim().replace(Jr, ""), e.length < 2) return "";
+	var ki = /[^+/0-9A-Za-z-_]/g;
+	function Ai(e) {
+		if (e = e.split("=")[0], e = e.trim().replace(ki, ""), e.length < 2) return "";
 		for (; e.length % 4 != 0;) e += "=";
 		return e;
 	}
@@ -2407,18 +2406,18 @@ var getValidatedClient$2 = async (t) => {
 		}
 		return a;
 	}
-	function Xr(e) {
+	function ji(e) {
 		let t = [];
 		for (let n = 0; n < e.length; ++n) t.push(e.charCodeAt(n) & 255);
 		return t;
 	}
-	function Zr(e, t) {
+	function Mi(e, t) {
 		let n, r, i, a = [];
 		for (let o = 0; o < e.length && !((t -= 2) < 0); ++o) n = e.charCodeAt(o), r = n >> 8, i = n % 256, a.push(i), a.push(r);
 		return a;
 	}
 	function Y(e) {
-		return t.toByteArray(Yr(e));
+		return t.toByteArray(Ai(e));
 	}
 	function X(e, t, n, r) {
 		let i;
@@ -2431,7 +2430,7 @@ var getValidatedClient$2 = async (t) => {
 	function Q(e) {
 		return e !== e;
 	}
-	var Qr = (function() {
+	var Ni = (function() {
 		let e = "0123456789abcdef", t = Array(256);
 		for (let n = 0; n < 16; ++n) {
 			let r = n * 16;
@@ -2440,9 +2439,9 @@ var getValidatedClient$2 = async (t) => {
 		return t;
 	})();
 	function $(e) {
-		return typeof BigInt > "u" ? $r : e;
+		return typeof BigInt > "u" ? Pi : e;
 	}
-	function $r() {
+	function Pi() {
 		throw Error("BigInt not supported");
 	}
 })), require_umd = /* @__PURE__ */ __commonJSMin(((e, t) => {
@@ -8396,7 +8395,7 @@ var getValidatedClient$2 = async (t) => {
 	}
 	t.exports = s, t.exports.toNumbered = c;
 })), require_connection = /* @__PURE__ */ __commonJSMin(((e, t) => {
-	var n = __require("net"), r = __require("tls"), i = __require("timers"), a = require_events().EventEmitter, o = __require("stream").Readable, s = require_denque(), c = require_sqlstring(), l = require_index_cjs().default, u = require_packet_parser(), d = require_packets(), f = require_commands(), p = require_connection_config(), m = require_charset_encodings(), h = 0, g = null;
+	var n = __require("net"), r = __require("tls"), i = __require("timers"), a = require_events().EventEmitter, o = __require("stream").Readable, s = require_denque(), c = require_sqlstring(), l = require_index_cjs().default, u = require_packet_parser(), d = require_packets(), f = require_commands(), p = require_connection_config(), m = require_charset_encodings(), h = 0, _ = null;
 	t.exports = class e extends a {
 		constructor(e) {
 			super(), this.config = e.config, e.config.stream ? typeof e.config.stream == "function" ? this.stream = e.config.stream(e) : this.stream = e.config.stream : e.config.socketPath ? this.stream = n.connect(e.config.socketPath) : (this.stream = n.connect(e.config.port, e.config.host), this.config.enableKeepAlive && this.stream.on("connect", () => {
@@ -8597,7 +8596,7 @@ var getValidatedClient$2 = async (t) => {
 			let t;
 			if (this.config.namedPlaceholders || e.namedPlaceholders) {
 				if (Array.isArray(e.values)) return;
-				g === null && (g = require_named_placeholders()()), t = g(e.sql, e.values), e.sql = t[0], e.values = t[1];
+				_ === null && (_ = require_named_placeholders()()), t = _(e.sql, e.values), e.sql = t[0], e.values = t[1];
 			}
 		}
 		query(t, n, r) {
@@ -9359,7 +9358,59 @@ var getValidatedClient$2 = async (t) => {
 	}, e.clearParserCache = function() {
 		r.clearCache();
 	};
-})), import_promise = require_promise(), NUMBER_REGEX = "^-?[0-9]+(.[0-9]+)?$";
+})), _freeGlobal_default = typeof global == "object" && global && global.Object === Object && global, freeSelf = typeof self == "object" && self && self.Object === Object && self, _Symbol_default = (_freeGlobal_default || freeSelf || Function("return this")()).Symbol, objectProto$1 = Object.prototype, hasOwnProperty$1 = objectProto$1.hasOwnProperty, nativeObjectToString$1 = objectProto$1.toString, symToStringTag$1 = _Symbol_default ? _Symbol_default.toStringTag : void 0;
+function getRawTag(e) {
+	var t = hasOwnProperty$1.call(e, symToStringTag$1), n = e[symToStringTag$1];
+	try {
+		e[symToStringTag$1] = void 0;
+		var r = !0;
+	} catch {}
+	var i = nativeObjectToString$1.call(e);
+	return r && (t ? e[symToStringTag$1] = n : delete e[symToStringTag$1]), i;
+}
+var _getRawTag_default = getRawTag, nativeObjectToString = Object.prototype.toString;
+function objectToString(e) {
+	return nativeObjectToString.call(e);
+}
+var _objectToString_default = objectToString, nullTag = "[object Null]", undefinedTag = "[object Undefined]", symToStringTag = _Symbol_default ? _Symbol_default.toStringTag : void 0;
+function baseGetTag(e) {
+	return e == null ? e === void 0 ? undefinedTag : nullTag : symToStringTag && symToStringTag in Object(e) ? _getRawTag_default(e) : _objectToString_default(e);
+}
+var _baseGetTag_default = baseGetTag;
+function isObjectLike(e) {
+	return typeof e == "object" && !!e;
+}
+var isObjectLike_default = isObjectLike, isArray_default = Array.isArray, argsTag = "[object Arguments]";
+function baseIsArguments(e) {
+	return isObjectLike_default(e) && _baseGetTag_default(e) == argsTag;
+}
+var _baseIsArguments_default = baseIsArguments, objectProto = Object.prototype, hasOwnProperty = objectProto.hasOwnProperty, propertyIsEnumerable = objectProto.propertyIsEnumerable, isArguments_default = _baseIsArguments_default(function() {
+	return arguments;
+}()) ? _baseIsArguments_default : function(e) {
+	return isObjectLike_default(e) && hasOwnProperty.call(e, "callee") && !propertyIsEnumerable.call(e, "callee");
+};
+function arrayPush(e, t) {
+	for (var n = -1, r = t.length, i = e.length; ++n < r;) e[i + n] = t[n];
+	return e;
+}
+var _arrayPush_default = arrayPush, spreadableSymbol = _Symbol_default ? _Symbol_default.isConcatSpreadable : void 0;
+function isFlattenable(e) {
+	return isArray_default(e) || isArguments_default(e) || !!(spreadableSymbol && e && e[spreadableSymbol]);
+}
+var _isFlattenable_default = isFlattenable;
+function baseFlatten(e, t, n, r, i) {
+	var a = -1, o = e.length;
+	for (n ||= _isFlattenable_default, i ||= []; ++a < o;) {
+		var s = e[a];
+		t > 0 && n(s) ? t > 1 ? baseFlatten(s, t - 1, n, r, i) : _arrayPush_default(i, s) : r || (i[i.length] = s);
+	}
+	return i;
+}
+var _baseFlatten_default = baseFlatten;
+function flatten(e) {
+	return e != null && e.length ? _baseFlatten_default(e, 1) : [];
+}
+var flatten_default = flatten, import_promise = require_promise(), NUMBER_REGEX = "^-?[0-9]+(.[0-9]+)?$";
 async function connectMySQL(e) {
 	let t = await (0, import_promise.createConnection)(e);
 	try {
@@ -9436,7 +9487,7 @@ async function generateEnums(e, t) {
 	});
 }
 async function generateIndexes$3(e, t) {
-	let r = (await e.query("\n    with\n      pk_fk_uniques as (\n        select constraint_name, table_name\n        from information_schema.table_constraints\n        where table_schema = ?\n      )\n    select\n      st.table_name as tableName,\n      case\n        when st.non_unique = 0 then true\n        else false\n        end as isIdxUnique,\n      st.index_name as idxName,\n      st.column_name as columnName,\n      st.sub_part as idxSubPart,\n      st.index_type as idxType,\n      replace(st.expression, '`', '') as idxExpression\n    from information_schema.statistics st\n    where\n      st.table_schema = ?\n      and st.index_name not in (\n        select constraint_name\n        from pk_fk_uniques pfu\n        where pfu.table_name = st.table_name\n      )\n      and st.index_type in ('BTREE', 'HASH')\n    group by\n      st.table_name, st.non_unique, st.index_name, st.column_name, st.sub_part, st.index_type, st.expression\n    order by st.index_name;\n  ", [t, t]))[0].reduce((e, t) => {
+	let n = (await e.query("\n    with\n      pk_fk_uniques as (\n        select constraint_name, table_name\n        from information_schema.table_constraints\n        where table_schema = ?\n      )\n    select\n      st.table_name as tableName,\n      case\n        when st.non_unique = 0 then true\n        else false\n        end as isIdxUnique,\n      st.index_name as idxName,\n      st.column_name as columnName,\n      st.sub_part as idxSubPart,\n      st.index_type as idxType,\n      replace(st.expression, '`', '') as idxExpression\n    from information_schema.statistics st\n    where\n      st.table_schema = ?\n      and st.index_name not in (\n        select constraint_name\n        from pk_fk_uniques pfu\n        where pfu.table_name = st.table_name\n      )\n      and st.index_type in ('BTREE', 'HASH')\n    group by\n      st.table_name, st.non_unique, st.index_name, st.column_name, st.sub_part, st.index_type, st.expression\n    order by st.index_name;\n  ", [t, t]))[0].reduce((e, t) => {
 		let { tableName: n, idxName: r, idxType: i, isIdxUnique: a, columnName: o, idxExpression: s, idxSubPart: c } = t, l = n;
 		e[l] || (e[l] = {}), e[l][r] || (e[l][r] = {
 			name: r,
@@ -9446,13 +9497,13 @@ async function generateIndexes$3(e, t) {
 		});
 		let u = e[l][r], d = getIndexColumn(o, s, c);
 		return d && u.columns.push(d), e;
-	}, {}), i = {};
-	return Object.keys(r).forEach((e) => {
-		i[e] = flatten(Object.values(r[e]));
-	}), i;
+	}, {}), r = {};
+	return Object.keys(n).forEach((e) => {
+		r[e] = flatten_default(Object.values(n[e]));
+	}), r;
 }
 async function generatePrimaryAndUniqueConstraint(e, t) {
-	let r = (await e.query("\n    select\n      tc.table_name as tableName,\n      tc.constraint_name as constraintName,\n      group_concat(kcu.column_name order by kcu.ordinal_position separator ',') as columnNames,\n      count(kcu.column_name) as columnCount,\n      tc.constraint_type as constraintType\n    from information_schema.table_constraints tc\n    join information_schema.key_column_usage kcu\n    on\n      tc.constraint_schema = kcu.constraint_schema\n      and tc.constraint_name = kcu.constraint_name\n      and tc.table_name = kcu.table_name\n    where\n      (tc.constraint_type = 'PRIMARY KEY' or tc.constraint_type = 'UNIQUE')\n      and tc.table_schema = ?\n    group by tc.table_name, tc.constraint_name, tc.constraint_type\n    order by tc.table_name, tc.constraint_name;\n  ", [t]))[0], i = r.filter((e) => e.columnCount === 1), a = r.filter((e) => e.columnCount > 1).reduce((e, t) => {
+	let n = (await e.query("\n    select\n      tc.table_name as tableName,\n      tc.constraint_name as constraintName,\n      group_concat(kcu.column_name order by kcu.ordinal_position separator ',') as columnNames,\n      count(kcu.column_name) as columnCount,\n      tc.constraint_type as constraintType\n    from information_schema.table_constraints tc\n    join information_schema.key_column_usage kcu\n    on\n      tc.constraint_schema = kcu.constraint_schema\n      and tc.constraint_name = kcu.constraint_name\n      and tc.table_name = kcu.table_name\n    where\n      (tc.constraint_type = 'PRIMARY KEY' or tc.constraint_type = 'UNIQUE')\n      and tc.table_schema = ?\n    group by tc.table_name, tc.constraint_name, tc.constraint_type\n    order by tc.table_name, tc.constraint_name;\n  ", [t]))[0], r = n.filter((e) => e.columnCount === 1), i = n.filter((e) => e.columnCount > 1).reduce((e, t) => {
 		let { tableName: n, constraintName: r, columnNames: i, constraintType: a } = t, o = n;
 		e[o] || (e[o] = {}), e[o][r] || (e[o][r] = { name: r }), a === "PRIMARY KEY" && (e[o][r].pk = !0), a === "UNIQUE" && (e[o][r].unique = !0);
 		let s = i.split(",").map((e) => ({
@@ -9460,12 +9511,12 @@ async function generatePrimaryAndUniqueConstraint(e, t) {
 			value: e
 		}));
 		return e[o][r].columns = s, e;
-	}, {}), o = {};
-	return Object.keys(a).forEach((e) => {
-		o[e] = flatten(Object.values(a[e]));
+	}, {}), a = {};
+	return Object.keys(i).forEach((e) => {
+		a[e] = flatten_default(Object.values(i[e]));
 	}), {
-		compositeConstraintMap: o,
-		primaryAndUniqueConstraintMap: i.reduce((e, t) => {
+		compositeConstraintMap: a,
+		primaryAndUniqueConstraintMap: r.reduce((e, t) => {
 			let { tableName: n, columnNames: r, constraintType: i } = t, a = n;
 			return e[a] || (e[a] = {}), r.split(",").forEach((t) => {
 				e[a][t] || (e[a][t] = { checks: [] }), i === "PRIMARY KEY" && (e[a][t].pk = !0), i === "UNIQUE" && !e[a][t].pk && (e[a][t].unique = !0);
@@ -9578,10 +9629,10 @@ var parseConnectionString = (e) => {
 	"DEBUG",
 	"TRACE"
 ].includes(e), connectToSnowflake = async (e) => {
-	let t = isLogLevel(e.LOG_LEVEL) ? e.LOG_LEVEL : "INFO", n = e.IS_DEBUG_MODE === "true";
+	let t = isLogLevel(e.LOG_LEVEL) ? e.LOG_LEVEL : "INFO", r = e.IS_DEBUG_MODE === "true";
 	snowflake.configure({
 		logLevel: t,
-		additionalLogToConsole: n
+		additionalLogToConsole: r
 	});
 	let i = {};
 	switch (e.AUTHENTICATOR) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@dbml/connector",
-  "version": "5.6.0-alpha.0",
+  "version": "5.6.0-alpha.2",
   "description": "This package was created to fetch the schema JSON from many kind of databases.",
   "author": "huy.phung.sw@gmail.com",
   "license": "MIT",
@@ -10,7 +10,6 @@
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "devDependencies": {
-    "@types/lodash": "^4.17.16",
     "@types/mssql": "^9.1.5",
     "@types/node": "^22.2.0",
     "@types/oracledb": "^6.10.0",
@@ -29,7 +28,7 @@
   },
   "dependencies": {
     "@google-cloud/bigquery": "^7.9.0",
-    "lodash": "^4.17.21",
+    "lodash-es": "^4.17.21",
     "mssql": "^11.0.1",
     "mysql2": "^3.11.0",
     "oracledb": "^6.10.0",
@@ -39,5 +38,5 @@
   "engines": {
     "node": ">=18"
   },
-  "gitHead": "e0cd0b00099344c05af0a83e30c2c9c2ccc325cc"
+  "gitHead": "1c7351657e2fc9dffcdf96770c79ac8a333f6f76"
 }

package/src/connectors/mysql/index.ts

@@ -1,5 +1,5 @@
 import { createConnection, Connection } from 'mysql2/promise';
-import { flatten } from 'lodash';
+import { flatten } from 'lodash-es';
 import {
   CheckConstraintDictionary, DefaultInfo, DatabaseSchema, DefaultType, Field, IndexColumn, FieldsDictionary, Table, Enum, IndexesDictionary, TableConstraintsDictionary, Index, Ref,
 } from '../types';