fix: add help values to cache

Author: jdx

package.json

@@ -5,14 +5,14 @@
   "author": "Jeff Dickey @jdxcode",
   "bugs": "https://github.com/anycli/command/issues",
   "dependencies": {
-    "@anycli/parser": "^3.0.2",
+    "@anycli/parser": "^3.0.3",
     "cli-ux": "^3.3.10",
     "debug": "^3.1.0",
     "lodash": "^4.17.4",
     "tslib": "^1.9.0"
   },
   "devDependencies": {
-    "@anycli/config": "^0.2.6",
+    "@anycli/config": "^0.2.8",
     "@anycli/tslint": "^0.2.1",
     "@commitlint/cli": "^6.0.5",
     "@commitlint/config-conventional": "^6.0.4",

src/cache.ts

@@ -16,8 +16,7 @@ export function convertToCached(c: Config.ICommand, opts: ConvertToCachedOptions
     pluginName: opts.plugin && opts.plugin.name,
     hidden: c.hidden,
     aliases: c.aliases || [],
-    // help: c.help,
-    flags: _.mapValues(c.flags, (flag, name) => {
+    flags: _.mapValues(c.flags || {}, (flag, name) => {
       if (flag.type === 'boolean') {
         return {
           name,
@@ -36,15 +35,18 @@ export function convertToCached(c: Config.ICommand, opts: ConvertToCachedOptions
         hidden: flag.hidden,
         required: flag.required,
         helpValue: flag.helpValue,
+        options: flag.options,
+        default: _.isFunction(flag.default) ? flag.default() : flag.default,
       }
     }),
-    args: c.args.map(a => ({
+    args: c.args ? c.args.map(a => ({
       name: a.name,
       description: a.description,
       required: a.required,
-      // default: a.default && a.default(),
+      options: a.options,
+      default: _.isFunction(a.default) ? a.default() : a.default,
       hidden: a.hidden,
-    })),
+    })) : {} as Config.ICachedCommand['args'],
     load: async () => c,
   }
 }

test/command.test.ts

@@ -63,6 +63,8 @@ describe('command', () => {
             hidden: true,
             required: false,
             description: 'flagb desc',
+            options: ['a', 'b'],
+            default: () => 'mydefault',
           }),
         }
         static args = [
@@ -71,6 +73,8 @@ describe('command', () => {
             description: 'arg1 desc',
             required: true,
             hidden: false,
+            options: ['af', 'b'],
+            default: () => 'myadefault',
           }
         ]
       }.convertToCached({id: 'foo:bar'})
@@ -102,6 +106,8 @@ describe('command', () => {
             required: false,
             type: 'option',
             helpValue: undefined,
+            default: 'mydefault',
+            options: ['a', 'b'],
           }
         },
         args: [
@@ -110,6 +116,8 @@ describe('command', () => {
             name: 'arg1',
             hidden: false,
             required: true,
+            options: ['af', 'b'],
+            default: 'myadefault',
           }
         ],
       })

yarn.lock

@@ -2,9 +2,9 @@
 # yarn lockfile v1
 
 
-"@anycli/config@^0.2.6":
-  version "0.2.6"
-  resolved "https://registry.yarnpkg.com/@anycli/config/-/config-0.2.6.tgz#d40709a61704907d4d6e7dcab6bbf124ab74e9ad"
+"@anycli/config@^0.2.8":
+  version "0.2.8"
+  resolved "https://registry.yarnpkg.com/@anycli/config/-/config-0.2.8.tgz#db2884692252f2f64afaf1e89cc507c2d35a3226"
   dependencies:
     cli-ux "^3.3.10"
     debug "^3.1.0"
@@ -13,9 +13,9 @@
     lodash "^4.17.4"
     read-pkg "^3.0.0"
 
-"@anycli/parser@^3.0.2":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@anycli/parser/-/parser-3.0.2.tgz#69af00b6b6f0cc6da4405cf44dc29b2d14d30c6e"
+"@anycli/parser@^3.0.3":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@anycli/parser/-/parser-3.0.3.tgz#abc33c9098485d0ae2705eab859ff305aec6006f"
   dependencies:
     "@anycli/screen" "^0.0.3"
     chalk "^2.3.0"
@@ -556,8 +556,8 @@ content-type@^1.0.4:
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
 
 conventional-changelog-angular@^1.3.3:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-1.6.0.tgz#0a26a071f2c9fcfcf2b86ba0cfbf6e6301b75bfa"
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-1.6.1.tgz#e1434d017c854032b272f690424a8c0ca16dc318"
   dependencies:
     compare-func "^1.3.1"
     q "^1.4.1"
@@ -1063,8 +1063,8 @@ global-dirs@^0.1.0:
     ini "^1.3.4"
 
 globals@^11.0.1:
-  version "11.2.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-11.2.0.tgz#aa2ece052a787563ba70a3dcd9dc2eb8a9a0488c"
+  version "11.3.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-11.3.0.tgz#e04fdb7b9796d8adac9c8f64c14837b2313378b0"
 
 globby@^4.0.0:
   version "4.1.0"