Remove nopt dependency

liriliri · Jul 15, 2019 · 833dbce · 833dbce
1 parent e0445a5
commit 833dbce
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 42 deletions.
diff --git a/bin/licia.js b/bin/licia.js
@@ -1,27 +1,28 @@
 #!/usr/bin/env node
 
-const nopt = require('nopt');
 const path = require('path');
-const { contain } = require('licia');
+const { contain, parseArgs } = require('licia');
 
-const knowOpts = {
-        browser: Boolean,
-        silent: Boolean,
-        all: Boolean,
-        sauce: Boolean,
-        demo: Boolean,
-        ts: Boolean,
-        release: Boolean
+const options = parseArgs(process.argv.slice(2), {
+    names: {
+        browser: 'boolean',
+        silent: 'boolean',
+        all: 'boolean',
+        sauce: 'boolean',
+        demo: 'boolean',
+        ts: 'boolean',
+        release: 'boolean'
     },
-    shortHands = {
-        b: '--browser',
-        s: '--silent',
-        a: '--all',
-        d: '--demo',
-        r: '--release'
-    },
-    options = nopt(knowOpts, shortHands, process.argv, 2),
-    remain = options.argv.remain;
+    shorthands: {
+        browser: 'b',
+        silent: 's',
+        all: 'a',
+        demo: 'd',
+        release: 'r'
+    }
+});
+
+const remain = options.remain;
 
 process.chdir(path.resolve(__dirname, '../'));
 global.options = options;

diff --git a/lib/benchmark.js b/lib/benchmark.js
@@ -5,7 +5,7 @@ const { mkdir, fileExist, readTpl, eustiaBuild, runScript } = require('./util');
 
 module.exports = async function() {
     await mkdir('benchmark');
-    const modName = options.argv.remain[0];
+    const modName = options.remain[0];
     if (!modName) return console.log('A module name must be given.');
 
     await run(modName);

diff --git a/lib/help.js b/lib/help.js
@@ -3,7 +3,7 @@ const { contain } = require('licia');
 const { readTpl } = require('./util');
 
 module.exports = async function() {
-    let cmdName = options.argv.remain[0];
+    let cmdName = options.remain[0];
     if (contain(['benchmark', 'test', 'pack', 'update'], cmdName)) {
         await output(cmdName);
     } else {

diff --git a/lib/test.js b/lib/test.js
@@ -72,7 +72,7 @@ module.exports = async function() {
         return;
     }
 
-    let modName = options.argv.remain[0];
+    let modName = options.remain[0];
     if (!modName) return console.log('A module name must be given.');
 
     if (options.ts) {

diff --git a/package.json b/package.json
@@ -63,7 +63,6 @@
     "licia": "latest",
     "mocha": "^5.0.4",
     "ncp": "^2.0.0",
-    "nopt": "^4.0.1",
     "npm": "5.7.1",
     "nws": "^1.1.1",
     "prettier": "^1.13.5",

diff --git a/src/c/contain.js b/src/c/contain.js
@@ -20,7 +20,7 @@
 
 /* typescript
  * export declare function contain(
- *     arr: any[] | {} | string, 
+ *     arr: any[] | {} | string,
  *     val: any
  * ): boolean;
  */

diff --git a/src/d/dateFormat.js b/src/d/dateFormat.js
@@ -123,10 +123,10 @@ exports = function(date, mask, utc, gmt) {
             Z: gmt
                 ? 'GMT'
                 : utc
-                    ? 'UTC'
-                    : (toStr(date).match(regTimezone) || [''])
-                          .pop()
-                          .replace(regTimezoneClip, ''),
+                ? 'UTC'
+                : (toStr(date).match(regTimezone) || [''])
+                      .pop()
+                      .replace(regTimezoneClip, ''),
             o:
                 (o > 0 ? '-' : '+') +
                 padZero(

diff --git a/src/f/fileType.js b/src/f/fileType.js
@@ -1,12 +1,12 @@
 /* Detect file type using magic number.
- * 
+ *
  * |Name  |Type                         |Desc                          |
  * |------|-----------------------------|------------------------------|
  * |input |Buffer ArrayBuffer Uint8Array|File input                    |
  * |return|object                       |Object containing ext and mime|
- * 
+ *
  * ### Supported file types
- * 
+ *
  * jpg, png, gif, webp, bmp, gz, zip, rar, pdf, exe
  */
 

diff --git a/src/f/fnArgs.js b/src/f/fnArgs.js
@@ -1,10 +1,10 @@
 /* Validate function arguments.
- * 
+ *
  * |Name |Type    |Desc           |
  * |-----|--------|---------------|
  * |types|array   |Argument types |
  * |args |Argument|Argument object|
- * 
+ *
  * It throws an exception when validation failed.
  */
 

diff --git a/src/m/MediaQuery.js b/src/m/MediaQuery.js
@@ -1,25 +1,25 @@
 /* CSS media query listener.
  *
  * Extend from Emitter.
- * 
+ *
  * ### constructor
- * 
+ *
  * |Name |Type  |Desc       |
  * |-----|------|-----------|
  * |query|string|Media query|
- * 
+ *
  * ### isMatch
- * 
+ *
  * Return true if given media query matches.
- * 
+ *
  * ### Events
- * 
+ *
  * #### match
- * 
+ *
  * Triggered when a media query matches.
- * 
+ *
  * #### unmatch
- * 
+ *
  * Opposite of match.
  */