@angular/core 12.1.0-next.5 → 12.1.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bundles/core-testing.umd.js +239 -46
- package/bundles/core-testing.umd.js.map +1 -1
- package/bundles/core.umd.js +60 -37
- package/bundles/core.umd.js.map +1 -1
- package/core.d.ts +45 -19
- package/core.metadata.json +1 -1
- package/esm2015/src/application_init.js +5 -5
- package/esm2015/src/application_ref.js +29 -8
- package/esm2015/src/change_detection/differs/iterable_differs.js +1 -1
- package/esm2015/src/compiler/compiler_facade_interface.js +1 -1
- package/esm2015/src/error_handler.js +2 -6
- package/esm2015/src/event_emitter.js +1 -1
- package/esm2015/src/linker/component_factory_resolver.js +1 -1
- package/esm2015/src/linker/template_ref.js +1 -1
- package/esm2015/src/linker/view_container_ref.js +1 -1
- package/esm2015/src/metadata/di.js +1 -1
- package/esm2015/src/metadata/do_boostrap.js +1 -1
- package/esm2015/src/render3/component_ref.js +1 -1
- package/esm2015/src/render3/definition.js +16 -16
- package/esm2015/src/render3/ng_module_ref.js +1 -1
- package/esm2015/src/render3/view_ref.js +1 -1
- package/esm2015/src/sanitization/bypass.js +1 -1
- package/esm2015/src/version.js +1 -1
- package/esm2015/src/view/entrypoint.js +1 -1
- package/esm2015/src/view/refs.js +1 -1
- package/esm2015/testing/src/ng_zone_mock.js +1 -1
- package/esm2015/testing/src/r3_test_bed.js +84 -7
- package/esm2015/testing/src/r3_test_bed_compiler.js +4 -1
- package/esm2015/testing/src/resolvers.js +1 -1
- package/esm2015/testing/src/test_bed.js +110 -21
- package/esm2015/testing/src/test_bed_common.js +7 -1
- package/esm2015/testing/src/test_hooks.js +45 -0
- package/esm2015/testing/src/testing.js +3 -3
- package/fesm2015/core.js +50 -33
- package/fesm2015/core.js.map +1 -1
- package/fesm2015/testing.js +216 -29
- package/fesm2015/testing.js.map +1 -1
- package/package.json +1 -1
- package/schematics/migrations/missing-injectable/providers_evaluator.js +1 -1
- package/schematics/migrations/static-queries/strategies/usage_strategy/template_usage_visitor.js +1 -1
- package/schematics/migrations/template-var-assignment/angular/html_variable_assignment_visitor.js +1 -1
- package/schematics/migrations.json +1 -1
- package/src/r3_symbols.d.ts +2 -3
- package/testing/testing.d.ts +64 -5
- package/testing/testing.metadata.json +1 -1
- package/testing.d.ts +1 -1
- package/esm2015/testing/src/before_each.js +0 -33
- package/schematics/migrations/abstract-control-parent/abstract-control-parent.externs.js +0 -0
- package/schematics/migrations/abstract-control-parent/index.mjs +0 -47
- package/schematics/migrations/abstract-control-parent/util.mjs +0 -50
- package/schematics/migrations/activated-route-snapshot-fragment/activated-route-snapshot-fragment.externs.js +0 -0
- package/schematics/migrations/activated-route-snapshot-fragment/index.mjs +0 -48
- package/schematics/migrations/activated-route-snapshot-fragment/util.mjs +0 -33
- package/schematics/migrations/can-activate-with-redirect-to/can-activate-with-redirect-to.externs.js +0 -0
- package/schematics/migrations/can-activate-with-redirect-to/index.mjs +0 -44
- package/schematics/migrations/can-activate-with-redirect-to/util.mjs +0 -55
- package/schematics/migrations/deep-shadow-piercing-selector/deep-shadow-piercing-selector.externs.js +0 -0
- package/schematics/migrations/deep-shadow-piercing-selector/index.mjs +0 -36
- package/schematics/migrations/dynamic-queries/dynamic-queries.externs.js +0 -0
- package/schematics/migrations/dynamic-queries/index.mjs +0 -51
- package/schematics/migrations/dynamic-queries/util.mjs +0 -65
- package/schematics/migrations/initial-navigation/collector.mjs +0 -105
- package/schematics/migrations/initial-navigation/index.mjs +0 -61
- package/schematics/migrations/initial-navigation/initial-navigation.externs.js +0 -0
- package/schematics/migrations/initial-navigation/transform.mjs +0 -54
- package/schematics/migrations/initial-navigation/update_recorder.mjs +0 -9
- package/schematics/migrations/initial-navigation/util.mjs +0 -28
- package/schematics/migrations/missing-injectable/definition_collector.mjs +0 -75
- package/schematics/migrations/missing-injectable/index.mjs +0 -100
- package/schematics/migrations/missing-injectable/missing-injectable.externs.js +0 -0
- package/schematics/migrations/missing-injectable/providers_evaluator.mjs +0 -50
- package/schematics/migrations/missing-injectable/transform.mjs +0 -187
- package/schematics/migrations/missing-injectable/update_recorder.mjs +0 -9
- package/schematics/migrations/module-with-providers/collector.mjs +0 -59
- package/schematics/migrations/module-with-providers/index.mjs +0 -71
- package/schematics/migrations/module-with-providers/module-with-providers.externs.js +0 -0
- package/schematics/migrations/module-with-providers/transform.mjs +0 -134
- package/schematics/migrations/module-with-providers/util.mjs +0 -25
- package/schematics/migrations/move-document/document_import_visitor.mjs +0 -60
- package/schematics/migrations/move-document/index.mjs +0 -71
- package/schematics/migrations/move-document/move-document.externs.js +0 -0
- package/schematics/migrations/move-document/move-import.mjs +0 -45
- package/schematics/migrations/native-view-encapsulation/index.mjs +0 -41
- package/schematics/migrations/native-view-encapsulation/native-view-encapsulation.externs.js +0 -0
- package/schematics/migrations/native-view-encapsulation/util.mjs +0 -34
- package/schematics/migrations/navigation-extras-omissions/index.mjs +0 -47
- package/schematics/migrations/navigation-extras-omissions/navigation-extras-omissions.externs.js +0 -0
- package/schematics/migrations/navigation-extras-omissions/util.mjs +0 -111
- package/schematics/migrations/relative-link-resolution/collector.mjs +0 -81
- package/schematics/migrations/relative-link-resolution/index.mjs +0 -62
- package/schematics/migrations/relative-link-resolution/relative-link-resolution.externs.js +0 -0
- package/schematics/migrations/relative-link-resolution/transform.mjs +0 -51
- package/schematics/migrations/relative-link-resolution/update_recorder.mjs +0 -9
- package/schematics/migrations/relative-link-resolution/util.mjs +0 -28
- package/schematics/migrations/renderer-to-renderer2/helpers.mjs +0 -224
- package/schematics/migrations/renderer-to-renderer2/index.mjs +0 -113
- package/schematics/migrations/renderer-to-renderer2/migration.mjs +0 -211
- package/schematics/migrations/renderer-to-renderer2/renderer-to-renderer2.externs.js +0 -0
- package/schematics/migrations/renderer-to-renderer2/util.mjs +0 -69
- package/schematics/migrations/router-preserve-query-params/index.mjs +0 -50
- package/schematics/migrations/router-preserve-query-params/router-preserve-query-params.externs.js +0 -0
- package/schematics/migrations/router-preserve-query-params/util.mjs +0 -88
- package/schematics/migrations/static-queries/angular/directive_inputs.mjs +0 -70
- package/schematics/migrations/static-queries/angular/ng_query_visitor.mjs +0 -113
- package/schematics/migrations/static-queries/angular/query-definition.mjs +0 -20
- package/schematics/migrations/static-queries/angular/super_class.mjs +0 -21
- package/schematics/migrations/static-queries/index.mjs +0 -206
- package/schematics/migrations/static-queries/static-queries.externs.js +0 -0
- package/schematics/migrations/static-queries/strategies/template_strategy/template_strategy.mjs +0 -200
- package/schematics/migrations/static-queries/strategies/test_strategy/test_strategy.mjs +0 -24
- package/schematics/migrations/static-queries/strategies/timing-strategy.mjs +0 -9
- package/schematics/migrations/static-queries/strategies/usage_strategy/declaration_usage_visitor.mjs +0 -355
- package/schematics/migrations/static-queries/strategies/usage_strategy/super_class_context.mjs +0 -38
- package/schematics/migrations/static-queries/strategies/usage_strategy/template_usage_visitor.mjs +0 -80
- package/schematics/migrations/static-queries/strategies/usage_strategy/usage_strategy.mjs +0 -154
- package/schematics/migrations/static-queries/transform.mjs +0 -88
- package/schematics/migrations/template-var-assignment/analyze_template.mjs +0 -25
- package/schematics/migrations/template-var-assignment/angular/html_variable_assignment_visitor.mjs +0 -65
- package/schematics/migrations/template-var-assignment/index.mjs +0 -68
- package/schematics/migrations/template-var-assignment/template-var-assignment.externs.js +0 -0
- package/schematics/migrations/undecorated-classes-with-decorated-fields/index.mjs +0 -92
- package/schematics/migrations/undecorated-classes-with-decorated-fields/transform.mjs +0 -286
- package/schematics/migrations/undecorated-classes-with-decorated-fields/undecorated-classes-with-decorated-fields.externs.js +0 -0
- package/schematics/migrations/undecorated-classes-with-decorated-fields/update_recorder.mjs +0 -9
- package/schematics/migrations/undecorated-classes-with-di/create_ngc_program.mjs +0 -43
- package/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/convert_directive_metadata.mjs +0 -82
- package/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/decorator_rewriter.mjs +0 -102
- package/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/import_rewrite_visitor.mjs +0 -111
- package/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/path_format.mjs +0 -17
- package/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/source_file_exports.mjs +0 -51
- package/schematics/migrations/undecorated-classes-with-di/index.mjs +0 -162
- package/schematics/migrations/undecorated-classes-with-di/ng_declaration_collector.mjs +0 -124
- package/schematics/migrations/undecorated-classes-with-di/transform.mjs +0 -356
- package/schematics/migrations/undecorated-classes-with-di/undecorated-classes-with-di.externs.js +0 -0
- package/schematics/migrations/undecorated-classes-with-di/update_recorder.mjs +0 -9
- package/schematics/migrations/wait-for-async/index.mjs +0 -76
- package/schematics/migrations/wait-for-async/util.mjs +0 -23
- package/schematics/migrations/wait-for-async/wait-for-async.externs.js +0 -0
- package/schematics/migrations/xhr-factory/index.mjs +0 -91
- package/schematics/migrations/xhr-factory/xhr-factory.externs.js +0 -0
- package/schematics/utils/import_manager.mjs +0 -197
- package/schematics/utils/line_mappings.mjs +0 -60
- package/schematics/utils/ng_component_template.mjs +0 -96
- package/schematics/utils/ng_decorators.mjs +0 -23
- package/schematics/utils/parse_html.mjs +0 -24
- package/schematics/utils/project_tsconfig_paths.mjs +0 -74
- package/schematics/utils/schematics_prompt.mjs +0 -30
- package/schematics/utils/typescript/class_declaration.mjs +0 -33
- package/schematics/utils/typescript/compiler_host.mjs +0 -66
- package/schematics/utils/typescript/decorators.mjs +0 -20
- package/schematics/utils/typescript/find_base_classes.mjs +0 -30
- package/schematics/utils/typescript/functions.mjs +0 -28
- package/schematics/utils/typescript/imports.mjs +0 -91
- package/schematics/utils/typescript/nodes.mjs +0 -57
- package/schematics/utils/typescript/parse_tsconfig.mjs +0 -26
- package/schematics/utils/typescript/property_name.mjs +0 -23
- package/schematics/utils/typescript/symbol.mjs +0 -72
- package/schematics/utils/utils.externs.js +0 -0
|
@@ -1,76 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @license
|
|
3
|
-
* Copyright Google LLC All Rights Reserved.
|
|
4
|
-
*
|
|
5
|
-
* Use of this source code is governed by an MIT-style license that can be
|
|
6
|
-
* found in the LICENSE file at https://angular.io/license
|
|
7
|
-
*/
|
|
8
|
-
import { SchematicsException } from '@angular-devkit/schematics';
|
|
9
|
-
import { basename, join, relative } from 'path';
|
|
10
|
-
import * as ts from 'typescript';
|
|
11
|
-
import { getProjectTsConfigPaths } from '../../utils/project_tsconfig_paths';
|
|
12
|
-
import { canMigrateFile, createMigrationProgram } from '../../utils/typescript/compiler_host';
|
|
13
|
-
import { getImportSpecifier, replaceImport } from '../../utils/typescript/imports';
|
|
14
|
-
import { closestNode } from '../../utils/typescript/nodes';
|
|
15
|
-
import { findAsyncReferences } from './util';
|
|
16
|
-
const MODULE_AUGMENTATION_FILENAME = 'ɵɵASYNC_MIGRATION_CORE_AUGMENTATION.d.ts';
|
|
17
|
-
/** Migration that switches from `async` to `waitForAsync`. */
|
|
18
|
-
export default function () {
|
|
19
|
-
return (tree) => {
|
|
20
|
-
const { buildPaths, testPaths } = getProjectTsConfigPaths(tree);
|
|
21
|
-
const basePath = process.cwd();
|
|
22
|
-
const allPaths = [...buildPaths, ...testPaths];
|
|
23
|
-
if (!allPaths.length) {
|
|
24
|
-
throw new SchematicsException('Could not find any tsconfig file. Cannot migrate async usages to waitForAsync.');
|
|
25
|
-
}
|
|
26
|
-
for (const tsconfigPath of allPaths) {
|
|
27
|
-
runWaitForAsyncMigration(tree, tsconfigPath, basePath);
|
|
28
|
-
}
|
|
29
|
-
};
|
|
30
|
-
}
|
|
31
|
-
function runWaitForAsyncMigration(tree, tsconfigPath, basePath) {
|
|
32
|
-
// Technically we can get away with using `MODULE_AUGMENTATION_FILENAME` as the path, but as of
|
|
33
|
-
// TS 4.2, the module resolution caching seems to be more aggressive which causes the file to be
|
|
34
|
-
// retained between test runs. We can avoid it by using the full path.
|
|
35
|
-
const augmentedFilePath = join(basePath, MODULE_AUGMENTATION_FILENAME);
|
|
36
|
-
const { program } = createMigrationProgram(tree, tsconfigPath, basePath, fileName => {
|
|
37
|
-
// In case the module augmentation file has been requested, we return a source file that
|
|
38
|
-
// augments "@angular/core/testing" to include a named export called "async". This ensures that
|
|
39
|
-
// we can rely on the type checker for this migration after `async` has been removed.
|
|
40
|
-
if (basename(fileName) === MODULE_AUGMENTATION_FILENAME) {
|
|
41
|
-
return `
|
|
42
|
-
import '@angular/core/testing';
|
|
43
|
-
declare module "@angular/core/testing" {
|
|
44
|
-
function async(fn: Function): any;
|
|
45
|
-
}
|
|
46
|
-
`;
|
|
47
|
-
}
|
|
48
|
-
return undefined;
|
|
49
|
-
}, [augmentedFilePath]);
|
|
50
|
-
const typeChecker = program.getTypeChecker();
|
|
51
|
-
const printer = ts.createPrinter();
|
|
52
|
-
const sourceFiles = program.getSourceFiles().filter(sourceFile => canMigrateFile(basePath, sourceFile, program));
|
|
53
|
-
const deprecatedFunction = 'async';
|
|
54
|
-
const newFunction = 'waitForAsync';
|
|
55
|
-
sourceFiles.forEach(sourceFile => {
|
|
56
|
-
const asyncImportSpecifier = getImportSpecifier(sourceFile, '@angular/core/testing', deprecatedFunction);
|
|
57
|
-
const asyncImport = asyncImportSpecifier ?
|
|
58
|
-
closestNode(asyncImportSpecifier, ts.SyntaxKind.NamedImports) :
|
|
59
|
-
null;
|
|
60
|
-
// If there are no imports for `async`, we can exit early.
|
|
61
|
-
if (!asyncImportSpecifier || !asyncImport) {
|
|
62
|
-
return;
|
|
63
|
-
}
|
|
64
|
-
const update = tree.beginUpdate(relative(basePath, sourceFile.fileName));
|
|
65
|
-
// Change the `async` import to `waitForAsync`.
|
|
66
|
-
update.remove(asyncImport.getStart(), asyncImport.getWidth());
|
|
67
|
-
update.insertRight(asyncImport.getStart(), printer.printNode(ts.EmitHint.Unspecified, replaceImport(asyncImport, deprecatedFunction, newFunction), sourceFile));
|
|
68
|
-
// Change `async` calls to `waitForAsync`.
|
|
69
|
-
findAsyncReferences(sourceFile, typeChecker, asyncImportSpecifier).forEach(node => {
|
|
70
|
-
update.remove(node.getStart(), node.getWidth());
|
|
71
|
-
update.insertRight(node.getStart(), newFunction);
|
|
72
|
-
});
|
|
73
|
-
tree.commitUpdate(update);
|
|
74
|
-
});
|
|
75
|
-
}
|
|
76
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/core/schematics/migrations/wait-for-async/index.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google LLC All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\nimport {Rule, SchematicsException, Tree} from '@angular-devkit/schematics';\nimport {basename, join, relative} from 'path';\nimport * as ts from 'typescript';\n\nimport {getProjectTsConfigPaths} from '../../utils/project_tsconfig_paths';\nimport {canMigrateFile, createMigrationProgram} from '../../utils/typescript/compiler_host';\nimport {getImportSpecifier, replaceImport} from '../../utils/typescript/imports';\nimport {closestNode} from '../../utils/typescript/nodes';\n\nimport {findAsyncReferences} from './util';\n\nconst MODULE_AUGMENTATION_FILENAME = 'ɵɵASYNC_MIGRATION_CORE_AUGMENTATION.d.ts';\n\n/** Migration that switches from `async` to `waitForAsync`. */\nexport default function(): Rule {\n  return (tree: Tree) => {\n    const {buildPaths, testPaths} = getProjectTsConfigPaths(tree);\n    const basePath = process.cwd();\n    const allPaths = [...buildPaths, ...testPaths];\n\n    if (!allPaths.length) {\n      throw new SchematicsException(\n          'Could not find any tsconfig file. Cannot migrate async usages to waitForAsync.');\n    }\n\n    for (const tsconfigPath of allPaths) {\n      runWaitForAsyncMigration(tree, tsconfigPath, basePath);\n    }\n  };\n}\n\nfunction runWaitForAsyncMigration(tree: Tree, tsconfigPath: string, basePath: string) {\n  // Technically we can get away with using `MODULE_AUGMENTATION_FILENAME` as the path, but as of\n  // TS 4.2, the module resolution caching seems to be more aggressive which causes the file to be\n  // retained between test runs. We can avoid it by using the full path.\n  const augmentedFilePath = join(basePath, MODULE_AUGMENTATION_FILENAME);\n  const {program} = createMigrationProgram(tree, tsconfigPath, basePath, fileName => {\n    // In case the module augmentation file has been requested, we return a source file that\n    // augments \"@angular/core/testing\" to include a named export called \"async\". This ensures that\n    // we can rely on the type checker for this migration after `async` has been removed.\n    if (basename(fileName) === MODULE_AUGMENTATION_FILENAME) {\n      return `\n        import '@angular/core/testing';\n        declare module \"@angular/core/testing\" {\n          function async(fn: Function): any;\n        }\n      `;\n    }\n    return undefined;\n  }, [augmentedFilePath]);\n  const typeChecker = program.getTypeChecker();\n  const printer = ts.createPrinter();\n  const sourceFiles =\n      program.getSourceFiles().filter(sourceFile => canMigrateFile(basePath, sourceFile, program));\n  const deprecatedFunction = 'async';\n  const newFunction = 'waitForAsync';\n\n  sourceFiles.forEach(sourceFile => {\n    const asyncImportSpecifier =\n        getImportSpecifier(sourceFile, '@angular/core/testing', deprecatedFunction);\n    const asyncImport = asyncImportSpecifier ?\n        closestNode<ts.NamedImports>(asyncImportSpecifier, ts.SyntaxKind.NamedImports) :\n        null;\n\n    // If there are no imports for `async`, we can exit early.\n    if (!asyncImportSpecifier || !asyncImport) {\n      return;\n    }\n\n    const update = tree.beginUpdate(relative(basePath, sourceFile.fileName));\n\n    // Change the `async` import to `waitForAsync`.\n    update.remove(asyncImport.getStart(), asyncImport.getWidth());\n    update.insertRight(\n        asyncImport.getStart(),\n        printer.printNode(\n            ts.EmitHint.Unspecified, replaceImport(asyncImport, deprecatedFunction, newFunction),\n            sourceFile));\n\n    // Change `async` calls to `waitForAsync`.\n    findAsyncReferences(sourceFile, typeChecker, asyncImportSpecifier).forEach(node => {\n      update.remove(node.getStart(), node.getWidth());\n      update.insertRight(node.getStart(), newFunction);\n    });\n\n    tree.commitUpdate(update);\n  });\n}\n"]}
|
|
@@ -1,23 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @license
|
|
3
|
-
* Copyright Google LLC All Rights Reserved.
|
|
4
|
-
*
|
|
5
|
-
* Use of this source code is governed by an MIT-style license that can be
|
|
6
|
-
* found in the LICENSE file at https://angular.io/license
|
|
7
|
-
*/
|
|
8
|
-
import * as ts from 'typescript';
|
|
9
|
-
import { isReferenceToImport } from '../../utils/typescript/symbol';
|
|
10
|
-
/** Finds calls to the `async` function. */
|
|
11
|
-
export function findAsyncReferences(sourceFile, typeChecker, asyncImportSpecifier) {
|
|
12
|
-
const results = new Set();
|
|
13
|
-
ts.forEachChild(sourceFile, function visitNode(node) {
|
|
14
|
-
if (ts.isCallExpression(node) && ts.isIdentifier(node.expression) &&
|
|
15
|
-
node.expression.text === 'async' &&
|
|
16
|
-
isReferenceToImport(typeChecker, node.expression, asyncImportSpecifier)) {
|
|
17
|
-
results.add(node.expression);
|
|
18
|
-
}
|
|
19
|
-
ts.forEachChild(node, visitNode);
|
|
20
|
-
});
|
|
21
|
-
return results;
|
|
22
|
-
}
|
|
23
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2NvcmUvc2NoZW1hdGljcy9taWdyYXRpb25zL3dhaXQtZm9yLWFzeW5jL3V0aWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7OztHQU1HO0FBRUgsT0FBTyxLQUFLLEVBQUUsTUFBTSxZQUFZLENBQUM7QUFFakMsT0FBTyxFQUFDLG1CQUFtQixFQUFDLE1BQU0sK0JBQStCLENBQUM7QUFFbEUsMkNBQTJDO0FBQzNDLE1BQU0sVUFBVSxtQkFBbUIsQ0FDL0IsVUFBeUIsRUFBRSxXQUEyQixFQUN0RCxvQkFBd0M7SUFDMUMsTUFBTSxPQUFPLEdBQUcsSUFBSSxHQUFHLEVBQWlCLENBQUM7SUFFekMsRUFBRSxDQUFDLFlBQVksQ0FBQyxVQUFVLEVBQUUsU0FBUyxTQUFTLENBQUMsSUFBYTtRQUMxRCxJQUFJLEVBQUUsQ0FBQyxnQkFBZ0IsQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUM7WUFDN0QsSUFBSSxDQUFDLFVBQVUsQ0FBQyxJQUFJLEtBQUssT0FBTztZQUNoQyxtQkFBbUIsQ0FBQyxXQUFXLEVBQUUsSUFBSSxDQUFDLFVBQVUsRUFBRSxvQkFBb0IsQ0FBQyxFQUFFO1lBQzNFLE9BQU8sQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDO1NBQzlCO1FBRUQsRUFBRSxDQUFDLFlBQVksQ0FBQyxJQUFJLEVBQUUsU0FBUyxDQUFDLENBQUM7SUFDbkMsQ0FBQyxDQUFDLENBQUM7SUFFSCxPQUFPLE9BQU8sQ0FBQztBQUNqQixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBMTEMgQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5cbmltcG9ydCAqIGFzIHRzIGZyb20gJ3R5cGVzY3JpcHQnO1xuXG5pbXBvcnQge2lzUmVmZXJlbmNlVG9JbXBvcnR9IGZyb20gJy4uLy4uL3V0aWxzL3R5cGVzY3JpcHQvc3ltYm9sJztcblxuLyoqIEZpbmRzIGNhbGxzIHRvIHRoZSBgYXN5bmNgIGZ1bmN0aW9uLiAqL1xuZXhwb3J0IGZ1bmN0aW9uIGZpbmRBc3luY1JlZmVyZW5jZXMoXG4gICAgc291cmNlRmlsZTogdHMuU291cmNlRmlsZSwgdHlwZUNoZWNrZXI6IHRzLlR5cGVDaGVja2VyLFxuICAgIGFzeW5jSW1wb3J0U3BlY2lmaWVyOiB0cy5JbXBvcnRTcGVjaWZpZXIpIHtcbiAgY29uc3QgcmVzdWx0cyA9IG5ldyBTZXQ8dHMuSWRlbnRpZmllcj4oKTtcblxuICB0cy5mb3JFYWNoQ2hpbGQoc291cmNlRmlsZSwgZnVuY3Rpb24gdmlzaXROb2RlKG5vZGU6IHRzLk5vZGUpIHtcbiAgICBpZiAodHMuaXNDYWxsRXhwcmVzc2lvbihub2RlKSAmJiB0cy5pc0lkZW50aWZpZXIobm9kZS5leHByZXNzaW9uKSAmJlxuICAgICAgICBub2RlLmV4cHJlc3Npb24udGV4dCA9PT0gJ2FzeW5jJyAmJlxuICAgICAgICBpc1JlZmVyZW5jZVRvSW1wb3J0KHR5cGVDaGVja2VyLCBub2RlLmV4cHJlc3Npb24sIGFzeW5jSW1wb3J0U3BlY2lmaWVyKSkge1xuICAgICAgcmVzdWx0cy5hZGQobm9kZS5leHByZXNzaW9uKTtcbiAgICB9XG5cbiAgICB0cy5mb3JFYWNoQ2hpbGQobm9kZSwgdmlzaXROb2RlKTtcbiAgfSk7XG5cbiAgcmV0dXJuIHJlc3VsdHM7XG59XG4iXX0=
|
|
File without changes
|
|
@@ -1,91 +0,0 @@
|
|
|
1
|
-
import * as ts from 'typescript';
|
|
2
|
-
import { findImportSpecifier } from '../../utils/typescript/imports';
|
|
3
|
-
function* visit(directory) {
|
|
4
|
-
for (const path of directory.subfiles) {
|
|
5
|
-
if (path.endsWith('.ts') && !path.endsWith('.d.ts')) {
|
|
6
|
-
const entry = directory.file(path);
|
|
7
|
-
if (entry) {
|
|
8
|
-
const content = entry.content;
|
|
9
|
-
if (content.includes('XhrFactory')) {
|
|
10
|
-
const source = ts.createSourceFile(entry.path, content.toString().replace(/^\uFEFF/, ''), ts.ScriptTarget.Latest, true);
|
|
11
|
-
yield source;
|
|
12
|
-
}
|
|
13
|
-
}
|
|
14
|
-
}
|
|
15
|
-
}
|
|
16
|
-
for (const path of directory.subdirs) {
|
|
17
|
-
if (path === 'node_modules' || path.startsWith('.')) {
|
|
18
|
-
continue;
|
|
19
|
-
}
|
|
20
|
-
yield* visit(directory.dir(path));
|
|
21
|
-
}
|
|
22
|
-
}
|
|
23
|
-
export default function () {
|
|
24
|
-
return tree => {
|
|
25
|
-
const printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed });
|
|
26
|
-
for (const sourceFile of visit(tree.root)) {
|
|
27
|
-
let recorder;
|
|
28
|
-
const allImportDeclarations = sourceFile.statements.filter(n => ts.isImportDeclaration(n));
|
|
29
|
-
if (allImportDeclarations.length === 0) {
|
|
30
|
-
continue;
|
|
31
|
-
}
|
|
32
|
-
const httpCommonImport = findImportDeclaration('@angular/common/http', allImportDeclarations);
|
|
33
|
-
if (!httpCommonImport) {
|
|
34
|
-
continue;
|
|
35
|
-
}
|
|
36
|
-
const commonHttpNamedBinding = getNamedImports(httpCommonImport);
|
|
37
|
-
if (commonHttpNamedBinding) {
|
|
38
|
-
const commonHttpNamedImports = commonHttpNamedBinding.elements;
|
|
39
|
-
const xhrFactorySpecifier = findImportSpecifier(commonHttpNamedImports, 'XhrFactory');
|
|
40
|
-
if (!xhrFactorySpecifier) {
|
|
41
|
-
continue;
|
|
42
|
-
}
|
|
43
|
-
recorder = tree.beginUpdate(sourceFile.fileName);
|
|
44
|
-
// Remove 'XhrFactory' from '@angular/common/http'
|
|
45
|
-
if (commonHttpNamedImports.length > 1) {
|
|
46
|
-
// Remove 'XhrFactory' named import
|
|
47
|
-
const index = commonHttpNamedBinding.getStart();
|
|
48
|
-
const length = commonHttpNamedBinding.getWidth();
|
|
49
|
-
const newImports = printer.printNode(ts.EmitHint.Unspecified, ts.factory.updateNamedImports(commonHttpNamedBinding, commonHttpNamedBinding.elements.filter(e => e !== xhrFactorySpecifier)), sourceFile);
|
|
50
|
-
recorder.remove(index, length).insertLeft(index, newImports);
|
|
51
|
-
}
|
|
52
|
-
else {
|
|
53
|
-
// Remove '@angular/common/http' import
|
|
54
|
-
const index = httpCommonImport.getFullStart();
|
|
55
|
-
const length = httpCommonImport.getFullWidth();
|
|
56
|
-
recorder.remove(index, length);
|
|
57
|
-
}
|
|
58
|
-
// Import XhrFactory from @angular/common
|
|
59
|
-
const commonImport = findImportDeclaration('@angular/common', allImportDeclarations);
|
|
60
|
-
const commonNamedBinding = getNamedImports(commonImport);
|
|
61
|
-
if (commonNamedBinding) {
|
|
62
|
-
// Already has an import for '@angular/common', just add the named import.
|
|
63
|
-
const index = commonNamedBinding.getStart();
|
|
64
|
-
const length = commonNamedBinding.getWidth();
|
|
65
|
-
const newImports = printer.printNode(ts.EmitHint.Unspecified, ts.factory.updateNamedImports(commonNamedBinding, [...commonNamedBinding.elements, xhrFactorySpecifier]), sourceFile);
|
|
66
|
-
recorder.remove(index, length).insertLeft(index, newImports);
|
|
67
|
-
}
|
|
68
|
-
else {
|
|
69
|
-
// Add import to '@angular/common'
|
|
70
|
-
const index = httpCommonImport.getFullStart();
|
|
71
|
-
recorder.insertLeft(index, `\nimport { XhrFactory } from '@angular/common';`);
|
|
72
|
-
}
|
|
73
|
-
}
|
|
74
|
-
if (recorder) {
|
|
75
|
-
tree.commitUpdate(recorder);
|
|
76
|
-
}
|
|
77
|
-
}
|
|
78
|
-
};
|
|
79
|
-
}
|
|
80
|
-
function findImportDeclaration(moduleSpecifier, importDeclarations) {
|
|
81
|
-
return importDeclarations.find(n => ts.isStringLiteral(n.moduleSpecifier) && n.moduleSpecifier.text === moduleSpecifier);
|
|
82
|
-
}
|
|
83
|
-
function getNamedImports(importDeclaration) {
|
|
84
|
-
var _a;
|
|
85
|
-
const namedBindings = (_a = importDeclaration === null || importDeclaration === void 0 ? void 0 : importDeclaration.importClause) === null || _a === void 0 ? void 0 : _a.namedBindings;
|
|
86
|
-
if (namedBindings && ts.isNamedImports(namedBindings)) {
|
|
87
|
-
return namedBindings;
|
|
88
|
-
}
|
|
89
|
-
return undefined;
|
|
90
|
-
}
|
|
91
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/core/schematics/migrations/xhr-factory/index.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google LLC All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\nimport {DirEntry, Rule, UpdateRecorder} from '@angular-devkit/schematics';\nimport * as ts from 'typescript';\nimport {findImportSpecifier} from '../../utils/typescript/imports';\n\nfunction* visit(directory: DirEntry): IterableIterator<ts.SourceFile> {\n  for (const path of directory.subfiles) {\n    if (path.endsWith('.ts') && !path.endsWith('.d.ts')) {\n      const entry = directory.file(path);\n      if (entry) {\n        const content = entry.content;\n        if (content.includes('XhrFactory')) {\n          const source = ts.createSourceFile(\n              entry.path,\n              content.toString().replace(/^\\uFEFF/, ''),\n              ts.ScriptTarget.Latest,\n              true,\n          );\n\n          yield source;\n        }\n      }\n    }\n  }\n\n  for (const path of directory.subdirs) {\n    if (path === 'node_modules' || path.startsWith('.')) {\n      continue;\n    }\n\n    yield* visit(directory.dir(path));\n  }\n}\n\nexport default function(): Rule {\n  return tree => {\n    const printer = ts.createPrinter({newLine: ts.NewLineKind.LineFeed});\n\n    for (const sourceFile of visit(tree.root)) {\n      let recorder: UpdateRecorder|undefined;\n\n      const allImportDeclarations =\n          sourceFile.statements.filter(n => ts.isImportDeclaration(n)) as ts.ImportDeclaration[];\n      if (allImportDeclarations.length === 0) {\n        continue;\n      }\n\n      const httpCommonImport = findImportDeclaration('@angular/common/http', allImportDeclarations);\n      if (!httpCommonImport) {\n        continue;\n      }\n\n      const commonHttpNamedBinding = getNamedImports(httpCommonImport);\n      if (commonHttpNamedBinding) {\n        const commonHttpNamedImports = commonHttpNamedBinding.elements;\n        const xhrFactorySpecifier = findImportSpecifier(commonHttpNamedImports, 'XhrFactory');\n\n        if (!xhrFactorySpecifier) {\n          continue;\n        }\n\n        recorder = tree.beginUpdate(sourceFile.fileName);\n\n        // Remove 'XhrFactory' from '@angular/common/http'\n        if (commonHttpNamedImports.length > 1) {\n          // Remove 'XhrFactory' named import\n          const index = commonHttpNamedBinding.getStart();\n          const length = commonHttpNamedBinding.getWidth();\n\n          const newImports = printer.printNode(\n              ts.EmitHint.Unspecified,\n              ts.factory.updateNamedImports(\n                  commonHttpNamedBinding,\n                  commonHttpNamedBinding.elements.filter(e => e !== xhrFactorySpecifier)),\n              sourceFile);\n          recorder.remove(index, length).insertLeft(index, newImports);\n        } else {\n          // Remove '@angular/common/http' import\n          const index = httpCommonImport.getFullStart();\n          const length = httpCommonImport.getFullWidth();\n          recorder.remove(index, length);\n        }\n\n        // Import XhrFactory from @angular/common\n        const commonImport = findImportDeclaration('@angular/common', allImportDeclarations);\n        const commonNamedBinding = getNamedImports(commonImport);\n        if (commonNamedBinding) {\n          // Already has an import for '@angular/common', just add the named import.\n          const index = commonNamedBinding.getStart();\n          const length = commonNamedBinding.getWidth();\n          const newImports = printer.printNode(\n              ts.EmitHint.Unspecified,\n              ts.factory.updateNamedImports(\n                  commonNamedBinding, [...commonNamedBinding.elements, xhrFactorySpecifier]),\n              sourceFile);\n\n          recorder.remove(index, length).insertLeft(index, newImports);\n        } else {\n          // Add import to '@angular/common'\n          const index = httpCommonImport.getFullStart();\n          recorder.insertLeft(index, `\\nimport { XhrFactory } from '@angular/common';`);\n        }\n      }\n\n      if (recorder) {\n        tree.commitUpdate(recorder);\n      }\n    }\n  };\n}\n\nfunction findImportDeclaration(moduleSpecifier: string, importDeclarations: ts.ImportDeclaration[]):\n    ts.ImportDeclaration|undefined {\n  return importDeclarations.find(\n      n => ts.isStringLiteral(n.moduleSpecifier) && n.moduleSpecifier.text === moduleSpecifier);\n}\n\nfunction getNamedImports(importDeclaration: ts.ImportDeclaration|undefined): ts.NamedImports|\n    undefined {\n  const namedBindings = importDeclaration?.importClause?.namedBindings;\n  if (namedBindings && ts.isNamedImports(namedBindings)) {\n    return namedBindings;\n  }\n\n  return undefined;\n}\n"]}
|
|
File without changes
|
|
@@ -1,197 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @license
|
|
3
|
-
* Copyright Google LLC All Rights Reserved.
|
|
4
|
-
*
|
|
5
|
-
* Use of this source code is governed by an MIT-style license that can be
|
|
6
|
-
* found in the LICENSE file at https://angular.io/license
|
|
7
|
-
*/
|
|
8
|
-
import { dirname, resolve } from 'path';
|
|
9
|
-
import * as ts from 'typescript';
|
|
10
|
-
/**
|
|
11
|
-
* Import manager that can be used to add TypeScript imports to given source
|
|
12
|
-
* files. The manager ensures that multiple transformations are applied properly
|
|
13
|
-
* without shifted offsets and that similar existing import declarations are re-used.
|
|
14
|
-
*/
|
|
15
|
-
export class ImportManager {
|
|
16
|
-
constructor(getUpdateRecorder, printer) {
|
|
17
|
-
this.getUpdateRecorder = getUpdateRecorder;
|
|
18
|
-
this.printer = printer;
|
|
19
|
-
/** Map of import declarations that need to be updated to include the given symbols. */
|
|
20
|
-
this.updatedImports = new Map();
|
|
21
|
-
/** Map of source-files and their previously used identifier names. */
|
|
22
|
-
this.usedIdentifierNames = new Map();
|
|
23
|
-
/**
|
|
24
|
-
* Array of previously resolved symbol imports. Cache can be re-used to return
|
|
25
|
-
* the same identifier without checking the source-file again.
|
|
26
|
-
*/
|
|
27
|
-
this.importCache = [];
|
|
28
|
-
}
|
|
29
|
-
/**
|
|
30
|
-
* Adds an import to the given source-file and returns the TypeScript
|
|
31
|
-
* identifier that can be used to access the newly imported symbol.
|
|
32
|
-
*/
|
|
33
|
-
addImportToSourceFile(sourceFile, symbolName, moduleName, typeImport = false) {
|
|
34
|
-
const sourceDir = dirname(sourceFile.fileName);
|
|
35
|
-
let importStartIndex = 0;
|
|
36
|
-
let existingImport = null;
|
|
37
|
-
// In case the given import has been already generated previously, we just return
|
|
38
|
-
// the previous generated identifier in order to avoid duplicate generated imports.
|
|
39
|
-
const cachedImport = this.importCache.find(c => c.sourceFile === sourceFile && c.symbolName === symbolName &&
|
|
40
|
-
c.moduleName === moduleName);
|
|
41
|
-
if (cachedImport) {
|
|
42
|
-
return cachedImport.identifier;
|
|
43
|
-
}
|
|
44
|
-
// Walk through all source-file top-level statements and search for import declarations
|
|
45
|
-
// that already match the specified "moduleName" and can be updated to import the
|
|
46
|
-
// given symbol. If no matching import can be found, the last import in the source-file
|
|
47
|
-
// will be used as starting point for a new import that will be generated.
|
|
48
|
-
for (let i = sourceFile.statements.length - 1; i >= 0; i--) {
|
|
49
|
-
const statement = sourceFile.statements[i];
|
|
50
|
-
if (!ts.isImportDeclaration(statement) || !ts.isStringLiteral(statement.moduleSpecifier) ||
|
|
51
|
-
!statement.importClause) {
|
|
52
|
-
continue;
|
|
53
|
-
}
|
|
54
|
-
if (importStartIndex === 0) {
|
|
55
|
-
importStartIndex = this._getEndPositionOfNode(statement);
|
|
56
|
-
}
|
|
57
|
-
const moduleSpecifier = statement.moduleSpecifier.text;
|
|
58
|
-
if (moduleSpecifier.startsWith('.') &&
|
|
59
|
-
resolve(sourceDir, moduleSpecifier) !== resolve(sourceDir, moduleName) ||
|
|
60
|
-
moduleSpecifier !== moduleName) {
|
|
61
|
-
continue;
|
|
62
|
-
}
|
|
63
|
-
if (statement.importClause.namedBindings) {
|
|
64
|
-
const namedBindings = statement.importClause.namedBindings;
|
|
65
|
-
// In case a "Type" symbol is imported, we can't use namespace imports
|
|
66
|
-
// because these only export symbols available at runtime (no types)
|
|
67
|
-
if (ts.isNamespaceImport(namedBindings) && !typeImport) {
|
|
68
|
-
return ts.createPropertyAccess(ts.createIdentifier(namedBindings.name.text), ts.createIdentifier(symbolName || 'default'));
|
|
69
|
-
}
|
|
70
|
-
else if (ts.isNamedImports(namedBindings) && symbolName) {
|
|
71
|
-
const existingElement = namedBindings.elements.find(e => e.propertyName ? e.propertyName.text === symbolName : e.name.text === symbolName);
|
|
72
|
-
if (existingElement) {
|
|
73
|
-
return ts.createIdentifier(existingElement.name.text);
|
|
74
|
-
}
|
|
75
|
-
// In case the symbol could not be found in an existing import, we
|
|
76
|
-
// keep track of the import declaration as it can be updated to include
|
|
77
|
-
// the specified symbol name without having to create a new import.
|
|
78
|
-
existingImport = statement;
|
|
79
|
-
}
|
|
80
|
-
}
|
|
81
|
-
else if (statement.importClause.name && !symbolName) {
|
|
82
|
-
return ts.createIdentifier(statement.importClause.name.text);
|
|
83
|
-
}
|
|
84
|
-
}
|
|
85
|
-
if (existingImport) {
|
|
86
|
-
const propertyIdentifier = ts.createIdentifier(symbolName);
|
|
87
|
-
const generatedUniqueIdentifier = this._getUniqueIdentifier(sourceFile, symbolName);
|
|
88
|
-
const needsGeneratedUniqueName = generatedUniqueIdentifier.text !== symbolName;
|
|
89
|
-
const importName = needsGeneratedUniqueName ? generatedUniqueIdentifier : propertyIdentifier;
|
|
90
|
-
// Since it can happen that multiple classes need to be imported within the
|
|
91
|
-
// specified source file and we want to add the identifiers to the existing
|
|
92
|
-
// import declaration, we need to keep track of the updated import declarations.
|
|
93
|
-
// We can't directly update the import declaration for each identifier as this
|
|
94
|
-
// would throw off the recorder offsets. We need to keep track of the new identifiers
|
|
95
|
-
// for the import and perform the import transformation as batches per source-file.
|
|
96
|
-
this.updatedImports.set(existingImport, (this.updatedImports.get(existingImport) || []).concat({
|
|
97
|
-
propertyName: needsGeneratedUniqueName ? propertyIdentifier : undefined,
|
|
98
|
-
importName: importName,
|
|
99
|
-
}));
|
|
100
|
-
// Keep track of all updated imports so that we don't generate duplicate
|
|
101
|
-
// similar imports as these can't be statically analyzed in the source-file yet.
|
|
102
|
-
this.importCache.push({ sourceFile, moduleName, symbolName, identifier: importName });
|
|
103
|
-
return importName;
|
|
104
|
-
}
|
|
105
|
-
let identifier = null;
|
|
106
|
-
let newImport = null;
|
|
107
|
-
if (symbolName) {
|
|
108
|
-
const propertyIdentifier = ts.createIdentifier(symbolName);
|
|
109
|
-
const generatedUniqueIdentifier = this._getUniqueIdentifier(sourceFile, symbolName);
|
|
110
|
-
const needsGeneratedUniqueName = generatedUniqueIdentifier.text !== symbolName;
|
|
111
|
-
identifier = needsGeneratedUniqueName ? generatedUniqueIdentifier : propertyIdentifier;
|
|
112
|
-
newImport = ts.createImportDeclaration(undefined, undefined, ts.createImportClause(undefined, ts.createNamedImports([ts.createImportSpecifier(needsGeneratedUniqueName ? propertyIdentifier : undefined, identifier)])), ts.createStringLiteral(moduleName));
|
|
113
|
-
}
|
|
114
|
-
else {
|
|
115
|
-
identifier = this._getUniqueIdentifier(sourceFile, 'defaultExport');
|
|
116
|
-
newImport = ts.createImportDeclaration(undefined, undefined, ts.createImportClause(identifier, undefined), ts.createStringLiteral(moduleName));
|
|
117
|
-
}
|
|
118
|
-
const newImportText = this.printer.printNode(ts.EmitHint.Unspecified, newImport, sourceFile);
|
|
119
|
-
// If the import is generated at the start of the source file, we want to add
|
|
120
|
-
// a new-line after the import. Otherwise if the import is generated after an
|
|
121
|
-
// existing import, we need to prepend a new-line so that the import is not on
|
|
122
|
-
// the same line as the existing import anchor.
|
|
123
|
-
this.getUpdateRecorder(sourceFile)
|
|
124
|
-
.addNewImport(importStartIndex, importStartIndex === 0 ? `${newImportText}\n` : `\n${newImportText}`);
|
|
125
|
-
// Keep track of all generated imports so that we don't generate duplicate
|
|
126
|
-
// similar imports as these can't be statically analyzed in the source-file yet.
|
|
127
|
-
this.importCache.push({ sourceFile, symbolName, moduleName, identifier });
|
|
128
|
-
return identifier;
|
|
129
|
-
}
|
|
130
|
-
/**
|
|
131
|
-
* Stores the collected import changes within the appropriate update recorders. The
|
|
132
|
-
* updated imports can only be updated *once* per source-file because previous updates
|
|
133
|
-
* could otherwise shift the source-file offsets.
|
|
134
|
-
*/
|
|
135
|
-
recordChanges() {
|
|
136
|
-
this.updatedImports.forEach((expressions, importDecl) => {
|
|
137
|
-
const sourceFile = importDecl.getSourceFile();
|
|
138
|
-
const recorder = this.getUpdateRecorder(sourceFile);
|
|
139
|
-
const namedBindings = importDecl.importClause.namedBindings;
|
|
140
|
-
const newNamedBindings = ts.updateNamedImports(namedBindings, namedBindings.elements.concat(expressions.map(({ propertyName, importName }) => ts.createImportSpecifier(propertyName, importName))));
|
|
141
|
-
const newNamedBindingsText = this.printer.printNode(ts.EmitHint.Unspecified, newNamedBindings, sourceFile);
|
|
142
|
-
recorder.updateExistingImport(namedBindings, newNamedBindingsText);
|
|
143
|
-
});
|
|
144
|
-
}
|
|
145
|
-
/** Gets an unique identifier with a base name for the given source file. */
|
|
146
|
-
_getUniqueIdentifier(sourceFile, baseName) {
|
|
147
|
-
if (this.isUniqueIdentifierName(sourceFile, baseName)) {
|
|
148
|
-
this._recordUsedIdentifier(sourceFile, baseName);
|
|
149
|
-
return ts.createIdentifier(baseName);
|
|
150
|
-
}
|
|
151
|
-
let name = null;
|
|
152
|
-
let counter = 1;
|
|
153
|
-
do {
|
|
154
|
-
name = `${baseName}_${counter++}`;
|
|
155
|
-
} while (!this.isUniqueIdentifierName(sourceFile, name));
|
|
156
|
-
this._recordUsedIdentifier(sourceFile, name);
|
|
157
|
-
return ts.createIdentifier(name);
|
|
158
|
-
}
|
|
159
|
-
/**
|
|
160
|
-
* Checks whether the specified identifier name is used within the given
|
|
161
|
-
* source file.
|
|
162
|
-
*/
|
|
163
|
-
isUniqueIdentifierName(sourceFile, name) {
|
|
164
|
-
if (this.usedIdentifierNames.has(sourceFile) &&
|
|
165
|
-
this.usedIdentifierNames.get(sourceFile).indexOf(name) !== -1) {
|
|
166
|
-
return false;
|
|
167
|
-
}
|
|
168
|
-
// Walk through the source file and search for an identifier matching
|
|
169
|
-
// the given name. In that case, it's not guaranteed that this name
|
|
170
|
-
// is unique in the given declaration scope and we just return false.
|
|
171
|
-
const nodeQueue = [sourceFile];
|
|
172
|
-
while (nodeQueue.length) {
|
|
173
|
-
const node = nodeQueue.shift();
|
|
174
|
-
if (ts.isIdentifier(node) && node.text === name) {
|
|
175
|
-
return false;
|
|
176
|
-
}
|
|
177
|
-
nodeQueue.push(...node.getChildren());
|
|
178
|
-
}
|
|
179
|
-
return true;
|
|
180
|
-
}
|
|
181
|
-
_recordUsedIdentifier(sourceFile, identifierName) {
|
|
182
|
-
this.usedIdentifierNames.set(sourceFile, (this.usedIdentifierNames.get(sourceFile) || []).concat(identifierName));
|
|
183
|
-
}
|
|
184
|
-
/**
|
|
185
|
-
* Determines the full end of a given node. By default the end position of a node is
|
|
186
|
-
* before all trailing comments. This could mean that generated imports shift comments.
|
|
187
|
-
*/
|
|
188
|
-
_getEndPositionOfNode(node) {
|
|
189
|
-
const nodeEndPos = node.getEnd();
|
|
190
|
-
const commentRanges = ts.getTrailingCommentRanges(node.getSourceFile().text, nodeEndPos);
|
|
191
|
-
if (!commentRanges || !commentRanges.length) {
|
|
192
|
-
return nodeEndPos;
|
|
193
|
-
}
|
|
194
|
-
return commentRanges[commentRanges.length - 1].end;
|
|
195
|
-
}
|
|
196
|
-
}
|
|
197
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"import_manager.js","sourceRoot":"","sources":["../../../../../../../packages/core/schematics/utils/import_manager.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google LLC All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\nimport {dirname, resolve} from 'path';\nimport * as ts from 'typescript';\n\n/** Update recorder for managing imports. */\nexport interface ImportManagerUpdateRecorder {\n  addNewImport(start: number, importText: string): void;\n  updateExistingImport(namedBindings: ts.NamedImports, newNamedBindings: string): void;\n}\n\n/**\n * Import manager that can be used to add TypeScript imports to given source\n * files. The manager ensures that multiple transformations are applied properly\n * without shifted offsets and that similar existing import declarations are re-used.\n */\nexport class ImportManager {\n  /** Map of import declarations that need to be updated to include the given symbols. */\n  private updatedImports =\n      new Map<ts.ImportDeclaration, {propertyName?: ts.Identifier, importName: ts.Identifier}[]>();\n  /** Map of source-files and their previously used identifier names. */\n  private usedIdentifierNames = new Map<ts.SourceFile, string[]>();\n  /**\n   * Array of previously resolved symbol imports. Cache can be re-used to return\n   * the same identifier without checking the source-file again.\n   */\n  private importCache: {\n    sourceFile: ts.SourceFile,\n    symbolName: string|null,\n    moduleName: string,\n    identifier: ts.Identifier\n  }[] = [];\n\n  constructor(\n      private getUpdateRecorder: (sf: ts.SourceFile) => ImportManagerUpdateRecorder,\n      private printer: ts.Printer) {}\n\n  /**\n   * Adds an import to the given source-file and returns the TypeScript\n   * identifier that can be used to access the newly imported symbol.\n   */\n  addImportToSourceFile(\n      sourceFile: ts.SourceFile, symbolName: string|null, moduleName: string,\n      typeImport = false): ts.Expression {\n    const sourceDir = dirname(sourceFile.fileName);\n    let importStartIndex = 0;\n    let existingImport: ts.ImportDeclaration|null = null;\n\n    // In case the given import has been already generated previously, we just return\n    // the previous generated identifier in order to avoid duplicate generated imports.\n    const cachedImport = this.importCache.find(\n        c => c.sourceFile === sourceFile && c.symbolName === symbolName &&\n            c.moduleName === moduleName);\n    if (cachedImport) {\n      return cachedImport.identifier;\n    }\n\n    // Walk through all source-file top-level statements and search for import declarations\n    // that already match the specified \"moduleName\" and can be updated to import the\n    // given symbol. If no matching import can be found, the last import in the source-file\n    // will be used as starting point for a new import that will be generated.\n    for (let i = sourceFile.statements.length - 1; i >= 0; i--) {\n      const statement = sourceFile.statements[i];\n\n      if (!ts.isImportDeclaration(statement) || !ts.isStringLiteral(statement.moduleSpecifier) ||\n          !statement.importClause) {\n        continue;\n      }\n\n      if (importStartIndex === 0) {\n        importStartIndex = this._getEndPositionOfNode(statement);\n      }\n\n      const moduleSpecifier = statement.moduleSpecifier.text;\n\n      if (moduleSpecifier.startsWith('.') &&\n              resolve(sourceDir, moduleSpecifier) !== resolve(sourceDir, moduleName) ||\n          moduleSpecifier !== moduleName) {\n        continue;\n      }\n\n      if (statement.importClause.namedBindings) {\n        const namedBindings = statement.importClause.namedBindings;\n\n        // In case a \"Type\" symbol is imported, we can't use namespace imports\n        // because these only export symbols available at runtime (no types)\n        if (ts.isNamespaceImport(namedBindings) && !typeImport) {\n          return ts.createPropertyAccess(\n              ts.createIdentifier(namedBindings.name.text),\n              ts.createIdentifier(symbolName || 'default'));\n        } else if (ts.isNamedImports(namedBindings) && symbolName) {\n          const existingElement = namedBindings.elements.find(\n              e =>\n                  e.propertyName ? e.propertyName.text === symbolName : e.name.text === symbolName);\n\n          if (existingElement) {\n            return ts.createIdentifier(existingElement.name.text);\n          }\n\n          // In case the symbol could not be found in an existing import, we\n          // keep track of the import declaration as it can be updated to include\n          // the specified symbol name without having to create a new import.\n          existingImport = statement;\n        }\n      } else if (statement.importClause.name && !symbolName) {\n        return ts.createIdentifier(statement.importClause.name.text);\n      }\n    }\n\n    if (existingImport) {\n      const propertyIdentifier = ts.createIdentifier(symbolName!);\n      const generatedUniqueIdentifier = this._getUniqueIdentifier(sourceFile, symbolName!);\n      const needsGeneratedUniqueName = generatedUniqueIdentifier.text !== symbolName;\n      const importName = needsGeneratedUniqueName ? generatedUniqueIdentifier : propertyIdentifier;\n\n      // Since it can happen that multiple classes need to be imported within the\n      // specified source file and we want to add the identifiers to the existing\n      // import declaration, we need to keep track of the updated import declarations.\n      // We can't directly update the import declaration for each identifier as this\n      // would throw off the recorder offsets. We need to keep track of the new identifiers\n      // for the import and perform the import transformation as batches per source-file.\n      this.updatedImports.set(\n          existingImport, (this.updatedImports.get(existingImport) || []).concat({\n            propertyName: needsGeneratedUniqueName ? propertyIdentifier : undefined,\n            importName: importName,\n          }));\n\n      // Keep track of all updated imports so that we don't generate duplicate\n      // similar imports as these can't be statically analyzed in the source-file yet.\n      this.importCache.push({sourceFile, moduleName, symbolName, identifier: importName});\n\n      return importName;\n    }\n\n    let identifier: ts.Identifier|null = null;\n    let newImport: ts.ImportDeclaration|null = null;\n\n    if (symbolName) {\n      const propertyIdentifier = ts.createIdentifier(symbolName);\n      const generatedUniqueIdentifier = this._getUniqueIdentifier(sourceFile, symbolName);\n      const needsGeneratedUniqueName = generatedUniqueIdentifier.text !== symbolName;\n      identifier = needsGeneratedUniqueName ? generatedUniqueIdentifier : propertyIdentifier;\n\n      newImport = ts.createImportDeclaration(\n          undefined, undefined,\n          ts.createImportClause(\n              undefined,\n              ts.createNamedImports([ts.createImportSpecifier(\n                  needsGeneratedUniqueName ? propertyIdentifier : undefined, identifier)])),\n          ts.createStringLiteral(moduleName));\n    } else {\n      identifier = this._getUniqueIdentifier(sourceFile, 'defaultExport');\n      newImport = ts.createImportDeclaration(\n          undefined, undefined, ts.createImportClause(identifier, undefined),\n          ts.createStringLiteral(moduleName));\n    }\n\n    const newImportText = this.printer.printNode(ts.EmitHint.Unspecified, newImport, sourceFile);\n    // If the import is generated at the start of the source file, we want to add\n    // a new-line after the import. Otherwise if the import is generated after an\n    // existing import, we need to prepend a new-line so that the import is not on\n    // the same line as the existing import anchor.\n    this.getUpdateRecorder(sourceFile)\n        .addNewImport(\n            importStartIndex, importStartIndex === 0 ? `${newImportText}\\n` : `\\n${newImportText}`);\n\n    // Keep track of all generated imports so that we don't generate duplicate\n    // similar imports as these can't be statically analyzed in the source-file yet.\n    this.importCache.push({sourceFile, symbolName, moduleName, identifier});\n\n    return identifier;\n  }\n\n  /**\n   * Stores the collected import changes within the appropriate update recorders. The\n   * updated imports can only be updated *once* per source-file because previous updates\n   * could otherwise shift the source-file offsets.\n   */\n  recordChanges() {\n    this.updatedImports.forEach((expressions, importDecl) => {\n      const sourceFile = importDecl.getSourceFile();\n      const recorder = this.getUpdateRecorder(sourceFile);\n      const namedBindings = importDecl.importClause!.namedBindings as ts.NamedImports;\n      const newNamedBindings = ts.updateNamedImports(\n          namedBindings,\n          namedBindings.elements.concat(expressions.map(\n              ({propertyName, importName}) => ts.createImportSpecifier(propertyName, importName))));\n\n      const newNamedBindingsText =\n          this.printer.printNode(ts.EmitHint.Unspecified, newNamedBindings, sourceFile);\n      recorder.updateExistingImport(namedBindings, newNamedBindingsText);\n    });\n  }\n\n  /** Gets an unique identifier with a base name for the given source file. */\n  private _getUniqueIdentifier(sourceFile: ts.SourceFile, baseName: string): ts.Identifier {\n    if (this.isUniqueIdentifierName(sourceFile, baseName)) {\n      this._recordUsedIdentifier(sourceFile, baseName);\n      return ts.createIdentifier(baseName);\n    }\n\n    let name = null;\n    let counter = 1;\n    do {\n      name = `${baseName}_${counter++}`;\n    } while (!this.isUniqueIdentifierName(sourceFile, name));\n\n    this._recordUsedIdentifier(sourceFile, name!);\n    return ts.createIdentifier(name!);\n  }\n\n  /**\n   * Checks whether the specified identifier name is used within the given\n   * source file.\n   */\n  private isUniqueIdentifierName(sourceFile: ts.SourceFile, name: string) {\n    if (this.usedIdentifierNames.has(sourceFile) &&\n        this.usedIdentifierNames.get(sourceFile)!.indexOf(name) !== -1) {\n      return false;\n    }\n\n    // Walk through the source file and search for an identifier matching\n    // the given name. In that case, it's not guaranteed that this name\n    // is unique in the given declaration scope and we just return false.\n    const nodeQueue: ts.Node[] = [sourceFile];\n    while (nodeQueue.length) {\n      const node = nodeQueue.shift()!;\n      if (ts.isIdentifier(node) && node.text === name) {\n        return false;\n      }\n      nodeQueue.push(...node.getChildren());\n    }\n    return true;\n  }\n\n  private _recordUsedIdentifier(sourceFile: ts.SourceFile, identifierName: string) {\n    this.usedIdentifierNames.set(\n        sourceFile, (this.usedIdentifierNames.get(sourceFile) || []).concat(identifierName));\n  }\n\n  /**\n   * Determines the full end of a given node. By default the end position of a node is\n   * before all trailing comments. This could mean that generated imports shift comments.\n   */\n  private _getEndPositionOfNode(node: ts.Node) {\n    const nodeEndPos = node.getEnd();\n    const commentRanges = ts.getTrailingCommentRanges(node.getSourceFile().text, nodeEndPos);\n    if (!commentRanges || !commentRanges.length) {\n      return nodeEndPos;\n    }\n    return commentRanges[commentRanges.length - 1]!.end;\n  }\n}\n"]}
|
|
@@ -1,60 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @license
|
|
3
|
-
* Copyright Google LLC All Rights Reserved.
|
|
4
|
-
*
|
|
5
|
-
* Use of this source code is governed by an MIT-style license that can be
|
|
6
|
-
* found in the LICENSE file at https://angular.io/license
|
|
7
|
-
*/
|
|
8
|
-
const LF_CHAR = 10;
|
|
9
|
-
const CR_CHAR = 13;
|
|
10
|
-
const LINE_SEP_CHAR = 8232;
|
|
11
|
-
const PARAGRAPH_CHAR = 8233;
|
|
12
|
-
/** Gets the line and character for the given position from the line starts map. */
|
|
13
|
-
export function getLineAndCharacterFromPosition(lineStartsMap, position) {
|
|
14
|
-
const lineIndex = findClosestLineStartPosition(lineStartsMap, position);
|
|
15
|
-
return { character: position - lineStartsMap[lineIndex], line: lineIndex };
|
|
16
|
-
}
|
|
17
|
-
/**
|
|
18
|
-
* Computes the line start map of the given text. This can be used in order to
|
|
19
|
-
* retrieve the line and character of a given text position index.
|
|
20
|
-
*/
|
|
21
|
-
export function computeLineStartsMap(text) {
|
|
22
|
-
const result = [0];
|
|
23
|
-
let pos = 0;
|
|
24
|
-
while (pos < text.length) {
|
|
25
|
-
const char = text.charCodeAt(pos++);
|
|
26
|
-
// Handles the "CRLF" line break. In that case we peek the character
|
|
27
|
-
// after the "CR" and check if it is a line feed.
|
|
28
|
-
if (char === CR_CHAR) {
|
|
29
|
-
if (text.charCodeAt(pos) === LF_CHAR) {
|
|
30
|
-
pos++;
|
|
31
|
-
}
|
|
32
|
-
result.push(pos);
|
|
33
|
-
}
|
|
34
|
-
else if (char === LF_CHAR || char === LINE_SEP_CHAR || char === PARAGRAPH_CHAR) {
|
|
35
|
-
result.push(pos);
|
|
36
|
-
}
|
|
37
|
-
}
|
|
38
|
-
result.push(pos);
|
|
39
|
-
return result;
|
|
40
|
-
}
|
|
41
|
-
/** Finds the closest line start for the given position. */
|
|
42
|
-
function findClosestLineStartPosition(linesMap, position, low = 0, high = linesMap.length - 1) {
|
|
43
|
-
while (low <= high) {
|
|
44
|
-
const pivotIdx = Math.floor((low + high) / 2);
|
|
45
|
-
const pivotEl = linesMap[pivotIdx];
|
|
46
|
-
if (pivotEl === position) {
|
|
47
|
-
return pivotIdx;
|
|
48
|
-
}
|
|
49
|
-
else if (position > pivotEl) {
|
|
50
|
-
low = pivotIdx + 1;
|
|
51
|
-
}
|
|
52
|
-
else {
|
|
53
|
-
high = pivotIdx - 1;
|
|
54
|
-
}
|
|
55
|
-
}
|
|
56
|
-
// In case there was no exact match, return the closest "lower" line index. We also
|
|
57
|
-
// subtract the index by one because want the index of the previous line start.
|
|
58
|
-
return low - 1;
|
|
59
|
-
}
|
|
60
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGluZV9tYXBwaW5ncy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2NvcmUvc2NoZW1hdGljcy91dGlscy9saW5lX21hcHBpbmdzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7R0FNRztBQUVILE1BQU0sT0FBTyxHQUFHLEVBQUUsQ0FBQztBQUNuQixNQUFNLE9BQU8sR0FBRyxFQUFFLENBQUM7QUFDbkIsTUFBTSxhQUFhLEdBQUcsSUFBSSxDQUFDO0FBQzNCLE1BQU0sY0FBYyxHQUFHLElBQUksQ0FBQztBQUU1QixtRkFBbUY7QUFDbkYsTUFBTSxVQUFVLCtCQUErQixDQUFDLGFBQXVCLEVBQUUsUUFBZ0I7SUFDdkYsTUFBTSxTQUFTLEdBQUcsNEJBQTRCLENBQUMsYUFBYSxFQUFFLFFBQVEsQ0FBQyxDQUFDO0lBQ3hFLE9BQU8sRUFBQyxTQUFTLEVBQUUsUUFBUSxHQUFHLGFBQWEsQ0FBQyxTQUFTLENBQUMsRUFBRSxJQUFJLEVBQUUsU0FBUyxFQUFDLENBQUM7QUFDM0UsQ0FBQztBQUVEOzs7R0FHRztBQUNILE1BQU0sVUFBVSxvQkFBb0IsQ0FBQyxJQUFZO0lBQy9DLE1BQU0sTUFBTSxHQUFhLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDN0IsSUFBSSxHQUFHLEdBQUcsQ0FBQyxDQUFDO0lBQ1osT0FBTyxHQUFHLEdBQUcsSUFBSSxDQUFDLE1BQU0sRUFBRTtRQUN4QixNQUFNLElBQUksR0FBRyxJQUFJLENBQUMsVUFBVSxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUM7UUFDcEMsb0VBQW9FO1FBQ3BFLGlEQUFpRDtRQUNqRCxJQUFJLElBQUksS0FBSyxPQUFPLEVBQUU7WUFDcEIsSUFBSSxJQUFJLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxLQUFLLE9BQU8sRUFBRTtnQkFDcEMsR0FBRyxFQUFFLENBQUM7YUFDUDtZQUNELE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7U0FDbEI7YUFBTSxJQUFJLElBQUksS0FBSyxPQUFPLElBQUksSUFBSSxLQUFLLGFBQWEsSUFBSSxJQUFJLEtBQUssY0FBYyxFQUFFO1lBQ2hGLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7U0FDbEI7S0FDRjtJQUNELE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDakIsT0FBTyxNQUFNLENBQUM7QUFDaEIsQ0FBQztBQUVELDJEQUEyRDtBQUMzRCxTQUFTLDRCQUE0QixDQUNqQyxRQUFhLEVBQUUsUUFBVyxFQUFFLEdBQUcsR0FBRyxDQUFDLEVBQUUsSUFBSSxHQUFHLFFBQVEsQ0FBQyxNQUFNLEdBQUcsQ0FBQztJQUNqRSxPQUFPLEdBQUcsSUFBSSxJQUFJLEVBQUU7UUFDbEIsTUFBTSxRQUFRLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLEdBQUcsR0FBRyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQztRQUM5QyxNQUFNLE9BQU8sR0FBRyxRQUFRLENBQUMsUUFBUSxDQUFDLENBQUM7UUFFbkMsSUFBSSxPQUFPLEtBQUssUUFBUSxFQUFFO1lBQ3hCLE9BQU8sUUFBUSxDQUFDO1NBQ2pCO2FBQU0sSUFBSSxRQUFRLEdBQUcsT0FBTyxFQUFFO1lBQzdCLEdBQUcsR0FBRyxRQUFRLEdBQUcsQ0FBQyxDQUFDO1NBQ3BCO2FBQU07WUFDTCxJQUFJLEdBQUcsUUFBUSxHQUFHLENBQUMsQ0FBQztTQUNyQjtLQUNGO0lBRUQsbUZBQW1GO0lBQ25GLCtFQUErRTtJQUMvRSxPQUFPLEdBQUcsR0FBRyxDQUFDLENBQUM7QUFDakIsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogQGxpY2Vuc2VcbiAqIENvcHlyaWdodCBHb29nbGUgTExDIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogVXNlIG9mIHRoaXMgc291cmNlIGNvZGUgaXMgZ292ZXJuZWQgYnkgYW4gTUlULXN0eWxlIGxpY2Vuc2UgdGhhdCBjYW4gYmVcbiAqIGZvdW5kIGluIHRoZSBMSUNFTlNFIGZpbGUgYXQgaHR0cHM6Ly9hbmd1bGFyLmlvL2xpY2Vuc2VcbiAqL1xuXG5jb25zdCBMRl9DSEFSID0gMTA7XG5jb25zdCBDUl9DSEFSID0gMTM7XG5jb25zdCBMSU5FX1NFUF9DSEFSID0gODIzMjtcbmNvbnN0IFBBUkFHUkFQSF9DSEFSID0gODIzMztcblxuLyoqIEdldHMgdGhlIGxpbmUgYW5kIGNoYXJhY3RlciBmb3IgdGhlIGdpdmVuIHBvc2l0aW9uIGZyb20gdGhlIGxpbmUgc3RhcnRzIG1hcC4gKi9cbmV4cG9ydCBmdW5jdGlvbiBnZXRMaW5lQW5kQ2hhcmFjdGVyRnJvbVBvc2l0aW9uKGxpbmVTdGFydHNNYXA6IG51bWJlcltdLCBwb3NpdGlvbjogbnVtYmVyKSB7XG4gIGNvbnN0IGxpbmVJbmRleCA9IGZpbmRDbG9zZXN0TGluZVN0YXJ0UG9zaXRpb24obGluZVN0YXJ0c01hcCwgcG9zaXRpb24pO1xuICByZXR1cm4ge2NoYXJhY3RlcjogcG9zaXRpb24gLSBsaW5lU3RhcnRzTWFwW2xpbmVJbmRleF0sIGxpbmU6IGxpbmVJbmRleH07XG59XG5cbi8qKlxuICogQ29tcHV0ZXMgdGhlIGxpbmUgc3RhcnQgbWFwIG9mIHRoZSBnaXZlbiB0ZXh0LiBUaGlzIGNhbiBiZSB1c2VkIGluIG9yZGVyIHRvXG4gKiByZXRyaWV2ZSB0aGUgbGluZSBhbmQgY2hhcmFjdGVyIG9mIGEgZ2l2ZW4gdGV4dCBwb3NpdGlvbiBpbmRleC5cbiAqL1xuZXhwb3J0IGZ1bmN0aW9uIGNvbXB1dGVMaW5lU3RhcnRzTWFwKHRleHQ6IHN0cmluZyk6IG51bWJlcltdIHtcbiAgY29uc3QgcmVzdWx0OiBudW1iZXJbXSA9IFswXTtcbiAgbGV0IHBvcyA9IDA7XG4gIHdoaWxlIChwb3MgPCB0ZXh0Lmxlbmd0aCkge1xuICAgIGNvbnN0IGNoYXIgPSB0ZXh0LmNoYXJDb2RlQXQocG9zKyspO1xuICAgIC8vIEhhbmRsZXMgdGhlIFwiQ1JMRlwiIGxpbmUgYnJlYWsuIEluIHRoYXQgY2FzZSB3ZSBwZWVrIHRoZSBjaGFyYWN0ZXJcbiAgICAvLyBhZnRlciB0aGUgXCJDUlwiIGFuZCBjaGVjayBpZiBpdCBpcyBhIGxpbmUgZmVlZC5cbiAgICBpZiAoY2hhciA9PT0gQ1JfQ0hBUikge1xuICAgICAgaWYgKHRleHQuY2hhckNvZGVBdChwb3MpID09PSBMRl9DSEFSKSB7XG4gICAgICAgIHBvcysrO1xuICAgICAgfVxuICAgICAgcmVzdWx0LnB1c2gocG9zKTtcbiAgICB9IGVsc2UgaWYgKGNoYXIgPT09IExGX0NIQVIgfHwgY2hhciA9PT0gTElORV9TRVBfQ0hBUiB8fCBjaGFyID09PSBQQVJBR1JBUEhfQ0hBUikge1xuICAgICAgcmVzdWx0LnB1c2gocG9zKTtcbiAgICB9XG4gIH1cbiAgcmVzdWx0LnB1c2gocG9zKTtcbiAgcmV0dXJuIHJlc3VsdDtcbn1cblxuLyoqIEZpbmRzIHRoZSBjbG9zZXN0IGxpbmUgc3RhcnQgZm9yIHRoZSBnaXZlbiBwb3NpdGlvbi4gKi9cbmZ1bmN0aW9uIGZpbmRDbG9zZXN0TGluZVN0YXJ0UG9zaXRpb248VD4oXG4gICAgbGluZXNNYXA6IFRbXSwgcG9zaXRpb246IFQsIGxvdyA9IDAsIGhpZ2ggPSBsaW5lc01hcC5sZW5ndGggLSAxKSB7XG4gIHdoaWxlIChsb3cgPD0gaGlnaCkge1xuICAgIGNvbnN0IHBpdm90SWR4ID0gTWF0aC5mbG9vcigobG93ICsgaGlnaCkgLyAyKTtcbiAgICBjb25zdCBwaXZvdEVsID0gbGluZXNNYXBbcGl2b3RJZHhdO1xuXG4gICAgaWYgKHBpdm90RWwgPT09IHBvc2l0aW9uKSB7XG4gICAgICByZXR1cm4gcGl2b3RJZHg7XG4gICAgfSBlbHNlIGlmIChwb3NpdGlvbiA+IHBpdm90RWwpIHtcbiAgICAgIGxvdyA9IHBpdm90SWR4ICsgMTtcbiAgICB9IGVsc2Uge1xuICAgICAgaGlnaCA9IHBpdm90SWR4IC0gMTtcbiAgICB9XG4gIH1cblxuICAvLyBJbiBjYXNlIHRoZXJlIHdhcyBubyBleGFjdCBtYXRjaCwgcmV0dXJuIHRoZSBjbG9zZXN0IFwibG93ZXJcIiBsaW5lIGluZGV4LiBXZSBhbHNvXG4gIC8vIHN1YnRyYWN0IHRoZSBpbmRleCBieSBvbmUgYmVjYXVzZSB3YW50IHRoZSBpbmRleCBvZiB0aGUgcHJldmlvdXMgbGluZSBzdGFydC5cbiAgcmV0dXJuIGxvdyAtIDE7XG59XG4iXX0=
|