@fluidframework/tree 2.3.1 → 2.4.0-297027

package/lib/simple-tree/core/getOrCreateNode.d.ts

@@ -0,0 +1,15 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+import type { TreeValue } from "../../core/index.js";
+import { type InnerNode } from "./treeNodeKernel.js";
+import type { TreeNode } from "./types.js";
+/**
+ * Returns the TreeNode or TreeValue for the provided {@link InnerNode}.
+ * This will allocate a new one if needed, and otherwise return one from cache.
+ * @remarks
+ * This supports both hydrated and unhydrated nodes.
+ */
+export declare function getOrCreateNodeFromInnerNode(flexNode: InnerNode): TreeNode | TreeValue;
+//# sourceMappingURL=getOrCreateNode.d.ts.map

package/lib/simple-tree/core/getOrCreateNode.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getOrCreateNode.d.ts","sourceRoot":"","sources":["../../../src/simple-tree/core/getOrCreateNode.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAGrD,OAAO,EAAE,KAAK,SAAS,EAAiC,MAAM,qBAAqB,CAAC;AAEpF,OAAO,KAAK,EAAE,QAAQ,EAAoB,MAAM,YAAY,CAAC;AAG7D;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAAC,QAAQ,EAAE,SAAS,GAAG,QAAQ,GAAG,SAAS,CAkBtF"}

package/lib/simple-tree/core/getOrCreateNode.js

@@ -0,0 +1,32 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+import { fail } from "../../util/index.js";
+import { mapTreeNodeToProxy, proxySlot } from "./treeNodeKernel.js";
+import { getSimpleNodeSchemaFromInnerNode } from "./schemaCaching.js";
+import { UnhydratedFlexTreeNode } from "./unhydratedFlexTree.js";
+/**
+ * Returns the TreeNode or TreeValue for the provided {@link InnerNode}.
+ * This will allocate a new one if needed, and otherwise return one from cache.
+ * @remarks
+ * This supports both hydrated and unhydrated nodes.
+ */
+export function getOrCreateNodeFromInnerNode(flexNode) {
+    const cached = flexNode instanceof UnhydratedFlexTreeNode
+        ? mapTreeNodeToProxy.get(flexNode)
+        : flexNode.anchorNode.slots.get(proxySlot);
+    if (cached !== undefined) {
+        return cached;
+    }
+    const classSchema = getSimpleNodeSchemaFromInnerNode(flexNode) ?? fail("Missing schema");
+    const node = flexNode;
+    // eslint-disable-next-line unicorn/prefer-ternary
+    if (typeof classSchema === "function") {
+        return new classSchema(node);
+    }
+    else {
+        return classSchema.create(flexNode);
+    }
+}
+//# sourceMappingURL=getOrCreateNode.js.map

package/lib/simple-tree/core/getOrCreateNode.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getOrCreateNode.js","sourceRoot":"","sources":["../../../src/simple-tree/core/getOrCreateNode.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAkB,kBAAkB,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACpF,OAAO,EAAE,gCAAgC,EAAE,MAAM,oBAAoB,CAAC;AAEtE,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AAEjE;;;;;GAKG;AACH,MAAM,UAAU,4BAA4B,CAAC,QAAmB;IAC/D,MAAM,MAAM,GACX,QAAQ,YAAY,sBAAsB;QACzC,CAAC,CAAC,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClC,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAE7C,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QAC1B,OAAO,MAAM,CAAC;IACf,CAAC;IAED,MAAM,WAAW,GAAG,gCAAgC,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,gBAAgB,CAAC,CAAC;IACzF,MAAM,IAAI,GAAG,QAAuC,CAAC;IACrD,kDAAkD;IAClD,IAAI,OAAO,WAAW,KAAK,UAAU,EAAE,CAAC;QACvC,OAAO,IAAI,WAAW,CAAC,IAAI,CAAa,CAAC;IAC1C,CAAC;SAAM,CAAC;QACP,OAAQ,WAAyD,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACpF,CAAC;AACF,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport type { TreeValue } from \"../../core/index.js\";\nimport type { FlexTreeNode } from \"../../feature-libraries/index.js\";\nimport { fail } from \"../../util/index.js\";\nimport { type InnerNode, mapTreeNodeToProxy, proxySlot } from \"./treeNodeKernel.js\";\nimport { getSimpleNodeSchemaFromInnerNode } from \"./schemaCaching.js\";\nimport type { TreeNode, InternalTreeNode } from \"./types.js\";\nimport { UnhydratedFlexTreeNode } from \"./unhydratedFlexTree.js\";\n\n/**\n * Returns the TreeNode or TreeValue for the provided {@link InnerNode}.\n * This will allocate a new one if needed, and otherwise return one from cache.\n * @remarks\n * This supports both hydrated and unhydrated nodes.\n */\nexport function getOrCreateNodeFromInnerNode(flexNode: InnerNode): TreeNode | TreeValue {\n\tconst cached =\n\t\tflexNode instanceof UnhydratedFlexTreeNode\n\t\t\t? mapTreeNodeToProxy.get(flexNode)\n\t\t\t: flexNode.anchorNode.slots.get(proxySlot);\n\n\tif (cached !== undefined) {\n\t\treturn cached;\n\t}\n\n\tconst classSchema = getSimpleNodeSchemaFromInnerNode(flexNode) ?? fail(\"Missing schema\");\n\tconst node = flexNode as unknown as InternalTreeNode;\n\t// eslint-disable-next-line unicorn/prefer-ternary\n\tif (typeof classSchema === \"function\") {\n\t\treturn new classSchema(node) as TreeNode;\n\t} else {\n\t\treturn (classSchema as { create(data: FlexTreeNode): TreeValue }).create(flexNode);\n\t}\n}\n"]}

package/lib/simple-tree/core/index.d.ts

@@ -2,9 +2,13 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-export { isTreeNode, TreeNodeKernel, getKernel, tryGetTreeNodeSchema, type InnerNode, tryGetCachedTreeNode, tryDisposeTreeNode, } from "./treeNodeKernel.js";
+export { isTreeNode, TreeNodeKernel, getKernel, tryGetTreeNodeSchema, type InnerNode, tryDisposeTreeNode, tryGetTreeNodeFromMapNode, } from "./treeNodeKernel.js";
 export { type WithType, typeNameSymbol, typeSchemaSymbol } from "./withType.js";
 export { type TreeChangeEvents, TreeNode, type Unhydrated, inPrototypeChain, type InternalTreeNode, privateToken, } from "./types.js";
-export { type TreeNodeSchema, NodeKind, type TreeNodeSchemaClass, type TreeNodeSchemaNonClass, type TreeNodeSchemaCore, } from "./treeNodeSchema.js";
-export { getSimpleNodeSchema, setFlexSchemaFromClassSchema, tryGetSimpleNodeSchema, cachedFlexSchemaFromClassSchema, getSimpleNodeSchemaFromNode, } from "./schemaCaching.js";
+export { type TreeNodeSchema, NodeKind, type TreeNodeSchemaClass, type TreeNodeSchemaNonClass, type TreeNodeSchemaCore, type TreeNodeSchemaBoth, } from "./treeNodeSchema.js";
+export { getSimpleNodeSchemaFromInnerNode } from "./schemaCaching.js";
+export { walkAllowedTypes, type SchemaVisitor } from "./walkSchema.js";
+export { Context, HydratedContext, SimpleContextSlot } from "./context.js";
+export { getOrCreateNodeFromInnerNode } from "./getOrCreateNode.js";
+export { UnhydratedFlexTreeNode, UnhydratedTreeSequenceField, tryUnhydratedFlexTreeNode, UnhydratedContext, } from "./unhydratedFlexTree.js";
 //# sourceMappingURL=index.d.ts.map

