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

package/lib/{zipItDataRepresentationUtils.d.ts → zipItDataRepresentationUtils.d.mts}

@@ -2,7 +2,8 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-import { ReadBuffer } from "./ReadBufferUtils";
+import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
+import { ReadBuffer } from "./ReadBufferUtils.mjs";
 /**
  * Control codes used by tree serialization / decentralization code. Same as on server. These can be found on
  * filestore code on server too at above link.
@@ -51,7 +52,7 @@ export declare enum MarkerCodesEnd {
 /**
  * This contains mapping of Marker Codes to number of bytes in which the corresponding data
  * will be stored.
-*/
+ */
 export declare const codeToBytesMap: {
     1: number;
     2: number;
@@ -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,8 +143,8 @@ 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 NodeCoreTypes = "list" | "set";
+export type NodeTypes = NodeCore | BlobCore | number | boolean | IStringElement;
+export type NodeCoreTypes = "list" | "set";
 /**
  * Node - node in the tree (non-leaf element of the tree)
  */
@@ -151,28 +158,48 @@ 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, logger: ITelemetryLoggerExt): {
+        durationStructure: number;
+        durationStrings: number;
+    };
     /**
      * Load and parse the buffer into a tree.
      * @param buffer - buffer to read from.
      */
-    protected load(buffer: ReadBuffer, dictionary: BlobCore[]): void;
+    protected loadStructure(buffer: ReadBuffer, logger: ITelemetryLoggerExt): IStringElementInternal[];
+    private loadStrings;
 }
 /**
  * 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: ITelemetryLoggerExt): {
+        builder: TreeBuilder;
+        telemetryProps: {
+            durationStructure: number;
+            durationStrings: number;
+        };
+    };
 }
+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/lib/zipItDataRepresentationUtils.d.mts.map

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

package/lib/{zipItDataRepresentationUtils.js → zipItDataRepresentationUtils.mjs}

@@ -2,15 +2,12 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-/**
- * 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
-*/
-import { assert, IsoBuffer, Uint8ArrayToArrayBuffer, Uint8ArrayToString } from "@fluidframework/common-utils";
+import { Uint8ArrayToArrayBuffer, Uint8ArrayToString } from "@fluid-internal/client-utils";
+import { assert } from "@fluidframework/core-utils";
 import { NonRetryableError } from "@fluidframework/driver-utils";
 import { DriverErrorType } from "@fluidframework/driver-definitions";
-import { pkgVersion as driverVersion } from "./packageVersion";
-// eslint-disable-next-line max-len
+import { pkgVersion as driverVersion } from "./packageVersion.mjs";
+import { measure } from "./odspUtils.mjs";
 // https://onedrive.visualstudio.com/SharePoint%20Online/_git/SPO?path=/cobalt/Base/Property/BinaryEncodedPropertyReader.cs&version=GBmaster&_a=contents
 /**
  * Control codes used by tree serialization / decentralization code. Same as on server. These can be found on
@@ -63,7 +60,7 @@ export var MarkerCodesEnd;
 /**
  * This contains mapping of Marker Codes to number of bytes in which the corresponding data
  * will be stored.
-*/
+ */
 export const codeToBytesMap = {
     // Integer code to bytes
     1: 0,
@@ -97,19 +94,11 @@ export function getValueSafely(map, key) {
     assert(val !== undefined, 0x287 /* key must exist in the map */);
     return val;
 }
-export function getAndValidateNodeProps(node, props, enforceAllProps = true) {
-    const propSet = new Set(props);
+export 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) {
-        assert(propSet.size === 0, 0x288 /* All properties should exist */);
+        const id = getStringInstance(keyNode, "keynode should be a string");
+        res[id] = valueNode;
     }
     return res;
 }
@@ -124,7 +113,9 @@ export function iteratePairs(it) {
             assert(b.done !== true, 0x22b /* "Should be a pair" */);
             return { value: [a.value, b.value], done: b.done };
         },
-        [Symbol.iterator]: () => { return res; },
+        [Symbol.iterator]: () => {
+            return res;
+        },
     };
     return res;
 }
