@henderea/arg-helper 1.2.1 → 1.2.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,16 +1,34 @@
1
1
  {
2
2
  "name": "@henderea/arg-helper",
3
- "version": "1.2.1",
3
+ "version": "1.2.3",
4
4
  "description": "A utility wrapper around the arg command-line parser",
5
5
  "main": "src/index.js",
6
6
  "types": "src/index.d.ts",
7
7
  "repository": "git@github.com:henderea/arg-helper.git",
8
8
  "author": "Eric Henderson <henderea@gmail.com>",
9
9
  "license": "MIT",
10
+ "scripts": {
11
+ "lint": "eslint src --ext .js",
12
+ "lint:fix": "eslint --fix src --ext .js"
13
+ },
10
14
  "peerDependencies": {
11
15
  "arg": "5.x"
12
16
  },
17
+ "dependencies": {
18
+ "escalade": "^3.1.1"
19
+ },
20
+ "devDependencies": {
21
+ "@typescript-eslint/eslint-plugin": "^5.58.0",
22
+ "@typescript-eslint/parser": "^5.58.0",
23
+ "eslint": "^8.38.0",
24
+ "eslint-config-henderea": "1.1.7",
25
+ "eslint-plugin-import": "^2.27.5",
26
+ "typescript": "^5.0.4"
27
+ },
13
28
  "files": [
14
29
  "src/**/*"
15
- ]
30
+ ],
31
+ "eslintConfig": {
32
+ "extends": "henderea"
33
+ }
16
34
  }
