Update the ArrayObserver to better account for sort and reverse

change/@microsoft-fast-element-65a1eb8c-3989-49a5-811f-fcc4274e53d6.json

@@ -0,0 +1,7 @@
+{
+  "type": "minor",
+  "comment": "Update the ArrayObserver to better account for sort and reverse",
+  "packageName": "@microsoft/fast-element",
+  "email": "[email protected]",
+  "dependentChangeType": "none"
+}

packages/web-components/fast-element/docs/api-report.api.md

@@ -19,15 +19,18 @@ export type AddViewBehaviorFactory = (factory: ViewBehaviorFactory) => string;
 
 // @public
 export interface ArrayObserver extends SubscriberSet {
+    addSort(sort: Sort): void;
     addSplice(splice: Splice): void;
     flush(): void;
     readonly lengthObserver: LengthObserver;
     reset(oldCollection: any[] | undefined): void;
+    readonly sortObserver: SortObserver;
     strategy: SpliceStrategy | null;
 }
 
 // @public
 export const ArrayObserver: Readonly<{
+    readonly sorted: 0;
     readonly enable: () => void;
 }>;
 
@@ -774,7 +777,7 @@ export function repeat<TSource = any, TArray extends ReadonlyArray<any> = Readon
 export class RepeatBehavior<TSource = any> implements ViewBehavior, Subscriber {
     constructor(directive: RepeatDirective);
     bind(controller: ViewController): void;
-    handleChange(source: any, args: Splice[] | ExpressionObserver): void;
+    handleChange(source: any, args: Splice[] | Sort[] | ExpressionObserver): void;
     unbind(): void;
     // @internal (undocumented)
     views: SyntheticView[];
@@ -822,6 +825,21 @@ export class SlottedDirective extends NodeObservationDirective<SlottedDirectiveO
 export interface SlottedDirectiveOptions<T = any> extends NodeBehaviorOptions<T>, AssignedNodesOptions {
 }
 
+// @public
+export class Sort {
+    constructor(sorted?: number[] | undefined);
+    // (undocumented)
+    sorted?: number[] | undefined;
+}
+
+// @public
+export function sortedCount<T>(array: readonly T[]): number;
+
+// @public
+export interface SortObserver extends Subscriber {
+    sorted: number;
+}
+
 // @public
 export const SourceLifetime: Readonly<{
     readonly unknown: undefined;

packages/web-components/fast-element/src/debug.ts

@@ -13,7 +13,7 @@ const FAST: FASTGlobal = globalThis.FAST;
 
 const debugMessages = {
     [1101 /* needsArrayObservation */]:
-        "Must call enableArrayObservation before observing arrays.",
+        "Must call ArrayObserver.enable() before observing arrays.",
     [1201 /* onlySetDOMPolicyOnce */]: "The DOM Policy can only be set once.",
     [1202 /* bindingInnerHTMLRequiresTrustedTypes */]:
         "To bind innerHTML, you must use a TrustedTypesPolicy.",

packages/web-components/fast-element/src/index.ts

@@ -39,6 +39,9 @@ export {
     Splice,
     SpliceStrategy,
     SpliceStrategySupport,
+    Sort,
+    SortObserver,
+    sortedCount,
 } from "./observation/arrays.js";
 export { UpdateQueue, Updates } from "./observation/update-queue.js";
 

packages/web-components/fast-element/src/observation/arrays.spec.ts

@@ -1,6 +1,6 @@
 import { expect } from "chai";
 import { Observable } from "./observable.js";
-import { ArrayObserver, lengthOf, Splice } from "./arrays.js";
+import { ArrayObserver, lengthOf, Splice, Sort } from "./arrays.js";
 import { SubscriberSet } from "./notifier.js";
 import { Updates } from "./update-queue.js";
 
@@ -140,13 +140,13 @@ describe("The ArrayObserver", () => {
         const array = [1, 2, 3, 4];
         array.reverse();
 
-        expect(array).members([4, 3, 2, 1]);
+        expect(array).ordered.members([4, 3, 2, 1]);
 
         Array.prototype.reverse.call(array);
-        expect(array).members([1, 2, 3, 4]);
+        expect(array).ordered.members([1, 2, 3, 4]);
 
         const observer = Observable.getNotifier<ArrayObserver>(array);
-        let changeArgs: Splice[] | null = null;
+        let changeArgs: Sort[] | null = null;
 
         observer.subscribe({
             handleChange(array, args) {
@@ -155,23 +155,34 @@ describe("The ArrayObserver", () => {
         });
 
         array.reverse();
-        expect(array).members([4, 3, 2, 1]);
+        expect(array).ordered.members([4, 3, 2, 1]);
 
         await Updates.next();
 
         expect(changeArgs).length(1);
-        expect(changeArgs![0].addedCount).equal(0);
-        expect(changeArgs![0].removed).members([]);
-        expect(changeArgs![0].index).equal(0);
-        expect(changeArgs![0].reset).equal(true);
+        expect(changeArgs![0].sorted).to.have.ordered.members(
+            [
+                3,
+                2,
+                1,
+                0
+            ]
+        );
+        changeArgs = null;
+        array.reverse();
+        expect(array).ordered.members([1, 2, 3, 4]);
+
+        await Updates.next();
 
-        Array.prototype.reverse.call(array);
-        expect(array).members([1, 2, 3, 4]);
         expect(changeArgs).length(1);
-        expect(changeArgs![0].addedCount).equal(0);
-        expect(changeArgs![0].removed).members([]);
-        expect(changeArgs![0].index).equal(0);
-        expect(changeArgs![0].reset).equal(true);
+        expect(changeArgs![0].sorted).to.have.ordered.members(
+            [
+                3,
+                2,
+                1,
+                0
+            ]
+        );
     });
 
     it("observes shifts", async () => {
@@ -216,16 +227,17 @@ describe("The ArrayObserver", () => {
 
     it("observes sorts", async () => {
         ArrayObserver.enable();
-        let array = [1, 2, 3, 4];
+        let array = [1, 3, 2, 4, 3];
 
         array.sort((a, b) => b - a);
-        expect(array).members([4, 3, 2, 1]);
+        expect(array).ordered.members([4, 3, 3, 2, 1]);
 
         Array.prototype.sort.call(array, (a, b) => a - b);
-        expect(array).members([1, 2, 3, 4]);
+        expect(array).ordered.members([1, 2, 3, 3, 4]);
 
+        array = [1, 3, 2, 4, 3];
         const observer = Observable.getNotifier<ArrayObserver>(array);
-        let changeArgs: Splice[] | null = null;
+        let changeArgs: Sort[] | null = null;
 
         observer.subscribe({
             handleChange(array, args) {
@@ -234,26 +246,20 @@ describe("The ArrayObserver", () => {
         });
 
         array.sort((a, b) => b - a);
-        expect(array).members([4, 3, 2, 1]);
+        expect(array).ordered.members([4, 3, 3, 2, 1]);
 
         await Updates.next();
 
         expect(changeArgs).length(1);
-        expect(changeArgs![0].addedCount).equal(0);
-        expect(changeArgs![0].removed).members([]);
-        expect(changeArgs![0].index).equal(0);
-        expect(changeArgs![0].reset).equal(true);
-
-        Array.prototype.sort.call(array, (a, b) => a - b);
-        expect(array).members([1, 2, 3, 4]);
-
-        await Updates.next();
-
-        expect(changeArgs).length(1);
-        expect(changeArgs![0].addedCount).equal(0);
-        expect(changeArgs![0].removed).members([]);
-        expect(changeArgs![0].index).equal(0);
-        expect(changeArgs![0].reset).equal(true);
+        expect(changeArgs![0].sorted).to.have.ordered.members(
+            [
+                3,
+                1,
+                4,
+                2,
+                0
+            ]
+        );
     });
 
     it("observes splices", async () => {