Skip to content

fix(@angular/cli): fix issue of folder getting generated on dry run #6026

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
merged 2 commits into from
May 24, 2017
Merged

fix(@angular/cli): fix issue of folder getting generated on dry run #6026

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
208e69b
fix(@angular/cli): fix issue of folder getting generated on dry run
sumitarora Apr 20, 2017
672b5f5
fix(@angular/cli): adding dynamic parser options
sumitarora May 3, 2017
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
11 changes: 9 additions & 2 deletions packages/@angular/cli/blueprints/class/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {getAppFromConfig} from '../../utilities/app-utils';
import {dynamicPathParser} from '../../utilities/dynamic-path-parser';
import {dynamicPathParser, DynamicPathOptions} from '../../utilities/dynamic-path-parser';
import {CliConfig} from '../../models/config';

const stringUtils = require('ember-cli-string-utils');
Expand Down Expand Up @@ -27,7 +27,14 @@ export default Blueprint.extend({

normalizeEntityName: function (entityName: string) {
const appConfig = getAppFromConfig(this.options.app);
const parsedPath = dynamicPathParser(this.project, entityName.split('.')[0], appConfig);
const dynamicPathOptions: DynamicPathOptions = {
project: this.project,
entityName: entityName.split('.')[0],
appConfig,
dryRun: this.options.dryRun
};

const parsedPath = dynamicPathParser(dynamicPathOptions);

this.dynamicPath = parsedPath;
return parsedPath.name;
Expand Down
10 changes: 8 additions & 2 deletions packages/@angular/cli/blueprints/component/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { oneLine } from 'common-tags';
import { NodeHost } from '../../lib/ast-tools';
import { CliConfig } from '../../models/config';
import { getAppFromConfig } from '../../utilities/app-utils';
import { dynamicPathParser } from '../../utilities/dynamic-path-parser';
import { dynamicPathParser, DynamicPathOptions } from '../../utilities/dynamic-path-parser';
import { resolveModulePath } from '../../utilities/resolve-module-file';

const Blueprint = require('../../ember-cli/lib/models/blueprint');
Expand Down Expand Up @@ -125,7 +125,13 @@ export default Blueprint.extend({

normalizeEntityName: function (entityName: string) {
const appConfig = getAppFromConfig(this.options.app);
const parsedPath = dynamicPathParser(this.project, entityName, appConfig);
const dynamicPathOptions: DynamicPathOptions = {
project: this.project,
entityName,
appConfig,
dryRun: this.options.dryRun
};
const parsedPath = dynamicPathParser(dynamicPathOptions);

this.dynamicPath = parsedPath;

Expand Down
10 changes: 8 additions & 2 deletions packages/@angular/cli/blueprints/directive/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { NodeHost } from '../../lib/ast-tools';
import { CliConfig } from '../../models/config';
import { getAppFromConfig } from '../../utilities/app-utils';
import { resolveModulePath } from '../../utilities/resolve-module-file';
import { dynamicPathParser } from '../../utilities/dynamic-path-parser';
import { dynamicPathParser, DynamicPathOptions } from '../../utilities/dynamic-path-parser';

const stringUtils = require('ember-cli-string-utils');
const astUtils = require('../../utilities/ast-utils');
Expand Down Expand Up @@ -78,7 +78,13 @@ export default Blueprint.extend({

normalizeEntityName: function (entityName: string) {
const appConfig = getAppFromConfig(this.options.app);
const parsedPath = dynamicPathParser(this.project, entityName, appConfig);
const dynamicPathOptions: DynamicPathOptions = {
project: this.project,
entityName,
appConfig,
dryRun: this.options.dryRun
};
const parsedPath = dynamicPathParser(dynamicPathOptions);

this.dynamicPath = parsedPath;

Expand Down
10 changes: 8 additions & 2 deletions packages/@angular/cli/blueprints/enum/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {getAppFromConfig} from '../../utilities/app-utils';
import {dynamicPathParser} from '../../utilities/dynamic-path-parser';
import {dynamicPathParser, DynamicPathOptions} from '../../utilities/dynamic-path-parser';

const stringUtils = require('ember-cli-string-utils');
const Blueprint = require('../../ember-cli/lib/models/blueprint');
Expand All @@ -20,7 +20,13 @@ export default Blueprint.extend({

normalizeEntityName: function (entityName: string) {
const appConfig = getAppFromConfig(this.options.app);
const parsedPath = dynamicPathParser(this.project, entityName, appConfig);
const dynamicPathOptions: DynamicPathOptions = {
project: this.project,
entityName,
appConfig,
dryRun: this.options.dryRun
};
const parsedPath = dynamicPathParser(dynamicPathOptions);

this.dynamicPath = parsedPath;
return parsedPath.name;
Expand Down
10 changes: 8 additions & 2 deletions packages/@angular/cli/blueprints/guard/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import * as path from 'path';
import { oneLine } from 'common-tags';
import { NodeHost } from '../../lib/ast-tools';
import { CliConfig } from '../../models/config';
import { dynamicPathParser } from '../../utilities/dynamic-path-parser';
import { dynamicPathParser, DynamicPathOptions } from '../../utilities/dynamic-path-parser';
import { getAppFromConfig } from '../../utilities/app-utils';
import { resolveModulePath } from '../../utilities/resolve-module-file';

Expand Down Expand Up @@ -46,7 +46,13 @@ export default Blueprint.extend({

normalizeEntityName: function (entityName: string) {
const appConfig = getAppFromConfig(this.options.app);
const parsedPath = dynamicPathParser(this.project, entityName, appConfig);
const dynamicPathOptions: DynamicPathOptions = {
project: this.project,
entityName,
appConfig,
dryRun: this.options.dryRun
};
const parsedPath = dynamicPathParser(dynamicPathOptions);

this.dynamicPath = parsedPath;
return parsedPath.name;
Expand Down
10 changes: 8 additions & 2 deletions packages/@angular/cli/blueprints/interface/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {CliConfig} from '../../models/config';
import {getAppFromConfig} from '../../utilities/app-utils';
import {dynamicPathParser} from '../../utilities/dynamic-path-parser';
import {dynamicPathParser, DynamicPathOptions} from '../../utilities/dynamic-path-parser';

const stringUtils = require('ember-cli-string-utils');
const Blueprint = require('../../ember-cli/lib/models/blueprint');
Expand All @@ -25,7 +25,13 @@ export default Blueprint.extend({

normalizeEntityName: function (entityName: string) {
const appConfig = getAppFromConfig(this.options.app);
const parsedPath = dynamicPathParser(this.project, entityName, appConfig);
const dynamicPathOptions: DynamicPathOptions = {
project: this.project,
entityName,
appConfig,
dryRun: this.options.dryRun
};
const parsedPath = dynamicPathParser(dynamicPathOptions);

this.dynamicPath = parsedPath;
return parsedPath.name;
Expand Down
10 changes: 8 additions & 2 deletions packages/@angular/cli/blueprints/module/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { NodeHost } from '../../lib/ast-tools';
import { CliConfig } from '../../models/config';
import { getAppFromConfig } from '../../utilities/app-utils';
import { resolveModulePath } from '../../utilities/resolve-module-file';
import { dynamicPathParser } from '../../utilities/dynamic-path-parser';
import { dynamicPathParser, DynamicPathOptions } from '../../utilities/dynamic-path-parser';

const stringUtils = require('ember-cli-string-utils');
const Blueprint = require('../../ember-cli/lib/models/blueprint');
Expand Down Expand Up @@ -58,7 +58,13 @@ export default Blueprint.extend({
normalizeEntityName: function (entityName: string) {
this.entityName = entityName;
const appConfig = getAppFromConfig(this.options.app);
const parsedPath = dynamicPathParser(this.project, entityName, appConfig);
const dynamicPathOptions: DynamicPathOptions = {
project: this.project,
entityName,
appConfig,
dryRun: this.options.dryRun
};
const parsedPath = dynamicPathParser(dynamicPathOptions);

this.dynamicPath = parsedPath;
return parsedPath.name;
Expand Down
10 changes: 8 additions & 2 deletions packages/@angular/cli/blueprints/pipe/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as chalk from 'chalk';
import * as path from 'path';
import { NodeHost } from '../../lib/ast-tools';
import { CliConfig } from '../../models/config';
import { dynamicPathParser } from '../../utilities/dynamic-path-parser';
import { dynamicPathParser, DynamicPathOptions } from '../../utilities/dynamic-path-parser';
import { getAppFromConfig } from '../../utilities/app-utils';
import { resolveModulePath } from '../../utilities/resolve-module-file';

Expand Down Expand Up @@ -72,7 +72,13 @@ export default Blueprint.extend({

normalizeEntityName: function (entityName: string) {
const appConfig = getAppFromConfig(this.options.app);
const parsedPath = dynamicPathParser(this.project, entityName, appConfig);
const dynamicPathOptions: DynamicPathOptions = {
project: this.project,
entityName,
appConfig,
dryRun: this.options.dryRun
};
const parsedPath = dynamicPathParser(dynamicPathOptions);

this.dynamicPath = parsedPath;
return parsedPath.name;
Expand Down
10 changes: 8 additions & 2 deletions packages/@angular/cli/blueprints/service/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import * as path from 'path';
import { oneLine } from 'common-tags';
import { NodeHost } from '../../lib/ast-tools';
import { CliConfig } from '../../models/config';
import { dynamicPathParser } from '../../utilities/dynamic-path-parser';
import { dynamicPathParser, DynamicPathOptions } from '../../utilities/dynamic-path-parser';
import { getAppFromConfig } from '../../utilities/app-utils';
import { resolveModulePath } from '../../utilities/resolve-module-file';

Expand Down Expand Up @@ -51,7 +51,13 @@ export default Blueprint.extend({

normalizeEntityName: function (entityName: string) {
const appConfig = getAppFromConfig(this.options.app);
const parsedPath = dynamicPathParser(this.project, entityName, appConfig);
const dynamicPathOptions: DynamicPathOptions = {
project: this.project,
entityName,
appConfig,
dryRun: this.options.dryRun
};
const parsedPath = dynamicPathParser(dynamicPathOptions);

this.dynamicPath = parsedPath;
return parsedPath.name;
Expand Down
2 changes: 1 addition & 1 deletion packages/@angular/cli/ember-cli/lib/models/blueprint.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,7 @@ Blueprint.prototype.install = function(options) {
ui.writeLine(chalk.yellow('You specified the dry-run flag, so no' +
' changes will be written.'));
}

this._normalizeEntityName(options.entity);
this._checkForPod(options.verbose);
this._checkInRepoAddonExists(options.inRepoAddon);
Expand Down
27 changes: 18 additions & 9 deletions packages/@angular/cli/utilities/dynamic-path-parser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,26 @@ import * as process from 'process';
import * as fs from 'fs-extra';
const stringUtils = require('ember-cli-string-utils');

export function dynamicPathParser(project: any, entityName: string, appConfig: any) {
const projectRoot = project.root;
const sourceDir = appConfig.root;
export interface DynamicPathOptions {
project: any;
entityName: string;
appConfig: any;
dryRun: boolean;
}

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To allow defaults and improve encapsulation, what about something like:

export class DynamicPathOptions {
  projectRoot: string;
  sourceDirectory: string;
  entityName: string;
  dryRun?: boolean = true;
}

And then something like this in the function:

options = { ...new DynamicPathOptions, ...options };

export function dynamicPathParser(options: DynamicPathOptions) {
const projectRoot = options.project.root;
const sourceDir = options.appConfig.root;
const appRoot = path.join(sourceDir, 'app');
const cwd = process.env.PWD;

const rootPath = path.join(projectRoot, appRoot);
let outputPath = path.join(rootPath, entityName);
let outputPath = path.join(rootPath, options.entityName);

if (entityName.indexOf(path.sep) === 0) {
outputPath = path.join(rootPath, entityName.substr(1));
if (options.entityName.indexOf(path.sep) === 0) {
outputPath = path.join(rootPath, options.entityName.substr(1));
} else if (cwd.indexOf(rootPath) >= 0) {
outputPath = path.join(cwd, entityName);
outputPath = path.join(cwd, options.entityName);
}

if (!fs.existsSync(outputPath)) {
Expand All @@ -38,15 +45,17 @@ export function dynamicPathParser(project: any, entityName: string, appConfig: a
// Folder not found, create it, and return it
const dasherizedPart = stringUtils.dasherize(part);
const dasherizedDirName = path.join(tempPath, dasherizedPart);
fs.mkdirpSync(dasherizedDirName);
if (!options.dryRun) {
fs.mkdirpSync(dasherizedDirName);
}
return dasherizedDirName;

}, parsedOutputPath.root);
outputPath = path.join(newPath, parsedOutputPath.name);
}

if (outputPath.indexOf(rootPath) < 0) {
throw `Invalid path: "${entityName}" cannot be ` +
throw `Invalid path: "${options.entityName}" cannot be ` +
`above the "${appRoot}" directory`;
}

Expand Down
10 changes: 8 additions & 2 deletions packages/@angular/cli/utilities/resolve-module-file.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as path from 'path';
import * as fs from 'fs';
import { dynamicPathParser } from './dynamic-path-parser';
import { dynamicPathParser, DynamicPathOptions } from './dynamic-path-parser';

export function resolveModulePath(
moduleNameFromFlag: string, project: any, projectRoot: any, appConfig: any): string {
Expand Down Expand Up @@ -41,7 +41,13 @@ export function resolveModulePath(
}

function buildFullPath(project: any, relativeModulePath: string, appConfig: any, projectRoot: any) {
const parsedPath = dynamicPathParser(project, relativeModulePath, appConfig);
const dynamicPathOptions: DynamicPathOptions = {
project,
entityName: relativeModulePath,
appConfig,
dryRun: false
};
const parsedPath = dynamicPathParser(dynamicPathOptions);
const fullModulePath = path.join(projectRoot, parsedPath.dir, parsedPath.base);

return fullModulePath;
Expand Down
Loading