narou 0.7.7 → 0.8.1

package/dist/ranking.d.ts

@@ -1,46 +1,46 @@
-import { NarouRankingResult, RankingResult } from "./narou-ranking-results";
-import { DefaultSearchResultFields } from "./search-builder";
-import { Fields, GzipLevel, OptionalFields, RankingParams, RankingType } from "./params";
-import NarouNovel from "./narou";
-import { SearchResultFields } from "./narou-search-results";
-/**
- * ランキングヘルパー
- * @class Ranking
- */
-export default class RankingBuilder {
-    protected params: Partial<RankingParams>;
-    protected api: NarouNovel;
-    protected date$: Date;
-    protected type$: RankingType;
-    /**
-     * constructor
-     * @private
-     */
-    constructor(params: Partial<RankingParams>, api: NarouNovel);
-    date(date: Date): this;
-    type(type: RankingType): this;
-    /**
-     * gzip圧縮する。
-     *
-     * 転送量上限を減らすためにも推奨
-     * @param {GzipLevel} level gzip圧縮レベル(1～5)
-     * @return {RankingBuilder} this
-     */
-    gzip(level: GzipLevel): this;
-    /**
-     * クエリパラメータをセットする
-     * @private
-     * @return {RankingBuilder} this
-     */
-    protected set(obj: Partial<RankingParams>): this;
-    /**
-     * なろう小説APIへのリクエストを実行する
-     * @returns ランキング
-     */
-    execute(): Promise<NarouRankingResult[]>;
-    executeWithFields(): Promise<RankingResult<DefaultSearchResultFields>[]>;
-    executeWithFields<TFields extends Fields>(fields: TFields | TFields[]): Promise<RankingResult<SearchResultFields<TFields>>[]>;
-    executeWithFields(fields: never[], opt: OptionalFields | OptionalFields[]): Promise<RankingResult<DefaultSearchResultFields | "weekly_unique">[]>;
-    executeWithFields<TFields extends Fields>(fields: TFields | TFields[], opt: OptionalFields | OptionalFields[]): Promise<RankingResult<SearchResultFields<TFields> | "weekly_unique">[]>;
-}
+import { NarouRankingResult, RankingResult } from "./narou-ranking-results";
+import { DefaultSearchResultFields } from "./search-builder";
+import { Fields, GzipLevel, OptionalFields, RankingParams, RankingType } from "./params";
+import NarouNovel from "./narou";
+import { SearchResultFields } from "./narou-search-results";
+/**
+ * ランキングヘルパー
+ * @class Ranking
+ */
+export default class RankingBuilder {
+    protected params: Partial<RankingParams>;
+    protected api: NarouNovel;
+    protected date$: Date;
+    protected type$: RankingType;
+    /**
+     * constructor
+     * @private
+     */
+    constructor(params: Partial<RankingParams>, api: NarouNovel);
+    date(date: Date): this;
+    type(type: RankingType): this;
+    /**
+     * gzip圧縮する。
+     *
+     * 転送量上限を減らすためにも推奨
+     * @param {GzipLevel} level gzip圧縮レベル(1～5)
+     * @return {RankingBuilder} this
+     */
+    gzip(level: GzipLevel): this;
+    /**
+     * クエリパラメータをセットする
+     * @private
+     * @return {RankingBuilder} this
+     */
+    protected set(obj: Partial<RankingParams>): this;
+    /**
+     * なろう小説APIへのリクエストを実行する
+     * @returns ランキング
+     */
+    execute(): Promise<NarouRankingResult[]>;
+    executeWithFields(): Promise<RankingResult<DefaultSearchResultFields>[]>;
+    executeWithFields<TFields extends Fields>(fields: TFields | TFields[]): Promise<RankingResult<SearchResultFields<TFields>>[]>;
+    executeWithFields(fields: never[], opt: OptionalFields | OptionalFields[]): Promise<RankingResult<DefaultSearchResultFields | "weekly_unique">[]>;
+    executeWithFields<TFields extends Fields>(fields: TFields | TFields[], opt: OptionalFields | OptionalFields[]): Promise<RankingResult<SearchResultFields<TFields> | "weekly_unique">[]>;
+}
 //# sourceMappingURL=ranking.d.ts.map

package/dist/ranking.js

