@angular/compiler 17.1.2 → 17.1.3
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/esm2022/src/constant_pool.mjs +14 -4
- package/esm2022/src/render3/partial/class_metadata.mjs +1 -1
- package/esm2022/src/render3/partial/directive.mjs +1 -1
- package/esm2022/src/render3/partial/factory.mjs +1 -1
- package/esm2022/src/render3/partial/injectable.mjs +1 -1
- package/esm2022/src/render3/partial/injector.mjs +1 -1
- package/esm2022/src/render3/partial/ng_module.mjs +1 -1
- package/esm2022/src/render3/partial/pipe.mjs +1 -1
- package/esm2022/src/render3/r3_class_metadata_compiler.mjs +5 -3
- package/esm2022/src/render3/view/api.mjs +1 -1
- package/esm2022/src/render3/view/compiler.mjs +3 -3
- package/esm2022/src/render3/view/template.mjs +7 -3
- package/esm2022/src/template/pipeline/src/ingest.mjs +9 -1
- package/esm2022/src/template/pipeline/src/phases/create_defer_deps_fns.mjs +4 -2
- package/esm2022/src/template/pipeline/src/phases/naming.mjs +5 -2
- package/esm2022/src/version.mjs +1 -1
- package/fesm2022/compiler.mjs +49 -20
- package/fesm2022/compiler.mjs.map +1 -1
- package/index.d.ts +22 -5
- package/package.json +2 -2
|
@@ -24,7 +24,9 @@ export function createDeferDepsFns(job) {
|
|
|
24
24
|
for (const dep of op.metadata.deps) {
|
|
25
25
|
if (dep.isDeferrable) {
|
|
26
26
|
// Callback function, e.g. `m () => m.MyCmp;`.
|
|
27
|
-
const innerFn = o.arrowFn(
|
|
27
|
+
const innerFn = o.arrowFn(
|
|
28
|
+
// Default imports are always accessed through the `default` property.
|
|
29
|
+
[new o.FnParam('m', o.DYNAMIC_TYPE)], o.variable('m').prop(dep.isDefaultImport ? 'default' : dep.symbolName));
|
|
28
30
|
// Dynamic import, e.g. `import('./a').then(...)`.
|
|
29
31
|
const importExpr = (new o.DynamicImportExpr(dep.importPath)).prop('then').callFn([innerFn]);
|
|
30
32
|
dependencies.push(importExpr);
|
|
@@ -45,4 +47,4 @@ export function createDeferDepsFns(job) {
|
|
|
45
47
|
}
|
|
46
48
|
}
|
|
47
49
|
}
|
|
48
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
50
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3JlYXRlX2RlZmVyX2RlcHNfZm5zLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvY29tcGlsZXIvc3JjL3RlbXBsYXRlL3BpcGVsaW5lL3NyYy9waGFzZXMvY3JlYXRlX2RlZmVyX2RlcHNfZm5zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7R0FNRztBQUVILE9BQU8sS0FBSyxDQUFDLE1BQU0sK0JBQStCLENBQUM7QUFDbkQsT0FBTyxLQUFLLEVBQUUsTUFBTSxVQUFVLENBQUM7QUFHL0I7O0dBRUc7QUFDSCxNQUFNLFVBQVUsa0JBQWtCLENBQUMsR0FBNEI7SUFDN0QsS0FBSyxNQUFNLElBQUksSUFBSSxHQUFHLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDN0IsS0FBSyxNQUFNLEVBQUUsSUFBSSxJQUFJLENBQUMsTUFBTSxFQUFFLENBQUM7WUFDN0IsSUFBSSxFQUFFLENBQUMsSUFBSSxLQUFLLEVBQUUsQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFFLENBQUM7Z0JBQ2hDLElBQUksRUFBRSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsTUFBTSxLQUFLLENBQUMsRUFBRSxDQUFDO29CQUNsQyxTQUFTO2dCQUNYLENBQUM7Z0JBQ0QsSUFBSSxFQUFFLENBQUMsVUFBVSxLQUFLLElBQUksRUFBRSxDQUFDO29CQUMzQixTQUFTO2dCQUNYLENBQUM7Z0JBQ0QsTUFBTSxZQUFZLEdBQW1CLEVBQUUsQ0FBQztnQkFDeEMsS0FBSyxNQUFNLEdBQUcsSUFBSSxFQUFFLENBQUMsUUFBUSxDQUFDLElBQUksRUFBRSxDQUFDO29CQUNuQyxJQUFJLEdBQUcsQ0FBQyxZQUFZLEVBQUUsQ0FBQzt3QkFDckIsOENBQThDO3dCQUM5QyxNQUFNLE9BQU8sR0FBRyxDQUFDLENBQUMsT0FBTzt3QkFDckIsc0VBQXNFO3dCQUN0RSxDQUFDLElBQUksQ0FBQyxDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsQ0FBQyxDQUFDLFlBQVksQ0FBQyxDQUFDLEVBQ3BDLENBQUMsQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUM7d0JBRTVFLGtEQUFrRDt3QkFDbEQsTUFBTSxVQUFVLEdBQ1osQ0FBQyxJQUFJLENBQUMsQ0FBQyxpQkFBaUIsQ0FBQyxHQUFHLENBQUMsVUFBVyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQzt3QkFDOUUsWUFBWSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQztvQkFDaEMsQ0FBQzt5QkFBTSxDQUFDO3dCQUNOLDJEQUEyRDt3QkFDM0QsWUFBWSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUM7b0JBQzlCLENBQUM7Z0JBQ0gsQ0FBQztnQkFDRCxNQUFNLFVBQVUsR0FBRyxDQUFDLENBQUMsT0FBTyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsVUFBVSxDQUFDLFlBQVksQ0FBQyxDQUFDLENBQUM7Z0JBQzdELElBQUksRUFBRSxDQUFDLE1BQU0sQ0FBQyxJQUFJLEtBQUssSUFBSSxFQUFFLENBQUM7b0JBQzVCLE1BQU0sSUFBSSxLQUFLLENBQ1gsNkVBQTZFLENBQUMsQ0FBQztnQkFDckYsQ0FBQztnQkFDRCxNQUFNLFlBQVksR0FBRyxJQUFJLENBQUMsTUFBTSxFQUFFLE9BQU8sQ0FBQyxXQUFXLEVBQUUsRUFBRSxDQUFDLENBQUM7Z0JBQzNELEVBQUUsQ0FBQyxVQUFVLEdBQUcsR0FBRyxDQUFDLElBQUksQ0FBQywwQkFBMEIsQ0FDL0MsVUFBVSxFQUFFLEdBQUcsWUFBWSxVQUFVLEVBQUUsQ0FBQyxNQUFNLENBQUMsSUFBSSxTQUFTO2dCQUM1RCxrREFBa0QsQ0FBQyxLQUFLLENBQUMsQ0FBQztZQUNoRSxDQUFDO1FBQ0gsQ0FBQztJQUNILENBQUM7QUFDSCxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBMTEMgQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5cbmltcG9ydCAqIGFzIG8gZnJvbSAnLi4vLi4vLi4vLi4vb3V0cHV0L291dHB1dF9hc3QnO1xuaW1wb3J0ICogYXMgaXIgZnJvbSAnLi4vLi4vaXInO1xuaW1wb3J0IHtDb21wb25lbnRDb21waWxhdGlvbkpvYn0gZnJvbSAnLi4vY29tcGlsYXRpb24nO1xuXG4vKipcbiAqIENyZWF0ZSBleHRyYWN0ZWQgZGVwcyBmdW5jdGlvbnMgZm9yIGRlZmVyIG9wcy5cbiAqL1xuZXhwb3J0IGZ1bmN0aW9uIGNyZWF0ZURlZmVyRGVwc0Zucyhqb2I6IENvbXBvbmVudENvbXBpbGF0aW9uSm9iKTogdm9pZCB7XG4gIGZvciAoY29uc3QgdW5pdCBvZiBqb2IudW5pdHMpIHtcbiAgICBmb3IgKGNvbnN0IG9wIG9mIHVuaXQuY3JlYXRlKSB7XG4gICAgICBpZiAob3Aua2luZCA9PT0gaXIuT3BLaW5kLkRlZmVyKSB7XG4gICAgICAgIGlmIChvcC5tZXRhZGF0YS5kZXBzLmxlbmd0aCA9PT0gMCkge1xuICAgICAgICAgIGNvbnRpbnVlO1xuICAgICAgICB9XG4gICAgICAgIGlmIChvcC5yZXNvbHZlckZuICE9PSBudWxsKSB7XG4gICAgICAgICAgY29udGludWU7XG4gICAgICAgIH1cbiAgICAgICAgY29uc3QgZGVwZW5kZW5jaWVzOiBvLkV4cHJlc3Npb25bXSA9IFtdO1xuICAgICAgICBmb3IgKGNvbnN0IGRlcCBvZiBvcC5tZXRhZGF0YS5kZXBzKSB7XG4gICAgICAgICAgaWYgKGRlcC5pc0RlZmVycmFibGUpIHtcbiAgICAgICAgICAgIC8vIENhbGxiYWNrIGZ1bmN0aW9uLCBlLmcuIGBtICgpID0+IG0uTXlDbXA7YC5cbiAgICAgICAgICAgIGNvbnN0IGlubmVyRm4gPSBvLmFycm93Rm4oXG4gICAgICAgICAgICAgICAgLy8gRGVmYXVsdCBpbXBvcnRzIGFyZSBhbHdheXMgYWNjZXNzZWQgdGhyb3VnaCB0aGUgYGRlZmF1bHRgIHByb3BlcnR5LlxuICAgICAgICAgICAgICAgIFtuZXcgby5GblBhcmFtKCdtJywgby5EWU5BTUlDX1RZUEUpXSxcbiAgICAgICAgICAgICAgICBvLnZhcmlhYmxlKCdtJykucHJvcChkZXAuaXNEZWZhdWx0SW1wb3J0ID8gJ2RlZmF1bHQnIDogZGVwLnN5bWJvbE5hbWUpKTtcblxuICAgICAgICAgICAgLy8gRHluYW1pYyBpbXBvcnQsIGUuZy4gYGltcG9ydCgnLi9hJykudGhlbiguLi4pYC5cbiAgICAgICAgICAgIGNvbnN0IGltcG9ydEV4cHIgPVxuICAgICAgICAgICAgICAgIChuZXcgby5EeW5hbWljSW1wb3J0RXhwcihkZXAuaW1wb3J0UGF0aCEpKS5wcm9wKCd0aGVuJykuY2FsbEZuKFtpbm5lckZuXSk7XG4gICAgICAgICAgICBkZXBlbmRlbmNpZXMucHVzaChpbXBvcnRFeHByKTtcbiAgICAgICAgICB9IGVsc2Uge1xuICAgICAgICAgICAgLy8gTm9uLWRlZmVycmFibGUgc3ltYm9sLCBqdXN0IHVzZSBhIHJlZmVyZW5jZSB0byB0aGUgdHlwZS5cbiAgICAgICAgICAgIGRlcGVuZGVuY2llcy5wdXNoKGRlcC50eXBlKTtcbiAgICAgICAgICB9XG4gICAgICAgIH1cbiAgICAgICAgY29uc3QgZGVwc0ZuRXhwciA9IG8uYXJyb3dGbihbXSwgby5saXRlcmFsQXJyKGRlcGVuZGVuY2llcykpO1xuICAgICAgICBpZiAob3AuaGFuZGxlLnNsb3QgPT09IG51bGwpIHtcbiAgICAgICAgICB0aHJvdyBuZXcgRXJyb3IoXG4gICAgICAgICAgICAgICdBc3NlcnRpb25FcnJvcjogc2xvdCBtdXN0IGJlIGFzc2lnbmVkIGJmb3JlIGV4dHJhY3RpbmcgZGVmZXIgZGVwcyBmdW5jdGlvbnMnKTtcbiAgICAgICAgfVxuICAgICAgICBjb25zdCBmdWxsUGF0aE5hbWUgPSB1bml0LmZuTmFtZT8ucmVwbGFjZShgX1RlbXBsYXRlYCwgYGApO1xuICAgICAgICBvcC5yZXNvbHZlckZuID0gam9iLnBvb2wuZ2V0U2hhcmVkRnVuY3Rpb25SZWZlcmVuY2UoXG4gICAgICAgICAgICBkZXBzRm5FeHByLCBgJHtmdWxsUGF0aE5hbWV9X0RlZmVyXyR7b3AuaGFuZGxlLnNsb3R9X0RlcHNGbmAsXG4gICAgICAgICAgICAvKiBEb24ndCB1c2UgdW5pcXVlIG5hbWVzIGZvciBUREIgY29tcGF0aWJpbGl0eSAqLyBmYWxzZSk7XG4gICAgICB9XG4gICAgfVxuICB9XG59XG4iXX0=
|
|
@@ -20,7 +20,10 @@ export function nameFunctionsAndVariables(job) {
|
|
|
20
20
|
}
|
|
21
21
|
function addNamesToView(unit, baseName, state, compatibility) {
|
|
22
22
|
if (unit.fnName === null) {
|
|
23
|
-
|
|
23
|
+
// Ensure unique names for view units. This is necessary because there might be multiple
|
|
24
|
+
// components with same names in the context of the same pool. Only add the suffix
|
|
25
|
+
// if really needed.
|
|
26
|
+
unit.fnName = unit.job.pool.uniqueName(sanitizeIdentifier(`${baseName}_${unit.job.fnSuffix}`), /* alwaysIncludeSuffix */ false);
|
|
24
27
|
}
|
|
25
28
|
// Keep track of the names we assign to variables in the view. We'll need to propagate these
|
|
26
29
|
// into reads of those variables afterwards.
|
|
@@ -151,4 +154,4 @@ function stripImportant(name) {
|
|
|
151
154
|
}
|
|
152
155
|
return name;
|
|
153
156
|
}
|
|
154
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"naming.js","sourceRoot":"","sources":["../../../../../../../../../../packages/compiler/src/template/pipeline/src/phases/naming.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 {sanitizeIdentifier} from '../../../../parse_util';\nimport {hyphenate} from '../../../../render3/view/style_parser';\nimport * as ir from '../../ir';\nimport {ViewCompilationUnit, type CompilationJob, type CompilationUnit} from '../compilation';\n\n/**\n * Generate names for functions and variables across all views.\n *\n * This includes propagating those names into any `ir.ReadVariableExpr`s of those variables, so that\n * the reads can be emitted correctly.\n */\nexport function nameFunctionsAndVariables(job: CompilationJob): void {\n  addNamesToView(\n      job.root, job.componentName, {index: 0},\n      job.compatibility === ir.CompatibilityMode.TemplateDefinitionBuilder);\n}\n\nfunction addNamesToView(\n    unit: CompilationUnit, baseName: string, state: {index: number}, compatibility: boolean): void {\n  if (unit.fnName === null) {\n    unit.fnName = sanitizeIdentifier(`${baseName}_${unit.job.fnSuffix}`);\n  }\n\n  // Keep track of the names we assign to variables in the view. We'll need to propagate these\n  // into reads of those variables afterwards.\n  const varNames = new Map<ir.XrefId, string>();\n\n  for (const op of unit.ops()) {\n    switch (op.kind) {\n      case ir.OpKind.Property:\n      case ir.OpKind.HostProperty:\n        if (op.isAnimationTrigger) {\n          op.name = '@' + op.name;\n        }\n        break;\n      case ir.OpKind.Listener:\n        if (op.handlerFnName !== null) {\n          break;\n        }\n        if (!op.hostListener && op.targetSlot.slot === null) {\n          throw new Error(`Expected a slot to be assigned`);\n        }\n        let animation = '';\n        if (op.isAnimationListener) {\n          op.name = `@${op.name}.${op.animationPhase}`;\n          animation = 'animation';\n        }\n        if (op.hostListener) {\n          op.handlerFnName = `${baseName}_${animation}${op.name}_HostBindingHandler`;\n        } else {\n          op.handlerFnName = `${unit.fnName}_${op.tag!.replace('-', '_')}_${animation}${op.name}_${\n              op.targetSlot.slot}_listener`;\n        }\n        op.handlerFnName = sanitizeIdentifier(op.handlerFnName);\n        break;\n      case ir.OpKind.Variable:\n        varNames.set(op.xref, getVariableName(unit, op.variable, state));\n        break;\n      case ir.OpKind.RepeaterCreate:\n        if (!(unit instanceof ViewCompilationUnit)) {\n          throw new Error(`AssertionError: must be compiling a component`);\n        }\n        if (op.handle.slot === null) {\n          throw new Error(`Expected slot to be assigned`);\n        }\n        if (op.emptyView !== null) {\n          const emptyView = unit.job.views.get(op.emptyView)!;\n          // Repeater empty view function is at slot +2 (metadata is in the first slot).\n          addNamesToView(\n              emptyView, `${baseName}_${`${op.functionNameSuffix}Empty`}_${op.handle.slot + 2}`,\n              state, compatibility);\n        }\n        // Repeater primary view function is at slot +1 (metadata is in the first slot).\n        addNamesToView(\n            unit.job.views.get(op.xref)!,\n            `${baseName}_${op.functionNameSuffix}_${op.handle.slot + 1}`, state, compatibility);\n        break;\n      case ir.OpKind.Template:\n        if (!(unit instanceof ViewCompilationUnit)) {\n          throw new Error(`AssertionError: must be compiling a component`);\n        }\n        const childView = unit.job.views.get(op.xref)!;\n        if (op.handle.slot === null) {\n          throw new Error(`Expected slot to be assigned`);\n        }\n        const suffix = op.functionNameSuffix.length === 0 ? '' : `_${op.functionNameSuffix}`;\n        addNamesToView(childView, `${baseName}${suffix}_${op.handle.slot}`, state, compatibility);\n        break;\n      case ir.OpKind.StyleProp:\n        op.name = normalizeStylePropName(op.name);\n        if (compatibility) {\n          op.name = stripImportant(op.name);\n        }\n        break;\n      case ir.OpKind.ClassProp:\n        if (compatibility) {\n          op.name = stripImportant(op.name);\n        }\n        break;\n    }\n  }\n\n  // Having named all variables declared in the view, now we can push those names into the\n  // `ir.ReadVariableExpr` expressions which represent reads of those variables.\n  for (const op of unit.ops()) {\n    ir.visitExpressionsInOp(op, expr => {\n      if (!(expr instanceof ir.ReadVariableExpr) || expr.name !== null) {\n        return;\n      }\n      if (!varNames.has(expr.xref)) {\n        throw new Error(`Variable ${expr.xref} not yet named`);\n      }\n      expr.name = varNames.get(expr.xref)!;\n    });\n  }\n}\n\nfunction getVariableName(\n    unit: CompilationUnit, variable: ir.SemanticVariable, state: {index: number}): string {\n  if (variable.name === null) {\n    switch (variable.kind) {\n      case ir.SemanticVariableKind.Context:\n        variable.name = `ctx_r${state.index++}`;\n        break;\n      case ir.SemanticVariableKind.Identifier:\n        if (unit.job.compatibility === ir.CompatibilityMode.TemplateDefinitionBuilder) {\n          // TODO: Prefix increment and `_r` are for compatiblity with the old naming scheme.\n          // This has the potential to cause collisions when `ctx` is the identifier, so we need a\n          // special check for that as well.\n          const compatPrefix = variable.identifier === 'ctx' ? 'i' : '';\n          variable.name = `${variable.identifier}_${compatPrefix}r${++state.index}`;\n        } else {\n          variable.name = `${variable.identifier}_i${state.index++}`;\n        }\n\n        break;\n      default:\n        // TODO: Prefix increment for compatibility only.\n        variable.name = `_r${++state.index}`;\n        break;\n    }\n  }\n  return variable.name;\n}\n\n/**\n * Normalizes a style prop name by hyphenating it (unless its a CSS variable).\n */\nfunction normalizeStylePropName(name: string) {\n  return name.startsWith('--') ? name : hyphenate(name);\n}\n\n/**\n * Strips `!important` out of the given style or class name.\n */\nfunction stripImportant(name: string) {\n  const importantIndex = name.indexOf('!important');\n  if (importantIndex > -1) {\n    return name.substring(0, importantIndex);\n  }\n  return name;\n}\n"]}
|
|
157
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"naming.js","sourceRoot":"","sources":["../../../../../../../../../../packages/compiler/src/template/pipeline/src/phases/naming.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 {sanitizeIdentifier} from '../../../../parse_util';\nimport {hyphenate} from '../../../../render3/view/style_parser';\nimport * as ir from '../../ir';\nimport {type CompilationJob, type CompilationUnit, ViewCompilationUnit} from '../compilation';\n\n/**\n * Generate names for functions and variables across all views.\n *\n * This includes propagating those names into any `ir.ReadVariableExpr`s of those variables, so that\n * the reads can be emitted correctly.\n */\nexport function nameFunctionsAndVariables(job: CompilationJob): void {\n  addNamesToView(\n      job.root, job.componentName, {index: 0},\n      job.compatibility === ir.CompatibilityMode.TemplateDefinitionBuilder);\n}\n\nfunction addNamesToView(\n    unit: CompilationUnit, baseName: string, state: {index: number}, compatibility: boolean): void {\n  if (unit.fnName === null) {\n    // Ensure unique names for view units. This is necessary because there might be multiple\n    // components with same names in the context of the same pool. Only add the suffix\n    // if really needed.\n    unit.fnName = unit.job.pool.uniqueName(\n        sanitizeIdentifier(`${baseName}_${unit.job.fnSuffix}`), /* alwaysIncludeSuffix */ false);\n  }\n\n  // Keep track of the names we assign to variables in the view. We'll need to propagate these\n  // into reads of those variables afterwards.\n  const varNames = new Map<ir.XrefId, string>();\n\n  for (const op of unit.ops()) {\n    switch (op.kind) {\n      case ir.OpKind.Property:\n      case ir.OpKind.HostProperty:\n        if (op.isAnimationTrigger) {\n          op.name = '@' + op.name;\n        }\n        break;\n      case ir.OpKind.Listener:\n        if (op.handlerFnName !== null) {\n          break;\n        }\n        if (!op.hostListener && op.targetSlot.slot === null) {\n          throw new Error(`Expected a slot to be assigned`);\n        }\n        let animation = '';\n        if (op.isAnimationListener) {\n          op.name = `@${op.name}.${op.animationPhase}`;\n          animation = 'animation';\n        }\n        if (op.hostListener) {\n          op.handlerFnName = `${baseName}_${animation}${op.name}_HostBindingHandler`;\n        } else {\n          op.handlerFnName = `${unit.fnName}_${op.tag!.replace('-', '_')}_${animation}${op.name}_${\n              op.targetSlot.slot}_listener`;\n        }\n        op.handlerFnName = sanitizeIdentifier(op.handlerFnName);\n        break;\n      case ir.OpKind.Variable:\n        varNames.set(op.xref, getVariableName(unit, op.variable, state));\n        break;\n      case ir.OpKind.RepeaterCreate:\n        if (!(unit instanceof ViewCompilationUnit)) {\n          throw new Error(`AssertionError: must be compiling a component`);\n        }\n        if (op.handle.slot === null) {\n          throw new Error(`Expected slot to be assigned`);\n        }\n        if (op.emptyView !== null) {\n          const emptyView = unit.job.views.get(op.emptyView)!;\n          // Repeater empty view function is at slot +2 (metadata is in the first slot).\n          addNamesToView(\n              emptyView, `${baseName}_${`${op.functionNameSuffix}Empty`}_${op.handle.slot + 2}`,\n              state, compatibility);\n        }\n        // Repeater primary view function is at slot +1 (metadata is in the first slot).\n        addNamesToView(\n            unit.job.views.get(op.xref)!,\n            `${baseName}_${op.functionNameSuffix}_${op.handle.slot + 1}`, state, compatibility);\n        break;\n      case ir.OpKind.Template:\n        if (!(unit instanceof ViewCompilationUnit)) {\n          throw new Error(`AssertionError: must be compiling a component`);\n        }\n        const childView = unit.job.views.get(op.xref)!;\n        if (op.handle.slot === null) {\n          throw new Error(`Expected slot to be assigned`);\n        }\n        const suffix = op.functionNameSuffix.length === 0 ? '' : `_${op.functionNameSuffix}`;\n        addNamesToView(childView, `${baseName}${suffix}_${op.handle.slot}`, state, compatibility);\n        break;\n      case ir.OpKind.StyleProp:\n        op.name = normalizeStylePropName(op.name);\n        if (compatibility) {\n          op.name = stripImportant(op.name);\n        }\n        break;\n      case ir.OpKind.ClassProp:\n        if (compatibility) {\n          op.name = stripImportant(op.name);\n        }\n        break;\n    }\n  }\n\n  // Having named all variables declared in the view, now we can push those names into the\n  // `ir.ReadVariableExpr` expressions which represent reads of those variables.\n  for (const op of unit.ops()) {\n    ir.visitExpressionsInOp(op, expr => {\n      if (!(expr instanceof ir.ReadVariableExpr) || expr.name !== null) {\n        return;\n      }\n      if (!varNames.has(expr.xref)) {\n        throw new Error(`Variable ${expr.xref} not yet named`);\n      }\n      expr.name = varNames.get(expr.xref)!;\n    });\n  }\n}\n\nfunction getVariableName(\n    unit: CompilationUnit, variable: ir.SemanticVariable, state: {index: number}): string {\n  if (variable.name === null) {\n    switch (variable.kind) {\n      case ir.SemanticVariableKind.Context:\n        variable.name = `ctx_r${state.index++}`;\n        break;\n      case ir.SemanticVariableKind.Identifier:\n        if (unit.job.compatibility === ir.CompatibilityMode.TemplateDefinitionBuilder) {\n          // TODO: Prefix increment and `_r` are for compatiblity with the old naming scheme.\n          // This has the potential to cause collisions when `ctx` is the identifier, so we need a\n          // special check for that as well.\n          const compatPrefix = variable.identifier === 'ctx' ? 'i' : '';\n          variable.name = `${variable.identifier}_${compatPrefix}r${++state.index}`;\n        } else {\n          variable.name = `${variable.identifier}_i${state.index++}`;\n        }\n\n        break;\n      default:\n        // TODO: Prefix increment for compatibility only.\n        variable.name = `_r${++state.index}`;\n        break;\n    }\n  }\n  return variable.name;\n}\n\n/**\n * Normalizes a style prop name by hyphenating it (unless its a CSS variable).\n */\nfunction normalizeStylePropName(name: string) {\n  return name.startsWith('--') ? name : hyphenate(name);\n}\n\n/**\n * Strips `!important` out of the given style or class name.\n */\nfunction stripImportant(name: string) {\n  const importantIndex = name.indexOf('!important');\n  if (importantIndex > -1) {\n    return name.substring(0, importantIndex);\n  }\n  return name;\n}\n"]}
|
package/esm2022/src/version.mjs
CHANGED
|
@@ -11,5 +11,5 @@
|
|
|
11
11
|
* Entry point for all public APIs of the compiler package.
|
|
12
12
|
*/
|
|
13
13
|
import { Version } from './util';
|
|
14
|
-
export const VERSION = new Version('17.1.
|
|
14
|
+
export const VERSION = new Version('17.1.3');
|
|
15
15
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2NvbXBpbGVyL3NyYy92ZXJzaW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7R0FNRztBQUVIOzs7O0dBSUc7QUFFSCxPQUFPLEVBQUMsT0FBTyxFQUFDLE1BQU0sUUFBUSxDQUFDO0FBRS9CLE1BQU0sQ0FBQyxNQUFNLE9BQU8sR0FBRyxJQUFJLE9BQU8sQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBMTEMgQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5cbi8qKlxuICogQG1vZHVsZVxuICogQGRlc2NyaXB0aW9uXG4gKiBFbnRyeSBwb2ludCBmb3IgYWxsIHB1YmxpYyBBUElzIG9mIHRoZSBjb21waWxlciBwYWNrYWdlLlxuICovXG5cbmltcG9ydCB7VmVyc2lvbn0gZnJvbSAnLi91dGlsJztcblxuZXhwb3J0IGNvbnN0IFZFUlNJT04gPSBuZXcgVmVyc2lvbignMC4wLjAtUExBQ0VIT0xERVInKTtcbiJdfQ==
|
package/fesm2022/compiler.mjs
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* @license Angular v17.1.
|
|
2
|
+
* @license Angular v17.1.3
|
|
3
3
|
* (c) 2010-2022 Google LLC. https://angular.io/
|
|
4
4
|
* License: MIT
|
|
5
5
|
*/
|
|
@@ -2236,6 +2236,13 @@ class ConstantPool {
|
|
|
2236
2236
|
this.literals = new Map();
|
|
2237
2237
|
this.literalFactories = new Map();
|
|
2238
2238
|
this.sharedConstants = new Map();
|
|
2239
|
+
/**
|
|
2240
|
+
* Constant pool also tracks claimed names from {@link uniqueName}.
|
|
2241
|
+
* This is useful to avoid collisions if variables are intended to be
|
|
2242
|
+
* named a certain way- but may conflict. We wouldn't want to always suffix
|
|
2243
|
+
* them with unique numbers.
|
|
2244
|
+
*/
|
|
2245
|
+
this._claimedNames = new Map();
|
|
2239
2246
|
this.nextNameIndex = 0;
|
|
2240
2247
|
}
|
|
2241
2248
|
getConstLiteral(literal, forceShared) {
|
|
@@ -2358,14 +2365,17 @@ class ConstantPool {
|
|
|
2358
2365
|
return { literalFactory, literalFactoryArguments };
|
|
2359
2366
|
}
|
|
2360
2367
|
/**
|
|
2361
|
-
* Produce a unique name.
|
|
2368
|
+
* Produce a unique name in the context of this pool.
|
|
2362
2369
|
*
|
|
2363
2370
|
* The name might be unique among different prefixes if any of the prefixes end in
|
|
2364
2371
|
* a digit so the prefix should be a constant string (not based on user input) and
|
|
2365
2372
|
* must not end in a digit.
|
|
2366
2373
|
*/
|
|
2367
|
-
uniqueName(
|
|
2368
|
-
|
|
2374
|
+
uniqueName(name, alwaysIncludeSuffix = true) {
|
|
2375
|
+
const count = this._claimedNames.get(name) ?? 0;
|
|
2376
|
+
const result = count === 0 && !alwaysIncludeSuffix ? `${name}` : `${name}${count}`;
|
|
2377
|
+
this._claimedNames.set(name, count + 1);
|
|
2378
|
+
return result;
|
|
2369
2379
|
}
|
|
2370
2380
|
freshName() {
|
|
2371
2381
|
return this.uniqueName(CONSTANT_PREFIX);
|
|
@@ -12185,7 +12195,9 @@ function createDeferDepsFns(job) {
|
|
|
12185
12195
|
for (const dep of op.metadata.deps) {
|
|
12186
12196
|
if (dep.isDeferrable) {
|
|
12187
12197
|
// Callback function, e.g. `m () => m.MyCmp;`.
|
|
12188
|
-
const innerFn = arrowFn(
|
|
12198
|
+
const innerFn = arrowFn(
|
|
12199
|
+
// Default imports are always accessed through the `default` property.
|
|
12200
|
+
[new FnParam('m', DYNAMIC_TYPE)], variable('m').prop(dep.isDefaultImport ? 'default' : dep.symbolName));
|
|
12189
12201
|
// Dynamic import, e.g. `import('./a').then(...)`.
|
|
12190
12202
|
const importExpr = (new DynamicImportExpr(dep.importPath)).prop('then').callFn([innerFn]);
|
|
12191
12203
|
dependencies.push(importExpr);
|
|
@@ -20631,7 +20643,10 @@ function nameFunctionsAndVariables(job) {
|
|
|
20631
20643
|
}
|
|
20632
20644
|
function addNamesToView(unit, baseName, state, compatibility) {
|
|
20633
20645
|
if (unit.fnName === null) {
|
|
20634
|
-
|
|
20646
|
+
// Ensure unique names for view units. This is necessary because there might be multiple
|
|
20647
|
+
// components with same names in the context of the same pool. Only add the suffix
|
|
20648
|
+
// if really needed.
|
|
20649
|
+
unit.fnName = unit.job.pool.uniqueName(sanitizeIdentifier(`${baseName}_${unit.job.fnSuffix}`), /* alwaysIncludeSuffix */ false);
|
|
20635
20650
|
}
|
|
20636
20651
|
// Keep track of the names we assign to variables in the view. We'll need to propagate these
|
|
20637
20652
|
// into reads of those variables afterwards.
|
|
@@ -24793,12 +24808,20 @@ function asMessage(i18nMeta) {
|
|
|
24793
24808
|
*/
|
|
24794
24809
|
function ingestElementBindings(unit, op, element) {
|
|
24795
24810
|
let bindings = new Array();
|
|
24811
|
+
let i18nAttributeBindingNames = new Set();
|
|
24796
24812
|
for (const attr of element.attributes) {
|
|
24797
24813
|
// Attribute literal bindings, such as `attr.foo="bar"`.
|
|
24798
24814
|
const securityContext = domSchema.securityContext(element.name, attr.name, true);
|
|
24799
24815
|
bindings.push(createBindingOp(op.xref, BindingKind.Attribute, attr.name, convertAstWithInterpolation(unit.job, attr.value, attr.i18n), null, securityContext, true, false, null, asMessage(attr.i18n), attr.sourceSpan));
|
|
24816
|
+
if (attr.i18n) {
|
|
24817
|
+
i18nAttributeBindingNames.add(attr.name);
|
|
24818
|
+
}
|
|
24800
24819
|
}
|
|
24801
24820
|
for (const input of element.inputs) {
|
|
24821
|
+
if (i18nAttributeBindingNames.has(input.name)) {
|
|
24822
|
+
console.error(`On component ${unit.job.componentName}, the binding ${input
|
|
24823
|
+
.name} is both an i18n attribute and a property. You may want to remove the property binding. This will become a compilation error in future versions of Angular.`);
|
|
24824
|
+
}
|
|
24802
24825
|
// All dynamic bindings (both attribute and property bindings).
|
|
24803
24826
|
bindings.push(createBindingOp(op.xref, BINDING_KINDS.get(input.type), input.name, convertAstWithInterpolation(unit.job, astOf(input.value), input.i18n), input.unit, input.securityContext, false, false, null, asMessage(input.i18n) ?? null, input.sourceSpan));
|
|
24804
24827
|
}
|
|
@@ -28525,7 +28548,9 @@ class TemplateDefinitionBuilder {
|
|
|
28525
28548
|
}
|
|
28526
28549
|
}
|
|
28527
28550
|
const contextName = `${this.contextName}${contextNameSuffix}_${index}`;
|
|
28528
|
-
|
|
28551
|
+
// Note: For the unique name, we don't include an unique suffix, unless really needed.
|
|
28552
|
+
// This keeps the generated output more clean as most of the time, we don't expect conflicts.
|
|
28553
|
+
const name = this.constantPool.uniqueName(`${contextName}_Template`, /** alwaysIncludeSuffix */ false);
|
|
28529
28554
|
// Create the template function
|
|
28530
28555
|
const visitor = new TemplateDefinitionBuilder(this.constantPool, this._bindingScope, this.level + 1, contextName, this.i18n, index, name, this._namespace, this.fileBasedI18nSuffix, this.i18nUseExternalIds, this.deferBlocks, this.elementLocations, this.allDeferrableDepsFn, this._constants);
|
|
28531
28556
|
// Nested templates must not be visited until after their parent templates have completed
|
|
@@ -28842,7 +28867,9 @@ class TemplateDefinitionBuilder {
|
|
|
28842
28867
|
for (const deferredDep of metadata.deps) {
|
|
28843
28868
|
if (deferredDep.isDeferrable) {
|
|
28844
28869
|
// Callback function, e.g. `m () => m.MyCmp;`.
|
|
28845
|
-
const innerFn = arrowFn([new FnParam('m', DYNAMIC_TYPE)],
|
|
28870
|
+
const innerFn = arrowFn([new FnParam('m', DYNAMIC_TYPE)],
|
|
28871
|
+
// Default imports are always accessed through the `default` property.
|
|
28872
|
+
variable('m').prop(deferredDep.isDefaultImport ? 'default' : deferredDep.symbolName));
|
|
28846
28873
|
// Dynamic import, e.g. `import('./a').then(...)`.
|
|
28847
28874
|
const importExpr = (new DynamicImportExpr(deferredDep.importPath)).prop('then').callFn([innerFn]);
|
|
28848
28875
|
dependencyExp.push(importExpr);
|
|
@@ -30184,9 +30211,9 @@ function compileDirectiveFromMetadata(meta, constantPool, bindingParser) {
|
|
|
30184
30211
|
function createDeferredDepsFunction(constantPool, name, deps) {
|
|
30185
30212
|
// This defer block has deps for which we need to generate dynamic imports.
|
|
30186
30213
|
const dependencyExp = [];
|
|
30187
|
-
for (const [symbolName, importPath] of deps) {
|
|
30214
|
+
for (const [symbolName, { importPath, isDefaultImport }] of deps) {
|
|
30188
30215
|
// Callback function, e.g. `m () => m.MyCmp;`.
|
|
30189
|
-
const innerFn = arrowFn([new FnParam('m', DYNAMIC_TYPE)], variable('m').prop(symbolName));
|
|
30216
|
+
const innerFn = arrowFn([new FnParam('m', DYNAMIC_TYPE)], variable('m').prop(isDefaultImport ? 'default' : symbolName));
|
|
30190
30217
|
// Dynamic import, e.g. `import('./a').then(...)`.
|
|
30191
30218
|
const importExpr = (new DynamicImportExpr(importPath)).prop('then').callFn([innerFn]);
|
|
30192
30219
|
dependencyExp.push(importExpr);
|
|
@@ -32357,7 +32384,7 @@ function publishFacade(global) {
|
|
|
32357
32384
|
* @description
|
|
32358
32385
|
* Entry point for all public APIs of the compiler package.
|
|
32359
32386
|
*/
|
|
32360
|
-
const VERSION = new Version('17.1.
|
|
32387
|
+
const VERSION = new Version('17.1.3');
|
|
32361
32388
|
|
|
32362
32389
|
class CompilerConfig {
|
|
32363
32390
|
constructor({ defaultEncapsulation = ViewEncapsulation.Emulated, preserveWhitespaces, strictInjectionParameters } = {}) {
|
|
@@ -33858,9 +33885,11 @@ function compileComponentClassMetadata(metadata, deferrableTypes) {
|
|
|
33858
33885
|
}
|
|
33859
33886
|
const dynamicImports = [];
|
|
33860
33887
|
const importedSymbols = [];
|
|
33861
|
-
for (const [symbolName, importPath] of deferrableTypes) {
|
|
33888
|
+
for (const [symbolName, { importPath, isDefaultImport }] of deferrableTypes) {
|
|
33862
33889
|
// e.g. `(m) => m.CmpA`
|
|
33863
|
-
const innerFn =
|
|
33890
|
+
const innerFn =
|
|
33891
|
+
// Default imports are always accessed through the `default` property.
|
|
33892
|
+
arrowFn([new FnParam('m', DYNAMIC_TYPE)], variable('m').prop(isDefaultImport ? 'default' : symbolName));
|
|
33864
33893
|
// e.g. `import('./cmp-a').then(...)`
|
|
33865
33894
|
const importExpr = (new DynamicImportExpr(importPath)).prop('then').callFn([innerFn]);
|
|
33866
33895
|
dynamicImports.push(importExpr);
|
|
@@ -33923,7 +33952,7 @@ const MINIMUM_PARTIAL_LINKER_VERSION$5 = '12.0.0';
|
|
|
33923
33952
|
function compileDeclareClassMetadata(metadata) {
|
|
33924
33953
|
const definitionMap = new DefinitionMap();
|
|
33925
33954
|
definitionMap.set('minVersion', literal(MINIMUM_PARTIAL_LINKER_VERSION$5));
|
|
33926
|
-
definitionMap.set('version', literal('17.1.
|
|
33955
|
+
definitionMap.set('version', literal('17.1.3'));
|
|
33927
33956
|
definitionMap.set('ngImport', importExpr(Identifiers.core));
|
|
33928
33957
|
definitionMap.set('type', metadata.type);
|
|
33929
33958
|
definitionMap.set('decorators', metadata.decorators);
|
|
@@ -34019,7 +34048,7 @@ function createDirectiveDefinitionMap(meta) {
|
|
|
34019
34048
|
const definitionMap = new DefinitionMap();
|
|
34020
34049
|
const minVersion = getMinimumVersionForPartialOutput(meta);
|
|
34021
34050
|
definitionMap.set('minVersion', literal(minVersion));
|
|
34022
|
-
definitionMap.set('version', literal('17.1.
|
|
34051
|
+
definitionMap.set('version', literal('17.1.3'));
|
|
34023
34052
|
// e.g. `type: MyDirective`
|
|
34024
34053
|
definitionMap.set('type', meta.type.value);
|
|
34025
34054
|
if (meta.isStandalone) {
|
|
@@ -34403,7 +34432,7 @@ const MINIMUM_PARTIAL_LINKER_VERSION$4 = '12.0.0';
|
|
|
34403
34432
|
function compileDeclareFactoryFunction(meta) {
|
|
34404
34433
|
const definitionMap = new DefinitionMap();
|
|
34405
34434
|
definitionMap.set('minVersion', literal(MINIMUM_PARTIAL_LINKER_VERSION$4));
|
|
34406
|
-
definitionMap.set('version', literal('17.1.
|
|
34435
|
+
definitionMap.set('version', literal('17.1.3'));
|
|
34407
34436
|
definitionMap.set('ngImport', importExpr(Identifiers.core));
|
|
34408
34437
|
definitionMap.set('type', meta.type.value);
|
|
34409
34438
|
definitionMap.set('deps', compileDependencies(meta.deps));
|
|
@@ -34438,7 +34467,7 @@ function compileDeclareInjectableFromMetadata(meta) {
|
|
|
34438
34467
|
function createInjectableDefinitionMap(meta) {
|
|
34439
34468
|
const definitionMap = new DefinitionMap();
|
|
34440
34469
|
definitionMap.set('minVersion', literal(MINIMUM_PARTIAL_LINKER_VERSION$3));
|
|
34441
|
-
definitionMap.set('version', literal('17.1.
|
|
34470
|
+
definitionMap.set('version', literal('17.1.3'));
|
|
34442
34471
|
definitionMap.set('ngImport', importExpr(Identifiers.core));
|
|
34443
34472
|
definitionMap.set('type', meta.type.value);
|
|
34444
34473
|
// Only generate providedIn property if it has a non-null value
|
|
@@ -34489,7 +34518,7 @@ function compileDeclareInjectorFromMetadata(meta) {
|
|
|
34489
34518
|
function createInjectorDefinitionMap(meta) {
|
|
34490
34519
|
const definitionMap = new DefinitionMap();
|
|
34491
34520
|
definitionMap.set('minVersion', literal(MINIMUM_PARTIAL_LINKER_VERSION$2));
|
|
34492
|
-
definitionMap.set('version', literal('17.1.
|
|
34521
|
+
definitionMap.set('version', literal('17.1.3'));
|
|
34493
34522
|
definitionMap.set('ngImport', importExpr(Identifiers.core));
|
|
34494
34523
|
definitionMap.set('type', meta.type.value);
|
|
34495
34524
|
definitionMap.set('providers', meta.providers);
|
|
@@ -34522,7 +34551,7 @@ function createNgModuleDefinitionMap(meta) {
|
|
|
34522
34551
|
throw new Error('Invalid path! Local compilation mode should not get into the partial compilation path');
|
|
34523
34552
|
}
|
|
34524
34553
|
definitionMap.set('minVersion', literal(MINIMUM_PARTIAL_LINKER_VERSION$1));
|
|
34525
|
-
definitionMap.set('version', literal('17.1.
|
|
34554
|
+
definitionMap.set('version', literal('17.1.3'));
|
|
34526
34555
|
definitionMap.set('ngImport', importExpr(Identifiers.core));
|
|
34527
34556
|
definitionMap.set('type', meta.type.value);
|
|
34528
34557
|
// We only generate the keys in the metadata if the arrays contain values.
|
|
@@ -34573,7 +34602,7 @@ function compileDeclarePipeFromMetadata(meta) {
|
|
|
34573
34602
|
function createPipeDefinitionMap(meta) {
|
|
34574
34603
|
const definitionMap = new DefinitionMap();
|
|
34575
34604
|
definitionMap.set('minVersion', literal(MINIMUM_PARTIAL_LINKER_VERSION));
|
|
34576
|
-
definitionMap.set('version', literal('17.1.
|
|
34605
|
+
definitionMap.set('version', literal('17.1.3'));
|
|
34577
34606
|
definitionMap.set('ngImport', importExpr(Identifiers.core));
|
|
34578
34607
|
// e.g. `type: MyPipe`
|
|
34579
34608
|
definitionMap.set('type', meta.type.value);
|