package/lib/simple-tree/core/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/simple-tree/core/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EACN,UAAU,EACV,cAAc,EACd,SAAS,EACT,oBAAoB,EACpB,KAAK,SAAS,EACd,oBAAoB,EACpB,kBAAkB,GAClB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,KAAK,QAAQ,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAChF,OAAO,EACN,KAAK,gBAAgB,EACrB,QAAQ,EACR,KAAK,UAAU,EACf,gBAAgB,EAChB,KAAK,gBAAgB,EACrB,YAAY,GACZ,MAAM,YAAY,CAAC;AACpB,OAAO,EACN,KAAK,cAAc,EACnB,QAAQ,EACR,KAAK,mBAAmB,EACxB,KAAK,sBAAsB,EAC3B,KAAK,kBAAkB,GACvB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACN,mBAAmB,EACnB,4BAA4B,EAC5B,sBAAsB,EACtB,+BAA+B,EAC/B,2BAA2B,GAC3B,MAAM,oBAAoB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/simple-tree/core/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EACN,UAAU,EACV,cAAc,EACd,SAAS,EACT,oBAAoB,EACpB,KAAK,SAAS,EACd,kBAAkB,EAClB,yBAAyB,GACzB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,KAAK,QAAQ,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAChF,OAAO,EACN,KAAK,gBAAgB,EACrB,QAAQ,EACR,KAAK,UAAU,EACf,gBAAgB,EAChB,KAAK,gBAAgB,EACrB,YAAY,GACZ,MAAM,YAAY,CAAC;AACpB,OAAO,EACN,KAAK,cAAc,EACnB,QAAQ,EACR,KAAK,mBAAmB,EACxB,KAAK,sBAAsB,EAC3B,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,GACvB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,gCAAgC,EAAE,MAAM,oBAAoB,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,KAAK,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACvE,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAC3E,OAAO,EAAE,4BAA4B,EAAE,MAAM,sBAAsB,CAAC;AACpE,OAAO,EACN,sBAAsB,EACtB,2BAA2B,EAC3B,yBAAyB,EACzB,iBAAiB,GACjB,MAAM,yBAAyB,CAAC"}

package/lib/simple-tree/core/index.js

@@ -2,9 +2,13 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-export { isTreeNode, TreeNodeKernel, getKernel, tryGetTreeNodeSchema, tryGetCachedTreeNode, tryDisposeTreeNode, } from "./treeNodeKernel.js";
+export { isTreeNode, TreeNodeKernel, getKernel, tryGetTreeNodeSchema, tryDisposeTreeNode, tryGetTreeNodeFromMapNode, } from "./treeNodeKernel.js";
 export { typeNameSymbol, typeSchemaSymbol } from "./withType.js";
 export { TreeNode, inPrototypeChain, privateToken, } from "./types.js";
 export { NodeKind, } from "./treeNodeSchema.js";
-export { getSimpleNodeSchema, setFlexSchemaFromClassSchema, tryGetSimpleNodeSchema, cachedFlexSchemaFromClassSchema, getSimpleNodeSchemaFromNode, } from "./schemaCaching.js";
+export { getSimpleNodeSchemaFromInnerNode } from "./schemaCaching.js";
+export { walkAllowedTypes } from "./walkSchema.js";
+export { Context, HydratedContext, SimpleContextSlot } from "./context.js";
+export { getOrCreateNodeFromInnerNode } from "./getOrCreateNode.js";
+export { UnhydratedFlexTreeNode, UnhydratedTreeSequenceField, tryUnhydratedFlexTreeNode, UnhydratedContext, } from "./unhydratedFlexTree.js";
 //# sourceMappingURL=index.js.map

package/lib/simple-tree/core/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/simple-tree/core/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EACN,UAAU,EACV,cAAc,EACd,SAAS,EACT,oBAAoB,EAEpB,oBAAoB,EACpB,kBAAkB,GAClB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAiB,cAAc,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAChF,OAAO,EAEN,QAAQ,EAER,gBAAgB,EAEhB,YAAY,GACZ,MAAM,YAAY,CAAC;AACpB,OAAO,EAEN,QAAQ,GAIR,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACN,mBAAmB,EACnB,4BAA4B,EAC5B,sBAAsB,EACtB,+BAA+B,EAC/B,2BAA2B,GAC3B,MAAM,oBAAoB,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nexport {\n\tisTreeNode,\n\tTreeNodeKernel,\n\tgetKernel,\n\ttryGetTreeNodeSchema,\n\ttype InnerNode,\n\ttryGetCachedTreeNode,\n\ttryDisposeTreeNode,\n} from \"./treeNodeKernel.js\";\nexport { type WithType, typeNameSymbol, typeSchemaSymbol } from \"./withType.js\";\nexport {\n\ttype TreeChangeEvents,\n\tTreeNode,\n\ttype Unhydrated,\n\tinPrototypeChain,\n\ttype InternalTreeNode,\n\tprivateToken,\n} from \"./types.js\";\nexport {\n\ttype TreeNodeSchema,\n\tNodeKind,\n\ttype TreeNodeSchemaClass,\n\ttype TreeNodeSchemaNonClass,\n\ttype TreeNodeSchemaCore,\n} from \"./treeNodeSchema.js\";\nexport {\n\tgetSimpleNodeSchema,\n\tsetFlexSchemaFromClassSchema,\n\ttryGetSimpleNodeSchema,\n\tcachedFlexSchemaFromClassSchema,\n\tgetSimpleNodeSchemaFromNode,\n} from \"./schemaCaching.js\";\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/simple-tree/core/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EACN,UAAU,EACV,cAAc,EACd,SAAS,EACT,oBAAoB,EAEpB,kBAAkB,EAClB,yBAAyB,GACzB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAiB,cAAc,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAChF,OAAO,EAEN,QAAQ,EAER,gBAAgB,EAEhB,YAAY,GACZ,MAAM,YAAY,CAAC;AACpB,OAAO,EAEN,QAAQ,GAKR,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,gCAAgC,EAAE,MAAM,oBAAoB,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAsB,MAAM,iBAAiB,CAAC;AACvE,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAC3E,OAAO,EAAE,4BAA4B,EAAE,MAAM,sBAAsB,CAAC;AACpE,OAAO,EACN,sBAAsB,EACtB,2BAA2B,EAC3B,yBAAyB,EACzB,iBAAiB,GACjB,MAAM,yBAAyB,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nexport {\n\tisTreeNode,\n\tTreeNodeKernel,\n\tgetKernel,\n\ttryGetTreeNodeSchema,\n\ttype InnerNode,\n\ttryDisposeTreeNode,\n\ttryGetTreeNodeFromMapNode,\n} from \"./treeNodeKernel.js\";\nexport { type WithType, typeNameSymbol, typeSchemaSymbol } from \"./withType.js\";\nexport {\n\ttype TreeChangeEvents,\n\tTreeNode,\n\ttype Unhydrated,\n\tinPrototypeChain,\n\ttype InternalTreeNode,\n\tprivateToken,\n} from \"./types.js\";\nexport {\n\ttype TreeNodeSchema,\n\tNodeKind,\n\ttype TreeNodeSchemaClass,\n\ttype TreeNodeSchemaNonClass,\n\ttype TreeNodeSchemaCore,\n\ttype TreeNodeSchemaBoth,\n} from \"./treeNodeSchema.js\";\nexport { getSimpleNodeSchemaFromInnerNode } from \"./schemaCaching.js\";\nexport { walkAllowedTypes, type SchemaVisitor } from \"./walkSchema.js\";\nexport { Context, HydratedContext, SimpleContextSlot } from \"./context.js\";\nexport { getOrCreateNodeFromInnerNode } from \"./getOrCreateNode.js\";\nexport {\n\tUnhydratedFlexTreeNode,\n\tUnhydratedTreeSequenceField,\n\ttryUnhydratedFlexTreeNode,\n\tUnhydratedContext,\n} from \"./unhydratedFlexTree.js\";\n"]}

