@itwin/ecschema-rpcinterface-tests 5.15.0-dev.16 → 5.15.0-dev.18

package/lib/dist/bundled-tests.js

@@ -76467,8 +76467,8 @@ class SchemaView {
             throw new Error("SchemaView is not mergeable: create it via SchemaView.createMergeable to merge fragments.");
         this._mergeContext.mergeBlob(blob);
         // A new fragment can add subclasses to an already-present base class, so the derived-class map
-        // must be rebuilt. transitiveBaseCache stays valid: a class's ancestors are always merged
-        // before it (dependency order), so an append never adds an ancestor to an already-cached class.
+        // must be rebuilt. transitiveBaseCache and PropertyRef.overriddenProperty stay valid: a class's ancestors
+        // are always merged before it (dependency order), so an append never adds an ancestor to an already-cached class.
         this[_storage].derivedClassMap = undefined;
     }
     // --- Internal helpers used by view objects ---
@@ -76558,12 +76558,18 @@ class SchemaView {
         // 1. Base class (recursive, depth-first)
         if (cls.baseClassIdx !== -1)
             this._collectProperties(cls.baseClassIdx, merged);
-        // 2. Mixins in declaration order
+        // 2. Mixins in declaration order. Each mixin is resolved on its own so its overrides win over its
+        // ancestors, then only adds names not already provided by the base class or an earlier mixin.
         for (let i = 0; i < cls.mixinCount; i++) {
             const mixinIdx = this[_storage].classMixins[cls.mixinStartIdx + i];
             if (mixinIdx === -1 || mixinIdx === undefined)
                 continue; // safety: dangling mixin ref
-            this._collectMixinProperties(mixinIdx, merged);
+            const mixinProperties = new Map();
+            this._collectProperties(mixinIdx, mixinProperties);
+            for (const [nameKey, resolved] of mixinProperties) {
+                if (!merged.has(nameKey))
+                    merged.set(nameKey, resolved);
+            }
         }
         // 3. Own properties - always override
         for (let i = 0; i < cls.ownPropCount; i++) {
@@ -76572,27 +76578,62 @@ class SchemaView {
             merged.set(nameKey, { ref, classIdx });
         }
     }
-    _collectMixinProperties(mixinIdx, merged) {
-        const mixin = this[_storage].classes[mixinIdx];
-        if (mixin === undefined)
-            return; // safety: dangling index from excluded schema
-        // Walk mixin's own base chain (mixins can extend other mixins)
-        if (mixin.baseClassIdx !== -1)
-            this._collectMixinProperties(mixin.baseClassIdx, merged);
-        // Mixin's own mixins
-        for (let i = 0; i < mixin.mixinCount; i++) {
-            const subMixinIdx = this[_storage].classMixins[mixin.mixinStartIdx + i];
-            if (subMixinIdx === -1 || subMixinIdx === undefined)
+    /** Finds the property declaration that a property of the given class overrides.
+     * Searches the base class and its ancestors first, then each mixin in declaration order.
+     */
+    _findOverriddenProperty(classIdx, nameKey) {
+        const cls = this[_storage].classes[classIdx];
+        if (cls === undefined || cls.type === _SchemaViewInterfaces__WEBPACK_IMPORTED_MODULE_0__.ClassType.View)
+            return undefined;
+        if (cls.baseClassIdx !== -1) {
+            const found = this._findPropertyDeclaration(cls.baseClassIdx, nameKey);
+            if (found !== undefined)
+                return found;
+        }
+        for (let i = 0; i < cls.mixinCount; i++) {
+            const mixinIdx = this[_storage].classMixins[cls.mixinStartIdx + i];
+            if (mixinIdx === -1 || mixinIdx === undefined)
                 continue; // safety: dangling mixin ref
-            this._collectMixinProperties(subMixinIdx, merged);
+            const found = this._findPropertyDeclaration(mixinIdx, nameKey);
+            if (found !== undefined)
+                return found;
         }
-        // Mixin's own properties - only set if not already present (first mixin wins)
-        for (let i = 0; i < mixin.ownPropCount; i++) {
-            const ref = this[_storage].propertyRefs[mixin.ownPropStart + i];
+        return undefined;
+    }
+    _findPropertyDeclaration(classIdx, nameKey) {
+        const cls = this[_storage].classes[classIdx];
+        if (cls === undefined)
+            return undefined; // safety: dangling index from excluded schema
+        for (let i = 0; i < cls.ownPropCount; i++) {
+            const ref = this[_storage].propertyRefs[cls.ownPropStart + i];
+            if (this[_storage].lowerStrings[this[_storage].propDefs[ref.defIdx].nameStringIdx] === nameKey)
+                return { ref, classIdx };
+        }
+        return this._findOverriddenProperty(classIdx, nameKey);
+    }
+    /** Returns the first declaration matching `predicate`, starting with the given declaration and
+     * continuing with the declarations it overrides.
+     * @internal
+     */
+    findPropertyDefInOverrides(ref, classIdx, predicate) {
+        let current = { ref, classIdx };
+        while (current !== null) {
+            const def = this[_storage].propDefs[current.ref.defIdx];
+            if (predicate(def))
+                return def;
+            current = this._getOverriddenProperty(current.ref, current.classIdx);
+        }
+        return undefined;
+    }
+    /** Returns the declaration the given one overrides, resolving and storing it on the ref on first access.
+     * Caching per ref is sound because a ref belongs to exactly one class; view properties (classIdx -1) never override.
+     */
+    _getOverriddenProperty(ref, classIdx) {
+        if (ref.overriddenProperty === undefined) {
             const nameKey = this[_storage].lowerStrings[this[_storage].propDefs[ref.defIdx].nameStringIdx];
-            if (!merged.has(nameKey))
-                merged.set(nameKey, { ref, classIdx: mixinIdx });
+            ref.overriddenProperty = classIdx !== -1 ? this._findOverriddenProperty(classIdx, nameKey) ?? null : null;
         }
+        return ref.overriddenProperty;
     }
     /** @internal */
     buildDerivedClassMap() {
@@ -76617,6 +76658,9 @@ class SchemaView {
 // =====================================================================================
 // SchemaView namespace - flyweight view types
 // =====================================================================================
+function hasCategory(def) { return def.categoryIdx !== -1; }
+function hasKindOfQuantity(def) { return def.koqIdx !== -1; }
+function isHiddenDef(def) { return def.isHidden; }
 /** @beta */
 (function (SchemaView) {
     /** Lightweight view over a schema in a `SchemaView`. Holds only a view reference and
@@ -76960,10 +77004,21 @@ class SchemaView {
         }
         get kind() { return this._def.kind; }
         get isReadOnly() { return this._def.isReadOnly; }
-        /** Reflects the `HiddenProperty` custom attribute from `CoreCustomAttributes`.
-         * Properties marked hidden are typically excluded from UI display but remain accessible programmatically. */
+        /** Reflects the `HiddenProperty` custom attribute from `CoreCustomAttributes` on this declaration only;
+         * see `isEffectivelyHidden`. Properties marked hidden are typically excluded from UI display but remain
+         * accessible programmatically. */
         get isHidden() { return this._def.isHidden; }
-        /** Display priority. Higher values should be displayed more prominently. 0 means default. */
+        /** True if this declaration is hidden. If it is not and the property is an override, we take this from the
+         * overridden property. Limitation: `HiddenProperty(Show=true)` reads the same as no `HiddenProperty`, so it does not
+         * unhide a property whose overridden property is hidden. */
+        get isEffectivelyHidden() {
+            if (this._def.isHidden)
+                return true;
+            return this._ctx.findPropertyDefInOverrides(this._ref, this._classIdx, isHiddenDef) !== undefined;
+        }
+        /** Display priority. Higher values should be displayed more prominently. 0 means default.
+         * Not inherited from the overridden property: an omitted priority is stored as 0, which cannot be told
+         * apart from an explicit 0 that overrides a base priority. */
         get priority() { return this._ref.priority; }
         /** The class that declared or contributed this property through inheritance.
          * For own properties, returns the class itself. For inherited properties, returns the
@@ -76974,11 +77029,21 @@ class SchemaView {
         get declaringClass() {
             return this._classIdx !== -1 ? createClass(this._ctx, this._classIdx) : undefined;
         }
-        /** Property category, or undefined if none assigned. Available on all property kinds. */
+        /** Property category. If there is no local category and the property is an override, we take this from
+         * the overridden property. Available on all property kinds. */
         get category() {
-            const idx = this._def.categoryIdx;
+            let idx = this._def.categoryIdx;
+            if (idx === -1 && this._ctx[_storage].propCategories.length !== 0)
+                idx = this._ctx.findPropertyDefInOverrides(this._ref, this._classIdx, hasCategory)?.categoryIdx ?? -1;
             return idx !== -1 ? new PropertyCategory(this._ctx, idx) : undefined;
         }
+        /** @internal */
+        get _kindOfQuantity() {
+            let idx = this._def.koqIdx;
+            if (idx === -1 && this._ctx[_storage].koqs.length !== 0)
+                idx = this._ctx.findPropertyDefInOverrides(this._ref, this._classIdx, hasKindOfQuantity)?.koqIdx ?? -1;
+            return idx !== -1 ? new KindOfQuantity(this._ctx, idx) : undefined;
+        }
         // Type guards - real type predicates that narrow `this`
         /** True for `SchemaView.PrimitiveProperty` and `SchemaView.PrimitiveArrayProperty`.
          * Matches ecschema-metadata behavior where `isPrimitive()` includes primitive arrays. */
@@ -77040,10 +77105,9 @@ class SchemaView {
             const idx = this._def.enumIdx;
             return idx !== -1 ? new Enumeration(this._ctx, idx) : undefined;
         }
-        get kindOfQuantity() {
-            const idx = this._def.koqIdx;
-            return idx !== -1 ? new KindOfQuantity(this._ctx, idx) : undefined;
-        }
+        /** KindOfQuantity. If there is no local KindOfQuantity and the property is an override, we take this
+         * from the overridden property. */
+        get kindOfQuantity() { return this._kindOfQuantity; }
     }
     SchemaView.PrimitiveProperty = PrimitiveProperty;
     /** An array of primitive values. Same primitive/enum fields as `PrimitiveProperty`,
@@ -77060,10 +77124,9 @@ class SchemaView {
             const idx = this._def.enumIdx;
             return idx !== -1 ? new Enumeration(this._ctx, idx) : undefined;
         }
-        get kindOfQuantity() {
-            const idx = this._def.koqIdx;
-            return idx !== -1 ? new KindOfQuantity(this._ctx, idx) : undefined;
-        }
+        /** KindOfQuantity. If there is no local KindOfQuantity and the property is an override, we take this
+         * from the overridden property. */
+        get kindOfQuantity() { return this._kindOfQuantity; }
         get arrayMinOccurs() { return this._def.arrayMinOccurs; }
         get arrayMaxOccurs() { return this._def.arrayMaxOccurs; }
     }
@@ -77969,6 +78032,7 @@ function mergeFragmentBlob(ctx, data) {
                 defIdx,
                 labelStringIdx: pr.labelStringIdx,
                 priority: pr.priority,
+                overriddenProperty: undefined,
             });
         }
         let sourceConstraintIdx = -1;
@@ -337629,7 +337693,7 @@ class WMS {
 (module) {
 
 "use strict";
-module.exports = /*#__PURE__*/JSON.parse('{"name":"@itwin/core-frontend","version":"5.15.0-dev.16","description":"iTwin.js frontend components","main":"lib/cjs/core-frontend.js","module":"lib/esm/core-frontend.js","typings":"lib/cjs/core-frontend","license":"MIT","scripts":{"build":"npm run -s copy:public && npm run -s build:cjs && npm run -s build:esm && npm run -s build:workers && npm run -s copy:draco","build:cjs":"npm run -s copy:js:cjs && tsc 1>&2 --outDir lib/cjs","build:esm":"npm run -s copy:js:esm && tsc 1>&2 --module ES2022 --outDir lib/esm","clean":"rimraf -g lib .rush/temp/package-deps*.json","copy:public":"cpx \\"./src/public/**/*\\" ./lib/public","copy:js:cjs":"cpx \\"./src/**/*.js\\" ./lib/cjs","copy:js:esm":"cpx \\"./src/**/*.js\\" ./lib/esm","copy:draco":"cpx \\"./node_modules/@loaders.gl/draco/dist/libs/*\\" ./lib/public/scripts","docs":"betools docs --json=../../generated-docs/core/core-frontend/file.json --tsIndexFile=./core-frontend.ts --onlyJson --excludes=webgl/**/*,**/map/*.d.ts,**/tile/*.d.ts,**/*-css.ts && npm run -s extract","extract":"betools extract --fileExt=ts --extractFrom=./src/test/example-code --recursive --out=../../generated-docs/extract","extract-api":"betools extract-api --entry=core-frontend && npm run extract-extension-api","extract-extension-api":"eslint --no-inline-config -c extraction.eslint.config.js  \\"./src/**/*.ts\\" 1>&2","lint":"eslint \\"./src/**/*.ts\\" 1>&2","lint-fix":"eslint --fix -f visualstudio \\"./src/**/*.ts\\" 1>&2","lint-deprecation":"eslint --fix -f visualstudio --no-inline-config -c ../../common/config/eslint/eslint.config.deprecation-policy.js \\"./src/**/*.ts\\"","pseudolocalize":"betools pseudolocalize --englishDir ./src/public/locales/en --out ./public/locales/en-PSEUDO","test":"npm run build:test-worker && vitest --run","cover":"npm run build:test-worker && vitest --run","build:test-worker":"vite build --config ./src/test/worker/vite.config.mts 1>&2","build:workers":"rimraf lib/workers/webpack && vite build --config ./src/workers/ImdlParser/vite.config.mts 1>&2"},"repository":{"type":"git","url":"https://github.com/iTwin/itwinjs-core.git","directory":"core/frontend"},"keywords":["Bentley","BIM","iModel","digital-twin","iTwin"],"author":{"name":"Bentley Systems, Inc.","url":"http://www.bentley.com"},"peerDependencies":{"@itwin/appui-abstract":"workspace:*","@itwin/core-bentley":"workspace:*","@itwin/core-common":"workspace:*","@itwin/core-geometry":"workspace:*","@itwin/core-orbitgt":"workspace:*","@itwin/core-quantity":"workspace:*","@itwin/ecschema-metadata":"workspace:*","@itwin/ecschema-rpcinterface-common":"workspace:*"},"//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":{"@bentley/aec-units-schema":"^1.0.3","@bentley/formats-schema":"^1.0.0","@bentley/units-schema":"^1.0.12","@itwin/appui-abstract":"workspace:*","@itwin/build-tools":"workspace:*","@itwin/core-bentley":"workspace:*","@itwin/core-common":"workspace:*","@itwin/core-geometry":"workspace:*","@itwin/core-orbitgt":"workspace:*","@itwin/core-quantity":"workspace:*","@itwin/ecschema-metadata":"workspace:*","@itwin/ecschema-rpcinterface-common":"workspace:*","@itwin/object-storage-core":"^3.0.4","@itwin/eslint-plugin":"^6.0.0","@types/node":"~20.17.0","@types/sinon":"^17.0.2","@vitest/browser-playwright":"^4.1.10","@vitest/coverage-v8":"^4.1.10","cpx2":"^8.0.0","eslint":"^9.31.0","playwright":"~1.56.1","rimraf":"^6.0.1","sinon":"^17.0.2","typescript":"~5.6.2","vite":"^6.4.4","vitest":"^4.1.10"},"//dependencies":["NOTE: these dependencies should be only for things that DO NOT APPEAR IN THE API","NOTE: core-frontend should remain UI technology agnostic, so no react/angular dependencies are allowed"],"dependencies":{"@itwin/core-i18n":"workspace:*","@itwin/webgl-compatibility":"workspace:*","@loaders.gl/core":"^4.4.5","@loaders.gl/draco":"^4.4.5","fuse.js":"^3.3.0","wms-capabilities":"0.6.0"}}');
+module.exports = /*#__PURE__*/JSON.parse('{"name":"@itwin/core-frontend","version":"5.15.0-dev.18","description":"iTwin.js frontend components","main":"lib/cjs/core-frontend.js","module":"lib/esm/core-frontend.js","typings":"lib/cjs/core-frontend","license":"MIT","scripts":{"build":"npm run -s copy:public && npm run -s build:cjs && npm run -s build:esm && npm run -s build:workers && npm run -s copy:draco","build:cjs":"npm run -s copy:js:cjs && tsc 1>&2 --outDir lib/cjs","build:esm":"npm run -s copy:js:esm && tsc 1>&2 --module ES2022 --outDir lib/esm","clean":"rimraf -g lib .rush/temp/package-deps*.json","copy:public":"cpx \\"./src/public/**/*\\" ./lib/public","copy:js:cjs":"cpx \\"./src/**/*.js\\" ./lib/cjs","copy:js:esm":"cpx \\"./src/**/*.js\\" ./lib/esm","copy:draco":"cpx \\"./node_modules/@loaders.gl/draco/dist/libs/*\\" ./lib/public/scripts","docs":"betools docs --json=../../generated-docs/core/core-frontend/file.json --tsIndexFile=./core-frontend.ts --onlyJson --excludes=webgl/**/*,**/map/*.d.ts,**/tile/*.d.ts,**/*-css.ts && npm run -s extract","extract":"betools extract --fileExt=ts --extractFrom=./src/test/example-code --recursive --out=../../generated-docs/extract","extract-api":"betools extract-api --entry=core-frontend && npm run extract-extension-api","extract-extension-api":"eslint --no-inline-config -c extraction.eslint.config.js  \\"./src/**/*.ts\\" 1>&2","lint":"eslint \\"./src/**/*.ts\\" 1>&2","lint-fix":"eslint --fix -f visualstudio \\"./src/**/*.ts\\" 1>&2","lint-deprecation":"eslint --fix -f visualstudio --no-inline-config -c ../../common/config/eslint/eslint.config.deprecation-policy.js \\"./src/**/*.ts\\"","pseudolocalize":"betools pseudolocalize --englishDir ./src/public/locales/en --out ./public/locales/en-PSEUDO","test":"npm run build:test-worker && vitest --run","cover":"npm run build:test-worker && vitest --run","build:test-worker":"vite build --config ./src/test/worker/vite.config.mts 1>&2","build:workers":"rimraf lib/workers/webpack && vite build --config ./src/workers/ImdlParser/vite.config.mts 1>&2"},"repository":{"type":"git","url":"https://github.com/iTwin/itwinjs-core.git","directory":"core/frontend"},"keywords":["Bentley","BIM","iModel","digital-twin","iTwin"],"author":{"name":"Bentley Systems, Inc.","url":"http://www.bentley.com"},"peerDependencies":{"@itwin/appui-abstract":"workspace:*","@itwin/core-bentley":"workspace:*","@itwin/core-common":"workspace:*","@itwin/core-geometry":"workspace:*","@itwin/core-orbitgt":"workspace:*","@itwin/core-quantity":"workspace:*","@itwin/ecschema-metadata":"workspace:*","@itwin/ecschema-rpcinterface-common":"workspace:*"},"//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":{"@bentley/aec-units-schema":"^1.0.3","@bentley/formats-schema":"^1.0.0","@bentley/units-schema":"^1.0.12","@itwin/appui-abstract":"workspace:*","@itwin/build-tools":"workspace:*","@itwin/core-bentley":"workspace:*","@itwin/core-common":"workspace:*","@itwin/core-geometry":"workspace:*","@itwin/core-orbitgt":"workspace:*","@itwin/core-quantity":"workspace:*","@itwin/ecschema-metadata":"workspace:*","@itwin/ecschema-rpcinterface-common":"workspace:*","@itwin/object-storage-core":"^3.0.4","@itwin/eslint-plugin":"^6.0.0","@types/node":"~20.17.0","@types/sinon":"^17.0.2","@vitest/browser-playwright":"^4.1.10","@vitest/coverage-v8":"^4.1.10","cpx2":"^8.0.0","eslint":"^9.31.0","playwright":"~1.56.1","rimraf":"^6.0.1","sinon":"^17.0.2","typescript":"~5.6.2","vite":"^6.4.4","vitest":"^4.1.10"},"//dependencies":["NOTE: these dependencies should be only for things that DO NOT APPEAR IN THE API","NOTE: core-frontend should remain UI technology agnostic, so no react/angular dependencies are allowed"],"dependencies":{"@itwin/core-i18n":"workspace:*","@itwin/webgl-compatibility":"workspace:*","@loaders.gl/core":"^4.4.5","@loaders.gl/draco":"^4.4.5","fuse.js":"^3.3.0","wms-capabilities":"0.6.0"}}');
 
 /***/ },