@itwin/presentation-common 5.0.0-dev.1 → 5.0.0-dev.100

package/lib/cjs/presentation-common/Utils.js

@@ -8,7 +8,10 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DEFAULT_KEYS_BATCH_SIZE = exports.getInstancesCount = void 0;
-const Key_1 = require("./hierarchy/Key");
+exports.omitUndefined = omitUndefined;
+exports.deepReplaceNullsToUndefined = deepReplaceNullsToUndefined;
+exports.createCancellableTimeoutPromise = createCancellableTimeoutPromise;
+const Key_js_1 = require("./hierarchy/Key.js");
 /**
  * Get total number of instances included in the supplied key set. The
  * count is calculated by adding all of the following:
@@ -24,10 +27,10 @@ const Key_1 = require("./hierarchy/Key");
 const getInstancesCount = (keys) => {
     let count = keys.instanceKeysCount;
     keys.nodeKeys.forEach((key) => {
-        if (Key_1.NodeKey.isInstancesNodeKey(key)) {
+        if (Key_js_1.NodeKey.isInstancesNodeKey(key)) {
             count += key.instanceKeys.length;
         }
-        else if (Key_1.NodeKey.isGroupingNodeKey(key)) {
+        else if (Key_js_1.NodeKey.isGroupingNodeKey(key)) {
             count += key.groupedInstancesCount;
         }
     });
@@ -41,4 +44,57 @@ exports.getInstancesCount = getInstancesCount;
  * @public
  */
 exports.DEFAULT_KEYS_BATCH_SIZE = 5000;
+/**
+ * Removes all `undefined` properties from given `obj` object and returns
+ * the same (mutated) object.
+ *
+ * Example: `omitUndefined({ a: 1, b: undefined })` will return `{ a: 1 }`
+ *
+ * @internal
+ */
+function omitUndefined(obj) {
+    Object.entries(obj).forEach(([key, value]) => {
+        if (value === undefined) {
+            delete obj[key];
+        }
+    });
+    return obj;
+}
+/** @internal */
+function deepReplaceNullsToUndefined(obj) {
+    /* c8 ignore next 3 */
+    if (obj === null) {
+        return undefined;
+    }
+    /* c8 ignore next 3 */
+    if (Array.isArray(obj)) {
+        return obj.map(deepReplaceNullsToUndefined);
+    }
+    if (typeof obj === "object") {
+        return Object.keys(obj).reduce((acc, key) => {
+            const value = obj[key];
+            if (value !== null && value !== undefined) {
+                acc[key] = deepReplaceNullsToUndefined(value);
+            }
+            return acc;
+        }, {});
+    }
+    return obj;
+}
+/** @internal */
+function createCancellableTimeoutPromise(timeoutMs) {
+    let timeout;
+    let rejectPromise;
+    const promise = new Promise((resolve, reject) => {
+        rejectPromise = reject;
+        timeout = setTimeout(resolve, timeoutMs);
+    });
+    return {
+        promise,
+        cancel: () => {
+            clearTimeout(timeout);
+            rejectPromise();
+        },
+    };
+}
 //# sourceMappingURL=Utils.js.map

