@fluidframework/datastore 2.0.0-internal.6.1.1 → 2.0.0-internal.6.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/datastore",
-  "version": "2.0.0-internal.6.1.1",
+  "version": "2.0.0-internal.6.3.0",
   "description": "Fluid data store implementation",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -14,7 +14,7 @@
   "main": "dist/index.js",
   "module": "lib/index.js",
   "types": "dist/index.d.ts",
-  "nyc": {
+  "c8": {
     "all": true,
     "cache-dir": "nyc/.cache",
     "exclude": [
@@ -35,36 +35,35 @@
     "temp-directory": "nyc/.nyc_output"
   },
   "dependencies": {
-    "@fluidframework/common-definitions": "^0.20.1",
-    "@fluidframework/common-utils": "^1.1.1",
-    "@fluidframework/container-definitions": ">=2.0.0-internal.6.1.1 <2.0.0-internal.6.2.0",
-    "@fluidframework/container-utils": ">=2.0.0-internal.6.1.1 <2.0.0-internal.6.2.0",
-    "@fluidframework/core-interfaces": ">=2.0.0-internal.6.1.1 <2.0.0-internal.6.2.0",
-    "@fluidframework/core-utils": ">=2.0.0-internal.6.1.1 <2.0.0-internal.6.2.0",
-    "@fluidframework/datastore-definitions": ">=2.0.0-internal.6.1.1 <2.0.0-internal.6.2.0",
-    "@fluidframework/driver-definitions": ">=2.0.0-internal.6.1.1 <2.0.0-internal.6.2.0",
-    "@fluidframework/driver-utils": ">=2.0.0-internal.6.1.1 <2.0.0-internal.6.2.0",
-    "@fluidframework/protocol-base": "^1.0.0",
+    "@fluid-internal/client-utils": ">=2.0.0-internal.6.3.0 <2.0.0-internal.6.4.0",
+    "@fluidframework/container-definitions": ">=2.0.0-internal.6.3.0 <2.0.0-internal.6.4.0",
+    "@fluidframework/container-utils": ">=2.0.0-internal.6.3.0 <2.0.0-internal.6.4.0",
+    "@fluidframework/core-interfaces": ">=2.0.0-internal.6.3.0 <2.0.0-internal.6.4.0",
+    "@fluidframework/core-utils": ">=2.0.0-internal.6.3.0 <2.0.0-internal.6.4.0",
+    "@fluidframework/datastore-definitions": ">=2.0.0-internal.6.3.0 <2.0.0-internal.6.4.0",
+    "@fluidframework/driver-definitions": ">=2.0.0-internal.6.3.0 <2.0.0-internal.6.4.0",
+    "@fluidframework/driver-utils": ">=2.0.0-internal.6.3.0 <2.0.0-internal.6.4.0",
+    "@fluidframework/protocol-base": "^1.0.1",
     "@fluidframework/protocol-definitions": "^1.1.0",
-    "@fluidframework/runtime-definitions": ">=2.0.0-internal.6.1.1 <2.0.0-internal.6.2.0",
-    "@fluidframework/runtime-utils": ">=2.0.0-internal.6.1.1 <2.0.0-internal.6.2.0",
-    "@fluidframework/telemetry-utils": ">=2.0.0-internal.6.1.1 <2.0.0-internal.6.2.0",
+    "@fluidframework/runtime-definitions": ">=2.0.0-internal.6.3.0 <2.0.0-internal.6.4.0",
+    "@fluidframework/runtime-utils": ">=2.0.0-internal.6.3.0 <2.0.0-internal.6.4.0",
+    "@fluidframework/telemetry-utils": ">=2.0.0-internal.6.3.0 <2.0.0-internal.6.4.0",
     "lodash": "^4.17.21",
-    "uuid": "^8.3.1"
+    "uuid": "^9.0.0"
   },
   "devDependencies": {
     "@fluid-tools/build-cli": "^0.22.0",
     "@fluidframework/build-common": "^2.0.0",
     "@fluidframework/build-tools": "^0.22.0",
-    "@fluidframework/datastore-previous": "npm:@fluidframework/datastore@2.0.0-internal.6.0.0",
-    "@fluidframework/eslint-config-fluid": "^2.0.0",
-    "@fluidframework/mocha-test-setup": ">=2.0.0-internal.6.1.1 <2.0.0-internal.6.2.0",
-    "@fluidframework/test-runtime-utils": ">=2.0.0-internal.6.1.1 <2.0.0-internal.6.2.0",
+    "@fluidframework/datastore-previous": "npm:@fluidframework/datastore@2.0.0-internal.6.1.1",
+    "@fluidframework/eslint-config-fluid": "^2.1.0",
+    "@fluidframework/mocha-test-setup": ">=2.0.0-internal.6.3.0 <2.0.0-internal.6.4.0",
+    "@fluidframework/test-runtime-utils": ">=2.0.0-internal.6.3.0 <2.0.0-internal.6.4.0",
     "@microsoft/api-extractor": "^7.34.4",
     "@types/mocha": "^9.1.1",
     "@types/node": "^16.18.38",
-    "@types/uuid": "^8.3.0",
-    "concurrently": "^7.6.0",
+    "@types/uuid": "^9.0.2",
+    "c8": "^7.7.1",
     "copyfiles": "^2.4.1",
     "cross-env": "^7.0.3",
     "eslint": "~8.6.0",
@@ -72,13 +71,16 @@
     "mocha-json-output-reporter": "^2.0.1",
     "mocha-multi-reporters": "^1.5.1",
     "moment": "^2.21.0",
-    "nyc": "^15.1.0",
     "prettier": "~2.6.2",
     "rimraf": "^4.4.0",
     "typescript": "~4.5.5"
   },
   "typeValidation": {
-    "broken": {}
+    "broken": {
+      "ClassDeclaration_FluidDataStoreRuntime": {
+        "backCompat": false
+      }
+    }
   },
   "scripts": {
     "build": "fluid-build . --task build",
@@ -88,7 +90,7 @@
     "build:esnext": "tsc --project ./tsconfig.esnext.json",
     "build:test": "tsc --project ./src/test/tsconfig.json",
     "ci:build:docs": "api-extractor run --typescript-compiler-folder ../../../node_modules/typescript && copyfiles -u 1 ./_api-extractor-temp/* ../../../_api-extractor-temp/",
-    "clean": "rimraf --glob \"dist\" \"lib\" \"*.tsbuildinfo\" \"*.build.log\"",
+    "clean": "rimraf --glob 'dist' 'lib' '*.tsbuildinfo' '*.build.log' '_api-extractor-temp' 'nyc'",
     "eslint": "eslint --format stylish src",
     "eslint:fix": "eslint --format stylish src --fix --fix-type problem,suggestion,layout",
     "format": "npm run prettier:fix",
@@ -97,9 +99,8 @@
     "prettier": "prettier --check . --ignore-path ../../../.prettierignore",
     "prettier:fix": "prettier --write . --ignore-path ../../../.prettierignore",
     "test": "npm run test:mocha",
-    "test:coverage": "nyc npm test -- --reporter xunit --reporter-option output=nyc/junit-report.xml",
-    "test:mocha": "mocha --ignore 'dist/test/types/*' --recursive dist/test --exit -r node_modules/@fluidframework/mocha-test-setup --unhandled-rejections=strict",
-    "test:mocha:multireport": "cross-env FLUID_TEST_MULTIREPORT=1 npm run test:mocha",
+    "test:coverage": "c8 npm test",
+    "test:mocha": "mocha --ignore 'dist/test/types/*' --recursive dist/test --exit -r node_modules/@fluidframework/mocha-test-setup",
     "test:mocha:verbose": "cross-env FLUID_TEST_VERBOSE=1 npm run test:mocha",
     "tsc": "tsc",
     "tsc:watch": "tsc --watch",

package/src/channelContext.ts

@@ -3,7 +3,11 @@
  * Licensed under the MIT License.
  */
 
-import { ITelemetryLoggerExt, tagCodeArtifacts } from "@fluidframework/telemetry-utils";
+import {
+	DataCorruptionError,
+	ITelemetryLoggerExt,
+	tagCodeArtifacts,
+} from "@fluidframework/telemetry-utils";
 import { IFluidHandle } from "@fluidframework/core-interfaces";
 import {
 	IChannel,
@@ -22,7 +26,6 @@ import {
 	IFluidDataStoreContext,
 } from "@fluidframework/runtime-definitions";
 import { addBlobToSummary } from "@fluidframework/runtime-utils";
-import { DataCorruptionError } from "@fluidframework/container-utils";
 import { readAndParse } from "@fluidframework/driver-utils";
 import { ChannelStorageService } from "./channelStorageService";
 import { ChannelDeltaConnection } from "./channelDeltaConnection";

package/src/channelDeltaConnection.ts

@@ -3,10 +3,10 @@
  * Licensed under the MIT License.
  */
 
-import { assert } from "@fluidframework/common-utils";
+import { assert } from "@fluidframework/core-utils";
 import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions";
 import { IDeltaConnection, IDeltaHandler } from "@fluidframework/datastore-definitions";
-import { DataProcessingError } from "@fluidframework/container-utils";
+import { DataProcessingError } from "@fluidframework/telemetry-utils";
 import { IFluidHandle } from "@fluidframework/core-interfaces";
 
 export class ChannelDeltaConnection implements IDeltaConnection {

package/src/dataStoreRuntime.ts

@@ -3,7 +3,9 @@
  * Licensed under the MIT License.
  */
 
+import { TypedEventEmitter } from "@fluid-internal/client-utils";
 import {
+	DataProcessingError,
 	ITelemetryLoggerExt,
 	generateStack,
 	LoggingError,
@@ -11,6 +13,7 @@ import {
 	raiseConnectedEvent,
 	createChildMonitoringContext,
 	tagCodeArtifacts,
+	UsageError,
 } from "@fluidframework/telemetry-utils";
 import {
 	FluidObject,
@@ -19,15 +22,13 @@ import {
 	IRequest,
 	IResponse,
 } from "@fluidframework/core-interfaces";
-import { LazyPromise } from "@fluidframework/core-utils";
+import { assert, Deferred, LazyPromise, unreachableCase } from "@fluidframework/core-utils";
 import {
 	IAudience,
 	IDeltaManager,
 	AttachState,
 	ILoaderOptions,
 } from "@fluidframework/container-definitions";
-import { DataProcessingError, UsageError } from "@fluidframework/container-utils";
-import { assert, Deferred, TypedEventEmitter, unreachableCase } from "@fluidframework/common-utils";
 import { buildSnapshotTree } from "@fluidframework/driver-utils";
 import {
 	IClientDetails,

package/src/localChannelContext.ts

@@ -5,7 +5,7 @@
 
 // eslint-disable-next-line import/no-internal-modules
 import cloneDeep from "lodash/cloneDeep";
-import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
+import { DataProcessingError, ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
 import { IDocumentStorageService } from "@fluidframework/driver-definitions";
 import { ISequencedDocumentMessage, ISnapshotTree } from "@fluidframework/protocol-definitions";
 import { IChannel, IFluidDataStoreRuntime } from "@fluidframework/datastore-definitions";
@@ -15,10 +15,8 @@ import {
 	ISummarizeResult,
 	ITelemetryContext,
 } from "@fluidframework/runtime-definitions";
-import { DataProcessingError } from "@fluidframework/container-utils";
-import { assert } from "@fluidframework/common-utils";
+import { assert, Lazy, LazyPromise } from "@fluidframework/core-utils";
 import { IFluidHandle } from "@fluidframework/core-interfaces";
-import { Lazy, LazyPromise } from "@fluidframework/core-utils";
 import {
 	ChannelServiceEndpoints,
 	createChannelServiceEndpoints,

package/src/localChannelStorageService.ts

@@ -4,7 +4,7 @@
  */
 
 import { IChannelStorageService } from "@fluidframework/datastore-definitions";
-import { stringToBuffer } from "@fluidframework/common-utils";
+import { stringToBuffer } from "@fluid-internal/client-utils";
 import { IBlob, ITree, TreeEntry } from "@fluidframework/protocol-definitions";
 import { listBlobsAtTreePath } from "@fluidframework/runtime-utils";
 

package/src/remoteChannelContext.ts

@@ -3,9 +3,8 @@
  * Licensed under the MIT License.
  */
 
-import { assert } from "@fluidframework/common-utils";
+import { assert, LazyPromise } from "@fluidframework/core-utils";
 import { IFluidHandle } from "@fluidframework/core-interfaces";
-import { LazyPromise } from "@fluidframework/core-utils";
 import { IChannel, IFluidDataStoreRuntime } from "@fluidframework/datastore-definitions";
 import { IDocumentStorageService } from "@fluidframework/driver-definitions";
 import { ISequencedDocumentMessage, ISnapshotTree } from "@fluidframework/protocol-definitions";