package/lib/simple-tree/core/schemaCaching.d.ts

@@ -2,23 +2,15 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-import type { FlexTreeNodeSchema, TreeNodeSchemaBase } from "../../feature-libraries/index.js";
 import type { TreeNodeSchema } from "./treeNodeSchema.js";
 import type { InnerNode } from "./treeNodeKernel.js";
-export declare function cachedFlexSchemaFromClassSchema(schema: TreeNodeSchema): TreeNodeSchemaBase | undefined;
-export declare function setFlexSchemaFromClassSchema(simple: TreeNodeSchema, flex: TreeNodeSchemaBase): void;
+import { type Context } from "./context.js";
 /**
- * Gets the {@link TreeNodeSchema} cached on the provided {@link FlexTreeNodeSchema | flexSchema}.
- * Returns `undefined` if no cached value is found.
- */
-export declare function tryGetSimpleNodeSchema(flexSchema: FlexTreeNodeSchema): TreeNodeSchema | undefined;
-/**
- * Gets the {@link TreeNodeSchema} cached on the provided {@link FlexTreeNodeSchema | flexSchema}.
- * Fails if no cached value is found.
+ * Gets the {@link TreeNodeSchema} for the {@link InnerNode}.
  */
-export declare function getSimpleNodeSchema(flexSchema: FlexTreeNodeSchema): TreeNodeSchema;
+export declare function getSimpleNodeSchemaFromInnerNode(innerNode: InnerNode): TreeNodeSchema;
 /**
- * Gets the {@link TreeNodeSchema} for the {@link InnerNode}.
+ * Gets the {@link Context} for the {@link InnerNode}.
  */
-export declare function getSimpleNodeSchemaFromNode(innerNode: InnerNode): TreeNodeSchema;
+export declare function getSimpleContextFromInnerNode(innerNode: InnerNode): Context;
 //# sourceMappingURL=schemaCaching.d.ts.map