package/lib/cjs/presentation-common/Utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"Utils.js","sourceRoot":"","sources":["../../../src/presentation-common/Utils.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;AAChG;;GAEG;;;AAEH,yCAA0C;AA8C1C;;;;;;;;;;;GAWG;AACI,MAAM,iBAAiB,GAAG,CAAC,IAAsB,EAAU,EAAE;IAClE,IAAI,KAAK,GAAG,IAAI,CAAC,iBAAiB,CAAC;IACnC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,GAAY,EAAE,EAAE;QACrC,IAAI,aAAO,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC;YACpC,KAAK,IAAI,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC;QACnC,CAAC;aAAM,IAAI,aAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;YAC1C,KAAK,IAAI,GAAG,CAAC,qBAAqB,CAAC;QACrC,CAAC;IACH,CAAC,CAAC,CAAC;IACH,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAVW,QAAA,iBAAiB,qBAU5B;AAEF;;;;;GAKG;AACU,QAAA,uBAAuB,GAAG,IAAI,CAAC","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n * Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n * See LICENSE.md in the project root for license terms and full copyright notice.\r\n *--------------------------------------------------------------------------------------------*/\r\n/** @packageDocumentation\r\n * @module Core\r\n */\r\n\r\nimport { NodeKey } from \"./hierarchy/Key\";\r\nimport { KeySet } from \"./KeySet\";\r\n\r\n/**\r\n * Create a type with `T` properties excluding properties listed in `K`.\r\n *\r\n * Usage example: `Omit<SomeType, \"exclude_prop1\" | \"exclude_prop2\">`\r\n *\r\n * @public\r\n */\r\nexport type Omit<T, K> = Pick<T, Exclude<keyof T, K>>;\r\n\r\n/**\r\n * Create a type with `T` properties excluding all properties in type `K`.\r\n *\r\n * Usage example: `Subtract<SomeType, ExcludePropertiesInThisType>`\r\n *\r\n * @public\r\n */\r\nexport type Subtract<T, K> = Omit<T, keyof K>;\r\n\r\n/**\r\n * Create a type from given type `T` and make specified properties optional.\r\n * @public\r\n */\r\nexport type PartialBy<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>;\r\n\r\n/**\r\n * A dictionary data structure.\r\n * @public\r\n */\r\nexport interface ValuesDictionary<T> {\r\n  [key: string]: T;\r\n}\r\n\r\n/**\r\n * A structure for paged responses\r\n * @public\r\n */\r\nexport interface PagedResponse<T> {\r\n  /** Total number of items */\r\n  total: number;\r\n  /** Items for the requested page  */\r\n  items: T[];\r\n}\r\n\r\n/**\r\n * Get total number of instances included in the supplied key set. The\r\n * count is calculated by adding all of the following:\r\n * - `keys.instanceKeysCount`\r\n * - number of `keys.nodeKeys` which are *ECInstance* keys\r\n * - for every grouping node key in `keys.nodeKeys`, number of grouped instances\r\n *\r\n * E.g. if `keys` contains one instance key, one *ECInstance* node key\r\n * and one grouping node key which groups 3 instances, the result is 5.\r\n *\r\n * @public\r\n */\r\nexport const getInstancesCount = (keys: Readonly<KeySet>): number => {\r\n  let count = keys.instanceKeysCount;\r\n  keys.nodeKeys.forEach((key: NodeKey) => {\r\n    if (NodeKey.isInstancesNodeKey(key)) {\r\n      count += key.instanceKeys.length;\r\n    } else if (NodeKey.isGroupingNodeKey(key)) {\r\n      count += key.groupedInstancesCount;\r\n    }\r\n  });\r\n  return count;\r\n};\r\n\r\n/**\r\n * Default (recommended) keyset batch size for cases when it needs to be sent\r\n * over HTTP. Sending keys in batches helps avoid HTTP413 error.\r\n *\r\n * @public\r\n */\r\nexport const DEFAULT_KEYS_BATCH_SIZE = 5000;\r\n"]}
+{"version":3,"file":"Utils.js","sourceRoot":"","sources":["../../../src/presentation-common/Utils.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;AAChG;;GAEG;;;AAwFH,sCAOC;AAYD,kEAmBC;AAGD,0EAcC;AA7ID,+CAA6C;AA8C7C;;;;;;;;;;;GAWG;AACI,MAAM,iBAAiB,GAAG,CAAC,IAAsB,EAAU,EAAE;IAClE,IAAI,KAAK,GAAG,IAAI,CAAC,iBAAiB,CAAC;IACnC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,GAAY,EAAE,EAAE;QACrC,IAAI,gBAAO,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC;YACpC,KAAK,IAAI,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC;QACnC,CAAC;aAAM,IAAI,gBAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;YAC1C,KAAK,IAAI,GAAG,CAAC,qBAAqB,CAAC;QACrC,CAAC;IACH,CAAC,CAAC,CAAC;IACH,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAVW,QAAA,iBAAiB,qBAU5B;AAEF;;;;;GAKG;AACU,QAAA,uBAAuB,GAAG,IAAI,CAAC;AAE5C;;;;;;;GAOG;AACH,SAAgB,aAAa,CAAmB,GAAM;IACpD,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QAC3C,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,OAAO,GAAG,CAAC,GAAc,CAAC,CAAC;QAC7B,CAAC;IACH,CAAC,CAAC,CAAC;IACH,OAAO,GAAG,CAAC;AACb,CAAC;AAWD,gBAAgB;AAChB,SAAgB,2BAA2B,CAAI,GAAM;IACnD,sBAAsB;IACtB,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;QACjB,OAAO,SAAgB,CAAC;IAC1B,CAAC;IACD,sBAAsB;IACtB,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QACvB,OAAO,GAAG,CAAC,GAAG,CAAC,2BAA2B,CAAuB,CAAC;IACpE,CAAC;IACD,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QAC5B,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YAC1C,MAAM,KAAK,GAAG,GAAG,CAAC,GAAc,CAAC,CAAC;YAClC,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBAC1C,GAAG,CAAC,GAA+B,CAAC,GAAG,2BAA2B,CAAC,KAAK,CAAQ,CAAC;YACnF,CAAC;YACD,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,EAAwB,CAAC,CAAC;IAC/B,CAAC;IACD,OAAO,GAAU,CAAC;AACpB,CAAC;AAED,gBAAgB;AAChB,SAAgB,+BAA+B,CAAC,SAAiB;IAC/D,IAAI,OAAsC,CAAC;IAC3C,IAAI,aAAyB,CAAC;IAC9B,MAAM,OAAO,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACpD,aAAa,GAAG,MAAM,CAAC;QACvB,OAAO,GAAG,UAAU,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IACH,OAAO;QACL,OAAO;QACP,MAAM,EAAE,GAAG,EAAE;YACX,YAAY,CAAC,OAAO,CAAC,CAAC;YACtB,aAAa,EAAE,CAAC;QAClB,CAAC;KACF,CAAC;AACJ,CAAC","sourcesContent":["/*---------------------------------------------------------------------------------------------\n * Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n * See LICENSE.md in the project root for license terms and full copyright notice.\n *--------------------------------------------------------------------------------------------*/\n/** @packageDocumentation\n * @module Core\n */\n\nimport { NodeKey } from \"./hierarchy/Key.js\";\nimport { KeySet } from \"./KeySet.js\";\n\n/**\n * Create a type with `T` properties excluding properties listed in `K`.\n *\n * Usage example: `Omit<SomeType, \"exclude_prop1\" | \"exclude_prop2\">`\n *\n * @public\n */\nexport type Omit<T, K> = Pick<T, Exclude<keyof T, K>>;\n\n/**\n * Create a type with `T` properties excluding all properties in type `K`.\n *\n * Usage example: `Subtract<SomeType, ExcludePropertiesInThisType>`\n *\n * @public\n */\nexport type Subtract<T, K> = Omit<T, keyof K>;\n\n/**\n * Create a type from given type `T` and make specified properties optional.\n * @public\n */\nexport type PartialBy<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>;\n\n/**\n * A dictionary data structure.\n * @public\n */\nexport interface ValuesDictionary<T> {\n  [key: string]: T;\n}\n\n/**\n * A structure for paged responses\n * @public\n */\nexport interface PagedResponse<T> {\n  /** Total number of items */\n  total: number;\n  /** Items for the requested page  */\n  items: T[];\n}\n\n/**\n * Get total number of instances included in the supplied key set. The\n * count is calculated by adding all of the following:\n * - `keys.instanceKeysCount`\n * - number of `keys.nodeKeys` which are *ECInstance* keys\n * - for every grouping node key in `keys.nodeKeys`, number of grouped instances\n *\n * E.g. if `keys` contains one instance key, one *ECInstance* node key\n * and one grouping node key which groups 3 instances, the result is 5.\n *\n * @public\n */\nexport const getInstancesCount = (keys: Readonly<KeySet>): number => {\n  let count = keys.instanceKeysCount;\n  keys.nodeKeys.forEach((key: NodeKey) => {\n    if (NodeKey.isInstancesNodeKey(key)) {\n      count += key.instanceKeys.length;\n    } else if (NodeKey.isGroupingNodeKey(key)) {\n      count += key.groupedInstancesCount;\n    }\n  });\n  return count;\n};\n\n/**\n * Default (recommended) keyset batch size for cases when it needs to be sent\n * over HTTP. Sending keys in batches helps avoid HTTP413 error.\n *\n * @public\n */\nexport const DEFAULT_KEYS_BATCH_SIZE = 5000;\n\n/**\n * Removes all `undefined` properties from given `obj` object and returns\n * the same (mutated) object.\n *\n * Example: `omitUndefined({ a: 1, b: undefined })` will return `{ a: 1 }`\n *\n * @internal\n */\nexport function omitUndefined<T extends object>(obj: T): T {\n  Object.entries(obj).forEach(([key, value]) => {\n    if (value === undefined) {\n      delete obj[key as keyof T];\n    }\n  });\n  return obj;\n}\n\n/** @internal */\ntype NullToUndefined<T> = T extends null\n  ? undefined\n  : T extends Array<infer U>\n    ? Array<NullToUndefined<U>>\n    : T extends object\n      ? { [K in keyof T]: NullToUndefined<T[K]> }\n      : T;\n\n/** @internal */\nexport function deepReplaceNullsToUndefined<T>(obj: T): NullToUndefined<T> {\n  /* c8 ignore next 3 */\n  if (obj === null) {\n    return undefined as any;\n  }\n  /* c8 ignore next 3 */\n  if (Array.isArray(obj)) {\n    return obj.map(deepReplaceNullsToUndefined) as NullToUndefined<T>;\n  }\n  if (typeof obj === \"object\") {\n    return Object.keys(obj).reduce((acc, key) => {\n      const value = obj[key as keyof T];\n      if (value !== null && value !== undefined) {\n        acc[key as keyof NullToUndefined<T>] = deepReplaceNullsToUndefined(value) as any;\n      }\n      return acc;\n    }, {} as NullToUndefined<T>);\n  }\n  return obj as any;\n}\n\n/** @internal */\nexport function createCancellableTimeoutPromise(timeoutMs: number) {\n  let timeout: ReturnType<typeof setTimeout>;\n  let rejectPromise: () => void;\n  const promise = new Promise<void>((resolve, reject) => {\n    rejectPromise = reject;\n    timeout = setTimeout(resolve, timeoutMs);\n  });\n  return {\n    promise,\n    cancel: () => {\n      clearTimeout(timeout);\n      rejectPromise();\n    },\n  };\n}\n"]}

package/lib/cjs/presentation-common/content/Category.d.ts

@@ -1,7 +1,7 @@
 /** @packageDocumentation
  * @module Content
  */
-import { RendererDescription } from "./Renderer";
+import { RendererDescription } from "./Renderer.js";
 /**
  * A data structure that describes a [[Field]] category.
  * @public

package/lib/cjs/presentation-common/content/Category.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Category.d.ts","sourceRoot":"","sources":["../../../../src/presentation-common/content/Category.ts"],"names":[],"mappings":"AAIA;;GAEG;AAEH,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAEjD;;;GAGG;AACH,MAAM,WAAW,mBAAmB;IAClC,kBAAkB;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,oBAAoB;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,4BAA4B;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,+EAA+E;IAC/E,QAAQ,EAAE,MAAM,CAAC;IACjB,0EAA0E;IAC1E,MAAM,EAAE,OAAO,CAAC;IAChB,kCAAkC;IAClC,MAAM,CAAC,EAAE,mBAAmB,CAAC;IAC7B,kCAAkC;IAClC,QAAQ,CAAC,EAAE,mBAAmB,CAAC;CAChC;AACD,cAAc;AACd,yBAAiB,mBAAmB,CAAC;IACnC,uCAAuC;IACvC,SAAgB,MAAM,CAAC,QAAQ,EAAE,mBAAmB,GAAG,uBAAuB,CAM7E;IAED;;;OAGG;IACH,SAAgB,QAAQ,CAAC,IAAI,EAAE,uBAAuB,GAAG,mBAAmB,CAI3E;IAWD,+DAA+D;IAC/D,SAAgB,YAAY,CAAC,IAAI,EAAE,uBAAuB,EAAE,GAAG,mBAAmB,EAAE,CAInF;CACF;AAED;;;GAGG;AACH,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,mBAAmB,CAAC;CAChC"}
+{"version":3,"file":"Category.d.ts","sourceRoot":"","sources":["../../../../src/presentation-common/content/Category.ts"],"names":[],"mappings":"AAIA;;GAEG;AAEH,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAEpD;;;GAGG;AACH,MAAM,WAAW,mBAAmB;IAClC,kBAAkB;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,oBAAoB;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,4BAA4B;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,+EAA+E;IAC/E,QAAQ,EAAE,MAAM,CAAC;IACjB,0EAA0E;IAC1E,MAAM,EAAE,OAAO,CAAC;IAChB,kCAAkC;IAClC,MAAM,CAAC,EAAE,mBAAmB,CAAC;IAC7B,kCAAkC;IAClC,QAAQ,CAAC,EAAE,mBAAmB,CAAC;CAChC;AACD,cAAc;AACd,yBAAiB,mBAAmB,CAAC;IACnC,uCAAuC;IACvC,SAAgB,MAAM,CAAC,QAAQ,EAAE,mBAAmB,GAAG,uBAAuB,CAM7E;IAED;;;OAGG;IACH,SAAgB,QAAQ,CAAC,IAAI,EAAE,uBAAuB,GAAG,mBAAmB,CAI3E;IAWD,+DAA+D;IAC/D,SAAgB,YAAY,CAAC,IAAI,EAAE,uBAAuB,EAAE,GAAG,mBAAmB,EAAE,CAInF;CACF;AAED;;;GAGG;AACH,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,mBAAmB,CAAC;CAChC"}

package/lib/cjs/presentation-common/content/Category.js.map

@@ -1 +1 @@
-{"version":3,"file":"Category.js","sourceRoot":"","sources":["../../../../src/presentation-common/content/Category.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;AAChG;;GAEG;;;AAwBH,cAAc;AACd,IAAiB,mBAAmB,CAmCnC;AAnCD,WAAiB,mBAAmB;IAClC,uCAAuC;IACvC,SAAgB,MAAM,CAAC,QAA6B;QAClD,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,QAAQ,CAAC;QACrC,OAAO;YACL,GAAG,IAAI;YACP,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;SAClD,CAAC;IACJ,CAAC;IANe,0BAAM,SAMrB,CAAA;IAED;;;OAGG;IACH,SAAgB,QAAQ,CAAC,IAA6B;QACpD,6DAA6D;QAC7D,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC;QACjC,OAAO,IAAI,CAAC;IACd,CAAC;IAJe,4BAAQ,WAIvB,CAAA;IAED,SAAS,yBAAyB,CAAC,IAA6B,EAAE,aAA+C;QAC/G,MAAM,QAAQ,GAAG,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAE,CAAC;QAC/C,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,mDAAmD;YACnD,QAAQ,CAAC,MAAM,GAAG,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACnD,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,+DAA+D;IAC/D,SAAgB,YAAY,CAAC,IAA+B;QAC1D,MAAM,aAAa,GAAG,IAAI,GAAG,EAA+B,CAAC;QAC7D,IAAI,CAAC,OAAO,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,EAAE,mBAAmB,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACjH,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,yBAAyB,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC,CAAC;IAC5F,CAAC;IAJe,gCAAY,eAI3B,CAAA;AACH,CAAC,EAnCgB,mBAAmB,mCAAnB,mBAAmB,QAmCnC","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n * Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n * See LICENSE.md in the project root for license terms and full copyright notice.\r\n *--------------------------------------------------------------------------------------------*/\r\n/** @packageDocumentation\r\n * @module Content\r\n */\r\n\r\nimport { RendererDescription } from \"./Renderer\";\r\n\r\n/**\r\n * A data structure that describes a [[Field]] category.\r\n * @public\r\n */\r\nexport interface CategoryDescription {\r\n  /** Unique name */\r\n  name: string;\r\n  /** Display label */\r\n  label: string;\r\n  /** Extensive description */\r\n  description: string;\r\n  /** Priority. Categories with higher priority should appear higher in the UI */\r\n  priority: number;\r\n  /** Should this category be auto-expanded when it's displayed in the UI */\r\n  expand: boolean;\r\n  /** Parent category description */\r\n  parent?: CategoryDescription;\r\n  /** Custom renderer description */\r\n  renderer?: RendererDescription;\r\n}\r\n/** @public */\r\nexport namespace CategoryDescription {\r\n  /** Serialize given category to JSON */\r\n  export function toJSON(category: CategoryDescription): CategoryDescriptionJSON {\r\n    const { parent, ...rest } = category;\r\n    return {\r\n      ...rest,\r\n      ...(parent ? { parent: parent.name } : undefined),\r\n    };\r\n  }\r\n\r\n  /**\r\n   * Deserialize [[CategoryDescription]] from JSON. The `parent` is not assigned - use [[CategoryDescription.listFromJSON]]\r\n   * to deserialize the whole categories list and set parents.\r\n   */\r\n  export function fromJSON(json: CategoryDescriptionJSON): CategoryDescription {\r\n    // eslint-disable-next-line @typescript-eslint/no-unused-vars\r\n    const { parent, ...rest } = json;\r\n    return rest;\r\n  }\r\n\r\n  function createCategoriesHierarchy(json: CategoryDescriptionJSON, categoriesMap: Map<string, CategoryDescription>): CategoryDescription {\r\n    const category = categoriesMap.get(json.name)!;\r\n    if (json.parent) {\r\n      // note: mutating categories in the `categoriesMap`\r\n      category.parent = categoriesMap.get(json.parent);\r\n    }\r\n    return category;\r\n  }\r\n\r\n  /** Deserialize a list of [[CategoryDescription]] from JSON. */\r\n  export function listFromJSON(json: CategoryDescriptionJSON[]): CategoryDescription[] {\r\n    const categoriesMap = new Map<string, CategoryDescription>();\r\n    json.forEach((categoryJson) => categoriesMap.set(categoryJson.name, CategoryDescription.fromJSON(categoryJson)));\r\n    return json.map((categoryJson) => createCategoriesHierarchy(categoryJson, categoriesMap));\r\n  }\r\n}\r\n\r\n/**\r\n * Serialized [[CategoryDescription]] JSON representation.\r\n * @public\r\n */\r\nexport interface CategoryDescriptionJSON {\r\n  name: string;\r\n  label: string;\r\n  description: string;\r\n  priority: number;\r\n  expand: boolean;\r\n  parent?: string;\r\n  renderer?: RendererDescription;\r\n}\r\n"]}
+{"version":3,"file":"Category.js","sourceRoot":"","sources":["../../../../src/presentation-common/content/Category.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;AAChG;;GAEG;;;AAwBH,cAAc;AACd,IAAiB,mBAAmB,CAmCnC;AAnCD,WAAiB,mBAAmB;IAClC,uCAAuC;IACvC,SAAgB,MAAM,CAAC,QAA6B;QAClD,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,QAAQ,CAAC;QACrC,OAAO;YACL,GAAG,IAAI;YACP,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;SAClD,CAAC;IACJ,CAAC;IANe,0BAAM,SAMrB,CAAA;IAED;;;OAGG;IACH,SAAgB,QAAQ,CAAC,IAA6B;QACpD,6DAA6D;QAC7D,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC;QACjC,OAAO,IAAI,CAAC;IACd,CAAC;IAJe,4BAAQ,WAIvB,CAAA;IAED,SAAS,yBAAyB,CAAC,IAA6B,EAAE,aAA+C;QAC/G,MAAM,QAAQ,GAAG,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAE,CAAC;QAC/C,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,mDAAmD;YACnD,QAAQ,CAAC,MAAM,GAAG,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACnD,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,+DAA+D;IAC/D,SAAgB,YAAY,CAAC,IAA+B;QAC1D,MAAM,aAAa,GAAG,IAAI,GAAG,EAA+B,CAAC;QAC7D,IAAI,CAAC,OAAO,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,EAAE,mBAAmB,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACjH,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,yBAAyB,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC,CAAC;IAC5F,CAAC;IAJe,gCAAY,eAI3B,CAAA;AACH,CAAC,EAnCgB,mBAAmB,mCAAnB,mBAAmB,QAmCnC","sourcesContent":["/*---------------------------------------------------------------------------------------------\n * Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n * See LICENSE.md in the project root for license terms and full copyright notice.\n *--------------------------------------------------------------------------------------------*/\n/** @packageDocumentation\n * @module Content\n */\n\nimport { RendererDescription } from \"./Renderer.js\";\n\n/**\n * A data structure that describes a [[Field]] category.\n * @public\n */\nexport interface CategoryDescription {\n  /** Unique name */\n  name: string;\n  /** Display label */\n  label: string;\n  /** Extensive description */\n  description: string;\n  /** Priority. Categories with higher priority should appear higher in the UI */\n  priority: number;\n  /** Should this category be auto-expanded when it's displayed in the UI */\n  expand: boolean;\n  /** Parent category description */\n  parent?: CategoryDescription;\n  /** Custom renderer description */\n  renderer?: RendererDescription;\n}\n/** @public */\nexport namespace CategoryDescription {\n  /** Serialize given category to JSON */\n  export function toJSON(category: CategoryDescription): CategoryDescriptionJSON {\n    const { parent, ...rest } = category;\n    return {\n      ...rest,\n      ...(parent ? { parent: parent.name } : undefined),\n    };\n  }\n\n  /**\n   * Deserialize [[CategoryDescription]] from JSON. The `parent` is not assigned - use [[CategoryDescription.listFromJSON]]\n   * to deserialize the whole categories list and set parents.\n   */\n  export function fromJSON(json: CategoryDescriptionJSON): CategoryDescription {\n    // eslint-disable-next-line @typescript-eslint/no-unused-vars\n    const { parent, ...rest } = json;\n    return rest;\n  }\n\n  function createCategoriesHierarchy(json: CategoryDescriptionJSON, categoriesMap: Map<string, CategoryDescription>): CategoryDescription {\n    const category = categoriesMap.get(json.name)!;\n    if (json.parent) {\n      // note: mutating categories in the `categoriesMap`\n      category.parent = categoriesMap.get(json.parent);\n    }\n    return category;\n  }\n\n  /** Deserialize a list of [[CategoryDescription]] from JSON. */\n  export function listFromJSON(json: CategoryDescriptionJSON[]): CategoryDescription[] {\n    const categoriesMap = new Map<string, CategoryDescription>();\n    json.forEach((categoryJson) => categoriesMap.set(categoryJson.name, CategoryDescription.fromJSON(categoryJson)));\n    return json.map((categoryJson) => createCategoriesHierarchy(categoryJson, categoriesMap));\n  }\n}\n\n/**\n * Serialized [[CategoryDescription]] JSON representation.\n * @public\n */\nexport interface CategoryDescriptionJSON {\n  name: string;\n  label: string;\n  description: string;\n  priority: number;\n  expand: boolean;\n  parent?: string;\n  renderer?: RendererDescription;\n}\n"]}

package/lib/cjs/presentation-common/content/Content.d.ts

@@ -1,8 +1,8 @@
 /** @packageDocumentation
  * @module Content
  */
-import { Descriptor, DescriptorJSON } from "./Descriptor";
-import { Item, ItemJSON } from "./Item";
+import { Descriptor, DescriptorJSON } from "./Descriptor.js";
+import { Item, ItemJSON } from "./Item.js";
 /**
  * Serialized [[Content]] JSON representation.
  * @public
@@ -28,12 +28,5 @@ export declare class Content {
     toJSON(): ContentJSON;
     /** Deserialize [[Content]] from JSON */
     static fromJSON(json: ContentJSON | string | undefined): Content | undefined;
-    /**
-     * Reviver function that can be used as a second argument for
-     * `JSON.parse` method when parsing Content objects.
-     *
-     * @internal
-     */
-    static reviver(key: string, value: any): any;
 }
 //# sourceMappingURL=Content.d.ts.map

