revdev 0.233.0 → 0.235.0

package/lib/back/common/entity.d.ts

@@ -1,8 +1,9 @@
-import { IdCodeOption } from "../../common";
+import { IdCodeOption, StringOption } from "../../common";
+import { AppSettings } from "../../shared";
 export interface BoInitData {
-    langCodes: string[];
+    langOptions: StringOption[];
     speechPartOptions: IdCodeOption[];
     quizCodes: string[];
     localeCodes: string[];
-    localeTexts: [string, string][];
+    settings: AppSettings;
 }

package/lib/back/wordImage/entity.d.ts

@@ -1,14 +1,26 @@
-import { DualContribGen, EntryStatus } from "../../common";
+import { ContribGen, DualContribGen, EntryStatus, ImageGen, UserReaction } from "../../common";
 import { WordGen } from "../../shared";
 export interface BoWordImageRecord {
     id: string;
     word: WordGen;
-    imageId: string;
-    fileName: string;
-    thumbnailFileName: string;
+    image: ImageGen;
     contrib: DualContribGen;
     wordTotal: number;
     rate: number;
     active: boolean;
     status?: EntryStatus;
 }
+interface WordImageContainerRecord {
+    id: string;
+    wordImageId: string;
+    word: WordGen;
+    image: ImageGen;
+    rate: number;
+    contrib: ContribGen;
+}
+export interface BoWordImageReactionRecord extends WordImageContainerRecord {
+    reaction: UserReaction;
+}
+export interface BoWordImagePinRecord extends WordImageContainerRecord {
+}
+export {};

package/lib/back/wordImage/request.d.ts

@@ -2,8 +2,3 @@ import { LangFeedRequest } from "../../feed";
 export interface BoWordImageFeedRequest extends LangFeedRequest {
     wordId?: string;
 }
-export interface BoUploadWordImageRequest {
-    langCode: string;
-    text: string;
-    [key: string]: any;
-}

package/lib/common/exception.d.ts

@@ -31,5 +31,6 @@ export declare enum ExceptionCodes {
     ImageCannotUploadInDevelopmentFolder = "ImageCannotUploadInDevelopmentFolder",
     CsvParsingValidation = "CsvParsingValidation",
     EntryStatusCannotBeChangedForAdminEntity = "EntryStatusCannotBeChangedForAdminEntity",
-    MaxTranWordPinsExceeded = "MaxTranWordPinsExceeded"
+    MaxTranWordPinsExceeded = "MaxTranWordPinsExceeded",
+    MaxWordImagePinsExceeded = "MaxWordImagePinsExceeded"
 }

package/lib/common/exception.js

@@ -39,4 +39,5 @@ var ExceptionCodes;
     // entry status
     ExceptionCodes["EntryStatusCannotBeChangedForAdminEntity"] = "EntryStatusCannotBeChangedForAdminEntity";
     ExceptionCodes["MaxTranWordPinsExceeded"] = "MaxTranWordPinsExceeded";
+    ExceptionCodes["MaxWordImagePinsExceeded"] = "MaxWordImagePinsExceeded";
 })(ExceptionCodes = exports.ExceptionCodes || (exports.ExceptionCodes = {}));

package/lib/common/image.d.ts

@@ -0,0 +1,5 @@
+export interface ImageGen {
+    id: string;
+    fileName: string;
+    thumbnailFileName: string;
+}

package/lib/common/image.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/common/index.d.ts

@@ -8,3 +8,5 @@ export * from "./gen";
 export * from "./link";
 export * from "./feed";
 export * from "./exception";
+export * from "./modifier";
+export * from "./image";

package/lib/common/index.js

@@ -20,3 +20,5 @@ __exportStar(require("./gen"), exports);
 __exportStar(require("./link"), exports);
 __exportStar(require("./feed"), exports);
 __exportStar(require("./exception"), exports);
+__exportStar(require("./modifier"), exports);
+__exportStar(require("./image"), exports);

package/lib/common/modifier.d.ts

@@ -0,0 +1,12 @@
+import { UserReaction } from "./enums";
+export interface ReactionModifier {
+    id: string;
+    reaction?: UserReaction;
+    reactionId?: string;
+    rate: number;
+}
+export interface PinModifier {
+    id: string;
+    pinned?: boolean;
+    pinId?: string;
+}

package/lib/common/modifier.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/common/request.d.ts

