@fluidframework/odsp-driver 1.3.0 → 2.0.0-dev.1.4.5.105745

package/dist/zipItDataRepresentationUtils.d.ts

@@ -2,6 +2,7 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
+import { ITelemetryLogger } from "@fluidframework/common-definitions";
 import { ReadBuffer } from "./ReadBufferUtils";
 /**
  * Control codes used by tree serialization / decentralization code. Same as on server. These can be found on
@@ -80,7 +81,7 @@ export declare const codeToBytesMap: {
 export declare function getValueSafely(map: {
     [index: number]: number;
 }, key: number): number;
-export declare function getAndValidateNodeProps(node: NodeCore, props: string[], enforceAllProps?: boolean): Record<string, NodeTypes>;
+export declare function getNodeProps(node: NodeCore): Record<string, NodeTypes>;
 export declare function iteratePairs<T>(it: IterableIterator<T>): IterableIterator<[T, T]>;
 /**
  * Helper function that returns iterator from an object
@@ -95,24 +96,19 @@ export declare function iterate<T>(obj: {
  * Note: concrete implementations (derived classes) are not exposed from this module
  */
 export declare abstract class BlobCore {
-    readonly constString: boolean;
-    readonly useUtf8Code: boolean;
     abstract get buffer(): Uint8Array;
-    get arrayBuffer(): ArrayBufferLike;
+    abstract get arrayBuffer(): ArrayBufferLike;
     /**
      * Represents a blob.
-     * @param constString - Whether it contains const string declaration.
-     * @param useUtf8Code - Represents if the utf8 string marker code should be used when representing.
      */
-    constructor(constString: boolean, useUtf8Code?: boolean);
-    toString(): string;
+    constructor();
 }
 /**
  * Shallow copy blob, keeps a reference to portion of ReadBuffer
  * it was constructed from. It takes much less memory compared to BlobDeepCopy
  */
 export declare class BlobShallowCopy extends BlobCore {
-    protected data: ReadBuffer;
+    protected data: Uint8Array;
     protected start: number;
     protected end: number;
     /**
@@ -120,15 +116,26 @@ export declare class BlobShallowCopy extends BlobCore {
      * @param data - Data array of the blob
      * @param start - Start point of the blob in the buffer.
      * @param end - End point of the blob in the buffer.
-     * @param constString - Whether it contains const string declaration.
      */
-    constructor(data: ReadBuffer, start: number, end: number, constString: boolean);
+    constructor(data: Uint8Array, start: number, end: number);
     get buffer(): Uint8Array;
-    static read(buffer: ReadBuffer, lengthLen: number, constString: boolean): BlobCore;
+    get arrayBuffer(): ArrayBufferLike;
+    static read(buffer: ReadBuffer, lengthLen: number): BlobCore;
 }
-export declare const addStringProperty: (node: NodeCore, a: string, b: string, encodeValAsConstString?: boolean) => void;
+export declare const addStringProperty: (node: NodeCore, a: string, b: string) => void;
+export declare const addDictionaryStringProperty: (node: NodeCore, a: string, b: string) => void;
 export declare const addNumberProperty: (node: NodeCore, a: string, b: number) => void;
 export declare const addBoolProperty: (node: NodeCore, a: string, b: boolean) => void;
+export interface IStringElement {
+    content: string;
+    dictionary: boolean;
+    _stringElement: true;
+}
+export interface IStringElementInternal extends Omit<IStringElement, "content"> {
+    content?: string;
+    startPos: number;
+    endPos: number;
+}
 /**
  * Three leaf types supported by tree:
  * 1. Node (sub-tree)
@@ -136,7 +143,7 @@ export declare const addBoolProperty: (node: NodeCore, a: string, b: boolean) =>
  * 3. integer
  * 4. boolean
  */
-export declare type NodeTypes = NodeCore | BlobCore | number | boolean;
+export declare type NodeTypes = NodeCore | BlobCore | number | boolean | IStringElement;
 export declare type NodeCoreTypes = "list" | "set";
 /**
  * Node - node in the tree (non-leaf element of the tree)
@@ -151,28 +158,33 @@ export declare class NodeCore {
     get length(): number;
     get(index: number): NodeTypes;
     getString(index: number): string;
+    getMaybeString(index: number): string | undefined;
     getBlob(index: number): BlobCore;
     getNode(index: number): NodeCore;
     getNumber(index: number): number;
     getBool(index: number): boolean;
     addNode(type?: NodeCoreTypes): NodeCore;
-    addBlob(blob: Uint8Array, constString: boolean, useUtf8Code?: boolean): void;
-    addString(payload: string, constString: boolean): void;
+    addBlob(blob: Uint8Array): void;
+    addDictionaryString(payload: string): void;
+    addString(payload: string): void;
     addNumber(payload: number | undefined): void;
     addBool(payload: boolean): void;
+    private static readString;
     /**
      * Load and parse the buffer into a tree.
      * @param buffer - buffer to read from.
      */