package/lib/cjs/presentation-common/content/Content.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Content.d.ts","sourceRoot":"","sources":["../../../../src/presentation-common/content/Content.ts"],"names":[],"mappings":"AAIA;;GAEG;AAEH,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAExC;;;GAGG;AACH,MAAM,WAAW,WAAW;IAC1B,UAAU,EAAE,cAAc,CAAC;IAC3B,UAAU,EAAE,QAAQ,EAAE,CAAC;CACxB;AAED;;;;;GAKG;AACH,qBAAa,OAAO;IAClB,4CAA4C;IAC5C,SAAgB,UAAU,EAAE,UAAU,CAAC;IACvC,oBAAoB;IACpB,SAAgB,UAAU,EAAE,IAAI,EAAE,CAAC;IAEnC,wCAAwC;gBACrB,UAAU,EAAE,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE;IAKxD,oCAAoC;IAC7B,MAAM,IAAI,WAAW;IAO5B,wCAAwC;WAC1B,QAAQ,CAAC,IAAI,EAAE,WAAW,GAAG,MAAM,GAAG,SAAS,GAAG,OAAO,GAAG,SAAS;IAkBnF;;;;;OAKG;WACW,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,GAAG;CAGpD"}
+{"version":3,"file":"Content.d.ts","sourceRoot":"","sources":["../../../../src/presentation-common/content/Content.ts"],"names":[],"mappings":"AAIA;;GAEG;AAEH,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAE3C;;;GAGG;AACH,MAAM,WAAW,WAAW;IAC1B,UAAU,EAAE,cAAc,CAAC;IAC3B,UAAU,EAAE,QAAQ,EAAE,CAAC;CACxB;AAED;;;;;GAKG;AACH,qBAAa,OAAO;IAClB,4CAA4C;IAC5C,SAAgB,UAAU,EAAE,UAAU,CAAC;IACvC,oBAAoB;IACpB,SAAgB,UAAU,EAAE,IAAI,EAAE,CAAC;IAEnC,wCAAwC;gBACrB,UAAU,EAAE,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE;IAKxD,oCAAoC;IAC7B,MAAM,IAAI,WAAW;IAO5B,wCAAwC;WAC1B,QAAQ,CAAC,IAAI,EAAE,WAAW,GAAG,MAAM,GAAG,SAAS,GAAG,OAAO,GAAG,SAAS;CAiBpF"}

