@itwin/ecschema-metadata 5.0.0-dev.9 → 5.0.0-dev.92

package/lib/esm/Metadata/Class.d.ts

@@ -2,7 +2,7 @@
  * @module Metadata
  */
 import { ClassProps } from "../Deserialization/JsonProps";
-import { ECClassModifier, PrimitiveType, SchemaItemType } from "../ECObjects";
+import { ECClassModifier, PrimitiveType, SchemaItemType, SupportedSchemaItemType } from "../ECObjects";
 import { AnyClass, LazyLoadedECClass } from "../Interfaces";
 import { CustomAttribute, CustomAttributeContainerProps, CustomAttributeSet } from "./CustomAttribute";
 import { Enumeration } from "./Enumeration";
@@ -14,17 +14,29 @@ import { SchemaItem } from "./SchemaItem";
  * @beta
  */
 export declare abstract class ECClass extends SchemaItem implements CustomAttributeContainerProps {
+    static get schemaItemType(): SupportedSchemaItemType;
     protected _modifier: ECClassModifier;
     protected _baseClass?: LazyLoadedECClass;
+    protected _derivedClasses?: Map<string, LazyLoadedECClass>;
     protected _properties?: Map<string, Property>;
     private _customAttributes?;
     private _mergedPropertyCache?;
     get modifier(): ECClassModifier;
-    get baseClass(): LazyLoadedECClass | undefined;
-    set baseClass(baseClass: LazyLoadedECClass | undefined);
-    get properties(): IterableIterator<Property> | undefined;
     get customAttributes(): CustomAttributeSet | undefined;
     constructor(schema: Schema, name: string, modifier?: ECClassModifier);
+    /**
+     * Gets the base class if it exists, otherwise returns undefined.
+     */
+    get baseClass(): LazyLoadedECClass | undefined;
+    /**
+     * Sets the base class of the ECClass. Pass undefined to 'remove' the base class.
+     */
+    protected setBaseClass(baseClass: LazyLoadedECClass | undefined): Promise<void>;
+    /**
+     * Gets the derived classes belonging to this class.
+     * @returns An array of ECClasses or undefined if no derived classes exist.
+     */
+    getDerivedClasses(): Promise<ECClass[] | undefined>;
     /**
      * Convenience method for adding an already loaded ECProperty used by create*Property methods.
      * @param prop The property to add.
@@ -137,23 +149,35 @@ export declare abstract class ECClass extends SchemaItem implements CustomAttrib
      * Iterates (recursively) over all base classes and mixins, in "property override" order.
      * This is essentially a depth-first traversal through the inheritance tree.
      */
-    getAllBaseClasses(): AsyncIterableIterator<ECClass>;
+    getAllBaseClasses(): AsyncIterable<ECClass>;
     getAllBaseClassesSync(): Iterable<AnyClass>;
-    protected static mergeProperties(target: Property[], existingValues: Map<string, number>, propertiesToMerge: Property[], overwriteExisting: boolean): void;
-    protected buildPropertyCache(result: Property[], existingValues?: Map<string, number>, resetBaseCaches?: boolean): Promise<void>;
-    protected buildPropertyCacheSync(result: Property[], existingValues?: Map<string, number>, resetBaseCaches?: boolean): void;
+    protected static mergeProperties(target: Property[], existingValues: Map<string, number>, propertiesToMerge: Iterable<Property>, overwriteExisting: boolean): void;
+    protected buildPropertyCache(result: Property[], existingValues?: Map<string, number>): Promise<void>;
+    protected buildPropertyCacheSync(result: Property[], existingValues?: Map<string, number>): void;
     /**
-     * Iterates all properties, including the ones merged from base classes and mixins. To obtain only local properties, use the 'properties' field.
+     * Clears all caches on this object. This is called implicitly for this class,
+     * but needs to be called if derived classes have changed.
+     * @internal
+     */
+    cleanCache(): void;
+    /**
+     * Returns the properties on this class and its base classes.
      * Since this is an expensive operation, results will be cached after first call.
-     * @param resetCache if true, any previously cached results will be dropped and cache will be rebuilt
+     * @param excludeInherited If true, only properties defined directly on this class will be returned. Defaults to false.
+     * @returns An array of properties, empty array if none exist.
      */
-    getPropertiesSync(resetCache?: boolean): Property[];
+    getPropertiesSync(excludeInherited?: boolean): Iterable<Property>;
     /**
-     * Iterates all properties, including the ones merged from base classes and mixins. To obtain only local properties, use the 'properties' field.
+     * Quick way to check whether this class has any local properties without having to use the iterable
+     */
+    get hasLocalProperties(): boolean;
+    /**
+     * Returns the properties on this class and its base classes.
      * Since this is an expensive operation, results will be cached after first call.
-     * @param resetCache if true, any previously cached results will be dropped and cache will be rebuilt
+     * @param excludeInherited If true, only properties defined directly on this class will be returned.
+     * @returns An array of properties, empty array if none exist.
      */
-    getProperties(resetCache?: boolean): Promise<Property[]>;
+    getProperties(excludeInherited?: boolean): Promise<Iterable<Property>>;
     /**
      * Retrieve all custom attributes in the current class and its bases
      * This is the async version of getCustomAttributesSync()
@@ -199,14 +223,48 @@ export declare abstract class ECClass extends SchemaItem implements CustomAttrib
      * @param modifier
      */
     protected setModifier(modifier: ECClassModifier): void;
+    /**
+     * Adds an ECClass to the derived class collection. This method is only intended to update the local
+     * cache of derived classes. For adding a class to the hierarchy, use the baseClass setter method.
+     * @param prop The property to add.
+     * @return The property that was added.
+     */
+    private addDerivedClass;
+    /**
+     * Removes an ECClass from the derived class collection. This method is only intended to update the local
+     * cache of derived classes. For updating the class hierarchy, use the baseClass setter method.
+     * @param prop The property to add.
+     * @return The property that was added.
+     */
+    private removeDerivedClass;
 }
 /**
  * A Typescript class representation of an ECStructClass.
  * @beta
  */
 export declare class StructClass extends ECClass {
-    readonly schemaItemType: SchemaItemType.StructClass;
-    constructor(schema: Schema, name: string, modifier?: ECClassModifier);
+    /**
+     * Get the type of item represented by this instance
+     * @beta
+     */
+    readonly schemaItemType: SchemaItemType;
+    /**
+     * Get the type of item represented by this class
+     * @beta
+     */
+    static get schemaItemType(): SchemaItemType;
+    /**
+     * Type guard to check if the SchemaItem is of type StructClass.
+     * @param item The SchemaItem to check.
+     * @returns True if the item is a StructClass, false otherwise.
+     */
+    static isStructClass(item?: SchemaItem): item is StructClass;
+    /**
+     * Type assertion to check if the SchemaItem is of type StructClass.
+     * @param item The SchemaItem to check.
+     * @returns The item cast to StructClass if it is a StructClass, undefined otherwise.
+     */
+    static assertIsStructClass(item?: SchemaItem): asserts item is StructClass;
 }
 /**
  * @internal
@@ -220,6 +278,7 @@ export declare abstract class MutableStructClass extends StructClass {
  * @internal
  */
 export declare abstract class MutableClass extends ECClass {
+    abstract setBaseClass(baseClass: LazyLoadedECClass | undefined): Promise<void>;
     abstract addCustomAttribute(customAttribute: CustomAttribute): void;
     abstract setModifier(modifier: ECClassModifier): void;
     abstract setName(name: string): void;

package/lib/esm/Metadata/Class.d.ts.map

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

package/lib/esm/Metadata/Class.js

@@ -8,10 +8,11 @@
 import { assert } from "@itwin/core-bentley";
 import { DelayedPromiseWithProps } from "../DelayedPromise";
 import { XmlSerializationUtils } from "../Deserialization/XmlSerializationUtils";
-import { classModifierToString, ECClassModifier, parseClassModifier, parsePrimitiveType, PrimitiveType, SchemaItemType } from "../ECObjects";
+import { AbstractSchemaItemType, classModifierToString, ECClassModifier, parseClassModifier, parsePrimitiveType, PrimitiveType, SchemaItemType } from "../ECObjects";
 import { ECObjectsError, ECObjectsStatus } from "../Exception";
 import { SchemaItemKey, SchemaKey } from "../SchemaKey";
 import { serializeCustomAttributes } from "./CustomAttribute";
+import { Enumeration } from "./Enumeration";
 import { EnumerationArrayProperty, EnumerationProperty, PrimitiveArrayProperty, PrimitiveProperty, StructArrayProperty, StructProperty, } from "./Property";
 import { SchemaItem } from "./SchemaItem";
 import { SchemaReadHelper } from "../Deserialization/Helper";
@@ -20,10 +21,14 @@ import { SchemaReadHelper } from "../Deserialization/Helper";
  * @beta
  */
 export class ECClass extends SchemaItem {
+    static get schemaItemType() { return AbstractSchemaItemType.Class; } // need this so getItem("name", ECClass) in schema works
+    _modifier;
+    _baseClass;
+    _derivedClasses;
+    _properties;
+    _customAttributes;
+    _mergedPropertyCache;
     get modifier() { return this._modifier; }
-    get baseClass() { return this._baseClass; }
-    set baseClass(baseClass) { this._baseClass = baseClass; }
-    get properties() { return this._properties?.values(); }
     get customAttributes() { return this._customAttributes; }
     constructor(schema, name, modifier) {
         super(schema, name);
@@ -32,6 +37,32 @@ export class ECClass extends SchemaItem {
         else
             this._modifier = ECClassModifier.None;
     }
+    /**
+     * Gets the base class if it exists, otherwise returns undefined.
+     */
+    get baseClass() {
+        return this._baseClass;
+    }
+    /**
+     * Sets the base class of the ECClass. Pass undefined to 'remove' the base class.
+     */
+    async setBaseClass(baseClass) {
+        const oldBaseClass = this._baseClass;
+        this._baseClass = baseClass;
+        if (baseClass)
+            this.addDerivedClass(await baseClass, this);
+        else if (oldBaseClass)
+            this.removeDerivedClass(await oldBaseClass, this);
+    }
+    /**
+     * Gets the derived classes belonging to this class.
+     * @returns An array of ECClasses or undefined if no derived classes exist.
+     */
+    async getDerivedClasses() {
+        if (!this._derivedClasses || this._derivedClasses.size === 0)
+            return undefined;
+        return Array.from(await Promise.all(this._derivedClasses.values()));
+    }
     /**
      * Convenience method for adding an already loaded ECProperty used by create*Property methods.
      * @param prop The property to add.
@@ -41,6 +72,7 @@ export class ECClass extends SchemaItem {
         if (!this._properties)
             this._properties = new Map();
         this._properties.set(prop.name.toUpperCase(), prop);
+        this.cleanCache();
         return prop;
     }
     /**
@@ -51,8 +83,10 @@ export class ECClass extends SchemaItem {
     async deleteProperty(name) {
         if (this._properties) {
             const property = await this.getProperty(name);
-            if (property)
+            if (property) {
                 this._properties.delete(name.toUpperCase());
+                this.cleanCache();
+            }
         }
     }
     /**
@@ -63,15 +97,17 @@ export class ECClass extends SchemaItem {
     deletePropertySync(name) {
         if (this._properties) {
             const property = this.getPropertySync(name);
-            if (property)
+            if (property) {
                 this._properties.delete(name.toUpperCase());
+                this.cleanCache();
+            }
         }
     }
     getBaseClassSync() {
         if (!this.baseClass) {
             return undefined;
         }
-        return this.schema.lookupItemSync(this.baseClass);
+        return this.schema.lookupItemSync(this.baseClass, ECClass);
     }
     /**
      * Searches, case-insensitive, for a local ECProperty with the name provided.
@@ -201,7 +237,7 @@ export class ECClass extends SchemaItem {
     async loadStructType(structType, schema) {
         let correctType;
         if (typeof (structType) === "string") {
-            correctType = await schema.lookupItem(structType);
+            correctType = await schema.lookupItem(structType, StructClass);
         }
         else
             correctType = structType;
@@ -212,7 +248,7 @@ export class ECClass extends SchemaItem {
     loadStructTypeSync(structType, schema) {
         let correctType;
         if (typeof (structType) === "string") {
-            correctType = schema.lookupItemSync(structType);
+            correctType = schema.lookupItemSync(structType, StructClass);
         }
         else
             correctType = structType;
@@ -226,7 +262,7 @@ export class ECClass extends SchemaItem {
         if (typeof (primitiveType) === "string") {
             let resolvedType = parsePrimitiveType(primitiveType);
             if (!resolvedType) {
-                resolvedType = await schema.lookupItem(primitiveType);
+                resolvedType = await schema.lookupItem(primitiveType, Enumeration);
             }
             if (resolvedType === undefined)
                 throw new ECObjectsError(ECObjectsStatus.InvalidType, `The provided primitive type, ${primitiveType}, is not a valid PrimitiveType or Enumeration.`);
@@ -243,7 +279,7 @@ export class ECClass extends SchemaItem {
         if (typeof (primitiveType) === "string") {
             let resolvedType = parsePrimitiveType(primitiveType);
             if (!resolvedType) {
-                resolvedType = schema.lookupItemSync(primitiveType);
+                resolvedType = schema.lookupItemSync(primitiveType, Enumeration);
             }
             if (resolvedType === undefined)
                 throw new ECObjectsError(ECObjectsStatus.InvalidType, `The provided primitive type, ${primitiveType}, is not a valid PrimitiveType or Enumeration.`);
@@ -265,7 +301,7 @@ export class ECClass extends SchemaItem {
         if (this.baseClass !== undefined)
             schemaJson.baseClass = this.baseClass.fullName;
         if (this._properties !== undefined && this._properties.size > 0)
-            schemaJson.properties = [...this.properties].map((prop) => prop.toJSON());
+            schemaJson.properties = [...this._properties.values()].map((prop) => prop.toJSON());
         const customAttributes = serializeCustomAttributes(this.customAttributes);
         if (customAttributes !== undefined)
             schemaJson.customAttributes = customAttributes;
@@ -283,8 +319,8 @@ export class ECClass extends SchemaItem {
             baseClassElement.textContent = baseClassName;
             itemElement.appendChild(baseClassElement);
         }
-        if (undefined !== this.properties) {
-            for (const prop of this.properties) {
+        if (undefined !== this._properties) {
+            for (const prop of this._properties.values()) {
                 const propXml = await prop.toXml(schemaXml);
                 itemElement.appendChild(propXml);
             }
@@ -317,12 +353,25 @@ export class ECClass extends SchemaItem {
             const ecClassSchemaItemKey = this.schema.getSchemaItemKey(classProps.baseClass);
             if (!ecClassSchemaItemKey)
                 throw new ECObjectsError(ECObjectsStatus.InvalidECJson, `Unable to locate the baseClass ${classProps.baseClass}.`);
-            this._baseClass = new DelayedPromiseWithProps(ecClassSchemaItemKey, async () => {
-                const baseClass = await this.schema.lookupItem(ecClassSchemaItemKey);
-                if (undefined === baseClass)
-                    throw new ECObjectsError(ECObjectsStatus.InvalidECJson, `Unable to locate the baseClass ${classProps.baseClass}.`);
-                return baseClass;
-            });
+            const baseClass = this.schema.lookupItemSync(ecClassSchemaItemKey);
+            let lazyBase;
+            if (!baseClass) {
+                lazyBase = new DelayedPromiseWithProps(ecClassSchemaItemKey, async () => {
+                    const baseItem = await this.schema.lookupItem(ecClassSchemaItemKey);
+                    if (undefined === baseItem || !ECClass.isECClass(baseItem))
+                        throw new ECObjectsError(ECObjectsStatus.InvalidECJson, `Unable to locate the baseClass ${classProps.baseClass}.`);
+                    return baseItem;
+                });
+            }
+            else {
+                lazyBase = new DelayedPromiseWithProps(ecClassSchemaItemKey, async () => {
+                    return baseClass;
+                });
+            }
+            this._baseClass = lazyBase;
+            if (!baseClass)
+                return;
+            this.addDerivedClass(baseClass, this);
         }
     }
     async fromJSON(classProps) {
@@ -341,8 +390,8 @@ export class ECClass extends SchemaItem {
         const baseClasses = [this];
         const addBaseClasses = async (ecClass) => {
             if (SchemaItemType.EntityClass === ecClass.schemaItemType) {
-                for (let i = (ecClass).mixins.length - 1; i >= 0; i--) {
-                    baseClasses.push(await (ecClass).mixins[i]);
+                for (let i = ecClass.mixins.length - 1; i >= 0; i--) {
+                    baseClasses.push(await ecClass.mixins[i]);
                 }
             }
             if (ecClass.baseClass)
@@ -358,7 +407,7 @@ export class ECClass extends SchemaItem {
     *getAllBaseClassesSync() {
         const baseClasses = [this];
         const addBaseClasses = (ecClass) => {
-            if (SchemaItemType.EntityClass === ecClass.schemaItemType) {
+            if (ecClass.schemaItemType === SchemaItemType.EntityClass) { // cannot use EntityClass typeguard because of circular reference
                 for (const m of Array.from(ecClass.getMixinsSync()).reverse()) {
                     baseClasses.push(m);
                 }
@@ -389,52 +438,71 @@ export class ECClass extends SchemaItem {
             }
         }
     }
-    async buildPropertyCache(result, existingValues, resetBaseCaches = false) {
+    async buildPropertyCache(result, existingValues) {
         if (!existingValues) {
             existingValues = new Map();
         }
         if (this.baseClass) {
-            ECClass.mergeProperties(result, existingValues, await (await this.baseClass).getProperties(resetBaseCaches), false);
+            const baseClass = await this.baseClass;
+            if (baseClass) {
+                ECClass.mergeProperties(result, existingValues, await baseClass.getProperties(), false);
+            }
         }
-        if (!this.properties)
+        if (!this._properties)
             return;
-        ECClass.mergeProperties(result, existingValues, [...this.properties], true);
+        ECClass.mergeProperties(result, existingValues, [...this._properties.values()], true);
     }
-    buildPropertyCacheSync(result, existingValues, resetBaseCaches = false) {
+    buildPropertyCacheSync(result, existingValues) {
         if (!existingValues) {
             existingValues = new Map();
         }
         const baseClass = this.getBaseClassSync();
         if (baseClass) {
-            ECClass.mergeProperties(result, existingValues, baseClass.getPropertiesSync(resetBaseCaches), false);
+            ECClass.mergeProperties(result, existingValues, baseClass.getPropertiesSync(), false);
         }
-        if (!this.properties)
+        if (!this._properties)
             return;
-        ECClass.mergeProperties(result, existingValues, [...this.properties], true);
+        ECClass.mergeProperties(result, existingValues, [...this._properties.values()], true);
     }
     /**
-     * Iterates all properties, including the ones merged from base classes and mixins. To obtain only local properties, use the 'properties' field.
+     * Clears all caches on this object. This is called implicitly for this class,
+     * but needs to be called if derived classes have changed.
+     * @internal
+     */
+    cleanCache() {
+        this._mergedPropertyCache = undefined;
+    }
+    /**
+     * Returns the properties on this class and its base classes.
      * Since this is an expensive operation, results will be cached after first call.
-     * @param resetCache if true, any previously cached results will be dropped and cache will be rebuilt
+     * @param excludeInherited If true, only properties defined directly on this class will be returned. Defaults to false.
+     * @returns An array of properties, empty array if none exist.
      */
-    getPropertiesSync(resetCache = false) {
-        if (!this._mergedPropertyCache || resetCache) {
+    getPropertiesSync(excludeInherited) {
+        if (excludeInherited) {
+            return this._properties && this._properties.size > 0 ? this._properties.values() : [];
+        }
+        if (!this._mergedPropertyCache) {
             this._mergedPropertyCache = [];
-            this.buildPropertyCacheSync(this._mergedPropertyCache, undefined, resetCache);
+            this.buildPropertyCacheSync(this._mergedPropertyCache, undefined);
         }
         return this._mergedPropertyCache;
     }
     /**
-     * Iterates all properties, including the ones merged from base classes and mixins. To obtain only local properties, use the 'properties' field.
+     * Quick way to check whether this class has any local properties without having to use the iterable
+     */
+    get hasLocalProperties() {
+        return this._properties !== undefined && this._properties.size > 0;
+    }
+    /**
+     * Returns the properties on this class and its base classes.
      * Since this is an expensive operation, results will be cached after first call.
-     * @param resetCache if true, any previously cached results will be dropped and cache will be rebuilt
+     * @param excludeInherited If true, only properties defined directly on this class will be returned.
+     * @returns An array of properties, empty array if none exist.
      */
-    async getProperties(resetCache = false) {
-        if (!this._mergedPropertyCache || resetCache) {
-            this._mergedPropertyCache = [];
-            await this.buildPropertyCache(this._mergedPropertyCache, undefined, resetCache);
-        }
-        return this._mergedPropertyCache;
+    async getProperties(excludeInherited) {
+        // At the moment we do not lazy load properties, so this is the same as getPropertiesSync
+        return this.getPropertiesSync(excludeInherited);
     }
     /**
      * Retrieve all custom attributes in the current class and its bases
@@ -533,15 +601,69 @@ export class ECClass extends SchemaItem {
     setModifier(modifier) {
         this._modifier = modifier;
     }
+    /**
+     * Adds an ECClass to the derived class collection. This method is only intended to update the local
+     * cache of derived classes. For adding a class to the hierarchy, use the baseClass setter method.
+     * @param prop The property to add.
+     * @return The property that was added.
+     */
+    addDerivedClass(baseClass, derivedClass) {
+        if (!baseClass._derivedClasses)
+            baseClass._derivedClasses = new Map();
+        if (baseClass._derivedClasses.has(derivedClass.fullName))
+            return;
+        if (derivedClass.isSync(baseClass)) {
+            const promise = new DelayedPromiseWithProps(derivedClass.key, async () => derivedClass);
+            baseClass._derivedClasses.set(derivedClass.fullName, promise);
+        }
+    }
+    /**
+     * Removes an ECClass from the derived class collection. This method is only intended to update the local
+     * cache of derived classes. For updating the class hierarchy, use the baseClass setter method.
+     * @param prop The property to add.
+     * @return The property that was added.
+     */
+    removeDerivedClass(baseClass, derivedClass) {
+        if (!baseClass._derivedClasses)
+            return;
+        if (!baseClass._derivedClasses.has(derivedClass.fullName))
+            return;
+        baseClass._derivedClasses.delete(derivedClass.fullName);
+    }
 }
 /**
  * A Typescript class representation of an ECStructClass.
  * @beta
  */
 export class StructClass extends ECClass {
-    constructor(schema, name, modifier) {
-        super(schema, name, modifier);
-        this.schemaItemType = SchemaItemType.StructClass;
+    /**
+     * Get the type of item represented by this instance
+     * @beta
+     */
+    schemaItemType = StructClass.schemaItemType;
+    /**
+     * Get the type of item represented by this class
+     * @beta
+     */
+    static get schemaItemType() { return SchemaItemType.StructClass; }
+    /**
+     * Type guard to check if the SchemaItem is of type StructClass.
+     * @param item The SchemaItem to check.
+     * @returns True if the item is a StructClass, false otherwise.
+     */
+    static isStructClass(item) {
+        if (item && item.schemaItemType === SchemaItemType.StructClass)
+            return true;
+        return false;
+    }
+    /**
+     * Type assertion to check if the SchemaItem is of type StructClass.
+     * @param item The SchemaItem to check.
+     * @returns The item cast to StructClass if it is a StructClass, undefined otherwise.
+     */
+    static assertIsStructClass(item) {
+        if (!this.isStructClass(item))
+            throw new ECObjectsError(ECObjectsStatus.InvalidSchemaItemType, `Expected '${SchemaItemType.StructClass}' (StructClass)`);
     }
 }
 /**