@l-v-yonsama/multi-platform-database-drivers 0.1.57 → 0.1.88

package/built/src/drivers/PostgresDriver.js

@@ -4,10 +4,9 @@ exports.PostgresDriver = void 0;
 const tslib_1 = require("tslib");
 const pg_1 = tslib_1.__importDefault(require("pg"));
 const enum_values_1 = require("enum-values");
-const PostgresColumnType_1 = require("../types/PostgresColumnType");
 const resource_1 = require("../resource");
-const types_1 = require("../types");
 const RDSBaseDriver_1 = require("./RDSBaseDriver");
+const PostgresColumnType_1 = require("../types/resource/PostgresColumnType");
 class PostgresDriver extends RDSBaseDriver_1.RDSBaseDriver {
     constructor(conRes) {
         super(conRes);
@@ -23,7 +22,11 @@ class PostgresDriver extends RDSBaseDriver_1.RDSBaseDriver {
             comment =
                 (_b = (_a = table.children.find((it) => it.name === fieldInfo.name)) === null || _a === void 0 ? void 0 : _a.comment) !== null && _b !== void 0 ? _b : '';
         }
-        const key = new resource_1.RdhKey(fieldInfo.name, types_1.GeneralColumnType.parse(name), comment);
+        const key = (0, resource_1.createRdhKey)({
+            name: fieldInfo.name,
+            type: (0, resource_1.parseColumnType)(name),
+            comment,
+        });
         return key;
     }
     connectSub() {
@@ -51,16 +54,15 @@ class PostgresDriver extends RDSBaseDriver_1.RDSBaseDriver {
     getTestSqlStatement() {
         return 'SELECT NOW()';
     }
-    requestSql(sql, options) {
+    requestSql(params) {
+        var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const { sql, conditions } = params;
             let rdh = new resource_1.ResultSetDataHolder([]);
             const ast = this.parseQuery(sql);
             const astTableName = this.getTableName(ast);
             const dbTable = this.getDbTable(astTableName);
-            let binds = [];
-            if (options && options.binds) {
-                binds = options.binds;
-            }
+            const binds = (_a = conditions === null || conditions === void 0 ? void 0 : conditions.binds) !== null && _a !== void 0 ? _a : [];
             const results = yield this.pool.query(sql, binds);
             if (results) {
                 const fields = results.fields;
@@ -73,7 +75,7 @@ class PostgresDriver extends RDSBaseDriver_1.RDSBaseDriver {
                     });
                 }
             }
-            this.setRdhMetaAndStatement(rdh, sql, astTableName, dbTable, options);
+            this.setRdhMetaAndStatement(params, rdh, ast === null || ast === void 0 ? void 0 : ast.type, astTableName, dbTable);
             return rdh;
         });
     }
@@ -132,9 +134,10 @@ class PostgresDriver extends RDSBaseDriver_1.RDSBaseDriver {
     }
     asyncGetDatabases(connection_database) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const rdh = yield this