package/lib/cjs/presentation-common/content/Content.js

@@ -8,8 +8,8 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Content = void 0;
-const Descriptor_1 = require("./Descriptor");
-const Item_1 = require("./Item");
+const Descriptor_js_1 = require("./Descriptor.js");
+const Item_js_1 = require("./Item.js");
 /**
  * A data structure that contains the [[Descriptor]] and a list of [[Item]]
  * objects which are based on that descriptor.
@@ -17,6 +17,10 @@ const Item_1 = require("./Item");
  * @public
  */
 class Content {
+    /** Descriptor used to create the content */
+    descriptor;
+    /** Content items */
+    contentSet;
     /** Create a new [[Content]] instance */
     constructor(descriptor, items) {
         this.descriptor = descriptor;
@@ -35,24 +39,15 @@ class Content {
             return undefined;
         }
         if (typeof json === "string") {
-            return JSON.parse(json, (key, value) => Content.reviver(key, value));
+            return Content.fromJSON(JSON.parse(json));
         }
-        const descriptor = Descriptor_1.Descriptor.fromJSON(json.descriptor);
+        const descriptor = Descriptor_js_1.Descriptor.fromJSON(json.descriptor);
         if (!descriptor) {
             return undefined;
         }
-        const contentSet = json.contentSet.map((itemJson) => Item_1.Item.fromJSON(itemJson)).filter((item) => item !== undefined);
+        const contentSet = json.contentSet.map((itemJson) => Item_js_1.Item.fromJSON(itemJson)).filter((item) => item !== undefined);
         return new Content(descriptor, contentSet);
     }
-    /**
-     * Reviver function that can be used as a second argument for
-     * `JSON.parse` method when parsing Content objects.
-     *
-     * @internal
-     */
-    static reviver(key, value) {
-        return key === "" ? Content.fromJSON(value) : value;
-    }
 }
 exports.Content = Content;
 //# sourceMappingURL=Content.js.map

