@angular/compiler-cli 12.1.0-next.4 → 12.1.1
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/linker/src/file_linker/partial_linkers/partial_component_linker_1.js +2 -3
- package/linker/src/file_linker/partial_linkers/partial_linker_selector.js +2 -2
- package/linker/src/file_linker/partial_linkers/partial_linker_selector.mjs +2 -2
- package/ngcc/src/host/esm2015_host.js +7 -5
- package/ngcc/src/host/esm2015_host.mjs +6 -4
- package/ngcc/src/host/esm5_host.js +1 -1
- package/ngcc/src/host/esm5_host.mjs +3 -3
- package/ngcc/src/host/ngcc_host.d.ts +3 -2
- package/ngcc/src/host/ngcc_host.js +1 -1
- package/ngcc/src/host/ngcc_host.mjs +1 -1
- package/ngcc/src/host/umd_host.js +2 -2
- package/ngcc/src/host/umd_host.mjs +2 -2
- package/ngcc/src/packages/build_marker.d.ts +1 -1
- package/ngcc/src/packages/build_marker.js +1 -1
- package/ngcc/src/packages/build_marker.mjs +1 -1
- package/ngcc/src/packages/configuration.d.ts +7 -0
- package/ngcc/src/packages/configuration.js +8 -3
- package/ngcc/src/packages/configuration.mjs +8 -3
- package/ngcc/src/packages/entry_point_manifest.js +2 -2
- package/ngcc/src/packages/entry_point_manifest.mjs +2 -2
- package/package.json +4 -4
- package/src/ngtsc/annotations/src/component.d.ts +2 -0
- package/src/ngtsc/annotations/src/component.js +47 -11
- package/src/ngtsc/annotations/src/component.mjs +47 -11
- package/src/ngtsc/core/api/src/public_options.d.ts +12 -0
- package/src/ngtsc/core/api/src/public_options.js +1 -1
- package/src/ngtsc/core/api/src/public_options.mjs +1 -1
- package/src/ngtsc/core/index.js +1 -1
- package/src/ngtsc/core/index.mjs +1 -1
- package/src/ngtsc/core/src/compiler.d.ts +5 -1
- package/src/ngtsc/core/src/compiler.js +11 -17
- package/src/ngtsc/core/src/compiler.mjs +10 -15
- package/src/ngtsc/cycles/src/imports.js +7 -1
- package/src/ngtsc/cycles/src/imports.mjs +7 -1
- package/src/ngtsc/diagnostics/src/error_code.d.ts +5 -0
- package/src/ngtsc/diagnostics/src/error_code.js +7 -1
- package/src/ngtsc/diagnostics/src/error_code.mjs +7 -1
- package/src/ngtsc/imports/src/find_export.js +4 -1
- package/src/ngtsc/imports/src/find_export.mjs +4 -1
- package/src/ngtsc/incremental/src/incremental.js +7 -3
- package/src/ngtsc/incremental/src/incremental.mjs +7 -3
- package/src/ngtsc/incremental/src/state.d.ts +5 -3
- package/src/ngtsc/incremental/src/state.js +1 -1
- package/src/ngtsc/incremental/src/state.mjs +1 -1
- package/src/ngtsc/metadata/src/dts.js +2 -3
- package/src/ngtsc/metadata/src/inheritance.js +2 -7
- package/src/ngtsc/partial_evaluator/src/diagnostics.js +4 -1
- package/src/ngtsc/partial_evaluator/src/diagnostics.mjs +4 -1
- package/src/ngtsc/partial_evaluator/src/dynamic.d.ts +19 -1
- package/src/ngtsc/partial_evaluator/src/dynamic.js +12 -4
- package/src/ngtsc/partial_evaluator/src/dynamic.mjs +12 -4
- package/src/ngtsc/partial_evaluator/src/interpreter.d.ts +2 -0
- package/src/ngtsc/partial_evaluator/src/interpreter.js +48 -1
- package/src/ngtsc/partial_evaluator/src/interpreter.mjs +37 -1
- package/src/ngtsc/program.d.ts +1 -0
- package/src/ngtsc/program.js +26 -2
- package/src/ngtsc/program.mjs +26 -2
- package/src/ngtsc/reflection/src/typescript.js +2 -2
- package/src/ngtsc/reflection/src/typescript.mjs +2 -2
- package/src/ngtsc/scope/index.js +1 -1
- package/src/ngtsc/scope/index.mjs +1 -1
- package/src/ngtsc/scope/src/api.js +1 -1
- package/src/ngtsc/scope/src/api.mjs +1 -1
- package/src/ngtsc/scope/src/dependency.js +4 -1
- package/src/ngtsc/scope/src/dependency.mjs +4 -1
- package/src/ngtsc/transform/index.d.ts +1 -1
- package/src/ngtsc/transform/index.js +2 -3
- package/src/ngtsc/transform/index.mjs +2 -2
- package/src/ngtsc/transform/src/api.d.ts +6 -0
- package/src/ngtsc/transform/src/api.js +1 -1
- package/src/ngtsc/transform/src/api.mjs +1 -1
- package/src/ngtsc/transform/src/compilation.d.ts +3 -0
- package/src/ngtsc/transform/src/compilation.js +124 -53
- package/src/ngtsc/transform/src/compilation.mjs +30 -1
- package/src/ngtsc/transform/src/declaration.d.ts +0 -8
- package/src/ngtsc/transform/src/declaration.js +2 -53
- package/src/ngtsc/transform/src/declaration.mjs +1 -50
- package/src/ngtsc/translator/src/typescript_ast_factory.d.ts +1 -1
- package/src/ngtsc/typecheck/api/scope.d.ts +2 -1
- package/src/ngtsc/typecheck/api/scope.js +1 -1
- package/src/ngtsc/typecheck/api/scope.mjs +1 -1
- package/src/ngtsc/typecheck/api/symbols.d.ts +2 -1
- package/src/ngtsc/typecheck/api/symbols.js +1 -1
- package/src/ngtsc/typecheck/api/symbols.mjs +1 -1
- package/src/ngtsc/typecheck/src/checker.js +2 -2
- package/src/ngtsc/typecheck/src/checker.mjs +3 -3
- package/src/ngtsc/typecheck/src/expression.js +32 -4
- package/src/ngtsc/typecheck/src/expression.mjs +33 -5
- package/src/ngtsc/typecheck/src/template_symbol_builder.js +24 -10
- package/src/ngtsc/typecheck/src/template_symbol_builder.mjs +25 -10
- package/src/ngtsc/typecheck/src/type_emitter.d.ts +2 -1
- package/src/ngtsc/typecheck/src/type_emitter.js +35 -48
- package/src/ngtsc/typecheck/src/type_emitter.mjs +35 -48
- package/src/ngtsc/typecheck/src/type_parameter_emitter.d.ts +2 -0
- package/src/ngtsc/typecheck/src/type_parameter_emitter.js +21 -7
- package/src/ngtsc/typecheck/src/type_parameter_emitter.mjs +19 -6
- package/src/ngtsc/util/src/typescript.d.ts +8 -0
- package/src/ngtsc/util/src/typescript.js +10 -2
- package/src/ngtsc/util/src/typescript.mjs +8 -1
- package/src/ngtsc/{modulewithproviders → xi18n}/index.d.ts +2 -2
- package/src/ngtsc/{modulewithproviders → xi18n}/index.js +3 -3
- package/src/ngtsc/xi18n/index.mjs +9 -0
- package/src/ngtsc/xi18n/src/context.d.ts +26 -0
- package/src/ngtsc/xi18n/src/context.js +20 -0
- package/src/ngtsc/xi18n/src/context.mjs +9 -0
- package/src/ngtsc/{modulewithproviders/modulewithproviders.externs.js → xi18n/xi18n.externs.js} +0 -0
- package/src/transformers/api.d.ts +0 -3
- package/src/transformers/api.js +1 -1
- package/src/transformers/api.mjs +1 -1
- package/src/transformers/i18n.d.ts +14 -0
- package/src/transformers/i18n.js +76 -0
- package/src/transformers/i18n.mjs +59 -0
- package/src/transformers/program.d.ts +0 -4
- package/src/transformers/program.js +5 -56
- package/src/transformers/program.mjs +3 -51
- package/src/typescript_support.js +2 -2
- package/src/typescript_support.mjs +2 -2
- package/src/version.js +1 -1
- package/src/version.mjs +1 -1
- package/src/ngtsc/modulewithproviders/index.mjs +0 -9
- package/src/ngtsc/modulewithproviders/src/scanner.d.ts +0 -26
- package/src/ngtsc/modulewithproviders/src/scanner.js +0 -180
- package/src/ngtsc/modulewithproviders/src/scanner.mjs +0 -142
|
@@ -23,7 +23,7 @@ const MIN_TS_VERSION = '4.2.3';
|
|
|
23
23
|
* Note: this check is disabled in g3, search for
|
|
24
24
|
* `angularCompilerOptions.disableTypeScriptVersionCheck` config param value in g3.
|
|
25
25
|
*/
|
|
26
|
-
const MAX_TS_VERSION = '4.
|
|
26
|
+
const MAX_TS_VERSION = '4.4.0';
|
|
27
27
|
/**
|
|
28
28
|
* The currently used version of TypeScript, which can be adjusted for testing purposes using
|
|
29
29
|
* `setTypeScriptVersionForTesting` and `restoreTypeScriptVersionForTesting` below.
|
|
@@ -54,4 +54,4 @@ export function checkVersion(version, minVersion, maxVersion) {
|
|
|
54
54
|
export function verifySupportedTypeScriptVersion() {
|
|
55
55
|
checkVersion(tsVersion, MIN_TS_VERSION, MAX_TS_VERSION);
|
|
56
56
|
}
|
|
57
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXNjcmlwdF9zdXBwb3J0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvY29tcGlsZXItY2xpL3NyYy90eXBlc2NyaXB0X3N1cHBvcnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7OztHQU1HO0FBQ0gsT0FBTyxLQUFLLEVBQUUsTUFBTSxZQUFZLENBQUM7QUFDakMsT0FBTyxFQUFDLGVBQWUsRUFBQyxNQUFNLGtDQUFrQyxDQUFDO0FBRWpFOzs7Ozs7R0FNRztBQUNILE1BQU0sY0FBYyxHQUFHLE9BQU8sQ0FBQztBQUUvQjs7Ozs7OztHQU9HO0FBQ0gsTUFBTSxjQUFjLEdBQUcsT0FBTyxDQUFDO0FBRS9COzs7R0FHRztBQUNILElBQUksU0FBUyxHQUFHLEVBQUUsQ0FBQyxPQUFPLENBQUM7QUFFM0IsTUFBTSxVQUFVLDhCQUE4QixDQUFDLE9BQWU7SUFDNUQsU0FBUyxHQUFHLE9BQU8sQ0FBQztBQUN0QixDQUFDO0FBRUQsTUFBTSxVQUFVLGtDQUFrQztJQUNoRCxTQUFTLEdBQUcsRUFBRSxDQUFDLE9BQU8sQ0FBQztBQUN6QixDQUFDO0FBRUQ7Ozs7Ozs7Ozs7R0FVRztBQUNILE1BQU0sVUFBVSxZQUFZLENBQUMsT0FBZSxFQUFFLFVBQWtCLEVBQUUsVUFBa0I7SUFDbEYsSUFBSSxDQUFDLGVBQWUsQ0FBQyxPQUFPLEVBQUUsVUFBVSxDQUFDLEdBQUcsQ0FBQyxJQUFJLGVBQWUsQ0FBQyxPQUFPLEVBQUUsVUFBVSxDQUFDLElBQUksQ0FBQyxDQUFDLEVBQUU7UUFDM0YsTUFBTSxJQUFJLEtBQUssQ0FBQyw4Q0FBOEMsVUFBVSxTQUNwRSxVQUFVLFFBQVEsT0FBTyxxQkFBcUIsQ0FBQyxDQUFDO0tBQ3JEO0FBQ0gsQ0FBQztBQUVELE1BQU0sVUFBVSxnQ0FBZ0M7SUFDOUMsWUFBWSxDQUFDLFNBQVMsRUFBRSxjQUFjLEVBQUUsY0FBYyxDQUFDLENBQUM7QUFDMUQsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogQGxpY2Vuc2VcbiAqIENvcHlyaWdodCBHb29nbGUgTExDIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogVXNlIG9mIHRoaXMgc291cmNlIGNvZGUgaXMgZ292ZXJuZWQgYnkgYW4gTUlULXN0eWxlIGxpY2Vuc2UgdGhhdCBjYW4gYmVcbiAqIGZvdW5kIGluIHRoZSBMSUNFTlNFIGZpbGUgYXQgaHR0cHM6Ly9hbmd1bGFyLmlvL2xpY2Vuc2VcbiAqL1xuaW1wb3J0ICogYXMgdHMgZnJvbSAndHlwZXNjcmlwdCc7XG5pbXBvcnQge2NvbXBhcmVWZXJzaW9uc30gZnJvbSAnLi9kaWFnbm9zdGljcy90eXBlc2NyaXB0X3ZlcnNpb24nO1xuXG4vKipcbiAqIE1pbmltdW0gc3VwcG9ydGVkIFR5cGVTY3JpcHQgdmVyc2lvblxuICog4oiAIHN1cHBvcnRlZCB0eXBlc2NyaXB0IHZlcnNpb24gdiwgdiA+
|
|
57
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXNjcmlwdF9zdXBwb3J0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvY29tcGlsZXItY2xpL3NyYy90eXBlc2NyaXB0X3N1cHBvcnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7OztHQU1HO0FBQ0gsT0FBTyxLQUFLLEVBQUUsTUFBTSxZQUFZLENBQUM7QUFDakMsT0FBTyxFQUFDLGVBQWUsRUFBQyxNQUFNLGtDQUFrQyxDQUFDO0FBRWpFOzs7Ozs7R0FNRztBQUNILE1BQU0sY0FBYyxHQUFHLE9BQU8sQ0FBQztBQUUvQjs7Ozs7OztHQU9HO0FBQ0gsTUFBTSxjQUFjLEdBQUcsT0FBTyxDQUFDO0FBRS9COzs7R0FHRztBQUNILElBQUksU0FBUyxHQUFHLEVBQUUsQ0FBQyxPQUFPLENBQUM7QUFFM0IsTUFBTSxVQUFVLDhCQUE4QixDQUFDLE9BQWU7SUFDNUQsU0FBUyxHQUFHLE9BQU8sQ0FBQztBQUN0QixDQUFDO0FBRUQsTUFBTSxVQUFVLGtDQUFrQztJQUNoRCxTQUFTLEdBQUcsRUFBRSxDQUFDLE9BQU8sQ0FBQztBQUN6QixDQUFDO0FBRUQ7Ozs7Ozs7Ozs7R0FVRztBQUNILE1BQU0sVUFBVSxZQUFZLENBQUMsT0FBZSxFQUFFLFVBQWtCLEVBQUUsVUFBa0I7SUFDbEYsSUFBSSxDQUFDLGVBQWUsQ0FBQyxPQUFPLEVBQUUsVUFBVSxDQUFDLEdBQUcsQ0FBQyxJQUFJLGVBQWUsQ0FBQyxPQUFPLEVBQUUsVUFBVSxDQUFDLElBQUksQ0FBQyxDQUFDLEVBQUU7UUFDM0YsTUFBTSxJQUFJLEtBQUssQ0FBQyw4Q0FBOEMsVUFBVSxTQUNwRSxVQUFVLFFBQVEsT0FBTyxxQkFBcUIsQ0FBQyxDQUFDO0tBQ3JEO0FBQ0gsQ0FBQztBQUVELE1BQU0sVUFBVSxnQ0FBZ0M7SUFDOUMsWUFBWSxDQUFDLFNBQVMsRUFBRSxjQUFjLEVBQUUsY0FBYyxDQUFDLENBQUM7QUFDMUQsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogQGxpY2Vuc2VcbiAqIENvcHlyaWdodCBHb29nbGUgTExDIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogVXNlIG9mIHRoaXMgc291cmNlIGNvZGUgaXMgZ292ZXJuZWQgYnkgYW4gTUlULXN0eWxlIGxpY2Vuc2UgdGhhdCBjYW4gYmVcbiAqIGZvdW5kIGluIHRoZSBMSUNFTlNFIGZpbGUgYXQgaHR0cHM6Ly9hbmd1bGFyLmlvL2xpY2Vuc2VcbiAqL1xuaW1wb3J0ICogYXMgdHMgZnJvbSAndHlwZXNjcmlwdCc7XG5pbXBvcnQge2NvbXBhcmVWZXJzaW9uc30gZnJvbSAnLi9kaWFnbm9zdGljcy90eXBlc2NyaXB0X3ZlcnNpb24nO1xuXG4vKipcbiAqIE1pbmltdW0gc3VwcG9ydGVkIFR5cGVTY3JpcHQgdmVyc2lvblxuICog4oiAIHN1cHBvcnRlZCB0eXBlc2NyaXB0IHZlcnNpb24gdiwgdiA+PSBNSU5fVFNfVkVSU0lPTlxuICpcbiAqIE5vdGU6IHRoaXMgY2hlY2sgaXMgZGlzYWJsZWQgaW4gZzMsIHNlYXJjaCBmb3JcbiAqIGBhbmd1bGFyQ29tcGlsZXJPcHRpb25zLmRpc2FibGVUeXBlU2NyaXB0VmVyc2lvbkNoZWNrYCBjb25maWcgcGFyYW0gdmFsdWUgaW4gZzMuXG4gKi9cbmNvbnN0IE1JTl9UU19WRVJTSU9OID0gJzQuMi4zJztcblxuLyoqXG4gKiBTdXByZW11bSBvZiBzdXBwb3J0ZWQgVHlwZVNjcmlwdCB2ZXJzaW9uc1xuICog4oiAIHN1cHBvcnRlZCB0eXBlc2NyaXB0IHZlcnNpb24gdiwgdiA8IE1BWF9UU19WRVJTSU9OXG4gKiBNQVhfVFNfVkVSU0lPTiBpcyBub3QgY29uc2lkZXJlZCBhcyBhIHN1cHBvcnRlZCBUeXBlU2NyaXB0IHZlcnNpb25cbiAqXG4gKiBOb3RlOiB0aGlzIGNoZWNrIGlzIGRpc2FibGVkIGluIGczLCBzZWFyY2ggZm9yXG4gKiBgYW5ndWxhckNvbXBpbGVyT3B0aW9ucy5kaXNhYmxlVHlwZVNjcmlwdFZlcnNpb25DaGVja2AgY29uZmlnIHBhcmFtIHZhbHVlIGluIGczLlxuICovXG5jb25zdCBNQVhfVFNfVkVSU0lPTiA9ICc0LjQuMCc7XG5cbi8qKlxuICogVGhlIGN1cnJlbnRseSB1c2VkIHZlcnNpb24gb2YgVHlwZVNjcmlwdCwgd2hpY2ggY2FuIGJlIGFkanVzdGVkIGZvciB0ZXN0aW5nIHB1cnBvc2VzIHVzaW5nXG4gKiBgc2V0VHlwZVNjcmlwdFZlcnNpb25Gb3JUZXN0aW5nYCBhbmQgYHJlc3RvcmVUeXBlU2NyaXB0VmVyc2lvbkZvclRlc3RpbmdgIGJlbG93LlxuICovXG5sZXQgdHNWZXJzaW9uID0gdHMudmVyc2lvbjtcblxuZXhwb3J0IGZ1bmN0aW9uIHNldFR5cGVTY3JpcHRWZXJzaW9uRm9yVGVzdGluZyh2ZXJzaW9uOiBzdHJpbmcpOiB2b2lkIHtcbiAgdHNWZXJzaW9uID0gdmVyc2lvbjtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIHJlc3RvcmVUeXBlU2NyaXB0VmVyc2lvbkZvclRlc3RpbmcoKTogdm9pZCB7XG4gIHRzVmVyc2lvbiA9IHRzLnZlcnNpb247XG59XG5cbi8qKlxuICogQ2hlY2tzIHdoZXRoZXIgYSBnaXZlbiB2ZXJzaW9uIOKIiCBbbWluVmVyc2lvbiwgbWF4VmVyc2lvblsuXG4gKiBBbiBlcnJvciB3aWxsIGJlIHRocm93biB3aGVuIHRoZSBnaXZlbiB2ZXJzaW9uIOKIiSBbbWluVmVyc2lvbiwgbWF4VmVyc2lvblsuXG4gKlxuICogQHBhcmFtIHZlcnNpb24gVGhlIHZlcnNpb24gb24gd2hpY2ggdGhlIGNoZWNrIHdpbGwgYmUgcGVyZm9ybWVkXG4gKiBAcGFyYW0gbWluVmVyc2lvbiBUaGUgbG93ZXIgYm91bmQgdmVyc2lvbi4gQSB2YWxpZCB2ZXJzaW9uIG5lZWRzIHRvIGJlIGdyZWF0ZXIgdGhhbiBtaW5WZXJzaW9uXG4gKiBAcGFyYW0gbWF4VmVyc2lvbiBUaGUgdXBwZXIgYm91bmQgdmVyc2lvbi4gQSB2YWxpZCB2ZXJzaW9uIG5lZWRzIHRvIGJlIHN0cmljdGx5IGxlc3MgdGhhblxuICogbWF4VmVyc2lvblxuICpcbiAqIEB0aHJvd3MgV2lsbCB0aHJvdyBhbiBlcnJvciBpZiB0aGUgZ2l2ZW4gdmVyc2lvbiDiiIkgW21pblZlcnNpb24sIG1heFZlcnNpb25bXG4gKi9cbmV4cG9ydCBmdW5jdGlvbiBjaGVja1ZlcnNpb24odmVyc2lvbjogc3RyaW5nLCBtaW5WZXJzaW9uOiBzdHJpbmcsIG1heFZlcnNpb246IHN0cmluZykge1xuICBpZiAoKGNvbXBhcmVWZXJzaW9ucyh2ZXJzaW9uLCBtaW5WZXJzaW9uKSA8IDAgfHwgY29tcGFyZVZlcnNpb25zKHZlcnNpb24sIG1heFZlcnNpb24pID49IDApKSB7XG4gICAgdGhyb3cgbmV3IEVycm9yKGBUaGUgQW5ndWxhciBDb21waWxlciByZXF1aXJlcyBUeXBlU2NyaXB0ID49JHttaW5WZXJzaW9ufSBhbmQgPCR7XG4gICAgICAgIG1heFZlcnNpb259IGJ1dCAke3ZlcnNpb259IHdhcyBmb3VuZCBpbnN0ZWFkLmApO1xuICB9XG59XG5cbmV4cG9ydCBmdW5jdGlvbiB2ZXJpZnlTdXBwb3J0ZWRUeXBlU2NyaXB0VmVyc2lvbigpOiB2b2lkIHtcbiAgY2hlY2tWZXJzaW9uKHRzVmVyc2lvbiwgTUlOX1RTX1ZFUlNJT04sIE1BWF9UU19WRVJTSU9OKTtcbn1cbiJdfQ==
|
package/src/version.js
CHANGED
|
@@ -23,6 +23,6 @@
|
|
|
23
23
|
* Entry point for all public APIs of the compiler-cli package.
|
|
24
24
|
*/
|
|
25
25
|
var compiler_1 = require("@angular/compiler");
|
|
26
|
-
exports.VERSION = new compiler_1.Version('12.1.
|
|
26
|
+
exports.VERSION = new compiler_1.Version('12.1.1');
|
|
27
27
|
});
|
|
28
28
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2NvbXBpbGVyLWNsaS9zcmMvdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7O0dBTUc7Ozs7Ozs7Ozs7Ozs7SUFFSDs7OztPQUlHO0lBRUgsOENBQTBDO0lBRTdCLFFBQUEsT0FBTyxHQUFHLElBQUksa0JBQU8sQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBMTEMgQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5cbi8qKlxuICogQG1vZHVsZVxuICogQGRlc2NyaXB0aW9uXG4gKiBFbnRyeSBwb2ludCBmb3IgYWxsIHB1YmxpYyBBUElzIG9mIHRoZSBjb21waWxlci1jbGkgcGFja2FnZS5cbiAqL1xuXG5pbXBvcnQge1ZlcnNpb259IGZyb20gJ0Bhbmd1bGFyL2NvbXBpbGVyJztcblxuZXhwb3J0IGNvbnN0IFZFUlNJT04gPSBuZXcgVmVyc2lvbignMC4wLjAtUExBQ0VIT0xERVInKTtcbiJdfQ==
|
package/src/version.mjs
CHANGED
|
@@ -11,5 +11,5 @@
|
|
|
11
11
|
* Entry point for all public APIs of the compiler-cli package.
|
|
12
12
|
*/
|
|
13
13
|
import { Version } from '@angular/compiler';
|
|
14
|
-
export const VERSION = new Version('12.1.
|
|
14
|
+
export const VERSION = new Version('12.1.1');
|
|
15
15
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2NvbXBpbGVyLWNsaS9zcmMvdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7O0dBTUc7QUFFSDs7OztHQUlHO0FBRUgsT0FBTyxFQUFDLE9BQU8sRUFBQyxNQUFNLG1CQUFtQixDQUFDO0FBRTFDLE1BQU0sQ0FBQyxNQUFNLE9BQU8sR0FBRyxJQUFJLE9BQU8sQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBMTEMgQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5cbi8qKlxuICogQG1vZHVsZVxuICogQGRlc2NyaXB0aW9uXG4gKiBFbnRyeSBwb2ludCBmb3IgYWxsIHB1YmxpYyBBUElzIG9mIHRoZSBjb21waWxlci1jbGkgcGFja2FnZS5cbiAqL1xuXG5pbXBvcnQge1ZlcnNpb259IGZyb20gJ0Bhbmd1bGFyL2NvbXBpbGVyJztcblxuZXhwb3J0IGNvbnN0IFZFUlNJT04gPSBuZXcgVmVyc2lvbignMC4wLjAtUExBQ0VIT0xERVInKTtcbiJdfQ==
|
|
@@ -1,9 +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
|
-
export * from './src/scanner';
|
|
9
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9jb21waWxlci1jbGkvc3JjL25ndHNjL21vZHVsZXdpdGhwcm92aWRlcnMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7OztHQU1HO0FBRUgsY0FBYyxlQUFlLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqIEBsaWNlbnNlXG4gKiBDb3B5cmlnaHQgR29vZ2xlIExMQyBBbGwgUmlnaHRzIFJlc2VydmVkLlxuICpcbiAqIFVzZSBvZiB0aGlzIHNvdXJjZSBjb2RlIGlzIGdvdmVybmVkIGJ5IGFuIE1JVC1zdHlsZSBsaWNlbnNlIHRoYXQgY2FuIGJlXG4gKiBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlIGF0IGh0dHBzOi8vYW5ndWxhci5pby9saWNlbnNlXG4gKi9cblxuZXhwb3J0ICogZnJvbSAnLi9zcmMvc2Nhbm5lcic7XG4iXX0=
|
|
@@ -1,26 +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
|
-
/// <amd-module name="@angular/compiler-cli/src/ngtsc/modulewithproviders/src/scanner" />
|
|
9
|
-
import { Type } from '@angular/compiler';
|
|
10
|
-
import * as ts from 'typescript';
|
|
11
|
-
import { ReferenceEmitter } from '../../imports';
|
|
12
|
-
import { PartialEvaluator } from '../../partial_evaluator';
|
|
13
|
-
import { ReflectionHost } from '../../reflection';
|
|
14
|
-
export interface DtsHandler {
|
|
15
|
-
addTypeReplacement(node: ts.Declaration, type: Type): void;
|
|
16
|
-
}
|
|
17
|
-
export declare class ModuleWithProvidersScanner {
|
|
18
|
-
private host;
|
|
19
|
-
private evaluator;
|
|
20
|
-
private emitter;
|
|
21
|
-
constructor(host: ReflectionHost, evaluator: PartialEvaluator, emitter: ReferenceEmitter);
|
|
22
|
-
scan(sf: ts.SourceFile, dts: DtsHandler): void;
|
|
23
|
-
private visitStatement;
|
|
24
|
-
private visitFunctionOrMethodDeclaration;
|
|
25
|
-
private returnTypeOf;
|
|
26
|
-
}
|
|
@@ -1,180 +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
|
-
(function (factory) {
|
|
9
|
-
if (typeof module === "object" && typeof module.exports === "object") {
|
|
10
|
-
var v = factory(require, exports);
|
|
11
|
-
if (v !== undefined) module.exports = v;
|
|
12
|
-
}
|
|
13
|
-
else if (typeof define === "function" && define.amd) {
|
|
14
|
-
define("@angular/compiler-cli/src/ngtsc/modulewithproviders/src/scanner", ["require", "exports", "tslib", "@angular/compiler", "typescript", "@angular/compiler-cli/src/ngtsc/imports"], factory);
|
|
15
|
-
}
|
|
16
|
-
})(function (require, exports) {
|
|
17
|
-
"use strict";
|
|
18
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
19
|
-
exports.ModuleWithProvidersScanner = void 0;
|
|
20
|
-
var tslib_1 = require("tslib");
|
|
21
|
-
var compiler_1 = require("@angular/compiler");
|
|
22
|
-
var ts = require("typescript");
|
|
23
|
-
var imports_1 = require("@angular/compiler-cli/src/ngtsc/imports");
|
|
24
|
-
var ModuleWithProvidersScanner = /** @class */ (function () {
|
|
25
|
-
function ModuleWithProvidersScanner(host, evaluator, emitter) {
|
|
26
|
-
this.host = host;
|
|
27
|
-
this.evaluator = evaluator;
|
|
28
|
-
this.emitter = emitter;
|
|
29
|
-
}
|
|
30
|
-
ModuleWithProvidersScanner.prototype.scan = function (sf, dts) {
|
|
31
|
-
var e_1, _a;
|
|
32
|
-
try {
|
|
33
|
-
for (var _b = tslib_1.__values(sf.statements), _c = _b.next(); !_c.done; _c = _b.next()) {
|
|
34
|
-
var stmt = _c.value;
|
|
35
|
-
this.visitStatement(dts, stmt);
|
|
36
|
-
}
|
|
37
|
-
}
|
|
38
|
-
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
39
|
-
finally {
|
|
40
|
-
try {
|
|
41
|
-
if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
|
|
42
|
-
}
|
|
43
|
-
finally { if (e_1) throw e_1.error; }
|
|
44
|
-
}
|
|
45
|
-
};
|
|
46
|
-
ModuleWithProvidersScanner.prototype.visitStatement = function (dts, stmt) {
|
|
47
|
-
var e_2, _a;
|
|
48
|
-
// Detect whether a statement is exported, which is used as one of the hints whether to look
|
|
49
|
-
// more closely at possible MWP functions within. This is a syntactic check, not a semantic
|
|
50
|
-
// check, so it won't detect cases like:
|
|
51
|
-
//
|
|
52
|
-
// var X = ...;
|
|
53
|
-
// export {X}
|
|
54
|
-
//
|
|
55
|
-
// This is intentional, because the alternative is slow and this will catch 99% of the cases we
|
|
56
|
-
// need to handle.
|
|
57
|
-
var isExported = stmt.modifiers !== undefined &&
|
|
58
|
-
stmt.modifiers.some(function (mod) { return mod.kind === ts.SyntaxKind.ExportKeyword; });
|
|
59
|
-
if (!isExported) {
|
|
60
|
-
return;
|
|
61
|
-
}
|
|
62
|
-
if (ts.isClassDeclaration(stmt)) {
|
|
63
|
-
try {
|
|
64
|
-
for (var _b = tslib_1.__values(stmt.members), _c = _b.next(); !_c.done; _c = _b.next()) {
|
|
65
|
-
var member = _c.value;
|
|
66
|
-
if (!ts.isMethodDeclaration(member) || !isStatic(member)) {
|
|
67
|
-
continue;
|
|
68
|
-
}
|
|
69
|
-
this.visitFunctionOrMethodDeclaration(dts, member);
|
|
70
|
-
}
|
|
71
|
-
}
|
|
72
|
-
catch (e_2_1) { e_2 = { error: e_2_1 }; }
|
|
73
|
-
finally {
|
|
74
|
-
try {
|
|
75
|
-
if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
|
|
76
|
-
}
|
|
77
|
-
finally { if (e_2) throw e_2.error; }
|
|
78
|
-
}
|
|
79
|
-
}
|
|
80
|
-
else if (ts.isFunctionDeclaration(stmt)) {
|
|
81
|
-
this.visitFunctionOrMethodDeclaration(dts, stmt);
|
|
82
|
-
}
|
|
83
|
-
};
|
|
84
|
-
ModuleWithProvidersScanner.prototype.visitFunctionOrMethodDeclaration = function (dts, decl) {
|
|
85
|
-
// First, some sanity. This should have a method body with a single return statement.
|
|
86
|
-
if (decl.body === undefined || decl.body.statements.length !== 1) {
|
|
87
|
-
return;
|
|
88
|
-
}
|
|
89
|
-
var retStmt = decl.body.statements[0];
|
|
90
|
-
if (!ts.isReturnStatement(retStmt) || retStmt.expression === undefined) {
|
|
91
|
-
return;
|
|
92
|
-
}
|
|
93
|
-
var retValue = retStmt.expression;
|
|
94
|
-
// Now, look at the return type of the method. Maybe bail if the type is already marked, or if
|
|
95
|
-
// it's incompatible with a MWP function.
|
|
96
|
-
var returnType = this.returnTypeOf(decl);
|
|
97
|
-
if (returnType === ReturnType.OTHER || returnType === ReturnType.MWP_WITH_TYPE) {
|
|
98
|
-
// Don't process this declaration, it either already declares the right return type, or an
|
|
99
|
-
// incompatible one.
|
|
100
|
-
return;
|
|
101
|
-
}
|
|
102
|
-
var value = this.evaluator.evaluate(retValue);
|
|
103
|
-
if (!(value instanceof Map) || !value.has('ngModule')) {
|
|
104
|
-
// The return value does not provide sufficient information to be able to add a generic type.
|
|
105
|
-
return;
|
|
106
|
-
}
|
|
107
|
-
if (returnType === ReturnType.INFERRED && !isModuleWithProvidersType(value)) {
|
|
108
|
-
// The return type is inferred but the returned object is not of the correct shape, so we
|
|
109
|
-
// shouldn's modify the return type to become `ModuleWithProviders`.
|
|
110
|
-
return;
|
|
111
|
-
}
|
|
112
|
-
// The return type has been verified to represent the `ModuleWithProviders` type, but either the
|
|
113
|
-
// return type is inferred or the generic type argument is missing. In both cases, a new return
|
|
114
|
-
// type is created where the `ngModule` type is included as generic type argument.
|
|
115
|
-
var ngModule = value.get('ngModule');
|
|
116
|
-
if (!(ngModule instanceof imports_1.Reference) || !ts.isClassDeclaration(ngModule.node)) {
|
|
117
|
-
return;
|
|
118
|
-
}
|
|
119
|
-
var ngModuleExpr = this.emitter.emit(ngModule, decl.getSourceFile(), imports_1.ImportFlags.ForceNewImport);
|
|
120
|
-
var ngModuleType = new compiler_1.ExpressionType(ngModuleExpr.expression);
|
|
121
|
-
var mwpNgType = new compiler_1.ExpressionType(new compiler_1.ExternalExpr(compiler_1.R3Identifiers.ModuleWithProviders), [ /* modifiers */], [ngModuleType]);
|
|
122
|
-
dts.addTypeReplacement(decl, mwpNgType);
|
|
123
|
-
};
|
|
124
|
-
ModuleWithProvidersScanner.prototype.returnTypeOf = function (decl) {
|
|
125
|
-
if (decl.type === undefined) {
|
|
126
|
-
return ReturnType.INFERRED;
|
|
127
|
-
}
|
|
128
|
-
else if (!ts.isTypeReferenceNode(decl.type)) {
|
|
129
|
-
return ReturnType.OTHER;
|
|
130
|
-
}
|
|
131
|
-
// Try to figure out if the type is of a familiar form, something that looks like it was
|
|
132
|
-
// imported.
|
|
133
|
-
var typeId;
|
|
134
|
-
if (ts.isIdentifier(decl.type.typeName)) {
|
|
135
|
-
// def: ModuleWithProviders
|
|
136
|
-
typeId = decl.type.typeName;
|
|
137
|
-
}
|
|
138
|
-
else if (ts.isQualifiedName(decl.type.typeName) && ts.isIdentifier(decl.type.typeName.left)) {
|
|
139
|
-
// def: i0.ModuleWithProviders
|
|
140
|
-
typeId = decl.type.typeName.right;
|
|
141
|
-
}
|
|
142
|
-
else {
|
|
143
|
-
return ReturnType.OTHER;
|
|
144
|
-
}
|
|
145
|
-
var importDecl = this.host.getImportOfIdentifier(typeId);
|
|
146
|
-
if (importDecl === null || importDecl.from !== '@angular/core' ||
|
|
147
|
-
importDecl.name !== 'ModuleWithProviders') {
|
|
148
|
-
return ReturnType.OTHER;
|
|
149
|
-
}
|
|
150
|
-
if (decl.type.typeArguments === undefined || decl.type.typeArguments.length === 0) {
|
|
151
|
-
// The return type is indeed ModuleWithProviders, but no generic type parameter was found.
|
|
152
|
-
return ReturnType.MWP_NO_TYPE;
|
|
153
|
-
}
|
|
154
|
-
else {
|
|
155
|
-
// The return type is ModuleWithProviders, and the user has already specified a generic type.
|
|
156
|
-
return ReturnType.MWP_WITH_TYPE;
|
|
157
|
-
}
|
|
158
|
-
};
|
|
159
|
-
return ModuleWithProvidersScanner;
|
|
160
|
-
}());
|
|
161
|
-
exports.ModuleWithProvidersScanner = ModuleWithProvidersScanner;
|
|
162
|
-
var ReturnType;
|
|
163
|
-
(function (ReturnType) {
|
|
164
|
-
ReturnType[ReturnType["INFERRED"] = 0] = "INFERRED";
|
|
165
|
-
ReturnType[ReturnType["MWP_NO_TYPE"] = 1] = "MWP_NO_TYPE";
|
|
166
|
-
ReturnType[ReturnType["MWP_WITH_TYPE"] = 2] = "MWP_WITH_TYPE";
|
|
167
|
-
ReturnType[ReturnType["OTHER"] = 3] = "OTHER";
|
|
168
|
-
})(ReturnType || (ReturnType = {}));
|
|
169
|
-
/** Whether the resolved value map represents a ModuleWithProviders object */
|
|
170
|
-
function isModuleWithProvidersType(value) {
|
|
171
|
-
var ngModule = value.has('ngModule');
|
|
172
|
-
var providers = value.has('providers');
|
|
173
|
-
return ngModule && (value.size === 1 || (providers && value.size === 2));
|
|
174
|
-
}
|
|
175
|
-
function isStatic(node) {
|
|
176
|
-
return node.modifiers !== undefined &&
|
|
177
|
-
node.modifiers.some(function (mod) { return mod.kind === ts.SyntaxKind.StaticKeyword; });
|
|
178
|
-
}
|
|
179
|
-
});
|
|
180
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"scanner.js","sourceRoot":"","sources":["../../../../../../../../../packages/compiler-cli/src/ngtsc/modulewithproviders/src/scanner.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 {ExpressionType, ExternalExpr, R3Identifiers as Identifiers, Type} from '@angular/compiler';\nimport * as ts from 'typescript';\n\nimport {ImportFlags, Reference, ReferenceEmitter} from '../../imports';\nimport {PartialEvaluator, ResolvedValueMap} from '../../partial_evaluator';\nimport {ReflectionHost} from '../../reflection';\n\nexport interface DtsHandler {\n  addTypeReplacement(node: ts.Declaration, type: Type): void;\n}\n\nexport class ModuleWithProvidersScanner {\n  constructor(\n      private host: ReflectionHost, private evaluator: PartialEvaluator,\n      private emitter: ReferenceEmitter) {}\n\n  scan(sf: ts.SourceFile, dts: DtsHandler): void {\n    for (const stmt of sf.statements) {\n      this.visitStatement(dts, stmt);\n    }\n  }\n\n  private visitStatement(dts: DtsHandler, stmt: ts.Statement): void {\n    // Detect whether a statement is exported, which is used as one of the hints whether to look\n    // more closely at possible MWP functions within. This is a syntactic check, not a semantic\n    // check, so it won't detect cases like:\n    //\n    // var X = ...;\n    // export {X}\n    //\n    // This is intentional, because the alternative is slow and this will catch 99% of the cases we\n    // need to handle.\n    const isExported = stmt.modifiers !== undefined &&\n        stmt.modifiers.some(mod => mod.kind === ts.SyntaxKind.ExportKeyword);\n\n    if (!isExported) {\n      return;\n    }\n\n    if (ts.isClassDeclaration(stmt)) {\n      for (const member of stmt.members) {\n        if (!ts.isMethodDeclaration(member) || !isStatic(member)) {\n          continue;\n        }\n\n        this.visitFunctionOrMethodDeclaration(dts, member);\n      }\n    } else if (ts.isFunctionDeclaration(stmt)) {\n      this.visitFunctionOrMethodDeclaration(dts, stmt);\n    }\n  }\n\n  private visitFunctionOrMethodDeclaration(\n      dts: DtsHandler, decl: ts.MethodDeclaration|ts.FunctionDeclaration): void {\n    // First, some sanity. This should have a method body with a single return statement.\n    if (decl.body === undefined || decl.body.statements.length !== 1) {\n      return;\n    }\n    const retStmt = decl.body.statements[0];\n    if (!ts.isReturnStatement(retStmt) || retStmt.expression === undefined) {\n      return;\n    }\n    const retValue = retStmt.expression;\n\n    // Now, look at the return type of the method. Maybe bail if the type is already marked, or if\n    // it's incompatible with a MWP function.\n    const returnType = this.returnTypeOf(decl);\n    if (returnType === ReturnType.OTHER || returnType === ReturnType.MWP_WITH_TYPE) {\n      // Don't process this declaration, it either already declares the right return type, or an\n      // incompatible one.\n      return;\n    }\n\n    const value = this.evaluator.evaluate(retValue);\n    if (!(value instanceof Map) || !value.has('ngModule')) {\n      // The return value does not provide sufficient information to be able to add a generic type.\n      return;\n    }\n\n    if (returnType === ReturnType.INFERRED && !isModuleWithProvidersType(value)) {\n      // The return type is inferred but the returned object is not of the correct shape, so we\n      // shouldn's modify the return type to become `ModuleWithProviders`.\n      return;\n    }\n\n    // The return type has been verified to represent the `ModuleWithProviders` type, but either the\n    // return type is inferred or the generic type argument is missing. In both cases, a new return\n    // type is created where the `ngModule` type is included as generic type argument.\n    const ngModule = value.get('ngModule');\n    if (!(ngModule instanceof Reference) || !ts.isClassDeclaration(ngModule.node)) {\n      return;\n    }\n\n    const ngModuleExpr =\n        this.emitter.emit(ngModule, decl.getSourceFile(), ImportFlags.ForceNewImport);\n    const ngModuleType = new ExpressionType(ngModuleExpr.expression);\n    const mwpNgType = new ExpressionType(\n        new ExternalExpr(Identifiers.ModuleWithProviders), [/* modifiers */], [ngModuleType]);\n\n    dts.addTypeReplacement(decl, mwpNgType);\n  }\n\n  private returnTypeOf(decl: ts.FunctionDeclaration|ts.MethodDeclaration|\n                       ts.VariableDeclaration): ReturnType {\n    if (decl.type === undefined) {\n      return ReturnType.INFERRED;\n    } else if (!ts.isTypeReferenceNode(decl.type)) {\n      return ReturnType.OTHER;\n    }\n\n    // Try to figure out if the type is of a familiar form, something that looks like it was\n    // imported.\n    let typeId: ts.Identifier;\n    if (ts.isIdentifier(decl.type.typeName)) {\n      // def: ModuleWithProviders\n      typeId = decl.type.typeName;\n    } else if (ts.isQualifiedName(decl.type.typeName) && ts.isIdentifier(decl.type.typeName.left)) {\n      // def: i0.ModuleWithProviders\n      typeId = decl.type.typeName.right;\n    } else {\n      return ReturnType.OTHER;\n    }\n\n    const importDecl = this.host.getImportOfIdentifier(typeId);\n    if (importDecl === null || importDecl.from !== '@angular/core' ||\n        importDecl.name !== 'ModuleWithProviders') {\n      return ReturnType.OTHER;\n    }\n\n    if (decl.type.typeArguments === undefined || decl.type.typeArguments.length === 0) {\n      // The return type is indeed ModuleWithProviders, but no generic type parameter was found.\n      return ReturnType.MWP_NO_TYPE;\n    } else {\n      // The return type is ModuleWithProviders, and the user has already specified a generic type.\n      return ReturnType.MWP_WITH_TYPE;\n    }\n  }\n}\n\nenum ReturnType {\n  INFERRED,\n  MWP_NO_TYPE,\n  MWP_WITH_TYPE,\n  OTHER,\n}\n\n/** Whether the resolved value map represents a ModuleWithProviders object */\nfunction isModuleWithProvidersType(value: ResolvedValueMap): boolean {\n  const ngModule = value.has('ngModule');\n  const providers = value.has('providers');\n\n  return ngModule && (value.size === 1 || (providers && value.size === 2));\n}\n\nfunction isStatic(node: ts.Node): boolean {\n  return node.modifiers !== undefined &&\n      node.modifiers.some(mod => mod.kind === ts.SyntaxKind.StaticKeyword);\n}\n"]}
|
|
@@ -1,142 +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 { ExpressionType, ExternalExpr, R3Identifiers as Identifiers } from '@angular/compiler';
|
|
9
|
-
import * as ts from 'typescript';
|
|
10
|
-
import { ImportFlags, Reference } from '../../imports';
|
|
11
|
-
export class ModuleWithProvidersScanner {
|
|
12
|
-
constructor(host, evaluator, emitter) {
|
|
13
|
-
this.host = host;
|
|
14
|
-
this.evaluator = evaluator;
|
|
15
|
-
this.emitter = emitter;
|
|
16
|
-
}
|
|
17
|
-
scan(sf, dts) {
|
|
18
|
-
for (const stmt of sf.statements) {
|
|
19
|
-
this.visitStatement(dts, stmt);
|
|
20
|
-
}
|
|
21
|
-
}
|
|
22
|
-
visitStatement(dts, stmt) {
|
|
23
|
-
// Detect whether a statement is exported, which is used as one of the hints whether to look
|
|
24
|
-
// more closely at possible MWP functions within. This is a syntactic check, not a semantic
|
|
25
|
-
// check, so it won't detect cases like:
|
|
26
|
-
//
|
|
27
|
-
// var X = ...;
|
|
28
|
-
// export {X}
|
|
29
|
-
//
|
|
30
|
-
// This is intentional, because the alternative is slow and this will catch 99% of the cases we
|
|
31
|
-
// need to handle.
|
|
32
|
-
const isExported = stmt.modifiers !== undefined &&
|
|
33
|
-
stmt.modifiers.some(mod => mod.kind === ts.SyntaxKind.ExportKeyword);
|
|
34
|
-
if (!isExported) {
|
|
35
|
-
return;
|
|
36
|
-
}
|
|
37
|
-
if (ts.isClassDeclaration(stmt)) {
|
|
38
|
-
for (const member of stmt.members) {
|
|
39
|
-
if (!ts.isMethodDeclaration(member) || !isStatic(member)) {
|
|
40
|
-
continue;
|
|
41
|
-
}
|
|
42
|
-
this.visitFunctionOrMethodDeclaration(dts, member);
|
|
43
|
-
}
|
|
44
|
-
}
|
|
45
|
-
else if (ts.isFunctionDeclaration(stmt)) {
|
|
46
|
-
this.visitFunctionOrMethodDeclaration(dts, stmt);
|
|
47
|
-
}
|
|
48
|
-
}
|
|
49
|
-
visitFunctionOrMethodDeclaration(dts, decl) {
|
|
50
|
-
// First, some sanity. This should have a method body with a single return statement.
|
|
51
|
-
if (decl.body === undefined || decl.body.statements.length !== 1) {
|
|
52
|
-
return;
|
|
53
|
-
}
|
|
54
|
-
const retStmt = decl.body.statements[0];
|
|
55
|
-
if (!ts.isReturnStatement(retStmt) || retStmt.expression === undefined) {
|
|
56
|
-
return;
|
|
57
|
-
}
|
|
58
|
-
const retValue = retStmt.expression;
|
|
59
|
-
// Now, look at the return type of the method. Maybe bail if the type is already marked, or if
|
|
60
|
-
// it's incompatible with a MWP function.
|
|
61
|
-
const returnType = this.returnTypeOf(decl);
|
|
62
|
-
if (returnType === ReturnType.OTHER || returnType === ReturnType.MWP_WITH_TYPE) {
|
|
63
|
-
// Don't process this declaration, it either already declares the right return type, or an
|
|
64
|
-
// incompatible one.
|
|
65
|
-
return;
|
|
66
|
-
}
|
|
67
|
-
const value = this.evaluator.evaluate(retValue);
|
|
68
|
-
if (!(value instanceof Map) || !value.has('ngModule')) {
|
|
69
|
-
// The return value does not provide sufficient information to be able to add a generic type.
|
|
70
|
-
return;
|
|
71
|
-
}
|
|
72
|
-
if (returnType === ReturnType.INFERRED && !isModuleWithProvidersType(value)) {
|
|
73
|
-
// The return type is inferred but the returned object is not of the correct shape, so we
|
|
74
|
-
// shouldn's modify the return type to become `ModuleWithProviders`.
|
|
75
|
-
return;
|
|
76
|
-
}
|
|
77
|
-
// The return type has been verified to represent the `ModuleWithProviders` type, but either the
|
|
78
|
-
// return type is inferred or the generic type argument is missing. In both cases, a new return
|
|
79
|
-
// type is created where the `ngModule` type is included as generic type argument.
|
|
80
|
-
const ngModule = value.get('ngModule');
|
|
81
|
-
if (!(ngModule instanceof Reference) || !ts.isClassDeclaration(ngModule.node)) {
|
|
82
|
-
return;
|
|
83
|
-
}
|
|
84
|
-
const ngModuleExpr = this.emitter.emit(ngModule, decl.getSourceFile(), ImportFlags.ForceNewImport);
|
|
85
|
-
const ngModuleType = new ExpressionType(ngModuleExpr.expression);
|
|
86
|
-
const mwpNgType = new ExpressionType(new ExternalExpr(Identifiers.ModuleWithProviders), [ /* modifiers */], [ngModuleType]);
|
|
87
|
-
dts.addTypeReplacement(decl, mwpNgType);
|
|
88
|
-
}
|
|
89
|
-
returnTypeOf(decl) {
|
|
90
|
-
if (decl.type === undefined) {
|
|
91
|
-
return ReturnType.INFERRED;
|
|
92
|
-
}
|
|
93
|
-
else if (!ts.isTypeReferenceNode(decl.type)) {
|
|
94
|
-
return ReturnType.OTHER;
|
|
95
|
-
}
|
|
96
|
-
// Try to figure out if the type is of a familiar form, something that looks like it was
|
|
97
|
-
// imported.
|
|
98
|
-
let typeId;
|
|
99
|
-
if (ts.isIdentifier(decl.type.typeName)) {
|
|
100
|
-
// def: ModuleWithProviders
|
|
101
|
-
typeId = decl.type.typeName;
|
|
102
|
-
}
|
|
103
|
-
else if (ts.isQualifiedName(decl.type.typeName) && ts.isIdentifier(decl.type.typeName.left)) {
|
|
104
|
-
// def: i0.ModuleWithProviders
|
|
105
|
-
typeId = decl.type.typeName.right;
|
|
106
|
-
}
|
|
107
|
-
else {
|
|
108
|
-
return ReturnType.OTHER;
|
|
109
|
-
}
|
|
110
|
-
const importDecl = this.host.getImportOfIdentifier(typeId);
|
|
111
|
-
if (importDecl === null || importDecl.from !== '@angular/core' ||
|
|
112
|
-
importDecl.name !== 'ModuleWithProviders') {
|
|
113
|
-
return ReturnType.OTHER;
|
|
114
|
-
}
|
|
115
|
-
if (decl.type.typeArguments === undefined || decl.type.typeArguments.length === 0) {
|
|
116
|
-
// The return type is indeed ModuleWithProviders, but no generic type parameter was found.
|
|
117
|
-
return ReturnType.MWP_NO_TYPE;
|
|
118
|
-
}
|
|
119
|
-
else {
|
|
120
|
-
// The return type is ModuleWithProviders, and the user has already specified a generic type.
|
|
121
|
-
return ReturnType.MWP_WITH_TYPE;
|
|
122
|
-
}
|
|
123
|
-
}
|
|
124
|
-
}
|
|
125
|
-
var ReturnType;
|
|
126
|
-
(function (ReturnType) {
|
|
127
|
-
ReturnType[ReturnType["INFERRED"] = 0] = "INFERRED";
|
|
128
|
-
ReturnType[ReturnType["MWP_NO_TYPE"] = 1] = "MWP_NO_TYPE";
|
|
129
|
-
ReturnType[ReturnType["MWP_WITH_TYPE"] = 2] = "MWP_WITH_TYPE";
|
|
130
|
-
ReturnType[ReturnType["OTHER"] = 3] = "OTHER";
|
|
131
|
-
})(ReturnType || (ReturnType = {}));
|
|
132
|
-
/** Whether the resolved value map represents a ModuleWithProviders object */
|
|
133
|
-
function isModuleWithProvidersType(value) {
|
|
134
|
-
const ngModule = value.has('ngModule');
|
|
135
|
-
const providers = value.has('providers');
|
|
136
|
-
return ngModule && (value.size === 1 || (providers && value.size === 2));
|
|
137
|
-
}
|
|
138
|
-
function isStatic(node) {
|
|
139
|
-
return node.modifiers !== undefined &&
|
|
140
|
-
node.modifiers.some(mod => mod.kind === ts.SyntaxKind.StaticKeyword);
|
|
141
|
-
}
|
|
142
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"scanner.js","sourceRoot":"","sources":["../../../../../../../../../packages/compiler-cli/src/ngtsc/modulewithproviders/src/scanner.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 {ExpressionType, ExternalExpr, R3Identifiers as Identifiers, Type} from '@angular/compiler';\nimport * as ts from 'typescript';\n\nimport {ImportFlags, Reference, ReferenceEmitter} from '../../imports';\nimport {PartialEvaluator, ResolvedValueMap} from '../../partial_evaluator';\nimport {ReflectionHost} from '../../reflection';\n\nexport interface DtsHandler {\n  addTypeReplacement(node: ts.Declaration, type: Type): void;\n}\n\nexport class ModuleWithProvidersScanner {\n  constructor(\n      private host: ReflectionHost, private evaluator: PartialEvaluator,\n      private emitter: ReferenceEmitter) {}\n\n  scan(sf: ts.SourceFile, dts: DtsHandler): void {\n    for (const stmt of sf.statements) {\n      this.visitStatement(dts, stmt);\n    }\n  }\n\n  private visitStatement(dts: DtsHandler, stmt: ts.Statement): void {\n    // Detect whether a statement is exported, which is used as one of the hints whether to look\n    // more closely at possible MWP functions within. This is a syntactic check, not a semantic\n    // check, so it won't detect cases like:\n    //\n    // var X = ...;\n    // export {X}\n    //\n    // This is intentional, because the alternative is slow and this will catch 99% of the cases we\n    // need to handle.\n    const isExported = stmt.modifiers !== undefined &&\n        stmt.modifiers.some(mod => mod.kind === ts.SyntaxKind.ExportKeyword);\n\n    if (!isExported) {\n      return;\n    }\n\n    if (ts.isClassDeclaration(stmt)) {\n      for (const member of stmt.members) {\n        if (!ts.isMethodDeclaration(member) || !isStatic(member)) {\n          continue;\n        }\n\n        this.visitFunctionOrMethodDeclaration(dts, member);\n      }\n    } else if (ts.isFunctionDeclaration(stmt)) {\n      this.visitFunctionOrMethodDeclaration(dts, stmt);\n    }\n  }\n\n  private visitFunctionOrMethodDeclaration(\n      dts: DtsHandler, decl: ts.MethodDeclaration|ts.FunctionDeclaration): void {\n    // First, some sanity. This should have a method body with a single return statement.\n    if (decl.body === undefined || decl.body.statements.length !== 1) {\n      return;\n    }\n    const retStmt = decl.body.statements[0];\n    if (!ts.isReturnStatement(retStmt) || retStmt.expression === undefined) {\n      return;\n    }\n    const retValue = retStmt.expression;\n\n    // Now, look at the return type of the method. Maybe bail if the type is already marked, or if\n    // it's incompatible with a MWP function.\n    const returnType = this.returnTypeOf(decl);\n    if (returnType === ReturnType.OTHER || returnType === ReturnType.MWP_WITH_TYPE) {\n      // Don't process this declaration, it either already declares the right return type, or an\n      // incompatible one.\n      return;\n    }\n\n    const value = this.evaluator.evaluate(retValue);\n    if (!(value instanceof Map) || !value.has('ngModule')) {\n      // The return value does not provide sufficient information to be able to add a generic type.\n      return;\n    }\n\n    if (returnType === ReturnType.INFERRED && !isModuleWithProvidersType(value)) {\n      // The return type is inferred but the returned object is not of the correct shape, so we\n      // shouldn's modify the return type to become `ModuleWithProviders`.\n      return;\n    }\n\n    // The return type has been verified to represent the `ModuleWithProviders` type, but either the\n    // return type is inferred or the generic type argument is missing. In both cases, a new return\n    // type is created where the `ngModule` type is included as generic type argument.\n    const ngModule = value.get('ngModule');\n    if (!(ngModule instanceof Reference) || !ts.isClassDeclaration(ngModule.node)) {\n      return;\n    }\n\n    const ngModuleExpr =\n        this.emitter.emit(ngModule, decl.getSourceFile(), ImportFlags.ForceNewImport);\n    const ngModuleType = new ExpressionType(ngModuleExpr.expression);\n    const mwpNgType = new ExpressionType(\n        new ExternalExpr(Identifiers.ModuleWithProviders), [/* modifiers */], [ngModuleType]);\n\n    dts.addTypeReplacement(decl, mwpNgType);\n  }\n\n  private returnTypeOf(decl: ts.FunctionDeclaration|ts.MethodDeclaration|\n                       ts.VariableDeclaration): ReturnType {\n    if (decl.type === undefined) {\n      return ReturnType.INFERRED;\n    } else if (!ts.isTypeReferenceNode(decl.type)) {\n      return ReturnType.OTHER;\n    }\n\n    // Try to figure out if the type is of a familiar form, something that looks like it was\n    // imported.\n    let typeId: ts.Identifier;\n    if (ts.isIdentifier(decl.type.typeName)) {\n      // def: ModuleWithProviders\n      typeId = decl.type.typeName;\n    } else if (ts.isQualifiedName(decl.type.typeName) && ts.isIdentifier(decl.type.typeName.left)) {\n      // def: i0.ModuleWithProviders\n      typeId = decl.type.typeName.right;\n    } else {\n      return ReturnType.OTHER;\n    }\n\n    const importDecl = this.host.getImportOfIdentifier(typeId);\n    if (importDecl === null || importDecl.from !== '@angular/core' ||\n        importDecl.name !== 'ModuleWithProviders') {\n      return ReturnType.OTHER;\n    }\n\n    if (decl.type.typeArguments === undefined || decl.type.typeArguments.length === 0) {\n      // The return type is indeed ModuleWithProviders, but no generic type parameter was found.\n      return ReturnType.MWP_NO_TYPE;\n    } else {\n      // The return type is ModuleWithProviders, and the user has already specified a generic type.\n      return ReturnType.MWP_WITH_TYPE;\n    }\n  }\n}\n\nenum ReturnType {\n  INFERRED,\n  MWP_NO_TYPE,\n  MWP_WITH_TYPE,\n  OTHER,\n}\n\n/** Whether the resolved value map represents a ModuleWithProviders object */\nfunction isModuleWithProvidersType(value: ResolvedValueMap): boolean {\n  const ngModule = value.has('ngModule');\n  const providers = value.has('providers');\n\n  return ngModule && (value.size === 1 || (providers && value.size === 2));\n}\n\nfunction isStatic(node: ts.Node): boolean {\n  return node.modifiers !== undefined &&\n      node.modifiers.some(mod => mod.kind === ts.SyntaxKind.StaticKeyword);\n}\n"]}
|