package/src/index.d.ts CHANGED
@@ -16,6 +16,7 @@ declare namespace argHelper {
16
16
  numbers(name: string, ...names: Array<string>): this;
17
17
  count(name: string, ...names: Array<string>): this;
18
18
  helpText(helpText: string, ...names: Array<string>): this;
19
+ findVersion(callerPath: string, ...names: Array<string>): this;
19
20
  version(packageJsonFile: string, ...names: Array<string>): this;
20
21
  parse(argv?: Array<any> | null): Map<any>;
21
22
  readonly argv: Map<any>;
package/src/index.js CHANGED
@@ -1,78 +1,86 @@
1
1
  const fs = require('fs');
2
+ const escalade = require('escalade/sync');
2
3
 
3
4
  class ArgParser {
4
- constructor(arg) {
5
- this._arg = arg;
6
- this._opts = {};
7
- this._names = {};
8
- this._helpText = null;
9
- this._packageJsonFile = null;
10
- }
5
+ constructor(arg) {
6
+ this._arg = arg;
7
+ this._opts = {};
8
+ this._names = {};
9
+ this._helpText = null;
10
+ this._packageJsonFile = null;
11
+ }
11
12
 
12
- flag(name, ...names) {
13
- let type = names.pop();
14
- let mainName = names.shift();
15
- this._opts[mainName] = type;
16
- this._names[mainName] = name;
17
- if(names.length > 0) {
18
- names.forEach(n => {
19
- this._opts[n] = mainName;
20
- });
21
- }
22
- return this;
23
- }
24
- flags(name, ...names) {
25
- let type = names.pop();
26
- return this.flag(name, ...names, [type]);
13
+ flag(name, ...names) {
14
+ let type = names.pop();
15
+ let mainName = names.shift();
16
+ this._opts[mainName] = type;
17
+ this._names[mainName] = name;
18
+ if(names.length > 0) {
19
+ names.forEach((n) => {
20
+ this._opts[n] = mainName;
21
+ });
27
22
  }
23
+ return this;
24
+ }
25
+ flags(name, ...names) {
26
+ let type = names.pop();
27
+ return this.flag(name, ...names, [type]);
28
+ }
28
29
 
29
- string(name, ...names) { return this.flag(name, ...names, String); }
30
- strings(name, ...names) { return this.flags(name, ...names, String); }
31
- bool(name, ...names) { return this.flag(name, ...names, Boolean); }
32
- bools(name, ...names) { return this.flags(name, ...names, Boolean); }
33
- number(name, ...names) { return this.flag(name, ...names, Number); }
34
- numbers(name, ...names) { return this.flags(name, ...names, Number); }
35
- count(name, ...names) { return this.flag(name, ...names, this._arg.COUNT); }
36
- help(helpText, ...names) {
37
- this._helpText = helpText;
38
- return this.bool('help', ...names);
39
- }
40
- version(packageJsonFile, ...names) {
41
- this._packageJsonFile = packageJsonFile;
42
- return this.bool('version', ...names);
30
+ string(name, ...names) { return this.flag(name, ...names, String); }
31
+ strings(name, ...names) { return this.flags(name, ...names, String); }
32
+ bool(name, ...names) { return this.flag(name, ...names, Boolean); }
33
+ bools(name, ...names) { return this.flags(name, ...names, Boolean); }
34
+ number(name, ...names) { return this.flag(name, ...names, Number); }
35
+ numbers(name, ...names) { return this.flags(name, ...names, Number); }
36
+ count(name, ...names) { return this.flag(name, ...names, this._arg.COUNT); }
37
+ help(helpText, ...names) {
38
+ this._helpText = helpText;
39
+ return this.bool('help', ...names);
40
+ }
41
+ findVersion(callerPath, ...names) {
42
+ const packageJsonFile = escalade(callerPath, (dir, fileNames) => fileNames.includes('package.json') && 'package.json');
43
+ if(packageJsonFile && fs.existsSync(packageJsonFile)) {
44
+ this.version(packageJsonFile, ...names);
43
45
  }
46
+ return this;
47
+ }
48
+ version(packageJsonFile, ...names) {
49
+ this._packageJsonFile = packageJsonFile;
50
+ return this.bool('version', ...names);
51
+ }
44
52
 
45
- parse(argv = null) {
46
- let config = { permissive: true };
47
- if(argv !== null) { config.argv = argv; }
48
- let options = this._arg(this._opts, config);
49
- let rv = {};
50
- Object.keys(options).forEach(k => {
51
- rv[k] = options[k];
52
- if(this._names.hasOwnProperty(k)) {
53
- rv[this._names[k]] = options[k];
54
- }
55
- });
56
- if(this._helpText && rv.help) {
57
- console.log(this._helpText);
58
- process.exit(0);
59
- }
60
- if(rv.version && this._packageJsonFile && fs.existsSync(this._packageJsonFile)) {
61
- const packageJson = JSON.parse(fs.readFileSync(this._packageJsonFile));
62
- const version = packageJson.version;
63
- if(version) {
64
- console.log(version);
65
- process.exit(0);
66
- }
67
- }
68
- return rv;
53
+ parse(argv = null) {
54
+ let config = { permissive: true };
55
+ if(argv !== null) { config.argv = argv; }
56
+ let options = this._arg(this._opts, config);
57
+ let rv = {};
58
+ Object.keys(options).forEach((k) => {
59
+ rv[k] = options[k];
60
+ if(Object.prototype.hasOwnProperty.call(this._names, k)) {
61
+ rv[this._names[k]] = options[k];
62
+ }
63
+ });
64
+ if(this._helpText && rv.help) {
65
+ console.log(this._helpText);
66
+ process.exit(0);
69
67
  }
70
-
71
- get argv() {
72
- return this.parse();
68
+ if(rv.version && this._packageJsonFile && fs.existsSync(this._packageJsonFile)) {
69
+ const packageJson = JSON.parse(fs.readFileSync(this._packageJsonFile));
70
+ const version = packageJson.version;
71
+ if(version) {
72
+ console.log(version);
73
+ process.exit(0);
74
+ }
73
75
  }
76
+ return rv;
77
+ }
78
+
79
+ get argv() {
80
+ return this.parse();
81
+ }
74
82
  }
75
83
 
76
84
  module.exports = (arg) => {
77
- return { argParser: () => new ArgParser(arg) };
78
- }
85
+ return { argParser: () => new ArgParser(arg) };
86
+ };