@tblabs/storage 5.12.0 → 5.12.2

package/Datasets/Dataset.d.ts

@@ -3,10 +3,12 @@ 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[]>;

package/Datasets/Dataset.js

@@ -6,10 +6,12 @@ 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 {
     _db;
     _converter;
     dataset;
+    Type = DatasetType.Objects;
     constructor(_db, _converter, dataset) {
         super(_db, dataset);
         this._db = _db;

package/Datasets/DatasetBase.d.ts

@@ -1,9 +1,12 @@
 import { IStorageUserPrivileges } from "../Models/IStorageUserPrivileges";
+import { DatasetType } from "../Services/DatasetType";
 import { OnlineStorage } from "../Services/OnlineStorage";
 import { dir } from "../Types/dir";
-export declare class DatasetBase {
+export declare abstract class DatasetBase {
     protected _db: OnlineStorage;
     protected dataset: dir;
+    abstract Type: DatasetType;
+    abstract GetAllIds(): Promise<string[]>;
     constructor(_db: OnlineStorage, dataset: dir);
     get Name(): string;
     get Database(): OnlineStorage;

package/Datasets/PicturesDataset/PicturesDataset.d.ts

@@ -4,12 +4,16 @@ import { DatasetBase } from "../DatasetBase";
 import { PicturesUploadResult } from "./PicturesUploadResult";
 import { PicsConfig } from "./PicsConfig";
 import { PicturePack } from "./PicturePack";
+import { DatasetType } from "../../Services/DatasetType";
 export declare class PicturesDataset extends DatasetBase {
     protected _db: OnlineStorage;
     protected dataset: dir;
     protected picsConfig: PicsConfig;
+    Type: DatasetType;
     constructor(_db: OnlineStorage, dataset: dir, picsConfig?: PicsConfig);
-    ListPictures(): Promise<PicturePack[]>;
+    GetAllIds(): Promise<string[]>;
+    GetPicture(id: string): Promise<PicturePack>;
+    GetAllPictures(): Promise<PicturePack[]>;
     UploadPictures(files: File[]): Promise<PicturesUploadResult>;
     DeletePicture(id: string): Promise<void>;
 }

package/Datasets/PicturesDataset/PicturesDataset.js

@@ -3,17 +3,35 @@ import { ListPicturesQuery } from "../../Messages/ListPicturesQuery";
 import { DatasetBase } from "../DatasetBase";
 import { DefaultPicsConfig } from "./DefaultPicsConfig";
 import { PicturesUploadResult } from "./PicturesUploadResult";
+import { DatasetType } from "../../Services/DatasetType";
+import { ListPicturesIdsQuery } from "../../Messages/ListPicturesIdsQuery";
+import { GetPictureQuery } from "../../Messages/GetPictureQuery";
 export class PicturesDataset extends DatasetBase {
     _db;
     dataset;
     picsConfig;
+    Type = DatasetType.Pictures;
     constructor(_db, dataset, picsConfig = DefaultPicsConfig) {
         super(_db, dataset);
         this._db = _db;
         this.dataset = dataset;
         this.picsConfig = picsConfig;
     }
-    async ListPictures() {
+    async GetAllIds() {
+        const result = await this._db.Send(new ListPicturesIdsQuery(this._db.DatabaseDir, this.dataset));
+        if (!result.IsSuccess) {
+            throw new Error("Failed to list pictures ids: " + result.ErrorMessage);
+        }
+        return result.Result;
+    }
+    async GetPicture(id) {
+        const result = await this._db.Send(new GetPictureQuery(this._db.DatabaseDir, this.dataset, id));
+        if (!result.IsSuccess) {
+            throw new Error("Failed to get picture: " + result.ErrorMessage);
+        }
+        return result.Result;
+    }
+    async GetAllPictures() {
         const result = await this._db.Send(new ListPicturesQuery(this._db.DatabaseDir, this.dataset));
         if (!result.IsSuccess) {
             throw new Error("Failed to list picture packs: " + result.ErrorMessage);

package/Datasets/RawTextDataset.d.ts

@@ -1,10 +1,12 @@
 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";
 export declare class RawTextDataset extends DatasetBase implements ITextRepo {
     protected _db: OnlineStorage;
     protected dataset: dir;
+    Type: DatasetType;
     constructor(_db: OnlineStorage, dataset: dir);
     Read(id: string, offset?: number, limit?: number): Promise<string[]>;
     GetAllIds(): Promise<string[]>;

package/Datasets/RawTextDataset.js

@@ -5,9 +5,11 @@ 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;
+    Type = DatasetType.Texts;
     constructor(_db, dataset) {
         super(_db, dataset);
         this._db = _db;

package/Messages/GetPictureQuery.d.ts

@@ -0,0 +1,5 @@
+import { Message } from '../MessageBus/Message';
+import { dir } from '../Types/dir';
+export declare class GetPictureQuery extends Message {
+    constructor(Database: dir, Dataset: dir, FileId: string);
+}

package/Messages/GetPictureQuery.js

@@ -0,0 +1,6 @@
+import { Message } from '../MessageBus/Message';
+export class GetPictureQuery extends Message {
+    constructor(Database, Dataset, FileId) {
+        super("GetPicture", { Database, Dataset, FileId });
+    }
+}

package/Messages/ListPicturesIdsQuery.d.ts

@@ -0,0 +1,5 @@
+import { Message } from '../MessageBus/Message';
+import { dir } from '../Types/dir';
+export declare class ListPicturesIdsQuery extends Message {
+    constructor(Database: dir, Dataset: dir);
+}

package/Messages/ListPicturesIdsQuery.js

@@ -0,0 +1,6 @@
+import { Message } from '../MessageBus/Message';
+export class ListPicturesIdsQuery extends Message {
+    constructor(Database, Dataset) {
+        super("ListPicturesIds", { Database, Dataset });
+    }
+}

package/Services/OnlineStorage.d.ts

@@ -13,6 +13,8 @@ import { RawTextDataset } from "../Datasets/RawTextDataset";
 import { TextDataset } from "../Datasets/TextDataset";
 import { ITextConverter } from "../Converters/ITextConverter";
 import { DatasetType } from "./DatasetType";
+import { PicturesDataset } from "../Datasets/PicturesDataset/PicturesDataset";
+import { PicsConfig } from "../Datasets/PicturesDataset/PicsConfig";
 export declare class OnlineStorage {
     private server;
     private database;
@@ -35,6 +37,7 @@ export declare class OnlineStorage {
     DeleteUser(user: IStorageUser): Promise<void>;
     GetDataset<T extends object>(datasetName: string, converter: IConverter<any, T>): Dataset<T>;
     GetTextDataset(datasetName: string, converter?: ITextConverter<any>): TextDataset<any> | RawTextDataset;
+    GetPicturesDataset(datasetName: string, picsConfig: PicsConfig): PicturesDataset;
     private IsBrowserEnvironment;
     private LoadUserFromLocalStorage;
     get User(): IStorageUser;

package/Services/OnlineStorage.js

@@ -18,6 +18,7 @@ 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";
 export class OnlineStorage {
     server;
     database;
@@ -108,6 +109,9 @@ export class OnlineStorage {
             ? new TextDataset(this, datasetName, converter)
             : new RawTextDataset(this, datasetName);
     }
+    GetPicturesDataset(datasetName, picsConfig) {
+        return new PicturesDataset(this, datasetName, picsConfig);
+    }
     IsBrowserEnvironment() {
         return typeof window !== "undefined" && typeof window.localStorage !== "undefined";
     }

package/package.json

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