Skip to content

feat: auto correct paths without a '+' to include a '+' if that dir e… #520

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Brocco merged 1 commit into from
Apr 26, 2016
Merged

feat: auto correct paths without a '+' to include a '+' if that dir e… #520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions addon/ng2/utilities/dynamic-path-parser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
var path = require('path');
var process = require('process');
var fs = require('fs');

module.exports = function dynamicPathParser(project, entityName) {
var projectRoot = project.root;
Expand Down Expand Up @@ -30,6 +31,27 @@ module.exports = function dynamicPathParser(project, entityName) {
}
}

if (!fs.existsSync(outputPath)) {
// Verify the path exists on disk.
var parsedOutputPath = path.parse(outputPath);
var parts = parsedOutputPath.dir.split(path.sep).slice(1);
var newPath = parts.reduce((tempPath, part) => {
// if (tempPath === '') {
// return part;
// }
var withoutPlus = path.join(tempPath, path.sep, part);
var withPlus = path.join(tempPath, path.sep, '+' + part);
if (fs.existsSync(withoutPlus)) {
return withoutPlus;
} else if (fs.existsSync(withPlus)) {
return withPlus;
}

throw `Invalid path: "${withoutPlus}"" is not a valid path.`
}, parsedOutputPath.root);
outputPath = path.join(newPath, parsedOutputPath.name);
}