package/lib/cjs/presentation-common/content/Content.js.map

@@ -1 +1 @@
-{"version":3,"file":"Content.js","sourceRoot":"","sources":["../../../../src/presentation-common/content/Content.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;AAChG;;GAEG;;;AAEH,6CAA0D;AAC1D,iCAAwC;AAWxC;;;;;GAKG;AACH,MAAa,OAAO;IAMlB,wCAAwC;IACxC,YAAmB,UAAsB,EAAE,KAAa;QACtD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;IAC1B,CAAC;IAED,oCAAoC;IAC7B,MAAM;QACX,OAAO;YACL,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;YACpC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,IAAU,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;SAC/D,CAAC;IACJ,CAAC;IAED,wCAAwC;IACjC,MAAM,CAAC,QAAQ,CAAC,IAAsC;QAC3D,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC7B,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;QACvE,CAAC;QAED,MAAM,UAAU,GAAG,uBAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACxD,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,QAAkB,EAAE,EAAE,CAAC,WAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAO,CAAC,IAAI,EAAgB,EAAE,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC;QACjJ,OAAO,IAAI,OAAO,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IAC7C,CAAC;IAED;;;;;OAKG;IACI,MAAM,CAAC,OAAO,CAAC,GAAW,EAAE,KAAU;QAC3C,OAAO,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IACtD,CAAC;CACF;AAhDD,0BAgDC","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n * Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n * See LICENSE.md in the project root for license terms and full copyright notice.\r\n *--------------------------------------------------------------------------------------------*/\r\n/** @packageDocumentation\r\n * @module Content\r\n */\r\n\r\nimport { Descriptor, DescriptorJSON } from \"./Descriptor\";\r\nimport { Item, ItemJSON } from \"./Item\";\r\n\r\n/**\r\n * Serialized [[Content]] JSON representation.\r\n * @public\r\n */\r\nexport interface ContentJSON {\r\n  descriptor: DescriptorJSON;\r\n  contentSet: ItemJSON[];\r\n}\r\n\r\n/**\r\n * A data structure that contains the [[Descriptor]] and a list of [[Item]]\r\n * objects which are based on that descriptor.\r\n *\r\n * @public\r\n */\r\nexport class Content {\r\n  /** Descriptor used to create the content */\r\n  public readonly descriptor: Descriptor;\r\n  /** Content items */\r\n  public readonly contentSet: Item[];\r\n\r\n  /** Create a new [[Content]] instance */\r\n  public constructor(descriptor: Descriptor, items: Item[]) {\r\n    this.descriptor = descriptor;\r\n    this.contentSet = items;\r\n  }\r\n\r\n  /** Serialize this object to JSON */\r\n  public toJSON(): ContentJSON {\r\n    return {\r\n      descriptor: this.descriptor.toJSON(),\r\n      contentSet: this.contentSet.map((item: Item) => item.toJSON()),\r\n    };\r\n  }\r\n\r\n  /** Deserialize [[Content]] from JSON */\r\n  public static fromJSON(json: ContentJSON | string | undefined): Content | undefined {\r\n    if (!json) {\r\n      return undefined;\r\n    }\r\n\r\n    if (typeof json === \"string\") {\r\n      return JSON.parse(json, (key, value) => Content.reviver(key, value));\r\n    }\r\n\r\n    const descriptor = Descriptor.fromJSON(json.descriptor);\r\n    if (!descriptor) {\r\n      return undefined;\r\n    }\r\n\r\n    const contentSet = json.contentSet.map((itemJson: ItemJSON) => Item.fromJSON(itemJson)).filter<Item>((item): item is Item => item !== undefined);\r\n    return new Content(descriptor, contentSet);\r\n  }\r\n\r\n  /**\r\n   * Reviver function that can be used as a second argument for\r\n   * `JSON.parse` method when parsing Content objects.\r\n   *\r\n   * @internal\r\n   */\r\n  public static reviver(key: string, value: any): any {\r\n    return key === \"\" ? Content.fromJSON(value) : value;\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"Content.js","sourceRoot":"","sources":["../../../../src/presentation-common/content/Content.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;AAChG;;GAEG;;;AAEH,mDAA6D;AAC7D,uCAA2C;AAW3C;;;;;GAKG;AACH,MAAa,OAAO;IAClB,4CAA4C;IAC5B,UAAU,CAAa;IACvC,oBAAoB;IACJ,UAAU,CAAS;IAEnC,wCAAwC;IACxC,YAAmB,UAAsB,EAAE,KAAa;QACtD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;IAC1B,CAAC;IAED,oCAAoC;IAC7B,MAAM;QACX,OAAO;YACL,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;YACpC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,IAAU,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;SAC/D,CAAC;IACJ,CAAC;IAED,wCAAwC;IACjC,MAAM,CAAC,QAAQ,CAAC,IAAsC;QAC3D,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC7B,OAAO,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;QAC5C,CAAC;QAED,MAAM,UAAU,GAAG,0BAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACxD,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,cAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAO,CAAC,IAAI,EAAgB,EAAE,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC;QACvI,OAAO,IAAI,OAAO,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IAC7C,CAAC;CACF;AAtCD,0BAsCC","sourcesContent":["/*---------------------------------------------------------------------------------------------\n * Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n * See LICENSE.md in the project root for license terms and full copyright notice.\n *--------------------------------------------------------------------------------------------*/\n/** @packageDocumentation\n * @module Content\n */\n\nimport { Descriptor, DescriptorJSON } from \"./Descriptor.js\";\nimport { Item, ItemJSON } from \"./Item.js\";\n\n/**\n * Serialized [[Content]] JSON representation.\n * @public\n */\nexport interface ContentJSON {\n  descriptor: DescriptorJSON;\n  contentSet: ItemJSON[];\n}\n\n/**\n * A data structure that contains the [[Descriptor]] and a list of [[Item]]\n * objects which are based on that descriptor.\n *\n * @public\n */\nexport class Content {\n  /** Descriptor used to create the content */\n  public readonly descriptor: Descriptor;\n  /** Content items */\n  public readonly contentSet: Item[];\n\n  /** Create a new [[Content]] instance */\n  public constructor(descriptor: Descriptor, items: Item[]) {\n    this.descriptor = descriptor;\n    this.contentSet = items;\n  }\n\n  /** Serialize this object to JSON */\n  public toJSON(): ContentJSON {\n    return {\n      descriptor: this.descriptor.toJSON(),\n      contentSet: this.contentSet.map((item: Item) => item.toJSON()),\n    };\n  }\n\n  /** Deserialize [[Content]] from JSON */\n  public static fromJSON(json: ContentJSON | string | undefined): Content | undefined {\n    if (!json) {\n      return undefined;\n    }\n\n    if (typeof json === \"string\") {\n      return Content.fromJSON(JSON.parse(json));\n    }\n\n    const descriptor = Descriptor.fromJSON(json.descriptor);\n    if (!descriptor) {\n      return undefined;\n    }\n\n    const contentSet = json.contentSet.map((itemJson) => Item.fromJSON(itemJson)).filter<Item>((item): item is Item => item !== undefined);\n    return new Content(descriptor, contentSet);\n  }\n}\n"]}

