Skip to content

Commit 9d4bcbd

Browse files
committed
refactor(gen): move .ts transform to util.js
1 parent 1d4ce11 commit 9d4bcbd

File tree

2 files changed

+5
-13
lines changed

2 files changed

+5
-13
lines changed

app/generator.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -497,13 +497,7 @@ export default class Generator extends Base {
497497

498498
let self = this;
499499
this.sourceRoot(path.join(__dirname, './templates'));
500-
this.processDirectory('.', '.', function(dest) {
501-
if(self.filters.ts && dest.indexOf('client') > -1 && dest.indexOf('.json') === -1) {
502-
dest = dest.replace('.js', '.ts');
503-
}
504-
505-
return dest;
506-
});
500+
this.processDirectory('.', '.');
507501
},
508502
generateEndpoint: function() {
509503
var models;

util.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -105,14 +105,10 @@ function templateIsUsable(self, filteredFile) {
105105
return true;
106106
}
107107

108-
function defaultIteratee(dest) {
109-
return dest;
110-
}
111-
112108
/**
113109
*
114110
*/
115-
export function processDirectory(source, destination, iteratee = defaultIteratee) {
111+
export function processDirectory(source, destination) {
116112
var self = this;
117113
var root = path.isAbsolute(source) ? source : path.join(self.sourceRoot(), source);
118114
var files = expandFiles('**', { dot: true, cwd: root });
@@ -132,7 +128,9 @@ export function processDirectory(source, destination, iteratee = defaultIteratee
132128
src = path.join(root, f);
133129
dest = path.join(destination, name);
134130

135-
dest = iteratee(dest);
131+
if(self.filters.ts && dest.indexOf('client') > -1 && dest.indexOf('.json') === -1) {
132+
dest = dest.replace('.js', '.ts');
133+
}
136134

137135
if(path.basename(dest).indexOf('_') === 0) {
138136
stripped = path.basename(dest).replace(/^_/, '');

0 commit comments

Comments
 (0)