-    protected load(buffer: ReadBuffer, dictionary: BlobCore[]): void;
+    protected load(buffer: ReadBuffer, logger: ITelemetryLogger): void;
 }
 /**
  * TreeBuilder - Root of the tree.
  * Provides loading and serialization capabilities.
  */
 export declare class TreeBuilder extends NodeCore {
-    static load(buffer: ReadBuffer): TreeBuilder;
+    static load(buffer: ReadBuffer, logger: ITelemetryLogger): TreeBuilder;
 }
+export declare function getMaybeStringInstance(node: NodeTypes): string | undefined;
+export declare function getStringInstance(node: NodeTypes, message: string): string;
 export declare function assertBlobCoreInstance(node: NodeTypes, message: string): asserts node is BlobCore;
 export declare function assertNodeCoreInstance(node: NodeTypes, message: string): asserts node is NodeCore;
 export declare function assertNumberInstance(node: NodeTypes, message: string): asserts node is number;

package/dist/zipItDataRepresentationUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"zipItDataRepresentationUtils.d.ts","sourceRoot":"","sources":["../src/zipItDataRepresentationUtils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"zipItDataRepresentationUtils.d.ts","sourceRoot":"","sources":["../src/zipItDataRepresentationUtils.ts"],"names":[],"mappings":"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"}

package/dist/zipItDataRepresentationUtils.js

@@ -4,7 +4,7 @@
  * Licensed under the MIT License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.assertBoolInstance = exports.assertNumberInstance = exports.assertNodeCoreInstance = exports.assertBlobCoreInstance = exports.TreeBuilder = exports.NodeCore = exports.addBoolProperty = exports.addNumberProperty = exports.addStringProperty = exports.BlobShallowCopy = exports.BlobCore = exports.iterate = exports.iteratePairs = exports.getAndValidateNodeProps = exports.getValueSafely = exports.codeToBytesMap = exports.MarkerCodesEnd = exports.MarkerCodesStart = exports.MarkerCodes = void 0;
+exports.assertBoolInstance = exports.assertNumberInstance = exports.assertNodeCoreInstance = exports.assertBlobCoreInstance = exports.getStringInstance = exports.getMaybeStringInstance = exports.TreeBuilder = exports.NodeCore = exports.addBoolProperty = exports.addNumberProperty = exports.addDictionaryStringProperty = exports.addStringProperty = exports.BlobShallowCopy = exports.BlobCore = exports.iterate = exports.iteratePairs = exports.getNodeProps = exports.getValueSafely = exports.codeToBytesMap = exports.MarkerCodesEnd = exports.MarkerCodesStart = exports.MarkerCodes = void 0;
 /**
  * Data representation which is followed(zipIt Protocol) here is described in this document:
  * https://microsoft.sharepoint-df.com/:w:/t/ODSPFileStore/ER06b64K_XdDjEyAKl-UT60BJiId39SCVkYSyo_2pvH9gQ?e=KYQ0c5
@@ -101,23 +101,15 @@ function getValueSafely(map, key) {
     return val;
 }
 exports.getValueSafely = getValueSafely;
-function getAndValidateNodeProps(node, props, enforceAllProps = true) {
-    const propSet = new Set(props);
+function getNodeProps(node) {
     const res = {};
     for (const [keyNode, valueNode] of node.iteratePairs()) {
-        assertBlobCoreInstance(keyNode, "keynode should be a blob");
-        const keyStr = keyNode.toString();
-        if (propSet.has(keyStr)) {
-            propSet.delete(keyStr);
-            res[keyStr] = valueNode;
-        }
-    }
-    if (enforceAllProps) {
-        (0, common_utils_1.assert)(propSet.size === 0, 0x288 /* All properties should exist */);
+        const id = getStringInstance(keyNode, "keynode should be a string");
+        res[id] = valueNode;
     }
     return res;
 }
