Graham/angular-cli
1
0
Fork 0
mirror of https://github.com/angular/angular-cli.git synced 2025-05-16 18:43:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(@angular-devkit/schematics): fully resolve schematic entries within packages

Browse Source 
Fixes: #17085
This commit is contained in:
Charles Lyding 2020-02-25 21:30:21 -05:00 committed by Keen Yee Liau
parent 1e258317b1
commit ea3d9e0285
1 changed files with 54 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
packages/angular_devkit/schematics/tools/node-module-engine-host.ts
View File

@ -10,7 +10,7 @@ import {
InvalidJsonCharacterException,
UnexpectedEndOfInputException,
} from '@angular-devkit/core';
import { dirname, extname, join, resolve } from 'path';
import { dirname, join, resolve } from 'path';
import { RuleFactory } from '../src';
import {
FileSystemCollectionDesc,
@ -39,26 +39,67 @@ export class NodePackageDoesNotSupportSchematics extends BaseException {
export class NodeModulesEngineHost extends FileSystemEngineHostBase {
constructor(private readonly paths?: string[]) { super(); }
protected _resolveCollectionPath(name: string): string {
let collectionPath: string | undefined = undefined;
if (name.startsWith('.') || name.startsWith('/')) {
name = resolve(name);
private resolve(name: string, requester?: string, references = new Set<string>()): string {
if (requester) {
if (references.has(requester)) {
references.add(requester);
throw new Error(
'Circular schematic reference detected: ' + JSON.stringify(Array.from(references)),
);
} else {
references.add(requester);
}
}
if (extname(name)) {
// When having an extension let's just resolve the provided path.
collectionPath = require.resolve(name, { paths: this.paths });
} else {
const packageJsonPath = require.resolve(join(name, 'package.json'), { paths: this.paths });
const relativeBase = requester ? dirname(requester) : process.cwd();
let collectionPath: string | undefined = undefined;
if (name.startsWith('.')) {
name = resolve(relativeBase, name);
}
const resolveOptions = {
paths: requester ? [dirname(requester), ...(this.paths || [])] : this.paths,
};
// Try to resolve as a package
try {
const packageJsonPath = require.resolve(join(name, 'package.json'), resolveOptions);
const { schematics } = require(packageJsonPath);
if (!schematics || typeof schematics !== 'string') {
throw new NodePackageDoesNotSupportSchematics(name);
}
collectionPath = resolve(dirname(packageJsonPath), schematics);
collectionPath = this.resolve(schematics, packageJsonPath, references);
} catch (e) {
if (e.code !== 'MODULE_NOT_FOUND') {
throw e;
}
}
// If not a package, try to resolve as a file
if (!collectionPath) {
try {
collectionPath = require.resolve(name, resolveOptions);
} catch (e) {
if (e.code !== 'MODULE_NOT_FOUND') {
throw e;
}
}
}
// If not a package or a file, error
if (!collectionPath) {
throw new CollectionCannotBeResolvedException(name);
}
return collectionPath;
}
protected _resolveCollectionPath(name: string): string {
const collectionPath = this.resolve(name);
try {
readJsonFile(collectionPath);
@ -68,10 +109,10 @@ export class NodeModulesEngineHost extends FileSystemEngineHostBase {
e instanceof InvalidJsonCharacterException || e instanceof UnexpectedEndOfInputException
) {
throw new InvalidCollectionJsonException(name, collectionPath, e);
} else {
throw e;
}
}
throw new CollectionCannotBeResolvedException(name);
}
protected _resolveReferenceString(refString: string, parentPath: string) {