random-word-wikipedia 1.0.5 → 1.1.0

package/cli.js

@@ -1,11 +1,12 @@
 #!/usr/bin/env node
-"use strict";
-const meow = require("meow");
-const randomWordWikipedia = require(".");
 
-const cli = meow(`
+import meow from "meow";
+import randomWordWikipedia from "./index.js";
+
+const cli = meow(
+	`
 	Usage
-	  $ random-word-wikipedia [lang]
+	  $ random-word-wikipedia [lang=en]
 
 	Options
 	  -n 10 or less [Default: 1]
@@ -19,13 +20,22 @@ const cli = meow(`
 		内野 (印西市)
 		PAC-MAN 256
 
-`);
+`,
+	{
+		importMeta: import.meta,
+		flags: {
+			n: {
+				type: "number"
+			}
+		}
+	}
+);
 
-randomWordWikipedia(cli.input[0], cli.flags.n)
-	.then(res => {
+randomWordWikipedia(cli.input[0], cli.flags.n || 1)
+	.then((res) => {
 		console.log(res.join("\n"));
 	})
-	.catch(err => {
+	.catch((err) => {
 		console.error("Error: err.message");
 		console.error("$ random-word-wikipedia --help");
 	});

package/index.js

@@ -1,27 +1,28 @@
-require("isomorphic-fetch");
-require("es6-promise").polyfill();
+import "isomorphic-fetch";
+import promise from "es6-promise";
+promise.polyfill();
 
-module.exports = (lang, n) => {
-	return new Promise(function(resolve, reject) {
+const randomWordWikipedia = (lang, n = 1) => {
+	return new Promise(function (resolve, reject) {
 		lang = lang || "en";
 		if (typeof lang !== "string") {
 			throw new TypeError(`Expected a string, got ${typeof lang}`);
 		}
 
-		n = n || 1;
 		if (n <= 0 || n > 10) {
 			throw new TypeError(`Expected a -n (1 - 10), got ${n}`);
 		}
 
 		// rnlimit: API limit 10 or less
-		const url = `http://${lang}.wikipedia.org/w/api.php?format=json&action=query&list=random&rnnamespace=0&rnlimit=10`;
+		const url = `https://${lang}.wikipedia.org/w/api.php?format=json&action=query&list=random&rnnamespace=0&rnlimit=${n}`;
 
 		const res = fetch(url)
-			.then(res => res.json())
-			.then(data => {
+			.then((res) => res.json())
+			.then((data) => {
 				const words = data.query.random;
-				words.length = n;
-				resolve(words.map(v => v.title));
+				resolve(words.slice(-n).map((v) => v.title));
 			});
 	});
 };
+
+export default randomWordWikipedia;

package/package.json

@@ -1,30 +1,33 @@
 {
 	"name": "random-word-wikipedia",
 	"description": "Get random word from wikipedia random page",
-	"version": "1.0.5",
+	"version": "1.1.0",
 	"author": {
 		"name": "elzup",
 		"email": "guild0105@gmail.com",
-		"url": "elzup.com"
+		"url": "https://anozon.me"
+	},
+	"type": "module",
+	"bin": {
+		"random-word-wikipedia": "./cli.js"
 	},
-	"bin": "cli.js",
 	"dependencies": {
-		"es6-promise": "^4.2.2",
-		"isomorphic-fetch": "^2.2.1",
-		"meow": "^3.7.0"
+		"es6-promise": "4.2.8",
+		"fetch-mock": "9.11.0",
+		"isomorphic-fetch": "3.0.0",
+		"meow": "10.1.2"
 	},
 	"devDependencies": {
-		"ava": "^0.20.0"
+		"ava": "3.15.0"
 	},
 	"engines": {
-		"node": ">=6"
+		"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
 	},
 	"files": [
 		"cli.js",
 		"index.js"
 	],
 	"keywords": [
-		"",
 		"cli",
 		"cli-app",
 		"wikipedia",
@@ -34,6 +37,7 @@
 	"license": "MIT",
 	"repository": "elzup/random-word-wikipedia",
 	"scripts": {
-		"test": "ava"
+		"test": "ava",
+		"cli": "node cli.js"
 	}
 }

package/readme.md

@@ -1,28 +1,25 @@
-# random-word-wikipedia [![Build Status](https://travis-ci.org/elzup/random-word-wikipedia.svg?branch=master)](https://travis-ci.org/elzup/random-word-wikipedia)
+# random-word-wikipedia [![Node.js CI](https://github.com/elzup/random-word-wikipedia/actions/workflows/node.js.yml/badge.svg)](https://github.com/elzup/random-word-wikipedia/actions/workflows/node.js.yml)
 
 > Get random word from wikipedia random page
 
-
 ## Install
 
 ```
 $ npm install random-word-wikipedia
 ```
 
-
 ## Usage
 
 ```js
-const randomWordWikipedia = require('random-word-wikipedia');
+const randomWordWikipedia = require("random-word-wikipedia");
 
 randomWordWikipedia().then(console.log);
 //=> [ 'Saxifraga spathularis' ]
 
-randomWordWikipedia('ja', 2).then(console.log);
+randomWordWikipedia("ja", 2).then(console.log);
 //=> [ 'ジョン・イサーク・ブリケ', '月は闇夜に隠るが如く' ]
 ```
 
-
 ## API
 
 ### randomWordWikipedia([lang, n])
@@ -69,7 +66,6 @@ $ random-word-wikipedia --help
 		PAC-MAN 256
 ```
 
-
 ## License
 
 MIT © [elzup](https://elzup.com)

package/lib/cli.js

@@ -1,19 +0,0 @@
-#!/usr/bin/env node
-
-"use strict";
-
-var _ = require(".");
-
-var _2 = _interopRequireDefault(_);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-var meow = require("meow");
-
-
-var cli = meow("\n\tUsage\n\t  $ random-word-wikipedia [lang]\n\n\tOptions\n\t  -n 10 or less [Default: 1]\n\n\tExamples\n\t  $ random-word-wikipedia\n\t\tYuruYuri\n\n\t  $ random-word-wikipedia ja -n 3\n\t\t\u30D0\u30C0\u30A4\u30F3\u30B8\u30E3\u30E9\u30F3\u7802\u6F20\n\t\t\u5185\u91CE (\u5370\u897F\u5E02)\n\t\tPAC-MAN 256\n\n");
-
-(0, _2.default)(cli.input[0], cli.flags.n).then(function (res) {
-	console.log(res.join("\n"));
-});
-//# sourceMappingURL=cli.js.map

package/lib/index.js

@@ -1,37 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-	value: true
-});
-
-var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
-
-require("isomorphic-fetch");
-
-require("es6-promise").polyfill();
-
-exports.default = async function main(lang, n) {
-	lang = lang || "en";
-	if (typeof lang !== "string") {
-		throw new TypeError("Expected a string, got " + (typeof lang === "undefined" ? "undefined" : _typeof(lang)));
-	}
-
-	n = n || 1;
-	if (n <= 0 || n > 10) {
-		throw new TypeError("Expected a -n (1 - 10), got " + n);
-	}
-
-	// rnlimit: API limit 10 or less
-	var url = "http://" + lang + ".wikipedia.org/w/api.php?format=json&action=query&list=random&rnnamespace=0&rnlimit=10";
-
-	var res = await fetch(url);
-	var data = await res.json();
-	var words = data.query.random;
-	words.length = n;
-	return words.map(function (v) {
-		return v.title;
-	});
-};
-
-module.exports = exports["default"];
-//# sourceMappingURL=index.js.map