From 150bf944de41858e1e7e9b59ea067656de5bb9ff Mon Sep 17 00:00:00 2001 From: Philipp Kunz Date: Sat, 10 Feb 2024 04:36:34 +0100 Subject: [PATCH] fix(core): update --- package.json | 3 ++- pnpm-lock.yaml | 32 +++++++++------------------ ts/00_commitinfo_data.ts | 2 +- ts/smartbucket.classes.smartbucket.ts | 12 ++-------- ts/smartbucket.plugins.ts | 8 +++++++ 5 files changed, 24 insertions(+), 33 deletions(-) diff --git a/package.json b/package.json index fe11117..74e6bfe 100644 --- a/package.json +++ b/package.json @@ -12,8 +12,8 @@ "build": "(tsbuild --web --allowimplicitany)" }, "devDependencies": { - "@git.zone/tsrun": "^1.2.46", "@git.zone/tsbuild": "^2.1.63", + "@git.zone/tsrun": "^1.2.46", "@git.zone/tstest": "^1.0.71", "@push.rocks/qenv": "^6.0.4", "@push.rocks/tapbundle": "^5.0.3" @@ -23,6 +23,7 @@ "@push.rocks/smartpromise": "^4.0.3", "@push.rocks/smartrx": "^3.0.7", "@push.rocks/smartstream": "^2.0.2", + "@tsclass/tsclass": "^4.0.50", "@types/minio": "^7.0.13", "minio": "^7.0.28" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 08b4989..6b661f1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -17,6 +17,9 @@ dependencies: '@push.rocks/smartstream': specifier: ^2.0.2 version: 2.0.8 + '@tsclass/tsclass': + specifier: ^4.0.50 + version: 4.0.50 '@types/minio': specifier: ^7.0.13 version: 7.0.13 @@ -82,7 +85,7 @@ packages: '@push.rocks/smartsitemap': 2.0.3 '@push.rocks/smarttime': 4.0.6 '@push.rocks/webstore': 2.0.13 - '@tsclass/tsclass': 4.0.46 + '@tsclass/tsclass': 4.0.50 '@types/express': 4.17.20 body-parser: 1.20.2 cors: 2.8.5 @@ -816,7 +819,7 @@ packages: '@push.rocks/smartpromise': 4.0.3 '@push.rocks/smartpuppeteer': 2.0.2 '@push.rocks/smartunique': 3.0.6 - '@tsclass/tsclass': 4.0.42 + '@tsclass/tsclass': 4.0.50 '@types/express': 4.17.17 express: 4.18.2 pdf-merger-js: 3.4.0 @@ -881,7 +884,7 @@ packages: '@push.rocks/smartxml': 1.0.8 '@push.rocks/smartyaml': 2.0.5 '@push.rocks/webrequest': 3.0.34 - '@tsclass/tsclass': 4.0.46 + '@tsclass/tsclass': 4.0.50 dev: true /@push.rocks/smartsocket@2.0.24: @@ -1324,17 +1327,10 @@ packages: type-fest: 2.19.0 dev: true - /@tsclass/tsclass@4.0.42: - resolution: {integrity: sha512-mWZ8k3G7VL/dSNaJCv7mjbad6movf2rTE+1MdsXMoCxblZpJ3YzqlRsKm/JUQkxqF1H28q6m/L5BV42LfNZsiA==} + /@tsclass/tsclass@4.0.50: + resolution: {integrity: sha512-ICUe4hfebpvbn8JkReGP1m3DCTq6S5FIhLJzbFx9F7tx6dn909fA9YIEHkFeMj2X7fT5aGvAXOZRlT52GsnSUw==} dependencies: - type-fest: 3.13.0 - dev: true - - /@tsclass/tsclass@4.0.46: - resolution: {integrity: sha512-UovPUvlozv1ftJp4KW5tt4MP/LQCNP3lSCinjyIrLkopOymczyzONUGvSAAwOBf1XBE9bO0tI4KtRuXWN9XBXQ==} - dependencies: - type-fest: 4.6.0 - dev: true + type-fest: 4.10.2 /@tsconfig/node10@1.0.9: resolution: {integrity: sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==} @@ -5654,15 +5650,9 @@ packages: engines: {node: '>=12.20'} dev: true - /type-fest@3.13.0: - resolution: {integrity: sha512-Gur3yQGM9qiLNs0KPP7LPgeRbio2QTt4xXouobMCarR0/wyW3F+F/+OWwshg3NG0Adon7uQfSZBpB46NfhoF1A==} - engines: {node: '>=14.16'} - dev: true - - /type-fest@4.6.0: - resolution: {integrity: sha512-rLjWJzQFOq4xw7MgJrCZ6T1jIOvvYElXT12r+y0CC6u67hegDHaxcPqb2fZHOGlqxugGQPNB1EnTezjBetkwkw==} + /type-fest@4.10.2: + resolution: {integrity: sha512-anpAG63wSpdEbLwOqH8L84urkL6PiVIov3EMmgIhhThevh9aiMQov+6Btx0wldNcvm4wV+e2/Rt1QdDwKHFbHw==} engines: {node: '>=16'} - dev: true /type-is@1.6.18: resolution: {integrity: sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==} diff --git a/ts/00_commitinfo_data.ts b/ts/00_commitinfo_data.ts index 2b46119..e817570 100644 --- a/ts/00_commitinfo_data.ts +++ b/ts/00_commitinfo_data.ts @@ -3,6 +3,6 @@ */ export const commitinfo = { name: '@push.rocks/smartbucket', - version: '2.0.3', + version: '2.0.4', description: 'simple cloud independent object storage' } diff --git a/ts/smartbucket.classes.smartbucket.ts b/ts/smartbucket.classes.smartbucket.ts index a40c25b..07f173a 100644 --- a/ts/smartbucket.classes.smartbucket.ts +++ b/ts/smartbucket.classes.smartbucket.ts @@ -1,23 +1,15 @@ import * as plugins from './smartbucket.plugins.js'; import { Bucket } from './smartbucket.classes.bucket.js'; -export interface ISmartBucketConfig { - endpoint: string; - port?: number; - useSsl?: boolean; - accessKey: string; - accessSecret: string; -} - export class SmartBucket { - public config: ISmartBucketConfig; + public config: plugins.tsclass.storage.IS3Descriptor; public minioClient: plugins.minio.Client; /** * the constructor of SmartBucket */ - constructor(configArg: ISmartBucketConfig) { + constructor(configArg: plugins.tsclass.storage.IS3Descriptor) { this.config = configArg; this.minioClient = new plugins.minio.Client({ endPoint: this.config.endpoint, diff --git a/ts/smartbucket.plugins.ts b/ts/smartbucket.plugins.ts index 5413734..f40d1ba 100644 --- a/ts/smartbucket.plugins.ts +++ b/ts/smartbucket.plugins.ts @@ -3,6 +3,7 @@ import * as path from 'path'; export { path }; +// @push.rocks scope import * as smartpath from '@push.rocks/smartpath'; import * as smartpromise from '@push.rocks/smartpromise'; import * as smartrx from '@push.rocks/smartrx'; @@ -10,6 +11,13 @@ import * as smartstream from '@push.rocks/smartstream'; export { smartpath, smartpromise, smartrx, smartstream }; +// @tsclass +import * as tsclass from '@tsclass/tsclass'; + +export { + tsclass, +} + // third party scope import * as minio from 'minio';