@itwin/core-backend 3.1.0-dev.26 → 3.1.0-dev.31

package/lib/cjs/IModelSchemaLoader.d.ts

@@ -1,5 +1,5 @@
-import { Schema } from "@itwin/ecschema-metadata";
 import { IModelDb } from "./IModelDb";
+import type { Schema as SchemaType } from "@itwin/ecschema-metadata";
 /**
  * A utility class for retrieving EC Schema objects from an iModel. Loaded schemas are held in memory within
  * a schema context managed by IModelSchemaLoader. The IModelSchemaLoader object should be held in memory if
@@ -16,11 +16,11 @@ export declare class IModelSchemaLoader {
      * @param schemaName a string with the name of the schema to load.
      * @throws [IModelError]($common) if the schema is not found or cannot be loaded.
      */
-    getSchema<T extends Schema>(schemaName: string): T;
+    getSchema<T extends SchemaType>(schemaName: string): T;
     /** Attempts to get a schema by name
      * @param schemaName a string with the name of the schema to load.
      * @throws [IModelError]($common) if the schema exists, but cannot be loaded.
      */
-    tryGetSchema<T extends Schema>(schemaName: string): T | undefined;
+    tryGetSchema<T extends SchemaType>(schemaName: string): T | undefined;
 }
 //# sourceMappingURL=IModelSchemaLoader.d.ts.map

