clia - npm Package Compare versions

Comparing version 2024.5.29 to 2024.5.31

index.js

@@ -1,8 +0,8 @@
-const parse_arg = (arg) => {
+const parse = (token) => {
 
-    if (arg.startsWith('--')) {
-        if (arg === '--')
-            return ['a', '--']
+    if (token.startsWith('--')) {
+        if (token === '--')
+            return { arg: '--' }
 
-        const option = arg.slice(2)
+        const option = token.slice(2)
 
@@ -12,15 +12,15 @@ if (option.includes('=')) {
             if (key === '' || value === '')
-                return ['o', [option]]
-            else return ['kv', [key, value]]
+                return { opt: [option] }
+            else return { kv: { k: key, v: value } }
         }
 
-        return ['o', [option]]
+        return { opt: [option] }
     }
 
-    if (arg.startsWith('-') && arg.length > 1) {
-        const options = arg.slice(1).split('')
-        return ['o', options]
+    if (token.startsWith('-') && token.length > 1) {
+        const options = token.slice(1).split('')
+        return { opt: options }
     }
 
-    return ['a', arg]
+    return { arg: token }
 }
@@ -31,8 +31,8 @@
 
-        const [kind, parsed] = acc.skip ? ['a', next] : parse_arg(next)
-
-        if (kind === 'o') {
-            const options = parsed.map(o => ({ [o]: true })).reduce((acc, next) => ({ ...acc, ...next }), {})
+        const { opt, arg, kv } = acc.skip ? { arg: next} : parse(next)
+	
+        if (opt) {
+            const options = opt.map(o => ({ [o]: true })).reduce((acc, next) => ({ ...acc, ...next }), {})
             return {
-                tag: parsed.length == 1 && parsed.find(_ => true) || acc.tag,
+                tag: opt.length == 1 && opt.find(_ => true) || acc.tag,
                 opt: { ...acc.opt, ...options },
@@ -43,12 +43,12 @@ args: acc.args,
         }
-        else if (kind === 'a') {
-            if (parsed === '--' && !acc.skip) {
+	else if (arg) {
+            if (arg === '--' && !acc.skip) {
                 acc.skip = true
             } else if (acc.tag) {
-                acc.args[acc.tag] = [...acc.args[acc.tag] || [], parsed]
+                acc.args[acc.tag] = [...acc.args[acc.tag] || [], arg]
             }
-            else acc.plain.push(parsed)
+            else acc.plain.push(arg)
         }
-        else if (kind === 'kv') {
-            const [k, v] = parsed
+	else if (kv) {
+            const { k, v } = kv
             acc.args[k] = [...acc.args[k] || [], v]
@@ -85,3 +85,3 @@ }
     if (!Array.isArray(args) || !Array.isArray(alias))
-        return [[], [], [`Expected input to be array(s). Eg clia(process.argv.slice(2),['alias','names'])`]]
+        return { errors: [`Expected input to be array(s). Eg clia(process.argv.slice(2),['alias','names'])`] }
 
@@ -95,15 +95,14 @@ const trim_filter = (input) => input
 
-    const filter_reason = `Not a string, string is empty or spaces only, string contains __proto__ or prototype.`
-
     const valid_args = trim_filter(args)
     const valid_alias = trim_filter(alias)
 
+    const inputs_requirement = `Inputs should be non-empty strings which don't contain __proto__ or prototype.`
+    const error_message = (inputs) => `One or more ${inputs} were excluded from parsing. ${inputs_requirement}`
+
     const errors = [
-        valid_args.length < args.length ?
-            `One or more args were excluded from parsing. Reason: ${filter_reason}` : '',
-        valid_alias.length < alias.length ?
-            `One or more aliases were excluded from parsing. Reason: ${filter_reason}` : '']
+        valid_args.length < args.length ? error_message('args') : '',
+        valid_alias.length < alias.length ? error_message('aliases') : '']
         .filter(e => e.length)
 
-    return [valid_args, valid_alias, errors]
+    return { valid_args, valid_alias, errors } 
 }
@@ -113,16 +112,15 @@
 
-    const [valid_args, valid_alias, errors] = validate_input(args, alias)
+    const { valid_args, valid_alias, errors } = validate_input(args, alias)
 
-    const parsed = combine_input(valid_args)
+    const parsed = combine_input(valid_args ?? [])
 
-    copy_alias_values(parsed, valid_alias)
+    copy_alias_values(parsed, valid_alias ?? [])
 
-    const result = {
+    return {
         arg: first_arg(parsed.args),
         args: parsed.args,
         opt: parsed.opt,
-        plain: parsed.plain
+        plain: parsed.plain,
+	...(errors.length ? { errors } : {})
     }
-
-    return errors.length ? { ...{ errors }, ...result } : result
 }

package.json

 {
   "name": "clia",
-  "version": "2024.5.29",
+  "version": "2024.5.31",
   "description": "Command line arguments parser",
@@ -8,3 +8,3 @@ "main": "index.js",
     "test": "npx t3st",
-    "start": "npx nodemon -x \"npx t3st\"",
+    "dev": "npx nodemon -x \"npx t3st\"",
     "lint": "npx eslint@9 ."
@@ -23,5 +23,4 @@ },
     "parser",
-    "t3st",
-    "testing",
-    "test"
+    "command",
+    "shell"
   ],
@@ -28,0 +27,0 @@ "author": "datafilter",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Worsened metrics

Total package byte prevSize

8796

decreased by-0.86%

Lines of code

96

decreased by-1.03%

No dependency changes