@@ -1,156 +1,87 @@
-"use strict";
-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];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-var search_builder_1 = require("./search-builder");
-var date_fns_1 = require("date-fns");
-var params_1 = require("./params");
-var dateFormat = "yyyyMMdd";
-/**
- * ランキングヘルパー
- * @class Ranking
- */
-var RankingBuilder = /** @class */ (function () {
-    /**
-     * constructor
-     * @private
-     */
-    function RankingBuilder(params, api) {
-        if (params === void 0) { params = {}; }
-        this.params = params;
-        this.api = api;
-        /**
-         * クエリパラメータ
-         * @protected
-         */
-        this.date$ = (0, date_fns_1.addDays)(Date.now(), -1);
-        this.type$ = params_1.RankingType.Daily;
-    }
-    RankingBuilder.prototype.date = function (date) {
-        this.date$ = date;
-        return this;
-    };
-    RankingBuilder.prototype.type = function (type) {
-        this.type$ = type;
-        return this;
-    };
-    /**
-     * gzip圧縮する。
-     *
-     * 転送量上限を減らすためにも推奨
-     * @param {GzipLevel} level gzip圧縮レベル(1～5)
-     * @return {RankingBuilder} this
-     */
-    RankingBuilder.prototype.gzip = function (level) {
-        this.set({ gzip: level });
-        return this;
-    };
-    /**
-     * クエリパラメータをセットする
-     * @private
-     * @return {RankingBuilder} this
-     */
-    RankingBuilder.prototype.set = function (obj) {
-        Object.assign(this.params, obj);
-        return this;
-    };
-    /**
-     * なろう小説APIへのリクエストを実行する
-     * @returns ランキング
-     */
-    RankingBuilder.prototype.execute = function () {
-        var date = (0, date_fns_1.format)(this.date$, dateFormat);
-        this.set({ rtype: "".concat(date, "-").concat(this.type$) });
-        return this.api.executeRanking(this.params);
-    };
-    RankingBuilder.prototype.executeWithFields = function (fields, opt) {
-        if (fields === void 0) { fields = []; }
-        return __awaiter(this, void 0, void 0, function () {
-            var ranking, fields$, rankingNcodes, builder, result;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.execute()];
-                    case 1:
-                        ranking = _a.sent();
-                        fields$ = Array.isArray(fields)
-                            ? fields.length == 0
-                                ? []
-                                : __spreadArray(__spreadArray([], fields, true), [params_1.Fields.ncode], false)
-                            : [fields, params_1.Fields.ncode];
-                        rankingNcodes = ranking.map(function (_a) {
-                            var ncode = _a.ncode;
-                            return ncode;
-                        });
-                        builder = new search_builder_1.default({}, this.api);
-                        builder.fields(fields$);
-                        if (opt) {
-                            builder.opt(opt);
-                        }
-                        builder.ncode(rankingNcodes);
-                        builder.limit(ranking.length);
-                        return [4 /*yield*/, builder.execute()];
-                    case 2:
-                        result = _a.sent();
-                        return [2 /*return*/, ranking.map(function (r) { return (__assign(__assign({}, r), result.values.find(function (novel) { return novel.ncode == r.ncode; }))); })];
-                }
-            });
-        });
-    };
-    return RankingBuilder;
-}());
-exports.default = RankingBuilder;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const search_builder_1 = require("./search-builder");
+const date_fns_1 = require("date-fns");
+const params_1 = require("./params");
+const dateFormat = "yyyyMMdd";
+/**
+ * ランキングヘルパー
+ * @class Ranking
+ */
+class RankingBuilder {
+    /**
+     * constructor
+     * @private
+     */
+    constructor(params = {}, api) {
+        this.params = params;
+        this.api = api;
+        /**
+         * クエリパラメータ
+         * @protected
+         */
+        this.date$ = (0, date_fns_1.addDays)(Date.now(), -1);
+        this.type$ = params_1.RankingType.Daily;
+    }
+    date(date) {
+        this.date$ = date;
+        return this;
+    }
+    type(type) {
+        this.type$ = type;
+        return this;
+    }
+    /**
+     * gzip圧縮する。
+     *
+     * 転送量上限を減らすためにも推奨
+     * @param {GzipLevel} level gzip圧縮レベル(1～5)
+     * @return {RankingBuilder} this
+     */
+    gzip(level) {
+        this.set({ gzip: level });
+        return this;
+    }
+    /**
+     * クエリパラメータをセットする
+     * @private
+     * @return {RankingBuilder} this
+     */
+    set(obj) {
+        Object.assign(this.params, obj);
+        return this;
+    }
+    /**
+     * なろう小説APIへのリクエストを実行する
+     * @returns ランキング
+     */
+    execute() {
+        const date = (0, date_fns_1.format)(this.date$, dateFormat);
+        this.set({ rtype: `${date}-${this.type$}` });
+        return this.api.executeRanking(this.params);
+    }
+    async executeWithFields(fields = [], opt) {
+        const ranking = await this.execute();
+        const fields$ = Array.isArray(fields)
+            ? fields.length == 0
+                ? []
+                : [...fields, params_1.Fields.ncode]
+            : [fields, params_1.Fields.ncode];
+        const rankingNcodes = ranking.map(({ ncode }) => ncode);
+        const builder = new search_builder_1.default({}, this.api);
+        builder.fields(fields$);
+        if (opt) {
+            builder.opt(opt);
+        }
+        builder.ncode(rankingNcodes);
+        builder.limit(ranking.length);
+        const result = await builder.execute();
+        return ranking.map((r) => ({
+            ...r,
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            ...result.values.find((novel) => novel.ncode == r.ncode),
+        }));
+    }
+}
+exports.default = RankingBuilder;
 //# sourceMappingURL=ranking.js.map