-                .requestSql(`SELECT datname AS name, pg_encoding_to_char(encoding) AS comment
-      FROM pg_database ORDER BY datname`);
+            const rdh = yield this.requestSql({
+                sql: `SELECT datname AS name, pg_encoding_to_char(encoding) AS comment
+      FROM pg_database ORDER BY datname`,
+            });
             return rdh.rows.map((r) => {
                 const res = new resource_1.RdsDatabase(r.values.name);
                 res.comment = r.values.comment;
@@ -144,10 +147,12 @@ class PostgresDriver extends RDSBaseDriver_1.RDSBaseDriver {
     }
     getSchemas(dbDatabase) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const rdh = yield this.requestSql(`SELECT SCHEMA_NAME AS name
+            const rdh = yield this.requestSql({
+                sql: `SELECT SCHEMA_NAME AS name
       FROM INFORMATION_SCHEMA.SCHEMATA
       WHERE LOWER(SCHEMA_NAME) NOT IN ('information_schema', 'sys', 'performance_schema', 'pg_catalog', 'pg_toast', 'pg_temp_1', 'pg_toast_temp_1')
-      ORDER BY name`);
+      ORDER BY name`,
+            });
             return rdh.rows.map((r) => {
                 const res = new resource_1.DbSchema(r.values.name);
                 return res;
@@ -156,20 +161,22 @@ class PostgresDriver extends RDSBaseDriver_1.RDSBaseDriver {
     }
     getTables(dbSchema) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            let rdh = yield this
-                .requestSql(`select quote_ident(m.relname) as qname, COALESCE(d.description, '') as comment
+            let rdh = yield this.requestSql({
+                sql: `select quote_ident(m.relname) as qname, COALESCE(d.description, '') as comment
       from pg_stat_all_tables as m
       LEFT JOIN pg_description as d ON (m.relid = d.objoid AND d.objsubid=0)
       WHERE m.schemaname='${dbSchema.name}'
-      ORDER BY m.relname`);
+      ORDER BY m.relname`,
+            });
             const list = rdh.rows.map((r) => {
                 const res = new resource_1.DbTable(r.values.qname, 'TABLE', r.values.comment);
                 return res;
             });
-            rdh = yield this
-                .requestSql(`select quote_ident(viewname) as qname, definition from pg_catalog.pg_views 
+            rdh = yield this.requestSql({
+                sql: `select quote_ident(viewname) as qname, definition from pg_catalog.pg_views 
       where schemaname = '${dbSchema.name}' 
-      order by viewname`);
+      order by viewname`,
+            });
             return list.concat(rdh.rows.map((r) => {
                 const res = new resource_1.DbTable(r.values.qname, 'VIEW', '');
                 return res;
@@ -179,7 +186,8 @@ class PostgresDriver extends RDSBaseDriver_1.RDSBaseDriver {
     getColumns(schemaName, dbTable) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const binds = [schemaName, dbTable.name];
-            const rdh = yield this.requestSql(`select
+            const rdh = yield this.requestSql({
+                sql: `select
       col.COLUMN_NAME as name,
       quote_ident(col.COLUMN_NAME) as qname,
       data_type as col_type,
@@ -231,10 +239,12 @@ class PostgresDriver extends RDSBaseDriver_1.RDSBaseDriver {
     where
     col.table_schema = $1 AND  quote_ident(col.table_name) = $2
     order by
-      col.ordinal_position`, { binds });
+      col.ordinal_position`,
+                conditions: { binds },
+            });
             return rdh.rows.map((r) => {
                 const type_name = enum_values_1.EnumValues.getNameFromValue(PostgresColumnType_1.PostgresColumnType, PostgresColumnType_1.PostgresColumnType.parse(r.values.col_type));
-                const res = new resource_1.DbColumn(r.values.qname, types_1.GeneralColumnType.parse(type_name), {
+                const res = new resource_1.DbColumn(r.values.qname, (0, resource_1.parseColumnType)(type_name), {
                     nullable: r.values.nullable === 1,
                     key: r.values.col_key,
                     default: r.values.col_default,

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

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

package/built/src/drivers/RDSBaseDriver.d.ts

@@ -1,9 +1,9 @@
-import { BaseDriver, RequestSqlOptions } from './BaseDriver';
-import { DbConnection, DbTable, RdsDatabase, ResultSetDataHolder, SchemaAndTableHints, TableRows } from '../resource';
+import { BaseDriver } from './BaseDriver';
+import { DbTable, RdsDatabase, ResultSetDataHolder, SchemaAndTableHints, TableRows } from '../resource';
 import { Statement } from 'pgsql-ast-parser';
-import { CompareKey } from '../types';
-export declare abstract class RDSBaseDriver extends BaseDriver {
-    constructor(conRes: DbConnection);
+import { CompareKey, ConnectionSetting, QueryParams } from '../types';
+export declare abstract class RDSBaseDriver extends BaseDriver<RdsDatabase> {
+    constructor(conRes: ConnectionSetting);
     protected abstract getTestSqlStatement(): string;
     test(with_connect?: boolean): Promise<string>;
     viewData(tableName: string, options?: {
@@ -12,12 +12,11 @@ export declare abstract class RDSBaseDriver extends BaseDriver {
         maxRows?: number;
         compareKeys?: CompareKey[];
     }): Promise<ResultSetDataHolder>;
-    getInfomationSchemas(): Promise<Array<RdsDatabase>>;
-    abstract getInfomationSchemasSub(): Promise<Array<RdsDatabase>>;
+    protected getRdsDatabase(): RdsDatabase | undefined;
     getTableName(ast: Statement): string | undefined;
     getDbTable(name: string): DbTable | undefined;
-    setRdhMetaAndStatement(rdh: ResultSetDataHolder, sql: string, astTableName?: string, dbTable?: DbTable, options?: RequestSqlOptions): void;
+    setRdhMetaAndStatement(params: QueryParams, rdh: ResultSetDataHolder, type: Statement['type'], astTableName?: string, dbTable?: DbTable): void;
     resetDefaultSchema(database: RdsDatabase): void;
-    abstract requestSql(sql: string, options?: RequestSqlOptions): Promise<ResultSetDataHolder>;
+    abstract requestSql(params: QueryParams): Promise<ResultSetDataHolder>;
     abstract countTables(tables: SchemaAndTableHints, options: any): Promise<TableRows[]>;
 }

package/built/src/drivers/RDSBaseDriver.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RDSBaseDriver = void 0;
 const tslib_1 = require("tslib");
 const BaseDriver_1 = require("./BaseDriver");
+const resource_1 = require("../resource");
 const types_1 = require("../types");
 class RDSBaseDriver extends BaseDriver_1.BaseDriver {
     constructor(conRes) {
@@ -16,7 +17,7 @@ class RDSBaseDriver extends BaseDriver_1.BaseDriver {
             }
             if (!errorReason) {
                 try {
-                    yield this.requestSql(this.getTestSqlStatement());
+                    yield this.requestSql({ sql: this.getTestSqlStatement() });
                 }
                 catch (e) {
                     errorReason = e.message;
@@ -42,23 +43,22 @@ class RDSBaseDriver extends BaseDriver_1.BaseDriver {
             else {
                 cols = '*';
             }
-            return yield this.requestSql(`SELECT ${cols} FROM ${sp}${tableName} `, {
-                tableName,
-                maxRows: options === null || options === void 0 ? void 0 : options.maxRows,
-                compareKeys: options === null || options === void 0 ? void 0 : options.compareKeys,
+            return yield this.requestSql({
+                sql: `SELECT ${cols} FROM ${sp}${tableName} `,
+                meta: {
+                    tableName,
+                    maxRows: options === null || options === void 0 ? void 0 : options.maxRows,
+                    compareKeys: options === null || options === void 0 ? void 0 : options.compareKeys,
+                },
             });
         });
     }
-    getInfomationSchemas() {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            this.conRes.clearChildren();
-            if (!this.conRes) {
-                return [];
-            }
-            const dbResources = yield this.getInfomationSchemasSub();
-            dbResources.forEach((it) => this.conRes.addChild(it));
-            return dbResources;
-        });
+    getRdsDatabase() {
+        const db = this.getDbDatabase();
+        if (db instanceof resource_1.RdsDatabase) {
+            return db;
+        }
+        return undefined;
     }
     getTableName(ast) {
         if (ast) {
@@ -79,10 +79,11 @@ class RDSBaseDriver extends BaseDriver_1.BaseDriver {
         return undefined;
     }
     getDbTable(name) {
+        var _a;
         if (!name) {
             return undefined;
         }
-        const list = this.conRes.findChildren({
+        const list = (_a = this.getRdsDatabase()) === null || _a === void 0 ? void 0 : _a.findChildren({
             keyword: name,
             resourceType: types_1.ResourceType.Table,
             recursively: true,
@@ -92,13 +93,13 @@ class RDSBaseDriver extends BaseDriver_1.BaseDriver {
         }
         return undefined;
     }
-    setRdhMetaAndStatement(rdh, sql, astTableName, dbTable, options) {
+    setRdhMetaAndStatement(params, rdh, type, astTableName, dbTable) {
+        const { sql, conditions, meta } = params;
         rdh.setSqlStatement(sql);
-        if (!rdh.meta) {
-            rdh.meta = {};
-        }
-        rdh.meta.tableName = options === null || options === void 0 ? void 0 : options.tableName;
-        rdh.meta.compareKeys = options === null || options === void 0 ? void 0 : options.compareKeys;
+        rdh.meta.connectionName = this.conRes.name;
+        rdh.meta.tableName = meta === null || meta === void 0 ? void 0 : meta.tableName;
+        rdh.meta.compareKeys = meta === null || meta === void 0 ? void 0 : meta.compareKeys;
+        rdh.meta.type = type;
         if (!rdh.meta.tableName) {
             rdh.meta.tableName = astTableName;
         }
@@ -107,6 +108,7 @@ class RDSBaseDriver extends BaseDriver_1.BaseDriver {
                 rdh.meta.compareKeys = dbTable.getCompareKeys();
             }
         }
+        rdh.queryConditions = conditions;
     }
     resetDefaultSchema(database) {
         const searchNames = [];

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

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

package/built/src/drivers/RedisDriver.d.ts

@@ -1,15 +1,15 @@
 import { Redis } from 'ioredis';
 import { BaseDriver, Scannable } from './BaseDriver';
-import { DbConnection, DbKey, RedisDatabase, RedisKeyParams, ResultSetDataHolder } from '../resource';
-import { RedisKeyType, ScanParams } from '../types';
-export declare class RedisDriver extends BaseDriver implements Scannable {
+import { DbKey, RedisDatabase, RedisKeyParams, ResultSetDataHolder } from '../resource';
+import { ConnectionSetting, RedisKeyType, ScanParams } from '../types';
+export declare class RedisDriver extends BaseDriver<RedisDatabase> implements Scannable {
     client: Redis | undefined;
-    constructor(conRes: DbConnection);
+    constructor(conRes: ConnectionSetting);
     connectSub(): Promise<string>;
     test(with_connect?: boolean): Promise<string>;
     scanStream(params: ScanParams): Promise<DbKey<RedisKeyParams>[]>;
     scan(params: ScanParams): Promise<ResultSetDataHolder>;
     getValueByKey(client: Redis, key: string, type: RedisKeyType): Promise<any>;
-    getInfomationSchemas(): Promise<Array<RedisDatabase>>;
+    getInfomationSchemasSub(): Promise<Array<RedisDatabase>>;
     closeSub(): Promise<string>;
 }

package/built/src/drivers/RedisDriver.js

@@ -32,7 +32,7 @@ class RedisDriver extends BaseDriver_1.BaseDriver {
                     options.port = this.sshLocalPort;
                 }
                 options.connectTimeout = 5000;
-                if (this.conRes.hasUrl()) {
+                if (this.conRes.url) {
                     this.client = new ioredis_1.Redis(this.conRes.url);
                 }
                 else {
@@ -112,10 +112,14 @@ class RedisDriver extends BaseDriver_1.BaseDriver {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const dbKeys = yield this.scanStream(params);
             const rdh = new resource_1.ResultSetDataHolder([
-                new resource_1.RdhKey('key', types_1.GeneralColumnType.TEXT),
-                new resource_1.RdhKey('type', types_1.GeneralColumnType.ENUM),
-                new resource_1.RdhKey('ttl', types_1.GeneralColumnType.INTEGER),
-                new resource_1.RdhKey('val', types_1.GeneralColumnType.UNKNOWN),
+                (0, resource_1.createRdhKey)({ name: 'key', type: types_1.GeneralColumnType.TEXT, width: 150 }),
+                (0, resource_1.createRdhKey)({ name: 'type', type: types_1.GeneralColumnType.ENUM, width: 70 }),
+                (0, resource_1.createRdhKey)({ name: 'ttl', type: types_1.GeneralColumnType.INTEGER, width: 50 }),
+                (0, resource_1.createRdhKey)({
+                    name: 'val',
+                    type: types_1.GeneralColumnType.UNKNOWN,
+                    width: 300,
+                }),
             ]);
             dbKeys.forEach((dbKey) => {
                 rdh.addRow(Object.assign(Object.assign({}, dbKey.params), { key: dbKey.name }));
@@ -142,7 +146,7 @@ class RedisDriver extends BaseDriver_1.BaseDriver {
             return undefined;
         });
     }
-    getInfomationSchemas() {
+    getInfomationSchemasSub() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (!this.conRes) {
                 return [];

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

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

package/built/src/drivers/aws/AwsCloudwatchServiceClient.d.ts

@@ -1,12 +1,12 @@
-import { AwsDatabase, DbConnection, ResultSetDataHolder } from '../../resource';
-import { ScanParams } from '../../types';
+import { AwsDatabase, ResultSetDataHolder } from '../../resource';
+import { ConnectionSetting, ScanParams } from '../../types';
 import { CloudWatchLogsClient, GetQueryResultsCommandOutput, LogStream, OutputLogEvent, QueryDefinition, StartQueryCommandInput } from '@aws-sdk/client-cloudwatch-logs';
 import { AwsServiceClient } from './AwsServiceClient';
 import { ClientConfigType } from '../AwsDriver';
 import { Scannable } from '../BaseDriver';
 export declare class AwsCloudwatchServiceClient extends AwsServiceClient implements Scannable {
     logClient: CloudWatchLogsClient;
-    constructor(conRes: DbConnection, config: ClientConfigType);
+    constructor(conRes: ConnectionSetting, config: ClientConfigType);
     connectSub(): Promise<string>;
     protected testSub(): Promise<void>;
     getLogEvents(params: {

package/built/src/drivers/aws/AwsCloudwatchServiceClient.js

@@ -7,7 +7,6 @@ const types_1 = require("../../types");
 const client_cloudwatch_logs_1 = require("@aws-sdk/client-cloudwatch-logs");
 const AwsServiceClient_1 = require("./AwsServiceClient");
 const util_1 = require("../../util");
-const AwsServiceType_1 = require("../../types/AwsServiceType");
 const pluralize_1 = require("pluralize");
 class AwsCloudwatchServiceClient extends AwsServiceClient_1.AwsServiceClient {
     constructor(conRes, config) {
@@ -109,10 +108,19 @@ class AwsCloudwatchServiceClient extends AwsServiceClient_1.AwsServiceClient {
             const keys = results[0]
                 .filter((it) => it.field !== undefined && it.field !== '@ptr')
                 .map((it) => {
-                const key = new resource_1.RdhKey(it.field, types_1.GeneralColumnType.TEXT);
+                const key = (0, resource_1.createRdhKey)({
+                    name: it.field,
+                    type: types_1.GeneralColumnType.TEXT,
+                });
                 if (it.field === '@timestamp') {
                     key.type = types_1.GeneralColumnType.TIMESTAMP;
                 }
+                else if (it.field === '@message') {
+                    key.width = 500;
+                }
+                else if (it.field === '@logStream') {
+                    key.width = 100;
+                }
                 return key;
             });
             const rdh = new resource_1.ResultSetDataHolder(keys);
@@ -142,9 +150,21 @@ class AwsCloudwatchServiceClient extends AwsServiceClient_1.AwsServiceClient {
                 startTime,
                 limit,
             });
-            const ingestionTime = new resource_1.RdhKey('ingestionTime', types_1.GeneralColumnType.TIMESTAMP, 'Time received by CloudWatch Logs');
-            const timestamp = new resource_1.RdhKey('timestamp', types_1.GeneralColumnType.TIMESTAMP, 'Timestamp field of the log event');
-            const message = new resource_1.RdhKey('message', types_1.GeneralColumnType.TEXT, '');
+            const ingestionTime = (0, resource_1.createRdhKey)({
+                name: 'ingestionTime',
+                type: types_1.GeneralColumnType.TIMESTAMP,
+                comment: 'Time received by CloudWatch Logs',
+            });
+            const timestamp = (0, resource_1.createRdhKey)({
+                name: 'timestamp',
+                type: types_1.GeneralColumnType.TIMESTAMP,
+                comment: 'Timestamp field of the log event',
+            });
+            const message = (0, resource_1.createRdhKey)({
+                name: 'message',
+                type: types_1.GeneralColumnType.TEXT,
+                width: 500,
+            });
             const keys = [ingestionTime, timestamp, message];
             const rdh = new resource_1.ResultSetDataHolder(keys);
             list.forEach((rowResult) => {
@@ -163,7 +183,7 @@ class AwsCloudwatchServiceClient extends AwsServiceClient_1.AwsServiceClient {
             if (!this.conRes) {
                 return null;
             }
-            const dbDatabase = new resource_1.AwsDatabase('Cloudwatch', AwsServiceType_1.AwsServiceType.Cloudwatch);
+            const dbDatabase = new resource_1.AwsDatabase('Cloudwatch', types_1.AwsServiceType.Cloudwatch);
             try {
                 let nextToken = undefined;
                 do {

package/built/src/drivers/aws/AwsCloudwatchServiceClient.js.map

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

package/built/src/drivers/aws/AwsS3ServiceClient.d.ts

@@ -1,12 +1,12 @@
 import { PutObjectCommandInput, S3Client } from '@aws-sdk/client-s3';
-import { AwsDatabase, DbConnection, DbKey, ResultSetDataHolder, S3KeyParams } from '../../resource';
-import { ScanParams } from '../../types';
+import { AwsDatabase, DbKey, ResultSetDataHolder, S3KeyParams } from '../../resource';
+import { ConnectionSetting, ScanParams } from '../../types';
 import { AwsServiceClient } from './AwsServiceClient';
 import { ClientConfigType } from '../AwsDriver';
 import { Scannable } from '../BaseDriver';
 export declare class AwsS3ServiceClient extends AwsServiceClient implements Scannable {
     s3Client: S3Client;
-    constructor(conRes: DbConnection, config: ClientConfigType);
+    constructor(conRes: ConnectionSetting, config: ClientConfigType);
     connectSub(): Promise<string>;
     protected testSub(): Promise<void>;
     listObjects({ bucket, prefix, limit, withValue, }: {

package/built/src/drivers/aws/AwsS3ServiceClient.js

@@ -6,7 +6,6 @@ const client_s3_1 = require("@aws-sdk/client-s3");
 const resource_1 = require("../../resource");
 const types_1 = require("../../types");
 const AwsServiceClient_1 = require("./AwsServiceClient");
-const AwsServiceType_1 = require("../../types/AwsServiceType");
 const pluralize_1 = require("pluralize");
 class AwsS3ServiceClient extends AwsServiceClient_1.AwsServiceClient {
     constructor(conRes, config) {
@@ -89,12 +88,12 @@ class AwsS3ServiceClient extends AwsServiceClient_1.AwsServiceClient {
                 withValue,
             });
             const rdh = new resource_1.ResultSetDataHolder([
-                new resource_1.RdhKey('key', types_1.GeneralColumnType.TEXT),
-                new resource_1.RdhKey('size', types_1.GeneralColumnType.INTEGER),
-                new resource_1.RdhKey('etag', types_1.GeneralColumnType.TEXT),
-                new resource_1.RdhKey('storageClass', types_1.GeneralColumnType.TEXT),
-                new resource_1.RdhKey('lastModified', types_1.GeneralColumnType.TIMESTAMP),
-                new resource_1.RdhKey('value', types_1.GeneralColumnType.UNKNOWN),
+                (0, resource_1.createRdhKey)({ name: 'key', type: types_1.GeneralColumnType.TEXT }),
+                (0, resource_1.createRdhKey)({ name: 'size', type: types_1.GeneralColumnType.INTEGER }),
+                (0, resource_1.createRdhKey)({ name: 'etag', type: types_1.GeneralColumnType.TEXT }),
+                (0, resource_1.createRdhKey)({ name: 'storageClass', type: types_1.GeneralColumnType.TEXT }),
+                (0, resource_1.createRdhKey)({ name: 'lastModified', type: types_1.GeneralColumnType.TIMESTAMP }),
+                (0, resource_1.createRdhKey)({ name: 'value', type: types_1.GeneralColumnType.UNKNOWN }),
             ]);
             list.forEach((dbKey) => {
                 var _a;
@@ -108,7 +107,7 @@ class AwsS3ServiceClient extends AwsServiceClient_1.AwsServiceClient {
             if (!this.conRes) {
                 return null;
             }
-            const dbDatabase = new resource_1.AwsDatabase('S3', AwsServiceType_1.AwsServiceType.S3);
+            const dbDatabase = new resource_1.AwsDatabase('S3', types_1.AwsServiceType.S3);
             try {
                 const buckets = yield this.s3Client.send(new client_s3_1.ListBucketsCommand({}));
                 if (buckets.Buckets) {

package/built/src/drivers/aws/AwsS3ServiceClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"AwsS3ServiceClient.js","sourceRoot":"","sources":["../../../../src/drivers/aws/AwsS3ServiceClient.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AwsS3ServiceClient.js","sourceRoot":"","sources":["../../../../src/drivers/aws/AwsS3ServiceClient.ts"],"names":[],"mappings":";;;;AAGA,kDAY4B;AAC5B,6CAQwB;AACxB,uCAKqB;AACrB,yDAAsD;AAGtD,yCAAmC;AAEnC,MAAa,kBAAmB,SAAQ,mCAAgB;IAGtD,YAAY,MAAyB,EAAE,MAAwB;QAC7D,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxB,CAAC;IAEK,UAAU;;;YACd,MAAM,MAAM,qBACP,IAAI,CAAC,MAAM,CACf,CAAC;YACF,IAAI,MAAA,IAAI,CAAC,MAAM,CAAC,UAAU,0CAAE,gBAAgB,EAAE;gBACtC,MAAO,CAAC,gBAAgB,GAAG,MAAA,IAAI,CAAC,MAAM,CAAC,UAAU,0CAAE,gBAAgB,CAAC;aAC3E;YACD,IAAI,CAAC,QAAQ,GAAG,IAAI,oBAAQ,CAAC,MAAM,CAAC,CAAC;YAErC,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;;KACzB;IAEe,OAAO;;YACrB,IAAI,IAAI,CAAC,QAAQ,EAAE;gBACjB,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,8BAAkB,CAAC,EAAE,CAAC,CAAC,CAAC;aACtD;QACH,CAAC;KAAA;IAYK,WAAW,CAAC,EAChB,MAAM,EACN,MAAM,EACN,KAAK,EACL,SAAS,GAMV;;;YAEC,IAAI,SAAS,GAAG,IAAI,CAAC;YAErB,IAAI,UAAU,CAAC;YAEf,MAAM,YAAY,GAA4B;gBAC5C,MAAM,EAAE,MAAM;gBACd,MAAM,EAAE,MAAM;aACf,CAAC;YAEF,MAAM,IAAI,GAAyB,EAAE,CAAC;YACtC,OAAO,SAAS,EAAE;gBAChB,IAAI;oBACF,YAAY,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC;oBAC3D,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CACvC,IAAI,8BAAkB,CAAC,YAAY,CAAC,CACrC,CAAC;oBAEF,MAAA,QAAQ,CAAC,QAAQ,0CAAE,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;wBAClC,MAAM,GAAG,GAAG,IAAI,gBAAK,CAAc,IAAI,CAAC,GAAG,EAAE;4BAC3C,IAAI,EAAE,IAAI,CAAC,IAAI;4BACf,IAAI,EAAE,IAAI,CAAC,IAAI;4BACf,YAAY,EAAE,IAAI,CAAC,YAAY;4BAC/B,YAAY,EAAE,IAAI,CAAC,YAAY;yBAChC,CAAC,CAAC;wBACH,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oBACjB,CAAC,CAAC,CAAC;oBAEH,SAAS,GAAG,QAAQ,CAAC,WAAW,CAAC;oBAEjC,IAAI,SAAS,EAAE;wBACb,UAAU,GAAG,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;wBAEhD,YAAY,CAAC,MAAM,GAAG,UAAU,CAAC;qBAClC;iBACF;gBAAC,OAAO,GAAG,EAAE;oBACZ,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;oBAC1B,SAAS,GAAG,KAAK,CAAC;iBACnB;aACF;YAED,IAAI,SAAS,KAAK,IAAI,IAAI,SAAS,KAAK,MAAM,EAAE;gBAC9C,MAAM,QAAQ,GAAG,IAAI;qBAClB,MAAM,CACL,CAAC,EAAE,EAAE,EAAE,CACL,SAAS,KAAK,IAAI;oBAClB,CAAC,SAAS,KAAK,MAAM,IAAI,EAAE,CAAC,MAAM,CAAC,IAAI,IAAI,KAAM,CAAC,CACrD;qBACA,GAAG,CAAC,CAAO,EAAE,EAAE,EAAE;oBAChB,EAAE,CAAC,MAAM,CAAC,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC;wBAC1C,MAAM;wBACN,GAAG,EAAE,EAAE,CAAC,IAAI;qBACb,CAAC,CAAC;gBACL,CAAC,CAAA,CAAC,CAAC;gBACL,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;aAC7B;YACD,OAAO,IAAI,CAAC;;KACb;IAEK,IAAI,CAAC,MAAkB;;YAC3B,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;YACrD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC;gBAClC,MAAM,EAAE,MAAM;gBACd,MAAM,EAAE,OAAO;gBACf,KAAK;gBACL,SAAS;aACV,CAAC,CAAC;YACH,MAAM,GAAG,GAAG,IAAI,8BAAmB,CAAC;gBAClC,IAAA,uBAAY,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,yBAAiB,CAAC,IAAI,EAAE,CAAC;gBAC3D,IAAA,uBAAY,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,yBAAiB,CAAC,OAAO,EAAE,CAAC;gBAC/D,IAAA,uBAAY,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,yBAAiB,CAAC,IAAI,EAAE,CAAC;gBAC5D,IAAA,uBAAY,EAAC,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,yBAAiB,CAAC,IAAI,EAAE,CAAC;gBACpE,IAAA,uBAAY,EAAC,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,yBAAiB,CAAC,SAAS,EAAE,CAAC;gBACzE,IAAA,uBAAY,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,yBAAiB,CAAC,OAAO,EAAE,CAAC;aACjE,CAAC,CAAC;YACH,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;;gBACrB,GAAG,CAAC,MAAM,iCACL,KAAK,CAAC,MAAM,KACf,GAAG,EAAE,KAAK,CAAC,IAAI,EACf,KAAK,EAAE,MAAA,KAAK,CAAC,MAAM,0CAAE,MAAM,IAC3B,CAAC;YACL,CAAC,CAAC,CAAC;YACH,OAAO,GAAG,CAAC;QACb,CAAC;KAAA;IAoBK,oBAAoB;;YACxB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;gBAChB,OAAO,IAAI,CAAC;aACb;YAED,MAAM,UAAU,GAAG,IAAI,sBAAW,CAAC,IAAI,EAAE,sBAAc,CAAC,EAAE,CAAC,CAAC;YAE5D,IAAI;gBACF,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,8BAAkB,CAAC,EAAE,CAAC,CAAC,CAAC;gBACrE,IAAI,OAAO,CAAC,OAAO,EAAE;oBACnB,KAAK,MAAM,MAAM,IAAI,OAAO,CAAC,OAAO,EAAE;wBACpC,MAAM,QAAQ,GAAG,IAAI,qBAAU,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC;wBAClE,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;qBAC/B;oBACD,UAAU,CAAC,OAAO,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,IAAI,IAAA,kBAAM,EAAC,QAAQ,CAAC,EAAE,CAAC;iBACtE;gBACD,IAAI,OAAO,CAAC,KAAK,EAAE;oBACjB,MAAM,OAAO,GAAG,IAAI,oBAAS,CAC3B,OAAO,CAAC,KAAK,CAAC,EAAE,EAChB,OAAO,CAAC,KAAK,CAAC,WAAW,CAC1B,CAAC;oBACF,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;iBAC9B;qBAAM;iBAEN;aACF;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;aAElB;YACD,OAAO,UAAU,CAAC;QACpB,CAAC;KAAA;IAyCK,YAAY,CAAC,EAAE,MAAM,EAAsB;;YAC/C,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,+BAAmB,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;QACxE,CAAC;KAAA;IAEK,aAAa,CAAC,EAClB,MAAM,EACN,GAAG,GAIJ;;YAEC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CACnC,IAAI,4BAAgB,CAAC;gBACnB,MAAM,EAAE,MAAM;gBACd,GAAG,EAAE,GAAG;aACT,CAAC,CACH,CAAC;YACF,OAAO,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACvC,CAAC;KAAA;IAEK,SAAS,CAAC,EACd,MAAM,EACN,GAAG,EACH,IAAI,GAKL;;YACC,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CACtB,IAAI,4BAAgB,CAAC;gBACnB,MAAM,EAAE,MAAM;gBACd,GAAG,EAAE,GAAG;gBACR,IAAI,EAAE,IAAI;aACX,CAAC,CACH,CAAC;QACJ,CAAC;KAAA;IAEK,YAAY,CAAC,EAAE,MAAM,EAAsB;;YAC/C,MAAM,IAAI,CAAC,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;YACxC,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,+BAAmB,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;QACxE,CAAC;KAAA;IAEK,gBAAgB,CAAC,EAAE,MAAM,EAAsB;;YACnD,IAAI,SAAS,GAAG,IAAI,CAAC;YACrB,IAAI,UAAU,CAAC;YACf,MAAM,YAAY,GAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;YAE7C,OAAO,SAAS,EAAE;gBAChB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CACvC,IAAI,8BAAkB,CAAC,YAAY,CAAC,CACrC,CAAC;gBAEF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;oBACjD,MAAM,IAAI,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;oBAClC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CACnC,IAAI,+BAAmB,CAAC;wBACtB,MAAM,EAAE,MAAM;wBACd,GAAG,EAAE,IAAI,CAAC,GAAG;qBACd,CAAC,CACH,CAAC;iBACH;gBAED,SAAS,GAAG,QAAQ,CAAC,WAAW,CAAC;gBAEjC,IAAI,SAAS,EAAE;oBACb,UAAU,GAAG,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;oBAEhD,YAAY,CAAC,MAAM,GAAG,UAAU,CAAC;iBAClC;aAEF;QACH,CAAC;KAAA;IAEe,QAAQ;;YACtB,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;QAChC,CAAC;KAAA;CACF;AA1SD,gDA0SC"}