package/lib/cjs/IModelSchemaLoader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"IModelSchemaLoader.d.ts","sourceRoot":"","sources":["../../src/IModelSchemaLoader.ts"],"names":[],"mappings":"AAMA,OAAO,EAA6B,MAAM,EAA6C,MAAM,0BAA0B,CAAC;AAGxH,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC;;;;;;GAMG;AACH,qBAAa,kBAAkB;IAIV,OAAO,CAAC,OAAO;IAHlC,OAAO,CAAC,QAAQ,CAAgB;IAEhC,gBAAgB;gBACW,OAAO,EAAE,QAAQ;IAM5C;;;OAGG;IACI,SAAS,CAAC,CAAC,SAAS,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,CAAC;IAQzD;;;OAGG;IACI,YAAY,CAAC,CAAC,SAAS,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,CAAC,GAAG,SAAS;CAMzE"}
+{"version":3,"file":"IModelSchemaLoader.d.ts","sourceRoot":"","sources":["../../src/IModelSchemaLoader.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,KAAK,EAAwC,MAAM,IAAI,UAAU,EAAE,MAAM,0BAA0B,CAAC;AA6B3G;;;;;;GAMG;AACH,qBAAa,kBAAkB;IAIV,OAAO,CAAC,OAAO;IAHlC,OAAO,CAAC,QAAQ,CAAuB;IAEvC,gBAAgB;gBACW,OAAO,EAAE,QAAQ;IAU5C;;;OAGG;IACI,SAAS,CAAC,CAAC,SAAS,UAAU,EAAE,UAAU,EAAE,MAAM,GAAG,CAAC;IAQ7D;;;OAGG;IACI,YAAY,CAAC,CAAC,SAAS,UAAU,EAAE,UAAU,EAAE,MAAM,GAAG,CAAC,GAAG,SAAS;CAM7E"}

package/lib/cjs/IModelSchemaLoader.js

@@ -6,8 +6,32 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IModelSchemaLoader = void 0;
 const core_bentley_1 = require("@itwin/core-bentley");
-const ecschema_metadata_1 = require("@itwin/ecschema-metadata");
 const core_common_1 = require("@itwin/core-common");
+/* eslint-disable @typescript-eslint/naming-convention */
+/* eslint-disable @typescript-eslint/no-var-requires  */
+let Schema;
+let SchemaContext;
+let SchemaKey;
+let SchemaMatchType;
+let ECVersion;
+/** The ecschema-metadata package is now an optional dependency. If the package
+ * has not been installed, the exception is caught below. All the types will be
+ * undefined, and an exception is throw in the IModelSchemaLoader constructor.
+ */
+function loadMetadata() {
+    try {
+        const metadata = require("@itwin/ecschema-metadata");
+        Schema = metadata.Schema;
+        SchemaContext = metadata.SchemaContext;
+        SchemaKey = metadata.SchemaKey;
+        SchemaMatchType = metadata.SchemaMatchType;
+        ECVersion = metadata.ECVersion;
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
 /**
  * A utility class for retrieving EC Schema objects from an iModel. Loaded schemas are held in memory within
  * a schema context managed by IModelSchemaLoader. The IModelSchemaLoader object should be held in memory if
@@ -19,7 +43,10 @@ class IModelSchemaLoader {
     /** @internal */
     constructor(_iModel) {
         this._iModel = _iModel;
-        this._context = new ecschema_metadata_1.SchemaContext();
+        // If the ecschema-metadata package was not installed inform the caller.
+        if (!loadMetadata())
+            throw new core_common_1.IModelError(core_bentley_1.IModelStatus.NotFound, "IModelSchemaLoader requires that @bentley/ecschema-metadata be installed.");
+        this._context = new SchemaContext();
         const locater = new IModelSchemaLocater(this._iModel);
         this._context.addLocater(locater);
     }
@@ -39,8 +66,8 @@ class IModelSchemaLoader {
      */
     tryGetSchema(schemaName) {
         // SchemaKey version is not used when locating schema in an iModel, so the version is arbitrary.
-        const key = new ecschema_metadata_1.SchemaKey(schemaName, new ecschema_metadata_1.ECVersion(1, 0, 0));
-        const schema = this._context.getSchemaSync(key, ecschema_metadata_1.SchemaMatchType.Latest);
+        const key = new SchemaKey(schemaName, new ECVersion(1, 0, 0));
+        const schema = this._context.getSchemaSync(key, SchemaMatchType.Latest);
         return schema;
     }
 }
@@ -73,8 +100,8 @@ class IModelSchemaLocater {
         const schemaProps = this.getSchemaString(schemaKey.name);
         if (!schemaProps)
             return undefined;
-        context = context ? context : new ecschema_metadata_1.SchemaContext();
-        return ecschema_metadata_1.Schema.fromJsonSync(schemaProps, context);
+        context = context ? context : new SchemaContext();
+        return Schema.fromJsonSync(schemaProps, context);
     }
     /** Read schema data from the iModel as JSON string
      * @param schemaName A string with the name of the schema to load.

package/lib/cjs/IModelSchemaLoader.js.map

@@ -1 +1 @@
-{"version":3,"file":"IModelSchemaLoader.js","sourceRoot":"","sources":["../../src/IModelSchemaLoader.ts"],"names":[],"mappings":";AAAA;;;+FAG+F;;;AAE/F,sDAAmD;AACnD,gEAAwH;AACxH,oDAAiD;AAIjD;;;;;;GAMG;AACH,MAAa,kBAAkB;IAG7B,gBAAgB;IAChB,YAA2B,OAAiB;QAAjB,YAAO,GAAP,OAAO,CAAU;QAC1C,IAAI,CAAC,QAAQ,GAAG,IAAI,iCAAa,EAAE,CAAC;QACpC,MAAM,OAAO,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACtD,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IACpC,CAAC;IAED;;;OAGG;IACI,SAAS,CAAmB,UAAkB;QACnD,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;QAC7C,IAAI,CAAC,MAAM;YACT,MAAM,IAAI,yBAAW,CAAC,2BAAY,CAAC,QAAQ,EAAE,kBAAkB,UAAU,EAAE,CAAC,CAAC;QAE/E,OAAO,MAAW,CAAC;IACrB,CAAC;IAED;;;OAGG;IACI,YAAY,CAAmB,UAAkB;QACtD,gGAAgG;QAChG,MAAM,GAAG,GAAG,IAAI,6BAAS,CAAC,UAAU,EAAE,IAAI,6BAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAC9D,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,GAAG,EAAE,mCAAe,CAAC,MAAM,CAAC,CAAC;QACxE,OAAO,MAAW,CAAC;IACrB,CAAC;CACF;AAhCD,gDAgCC;AAED;;;GAGG;AACH,MAAM,mBAAmB;IACvB,gBAAgB;IAChB,YAA2B,OAAiB;QAAjB,YAAO,GAAP,OAAO,CAAU;IAAI,CAAC;IAEjD;;;;;OAKG;IACI,KAAK,CAAC,SAAS,CAAmB,SAAoB,EAAE,SAA0B,EAAE,OAAmC;QAC5H,OAAO,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,CAAM,CAAC;IAChE,CAAC;IAED;;;;;OAKG;IACI,aAAa,CAAmB,SAAoB,EAAE,UAA2B,EAAE,OAAmC;QAC3H,MAAM,WAAW,GAAG,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACzD,IAAI,CAAC,WAAW;YACd,OAAO,SAAS,CAAC;QAEnB,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,iCAAa,EAAE,CAAC;QAClD,OAAO,0BAAM,CAAC,YAAY,CAAC,WAAW,EAAE,OAAO,CAAM,CAAC;IACxD,CAAC;IAED;;;;OAIG;IACK,eAAe,CAAC,UAAkB;QACxC,MAAM,GAAG,GAAiD,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QACtG,IAAI,SAAS,KAAK,GAAG,CAAC,KAAK,EAAE;YAC3B,IAAI,2BAAY,CAAC,QAAQ,KAAK,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE;gBAC9C,OAAO,SAAS,CAAC;aAClB;YACD,MAAM,IAAI,yBAAW,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,kBAAkB,UAAU,EAAE,CAAC,CAAC;SACzE;QACD,OAAO,GAAG,CAAC,MAAM,CAAC;IACpB,CAAC;CACF","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\r\nimport { IModelStatus } from \"@itwin/core-bentley\";\r\nimport { ECVersion, ISchemaLocater, Schema, SchemaContext, SchemaKey, SchemaMatchType } from \"@itwin/ecschema-metadata\";\r\nimport { IModelError } from \"@itwin/core-common\";\r\nimport { IModelJsNative } from \"@bentley/imodeljs-native\";\r\nimport { IModelDb } from \"./IModelDb\";\r\n\r\n/**\r\n * A utility class for retrieving EC Schema objects from an iModel. Loaded schemas are held in memory within\r\n * a schema context managed by IModelSchemaLoader. The IModelSchemaLoader object should be held in memory if\r\n * multiple calls to [[getSchema]] or [[tryGetSchema]] is a possibility, thereby avoiding unnecessary schema\r\n * retrievals from an iModel.\r\n * @alpha\r\n */\r\nexport class IModelSchemaLoader {\r\n  private _context: SchemaContext;\r\n\r\n  /** @internal */\r\n  public constructor(private _iModel: IModelDb) {\r\n    this._context = new SchemaContext();\r\n    const locater = new IModelSchemaLocater(this._iModel);\r\n    this._context.addLocater(locater);\r\n  }\r\n\r\n  /** Get a schema by name\r\n   * @param schemaName a string with the name of the schema to load.\r\n   * @throws [IModelError]($common) if the schema is not found or cannot be loaded.\r\n   */\r\n  public getSchema<T extends Schema>(schemaName: string): T {\r\n    const schema = this.tryGetSchema(schemaName);\r\n    if (!schema)\r\n      throw new IModelError(IModelStatus.NotFound, `reading schema=${schemaName}`);\r\n\r\n    return schema as T;\r\n  }\r\n\r\n  /** Attempts to get a schema by name\r\n   * @param schemaName a string with the name of the schema to load.\r\n   * @throws [IModelError]($common) if the schema exists, but cannot be loaded.\r\n   */\r\n  public tryGetSchema<T extends Schema>(schemaName: string): T | undefined {\r\n    // SchemaKey version is not used when locating schema in an iModel, so the version is arbitrary.\r\n    const key = new SchemaKey(schemaName, new ECVersion(1, 0, 0));\r\n    const schema = this._context.getSchemaSync(key, SchemaMatchType.Latest);\r\n    return schema as T;\r\n  }\r\n}\r\n\r\n/**\r\n * A private ISchemaLocater implementation for locating and retrieving EC Schema objects from an iModel\r\n * @alpha\r\n */\r\nclass IModelSchemaLocater implements ISchemaLocater {\r\n  /** @internal */\r\n  public constructor(private _iModel: IModelDb) { }\r\n\r\n  /** Get a schema by [SchemaKey]\r\n   * @param schemaKey The [SchemaKey] that identifies the schema.\r\n   * @param matchType The [SchemaMatchType] to used for comparing schema versions.\r\n   * @param context The [SchemaContext] used to facilitate schema location.\r\n   * @throws [IModelError]($common) if the schema exists, but cannot be loaded.\r\n   */\r\n  public async getSchema<T extends Schema>(schemaKey: SchemaKey, matchType: SchemaMatchType, context?: SchemaContext | undefined): Promise<T | undefined> {\r\n    return this.getSchemaSync(schemaKey, matchType, context) as T;\r\n  }\r\n\r\n  /** Get a schema by [SchemaKey] synchronously.\r\n   * @param schemaKey The [SchemaKey] that identifies the schema.\r\n   * * @param matchType The [SchemaMatchType] to used for comparing schema versions.\r\n   * @param context The [SchemaContext] used to facilitate schema location.\r\n   * @throws [IModelError]($common) if the schema exists, but cannot be loaded.\r\n   */\r\n  public getSchemaSync<T extends Schema>(schemaKey: SchemaKey, _matchType: SchemaMatchType, context?: SchemaContext | undefined): T | undefined {\r\n    const schemaProps = this.getSchemaString(schemaKey.name);\r\n    if (!schemaProps)\r\n      return undefined;\r\n\r\n    context = context ? context : new SchemaContext();\r\n    return Schema.fromJsonSync(schemaProps, context) as T;\r\n  }\r\n\r\n  /** Read schema data from the iModel as JSON string\r\n   * @param schemaName A string with the name of the schema to load.\r\n   * @returns A string with the JSON for the schema or `undefined` if the schema is not found.\r\n   * @throws [IModelError]($common) if the schema exists, but cannot be loaded.\r\n   */\r\n  private getSchemaString(schemaName: string): string | undefined {\r\n    const val: IModelJsNative.ErrorStatusOrResult<any, any> = this._iModel.nativeDb.getSchema(schemaName);\r\n    if (undefined !== val.error) {\r\n      if (IModelStatus.NotFound === val.error.status) {\r\n        return undefined;\r\n      }\r\n      throw new IModelError(val.error.status, `reading schema=${schemaName}`);\r\n    }\r\n    return val.result;\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"IModelSchemaLoader.js","sourceRoot":"","sources":["../../src/IModelSchemaLoader.ts"],"names":[],"mappings":"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","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\r\nimport { IModelStatus } from \"@itwin/core-bentley\";\r\nimport { IModelError } from \"@itwin/core-common\";\r\nimport { IModelJsNative } from \"@bentley/imodeljs-native\";\r\nimport { IModelDb } from \"./IModelDb\";\r\nimport type { ISchemaLocater as ISchemaLocaterType, Schema as SchemaType } from \"@itwin/ecschema-metadata\";\r\n\r\n/* eslint-disable @typescript-eslint/naming-convention */\r\n/* eslint-disable @typescript-eslint/no-var-requires  */\r\n\r\nlet Schema: any;\r\nlet SchemaContext: any;\r\nlet SchemaKey: any;\r\nlet SchemaMatchType: any;\r\nlet ECVersion: any;\r\n\r\n/** The ecschema-metadata package is now an optional dependency. If the package\r\n * has not been installed, the exception is caught below. All the types will be\r\n * undefined, and an exception is throw in the IModelSchemaLoader constructor.\r\n */\r\nfunction loadMetadata(): boolean {\r\n  try {\r\n    const metadata = require(\"@itwin/ecschema-metadata\");\r\n    Schema = metadata.Schema;\r\n    SchemaContext = metadata.SchemaContext;\r\n    SchemaKey = metadata.SchemaKey;\r\n    SchemaMatchType = metadata.SchemaMatchType;\r\n    ECVersion = metadata.ECVersion;\r\n    return true;\r\n  } catch {\r\n    return false;\r\n  }\r\n}\r\n\r\n/**\r\n * A utility class for retrieving EC Schema objects from an iModel. Loaded schemas are held in memory within\r\n * a schema context managed by IModelSchemaLoader. The IModelSchemaLoader object should be held in memory if\r\n * multiple calls to [[getSchema]] or [[tryGetSchema]] is a possibility, thereby avoiding unnecessary schema\r\n * retrievals from an iModel.\r\n * @alpha\r\n */\r\nexport class IModelSchemaLoader {\r\n  private _context: typeof SchemaContext;\r\n\r\n  /** @internal */\r\n  public constructor(private _iModel: IModelDb) {\r\n    // If the ecschema-metadata package was not installed inform the caller.\r\n    if (!loadMetadata())\r\n      throw new IModelError(IModelStatus.NotFound, \"IModelSchemaLoader requires that @bentley/ecschema-metadata be installed.\");\r\n\r\n    this._context = new SchemaContext();\r\n    const locater = new IModelSchemaLocater(this._iModel);\r\n    this._context.addLocater(locater);\r\n  }\r\n\r\n  /** Get a schema by name\r\n   * @param schemaName a string with the name of the schema to load.\r\n   * @throws [IModelError]($common) if the schema is not found or cannot be loaded.\r\n   */\r\n  public getSchema<T extends SchemaType>(schemaName: string): T {\r\n    const schema = this.tryGetSchema(schemaName);\r\n    if (!schema)\r\n      throw new IModelError(IModelStatus.NotFound, `reading schema=${schemaName}`);\r\n\r\n    return schema as T;\r\n  }\r\n\r\n  /** Attempts to get a schema by name\r\n   * @param schemaName a string with the name of the schema to load.\r\n   * @throws [IModelError]($common) if the schema exists, but cannot be loaded.\r\n   */\r\n  public tryGetSchema<T extends SchemaType>(schemaName: string): T | undefined {\r\n    // SchemaKey version is not used when locating schema in an iModel, so the version is arbitrary.\r\n    const key = new SchemaKey(schemaName, new ECVersion(1, 0, 0));\r\n    const schema = this._context.getSchemaSync(key, SchemaMatchType.Latest);\r\n    return schema as T;\r\n  }\r\n}\r\n\r\n/**\r\n * A private ISchemaLocater implementation for locating and retrieving EC Schema objects from an iModel\r\n * @alpha\r\n */\r\nclass IModelSchemaLocater implements ISchemaLocaterType {\r\n  /** @internal */\r\n  public constructor(private _iModel: IModelDb) { }\r\n\r\n  /** Get a schema by [SchemaKey]\r\n   * @param schemaKey The [SchemaKey] that identifies the schema.\r\n   * @param matchType The [SchemaMatchType] to used for comparing schema versions.\r\n   * @param context The [SchemaContext] used to facilitate schema location.\r\n   * @throws [IModelError]($common) if the schema exists, but cannot be loaded.\r\n   */\r\n  public async getSchema<T extends SchemaType>(schemaKey: typeof SchemaKey, matchType: typeof SchemaMatchType, context?: typeof SchemaContext | undefined): Promise<T | undefined> {\r\n    return this.getSchemaSync(schemaKey, matchType, context) as T;\r\n  }\r\n\r\n  /** Get a schema by [SchemaKey] synchronously.\r\n   * @param schemaKey The [SchemaKey] that identifies the schema.\r\n   * * @param matchType The [SchemaMatchType] to used for comparing schema versions.\r\n   * @param context The [SchemaContext] used to facilitate schema location.\r\n   * @throws [IModelError]($common) if the schema exists, but cannot be loaded.\r\n   */\r\n  public getSchemaSync<T extends SchemaType>(schemaKey: typeof SchemaKey, _matchType: typeof SchemaMatchType, context?: typeof SchemaContext | undefined): T | undefined {\r\n    const schemaProps = this.getSchemaString(schemaKey.name);\r\n    if (!schemaProps)\r\n      return undefined;\r\n\r\n    context = context ? context : new SchemaContext();\r\n    return Schema.fromJsonSync(schemaProps, context) as T;\r\n  }\r\n\r\n  /** Read schema data from the iModel as JSON string\r\n   * @param schemaName A string with the name of the schema to load.\r\n   * @returns A string with the JSON for the schema or `undefined` if the schema is not found.\r\n   * @throws [IModelError]($common) if the schema exists, but cannot be loaded.\r\n   */\r\n  private getSchemaString(schemaName: string): string | undefined {\r\n    const val: IModelJsNative.ErrorStatusOrResult<any, any> = this._iModel.nativeDb.getSchema(schemaName);\r\n    if (undefined !== val.error) {\r\n      if (IModelStatus.NotFound === val.error.status) {\r\n        return undefined;\r\n      }\r\n      throw new IModelError(val.error.status, `reading schema=${schemaName}`);\r\n    }\r\n    return val.result;\r\n  }\r\n}\r\n"]}

package/lib/cjs/PromiseMemoizer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PromiseMemoizer.d.ts","sourceRoot":"","sources":["../../src/PromiseMemoizer.ts"],"names":[],"mappings":"AAIA;;GAEG;AAEH,OAAO,EAAE,WAAW,EAAU,MAAM,qBAAqB,CAAC;AAG1D;;GAEG;AACH,qBAAa,gBAAgB,CAAC,CAAC;aAUM,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;IAT/C,MAAM,CAAC,EAAE,CAAC,CAAC;IACX,KAAK,CAAC,EAAE,GAAG,CAAC;IAEnB,OAAO,CAAC,UAAU,CAAkB;IACpC,OAAO,CAAC,SAAS,CAAkB;IAEnC,IAAW,SAAS,IAAI,OAAO,CAAkD;IACjF,IAAW,WAAW,IAAI,OAAO,CAA4B;IAC7D,IAAW,UAAU,IAAI,OAAO,CAA2B;gBACxB,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;CAKvD;AAED,gBAAgB;AAChB,oBAAY,aAAa,CAAC,CAAC,IAAI,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;AAC9D,gBAAgB;AAChB,oBAAY,iBAAiB,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,MAAM,CAAC;AAE3D;;;GAGG;AACH,qBAAa,eAAe,CAAC,CAAC,CAAE,YAAW,WAAW;IACpD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA4E;IAC5G,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA8D;IACtF,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAmB;IAC9C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAoB;IACnD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IAEvC;;;;;;;;OAQG;gBACgB,SAAS,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,iBAAiB,EAAE,YAAY,GAAE,MAAY,EAAE,YAAY,GAAE,MAAc;IAO1I,iCAAiC;IAC1B,OAAO,YAAa,GAAG,EAAE,KAAG,iBAAiB,CAAC,CAAC,CAyBpD;IAEF,mCAAmC;IAC5B,cAAc,YAAa,GAAG,EAAE,UAGrC;IAEF,8CAA8C;IACvC,UAAU,aAEf;IAEK,OAAO,aAKZ;CACH"}
+{"version":3,"file":"PromiseMemoizer.d.ts","sourceRoot":"","sources":["../../src/PromiseMemoizer.ts"],"names":[],"mappings":"AAIA;;GAEG;AAEH,OAAO,EAAE,WAAW,EAAU,MAAM,qBAAqB,CAAC;AAG1D;;GAEG;AACH,qBAAa,gBAAgB,CAAC,CAAC;aAUM,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;IAT/C,MAAM,CAAC,EAAE,CAAC,CAAC;IACX,KAAK,CAAC,EAAE,GAAG,CAAC;IAEnB,OAAO,CAAC,UAAU,CAAkB;IACpC,OAAO,CAAC,SAAS,CAAkB;IAEnC,IAAW,SAAS,IAAI,OAAO,CAAkD;IACjF,IAAW,WAAW,IAAI,OAAO,CAA4B;IAC7D,IAAW,UAAU,IAAI,OAAO,CAA2B;gBACxB,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;CAKvD;AAED,gBAAgB;AAChB,oBAAY,aAAa,CAAC,CAAC,IAAI,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;AAC9D,gBAAgB;AAChB,oBAAY,iBAAiB,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,MAAM,CAAC;AAE3D;;;GAGG;AACH,qBAAa,eAAe,CAAC,CAAC,CAAE,YAAW,WAAW;IACpD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA4E;IAC5G,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA8D;IACtF,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAmB;IAC9C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAoB;IACnD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IAEvC;;;;;;;;OAQG;gBACgB,SAAS,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,iBAAiB,EAAE,YAAY,GAAE,MAAY,EAAE,YAAY,GAAE,MAAc;IAO1I,iCAAiC;IAC1B,OAAO,YAAa,GAAG,EAAE,KAAG,iBAAiB,CAAC,CAAC,CAyBpD;IAEF,mCAAmC;IAC5B,cAAc,YAAa,GAAG,EAAE,UAMrC;IAEF,8CAA8C;IACvC,UAAU,aAEf;IAEK,OAAO,aAKZ;CACH"}

package/lib/cjs/PromiseMemoizer.js

@@ -72,6 +72,9 @@ class PromiseMemoizer {
         this.deleteMemoized = (...args) => {
             const key = this._generateKeyFn(...args);
             this._cachedPromises.delete(key);
+            const timer = this._timers.get(key);
+            if (timer)
+                clearTimeout(timer);
         };
         /** Clear all entries in the memoizer cache */
         this.clearCache = () => {

package/lib/cjs/PromiseMemoizer.js.map

@@ -1 +1 @@
-{"version":3,"file":"PromiseMemoizer.js","sourceRoot":"","sources":["../../src/PromiseMemoizer.ts"],"names":[],"mappings":"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","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 Utils\r\n */\r\n\r\nimport { IDisposable, Logger } from \"@itwin/core-bentley\";\r\nimport { BackendLoggerCategory } from \"./BackendLoggerCategory\";\r\n\r\n/** Wrapper around a promise that allows synchronous queries of it's state\r\n * @internal\r\n */\r\nexport class QueryablePromise<T> {\r\n  public result?: T;\r\n  public error?: any;\r\n\r\n  private _fulfilled: boolean = false;\r\n  private _rejected: boolean = false;\r\n\r\n  public get isPending(): boolean { return !this.isFulfilled && !this.isRejected; }\r\n  public get isFulfilled(): boolean { return this._fulfilled; }\r\n  public get isRejected(): boolean { return this._rejected; }\r\n  public constructor(public readonly promise: Promise<T>) {\r\n    this.promise\r\n      .then((res: T) => { this.result = res; this._fulfilled = true; })\r\n      .catch((err: any) => { this.error = err; this._rejected = true; });\r\n  }\r\n}\r\n\r\n/** @internal */\r\nexport type MemoizeFnType<T> = (...args: any[]) => Promise<T>;\r\n/** @internal */\r\nexport type GenerateKeyFnType = (...args: any[]) => string;\r\n\r\n/** Utility to cache and retrieve results of long running asynchronous functions.\r\n * The cache is keyed on the input arguments passed to these functions\r\n * @internal\r\n */\r\nexport class PromiseMemoizer<T> implements IDisposable {\r\n  private readonly _cachedPromises: Map<string, QueryablePromise<T>> = new Map<string, QueryablePromise<T>>();\r\n  private readonly _timers: Map<string, NodeJS.Timer> = new Map<string, NodeJS.Timer>();\r\n  private readonly _memoizeFn: MemoizeFnType<T>;\r\n  private readonly _generateKeyFn: GenerateKeyFnType;\r\n  private readonly _maxCacheSize: number;\r\n  private readonly _cacheTimeout: number;\r\n\r\n  /**\r\n   * Constructor\r\n   * @param memoizeFn Function to memoize\r\n   * @param generateKeyFn Function to generate the key for the memoized function\r\n   * @param maxCacheSize Maximum size of the memoizer cache.\r\n   * If the maximum cache size is exceeded, fulfilled/rejected entries are first discarded - these\r\n   * may have been unclaimed/orphaned promises. If the cache size is still above the maxCacheSize\r\n   * threshold, the entire cache is then cleared.\r\n   */\r\n  public constructor(memoizeFn: MemoizeFnType<T>, generateKeyFn: GenerateKeyFnType, maxCacheSize: number = 500, cacheTimeout: number = 30000) {\r\n    this._memoizeFn = memoizeFn;\r\n    this._generateKeyFn = generateKeyFn;\r\n    this._maxCacheSize = maxCacheSize;\r\n    this._cacheTimeout = cacheTimeout;\r\n  }\r\n\r\n  /** Call the memoized function */\r\n  public memoize = (...args: any[]): QueryablePromise<T> => {\r\n    const key: string = this._generateKeyFn(...args);\r\n    let qp: QueryablePromise<T> | undefined = this._cachedPromises.get(key);\r\n    if (qp)\r\n      return qp;\r\n\r\n    if (this._cachedPromises.size >= this._maxCacheSize) {\r\n      if (this._maxCacheSize > 1)\r\n        Logger.logError(BackendLoggerCategory.PromiseMemoizer, \"Cleared too many unresolved entries in memoizer cache\");\r\n      this.clearCache();\r\n    }\r\n\r\n    const removeCachedPromise = (v: T) => {\r\n      const cleanUp = () => {\r\n        this._cachedPromises.delete(key);\r\n        this._timers.delete(key);\r\n      };\r\n      this._timers.set(key, setTimeout(cleanUp, this._cacheTimeout));\r\n      return v;\r\n    };\r\n\r\n    const p = this._memoizeFn(...args).then(removeCachedPromise, (e) => { throw removeCachedPromise(e); });\r\n    qp = new QueryablePromise<T>(p);\r\n    this._cachedPromises.set(key, qp);\r\n    return qp;\r\n  };\r\n\r\n  /** Delete the memoized function */\r\n  public deleteMemoized = (...args: any[]) => {\r\n    const key: string = this._generateKeyFn(...args);\r\n    this._cachedPromises.delete(key);\r\n  };\r\n\r\n  /** Clear all entries in the memoizer cache */\r\n  public clearCache = () => {\r\n    this._cachedPromises.clear();\r\n  };\r\n\r\n  public dispose = () => {\r\n    for (const timer of this._timers.values())\r\n      clearTimeout(timer);\r\n    this._timers.clear();\r\n    this.clearCache();\r\n  };\r\n}\r\n"]}
+{"version":3,"file":"PromiseMemoizer.js","sourceRoot":"","sources":["../../src/PromiseMemoizer.ts"],"names":[],"mappings":"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","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 Utils\r\n */\r\n\r\nimport { IDisposable, Logger } from \"@itwin/core-bentley\";\r\nimport { BackendLoggerCategory } from \"./BackendLoggerCategory\";\r\n\r\n/** Wrapper around a promise that allows synchronous queries of it's state\r\n * @internal\r\n */\r\nexport class QueryablePromise<T> {\r\n  public result?: T;\r\n  public error?: any;\r\n\r\n  private _fulfilled: boolean = false;\r\n  private _rejected: boolean = false;\r\n\r\n  public get isPending(): boolean { return !this.isFulfilled && !this.isRejected; }\r\n  public get isFulfilled(): boolean { return this._fulfilled; }\r\n  public get isRejected(): boolean { return this._rejected; }\r\n  public constructor(public readonly promise: Promise<T>) {\r\n    this.promise\r\n      .then((res: T) => { this.result = res; this._fulfilled = true; })\r\n      .catch((err: any) => { this.error = err; this._rejected = true; });\r\n  }\r\n}\r\n\r\n/** @internal */\r\nexport type MemoizeFnType<T> = (...args: any[]) => Promise<T>;\r\n/** @internal */\r\nexport type GenerateKeyFnType = (...args: any[]) => string;\r\n\r\n/** Utility to cache and retrieve results of long running asynchronous functions.\r\n * The cache is keyed on the input arguments passed to these functions\r\n * @internal\r\n */\r\nexport class PromiseMemoizer<T> implements IDisposable {\r\n  private readonly _cachedPromises: Map<string, QueryablePromise<T>> = new Map<string, QueryablePromise<T>>();\r\n  private readonly _timers: Map<string, NodeJS.Timer> = new Map<string, NodeJS.Timer>();\r\n  private readonly _memoizeFn: MemoizeFnType<T>;\r\n  private readonly _generateKeyFn: GenerateKeyFnType;\r\n  private readonly _maxCacheSize: number;\r\n  private readonly _cacheTimeout: number;\r\n\r\n  /**\r\n   * Constructor\r\n   * @param memoizeFn Function to memoize\r\n   * @param generateKeyFn Function to generate the key for the memoized function\r\n   * @param maxCacheSize Maximum size of the memoizer cache.\r\n   * If the maximum cache size is exceeded, fulfilled/rejected entries are first discarded - these\r\n   * may have been unclaimed/orphaned promises. If the cache size is still above the maxCacheSize\r\n   * threshold, the entire cache is then cleared.\r\n   */\r\n  public constructor(memoizeFn: MemoizeFnType<T>, generateKeyFn: GenerateKeyFnType, maxCacheSize: number = 500, cacheTimeout: number = 30000) {\r\n    this._memoizeFn = memoizeFn;\r\n    this._generateKeyFn = generateKeyFn;\r\n    this._maxCacheSize = maxCacheSize;\r\n    this._cacheTimeout = cacheTimeout;\r\n  }\r\n\r\n  /** Call the memoized function */\r\n  public memoize = (...args: any[]): QueryablePromise<T> => {\r\n    const key: string = this._generateKeyFn(...args);\r\n    let qp: QueryablePromise<T> | undefined = this._cachedPromises.get(key);\r\n    if (qp)\r\n      return qp;\r\n\r\n    if (this._cachedPromises.size >= this._maxCacheSize) {\r\n      if (this._maxCacheSize > 1)\r\n        Logger.logError(BackendLoggerCategory.PromiseMemoizer, \"Cleared too many unresolved entries in memoizer cache\");\r\n      this.clearCache();\r\n    }\r\n\r\n    const removeCachedPromise = (v: T) => {\r\n      const cleanUp = () => {\r\n        this._cachedPromises.delete(key);\r\n        this._timers.delete(key);\r\n      };\r\n      this._timers.set(key, setTimeout(cleanUp, this._cacheTimeout));\r\n      return v;\r\n    };\r\n\r\n    const p = this._memoizeFn(...args).then(removeCachedPromise, (e) => { throw removeCachedPromise(e); });\r\n    qp = new QueryablePromise<T>(p);\r\n    this._cachedPromises.set(key, qp);\r\n    return qp;\r\n  };\r\n\r\n  /** Delete the memoized function */\r\n  public deleteMemoized = (...args: any[]) => {\r\n    const key: string = this._generateKeyFn(...args);\r\n    this._cachedPromises.delete(key);\r\n    const timer = this._timers.get(key);\r\n    if (timer)\r\n      clearTimeout(timer);\r\n  };\r\n\r\n  /** Clear all entries in the memoizer cache */\r\n  public clearCache = () => {\r\n    this._cachedPromises.clear();\r\n  };\r\n\r\n  public dispose = () => {\r\n    for (const timer of this._timers.values())\r\n      clearTimeout(timer);\r\n    this._timers.clear();\r\n    this.clearCache();\r\n  };\r\n}\r\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itwin/core-backend",
-  "version": "3.1.0-dev.26",
+  "version": "3.1.0-dev.31",
   "description": "iTwin.js backend components",
   "main": "lib/cjs/core-backend.js",
   "typings": "lib/cjs/core-backend",
@@ -24,22 +24,27 @@
     "url": "http://www.bentley.com"
   },
   "peerDependencies": {
-    "@itwin/core-bentley": "^3.1.0-dev.26",
-    "@itwin/core-common": "^3.1.0-dev.26",
-    "@itwin/core-geometry": "^3.1.0-dev.26",
-    "@itwin/ecschema-metadata": "^3.1.0-dev.26"
+    "@itwin/core-bentley": "^3.1.0-dev.31",
+    "@itwin/core-common": "^3.1.0-dev.31",
+    "@itwin/core-geometry": "^3.1.0-dev.31",
+    "@itwin/ecschema-metadata": "^3.1.0-dev.31"
+  },
+  "peerDependenciesMeta": {
+    "@itwin/ecschema-metadata": {
+      "optional": true
+    }
   },
   "//devDependencies": [
     "NOTE: All peerDependencies should also be listed as devDependencies since peerDependencies are not considered by npm install",
     "NOTE: All tools used by scripts in this package must be listed as devDependencies"
   ],
   "devDependencies": {
-    "@itwin/build-tools": "3.1.0-dev.26",
-    "@itwin/core-bentley": "3.1.0-dev.26",
-    "@itwin/core-common": "3.1.0-dev.26",
-    "@itwin/core-geometry": "3.1.0-dev.26",
-    "@itwin/ecschema-metadata": "3.1.0-dev.26",
-    "@itwin/eslint-plugin": "3.1.0-dev.26",
+    "@itwin/build-tools": "3.1.0-dev.31",
+    "@itwin/core-bentley": "3.1.0-dev.31",
+    "@itwin/core-common": "3.1.0-dev.31",
+    "@itwin/core-geometry": "3.1.0-dev.31",
+    "@itwin/ecschema-metadata": "3.1.0-dev.31",
+    "@itwin/eslint-plugin": "3.1.0-dev.31",
     "@types/chai": "^4.1.4",
     "@types/chai-as-promised": "^7",
     "@types/fs-extra": "^4.0.7",
@@ -64,8 +69,8 @@
   },
   "dependencies": {
     "@azure/storage-blob": "^12.7.0",
-    "@bentley/imodeljs-native": "3.1.1",
-    "@itwin/core-telemetry": "3.1.0-dev.26",
+    "@bentley/imodeljs-native": "3.1.5",
+    "@itwin/core-telemetry": "3.1.0-dev.31",
     "form-data": "^2.3.2",
     "fs-extra": "^8.1.0",
     "json5": "^2.2.0",