Skip to content

Commit d0145ab

Browse files
Awk34Awk34
committed
feat(gen): add route generator
1 parent c3a649d commit d0145ab

File tree

6 files changed

+267
-33
lines changed

6 files changed

+267
-33
lines changed

‎src/generators/base.js‎

Lines changed: 182 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ import _ from 'lodash';
55
import s from 'underscore.string';
66
import Promise from 'bluebird';
77
import semver from 'semver';
8-
import {appName} from './util.js';
9-
import {Base} from 'yeoman-generator';
8+
import Generator from 'yeoman-generator';
9+
import glob from 'glob';
10+
import fs from 'fs';
1011

1112
// extend lodash with underscore.string
1213
_.mixin(s.exports());
@@ -29,11 +30,132 @@ function runCmd(cmd) {
2930
});
3031
}
3132

32-
export class BaseGenerator extends Base {
33-
initializing() {
33+
function appName(suffix) {
34+
let counter = 0;
35+
// Have to check this because of generator bug` #386
36+
process.argv.forEach(val => {
37+
if(val.indexOf('--app-suffix') > -1) {
38+
counter++;
39+
}
40+
});
41+
if(counter === 0 || (typeof suffix === 'boolean' && suffix)) {
42+
suffix = 'App';
43+
}
44+
return suffix ? _.upperFirst(_.camelCase(suffix)) : '';
45+
}
46+
47+
48+
function expandFiles(pattern, options) {
49+
options = options || {};
50+
var cwd = options.cwd || process.cwd();
51+
return glob.sync(pattern, options).filter(function (filepath) {
52+
return fs.statSync(path.join(cwd, filepath)).isFile();
53+
});
54+
}
55+
56+
export function rewriteFile(args) {
57+
args.path = args.path || process.cwd();
58+
var fullPath = path.join(args.path, args.file);
59+
60+
args.haystack = fs.readFileSync(fullPath, 'utf8');
61+
var body = rewrite(args);
62+
63+
fs.writeFileSync(fullPath, body);
64+
}
65+
66+
function escapeRegExp(str) {
67+
return str.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, '\\$&');
68+
}
69+
70+
export function rewrite(args) {
71+
// check if splicable is already in the body text
72+
var re = new RegExp(args.splicable.map(function(line) {
73+
return '\s*' + escapeRegExp(line);
74+
}).join('\n'));
75+
76+
if (re.test(args.haystack)) {
77+
return args.haystack;
78+
}
79+
80+
var lines = args.haystack.split('\n');
81+
82+
var otherwiseLineIndex = -1;
83+
lines.forEach(function (line, i) {
84+
if (line.indexOf(args.needle) !== -1) {
85+
otherwiseLineIndex = i;
86+
}
87+
});
88+
if(otherwiseLineIndex === -1) return lines.join('\n');
89+
90+
var spaces = 0;
91+
while (lines[otherwiseLineIndex].charAt(spaces) === ' ') {
92+
spaces += 1;
93+
}
94+
95+
var spaceStr = '';
96+
while ((spaces -= 1) >= 0) {
97+
spaceStr += ' ';
98+
}
99+
100+
lines.splice(otherwiseLineIndex + 1, 0, args.splicable.map(function(line) {
101+
return spaceStr + line;
102+
}).join('\n'));
103+
104+
return lines.join('\n');
105+
}
106+
107+
export function appSuffix(self) {
108+
var suffix = self.options['app-suffix'];
109+
return (typeof suffix === 'string') ? _.classify(suffix) : '';
110+
}
111+
112+
export function relativeRequire(to, fr) {
113+
fr = this.destinationPath(fr || this.filePath);
114+
to = this.destinationPath(to);
115+
return path.relative(path.dirname(fr), to)
116+
.replace(/\\/g, '/') // convert win32 separator to posix
117+
.replace(/^(?!\.\.)(.*)/, './$1') // prefix non parent path with ./
118+
.replace(/[\/\\]index\.js$/, ''); // strip index.js suffix from path
119+
}
120+
121+
function filterFile(template) {
122+
// Find matches for parans
123+
var filterMatches = template.match(/\(([^)]+)\)/g);
124+
var filters = [];
125+
if(filterMatches) {
126+
filterMatches.forEach(function(filter) {
127+
filters.push(filter.replace('(', '').replace(')', ''));
128+
template = template.replace(filter, '');
129+
});
130+
}
131+
132+
return { name: template, filters: filters };
133+
}
134+
135+
function templateIsUsable(self, filteredFile) {
136+
var filters = self.filters || self.config.get('filters');
137+
var enabledFilters = [];
138+
for(var key in filters) {
139+
if(filters[key]) enabledFilters.push(key);
140+
}
141+
var matchedFilters = _.intersection(filteredFile.filters, enabledFilters);
142+
// check that all filters on file are matched
143+
if(filteredFile.filters.length && matchedFilters.length !== filteredFile.filters.length) {
144+
return false;
145+
}
146+
return true;
147+
}
148+
149+
export class BaseGenerator extends Generator {
150+
constructor(args, opts) {
151+
// Calling the super constructor is important so our generator is correctly set up
152+
super(args, opts);
153+
34154
this.argument('name', { type: String, required: false });
35155

36-
this.lodash = _;
156+
this.name = this.options.name;
157+
158+
// this.lodash = _;
37159

38160
var yoCheckPromise;
39161

@@ -48,13 +170,8 @@ export class BaseGenerator extends Base {
48170
yoCheckPromise = Promise.resolve();
49171
}
50172

51-
try {
52-
this.appname = require(path.join(process.cwd(), 'bower.json')).name;
53-
} catch(err) {
54-
this.appname = path.basename(process.cwd());
55-
}
56-
this.appname = _.slugify(_.humanize(this.appname));
57-
this.scriptAppName = this.config.get('moduleName') || _.camelize(this.appname) + appName(this);
173+
this.appname = _.slugify(_.humanize(path.basename(process.cwd())));
174+
this.scriptAppName = this.config.get('moduleName') || _.camelize(this.appname) + appName(this.options['app-suffix']);
58175

59176
this.cameledName = _.camelize(this.name);
60177
this.classedName = _.classify(this.name);
@@ -85,6 +202,58 @@ export class BaseGenerator extends Base {
85202

86203
this.sourceRoot(path.join(__dirname, '..', '/templates'));
87204

88-
return yoCheckPromise;
205+
// return yoCheckPromise;
206+
}
207+
208+
/**
209+
* Copy templates from `source` to `destination` whily applying name transformations
210+
*/
211+
processDirectory(source, destination) {
212+
const root = path.isAbsolute(source) ? source : path.join(this.sourceRoot(), source);
213+
const files = expandFiles('**', { dot: true, cwd: root });
214+
215+
for(const file of files) {
216+
var filteredFile = filterFile(file);
217+
218+
if(this.basename) {
219+
filteredFile.name = filteredFile.name.replace('basename', this.basename);
220+
}
221+
222+
if(this.name) {
223+
filteredFile.name = filteredFile.name.replace('name', this.name);
224+
}
225+
226+
const name = filteredFile.name;
227+
let copy = false;
228+
let stripped;
229+
230+
let src = path.join(root, file);
231+
let dest = path.join(destination, name);
232+
233+
if(this.filters.ts && dest.indexOf('client') > -1 && dest.indexOf('.json') === -1) {
234+
dest = dest.replace('.js', '.ts');
235+
}
236+
237+
if(path.basename(dest).indexOf('_') === 0) {
238+
stripped = path.basename(dest).replace(/^_/, '');
239+
dest = path.join(path.dirname(dest), stripped);
240+
}
241+
242+
if(path.basename(dest).indexOf('!') === 0) {
243+
stripped = path.basename(dest).replace(/^!/, '');
244+
dest = path.join(path.dirname(dest), stripped);
245+
copy = true;
246+
}
247+
248+
if(templateIsUsable(this, filteredFile)) {
249+
if(copy) {
250+
this.fs.copy(src, dest);
251+
} else {
252+
this.filePath = dest;
253+
this.fs.copyTpl(src, dest, this);
254+
delete this.filePath;
255+
}
256+
}
257+
}
89258
}
90259
}

‎src/generators/route/index.js‎

Lines changed: 46 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,69 @@
1+
import filter from 'gulp-filter';
2+
import fs from 'fs';
3+
import jscodeshift, { ImportDeclaration } from 'jscodeshift';
14
import path from 'path';
5+
import tap from 'gulp-tap';
26
import {BaseGenerator} from '../base';
3-
import {relativeUrl, copyTemplates} from '../util';
7+
import {addModule} from './module-transform';
8+
9+
function readFile(path) {
10+
return new Promise((resolve, reject) => {
11+
fs.readFile(path, 'utf8', (err, data) => {
12+
if(err) return reject(err);
13+
14+
resolve(data);
15+
});
16+
});
17+
}
18+
19+
function writeFile(path, source) {
20+
return new Promise((resolve, reject) => {
21+
fs.writeFile(path, source, err => {
22+
if(err) return reject(err);
23+
24+
resolve();
25+
});
26+
});
27+
}
428

529
class Generator extends BaseGenerator {
630
prompting() {
731
var prompts = [{
8-
name: 'moduleName',
9-
message: 'What module name would you like to use?',
10-
default: `${this.name}Module`,
11-
when: () => this.config.get('modulePrompt')
12-
}, {
1332
name: 'dir',
1433
message: 'Where would you like to create this route?',
15-
default: this.config.get('routeDirectory')
34+
default: this.config.get('routeDirectory'),
1635
}, {
1736
name: 'route',
1837
message: 'What will the url of your route be?',
19-
default: `/${this.name}`
38+
default: `${this.name}`,
2039
}];
2140

2241
return this.prompt(prompts).then(props => {
23-
this.scriptAppName = props.moduleName || this.scriptAppName;
2442
this.route = props.route;
2543
this.dir = path.join(props.dir, this.name);
2644
});
2745
}
2846

29-
writing() {
30-
var basePath = this.config.get('basePath') || '';
31-
this.htmlUrl = relativeUrl(basePath, path.join(this.dir, `${this.name}.${this.templateExt}`));
32-
copyTemplates(this, 'route');
33-
}
47+
async writing() {
48+
this.sourceRoot(path.join(__dirname, '../../templates/route'));
49+
this.processDirectory('.', this.dir);
50+
51+
const appModulePath = this.config.get('appModulePath');
52+
53+
const appModuleFolder = appModulePath.substring(0, appModulePath.lastIndexOf('/'));
54+
const newModuleFilePath = path.normalize(`${this.dir}/${this.name}.module`);
55+
56+
const relativeModulePath = `./${path.normalize(path.relative(appModuleFolder, newModuleFilePath))}`
57+
.replace(/\\/g, '/');
58+
59+
let source = await readFile(appModulePath);
60+
61+
source = addModule(source, `${this.classedName}Module`, relativeModulePath);
62+
63+
// FIXME: Bug in jscodeshift/recast removing `@` from modified `NgModule` decorator
64+
source = source.replace(/\nNgModule/, '\n@NgModule');
3465

35-
end() {
36-
// this.log(`
37-
// In the parent of this component, you should now import this component and add it as a dependency:
38-
// import ${this.classedName}Component from './${this.name}/${this.name}.component';
39-
// ...
40-
// export angular.module('myParentModule', [${this.classedName}Component]);`);
66+
await writeFile(appModulePath, source);
4167
}
4268
}
4369

‎templates/route/name.component.js‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import { Component } from '@angular/core';
2+
3+
@Component({
4+
selector: '<%= cameledName %>',
5+
template: require('./<%= name %>.html'),
6+
// styles: [require('./<%= name %>.css')],
7+
})
8+
export class <%= classedName %>Component {
9+
message/*: string*/;
10+
11+
static parameters = [];
12+
constructor() {
13+
this.message = 'hello';
14+
}
15+
}

‎templates/route/name.component.test.js‎

Whitespace-only changes.

‎templates/route/name.html‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<div>This is the <%= name %> view.</div>
2+
<div>I bear this message: {{message}}</div>

‎templates/route/name.module.js‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
import { NgModule } from '@angular/core';
2+
import { RouterModule, Routes } from '@angular/router';
3+
4+
import { <%= classedName %>Component } from './<%= name %>.component';
5+
6+
export const ROUTES/*: Routes*/ = [
7+
{ path: '<%= route %>', component: <%= classedName %>Component },
8+
];
9+
10+
11+
@NgModule({
12+
imports: [
13+
RouterModule.forChild(ROUTES),
14+
],
15+
declarations: [
16+
<%= classedName %>Component,
17+
],
18+
exports: [
19+
<%= classedName %>Component,
20+
],
21+
})
22+
export class <%= classedName %>Module {}

0 commit comments

Comments
 (0)