narou 0.9.2 → 1.0.0

package/package.json

@@ -1,74 +1,86 @@
-{
-  "name": "narou",
-  "version": "0.9.2",
-  "description": "Narou API Wrapper",
-  "type": "module",
-  "main": "dist/index.cjs",
-  "types": "dist/index.d.ts",
-  "module": "dist/index.js",
-  "exports": {
-    ".": {
-      "default": "./dist/index.js",
-      "require": "./dist/index.cjs",
-      "import": "./dist/index.js",
-      "types": "./dist/index.d.ts",
-      "browser": {
-        "require": "./dist/index.browser.cjs",
-        "import": "./dist/index.browser.js",
-        "types": "./dist/index.browser.d.ts"
-      }
-    }
-  },
-  "files": [
-    "dist",
-    "src",
-    "package.json",
-    "package-lock.json",
-    "README.md"
-  ],
-  "engines": {
-    "node": ">=16.0.0"
-  },
-  "author": "deflis <deflis@gmail.com>",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/deflis/node-narou.git"
-  },
-  "dependencies": {
-    "date-fns": "^2.30.0"
-  },
-  "devDependencies": {
-    "@types/jest": "^29.5.8",
-    "@types/node": "^20.9.0",
-    "@types/node-fetch": "^2.6.9",
-    "@typescript-eslint/eslint-plugin": "^6.10.0",
-    "@typescript-eslint/parser": "^6.10.0",
-    "eslint": "^8.53.0",
-    "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-prettier": "^5.0.1",
-    "jest": "^29.7.0",
-    "node-fetch": "^2.7.0",
-    "npm-run-all": "^4.1.5",
-    "prettier": "^3.0.3",
-    "ts-jest": "^29.1.1",
-    "tsup": "^7.2.0",
-    "typescript": "^5.2.2"
-  },
-  "optionalDependencies": {
-    "node-fetch": "^2.6.7"
-  },
-  "scripts": {
-    "build": "npm-run-all check build:tsc",
-    "build:tsc": "tsup ./src",
-    "check": "npm-run-all --parallel check:lint check:build test",
-    "check:lint": "eslint src/** test/**",
-    "check:build": "tsc --noEmit",
-    "prepack": "npm-run-all format build",
-    "format": "eslint --fix src/** test/**",
-    "test": "jest",
-    "docs": "npm-run-all docs:clean docs:typedoc",
-    "docs:clean": "npx rimraf docs",
-    "docs:typedoc": "npx typedoc --out ./docs src/index.ts"
-  }
-}
+{
+  "name": "narou",
+  "version": "1.0.0",
+  "description": "Narou API Wrapper",
+  "type": "module",
+  "main": "dist/index.cjs",
+  "types": "dist/index.d.ts",
+  "module": "dist/index.js",
+  "exports": {
+    ".": {
+      "default": "./dist/index.js",
+      "require": "./dist/index.cjs",
+      "import": "./dist/index.js",
+      "types": "./dist/index.d.ts",
+      "browser": {
+        "require": "./dist/index.browser.cjs",
+        "import": "./dist/index.browser.js",
+        "types": "./dist/index.browser.d.ts"
+      }
+    },
+    "./browser": {
+      "default": "./dist/index.browser.js",
+      "require": "./dist/index.browser.cjs",
+      "import": "./dist/index.browser.js",
+      "types": "./dist/index.browser.d.ts"
+    },
+    "./*": {
+      "default": "./dist/*.js",
+      "require": "./dist/*.cjs",
+      "import": "./dist/*.js",
+      "types": "./dist/*.d.ts"
+    },
+    "./utils": {
+      "default": "./dist/utils/*.js",
+      "require": "./dist/utils/*.cjs",
+      "import": "./dist/utils/*.js",
+      "types": "./dist/utils/*.d.ts"
+    }
+  },
+  "files": [
+    "dist",
+    "src",
+    "package.json",
+    "package-lock.json",
+    "README.md"
+  ],
+  "engines": {
+    "node": ">=16.0.0",
+    "pnpm": ">=8"
+  },
+  "author": "deflis <deflis@gmail.com>",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/deflis/node-narou.git"
+  },
+  "dependencies": {
+    "date-fns": "^3.3.1"
+  },
+  "devDependencies": {
+    "@types/node": "^20.11.20",
+    "@typescript-eslint/eslint-plugin": "^7.1.0",
+    "@typescript-eslint/parser": "^7.1.0",
+    "@vitest/coverage-v8": "^1.3.1",
+    "eslint": "^8.57.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-prettier": "^5.1.3",
+    "prettier": "^3.2.5",
+    "run-z": "^2.0.0",
+    "tsup": "^8.0.2",
+    "typescript": "^5.3.3",
+    "vitest": "^1.3.1"
+  },
+  "scripts": {
+    "build": "run-z check build:tsc",
+    "build:tsc": "tsup ./src",
+    "check": "run-z check:lint,check:build,test",
+    "check:lint": "eslint src/** test/**",
+    "check:build": "tsc --noEmit",
+    "format": "eslint --fix src/** test/**",
+    "test": "vitest run",
+    "docs": "run-z docs:clean docs:typedoc",
+    "docs:clean": "pnpm dlx rimraf docs",
+    "docs:typedoc": "pnpm dlx typedoc --out ./docs src/index.ts"
+  }
+}

