@tblabs/storage 5.12.10 → 5.13.1

package/Datasets/{IRepo.d.ts → Object/IRepo.d.ts}

@@ -1,4 +1,4 @@
-import { IRepoBase } from "./IRepoBase";
+import { IRepoBase } from "../IRepoBase";
 export interface IRepo<T> extends IRepoBase {
     Add(id: string, item: T): Promise<void>;
     GetOne(id: string): Promise<T>;

package/Datasets/{IRepos.d.ts → Object/IRepos.d.ts}

@@ -1,4 +1,4 @@
-import { IStorageUserPrivileges } from "../Models/IStorageUserPrivileges";
+import { IStorageUserPrivileges } from "../../Models/IStorageUserPrivileges";
 export interface IRepos<T> {
     CanUserDo(action: keyof IStorageUserPrivileges): boolean;
     Add(dataset: string, id: string, item: T): Promise<void>;

package/Datasets/Object/ObjectDataset.d.ts

@@ -0,0 +1,20 @@
+import { OnlineStorage } from "../../Services/OnlineStorage";
+import { IConverter } from "../../Converters/IConverter";
+import { IRepo } from "./IRepo";
+import { dir } from "../../Types/dir";
+import { DatasetBase } from "../DatasetBase";
+import { DatasetType } from "../../Services/DatasetType";
+export declare class ObjectDataset<T extends object> extends DatasetBase implements IRepo<T> {
+    protected _db: OnlineStorage;
+    protected dataset: dir;
+    protected _converter: IConverter<any, T>;
+    Type: DatasetType;
+    constructor(_db: OnlineStorage, dataset: dir, _converter?: IConverter<any, T>);
+    GetOne(id: string): Promise<T>;
+    GetAll(): Promise<T[]>;
+    GetAllIds(): Promise<string[]>;
+    Add(id: string, item: T): Promise<void>;
+    Update(id: string, item: T): Promise<void>;
+    Delete(id: string): Promise<void>;
+    Drop(): Promise<void>;
+}

package/Datasets/{Dataset.js → Object/ObjectDataset.js}

@@ -1,22 +1,23 @@
-import { AddFileCommand } from "../Messages/AddFileCommand";
-import { DeleteFileCommand } from "../Messages/DeleteFileCommand";
-import { DropDatasetCommand } from "../Messages/DropDatasetCommand";
-import { ListFilesQuery } from "../Messages/ListFilesQuery";
-import { GetFileQuery } from "../Messages/GetFileQuery";
-import { UpdateFileCommand } from "../Messages/UpdateFileCommand";
-import { ListFilesIdsQuery } from "../Messages/ListFilesIdsQuery";
-import { DatasetBase } from "../Datasets/DatasetBase";
-import { DatasetType } from "../Services/DatasetType";
-export class Dataset extends DatasetBase {
+import { AddFileCommand } from "../../Messages/AddFileCommand";
+import { DeleteFileCommand } from "../../Messages/DeleteFileCommand";
+import { DropDatasetCommand } from "../../Messages/DropDatasetCommand";
+import { ListFilesQuery } from "../../Messages/ListFilesQuery";
+import { GetFileQuery } from "../../Messages/GetFileQuery";
+import { UpdateFileCommand } from "../../Messages/UpdateFileCommand";
+import { ListFilesIdsQuery } from "../../Messages/ListFilesIdsQuery";
+import { DatasetBase } from "../DatasetBase";
+import { DatasetType } from "../../Services/DatasetType";
+import { DummyConverter } from "../../Converters/DummyConverter";
+export class ObjectDataset extends DatasetBase {
     _db;
-    _converter;
     dataset;
+    _converter;
     Type = DatasetType.Object;
-    constructor(_db, _converter, dataset) {
+    constructor(_db, dataset, _converter = new DummyConverter()) {
         super(_db, dataset);
         this._db = _db;
-        this._converter = _converter;
         this.dataset = dataset;
+        this._converter = _converter;
     }
     async GetOne(id) {
         this.Log(`Fetching "${id}"...`);

package/Datasets/Picture/DefaultPicsConfig.js

@@ -0,0 +1,4 @@
+export const DefaultPicsConfig = {
+    KeepSource: true,
+    Sizes: {}
+};

package/Datasets/Picture/PicConfig.d.ts

@@ -0,0 +1,4 @@
+export interface PicConfig {
+    ResizeToWidth?: number;
+    ResizeToHeight?: number;
+}

package/Datasets/{PicturesDataset → Picture}/PicsConfig.d.ts

@@ -1,4 +1,5 @@
 import { PicConfig } from "./PicConfig";
 export interface PicsConfig {
+    KeepSource: boolean;
     Sizes: Record<string, PicConfig>;
 }

package/Datasets/{PicturesDataset → Picture}/PicturePack.d.ts

@@ -1,5 +1,7 @@
 export interface PicturePack {
+    Url: string;
     Name: string;
-    Extension: string;
     Sizes: string[];
+    Extension: string;
+    Files: string[];
 }

package/Datasets/{ITextRepo.d.ts → Text/ITextRepo.d.ts}

@@ -1,4 +1,4 @@
-import { IRepoBase } from "./IRepoBase";
+import { IRepoBase } from "../IRepoBase";
 export interface ITextRepo extends IRepoBase {
     Create(id: string): Promise<void>;
     Read(id: string, offset: number, limit: number): Promise<string[]>;

package/Datasets/{RawTextDataset.d.ts → Text/RawTextDataset.d.ts}

@@ -1,8 +1,8 @@
-import { DatasetBase } from "../Datasets/DatasetBase";
-import { ITextRepo } from "../Datasets/ITextRepo";
-import { DatasetType } from "../Services/DatasetType";
-import { OnlineStorage } from "../Services/OnlineStorage";
-import { dir } from "../Types/dir";
+import { DatasetBase } from "../DatasetBase";
+import { ITextRepo } from "./ITextRepo";
+import { DatasetType } from "../../Services/DatasetType";
+import { OnlineStorage } from "../../Services/OnlineStorage";
+import { dir } from "../../Types/dir";
 export declare class RawTextDataset extends DatasetBase implements ITextRepo {
     protected _db: OnlineStorage;
     protected dataset: dir;

package/Datasets/{RawTextDataset.js → Text/RawTextDataset.js}

@@ -1,12 +1,12 @@
-import { DatasetBase } from "../Datasets/DatasetBase";
-import { AppendCommand } from "../Messages/AppendCommand";
-import { ClearCommand } from "../Messages/ClearCommand";
-import { CreateFileCommand } from "../Messages/CreateFileCommand";
-import { DeleteFileCommand } from "../Messages/DeleteFileCommand";
-import { DropDatasetCommand } from "../Messages/DropDatasetCommand";
-import { ListFilesIdsQuery } from "../Messages/ListFilesIdsQuery";
-import { ReadFileQuery } from "../Messages/ReadFileQuery";
-import { DatasetType } from "../Services/DatasetType";
+import { DatasetBase } from "../DatasetBase";
+import { AppendCommand } from "../../Messages/AppendCommand";
+import { ClearCommand } from "../../Messages/ClearCommand";
+import { CreateFileCommand } from "../../Messages/CreateFileCommand";
+import { DeleteFileCommand } from "../../Messages/DeleteFileCommand";
+import { DropDatasetCommand } from "../../Messages/DropDatasetCommand";
+import { ListFilesIdsQuery } from "../../Messages/ListFilesIdsQuery";
+import { ReadFileQuery } from "../../Messages/ReadFileQuery";
+import { DatasetType } from "../../Services/DatasetType";
 export class RawTextDataset extends DatasetBase {
     _db;
     dataset;

package/Datasets/{TextDataset.d.ts → Text/TextDataset.d.ts}

@@ -1,7 +1,7 @@
-import { OnlineStorage } from "../Services/OnlineStorage";
+import { OnlineStorage } from "../../Services/OnlineStorage";
 import { RawTextDataset } from "./RawTextDataset";
-import { ITextConverter } from "../Converters/ITextConverter";
-import { dir } from "../Types/dir";
+import { ITextConverter } from "../../Converters/ITextConverter";
+import { dir } from "../../Types/dir";
 export declare class TextDataset<T> extends RawTextDataset {
     protected _db: OnlineStorage;
     protected dataset: dir;

package/Datasets/{TextDataset.js → Text/TextDataset.js}

@@ -1,4 +1,4 @@
-import { JsonTextConverter } from "../Converters/JsonTextConverter";
+import { JsonTextConverter } from "../../Converters/JsonTextConverter";
 import { RawTextDataset } from "./RawTextDataset";
 export class TextDataset extends RawTextDataset {
     _db;

package/Services/OnlineStorage.d.ts

@@ -3,18 +3,18 @@ import { IMessage } from "../MessageBus/IMessage";
 import { ISender } from "../MessageBus/ISender";
 import { MessageBus } from "../MessageBus/MessageBus";
 import { MessageBusResponse } from "../MessageBus/MessageBusResponse";
-import { Dataset } from "../Datasets/Dataset";
+import { ObjectDataset } from "../Datasets/Object/ObjectDataset";
 import { IStorageUser } from "../Models/IStorageUser";
 import { IConverter } from "../Converters/IConverter";
 import { IStorageUserPrivileges } from "../Models/IStorageUserPrivileges";
 import { DatabaseInfo } from "../Models/DatabaseInfo";
 import { DatasetInfo } from "../Models/DatasetInfo";
-import { RawTextDataset } from "../Datasets/RawTextDataset";
-import { TextDataset } from "../Datasets/TextDataset";
+import { RawTextDataset } from "../Datasets/Text/RawTextDataset";
+import { TextDataset } from "../Datasets/Text/TextDataset";
 import { ITextConverter } from "../Converters/ITextConverter";
 import { DatasetType } from "./DatasetType";
-import { PicturesDataset } from "../Datasets/PicturesDataset/PicturesDataset";
-import { PicsConfig } from "../Datasets/PicturesDataset/PicsConfig";
+import { PicturesDataset } from "../Datasets/Picture/PicturesDataset";
+import { PicsConfig } from "../Datasets/Picture/PicsConfig";
 export declare class OnlineStorage {
     private server;
     private database;
@@ -23,7 +23,8 @@ export declare class OnlineStorage {
     private logEnabled;
     private readonly _bus;
     private onUserChange;
-    private USER_LOCAL_STORAGE_KEY;
+    private USER_LOCAL_STORAGE_KEY_PREFIX;
+    private userLocalStorageKey;
     get Server(): string;
     get DatabaseDir(): dir;
     constructor(server: url, database: dir, sender?: ISender, bus?: MessageBus);
@@ -35,7 +36,7 @@ export declare class OnlineStorage {
     AddUser(user: IStorageUser): Promise<void>;
     UpdateUser(user: IStorageUser): Promise<void>;
     DeleteUser(user: IStorageUser): Promise<void>;
-    GetDataset<T extends object>(datasetName: string, converter: IConverter<any, T>): Dataset<T>;
+    GetObjectDataset<T extends object>(datasetName: string, converter?: IConverter<any, T>): ObjectDataset<T>;
     GetTextDataset(datasetName: string, converter?: ITextConverter<any>): TextDataset<any> | RawTextDataset;
     GetPicturesDataset(datasetName: string, picsConfig?: PicsConfig): PicturesDataset;
     private IsBrowserEnvironment;
@@ -57,7 +58,7 @@ export declare class OnlineStorage {
     CreateDataset(type: DatasetType, datasetName: string): Promise<void>;
     DatasetExists(datasetName: string): Promise<boolean>;
     RemoveDataset(datasetName: string): Promise<void>;
-    Move(fileId: string, sourceDataset: Dataset<any>, targetDataset: Dataset<any>): Promise<void>;
+    Move(fileId: string, sourceDataset: ObjectDataset<any>, targetDataset: ObjectDataset<any>): Promise<void>;
     GetLogsList(): Promise<string[]>;
     GetLog(id: string): Promise<string>;
     ListDatabases(): Promise<DatabaseInfo[]>;

package/Services/OnlineStorage.js

@@ -2,7 +2,7 @@ import { MessageBus } from "../MessageBus/MessageBus";
 import { CreateDatasetCommand } from '../Messages/CreateDatasetCommand';
 import { DatasetExistsCommand } from '../Messages/DatasetExistsCommand';
 import { RemoveDatasetCommand } from '../Messages/RemoveDatasetCommand';
-import { Dataset } from "../Datasets/Dataset";
+import { ObjectDataset } from "../Datasets/Object/ObjectDataset";
 import { MoveFileCommand } from "../Messages/MoveFileCommand";
 import { LoginUserQuery } from "../Messages/LoginUserQuery";
 import { ListUsersQuery } from "../Messages/ListUsersQuery";
@@ -16,9 +16,9 @@ import { ListDatabasesQuery } from "../Messages/ListDatabasesQuery";
 import { CreateDatabaseCommand } from "../Messages/CreateDatabaseCommand";
 import { ListDatasetsQuery } from '../Messages/ListDatasetsQuery';
 import { DeleteDatabaseCommand } from "../Messages/DeleteDatabaseCommand";
-import { RawTextDataset } from "../Datasets/RawTextDataset";
-import { TextDataset } from "../Datasets/TextDataset";
-import { PicturesDataset } from "../Datasets/PicturesDataset/PicturesDataset";
+import { RawTextDataset } from "../Datasets/Text/RawTextDataset";
+import { TextDataset } from "../Datasets/Text/TextDataset";
+import { PicturesDataset } from "../Datasets/Picture/PicturesDataset";
 export class OnlineStorage {
     server;
     database;
@@ -27,7 +27,8 @@ export class OnlineStorage {
     logEnabled = false;
     _bus;
     onUserChange = [];
-    USER_LOCAL_STORAGE_KEY = "";
+    USER_LOCAL_STORAGE_KEY_PREFIX = "OnlineStorage:User:";
+    userLocalStorageKey = "";
     get Server() {
         return this.server;
     }
@@ -38,7 +39,7 @@ export class OnlineStorage {
         this.server = server;
         this.database = database;
         this._bus = bus || new MessageBus(server, sender);
-        this.USER_LOCAL_STORAGE_KEY = "OnlineStorage:User:" + this.database;
+        this.userLocalStorageKey = this.USER_LOCAL_STORAGE_KEY_PREFIX + this.database;
         if (this.LoadUserFromLocalStorage()) {
             this.CallOnUserChanged(true);
         }
@@ -50,7 +51,7 @@ export class OnlineStorage {
     }
     SetDatabase(database) {
         this.database = database;
-        this.USER_LOCAL_STORAGE_KEY = "OnlineStorage:User:" + this.database;
+        this.userLocalStorageKey = this.USER_LOCAL_STORAGE_KEY_PREFIX + this.database;
         return this;
     }
     async ListDatasets() {
@@ -101,8 +102,8 @@ export class OnlineStorage {
         this.Log(`User "${user.Id}" deleted.`);
     }
     ;
-    GetDataset(datasetName, converter) {
-        return new Dataset(this, converter, datasetName);
+    GetObjectDataset(datasetName, converter) {
+        return new ObjectDataset(this, datasetName, converter);
     }
     GetTextDataset(datasetName, converter) {
         return converter
@@ -117,7 +118,7 @@ export class OnlineStorage {
     }
     LoadUserFromLocalStorage() {
         if (this.IsBrowserEnvironment()) {
-            const user = window.localStorage.getItem(this.USER_LOCAL_STORAGE_KEY);
+            const user = window.localStorage.getItem(this.userLocalStorageKey);
             if (user) {
                 this.user = JSON.parse(user);
                 this.SetUser(this.user || this.ANONYMOUS_USER);
@@ -142,7 +143,7 @@ export class OnlineStorage {
     }
     SaveUserInLocalStorage() {
         if (this.IsBrowserEnvironment()) {
-            window.localStorage.setItem(this.USER_LOCAL_STORAGE_KEY, JSON.stringify(this.user));
+            window.localStorage.setItem(this.userLocalStorageKey, JSON.stringify(this.user));
         }
     }
     OnUserChange(handler) {

package/index.d.ts

@@ -9,17 +9,17 @@ export * from "./Converters/DummyConverter";
 export * from "./Converters/ITextConverter";
 export * from "./Converters/JsonTextConverter";
 export * from "./Datasets/IRepoBase";
-export * from "./Datasets/IRepo";
-export * from "./Datasets/ITextRepo";
-export * from "./Datasets/IRepos";
+export * from "./Datasets/Object/IRepo";
+export * from "./Datasets/Text/ITextRepo";
+export * from "./Datasets/Object/IRepos";
 export * from "./Datasets/DatasetBase";
-export * from "./Datasets/Dataset";
-export * from "./Datasets/RawTextDataset";
-export * from "./Datasets/TextDataset";
-export * from "./Datasets/PicturesDataset/PicturesDataset";
-export * from "./Datasets/PicturesDataset/PicConfig";
-export * from "./Datasets/PicturesDataset/PicsConfig";
-export * from "./Datasets/PicturesDataset/PicturePack";
-export * from "./Datasets/PicturesDataset/PicturesUploadResult";
+export * from "./Datasets/Object/ObjectDataset";
+export * from "./Datasets/Text/RawTextDataset";
+export * from "./Datasets/Text/TextDataset";
+export * from "./Datasets/Picture/PicturesDataset";
+export * from "./Datasets/Picture/PicConfig";
+export * from "./Datasets/Picture/PicsConfig";
+export * from "./Datasets/Picture/PicturePack";
+export * from "./Datasets/Picture/PicturesUploadResult";
 export * from "./Services/DatasetType";
 export * from "./Services/OnlineStorage";

package/index.js

@@ -9,17 +9,17 @@ export * from "./Converters/DummyConverter";
 export * from "./Converters/ITextConverter";
 export * from "./Converters/JsonTextConverter";
 export * from "./Datasets/IRepoBase";
-export * from "./Datasets/IRepo";
-export * from "./Datasets/ITextRepo";
-export * from "./Datasets/IRepos";
+export * from "./Datasets/Object/IRepo";
+export * from "./Datasets/Text/ITextRepo";
+export * from "./Datasets/Object/IRepos";
 export * from "./Datasets/DatasetBase";
-export * from "./Datasets/Dataset";
-export * from "./Datasets/RawTextDataset";
-export * from "./Datasets/TextDataset";
-export * from "./Datasets/PicturesDataset/PicturesDataset";
-export * from "./Datasets/PicturesDataset/PicConfig";
-export * from "./Datasets/PicturesDataset/PicsConfig";
-export * from "./Datasets/PicturesDataset/PicturePack";
-export * from "./Datasets/PicturesDataset/PicturesUploadResult";
+export * from "./Datasets/Object/ObjectDataset";
+export * from "./Datasets/Text/RawTextDataset";
+export * from "./Datasets/Text/TextDataset";
+export * from "./Datasets/Picture/PicturesDataset";
+export * from "./Datasets/Picture/PicConfig";
+export * from "./Datasets/Picture/PicsConfig";
+export * from "./Datasets/Picture/PicturePack";
+export * from "./Datasets/Picture/PicturesUploadResult";
 export * from "./Services/DatasetType";
 export * from "./Services/OnlineStorage";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tblabs/storage",
-  "version": "5.12.10",
+  "version": "5.13.1",
   "description": "online storage module with auth",
   "license": "beerware",
   "main": "index.js",

package/Datasets/Dataset.d.ts

@@ -1,20 +0,0 @@
-import { OnlineStorage } from "../Services/OnlineStorage";
-import { IConverter } from "../Converters/IConverter";
-import { IRepo } from "../Datasets/IRepo";
-import { dir } from "../Types/dir";
-import { DatasetBase } from "../Datasets/DatasetBase";
-import { DatasetType } from "../Services/DatasetType";
-export declare class Dataset<T extends object> extends DatasetBase implements IRepo<T> {
-    protected _db: OnlineStorage;
-    protected _converter: IConverter<any, T>;
-    protected dataset: dir;
-    Type: DatasetType;
-    constructor(_db: OnlineStorage, _converter: IConverter<any, T>, dataset: dir);
-    GetOne(id: string): Promise<T>;
-    GetAll(): Promise<T[]>;
-    GetAllIds(): Promise<string[]>;
-    Add(id: string, item: T): Promise<void>;
-    Update(id: string, item: T): Promise<void>;
-    Delete(id: string): Promise<void>;
-    Drop(): Promise<void>;
-}

package/Datasets/PicturesDataset/DefaultPicsConfig.js

@@ -1,7 +0,0 @@
-export const DefaultPicsConfig = {
-    Sizes: {
-        "h1024": { ResizeTo: "height", Height: 1024 },
-        "w256": { ResizeTo: "width", Width: 256 },
-        "w64": { ResizeTo: "width", Width: 64 }
-    }
-};

package/Datasets/PicturesDataset/PicConfig.d.ts

@@ -1,5 +0,0 @@
-export interface PicConfig {
-    ResizeTo: "height" | "width";
-    Height?: number;
-    Width?: number;
-}