package/lib/simple-tree/core/schemaCaching.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schemaCaching.d.ts","sourceRoot":"","sources":["../../../src/simple-tree/core/schemaCaching.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,KAAK,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAG/F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAarD,wBAAgB,+BAA+B,CAC9C,MAAM,EAAE,cAAc,GACpB,kBAAkB,GAAG,SAAS,CAGhC;AAED,wBAAgB,4BAA4B,CAC3C,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,kBAAkB,GACtB,IAAI,CAON;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CACrC,UAAU,EAAE,kBAAkB,GAC5B,cAAc,GAAG,SAAS,CAK5B;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,kBAAkB,GAAG,cAAc,CAElF;AAED;;GAEG;AACH,wBAAgB,2BAA2B,CAAC,SAAS,EAAE,SAAS,GAAG,cAAc,CAIhF"}
+{"version":3,"file":"schemaCaching.d.ts","sourceRoot":"","sources":["../../../src/simple-tree/core/schemaCaching.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAMH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAErD,OAAO,EAAqB,KAAK,OAAO,EAAE,MAAM,cAAc,CAAC;AAE/D;;GAEG;AACH,wBAAgB,gCAAgC,CAAC,SAAS,EAAE,SAAS,GAAG,cAAc,CAGrF;AAED;;GAEG;AACH,wBAAgB,6BAA6B,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAS3E"}

package/lib/simple-tree/core/schemaCaching.js

@@ -4,50 +4,24 @@
  */
 import { assert } from "@fluidframework/core-utils/internal";
 import { fail } from "../../util/index.js";
+import { UnhydratedFlexTreeNode } from "./unhydratedFlexTree.js";
+import { SimpleContextSlot } from "./context.js";
 /**
- * A symbol for storing FlexTreeSchema on TreeNodeSchema.
- * Eagerly set on leaves, and lazily set for other cases.
- */
-const flexSchemaSymbol = Symbol(`flexSchema`);
-/**
- * A symbol for storing TreeNodeSchema on FlexTreeNode's schema.
+ * Gets the {@link TreeNodeSchema} for the {@link InnerNode}.
  */
-const simpleNodeSchemaSymbol = Symbol(`simpleNodeSchema`);
-export function cachedFlexSchemaFromClassSchema(schema) {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    return schema[flexSchemaSymbol];
-}
-export function setFlexSchemaFromClassSchema(simple, flex) {
-    assert(!(flexSchemaSymbol in simple), 0x91f /* simple schema already marked */);
-    assert(!(simpleNodeSchemaSymbol in flex), 0x920 /* flex schema already marked */);
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    simple[flexSchemaSymbol] = flex;
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    flex[simpleNodeSchemaSymbol] = simple;
+export function getSimpleNodeSchemaFromInnerNode(innerNode) {
+    const context = getSimpleContextFromInnerNode(innerNode);
+    return context.schema.get(innerNode.schema) ?? fail("missing schema from context");
 }
 /**
- * Gets the {@link TreeNodeSchema} cached on the provided {@link FlexTreeNodeSchema | flexSchema}.
- * Returns `undefined` if no cached value is found.
+ * Gets the {@link Context} for the {@link InnerNode}.
  */
-export function tryGetSimpleNodeSchema(flexSchema) {
-    if (simpleNodeSchemaSymbol in flexSchema) {
-        return flexSchema[simpleNodeSchemaSymbol];
+export function getSimpleContextFromInnerNode(innerNode) {
+    if (innerNode instanceof UnhydratedFlexTreeNode) {
+        return innerNode.simpleContext;
     }
-    return undefined;
-}
-/**
- * Gets the {@link TreeNodeSchema} cached on the provided {@link FlexTreeNodeSchema | flexSchema}.
- * Fails if no cached value is found.
- */
-export function getSimpleNodeSchema(flexSchema) {
-    return tryGetSimpleNodeSchema(flexSchema) ?? fail("missing simple schema");
-}
-/**
- * Gets the {@link TreeNodeSchema} for the {@link InnerNode}.
- */
-export function getSimpleNodeSchemaFromNode(innerNode) {
-    // TODO: to make this work without depending on flex tree schema, a new caching/lookup mechanism will be required, likely leveraging the FlexTreeContext:
-    // A SimpleTreeContext could be defined and associated with the FlexTreeContext, and used to look up simple-tree schema by identifier.
-    return getSimpleNodeSchema(innerNode.flexSchema);
+    const context = innerNode.anchorNode.anchorSet.slots.get(SimpleContextSlot);
+    assert(context !== undefined, "missing simple tree context");
+    return context;
 }
 //# sourceMappingURL=schemaCaching.js.map

package/lib/simple-tree/core/schemaCaching.js.map

@@ -1 +1 @@
-{"version":3,"file":"schemaCaching.js","sourceRoot":"","sources":["../../../src/simple-tree/core/schemaCaching.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,qCAAqC,CAAC;AAG7D,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAK3C;;;GAGG;AACH,MAAM,gBAAgB,GAAkB,MAAM,CAAC,YAAY,CAAC,CAAC;AAE7D;;GAEG;AACH,MAAM,sBAAsB,GAAkB,MAAM,CAAC,kBAAkB,CAAC,CAAC;AAEzE,MAAM,UAAU,+BAA+B,CAC9C,MAAsB;IAEtB,8DAA8D;IAC9D,OAAQ,MAAc,CAAC,gBAAgB,CAAmC,CAAC;AAC5E,CAAC;AAED,MAAM,UAAU,4BAA4B,CAC3C,MAAsB,EACtB,IAAwB;IAExB,MAAM,CAAC,CAAC,CAAC,gBAAgB,IAAI,MAAM,CAAC,EAAE,KAAK,CAAC,kCAAkC,CAAC,CAAC;IAChF,MAAM,CAAC,CAAC,CAAC,sBAAsB,IAAI,IAAI,CAAC,EAAE,KAAK,CAAC,gCAAgC,CAAC,CAAC;IAClF,8DAA8D;IAC7D,MAAc,CAAC,gBAAgB,CAAC,GAAG,IAAI,CAAC;IACzC,8DAA8D;IAC7D,IAAY,CAAC,sBAAsB,CAAC,GAAG,MAAM,CAAC;AAChD,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,sBAAsB,CACrC,UAA8B;IAE9B,IAAI,sBAAsB,IAAI,UAAU,EAAE,CAAC;QAC1C,OAAO,UAAU,CAAC,sBAAsB,CAAmB,CAAC;IAC7D,CAAC;IACD,OAAO,SAAS,CAAC;AAClB,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,mBAAmB,CAAC,UAA8B;IACjE,OAAO,sBAAsB,CAAC,UAAU,CAAC,IAAI,IAAI,CAAC,uBAAuB,CAAC,CAAC;AAC5E,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,2BAA2B,CAAC,SAAoB;IAC/D,yJAAyJ;IACzJ,sIAAsI;IACtI,OAAO,mBAAmB,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;AAClD,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { assert } from \"@fluidframework/core-utils/internal\";\n\nimport type { FlexTreeNodeSchema, TreeNodeSchemaBase } from \"../../feature-libraries/index.js\";\nimport { fail } from \"../../util/index.js\";\n\nimport type { TreeNodeSchema } from \"./treeNodeSchema.js\";\nimport type { InnerNode } from \"./treeNodeKernel.js\";\n\n/**\n * A symbol for storing FlexTreeSchema on TreeNodeSchema.\n * Eagerly set on leaves, and lazily set for other cases.\n */\nconst flexSchemaSymbol: unique symbol = Symbol(`flexSchema`);\n\n/**\n * A symbol for storing TreeNodeSchema on FlexTreeNode's schema.\n */\nconst simpleNodeSchemaSymbol: unique symbol = Symbol(`simpleNodeSchema`);\n\nexport function cachedFlexSchemaFromClassSchema(\n\tschema: TreeNodeSchema,\n): TreeNodeSchemaBase | undefined {\n\t// eslint-disable-next-line @typescript-eslint/no-explicit-any\n\treturn (schema as any)[flexSchemaSymbol] as TreeNodeSchemaBase | undefined;\n}\n\nexport function setFlexSchemaFromClassSchema(\n\tsimple: TreeNodeSchema,\n\tflex: TreeNodeSchemaBase,\n): void {\n\tassert(!(flexSchemaSymbol in simple), 0x91f /* simple schema already marked */);\n\tassert(!(simpleNodeSchemaSymbol in flex), 0x920 /* flex schema already marked */);\n\t// eslint-disable-next-line @typescript-eslint/no-explicit-any\n\t(simple as any)[flexSchemaSymbol] = flex;\n\t// eslint-disable-next-line @typescript-eslint/no-explicit-any\n\t(flex as any)[simpleNodeSchemaSymbol] = simple;\n}\n\n/**\n * Gets the {@link TreeNodeSchema} cached on the provided {@link FlexTreeNodeSchema | flexSchema}.\n * Returns `undefined` if no cached value is found.\n */\nexport function tryGetSimpleNodeSchema(\n\tflexSchema: FlexTreeNodeSchema,\n): TreeNodeSchema | undefined {\n\tif (simpleNodeSchemaSymbol in flexSchema) {\n\t\treturn flexSchema[simpleNodeSchemaSymbol] as TreeNodeSchema;\n\t}\n\treturn undefined;\n}\n\n/**\n * Gets the {@link TreeNodeSchema} cached on the provided {@link FlexTreeNodeSchema | flexSchema}.\n * Fails if no cached value is found.\n */\nexport function getSimpleNodeSchema(flexSchema: FlexTreeNodeSchema): TreeNodeSchema {\n\treturn tryGetSimpleNodeSchema(flexSchema) ?? fail(\"missing simple schema\");\n}\n\n/**\n * Gets the {@link TreeNodeSchema} for the {@link InnerNode}.\n */\nexport function getSimpleNodeSchemaFromNode(innerNode: InnerNode): TreeNodeSchema {\n\t// TODO: to make this work without depending on flex tree schema, a new caching/lookup mechanism will be required, likely leveraging the FlexTreeContext:\n\t// A SimpleTreeContext could be defined and associated with the FlexTreeContext, and used to look up simple-tree schema by identifier.\n\treturn getSimpleNodeSchema(innerNode.flexSchema);\n}\n"]}
+{"version":3,"file":"schemaCaching.js","sourceRoot":"","sources":["../../../src/simple-tree/core/schemaCaching.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,qCAAqC,CAAC;AAE7D,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAI3C,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAgB,MAAM,cAAc,CAAC;AAE/D;;GAEG;AACH,MAAM,UAAU,gCAAgC,CAAC,SAAoB;IACpE,MAAM,OAAO,GAAY,6BAA6B,CAAC,SAAS,CAAC,CAAC;IAClE,OAAO,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,6BAA6B,CAAC,CAAC;AACpF,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,6BAA6B,CAAC,SAAoB;IACjE,IAAI,SAAS,YAAY,sBAAsB,EAAE,CAAC;QACjD,OAAO,SAAS,CAAC,aAAa,CAAC;IAChC,CAAC;IAED,MAAM,OAAO,GAAG,SAAS,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;IAC5E,MAAM,CAAC,OAAO,KAAK,SAAS,EAAE,6BAA6B,CAAC,CAAC;IAE7D,OAAO,OAAO,CAAC;AAChB,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { assert } from \"@fluidframework/core-utils/internal\";\n\nimport { fail } from \"../../util/index.js\";\n\nimport type { TreeNodeSchema } from \"./treeNodeSchema.js\";\nimport type { InnerNode } from \"./treeNodeKernel.js\";\nimport { UnhydratedFlexTreeNode } from \"./unhydratedFlexTree.js\";\nimport { SimpleContextSlot, type Context } from \"./context.js\";\n\n/**\n * Gets the {@link TreeNodeSchema} for the {@link InnerNode}.\n */\nexport function getSimpleNodeSchemaFromInnerNode(innerNode: InnerNode): TreeNodeSchema {\n\tconst context: Context = getSimpleContextFromInnerNode(innerNode);\n\treturn context.schema.get(innerNode.schema) ?? fail(\"missing schema from context\");\n}\n\n/**\n * Gets the {@link Context} for the {@link InnerNode}.\n */\nexport function getSimpleContextFromInnerNode(innerNode: InnerNode): Context {\n\tif (innerNode instanceof UnhydratedFlexTreeNode) {\n\t\treturn innerNode.simpleContext;\n\t}\n\n\tconst context = innerNode.anchorNode.anchorSet.slots.get(SimpleContextSlot);\n\tassert(context !== undefined, \"missing simple tree context\");\n\n\treturn context;\n}\n"]}

package/lib/simple-tree/core/treeNodeKernel.d.ts

@@ -5,8 +5,10 @@
 import { type Listenable, type Off } from "../../events/index.js";
 import type { TreeNode, Unhydrated } from "./types.js";
 import { type AnchorEvents, type AnchorNode, type AnchorSet, type UpPath } from "../../core/index.js";
-import { TreeStatus, type FlexTreeNode, type MapTreeNode } from "../../feature-libraries/index.js";
+import { TreeStatus, type FlexTreeNode } from "../../feature-libraries/index.js";
 import type { TreeNodeSchema } from "./treeNodeSchema.js";
+import { type Context } from "./context.js";
+import { UnhydratedFlexTreeNode } from "./unhydratedFlexTree.js";
 export declare function getKernel(node: TreeNode): TreeNodeKernel;
 /**
  * Detects if the given 'candidate' is a TreeNode.
@@ -42,6 +44,7 @@ export declare class TreeNodeKernel implements Listenable<KernelEvents> {
     readonly node: TreeNode;
     readonly schema: TreeNodeSchema;
     private innerNode;
+    private readonly initialContext;
     private disposed;
     /**
      * Generation number which is incremented any time we have an edit on the node.
@@ -57,20 +60,21 @@ export declare class TreeNodeKernel implements Listenable<KernelEvents> {
     /**
      * Create a TreeNodeKernel which can be looked up with {@link getKernel}.
      *
+     * @param initialContext - context from when this node was originally crated.
      * @param innerNode - When unhydrated/raw or marinated the MapTreeNode. FlexTreeNode when cooked.
      * @remarks
      * Exactly one kernel per TreeNode should be created.
      */
-    constructor(node: TreeNode, schema: TreeNodeSchema, innerNode: InnerNode);
+    constructor(node: TreeNode, schema: TreeNodeSchema, innerNode: InnerNode, initialContext: Context);
+    get context(): Context;
     /**
      * Transition from {@link Unhydrated} to hydrated.
      * Bi-directionally associates the given hydrated TreeNode to the given anchor node.
      * @remarks
      * Happens at most once for any given node.
-     * Cleans up mappings to {@link MapTreeNode} - it is assumed that they are no longer needed once the proxy has an anchor node.
+     * Cleans up mappings to {@link UnhydratedFlexTreeNode} - it is assumed that they are no longer needed once the proxy has an anchor node.
      */
     hydrate(anchorNode: AnchorNode): void;
-    isHydrated(): boolean;
     getStatus(): TreeStatus;
     on<K extends keyof KernelEvents>(eventName: K, listener: KernelEvents[K]): Off;
     dispose(): void;
@@ -118,11 +122,29 @@ type KernelEvents = Pick<AnchorEvents, (typeof kernelEvents)[number]>;
  * TODO: The inconsistent handling of "marinated" cases should be cleaned up.
  * Maybe getOrCreateInnerNode should cook marinated nodes so they have a proper InnerNode?
  */
-export type InnerNode = FlexTreeNode | MapTreeNode;
+export type InnerNode = FlexTreeNode | UnhydratedFlexTreeNode;
 /**
- * Retrieves the proxy associated with the given flex node via {@link setInnerNode}, if any.
+ * {@inheritdoc proxyToMapTreeNode}
  */
-export declare function tryGetCachedTreeNode(flexNode: InnerNode): TreeNode | undefined;
+export declare const mapTreeNodeToProxy: WeakMap<UnhydratedFlexTreeNode, TreeNode>;
+/**
+ * An anchor slot which associates an anchor with its corresponding TreeNode, if there is one.
+ * @remarks
+ * For this to work, we have to require that there is at most a single view using a given AnchorSet.
+ * FlexTree already has this assumption, and we also assume there is a single simple-tree per FlexTree, so this is valid.
+ */
+export declare const proxySlot: import("../../core/index.js").AnchorSlot<TreeNode>;
+/**
+ * Retrieves the node associated with the given MapTreeNode node if any.
+ */
+export declare function tryGetTreeNodeFromMapNode(flexNode: UnhydratedFlexTreeNode): TreeNode | undefined;
 export declare function tryDisposeTreeNode(anchorNode: AnchorNode): void;
+/**
+ * Lookup a TreeNodeSchema from a Hydrated FlexTreeNode.
+ * @privateRemarks
+ * This provides a way to access simple tree schema from the flex tree without depending on {@link FlexTreeSchema} which is in the process of being removed.
+ * This is currently limited to hydrated nodes: this limitation will have to be fixed before {@link FlexTreeSchema} can be fully removed.
+ */
+export declare function getTreeNodeSchemaFromHydratedFlexNode(flexNode: FlexTreeNode): TreeNodeSchema;
 export {};
 //# sourceMappingURL=treeNodeKernel.d.ts.map

package/lib/simple-tree/core/treeNodeKernel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"treeNodeKernel.d.ts","sourceRoot":"","sources":["../../../src/simple-tree/core/treeNodeKernel.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAIN,KAAK,UAAU,EACf,KAAK,GAAG,EACR,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,EAEN,KAAK,YAAY,EACjB,KAAK,UAAU,EACf,KAAK,SAAS,EACd,KAAK,MAAM,EACX,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAQN,UAAU,EAEV,KAAK,YAAY,EACjB,KAAK,WAAW,EAChB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAQ1D,wBAAgB,SAAS,CAAC,IAAI,EAAE,QAAQ,GAAG,cAAc,CAIxD;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,UAAU,CAAC,SAAS,EAAE,OAAO,GAAG,SAAS,IAAI,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC,CAE3F;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,OAAO,GAAG,SAAS,GAAG,cAAc,CAG/E;AAED;;;;;GAKG;AACH,qBAAa,cAAe,YAAW,UAAU,CAAC,YAAY,CAAC;;aAyD7C,IAAI,EAAE,QAAQ;aACd,MAAM,EAAE,cAAc;IACtC,OAAO,CAAC,SAAS;IA1DlB,OAAO,CAAC,QAAQ,CAAS;IAEzB;;;;;;;;;OASG;IACI,gBAAgB,EAAE,MAAM,CAAK;IAoCpC;;;;;;OAMG;gBAEc,IAAI,EAAE,QAAQ,EACd,MAAM,EAAE,cAAc,EAC9B,SAAS,EAAE,SAAS;IAkB7B;;;;;;OAMG;IACI,OAAO,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI;IAuCrC,UAAU,IAAI,OAAO;IAKrB,SAAS,IAAI,UAAU;IAoBvB,EAAE,CAAC,CAAC,SAAS,MAAM,YAAY,EAAE,SAAS,EAAE,CAAC,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,GAAG;IAI9E,OAAO,IAAI,IAAI;IAQtB;;;;;;;OAOG;IACI,oBAAoB,CAAC,UAAU,UAAQ,GAAG,SAAS;IAiC1D;;;;;;;;;;OAUG;IACI,WAAW,CAAC,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,GAAG,UAAU;IAiBhE;;;;;;OAMG;IACI,eAAe,IAAI,SAAS,GAAG,SAAS;CAgB/C;AAOD,QAAA,MAAM,YAAY,oEAAqE,CAAC;AAExF,KAAK,YAAY,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC,OAAO,YAAY,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;AAEtE;;;;;;;;;;;GAWG;AACH,MAAM,MAAM,SAAS,GAAG,YAAY,GAAG,WAAW,CAAC;AAenD;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,SAAS,GAAG,QAAQ,GAAG,SAAS,CAO9E;AAED,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI,CAM/D"}
+{"version":3,"file":"treeNodeKernel.d.ts","sourceRoot":"","sources":["../../../src/simple-tree/core/treeNodeKernel.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAiB,KAAK,UAAU,EAAE,KAAK,GAAG,EAAE,MAAM,uBAAuB,CAAC;AACjF,OAAO,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,EAEN,KAAK,YAAY,EACjB,KAAK,UAAU,EACf,KAAK,SAAS,EACd,KAAK,MAAM,EACX,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAON,UAAU,EAEV,KAAK,YAAY,EACjB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAK1D,OAAO,EAAqB,KAAK,OAAO,EAAE,MAAM,cAAc,CAAC;AAC/D,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AAIjE,wBAAgB,SAAS,CAAC,IAAI,EAAE,QAAQ,GAAG,cAAc,CAIxD;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,UAAU,CAAC,SAAS,EAAE,OAAO,GAAG,SAAS,IAAI,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC,CAE3F;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,OAAO,GAAG,SAAS,GAAG,cAAc,CAG/E;AAqBD;;;;;GAKG;AACH,qBAAa,cAAe,YAAW,UAAU,CAAC,YAAY,CAAC;;aAoC7C,IAAI,EAAE,QAAQ;aACd,MAAM,EAAE,cAAc;IACtC,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,QAAQ,CAAC,cAAc;IAtChC,OAAO,CAAC,QAAQ,CAAS;IAEzB;;;;;;;;;OASG;IACI,gBAAgB,EAAE,MAAM,CAAK;IAcpC;;;;;;;OAOG;gBAEc,IAAI,EAAE,QAAQ,EACd,MAAM,EAAE,cAAc,EAC9B,SAAS,EAAE,SAAS,EACX,cAAc,EAAE,OAAO;IAuCzC,IAAW,OAAO,IAAI,OAAO,CAS5B;IAED;;;;;;OAMG;IACI,OAAO,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI;IAqCrC,SAAS,IAAI,UAAU;IAoBvB,EAAE,CAAC,CAAC,SAAS,MAAM,YAAY,EAAE,SAAS,EAAE,CAAC,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,GAAG;IAS9E,OAAO,IAAI,IAAI;IAUtB;;;;;;;OAOG;IACI,oBAAoB,CAAC,UAAU,UAAQ,GAAG,SAAS;IAgC1D;;;;;;;;;;OAUG;IACI,WAAW,CAAC,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,GAAG,UAAU;IAiBhE;;;;;;OAMG;IACI,eAAe,IAAI,SAAS,GAAG,SAAS;CAe/C;AAOD,QAAA,MAAM,YAAY,oEAAqE,CAAC;AAExF,KAAK,YAAY,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC,OAAO,YAAY,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;AAEtE;;;;;;;;;;;GAWG;AACH,MAAM,MAAM,SAAS,GAAG,YAAY,GAAG,sBAAsB,CAAC;AAE9D;;GAEG;AACH,eAAO,MAAM,kBAAkB,2CAAkD,CAAC;AAElF;;;;;GAKG;AACH,eAAO,MAAM,SAAS,oDAAyB,CAAC;AAEhD;;GAEG;AACH,wBAAgB,yBAAyB,CACxC,QAAQ,EAAE,sBAAsB,GAC9B,QAAQ,GAAG,SAAS,CAEtB;AAED,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI,CAM/D;AAED;;;;;GAKG;AACH,wBAAgB,qCAAqC,CAAC,QAAQ,EAAE,YAAY,GAAG,cAAc,CAW5F"}

package/lib/simple-tree/core/treeNodeKernel.js

@@ -13,15 +13,17 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-var _TreeNodeKernel_instances, _TreeNodeKernel_hydrated, _TreeNodeKernel_preHydrationEvents, _TreeNodeKernel_events_get;
-import { assert } from "@fluidframework/core-utils/internal";
-import { createEmitter, } from "../../events/index.js";
+var _TreeNodeKernel_hydrationState, _TreeNodeKernel_unhydratedEvents;
+import { assert, Lazy } from "@fluidframework/core-utils/internal";
+import { createEmitter } from "../../events/index.js";
 import { anchorSlot, } from "../../core/index.js";
-import { assertFlexTreeEntityNotFreed, ContextSlot, flexTreeSlot, isFlexTreeNode, isFreedSymbol, isMapTreeNode, LazyEntity, TreeStatus, treeStatusFromAnchorCache, } from "../../feature-libraries/index.js";
+import { assertFlexTreeEntityNotFreed, ContextSlot, flexTreeSlot, isFlexTreeNode, isFreedSymbol, LazyEntity, TreeStatus, treeStatusFromAnchorCache, } from "../../feature-libraries/index.js";
 import { fail } from "../../util/index.js";
 // TODO: decide how to deal with dependencies on flex-tree implementation.
 // eslint-disable-next-line import/no-internal-modules
 import { makeTree } from "../../feature-libraries/flex-tree/lazyNode.js";
+import { SimpleContextSlot } from "./context.js";
+import { UnhydratedFlexTreeNode } from "./unhydratedFlexTree.js";
 const treeNodeToKernel = new WeakMap();
 export function getKernel(node) {
     const kernel = treeNodeToKernel.get(node);
@@ -56,6 +58,10 @@ export function tryGetTreeNodeSchema(value) {
     const kernel = treeNodeToKernel.get(value);
     return kernel?.schema;
 }
+/** True if and only if the given {@link HydrationState} is post-hydration */
+function isHydrated(state) {
+    return typeof state === "object";
+}
 /**
  * Contains state and an internal API for managing {@link TreeNode}s.
  * @remarks All {@link TreeNode}s have an associated kernel object.
@@ -66,15 +72,16 @@ export class TreeNodeKernel {
     /**
      * Create a TreeNodeKernel which can be looked up with {@link getKernel}.
      *
+     * @param initialContext - context from when this node was originally crated.
      * @param innerNode - When unhydrated/raw or marinated the MapTreeNode. FlexTreeNode when cooked.
      * @remarks
      * Exactly one kernel per TreeNode should be created.
      */
-    constructor(node, schema, innerNode) {
-        _TreeNodeKernel_instances.add(this);
+    constructor(node, schema, innerNode, initialContext) {
         this.node = node;
         this.schema = schema;
         this.innerNode = innerNode;
+        this.initialContext = initialContext;
         this.disposed = false;
         /**
          * Generation number which is incremented any time we have an edit on the node.
@@ -87,18 +94,38 @@ export class TreeNodeKernel {
          * but they only way to do that is add a separate public accessor and make it private, which was deemed not worth the boilerplate, runtime overhead and bundle size.
          */
         this.generationNumber = 0;
-        _TreeNodeKernel_hydrated.set(this, void 0);
+        _TreeNodeKernel_hydrationState.set(this, () => { });
         /**
          * Events registered before hydration.
          * @remarks
-         * As an optimization these are allocated lazily as they are usually unused.
+         * Since these are usually not used, they are allocated lazily as an optimization.
+         * The laziness also avoids extra forwarding overhead for events from this kernel's anchor node and also avoids registering for events that are unneeded.
+         * This means optimizations like skipping processing data in subtrees where no subtreeChanged events are subscribed to would be able to work,
+         * since the kernel does not unconditionally subscribe to those events (like a design which simply forwards all events would).
          */
-        _TreeNodeKernel_preHydrationEvents.set(this, void 0);
+        _TreeNodeKernel_unhydratedEvents.set(this, new Lazy((createEmitter)));
         assert(!treeNodeToKernel.has(node), 0xa1a /* only one kernel per node can be made */);
         treeNodeToKernel.set(node, this);
-        if (isMapTreeNode(innerNode)) {
+        if (innerNode instanceof UnhydratedFlexTreeNode) {
             // Unhydrated case
             mapTreeNodeToProxy.set(innerNode, node);
+            // Register for change events from the unhydrated flex node.
+            // These will be fired if the unhydrated node is edited, and will also be forwarded later to the hydrated node.
+            __classPrivateFieldSet(this, _TreeNodeKernel_hydrationState, innerNode.events.on("childrenChangedAfterBatch", ({ changedFields }) => {
+                __classPrivateFieldGet(this, _TreeNodeKernel_unhydratedEvents, "f").value.emit("childrenChangedAfterBatch", {
+                    changedFields,
+                });
+                let n = innerNode;
+                while (n !== undefined) {
+                    const treeNode = mapTreeNodeToProxy.get(n);
+                    if (treeNode !== undefined) {
+                        const kernel = getKernel(treeNode);
+                        __classPrivateFieldGet(kernel, _TreeNodeKernel_unhydratedEvents, "f").value.emit("subtreeChangedAfterBatch");
+                    }
+                    // This cast is safe because the parent (if it exists) of an unhydrated flex node is always another unhydrated flex node.
+                    n = n.parentField.parent.parent;
+                }
+            }), "f");
         }
         else {
             // Hydrated case
@@ -106,23 +133,31 @@ export class TreeNodeKernel {
             this.hydrate(innerNode.anchorNode);
         }
     }
+    get context() {
+        if (isHydrated(__classPrivateFieldGet(this, _TreeNodeKernel_hydrationState, "f"))) {
+            // This can't be cached on this.#hydrated during hydration since initial tree is hydrated before the context is cached on the anchorSet.
+            return (__classPrivateFieldGet(this, _TreeNodeKernel_hydrationState, "f")?.anchorNode.anchorSet.slots.get(SimpleContextSlot) ??
+                fail("missing simple-tree context"));
+        }
+        return this.initialContext;
+    }
     /**
      * Transition from {@link Unhydrated} to hydrated.
      * Bi-directionally associates the given hydrated TreeNode to the given anchor node.
      * @remarks
      * Happens at most once for any given node.
-     * Cleans up mappings to {@link MapTreeNode} - it is assumed that they are no longer needed once the proxy has an anchor node.
+     * Cleans up mappings to {@link UnhydratedFlexTreeNode} - it is assumed that they are no longer needed once the proxy has an anchor node.
      */
     hydrate(anchorNode) {
         assert(!this.disposed, 0xa2a /* cannot hydrate a disposed node */);
-        assert(__classPrivateFieldGet(this, _TreeNodeKernel_hydrated, "f") === undefined, 0xa2b /* hydration should only happen once */);
+        assert(!isHydrated(__classPrivateFieldGet(this, _TreeNodeKernel_hydrationState, "f")), 0xa2b /* hydration should only happen once */);
         // If the this node is raw and thus has a MapTreeNode, forget it:
-        if (isMapTreeNode(this.innerNode)) {
+        if (this.innerNode instanceof UnhydratedFlexTreeNode) {
             mapTreeNodeToProxy.delete(this.innerNode);
         }
         // However, it's fine for an anchor node to rotate through different proxies when the content at that place in the tree is replaced.
         anchorNode.slots.set(proxySlot, this.node);
-        __classPrivateFieldSet(this, _TreeNodeKernel_hydrated, {
+        __classPrivateFieldSet(this, _TreeNodeKernel_hydrationState, {
             anchorNode,
             offAnchorNode: new Set([
                 anchorNode.on("afterDestroy", () => this.dispose()),
@@ -133,45 +168,48 @@ export class TreeNodeKernel {
             ]),
         }, "f");
         // If needed, register forwarding emitters for events from before hydration
-        if (__classPrivateFieldGet(this, _TreeNodeKernel_preHydrationEvents, "f") !== undefined) {
+        if (__classPrivateFieldGet(this, _TreeNodeKernel_unhydratedEvents, "f").evaluated) {
+            const events = __classPrivateFieldGet(this, _TreeNodeKernel_unhydratedEvents, "f").value;
             for (const eventName of kernelEvents) {
-                if (__classPrivateFieldGet(this, _TreeNodeKernel_preHydrationEvents, "f").hasListeners(eventName)) {
-                    __classPrivateFieldGet(this, _TreeNodeKernel_hydrated, "f").offAnchorNode.add(
+                if (events.hasListeners(eventName)) {
+                    __classPrivateFieldGet(this, _TreeNodeKernel_hydrationState, "f").offAnchorNode.add(
                     // Argument is forwarded between matching events, so the type should be correct.
                     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                    anchorNode.on(eventName, (arg) => __classPrivateFieldGet(this, _TreeNodeKernel_preHydrationEvents, "f")?.emit(eventName, arg)));
+                    anchorNode.on(eventName, (arg) => events.emit(eventName, arg)));
                 }
             }
         }
     }
-    isHydrated() {
-        assert(!this.disposed, 0xa2c /* cannot use a disposed node */);
-        return __classPrivateFieldGet(this, _TreeNodeKernel_hydrated, "f") !== undefined;
-    }
     getStatus() {
         if (this.disposed) {
             return TreeStatus.Deleted;
         }
-        if (__classPrivateFieldGet(this, _TreeNodeKernel_hydrated, "f")?.anchorNode === undefined) {
+        if (!isHydrated(__classPrivateFieldGet(this, _TreeNodeKernel_hydrationState, "f"))) {
             return TreeStatus.New;
         }
         // TODO: Replace this check with the proper check against the cursor state when the cursor becomes part of the kernel
-        const flex = __classPrivateFieldGet(this, _TreeNodeKernel_hydrated, "f").anchorNode.slots.get(flexTreeSlot);
+        const flex = __classPrivateFieldGet(this, _TreeNodeKernel_hydrationState, "f").anchorNode.slots.get(flexTreeSlot);
         if (flex !== undefined) {
             assert(flex instanceof LazyEntity, 0x9b4 /* Unexpected flex node implementation */);
             if (flex[isFreedSymbol]()) {
                 return TreeStatus.Deleted;
             }
         }
-        return treeStatusFromAnchorCache(__classPrivateFieldGet(this, _TreeNodeKernel_hydrated, "f").anchorNode);
+        return treeStatusFromAnchorCache(__classPrivateFieldGet(this, _TreeNodeKernel_hydrationState, "f").anchorNode);
     }
     on(eventName, listener) {
-        return __classPrivateFieldGet(this, _TreeNodeKernel_instances, "a", _TreeNodeKernel_events_get).on(eventName, listener);
+        // Retrieve the correct events object based on whether this node is pre or post hydration.
+        const events = isHydrated(__classPrivateFieldGet(this, _TreeNodeKernel_hydrationState, "f"))
+            ? __classPrivateFieldGet(this, _TreeNodeKernel_hydrationState, "f").anchorNode
+            : __classPrivateFieldGet(this, _TreeNodeKernel_unhydratedEvents, "f").value;
+        return events.on(eventName, listener);
     }
     dispose() {
         this.disposed = true;
-        for (const off of __classPrivateFieldGet(this, _TreeNodeKernel_hydrated, "f")?.offAnchorNode ?? []) {
-            off();
+        if (isHydrated(__classPrivateFieldGet(this, _TreeNodeKernel_hydrationState, "f"))) {
+            for (const off of __classPrivateFieldGet(this, _TreeNodeKernel_hydrationState, "f").offAnchorNode) {
+                off();
+            }
         }
         // TODO: go to the context and remove myself from withAnchors
     }
@@ -184,16 +222,15 @@ export class TreeNodeKernel {
      * Note that for "marinated" nodes, this FlexTreeNode exists and returns it: it does not return the MapTreeNode which is the current InnerNode.
      */
     getOrCreateInnerNode(allowFreed = false) {
-        if (!isMapTreeNode(this.innerNode)) {
+        if (!(this.innerNode instanceof UnhydratedFlexTreeNode)) {
             // Cooked case
             return this.innerNode;
         }
-        if (__classPrivateFieldGet(this, _TreeNodeKernel_hydrated, "f") === undefined) {
-            // Unhydrated case
+        if (!isHydrated(__classPrivateFieldGet(this, _TreeNodeKernel_hydrationState, "f"))) {
             return this.innerNode;
         }
         // Marinated case -> cooked
-        const anchorNode = __classPrivateFieldGet(this, _TreeNodeKernel_hydrated, "f").anchorNode;
+        const anchorNode = __classPrivateFieldGet(this, _TreeNodeKernel_hydrationState, "f").anchorNode;
         // The proxy is bound to an anchor node, but it may or may not have an actual flex node yet
         const flexNode = anchorNode.slots.get(flexTreeSlot);
         if (flexNode !== undefined) {
@@ -252,25 +289,16 @@ export class TreeNodeKernel {
             // Cooked case
             return this.innerNode;
         }
-        if (__classPrivateFieldGet(this, _TreeNodeKernel_hydrated, "f") === undefined) {
-            // Unhydrated case
+        if (!isHydrated(__classPrivateFieldGet(this, _TreeNodeKernel_hydrationState, "f"))) {
             return this.innerNode;
         }
         // Marinated case -> cooked
-        const anchorNode = __classPrivateFieldGet(this, _TreeNodeKernel_hydrated, "f").anchorNode;
+        const anchorNode = __classPrivateFieldGet(this, _TreeNodeKernel_hydrationState, "f").anchorNode;
         // The proxy is bound to an anchor node, but it may or may not have an actual flex node yet
         return anchorNode.slots.get(flexTreeSlot);
     }
 }
-_TreeNodeKernel_hydrated = new WeakMap(), _TreeNodeKernel_preHydrationEvents = new WeakMap(), _TreeNodeKernel_instances = new WeakSet(), _TreeNodeKernel_events_get = function _TreeNodeKernel_events_get() {
-    if (__classPrivateFieldGet(this, _TreeNodeKernel_hydrated, "f") === undefined) {
-        __classPrivateFieldSet(this, _TreeNodeKernel_preHydrationEvents, __classPrivateFieldGet(this, _TreeNodeKernel_preHydrationEvents, "f") ?? createEmitter(), "f");
-        return __classPrivateFieldGet(this, _TreeNodeKernel_preHydrationEvents, "f");
-    }
-    else {
-        return __classPrivateFieldGet(this, _TreeNodeKernel_hydrated, "f").anchorNode;
-    }
-};
+_TreeNodeKernel_hydrationState = new WeakMap(), _TreeNodeKernel_unhydratedEvents = new WeakMap();
 /**
  * Used by {@link anchorProxy} as an optimization to ensure that only one anchor is remembered at a time for a given anchor node
  */
@@ -279,24 +307,19 @@ const kernelEvents = ["childrenChangedAfterBatch", "subtreeChangedAfterBatch"];
 /**
  * {@inheritdoc proxyToMapTreeNode}
  */
-const mapTreeNodeToProxy = new WeakMap();
+export const mapTreeNodeToProxy = new WeakMap();
 /**
  * An anchor slot which associates an anchor with its corresponding TreeNode, if there is one.
  * @remarks
  * For this to work, we have to require that there is at most a single view using a given AnchorSet.
  * FlexTree already has this assumption, and we also assume there is a single simple-tree per FlexTree, so this is valid.
  */
-const proxySlot = anchorSlot();
+export const proxySlot = anchorSlot();
 /**
- * Retrieves the proxy associated with the given flex node via {@link setInnerNode}, if any.
+ * Retrieves the node associated with the given MapTreeNode node if any.
  */
-export function tryGetCachedTreeNode(flexNode) {
-    if (isMapTreeNode(flexNode)) {
-        // Unhydrated case
-        return mapTreeNodeToProxy.get(flexNode);
-    }
-    // Hydrated case
-    return flexNode.anchorNode.slots.get(proxySlot);
+export function tryGetTreeNodeFromMapNode(flexNode) {
+    return mapTreeNodeToProxy.get(flexNode);
 }
 export function tryDisposeTreeNode(anchorNode) {
     const treeNode = anchorNode.slots.get(proxySlot);
@@ -305,4 +328,16 @@ export function tryDisposeTreeNode(anchorNode) {
         kernel.dispose();
     }
 }
+/**
+ * Lookup a TreeNodeSchema from a Hydrated FlexTreeNode.
+ * @privateRemarks
+ * This provides a way to access simple tree schema from the flex tree without depending on {@link FlexTreeSchema} which is in the process of being removed.
+ * This is currently limited to hydrated nodes: this limitation will have to be fixed before {@link FlexTreeSchema} can be fully removed.
+ */
+export function getTreeNodeSchemaFromHydratedFlexNode(flexNode) {
+    assert(flexNode.context.isHydrated(), "getTreeNodeSchemaFromHydratedFlexNode only allows hydrated flex tree nodes");
+    const context = flexNode.anchorNode.anchorSet.slots.get(SimpleContextSlot) ??
+        fail("Missing SimpleContextSlot");
+    return context.schema.get(flexNode.schema) ?? fail("Missing schema");
+}
 //# sourceMappingURL=treeNodeKernel.js.map