revdev 0.367.0 → 0.369.0

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

@@ -9,4 +9,5 @@ export interface BoInitData {
     localeCodes: string[];
     settings: AppSettings;
     permissionOptions: BoAdminPermissionOption[];
+    ruleCategoryOptions: StringOption[];
 }

package/lib/back/index.d.ts

@@ -20,6 +20,7 @@ export * from "./episode";
 export * from "./exercise";
 export * from "./item";
 export * from "./rule";
+export * from "./ruleCategory";
 export * from "./admin";
 export * from "./ai";
 export * from "./topic";

package/lib/back/index.js

@@ -36,6 +36,7 @@ __exportStar(require("./episode"), exports);
 __exportStar(require("./exercise"), exports);
 __exportStar(require("./item"), exports);
 __exportStar(require("./rule"), exports);
+__exportStar(require("./ruleCategory"), exports);
 __exportStar(require("./admin"), exports);
 __exportStar(require("./ai"), exports);
 __exportStar(require("./topic"), exports);

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

@@ -6,7 +6,7 @@ export interface BoGenerateItemChoiceRequest {
     count: number;
     exerciseId: string;
     altRuleIds: string[];
-    incorrectAnswerTotal?: number;
+    answerTotal?: number;
 }
 export interface BoCreateItemChoiceSetRequest {
     exerciseId: string;
@@ -14,6 +14,7 @@ export interface BoCreateItemChoiceSetRequest {
         content: string;
         answers: string[];
         correctAnswerIndex: number;
+        ruleId?: string;
     }[];
 }
 export interface BoUpdateItemRegularRequest {

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

@@ -1,4 +1,4 @@
-import { ContentType, EntryStatus, LevelGen } from "../../common";
+import { EntryStatus, LevelGen, NameGen, SelectOption } from "../../common";
 export interface BoRuleRecord {
     id: string;
     langCode: string;
@@ -12,10 +12,12 @@ export interface BoRuleRecord {
     levels: LevelGen[];
     levelTotal: number;
     userTotal: number;
+    category?: NameGen;
 }
-export interface BoRuleModifier extends Omit<BoRuleRecord, "levelTotal" | "userTotal"> {
-    contentType: ContentType;
-    content: string;
-    note?: string;
-    description: string;
+export interface BoRuleExerciseGenerator {
+    langCode: string;
+    rule: NameGen;
+    category?: NameGen;
+    ignoreRuleIds: string[];
+    altRuleOptions: SelectOption[];
 }

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

@@ -1,4 +1,4 @@
-import { ContentType } from "../../common";
+import { ContentType, EntryStatus, LangOptionRequest, LevelGen, ValueOption } from "../../common";
 import { LangFeedRequest } from "../../feed";
 export interface BoCreateRuleRequest {
     langCode: string;
@@ -9,10 +9,19 @@ export interface BoCreateRuleRequest {
     note?: string;
     predefinedOptions?: string[];
     description: string;
+    categoryId?: string;
 }
 export interface BoUpdateRuleRequest extends BoCreateRuleRequest {
     id: string;
 }
+export interface BoRuleModifier extends BoUpdateRuleRequest {
+    categoryOption?: ValueOption;
+    created: string;
+    active: boolean;
+    status?: EntryStatus;
+    exerciseTotal: number;
+    levels: LevelGen[];
+}
 export interface BoRuleFeedRequest extends LangFeedRequest {
     hasLevel?: boolean;
     levelCode?: string;
@@ -26,3 +35,6 @@ export interface BoDeleteRuleLevelRequest {
     ruleId: string;
     levelCode: string;
 }
+export interface BoRuleOptionRequest extends LangOptionRequest {
+    categoryId?: string;
+}

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

@@ -0,0 +1,8 @@
+import { NameGen } from "../..";
+export interface BoRuleCategoryRecord {
+    id: string;
+    langCode: string;
+    name: string;
+    rootRule?: NameGen;
+    ruleTotal: number;
+}

package/lib/back/ruleCategory/entity.js

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

package/lib/back/ruleCategory/index.d.ts

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

package/lib/back/ruleCategory/index.js

@@ -0,0 +1,18 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./entity"), exports);
+__exportStar(require("./request"), exports);

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

@@ -0,0 +1,12 @@
+import { ValueOption } from "../../common";
+export interface BoCreateRuleCategoryRequest {
+    langCode: string;
+    name: string;
+    rootRuleId?: string;
+}
+export interface BoUpdateRuleCategoryRequest extends BoCreateRuleCategoryRequest {
+    id: string;
+}
+export interface BoRuleCategoryModifier extends BoUpdateRuleCategoryRequest {
+    rootRuleOption?: ValueOption;
+}

package/lib/back/ruleCategory/request.js

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

package/lib/common/enums.d.ts

@@ -122,6 +122,7 @@ export declare enum AiPromptName {
     WordMeaning = "wordMeaning",
     WordTranscription = "wordTranscription",
     ExerciseItemChoice = "exerciseItemChoice",
+    RuleItemChoice = "ruleItemChoice",
     WordLevel = "wordLevel",
     RuleLevel = "ruleLevel"
 }

package/lib/common/enums.js

@@ -154,6 +154,7 @@ var AiPromptName;
     AiPromptName["WordMeaning"] = "wordMeaning";
     AiPromptName["WordTranscription"] = "wordTranscription";
     AiPromptName["ExerciseItemChoice"] = "exerciseItemChoice";
+    AiPromptName["RuleItemChoice"] = "ruleItemChoice";
     AiPromptName["WordLevel"] = "wordLevel";
     AiPromptName["RuleLevel"] = "ruleLevel";
 })(AiPromptName || (exports.AiPromptName = AiPromptName = {}));

package/lib/shared/exercise/regular.d.ts

@@ -1,24 +1,22 @@
 import { EntryStatus, ExerciseKind } from "../../common";
-export interface CreateExerciseRegularRequest {
-    episodeId?: string;
-    ruleId?: string;
+export interface CreateExerciseRequest {
+    ruleId: string;
     kind: ExerciseKind;
 }
-export interface UpdateExerciseRegularRequest extends Pick<CreateExerciseRegularRequest, "kind"> {
+export interface UpdateExerciseRequest extends Pick<CreateExerciseRequest, "kind"> {
     id: string;
 }
-export interface ExerciseRegularModifier extends CreateExerciseRegularRequest {
+export interface ExerciseModifier extends CreateExerciseRequest {
     id: string;
     valid: boolean;
-    exerciseRuleId?: string;
     itemTotal: number;
     active: boolean;
     status?: EntryStatus;
 }
-export interface GenerateExerciseRegularRequest {
+export interface GenerateExerciseRequest {
     ruleId: string;
     kind: ExerciseKind;
     itemCount: number;
     altRuleIds: string[];
-    incorrectAnswerTotal?: number;
+    answerTotal?: number;
 }

package/lib/tests/array.test.js

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

package/lib/utils/array.d.ts

@@ -1,4 +1,4 @@
 export declare class ArrayUtil {
-    static toArray<T>(item: T | T[]): T[];
+    static toArray<T>(item?: T | T[]): T[];
     static shuffle<T>(array: T[]): void;
 }

package/lib/utils/array.js

@@ -5,7 +5,12 @@ var ArrayUtil = /** @class */ (function () {
     function ArrayUtil() {
     }
     ArrayUtil.toArray = function (item) {
-        return Array.isArray(item) ? item : [item];
+        if (Array.isArray(item)) {
+            return item;
+        }
+        else {
+            return item !== undefined ? [item] : [];
+        }
     };
     ArrayUtil.shuffle = function (array) {
         var _a;

package/lib/utils/regex.d.ts

@@ -1,10 +1,12 @@
 export declare class RegexUtil {
     private static slugRegex;
+    private static shortSlugRegex;
     private static usernameRegex;
     private static tagCodeRegex;
     private static emailRegex;
     private static passwordRegex;
     static slug(slug: string): boolean;
+    static shortSlug(slug: string): boolean;
     static username(text: string): boolean;
     static tagCode(text: string): boolean;
     static email(text: string): boolean;

package/lib/utils/regex.js

@@ -8,6 +8,10 @@ var RegexUtil = /** @class */ (function () {
         this.slugRegex.lastIndex = 0;
         return this.slugRegex.test(slug);
     };
+    RegexUtil.shortSlug = function (slug) {
+        this.shortSlugRegex.lastIndex = 0;
+        return this.shortSlugRegex.test(slug);
+    };
     RegexUtil.username = function (text) {
         this.usernameRegex.lastIndex = 0;
         return this.usernameRegex.test(text);
@@ -28,6 +32,8 @@ var RegexUtil = /** @class */ (function () {
     };
     // min: 6, max: 50
     RegexUtil.slugRegex = /^[a-z][a-z0-9-]{4,48}[a-z0-9]$/g;
+    // min: 1, max: 50
+    RegexUtil.shortSlugRegex = /^[a-z](?:[a-z0-9-]{0,48}[a-z0-9])?$/g;
     // min: 6, max: 50
     RegexUtil.usernameRegex = /^[a-z][a-z0-9]{5,48}$/g;
     RegexUtil.tagCodeRegex = /^[a-z]([-]?[a-z]+)*$/g;

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

@@ -19,6 +19,25 @@ describe("RegexUtil", function () {
             validate("1mylist", false);
         });
     });
+    describe("shortSlug", function () {
+        function validate(text, valid) {
+            if (valid === void 0) { valid = true; }
+            expect(regex_1.RegexUtil.shortSlug(text)).toBe(valid);
+        }
+        test("true", function () {
+            validate("a");
+            validate("my-list");
+            validate("m12345");
+            validate("a".repeat(50));
+        });
+        test("false", function () {
+            validate("", false);
+            validate("-mylist", false);
+            validate("1mylist", false);
+            validate("mylist-", false);
+            validate("a".repeat(51), false);
+        });
+    });
     describe("username", function () {
         function validate(text, valid) {
             if (valid === void 0) { valid = true; }

package/package.json

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