@fluidframework/odsp-driver 1.4.0-121020 → 2.0.0-dev-rc.1.0.0.225277

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/odsp-driver",
-  "version": "1.4.0-121020",
+  "version": "2.0.0-dev-rc.1.0.0.225277",
   "description": "Socket storage implementation for SPO and ODC",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -11,44 +11,20 @@
   "license": "MIT",
   "author": "Microsoft and contributors",
   "sideEffects": false,
-  "main": "dist/index.js",
-  "module": "lib/index.js",
+  "main": "dist/index.cjs",
+  "module": "lib/index.mjs",
   "types": "dist/index.d.ts",
-  "scripts": {
-    "build": "npm run build:genver && concurrently npm:build:compile npm:lint && npm run build:docs",
-    "build:commonjs": "npm run tsc && npm run typetests:gen && npm run build:test",
-    "build:compile": "concurrently npm:build:commonjs npm:build:esnext",
-    "build:docs": "api-extractor run --local --typescript-compiler-folder ../../../node_modules/typescript && copyfiles -u 1 ./_api-extractor-temp/doc-models/* ../../../_api-extractor-temp/",
-    "build:esnext": "tsc --project ./tsconfig.esnext.json",
-    "build:full": "npm run build",
-    "build:full:compile": "npm run build:compile",
-    "build:genver": "gen-version",
-    "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 dist lib *.tsbuildinfo *.build.log",
-    "eslint": "eslint --format stylish src",
-    "eslint:fix": "eslint --format stylish src --fix --fix-type problem,suggestion,layout",
-    "lint": "npm run eslint",
-    "lint:fix": "npm run eslint:fix",
-    "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 -r node_modules/@fluidframework/mocha-test-setup --unhandled-rejections=strict",
-    "test:mocha:verbose": "cross-env FLUID_TEST_VERBOSE=1 npm run test:mocha",
-    "tsc": "tsc",
-    "typetests:gen": "flub generate typetests --generate --dir . --no-generateInName",
-    "typetests:prepare": "flub generate typetests --prepare --dir . --pin"
-  },
-  "nyc": {
+  "c8": {
     "all": true,
     "cache-dir": "nyc/.cache",
     "exclude": [
-      "src/test/**/*.ts",
-      "dist/test/**/*.js"
+      "src/test/**/*.*ts",
+      "dist/test/**/*.*js"
     ],
     "exclude-after-remap": false,
     "include": [
-      "src/**/*.ts",
-      "dist/**/*.js"
+      "src/**/*.*ts",
+      "dist/**/*.*js"
     ],
     "report-dir": "nyc/report",
     "reporter": [
@@ -59,49 +35,91 @@
     "temp-directory": "nyc/.nyc_output"
   },
   "dependencies": {
-    "@fluidframework/common-definitions": "^0.20.1",
-    "@fluidframework/common-utils": "^0.32.1",
-    "@fluidframework/core-interfaces": "1.4.0-121020",
-    "@fluidframework/driver-base": "1.4.0-121020",
-    "@fluidframework/driver-definitions": "1.4.0-121020",
-    "@fluidframework/driver-utils": "1.4.0-121020",
-    "@fluidframework/gitresources": "^0.1036.5000",
-    "@fluidframework/odsp-doclib-utils": "1.4.0-121020",
-    "@fluidframework/odsp-driver-definitions": "1.4.0-121020",
-    "@fluidframework/protocol-base": "^0.1036.5000",
-    "@fluidframework/protocol-definitions": "^0.1028.2000",
-    "@fluidframework/telemetry-utils": "1.4.0-121020",
-    "abort-controller": "^3.0.0",
-    "node-fetch": "^2.6.1",
-    "socket.io-client": "^4.4.1",
-    "uuid": "^8.3.1"
+    "@fluid-internal/client-utils": "2.0.0-dev-rc.1.0.0.225277",
+    "@fluidframework/core-interfaces": "2.0.0-dev-rc.1.0.0.225277",
+    "@fluidframework/core-utils": "2.0.0-dev-rc.1.0.0.225277",
+    "@fluidframework/driver-base": "2.0.0-dev-rc.1.0.0.225277",
+    "@fluidframework/driver-definitions": "2.0.0-dev-rc.1.0.0.225277",
+    "@fluidframework/driver-utils": "2.0.0-dev-rc.1.0.0.225277",
+    "@fluidframework/odsp-doclib-utils": "2.0.0-dev-rc.1.0.0.225277",
+    "@fluidframework/odsp-driver-definitions": "2.0.0-dev-rc.1.0.0.225277",
+    "@fluidframework/protocol-base": "^3.0.0-223236",
+    "@fluidframework/protocol-definitions": "^3.1.0-223007",
+    "@fluidframework/telemetry-utils": "2.0.0-dev-rc.1.0.0.225277",
+    "node-fetch": "^2.6.9",
+    "socket.io-client": "^4.6.1",
+    "uuid": "^9.0.0"
   },
   "devDependencies": {
-    "@fluidframework/build-common": "^0.24.0",
-    "@fluidframework/build-tools": "^0.6.0-110101",
-    "@fluidframework/eslint-config-fluid": "^0.28.2000",
-    "@fluidframework/mocha-test-setup": "1.4.0-121020",
-    "@fluidframework/odsp-driver-previous": "npm:@fluidframework/odsp-driver@1.3.1",
-    "@microsoft/api-extractor": "^7.22.2",
-    "@rushstack/eslint-config": "^2.5.1",
+    "@arethetypeswrong/cli": "^0.13.3",
+    "@fluid-tools/build-cli": "0.29.0-222379",
+    "@fluidframework/build-common": "^2.0.3",
+    "@fluidframework/build-tools": "0.29.0-222379",
+    "@fluidframework/eslint-config-fluid": "^3.1.0",
+    "@fluidframework/mocha-test-setup": "2.0.0-dev-rc.1.0.0.225277",
+    "@fluidframework/odsp-driver-previous": "npm:@fluidframework/odsp-driver@2.0.0-internal.8.0.0",
+    "@microsoft/api-extractor": "^7.38.3",
     "@types/mocha": "^9.1.1",
+    "@types/node": "^18.19.0",
     "@types/node-fetch": "^2.5.10",
-    "@types/sha.js": "^2.4.0",
-    "concurrently": "^6.2.0",
-    "copyfiles": "^2.1.0",
-    "cross-env": "^7.0.2",
-    "eslint": "~8.6.0",
-    "mocha": "^10.0.0",
-    "nyc": "^15.0.0",
-    "rimraf": "^2.6.2",
+    "@types/sinon": "^7.0.13",
+    "c8": "^8.0.1",
+    "copyfiles": "^2.4.1",
+    "cross-env": "^7.0.3",
+    "eslint": "~8.50.0",
+    "mocha": "^10.2.0",
+    "mocha-json-output-reporter": "^2.0.1",
+    "mocha-multi-reporters": "^1.5.1",
+    "moment": "^2.21.0",
+    "prettier": "~3.0.3",
+    "rimraf": "^4.4.0",
     "sinon": "^7.4.2",
-    "typescript": "~4.5.5",
-    "typescript-formatter": "7.1.0"
+    "tsc-multi": "^1.1.0",
+    "typescript": "~5.1.6"
+  },
+  "fluidBuild": {
+    "tasks": {
+      "build:docs": {
+        "dependsOn": [
+          "...",
+          "api-extractor:commonjs",
+          "api-extractor:esnext"
+        ],
+        "script": false
+      }
+    }
   },
   "typeValidation": {
-    "version": "1.4.0",
-    "baselineRange": "~1.3.0",
-    "baselineVersion": "1.3.1",
     "broken": {}
+  },
+  "scripts": {
+    "api": "fluid-build . --task api",
+    "api-extractor:commonjs": "api-extractor run --local",
+    "api-extractor:esnext": "api-extractor run --config ./api-extractor-esm.json",
+    "build": "fluid-build . --task build",
+    "build:commonjs": "fluid-build . --task commonjs",
+    "build:compile": "fluid-build . --task compile",
+    "build:docs": "fluid-build . --task api",
+    "build:esnext": "tsc-multi --config ../../../common/build/build-common/tsc-multi.esm.json",
+    "build:genver": "gen-version",
+    "build:test": "tsc-multi --config ./tsc-multi.test.json",
+    "check:are-the-types-wrong": "attw --pack",
+    "check:release-tags": "api-extractor run --local --config ./api-extractor-lint.json",
+    "ci:build:docs": "api-extractor run",
+    "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",
+    "lint": "npm run prettier && npm run check:release-tags && npm run eslint",
+    "lint:fix": "npm run prettier:fix && npm run eslint:fix",
+    "prettier": "prettier --check . --cache --ignore-path ../../../.prettierignore",
+    "prettier:fix": "prettier --write . --cache --ignore-path ../../../.prettierignore",
+    "test": "npm run test:mocha",
+    "test:coverage": "c8 npm test",
+    "test:mocha": "mocha --ignore \"dist/test/types/*\" --recursive dist/test -r node_modules/@fluidframework/mocha-test-setup",
+    "test:mocha:verbose": "cross-env FLUID_TEST_VERBOSE=1 npm run test:mocha",
+    "tsc": "tsc-multi --config ../../../common/build/build-common/tsc-multi.cjs.json",
+    "typetests:gen": "fluid-type-test-generator",
+    "typetests:prepare": "flub typetests --dir . --reset --previous --normalize"
   }
-}
+}