package/dist/ranking.js.map

@@ -1 +1 @@
-{"version":3,"file":"ranking.js","sourceRoot":"","sources":["../src/ranking.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ranking.js","sourceRoot":"","sources":["../src/ranking.ts"],"names":[],"mappings":"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"}

package/dist/search-builder-r18.d.ts

@@ -1,29 +1,29 @@
-import { SearchBuilderBase } from "./search-builder";
-import NarouSearchResults, { NarouSearchResult, SearchResultR18Fields, SerachResultOptionalFields } from "./narou-search-results";
-import { R18Site, SearchResultFieldNames, R18Fields, OptionalFields } from "./params";
-export declare type DefaultR18SearchResultFields = keyof Omit<NarouSearchResult, "weekly_unique" | "noveltype" | "biggenre" | "genre" | "isr15" | "id">;
-/**
- * 18禁API検索ヘルパー
- * @class SearchBuilderR18
- */
-export default class SearchBuilderR18<T extends SearchResultFieldNames = DefaultR18SearchResultFields, TOpt extends keyof NarouSearchResult = never> extends SearchBuilderBase<T | TOpt> {
-    /**
-     * なろう小説APIへの検索リクエストを実行する
-     * @override
-     * @returns {Promise<NarouSearchResults>} 検索結果
-     */
-    execute(): Promise<NarouSearchResults<T | TOpt>>;
-    r18Site(sites: R18Site | readonly R18Site[]): this;
-    /**
-     *
-     * @return {SearchBuilder} this
-     */
-    xid(ids: number | readonly number[]): this;
-    /**
-     *
-     * @return {SearchBuilder} this
-     */
-    fields<TFields extends R18Fields>(fields: TFields | readonly TFields[]): SearchBuilderR18<SearchResultR18Fields<R18Fields>>;
-    opt<TFields extends OptionalFields>(option: TFields | readonly TFields[]): SearchBuilderR18<T, SerachResultOptionalFields<TFields>>;
-}
+import { NovelSearchBuilderBase } from "./search-builder";
+import NarouSearchResults, { NarouSearchResult, SearchResultR18Fields, SearchResultOptionalFields } from "./narou-search-results";
+import { R18Site, SearchResultFieldNames, R18Fields, OptionalFields } from "./params";
+export declare type DefaultR18SearchResultFields = keyof Omit<NarouSearchResult, "weekly_unique" | "noveltype" | "biggenre" | "genre" | "isr15" | "id">;
+/**
+ * 18禁API検索ヘルパー
+ * @class SearchBuilderR18
+ */
+export default class SearchBuilderR18<T extends SearchResultFieldNames = DefaultR18SearchResultFields, TOpt extends keyof NarouSearchResult = never> extends NovelSearchBuilderBase<T | TOpt> {
+    /**
+     * なろう小説APIへの検索リクエストを実行する
+     * @override
+     * @returns {Promise<NarouSearchResults>} 検索結果
+     */
+    execute(): Promise<NarouSearchResults<NarouSearchResult, T | TOpt>>;
+    r18Site(sites: R18Site | readonly R18Site[]): this;
+    /**
+     *
+     * @return {SearchBuilder} this
+     */
+    xid(ids: number | readonly number[]): this;
+    /**
+     *
+     * @return {SearchBuilder} this
+     */
+    fields<TFields extends R18Fields>(fields: TFields | readonly TFields[]): SearchBuilderR18<SearchResultR18Fields<R18Fields>>;
+    opt<TFields extends OptionalFields>(option: TFields | readonly TFields[]): SearchBuilderR18<T, SearchResultOptionalFields<TFields>>;
+}
 //# sourceMappingURL=search-builder-r18.d.ts.map

package/dist/search-builder-r18.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"search-builder-r18.d.ts","sourceRoot":"","sources":["../src/search-builder-r18.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,kBAAkB,EAAE,EACzB,iBAAiB,EACjB,qBAAqB,EACrB,0BAA0B,EAC3B,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,OAAO,EACP,sBAAsB,EACtB,SAAS,EACT,cAAc,EACf,MAAM,UAAU,CAAC;AAElB,oBAAY,4BAA4B,GAAG,MAAM,IAAI,CACnD,iBAAiB,EACjB,eAAe,GAAG,WAAW,GAAG,UAAU,GAAG,OAAO,GAAG,OAAO,GAAG,IAAI,CACtE,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,OAAO,OAAO,gBAAgB,CACnC,CAAC,SAAS,sBAAsB,GAAG,4BAA4B,EAC/D,IAAI,SAAS,MAAM,iBAAiB,GAAG,KAAK,CAC5C,SAAQ,iBAAiB,CAAC,CAAC,GAAG,IAAI,CAAC;IACnC;;;;OAIG;IACH,OAAO,IAAI,OAAO,CAAC,kBAAkB,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;IAIhD,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,SAAS,OAAO,EAAE;IAK3C;;;OAGG;IACH,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE;IAKnC;;;OAGG;IACH,MAAM,CAAC,OAAO,SAAS,SAAS,EAC9B,MAAM,EAAE,OAAO,GAAG,SAAS,OAAO,EAAE,GACnC,gBAAgB,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC;IAMrD,GAAG,CAAC,OAAO,SAAS,cAAc,EAChC,MAAM,EAAE,OAAO,GAAG,SAAS,OAAO,EAAE,GACnC,gBAAgB,CAAC,CAAC,EAAE,0BAA0B,CAAC,OAAO,CAAC,CAAC;CAK5D"}
+{"version":3,"file":"search-builder-r18.d.ts","sourceRoot":"","sources":["../src/search-builder-r18.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,kBAAkB,EAAE,EACzB,iBAAiB,EACjB,qBAAqB,EACrB,0BAA0B,EAC3B,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,OAAO,EACP,sBAAsB,EACtB,SAAS,EACT,cAAc,EACf,MAAM,UAAU,CAAC;AAElB,oBAAY,4BAA4B,GAAG,MAAM,IAAI,CACnD,iBAAiB,EACjB,eAAe,GAAG,WAAW,GAAG,UAAU,GAAG,OAAO,GAAG,OAAO,GAAG,IAAI,CACtE,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,OAAO,OAAO,gBAAgB,CACnC,CAAC,SAAS,sBAAsB,GAAG,4BAA4B,EAC/D,IAAI,SAAS,MAAM,iBAAiB,GAAG,KAAK,CAC5C,SAAQ,sBAAsB,CAAC,CAAC,GAAG,IAAI,CAAC;IACxC;;;;OAIG;IACH,OAAO,IAAI,OAAO,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC;IAInE,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,SAAS,OAAO,EAAE;IAK3C;;;OAGG;IACH,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE;IAKnC;;;OAGG;IACH,MAAM,CAAC,OAAO,SAAS,SAAS,EAC9B,MAAM,EAAE,OAAO,GAAG,SAAS,OAAO,EAAE,GACnC,gBAAgB,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC;IAMrD,GAAG,CAAC,OAAO,SAAS,cAAc,EAChC,MAAM,EAAE,OAAO,GAAG,SAAS,OAAO,EAAE,GACnC,gBAAgB,CAAC,CAAC,EAAE,0BAA0B,CAAC,OAAO,CAAC,CAAC;CAK5D"}

package/dist/search-builder-r18.js

@@ -1,65 +1,45 @@
-"use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-var search_builder_1 = require("./search-builder");
-/**
- * 18禁API検索ヘルパー
- * @class SearchBuilderR18
- */
-var SearchBuilderR18 = /** @class */ (function (_super) {
-    __extends(SearchBuilderR18, _super);
-    function SearchBuilderR18() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    /**
-     * なろう小説APIへの検索リクエストを実行する
-     * @override
-     * @returns {Promise<NarouSearchResults>} 検索結果
-     */
-    SearchBuilderR18.prototype.execute = function () {
-        return this.api.executeNovel18(this.params);
-    };
-    SearchBuilderR18.prototype.r18Site = function (sites) {
-        this.set({ nocgenre: search_builder_1.SearchBuilderBase.array2string(sites) });
-        return this;
-    };
-    /**
-     *
-     * @return {SearchBuilder} this
-     */
-    SearchBuilderR18.prototype.xid = function (ids) {
-        this.set({ xid: search_builder_1.SearchBuilderBase.array2string(ids) });
-        return this;
-    };
-    /**
-     *
-     * @return {SearchBuilder} this
-     */
-    SearchBuilderR18.prototype.fields = function (fields) {
-        this.set({ of: search_builder_1.SearchBuilderBase.array2string(fields) });
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        return this;
-    };
-    SearchBuilderR18.prototype.opt = function (option) {
-        this.set({ opt: search_builder_1.SearchBuilderBase.array2string(option) });
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        return this;
-    };
-    return SearchBuilderR18;
-}(search_builder_1.SearchBuilderBase));
-exports.default = SearchBuilderR18;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const search_builder_1 = require("./search-builder");
+/**
+ * 18禁API検索ヘルパー
+ * @class SearchBuilderR18
+ */
+class SearchBuilderR18 extends search_builder_1.NovelSearchBuilderBase {
+    /**
+     * なろう小説APIへの検索リクエストを実行する
+     * @override
+     * @returns {Promise<NarouSearchResults>} 検索結果
+     */
+    execute() {
+        return this.api.executeNovel18(this.params);
+    }
+    r18Site(sites) {
+        this.set({ nocgenre: search_builder_1.NovelSearchBuilderBase.array2string(sites) });
+        return this;
+    }
+    /**
+     *
+     * @return {SearchBuilder} this
+     */
+    xid(ids) {
+        this.set({ xid: search_builder_1.NovelSearchBuilderBase.array2string(ids) });
+        return this;
+    }
+    /**
+     *
+     * @return {SearchBuilder} this
+     */
+    fields(fields) {
+        this.set({ of: search_builder_1.NovelSearchBuilderBase.array2string(fields) });
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        return this;
+    }
+    opt(option) {
+        this.set({ opt: search_builder_1.NovelSearchBuilderBase.array2string(option) });
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        return this;
+    }
+}
+exports.default = SearchBuilderR18;
 //# sourceMappingURL=search-builder-r18.js.map

package/dist/search-builder-r18.js.map

@@ -1 +1 @@
-{"version":3,"file":"search-builder-r18.js","sourceRoot":"","sources":["../src/search-builder-r18.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,mDAAqD;AAkBrD;;;GAGG;AACH;IAGU,oCAA2B;IAHrC;;IA8CA,CAAC;IA1CC;;;;OAIG;IACH,kCAAO,GAAP;QACE,OAAO,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC9C,CAAC;IAED,kCAAO,GAAP,UAAQ,KAAmC;QACzC,IAAI,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,kCAAiB,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC9D,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;OAGG;IACH,8BAAG,GAAH,UAAI,GAA+B;QACjC,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,kCAAiB,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACvD,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;OAGG;IACH,iCAAM,GAAN,UACE,MAAoC;QAEpC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,kCAAiB,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACzD,8DAA8D;QAC9D,OAAO,IAAW,CAAC;IACrB,CAAC;IAED,8BAAG,GAAH,UACE,MAAoC;QAEpC,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,kCAAiB,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC1D,8DAA8D;QAC9D,OAAO,IAAW,CAAC;IACrB,CAAC;IACH,uBAAC;AAAD,CAAC,AA9CD,CAGU,kCAAiB,GA2C1B"}
+{"version":3,"file":"search-builder-r18.js","sourceRoot":"","sources":["../src/search-builder-r18.ts"],"names":[],"mappings":";;AAAA,qDAA0D;AAkB1D;;;GAGG;AACH,MAAqB,gBAGnB,SAAQ,uCAAgC;IACxC;;;;OAIG;IACH,OAAO;QACL,OAAO,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC9C,CAAC;IAED,OAAO,CAAC,KAAmC;QACzC,IAAI,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,uCAAsB,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACnE,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;OAGG;IACH,GAAG,CAAC,GAA+B;QACjC,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,uCAAsB,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC5D,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;OAGG;IACH,MAAM,CACJ,MAAoC;QAEpC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,uCAAsB,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC9D,8DAA8D;QAC9D,OAAO,IAAW,CAAC;IACrB,CAAC;IAED,GAAG,CACD,MAAoC;QAEpC,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,uCAAsB,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC/D,8DAA8D;QAC9D,OAAO,IAAW,CAAC;IACrB,CAAC;CACF;AA9CD,mCA8CC"}