@@ -143,46 +134,36 @@ export function iterate(obj) {
 export 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 Uint8ArrayToArrayBuffer(this.buffer);
-    }
-    toString() {
-        return Uint8ArrayToString(this.buffer, "utf-8");
-    }
+    constructor() { }
 }
 /**
  * "deep copy" blob, holds to binary data passed in
  * It is called deep copy as a counter-part to BlobShallowCopy, which
  * is a reference to underlying binary stream (ReadBuffer).
-*/
+ */
 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 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);
     }
 }
 /**
@@ -195,61 +176,76 @@ export 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);
     }
-    static read(buffer, lengthLen, constString) {
+    // 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) {
         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);
     }
 }
-export const addStringProperty = (node, a, b, encodeValAsConstString = false) => {
-    node.addString(a, true);
-    node.addString(b, encodeValAsConstString);
+export const addStringProperty = (node, a, b) => {
+    node.addDictionaryString(a);
+    node.addString(b);
+};
+export const addDictionaryStringProperty = (node, a, b) => {
+    node.addDictionaryString(a);
+    node.addString(b);
 };
 export const addNumberProperty = (node, a, b) => {
-    node.addString(a, true);
+    node.addDictionaryString(a);
     node.addNumber(b);
 };
 export const addBoolProperty = (node, a, b) => {
-    node.addString(a, true);
+    node.addDictionaryString(a);
     node.addBool(b);
 };
 /**
  * Node - node in the tree (non-leaf element of the tree)
  */
 export class NodeCore {
+    get nodes() {
+        return this.children;
+    }
     constructor(type = "set") {
         this.type = type;
         // It is an array of nodes.
         this.children = [];
     }
-    get nodes() {
-        return this.children;
-    }
     [Symbol.iterator]() {
         return this.children[Symbol.iterator]();
     }
     iteratePairs() {
-        assert((this.length % 2) === 0, 0x22c /* "reading pairs" */);
+        assert(this.length % 2 === 0, 0x22c /* "reading pairs" */);
         return iteratePairs(iterate(this));
     }
-    get length() { return this.children.length; }
-    get(index) { return this.children[index]; }
+    get length() {
+        return this.children.length;
+    }
+    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];
@@ -276,11 +272,22 @@ export 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));
+    }
+    addDictionaryString(payload) {
+        this.children.push({
+            content: payload,
+            dictionary: true,
+            _stringElement: true,
+        });
     }
-    addString(payload, constString) {
-        this.addBlob(IsoBuffer.from(payload, "utf-8"), constString, true);
+    addString(payload) {
+        this.children.push({
+            content: payload,
+            dictionary: false,
+            _stringElement: true,
+        });
     }
     addNumber(payload) {
         assert(Number.isInteger(payload), 0x231 /* "Number should be an integer" */);
@@ -290,60 +297,93 @@ export 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(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, logger) {
+        const [stringsToResolve, durationStructure] = measure(() => this.loadStructure(buffer, logger));
+        const [, durationStrings] = measure(() => this.loadStrings(buffer, stringsToResolve, logger));
+        return { durationStructure, durationStrings };
+    }
     /**
      * Load and parse the buffer into a tree.
      * @param buffer - buffer to read from.
      */
-    load(buffer, dictionary) {
+    loadStructure(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(codeToBytesMap, code));
-                        const constString = BlobShallowCopy.read(buffer, getValueSafely(codeToBytesMap, code), true);
-                        dictionary[stringId] = constString;
-                        break;
-                    }
+                case MarkerCodes.ConstStringDeclareBig: {
+                    const stringId = buffer.read(getValueSafely(codeToBytesMap, code));
+                    const constString = NodeCore.readString(buffer, code, true /* dictionary */);
+                    stringsToResolve.push(constString);
+                    dictionary[stringId] = constString;
+                    continue;
+                }
                 case MarkerCodes.ConstString8Id:
                 case MarkerCodes.ConstString16Id:
-                case MarkerCodes.ConstString32Id:
-                    {
-                        const stringId = buffer.read(getValueSafely(codeToBytesMap, code));
-                        childValue = dictionary[stringId];
-                        this.children.push(childValue);
-                        break;
-                    }
+                case MarkerCodes.ConstString32Id: {
+                    const stringId = buffer.read(getValueSafely(codeToBytesMap, code));
+                    const content = dictionary[stringId];
+                    assert(content !== undefined, 0x3de /* const string not found */);
+                    children.push(content);
+                    continue;
+                }
                 case MarkerCodes.StringEmpty:
                 case MarkerCodes.String8Length:
                 case MarkerCodes.String16Length:
-                case MarkerCodes.String32Length:
+                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(codeToBytesMap, code), false);
-                        this.children.push(childValue);
-                        break;
-                    }
+                case MarkerCodes.BinarySingle64: {
+                    children.push(BlobShallowCopy.read(buffer, getValueSafely(codeToBytesMap, code)));
+                    continue;
+                }
                 // If integer is 0.
