@nakamura-123/pages 0.1.21 → 0.1.23

package/dist/component/SubCagegoryList.js

@@ -1,41 +1,68 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
+var __assign =
+  (this && this.__assign) ||
+  function () {
+    __assign =
+      Object.assign ||
+      function (t) {
         for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
+          s = arguments[i];
+          for (var p in s)
+            if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
         }
         return t;
-    };
+      };
     return __assign.apply(this, arguments);
-};
-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 __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
+  };
+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 __setModuleDefault =
+  (this && this.__setModuleDefault) ||
+  (Object.create
+    ? function (o, v) {
+        Object.defineProperty(o, "default", { enumerable: true, value: v });
+      }
+    : function (o, v) {
+        o["default"] = v;
+      });
+var __importStar =
+  (this && this.__importStar) ||
+  function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null)
+      for (var k in mod)
+        if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k))
+          __createBinding(result, mod, k);
     __setModuleDefault(result, mod);
     return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
+  };
+var __importDefault =
+  (this && this.__importDefault) ||
+  function (mod) {
+    return mod && mod.__esModule ? mod : { default: mod };
+  };
 Object.defineProperty(exports, "__esModule", { value: true });
 var react_1 = __importStar(require("react"));
 var react_native_1 = require("react-native");
@@ -45,76 +72,136 @@ var react_i18next_1 = require("react-i18next");
 var common_1 = require("@nakamura-123/common");
 var db_1 = require("@nakamura-123/db");
 var stores_1 = require("@nakamura-123/stores");
-var setSelectedSubject = stores_1.setAction.setSelectedSubject, setMaxIndex = stores_1.setAction.setMaxIndex;
-var SubCategoryLeft_1 = __importDefault(require("../component/SubCategoryLeft"));
+var setSelectedSubject = stores_1.setAction.setSelectedSubject,
+  setMaxIndex = stores_1.setAction.setMaxIndex;
+var SubCategoryLeft_1 = __importDefault(require("./SubCategoryLeft"));
 var tagFnc_1 = require("../functions/tagFnc");
