iSharkFly-Docs
/
angular-docs-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(ivy): minor refactorings (#25406) 

PR Close #25406
This commit is contained in:
George Kalpakas 2018-07-26 22:44:07 +03:00 committed by Matias Niemelä
parent 9081efa961
commit ea68ba048a
7 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/compiler-cli/src/metadata/bundler.ts
View File

@ -8,10 +8,11 @@
import * as path from 'path'; import * as path from 'path';
import * as ts from 'typescript'; import * as ts from 'typescript';
import {MetadataCollector} from '../metadata/collector';
import {ClassMetadata, ConstructorMetadata, FunctionMetadata, METADATA_VERSION, MemberMetadata, MetadataEntry, MetadataError, MetadataImportedSymbolReferenceExpression, MetadataMap, MetadataObject, MetadataSymbolicExpression, MetadataSymbolicReferenceExpression, MetadataValue, MethodMetadata, ModuleExportMetadata, ModuleMetadata, isClassMetadata, isConstructorMetadata, isFunctionMetadata, isInterfaceMetadata, isMetadataError, isMetadataGlobalReferenceExpression, isMetadataImportedSymbolReferenceExpression, isMetadataModuleReferenceExpression, isMetadataSymbolicExpression, isMethodMetadata} from '../metadata/schema';
import {MetadataCache} from '../transformers/metadata_cache'; import {MetadataCache} from '../transformers/metadata_cache';
import {MetadataCollector} from './collector';
import {ClassMetadata, ConstructorMetadata, FunctionMetadata, METADATA_VERSION, MemberMetadata, MetadataEntry, MetadataError, MetadataImportedSymbolReferenceExpression, MetadataMap, MetadataObject, MetadataSymbolicExpression, MetadataSymbolicReferenceExpression, MetadataValue, MethodMetadata, ModuleExportMetadata, ModuleMetadata, isClassMetadata, isConstructorMetadata, isFunctionMetadata, isInterfaceMetadata, isMetadataError, isMetadataGlobalReferenceExpression, isMetadataImportedSymbolReferenceExpression, isMetadataModuleReferenceExpression, isMetadataSymbolicExpression, isMethodMetadata} from './schema';
// The character set used to produce private names. // The character set used to produce private names.

2
packages/compiler-cli/src/ngtsc/metadata/src/resolver.ts
View File

@ -202,7 +202,7 @@ function pickIdentifier(
context: ts.SourceFile, primary: ts.Identifier, secondaries: ts.Identifier[], context: ts.SourceFile, primary: ts.Identifier, secondaries: ts.Identifier[],
mode: ImportMode): ts.Identifier|null { mode: ImportMode): ts.Identifier|null {
context = ts.getOriginalNode(context) as ts.SourceFile; context = ts.getOriginalNode(context) as ts.SourceFile;
let localIdentifier: ts.Identifier|null = null;
if (ts.getOriginalNode(primary).getSourceFile() === context) { if (ts.getOriginalNode(primary).getSourceFile() === context) {
return primary; return primary;
} else if (mode === ImportMode.UseExistingImport) { } else if (mode === ImportMode.UseExistingImport) {

3
packages/compiler-cli/src/ngtsc/program.ts
View File

@ -140,8 +140,7 @@ export class NgtscProgram implements api.Program {
sourceFiles: ReadonlyArray<ts.SourceFile>) => { sourceFiles: ReadonlyArray<ts.SourceFile>) => {
if (fileName.endsWith('.d.ts')) { if (fileName.endsWith('.d.ts')) {
data = sourceFiles.reduce( data = sourceFiles.reduce(
(data, sf) => this.compilation !.transformedDtsFor(sf.fileName, data, fileName), (data, sf) => this.compilation !.transformedDtsFor(sf.fileName, data), data);
data);
} }
this.host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles); this.host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles);
}; };

2
packages/compiler-cli/src/ngtsc/transform/src/compilation.ts
View File

@ -192,7 +192,7 @@ export class IvyCompilation {
* Process a .d.ts source string and return a transformed version that incorporates the changes * Process a .d.ts source string and return a transformed version that incorporates the changes
* made to the source file. * made to the source file.
*/ */
transformedDtsFor(tsFileName: string, dtsOriginalSource: string, dtsPath: string): string { transformedDtsFor(tsFileName: string, dtsOriginalSource: string): string {
// No need to transform if no changes have been requested to the input file. // No need to transform if no changes have been requested to the input file.
if (!this.dtsMap.has(tsFileName)) { if (!this.dtsMap.has(tsFileName)) {
return dtsOriginalSource; return dtsOriginalSource;

2
packages/compiler-cli/src/ngtsc/transform/src/declaration.ts
View File

@ -8,8 +8,6 @@
import * as ts from 'typescript'; import * as ts from 'typescript';
import {relativePathBetween} from '../../util/src/path';
import {CompileResult} from './api'; import {CompileResult} from './api';
import {ImportManager, translateType} from './translator'; import {ImportManager, translateType} from './translator';