-exports.getAndValidateNodeProps = getAndValidateNodeProps;
+exports.getNodeProps = getNodeProps;
 function iteratePairs(it) {
     const res = {
         next: () => {
@@ -150,19 +142,8 @@ exports.iterate = iterate;
 class BlobCore {
     /**
      * Represents a blob.
-     * @param constString - Whether it contains const string declaration.
-     * @param useUtf8Code - Represents if the utf8 string marker code should be used when representing.
      */
-    constructor(constString, useUtf8Code = false) {
-        this.constString = constString;
-        this.useUtf8Code = useUtf8Code;
-    }
-    get arrayBuffer() {
-        return (0, common_utils_1.Uint8ArrayToArrayBuffer)(this.buffer);
-    }
-    toString() {
-        return (0, common_utils_1.Uint8ArrayToString)(this.buffer, "utf-8");
-    }
+    constructor() { }
 }
 exports.BlobCore = BlobCore;
 /**
@@ -174,23 +155,24 @@ class BlobDeepCopy extends BlobCore {
     /**
      * Represents a deep copy of the blob.
      * @param data - Data array of the blob
-     * @param constString - Whether it contains const string declaration.
-     * @param useUtf8Code - Represents if the utf8 string marker code should be used when representing.
      */
-    constructor(data, constString, useUtf8Code = false) {
-        super(constString, useUtf8Code);
+    constructor(data) {
+        super();
         this.data = data;
     }
     get buffer() {
         return this.data;
     }
-    static read(buffer, lengthLen, constString) {
+    get arrayBuffer() {
+        return (0, common_utils_1.Uint8ArrayToArrayBuffer)(this.buffer);
+    }
+    static read(buffer, lengthLen) {
         const length = buffer.read(lengthLen);
         const data = new Uint8Array(length);
         for (let counter = 0; counter < length; counter++) {
             data[counter] = buffer.read();
         }
-        return new BlobDeepCopy(data, constString);
+        return new BlobDeepCopy(data);
     }
 }
 /**
@@ -203,37 +185,46 @@ class BlobShallowCopy extends BlobCore {
      * @param data - Data array of the blob
      * @param start - Start point of the blob in the buffer.
      * @param end - End point of the blob in the buffer.
-     * @param constString - Whether it contains const string declaration.
      */
-    constructor(data, start, end, constString) {
-        super(constString);
+    constructor(data, start, end) {
+        super();
         this.data = data;
         this.start = start;
         this.end = end;
     }
     get buffer() {
-        return this.data.buffer.subarray(this.start, this.end);
+        return this.data.subarray(this.start, this.end);
+    }
+    // Equivalent to Uint8ArrayToArrayBuffer(this.buffer)
+    get arrayBuffer() {
+        const offset = this.data.byteOffset;
+        return this.data.buffer.slice(this.start + offset, this.end + offset);
     }
-    static read(buffer, lengthLen, constString) {
+    static read(buffer, lengthLen) {
         const length = buffer.read(lengthLen);
         const pos = buffer.pos;
         buffer.skip(length);
-        return new BlobShallowCopy(buffer, pos, pos + length, constString);
+        return new BlobShallowCopy(buffer.buffer, pos, pos + length);
     }
 }
 exports.BlobShallowCopy = BlobShallowCopy;
-const addStringProperty = (node, a, b, encodeValAsConstString = false) => {
-    node.addString(a, true);
-    node.addString(b, encodeValAsConstString);
+const addStringProperty = (node, a, b) => {
+    node.addDictionaryString(a);
+    node.addString(b);
 };
 exports.addStringProperty = addStringProperty;
+const addDictionaryStringProperty = (node, a, b) => {
+    node.addDictionaryString(a);
+    node.addString(b);
+};
+exports.addDictionaryStringProperty = addDictionaryStringProperty;
 const addNumberProperty = (node, a, b) => {
-    node.addString(a, true);
+    node.addDictionaryString(a);
     node.addNumber(b);
 };
 exports.addNumberProperty = addNumberProperty;
 const addBoolProperty = (node, a, b) => {
-    node.addString(a, true);
+    node.addDictionaryString(a);
     node.addBool(b);
 };
 exports.addBoolProperty = addBoolProperty;
@@ -260,8 +251,11 @@ class NodeCore {
     get(index) { return this.children[index]; }
     getString(index) {
         const node = this.children[index];
-        assertBlobCoreInstance(node, "getString should return stringblob");
-        return node.toString();
+        return getStringInstance(node, "getString should return string");
+    }
+    getMaybeString(index) {
+        const node = this.children[index];
+        return getMaybeStringInstance(node);
     }
     getBlob(index) {
         const node = this.children[index];
@@ -288,11 +282,22 @@ class NodeCore {
         this.children.push(node);
         return node;
     }
-    addBlob(blob, constString, useUtf8Code = false) {
-        this.children.push(new BlobDeepCopy(blob, constString, useUtf8Code));
+    addBlob(blob) {
+        this.children.push(new BlobDeepCopy(blob));
     }
-    addString(payload, constString) {
-        this.addBlob(common_utils_1.IsoBuffer.from(payload, "utf-8"), constString, true);
+    addDictionaryString(payload) {
+        this.children.push({
+            content: payload,
+            dictionary: true,
+            _stringElement: true,
+        });
+    }
+    addString(payload) {
+        this.children.push({
+            content: payload,
+            dictionary: false,
+            _stringElement: true,
+        });
     }
     addNumber(payload) {
         (0, common_utils_1.assert)(Number.isInteger(payload), 0x231 /* "Number should be an integer" */);
@@ -302,59 +307,88 @@ class NodeCore {
     addBool(payload) {
         this.children.push(payload);
     }
+    // Can we do more efficiently here, without extra objects somehow??
+    static readString(buffer, code, dictionary) {
+        const lengthLen = getValueSafely(exports.codeToBytesMap, code);
+        const length = buffer.read(lengthLen);
+        const startPos = buffer.pos;
+        buffer.skip(length);
+        const result = {
+            // Note: Setting here property 'content: undefined' makes code substantially slower!
+            dictionary,
+            _stringElement: true,
+            startPos,
+            endPos: buffer.pos,
+        };
+        // We are lying here in terms of presence of `content` property.
+        // This will be addressed at the bottom of NodeCore.load() by resolving all strings at once!
+        // It's equivalent (but much slower!) to do it here via
+        // result.content = Uint8ArrayToString(buffer.buffer.subarray(startPos, buffer.pos), "utf-8");
+        return result;
+    }
     /**
      * Load and parse the buffer into a tree.
      * @param buffer - buffer to read from.
      */
-    load(buffer, dictionary) {
+    load(buffer, logger) {
+        const stack = [];
+        const stringsToResolve = [];
+        const dictionary = [];
+        let children = this.children;
         for (; !buffer.eof;) {
-            let childValue;
             const code = buffer.read();
             switch (code) {
                 case MarkerCodesStart.list:
                 case MarkerCodesStart.set: {
-                    childValue = new NodeCore(code === MarkerCodesStart.set ? "set" : "list");
-                    this.children.push(childValue);
-                    childValue.load(buffer, dictionary);
-                    break;
+                    const childValue = new NodeCore(code === MarkerCodesStart.set ? "set" : "list");
+                    children.push(childValue);
+                    stack.push(children);
+                    children = childValue.children;
+                    continue;
                 }
                 case MarkerCodes.ConstStringDeclare:
                 case MarkerCodes.ConstStringDeclareBig:
                     {
                         const stringId = buffer.read(getValueSafely(exports.codeToBytesMap, code));
-                        const constString = BlobShallowCopy.read(buffer, getValueSafely(exports.codeToBytesMap, code), true);
+                        const constString = NodeCore.readString(buffer, code, true /* dictionary */);
+                        stringsToResolve.push(constString);
                         dictionary[stringId] = constString;
-                        break;
+                        continue;
                     }
                 case MarkerCodes.ConstString8Id:
                 case MarkerCodes.ConstString16Id:
                 case MarkerCodes.ConstString32Id:
                     {
                         const stringId = buffer.read(getValueSafely(exports.codeToBytesMap, code));
-                        childValue = dictionary[stringId];
-                        this.children.push(childValue);
-                        break;
+                        const content = dictionary[stringId];
+                        (0, common_utils_1.assert)(content !== undefined, 0x3de /* const string not found */);
+                        children.push(content);
+                        continue;
                     }
                 case MarkerCodes.StringEmpty:
                 case MarkerCodes.String8Length:
                 case MarkerCodes.String16Length:
                 case MarkerCodes.String32Length:
+                    {
+                        const str = NodeCore.readString(buffer, code, false /* dictionary */);
+                        stringsToResolve.push(str);
+                        children.push(str);
+                        continue;
+                    }
                 case MarkerCodes.BinaryEmpty:
                 case MarkerCodes.BinarySingle8:
                 case MarkerCodes.BinarySingle16:
                 case MarkerCodes.BinarySingle32:
                 case MarkerCodes.BinarySingle64:
                     {
-                        childValue = BlobShallowCopy.read(buffer, getValueSafely(exports.codeToBytesMap, code), false);
-                        this.children.push(childValue);
-                        break;
+                        children.push(BlobShallowCopy.read(buffer, getValueSafely(exports.codeToBytesMap, code)));
+                        continue;
                     }
                 // If integer is 0.
                 case MarkerCodes.Int0:
                     {
-                        childValue = 0;
-                        this.children.push(childValue);
-                        break;
+                        children.push(0);
+                        continue;
                     }
                 case MarkerCodes.UInt8:
                 case MarkerCodes.UInt16:
@@ -365,23 +399,66 @@ class NodeCore {
                 case MarkerCodes.Int32:
                 case MarkerCodes.Int64:
                     {
-                        childValue = buffer.read(getValueSafely(exports.codeToBytesMap, code));
-                        this.children.push(childValue);
-                        break;
+                        children.push(buffer.read(getValueSafely(exports.codeToBytesMap, code)));
+                        continue;
                     }
                 case MarkerCodes.BoolTrue:
-                    this.children.push(true);
-                    break;
+                    children.push(true);
+                    continue;
                 case MarkerCodes.BoolFalse:
-                    this.children.push(false);
-                    break;
+                    children.push(false);
+                    continue;
                 case MarkerCodesEnd.list:
                 case MarkerCodesEnd.set:
-                    return;
+                    // Note: We are not checking that end marker matches start marker.
+                    // I.e. that we do not have a case where we start a 'list' but end with a 'set'
+                    // Checking it would require more state tracking that seems not very useful, given
+                    // our code does not care.
+                    children = stack.pop();
+                    // To my surprise, checking children !== undefined adds measurable cost!
+                    // We will rely on children.push() crashing in case of mismatch, and check below
+                    // (outside of the loop)
+                    continue;
                 default:
                     throw new Error(`Invalid code: ${code}`);
             }
         }
+        // This also ensures that stack.length === 0.
+        (0, common_utils_1.assert)(children === this.children, 0x3e7 /* Unpaired start/end list/set markers! */);
+        /**
+         * Process all the strings at once!
+         */
+        let length = 0;
+        for (const el of stringsToResolve) {
+            length += el.endPos - el.startPos + 1;
+        }
+        const stringBuffer = new Uint8Array(length);
+        length = 0;
+        const input = buffer.buffer;
+        (0, common_utils_1.assert)(input.byteOffset === 0, 0x3e8 /* code below assumes no offset */);
+        for (const el of stringsToResolve) {
+            for (let it = el.startPos; it < el.endPos; it++) {
+                stringBuffer[length] = input[it];
+                length++;
+            }
+            stringBuffer[length] = 0;
+            length++;
+        }
+        if (length === stringBuffer.length) {
+            // All is good, we expect all the cases to get here
+            const result = (0, common_utils_1.Uint8ArrayToString)(stringBuffer, "utf-8").split(String.fromCharCode(0));
+            (0, common_utils_1.assert)(result.length === stringsToResolve.length + 1, 0x3e9 /* String content has \0 chars! */);
+            for (let i = 0; i < stringsToResolve.length; i++) {
+                stringsToResolve[i].content = result[i];
+            }
+        }
+        else {
+            // Recovery code
+            logger.sendErrorEvent({ eventName: "StringParsingError" });
+            for (const el of stringsToResolve) {
+                (0, common_utils_1.assert)(el.content === (0, common_utils_1.Uint8ArrayToString)(input.subarray(el.startPos, el.endPos), "utf-8"), 0x3ea /* test */);
+            }
+        }
     }
 }
 exports.NodeCore = NodeCore;
@@ -390,15 +467,29 @@ exports.NodeCore = NodeCore;
  * Provides loading and serialization capabilities.
  */
 class TreeBuilder extends NodeCore {
-    static load(buffer) {
+    static load(buffer, logger) {
         const builder = new TreeBuilder();
-        const dictionary = new Array();
-        builder.load(buffer, dictionary);
+        builder.load(buffer, logger);
         (0, common_utils_1.assert)(buffer.eof, 0x233 /* "Unexpected data at the end of buffer" */);
         return builder;
     }
 }
 exports.TreeBuilder = TreeBuilder;
+function getMaybeStringInstance(node) {
+    const maybeString = node;
+    if (maybeString._stringElement) {
+        return maybeString.content;
+    }
+}
+exports.getMaybeStringInstance = getMaybeStringInstance;
+function getStringInstance(node, message) {
+    const maybeString = node;
+    if (maybeString._stringElement) {
+        return maybeString.content;
+    }
+    throwBufferParseException(node, "BlobCore", message);
+}
+exports.getStringInstance = getStringInstance;
 function assertBlobCoreInstance(node, message) {
     if (node instanceof BlobCore) {
         return;
@@ -447,6 +538,9 @@ function getNodeType(value) {
     else if (typeof value === "boolean") {
         return "Boolean";
     }
+    else if (value._stringElement) {
+        return "String";
+    }
     return "UnknownType";
 }
 //# sourceMappingURL=zipItDataRepresentationUtils.js.map