-var Tag5s_1 = __importDefault(require("../component/Tag5s"));
+var Tag5s_1 = __importDefault(require("./Tag5s"));
 var testFnc_1 = require("../functions/testFnc");
 var SubCategoryList = function (_a) {
-    var _b, _c;
-    var navigation = _a.navigation, subjectName = _a.subjectName;
-    console.log("UnitPageが実行されました");
-    var dispatch = (0, react_redux_1.useDispatch)();
-    var subjectType = (0, react_redux_1.useSelector)(function (state) { return state.app.appSetting.setting.basic[subjectName]; });
-    (0, react_1.useEffect)(function () {
-        dispatch(setSelectedSubject(subjectName));
-        dispatch(setMaxIndex(labels.length));
-    }, []);
-    // topTabsのラベルを取得
-    var categoryList = (0, react_redux_1.useSelector)(function (state) { return state.app[subjectName]; });
-    var labels = categoryList.map(function (category) { var _a; return (_a = category.label) !== null && _a !== void 0 ? _a : category.title; });
-    var _d = (0, react_redux_1.useSelector)(function (state) { return state.setting.viewSet[subjectName]; }), activeIndex = _d.activeIndex, preSelect = _d.preSelect;
-    var outOfYearRange = (0, react_redux_1.useSelector)(function (state) { return state.quizCfg.startCfg.outOfYearRange; });
-    var selectedList = categoryList[activeIndex];
-    // 単元名
-    var categoryName = "".concat((_b = selectedList.label) !== null && _b !== void 0 ? _b : "", " ").concat(selectedList.title).trim();
-    // バッジ
-    var t = (0, react_i18next_1.useTranslation)().t;
-    var selectKey = selectedList.key;
-    // Tagリスト
-    var QuestionDB = (0, react_2.useQuery)(db_1.dQuestionSchema);
-    var categoryTags = (0, tagFnc_1.getCategoryTagLevelCnts)(QuestionDB, selectKey, outOfYearRange);
-    // subメニューリスト
-    var subCategories = (_c = selectedList.sub) !== null && _c !== void 0 ? _c : [];
-    var handleSubCategory = function (index) {
-        var lesson = __assign({}, subCategories[index]);
-        lesson.title = selectedList.label
-            ? "".concat(selectedList.label, " ").concat(lesson.title)
-            : lesson.title;
-        dispatch(stores_1.quizAction.setLesson({
-            subject: subjectName,
-            type: subjectType,
-            category: selectKey,
-            lesson: lesson,
-        }));
-        navigation.navigate("QuizSetup");
-    };
-    // ミニテスト
-    var testDB = (0, react_2.useQuery)(db_1.MiniTestSchema);
-    var testLevels = (0, testFnc_1.getMiniTestLevelCnts)(testDB, subjectName, selectKey);
-    // スワイプの動作処理
-    var scrollViewRef = (0, react_1.useRef)(null);
-    // 全問スタート
-    var categoryLabel = selectedList.label || selectedList.title;
-    var handleAllQuiz = function () {
-        dispatch(stores_1.quizAction.setLesson({
-            subject: subjectName,
-            type: subjectType,
-            category: selectKey,
-            lesson: { title: categoryLabel, key: 0 },
-        }));
-        navigation.navigate("QuizSetup");
-    };
-    // セーブデータ
-    var existSaveData = (0, react_redux_1.useSelector)(function (state) { return state.score.isSave[subjectName]; });
-    return (<react_native_1.View>
+  var _b, _c;
+  var navigation = _a.navigation,
+    subjectName = _a.subjectName;
+  console.log("UnitPageが実行されました");
+  var dispatch = (0, react_redux_1.useDispatch)();
+  var subjectType = (0, react_redux_1.useSelector)(function (state) {
+    return state.app.appSetting.setting.basic[subjectName];
+  });
+  (0, react_1.useEffect)(function () {
+    dispatch(setSelectedSubject(subjectName));
+    dispatch(setMaxIndex(labels.length));
+  }, []);
+  // topTabsのラベルを取得
+  var categoryList = (0, react_redux_1.useSelector)(function (state) {
+    return state.app[subjectName];
+  });
+  var labels = categoryList.map(function (category) {
+    var _a;
+    return (_a = category.label) !== null && _a !== void 0
+      ? _a
+      : category.title;
+  });
+  var _d = (0, react_redux_1.useSelector)(function (state) {
+      return state.setting.viewSet[subjectName];
+    }),
+    activeIndex = _d.activeIndex,
+    preSelect = _d.preSelect;
+  var outOfYearRange = (0, react_redux_1.useSelector)(function (state) {
+    return state.quizCfg.startCfg.outOfYearRange;
+  });
+  var selectedList = categoryList[activeIndex];
+  // 単元名
+  var categoryName = ""
+    .concat((_b = selectedList.label) !== null && _b !== void 0 ? _b : "", " ")
+    .concat(selectedList.title)
+    .trim();
+  // バッジ
+  var t = (0, react_i18next_1.useTranslation)().t;
+  var selectKey = selectedList.key;
+  // Tagリスト
+  var QuestionDB = (0, react_2.useQuery)(db_1.dQuestionSchema);
+  var categoryTags = (0, tagFnc_1.getCategoryTagLevelCnts)(
+    QuestionDB,
+    selectKey,
+    outOfYearRange
+  );
+  // subメニューリスト
+  var subCategories =
+    (_c = selectedList.sub) !== null && _c !== void 0 ? _c : [];
+  var handleSubCategory = function (index) {
+    var lesson = __assign({}, subCategories[index]);
+    lesson.title = selectedList.label
+      ? "".concat(selectedList.label, " ").concat(lesson.title)
+      : lesson.title;
+    dispatch(
+      stores_1.quizAction.setLesson({
+        subject: subjectName,
+        type: subjectType,
+        category: selectKey,
+        lesson: lesson,
+      })
+    );
+    navigation.navigate("QuizSetup");
+  };
+  // ミニテスト
+  var testDB = (0, react_2.useQuery)(db_1.MiniTestSchema);
+  var testLevels = (0, testFnc_1.getMiniTestLevelCnts)(
+    testDB,
+    subjectName,
+    selectKey
+  );
+  // スワイプの動作処理
+  var scrollViewRef = (0, react_1.useRef)(null);
+  // 全問スタート
+  var categoryLabel = selectedList.label || selectedList.title;
+  var handleAllQuiz = function () {
+    dispatch(
+      stores_1.quizAction.setLesson({
+        subject: subjectName,
+        type: subjectType,
+        category: selectKey,
+        lesson: { title: categoryLabel, key: 0 },
+      })
+    );
+    navigation.navigate("QuizSetup");
+  };
+  // セーブデータ
+  var existSaveData = (0, react_redux_1.useSelector)(function (state) {
+    return state.score.isSave[subjectName];
+  });
+  return (
+    <react_native_1.View>
       {subCategories.map(function (_a, i) {
-            var key = _a.key, title = _a.title;
-            var subTags = (0, tagFnc_1.getUnitSubTagLevelCnts)(QuestionDB, selectKey, key, outOfYearRange);
-            var isPreSelect = preSelect.category === selectKey && preSelect.lessonKey === key;
-            return (<common_1.RectangleCard key={i} title={title} left={<SubCategoryLeft_1.default rate={(0, tagFnc_1.getCompletedTagRate)(subTags)}/>} bottom={<Tag5s_1.default tags={subTags}/>} onPress={function () { return handleSubCategory(i); }} borderColor={isPreSelect ? "green" : undefined} outerStyle={{ marginBottom: 20 }}/>);
-        })}
-    </react_native_1.View>);
+        var key = _a.key,
+          title = _a.title;
+        var subTags = (0, tagFnc_1.getUnitSubTagLevelCnts)(
+          QuestionDB,
+          selectKey,
+          key,
+          outOfYearRange
+        );
+        var isPreSelect =
+          preSelect.category === selectKey && preSelect.lessonKey === key;
+        return (
+          <common_1.RectangleCard
+            key={i}
+            title={title}
+            left={
+              <SubCategoryLeft_1.default
+                rate={(0, tagFnc_1.getCompletedTagRate)(subTags)}
+              />
+            }
+            bottom={<Tag5s_1.default tags={subTags} />}
+            onPress={function () {
+              return handleSubCategory(i);
+            }}
+            borderColor={isPreSelect ? "green" : undefined}
+            outerStyle={{ marginBottom: 20 }}
+          />
+        );
+      })}
+    </react_native_1.View>
+  );
 };
 var styles = react_native_1.StyleSheet.create({});
 exports.default = SubCategoryList;

