revdev 0.382.0 → 0.384.0

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

@@ -3,7 +3,6 @@ export interface BoExerciseRecord {
     id: string;
     type: ExerciseType;
     contrib: DualContribGen;
-    episodeId?: string;
     position: number;
     valid: boolean;
     errorText?: string;

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

@@ -1,7 +1,6 @@
 import { LangOptionRequest } from "../../common";
 import { FeedRequest } from "../../feed";
 export interface BoExerciseFeedRequest extends FeedRequest {
-    episodeId?: string;
     ruleId?: string;
 }
 export interface BoExerciseRuleOptionRequest extends LangOptionRequest {

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

@@ -14,14 +14,17 @@ export interface BoRuleRecord {
     userTotal: number;
     category?: NameGen;
     isRoot?: boolean;
+    isCanon: boolean;
     ruleTotal: number;
 }
 export interface BoRuleExerciseGenerator {
     langCode: string;
     rule: NameGen;
+    isCanon: boolean;
+    isRoot: boolean;
     category?: NameGen;
     ignoreRuleIds: string[];
     otherRuleOptions: SelectOption[];
     allowedKinds: ExerciseKind[];
-    otherRuleOptionsDisabled: boolean;
+    canonRules: NameGen[];
 }

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

@@ -10,6 +10,8 @@ export interface BoCreateRuleRequest {
     predefinedOptions?: string[];
     description: string;
     categoryId?: string;
+    isCanon: boolean;
+    canonRuleIds?: string[];
 }
 export interface BoUpdateRuleRequest extends BoCreateRuleRequest {
     id: string;
@@ -21,12 +23,14 @@ export interface BoRuleModifier extends BoUpdateRuleRequest {
     status?: EntryStatus;
     exerciseTotal: number;
     levels: LevelGen[];
+    canonRuleOptions: ValueOption[];
 }
 export interface BoRuleFeedRequest extends LangFeedRequest {
     hasLevel?: boolean;
     levelCode?: string;
     categoryId?: string;
     isRoot?: boolean;
+    isCanon?: boolean;
 }
 export interface BoUpdateRuleLevelRequest {
     ruleId: string;
@@ -39,4 +43,5 @@ export interface BoDeleteRuleLevelRequest {
 }
 export interface BoRuleOptionRequest extends LangOptionRequest {
     categoryId?: string;
+    isCanon?: boolean;
 }

package/lib/common/gen.d.ts

@@ -35,8 +35,7 @@ export interface RuleGen extends NameGen {
     langCode: string;
 }
 export interface RuleCategoryGen extends NameGen {
-    rootRule: RuleGen | undefined;
-    rules: RuleGen[];
+    rootRule?: RuleGen;
 }
 export interface UserInfoGen {
     id: string;

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

@@ -1,4 +1,4 @@
-import { ContentType, Knowing, LevelGen, RuleCategoryGen } from "../../common";
+import { ContentType, Knowing, LevelGen, RuleCategoryGen, RuleGen } from "../../common";
 export interface FeRuleRecord {
     id: string;
     langCode: string;
@@ -11,7 +11,9 @@ export interface FeRuleEntity extends FeRuleRecord {
     contentType: ContentType;
     content: string;
     description: string;
-    category: RuleCategoryGen;
+    category?: RuleCategoryGen;
+    categoryRules?: RuleGen[];
+    plainRules?: RuleGen[];
 }
 export interface FeRuleKnowingResult {
     changed: boolean;

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

@@ -1,11 +1,8 @@
 import { ExerciseType } from "../../common";
-export interface CreateExerciseEpisodicRequest {
-    episodeId: string;
-}
 export interface UpdateExerciseEpisodicRequest {
     id: string;
 }
-export interface ExerciseEpisodicModifier extends CreateExerciseEpisodicRequest {
+export interface ExerciseEpisodicModifier {
     id: string;
     valid: boolean;
     type: ExerciseType;

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

@@ -1,6 +1,6 @@
 import { ValueOption } from "../../common";
-import { ExerciseEpisodicModifier, CreateExerciseEpisodicRequest, UpdateExerciseEpisodicRequest } from "./baseEpisodic";
-export interface CreateExerciseListRequest extends CreateExerciseEpisodicRequest {
+import { ExerciseEpisodicModifier, UpdateExerciseEpisodicRequest } from "./baseEpisodic";
+export interface CreateExerciseListRequest {
     wordIds: string[];
 }
 export interface UpdateExerciseListRequest extends UpdateExerciseEpisodicRequest {

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

@@ -1,11 +1,8 @@
+import { GenerateItemRequest } from "../..";
 import { EntryStatus, ExerciseKind } from "../../common";
 export interface CreateExerciseRequest {
     kind: ExerciseKind;
     levelCode?: string;
-    episodeId?: string;
-}
-export interface UpdateExerciseRequest extends Pick<CreateExerciseRequest, "kind"> {
-    id: string;
 }
 export interface ExerciseModifier extends CreateExerciseRequest {
     id: string;
@@ -14,11 +11,6 @@ export interface ExerciseModifier extends CreateExerciseRequest {
     active: boolean;
     status?: EntryStatus;
 }
-export interface GenerateExerciseRequest {
-    ruleId: string;
+export interface GenerateExerciseRequest extends Omit<GenerateItemRequest, "exerciseId"> {
     kind: ExerciseKind;
-    levelCode?: string;
-    itemCount: number;
-    otherRuleIds: string[];
-    answerTotal?: number;
 }

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

@@ -1,5 +1,5 @@
 import { ValueOption } from "../../common";
-import { ExerciseEpisodicModifier, CreateExerciseEpisodicRequest, UpdateExerciseEpisodicRequest } from "./baseEpisodic";
+import { ExerciseEpisodicModifier, UpdateExerciseEpisodicRequest } from "./baseEpisodic";
 export interface ExerciseTableCell {
     wordIds: string[];
     columnIndex: number;
@@ -8,7 +8,7 @@ export interface ExerciseTableRow<TCell = ExerciseTableCell> {
     cells: TCell[];
     rowId?: string;
 }
-export interface CreateExerciseTableRequest extends CreateExerciseEpisodicRequest {
+export interface CreateExerciseTableRequest {
     columns: string[];
     rows: ExerciseTableRow[];
 }

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

@@ -41,10 +41,9 @@ export interface CreateItemSetRequest {
     }[];
 }
 export interface GenerateItemRequest {
-    count: number;
     exerciseId: string;
     levelCode?: string;
-    otherRuleIds: string[];
+    itemCount: number;
+    ruleIds: string[];
     answerTotal?: number;
-    ruleId: string;
 }

package/package.json

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