refactor: ♻️ 重构 createSequence 为 range

Author: hymbz

src/components/Manga/actions/translation/index.ts

@@ -152,10 +152,10 @@ const createTranslateRange = (imgs: Accessor<number[]>) => {
 
 // 翻译全部图片
 export const [isTranslatingAll, translateAll] = createTranslateRange(
-  createRootMemo(() => range(store.imgList.length - 1)),
+  createRootMemo(() => range(store.imgList.length)),
 );
 
 // 翻译当前页以后的全部图片
 export const [isTranslatingToEnd, translateToEnd] = createTranslateRange(
-  createRootMemo(() => range(activeImgIndex(), store.imgList.length - 1)),
+  createRootMemo(() => range(activeImgIndex(), store.imgList.length)),
 );

src/components/Manga/components/ComicImgFlow.tsx

@@ -1,10 +1,10 @@
 import { type Component, createMemo, onMount, Index } from 'solid-js';
 import {
   boolDataVal,
-  createSequence,
   createEffectOn,
   type UseDrag,
   useDrag,
+  range,
 } from 'helper';
 
 import { useStyleMemo, useStyle } from '../hooks/useStyle';
@@ -116,14 +116,12 @@ export const ComicImgFlow: Component = () => {
 
     if (store.option.scrollMode.enabled) {
       if (store.option.scrollMode.abreastMode)
-        return `"${createSequence(abreastArea().columns.length)
-          .map((i) => `_${i}`)
-          .join(' ')}"`;
+        return `"${range(abreastArea().columns.length, (i) => `_${i}`).join(
+          ' ',
+        )}"`;
       if (store.option.scrollMode.doubleMode)
         return store.pageList.map((page) => `"${pageToText(page)}"`).join('\n');
-      return createSequence(store.imgList.length)
-        .map((i) => `"_${i}"`)
-        .join('\n');
+      return range(store.imgList.length, (i) => `"_${i}"`).join('\n');
     }
 
     return store.page.vertical

src/helper/other.ts

@@ -52,11 +52,11 @@ export function range<T = number>(
 ) {
   switch (typeof b) {
     case 'undefined':
-      return [...Array.from({ length: a + 1 }).keys()];
+      return [...Array.from({ length: a }).keys()];
 
     case 'number': {
       const list: Array<T | number> = [];
-      for (let i = a; i <= b; i++) list.push(c ? c(i) : i);
+      for (let i = a; i < b; i++) list.push(c ? c(i) : i);
       return list;
     }
 
@@ -112,11 +112,6 @@ export const getMostItem = <T>(list: T[]) => {
   )[0];
 };
 
-/** 创建顺序数组 */
-export const createSequence = (length: number) => [
-  ...Array.from({ length }).keys(),
-];
-
 /** 判断字符串是否为 URL */
 export const isUrl = (text: string) => {
   // 等浏览器版本上来后可以直接使用 URL.canParse

src/index.ts

@@ -1,7 +1,6 @@
 import { getInitLang } from 'helper/languages';
 import { otherSite } from 'userscript/otherSite';
 import {
-  createSequence,
   isUrl,
   log,
   plimit,
@@ -67,7 +66,8 @@ try {
 
       const loadImgFn: LoadImgFn = (setImg) =>
         plimit(
-          createSequence(totalPageNum).map(
+          range(
+            totalPageNum,
             (i) => async () => setImg(i, await getImg(i + 1)),
           ),
         );
@@ -301,7 +301,7 @@ try {
           )
             throw new Error('获取图片列表时出错');
 
-          return plimit<string>(createSequence(pageList.length).map(getImgUrl));
+          return plimit<string>(range(pageList.length, getImgUrl));
         },
         SPA: {
           isMangaPage: () => window.location.href.includes('episode'),

src/site/ehentai/index.tsx

@@ -22,10 +22,10 @@ import {
   requestIdleCallback,
   linstenKeydown,
   assign,
-  createSequence,
   extractRange,
   useCache,
   sleep,
+  range,
 } from 'helper';
 
 import { escHandler, createEhContext } from './helper';
@@ -305,9 +305,7 @@ import { expandTagList } from './expandTagList';
     // 所以只能一次性获取所有页数上的图片页地址
     if (context.pageList.length !== totalPageNum) {
       const allPageList = await plimit(
-        createSequence(totalPageNum).map(
-          (pageNum) => () => getImgPageUrl(pageNum),
-        ),
+        range(totalPageNum, (pageNum) => () => getImgPageUrl(pageNum)),
       );
       context.pageList.length = 0;
       context.fileNameList.length = 0;
@@ -342,17 +340,17 @@ import { expandTagList } from './expandTagList';
       e.stopPropagation();
 
       // eslint-disable-next-line no-alert
-      const range = prompt(
+      const pageRange = prompt(
         t('other.page_range'),
         (await cache.get('pageRange', unsafeWindow.gid))?.range,
       );
-      if (!range) return;
+      if (!pageRange) return;
       await cache.set('pageRange', {
         id: unsafeWindow.gid ?? context.galleryId,
-        range,
+        range: pageRange,
       });
 
-      setLoadImgsText(range ?? `1-${context.imgNum}`);
+      setLoadImgsText(pageRange ?? `1-${context.imgNum}`);
       // 删掉当前的图片列表以便触发重新加载
       setComicMap('', 'imgList', undefined);
       showComic();