package/dist/component/Tag5s.js

@@ -6,12 +6,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var react_1 = __importDefault(require("react"));
 var react_native_1 = require("react-native");
 var common_1 = require("@nakamura-123/common");
-var tagFnc_1 = require("../functions/tagFnc");
+var tagFncD_1 = require("../functions/tagFncD");
 var Tag5s = function (_a) {
     var tags = _a.tags;
     // Empty function body
     var cntTxt = tags.length + "問";
-    var tagInfos = (0, tagFnc_1.countTagsByLevel)(tags);
+    var tagInfos = (0, tagFncD_1.countTagsByLevel)(tags);
     return (<react_native_1.View style={styles.container}>
       <react_native_1.View>
         <common_1.MyText style={styles.cntTxt}>{cntTxt}</common_1.MyText>

package/dist/component/TagBadge5s.js

@@ -1,35 +1,15 @@
 "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 __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var react_1 = __importStar(require("react"));
+var react_1 = __importDefault(require("react"));
 var react_native_1 = require("react-native");
-var react_2 = require("@realm/react");
 var react_redux_1 = require("react-redux");
-var db_1 = require("@nakamura-123/db");
 var common_1 = require("@nakamura-123/common");
-var tagFnc_1 = require("../functions/tagFnc");
+var tagFncD_1 = require("../functions/tagFncD");
+var basicHook_1 = require("../hooks/basicHook");
+var tagFncJ_1 = require("../functions/tagFncJ");
 var TagBadge5s = function (_a) {
     var subject = _a.subject, index = _a.index;
     // Redux 状態を取得
@@ -37,14 +17,15 @@ var TagBadge5s = function (_a) {
     var outOfYearRangeStore = (0, react_redux_1.useSelector)(function (state) { return state.quizCfg.startCfg.outOfYearRange; });
     var outOfYearRange = subject.type === "unit" ? outOfYearRangeStore : undefined;
     // Realm データベースクエリ
-    var QuestionDB = (0, react_2.useQuery)(db_1.dQuestionSchema);
-    // カテゴリタグの計算をメモ化
-    var tagInfos = (0, react_1.useMemo)(function () {
-        var categoryTags = (0, tagFnc_1.getCategoryTagLevelCnts)(QuestionDB, selectKey, subject.type, outOfYearRange);
-        return (0, tagFnc_1.countTagsByLevel)(categoryTags);
-    }, [selectKey, JSON.stringify(outOfYearRange)]);
+    var QuestionDBInfo = (0, basicHook_1.useGetQuestionQuery)();
+    var tagInfos = function () {
+        var getCategoryTags = QuestionDBInfo.system === "JLPT"
+            ? (0, tagFncJ_1.getCategoryTagLevelCntsJ)(QuestionDBInfo.query, selectKey, subject.tag)
+            : (0, tagFncD_1.getCategoryTagLevelCntsD)(QuestionDBInfo.query, selectKey, subject.type, outOfYearRange);
+        return (0, tagFncD_1.countTagsByLevel)(getCategoryTags);
+    };
     return (<react_native_1.View style={styles.container}>
-      {tagInfos.map(function (tag, i) { return (<common_1.Badge key={i} name={String(tag.cnt)} icon={"tag"} circleColor={tag.color} style={styles.badge}/>); })}
+      {tagInfos().map(function (tag, i) { return (<common_1.Badge key={i} name={String(tag.cnt)} icon={"tag"} circleColor={tag.color} style={styles.badge}/>); })}
     </react_native_1.View>);
 };
 var styles = react_native_1.StyleSheet.create({

package/dist/component/TagBadge5sPress.js

@@ -7,13 +7,13 @@ var react_1 = __importDefault(require("react"));
 var react_native_1 = require("react-native");
 var react_redux_1 = require("react-redux");
 var common_1 = require("@nakamura-123/common");
-var tagFnc_1 = require("../functions/tagFnc");
+var tagFncD_1 = require("../functions/tagFncD");
 var stores_1 = require("@nakamura-123/stores");
 var TagBadge5sPress = function (_a) {
     var categoryTags = _a.categoryTags;
     var dispatch = (0, react_redux_1.useDispatch)();
     var tagActives = (0, react_redux_1.useSelector)(function (state) { return state.quizCfg.startCfg.tags; });
-    var tagInfos = (0, tagFnc_1.countTagsByLevelSelected)(categoryTags, tagActives);
+    var tagInfos = (0, tagFncD_1.countTagsByLevelSelected)(categoryTags, tagActives);
     return (<react_native_1.View style={styles.container}>
       {tagInfos.map(function (tag, i) { return (<react_native_1.View key={i} style={{ alignItems: "center" }}>
           <common_1.Badge name={String(tag.cnt)} icon={"tag"} circleColor={tag.circle} badgeColor={tag.badge} iconColor={tag.icon} onPress={function () { return dispatch(stores_1.cfgAction.changeTagActive(tag.level)); }}/>

package/dist/functions/commonFilter.js

@@ -0,0 +1,12 @@
+"use strict";
+// import { Results } from "realm";
+// import { DQuestionSchema, JQuestionSchema } from "@nakamura-123/db";
+// type QR = Results<JQuestionSchema> | Results<DQuestionSchema>;
+// const getCategoryTagLevelCnts = (QuestionDB: QR) => {
+//   // 分岐を作る
+//   let returnQuestions;
+//   const isJLPT = QuestionDB[0].hasOwnProperty("jp");
+// 	if (isJLPT) {
+// 		returnQuestions =
+// 	}
+// };

package/dist/functions/createQuizFnc.d.ts

@@ -1,21 +1,14 @@
-import { dQuestionSchema } from "@nakamura-123/db";
-import { QuizInitial } from "@nakamura-123/stores";
+import { DQuestionSchema } from "@nakamura-123/db";
+import { CfgInitial, QuizInitial } from "@nakamura-123/stores";
 import { Results } from "realm";
 import { Store } from "@nakamura-123/types";
-type QuestionType = typeof dQuestionSchema.prototype;
+type QuestionType = typeof DQuestionSchema.prototype;
 type QuestionResult = Results<QuestionType>;
+type startCfg = CfgInitial["startCfg"];
 type Selected = QuizInitial["selected"];
-export declare const getBasicQuizList: (QuestionDB: QuestionResult, startCfg: {
-    tags: import("@nakamura-123/types/dist/types/libType").LevelNames[];
-    option: import("@nakamura-123/lib/dist/config/startOption").QuizStartOptionValue;
-    outOfYearRange: number[];
-}, selected: Selected) => Store.DQInStore[];
+export declare const getBasicQuizList: (QuestionDB: QuestionResult, startCfg: startCfg, selected: Selected) => Store.DQInStore[];
 export declare const getMiniTestQuestions: (QuestionDB: QuestionResult, subjectType: "unit" | "year", key: number, cnt: number, outOfYearRange: number[]) => Store.DQInStore[];
 export declare const getTestQuestions: (QuestionDB: QuestionResult, cnt: number) => Store.DQInStore[];
 export declare const getTestQuestionsByUnit: (QuestionDB: QuestionResult, cnt: number, unit: number[]) => Store.DQInStore[];
-export declare const getBootQuestions: (QuestionDB: QuestionResult, startCfg: {
-    tags: import("@nakamura-123/types/dist/types/libType").LevelNames[];
-    option: import("@nakamura-123/lib/dist/config/startOption").QuizStartOptionValue;
-    outOfYearRange: number[];
-}, outOfUnitRange: number[], outOfYearRange: number[]) => Store.DQInStore[];
+export declare const getBootQuestions: (QuestionDB: QuestionResult, startCfg: startCfg, outOfUnitRange: number[], outOfYearRange: number[]) => Store.DQInStore[];
 export {};

package/dist/functions/createQuizFnc.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getBootQuestions = exports.getTestQuestionsByUnit = exports.getTestQuestions = exports.getMiniTestQuestions = exports.getBasicQuizList = void 0;
-var questionFilter_1 = require("./questionFilter");
+var questionFilterD_1 = require("./questionFilterD");
 var lib_1 = require("@nakamura-123/lib");
 var questionFormat_1 = require("./questionFormat");
 var getBasicQuizList = function (QuestionDB, startCfg, selected) {
@@ -10,28 +10,28 @@ var getBasicQuizList = function (QuestionDB, startCfg, selected) {
     if (selected.type === "unit") {
         var category = selected.category, lesson = selected.lesson;
         if (lesson.key === 0)
-            questions = (0, questionFilter_1.getUnitQuestions)(QuestionDB, category);
+            questions = (0, questionFilterD_1.getUnitQuestions)(QuestionDB, category);
         else
-            questions = (0, questionFilter_1.getSubUnitQuestions)(QuestionDB, category, lesson.key);
+            questions = (0, questionFilterD_1.getSubUnitQuestions)(QuestionDB, category, lesson.key);
         // 02_試験範囲外の問題を除外
-        questions = (0, questionFilter_1.filterByOutOfYearRange)(questions, startCfg.outOfYearRange);
+        questions = (0, questionFilterD_1.filterByOutOfYearRange)(questions, startCfg.outOfYearRange);
     }
     // 03_試験別の抽出
     if (selected.type === "year") {
         var category = selected.category, lesson = selected.lesson;
         var key = lesson.key;
         if (key === 0)
-            questions = (0, questionFilter_1.getYearQuestions)(QuestionDB, category);
+            questions = (0, questionFilterD_1.getYearQuestions)(QuestionDB, category);
         else
-            questions = (0, questionFilter_1.getSubYearQuestions)(QuestionDB, category, key);
+            questions = (0, questionFilterD_1.getSubYearQuestions)(QuestionDB, category, key);
     }
     // 04_タグによる絞り込み
-    questions = (0, questionFilter_1.filterByTags)(questions, startCfg);
+    questions = (0, questionFilterD_1.filterByTags)(questions, startCfg);
     // 05_共通処理(シャッフル・問題数)（ここで配列化）
     // (選択肢を変更しシャッフル)
     var _a = startCfg.option, quizCnt = _a.quizCnt, isShuffle = _a.isShuffle;
     var formatted = (0, questionFormat_1.formatQuestions)(questions);
-    var filtered = (0, questionFilter_1.commonFilter)(formatted, quizCnt, isShuffle);
+    var filtered = (0, questionFilterD_1.commonFilter)(formatted, quizCnt, isShuffle);
     return filtered;
 };
 exports.getBasicQuizList = getBasicQuizList;
@@ -39,13 +39,13 @@ exports.getBasicQuizList = getBasicQuizList;
 var getMiniTestQuestions = function (QuestionDB, subjectType, key, cnt, outOfYearRange) {
     var questions = QuestionDB.filtered("FALSEPREDICATE");
     if (subjectType === "unit") {
-        questions = (0, questionFilter_1.getUnitQuestions)(QuestionDB, key);
-        questions = (0, questionFilter_1.filterByOutOfYearRange)(questions, outOfYearRange);
+        questions = (0, questionFilterD_1.getUnitQuestions)(QuestionDB, key);
+        questions = (0, questionFilterD_1.filterByOutOfYearRange)(questions, outOfYearRange);
     }
     else if (subjectType === "year")
-        questions = (0, questionFilter_1.getYearQuestions)(QuestionDB, key);
+        questions = (0, questionFilterD_1.getYearQuestions)(QuestionDB, key);
     var formatted = (0, questionFormat_1.formatQuestions)(questions);
-    return (0, questionFilter_1.commonFilter)(formatted, cnt, true);
+    return (0, questionFilterD_1.commonFilter)(formatted, cnt, true);
 };
 exports.getMiniTestQuestions = getMiniTestQuestions;
 // 模擬試験の開始(Randam)
@@ -56,7 +56,7 @@ var getTestQuestions = function (QuestionDB, cnt) {
     var randomItems = Array.from(numArray).map(function (index) { return QuestionDB[index]; });
     randomItems.sort(function (a, b) { return a.num - b.num; });
     var formatted = (0, questionFormat_1.formatQuestions)(randomItems);
-    var filttered = (0, questionFilter_1.commonFilter)(formatted, cnt, false);
+    var filttered = (0, questionFilterD_1.commonFilter)(formatted, cnt, false);
     return filttered;
 };
 exports.getTestQuestions = getTestQuestions;
@@ -65,16 +65,16 @@ var getTestQuestionsByUnit = function (QuestionDB, cnt, unit) {
     // unitに含まれる問題を抽出
     var questions = QuestionDB.filtered("unitId IN $0", unit);
     var formatted = (0, exports.getTestQuestions)(questions, cnt);
-    return (0, questionFilter_1.commonFilter)(formatted, cnt, false);
+    return (0, questionFilterD_1.commonFilter)(formatted, cnt, false);
 };
 exports.getTestQuestionsByUnit = getTestQuestionsByUnit;
 // 集中特訓モードの開始
 var getBootQuestions = function (QuestionDB, startCfg, outOfUnitRange, outOfYearRange) {
-    var questions = (0, questionFilter_1.filterByOutOfYearRange)(QuestionDB, outOfYearRange);
-    questions = (0, questionFilter_1.filterByOutOfUnitRange)(questions, outOfUnitRange);
-    questions = (0, questionFilter_1.filterByTags)(questions, startCfg);
+    var questions = (0, questionFilterD_1.filterByOutOfYearRange)(QuestionDB, outOfYearRange);
+    questions = (0, questionFilterD_1.filterByOutOfUnitRange)(questions, outOfUnitRange);
+    questions = (0, questionFilterD_1.filterByTags)(questions, startCfg);
     var _a = startCfg.option, quizCnt = _a.quizCnt, isShuffle = _a.isShuffle;
     var formatted = (0, questionFormat_1.formatQuestions)(questions);
-    return (0, questionFilter_1.commonFilter)(formatted, quizCnt, isShuffle);
+    return (0, questionFilterD_1.commonFilter)(formatted, quizCnt, isShuffle);
 };
 exports.getBootQuestions = getBootQuestions;

package/dist/functions/createQuizFncD.d.ts

@@ -0,0 +1,18 @@
+import { QuizInitial } from "@nakamura-123/stores";
+import { Store } from "@nakamura-123/types";
+import { QRD } from "../types/filterType";
+type Selected = QuizInitial["selected"];
+export declare const getBasicQuizList: (QuestionDB: QRD, startCfg: {
+    tags: import("@nakamura-123/types/dist/types/libType").LevelNames[];
+    option: import("@nakamura-123/lib/dist/config/startOption").QuizStartOptionValue;
+    outOfYearRange: number[];
+}, selected: Selected) => Store.DQInStore[];
+export declare const getMiniTestQuestions: (QuestionDB: QRD, subjectType: "unit" | "year", key: number, cnt: number, outOfYearRange: number[]) => Store.DQInStore[];
+export declare const getTestQuestions: (QuestionDB: QRD, cnt: number) => Store.DQInStore[];
+export declare const getTestQuestionsByUnit: (QuestionDB: QRD, cnt: number, unit: number[]) => Store.DQInStore[];
+export declare const getBootQuestions: (QuestionDB: QRD, startCfg: {
+    tags: import("@nakamura-123/types/dist/types/libType").LevelNames[];
+    option: import("@nakamura-123/lib/dist/config/startOption").QuizStartOptionValue;
+    outOfYearRange: number[];
+}, outOfUnitRange: number[], outOfYearRange: number[]) => Store.DQInStore[];
+export {};

package/dist/functions/createQuizFncD.js

@@ -0,0 +1,80 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getBootQuestions = exports.getTestQuestionsByUnit = exports.getTestQuestions = exports.getMiniTestQuestions = exports.getBasicQuizList = void 0;
+var questionFilterD_1 = require("./questionFilterD");
+var lib_1 = require("@nakamura-123/lib");
+var questionFormatD_1 = require("./questionFormatD");
+var getBasicQuizList = function (QuestionDB, startCfg, selected) {
+    var questions = QuestionDB.filtered("FALSEPREDICATE");
+    // 01_単元別の抽出
+    if (selected.type === "unit") {
+        var category = selected.category, lesson = selected.lesson;
+        if (lesson.key === 0)
+            questions = (0, questionFilterD_1.getUnitQuestions)(QuestionDB, category);
+        else
+            questions = (0, questionFilterD_1.getSubUnitQuestions)(QuestionDB, category, lesson.key);
+        // 02_試験範囲外の問題を除外
+        questions = (0, questionFilterD_1.filterByOutOfYearRange)(questions, startCfg.outOfYearRange);
+    }
+    // 03_試験別の抽出
+    if (selected.type === "year") {
+        var category = selected.category, lesson = selected.lesson;
+        var key = lesson.key;
+        if (key === 0)
+            questions = (0, questionFilterD_1.getYearQuestions)(QuestionDB, category);
+        else
+            questions = (0, questionFilterD_1.getSubYearQuestions)(QuestionDB, category, key);
+    }
+    // 04_タグによる絞り込み
+    questions = (0, questionFilterD_1.filterByTags)(questions, startCfg);
+    // 05_共通処理(シャッフル・問題数)（ここで配列化）
+    // (選択肢を変更しシャッフル)
+    var _a = startCfg.option, quizCnt = _a.quizCnt, isShuffle = _a.isShuffle;
+    var formatted = (0, questionFormatD_1.formatQuestions)(questions);
+    var filtered = (0, questionFilterD_1.commonFilter)(formatted, quizCnt, isShuffle);
+    return filtered;
+};
+exports.getBasicQuizList = getBasicQuizList;
+// ミニテストの問題を取得
+var getMiniTestQuestions = function (QuestionDB, subjectType, key, cnt, outOfYearRange) {
+    var questions = QuestionDB.filtered("FALSEPREDICATE");
+    if (subjectType === "unit") {
+        questions = (0, questionFilterD_1.getUnitQuestions)(QuestionDB, key);
+        questions = (0, questionFilterD_1.filterByOutOfYearRange)(questions, outOfYearRange);
+    }
+    else if (subjectType === "year")
+        questions = (0, questionFilterD_1.getYearQuestions)(QuestionDB, key);
+    var formatted = (0, questionFormatD_1.formatQuestions)(questions);
+    return (0, questionFilterD_1.commonFilter)(formatted, cnt, true);
+};
+exports.getMiniTestQuestions = getMiniTestQuestions;
+// 模擬試験の開始(Randam)
+var getTestQuestions = function (QuestionDB, cnt) {
+    // シャッフルしてから必要な数だけ抽出
+    var totalCnt = QuestionDB.length;
+    var numArray = lib_1.utilFnc.createArrayBasedOnCnt(cnt, totalCnt);
+    var randomItems = Array.from(numArray).map(function (index) { return QuestionDB[index]; });
+    randomItems.sort(function (a, b) { return a.num - b.num; });
+    var formatted = (0, questionFormatD_1.formatQuestions)(randomItems);
+    var filttered = (0, questionFilterD_1.commonFilter)(formatted, cnt, false);
+    return filttered;
+};
+exports.getTestQuestions = getTestQuestions;
+// 模擬試験の開始(Unit)
+var getTestQuestionsByUnit = function (QuestionDB, cnt, unit) {
+    // unitに含まれる問題を抽出
+    var questions = QuestionDB.filtered("unitId IN $0", unit);
+    var formatted = (0, exports.getTestQuestions)(questions, cnt);
+    return (0, questionFilterD_1.commonFilter)(formatted, cnt, false);
+};
+exports.getTestQuestionsByUnit = getTestQuestionsByUnit;
+// 集中特訓モードの開始
+var getBootQuestions = function (QuestionDB, startCfg, outOfUnitRange, outOfYearRange) {
+    var questions = (0, questionFilterD_1.filterByOutOfYearRange)(QuestionDB, outOfYearRange);
+    questions = (0, questionFilterD_1.filterByOutOfUnitRange)(questions, outOfUnitRange);
+    questions = (0, questionFilterD_1.filterByTags)(questions, startCfg);
+    var _a = startCfg.option, quizCnt = _a.quizCnt, isShuffle = _a.isShuffle;
+    var formatted = (0, questionFormatD_1.formatQuestions)(questions);
+    return (0, questionFilterD_1.commonFilter)(formatted, quizCnt, isShuffle);
+};
+exports.getBootQuestions = getBootQuestions;