@l-v-yonsama/multi-platform-database-drivers 0.1.31 → 0.1.32

package/built/src/drivers/PostgresDriver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PostgresDriver.js","sourceRoot":"","sources":["../../../src/drivers/PostgresDriver.ts"],"names":[],"mappings":"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"}

package/built/src/{db/drivers → drivers}/RedisDriver.d.ts

@@ -1,8 +1,7 @@
-import { BaseDriver, RequestSqlOptions } from './BaseDriver';
-import { DbConnection, DbKey, SchemaAndTableHints, TableRows, DbDatabase } from '../resource/DbResource';
 import { Redis } from 'ioredis';
-import { ResultSetDataHolder, RedisKeyType } from '../resource';
-import { RedisRequest } from '../../service/request/RedisRequest';
+import { BaseDriver, RequestSqlOptions } from './BaseDriver';
+import { DbConnection, DbDatabase, DbKey, RedisKeyParams, ResultSetDataHolder } from '../resource';
+import { RedisKeyType, ScanParams } from '../types';
 export declare class RedisDriver extends BaseDriver {
     client: Redis | undefined;
     databases: number;
@@ -10,9 +9,7 @@ export declare class RedisDriver extends BaseDriver {
     connectSub(): Promise<string>;
     test(with_connect?: boolean): Promise<string>;
     requestSql(sql: string, options?: RequestSqlOptions): Promise<ResultSetDataHolder>;
-    countTables(tables: SchemaAndTableHints, options: any): Promise<TableRows[]>;
-    executeCommand(req: RedisRequest): Promise<DbKey | string | number>;
-    scan(db_index: number, key: string, count: number, withValue: boolean, progressCallback?: Function): Promise<Array<DbKey>>;
+    scan(params: ScanParams): Promise<DbKey<RedisKeyParams>[]>;
     getValueByKey(client: Redis, key: string, type: RedisKeyType): Promise<any>;
     getInfomationSchemas(options: {
         progress_callback?: Function | undefined;

package/built/src/{db/drivers → drivers}/RedisDriver.js

@@ -2,11 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RedisDriver = void 0;
 const tslib_1 = require("tslib");
-const BaseDriver_1 = require("./BaseDriver");
-const DbResource_1 = require("../resource/DbResource");
 const ioredis_1 = require("ioredis");
+const BaseDriver_1 = require("./BaseDriver");
 const resource_1 = require("../resource");
-const RedisRequest_1 = require("../../service/request/RedisRequest");
+const types_1 = require("../types");
 class RedisDriver extends BaseDriver_1.BaseDriver {
     constructor(conRes) {
         super(conRes);
@@ -90,117 +89,59 @@ class RedisDriver extends BaseDriver_1.BaseDriver {
             return resource_1.ResultSetDataHolder.createEmpty();
         });
     }
-    countTables(tables, options) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return new Array();
-        });
-    }
-    executeCommand(req) {
+    scan(params) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            let ret = '';
-            if (!this.client) {
-                return ret;
-            }
-            yield this.client.select(req.index);
-            let r = '';
-            switch (req.command) {
-                case RedisRequest_1.RedisCommandType.GetValue:
-                    {
-                        r = yield this.getValueByKey(this.client, req.key, req.type);
-                        const ttl = yield this.client.ttl(req.key);
-                        ret = new DbResource_1.DbKey(req.key, req.type, ttl);
-                        if (ret.ttl > 0) {
-                            ret.ttlConfirmationDatetime = new Date().getTime();
-                        }
-                        ret.val = r;
+            const { target, limit, withValue, keyword } = params;
+            const keys = yield new Promise((resolve) => {
+                this.client.select(target);
+                const stream = this.client.scanStream({
+                    match: keyword,
+                    count: limit,
+                });
+                const keys = [];
+                stream.on('data', (resultKeys) => {
+                    resultKeys.forEach((key) => {
+                        keys.push(key);
+                    });
+                    if (keys.length > limit) {
+                        stream.close();
                     }
-                    break;
-                case RedisRequest_1.RedisCommandType.SetValue:
-                    if (req.options) {
-                        yield this.client.set(req.key, req.options.val);
+                });
+                stream.on('end', () => {
+                    if (keys.length > limit) {
+                        keys.splice(limit - 1, keys.length - limit);
                     }
-                    break;
-                case RedisRequest_1.RedisCommandType.Flushall:
-                    ret = yield this.client.flushall();
-                    break;
-                case RedisRequest_1.RedisCommandType.Flushdb:
-                    ret = yield this.client.flushdb();
-                    break;
-                case RedisRequest_1.RedisCommandType.Dbsize:
-                    ret = yield this.client.dbsize();
-                    break;
-                case RedisRequest_1.RedisCommandType.Info:
-                    ret = yield this.client.info(req.options.section);
-                    break;
-                default:
-                    console.error('undefined.', req.command);
-                    break;
-            }
-            return ret;
-        });
-    }
-    scan(db_index, key, count, withValue, progressCallback) {
-        return new Promise((resolve) => {
-            const currentClient = this.client;
-            this.client.select(db_index);
-            const stream = this.client.scanStream({
-                match: key,
-                count,
-            });
-            const ret = new Array();
-            stream.on('data', (resultKeys) => {
-                resultKeys.forEach((key) => {
-                    ret.push(new DbResource_1.DbKey(key));
+                    resolve(keys);
                 });
-                if (progressCallback) {
-                    progressCallback('Key scanning now.', Math.round((ret.length * 100) / count));
-                }
-                if (ret.length > count) {
-                    stream.close();
-                }
             });
-            stream.on('end', () => {
-                if (progressCallback) {
-                    progressCallback('Key scanning done. get type and ttl.', 80);
+            const promises = keys.map((key) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                const type = (yield this.client.type(key));
+                const ttl = yield this.client.ttl(key);
+                let val;
+                if (withValue) {
+                    val = yield this.getValueByKey(this.client, key, type);
                 }
-                if (ret.length > count) {
-                    ret.splice(count - 1, ret.length - count);
-                }
-                const parallels = [];
-                ret.forEach((keyRes) => {
-                    parallels.push((() => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                        keyRes.type = resource_1.RedisKeyType.parse(yield currentClient.type(keyRes.getName()));
-                        keyRes.ttl = yield currentClient.ttl(keyRes.getName());
-                        if (keyRes.ttl > 0) {
-                            keyRes.ttlConfirmationDatetime = new Date().getTime();
-                        }
-                        if (withValue) {
-                            keyRes.val = yield this.getValueByKey(currentClient, keyRes.getName(), keyRes.type);
-                        }
-                    }))());
+                return new resource_1.DbKey(key, {
+                    type,
+                    ttl,
+                    val,
                 });
-                (() => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                    yield Promise.all(parallels);
-                    if (progressCallback) {
-                        progressCallback('Key scanning done.', 100);
-                    }
-                    resolve(ret);
-                }))();
-            });
+            }));
+            return yield Promise.all(promises);
         });
     }
     getValueByKey(client, key, type) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             switch (type) {
-                case resource_1.RedisKeyType.string:
+                case types_1.RedisKeyType.string:
                     return yield client.get(key);
-                case resource_1.RedisKeyType.list:
+                case types_1.RedisKeyType.list:
                     return yield client.lrange(key, 0, -1);
-                case resource_1.RedisKeyType.set:
+                case types_1.RedisKeyType.set:
                     return yield client.smembers(key);
-                case resource_1.RedisKeyType.zset:
+                case types_1.RedisKeyType.zset:
                     return yield client.zrange(key, 0, -1);
-                case resource_1.RedisKeyType.hash:
+                case types_1.RedisKeyType.hash:
                     return yield client.hgetall(key);
                 default:
                     console.log('whattype??', type);
@@ -222,13 +163,13 @@ class RedisDriver extends BaseDriver_1.BaseDriver {
                 const keys = parseInt(m[2], 10);
                 const expires = parseInt(m[3], 10);
                 const avg_ttl = parseInt(m[4], 10);
-                const dbRes = new DbResource_1.RedisDatabase(db, keys, expires, avg_ttl);
+                const dbRes = new resource_1.RedisDatabase(db, keys, expires, avg_ttl);
                 dbResources.push(dbRes);
             }
             for (let i = 0; i < this.databases; i++) {
                 const name = `${i}`;
                 if (!dbResources.some((r) => r.getName() === name)) {
-                    const dbRes = new DbResource_1.RedisDatabase(name, 0, 0, 0);
+                    const dbRes = new resource_1.RedisDatabase(name, 0, 0, 0);
                     dbResources.push(dbRes);
                 }
             }

package/built/src/drivers/RedisDriver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RedisDriver.js","sourceRoot":"","sources":["../../../src/drivers/RedisDriver.ts"],"names":[],"mappings":"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"}

package/built/src/{db/drivers → drivers}/index.d.ts

@@ -1,5 +1,7 @@
 export * from './AwsS3Driver';
+export * from './AwsSQSDriver';
 export * from './BaseDriver';
 export * from './MySQLDriver';
 export * from './PostgresDriver';
 export * from './RedisDriver';
+export * from './DBDriverResolver';

package/built/src/{db/drivers → drivers}/index.js

@@ -2,8 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./AwsS3Driver"), exports);
+tslib_1.__exportStar(require("./AwsSQSDriver"), exports);
 tslib_1.__exportStar(require("./BaseDriver"), exports);
 tslib_1.__exportStar(require("./MySQLDriver"), exports);
 tslib_1.__exportStar(require("./PostgresDriver"), exports);
 tslib_1.__exportStar(require("./RedisDriver"), exports);
+tslib_1.__exportStar(require("./DBDriverResolver"), exports);
 //# sourceMappingURL=index.js.map

package/built/src/drivers/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/drivers/index.ts"],"names":[],"mappings":";;;AAAA,wDAA8B;AAC9B,yDAA+B;AAC/B,uDAA6B;AAC7B,wDAA8B;AAC9B,2DAAiC;AACjC,wDAA8B;AAC9B,6DAAmC"}

package/built/src/index.d.ts

@@ -1,3 +1,3 @@
-export * from './db';
+export * from './drivers';
+export * from './resource';
 export * from './types';
-export * from './service';

package/built/src/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./db"), exports);
+tslib_1.__exportStar(require("./drivers"), exports);
+tslib_1.__exportStar(require("./resource"), exports);
 tslib_1.__exportStar(require("./types"), exports);
-tslib_1.__exportStar(require("./service"), exports);
 //# sourceMappingURL=index.js.map

package/built/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;AAAA,+CAAqB;AACrB,kDAAwB;AACxB,oDAA0B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;AAAA,oDAA0B;AAC1B,qDAA2B;AAC3B,kDAAwB"}

package/built/src/{db/resource → resource}/DbResource.d.ts

@@ -1,4 +1,4 @@
-import { DBType, ResourceType, RedisKeyType, GeneralColumnType, ODBCVendorType } from './types';
+import { DBType, GeneralColumnType, RedisKeyType, ResourceType } from '../types';
 export interface Proposal {
     s?: string;
     t?: string;
@@ -39,7 +39,7 @@ export declare class DbResource {
     hasChildren(): boolean;
     containsResource(filter: string): boolean;
     clearChildren(): void;
-    getChildByName(name: string, options?: {
+    getChildByName(name: string | RegExp, options?: {
         unwrapQuote?: boolean;
         resouceType?: ResourceType;
     }): DbResource;
@@ -87,7 +87,6 @@ export interface ConnectionSetting {
 export declare class DbConnection extends DbResource implements ConnectionSetting {
     property: Map<string, object>;
     dbType: any;
-    odbcVendorType: ODBCVendorType;
     host: string;
     port: number;
     user: string;
@@ -138,16 +137,30 @@ export declare class DbTable extends DbResource {
     toString(): string;
     static deserialize(db: DbDatabase, schema: DbSchema, json: any): DbTable;
 }
-export declare class DbKey extends DbResource {
-    type: RedisKeyType;
-    ttl: number;
-    ttlConfirmationDatetime: number | undefined;
-    ttl_remain: number | undefined;
-    val: any;
-    constructor(name: string, type?: RedisKeyType, ttl?: number);
-    toString(): string;
+export declare class DbKey<T extends RedisKeyParams | S3KeyParams | SQSMessageParams = any> extends DbResource {
+    readonly params: T;
+    constructor(name: string, params: T);
     static deserialize(json: any): DbKey;
 }
+export type RedisKeyParams = {
+    type: RedisKeyType;
+    ttl: number;
+    val?: any;
+    base64?: string;
+};
+export type S3KeyParams = {
+    outputFilePath?: string;
+    lastModified: Date;
+    etag: string;
+    size: number;
+    storageClass: string;
+    base64?: string;
+};
+export type SQSMessageParams = {
+    body: string;
+    receiptHandle: string;
+    md5OfBody: string;
+};
 export declare class DbColumn extends DbResource {
     readonly colType: GeneralColumnType;
     readonly nullable: boolean;
@@ -156,7 +169,6 @@ export declare class DbColumn extends DbResource {
     readonly extra: any;
     constructor(name: string, colType: GeneralColumnType, params: any, comment?: string);
     static deserialize(db: DbDatabase, schema: DbSchema, table: DbTable, json: any): DbColumn;
-    getGeneralType(): string;
     toString(): string;
 }
 export declare class DbS3Bucket extends DbResource {
@@ -164,30 +176,15 @@ export declare class DbS3Bucket extends DbResource {
     isInProgress: boolean;
     refreshed?: Date;
     constructor(name?: string, created?: Date);
-    getDir(key: string): DbS3Key | undefined;
     static deserialize(db: DbDatabase, json: any): DbS3Bucket;
 }
+export declare class DbSQSQueue extends DbResource {
+    readonly url: string;
+    readonly attributes?: Record<string, string>;
+    constructor(name: string, url: string, attributes?: Record<string, string>);
+    static deserialize(db: DbDatabase, json: any): DbSQSQueue;
+}
 export declare class DbS3Owner extends DbResource {
     constructor(id: string, name?: string);
     static deserialize(db: DbDatabase, json: any): DbS3Owner;
 }
-export interface S3KeySearchResult {
-    prefix?: string;
-    list: Array<DbS3Key>;
-    ContinuationToken: string;
-    error_message?: string;
-}
-export declare class DbS3Key extends DbResource {
-    output_file_path?: string;
-    is_dir: boolean;
-    isInProgress: boolean;
-    refreshed?: Date;
-    updated?: Date;
-    etag?: string;
-    size?: number;
-    storage_class?: string;
-    base64?: string;
-    constructor(name: string, is_dir?: boolean);
-    toString(): string;
-    static deserialize(json: any): DbS3Key;
-}

package/built/src/{db/resource → resource}/DbResource.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DbS3Key = exports.DbS3Owner = exports.DbS3Bucket = exports.DbColumn = exports.DbKey = exports.DbTable = exports.DbSchema = exports.RedisDatabase = exports.DbDatabase = exports.DbConnection = exports.DbResource = void 0;
+exports.DbS3Owner = exports.DbSQSQueue = exports.DbS3Bucket = exports.DbColumn = exports.DbKey = exports.DbTable = exports.DbSchema = exports.RedisDatabase = exports.DbDatabase = exports.DbConnection = exports.DbResource = void 0;
 const tslib_1 = require("tslib");
-const types_1 = require("./types");
 const dayjs_1 = tslib_1.__importDefault(require("dayjs"));
 const short_unique_id_1 = tslib_1.__importDefault(require("short-unique-id"));
+const types_1 = require("../types");
 const uid = new short_unique_id_1.default();
 const unwrapQuote = (n) => {
     if (n && n.startsWith('"') && n.endsWith('"')) {
@@ -68,14 +68,17 @@ class DbResource {
         if (options && options.resouceType) {
             searchChildren = this.children.filter((it) => it.resouceType === options.resouceType);
         }
-        let uname = name.toUpperCase();
-        if (options && options.unwrapQuote === true) {
-            uname = unwrapQuote(uname);
-            return searchChildren.find((a) => unwrapQuote(a.getName()).toUpperCase() === uname);
-        }
-        else {
-            return searchChildren.find((a) => a.getName().toUpperCase() === uname);
+        if (typeof name === 'string') {
+            let uname = name.toUpperCase();
+            if (options && options.unwrapQuote === true) {
+                uname = unwrapQuote(uname);
+                return searchChildren.find((a) => unwrapQuote(a.getName()).toUpperCase() === uname);
+            }
+            else {
+                return searchChildren.find((a) => a.getName().toUpperCase() === uname);
+            }
         }
+        return searchChildren.find((a) => name.test(a.getName()));
     }
     toString() {
         return `[${this.resouceType}]:${this.name}`;
@@ -94,7 +97,6 @@ class DbConnection extends DbResource {
     constructor(prop) {
         super(types_1.ResourceType.Connection, prop.name);
         this.dbType = undefined;
-        this.odbcVendorType = types_1.ODBCVendorType.Oracle;
         this.host = '';
         this.port = 0;
         this.user = '';
@@ -108,7 +110,6 @@ class DbConnection extends DbResource {
         this.isInProgress = false;
         this.id = prop.id;
         this.dbType = prop.dbType;
-        this.odbcVendorType = prop.odbcVendorType;
         this.property = new Map();
         this.host = prop.host;
         this.port = prop.port;
@@ -271,36 +272,12 @@ class DbTable extends DbResource {
 }
 exports.DbTable = DbTable;
 class DbKey extends DbResource {
-    constructor(name, type = types_1.RedisKeyType.UNKNOWN, ttl = -1) {
+    constructor(name, params) {
         super(types_1.ResourceType.Key, name);
-        this.type = types_1.RedisKeyType.UNKNOWN;
-        this.ttl = -1;
-        this.type = type;
-        this.ttl = ttl;
-        if (ttl > 0) {
-            this.ttl_remain = this.ttl;
-        }
-    }
-    toString() {
-        if (this.ttl < 0) {
-            return `${super.toString()} TYPE[${this.type}]`;
-        }
-        return `${super.toString()} TYPE[${this.type}] TTL[${this.ttl}]`;
+        this.params = params;
     }
     static deserialize(json) {
-        const own = new DbKey(json.name, json.type, json.ttl);
-        own.ttlConfirmationDatetime = json.ttlConfirmationDatetime;
-        if (own.ttl > 0 && own.ttlConfirmationDatetime) {
-            const sub = Math.round((Date.now() - own.ttlConfirmationDatetime) / 1000);
-            const r = own.ttl - sub;
-            if (r > 0) {
-                own.ttl_remain = own.ttl;
-            }
-            else {
-                own.ttl_remain = undefined;
-            }
-        }
-        own.val = json.val;
+        const own = new DbKey(json.name, json.params);
         return own;
     }
 }
@@ -324,11 +301,8 @@ class DbColumn extends DbResource {
         const own = new DbColumn(json.name, json.colType, json.params, json.comment);
         return own;
     }
-    getGeneralType() {
-        return '' + this.colType;
-    }
     toString() {
-        return `[${super.toString()}]: GType[${this.getGeneralType()}] Nullable[${this.nullable}] Key[${this.key}]`;
+        return `[${super.toString()}]: Nullable[${this.nullable}] Key[${this.key}]`;
     }
 }
 exports.DbColumn = DbColumn;
@@ -338,28 +312,6 @@ class DbS3Bucket extends DbResource {
         this.isInProgress = false;
         this.created = created;
     }
-    getDir(key) {
-        if (key.length === 0) {
-            return undefined;
-        }
-        if (key.endsWith('/')) {
-            key = key.substring(0, key.length - 1);
-        }
-        if (key.startsWith('/')) {
-            key = key.substring(1, key.length);
-        }
-        const dirNames = key.split('/');
-        let searchRes = this;
-        for (let i = 0; i < dirNames.length; i++) {
-            const dir = dirNames[i];
-            const r = searchRes.getChildByName(dir + '/');
-            if (r === undefined) {
-                return undefined;
-            }
-            searchRes = r;
-        }
-        return searchRes;
-    }
     static deserialize(db, json) {
         const own = new DbS3Bucket(json.name);
         own.created = json.created;
@@ -368,13 +320,25 @@ class DbS3Bucket extends DbResource {
         }
         if (json.children && json.children.length > 0) {
             json.children.forEach((childJson) => {
-                own.addChild(DbS3Key.deserialize(childJson));
+                own.addChild(DbKey.deserialize(childJson));
             });
         }
         return own;
     }
 }
 exports.DbS3Bucket = DbS3Bucket;
+class DbSQSQueue extends DbResource {
+    constructor(name, url, attributes) {
+        super(types_1.ResourceType.Queue, name);
+        this.url = url;
+        this.attributes = attributes;
+    }
+    static deserialize(db, json) {
+        const own = new DbSQSQueue(json.name, json.url, json.attributes);
+        return own;
+    }
+}
+exports.DbSQSQueue = DbSQSQueue;
 class DbS3Owner extends DbResource {
     constructor(id, name) {
         super(types_1.ResourceType.Owner, name === undefined ? '' : name);
@@ -387,32 +351,4 @@ class DbS3Owner extends DbResource {
     }
 }
 exports.DbS3Owner = DbS3Owner;
-class DbS3Key extends DbResource {
-    constructor(name, is_dir = false) {
-        super(types_1.ResourceType.Key, name);
-        this.is_dir = false;
-        this.isInProgress = false;
-        this.is_dir = is_dir;
-    }
-    toString() {
-        return `${super.toString()}`;
-    }
-    static deserialize(json) {
-        const own = new DbS3Key(json.name);
-        own.is_dir = json.is_dir;
-        if (json.updated) {
-            own.updated = (0, dayjs_1.default)(json.updated).toDate();
-        }
-        if (json.refreshed) {
-            own.refreshed = (0, dayjs_1.default)(json.refreshed).toDate();
-        }
-        own.etag = json.etag;
-        own.size = json.size;
-        own.storage_class = json.storage_class;
-        own.output_file_path = json.output_file_path;
-        own.base64 = json.base64;
-        return own;
-    }
-}
-exports.DbS3Key = DbS3Key;
 //# sourceMappingURL=DbResource.js.map

package/built/src/resource/DbResource.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"DbResource.js","sourceRoot":"","sources":["../../../src/resource/DbResource.ts"],"names":[],"mappings":"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"}

package/built/src/{db/resource → resource}/MultipleResultSetDataHolder.d.ts

@@ -1,4 +1,4 @@
-import { ResultSetDataHolder, AnnotationType } from './ResultSetDataHolder';
+import { AnnotationType, ResultSetDataHolder } from './ResultSetDataHolder';
 export interface DocumentConvertOptions {
     progress_callback?: Function;
     write_page_number?: boolean;

package/built/src/{db/resource → resource}/MultipleResultSetDataHolder.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MultipleResultSetDataHolder = void 0;
 const tslib_1 = require("tslib");
-const ResultSetDataHolder_1 = require("./ResultSetDataHolder");
 const short_unique_id_1 = tslib_1.__importDefault(require("short-unique-id"));
+const ResultSetDataHolder_1 = require("./ResultSetDataHolder");
 const uid = new short_unique_id_1.default();
 class MultipleResultSetDataHolder {
     static createEmpty() {

package/built/src/resource/MultipleResultSetDataHolder.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"MultipleResultSetDataHolder.js","sourceRoot":"","sources":["../../../src/resource/MultipleResultSetDataHolder.ts"],"names":[],"mappings":"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"}