@@ -36,7 +36,7 @@ export function isCompilable(filename) {
36
36
}
37
37
38
38
function defaultIndexTemplate ( filePaths ) {
39
- const exportEntries = filePaths . map ( filePath => {
39
+ const exportEntries = filePaths . map ( ( filePath ) => {
40
40
const basename = path . basename ( filePath , path . extname ( filePath ) )
41
41
const exportName = / ^ \d / . test ( basename ) ? `Svg${ basename } ` : basename
42
42
return `export { default as ${ exportName } } from './${ basename } '`
@@ -54,7 +54,7 @@ export default async function dirCommand(
54
54
{ ext, filenameCase = CASE . PASCAL , ...options } ,
55
55
) {
56
56
async function write ( src , dest ) {
57
- if ( ! isCompilable ( src ) ) return null
57
+ if ( ! isCompilable ( src ) ) return { transformed : false , dest : null }
58
58
59
59
ext = ext || getDefaultExtension ( options )
60
60
dest = rename ( dest , ext , filenameCase )
@@ -64,12 +64,12 @@ export default async function dirCommand(
64
64
65
65
if ( program . ignoreExisting && ( await exists ( dest ) ) ) {
66
66
politeWrite ( program , chalk . grey ( logOutput ) )
67
- return null
67
+ return { transformed : false , dest }
68
68
}
69
69
70
70
outputFileSync ( dest , code )
71
71
politeWrite ( program , chalk . white ( logOutput ) )
72
- return dest
72
+ return { transformed : true , dest }
73
73
}
74
74
75
75
async function generateIndex ( dest , files ) {
@@ -86,28 +86,29 @@ export default async function dirCommand(
86
86
const dirname = filename
87
87
const files = await readdir ( dirname )
88
88
const results = await Promise . all (
89
- files . map ( async relativeFile => {
89
+ files . map ( async ( relativeFile ) => {
90
90
const absFile = path . join ( dirname , relativeFile )
91
91
return handle ( absFile , root )
92
92
} ) ,
93
93
)
94
- const transformed = results . filter ( Boolean )
94
+ const transformed = results . filter ( ( result ) => result . transformed )
95
95
if ( transformed . length ) {
96
+ const destFiles = results . map ( ( result ) => result . dest ) . filter ( Boolean )
96
97
const dest = path . resolve ( program . outDir , path . relative ( root , dirname ) )
97
- await generateIndex ( dest , transformed )
98
+ await generateIndex ( dest , destFiles )
98
99
}
99
- return null
100
+ return { transformed : false , dest : null }
100
101
}
101
102
102
103
const dest = path . resolve ( program . outDir , path . relative ( root , filename ) )
103
104
return write ( filename , dest )
104
105
}
105
106
106
107
await Promise . all (
107
- filenames . map ( async file => {
108
+ filenames . map ( async ( file ) => {
108
109
const stats = await stat ( file )
109
110
const root = stats . isDirectory ( ) ? file : path . dirname ( file )
110
- return handle ( file , root )
111
+ await handle ( file , root )
111
112
} ) ,
112
113
)
113
114
}
0 commit comments