-                case MarkerCodes.Int0:
-                    {
-                        childValue = 0;
-                        this.children.push(childValue);
-                        break;
-                    }
+                case MarkerCodes.Int0: {
+                    children.push(0);
+                    continue;
+                }
                 case MarkerCodes.UInt8:
                 case MarkerCodes.UInt16:
                 case MarkerCodes.UInt32:
@@ -351,25 +391,72 @@ export class NodeCore {
                 case MarkerCodes.Int8:
                 case MarkerCodes.Int16:
                 case MarkerCodes.Int32:
-                case MarkerCodes.Int64:
-                    {
-                        childValue = buffer.read(getValueSafely(codeToBytesMap, code));
-                        this.children.push(childValue);
-                        break;
-                    }
+                case MarkerCodes.Int64: {
+                    children.push(buffer.read(getValueSafely(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.
+        assert(children === this.children, 0x3e7 /* Unpaired start/end list/set markers! */);
+        return stringsToResolve;
+    }
+    loadStrings(buffer, stringsToResolve, logger) {
+        /**
+         * 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;
+        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++;
+        }
+        assert(length === stringBuffer.length, 0x418 /* properly encoded */);
+        const result = Uint8ArrayToString(stringBuffer, "utf-8").split(String.fromCharCode(0));
+        if (result.length === stringsToResolve.length + 1) {
+            // All is good, we expect all the cases to get here
+            for (let i = 0; i < stringsToResolve.length; i++) {
+                stringsToResolve[i].content = result[i];
+            }
+        }
+        else {
+            // String content has \0 chars!
+            // Recovery code
+            logger.sendErrorEvent({ eventName: "StringParsingError" });
+            for (const el of stringsToResolve) {
+                assert(el.content ===
+                    Uint8ArrayToString(input.subarray(el.startPos, el.endPos), "utf-8"), 0x3ea /* test */);
+            }
+        }
     }
 }
 /**
@@ -377,14 +464,26 @@ export class NodeCore {
  * Provides loading and serialization capabilities.
  */
 export class TreeBuilder extends NodeCore {
-    static load(buffer) {
+    static load(buffer, logger) {
         const builder = new TreeBuilder();
-        const dictionary = new Array();
-        builder.load(buffer, dictionary);
+        const telemetryProps = builder.load(buffer, logger);
         assert(buffer.eof, 0x233 /* "Unexpected data at the end of buffer" */);
-        return builder;
+        return { builder, telemetryProps };
     }
 }
+export function getMaybeStringInstance(node) {
+    const maybeString = node;
+    if (maybeString._stringElement) {
+        return maybeString.content;
+    }
+}
+export function getStringInstance(node, message) {
+    const maybeString = node;
+    if (maybeString._stringElement) {
+        return maybeString.content;
+    }
+    throwBufferParseException(node, "BlobCore", message);
+}
 export function assertBlobCoreInstance(node, message) {
     if (node instanceof BlobCore) {
         return;
@@ -429,6 +528,9 @@ function getNodeType(value) {
     else if (typeof value === "boolean") {
         return "Boolean";
     }
+    else if (value._stringElement) {
+        return "String";
+    }
     return "UnknownType";
 }
-//# sourceMappingURL=zipItDataRepresentationUtils.js.map
+//# sourceMappingURL=zipItDataRepresentationUtils.mjs.map