package/lib/cjs/presentation-common/content/ContentTraverser.d.ts

@@ -1,14 +1,14 @@
 /** @packageDocumentation
  * @module Content
  */
-import { CategoryDescription } from "./Category";
-import { Content } from "./Content";
-import { Descriptor } from "./Descriptor";
-import { Field } from "./Fields";
-import { Item } from "./Item";
-import { TypeDescription } from "./TypeDescription";
-import { DisplayValue, DisplayValuesArray, DisplayValuesMap, Value as PresentationValue, ValuesArray as PresentationValuesArray, ValuesMap as PresentationValuesMap } from "./Value";
-import { LabelDefinition } from "../LabelDefinition";
+import { LabelDefinition } from "../LabelDefinition.js";
+import { CategoryDescription } from "./Category.js";
+import { Content } from "./Content.js";
+import { Descriptor } from "./Descriptor.js";
+import { Field } from "./Fields.js";
+import { Item } from "./Item.js";
+import { TypeDescription } from "./TypeDescription.js";
+import { DisplayValue, DisplayValuesArray, DisplayValuesMap, Value as PresentationValue, ValuesArray as PresentationValuesArray, ValuesMap as PresentationValuesMap } from "./Value.js";
 /**
  * A data structure to define a hierarchy of [[Field]] objects.
  * @public
@@ -256,7 +256,7 @@ export declare function traverseContentItem(visitor: IContentVisitor, descriptor
  */
 export declare function createFieldHierarchies(fields: Field[], ignoreCategories?: boolean): FieldHierarchy[];
 /**
- * Adds a field hierarchy into root field hierarchies list. *
+ * Adds a field hierarchy into root field hierarchies list.
  * @public
  */
 export declare function addFieldHierarchy(rootHierarchies: FieldHierarchy[], hierarchy: FieldHierarchy): void;

package/lib/cjs/presentation-common/content/ContentTraverser.d.ts.map

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

package/lib/cjs/presentation-common/content/ContentTraverser.js

@@ -6,6 +6,58 @@
 /** @packageDocumentation
  * @module Content
  */
+var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
+    if (value !== null && value !== void 0) {
+        if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
+        var dispose, inner;
+        if (async) {
+            if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");
+            dispose = value[Symbol.asyncDispose];
+        }
+        if (dispose === void 0) {
+            if (!Symbol.dispose) throw new TypeError("Symbol.dispose is not defined.");
+            dispose = value[Symbol.dispose];
+            if (async) inner = dispose;
+        }
+        if (typeof dispose !== "function") throw new TypeError("Object not disposable.");
+        if (inner) dispose = function() { try { inner.call(this); } catch (e) { return Promise.reject(e); } };
+        env.stack.push({ value: value, dispose: dispose, async: async });
+    }
+    else if (async) {
+        env.stack.push({ async: true });
+    }
+    return value;
+};
+var __disposeResources = (this && this.__disposeResources) || (function (SuppressedError) {
+    return function (env) {
+        function fail(e) {
+            env.error = env.hasError ? new SuppressedError(e, env.error, "An error was suppressed during disposal.") : e;
+            env.hasError = true;
+        }
+        var r, s = 0;
+        function next() {
+            while (r = env.stack.pop()) {
+                try {
+                    if (!r.async && s === 1) return s = 0, env.stack.push(r), Promise.resolve().then(next);
+                    if (r.dispose) {
+                        var result = r.dispose.call(r.value);
+                        if (r.async) return s |= 2, Promise.resolve(result).then(next, function(e) { fail(e); return next(); });
+                    }
+                    else s |= 1;
+                }
+                catch (e) {
+                    fail(e);
+                }
+            }
+            if (s === 1) return env.hasError ? Promise.reject(env.error) : Promise.resolve();
+            if (env.hasError) throw env.error;
+        }
+        return next();
+    };
+})(typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
+    var e = new Error(message);
+    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+});
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FIELD_NAMES_SEPARATOR = void 0;
 exports.traverseFieldHierarchy = traverseFieldHierarchy;
