@angular/core 16.0.0-next.2 → 16.0.0-next.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/esm2020/src/application_ref.mjs +95 -87
- package/esm2020/src/application_tokens.mjs +27 -21
- package/esm2020/src/compiler/compiler_facade_interface.mjs +1 -1
- package/esm2020/src/core_private_export.mjs +2 -3
- package/esm2020/src/di/contextual.mjs +37 -0
- package/esm2020/src/di/index.mjs +2 -1
- package/esm2020/src/di/r3_injector.mjs +1 -1
- package/esm2020/src/errors.mjs +1 -1
- package/esm2020/src/hydration/annotate.mjs +136 -5
- package/esm2020/src/hydration/api.mjs +9 -1
- package/esm2020/src/hydration/cleanup.mjs +50 -0
- package/esm2020/src/hydration/error_handling.mjs +11 -3
- package/esm2020/src/hydration/interfaces.mjs +9 -2
- package/esm2020/src/hydration/node_lookup_utils.mjs +22 -14
- package/esm2020/src/hydration/skip_hydration.mjs +16 -1
- package/esm2020/src/hydration/utils.mjs +82 -7
- package/esm2020/src/hydration/views.mjs +80 -0
- package/esm2020/src/linker/template_ref.mjs +17 -2
- package/esm2020/src/linker/view_container_ref.mjs +110 -35
- package/esm2020/src/render3/component_ref.mjs +2 -2
- package/esm2020/src/render3/definition.mjs +114 -45
- package/esm2020/src/render3/instructions/element.mjs +18 -8
- package/esm2020/src/render3/instructions/element_container.mjs +12 -13
- package/esm2020/src/render3/instructions/shared.mjs +53 -16
- package/esm2020/src/render3/instructions/template.mjs +57 -6
- package/esm2020/src/render3/instructions/text.mjs +1 -1
- package/esm2020/src/render3/interfaces/container.mjs +3 -2
- package/esm2020/src/render3/interfaces/type_checks.mjs +2 -2
- package/esm2020/src/render3/interfaces/view.mjs +1 -1
- package/esm2020/src/render3/jit/module.mjs +3 -2
- package/esm2020/src/render3/ng_module_ref.mjs +9 -5
- package/esm2020/src/render3/util/discovery_utils.mjs +3 -2
- package/esm2020/src/util/ng_dev_mode.mjs +2 -1
- package/esm2020/src/version.mjs +1 -1
- package/esm2020/src/zone/ng_zone.mjs +62 -1
- package/esm2020/testing/src/logger.mjs +3 -3
- package/esm2020/testing/src/ng_zone_mock.mjs +3 -3
- package/esm2020/testing/src/test_bed_compiler.mjs +4 -4
- package/fesm2015/core.mjs +2354 -1657
- package/fesm2015/core.mjs.map +1 -1
- package/fesm2015/testing.mjs +1910 -1415
- package/fesm2015/testing.mjs.map +1 -1
- package/fesm2020/core.mjs +2288 -1581
- package/fesm2020/core.mjs.map +1 -1
- package/fesm2020/testing.mjs +5085 -4581
- package/fesm2020/testing.mjs.map +1 -1
- package/index.d.ts +370 -400
- package/package.json +1 -1
- package/schematics/ng-generate/standalone-migration/bundle.js +198 -99
- package/schematics/ng-generate/standalone-migration/bundle.js.map +3 -3
- package/testing/index.d.ts +1 -1
|
@@ -6,11 +6,12 @@
|
|
|
6
6
|
* found in the LICENSE file at https://angular.io/license
|
|
7
7
|
*/
|
|
8
8
|
import { collectNativeNodes } from '../render3/collect_native_nodes';
|
|
9
|
-
import {
|
|
9
|
+
import { CONTAINER_HEADER_OFFSET } from '../render3/interfaces/container';
|
|
10
|
+
import { isLContainer, isRootView } from '../render3/interfaces/type_checks';
|
|
10
11
|
import { HEADER_OFFSET, HOST, RENDERER, TVIEW } from '../render3/interfaces/view';
|
|
11
12
|
import { unwrapRNode } from '../render3/util/view_utils';
|
|
12
13
|
import { TransferState } from '../transfer_state';
|
|
13
|
-
import { ELEMENT_CONTAINERS } from './interfaces';
|
|
14
|
+
import { CONTAINERS, ELEMENT_CONTAINERS, NUM_ROOT_NODES, TEMPLATE_ID, TEMPLATES } from './interfaces';
|
|
14
15
|
import { SKIP_HYDRATION_ATTR_NAME } from './skip_hydration';
|
|
15
16
|
import { getComponentLViewForHydration, NGH_ATTR_NAME, NGH_DATA_KEY } from './utils';
|
|
16
17
|
/**
|
|
@@ -38,6 +39,25 @@ class SerializedViewCollection {
|
|
|
38
39
|
return this.views;
|
|
39
40
|
}
|
|
40
41
|
}
|
|
42
|
+
/**
|
|
43
|
+
* Global counter that is used to generate a unique id for TViews
|
|
44
|
+
* during the serialization process.
|
|
45
|
+
*/
|
|
46
|
+
let tViewSsrId = 0;
|
|
47
|
+
/**
|
|
48
|
+
* Generates a unique id for a given TView and returns this id.
|
|
49
|
+
* The id is also stored on this instance of a TView and reused in
|
|
50
|
+
* subsequent calls.
|
|
51
|
+
*
|
|
52
|
+
* This id is needed to uniquely identify and pick up dehydrated views
|
|
53
|
+
* at runtime.
|
|
54
|
+
*/
|
|
55
|
+
function getSsrId(tView) {
|
|
56
|
+
if (!tView.ssrId) {
|
|
57
|
+
tView.ssrId = `t${tViewSsrId++}`;
|
|
58
|
+
}
|
|
59
|
+
return tView.ssrId;
|
|
60
|
+
}
|
|
41
61
|
/**
|
|
42
62
|
* Computes the number of root nodes in a given view
|
|
43
63
|
* (or child nodes in a given container if a tNode is provided).
|
|
@@ -56,6 +76,7 @@ function calcNumRootNodes(tView, lView, tNode) {
|
|
|
56
76
|
*/
|
|
57
77
|
export function annotateForHydration(appRef, doc) {
|
|
58
78
|
const serializedViewCollection = new SerializedViewCollection();
|
|
79
|
+
const corruptedTextNodes = new Map();
|
|
59
80
|
const viewRefs = appRef._views;
|
|
60
81
|
for (const viewRef of viewRefs) {
|
|
61
82
|
const lView = getComponentLViewForHydration(viewRef);
|
|
@@ -66,8 +87,10 @@ export function annotateForHydration(appRef, doc) {
|
|
|
66
87
|
if (hostElement) {
|
|
67
88
|
const context = {
|
|
68
89
|
serializedViewCollection,
|
|
90
|
+
corruptedTextNodes,
|
|
69
91
|
};
|
|
70
92
|
annotateHostElementForHydration(hostElement, lView, context);
|
|
93
|
+
insertCorruptedTextNodeMarkers(corruptedTextNodes, doc);
|
|
71
94
|
}
|
|
72
95
|
}
|
|
73
96
|
}
|
|
@@ -77,6 +100,45 @@ export function annotateForHydration(appRef, doc) {
|
|
|
77
100
|
transferState.set(NGH_DATA_KEY, allSerializedViews);
|
|
78
101
|
}
|
|
79
102
|
}
|
|
103
|
+
/**
|
|
104
|
+
* Serializes the lContainer data into a list of SerializedView objects,
|
|
105
|
+
* that represent views within this lContainer.
|
|
106
|
+
*
|
|
107
|
+
* @param lContainer the lContainer we are serializing
|
|
108
|
+
* @param context the hydration context
|
|
109
|
+
* @returns an array of the `SerializedView` objects
|
|
110
|
+
*/
|
|
111
|
+
function serializeLContainer(lContainer, context) {
|
|
112
|
+
const views = [];
|
|
113
|
+
for (let i = CONTAINER_HEADER_OFFSET; i < lContainer.length; i++) {
|
|
114
|
+
let childLView = lContainer[i];
|
|
115
|
+
// If this is a root view, get an LView for the underlying component,
|
|
116
|
+
// because it contains information about the view to serialize.
|
|
117
|
+
if (isRootView(childLView)) {
|
|
118
|
+
childLView = childLView[HEADER_OFFSET];
|
|
119
|
+
}
|
|
120
|
+
const childTView = childLView[TVIEW];
|
|
121
|
+
let template;
|
|
122
|
+
let numRootNodes = 0;
|
|
123
|
+
if (childTView.type === 1 /* TViewType.Component */) {
|
|
124
|
+
template = childTView.ssrId;
|
|
125
|
+
// This is a component view, thus it has only 1 root node: the component
|
|
126
|
+
// host node itself (other nodes would be inside that host node).
|
|
127
|
+
numRootNodes = 1;
|
|
128
|
+
}
|
|
129
|
+
else {
|
|
130
|
+
template = getSsrId(childTView);
|
|
131
|
+
numRootNodes = calcNumRootNodes(childTView, childLView, childTView.firstChild);
|
|
132
|
+
}
|
|
133
|
+
const view = {
|
|
134
|
+
[TEMPLATE_ID]: template,
|
|
135
|
+
[NUM_ROOT_NODES]: numRootNodes,
|
|
136
|
+
...serializeLView(lContainer[i], context),
|
|
137
|
+
};
|
|
138
|
+
views.push(view);
|
|
139
|
+
}
|
|
140
|
+
return views;
|
|
141
|
+
}
|
|
80
142
|
/**
|
|
81
143
|
* Serializes the lView data into a SerializedView object that will later be added
|
|
82
144
|
* to the TransferState storage and referenced using the `ngh` attribute on a host
|
|
@@ -101,8 +163,26 @@ function serializeLView(lView, context) {
|
|
|
101
163
|
continue;
|
|
102
164
|
}
|
|
103
165
|
if (isLContainer(lView[i])) {
|
|
104
|
-
//
|
|
105
|
-
|
|
166
|
+
// Serialize information about a template.
|
|
167
|
+
const embeddedTView = tNode.tView;
|
|
168
|
+
if (embeddedTView !== null) {
|
|
169
|
+
ngh[TEMPLATES] ?? (ngh[TEMPLATES] = {});
|
|
170
|
+
ngh[TEMPLATES][noOffsetIndex] = getSsrId(embeddedTView);
|
|
171
|
+
}
|
|
172
|
+
// Serialize views within this LContainer.
|
|
173
|
+
const hostNode = lView[i][HOST]; // host node of this container
|
|
174
|
+
// LView[i][HOST] can be of 2 different types:
|
|
175
|
+
// - either a DOM node
|
|
176
|
+
// - or an array that represents an LView of a component
|
|
177
|
+
if (Array.isArray(hostNode)) {
|
|
178
|
+
// This is a component, serialize info about it.
|
|
179
|
+
const targetNode = unwrapRNode(hostNode);
|
|
180
|
+
if (!targetNode.hasAttribute(SKIP_HYDRATION_ATTR_NAME)) {
|
|
181
|
+
annotateHostElementForHydration(targetNode, hostNode, context);
|
|
182
|
+
}
|
|
183
|
+
}
|
|
184
|
+
ngh[CONTAINERS] ?? (ngh[CONTAINERS] = {});
|
|
185
|
+
ngh[CONTAINERS][noOffsetIndex] = serializeLContainer(lView[i], context);
|
|
106
186
|
}
|
|
107
187
|
else if (Array.isArray(lView[i])) {
|
|
108
188
|
// This is a component, annotate the host node with an `ngh` attribute.
|
|
@@ -120,6 +200,43 @@ function serializeLView(lView, context) {
|
|
|
120
200
|
ngh[ELEMENT_CONTAINERS] ?? (ngh[ELEMENT_CONTAINERS] = {});
|
|
121
201
|
ngh[ELEMENT_CONTAINERS][noOffsetIndex] = calcNumRootNodes(tView, lView, tNode.child);
|
|
122
202
|
}
|
|
203
|
+
else {
|
|
204
|
+
// Handle cases where text nodes can be lost after DOM serialization:
|
|
205
|
+
// 1. When there is an *empty text node* in DOM: in this case, this
|
|
206
|
+
// node would not make it into the serialized string and as a result,
|
|
207
|
+
// this node wouldn't be created in a browser. This would result in
|
|
208
|
+
// a mismatch during the hydration, where the runtime logic would expect
|
|
209
|
+
// a text node to be present in live DOM, but no text node would exist.
|
|
210
|
+
// Example: `<span>{{ name }}</span>` when the `name` is an empty string.
|
|
211
|
+
// This would result in `<span></span>` string after serialization and
|
|
212
|
+
// in a browser only the `span` element would be created. To resolve that,
|
|
213
|
+
// an extra comment node is appended in place of an empty text node and
|
|
214
|
+
// that special comment node is replaced with an empty text node *before*
|
|
215
|
+
// hydration.
|
|
216
|
+
// 2. When there are 2 consecutive text nodes present in the DOM.
|
|
217
|
+
// Example: `<div>Hello <ng-container *ngIf="true">world</ng-container></div>`.
|
|
218
|
+
// In this scenario, the live DOM would look like this:
|
|
219
|
+
// <div>#text('Hello ') #text('world') #comment('container')</div>
|
|
220
|
+
// Serialized string would look like this: `<div>Hello world<!--container--></div>`.
|
|
221
|
+
// The live DOM in a browser after that would be:
|
|
222
|
+
// <div>#text('Hello world') #comment('container')</div>
|
|
223
|
+
// Notice how 2 text nodes are now "merged" into one. This would cause hydration
|
|
224
|
+
// logic to fail, since it'd expect 2 text nodes being present, not one.
|
|
225
|
+
// To fix this, we insert a special comment node in between those text nodes, so
|
|
226
|
+
// serialized representation is: `<div>Hello <!--ngtns-->world<!--container--></div>`.
|
|
227
|
+
// This forces browser to create 2 text nodes separated by a comment node.
|
|
228
|
+
// Before running a hydration process, this special comment node is removed, so the
|
|
229
|
+
// live DOM has exactly the same state as it was before serialization.
|
|
230
|
+
if (tNode.type & 1 /* TNodeType.Text */) {
|
|
231
|
+
const rNode = unwrapRNode(lView[i]);
|
|
232
|
+
if (rNode.textContent?.replace(/\s/gm, '') === '') {
|
|
233
|
+
context.corruptedTextNodes.set(rNode, "ngetn" /* TextNodeMarker.EmptyNode */);
|
|
234
|
+
}
|
|
235
|
+
else if (rNode.nextSibling?.nodeType === Node.TEXT_NODE) {
|
|
236
|
+
context.corruptedTextNodes.set(rNode, "ngtns" /* TextNodeMarker.Separator */);
|
|
237
|
+
}
|
|
238
|
+
}
|
|
239
|
+
}
|
|
123
240
|
}
|
|
124
241
|
}
|
|
125
242
|
return ngh;
|
|
@@ -137,4 +254,18 @@ function annotateHostElementForHydration(element, lView, context) {
|
|
|
137
254
|
const renderer = lView[RENDERER];
|
|
138
255
|
renderer.setAttribute(element, NGH_ATTR_NAME, index.toString());
|
|
139
256
|
}
|
|
140
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"annotate.js","sourceRoot":"","sources":["../../../../../../../packages/core/src/hydration/annotate.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 {ApplicationRef} from '../application_ref';\nimport {collectNativeNodes} from '../render3/collect_native_nodes';\nimport {TNode, TNodeType} from '../render3/interfaces/node';\nimport {RElement} from '../render3/interfaces/renderer_dom';\nimport {isLContainer} from '../render3/interfaces/type_checks';\nimport {HEADER_OFFSET, HOST, LView, RENDERER, TView, TVIEW} from '../render3/interfaces/view';\nimport {unwrapRNode} from '../render3/util/view_utils';\nimport {TransferState} from '../transfer_state';\n\nimport {ELEMENT_CONTAINERS, SerializedView} from './interfaces';\nimport {SKIP_HYDRATION_ATTR_NAME} from './skip_hydration';\nimport {getComponentLViewForHydration, NGH_ATTR_NAME, NGH_DATA_KEY} from './utils';\n\n/**\n * A collection that tracks all serialized views (`ngh` DOM annotations)\n * to avoid duplication. An attempt to add a duplicate view results in the\n * collection returning the index of the previously collected serialized view.\n * This reduces the number of annotations needed for a given page.\n */\nclass SerializedViewCollection {\n  private views: SerializedView[] = [];\n  private indexByContent = new Map<string, number>();\n\n  add(serializedView: SerializedView): number {\n    const viewAsString = JSON.stringify(serializedView);\n    if (!this.indexByContent.has(viewAsString)) {\n      const index = this.views.length;\n      this.views.push(serializedView);\n      this.indexByContent.set(viewAsString, index);\n      return index;\n    }\n    return this.indexByContent.get(viewAsString)!;\n  }\n\n  getAll(): SerializedView[] {\n    return this.views;\n  }\n}\n\n/**\n * Describes a context available during the serialization\n * process. The context is used to share and collect information\n * during the serialization.\n */\ninterface HydrationContext {\n  serializedViewCollection: SerializedViewCollection;\n}\n\n/**\n * Computes the number of root nodes in a given view\n * (or child nodes in a given container if a tNode is provided).\n */\nfunction calcNumRootNodes(tView: TView, lView: LView, tNode: TNode|null): number {\n  const rootNodes: unknown[] = [];\n  collectNativeNodes(tView, lView, tNode, rootNodes);\n  return rootNodes.length;\n}\n\n/**\n * Annotates all components bootstrapped in a given ApplicationRef\n * with info needed for hydration.\n *\n * @param appRef An instance of an ApplicationRef.\n * @param doc A reference to the current Document instance.\n */\nexport function annotateForHydration(appRef: ApplicationRef, doc: Document) {\n  const serializedViewCollection = new SerializedViewCollection();\n  const viewRefs = appRef._views;\n  for (const viewRef of viewRefs) {\n    const lView = getComponentLViewForHydration(viewRef);\n    // An `lView` might be `null` if a `ViewRef` represents\n    // an embedded view (not a component view).\n    if (lView !== null) {\n      const hostElement = lView[HOST];\n      if (hostElement) {\n        const context: HydrationContext = {\n          serializedViewCollection,\n        };\n        annotateHostElementForHydration(hostElement as HTMLElement, lView, context);\n      }\n    }\n  }\n  const allSerializedViews = serializedViewCollection.getAll();\n  if (allSerializedViews.length > 0) {\n    const transferState = appRef.injector.get(TransferState);\n    transferState.set(NGH_DATA_KEY, allSerializedViews);\n  }\n}\n\n/**\n * Serializes the lView data into a SerializedView object that will later be added\n * to the TransferState storage and referenced using the `ngh` attribute on a host\n * element.\n *\n * @param lView the lView we are serializing\n * @param context the hydration context\n * @returns the `SerializedView` object containing the data to be added to the host node\n */\nfunction serializeLView(lView: LView, context: HydrationContext): SerializedView {\n  const ngh: SerializedView = {};\n  const tView = lView[TVIEW];\n  // Iterate over DOM element references in an LView.\n  for (let i = HEADER_OFFSET; i < tView.bindingStartIndex; i++) {\n    const tNode = tView.data[i] as TNode;\n    const noOffsetIndex = i - HEADER_OFFSET;\n    // Local refs (e.g. <div #localRef>) take up an extra slot in LViews\n    // to store the same element. In this case, there is no information in\n    // a corresponding slot in TNode data structure. If that's the case, just\n    // skip this slot and move to the next one.\n    if (!tNode) {\n      continue;\n    }\n    if (isLContainer(lView[i])) {\n      // TODO: serialization of LContainers will be added\n      // in followup PRs.\n    } else if (Array.isArray(lView[i])) {\n      // This is a component, annotate the host node with an `ngh` attribute.\n      const targetNode = unwrapRNode(lView[i][HOST]!);\n      if (!(targetNode as HTMLElement).hasAttribute(SKIP_HYDRATION_ATTR_NAME)) {\n        annotateHostElementForHydration(targetNode as RElement, lView[i], context);\n      }\n    } else {\n      // <ng-container> case\n      if (tNode.type & TNodeType.ElementContainer) {\n        // An <ng-container> is represented by the number of\n        // top-level nodes. This information is needed to skip over\n        // those nodes to reach a corresponding anchor node (comment node).\n        ngh[ELEMENT_CONTAINERS] ??= {};\n        ngh[ELEMENT_CONTAINERS][noOffsetIndex] = calcNumRootNodes(tView, lView, tNode.child);\n      }\n    }\n  }\n  return ngh;\n}\n\n/**\n * Physically adds the `ngh` attribute and serialized data to the host element.\n *\n * @param element The Host element to be annotated\n * @param lView The associated LView\n * @param context The hydration context\n */\nfunction annotateHostElementForHydration(\n    element: RElement, lView: LView, context: HydrationContext): void {\n  const ngh = serializeLView(lView, context);\n  const index = context.serializedViewCollection.add(ngh);\n  const renderer = lView[RENDERER];\n  renderer.setAttribute(element, NGH_ATTR_NAME, index.toString());\n}\n"]}
|
|
257
|
+
/**
|
|
258
|
+
* Physically inserts the comment nodes to ensure empty text nodes and adjacent
|
|
259
|
+
* text node separators are preserved after server serialization of the DOM.
|
|
260
|
+
* These get swapped back for empty text nodes or separators once hydration happens
|
|
261
|
+
* on the client.
|
|
262
|
+
*
|
|
263
|
+
* @param corruptedTextNodes The Map of text nodes to be replaced with comments
|
|
264
|
+
* @param doc The document
|
|
265
|
+
*/
|
|
266
|
+
function insertCorruptedTextNodeMarkers(corruptedTextNodes, doc) {
|
|
267
|
+
for (const [textNode, marker] of corruptedTextNodes) {
|
|
268
|
+
textNode.after(doc.createComment(marker));
|
|
269
|
+
}
|
|
270
|
+
}
|
|
271
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"annotate.js","sourceRoot":"","sources":["../../../../../../../packages/core/src/hydration/annotate.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 {ApplicationRef} from '../application_ref';\nimport {collectNativeNodes} from '../render3/collect_native_nodes';\nimport {CONTAINER_HEADER_OFFSET, LContainer} from '../render3/interfaces/container';\nimport {TNode, TNodeType} from '../render3/interfaces/node';\nimport {RElement} from '../render3/interfaces/renderer_dom';\nimport {isLContainer, isRootView} from '../render3/interfaces/type_checks';\nimport {HEADER_OFFSET, HOST, LView, RENDERER, TView, TVIEW, TViewType} from '../render3/interfaces/view';\nimport {unwrapRNode} from '../render3/util/view_utils';\nimport {TransferState} from '../transfer_state';\n\nimport {CONTAINERS, ELEMENT_CONTAINERS, NUM_ROOT_NODES, SerializedContainerView, SerializedView, TEMPLATE_ID, TEMPLATES} from './interfaces';\nimport {SKIP_HYDRATION_ATTR_NAME} from './skip_hydration';\nimport {getComponentLViewForHydration, NGH_ATTR_NAME, NGH_DATA_KEY, TextNodeMarker} from './utils';\n\n/**\n * A collection that tracks all serialized views (`ngh` DOM annotations)\n * to avoid duplication. An attempt to add a duplicate view results in the\n * collection returning the index of the previously collected serialized view.\n * This reduces the number of annotations needed for a given page.\n */\nclass SerializedViewCollection {\n  private views: SerializedView[] = [];\n  private indexByContent = new Map<string, number>();\n\n  add(serializedView: SerializedView): number {\n    const viewAsString = JSON.stringify(serializedView);\n    if (!this.indexByContent.has(viewAsString)) {\n      const index = this.views.length;\n      this.views.push(serializedView);\n      this.indexByContent.set(viewAsString, index);\n      return index;\n    }\n    return this.indexByContent.get(viewAsString)!;\n  }\n\n  getAll(): SerializedView[] {\n    return this.views;\n  }\n}\n\n/**\n * Global counter that is used to generate a unique id for TViews\n * during the serialization process.\n */\nlet tViewSsrId = 0;\n\n/**\n * Generates a unique id for a given TView and returns this id.\n * The id is also stored on this instance of a TView and reused in\n * subsequent calls.\n *\n * This id is needed to uniquely identify and pick up dehydrated views\n * at runtime.\n */\nfunction getSsrId(tView: TView): string {\n  if (!tView.ssrId) {\n    tView.ssrId = `t${tViewSsrId++}`;\n  }\n  return tView.ssrId;\n}\n\n/**\n * Describes a context available during the serialization\n * process. The context is used to share and collect information\n * during the serialization.\n */\ninterface HydrationContext {\n  serializedViewCollection: SerializedViewCollection;\n  corruptedTextNodes: Map<HTMLElement, TextNodeMarker>;\n}\n\n/**\n * Computes the number of root nodes in a given view\n * (or child nodes in a given container if a tNode is provided).\n */\nfunction calcNumRootNodes(tView: TView, lView: LView, tNode: TNode|null): number {\n  const rootNodes: unknown[] = [];\n  collectNativeNodes(tView, lView, tNode, rootNodes);\n  return rootNodes.length;\n}\n\n/**\n * Annotates all components bootstrapped in a given ApplicationRef\n * with info needed for hydration.\n *\n * @param appRef An instance of an ApplicationRef.\n * @param doc A reference to the current Document instance.\n */\nexport function annotateForHydration(appRef: ApplicationRef, doc: Document) {\n  const serializedViewCollection = new SerializedViewCollection();\n  const corruptedTextNodes = new Map<HTMLElement, TextNodeMarker>();\n  const viewRefs = appRef._views;\n  for (const viewRef of viewRefs) {\n    const lView = getComponentLViewForHydration(viewRef);\n    // An `lView` might be `null` if a `ViewRef` represents\n    // an embedded view (not a component view).\n    if (lView !== null) {\n      const hostElement = lView[HOST];\n      if (hostElement) {\n        const context: HydrationContext = {\n          serializedViewCollection,\n          corruptedTextNodes,\n        };\n        annotateHostElementForHydration(hostElement as HTMLElement, lView, context);\n        insertCorruptedTextNodeMarkers(corruptedTextNodes, doc);\n      }\n    }\n  }\n  const allSerializedViews = serializedViewCollection.getAll();\n  if (allSerializedViews.length > 0) {\n    const transferState = appRef.injector.get(TransferState);\n    transferState.set(NGH_DATA_KEY, allSerializedViews);\n  }\n}\n\n/**\n * Serializes the lContainer data into a list of SerializedView objects,\n * that represent views within this lContainer.\n *\n * @param lContainer the lContainer we are serializing\n * @param context the hydration context\n * @returns an array of the `SerializedView` objects\n */\nfunction serializeLContainer(\n    lContainer: LContainer, context: HydrationContext): SerializedContainerView[] {\n  const views: SerializedContainerView[] = [];\n\n  for (let i = CONTAINER_HEADER_OFFSET; i < lContainer.length; i++) {\n    let childLView = lContainer[i] as LView;\n\n    // If this is a root view, get an LView for the underlying component,\n    // because it contains information about the view to serialize.\n    if (isRootView(childLView)) {\n      childLView = childLView[HEADER_OFFSET];\n    }\n    const childTView = childLView[TVIEW];\n\n    let template: string;\n    let numRootNodes = 0;\n    if (childTView.type === TViewType.Component) {\n      template = childTView.ssrId!;\n\n      // This is a component view, thus it has only 1 root node: the component\n      // host node itself (other nodes would be inside that host node).\n      numRootNodes = 1;\n    } else {\n      template = getSsrId(childTView);\n      numRootNodes = calcNumRootNodes(childTView, childLView, childTView.firstChild);\n    }\n\n    const view: SerializedContainerView = {\n      [TEMPLATE_ID]: template,\n      [NUM_ROOT_NODES]: numRootNodes,\n      ...serializeLView(lContainer[i] as LView, context),\n    };\n\n    views.push(view);\n  }\n  return views;\n}\n\n/**\n * Serializes the lView data into a SerializedView object that will later be added\n * to the TransferState storage and referenced using the `ngh` attribute on a host\n * element.\n *\n * @param lView the lView we are serializing\n * @param context the hydration context\n * @returns the `SerializedView` object containing the data to be added to the host node\n */\nfunction serializeLView(lView: LView, context: HydrationContext): SerializedView {\n  const ngh: SerializedView = {};\n  const tView = lView[TVIEW];\n  // Iterate over DOM element references in an LView.\n  for (let i = HEADER_OFFSET; i < tView.bindingStartIndex; i++) {\n    const tNode = tView.data[i] as TNode;\n    const noOffsetIndex = i - HEADER_OFFSET;\n    // Local refs (e.g. <div #localRef>) take up an extra slot in LViews\n    // to store the same element. In this case, there is no information in\n    // a corresponding slot in TNode data structure. If that's the case, just\n    // skip this slot and move to the next one.\n    if (!tNode) {\n      continue;\n    }\n    if (isLContainer(lView[i])) {\n      // Serialize information about a template.\n      const embeddedTView = tNode.tView;\n      if (embeddedTView !== null) {\n        ngh[TEMPLATES] ??= {};\n        ngh[TEMPLATES][noOffsetIndex] = getSsrId(embeddedTView);\n      }\n\n      // Serialize views within this LContainer.\n      const hostNode = lView[i][HOST]!;  // host node of this container\n\n      // LView[i][HOST] can be of 2 different types:\n      // - either a DOM node\n      // - or an array that represents an LView of a component\n      if (Array.isArray(hostNode)) {\n        // This is a component, serialize info about it.\n        const targetNode = unwrapRNode(hostNode as LView) as RElement;\n        if (!(targetNode as HTMLElement).hasAttribute(SKIP_HYDRATION_ATTR_NAME)) {\n          annotateHostElementForHydration(targetNode, hostNode as LView, context);\n        }\n      }\n      ngh[CONTAINERS] ??= {};\n      ngh[CONTAINERS][noOffsetIndex] = serializeLContainer(lView[i], context);\n    } else if (Array.isArray(lView[i])) {\n      // This is a component, annotate the host node with an `ngh` attribute.\n      const targetNode = unwrapRNode(lView[i][HOST]!);\n      if (!(targetNode as HTMLElement).hasAttribute(SKIP_HYDRATION_ATTR_NAME)) {\n        annotateHostElementForHydration(targetNode as RElement, lView[i], context);\n      }\n    } else {\n      // <ng-container> case\n      if (tNode.type & TNodeType.ElementContainer) {\n        // An <ng-container> is represented by the number of\n        // top-level nodes. This information is needed to skip over\n        // those nodes to reach a corresponding anchor node (comment node).\n        ngh[ELEMENT_CONTAINERS] ??= {};\n        ngh[ELEMENT_CONTAINERS][noOffsetIndex] = calcNumRootNodes(tView, lView, tNode.child);\n      } else {\n        // Handle cases where text nodes can be lost after DOM serialization:\n        //  1. When there is an *empty text node* in DOM: in this case, this\n        //     node would not make it into the serialized string and as a result,\n        //     this node wouldn't be created in a browser. This would result in\n        //     a mismatch during the hydration, where the runtime logic would expect\n        //     a text node to be present in live DOM, but no text node would exist.\n        //     Example: `<span>{{ name }}</span>` when the `name` is an empty string.\n        //     This would result in `<span></span>` string after serialization and\n        //     in a browser only the `span` element would be created. To resolve that,\n        //     an extra comment node is appended in place of an empty text node and\n        //     that special comment node is replaced with an empty text node *before*\n        //     hydration.\n        //  2. When there are 2 consecutive text nodes present in the DOM.\n        //     Example: `<div>Hello <ng-container *ngIf=\"true\">world</ng-container></div>`.\n        //     In this scenario, the live DOM would look like this:\n        //       <div>#text('Hello ') #text('world') #comment('container')</div>\n        //     Serialized string would look like this: `<div>Hello world<!--container--></div>`.\n        //     The live DOM in a browser after that would be:\n        //       <div>#text('Hello world') #comment('container')</div>\n        //     Notice how 2 text nodes are now \"merged\" into one. This would cause hydration\n        //     logic to fail, since it'd expect 2 text nodes being present, not one.\n        //     To fix this, we insert a special comment node in between those text nodes, so\n        //     serialized representation is: `<div>Hello <!--ngtns-->world<!--container--></div>`.\n        //     This forces browser to create 2 text nodes separated by a comment node.\n        //     Before running a hydration process, this special comment node is removed, so the\n        //     live DOM has exactly the same state as it was before serialization.\n        if (tNode.type & TNodeType.Text) {\n          const rNode = unwrapRNode(lView[i]) as HTMLElement;\n          if (rNode.textContent?.replace(/\\s/gm, '') === '') {\n            context.corruptedTextNodes.set(rNode, TextNodeMarker.EmptyNode);\n          } else if (rNode.nextSibling?.nodeType === Node.TEXT_NODE) {\n            context.corruptedTextNodes.set(rNode, TextNodeMarker.Separator);\n          }\n        }\n      }\n    }\n  }\n  return ngh;\n}\n\n/**\n * Physically adds the `ngh` attribute and serialized data to the host element.\n *\n * @param element The Host element to be annotated\n * @param lView The associated LView\n * @param context The hydration context\n */\nfunction annotateHostElementForHydration(\n    element: RElement, lView: LView, context: HydrationContext): void {\n  const ngh = serializeLView(lView, context);\n  const index = context.serializedViewCollection.add(ngh);\n  const renderer = lView[RENDERER];\n  renderer.setAttribute(element, NGH_ATTR_NAME, index.toString());\n}\n\n/**\n * Physically inserts the comment nodes to ensure empty text nodes and adjacent\n * text node separators are preserved after server serialization of the DOM.\n * These get swapped back for empty text nodes or separators once hydration happens\n * on the client.\n *\n * @param corruptedTextNodes The Map of text nodes to be replaced with comments\n * @param doc The document\n */\nfunction insertCorruptedTextNodeMarkers(\n    corruptedTextNodes: Map<HTMLElement, string>, doc: Document) {\n  for (const [textNode, marker] of corruptedTextNodes) {\n    textNode.after(doc.createComment(marker));\n  }\n}\n"]}
|
|
@@ -8,11 +8,15 @@
|
|
|
8
8
|
import { PLATFORM_ID } from '../application_tokens';
|
|
9
9
|
import { ENVIRONMENT_INITIALIZER, makeEnvironmentProviders } from '../di';
|
|
10
10
|
import { inject } from '../di/injector_compatibility';
|
|
11
|
+
import { enableLocateOrCreateContainerRefImpl } from '../linker/view_container_ref';
|
|
11
12
|
import { enableLocateOrCreateElementNodeImpl } from '../render3/instructions/element';
|
|
12
13
|
import { enableLocateOrCreateElementContainerNodeImpl } from '../render3/instructions/element_container';
|
|
14
|
+
import { enableApplyRootElementTransformImpl } from '../render3/instructions/shared';
|
|
15
|
+
import { enableLocateOrCreateContainerAnchorImpl } from '../render3/instructions/template';
|
|
13
16
|
import { enableLocateOrCreateTextNodeImpl } from '../render3/instructions/text';
|
|
14
17
|
import { IS_HYDRATION_FEATURE_ENABLED, PRESERVE_HOST_CONTENT } from './tokens';
|
|
15
18
|
import { enableRetrieveHydrationInfoImpl } from './utils';
|
|
19
|
+
import { enableFindMatchingDehydratedViewImpl } from './views';
|
|
16
20
|
/**
|
|
17
21
|
* Indicates whether the hydration-related code was added,
|
|
18
22
|
* prevents adding it multiple times.
|
|
@@ -36,6 +40,10 @@ function enableHydrationRuntimeSupport() {
|
|
|
36
40
|
enableLocateOrCreateElementNodeImpl();
|
|
37
41
|
enableLocateOrCreateTextNodeImpl();
|
|
38
42
|
enableLocateOrCreateElementContainerNodeImpl();
|
|
43
|
+
enableLocateOrCreateContainerAnchorImpl();
|
|
44
|
+
enableLocateOrCreateContainerRefImpl();
|
|
45
|
+
enableFindMatchingDehydratedViewImpl();
|
|
46
|
+
enableApplyRootElementTransformImpl();
|
|
39
47
|
}
|
|
40
48
|
}
|
|
41
49
|
/**
|
|
@@ -117,4 +125,4 @@ export function provideHydrationSupport() {
|
|
|
117
125
|
}
|
|
118
126
|
]);
|
|
119
127
|
}
|
|
120
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
128
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../../../../../packages/core/src/hydration/api.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAC,WAAW,EAAC,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAC,uBAAuB,EAAwB,wBAAwB,EAAC,MAAM,OAAO,CAAC;AAC9F,OAAO,EAAC,MAAM,EAAC,MAAM,8BAA8B,CAAC;AACpD,OAAO,EAAC,oCAAoC,EAAC,MAAM,8BAA8B,CAAC;AAClF,OAAO,EAAC,mCAAmC,EAAC,MAAM,iCAAiC,CAAC;AACpF,OAAO,EAAC,4CAA4C,EAAC,MAAM,2CAA2C,CAAC;AACvG,OAAO,EAAC,mCAAmC,EAAC,MAAM,gCAAgC,CAAC;AACnF,OAAO,EAAC,uCAAuC,EAAC,MAAM,kCAAkC,CAAC;AACzF,OAAO,EAAC,gCAAgC,EAAC,MAAM,8BAA8B,CAAC;AAE9E,OAAO,EAAC,4BAA4B,EAAE,qBAAqB,EAAC,MAAM,UAAU,CAAC;AAC7E,OAAO,EAAC,+BAA+B,EAAC,MAAM,SAAS,CAAC;AACxD,OAAO,EAAC,oCAAoC,EAAC,MAAM,SAAS,CAAC;AAG7D;;;GAGG;AACH,IAAI,yBAAyB,GAAG,KAAK,CAAC;AAEtC;;;;;;;;;;GAUG;AACH,SAAS,6BAA6B;IACpC,IAAI,CAAC,yBAAyB,EAAE;QAC9B,yBAAyB,GAAG,IAAI,CAAC;QACjC,+BAA+B,EAAE,CAAC;QAClC,mCAAmC,EAAE,CAAC;QACtC,gCAAgC,EAAE,CAAC;QACnC,4CAA4C,EAAE,CAAC;QAC/C,uCAAuC,EAAE,CAAC;QAC1C,oCAAoC,EAAE,CAAC;QACvC,oCAAoC,EAAE,CAAC;QACvC,mCAAmC,EAAE,CAAC;KACvC;AACH,CAAC;AAED;;;;GAIG;AACH,SAAS,SAAS;IAChB,OAAO,MAAM,CAAC,WAAW,CAAC,KAAK,SAAS,CAAC;AAC3C,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyCG;AACH,MAAM,UAAU,uBAAuB;IACrC,OAAO,wBAAwB,CAAC;QAC9B;YACE,OAAO,EAAE,uBAAuB;YAChC,QAAQ,EAAE,GAAG,EAAE;gBACb,6DAA6D;gBAC7D,6DAA6D;gBAC7D,8DAA8D;gBAC9D,gEAAgE;gBAChE,SAAS;gBACT,IAAI,SAAS,EAAE,EAAE;oBACf,6BAA6B,EAAE,CAAC;iBACjC;YACH,CAAC;YACD,KAAK,EAAE,IAAI;SACZ;QACD;YACE,OAAO,EAAE,4BAA4B;YACrC,QAAQ,EAAE,IAAI;SACf;QACD;YACE,OAAO,EAAE,qBAAqB;YAC9B,kDAAkD;YAClD,uDAAuD;YACvD,uDAAuD;YACvD,UAAU,EAAE,GAAG,EAAE,CAAC,SAAS,EAAE;SAC9B;KACF,CAAC,CAAC;AACL,CAAC","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 {PLATFORM_ID} from '../application_tokens';\nimport {ENVIRONMENT_INITIALIZER, EnvironmentProviders, makeEnvironmentProviders} from '../di';\nimport {inject} from '../di/injector_compatibility';\nimport {enableLocateOrCreateContainerRefImpl} from '../linker/view_container_ref';\nimport {enableLocateOrCreateElementNodeImpl} from '../render3/instructions/element';\nimport {enableLocateOrCreateElementContainerNodeImpl} from '../render3/instructions/element_container';\nimport {enableApplyRootElementTransformImpl} from '../render3/instructions/shared';\nimport {enableLocateOrCreateContainerAnchorImpl} from '../render3/instructions/template';\nimport {enableLocateOrCreateTextNodeImpl} from '../render3/instructions/text';\n\nimport {IS_HYDRATION_FEATURE_ENABLED, PRESERVE_HOST_CONTENT} from './tokens';\nimport {enableRetrieveHydrationInfoImpl} from './utils';\nimport {enableFindMatchingDehydratedViewImpl} from './views';\n\n\n/**\n * Indicates whether the hydration-related code was added,\n * prevents adding it multiple times.\n */\nlet isHydrationSupportEnabled = false;\n\n/**\n * Brings the necessary hydration code in tree-shakable manner.\n * The code is only present when the `provideHydrationSupport` is\n * invoked. Otherwise, this code is tree-shaken away during the\n * build optimization step.\n *\n * This technique allows us to swap implementations of methods so\n * tree shaking works appropriately when hydration is disabled or\n * enabled. It brings in the appropriate version of the method that\n * supports hydration only when enabled.\n */\nfunction enableHydrationRuntimeSupport() {\n  if (!isHydrationSupportEnabled) {\n    isHydrationSupportEnabled = true;\n    enableRetrieveHydrationInfoImpl();\n    enableLocateOrCreateElementNodeImpl();\n    enableLocateOrCreateTextNodeImpl();\n    enableLocateOrCreateElementContainerNodeImpl();\n    enableLocateOrCreateContainerAnchorImpl();\n    enableLocateOrCreateContainerRefImpl();\n    enableFindMatchingDehydratedViewImpl();\n    enableApplyRootElementTransformImpl();\n  }\n}\n\n/**\n * Detects whether the code is invoked in a browser.\n * Later on, this check should be replaced with a tree-shakable\n * flag (e.g. `!isServer`).\n */\nfunction isBrowser(): boolean {\n  return inject(PLATFORM_ID) === 'browser';\n}\n\n/**\n * Returns a set of providers required to setup hydration support\n * for an application that is server side rendered.\n *\n * ## NgModule-based bootstrap\n *\n * You can add the function call to the root AppModule of an application:\n * ```\n * import {provideHydrationSupport} from '@angular/core';\n *\n * @NgModule({\n *   providers: [\n *     // ... other providers ...\n *     provideHydrationSupport()\n *   ],\n *   declarations: [AppComponent],\n *   bootstrap: [AppComponent]\n * })\n * class AppModule {}\n * ```\n *\n * ## Standalone-based bootstrap\n *\n * Add the function to the `bootstrapApplication` call:\n * ```\n * import {provideHydrationSupport} from '@angular/core';\n *\n * bootstrapApplication(RootComponent, {\n *   providers: [\n *     // ... other providers ...\n *     provideHydrationSupport()\n *   ]\n * });\n * ```\n *\n * The function sets up an internal flag that would be recognized during\n * the server side rendering time as well, so there is no need to\n * configure or change anything in NgUniversal to enable the feature.\n *\n * @publicApi\n * @developerPreview\n */\nexport function provideHydrationSupport(): EnvironmentProviders {\n  return makeEnvironmentProviders([\n    {\n      provide: ENVIRONMENT_INITIALIZER,\n      useValue: () => {\n        // Since this function is used across both server and client,\n        // make sure that the runtime code is only added when invoked\n        // on the client. Moving forward, the `isBrowser` check should\n        // be replaced with a tree-shakable alternative (e.g. `isServer`\n        // flag).\n        if (isBrowser()) {\n          enableHydrationRuntimeSupport();\n        }\n      },\n      multi: true,\n    },\n    {\n      provide: IS_HYDRATION_FEATURE_ENABLED,\n      useValue: true,\n    },\n    {\n      provide: PRESERVE_HOST_CONTENT,\n      // Preserve host element content only in a browser\n      // environment. On a server, an application is rendered\n      // from scratch, so the host content needs to be empty.\n      useFactory: () => isBrowser(),\n    }\n  ]);\n}\n"]}
|
|
@@ -0,0 +1,50 @@
|
|
|
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 { DEHYDRATED_VIEWS } from '../render3/interfaces/container';
|
|
9
|
+
import { PARENT, RENDERER } from '../render3/interfaces/view';
|
|
10
|
+
import { nativeRemoveNode } from '../render3/node_manipulation';
|
|
11
|
+
import { EMPTY_ARRAY } from '../util/empty';
|
|
12
|
+
import { validateSiblingNodeExists } from './error_handling';
|
|
13
|
+
import { NUM_ROOT_NODES } from './interfaces';
|
|
14
|
+
/**
|
|
15
|
+
* Removes all dehydrated views from a given LContainer:
|
|
16
|
+
* both in internal data structure, as well as removing
|
|
17
|
+
* corresponding DOM nodes that belong to that dehydrated view.
|
|
18
|
+
*/
|
|
19
|
+
export function removeDehydratedViews(lContainer) {
|
|
20
|
+
const views = lContainer[DEHYDRATED_VIEWS] ?? [];
|
|
21
|
+
const parentLView = lContainer[PARENT];
|
|
22
|
+
const renderer = parentLView[RENDERER];
|
|
23
|
+
for (const view of views) {
|
|
24
|
+
removeDehydratedView(view, renderer);
|
|
25
|
+
ngDevMode && ngDevMode.dehydratedViewsRemoved++;
|
|
26
|
+
}
|
|
27
|
+
// Reset the value to an empty array to indicate that no
|
|
28
|
+
// further processing of dehydrated views is needed for
|
|
29
|
+
// this view container (i.e. do not trigger the lookup process
|
|
30
|
+
// once again in case a `ViewContainerRef` is created later).
|
|
31
|
+
lContainer[DEHYDRATED_VIEWS] = EMPTY_ARRAY;
|
|
32
|
+
}
|
|
33
|
+
/**
|
|
34
|
+
* Helper function to remove all nodes from a dehydrated view.
|
|
35
|
+
*/
|
|
36
|
+
function removeDehydratedView(dehydratedView, renderer) {
|
|
37
|
+
let nodesRemoved = 0;
|
|
38
|
+
let currentRNode = dehydratedView.firstChild;
|
|
39
|
+
if (currentRNode) {
|
|
40
|
+
const numNodes = dehydratedView.data[NUM_ROOT_NODES];
|
|
41
|
+
while (nodesRemoved < numNodes) {
|
|
42
|
+
ngDevMode && validateSiblingNodeExists(currentRNode);
|
|
43
|
+
const nextSibling = currentRNode.nextSibling;
|
|
44
|
+
nativeRemoveNode(renderer, currentRNode, false);
|
|
45
|
+
currentRNode = nextSibling;
|
|
46
|
+
nodesRemoved++;
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xlYW51cC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2NvcmUvc3JjL2h5ZHJhdGlvbi9jbGVhbnVwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7R0FNRztBQUVILE9BQU8sRUFBQyxnQkFBZ0IsRUFBYSxNQUFNLGlDQUFpQyxDQUFDO0FBRzdFLE9BQU8sRUFBQyxNQUFNLEVBQUUsUUFBUSxFQUFDLE1BQU0sNEJBQTRCLENBQUM7QUFDNUQsT0FBTyxFQUFDLGdCQUFnQixFQUFDLE1BQU0sOEJBQThCLENBQUM7QUFDOUQsT0FBTyxFQUFDLFdBQVcsRUFBQyxNQUFNLGVBQWUsQ0FBQztBQUUxQyxPQUFPLEVBQUMseUJBQXlCLEVBQUMsTUFBTSxrQkFBa0IsQ0FBQztBQUMzRCxPQUFPLEVBQTBCLGNBQWMsRUFBQyxNQUFNLGNBQWMsQ0FBQztBQUVyRTs7OztHQUlHO0FBQ0gsTUFBTSxVQUFVLHFCQUFxQixDQUFDLFVBQXNCO0lBQzFELE1BQU0sS0FBSyxHQUFHLFVBQVUsQ0FBQyxnQkFBZ0IsQ0FBQyxJQUFJLEVBQUUsQ0FBQztJQUNqRCxNQUFNLFdBQVcsR0FBRyxVQUFVLENBQUMsTUFBTSxDQUFDLENBQUM7SUFDdkMsTUFBTSxRQUFRLEdBQUcsV0FBVyxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQ3ZDLEtBQUssTUFBTSxJQUFJLElBQUksS0FBSyxFQUFFO1FBQ3hCLG9CQUFvQixDQUFDLElBQUksRUFBRSxRQUFRLENBQUMsQ0FBQztRQUNyQyxTQUFTLElBQUksU0FBUyxDQUFDLHNCQUFzQixFQUFFLENBQUM7S0FDakQ7SUFDRCx3REFBd0Q7SUFDeEQsdURBQXVEO0lBQ3ZELDhEQUE4RDtJQUM5RCw2REFBNkQ7SUFDN0QsVUFBVSxDQUFDLGdCQUFnQixDQUFDLEdBQUcsV0FBVyxDQUFDO0FBQzdDLENBQUM7QUFFRDs7R0FFRztBQUNILFNBQVMsb0JBQW9CLENBQUMsY0FBdUMsRUFBRSxRQUFrQjtJQUN2RixJQUFJLFlBQVksR0FBRyxDQUFDLENBQUM7SUFDckIsSUFBSSxZQUFZLEdBQUcsY0FBYyxDQUFDLFVBQVUsQ0FBQztJQUM3QyxJQUFJLFlBQVksRUFBRTtRQUNoQixNQUFNLFFBQVEsR0FBRyxjQUFjLENBQUMsSUFBSSxDQUFDLGNBQWMsQ0FBQyxDQUFDO1FBQ3JELE9BQU8sWUFBWSxHQUFHLFFBQVEsRUFBRTtZQUM5QixTQUFTLElBQUkseUJBQXlCLENBQUMsWUFBWSxDQUFDLENBQUM7WUFDckQsTUFBTSxXQUFXLEdBQVUsWUFBWSxDQUFDLFdBQVksQ0FBQztZQUNyRCxnQkFBZ0IsQ0FBQyxRQUFRLEVBQUUsWUFBWSxFQUFFLEtBQUssQ0FBQyxDQUFDO1lBQ2hELFlBQVksR0FBRyxXQUFXLENBQUM7WUFDM0IsWUFBWSxFQUFFLENBQUM7U0FDaEI7S0FDRjtBQUNILENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqIEBsaWNlbnNlXG4gKiBDb3B5cmlnaHQgR29vZ2xlIExMQyBBbGwgUmlnaHRzIFJlc2VydmVkLlxuICpcbiAqIFVzZSBvZiB0aGlzIHNvdXJjZSBjb2RlIGlzIGdvdmVybmVkIGJ5IGFuIE1JVC1zdHlsZSBsaWNlbnNlIHRoYXQgY2FuIGJlXG4gKiBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlIGF0IGh0dHBzOi8vYW5ndWxhci5pby9saWNlbnNlXG4gKi9cblxuaW1wb3J0IHtERUhZRFJBVEVEX1ZJRVdTLCBMQ29udGFpbmVyfSBmcm9tICcuLi9yZW5kZXIzL2ludGVyZmFjZXMvY29udGFpbmVyJztcbmltcG9ydCB7UmVuZGVyZXJ9IGZyb20gJy4uL3JlbmRlcjMvaW50ZXJmYWNlcy9yZW5kZXJlcic7XG5pbXBvcnQge1JOb2RlfSBmcm9tICcuLi9yZW5kZXIzL2ludGVyZmFjZXMvcmVuZGVyZXJfZG9tJztcbmltcG9ydCB7UEFSRU5ULCBSRU5ERVJFUn0gZnJvbSAnLi4vcmVuZGVyMy9pbnRlcmZhY2VzL3ZpZXcnO1xuaW1wb3J0IHtuYXRpdmVSZW1vdmVOb2RlfSBmcm9tICcuLi9yZW5kZXIzL25vZGVfbWFuaXB1bGF0aW9uJztcbmltcG9ydCB7RU1QVFlfQVJSQVl9IGZyb20gJy4uL3V0aWwvZW1wdHknO1xuXG5pbXBvcnQge3ZhbGlkYXRlU2libGluZ05vZGVFeGlzdHN9IGZyb20gJy4vZXJyb3JfaGFuZGxpbmcnO1xuaW1wb3J0IHtEZWh5ZHJhdGVkQ29udGFpbmVyVmlldywgTlVNX1JPT1RfTk9ERVN9IGZyb20gJy4vaW50ZXJmYWNlcyc7XG5cbi8qKlxuICogUmVtb3ZlcyBhbGwgZGVoeWRyYXRlZCB2aWV3cyBmcm9tIGEgZ2l2ZW4gTENvbnRhaW5lcjpcbiAqIGJvdGggaW4gaW50ZXJuYWwgZGF0YSBzdHJ1Y3R1cmUsIGFzIHdlbGwgYXMgcmVtb3ZpbmdcbiAqIGNvcnJlc3BvbmRpbmcgRE9NIG5vZGVzIHRoYXQgYmVsb25nIHRvIHRoYXQgZGVoeWRyYXRlZCB2aWV3LlxuICovXG5leHBvcnQgZnVuY3Rpb24gcmVtb3ZlRGVoeWRyYXRlZFZpZXdzKGxDb250YWluZXI6IExDb250YWluZXIpIHtcbiAgY29uc3Qgdmlld3MgPSBsQ29udGFpbmVyW0RFSFlEUkFURURfVklFV1NdID8/IFtdO1xuICBjb25zdCBwYXJlbnRMVmlldyA9IGxDb250YWluZXJbUEFSRU5UXTtcbiAgY29uc3QgcmVuZGVyZXIgPSBwYXJlbnRMVmlld1tSRU5ERVJFUl07XG4gIGZvciAoY29uc3QgdmlldyBvZiB2aWV3cykge1xuICAgIHJlbW92ZURlaHlkcmF0ZWRWaWV3KHZpZXcsIHJlbmRlcmVyKTtcbiAgICBuZ0Rldk1vZGUgJiYgbmdEZXZNb2RlLmRlaHlkcmF0ZWRWaWV3c1JlbW92ZWQrKztcbiAgfVxuICAvLyBSZXNldCB0aGUgdmFsdWUgdG8gYW4gZW1wdHkgYXJyYXkgdG8gaW5kaWNhdGUgdGhhdCBub1xuICAvLyBmdXJ0aGVyIHByb2Nlc3Npbmcgb2YgZGVoeWRyYXRlZCB2aWV3cyBpcyBuZWVkZWQgZm9yXG4gIC8vIHRoaXMgdmlldyBjb250YWluZXIgKGkuZS4gZG8gbm90IHRyaWdnZXIgdGhlIGxvb2t1cCBwcm9jZXNzXG4gIC8vIG9uY2UgYWdhaW4gaW4gY2FzZSBhIGBWaWV3Q29udGFpbmVyUmVmYCBpcyBjcmVhdGVkIGxhdGVyKS5cbiAgbENvbnRhaW5lcltERUhZRFJBVEVEX1ZJRVdTXSA9IEVNUFRZX0FSUkFZO1xufVxuXG4vKipcbiAqIEhlbHBlciBmdW5jdGlvbiB0byByZW1vdmUgYWxsIG5vZGVzIGZyb20gYSBkZWh5ZHJhdGVkIHZpZXcuXG4gKi9cbmZ1bmN0aW9uIHJlbW92ZURlaHlkcmF0ZWRWaWV3KGRlaHlkcmF0ZWRWaWV3OiBEZWh5ZHJhdGVkQ29udGFpbmVyVmlldywgcmVuZGVyZXI6IFJlbmRlcmVyKSB7XG4gIGxldCBub2Rlc1JlbW92ZWQgPSAwO1xuICBsZXQgY3VycmVudFJOb2RlID0gZGVoeWRyYXRlZFZpZXcuZmlyc3RDaGlsZDtcbiAgaWYgKGN1cnJlbnRSTm9kZSkge1xuICAgIGNvbnN0IG51bU5vZGVzID0gZGVoeWRyYXRlZFZpZXcuZGF0YVtOVU1fUk9PVF9OT0RFU107XG4gICAgd2hpbGUgKG5vZGVzUmVtb3ZlZCA8IG51bU5vZGVzKSB7XG4gICAgICBuZ0Rldk1vZGUgJiYgdmFsaWRhdGVTaWJsaW5nTm9kZUV4aXN0cyhjdXJyZW50Uk5vZGUpO1xuICAgICAgY29uc3QgbmV4dFNpYmxpbmc6IFJOb2RlID0gY3VycmVudFJOb2RlLm5leHRTaWJsaW5nITtcbiAgICAgIG5hdGl2ZVJlbW92ZU5vZGUocmVuZGVyZXIsIGN1cnJlbnRSTm9kZSwgZmFsc2UpO1xuICAgICAgY3VycmVudFJOb2RlID0gbmV4dFNpYmxpbmc7XG4gICAgICBub2Rlc1JlbW92ZWQrKztcbiAgICB9XG4gIH1cbn1cbiJdfQ==
|
|
@@ -10,9 +10,10 @@
|
|
|
10
10
|
* based on internal data structure state.
|
|
11
11
|
*/
|
|
12
12
|
export function validateMatchingNode(node, nodeType, tagName, lView, tNode) {
|
|
13
|
+
validateNodeExists(node);
|
|
13
14
|
if (node.nodeType !== nodeType ||
|
|
14
|
-
|
|
15
|
-
node.tagName.toLowerCase() !== tagName?.toLowerCase())
|
|
15
|
+
node.nodeType === Node.ELEMENT_NODE &&
|
|
16
|
+
node.tagName.toLowerCase() !== tagName?.toLowerCase()) {
|
|
16
17
|
// TODO: improve error message and use RuntimeError instead.
|
|
17
18
|
throw new Error(`Unexpected node found during hydration.`);
|
|
18
19
|
}
|
|
@@ -21,9 +22,16 @@ export function validateMatchingNode(node, nodeType, tagName, lView, tNode) {
|
|
|
21
22
|
* Verifies whether next sibling node exists.
|
|
22
23
|
*/
|
|
23
24
|
export function validateSiblingNodeExists(node) {
|
|
25
|
+
validateNodeExists(node);
|
|
24
26
|
if (!node.nextSibling) {
|
|
25
27
|
// TODO: improve error message and use RuntimeError instead.
|
|
26
28
|
throw new Error(`Unexpected state: insufficient number of sibling nodes.`);
|
|
27
29
|
}
|
|
28
30
|
}
|
|
29
|
-
|
|
31
|
+
export function validateNodeExists(node) {
|
|
32
|
+
if (!node) {
|
|
33
|
+
// TODO: improve error message and use RuntimeError instead.
|
|
34
|
+
throw new Error(`Hydration expected an element to be present at this location.`);
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3JfaGFuZGxpbmcuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9jb3JlL3NyYy9oeWRyYXRpb24vZXJyb3JfaGFuZGxpbmcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7OztHQU1HO0FBTUg7OztHQUdHO0FBQ0gsTUFBTSxVQUFVLG9CQUFvQixDQUNoQyxJQUFXLEVBQUUsUUFBZ0IsRUFBRSxPQUFvQixFQUFFLEtBQVksRUFBRSxLQUFZO0lBQ2pGLGtCQUFrQixDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3pCLElBQUssSUFBYSxDQUFDLFFBQVEsS0FBSyxRQUFRO1FBQ25DLElBQWEsQ0FBQyxRQUFRLEtBQUssSUFBSSxDQUFDLFlBQVk7WUFDeEMsSUFBb0IsQ0FBQyxPQUFPLENBQUMsV0FBVyxFQUFFLEtBQUssT0FBTyxFQUFFLFdBQVcsRUFBRSxFQUFFO1FBQzlFLDREQUE0RDtRQUM1RCxNQUFNLElBQUksS0FBSyxDQUFDLHlDQUF5QyxDQUFDLENBQUM7S0FDNUQ7QUFDSCxDQUFDO0FBRUQ7O0dBRUc7QUFDSCxNQUFNLFVBQVUseUJBQXlCLENBQUMsSUFBZ0I7SUFDeEQsa0JBQWtCLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDekIsSUFBSSxDQUFFLElBQWMsQ0FBQyxXQUFXLEVBQUU7UUFDaEMsNERBQTREO1FBQzVELE1BQU0sSUFBSSxLQUFLLENBQUMseURBQXlELENBQUMsQ0FBQztLQUM1RTtBQUNILENBQUM7QUFFRCxNQUFNLFVBQVUsa0JBQWtCLENBQUMsSUFBZ0I7SUFDakQsSUFBSSxDQUFDLElBQUksRUFBRTtRQUNULDREQUE0RDtRQUM1RCxNQUFNLElBQUksS0FBSyxDQUFDLCtEQUErRCxDQUFDLENBQUM7S0FDbEY7QUFDSCxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBMTEMgQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5cbmltcG9ydCB7VE5vZGV9IGZyb20gJy4uL3JlbmRlcjMvaW50ZXJmYWNlcy9ub2RlJztcbmltcG9ydCB7Uk5vZGV9IGZyb20gJy4uL3JlbmRlcjMvaW50ZXJmYWNlcy9yZW5kZXJlcl9kb20nO1xuaW1wb3J0IHtMVmlld30gZnJvbSAnLi4vcmVuZGVyMy9pbnRlcmZhY2VzL3ZpZXcnO1xuXG4vKipcbiAqIFZlcmlmaWVzIHdoZXRoZXIgYSBnaXZlbiBub2RlIG1hdGNoZXMgYW4gZXhwZWN0ZWQgY3JpdGVyaWEsXG4gKiBiYXNlZCBvbiBpbnRlcm5hbCBkYXRhIHN0cnVjdHVyZSBzdGF0ZS5cbiAqL1xuZXhwb3J0IGZ1bmN0aW9uIHZhbGlkYXRlTWF0Y2hpbmdOb2RlKFxuICAgIG5vZGU6IFJOb2RlLCBub2RlVHlwZTogbnVtYmVyLCB0YWdOYW1lOiBzdHJpbmd8bnVsbCwgbFZpZXc6IExWaWV3LCB0Tm9kZTogVE5vZGUpOiB2b2lkIHtcbiAgdmFsaWRhdGVOb2RlRXhpc3RzKG5vZGUpO1xuICBpZiAoKG5vZGUgYXMgTm9kZSkubm9kZVR5cGUgIT09IG5vZGVUeXBlIHx8XG4gICAgICAobm9kZSBhcyBOb2RlKS5ub2RlVHlwZSA9PT0gTm9kZS5FTEVNRU5UX05PREUgJiZcbiAgICAgICAgICAobm9kZSBhcyBIVE1MRWxlbWVudCkudGFnTmFtZS50b0xvd2VyQ2FzZSgpICE9PSB0YWdOYW1lPy50b0xvd2VyQ2FzZSgpKSB7XG4gICAgLy8gVE9ETzogaW1wcm92ZSBlcnJvciBtZXNzYWdlIGFuZCB1c2UgUnVudGltZUVycm9yIGluc3RlYWQuXG4gICAgdGhyb3cgbmV3IEVycm9yKGBVbmV4cGVjdGVkIG5vZGUgZm91bmQgZHVyaW5nIGh5ZHJhdGlvbi5gKTtcbiAgfVxufVxuXG4vKipcbiAqIFZlcmlmaWVzIHdoZXRoZXIgbmV4dCBzaWJsaW5nIG5vZGUgZXhpc3RzLlxuICovXG5leHBvcnQgZnVuY3Rpb24gdmFsaWRhdGVTaWJsaW5nTm9kZUV4aXN0cyhub2RlOiBSTm9kZXxudWxsKTogdm9pZCB7XG4gIHZhbGlkYXRlTm9kZUV4aXN0cyhub2RlKTtcbiAgaWYgKCEobm9kZSBhcyBSTm9kZSkubmV4dFNpYmxpbmcpIHtcbiAgICAvLyBUT0RPOiBpbXByb3ZlIGVycm9yIG1lc3NhZ2UgYW5kIHVzZSBSdW50aW1lRXJyb3IgaW5zdGVhZC5cbiAgICB0aHJvdyBuZXcgRXJyb3IoYFVuZXhwZWN0ZWQgc3RhdGU6IGluc3VmZmljaWVudCBudW1iZXIgb2Ygc2libGluZyBub2Rlcy5gKTtcbiAgfVxufVxuXG5leHBvcnQgZnVuY3Rpb24gdmFsaWRhdGVOb2RlRXhpc3RzKG5vZGU6IFJOb2RlfG51bGwpOiB2b2lkIHtcbiAgaWYgKCFub2RlKSB7XG4gICAgLy8gVE9ETzogaW1wcm92ZSBlcnJvciBtZXNzYWdlIGFuZCB1c2UgUnVudGltZUVycm9yIGluc3RlYWQuXG4gICAgdGhyb3cgbmV3IEVycm9yKGBIeWRyYXRpb24gZXhwZWN0ZWQgYW4gZWxlbWVudCB0byBiZSBwcmVzZW50IGF0IHRoaXMgbG9jYXRpb24uYCk7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -5,6 +5,13 @@
|
|
|
5
5
|
* Use of this source code is governed by an MIT-style license that can be
|
|
6
6
|
* found in the LICENSE file at https://angular.io/license
|
|
7
7
|
*/
|
|
8
|
-
|
|
8
|
+
/**
|
|
9
|
+
* Keys within serialized view data structure to represent various
|
|
10
|
+
* parts. See the `SerializedView` interface below for additional information.
|
|
11
|
+
*/
|
|
9
12
|
export const ELEMENT_CONTAINERS = 'e';
|
|
10
|
-
|
|
13
|
+
export const TEMPLATES = 't';
|
|
14
|
+
export const CONTAINERS = 'c';
|
|
15
|
+
export const NUM_ROOT_NODES = 'r';
|
|
16
|
+
export const TEMPLATE_ID = 'i'; // as it's also an "id"
|
|
17
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZXJmYWNlcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2NvcmUvc3JjL2h5ZHJhdGlvbi9pbnRlcmZhY2VzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7R0FNRztBQUlIOzs7R0FHRztBQUNILE1BQU0sQ0FBQyxNQUFNLGtCQUFrQixHQUFHLEdBQUcsQ0FBQztBQUN0QyxNQUFNLENBQUMsTUFBTSxTQUFTLEdBQUcsR0FBRyxDQUFDO0FBQzdCLE1BQU0sQ0FBQyxNQUFNLFVBQVUsR0FBRyxHQUFHLENBQUM7QUFDOUIsTUFBTSxDQUFDLE1BQU0sY0FBYyxHQUFHLEdBQUcsQ0FBQztBQUNsQyxNQUFNLENBQUMsTUFBTSxXQUFXLEdBQUcsR0FBRyxDQUFDLENBQUUsdUJBQXVCIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBMTEMgQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5cbmltcG9ydCB7Uk5vZGV9IGZyb20gJy4uL3JlbmRlcjMvaW50ZXJmYWNlcy9yZW5kZXJlcl9kb20nO1xuXG4vKipcbiAqIEtleXMgd2l0aGluIHNlcmlhbGl6ZWQgdmlldyBkYXRhIHN0cnVjdHVyZSB0byByZXByZXNlbnQgdmFyaW91c1xuICogcGFydHMuIFNlZSB0aGUgYFNlcmlhbGl6ZWRWaWV3YCBpbnRlcmZhY2UgYmVsb3cgZm9yIGFkZGl0aW9uYWwgaW5mb3JtYXRpb24uXG4gKi9cbmV4cG9ydCBjb25zdCBFTEVNRU5UX0NPTlRBSU5FUlMgPSAnZSc7XG5leHBvcnQgY29uc3QgVEVNUExBVEVTID0gJ3QnO1xuZXhwb3J0IGNvbnN0IENPTlRBSU5FUlMgPSAnYyc7XG5leHBvcnQgY29uc3QgTlVNX1JPT1RfTk9ERVMgPSAncic7XG5leHBvcnQgY29uc3QgVEVNUExBVEVfSUQgPSAnaSc7ICAvLyBhcyBpdCdzIGFsc28gYW4gXCJpZFwiXG5cbi8qKlxuICogUmVwcmVzZW50cyBlbGVtZW50IGNvbnRhaW5lcnMgd2l0aGluIHRoaXMgdmlldywgc3RvcmVkIGFzIGtleS12YWx1ZSBwYWlyc1xuICogd2hlcmUga2V5IGlzIGFuIGluZGV4IG9mIGEgY29udGFpbmVyIGluIGFuIExWaWV3IChhbHNvIHVzZWQgaW4gdGhlXG4gKiBgZWxlbWVudENvbnRhaW5lclN0YXJ0YCBpbnN0cnVjdGlvbiksIHRoZSB2YWx1ZSBpcyB0aGUgbnVtYmVyIG9mIHJvb3Qgbm9kZXNcbiAqIGluIHRoaXMgY29udGFpbmVyLiBUaGlzIGluZm9ybWF0aW9uIGlzIG5lZWRlZCB0byBsb2NhdGUgYW4gYW5jaG9yIGNvbW1lbnRcbiAqIG5vZGUgdGhhdCBnb2VzIGFmdGVyIGFsbCBjb250YWluZXIgbm9kZXMuXG4gKi9cbmV4cG9ydCBpbnRlcmZhY2UgU2VyaWFsaXplZEVsZW1lbnRDb250YWluZXJzIHtcbiAgW2tleTogbnVtYmVyXTogbnVtYmVyO1xufVxuXG4vKipcbiAqIFNlcmlhbGl6ZWQgZGF0YSBzdHJ1Y3R1cmUgdGhhdCBjb250YWlucyByZWxldmFudCBoeWRyYXRpb25cbiAqIGFubm90YXRpb24gaW5mb3JtYXRpb24gdGhhdCBkZXNjcmliZXMgYSBnaXZlbiBoeWRyYXRpb24gYm91bmRhcnlcbiAqIChlLmcuIGEgY29tcG9uZW50KS5cbiAqL1xuZXhwb3J0IGludGVyZmFjZSBTZXJpYWxpemVkVmlldyB7XG4gIC8qKlxuICAgKiBTZXJpYWxpemVkIGluZm9ybWF0aW9uIGFib3V0IDxuZy1jb250YWluZXI+cy5cbiAgICovXG4gIFtFTEVNRU5UX0NPTlRBSU5FUlNdPzogU2VyaWFsaXplZEVsZW1lbnRDb250YWluZXJzO1xuXG4gIC8qKlxuICAgKiBTZXJpYWxpemVkIGluZm9ybWF0aW9uIGFib3V0IHRlbXBsYXRlcy5cbiAgICogS2V5LXZhbHVlIHBhaXJzIHdoZXJlIGEga2V5IGlzIGFuIGluZGV4IG9mIHRoZSBjb3JyZXNwb25kaW5nXG4gICAqIGB0ZW1wbGF0ZWAgaW5zdHJ1Y3Rpb24gYW5kIHRoZSB2YWx1ZSBpcyBhIHVuaXF1ZSBpZCB0aGF0IGNhblxuICAgKiBiZSB1c2VkIGR1cmluZyBoeWRyYXRpb24gdG8gaWRlbnRpZnkgdGhhdCB0ZW1wbGF0ZS5cbiAgICovXG4gIFtURU1QTEFURVNdPzogUmVjb3JkPG51bWJlciwgc3RyaW5nPjtcblxuICAvKipcbiAgICogU2VyaWFsaXplZCBpbmZvcm1hdGlvbiBhYm91dCB2aWV3IGNvbnRhaW5lcnMuXG4gICAqIEtleS12YWx1ZSBwYWlycyB3aGVyZSBhIGtleSBpcyBhbiBpbmRleCBvZiB0aGUgY29ycmVzcG9uZGluZ1xuICAgKiBMQ29udGFpbmVyIGVudHJ5IHdpdGhpbiBhbiBMVmlldywgYW5kIHRoZSB2YWx1ZSBpcyBhIGxpc3RcbiAgICogb2Ygc2VyaWFsaXplZCBpbmZvcm1hdGlvbiBhYm91dCB2aWV3cyB3aXRoaW4gdGhpcyBjb250YWluZXIuXG4gICAqL1xuICBbQ09OVEFJTkVSU10/OiBSZWNvcmQ8bnVtYmVyLCBTZXJpYWxpemVkQ29udGFpbmVyVmlld1tdPjtcbn1cblxuLyoqXG4gKiBTZXJpYWxpemVkIGRhdGEgc3RydWN0dXJlIHRoYXQgY29udGFpbnMgcmVsZXZhbnQgaHlkcmF0aW9uXG4gKiBhbm5vdGF0aW9uIGluZm9ybWF0aW9uIGFib3V0IGEgdmlldyB0aGF0IGlzIGEgcGFydCBvZiBhXG4gKiBWaWV3Q29udGFpbmVyIGNvbGxlY3Rpb24uXG4gKi9cbmV4cG9ydCBpbnRlcmZhY2UgU2VyaWFsaXplZENvbnRhaW5lclZpZXcgZXh0ZW5kcyBTZXJpYWxpemVkVmlldyB7XG4gIC8qKlxuICAgKiBVbmlxdWUgaWQgdGhhdCByZXByZXNlbnRzIGEgVFZpZXcgdGhhdCB3YXMgdXNlZCB0byBjcmVhdGVcbiAgICogYSBnaXZlbiBpbnN0YW5jZSBvZiBhIHZpZXc6XG4gICAqICAtIFRWaWV3VHlwZS5FbWJlZGRlZDogYSB1bmlxdWUgaWQgZ2VuZXJhdGVkIGR1cmluZyBzZXJpYWxpemF0aW9uIG9uIHRoZSBzZXJ2ZXJcbiAgICogIC0gVFZpZXdUeXBlLkNvbXBvbmVudDogYW4gaWQgZ2VuZXJhdGVkIGJhc2VkIG9uIGNvbXBvbmVudCBwcm9wZXJ0aWVzXG4gICAqICAgICAgICAgICAgICAgICAgICAgICAgKHNlZSBgZ2V0Q29tcG9uZW50SWRgIGZ1bmN0aW9uIGZvciBkZXRhaWxzKVxuICAgKi9cbiAgW1RFTVBMQVRFX0lEXTogc3RyaW5nO1xuXG4gIC8qKlxuICAgKiBOdW1iZXIgb2Ygcm9vdCBub2RlcyB0aGF0IGJlbG9uZyB0byB0aGlzIHZpZXcuXG4gICAqIFRoaXMgaW5mb3JtYXRpb24gaXMgbmVlZGVkIHRvIGVmZmVjdGl2ZWx5IHRyYXZlcnNlIHRoZSBET00gdHJlZVxuICAgKiBhbmQgaWRlbnRpZnkgc2VnbWVudHMgdGhhdCBiZWxvbmcgdG8gZGlmZmVyZW50IHZpZXdzLlxuICAgKi9cbiAgW05VTV9ST09UX05PREVTXTogbnVtYmVyO1xufVxuXG4vKipcbiAqIEFuIG9iamVjdCB0aGF0IGNvbnRhaW5zIGh5ZHJhdGlvbi1yZWxhdGVkIGluZm9ybWF0aW9uIHNlcmlhbGl6ZWRcbiAqIG9uIHRoZSBzZXJ2ZXIsIGFzIHdlbGwgYXMgdGhlIG5lY2Vzc2FyeSByZWZlcmVuY2VzIHRvIHNlZ21lbnRzIG9mXG4gKiB0aGUgRE9NLCB0byBmYWNpbGl0YXRlIHRoZSBoeWRyYXRpb24gcHJvY2VzcyBmb3IgYSBnaXZlbiBoeWRyYXRpb25cbiAqIGJvdW5kYXJ5IG9uIHRoZSBjbGllbnQuXG4gKi9cbmV4cG9ydCBpbnRlcmZhY2UgRGVoeWRyYXRlZFZpZXcge1xuICAvKipcbiAgICogVGhlIHJlYWRvbmx5IGh5ZHJhdGlvbiBhbm5vdGF0aW9uIGRhdGEuXG4gICAqL1xuICBkYXRhOiBSZWFkb25seTxTZXJpYWxpemVkVmlldz47XG5cbiAgLyoqXG4gICAqIEEgcmVmZXJlbmNlIHRvIHRoZSBmaXJzdCBjaGlsZCBpbiBhIERPTSBzZWdtZW50IGFzc29jaWF0ZWRcbiAgICogd2l0aCBhIGdpdmVuIGh5ZHJhdGlvbiBib3VuZGFyeS5cbiAgICovXG4gIGZpcnN0Q2hpbGQ6IFJOb2RlfG51bGw7XG5cbiAgLyoqXG4gICAqIFN0b3JlcyByZWZlcmVuY2VzIHRvIGZpcnN0IG5vZGVzIGluIERPTSBzZWdtZW50cyB0aGF0XG4gICAqIHJlcHJlc2VudCBlaXRoZXIgYW4gPG5nLWNvbnRhaW5lcj4gb3IgYSB2aWV3IGNvbnRhaW5lci5cbiAgICovXG4gIHNlZ21lbnRIZWFkcz86IHtbaW5kZXg6IG51bWJlcl06IFJOb2RlfG51bGx9O1xufVxuXG4vKipcbiAqIEFuIG9iamVjdCB0aGF0IGNvbnRhaW5zIGh5ZHJhdGlvbi1yZWxhdGVkIGluZm9ybWF0aW9uIHNlcmlhbGl6ZWRcbiAqIG9uIHRoZSBzZXJ2ZXIsIGFzIHdlbGwgYXMgdGhlIG5lY2Vzc2FyeSByZWZlcmVuY2VzIHRvIHNlZ21lbnRzIG9mXG4gKiB0aGUgRE9NLCB0byBmYWNpbGl0YXRlIHRoZSBoeWRyYXRpb24gcHJvY2VzcyBmb3IgYSBnaXZlbiB2aWV3XG4gKiBpbnNpZGUgYSB2aWV3IGNvbnRhaW5lciAoZWl0aGVyIGFuIGVtYmVkZGVkIHZpZXcgb3IgYSB2aWV3IGNyZWF0ZWRcbiAqIGZvciBhIGNvbXBvbmVudCkuXG4gKi9cbmV4cG9ydCBpbnRlcmZhY2UgRGVoeWRyYXRlZENvbnRhaW5lclZpZXcgZXh0ZW5kcyBEZWh5ZHJhdGVkVmlldyB7XG4gIGRhdGE6IFJlYWRvbmx5PFNlcmlhbGl6ZWRDb250YWluZXJWaWV3Pjtcbn1cbiJdfQ==
|
|
@@ -9,19 +9,11 @@ import { HEADER_OFFSET } from '../render3/interfaces/view';
|
|
|
9
9
|
import { getNativeByTNode } from '../render3/util/view_utils';
|
|
10
10
|
import { assertDefined } from '../util/assert';
|
|
11
11
|
import { validateSiblingNodeExists } from './error_handling';
|
|
12
|
+
import { calcSerializedContainerSize, getSegmentHead } from './utils';
|
|
12
13
|
/** Whether current TNode is a first node in an <ng-container>. */
|
|
13
14
|
function isFirstElementInNgContainer(tNode) {
|
|
14
15
|
return !tNode.prev && tNode.parent?.type === 8 /* TNodeType.ElementContainer */;
|
|
15
16
|
}
|
|
16
|
-
/** Returns first element from a DOM segment that corresponds to this <ng-container>. */
|
|
17
|
-
function getDehydratedNgContainer(hydrationInfo, tContainerNode) {
|
|
18
|
-
const noOffsetIndex = tContainerNode.index - HEADER_OFFSET;
|
|
19
|
-
const ngContainer = hydrationInfo.ngContainers?.[noOffsetIndex];
|
|
20
|
-
ngDevMode &&
|
|
21
|
-
assertDefined(ngContainer, 'Unexpected state: no hydration info available for a given TNode, ' +
|
|
22
|
-
'which represents an element container.');
|
|
23
|
-
return ngContainer;
|
|
24
|
-
}
|
|
25
17
|
/**
|
|
26
18
|
* Locate a node in DOM tree that corresponds to a given TNode.
|
|
27
19
|
*
|
|
@@ -45,17 +37,33 @@ export function locateNextRNode(hydrationInfo, tView, lView, tNode) {
|
|
|
45
37
|
ngDevMode &&
|
|
46
38
|
assertDefined(previousTNode, 'Unexpected state: current TNode does not have a connection ' +
|
|
47
39
|
'to the previous node or a parent node.');
|
|
48
|
-
const previousRElement = getNativeByTNode(previousTNode, lView);
|
|
49
40
|
if (isFirstElementInNgContainer(tNode)) {
|
|
50
|
-
const
|
|
51
|
-
native =
|
|
41
|
+
const noOffsetParentIndex = tNode.parent.index - HEADER_OFFSET;
|
|
42
|
+
native = getSegmentHead(hydrationInfo, noOffsetParentIndex);
|
|
52
43
|
}
|
|
53
44
|
else {
|
|
45
|
+
let previousRElement = getNativeByTNode(previousTNode, lView);
|
|
54
46
|
if (previousTNodeParent) {
|
|
55
47
|
native = previousRElement.firstChild;
|
|
56
48
|
}
|
|
57
49
|
else {
|
|
58
|
-
|
|
50
|
+
// If the previous node is an element, but it also has container info,
|
|
51
|
+
// this means that we are processing a node like `<div #vcrTarget>`, which is
|
|
52
|
+
// represented in the DOM as `<div></div>...<!--container-->`.
|
|
53
|
+
// In this case, there are nodes *after* this element and we need to skip
|
|
54
|
+
// all of them to reach an element that we are looking for.
|
|
55
|
+
const noOffsetPrevSiblingIndex = previousTNode.index - HEADER_OFFSET;
|
|
56
|
+
const segmentHead = getSegmentHead(hydrationInfo, noOffsetPrevSiblingIndex);
|
|
57
|
+
if (previousTNode.type === 2 /* TNodeType.Element */ && segmentHead) {
|
|
58
|
+
const numRootNodesToSkip = calcSerializedContainerSize(hydrationInfo, noOffsetPrevSiblingIndex);
|
|
59
|
+
// `+1` stands for an anchor comment node after all the views in this container.
|
|
60
|
+
const nodesToSkip = numRootNodesToSkip + 1;
|
|
61
|
+
// First node after this segment.
|
|
62
|
+
native = siblingAfter(nodesToSkip, segmentHead);
|
|
63
|
+
}
|
|
64
|
+
else {
|
|
65
|
+
native = previousRElement.nextSibling;
|
|
66
|
+
}
|
|
59
67
|
}
|
|
60
68
|
}
|
|
61
69
|
}
|
|
@@ -72,4 +80,4 @@ export function siblingAfter(skip, from) {
|
|
|
72
80
|
}
|
|
73
81
|
return currentNode;
|
|
74
82
|
}
|
|
75
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
83
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm9kZV9sb29rdXBfdXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9jb3JlL3NyYy9oeWRyYXRpb24vbm9kZV9sb29rdXBfdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7OztHQU1HO0FBSUgsT0FBTyxFQUFDLGFBQWEsRUFBZSxNQUFNLDRCQUE0QixDQUFDO0FBQ3ZFLE9BQU8sRUFBQyxnQkFBZ0IsRUFBQyxNQUFNLDRCQUE0QixDQUFDO0FBQzVELE9BQU8sRUFBQyxhQUFhLEVBQUMsTUFBTSxnQkFBZ0IsQ0FBQztBQUU3QyxPQUFPLEVBQUMseUJBQXlCLEVBQUMsTUFBTSxrQkFBa0IsQ0FBQztBQUUzRCxPQUFPLEVBQUMsMkJBQTJCLEVBQUUsY0FBYyxFQUFDLE1BQU0sU0FBUyxDQUFDO0FBRXBFLGtFQUFrRTtBQUNsRSxTQUFTLDJCQUEyQixDQUFDLEtBQVk7SUFDL0MsT0FBTyxDQUFDLEtBQUssQ0FBQyxJQUFJLElBQUksS0FBSyxDQUFDLE1BQU0sRUFBRSxJQUFJLHVDQUErQixDQUFDO0FBQzFFLENBQUM7QUFFRDs7Ozs7Ozs7R0FRRztBQUNILE1BQU0sVUFBVSxlQUFlLENBQzNCLGFBQTZCLEVBQUUsS0FBWSxFQUFFLEtBQXFCLEVBQUUsS0FBWTtJQUNsRixJQUFJLE1BQU0sR0FBZSxJQUFJLENBQUM7SUFDOUIsSUFBSSxLQUFLLENBQUMsVUFBVSxLQUFLLEtBQUssRUFBRTtRQUM5Qiw2REFBNkQ7UUFDN0QsMENBQTBDO1FBQzFDLE1BQU0sR0FBRyxhQUFhLENBQUMsVUFBVSxDQUFDO0tBQ25DO1NBQU07UUFDTCw4REFBOEQ7UUFDOUQsTUFBTSxtQkFBbUIsR0FBRyxLQUFLLENBQUMsSUFBSSxLQUFLLElBQUksQ0FBQztRQUNoRCxNQUFNLGFBQWEsR0FBRyxDQUFDLEtBQUssQ0FBQyxJQUFJLElBQUksS0FBSyxDQUFDLE1BQU0sQ0FBRSxDQUFDO1FBQ3BELFNBQVM7WUFDTCxhQUFhLENBQ1QsYUFBYSxFQUNiLDZEQUE2RDtnQkFDekQsd0NBQXdDLENBQUMsQ0FBQztRQUN0RCxJQUFJLDJCQUEyQixDQUFDLEtBQUssQ0FBQyxFQUFFO1lBQ3RDLE1BQU0sbUJBQW1CLEdBQUcsS0FBSyxDQUFDLE1BQU8sQ0FBQyxLQUFLLEdBQUcsYUFBYSxDQUFDO1lBQ2hFLE1BQU0sR0FBRyxjQUFjLENBQUMsYUFBYSxFQUFFLG1CQUFtQixDQUFDLENBQUM7U0FDN0Q7YUFBTTtZQUNMLElBQUksZ0JBQWdCLEdBQUcsZ0JBQWdCLENBQUMsYUFBYSxFQUFFLEtBQUssQ0FBQyxDQUFDO1lBQzlELElBQUksbUJBQW1CLEVBQUU7Z0JBQ3ZCLE1BQU0sR0FBSSxnQkFBNkIsQ0FBQyxVQUFVLENBQUM7YUFDcEQ7aUJBQU07Z0JBQ0wsc0VBQXNFO2dCQUN0RSw2RUFBNkU7Z0JBQzdFLDhEQUE4RDtnQkFDOUQseUVBQXlFO2dCQUN6RSwyREFBMkQ7Z0JBQzNELE1BQU0sd0JBQXdCLEdBQUcsYUFBYSxDQUFDLEtBQUssR0FBRyxhQUFhLENBQUM7Z0JBQ3JFLE1BQU0sV0FBVyxHQUFHLGNBQWMsQ0FBQyxhQUFhLEVBQUUsd0JBQXdCLENBQUMsQ0FBQztnQkFDNUUsSUFBSSxhQUFhLENBQUMsSUFBSSw4QkFBc0IsSUFBSSxXQUFXLEVBQUU7b0JBQzNELE1BQU0sa0JBQWtCLEdBQ3BCLDJCQUEyQixDQUFDLGFBQWEsRUFBRSx3QkFBd0IsQ0FBQyxDQUFDO29CQUN6RSxnRkFBZ0Y7b0JBQ2hGLE1BQU0sV0FBVyxHQUFHLGtCQUFrQixHQUFHLENBQUMsQ0FBQztvQkFDM0MsaUNBQWlDO29CQUNqQyxNQUFNLEdBQUcsWUFBWSxDQUFDLFdBQVcsRUFBRSxXQUFXLENBQUMsQ0FBQztpQkFDakQ7cUJBQU07b0JBQ0wsTUFBTSxHQUFHLGdCQUFnQixDQUFDLFdBQVcsQ0FBQztpQkFDdkM7YUFDRjtTQUNGO0tBQ0Y7SUFDRCxPQUFPLE1BQVcsQ0FBQztBQUNyQixDQUFDO0FBRUQ7O0dBRUc7QUFDSCxNQUFNLFVBQVUsWUFBWSxDQUFrQixJQUFZLEVBQUUsSUFBVztJQUNyRSxJQUFJLFdBQVcsR0FBRyxJQUFJLENBQUM7SUFDdkIsS0FBSyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxHQUFHLElBQUksRUFBRSxDQUFDLEVBQUUsRUFBRTtRQUM3QixTQUFTLElBQUkseUJBQXlCLENBQUMsV0FBVyxDQUFDLENBQUM7UUFDcEQsV0FBVyxHQUFHLFdBQVcsQ0FBQyxXQUFZLENBQUM7S0FDeEM7SUFDRCxPQUFPLFdBQWdCLENBQUM7QUFDMUIsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogQGxpY2Vuc2VcbiAqIENvcHlyaWdodCBHb29nbGUgTExDIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogVXNlIG9mIHRoaXMgc291cmNlIGNvZGUgaXMgZ292ZXJuZWQgYnkgYW4gTUlULXN0eWxlIGxpY2Vuc2UgdGhhdCBjYW4gYmVcbiAqIGZvdW5kIGluIHRoZSBMSUNFTlNFIGZpbGUgYXQgaHR0cHM6Ly9hbmd1bGFyLmlvL2xpY2Vuc2VcbiAqL1xuXG5pbXBvcnQge1ROb2RlLCBUTm9kZVR5cGV9IGZyb20gJy4uL3JlbmRlcjMvaW50ZXJmYWNlcy9ub2RlJztcbmltcG9ydCB7UkVsZW1lbnQsIFJOb2RlfSBmcm9tICcuLi9yZW5kZXIzL2ludGVyZmFjZXMvcmVuZGVyZXJfZG9tJztcbmltcG9ydCB7SEVBREVSX09GRlNFVCwgTFZpZXcsIFRWaWV3fSBmcm9tICcuLi9yZW5kZXIzL2ludGVyZmFjZXMvdmlldyc7XG5pbXBvcnQge2dldE5hdGl2ZUJ5VE5vZGV9IGZyb20gJy4uL3JlbmRlcjMvdXRpbC92aWV3X3V0aWxzJztcbmltcG9ydCB7YXNzZXJ0RGVmaW5lZH0gZnJvbSAnLi4vdXRpbC9hc3NlcnQnO1xuXG5pbXBvcnQge3ZhbGlkYXRlU2libGluZ05vZGVFeGlzdHN9IGZyb20gJy4vZXJyb3JfaGFuZGxpbmcnO1xuaW1wb3J0IHtEZWh5ZHJhdGVkVmlld30gZnJvbSAnLi9pbnRlcmZhY2VzJztcbmltcG9ydCB7Y2FsY1NlcmlhbGl6ZWRDb250YWluZXJTaXplLCBnZXRTZWdtZW50SGVhZH0gZnJvbSAnLi91dGlscyc7XG5cbi8qKiBXaGV0aGVyIGN1cnJlbnQgVE5vZGUgaXMgYSBmaXJzdCBub2RlIGluIGFuIDxuZy1jb250YWluZXI+LiAqL1xuZnVuY3Rpb24gaXNGaXJzdEVsZW1lbnRJbk5nQ29udGFpbmVyKHROb2RlOiBUTm9kZSk6IGJvb2xlYW4ge1xuICByZXR1cm4gIXROb2RlLnByZXYgJiYgdE5vZGUucGFyZW50Py50eXBlID09PSBUTm9kZVR5cGUuRWxlbWVudENvbnRhaW5lcjtcbn1cblxuLyoqXG4gKiBMb2NhdGUgYSBub2RlIGluIERPTSB0cmVlIHRoYXQgY29ycmVzcG9uZHMgdG8gYSBnaXZlbiBUTm9kZS5cbiAqXG4gKiBAcGFyYW0gaHlkcmF0aW9uSW5mbyBUaGUgaHlkcmF0aW9uIGFubm90YXRpb24gZGF0YVxuICogQHBhcmFtIHRWaWV3IHRoZSBjdXJyZW50IHRWaWV3XG4gKiBAcGFyYW0gbFZpZXcgdGhlIGN1cnJlbnQgbFZpZXdcbiAqIEBwYXJhbSB0Tm9kZSB0aGUgY3VycmVudCB0Tm9kZVxuICogQHJldHVybnMgYW4gUk5vZGUgdGhhdCByZXByZXNlbnRzIGEgZ2l2ZW4gdE5vZGVcbiAqL1xuZXhwb3J0IGZ1bmN0aW9uIGxvY2F0ZU5leHRSTm9kZTxUIGV4dGVuZHMgUk5vZGU+KFxuICAgIGh5ZHJhdGlvbkluZm86IERlaHlkcmF0ZWRWaWV3LCB0VmlldzogVFZpZXcsIGxWaWV3OiBMVmlldzx1bmtub3duPiwgdE5vZGU6IFROb2RlKTogVHxudWxsIHtcbiAgbGV0IG5hdGl2ZTogUk5vZGV8bnVsbCA9IG51bGw7XG4gIGlmICh0Vmlldy5maXJzdENoaWxkID09PSB0Tm9kZSkge1xuICAgIC8vIFdlIGNyZWF0ZSBhIGZpcnN0IG5vZGUgaW4gdGhpcyB2aWV3LCBzbyB3ZSB1c2UgYSByZWZlcmVuY2VcbiAgICAvLyB0byB0aGUgZmlyc3QgY2hpbGQgaW4gdGhpcyBET00gc2VnbWVudC5cbiAgICBuYXRpdmUgPSBoeWRyYXRpb25JbmZvLmZpcnN0Q2hpbGQ7XG4gIH0gZWxzZSB7XG4gICAgLy8gTG9jYXRlIGEgbm9kZSBiYXNlZCBvbiBhIHByZXZpb3VzIHNpYmxpbmcgb3IgYSBwYXJlbnQgbm9kZS5cbiAgICBjb25zdCBwcmV2aW91c1ROb2RlUGFyZW50ID0gdE5vZGUucHJldiA9PT0gbnVsbDtcbiAgICBjb25zdCBwcmV2aW91c1ROb2RlID0gKHROb2RlLnByZXYgPz8gdE5vZGUucGFyZW50KSE7XG4gICAgbmdEZXZNb2RlICYmXG4gICAgICAgIGFzc2VydERlZmluZWQoXG4gICAgICAgICAgICBwcmV2aW91c1ROb2RlLFxuICAgICAgICAgICAgJ1VuZXhwZWN0ZWQgc3RhdGU6IGN1cnJlbnQgVE5vZGUgZG9lcyBub3QgaGF2ZSBhIGNvbm5lY3Rpb24gJyArXG4gICAgICAgICAgICAgICAgJ3RvIHRoZSBwcmV2aW91cyBub2RlIG9yIGEgcGFyZW50IG5vZGUuJyk7XG4gICAgaWYgKGlzRmlyc3RFbGVtZW50SW5OZ0NvbnRhaW5lcih0Tm9kZSkpIHtcbiAgICAgIGNvbnN0IG5vT2Zmc2V0UGFyZW50SW5kZXggPSB0Tm9kZS5wYXJlbnQhLmluZGV4IC0gSEVBREVSX09GRlNFVDtcbiAgICAgIG5hdGl2ZSA9IGdldFNlZ21lbnRIZWFkKGh5ZHJhdGlvbkluZm8sIG5vT2Zmc2V0UGFyZW50SW5kZXgpO1xuICAgIH0gZWxzZSB7XG4gICAgICBsZXQgcHJldmlvdXNSRWxlbWVudCA9IGdldE5hdGl2ZUJ5VE5vZGUocHJldmlvdXNUTm9kZSwgbFZpZXcpO1xuICAgICAgaWYgKHByZXZpb3VzVE5vZGVQYXJlbnQpIHtcbiAgICAgICAgbmF0aXZlID0gKHByZXZpb3VzUkVsZW1lbnQgYXMgUkVsZW1lbnQpLmZpcnN0Q2hpbGQ7XG4gICAgICB9IGVsc2Uge1xuICAgICAgICAvLyBJZiB0aGUgcHJldmlvdXMgbm9kZSBpcyBhbiBlbGVtZW50LCBidXQgaXQgYWxzbyBoYXMgY29udGFpbmVyIGluZm8sXG4gICAgICAgIC8vIHRoaXMgbWVhbnMgdGhhdCB3ZSBhcmUgcHJvY2Vzc2luZyBhIG5vZGUgbGlrZSBgPGRpdiAjdmNyVGFyZ2V0PmAsIHdoaWNoIGlzXG4gICAgICAgIC8vIHJlcHJlc2VudGVkIGluIHRoZSBET00gYXMgYDxkaXY+PC9kaXY+Li4uPCEtLWNvbnRhaW5lci0tPmAuXG4gICAgICAgIC8vIEluIHRoaXMgY2FzZSwgdGhlcmUgYXJlIG5vZGVzICphZnRlciogdGhpcyBlbGVtZW50IGFuZCB3ZSBuZWVkIHRvIHNraXBcbiAgICAgICAgLy8gYWxsIG9mIHRoZW0gdG8gcmVhY2ggYW4gZWxlbWVudCB0aGF0IHdlIGFyZSBsb29raW5nIGZvci5cbiAgICAgICAgY29uc3Qgbm9PZmZzZXRQcmV2U2libGluZ0luZGV4ID0gcHJldmlvdXNUTm9kZS5pbmRleCAtIEhFQURFUl9PRkZTRVQ7XG4gICAgICAgIGNvbnN0IHNlZ21lbnRIZWFkID0gZ2V0U2VnbWVudEhlYWQoaHlkcmF0aW9uSW5mbywgbm9PZmZzZXRQcmV2U2libGluZ0luZGV4KTtcbiAgICAgICAgaWYgKHByZXZpb3VzVE5vZGUudHlwZSA9PT0gVE5vZGVUeXBlLkVsZW1lbnQgJiYgc2VnbWVudEhlYWQpIHtcbiAgICAgICAgICBjb25zdCBudW1Sb290Tm9kZXNUb1NraXAgPVxuICAgICAgICAgICAgICBjYWxjU2VyaWFsaXplZENvbnRhaW5lclNpemUoaHlkcmF0aW9uSW5mbywgbm9PZmZzZXRQcmV2U2libGluZ0luZGV4KTtcbiAgICAgICAgICAvLyBgKzFgIHN0YW5kcyBmb3IgYW4gYW5jaG9yIGNvbW1lbnQgbm9kZSBhZnRlciBhbGwgdGhlIHZpZXdzIGluIHRoaXMgY29udGFpbmVyLlxuICAgICAgICAgIGNvbnN0IG5vZGVzVG9Ta2lwID0gbnVtUm9vdE5vZGVzVG9Ta2lwICsgMTtcbiAgICAgICAgICAvLyBGaXJzdCBub2RlIGFmdGVyIHRoaXMgc2VnbWVudC5cbiAgICAgICAgICBuYXRpdmUgPSBzaWJsaW5nQWZ0ZXIobm9kZXNUb1NraXAsIHNlZ21lbnRIZWFkKTtcbiAgICAgICAgfSBlbHNlIHtcbiAgICAgICAgICBuYXRpdmUgPSBwcmV2aW91c1JFbGVtZW50Lm5leHRTaWJsaW5nO1xuICAgICAgICB9XG4gICAgICB9XG4gICAgfVxuICB9XG4gIHJldHVybiBuYXRpdmUgYXMgVDtcbn1cblxuLyoqXG4gKiBTa2lwcyBvdmVyIGEgc3BlY2lmaWVkIG51bWJlciBvZiBub2RlcyBhbmQgcmV0dXJucyB0aGUgbmV4dCBzaWJsaW5nIG5vZGUgYWZ0ZXIgdGhhdC5cbiAqL1xuZXhwb3J0IGZ1bmN0aW9uIHNpYmxpbmdBZnRlcjxUIGV4dGVuZHMgUk5vZGU+KHNraXA6IG51bWJlciwgZnJvbTogUk5vZGUpOiBUfG51bGwge1xuICBsZXQgY3VycmVudE5vZGUgPSBmcm9tO1xuICBmb3IgKGxldCBpID0gMDsgaSA8IHNraXA7IGkrKykge1xuICAgIG5nRGV2TW9kZSAmJiB2YWxpZGF0ZVNpYmxpbmdOb2RlRXhpc3RzKGN1cnJlbnROb2RlKTtcbiAgICBjdXJyZW50Tm9kZSA9IGN1cnJlbnROb2RlLm5leHRTaWJsaW5nITtcbiAgfVxuICByZXR1cm4gY3VycmVudE5vZGUgYXMgVDtcbn1cbiJdfQ==
|
|
@@ -31,4 +31,19 @@ export function hasNgSkipHydrationAttr(tNode) {
|
|
|
31
31
|
}
|
|
32
32
|
return false;
|
|
33
33
|
}
|
|
34
|
-
|
|
34
|
+
/**
|
|
35
|
+
* Helper function that determines if a given node is within a skip hydration block
|
|
36
|
+
* by navigating up the TNode tree to see if any parent nodes have skip hydration
|
|
37
|
+
* attribute.
|
|
38
|
+
*/
|
|
39
|
+
export function isInSkipHydrationBlock(tNode) {
|
|
40
|
+
let currentTNode = tNode.parent;
|
|
41
|
+
while (currentTNode) {
|
|
42
|
+
if (hasNgSkipHydrationAttr(currentTNode)) {
|
|
43
|
+
return true;
|
|
44
|
+
}
|
|
45
|
+
currentTNode = currentTNode.parent;
|
|
46
|
+
}
|
|
47
|
+
return false;
|
|
48
|
+
}
|
|
49
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2tpcF9oeWRyYXRpb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9jb3JlL3NyYy9oeWRyYXRpb24vc2tpcF9oeWRyYXRpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7OztHQU1HO0FBS0g7OztHQUdHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sd0JBQXdCLEdBQUcsaUJBQWlCLENBQUM7QUFFMUQ7O0dBRUc7QUFDSCxNQUFNLFVBQVUsc0JBQXNCLENBQUMsS0FBWTtJQUNqRCxNQUFNLG1DQUFtQyxHQUFHLHdCQUF3QixDQUFDLFdBQVcsRUFBRSxDQUFDO0lBRW5GLE1BQU0sS0FBSyxHQUFHLEtBQUssQ0FBQyxXQUFXLENBQUM7SUFDaEMsSUFBSSxLQUFLLEtBQUssSUFBSTtRQUFFLE9BQU8sS0FBSyxDQUFDO0lBQ2pDLDJEQUEyRDtJQUMzRCxLQUFLLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLEdBQUcsS0FBSyxDQUFDLE1BQU0sRUFBRSxDQUFDLElBQUksQ0FBQyxFQUFFO1FBQ3hDLE1BQU0sS0FBSyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUN2Qiw0RUFBNEU7UUFDNUUsd0JBQXdCO1FBQ3hCLElBQUksT0FBTyxLQUFLLEtBQUssUUFBUTtZQUFFLE9BQU8sS0FBSyxDQUFDO1FBQzVDLElBQUksT0FBTyxLQUFLLEtBQUssUUFBUSxJQUFJLEtBQUssQ0FBQyxXQUFXLEVBQUUsS0FBSyxtQ0FBbUMsRUFBRTtZQUM1RixPQUFPLElBQUksQ0FBQztTQUNiO0tBQ0Y7SUFDRCxPQUFPLEtBQUssQ0FBQztBQUNmLENBQUM7QUFFRDs7OztHQUlHO0FBQ0gsTUFBTSxVQUFVLHNCQUFzQixDQUFDLEtBQVk7SUFDakQsSUFBSSxZQUFZLEdBQWUsS0FBSyxDQUFDLE1BQU0sQ0FBQztJQUM1QyxPQUFPLFlBQVksRUFBRTtRQUNuQixJQUFJLHNCQUFzQixDQUFDLFlBQVksQ0FBQyxFQUFFO1lBQ3hDLE9BQU8sSUFBSSxDQUFDO1NBQ2I7UUFDRCxZQUFZLEdBQUcsWUFBWSxDQUFDLE1BQU0sQ0FBQztLQUNwQztJQUNELE9BQU8sS0FBSyxDQUFDO0FBQ2YsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogQGxpY2Vuc2VcbiAqIENvcHlyaWdodCBHb29nbGUgTExDIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogVXNlIG9mIHRoaXMgc291cmNlIGNvZGUgaXMgZ292ZXJuZWQgYnkgYW4gTUlULXN0eWxlIGxpY2Vuc2UgdGhhdCBjYW4gYmVcbiAqIGZvdW5kIGluIHRoZSBMSUNFTlNFIGZpbGUgYXQgaHR0cHM6Ly9hbmd1bGFyLmlvL2xpY2Vuc2VcbiAqL1xuXG5pbXBvcnQge1ROb2RlfSBmcm9tICcuLi9yZW5kZXIzL2ludGVyZmFjZXMvbm9kZSc7XG5pbXBvcnQge0xWaWV3fSBmcm9tICcuLi9yZW5kZXIzL2ludGVyZmFjZXMvdmlldyc7XG5cbi8qKlxuICogVGhlIG5hbWUgb2YgYW4gYXR0cmlidXRlIHRoYXQgY2FuIGJlIGFkZGVkIHRvIHRoZSBoeWRyYXRpb24gYm91bmRhcnkgbm9kZVxuICogKGNvbXBvbmVudCBob3N0IG5vZGUpIHRvIGRpc2FibGUgaHlkcmF0aW9uIGZvciB0aGUgY29udGVudCB3aXRoaW4gdGhhdCBib3VuZGFyeS5cbiAqL1xuZXhwb3J0IGNvbnN0IFNLSVBfSFlEUkFUSU9OX0FUVFJfTkFNRSA9ICduZ1NraXBIeWRyYXRpb24nO1xuXG4vKipcbiAqIEhlbHBlciBmdW5jdGlvbiB0byBjaGVjayBpZiBhIGdpdmVuIG5vZGUgaGFzIHRoZSAnbmdTa2lwSHlkcmF0aW9uJyBhdHRyaWJ1dGVcbiAqL1xuZXhwb3J0IGZ1bmN0aW9uIGhhc05nU2tpcEh5ZHJhdGlvbkF0dHIodE5vZGU6IFROb2RlKTogYm9vbGVhbiB7XG4gIGNvbnN0IFNLSVBfSFlEUkFUSU9OX0FUVFJfTkFNRV9MT1dFUl9DQVNFID0gU0tJUF9IWURSQVRJT05fQVRUUl9OQU1FLnRvTG93ZXJDYXNlKCk7XG5cbiAgY29uc3QgYXR0cnMgPSB0Tm9kZS5tZXJnZWRBdHRycztcbiAgaWYgKGF0dHJzID09PSBudWxsKSByZXR1cm4gZmFsc2U7XG4gIC8vIG9ubHkgZXZlciBsb29rIGF0IHRoZSBhdHRyaWJ1dGUgbmFtZSBhbmQgc2tpcCB0aGUgdmFsdWVzXG4gIGZvciAobGV0IGkgPSAwOyBpIDwgYXR0cnMubGVuZ3RoOyBpICs9IDIpIHtcbiAgICBjb25zdCB2YWx1ZSA9IGF0dHJzW2ldO1xuICAgIC8vIFRoaXMgaXMgYSBtYXJrZXIsIHdoaWNoIG1lYW5zIHRoYXQgdGhlIHN0YXRpYyBhdHRyaWJ1dGVzIHNlY3Rpb24gaXMgb3ZlcixcbiAgICAvLyBzbyB3ZSBjYW4gZXhpdCBlYXJseS5cbiAgICBpZiAodHlwZW9mIHZhbHVlID09PSAnbnVtYmVyJykgcmV0dXJuIGZhbHNlO1xuICAgIGlmICh0eXBlb2YgdmFsdWUgPT09ICdzdHJpbmcnICYmIHZhbHVlLnRvTG93ZXJDYXNlKCkgPT09IFNLSVBfSFlEUkFUSU9OX0FUVFJfTkFNRV9MT1dFUl9DQVNFKSB7XG4gICAgICByZXR1cm4gdHJ1ZTtcbiAgICB9XG4gIH1cbiAgcmV0dXJuIGZhbHNlO1xufVxuXG4vKipcbiAqIEhlbHBlciBmdW5jdGlvbiB0aGF0IGRldGVybWluZXMgaWYgYSBnaXZlbiBub2RlIGlzIHdpdGhpbiBhIHNraXAgaHlkcmF0aW9uIGJsb2NrXG4gKiBieSBuYXZpZ2F0aW5nIHVwIHRoZSBUTm9kZSB0cmVlIHRvIHNlZSBpZiBhbnkgcGFyZW50IG5vZGVzIGhhdmUgc2tpcCBoeWRyYXRpb25cbiAqIGF0dHJpYnV0ZS5cbiAqL1xuZXhwb3J0IGZ1bmN0aW9uIGlzSW5Ta2lwSHlkcmF0aW9uQmxvY2sodE5vZGU6IFROb2RlKTogYm9vbGVhbiB7XG4gIGxldCBjdXJyZW50VE5vZGU6IFROb2RlfG51bGwgPSB0Tm9kZS5wYXJlbnQ7XG4gIHdoaWxlIChjdXJyZW50VE5vZGUpIHtcbiAgICBpZiAoaGFzTmdTa2lwSHlkcmF0aW9uQXR0cihjdXJyZW50VE5vZGUpKSB7XG4gICAgICByZXR1cm4gdHJ1ZTtcbiAgICB9XG4gICAgY3VycmVudFROb2RlID0gY3VycmVudFROb2RlLnBhcmVudDtcbiAgfVxuICByZXR1cm4gZmFsc2U7XG59XG4iXX0=
|