revdev 0.310.0 → 0.312.0

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

@@ -0,0 +1,57 @@
+import { FeEntityPointer, FePassItemResult, WordUserGen } from "../..";
+import { ExerciseMode, ExerciseType, PassExerciseStatus } from "../../common";
+export interface FeExerciseNavigator {
+    id: string;
+    name: string;
+    type: ExerciseType;
+    totalItems: number;
+    mode?: ExerciseMode;
+    grade?: number;
+    status: PassExerciseStatus;
+}
+export interface FeBasicExercisePointer extends FeEntityPointer<PassExerciseStatus> {
+    type: ExerciseType;
+}
+export interface FeExerciseRegularPointer extends FeBasicExercisePointer {
+    type: ExerciseType.Regular;
+    randomTips?: boolean;
+    mode?: ExerciseMode;
+    passItemsCount: number;
+}
+export interface FeExerciseListData {
+    listId: string;
+    words: WordUserGen[];
+}
+export interface FeExerciseListPointer extends FeBasicExercisePointer, FeExerciseListData {
+    type: ExerciseType.List;
+}
+export interface FeExerciseTableData {
+    tableId: string;
+    columns: string[];
+    rows: {
+        cells: WordUserGen[][];
+    }[];
+}
+export interface FeExerciseTablePointer extends FeBasicExercisePointer, FeExerciseTableData {
+    type: ExerciseType.Table;
+}
+export type FeExercisePointer = FeExerciseRegularPointer | FeExerciseListPointer | FeExerciseTablePointer;
+export interface FeBasicPassExerciseResult {
+    id: string;
+    exerciseId: string;
+    passEpisodeId: string;
+    status: PassExerciseStatus;
+    type: ExerciseType;
+    grade: number;
+}
+export interface FePassExerciseResultRegular extends FeBasicPassExerciseResult {
+    type: ExerciseType.Regular;
+    items: FePassItemResult[];
+}
+export interface FePassExerciseResultList extends FeBasicPassExerciseResult, FeExerciseListData {
+    type: ExerciseType.List;
+}
+export interface FePassExerciseResultTable extends FeBasicPassExerciseResult, FeExerciseTableData {
+    type: ExerciseType.Table;
+}
+export type FePassExerciseResult = FePassExerciseResultRegular | FePassExerciseResultList | FePassExerciseResultTable;

package/lib/front/exercise/entity.js

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

package/lib/front/exercise/index.d.ts

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

package/lib/front/exercise/index.js

@@ -0,0 +1,17 @@
+"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);

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

@@ -1,4 +1,4 @@
-import { IdCodeOption, UserInfoGen } from "../../common";
+import { IdCodeOption } from "../../common";
 import { AppSettings } from "../../shared";
 import { FeLangRecord } from "../lang";
 import { FeListRecord } from "../list";