package/prettier.config.cjs

@@ -0,0 +1,8 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+module.exports = {
+	...require("@fluidframework/build-common/prettier.config.cjs"),
+};

package/src/ReadBufferUtils.ts

@@ -3,54 +3,61 @@
  * Licensed under the MIT License.
  */
 
-import { assert } from "@fluidframework/common-utils";
+import { assert } from "@fluidframework/core-utils";
 
 /**
  * Buffer class, used to sequentially read data.
  * Used by tree code to reconstruct a tree from binary representation.
  */
 export class ReadBuffer {
-    protected index = 0;
-
-    public get buffer() {
-        return this.data;
-    }
-
-    constructor(protected readonly data: Uint8Array) {
-        // BlobShallowCopy will return to users parts of this array.
-        // We need to ensure that nobody can change it, as it will have
-        // catastrophic result and will be really hard to investigate.
-        Object.freeze(data.buffer);
-    }
-
-    public get eof() { return this.index === this.data.length; }
-    public get pos() { return this.index; }
-    public get length() { return this.data.length; }
-
-    public slice(start: number, end: number) {
-        return this.data.slice(start, end);
-    }
-
-    public reset() {
-        this.index = 0;
-    }
-
-    public read(lengthArg = 1): number {
-        let res = 0;
-        let multiplier = 1;
-        let length = lengthArg;
-        while (length > 0) {
-            assert(!this.eof, 0x223 /* "unexpected end of buffer" */);
-            res += this.data[this.index] * multiplier;
-            this.index++;
-            multiplier *= 256;
-            length--;
-        }
-        return res;
-    }
-
-    public skip(length: number) {
-        assert(length >= 0, 0x224 /* "Skip length should be positive" */);
-        this.index += length;
-    }
+	protected index = 0;
+
+	public get buffer() {
+		return this.data;
+	}
+
+	constructor(protected readonly data: Uint8Array) {
+		// BlobShallowCopy will return to users parts of this array.
+		// We need to ensure that nobody can change it, as it will have
+		// catastrophic result and will be really hard to investigate.
+		Object.freeze(data.buffer);
+	}
+
+	public get eof() {
+		return this.index === this.data.length;
+	}
+	public get pos() {
+		return this.index;
+	}
+	public get length() {
+		return this.data.length;
+	}
+
+	public slice(start: number, end: number) {
+		return this.data.slice(start, end);
+	}
+
+	public reset() {
+		this.index = 0;
+	}
+
+	public read(lengthArg = 1): number {
+		let res = 0;
+		let multiplier = 1;
+		let length = lengthArg;
+		while (length > 0) {
+			assert(!this.eof, 0x223 /* "unexpected end of buffer" */);
+			res += this.data[this.index] * multiplier;
+			this.index++;
+			multiplier *= 256;
+			length--;
+		}
+		return res;
+	}
+
+	public skip(length: number) {
+		assert(length >= 0, 0x224 /* "Skip length should be positive" */);
+		this.index += length;
+		assert(this.index <= this.data.length, 0x3dc /* skipping past size of buffer */);
+	}
 }