package/src/index.browser.ts

@@ -1,12 +1,12 @@
-import NarouNovelJsonp from "./narou-jsonp";
-import NarouNovel from "./narou";
-import SearchBuilder from "./search-builder";
-import SearchBuilderR18 from "./search-builder-r18";
-import RankingBuilder from "./ranking";
-import { formatRankingHistory, RankingHistoryResult } from "./ranking-history";
-import UserSearchBuilder from "./user-search";
+import type NarouNovel from "./narou.js";
+import NarouNovelJsonp from "./narou-jsonp.js";
+import SearchBuilder from "./search-builder.js";
+import SearchBuilderR18 from "./search-builder-r18.js";
+import RankingBuilder from "./ranking.js";
+import { formatRankingHistory, RankingHistoryResult } from "./ranking-history.js";
+import UserSearchBuilder from "./user-search.js";
 
-export * from "./index.common";
+export * from "./index.common.js";
 export { NarouNovelJsonp };
 
 const narouNovelJsonp = new NarouNovelJsonp();

package/src/index.common.ts

@@ -1,8 +1,8 @@
-import NarouNovel from "./narou";
-import NarouSearchResults from "./narou-search-results";
-import SearchBuilder from "./search-builder";
-import SearchBuilderR18 from "./search-builder-r18";
-import RankingBuilder from "./ranking";
+import NarouNovel from "./narou.js";
+import NarouSearchResults from "./narou-search-results.js";
+import SearchBuilder from "./search-builder.js";
+import SearchBuilderR18 from "./search-builder-r18.js";
+import RankingBuilder from "./ranking.js";
 
 export {
   NarouNovel,
@@ -12,11 +12,11 @@ export {
   RankingBuilder,
 };
 
-export * from "./ranking-history";
-export * from "./params";
-export { NarouParams } from "./narou";
-export * from "./narou-search-results";
-export * from "./narou-ranking-results";
-export * from "./search-builder";
-export * from "./search-builder-r18";
-export * from "./user-search";
+export * from "./ranking-history.js";
+export * from "./params.js";
+export type { NarouParams } from "./narou.js";
+export * from "./narou-search-results.js";
+export type * from "./narou-ranking-results.js";
+export * from "./search-builder.js";
+export * from "./search-builder-r18.js";
+export * from "./user-search.js";

package/src/index.ts

@@ -1,13 +1,13 @@
-import NarouNovel from "./narou";
-import NarouNovelFetch from "./narou-fetch";
-import NarouNovelJsonp from "./narou-jsonp";
-import RankingBuilder from "./ranking";
-import { formatRankingHistory, RankingHistoryResult } from "./ranking-history";
-import SearchBuilder from "./search-builder";
-import SearchBuilderR18 from "./search-builder-r18";
-import UserSearchBuilder from "./user-search";
+import type NarouNovel from "./narou.js";
+import NarouNovelFetch from "./narou-fetch.js";
+import NarouNovelJsonp from "./narou-jsonp.js";
+import RankingBuilder from "./ranking.js";
+import { formatRankingHistory, RankingHistoryResult } from "./ranking-history.js";
+import SearchBuilder from "./search-builder.js";
+import SearchBuilderR18 from "./search-builder-r18.js";
+import UserSearchBuilder from "./user-search.js";
 
-export * from "./index.common";
+export * from "./index.common.js";
 export { NarouNovelFetch, NarouNovelJsonp };
 
 const narouNovelFetch = new NarouNovelFetch();

package/src/narou-fetch.ts

@@ -1,5 +1,6 @@
-import { unzipp } from "./util/unzipp";
-import NarouNovel, { NarouParams } from "./narou";
+import { unzipp } from "./util/unzipp.js";
+import NarouNovel from "./narou.js";
+import type { NarouParams } from "./narou.js";
 
 type Fetch = typeof fetch;
 
@@ -7,7 +8,11 @@ type Fetch = typeof fetch;
  * なろう小説APIへのリクエストを実行する
  */
 export default class NarouNovelFetch extends NarouNovel {
-  constructor(private fetch: Fetch = require('node-fetch')) {
+  /**
+   * コンストラクタ
+   * @param fetch fetch関数（デフォルトはネイティブのfetch）
+   */
+  constructor(private fetch?: Fetch) {
     super();
   }
 
@@ -28,7 +33,7 @@ export default class NarouNovelFetch extends NarouNovel {
       }
     });
 
-    const res = await this.fetch(url);
+    const res = await (this.fetch ?? fetch)(url);
 
     if (query.gzip === 0) {
       return (await res.json()) as T;

package/src/narou-jsonp.ts

@@ -1,5 +1,6 @@
-import NarouNovel, { NarouParams } from "./narou";
-import { jsonp } from "./util/jsonp";
+import NarouNovel from "./narou.js";
+import type { NarouParams } from "./narou.js";
+import { jsonp } from "./util/jsonp.js";
 
 /**
  * なろう小説APIへのリクエストを実行する

package/src/narou-ranking-results.ts

@@ -1,6 +1,6 @@
-import { PickedNarouSearchResult } from "./narou-search-results";
-import { SearchResultFieldNames } from "./params";
-import { DefaultSearchResultFields } from "./search-builder";
+import type { PickedNarouSearchResult } from "./narou-search-results.js";
+import type { SearchResultFieldNames } from "./params.js";
+import type { DefaultSearchResultFields } from "./search-builder.js";
 
 /**
  * ランキングAPIの結果

package/src/narou-search-results.ts

@@ -1,4 +1,4 @@
-import {
+import type {
   BooleanNumber as BooleanNumber,
   Genre,
   R18Site,
@@ -8,7 +8,7 @@ import {
   R18Fields,
   OptionalFields,
   UserFields,
-} from "./params";
+} from "./params.js";
 
 /**
  * なろう小説API検索結果

package/src/narou.ts

@@ -1,15 +1,16 @@
-import { NarouRankingResult } from "./narou-ranking-results";
-import NarouSearchResults, {
+import type { NarouRankingResult } from "./narou-ranking-results.js";
+import NarouSearchResults from "./narou-search-results.js";
+import type {
   NarouSearchResult,
   UserSearchResult,
-} from "./narou-search-results";
-import {
+} from "./narou-search-results.js";
+import type {
   RankingHistoryParams,
   RankingParams,
   SearchParams,
   UserSearchParams,
-} from "./params";
-import { RankingHistoryRawResult } from "./ranking-history";
+} from "./params.js";
+import type { RankingHistoryRawResult } from "./ranking-history.js";
 
 /**
  * なろう小説APIへのリクエストパラメータ

package/src/params.ts

@@ -1,5 +1,5 @@
-import { NarouSearchResult, UserSearchResult } from "./narou-search-results";
-import { Join } from "./util/type";
+import type { NarouSearchResult, UserSearchResult } from "./narou-search-results.js";
+import type { Join } from "./util/type.js";
 
 export const RankingType = {
   Daily: "d",

package/src/ranking-history.ts

@@ -1,5 +1,5 @@
 import { parse } from "date-fns";
-import { RankingType } from "./params";
+import type { RankingType } from "./params.js";
 
 const dateFormat = "yyyyMMdd";
 

package/src/ranking.ts

@@ -1,15 +1,18 @@
-import { NarouRankingResult, RankingResult } from "./narou-ranking-results";
-import SearchBuilder, { DefaultSearchResultFields } from "./search-builder";
+import type { NarouRankingResult, RankingResult } from "./narou-ranking-results.js";
+import SearchBuilder from "./search-builder.js";
+import type { DefaultSearchResultFields } from "./search-builder.js";
 import { addDays, format } from "date-fns";
-import {
-  Fields,
+import type {
   GzipLevel,
   OptionalFields,
+} from "./params.js";
+import {
   RankingParams,
   RankingType,
-} from "./params";
-import NarouNovel from "./narou";
-import { SearchResultFields } from "./narou-search-results";
+  Fields,
+} from "./params.js";
+import type NarouNovel from "./narou.js";
+import type { SearchResultFields } from "./narou-search-results.js";
 
 const dateFormat = "yyyyMMdd";
 

package/src/search-builder-r18.ts

@@ -1,15 +1,16 @@
-import { NovelSearchBuilderBase } from "./search-builder";
-import NarouSearchResults, {
+import { NovelSearchBuilderBase } from "./search-builder.js";
+import type NarouSearchResults from "./narou-search-results.js";
+import type {
   NarouSearchResult,
   SearchResultR18Fields,
   SearchResultOptionalFields,
-} from "./narou-search-results";
-import {
+} from "./narou-search-results.js";
+import type {
   R18Site,
   SearchResultFieldNames,
   R18Fields,
   OptionalFields,
-} from "./params";
+} from "./params.js";
 
 export type DefaultR18SearchResultFields = keyof Omit<
   NarouSearchResult,

package/src/search-builder.ts

@@ -1,16 +1,14 @@
-import NarouNovel from "./narou";
-import {
+import type NarouNovel from "./narou.js";
+import type {
   NarouSearchResult,
   SearchResultFields,
   SearchResultOptionalFields,
-} from "./narou-search-results";
-import NarouSearchResults from "./narou-search-results";
-import {
+} from "./narou-search-results.js";
+import type NarouSearchResults from "./narou-search-results.js";
+import type {
   BigGenre,
-  BooleanNumber,
   SearchResultFieldNames,
   Genre,
-  StopParam,
   SearchParams,
   Fields,
   Order,
@@ -19,8 +17,9 @@ import {
   GzipLevel,
   OptionalFields,
   ParamsBaseWithOrder,
-} from "./params";
-import { Join } from "./util/type";
+} from "./params.js";
+import { BooleanNumber, StopParam } from "./params.js";
+import type { Join } from "./util/type.js";
 
 export type DefaultSearchResultFields = keyof Omit<
   NarouSearchResult,
@@ -38,7 +37,7 @@ export abstract class SearchBuilderBase<
   constructor(
     protected params: TParams = {} as TParams,
     protected api: NarouNovel
-  ) {}
+  ) { }
 
   protected static distinct<T>(array: readonly T[]): T[] {
     return Array.from(new Set(array));

package/src/user-search.ts

@@ -1,9 +1,10 @@
-import NarouSearchResults, {
+import NarouSearchResults from "./narou-search-results.js";
+import type {
   UserSearchResult,
   UserSearchResultFields,
-} from "./narou-search-results";
-import { UserFields, UserOrder, UserSearchParams } from "./params";
-import { SearchBuilderBase } from "./search-builder";
+} from "./narou-search-results.js";
+import type { UserFields, UserOrder, UserSearchParams } from "./params.js";
+import { SearchBuilderBase } from "./search-builder.js";
 
 /**
  * なろうユーザ検索API