@itwin/ecschema-metadata 4.7.0-dev.9 → 4.7.1

package/CHANGELOG.md

@@ -1,6 +1,26 @@
 # Change Log - @itwin/ecschema-metadata
 
-This log was last generated on Wed, 15 May 2024 21:32:22 GMT and should not be manually modified.
+This log was last generated on Thu, 13 Jun 2024 22:47:32 GMT and should not be manually modified.
+
+## 4.7.1
+Thu, 13 Jun 2024 22:47:32 GMT
+
+_Version update only_
+
+## 4.7.0
+Wed, 12 Jun 2024 18:02:16 GMT
+
+_Version update only_
+
+## 4.6.2
+Sat, 08 Jun 2024 00:50:25 GMT
+
+_Version update only_
+
+## 4.6.1
+Wed, 29 May 2024 14:35:17 GMT
+
+_Version update only_
 
 ## 4.6.0
 Mon, 13 May 2024 20:32:51 GMT

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

@@ -1 +1 @@
-{"version":3,"file":"SchemaJsonLocater.d.ts","sourceRoot":"","sources":["../../src/SchemaJsonLocater.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC;;;;GAIG;AACH,MAAM,MAAM,iBAAiB,GAAG,CAAC,UAAU,EAAE,MAAM,KAAK,WAAW,GAAG,SAAS,CAAC;AAEhF;;;;GAIG;AACH,qBAAa,iBAAkB,YAAW,cAAc;IACnC,OAAO,CAAC,UAAU;gBAAV,UAAU,EAAE,iBAAiB;IAExD;;;;;OAKG;IACU,SAAS,CAAC,CAAC,SAAS,MAAM,EAAE,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC,EAAE,SAAS,EAAE,eAAe,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAIpJ;;;;OAIG;IACU,aAAa,CAAC,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC,EAAE,SAAS,EAAE,eAAe,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IAI/I;;;;;OAKG;IACI,aAAa,CAAC,CAAC,SAAS,MAAM,EAAE,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC,EAAE,UAAU,EAAE,eAAe,EAAE,OAAO,EAAE,aAAa,GAAG,CAAC,GAAG,SAAS;CAS3I"}
+{"version":3,"file":"SchemaJsonLocater.d.ts","sourceRoot":"","sources":["../../src/SchemaJsonLocater.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC;;;;GAIG;AACH,MAAM,MAAM,iBAAiB,GAAG,CAAC,UAAU,EAAE,MAAM,KAAK,WAAW,GAAG,SAAS,CAAC;AAEhF;;;;GAIG;AACH,qBAAa,iBAAkB,YAAW,cAAc;IACnC,OAAO,CAAC,UAAU;gBAAV,UAAU,EAAE,iBAAiB;IAExD;;;;;OAKG;IACU,SAAS,CAAC,CAAC,SAAS,MAAM,EAAE,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC,EAAE,SAAS,EAAE,eAAe,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAKpJ;;;;OAIG;IACU,aAAa,CAAC,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC,EAAE,SAAS,EAAE,eAAe,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IAY/I;;;;;OAKG;IACI,aAAa,CAAC,CAAC,SAAS,MAAM,EAAE,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC,EAAE,UAAU,EAAE,eAAe,EAAE,OAAO,EAAE,aAAa,GAAG,CAAC,GAAG,SAAS;CAS3I"}

package/lib/cjs/SchemaJsonLocater.js

@@ -23,7 +23,8 @@ class SchemaJsonLocater {
      * @throws [ECObjectsError]($ecschema-metadata) if the schema exists, but cannot be loaded.
      */
     async getSchema(schemaKey, matchType, context) {
-        return this.getSchemaSync(schemaKey, matchType, context);
+        await this.getSchemaInfo(schemaKey, matchType, context);
+        return await context.getCachedSchema(schemaKey, matchType);
     }
     /**
      * Gets the schema info which matches the provided SchemaKey.  The schema info may be returned before the schema is fully loaded.
@@ -31,7 +32,13 @@ class SchemaJsonLocater {
      * @param matchType The match type to use when locating the schema
      */
     async getSchemaInfo(schemaKey, matchType, context) {
-        return this.getSchema(schemaKey, matchType, context);
+        const schemaProps = this._getSchema(schemaKey.name);
+        if (!schemaProps)
+            return undefined;
+        const schemaInfo = await Schema_1.Schema.startLoadingFromJson(schemaProps, context);
+        if (schemaInfo !== undefined && schemaInfo.schemaKey.matches(schemaKey, matchType))
+            return schemaInfo;
+        return undefined;
     }
     /** Get a schema by [SchemaKey] synchronously.
      * @param schemaKey The [SchemaKey] that identifies the schema.

package/lib/cjs/SchemaJsonLocater.js.map

@@ -1 +1 @@
-{"version":3,"file":"SchemaJsonLocater.js","sourceRoot":"","sources":["../../src/SchemaJsonLocater.ts"],"names":[],"mappings":";AAAA;;;+FAG+F;;;AAE/F,uCAA0D;AAI1D,8CAA2C;AAU3C;;;;GAIG;AACH,MAAa,iBAAiB;IAC5B,YAA2B,UAA6B;QAA7B,eAAU,GAAV,UAAU,CAAmB;IAAI,CAAC;IAE7D;;;;;OAKG;IACI,KAAK,CAAC,SAAS,CAAmB,SAA8B,EAAE,SAA0B,EAAE,OAAsB;QACzH,OAAO,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,CAAM,CAAC;IAChE,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,aAAa,CAAC,SAA8B,EAAE,SAA0B,EAAE,OAAsB;QAC3G,OAAO,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;IACvD,CAAC;IAED;;;;;OAKG;IACI,aAAa,CAAmB,SAA8B,EAAE,UAA2B,EAAE,OAAsB;QACxH,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACpD,IAAI,CAAC,WAAW;YACd,OAAO,SAAS,CAAC;QAEnB,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,uBAAa,EAAE,CAAC;QAClD,OAAO,eAAM,CAAC,YAAY,CAAC,WAAW,EAAE,OAAO,CAAM,CAAC;IACxD,CAAC;CAEF;AArCD,8CAqCC","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 { ISchemaLocater, SchemaContext } from \"./Context\";\r\nimport { SchemaProps } from \"./Deserialization/JsonProps\";\r\nimport { SchemaMatchType } from \"./ECObjects\";\r\nimport { SchemaInfo } from \"./Interfaces\";\r\nimport { Schema } from \"./Metadata/Schema\";\r\nimport { SchemaKey } from \"./SchemaKey\";\r\n\r\n/**\r\n * Gets the full schema Json for the input schema name or undefined if not found\r\n * @throws [Error] if the schema is found but json cannot be returned\r\n * @beta\r\n */\r\nexport type SchemaPropsGetter = (schemaName: string) => SchemaProps | undefined;\r\n\r\n/**\r\n * A  ISchemaLocater implementation for locating and retrieving EC Schema objects using a function\r\n * that returns the Schema Json for a given schema name\r\n * @beta\r\n */\r\nexport class SchemaJsonLocater implements ISchemaLocater {\r\n  public constructor(private _getSchema: SchemaPropsGetter) { }\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 [ECObjectsError]($ecschema-metadata) if the schema exists, but cannot be loaded.\r\n   */\r\n  public async getSchema<T extends Schema>(schemaKey: Readonly<SchemaKey>, matchType: SchemaMatchType, context: SchemaContext): Promise<T | undefined> {\r\n    return this.getSchemaSync(schemaKey, matchType, context) as T;\r\n  }\r\n\r\n  /**\r\n   * Gets the schema info which matches the provided SchemaKey.  The schema info may be returned before the schema is fully loaded.\r\n   * @param schemaKey The SchemaKey describing the schema to get from the cache.\r\n   * @param matchType The match type to use when locating the schema\r\n   */\r\n  public async getSchemaInfo(schemaKey: Readonly<SchemaKey>, matchType: SchemaMatchType, context: SchemaContext): Promise<SchemaInfo | undefined> {\r\n    return this.getSchema(schemaKey, matchType, context);\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 [Error]($ecschema-metadata) if the schema exists, but cannot be loaded.\r\n   */\r\n  public getSchemaSync<T extends Schema>(schemaKey: Readonly<SchemaKey>, _matchType: SchemaMatchType, context: SchemaContext): T | undefined {\r\n    const schemaProps = this._getSchema(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}\r\n"]}
+{"version":3,"file":"SchemaJsonLocater.js","sourceRoot":"","sources":["../../src/SchemaJsonLocater.ts"],"names":[],"mappings":";AAAA;;;+FAG+F;;;AAE/F,uCAA0D;AAI1D,8CAA2C;AAU3C;;;;GAIG;AACH,MAAa,iBAAiB;IAC5B,YAA2B,UAA6B;QAA7B,eAAU,GAAV,UAAU,CAAmB;IAAI,CAAC;IAE7D;;;;;OAKG;IACI,KAAK,CAAC,SAAS,CAAmB,SAA8B,EAAE,SAA0B,EAAE,OAAsB;QACzH,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;QACxD,OAAO,MAAM,OAAO,CAAC,eAAe,CAAC,SAAS,EAAE,SAAS,CAAM,CAAC;IAClE,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,aAAa,CAAC,SAA8B,EAAE,SAA0B,EAAE,OAAsB;QAC3G,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACpD,IAAI,CAAC,WAAW;YACd,OAAO,SAAS,CAAC;QAEnB,MAAM,UAAU,GAAG,MAAM,eAAM,CAAC,oBAAoB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAC3E,IAAI,UAAU,KAAK,SAAS,IAAI,UAAU,CAAC,SAAS,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;YAChF,OAAO,UAAU,CAAC;QAEpB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED;;;;;OAKG;IACI,aAAa,CAAmB,SAA8B,EAAE,UAA2B,EAAE,OAAsB;QACxH,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACpD,IAAI,CAAC,WAAW;YACd,OAAO,SAAS,CAAC;QAEnB,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,uBAAa,EAAE,CAAC;QAClD,OAAO,eAAM,CAAC,YAAY,CAAC,WAAW,EAAE,OAAO,CAAM,CAAC;IACxD,CAAC;CAEF;AA9CD,8CA8CC","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 { ISchemaLocater, SchemaContext } from \"./Context\";\r\nimport { SchemaProps } from \"./Deserialization/JsonProps\";\r\nimport { SchemaMatchType } from \"./ECObjects\";\r\nimport { SchemaInfo } from \"./Interfaces\";\r\nimport { Schema } from \"./Metadata/Schema\";\r\nimport { SchemaKey } from \"./SchemaKey\";\r\n\r\n/**\r\n * Gets the full schema Json for the input schema name or undefined if not found\r\n * @throws [Error] if the schema is found but json cannot be returned\r\n * @beta\r\n */\r\nexport type SchemaPropsGetter = (schemaName: string) => SchemaProps | undefined;\r\n\r\n/**\r\n * A  ISchemaLocater implementation for locating and retrieving EC Schema objects using a function\r\n * that returns the Schema Json for a given schema name\r\n * @beta\r\n */\r\nexport class SchemaJsonLocater implements ISchemaLocater {\r\n  public constructor(private _getSchema: SchemaPropsGetter) { }\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 [ECObjectsError]($ecschema-metadata) if the schema exists, but cannot be loaded.\r\n   */\r\n  public async getSchema<T extends Schema>(schemaKey: Readonly<SchemaKey>, matchType: SchemaMatchType, context: SchemaContext): Promise<T | undefined> {\r\n    await this.getSchemaInfo(schemaKey, matchType, context);\r\n    return await context.getCachedSchema(schemaKey, matchType) as T;\r\n  }\r\n\r\n  /**\r\n   * Gets the schema info which matches the provided SchemaKey.  The schema info may be returned before the schema is fully loaded.\r\n   * @param schemaKey The SchemaKey describing the schema to get from the cache.\r\n   * @param matchType The match type to use when locating the schema\r\n   */\r\n  public async getSchemaInfo(schemaKey: Readonly<SchemaKey>, matchType: SchemaMatchType, context: SchemaContext): Promise<SchemaInfo | undefined> {\r\n    const schemaProps = this._getSchema(schemaKey.name);\r\n    if (!schemaProps)\r\n      return undefined;\r\n\r\n    const schemaInfo = await Schema.startLoadingFromJson(schemaProps, context);\r\n    if (schemaInfo !== undefined && schemaInfo.schemaKey.matches(schemaKey, matchType))\r\n      return schemaInfo;\r\n\r\n    return undefined;\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 [Error]($ecschema-metadata) if the schema exists, but cannot be loaded.\r\n   */\r\n  public getSchemaSync<T extends Schema>(schemaKey: Readonly<SchemaKey>, _matchType: SchemaMatchType, context: SchemaContext): T | undefined {\r\n    const schemaProps = this._getSchema(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}\r\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itwin/ecschema-metadata",
-  "version": "4.7.0-dev.9",
+  "version": "4.7.1",
   "description": "ECObjects core concepts in typescript",
   "license": "MIT",
   "main": "lib/cjs/ecschema-metadata.js",
@@ -42,13 +42,13 @@
     "rimraf": "^3.0.2",
     "sinon": "^17.0.1",
     "typescript": "~5.3.3",
-    "@itwin/build-tools": "4.7.0-dev.9",
-    "@itwin/core-bentley": "4.7.0-dev.9",
-    "@itwin/core-quantity": "4.7.0-dev.9"
+    "@itwin/build-tools": "4.7.1",
+    "@itwin/core-bentley": "4.7.1",
+    "@itwin/core-quantity": "4.7.1"
   },
   "peerDependencies": {
-    "@itwin/core-bentley": "^4.7.0-dev.9",
-    "@itwin/core-quantity": "^4.7.0-dev.9"
+    "@itwin/core-bentley": "^4.7.1",
+    "@itwin/core-quantity": "^4.7.1"
   },
   "dependencies": {
     "almost-equal": "^1.1.0"