@@ -16,11 +68,11 @@ exports.addFieldHierarchy = addFieldHierarchy;
 exports.combineFieldNames = combineFieldNames;
 exports.parseCombinedFieldNames = parseCombinedFieldNames;
 const core_bentley_1 = require("@itwin/core-bentley");
-const Content_1 = require("./Content");
-const Fields_1 = require("./Fields");
-const Item_1 = require("./Item");
-const TypeDescription_1 = require("./TypeDescription");
-const Value_1 = require("./Value");
+const Content_js_1 = require("./Content.js");
+const Fields_js_1 = require("./Fields.js");
+const Item_js_1 = require("./Item.js");
+const TypeDescription_js_1 = require("./TypeDescription.js");
+const Value_js_1 = require("./Value.js");
 const NESTED_CONTENT_LABEL_SYMBOL = Symbol();
 /**
  * An utility for traversing field hierarchy. Stops traversal as soon as `cb` returns `false`.
@@ -56,9 +108,12 @@ function traverseContent(visitor, content) {
  * @public
  */
 function traverseContentItem(visitor, descriptor, item) {
-    traverseContent(visitor, new Content_1.Content(descriptor, [item]));
+    traverseContent(visitor, new Content_js_1.Content(descriptor, [item]));
 }
 class VisitedCategories {
+    _visitor;
+    _visitedCategories;
+    _didVisitAllHierarchy;
     constructor(_visitor, category) {
         this._visitor = _visitor;
         const stack = [];
@@ -80,7 +135,7 @@ class VisitedCategories {
             }
         }
     }