if (outputPath.indexOf(rootPath) < 0) {
throw `Invalid path: "${entityName}" cannot be ` +
`above the "${appRoot}" directory`;
Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
"exists-sync": "0.0.3",
"minimatch": "^3.0.0",
"mocha": "^2.4.5",
"mock-fs": "^3.8.0",
"object-assign": "^4.0.1",
"rewire": "^2.5.1",
"sinon": "^1.17.3",
Expand Down
94 changes: 86 additions & 8 deletions tests/acceptance/dynamic-path-parser.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,63 +3,141 @@
var expect = require('chai').expect;
var path = require('path');
var dynamicPathParser = require('../../addon/ng2/utilities/dynamic-path-parser');
var mockFs = require('mock-fs');

var appDir = `src${path.sep}client${path.sep}app`;

describe('dynamic path parser', () => {
var project;
var entityName = 'temp-name';
var rootName = path.parse(process.cwd()).root + 'project';
beforeEach(() => {
project = { root: process.cwd() }
project = { root: rootName };
var mockFolder = {};
mockFolder[rootName] = {
src: {
client: {
app: {
'index.html': '<html></html>',
'temp-name': {}
}
}
}
};
mockFs(mockFolder);
});

afterEach(() => {
mockFs.restore();
});

it('parse from proj root dir', () => {
process.env.PWD = process.cwd();
process.env.PWD = project.root;
var result = dynamicPathParser(project, entityName);
expect(result.dir).to.equal(appDir);
expect(result.name).to.equal(entityName);
});

it('parse from proj src dir', () => {
process.env.PWD = path.join(process.cwd(), 'src');
process.env.PWD = path.join(project.root, 'src');
var result = dynamicPathParser(project, entityName);
expect(result.dir).to.equal(appDir);
expect(result.name).to.equal(entityName);
});

it(`parse from proj src${path.sep}client dir`, () => {
process.env.PWD = path.join(process.cwd(), 'src', 'client');
process.env.PWD = path.join(project.root, 'src', 'client');
var result = dynamicPathParser(project, entityName);
expect(result.dir).to.equal(appDir);
expect(result.name).to.equal(entityName);
});

it(`parse from proj src${path.sep}client${path.sep}app dir`, () => {
process.env.PWD = path.join(process.cwd(), 'src', 'client', 'app');
process.env.PWD = path.join(project.root, 'src', 'client', 'app');
var result = dynamicPathParser(project, entityName);
expect(result.dir).to.equal(appDir);
expect(result.name).to.equal(entityName);
});

it(`parse from proj src${path.sep}client${path.sep}app${path.sep}child-dir`, () => {
process.env.PWD = path.join(process.cwd(), 'src', 'client', 'app', 'child-dir');
var mockFolder = {};
mockFolder[rootName] = {
src: {
client: {
app: {
'index.html': '<html></html>',
'child-dir': {
'temp-name': {}
}
}
}
}
};
mockFs(mockFolder);
process.env.PWD = path.join(project.root, 'src', 'client', 'app', 'child-dir');
var result = dynamicPathParser(project, entityName);
expect(result.dir).to.equal(`${appDir}${path.sep}child-dir`);
expect(result.name).to.equal(entityName);
});

it(`parse from proj src${path.sep}client${path.sep}app${path.sep}child-dir w/ ..${path.sep}`, () => {
process.env.PWD = path.join(process.cwd(), 'src', 'client', 'app', 'child-dir');
var mockFolder = {};
mockFolder[rootName] = {
src: {
client: {
app: {
'index.html': '<html></html>',
'child-dir': {},
'temp-name': {}
}
}
}
};
mockFs(mockFolder);
process.env.PWD = path.join(project.root, 'src', 'client', 'app', 'child-dir');
var result = dynamicPathParser(project, '..' + path.sep + entityName);
expect(result.dir).to.equal(appDir);
expect(result.name).to.equal(entityName);
});

it(`parse from proj src${path.sep}client${path.sep}app${path.sep}child-dir${path.sep}grand-child-dir w/ ..${path.sep}`,
() => {
process.env.PWD = path.join(process.cwd(), 'src', 'client', 'app', 'child-dir', 'grand-child-dir');
var mockFolder = {};
mockFolder[rootName] = {
src: {
client: {
app: {
'index.html': '<html></html>',
'child-dir': {
'grand-child-dir': {},
'temp-name': {}
}
}
}
}
};
mockFs(mockFolder);
process.env.PWD = path.join(project.root, 'src', 'client', 'app', 'child-dir', 'grand-child-dir');
var result = dynamicPathParser(project, '..' + path.sep + entityName);
expect(result.dir).to.equal(`${appDir}${path.sep}child-dir`);
expect(result.name).to.equal(entityName);
});

it('auto look for dirs with a "+" when not specified', () => {
var mockFolder = {};
mockFolder[rootName] = {
src: {
client: {
app: {
'+my-route': {}
}
}
}
};
mockFs(mockFolder);
process.env.PWD = path.join(project.root, 'src', 'client', 'app', 'my-route');
var result = dynamicPathParser(project, entityName);
expect(result.dir).to.equal(`${appDir}${path.sep}+my-route`);
expect(result.name).to.equal(entityName);
});
});
9 changes: 5 additions & 4 deletions tests/acceptance/generate-component.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ describe('Acceptance: ng generate component', function () {
});

it('ng generate component test' + path.sep + 'my-comp', function () {
fs.mkdirsSync(path.join(root, 'tmp', 'foo', 'src', 'client', 'app', 'test'));
return ng(['generate', 'component', 'test' + path.sep + 'my-comp']).then(() => {
var testPath = path.join(root, 'tmp', 'foo', 'src', 'client', 'app', 'test', 'my-comp', 'my-comp.component.ts');
expect(existsSync(testPath)).to.equal(true);
Expand All @@ -53,13 +54,13 @@ describe('Acceptance: ng generate component', function () {
});

it('ng generate component my-comp from a child dir', () => {
fs.mkdirsSync(path.join(root, 'tmp', 'foo', 'src', 'client', 'app', '1'));
return new Promise(function (resolve) {
process.chdir('./src');
resolve();
})
.then(() => process.chdir('./client'))
.then(() => process.chdir('./app'))
.then(() => fs.mkdirsSync('./1'))
.then(() => process.chdir('./1'))
.then(() => {
return ng(['generate', 'component', 'my-comp'])
Expand All @@ -71,13 +72,13 @@ describe('Acceptance: ng generate component', function () {
});

it('ng generate component child-dir' + path.sep + 'my-comp from a child dir', () => {
fs.mkdirsSync(path.join(root, 'tmp', 'foo', 'src', 'client', 'app', '1', 'child-dir'));
return new Promise(function (resolve) {
process.chdir('./src');
resolve();
})
.then(() => process.chdir('./client'))
.then(() => process.chdir('./app'))
.then(() => fs.mkdirsSync('./1'))
.then(() => process.chdir('./1'))
.then(() => {
return ng(['generate', 'component', 'child-dir' + path.sep + 'my-comp'])
Expand All @@ -91,13 +92,13 @@ describe('Acceptance: ng generate component', function () {

it('ng generate component child-dir' + path.sep + '..' + path.sep + 'my-comp from a child dir',
() => {
fs.mkdirsSync(path.join(root, 'tmp', 'foo', 'src', 'client', 'app', '1'));
return new Promise(function (resolve) {
process.chdir('./src');
resolve();
})
.then(() => process.chdir('./client'))
.then(() => process.chdir('./app'))
.then(() => fs.mkdirsSync('./1'))
.then(() => process.chdir('./1'))
.then(() => {
return ng([
Expand All @@ -114,13 +115,13 @@ describe('Acceptance: ng generate component', function () {
it('ng generate component ' + path.sep + 'my-comp from a child dir, gens under ' +
path.join('src', 'client', 'app'),
() => {
fs.mkdirsSync(path.join(root, 'tmp', 'foo', 'src', 'client', 'app', '1'));
return new Promise(function (resolve) {
process.chdir('./src');
resolve();
})
.then(() => process.chdir('./client'))
.then(() => process.chdir('./app'))
.then(() => fs.mkdirsSync('./1'))
.then(() => process.chdir('./1'))
.then(() => {
return ng(['generate', 'component', path.sep + 'my-comp'])
Expand Down
9 changes: 5 additions & 4 deletions tests/acceptance/generate-directive.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ describe('Acceptance: ng generate directive', function () {
});

it('ng generate directive test' + path.sep + 'my-dir', function () {
fs.mkdirsSync(path.join(root, 'tmp', 'foo', 'src', 'client', 'app', 'test'));
return ng(['generate', 'directive', 'test' + path.sep + 'my-dir', '--flat', 'false']).then(() => {
var testPath = path.join(root, 'tmp', 'foo', 'src', 'client', 'app', 'test', 'my-dir', 'my-dir.directive.ts');
expect(existsSync(testPath)).to.equal(true);
Expand All @@ -60,13 +61,13 @@ describe('Acceptance: ng generate directive', function () {
});

it('ng generate directive my-dir from a child dir', () => {
fs.mkdirsSync(path.join(root, 'tmp', 'foo', 'src', 'client', 'app', '1'));
return new Promise(function (resolve) {
process.chdir('./src');
resolve();
})
.then(() => process.chdir('./client'))
.then(() => process.chdir('./app'))
.then(() => fs.mkdirsSync('./1'))
.then(() => process.chdir('./1'))
.then(() => {
process.env.CWD = process.cwd();
Expand All @@ -79,13 +80,13 @@ describe('Acceptance: ng generate directive', function () {
});

it('ng generate directive child-dir' + path.sep + 'my-dir from a child dir', () => {
fs.mkdirsSync(path.join(root, 'tmp', 'foo', 'src', 'client', 'app', '1', 'child-dir'));
return new Promise(function (resolve) {
process.chdir('./src');
resolve();
})
.then(() => process.chdir('./client'))
.then(() => process.chdir('./app'))
.then(() => fs.mkdirsSync('./1'))
.then(() => process.chdir('./1'))
.then(() => {
process.env.CWD = process.cwd();
Expand All @@ -100,13 +101,13 @@ describe('Acceptance: ng generate directive', function () {

it('ng generate directive child-dir' + path.sep + '..' + path.sep + 'my-dir from a child dir',
() => {
fs.mkdirsSync(path.join(root, 'tmp', 'foo', 'src', 'client', 'app', '1'));
return new Promise(function (resolve) {
process.chdir('./src');
resolve();
})
.then(() => process.chdir('./client'))
.then(() => process.chdir('./app'))
.then(() => fs.mkdirsSync('./1'))
.then(() => process.chdir('./1'))
.then(() => {
process.env.CWD = process.cwd();
Expand All @@ -123,13 +124,13 @@ describe('Acceptance: ng generate directive', function () {
it('ng generate directive ' + path.sep + 'my-dir from a child dir, gens under ' +
path.join('src', 'client', 'app'),
() => {
fs.mkdirsSync(path.join(root, 'tmp', 'foo', 'src', 'client', 'app', '1'));
return new Promise(function (resolve) {
process.chdir('./src');
resolve();
})
.then(() => process.chdir('./client'))
.then(() => process.chdir('./app'))
.then(() => fs.mkdirsSync('./1'))
.then(() => process.chdir('./1'))
.then(() => {
process.env.CWD = process.cwd();
Expand Down
9 changes: 5 additions & 4 deletions tests/acceptance/generate-pipe.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ describe('Acceptance: ng generate pipe', function () {
});

it('ng generate pipe test' + path.sep + 'my-pipe', function () {
fs.mkdirsSync(path.join(root, 'tmp', 'foo', 'src', 'client', 'app', 'test'));
return ng(['generate', 'pipe', 'test' + path.sep + 'my-pipe']).then(() => {
var testPath = path.join(root, 'tmp', 'foo', 'src', 'client', 'app', 'test', 'my-pipe.pipe.ts');
expect(existsSync(testPath)).to.equal(true);
Expand All @@ -52,13 +53,13 @@ describe('Acceptance: ng generate pipe', function () {
});

it('ng generate pipe my-pipe from a child dir', () => {
fs.mkdirsSync(path.join(root, 'tmp', 'foo', 'src', 'client', 'app', '1'));
return new Promise(function (resolve) {
process.chdir('./src');
resolve();
})
.then(() => process.chdir('./client'))
.then(() => process.chdir('./app'))
.then(() => fs.mkdirsSync('./1'))
.then(() => process.chdir('./1'))
.then(() => {
process.env.CWD = process.cwd();
Expand All @@ -71,13 +72,13 @@ describe('Acceptance: ng generate pipe', function () {
});

it('ng generate pipe child-dir' + path.sep + 'my-pipe from a child dir', () => {
fs.mkdirsSync(path.join(root, 'tmp', 'foo', 'src', 'client', 'app', '1', 'child-dir'));
return new Promise(function (resolve) {
process.chdir('./src');
resolve();
})
.then(() => process.chdir('./client'))
.then(() => process.chdir('./app'))
.then(() => fs.mkdirsSync('./1'))
.then(() => process.chdir('./1'))
.then(() => {
process.env.CWD = process.cwd();
Expand All @@ -91,13 +92,13 @@ describe('Acceptance: ng generate pipe', function () {
});

it('ng generate pipe child-dir' + path.sep + '..' + path.sep + 'my-pipe from a child dir', () => {
fs.mkdirsSync(path.join(root, 'tmp', 'foo', 'src', 'client', 'app', '1'));
return new Promise(function (resolve) {
process.chdir('./src');
resolve();
})
.then(() => process.chdir('./client'))
.then(() => process.chdir('./app'))
.then(() => fs.mkdirsSync('./1'))
.then(() => process.chdir('./1'))
.then(() => {
process.env.CWD = process.cwd();
Expand All @@ -112,13 +113,13 @@ describe('Acceptance: ng generate pipe', function () {
it('ng generate pipe ' + path.sep + 'my-pipe from a child dir, gens under ' +
path.join('src', 'client', 'app'),
() => {
fs.mkdirsSync(path.join(root, 'tmp', 'foo', 'src', 'client', 'app', '1'));
return new Promise(function (resolve) {
process.chdir('./src');
resolve();
})
.then(() => process.chdir('./client'))
.then(() => process.chdir('./app'))
.then(() => fs.mkdirsSync('./1'))
.then(() => process.chdir('./1'))
.then(() => {
process.env.CWD = process.cwd();
Expand Down
Loading