@@ -9,14 +9,16 @@ const doxdox = require('../lib/doxdox');
9
9
10
10
const findPackageFileInPath = require ( '../lib/utils' ) . findPackageFileInPath ;
11
11
12
+ const pkg = require ( '../package' ) ;
13
+
12
14
const args = require ( 'parse-cmd-args' ) ( null , {
13
15
'allowMultipleInputs' : true ,
14
16
'requireUserInput' : true
15
17
} ) ;
16
18
17
19
if ( args . flags [ '--version' ] || args . flags [ '-v' ] ) {
18
20
19
- process . stdout . write ( `${ require ( '../package' ) . version } \n` ) ;
21
+ process . stdout . write ( `${ pkg . version } \n` ) ;
20
22
process . exit ( ) ;
21
23
22
24
} else if ( ! args . inputs . length || args . flags [ '--help' ] || args . flags [ '-h' ] ) {
@@ -46,39 +48,37 @@ ${chalk.yellow(' -t, --title')} Sets title.
46
48
47
49
} else {
48
50
49
- let pkg = findPackageFileInPath ( args . flags [ '--package' ] || args . flags [ '-p' ] ) ;
50
-
51
- try {
51
+ const projectPkgPath = findPackageFileInPath ( args . flags [ '--package' ] || args . flags [ '-p' ] ) ;
52
52
53
- const pkgStats = fs . statSync ( pkg ) ;
53
+ let projectPkg = { } ;
54
54
55
- if ( pkgStats . isFile ( ) ) {
55
+ try {
56
56
57
- pkg = require ( pkg ) ;
57
+ const projectPkgStats = fs . statSync ( projectPkgPath ) ;
58
58
59
- } else {
59
+ if ( projectPkgStats . isFile ( ) ) {
60
60
61
- pkg = { } ;
61
+ projectPkg = require ( projectPkgPath ) ;
62
62
63
63
}
64
64
65
65
} catch ( err ) {
66
66
67
- pkg = { } ;
67
+ process . stderr . write ( ` ${ err . toString ( ) } \n` ) ;
68
68
69
69
}
70
70
71
71
const config = {
72
- 'description' : args . flags [ '--description' ] || args . flags [ '-d' ] || pkg . description || '' ,
72
+ 'description' : args . flags [ '--description' ] || args . flags [ '-d' ] || projectPkg . description || '' ,
73
73
'ignore' : ( args . flags [ '--ignore' ] || args . flags [ '-i' ] || '' ) . split ( / \s * , \s * / ) ,
74
74
'layout' : ( args . flags [ '--layout' ] || args . flags [ '-l' ] || 'markdown' ) . toLowerCase ( ) ,
75
75
'parser' : ( args . flags [ '--parser' ] || args . flags [ '-r' ] || 'dox' ) . toLowerCase ( ) ,
76
- 'title' : args . flags [ '--title' ] || args . flags [ '-t' ] || pkg . name || 'Untitled Project'
76
+ 'title' : args . flags [ '--title' ] || args . flags [ '-t' ] || projectPkg . name || 'Untitled Project'
77
77
} ;
78
78
79
79
const output = args . flags [ '--output' ] || args . flags [ '-o' ] || null ;
80
80
81
- doxdox . parseInputs ( args . inputs , Object . assign ( { pkg } , config ) ) . then ( content => {
81
+ doxdox . parseInputs ( args . inputs , Object . assign ( { projectPkg } , config ) ) . then ( content => {
82
82
83
83
if ( output ) {
84
84
0 commit comments