-    dispose() {
+    [Symbol.dispose]() {
         while (this._visitedCategories.pop()) {
             this._visitor.finishCategory();
         }
@@ -95,11 +150,20 @@ function traverseContentItemFields(visitor, fieldHierarchies, item) {
     }
     try {
         fieldHierarchies.forEach((fieldHierarchy) => {
-            (0, core_bentley_1.using)(new VisitedCategories(visitor, fieldHierarchy.field.category), (res) => {
+            const env_1 = { stack: [], error: void 0, hasError: false };
+            try {
+                const res = __addDisposableResource(env_1, new VisitedCategories(visitor, fieldHierarchy.field.category), false);
                 if (res.shouldContinue) {
                     traverseContentItemField(visitor, fieldHierarchy, item);
                 }
-            });
+            }
+            catch (e_1) {
+                env_1.error = e_1;
+                env_1.hasError = true;
+            }
+            finally {
+                __disposeResources(env_1);
+            }
         });
     }
     finally {
@@ -143,13 +207,15 @@ function traverseContentItemField(visitor, fieldHierarchy, item) {
         else if (pathUpToField.length > 0) {
             fieldHierarchy = {
                 ...fieldHierarchy,
-                field: Object.assign(fieldHierarchy.field.clone(), {
-                    type: {
-                        valueFormat: TypeDescription_1.PropertyValueFormat.Array,
+                field: (function () {
+                    const clone = fieldHierarchy.field.clone();
+                    clone.type = {
+                        valueFormat: TypeDescription_js_1.PropertyValueFormat.Array,
                         typeName: `${fieldHierarchy.field.type.typeName}[]`,
                         memberType: fieldHierarchy.field.type,
-                    },
-                }),
+                    };
+                    return clone;
+                })(),
             };
         }
         traverseContentItemFieldValue(visitor, fieldHierarchy, item.mergedFieldNames, fieldHierarchy.field.type, parentFieldName, item.values[fieldHierarchy.field.name], item.displayValues[fieldHierarchy.field.name]);
@@ -160,14 +226,14 @@ function traverseContentItemField(visitor, fieldHierarchy, item) {
 }
 function traverseContentItemFieldValue(visitor, fieldHierarchy, mergedFieldNames, valueType, parentFieldName, rawValue, displayValue) {
     if (rawValue !== undefined) {
-        if (valueType.valueFormat === TypeDescription_1.PropertyValueFormat.Array) {
-            (0, core_bentley_1.assert)(Value_1.Value.isArray(rawValue));
-            (0, core_bentley_1.assert)(Value_1.DisplayValue.isArray(displayValue));
+        if (valueType.valueFormat === TypeDescription_js_1.PropertyValueFormat.Array) {
+            (0, core_bentley_1.assert)(Value_js_1.Value.isArray(rawValue));
+            (0, core_bentley_1.assert)(Value_js_1.DisplayValue.isArray(displayValue));
             return traverseContentItemArrayFieldValue(visitor, fieldHierarchy, mergedFieldNames, valueType, parentFieldName, rawValue, displayValue);
         }
-        if (valueType.valueFormat === TypeDescription_1.PropertyValueFormat.Struct) {
-            (0, core_bentley_1.assert)(Value_1.Value.isMap(rawValue));
-            (0, core_bentley_1.assert)(Value_1.DisplayValue.isMap(displayValue));
+        if (valueType.valueFormat === TypeDescription_js_1.PropertyValueFormat.Struct) {
+            (0, core_bentley_1.assert)(Value_js_1.Value.isMap(rawValue));
+            (0, core_bentley_1.assert)(Value_js_1.DisplayValue.isMap(displayValue));
             return traverseContentItemStructFieldValue(visitor, fieldHierarchy, mergedFieldNames, valueType, parentFieldName, rawValue, displayValue);
         }
     }
@@ -175,7 +241,7 @@ function traverseContentItemFieldValue(visitor, fieldHierarchy, mergedFieldNames
 }
 function traverseContentItemArrayFieldValue(visitor, fieldHierarchy, mergedFieldNames, valueType, parentFieldName, rawValues, displayValues) {
     (0, core_bentley_1.assert)(rawValues.length === displayValues.length);
-    (0, core_bentley_1.assert)(valueType.valueFormat === TypeDescription_1.PropertyValueFormat.Array);
+    (0, core_bentley_1.assert)(valueType.valueFormat === TypeDescription_js_1.PropertyValueFormat.Array);
     if (!visitor.startArray({ hierarchy: fieldHierarchy, valueType, parentFieldName, rawValues, displayValues })) {
         return;
     }
@@ -190,7 +256,7 @@ function traverseContentItemArrayFieldValue(visitor, fieldHierarchy, mergedField
     }
 }
 function traverseContentItemStructFieldValue(visitor, fieldHierarchy, mergedFieldNames, valueType, parentFieldName, rawValues, displayValues) {
-    (0, core_bentley_1.assert)(valueType.valueFormat === TypeDescription_1.PropertyValueFormat.Struct);
+    (0, core_bentley_1.assert)(valueType.valueFormat === TypeDescription_js_1.PropertyValueFormat.Struct);
     const label = rawValues[NESTED_CONTENT_LABEL_SYMBOL];
     if (!visitor.startStruct({ hierarchy: fieldHierarchy, valueType, parentFieldName, rawValues, displayValues, label })) {
         return;
@@ -205,7 +271,14 @@ function traverseContentItemStructFieldValue(visitor, fieldHierarchy, mergedFiel
                 // Not finding a member field means we're traversing an ECStruct. We still need to carry member information, so we
                 // create a fake field to represent the member
                 memberField = {
-                    field: new Fields_1.Field(fieldHierarchy.field.category, memberDescription.name, memberDescription.label, memberDescription.type, fieldHierarchy.field.isReadonly, 0),
+                    field: new Fields_js_1.Field({
+                        category: fieldHierarchy.field.category,
+                        name: memberDescription.name,
+                        label: memberDescription.label,
+                        type: memberDescription.type,
+                        isReadonly: fieldHierarchy.field.isReadonly,
+                        priority: 0,
+                    }),
                     childFields: [],
                 };
             }
@@ -326,7 +399,7 @@ function mergeHierarchies(lhs, rhs) {
     return result;
 }
 /**
- * Adds a field hierarchy into root field hierarchies list. *
+ * Adds a field hierarchy into root field hierarchies list.
  * @public
  */
 function addFieldHierarchy(rootHierarchies, hierarchy) {
@@ -370,27 +443,35 @@ function parseCombinedFieldNames(combinedName) {
 }
 function convertNestedContentItemToStructArrayItem(item, field, nextField) {
     const value = item.values[field.name] ?? [];
-    (0, core_bentley_1.assert)(Value_1.Value.isNestedContent(value));
+    (0, core_bentley_1.assert)(Value_js_1.Value.isNestedContent(value));
     if (value.length === 0) {
         return { emptyNestedItem: true, convertedItem: item };
     }
-    const nextFieldValues = { raw: [], display: [] };
-    value.forEach((ncv) => {
-        const nextRawValue = ncv.values[nextField.name];
-        const nextDisplayValue = ncv.displayValues[nextField.name];
-        if (nextField.isNestedContentField()) {
+    let nextFieldValues = { raw: [], display: [] };
+    if (nextField.isNestedContentField()) {
+        const nextNestedContent = [];
+        value.forEach((ncv) => {
+            const nextRawValue = ncv.values[nextField.name];
             if (nextRawValue) {
-                (0, core_bentley_1.assert)(Value_1.Value.isNestedContent(nextRawValue));
-                nextFieldValues.raw.push(...nextRawValue);
+                (0, core_bentley_1.assert)(Value_js_1.Value.isNestedContent(nextRawValue));
+                nextNestedContent.push(...nextRawValue);
             }
-        }
-        else {
-            nextFieldValues.raw.push(nextRawValue);
-            nextFieldValues.display.push(nextDisplayValue);
-        }
+        });
+        nextFieldValues.raw = nextNestedContent;
+    }
+    else {
+        const nextValues = { raw: [], display: [] };
+        value.forEach((ncv) => {
+            nextValues.raw.push(ncv.values[nextField.name]);
+            nextValues.display.push(ncv.displayValues[nextField.name]);
+        });
+        nextFieldValues = nextValues;
+    }
+    const convertedItem = new Item_js_1.Item({
+        ...item,
+        values: { [nextField.name]: nextFieldValues.raw },
+        displayValues: { [nextField.name]: nextFieldValues.display },
     });
-    const convertedItem = new Item_1.Item(item.primaryKeys, item.label, item.imageId, // eslint-disable-line @typescript-eslint/no-deprecated
-    item.classInfo, { [nextField.name]: nextFieldValues.raw }, { [nextField.name]: nextFieldValues.display }, item.mergedFieldNames, item.extendedData);
     return { emptyNestedItem: false, convertedItem };
 }
 function convertNestedContentFieldHierarchyToStructArrayHierarchy(fieldHierarchy, parentFieldName) {
@@ -402,12 +483,13 @@ function convertNestedContentFieldHierarchyToStructArrayHierarchy(fieldHierarchy
         return child;
     });
     const convertedFieldHierarchy = {
-        field: Object.assign(fieldHierarchy.field.clone(), {
-            type: {
-                valueFormat: TypeDescription_1.PropertyValueFormat.Array,
+        field: (function () {
+            const clone = fieldHierarchy.field.clone();
+            clone.type = {
+                valueFormat: TypeDescription_js_1.PropertyValueFormat.Array,
                 typeName: `${fieldHierarchy.field.type.typeName}[]`,
                 memberType: {
-                    valueFormat: TypeDescription_1.PropertyValueFormat.Struct,
+                    valueFormat: TypeDescription_js_1.PropertyValueFormat.Struct,
                     typeName: fieldHierarchy.field.type.typeName,
                     members: convertedChildFieldHierarchies.map((member) => ({
                         name: member.field.name,
@@ -415,8 +497,9 @@ function convertNestedContentFieldHierarchyToStructArrayHierarchy(fieldHierarchy
                         type: member.field.type,
                     })),
                 },
-            },
-        }),
+            };
+            return clone;
+        })(),
         childFields: convertedChildFieldHierarchies,
     };
     return convertedFieldHierarchy;
@@ -427,7 +510,8 @@ function convertNestedContentValuesToStructArrayValuesRecursive(fieldHierarchy,
         const values = { ...ncv.values };
         const displayValues = { ...ncv.displayValues };
         const mergedFieldNames = [...ncv.mergedFieldNames];
-        values[NESTED_CONTENT_LABEL_SYMBOL] = ncv.labelDefinition;
+        // eslint-disable-next-line @typescript-eslint/no-deprecated
+        values[NESTED_CONTENT_LABEL_SYMBOL] = ncv.label ?? ncv.labelDefinition;
         fieldHierarchy.childFields.forEach((childFieldHierarchy) => {
             const childFieldName = childFieldHierarchy.field.name;
             if (-1 !== ncv.mergedFieldNames.indexOf(childFieldName)) {
@@ -435,7 +519,7 @@ function convertNestedContentValuesToStructArrayValuesRecursive(fieldHierarchy,
             }
             if (childFieldHierarchy.field.isNestedContentField()) {
                 const value = values[childFieldName];
-                (0, core_bentley_1.assert)(Value_1.Value.isNestedContent(value));
+                (0, core_bentley_1.assert)(Value_js_1.Value.isNestedContent(value));
                 const convertedValues = convertNestedContentValuesToStructArrayValuesRecursive(childFieldHierarchy, value);
                 values[childFieldName] = convertedValues.raw;
                 displayValues[childFieldName] = convertedValues.display;
@@ -451,13 +535,17 @@ function convertNestedContentValuesToStructArrayValuesRecursive(fieldHierarchy,
 function convertNestedContentFieldHierarchyItemToStructArrayItem(item, fieldHierarchy) {
     const fieldName = fieldHierarchy.field.name;
     const rawValue = item.values[fieldName];
-    (0, core_bentley_1.assert)(Value_1.Value.isNestedContent(rawValue));
+    (0, core_bentley_1.assert)(Value_js_1.Value.isNestedContent(rawValue));
     if (rawValue.length === 0) {
         return { emptyNestedItem: true, convertedItem: item };
     }
     const converted = convertNestedContentValuesToStructArrayValuesRecursive(fieldHierarchy, rawValue);
-    const convertedItem = new Item_1.Item(item.primaryKeys, item.label, item.imageId, // eslint-disable-line @typescript-eslint/no-deprecated
-    item.classInfo, { [fieldName]: converted.raw }, { [fieldName]: converted.display }, converted.mergedFieldNames, item.extendedData);
+    const convertedItem = new Item_js_1.Item({
+        ...item,
+        values: { [fieldName]: converted.raw },
+        displayValues: { [fieldName]: converted.display },
+        mergedFieldNames: converted.mergedFieldNames,
+    });
     return { emptyNestedItem: false, convertedItem };
 }
 //# sourceMappingURL=ContentTraverser.js.map