@fluidframework/map 1.0.0 → 1.1.0-76254

package/lib/packageVersion.js

@@ -5,5 +5,5 @@
  * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY
  */
 export const pkgName = "@fluidframework/map";
-export const pkgVersion = "1.0.0";
+export const pkgVersion = "1.1.0-76254";
 //# sourceMappingURL=packageVersion.js.map

package/lib/packageVersion.js.map

@@ -1 +1 @@
-{"version":3,"file":"packageVersion.js","sourceRoot":"","sources":["../src/packageVersion.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,MAAM,CAAC,MAAM,OAAO,GAAG,qBAAqB,CAAC;AAC7C,MAAM,CAAC,MAAM,UAAU,GAAG,OAAO,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n *\n * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY\n */\n\nexport const pkgName = \"@fluidframework/map\";\nexport const pkgVersion = \"1.0.0\";\n"]}
+{"version":3,"file":"packageVersion.js","sourceRoot":"","sources":["../src/packageVersion.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,MAAM,CAAC,MAAM,OAAO,GAAG,qBAAqB,CAAC;AAC7C,MAAM,CAAC,MAAM,UAAU,GAAG,aAAa,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n *\n * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY\n */\n\nexport const pkgName = \"@fluidframework/map\";\nexport const pkgVersion = \"1.1.0-76254\";\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/map",
-  "version": "1.0.0",
+  "version": "1.1.0-76254",
   "description": "Distributed map",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -62,24 +62,24 @@
   "dependencies": {
     "@fluidframework/common-definitions": "^0.20.1",
     "@fluidframework/common-utils": "^0.32.1",
-    "@fluidframework/container-utils": "^1.0.0",
-    "@fluidframework/core-interfaces": "^1.0.0",
-    "@fluidframework/datastore-definitions": "^1.0.0",
-    "@fluidframework/driver-utils": "^1.0.0",
+    "@fluidframework/container-utils": "1.1.0-76254",
+    "@fluidframework/core-interfaces": "1.1.0-76254",
+    "@fluidframework/datastore-definitions": "1.1.0-76254",
+    "@fluidframework/driver-utils": "1.1.0-76254",
     "@fluidframework/protocol-definitions": "^0.1028.2000",
-    "@fluidframework/runtime-definitions": "^1.0.0",
-    "@fluidframework/runtime-utils": "^1.0.0",
-    "@fluidframework/shared-object-base": "^1.0.0",
+    "@fluidframework/runtime-definitions": "1.1.0-76254",
+    "@fluidframework/runtime-utils": "1.1.0-76254",
+    "@fluidframework/shared-object-base": "1.1.0-76254",
     "path-browserify": "^1.0.1"
   },
   "devDependencies": {
-    "@fluid-internal/test-dds-utils": "^1.0.0",
-    "@fluidframework/build-common": "^0.23.0",
-    "@fluidframework/build-tools": "^0.2.71273",
+    "@fluid-internal/test-dds-utils": "1.1.0-76254",
+    "@fluidframework/build-common": "^0.24.0-0",
+    "@fluidframework/build-tools": "^0.2.74327",
     "@fluidframework/eslint-config-fluid": "^0.28.2000",
-    "@fluidframework/map-previous": "npm:@fluidframework/map@^0.59.0",
-    "@fluidframework/mocha-test-setup": "^1.0.0",
-    "@fluidframework/test-runtime-utils": "^1.0.0",
+    "@fluidframework/map-previous": "npm:@fluidframework/map@^1.0.0",
+    "@fluidframework/mocha-test-setup": "1.1.0-76254",
+    "@fluidframework/test-runtime-utils": "1.1.0-76254",
     "@microsoft/api-extractor": "^7.22.2",
     "@rushstack/eslint-config": "^2.5.1",
     "@types/mocha": "^9.1.1",
@@ -95,7 +95,7 @@
     "typescript-formatter": "7.1.0"
   },
   "typeValidation": {
-    "version": "1.0.0",
+    "version": "1.1.0",
     "broken": {}
   }
 }

package/src/directory.ts

@@ -1429,14 +1429,14 @@ class SubDirectory extends TypedEventEmitter<IDirectoryEvents> implements IDirec
             return false;
         }
 