@@ -10,7 +10,6 @@ export interface FeInitData {
     quizCodes: string[];
     localeCodes: string[];
     settings: AppSettings;
-    userInfo?: UserInfoGen;
 }
 export interface FeIntroductionData {
     langs: FeLangRecord[];

package/lib/front/index.d.ts

@@ -15,3 +15,8 @@ export * from "./quiz";
 export * from "./progress";
 export * from "./wordImage";
 export * from "./explorer";
+export * from "./course";
+export * from "./item";
+export * from "./episode";
+export * from "./exercise";
+export * from "./pass";

package/lib/front/index.js

@@ -31,3 +31,8 @@ __exportStar(require("./quiz"), exports);
 __exportStar(require("./progress"), exports);
 __exportStar(require("./wordImage"), exports);
 __exportStar(require("./explorer"), exports);
+__exportStar(require("./course"), exports);
+__exportStar(require("./item"), exports);
+__exportStar(require("./episode"), exports);
+__exportStar(require("./exercise"), exports);
+__exportStar(require("./pass"), exports);

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

@@ -0,0 +1,33 @@
+import { ItemType } from "../../common";
+export interface FeBasicItemPointer {
+    id: string;
+    type: ItemType;
+    isExample?: boolean;
+    tips: string[];
+    answers: string[][];
+}
+export interface FeItemRegularPointer extends FeBasicItemPointer {
+    type: ItemType.Regular;
+    content: string;
+}
+export interface FeItemImagePointer extends FeBasicItemPointer {
+    type: ItemType.Image;
+    imageUrl: string;
+}
+export type FeItemPointer = FeItemRegularPointer | FeItemImagePointer;
+export interface FePassAnswerResult {
+    id: string;
+    index: number;
+    isCorrect: boolean;
+    text: string;
+    correctText?: string;
+}
+export interface FePassItemResult {
+    id: string;
+    itemId: string;
+    passExerciseId: string;
+    grade: number;
+    isExample: boolean;
+    content?: string;
+    answers: FePassAnswerResult[];
+}

package/lib/front/item/entity.js

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

package/lib/front/item/index.d.ts

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

package/lib/front/item/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/front/item/request.d.ts

@@ -0,0 +1,5 @@
+import { ItemType } from "../../common";
+export interface FeItemSetRequest {
+    exerciseId: string;
+    type: ItemType;
+}

package/lib/front/item/request.js

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

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

@@ -1,4 +1,4 @@
-import { AccessGen, ContribGen } from "../../common";
+import { AccessGen, ContribGen, ImageGen } from "../../common";
 export interface FeListRecord {
     id: string;
     slug: string;
@@ -9,6 +9,7 @@ export interface FeListRecord {
     userTotal: number;
     contrib: ContribGen;
     access: AccessGen;
+    image: ImageGen | null;
 }
 export interface FeListEntity {
     id: string;
@@ -22,8 +23,5 @@ export interface FeListEntity {
     userTotal: number;
     wordTotal: number;
     knownWordTotal: number;
-    fileName?: string;
-    thumbnailFileName?: string;
-    imageUrl?: string;
-    imageThumbnailUrl?: string;
+    image: ImageGen | null;
 }

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

@@ -0,0 +1,39 @@
+import { FeCourseRecord } from "../..";
+import { EntityContent, PassEpisodeStatus, PassStatus, PointerMode } from "../../common";
+import { FeEpisodeNavigator, FePassEpisodeResult } from "../episode";
+import { FeExercisePointer, FePassExerciseResult } from "../exercise";
+import { FeItemPointer } from "../item";
+export interface FeEntityPointer<StatusType = PassStatus> {
+    id: string;
+    passId?: string;
+    passStatus?: StatusType;
+}
+export interface FeCoursePointer extends FeEntityPointer {
+    name: string;
+    langCode: string;
+    grade?: number;
+}
+export interface FeEpisodePointer extends FeEntityPointer<PassEpisodeStatus> {
+    name: string;
+}
+export interface FePassPointer {
+    mode: PointerMode;
+    episodeView?: EntityContent;
+    courseView?: EntityContent;
+    course: FeCoursePointer;
+    episode?: FeEpisodePointer;
+    exercise?: FeExercisePointer;
+    item?: FeItemPointer;
+    exerciseResult?: FePassExerciseResult;
+}
+export interface FePassCourseResult {
+    id: string;
+    courseId: string;
+    status: PassStatus;
+    grade: number;
+    episodes: FePassEpisodeResult[];
+}
+export interface FePassCourseEntity extends FeCourseRecord {
+    episodes: FeEpisodeNavigator[];
+    pointer: FePassPointer;
+}

package/lib/front/pass/entity.js

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

package/lib/front/pass/index.d.ts

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

package/lib/front/pass/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("./request"), exports);
+__exportStar(require("./entity"), exports);

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

@@ -0,0 +1,34 @@
+export interface FePassPointerRequest {
+    courseId: string;
+    exerciseId?: string;
+    episodeId?: string;
+}
+export interface FePassSubmitExerciseRequest {
+    courseId: string;
+    exerciseId: string;
+}
+export interface FePassSubmitEpisodeRequest {
+    courseId: string;
+    episodeId: string;
+}
+export interface FePassSubmitItemRequest {
+    courseId: string;
+    exerciseId: string;
+    itemId: string;
+    answers: string[];
+}
+export type FePassSubmitRequest = FePassSubmitExerciseRequest | FePassSubmitItemRequest | FePassSubmitEpisodeRequest;
+export interface FePassItemRequest {
+    itemId: string;
+}
+export interface FePassExerciseRequest {
+    exerciseId: string;
+}
+export interface FePassEpisodeRequest {
+    episodeId: string;
+}
+export interface FePassRepeatExerciseRequest {
+    courseId: string;
+    exerciseId: string;
+    onlyFailed?: boolean;
+}

package/lib/front/pass/request.js

@@ -0,0 +1,5 @@
+"use strict";
+// export interface FePassStartRequest {
+//   courseId: string;
+// }
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -1,4 +1,4 @@
-import { AccessGen, ContribGen } from "../../common";
+import { AccessGen, ContribGen, ImageGen } from "../../common";
 export interface FeTableRecord {
     id: string;
     slug: string;
@@ -8,6 +8,7 @@ export interface FeTableRecord {
     wordTotal: number;
     contrib: ContribGen;
     access: AccessGen;
+    image: ImageGen | null;
 }
 export interface FeTableEntity {
     id: string;
@@ -16,10 +17,7 @@ export interface FeTableEntity {
     langCode: string;
     description?: string;
     metaKeywords: string;
-    fileName?: string;
-    thumbnailFileName?: string;
-    imageUrl?: string;
-    imageThumbnailUrl?: string;
+    image: ImageGen | null;
     access: AccessGen;
     contrib: ContribGen;
     rowTotal: number;

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

@@ -4,6 +4,7 @@ export interface FeTableEntityRequest extends SlugRequest {
 }
 export interface FeTableWordFeedRequest extends WordFeedExtension, FeedRequest {
     slug: string;
+    state?: string;
 }
 export interface FeTableFeedRequest extends LangFeedRequest {
     userSlug?: string;

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

@@ -1,7 +1,10 @@
-import { PostStatus } from "../../common";
+import { ContentType, ImageGen, PostStatus } from "../../common";
 export interface CreateCourseRequest {
     name: string;
+    slug?: string;
     description?: string;
+    content?: string;
+    contentType?: ContentType;
     langCode: string;
 }
 export interface UpdateCourseRequest extends CreateCourseRequest {
@@ -9,4 +12,8 @@ export interface UpdateCourseRequest extends CreateCourseRequest {
 }
 export interface CourseModifier extends UpdateCourseRequest {
     status: PostStatus;
+    image?: ImageGen;
+}
+export interface CourseRequest {
+    courseId: string;
 }

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

@@ -1,9 +1,11 @@
+import { ContentType } from "../..";
 export interface CreateEpisodeRequest {
-    title: string;
+    name: string;
     content: string;
+    contentType?: ContentType;
     courseId: string;
 }
-export interface UpdateEpisodeRequest extends Pick<CreateEpisodeRequest, "title" | "content"> {
+export interface UpdateEpisodeRequest extends Pick<CreateEpisodeRequest, "name" | "content" | "contentType"> {
     id: string;
 }
 export interface EpisodeModifier extends CreateEpisodeRequest {

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

@@ -0,0 +1,10 @@
+import { ExerciseType } from "../../common";
+export interface CreateBaseExerciseRequest {
+    name: string;
+    episodeId: string;
+}
+export interface BasicExerciseModifier extends CreateBaseExerciseRequest {
+    id: string;
+    valid: boolean;
+    type: ExerciseType;
+}

package/lib/shared/exercise/basic.js

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

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

@@ -1,3 +1,5 @@
 export * from "./request";
 export * from "./list";
 export * from "./table";
+export * from "./regular";
+export * from "./basic";

package/lib/shared/exercise/index.js

@@ -17,3 +17,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./request"), exports);
 __exportStar(require("./list"), exports);
 __exportStar(require("./table"), exports);
+__exportStar(require("./regular"), exports);
+__exportStar(require("./basic"), exports);

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

@@ -1,10 +1,12 @@
-import { CreateBaseExerciseRequest, ExerciseModifier, UpdateExerciseRequest } from "./request";
+import { BasicExerciseModifier, CreateBaseExerciseRequest } from "./basic";
+import { UpdateExerciseRequest } from "./request";
 export interface CreateExerciseListRequest extends CreateBaseExerciseRequest {
     wordIds: string[];
 }
 export interface UpdateExerciseListRequest extends UpdateExerciseRequest {
     wordIds: string[];
 }
-export interface ExerciseListModifier extends ExerciseModifier {
+export interface ExerciseListModifier extends BasicExerciseModifier {
+    listId: string;
     wordIds: string[];
 }

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

@@ -0,0 +1,15 @@
+import { ExerciseMode } from "../../common";
+import { BasicExerciseModifier, CreateBaseExerciseRequest } from "./basic";
+import { UpdateExerciseRequest } from "./request";
+export interface CreateExerciseRegularRequest extends CreateBaseExerciseRequest {
+    randomTips?: boolean;
+    mode?: ExerciseMode;
+}
+export interface UpdateExerciseRegularRequest extends UpdateExerciseRequest {
+    id: string;
+    randomTips?: boolean;
+}
+export interface ExerciseRegularModifier extends BasicExerciseModifier {
+    randomTips?: boolean;
+    mode?: ExerciseMode;
+}

package/lib/shared/exercise/regular.js

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

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

@@ -1,23 +1,8 @@
-import { ExerciseType } from "../../common";
-export interface CreateBaseExerciseRequest {
-    title: string;
-    episodeId: string;
-}
-export interface CreateExerciseRegularRequest extends CreateBaseExerciseRequest {
-    randomTips?: boolean;
-}
-export interface UpdateExerciseRequest extends Pick<CreateBaseExerciseRequest, "title"> {
-    id: string;
-}
-export interface UpdateExerciseRegularRequest extends UpdateExerciseRequest {
+import { CreateBaseExerciseRequest } from "./basic";
+import { ExerciseListModifier } from "./list";
+import { ExerciseTableModifier } from "./table";
+import { ExerciseRegularModifier } from "./regular";
+export interface UpdateExerciseRequest extends Pick<CreateBaseExerciseRequest, "name"> {
     id: string;
-    randomTips?: boolean;
-}
-export interface ExerciseModifier extends CreateBaseExerciseRequest {
-    id: string;
-    valid: boolean;
-    type: ExerciseType;
-}
-export interface ExerciseRegularModifier extends ExerciseModifier {
-    randomTips: boolean;
 }
+export type ExerciseModifier = ExerciseListModifier | ExerciseTableModifier | ExerciseRegularModifier;

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

@@ -1,4 +1,5 @@
-import { CreateBaseExerciseRequest, ExerciseModifier, UpdateExerciseRequest } from "./request";
+import { BasicExerciseModifier, CreateBaseExerciseRequest } from "./basic";
+import { UpdateExerciseRequest } from "./request";
 export interface ExerciseTableCell {
     wordIds: string[];
     columnIndex: number;
@@ -11,7 +12,7 @@ export interface CreateExerciseTableRequest extends CreateBaseExerciseRequest {
     columns: string[];
     rows: ExerciseTableRow[];
 }
-export interface ExerciseTableModifier extends ExerciseModifier {
+export interface ExerciseTableModifier extends BasicExerciseModifier {
     tableId: string;
     columns: string[];
     rows: ExerciseTableRow[];

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

@@ -33,4 +33,7 @@ export interface AppSettings {
     readonly courseEpisodes: [number, number];
     readonly episodeExercises: [number, number];
     readonly exerciseItems: [number, number];
+    readonly exerciseListWords: [number, number];
+    readonly exerciseTableRows: [number, number];
+    readonly exerciseListPassRate: number;
 }

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

@@ -1,7 +1,7 @@
-import { ItemType } from "../..";
+import { ImageGen, ItemType } from "../..";
 export interface BaseItemRequest {
     exerciseId: string;
-    showAnswer?: boolean;
+    isExample?: boolean;
     answers: string[][];
     tips: string[];
 }
@@ -9,7 +9,6 @@ export interface CreateItemRegularRequest extends BaseItemRequest {
     content: string;
 }
 export interface CreateItemImageRequest extends BaseItemRequest {
-    imageFileName: string;
 }
 export interface UpdateItemRegularRequest extends CreateItemRegularRequest {
     id: string;
@@ -17,14 +16,15 @@ export interface UpdateItemRegularRequest extends CreateItemRegularRequest {
 export interface UpdateItemImageRequest extends CreateItemImageRequest {
     id: string;
 }
-export interface ItemModifier extends BaseItemRequest {
+export interface BaseItemModifier extends BaseItemRequest {
     id: string;
     type: ItemType;
     tips: string[];
 }
-export interface ItemRegularModifier extends ItemModifier {
+export interface ItemRegularModifier extends BaseItemModifier {
     content: string;
 }
-export interface ItemImageModifier extends ItemModifier {
-    imageFileName: string;
+export interface ItemImageModifier extends BaseItemModifier {
+    image: ImageGen;
 }
+export type ItemModifier = ItemRegularModifier | ItemImageModifier;

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

@@ -1,3 +1,4 @@
+import { ImageGen } from "../../common";
 import { WordFeedExtension, FeedRequest, LangFeedRequest } from "../../feed";
 import { LiteralWord } from "../../shared";
 import { TableCellSkeleton } from "./entity";
@@ -27,8 +28,7 @@ export interface UpdateTableRequest extends Omit<CreateTableRequest, "langCode"
 }
 export interface TableModifier extends CreateTableRequest {
     id: string;
-    imageUrl?: string;
-    imageThumbnailUrl?: string;
+    image: ImageGen | null;
 }
 export interface UpdateTableCellRequest extends TableCellSkeleton<LiteralWord> {
 }

package/package.json

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