dbgate-tools 5.1.0 → 5.1.2

package/lib/nameTools.d.ts

@@ -1,4 +1,4 @@
-import { ColumnInfo, DatabaseInfo, DatabaseInfoObjects, SqlDialect, TableInfo } from 'dbgate-types';
+import { ColumnInfo, DatabaseInfo, DatabaseInfoObjects, NamedObjectInfo, SqlDialect, TableInfo } from 'dbgate-types';
 export declare function fullNameFromString(name: any): {
     schemaName: any;
     pureName: any;
@@ -16,6 +16,7 @@ export declare function quoteFullName(dialect: any, { schemaName, pureName }: {
     pureName: any;
 }): string;
 export declare function equalStringLike(s1: any, s2: any): boolean;
+export declare function equalFullName(name1: NamedObjectInfo, name2: NamedObjectInfo): boolean;
 export declare function findObjectLike({ pureName, schemaName }: {
     pureName: any;
     schemaName: any;

package/lib/nameTools.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fillConstraintNames = exports.makeUniqueColumnNames = exports.findForeignKeyForColumn = exports.findObjectLike = exports.equalStringLike = exports.quoteFullName = exports.fullNameToLabel = exports.fullNameToString = exports.fullNameFromString = void 0;
+exports.fillConstraintNames = exports.makeUniqueColumnNames = exports.findForeignKeyForColumn = exports.findObjectLike = exports.equalFullName = exports.equalStringLike = exports.quoteFullName = exports.fullNameToLabel = exports.fullNameToString = exports.fullNameFromString = void 0;
 const cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
 const isString_1 = __importDefault(require("lodash/isString"));
 function fullNameFromString(name) {
@@ -44,6 +44,12 @@ function equalStringLike(s1, s2) {
     return (s1 || '').toLowerCase().trim() == (s2 || '').toLowerCase().trim();
 }
 exports.equalStringLike = equalStringLike;
+function equalFullName(name1, name2) {
+    if (!name1 || !name2)
+        return name1 == name2;
+    return name1.pureName == name2.pureName && name1.schemaName == name2.schemaName;
+}
+exports.equalFullName = equalFullName;
 function findObjectLike({ pureName, schemaName }, dbinfo, objectTypeField) {
     var _a, _b;
     if (!dbinfo)

package/lib/stringTools.d.ts

@@ -6,3 +6,5 @@ export declare function safeJsonParse(json: any, defaultValue?: any, logError?:
 export declare function isJsonLikeLongString(value: any): RegExpMatchArray;
 export declare function getIconForRedisType(type: any): "img folder" | "img type-string" | "img type-hash" | "img type-set" | "img type-list" | "img type-zset" | "img type-stream" | "img type-binary" | "img type-rejson";
 export declare function isWktGeometry(s: any): boolean;
+export declare function arrayBufferToBase64(buffer: any): string;
+export declare function getAsImageSrc(obj: any): string;

package/lib/stringTools.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isWktGeometry = exports.getIconForRedisType = exports.isJsonLikeLongString = exports.safeJsonParse = exports.stringifyCellValue = exports.parseCellValue = exports.hexStringToArray = exports.arrayToHexString = void 0;
+exports.getAsImageSrc = exports.arrayBufferToBase64 = exports.isWktGeometry = exports.getIconForRedisType = exports.isJsonLikeLongString = exports.safeJsonParse = exports.stringifyCellValue = exports.parseCellValue = exports.hexStringToArray = exports.arrayToHexString = void 0;
 const isString_1 = __importDefault(require("lodash/isString"));
 const isArray_1 = __importDefault(require("lodash/isArray"));
 const isPlainObject_1 = __importDefault(require("lodash/isPlainObject"));
@@ -54,6 +54,9 @@ function stringifyCellValue(value) {
 }
 exports.stringifyCellValue = stringifyCellValue;
 function safeJsonParse(json, defaultValue, logError = false) {
+    if ((0, isArray_1.default)(json) || (0, isPlainObject_1.default)(json)) {
+        return json;
+    }
     try {
         return JSON.parse(json);
     }
@@ -101,3 +104,20 @@ function isWktGeometry(s) {
     return !!s.match(/^POINT\s*\(|^LINESTRING\s*\(|^POLYGON\s*\(|^MULTIPOINT\s*\(|^MULTILINESTRING\s*\(|^MULTIPOLYGON\s*\(|^GEOMCOLLECTION\s*\(|^GEOMETRYCOLLECTION\s*\(/);
 }
 exports.isWktGeometry = isWktGeometry;
+function arrayBufferToBase64(buffer) {
+    var binary = '';
+    var bytes = [].slice.call(new Uint8Array(buffer));
+    bytes.forEach(b => (binary += String.fromCharCode(b)));
+    return btoa(binary);
+}
+exports.arrayBufferToBase64 = arrayBufferToBase64;
+function getAsImageSrc(obj) {
+    if ((obj === null || obj === void 0 ? void 0 : obj.type) == 'Buffer' && (0, isArray_1.default)(obj === null || obj === void 0 ? void 0 : obj.data)) {
+        return `data:image/png;base64, ${arrayBufferToBase64(obj === null || obj === void 0 ? void 0 : obj.data)}`;
+    }
+    if ((0, isString_1.default)(obj) && (obj.startsWith('http://') || obj.startsWith('https://'))) {
+        return obj;
+    }
+    return null;
+}
+exports.getAsImageSrc = getAsImageSrc;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.1.0",
+  "version": "5.1.2",
   "name": "dbgate-tools",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -25,14 +25,14 @@
   ],
   "devDependencies": {
     "@types/node": "^13.7.0",
-    "dbgate-types": "^5.1.0",
+    "dbgate-types": "^5.1.2",
     "jest": "^24.9.0",
     "ts-jest": "^25.2.1",
     "typescript": "^4.4.3"
   },
   "dependencies": {
     "dbgate-query-splitter": "^4.9.0",
-    "dbgate-sqltree": "^5.1.0",
+    "dbgate-sqltree": "^5.1.2",
     "debug": "^4.3.4",
     "json-stable-stringify": "^1.0.1",
     "lodash": "^4.17.21",