-        if (this.pendingKeys.has(op.key)) {
+        const pendingKeyMessageId = this.pendingKeys.get(op.key);
+        if (pendingKeyMessageId !== undefined) {
             // Found an NACK op, clear it from the directory if the latest sequence number in the directory
             // match the message's and don't process the op.
             if (local) {
                 assert(localOpMetadata !== undefined,
                     0x011 /* pendingMessageId is missing from the local client's operation */);
                 const pendingMessageId = localOpMetadata as number;
-                const pendingKeyMessageId = this.pendingKeys.get(op.key);
                 if (pendingKeyMessageId === pendingMessageId) {
                     this.pendingKeys.delete(op.key);
                 }
@@ -1463,12 +1463,12 @@ class SubDirectory extends TypedEventEmitter<IDirectoryEvents> implements IDirec
         local: boolean,
         localOpMetadata: unknown,
     ): boolean {
-        if (this.pendingSubDirectories.has(op.subdirName)) {
+        const pendingSubDirectoryMessageId = this.pendingSubDirectories.get(op.subdirName);
+        if (pendingSubDirectoryMessageId !== undefined) {
             if (local) {
                 assert(localOpMetadata !== undefined,
                     0x012 /* pendingMessageId is missing from the local client's operation */);
                 const pendingMessageId = localOpMetadata as number;
-                const pendingSubDirectoryMessageId = this.pendingSubDirectories.get(op.subdirName);
                 if (pendingSubDirectoryMessageId === pendingMessageId) {
                     this.pendingSubDirectories.delete(op.subdirName);
                 }

package/src/interfaces.ts

@@ -144,9 +144,10 @@ export interface IDirectory extends Map<string, any>, IEventProvider<IDirectoryE
  * ```typescript
  * (path: string, local: boolean, target: IEventThisPlaceHolder) => void
  * ```
- * - `path` -  The relative path to the key that is created.It is relative from the object which raises the event.
+ * - `path` -  The relative path to the subdirectory that is created.
+ *             It is relative from the object which raises the event.
  *
- * - `local` - Whether the clear originated from the this client.
+ * - `local` - Whether the create originated from the this client.
  *
  * - `target` - The ISharedDirectory itself.
  *
@@ -159,9 +160,10 @@ export interface IDirectory extends Map<string, any>, IEventProvider<IDirectoryE
  * ```typescript
  * (path: string, local: boolean, target: IEventThisPlaceHolder) => void
  * ```
- * - `path` - The relative path to the key that is deleted.It is relative from the object which raises the event.
+ * - `path` - The relative path to the subdirectory that is deleted.
+ *            It is relative from the object which raises the event.
  *
- * - `local` - Whether the clear originated from the this client.
+ * - `local` - Whether the delete originated from the this client.
  *
  * - `target` - The ISharedDirectory itself.
  */
@@ -216,9 +218,10 @@ export interface ISharedDirectoryEvents extends ISharedObjectEvents {
  * ```typescript
  * (path: string, local: boolean, target: IEventThisPlaceHolder) => void
  * ```
- * - `path` - The relative path to the key that is created. It is relative from the object which raises the event.
+ * - `path` - The relative path to the subdirectory that is created.
+ *            It is relative from the object which raises the event.
  *
- * - `local` - Whether the clear originated from the this client.
+ * - `local` - Whether the creation originated from the this client.
  *
  * - `target` - The ISharedDirectory itself.
  *
@@ -231,9 +234,10 @@ export interface ISharedDirectoryEvents extends ISharedObjectEvents {
  * ```typescript
  * (path: string, local: boolean, target: IEventThisPlaceHolder) => void
  * ```
- * - `path` - The relative path to the key that is deleted. It is relative from the object which raises the event.
+ * - `path` - The relative path to the subdirectory that is deleted.
+ *            It is relative from the object which raises the event.
  *
- * - `local` - Whether the clear originated from the this client.
+ * - `local` - Whether the delete originated from the this client.
  *
  * - `target` - The ISharedDirectory itself.
  *
@@ -306,7 +310,6 @@ export interface IDirectoryValueChanged extends IValueChanged {
  * (
  *     changed: IValueChanged,
  *     local: boolean,
- *     op: ISequencedDocumentMessage | null,
  *     target: IEventThisPlaceHolder,
  * ) => void
  * ```
@@ -314,8 +317,6 @@ export interface IDirectoryValueChanged extends IValueChanged {
  *
  * - `local` - Whether the change originated from the this client.
  *
- * - `op` - The op that caused the change in value.
- *
  * - `target` - The map itself.
  *
  * ### "clear"
@@ -325,12 +326,10 @@ export interface IDirectoryValueChanged extends IValueChanged {
  * #### Listener signature
  *
  * ```typescript
- * (local: boolean, op: ISequencedDocumentMessage | null, target: IEventThisPlaceHolder) => void
+ * (local: boolean, target: IEventThisPlaceHolder) => void
  * ```
  * - `local` - Whether the clear originated from the this client.
  *
- * - `op` - The op that caused the clear.
- *
  * - `target` - The map itself.
  */
 export interface ISharedMapEvents extends ISharedObjectEvents {
@@ -340,8 +339,7 @@ export interface ISharedMapEvents extends ISharedObjectEvents {
         target: IEventThisPlaceHolder) => void);
     (event: "clear", listener: (
         local: boolean,
-        target: IEventThisPlaceHolder
-    ) => void);
+        target: IEventThisPlaceHolder) => void);
 }
 
 /**

package/src/map.ts

@@ -368,4 +368,12 @@ export class SharedMap extends SharedObject<ISharedMapEvents> implements IShared
             this.kernel.tryProcessMessage(message.contents, local, localOpMetadata);
         }
     }
+
+    /**
+     * {@inheritDoc @fluidframework/shared-object-base#SharedObject.rollback}
+     * @internal
+    */
+   protected rollback(content: any, localOpMetadata: unknown) {
+       this.kernel.rollback(content, localOpMetadata);
+   }
 }