@@ -17,10 +17,18 @@ export interface WordIdsRequest {
 }
 export interface ReactionRequest {
     reaction: UserReaction;
+    id: string;
 }
 export interface PinRequest {
     pin: boolean;
+    id: string;
 }
 export interface TokenRequest {
     token: string;
 }
+export interface OptionRequest {
+    search?: string;
+}
+export interface LangOptionRequest extends OptionRequest {
+    langCode: string;
+}

package/lib/front/general/entity.d.ts

@@ -1,4 +1,5 @@
 import { IdCodeOption } from "../../common";
+import { AppSettings } from "../../shared";
 import { FeLangRecord } from "../lang";
 import { FeListRecord } from "../list";
 import { FeTableRecord } from "../table";
@@ -8,6 +9,7 @@ export interface FeInitData {
     speechPartOptions: IdCodeOption[];
     quizCodes: string[];
     localeCodes: string[];
+    settings: AppSettings;
 }
 export interface FeIntroductionData {
     langs: FeLangRecord[];

package/lib/front/tran/entity.d.ts

@@ -1,4 +1,4 @@
-import { ContribGen, UserReaction } from "../../common";
+import { ContribGen, PinModifier, UserReaction } from "../../common";
 import { TranRecord } from "../../shared";
 import { WordDataGen } from "../word";
 export interface FeTranRecord extends Omit<TranRecord, "dest"> {
@@ -8,3 +8,6 @@ export interface FeTranRecord extends Omit<TranRecord, "dest"> {
     pinned: boolean;
     contrib?: ContribGen;
 }
+export interface FeTranWordPinModifier extends PinModifier {
+    tranId: string;
+}

package/lib/front/tran/request.d.ts

@@ -1,15 +1,4 @@
-import { PinRequest, ReactionRequest } from "../../common";
-export interface FeTranWordPinRequest extends PinRequest {
+import { PinRequest } from "../../common";
+export interface FeTranWordPinRequest extends Pick<PinRequest, "pin"> {
     tranWordId: string;
 }
-export interface FeTranWordPinModifier extends FeTranWordPinRequest {
-    tranId: string;
-    id: string;
-}
-export interface FeTranReactionRequest extends ReactionRequest {
-    tranId: string;
-}
-export interface FeTranReactionModifier extends FeTranReactionRequest {
-    rate: number;
-    id: string;
-}

package/lib/front/word/entity.d.ts

@@ -1,7 +1,7 @@
 import { Feed } from "../../feed";
 import { QuizCode, QuizMode, DualContribGen, AccessGen, ContribGen } from "../../common";
 import { FeTranRecord } from "../tran";
-import { ReactionGen, WordUserGen } from "../../shared";
+import { WordUserGen } from "../../shared";
 import { FeWordImageRecord } from "../wordImage";
 export interface WordDataGen extends WordUserGen {
     attempts?: FeWordAttempt[];
@@ -13,7 +13,6 @@ export interface WordDataGen extends WordUserGen {
 export interface FeWordTag {
     wordId: string;
     tagCode: string;
-    reaction: ReactionGen;
     contrib: ContribGen;
 }
 export interface FeWordAttempt {
@@ -30,7 +29,6 @@ export interface FeWordAudio {
     wordId: string;
     audioId: string;
     fileName: string;
-    reaction: ReactionGen;
     contrib: ContribGen;
 }
 export interface FeWordSpeechPart {

package/lib/front/wordImage/entity.d.ts

@@ -1,13 +1,11 @@
-import { DualContribGen, UserReaction } from "../../common";
+import { ContribGen, ImageGen, UserReaction } from "../../common";
 export interface FeWordImageRecord {
     id: string;
     wordId: string;
-    imageId: string;
-    fileName: string;
-    thumbnailFileName: string;
+    image: ImageGen;
     active: boolean;
     rate: number;
     reaction: UserReaction;
     pinned: boolean;
-    contrib: DualContribGen;
+    contrib: ContribGen;
 }

package/lib/shared/general/entity.d.ts

@@ -5,11 +5,27 @@ export interface WordKnowledge {
     unknown: number;
 }
 export declare type UserWordKnowing = [number, number];
-export interface ReactionGen {
-    rate: number;
-    userRate: number;
-}
 export interface UpdatedEntity {
     id: string;
     slug: string;
 }
+export interface AppSettings {
+    readonly maxQuizWords: number;
+    readonly feedTake: number;
+    readonly shortFeedTake: number;
+    readonly maxListWords: number;
+    readonly maxTableRows: number;
+    readonly maxTableColumns: number;
+    readonly maxTableCellWords: number;
+    readonly resetPasswordTokenLifeHours: number;
+    readonly proveKnowingWords: number;
+    readonly wordSetTake: number;
+    readonly wordAttemptTake: number;
+    readonly wordImageMinDimension: number;
+    readonly wordImageOptimalDimension: number;
+    readonly wordImageThumbnailSize: number;
+    readonly initRateRange: [number, number];
+    readonly maxTranWordPins: number;
+    readonly maxWordImagePins: number;
+    readonly optionCount: number;
+}

package/lib/shared/wordImage/index.d.ts

@@ -1 +1,2 @@
 export * from "./entity";
+export * from "./request";

package/lib/shared/wordImage/index.js

@@ -11,3 +11,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./entity"), exports);
+__exportStar(require("./request"), exports);

package/lib/shared/wordImage/request.d.ts

@@ -0,0 +1,3 @@
+export interface UploadWordImageRequest {
+    wordId: string;
+}

package/lib/shared/wordImage/request.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/tests/array.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/tests/array.test.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var utils_1 = require("../utils");
+describe("ArrayUtil Test", function () {
+    test("true", function () {
+        expect(utils_1.ArrayUtil.toArray(1)).toMatchObject([1]);
+        expect(utils_1.ArrayUtil.toArray("text")).toMatchObject(["text"]);
+    });
+});

package/lib/utils/fileName.d.ts

@@ -0,0 +1,5 @@
+export declare class FileNameUtil {
+    static extension(fileName: string): string | undefined;
+    static parseAccept(accept: string): string[];
+    static extensionMatch(fileName: string, accept: string): boolean;
+}

package/lib/utils/fileName.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FileNameUtil = void 0;
+var FileNameUtil = /** @class */ (function () {
+    function FileNameUtil() {
+    }
+    FileNameUtil.extension = function (fileName) {
+        return fileName === null || fileName === void 0 ? void 0 : fileName.split(".").pop();
+    };
+    FileNameUtil.parseAccept = function (accept) {
+        var extensions = (accept === null || accept === void 0 ? void 0 : accept.split(",").map(function (text) { return text.trim().replace(/^./, ""); })) || [];
+        return extensions;
+    };
+    FileNameUtil.extensionMatch = function (fileName, accept) {
+        var extension = FileNameUtil.extension(fileName);
+        var allowExtensions = FileNameUtil.parseAccept(accept);
+        return allowExtensions.includes(extension || "");
+    };
+    return FileNameUtil;
+}());
+exports.FileNameUtil = FileNameUtil;

package/lib/utils/index.d.ts

@@ -4,3 +4,4 @@ export * from "./string";
 export * from "./regex";
 export * from "./array";
 export * from "./link";
+export * from "./fileName";

package/lib/utils/index.js

@@ -16,3 +16,4 @@ __exportStar(require("./string"), exports);
 __exportStar(require("./regex"), exports);
 __exportStar(require("./array"), exports);
 __exportStar(require("./link"), exports);
+__exportStar(require("./fileName"), exports);

package/lib/utils/tests/fileName.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/utils/tests/fileName.test.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var fileName_1 = require("../fileName");
+describe("FileNameUtil", function () {
+    test("extension", function () {
+        expect(fileName_1.FileNameUtil.extension("file.txt")).toBe("txt");
+        expect(fileName_1.FileNameUtil.extension("first.file.txt")).toBe("txt");
+        expect(fileName_1.FileNameUtil.extension("file")).toBe("file");
+        expect(fileName_1.FileNameUtil.extension("")).toBe("");
+        expect(fileName_1.FileNameUtil.extension(undefined)).toBe(undefined);
+    });
+    test("parseAccept", function () {
+        expect(fileName_1.FileNameUtil.parseAccept(".jpg,.png")).toMatchObject(["jpg", "png"]);
+        expect(fileName_1.FileNameUtil.parseAccept(".jpg , .png")).toMatchObject(["jpg", "png"]);
+    });
+    test("extensionMatch", function () {
+        expect(fileName_1.FileNameUtil.extensionMatch("file.jpg", ".jpg,.png")).toBeTruthy();
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "revdev",
-  "version": "0.233.0",
+  "version": "0.235.0",
   "description": "",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",