@redocly/redoc-reef 0.130.0-next.10 → 0.130.0-next.11

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @redocly/redoc-reef
 
+## 0.130.0-next.11
+
+### Minor Changes
+
+- 85818157d8: Added bundling support for OpenAPI 3.2 `components/mediaTypes` references used in request and response content.
+
+### Patch Changes
+
+- e135881ebc: Updated `@redocly/openapi-core` to version `2.15.2`.
+- c585ce5de8: Improved tooltip positioning and performance.
+- 4015d8d229: Fixed an issue where the `llms.txt` page ignored path prefix in links.
+- Updated dependencies [e135881ebc]
+- Updated dependencies [c585ce5de8]
+- Updated dependencies [a759cf76c7]
+- Updated dependencies [85818157d8]
+  - @redocly/openapi-docs@3.18.0-next.10
+  - @redocly/theme@0.62.0-next.7
+  - @redocly/realm-asyncapi-sdk@0.8.0-next.3
+  - @redocly/asyncapi-docs@1.7.0-next.10
+  - @redocly/portal-plugin-mock-server@0.15.0-next.10
+  - @redocly/graphql-docs@1.7.0-next.2
+
 ## 0.130.0-next.10
 
 ### Patch Changes

package/dist/server/plugins/catalog-entities/database/catalog-entities-service.d.ts

@@ -8,6 +8,7 @@ import type { TransactionsManager } from '../../../providers/database/transactio
 import type { CreateEntityParams } from './repositories/local/catalog-entities-local-write-repository.js';
 import type { Filter } from '../../../providers/database/pagination/types.js';
 import type { ScorecardsStatus } from '../entities/types.js';
+import type { GetEntityByIdParams } from '../types/params.js';
 import { type EntityDtoSchema, type EntityRelationDtoSchema } from '../schemas/dto-schemas.js';
 import { CatalogEntitiesLocalRepository } from './repositories/local/catalog-entities-local-repository.js';
 import { CatalogEntitiesRemoteRepository } from './repositories/remote/catalog-entities-remote-repository.js';
@@ -25,8 +26,13 @@ export declare class CatalogEntitiesService {
     constructor(localRepository: CatalogEntitiesLocalRepository, remoteRepository: CatalogEntitiesRemoteRepository | null);
     static getInstance(options: ServiceInstanceOptions): Promise<CatalogEntitiesService>;
     transaction<T>(...args: Parameters<TransactionsManager['transaction']>): Promise<T>;
-    getEntities(paginationParams: PaginationParams): Promise<ListResponseResult<EntityReadModelSchema>>;
-    getEntityById(id: string): Promise<EntityReadModelSchema | null>;
+    getEntities({ paginationParams, rbacTeams, excludedTypes, excludedEntities, }: {
+        paginationParams: PaginationParams;
+        rbacTeams?: string[];
+        excludedTypes?: string[];
+        excludedEntities?: string[];
+    }): Promise<ListResponseResult<EntityReadModelSchema>>;
+    getEntityById(id: string, params?: GetEntityByIdParams): Promise<EntityReadModelSchema | null>;
     getEntityKeysAndVersionsBySourceFile(sourceFile: string): Promise<Set<string>>;
     getEntitiesCountByTypes(): Promise<{
         type: string;
@@ -57,7 +63,7 @@ export declare class CatalogEntitiesService {
      */
     createEntityRelationsInLocalDatabase(relations: EntityRelationDtoSchema[]): Promise<void>;
     updateEntity(incomingEntity: Partial<EntityDtoSchema>, entityToBeUpdated: EntityReadModelSchema): Promise<EntityReadModelSchema | null | undefined>;
-    deleteEntity(id: string): Promise<string | null | undefined>;
+    deleteEntity(entityToBeRemoved: EntityReadModelSchema): Promise<string | null | undefined>;
     /**
      * Use only internally, everything that is created via API should be created in the remote database.
      * @param filter - The conditions used to select which entities to delete.
@@ -121,12 +127,29 @@ export declare class CatalogEntitiesService {
      * @param filter - The conditions used to select which entity relations to delete.
      */
     deleteEntityRelationsInLocalDatabase(filter: Filter): Promise<void>;
-    getEntitiesWithRelations(paginationParams?: PaginationParams, rbacTeams?: string[]): Promise<BffCatalogEntityList>;
-    getEntityWithRelationsByKey(entityKey: string, filter?: {
-        revision?: string | null;
-        version?: string | null;
-    }, rbacTeams?: string[]): Promise<BffCatalogEntity | null>;
-    getRelatedEntities(entityKey: string, paginationParams?: PaginationParams): Promise<BffCatalogRelatedEntityList>;
+    getEntitiesWithRelations({ paginationParams, rbacTeams, excludedTypes, excludedEntities, }: {
+        paginationParams: PaginationParams;
+        rbacTeams?: string[];
+        excludedTypes?: string[];
+        excludedEntities?: string[];
+    }): Promise<BffCatalogEntityList>;
+    getEntityWithRelationsByKey({ entityKey, filter, rbacTeams, excludedTypes, excludedEntities, }: {
+        entityKey: string;
+        filter?: {
+            revision?: string | null;
+            version?: string | null;
+        };
+        rbacTeams?: string[];
+        excludedTypes?: string[];
+        excludedEntities?: string[];
+    }): Promise<BffCatalogEntity | null>;
+    getRelatedEntities({ entityKey, paginationParams, rbacTeams, excludedTypes, excludedEntities, }: {
+        entityKey: string;
+        paginationParams: PaginationParams;
+        rbacTeams?: string[];
+        excludedTypes?: string[];
+        excludedEntities?: string[];
+    }): Promise<BffCatalogRelatedEntityList>;
     softDeleteEntitiesInLocalDatabase({ filter, revision, fileHash, }: {
         filter: Filter;
         revision: string;

package/dist/server/plugins/catalog-entities/database/catalog-entities-service.js

@@ -1 +1 @@
-import{deepMerge as E}from"../../../../utils/object/deep-merge.js";import{promiseMapLimit as y}from"../../../utils/async/promise-map-limit.js";import{logger as r}from"../../../tools/notifiers/logger.js";import{isWebView as o}from"../../../../utils/env/is-web-view.js";import{entityRelationDtoSchema as h}from"../schemas/dto-schemas.js";import{CatalogEntitiesLocalRepository as d}from"./repositories/local/catalog-entities-local-repository.js";import{CatalogEntitiesRemoteRepository as w}from"./repositories/remote/catalog-entities-remote-repository.js";import{prepareListResponse as c}from"../../../web-server/utils/prepare-list-response.js";import{ENTITY_RELATION_FROM_DATABASE as l}from"./mappers/field-transformations.js";import{createValidator as m}from"../utils/ajv-validator.js";import{hasOptionsChanged as R}from"../utils/has-options-changed.js";const u=15,p=m(h,{errorPrefix:"Entity relation validation failed:",dataVar:"entity relation"});class n{static#a;static#i;#t;#e;constructor(t,e){this.#t=t,this.#e=e}static async#n(t){const[e,a]=await Promise.all([d.getInstance(t),t.runOnlyLocalDatabase?null:w.getInstance(t)]),i=new n(e,a);a&&(process.env.NODE_ENV==="development"&&r.info("Attaching remote database to local database"),await i.#t.attachDatabase(a.path)),n.#a=i,n.#i=t}static async getInstance(t){return t.runOnlyLocalDatabase===void 0&&(t.runOnlyLocalDatabase=process.env.REDOCLY_LOCAL_DEV==="true"||process.env.CI==="true"),t.removeExisting===void 0&&(t.removeExisting=!1),(!n.#a||R(n.#i,t))&&await n.#n(t),n.#a}async transaction(...t){return this.#t.transactionsManager.transaction(...t)}async getEntities(t){await this.#e?.sync();const{items:e,total:a,hasMore:i}=await this.#t.getEntities(t);return c({data:e,params:t,totalCount:a,hasMore:i})}async getEntityById(t){return await this.#e?.sync(),await this.#t.getEntityById(t)}async getEntityKeysAndVersionsBySourceFile(t){return await this.#e?.sync(),this.#t.getEntityKeysAndVersionsBySourceFile(t)}async getEntitiesCountByTypes(){return await this.#e?.sync(),this.#t.getEntitiesCountByTypes()}async getCatalogFilters(t){return await this.#e?.sync(),this.#t.getCatalogFilters(t)}async createEntity(t){if(o())throw new Error("Entity creation is not supported in the WebView");return this.#e?this.#e.createEntity(t):(r.warn("No remote database found"),null)}async createEntities(t){if(o())throw new Error("Entity creation is not supported in the WebView");const e=this.#e;return e?await y(t,u,async a=>e.createEntity(a).then(i=>({status:"ok",resource:i})).catch(i=>({key:a.key,status:"error",error:i}))):(r.warn("No remote database found"),[])}getEntitySources(){return this.#t.getEntitySources()}async createEntityInLocalDatabase(t){return this.#t.createEntity(t)}async createEntitiesInLocalDatabase(t){await this.#t.createEntities(t)}async createEntityRelationInLocalDatabase(t){await this.#t.createEntityRelation(t)}async createEntityRelationsInLocalDatabase(t){await this.#t.createEntityRelations(t)}async updateEntity(t,e){if(o())throw new Error("Entity update is not supported in the WebView");return await this.#e?.updateEntity(t,e)}async deleteEntity(t){if(o())throw new Error("Entity deletion is not supported in the WebView");return await this.#e?.deleteEntity(t)}async deleteEntitiesInLocalDatabase(t){await this.#t.deleteEntities(t)}async getEntityRelationById(t){return await this.#e?.sync(),await this.#t.getEntityRelationById(t)}async getEntitiesRelations(t={}){await this.#e?.sync();const{items:e,total:a,hasMore:i}=await this.#t.getEntitiesRelations(t);return c({data:e,params:t,totalCount:a,nameTransformationsFromDatabase:l,hasMore:i})}async createEntityRelation(t){return this.#e?.createEntityRelation(t)}async createEntitiesRelations(t){const e=this.#e;return e?await y(t,u,async a=>e.createEntityRelation(a).then(i=>({status:"ok",resource:i})).catch(i=>({key:a.sourceKey,status:"error",error:i}))):(r.warn("No remote database found"),[])}async updateEntityRelation(t,e){const a=await this.#t.getEntityRelationById(t);if(!a)throw new Error(`Entity relation with id ${t} not found`);const i=E(a,e),s=p(i);return this.#e?.createEntityRelation(s)}async deleteEntityRelation(t){let e=await this.#e?.deleteEntityRelation(t);return e||(e=await this.#t.deleteEntityRelation(t)),e}async deleteEntityRelationsInLocalDatabase(t){await this.#t.deleteEntityRelations(t)}async getEntitiesWithRelations(t={},e){await this.#e?.sync();const{items:a,total:i,hasMore:s}=await this.#t.getEntitiesWithRelations(t,e);return c({data:a,params:t,totalCount:i,hasMore:s})}async getEntityWithRelationsByKey(t,e,a){return this.#t.getEntityWithRelationsByKey(t,e,a)}async getRelatedEntities(t,e={}){await this.#e?.sync();const{items:a,total:i,hasMore:s}=await this.#t.getRelatedEntities(t,e);return c({data:a,params:e,totalCount:i,nameTransformationsFromDatabase:l,hasMore:s})}async softDeleteEntitiesInLocalDatabase({filter:t,revision:e,fileHash:a}){await this.#t.softDeleteEntities({filter:t,revision:e,fileHash:a})}async listEntityRevisions(t,e){return await this.#e?.sync(),this.#t.listEntityRevisions(t,e)}async updateEntityScorecardsStatus(t,e){return await this.#e?.sync(),this.#t.updateEntityScorecardsStatus(t,e)}async updateEntityScorecardsStatusIfCalculating(t,e){return await this.#e?.sync(),this.#t.updateEntityScorecardsStatusIfCalculating(t,e)}async getOutdatedEntities(t){return await this.#e?.sync(),this.#t.getOutdatedEntities(t)}async setEntitiesAsOutdated(t){await this.#e?.sync(),await this.#t.setEntitiesAsOutdated(t)}}export{n as CatalogEntitiesService};
+import{deepMerge as w}from"../../../../utils/object/deep-merge.js";import{promiseMapLimit as u}from"../../../utils/async/promise-map-limit.js";import{logger as c}from"../../../tools/notifiers/logger.js";import{isWebView as y}from"../../../../utils/env/is-web-view.js";import{entityRelationDtoSchema as m}from"../schemas/dto-schemas.js";import{CatalogEntitiesLocalRepository as R}from"./repositories/local/catalog-entities-local-repository.js";import{CatalogEntitiesRemoteRepository as p}from"./repositories/remote/catalog-entities-remote-repository.js";import{prepareListResponse as l}from"../../../web-server/utils/prepare-list-response.js";import{ENTITY_RELATION_FROM_DATABASE as E}from"./mappers/field-transformations.js";import{createValidator as f}from"../utils/ajv-validator.js";import{hasOptionsChanged as g}from"../utils/has-options-changed.js";const h=15,I=f(m,{errorPrefix:"Entity relation validation failed:",dataVar:"entity relation"});class s{static#a;static#i;#t;#e;constructor(t,e){this.#t=t,this.#e=e}static async#n(t){const[e,a]=await Promise.all([R.getInstance(t),t.runOnlyLocalDatabase?null:p.getInstance(t)]),i=new s(e,a);a&&(process.env.NODE_ENV==="development"&&c.info("Attaching remote database to local database"),await i.#t.attachDatabase(a.path)),s.#a=i,s.#i=t}static async getInstance(t){return t.runOnlyLocalDatabase===void 0&&(t.runOnlyLocalDatabase=process.env.REDOCLY_LOCAL_DEV==="true"||process.env.CI==="true"),t.removeExisting===void 0&&(t.removeExisting=!1),(!s.#a||g(s.#i,t))&&await s.#n(t),s.#a}async transaction(...t){return this.#t.transactionsManager.transaction(...t)}async getEntities({paginationParams:t,rbacTeams:e,excludedTypes:a,excludedEntities:i}){await this.#e?.sync();const{items:n,total:r,hasMore:o}=await this.#t.getEntities({paginationParams:t,rbacTeams:e,excludedTypes:a,excludedEntities:i});return l({data:n,params:t,totalCount:r,hasMore:o})}async getEntityById(t,e){return await this.#e?.sync(),await this.#t.getEntityById(t,e)}async getEntityKeysAndVersionsBySourceFile(t){return await this.#e?.sync(),this.#t.getEntityKeysAndVersionsBySourceFile(t)}async getEntitiesCountByTypes(){return await this.#e?.sync(),this.#t.getEntitiesCountByTypes()}async getCatalogFilters(t){return await this.#e?.sync(),this.#t.getCatalogFilters(t)}async createEntity(t){if(y())throw new Error("Entity creation is not supported in the WebView");return this.#e?this.#e.createEntity(t):(c.warn("No remote database found"),null)}async createEntities(t){if(y())throw new Error("Entity creation is not supported in the WebView");const e=this.#e;return e?await u(t,h,async a=>e.createEntity(a).then(i=>({status:"ok",resource:i})).catch(i=>({key:a.key,status:"error",error:i}))):(c.warn("No remote database found"),[])}getEntitySources(){return this.#t.getEntitySources()}async createEntityInLocalDatabase(t){return this.#t.createEntity(t)}async createEntitiesInLocalDatabase(t){await this.#t.createEntities(t)}async createEntityRelationInLocalDatabase(t){await this.#t.createEntityRelation(t)}async createEntityRelationsInLocalDatabase(t){await this.#t.createEntityRelations(t)}async updateEntity(t,e){if(y())throw new Error("Entity update is not supported in the WebView");return await this.#e?.updateEntity(t,e)}async deleteEntity(t){if(y())throw new Error("Entity deletion is not supported in the WebView");return await this.#e?.deleteEntity(t)}async deleteEntitiesInLocalDatabase(t){await this.#t.deleteEntities(t)}async getEntityRelationById(t){return await this.#e?.sync(),await this.#t.getEntityRelationById(t)}async getEntitiesRelations(t={}){await this.#e?.sync();const{items:e,total:a,hasMore:i}=await this.#t.getEntitiesRelations(t);return l({data:e,params:t,totalCount:a,nameTransformationsFromDatabase:E,hasMore:i})}async createEntityRelation(t){return this.#e?.createEntityRelation(t)}async createEntitiesRelations(t){const e=this.#e;return e?await u(t,h,async a=>e.createEntityRelation(a).then(i=>({status:"ok",resource:i})).catch(i=>({key:a.sourceKey,status:"error",error:i}))):(c.warn("No remote database found"),[])}async updateEntityRelation(t,e){const a=await this.#t.getEntityRelationById(t);if(!a)throw new Error(`Entity relation with id ${t} not found`);const i=w(a,e),n=I(i);return this.#e?.createEntityRelation(n)}async deleteEntityRelation(t){let e=await this.#e?.deleteEntityRelation(t);return e||(e=await this.#t.deleteEntityRelation(t)),e}async deleteEntityRelationsInLocalDatabase(t){await this.#t.deleteEntityRelations(t)}async getEntitiesWithRelations({paginationParams:t,rbacTeams:e,excludedTypes:a,excludedEntities:i}){await this.#e?.sync();const{items:n,total:r,hasMore:o}=await this.#t.getEntitiesWithRelations({paginationParams:t,rbacTeams:e,excludedTypes:a,excludedEntities:i});return l({data:n,params:t,totalCount:r,hasMore:o})}async getEntityWithRelationsByKey({entityKey:t,filter:e,rbacTeams:a,excludedTypes:i,excludedEntities:n}){return this.#t.getEntityWithRelationsByKey({entityKey:t,filter:e,rbacTeams:a,excludedTypes:i,excludedEntities:n})}async getRelatedEntities({entityKey:t,paginationParams:e,rbacTeams:a,excludedTypes:i,excludedEntities:n}){await this.#e?.sync();const{items:r,total:o,hasMore:d}=await this.#t.getRelatedEntities({key:t,paginationParams:e,rbacTeams:a,excludedTypes:i,excludedEntities:n});return l({data:r,params:e,totalCount:o,nameTransformationsFromDatabase:E,hasMore:d})}async softDeleteEntitiesInLocalDatabase({filter:t,revision:e,fileHash:a}){await this.#t.softDeleteEntities({filter:t,revision:e,fileHash:a})}async listEntityRevisions(t,e){return await this.#e?.sync(),this.#t.listEntityRevisions(t,e)}async updateEntityScorecardsStatus(t,e){return await this.#e?.sync(),this.#t.updateEntityScorecardsStatus(t,e)}async updateEntityScorecardsStatusIfCalculating(t,e){return await this.#e?.sync(),this.#t.updateEntityScorecardsStatusIfCalculating(t,e)}async getOutdatedEntities(t){return await this.#e?.sync(),this.#t.getOutdatedEntities(t)}async setEntitiesAsOutdated(t){await this.#e?.sync(),await this.#t.setEntitiesAsOutdated(t)}}export{s as CatalogEntitiesService};

package/dist/server/plugins/catalog-entities/database/repositories/local/catalog-entities-bff-repository.d.ts

@@ -5,10 +5,21 @@ import type { ListResult } from './catalog-entities-local-read-repository.js';
 export declare class CatalogEntitiesBffRepository {
     #private;
     constructor(db: DatabaseClient, attachedDatabasePath: string);
-    getEntitiesWithRelations(paginationParams?: PaginationParams, rbacTeams?: string[]): Promise<ListResult<BffCatalogEntity>>;
-    getEntityWithRelationsByKey(entityKey: string, filter?: {
-        revision?: string | null;
-        version?: string | null;
-    }, rbacTeams?: string[]): Promise<BffCatalogEntity | null>;
+    getEntitiesWithRelations({ paginationParams, rbacTeams, excludedEntities, excludedTypes, }: {
+        paginationParams: PaginationParams;
+        rbacTeams?: string[];
+        excludedEntities?: string[];
+        excludedTypes?: string[];
+    }): Promise<ListResult<BffCatalogEntity>>;
+    getEntityWithRelationsByKey({ entityKey, filter, rbacTeams, excludedTypes, excludedEntities, }: {
+        entityKey: string;
+        filter?: {
+            revision?: string | null;
+            version?: string | null;
+        };
+        rbacTeams?: string[];
+        excludedTypes?: string[];
+        excludedEntities?: string[];
+    }): Promise<BffCatalogEntity | null>;
 }
 //# sourceMappingURL=catalog-entities-bff-repository.d.ts.map

package/dist/server/plugins/catalog-entities/database/repositories/local/catalog-entities-bff-repository.js

@@ -1,45 +1,45 @@
-import{and as n,desc as V,eq as r,notExists as g,sql as e,or as A,isNull as X,exists as x,inArray as z}from"drizzle-orm";import{unionAll as S}from"drizzle-orm/sqlite-core";import{logger as J}from"../../../../../tools/notifiers/logger.js";import{entitiesTable as t}from"../../../../../providers/database/databases/catalog-sqlite/schemas/entities-table.js";import{entitiesRelationsTable as O}from"../../../../../providers/database/databases/catalog-sqlite/schemas/entities-relations-table.js";import{entitiesAttributesTable as _}from"../../../../../providers/database/databases/catalog-sqlite/schemas/entities-attributes-table.js";import{applyPagination as F}from"../../../../../providers/database/pagination/index.js";import{applyFilter as U,excludeFieldsFromFilter as q,getAllFilterFieldValues as W}from"../../../../../providers/database/pagination/filter.js";import{createBffEntity as L}from"../../mappers/create-bff-entity.js";import{FIELDS_TO_SELECT_FOR_ENTITY as d,FIELDS_TO_SELECT_FOR_ENTITY_RELATION as C,createEntityFieldsForSelect as $}from"../utils.js";import{createMergedEntityFieldsForSelect as I}from"../utils/create-merged-entity-fields-for-select.js";import{buildNoHigherVersionExistsFilter as B,buildSemanticVersionSortExpr as Y}from"../utils/semantic-version-sort.js";class ae{#e;#t;constructor(i,o){this.#e=i,this.#t=o}async getEntitiesWithRelations(i={},o){const a=W(i.filter,"owners");if(a.length>0)return this.#a(i,a,o);const l=W(i.filter,"domains");return l.length>0?this.#d(i,l,o):this.#m(i,o)}async#a(i,o,a){const l=this.#n(a),c=this.#o(),h=this.#l(),b=c.as("combined_relations"),w=h.as("combined_target_entities"),u=o.map(s=>e`
+import{and as a,desc as U,eq as r,notExists as k,sql as e,or as j}from"drizzle-orm";import{unionAll as W}from"drizzle-orm/sqlite-core";import{logger as z}from"../../../../../tools/notifiers/logger.js";import{entitiesTable as t}from"../../../../../providers/database/databases/catalog-sqlite/schemas/entities-table.js";import{entitiesRelationsTable as L}from"../../../../../providers/database/databases/catalog-sqlite/schemas/entities-relations-table.js";import{entitiesAttributesTable as d}from"../../../../../providers/database/databases/catalog-sqlite/schemas/entities-attributes-table.js";import{applyPagination as J}from"../../../../../providers/database/pagination/index.js";import{applyFilter as Z,excludeFieldsFromFilter as P,getAllFilterFieldValues as B}from"../../../../../providers/database/pagination/filter.js";import{createBffEntity as V}from"../../mappers/create-bff-entity.js";import{FIELDS_TO_SELECT_FOR_ENTITY as f,FIELDS_TO_SELECT_FOR_ENTITY_RELATION as F,createEntityFieldsForSelect as C}from"../utils.js";import{createMergedEntityFieldsForSelect as X}from"../utils/create-merged-entity-fields-for-select.js";import{buildNoHigherVersionExistsFilter as Y,buildSemanticVersionSortExpr as x}from"../utils/semantic-version-sort.js";import{buildEntitiesExclusionFilter as N}from"../utils/build-entities-exclusion-filter.js";import{buildRbacFilter as p,buildSubqueryRbacJoinAndFilter as G}from"../utils/build-rbac-filter.js";class ye{#e;#t;constructor(i,s){this.#e=i,this.#t=s}async getEntitiesWithRelations({paginationParams:i,rbacTeams:s,excludedEntities:n,excludedTypes:o}){const l=B(i.filter,"owners");if(l.length>0)return this.#c(i,l,s,o,n);const u=B(i.filter,"domains");return u.length>0?this.#a(i,u,s,o,n):this.#m(i,s,o,n)}async#c(i,s,n,o,l){const u=this.#o(n,o,l),h=this.#l(),b=this.#i(o,l),A=h.as("combined_relations"),T=b.as("combined_target_entities"),w=this.#n().as("combined_target_attributes"),_=s.map(c=>e`
         EXISTS (
-          SELECT 1 FROM (${c}) cr
-          WHERE cr.source_key = ${s}
+          SELECT 1 FROM (${h}) cr
+          WHERE cr.source_key = ${c}
             AND cr.source_to_target_relation = 'owns'
             AND cr.target_key = base_entities.key
         )
-      `),y=u.length===1?u[0]:e`(${e.join(u,e` OR `)})`,N=W(i.filter,"domains");let v=y;if(N.length>0){const s=N.map(m=>e`
+      `),v=_.length===1?_[0]:e`(${e.join(_,e` OR `)})`,g=B(i.filter,"domains");let $=v;if(g.length>0){const c=g.map(m=>e`
           EXISTS (
-            SELECT 1 FROM (${c}) cr
-            JOIN (${h}) d ON d.key = ${m}
+            SELECT 1 FROM (${h}) cr
+            JOIN (${b}) d ON d.key = ${m}
             WHERE d.type = 'domain'
               AND d.is_current = 1
               AND cr.source_key = ${m}
               AND cr.target_key = base_entities.key
               AND cr.source_to_target_relation = 'hasParts'
           )
-        `),f=s.length===1?s[0]:e`(${e.join(s,e` OR `)})`;v=e`(${y} AND ${f})`}const p=q(i.filter,["owners","domains"]),k={...i,filter:p,baseWhereCondition:v},E=this.#e.client.select(d).from(l.as("base_entities")).$dynamic();try{const s=this.#e.client.select(d).from(l.as("base_entities")).$dynamic();F(s,{...k,limit:void 0,skip:void 0,after:void 0,before:void 0});const f=this.#e.client.$count(s),m=i.limit||10;F(E,{...k,limit:m+1});const R=E.as("paged_entities"),M=this.#e.client.with(b,w,R).select({...$("paged_entities"),domains:this.#r("paged_entities").as("domains"),owners:this.#s("paged_entities").as("owners")}).from(R),[Q,H]=await Promise.all([M.run(),f]),T=Q.rows,j=T.length>m;return{items:T.slice(0,m).map(D=>L(D)).filter(D=>D!==null),hasMore:j,total:H}}catch(s){return J.error("Error getting entities with relations (owner optimized path): "+s.message),{items:[],hasMore:!1,total:0}}}async#d(i,o,a){const l=this.#n(a),c=this.#o(),h=this.#l(),b=c.as("combined_relations"),w=h.as("combined_target_entities"),u=o.map(s=>e`
+        `),y=c.length===1?c[0]:e`(${e.join(c,e` OR `)})`;$=e`(${v} AND ${y})`}const D=P(i.filter,["owners","domains"]),S={...i,filter:D,baseWhereCondition:$},R=this.#e.client.select(f).from(u.as("base_entities")).$dynamic();try{const c=this.#e.client.select(f).from(u.as("base_entities")).$dynamic();J(c,{...S,limit:void 0,skip:void 0,after:void 0,before:void 0});const y=this.#e.client.$count(c),m=i.limit||10;J(R,{...S,limit:m+1});const E=R.as("paged_entities"),M=this.#e.client.with(A,T,w,E).select({...C("paged_entities"),domains:this.#r("paged_entities",n).as("domains"),owners:this.#s("paged_entities",n).as("owners")}).from(E),[H,K]=await Promise.all([M.run(),y]),Q=H.rows,q=Q.length>m;return{items:Q.slice(0,m).map(O=>V(O)).filter(O=>O!==null),hasMore:q,total:K}}catch(c){return z.error("Error getting entities with relations (owner optimized path): "+c.message),{items:[],hasMore:!1,total:0}}}async#a(i,s,n,o,l){const u=this.#o(n,o,l),h=this.#l(),b=this.#i(o,l),A=h.as("combined_relations"),T=b.as("combined_target_entities"),w=this.#n().as("combined_target_attributes"),_=s.map(c=>e`
         EXISTS (
-          SELECT 1 FROM (${c}) cr
-          JOIN (${h}) d ON d.key = ${s}
+          SELECT 1 FROM (${h}) cr
+          JOIN (${b}) d ON d.key = ${c}
           WHERE d.type = 'domain'
             AND d.is_current = 1
-            AND cr.source_key = ${s}
+            AND cr.source_key = ${c}
             AND cr.target_key = base_entities.key
             AND cr.source_to_target_relation = 'hasParts'
         )
-      `),y=u.length===1?u[0]:e`(${e.join(u,e` OR `)})`,N=W(i.filter,"owners");let v=y;if(N.length>0){const s=N.map(m=>e`
+      `),v=_.length===1?_[0]:e`(${e.join(_,e` OR `)})`,g=B(i.filter,"owners");let $=v;if(g.length>0){const c=g.map(m=>e`
           EXISTS (
-            SELECT 1 FROM (${c}) cr
+            SELECT 1 FROM (${h}) cr
             WHERE cr.source_key = ${m}
               AND cr.source_to_target_relation = 'owns'
               AND cr.target_key = base_entities.key
           )
-        `),f=s.length===1?s[0]:e`(${e.join(s,e` OR `)})`;v=e`(${y} AND ${f})`}const p=q(i.filter,["domains","owners"]),k={...i,filter:p,baseWhereCondition:v},E=this.#e.client.select(d).from(l.as("base_entities")).$dynamic();try{const s=this.#e.client.select(d).from(l.as("base_entities")).$dynamic();F(s,{...k,limit:void 0,skip:void 0,after:void 0,before:void 0});const f=this.#e.client.$count(s),m=i.limit||10;F(E,{...k,limit:m+1});const R=E.as("paged_entities"),M=this.#e.client.with(b,w,R).select({...$("paged_entities"),domains:this.#r("paged_entities").as("domains"),owners:this.#s("paged_entities").as("owners")}).from(R),[Q,H]=await Promise.all([M.run(),f]),T=Q.rows,j=T.length>m;return{items:T.slice(0,m).map(D=>L(D)).filter(D=>D!==null),hasMore:j,total:H}}catch(s){return J.error("Error getting entities with relations (domain optimized path): "+s.message),{items:[],hasMore:!1,total:0}}}async#m(i,o){const a=this.#n(o),l=this.#o(),c=this.#l(),h=l.as("combined_relations"),b=c.as("combined_target_entities"),w=this.#e.client.select(d).from(a.as("base_entities")).$dynamic(),{whereCondition:u}=U(w,i.filter);u&&w.where(u);try{const y=this.#e.client.select(d).from(a.as("base_entities")).$dynamic();u&&y.where(u);const N=this.#e.client.$count(y),v=i.limit||10;F(w,{...i,limit:v+1});const p=w.as("paged_entities"),k=this.#e.client.with(h,b,p).select({...$("paged_entities"),domains:this.#r("paged_entities").as("domains"),owners:this.#s("paged_entities").as("owners")}).from(p),[E,s]=await Promise.all([k.run(),N]),f=E.rows,m=f.length>v;return{items:f.slice(0,v).map(R=>L(R)).filter(R=>R!==null),hasMore:m,total:s}}catch(y){return J.error("Error getting entities with relations (optimized path): "+y.message),{items:[],hasMore:!1,total:0}}}#n(i){return this.#t?S(this.#e.client.select($("entities")).from(e`remote.entities`).leftJoin(e`remote.entities_attributes`,r(t.key,_.entityKey)).where(n(r(e.raw("is_current"),1),r(e.raw("is_deleted"),!1),this.#i(i),g(this.#e.client.select({id:d.id}).from(t).where(n(e`${t.key} = remote.entities.key`,e`${t.version} = remote.entities.version`,e`${t.revision} = remote.entities.revision`))),B("remote.entities.key","remote.entities.version","remote.entities.revision"))),this.#e.client.select($("entities")).from(t).leftJoin(_,r(t.key,_.entityKey)).where(n(r(t.isCurrent,!0),r(t.isDeleted,!1),this.#i(i),g(this.#e.client.select({id:e.raw("id")}).from(e`remote.entities as r`).where(n(e`r.key = ${t.key}`,e`r.version = ${t.version}`,e`r.revision = ${t.revision}`))),B("entities.key","entities.version","entities.revision"))),this.#e.client.select(I("r","l")).from(e`remote.entities as r`).innerJoin(e`entities as l`,e`l.key = r.key AND l.version = r.version AND l.revision = r.revision`).leftJoin(e`entities_attributes as ea`,e`l.key = ea.entity_key`).where(n(A(r(e.raw("r.is_current"),1),r(e.raw("l.is_current"),1)),A(r(e.raw("r.is_deleted"),!1),r(e.raw("l.is_deleted"),!1)),this.#c(i,"ea"),B("r.key","r.version","r.revision")))):this.#e.client.select($("entities")).from(t).leftJoin(_,r(t.key,_.entityKey)).where(n(r(t.isCurrent,!0),r(t.isDeleted,!1),this.#i(i)))}#o(){return this.#t?S(this.#e.client.select(C).from(e`remote.entities_relations`),this.#e.client.select(C).from(O).where(g(this.#e.client.select({id:C.id}).from(e`remote.entities_relations as remote`).where(e`remote.source_key = ${O.sourceKey}`)))):this.#e.client.select(C).from(O)}#l(){return this.#t?S(this.#e.client.select(d).from(e`remote.entities`).where(n(r(e.raw("is_current"),1),r(e.raw("is_deleted"),!1),g(this.#e.client.select({id:d.id}).from(t).where(n(e`${t.key} = remote.entities.key`,e`${t.version} = remote.entities.version`,e`${t.revision} = remote.entities.revision`))))),this.#e.client.select(d).from(t).where(n(r(t.isCurrent,!0),r(t.isDeleted,!1),g(this.#e.client.select({id:e.raw("id")}).from(e`remote.entities as r`).where(n(e`r.key = ${t.key}`,e`r.version = ${t.version}`,e`r.revision = ${t.revision}`))))),this.#e.client.select(I("r","l")).from(e`remote.entities as r`).innerJoin(e`entities as l`,e`l.key = r.key AND l.version = r.version AND l.revision = r.revision`).where(n(A(r(e.raw("r.is_current"),1),r(e.raw("l.is_current"),1)),A(r(e.raw("r.is_deleted"),!1),r(e.raw("l.is_deleted"),!1))))):this.#e.client.select(d).from(t).where(n(r(t.isCurrent,!0),r(t.isDeleted,!1)))}async getEntityWithRelationsByKey(i,o,a){if(!i||i.trim()==="")return null;const l=o?.revision,c=o?.version,h=l?null:await this.#h(i,c||null),b=c??h?.version,w=l||h?.revision||null,y=(this.#t?S(this.#e.client.select($("entities")).from(e`remote.entities`).leftJoin(e`remote.entities_attributes`,r(t.key,_.entityKey)).where(n(e`remote.entities.key = ${i}`,this.#i(a),g(this.#e.client.select({id:d.id}).from(t).where(n(e`${t.key} = remote.entities.key`,e`${t.version} = remote.entities.version`,e`${t.revision} = remote.entities.revision`))))),this.#e.client.select($("entities")).from(t).leftJoin(_,r(t.key,_.entityKey)).where(n(r(t.key,i),this.#i(a),g(this.#e.client.select({id:e.raw("id")}).from(e`remote.entities as r`).where(n(e`r.key = ${t.key}`,e`r.version = ${t.version}`,e`r.revision = ${t.revision}`))))),this.#e.client.select(I("r","l")).from(e`remote.entities as r`).innerJoin(e`entities as l`,e`l.key = r.key AND l.version = r.version AND l.revision = r.revision`).leftJoin(e`entities_attributes as ea`,e`l.key = ea.entity_key`).where(n(e`r.key = ${i}`,this.#c(a,"ea")))):this.#e.client.select($("entities")).from(t).leftJoin(_,r(t.key,_.entityKey)).where(n(r(t.key,i),this.#i(a)))).as("e"),v=(this.#t?S(this.#e.client.select(C).from(e`remote.entities_relations`),this.#e.client.select(C).from(O).where(g(this.#e.client.select({id:C.id}).from(e`remote.entities_relations as remote`).where(e`remote.source_key = ${O.sourceKey}`)))):this.#e.client.select(C).from(O)).as("combined_relations"),k=(this.#t?S(this.#e.client.select(d).from(e`remote.entities`).where(g(this.#e.client.select({id:d.id}).from(t).where(n(e`${t.key} = remote.entities.key`,e`${t.version} = remote.entities.version`,e`${t.revision} = remote.entities.revision`)))),this.#e.client.select(d).from(t).where(g(this.#e.client.select({id:e.raw("id")}).from(e`remote.entities as r`).where(n(e`r.key = ${t.key}`,e`r.version = ${t.version}`,e`r.revision = ${t.revision}`)))),this.#e.client.select(I("r","l")).from(e`remote.entities as r`).innerJoin(e`entities as l`,e`l.key = r.key AND l.version = r.version AND l.revision = r.revision`)):this.#e.client.select(d).from(t)).as("combined_target_entities"),E=this.#e.client.with(y,v,k).select({...$("e"),domains:this.#r("e").as("domains"),owners:this.#s("e").as("owners")}).from(y).$dynamic();w?E.where(n(r(e.raw("revision"),w),b?r(e.raw("version"),b):void 0)):E.where(r(e.raw("is_current"),1)),E.limit(1);const s=await E.run();if(s.rows.length===0)return null;const f=s.rows[0];return L(f)}async#h(i,o){if(o){const c=await(this.#t?S(this.#e.client.select({version:e.raw("version"),revision:e.raw("revision")}).from(e`remote.entities`).where(n(e`key = ${i}`,e`version = ${o}`)).orderBy(e.raw("revision DESC")),this.#e.client.select({version:t.version,revision:t.revision}).from(t).where(n(r(t.key,i),r(t.version,o),g(this.#e.client.select({id:e.raw("id")}).from(e`remote.entities as remote`).where(n(e`remote.key = ${t.key}`,e`remote.version = ${o}`))))).orderBy(V(t.revision))):this.#e.client.select({version:t.version,revision:t.revision}).from(t).where(n(r(t.key,i),r(t.version,o))).orderBy(V(t.revision))).limit(1).run();if(c.rows.length>0){const h=c.rows[0];return{version:h.version||null,revision:h.revision||null}}return null}if(this.#t){const l=await this.#e.client.select({version:e.raw("version"),revision:e.raw("revision")}).from(e`(
-            SELECT version, revision, ROW_NUMBER() OVER (ORDER BY ${Y("version")} DESC, revision DESC) as rn
+        `),y=c.length===1?c[0]:e`(${e.join(c,e` OR `)})`;$=e`(${v} AND ${y})`}const D=P(i.filter,["domains","owners"]),S={...i,filter:D,baseWhereCondition:$},R=this.#e.client.select(f).from(u.as("base_entities")).$dynamic();try{const c=this.#e.client.select(f).from(u.as("base_entities")).$dynamic();J(c,{...S,limit:void 0,skip:void 0,after:void 0,before:void 0});const y=this.#e.client.$count(c),m=i.limit||10;J(R,{...S,limit:m+1});const E=R.as("paged_entities"),M=this.#e.client.with(A,T,w,E).select({...C("paged_entities"),domains:this.#r("paged_entities",n).as("domains"),owners:this.#s("paged_entities",n).as("owners")}).from(E),[H,K]=await Promise.all([M.run(),y]),Q=H.rows,q=Q.length>m;return{items:Q.slice(0,m).map(O=>V(O)).filter(O=>O!==null),hasMore:q,total:K}}catch(c){return z.error("Error getting entities with relations (domain optimized path): "+c.message),{items:[],hasMore:!1,total:0}}}async#m(i,s,n,o){const l=this.#o(s,n,o),u=this.#l(),h=this.#i(n,o),b=u.as("combined_relations"),A=h.as("combined_target_entities"),I=this.#n().as("combined_target_attributes"),w=this.#e.client.select(f).from(l.as("base_entities")).$dynamic(),{whereCondition:_}=Z(w,i.filter);_&&w.where(_);try{const v=this.#e.client.select(f).from(l.as("base_entities")).$dynamic();_&&v.where(_);const g=this.#e.client.$count(v),$=i.limit||10;J(w,{...i,limit:$+1});const D=w.as("paged_entities"),S=this.#e.client.with(b,A,I,D).select({...C("paged_entities"),domains:this.#r("paged_entities",s).as("domains"),owners:this.#s("paged_entities",s).as("owners")}).from(D),[R,c]=await Promise.all([S.run(),g]),y=R.rows,m=y.length>$;return{items:y.slice(0,$).map(E=>V(E)).filter(E=>E!==null),hasMore:m,total:c}}catch(v){return z.error("Error getting entities with relations (optimized path): "+v.message),{items:[],hasMore:!1,total:0}}}#o(i,s,n){const o=N(s,n,"remote.entities"),l=N(s,n,"entities"),u=N(s,n,"r");return this.#t?W(this.#e.client.select(C("entities")).from(e`remote.entities`).leftJoin(e`remote.entities_attributes`,r(t.key,d.entityKey)).where(a(r(e.raw("is_current"),1),r(e.raw("is_deleted"),!1),p(i,"remote.entities_attributes"),o,k(this.#e.client.select({id:f.id}).from(t).where(a(e`${t.key} = remote.entities.key`,e`${t.version} = remote.entities.version`,e`${t.revision} = remote.entities.revision`))),Y("remote.entities.key","remote.entities.version","remote.entities.revision"))),this.#e.client.select(C("entities")).from(t).leftJoin(d,r(t.key,d.entityKey)).where(a(r(t.isCurrent,!0),r(t.isDeleted,!1),p(i,"entities_attributes"),l,k(this.#e.client.select({id:e.raw("id")}).from(e`remote.entities as r`).where(a(e`r.key = ${t.key}`,e`r.version = ${t.version}`,e`r.revision = ${t.revision}`))),Y("entities.key","entities.version","entities.revision"))),this.#e.client.select(X("r","l")).from(e`remote.entities as r`).innerJoin(e`entities as l`,e`l.key = r.key AND l.version = r.version AND l.revision = r.revision`).leftJoin(e`entities_attributes as ea`,e`l.key = ea.entity_key`).where(a(j(r(e.raw("r.is_current"),1),r(e.raw("l.is_current"),1)),j(r(e.raw("r.is_deleted"),!1),r(e.raw("l.is_deleted"),!1)),p(i,"ea"),u,Y("r.key","r.version","r.revision")))):this.#e.client.select(C("entities")).from(t).leftJoin(d,r(t.key,d.entityKey)).where(a(r(t.isCurrent,!0),r(t.isDeleted,!1),p(i,"entities_attributes"),l))}#l(){return this.#t?W(this.#e.client.select(F).from(e`remote.entities_relations`),this.#e.client.select(F).from(L).where(k(this.#e.client.select({id:F.id}).from(e`remote.entities_relations as remote`).where(e`remote.source_key = ${L.sourceKey}`)))):this.#e.client.select(F).from(L)}#i(i,s){const n=N(i,s,"remote.entities"),o=N(i,s,"entities"),l=N(i,s,"r");return this.#t?W(this.#e.client.select(f).from(e`remote.entities`).where(a(r(e.raw("is_current"),1),r(e.raw("is_deleted"),!1),n,k(this.#e.client.select({id:f.id}).from(t).where(a(e`${t.key} = remote.entities.key`,e`${t.version} = remote.entities.version`,e`${t.revision} = remote.entities.revision`))))),this.#e.client.select(f).from(t).where(a(r(t.isCurrent,!0),r(t.isDeleted,!1),o,k(this.#e.client.select({id:e.raw("id")}).from(e`remote.entities as r`).where(a(e`r.key = ${t.key}`,e`r.version = ${t.version}`,e`r.revision = ${t.revision}`))))),this.#e.client.select(X("r","l")).from(e`remote.entities as r`).innerJoin(e`entities as l`,e`l.key = r.key AND l.version = r.version AND l.revision = r.revision`).where(a(j(r(e.raw("r.is_current"),1),r(e.raw("l.is_current"),1)),j(r(e.raw("r.is_deleted"),!1),r(e.raw("l.is_deleted"),!1)),l))):this.#e.client.select(f).from(t).where(a(r(t.isCurrent,!0),r(t.isDeleted,!1),o))}async getEntityWithRelationsByKey({entityKey:i,filter:s,rbacTeams:n,excludedTypes:o,excludedEntities:l}){if(!i||i.trim()==="")return null;const u=s?.revision,h=s?.version,b=u?null:await this.#u(i,h||null),A=h??b?.version,T=u||b?.revision||null,I=N(o,l,"remote.entities"),w=N(o,l,"entities"),_=N(o,l,"r"),g=(this.#t?W(this.#e.client.select(C("entities")).from(e`remote.entities`).leftJoin(e`remote.entities_attributes`,r(t.key,d.entityKey)).where(a(e`remote.entities.key = ${i}`,p(n,"remote.entities_attributes"),I,k(this.#e.client.select({id:f.id}).from(t).where(a(e`${t.key} = remote.entities.key`,e`${t.version} = remote.entities.version`,e`${t.revision} = remote.entities.revision`))))),this.#e.client.select(C("entities")).from(t).leftJoin(d,r(t.key,d.entityKey)).where(a(r(t.key,i),p(n,"entities_attributes"),w,k(this.#e.client.select({id:e.raw("id")}).from(e`remote.entities as r`).where(a(e`r.key = ${t.key}`,e`r.version = ${t.version}`,e`r.revision = ${t.revision}`))))),this.#e.client.select(X("r","l")).from(e`remote.entities as r`).innerJoin(e`entities as l`,e`l.key = r.key AND l.version = r.version AND l.revision = r.revision`).leftJoin(e`entities_attributes as ea`,e`l.key = ea.entity_key`).where(a(e`r.key = ${i}`,p(n,"ea"),_))):this.#e.client.select(C("entities")).from(t).leftJoin(d,r(t.key,d.entityKey)).where(a(r(t.key,i),p(n,"entities_attributes"),w))).as("e"),D=(this.#t?W(this.#e.client.select(F).from(e`remote.entities_relations`),this.#e.client.select(F).from(L).where(k(this.#e.client.select({id:F.id}).from(e`remote.entities_relations as remote`).where(e`remote.source_key = ${L.sourceKey}`)))):this.#e.client.select(F).from(L)).as("combined_relations"),R=this.#i(o,l).as("combined_target_entities"),y=this.#n().as("combined_target_attributes"),m=this.#e.client.with(g,D,R,y).select({...C("e"),domains:this.#r("e",n).as("domains"),owners:this.#s("e",n).as("owners")}).from(g).$dynamic();T?m.where(a(r(e.raw("revision"),T),A?r(e.raw("version"),A):void 0)):m.where(r(e.raw("is_current"),1)),m.limit(1);const E=await m.run();if(E.rows.length===0)return null;const M=E.rows[0];return V(M)}async#u(i,s){if(s){const l=await(this.#t?W(this.#e.client.select({version:e.raw("version"),revision:e.raw("revision")}).from(e`remote.entities`).where(a(e`key = ${i}`,e`version = ${s}`)).orderBy(e.raw("revision DESC")),this.#e.client.select({version:t.version,revision:t.revision}).from(t).where(a(r(t.key,i),r(t.version,s),k(this.#e.client.select({id:e.raw("id")}).from(e`remote.entities as remote`).where(a(e`remote.key = ${t.key}`,e`remote.version = ${s}`))))).orderBy(U(t.revision))):this.#e.client.select({version:t.version,revision:t.revision}).from(t).where(a(r(t.key,i),r(t.version,s))).orderBy(U(t.revision))).limit(1).run();if(l.rows.length>0){const u=l.rows[0];return{version:u.version||null,revision:u.revision||null}}return null}if(this.#t){const o=await this.#e.client.select({version:e.raw("version"),revision:e.raw("revision")}).from(e`(
+            SELECT version, revision, ROW_NUMBER() OVER (ORDER BY ${x("version")} DESC, revision DESC) as rn
             FROM (
               SELECT version, revision FROM remote.entities WHERE key = ${i} AND is_current = 1
               UNION ALL
               SELECT version, revision FROM entities WHERE key = ${i} AND is_current = 1
             )
-          ) as ranked_entities`).where(e`rn = 1`).limit(1).run();if(l.rows.length>0){const c=l.rows[0];return{version:c.version||null,revision:c.revision||null}}return null}const a=await this.#e.client.select({version:t.version,revision:t.revision}).from(t).where(n(r(t.key,i),r(t.isCurrent,!0))).limit(1).run();if(a.rows.length>0){const l=a.rows[0];return{version:l.version||null,revision:l.revision||null}}return null}#r(i){return e`
+          ) as ranked_entities`).where(e`rn = 1`).limit(1).run();if(o.rows.length>0){const l=o.rows[0];return{version:l.version||null,revision:l.revision||null}}return null}const n=await this.#e.client.select({version:t.version,revision:t.revision}).from(t).where(a(r(t.key,i),r(t.isCurrent,!0))).limit(1).run();if(n.rows.length>0){const o=n.rows[0];return{version:o.version||null,revision:o.revision||null}}return null}#r(i,s){const{join:n,filter:o}=G(s,"d.key");return e`
       COALESCE(
         (
           SELECT json_group_array(
@@ -59,10 +59,12 @@ import{and as n,desc as V,eq as r,notExists as g,sql as e,or as A,isNull as X,ex
             SELECT DISTINCT d.*
             FROM combined_relations er
             JOIN combined_target_entities d ON d.key = er.source_key
+            ${n}
             WHERE er.source_to_target_relation = 'hasParts'
               AND er.target_key = ${e.raw(`${i}.key`)}
               AND d.type = 'domain'
               AND d.is_current = 1
+              ${o}
               AND CASE 
                 WHEN ${e.raw(`${i}.version`)} = '' 
                 THEN er.target_version = ''
@@ -78,7 +80,7 @@ import{and as n,desc as V,eq as r,notExists as g,sql as e,or as A,isNull as X,ex
         ),
         json_array()
       )
-    `}#s(i){return e`
+    `}#s(i,s){const{join:n,filter:o}=G(s,"o.key");return e`
       COALESCE(
         (
           SELECT json_group_array(
@@ -98,9 +100,11 @@ import{and as n,desc as V,eq as r,notExists as g,sql as e,or as A,isNull as X,ex
             SELECT DISTINCT o.*
             FROM combined_relations er
             JOIN combined_target_entities o ON o.key = er.source_key
+            ${n}
             WHERE er.source_to_target_relation = 'owns'
               AND er.target_key = ${e.raw(`${i}.key`)}
               AND o.is_current = 1
+              ${o}
               AND CASE 
                 WHEN ${e.raw(`${i}.version`)} = '' 
                 THEN er.target_version = ''
@@ -116,4 +120,4 @@ import{and as n,desc as V,eq as r,notExists as g,sql as e,or as A,isNull as X,ex
         ),
         json_array()
       )
-    `}#i(i){if(!(!i||i.length===0))return A(X(_.rbacTeams),e`json_array_length(${_.rbacTeams}) = 0`,x(this.#e.client.select({id:e.raw("1")}).from(e`json_each(${_.rbacTeams}) as entity_teams`).where(z(e`entity_teams.value`,i))))}#c(i,o="ea"){if(!(!i||i.length===0))return A(e.raw(`${o}.rbac_teams IS NULL`),e.raw(`json_array_length(${o}.rbac_teams) = 0`),x(this.#e.client.select({id:e.raw("1")}).from(e.raw(`json_each(${o}.rbac_teams) as entity_teams`)).where(z(e`entity_teams.value`,i))))}}export{ae as CatalogEntitiesBffRepository};
+    `}#n(){return this.#t?W(this.#e.client.select({entityKey:e.raw("entity_key"),rbacTeams:e.raw("rbac_teams")}).from(e`remote.entities_attributes`),this.#e.client.select({entityKey:d.entityKey,rbacTeams:d.rbacTeams}).from(d).where(k(this.#e.client.select({id:e.raw("1")}).from(e`remote.entities_attributes as remote`).where(e`remote.entity_key = ${d.entityKey}`)))):this.#e.client.select({entityKey:d.entityKey,rbacTeams:d.rbacTeams}).from(d)}}export{ye as CatalogEntitiesBffRepository};

package/dist/server/plugins/catalog-entities/database/repositories/local/catalog-entities-local-read-repository.d.ts

@@ -3,6 +3,7 @@ import type { PaginationParams } from '../../../../../providers/database/paginat
 import type { EntityRelationReadModelSchema } from '../../../schemas/read-model-schemas.js';
 import type { DatabaseClient } from '../../../../../providers/database/client.js';
 import type { Filter } from '../../../../../providers/database/pagination/types.js';
+import type { GetEntityByIdParams } from '../../../types/params.js';
 import { type EntityReadModelSchema, type EntityRevisionSummary } from '../../../schemas/read-model-schemas.js';
 export type ListResult<T> = {
     items: T[];
@@ -12,6 +13,9 @@ export type ListResult<T> = {
 export type CatalogFiltersParams = {
     entitiesTypes?: string[];
     emptyFilters?: string[];
+    rbacTeams?: string[];
+    excludedTypes?: string[];
+    excludedEntities?: string[];
 };
 export type FilterOption = {
     value: string;
@@ -21,22 +25,38 @@ export declare class CatalogEntitiesLocalReadRepository {
     #private;
     constructor(db: DatabaseClient);
     attachDatabase(databasePath: string): Promise<void>;
-    getEntities(paginationParams?: PaginationParams): Promise<ListResult<EntityReadModelSchema>>;
+    getEntities({ paginationParams, rbacTeams, excludedTypes, excludedEntities, }: {
+        paginationParams: PaginationParams;
+        rbacTeams?: string[];
+        excludedTypes?: string[];
+        excludedEntities?: string[];
+    }): Promise<ListResult<EntityReadModelSchema>>;
     getEntityKeysAndVersionsBySourceFile(sourceFile: string): Promise<Set<string>>;
     listEntityRevisions(entityKey: string, version?: string | null): Promise<EntityRevisionSummary[]>;
     getEntitiesCountByTypes(): Promise<{
         type: string;
         count: number;
     }[]>;
-    getEntityById(id: string): Promise<EntityReadModelSchema | null>;
+    getEntityById(id: string, params?: GetEntityByIdParams): Promise<EntityReadModelSchema | null>;
     getOutdatedEntities(filter?: Filter): Promise<EntityReadModelSchema[]>;
     getEntitiesRelations(paginationParams?: PaginationParams): Promise<ListResult<EntityRelationReadModelSchema>>;
     getEntityRelationById(id: string): Promise<EntityRelationReadModelSchema | null>;
-    getEntitiesWithRelations(paginationParams?: PaginationParams, rbacTeams?: string[]): Promise<ListResult<BffCatalogEntity>>;
-    getEntityWithRelationsByKey(entityKey: string, filter?: {
-        revision?: string | null;
-        version?: string | null;
-    }, rbacTeams?: string[]): Promise<BffCatalogEntity | null>;
+    getEntitiesWithRelations({ paginationParams, rbacTeams, excludedEntities, excludedTypes, }: {
+        paginationParams: PaginationParams;
+        rbacTeams?: string[];
+        excludedEntities?: string[];
+        excludedTypes?: string[];
+    }): Promise<ListResult<BffCatalogEntity>>;
+    getEntityWithRelationsByKey({ entityKey, filter, rbacTeams, excludedTypes, excludedEntities, }: {
+        entityKey: string;
+        filter?: {
+            revision?: string | null;
+            version?: string | null;
+        };
+        rbacTeams?: string[];
+        excludedTypes?: string[];
+        excludedEntities?: string[];
+    }): Promise<BffCatalogEntity | null>;
     getRelationsForEntity(key: string, version?: string | null, revision?: string | null): Promise<{
         targetKey: string;
         targetRevision: string;
@@ -44,7 +64,13 @@ export declare class CatalogEntitiesLocalReadRepository {
         direction: "outgoing" | "incoming";
         priority: number;
     }[]>;
-    getRelatedEntities(key: string, paginationParams?: PaginationParams): Promise<ListResult<BffCatalogRelatedEntity>>;
-    getCatalogFilters({ entitiesTypes, emptyFilters, }: CatalogFiltersParams): Promise<Record<string, FilterOption[]>>;
+    getRelatedEntities({ key, paginationParams, rbacTeams, excludedTypes, excludedEntities, }: {
+        key: string;
+        paginationParams: PaginationParams;
+        rbacTeams?: string[];
+        excludedTypes?: string[];
+        excludedEntities?: string[];
+    }): Promise<ListResult<BffCatalogRelatedEntity>>;
+    getCatalogFilters({ entitiesTypes, emptyFilters, rbacTeams, excludedTypes, excludedEntities, }: CatalogFiltersParams): Promise<Record<string, FilterOption[]>>;
 }
 //# sourceMappingURL=catalog-entities-local-read-repository.d.ts.map

package/dist/server/plugins/catalog-entities/database/repositories/local/catalog-entities-local-read-repository.js

@@ -1,15 +1,15 @@
-import{and as c,count as v,eq as u,isNotNull as D,notExists as y,or as $,sql as e}from"drizzle-orm";import{unionAll as f}from"drizzle-orm/sqlite-core";import{logger as F}from"../../../../../tools/notifiers/logger.js";import{VERSION_NOT_SPECIFIED as A}from"@redocly/theme/core/constants";import{applyPagination as S}from"../../../../../providers/database/pagination/index.js";import{applyFilter as B}from"../../../../../providers/database/pagination/filter.js";import{FIELDS_TO_SELECT_FOR_ENTITY as _,FIELDS_TO_SELECT_FOR_ENTITY_RELATION as m}from"../utils.js";import{createEntityReadModel as k}from"../../mappers/create-entity-read-model.js";import{createEntityRelation as C}from"../../mappers/create-entity-relation.js";import{entitiesTable as i}from"../../../../../providers/database/databases/catalog-sqlite/schemas/entities-table.js";import{entitiesRelationsTable as E}from"../../../../../providers/database/databases/catalog-sqlite/schemas/entities-relations-table.js";import{CatalogEntitiesRelationsRepository as I}from"./catalog-entities-relations-repository.js";import{CatalogEntitiesBffRepository as g}from"./catalog-entities-bff-repository.js";import{createMergedEntityFieldsForSelect as b}from"../utils/create-merged-entity-fields-for-select.js";import{buildSemanticVersionSortExpr as L}from"../utils/semantic-version-sort.js";import{normalizeRevisionFlags as M}from"../utils/normalize-revision-flags.js";class te{#e;#t=void 0;#i;#r;constructor(t){this.#e=t,this.#i=new I(this.#e,this.#t||""),this.#r=new g(this.#e,this.#t||"")}async attachDatabase(t){this.#t!==t&&(this.#t=t,await this.#e.client.run(e`ATTACH DATABASE ${t} AS remote`),this.#i=new I(this.#e,t),this.#r=new g(this.#e,t))}async getEntities(t={}){const r=this.#t?f(this.#e.client.select(_).from(e`remote.entities`).where(y(this.#e.client.select({id:_.id}).from(i).where(c(e`${i.key} = remote.entities.key`,e`${i.version} = remote.entities.version`,e`${i.revision} = remote.entities.revision`)))),this.#e.client.select(_).from(i).where(y(this.#e.client.select({id:e.raw("id")}).from(e`remote.entities as r`).where(c(e`r.key = ${i.key}`,e`r.version = ${i.version}`,e`r.revision = ${i.revision}`)))),this.#e.client.select(b("r","l")).from(e`remote.entities as r`).innerJoin(e`entities as l`,e`l.key = r.key AND l.version = r.version AND l.revision = r.revision`)):this.#e.client.select(_).from(i),s=this.#e.client.select(_).from(r.as("combined_entities")),n=this.#e.client.select(_).from(r.as("combined_entities")).$dynamic(),d=S(n,{...t,limit:void 0,skip:void 0,after:void 0,before:void 0}),l=this.#e.client.$count(d),a=s.$dynamic(),o=t.limit||10,h=S(a,{...t,limit:o+1}),[N,p]=await Promise.all([h.run(),l]),w=N.rows,T=w.length>o;return{items:w.slice(0,o).map(R=>k(R)).filter(R=>R!==null),hasMore:T,total:p}}async getEntityKeysAndVersionsBySourceFile(t){const r=this.#t?f(this.#e.client.select({keyVersion:e`key || ':' || COALESCE(version, ${A})`.as("keyVersion")}).from(e`remote.entities`).where(c(e`source_file = ${t}`,e`source = 'file'`,e`key IS NOT NULL`)),this.#e.client.select({keyVersion:e`${i.key} || ':' || COALESCE(${i.version}, ${A})`.as("keyVersion")}).from(i).where(c(u(i.sourceFile,t),u(i.source,"file"),e`${i.key} IS NOT NULL`,y(this.#e.client.select({key:e.raw("key")}).from(e`remote.entities as remote`).where(e`remote.key = ${i.key}`))))):this.#e.client.select({keyVersion:e`${i.key} || ':' || COALESCE(${i.version}, ${A})`.as("keyVersion")}).from(i).where(c(u(i.sourceFile,t),u(i.source,"file"),D(i.key))),s=await this.#e.client.selectDistinct({keyVersion:e`combined_keys_versions.keyVersion`}).from(r.as("combined_keys_versions")).run();return new Set(s.rows.map(n=>n.keyVersion))}async listEntityRevisions(t,r){const s=[u(i.key,t),u(i.isDeleted,!1),...r?[u(i.version,r)]:[]],n={version:e.raw("version"),revision:e.raw("revision"),isCurrent:e.raw("is_current"),createdAt:e.raw("created_at"),updatedAt:e.raw("updated_at"),isDefaultVersion:e.raw("is_default_version")},d=this.#t?f(this.#e.client.select(n).from(e`remote.entities`).where(c(e`key = ${t}`,e`is_deleted = 0`,r?e`version = ${r}`:void 0,y(this.#e.client.select({id:e.raw("id")}).from(i).where(c(e`${i.key} = remote.entities.key`,e`${i.version} = remote.entities.version`,e`${i.revision} = remote.entities.revision`))))),this.#e.client.select({version:i.version,revision:i.revision,isCurrent:i.isCurrent,createdAt:i.createdAt,updatedAt:i.updatedAt,isDefaultVersion:i.isDefaultVersion}).from(i).where(c(...s,y(this.#e.client.select({id:e.raw("id")}).from(e`remote.entities as r`).where(c(e`r.key = ${i.key}`,e`r.version = ${i.version}`,e`r.revision = ${i.revision}`))))),this.#e.client.select({version:e.raw("r.version AS version"),revision:e.raw("r.revision AS revision"),isCurrent:e.raw("MAX(r.is_current, l.is_current) AS is_current"),createdAt:e.raw("MIN(r.created_at, l.created_at) AS created_at"),updatedAt:e.raw("MAX(r.updated_at, l.updated_at) AS updated_at"),isDefaultVersion:e.raw("MAX(r.is_default_version, l.is_default_version) AS is_default_version")}).from(e`remote.entities as r`).innerJoin(e`entities as l`,e`l.key = r.key AND l.version = r.version AND l.revision = r.revision`).where(c(e`r.key = ${t}`,e`r.is_deleted = 0`,e`l.is_deleted = 0`,r?e`r.version = ${r}`:void 0))):this.#e.client.select({version:i.version,revision:i.revision,isCurrent:i.isCurrent,createdAt:i.createdAt,updatedAt:i.updatedAt,isDefaultVersion:i.isDefaultVersion}).from(i).where(c(...s)),a=(await this.#e.client.select({version:e.raw("version"),revision:e.raw("revision"),isCurrent:e.raw("is_current"),createdAt:e.raw("created_at"),updatedAt:e.raw("updated_at"),isDefaultVersion:e.raw("is_default_version")}).from(d.as("combined_revisions")).orderBy(e`${L("version")} DESC`,e.raw("revision DESC")).run()).rows.map(o=>({version:o.version||null,revision:o.revision??"",isCurrent:o.is_current!==null?!!o.is_current:!1,createdAt:o.created_at||null,updatedAt:o.updated_at||null,isDefaultVersion:o.is_default_version!==null?!!o.is_default_version:!1}));return M(a),a}async getEntitiesCountByTypes(){if(this.#t){const t=e`
+import{and as u,count as F,eq as _,isNotNull as X,notExists as f,or as J,sql as e}from"drizzle-orm";import{unionAll as p}from"drizzle-orm/sqlite-core";import{logger as q}from"../../../../../tools/notifiers/logger.js";import{VERSION_NOT_SPECIFIED as v}from"@redocly/theme/core/constants";import{applyPagination as R}from"../../../../../providers/database/pagination/index.js";import{applyFilter as P}from"../../../../../providers/database/pagination/filter.js";import{createEntityFieldsForSelect as S,FIELDS_TO_SELECT_FOR_ENTITY as h,FIELDS_TO_SELECT_FOR_ENTITY_RELATION as m}from"../utils.js";import{createEntityReadModel as g}from"../../mappers/create-entity-read-model.js";import{createEntityRelation as b}from"../../mappers/create-entity-relation.js";import{entitiesTable as t}from"../../../../../providers/database/databases/catalog-sqlite/schemas/entities-table.js";import{entitiesRelationsTable as y}from"../../../../../providers/database/databases/catalog-sqlite/schemas/entities-relations-table.js";import{entitiesAttributesTable as d}from"../../../../../providers/database/databases/catalog-sqlite/schemas/entities-attributes-table.js";import{CatalogEntitiesRelationsRepository as $}from"./catalog-entities-relations-repository.js";import{CatalogEntitiesBffRepository as B}from"./catalog-entities-bff-repository.js";import{createMergedEntityFieldsForSelect as j}from"../utils/create-merged-entity-fields-for-select.js";import{buildSemanticVersionSortExpr as M}from"../utils/semantic-version-sort.js";import{normalizeRevisionFlags as x}from"../utils/normalize-revision-flags.js";import{buildEntitiesExclusionFilter as A}from"../utils/build-entities-exclusion-filter.js";import{buildRbacFilter as T,buildRbacFilterRaw as Y}from"../utils/build-rbac-filter.js";class Ee{#e;#t=void 0;#i;#s;constructor(i){this.#e=i,this.#i=new $(this.#e,this.#t||""),this.#s=new B(this.#e,this.#t||"")}async attachDatabase(i){this.#t!==i&&(this.#t=i,await this.#e.client.run(e`ATTACH DATABASE ${i} AS remote`),this.#i=new $(this.#e,i),this.#s=new B(this.#e,i))}async getEntities({paginationParams:i,rbacTeams:s,excludedTypes:r,excludedEntities:n}){const o=A(r,n,"remote.entities"),c=A(r,n,"entities"),a=A(r,n,"r"),l=this.#t?p(this.#e.client.select(S("remote.entities")).from(e`remote.entities`).leftJoin(e`remote.entities_attributes`,_(t.key,d.entityKey)).where(u(T(s,"remote.entities_attributes"),o,f(this.#e.client.select({id:h.id}).from(t).where(u(e`${t.key} = remote.entities.key`,e`${t.version} = remote.entities.version`,e`${t.revision} = remote.entities.revision`))))),this.#e.client.select(S("entities")).from(t).leftJoin(d,_(t.key,d.entityKey)).where(u(T(s,"entities_attributes"),c,f(this.#e.client.select({id:e.raw("id")}).from(e`remote.entities as r`).where(u(e`r.key = ${t.key}`,e`r.version = ${t.version}`,e`r.revision = ${t.revision}`))))),this.#e.client.select(j("r","l")).from(e`remote.entities as r`).innerJoin(e`entities as l`,e`l.key = r.key AND l.version = r.version AND l.revision = r.revision`).leftJoin(e`entities_attributes as ea`,e`l.key = ea.entity_key`).where(u(T(s,"ea"),a))):this.#e.client.select(S("entities")).from(t).leftJoin(d,_(t.key,d.entityKey)).where(u(T(s,"entities_attributes"),c)),N=this.#e.client.select(h).from(l.as("combined_entities")),E=this.#e.client.select(h).from(l.as("combined_entities")).$dynamic(),k=R(E,{...i,limit:void 0,skip:void 0,after:void 0,before:void 0}),O=this.#e.client.$count(k),w=N.$dynamic(),I=i.limit||10,U=R(w,{...i,limit:I+1}),[W,V]=await Promise.all([U.run(),O]),D=W.rows,H=D.length>I;return{items:D.slice(0,I).map(C=>g(C)).filter(C=>C!==null),hasMore:H,total:V}}async getEntityKeysAndVersionsBySourceFile(i){const s=this.#t?p(this.#e.client.select({keyVersion:e`key || ':' || COALESCE(version, ${v})`.as("keyVersion")}).from(e`remote.entities`).where(u(e`source_file = ${i}`,e`source = 'file'`,e`key IS NOT NULL`)),this.#e.client.select({keyVersion:e`${t.key} || ':' || COALESCE(${t.version}, ${v})`.as("keyVersion")}).from(t).where(u(_(t.sourceFile,i),_(t.source,"file"),e`${t.key} IS NOT NULL`,f(this.#e.client.select({key:e.raw("key")}).from(e`remote.entities as remote`).where(e`remote.key = ${t.key}`))))):this.#e.client.select({keyVersion:e`${t.key} || ':' || COALESCE(${t.version}, ${v})`.as("keyVersion")}).from(t).where(u(_(t.sourceFile,i),_(t.source,"file"),X(t.key))),r=await this.#e.client.selectDistinct({keyVersion:e`combined_keys_versions.keyVersion`}).from(s.as("combined_keys_versions")).run();return new Set(r.rows.map(n=>n.keyVersion))}async listEntityRevisions(i,s){const r=[_(t.key,i),_(t.isDeleted,!1),...s?[_(t.version,s)]:[]],n={version:e.raw("version"),revision:e.raw("revision"),isCurrent:e.raw("is_current"),createdAt:e.raw("created_at"),updatedAt:e.raw("updated_at"),isDefaultVersion:e.raw("is_default_version")},o=this.#t?p(this.#e.client.select(n).from(e`remote.entities`).where(u(e`key = ${i}`,e`is_deleted = 0`,s?e`version = ${s}`:void 0,f(this.#e.client.select({id:e.raw("id")}).from(t).where(u(e`${t.key} = remote.entities.key`,e`${t.version} = remote.entities.version`,e`${t.revision} = remote.entities.revision`))))),this.#e.client.select({version:t.version,revision:t.revision,isCurrent:t.isCurrent,createdAt:t.createdAt,updatedAt:t.updatedAt,isDefaultVersion:t.isDefaultVersion}).from(t).where(u(...r,f(this.#e.client.select({id:e.raw("id")}).from(e`remote.entities as r`).where(u(e`r.key = ${t.key}`,e`r.version = ${t.version}`,e`r.revision = ${t.revision}`))))),this.#e.client.select({version:e.raw("r.version AS version"),revision:e.raw("r.revision AS revision"),isCurrent:e.raw("MAX(r.is_current, l.is_current) AS is_current"),createdAt:e.raw("MIN(r.created_at, l.created_at) AS created_at"),updatedAt:e.raw("MAX(r.updated_at, l.updated_at) AS updated_at"),isDefaultVersion:e.raw("MAX(r.is_default_version, l.is_default_version) AS is_default_version")}).from(e`remote.entities as r`).innerJoin(e`entities as l`,e`l.key = r.key AND l.version = r.version AND l.revision = r.revision`).where(u(e`r.key = ${i}`,e`r.is_deleted = 0`,e`l.is_deleted = 0`,s?e`r.version = ${s}`:void 0))):this.#e.client.select({version:t.version,revision:t.revision,isCurrent:t.isCurrent,createdAt:t.createdAt,updatedAt:t.updatedAt,isDefaultVersion:t.isDefaultVersion}).from(t).where(u(...r)),a=(await this.#e.client.select({version:e.raw("version"),revision:e.raw("revision"),isCurrent:e.raw("is_current"),createdAt:e.raw("created_at"),updatedAt:e.raw("updated_at"),isDefaultVersion:e.raw("is_default_version")}).from(o.as("combined_revisions")).orderBy(e`${M("version")} DESC`,e.raw("revision DESC")).run()).rows.map(l=>({version:l.version||null,revision:l.revision??"",isCurrent:l.is_current!==null?!!l.is_current:!1,createdAt:l.created_at||null,updatedAt:l.updated_at||null,isDefaultVersion:l.is_default_version!==null?!!l.is_default_version:!1}));return x(a),a}async getEntitiesCountByTypes(){if(this.#t){const i=e`
         SELECT key, type, version,
           ROW_NUMBER() OVER (
             PARTITION BY key 
-            ORDER BY ${L("version")} DESC
+            ORDER BY ${M("version")} DESC
           ) as rn
         FROM (
           SELECT key, type, version FROM remote.entities WHERE is_current = 1 AND is_deleted = 0
           UNION ALL
           SELECT key, type, version FROM entities WHERE is_current = 1 AND is_deleted = 0
         )
-      `;return this.#e.client.select({type:e`type`,count:v()}).from(e`(SELECT * FROM (${t}) WHERE rn = 1) as highest_version_entities`).groupBy(e`type`)}return this.#e.client.select({type:i.type,count:v()}).from(i).where(c(u(i.isCurrent,!0),u(i.isDeleted,!1))).groupBy(i.type)}async getEntityById(t){const n=(await(this.#t?f(this.#e.client.select(_).from(e`remote.entities`).where(e`id = ${t}`),this.#e.client.select(_).from(i).where(u(i.id,t))):this.#e.client.select(_).from(i).where(u(i.id,t))).run()).rows[0];return n?k(n):null}async getOutdatedEntities(t){const r=this.#t?f(this.#e.client.select(_).from(e`remote.entities`),this.#e.client.select(_).from(i).where(y(this.#e.client.select({id:_.id}).from(e`remote.entities as remote`).where(e`remote.key = ${i.key}`)))):this.#e.client.select(_).from(i),s=this.#e.client.select(_).from(r.as("combined_entities")).$dynamic(),{whereCondition:n}=B(s,t),d=$(e`combined_entities.scorecards_status = 'OUTDATED'`,e`combined_entities.scorecards_status IS NULL`),l=n?c(n,d):d;return(await s.where(l).run()).rows.map(o=>k(o)).filter(o=>o!==null)}async getEntitiesRelations(t={}){const r=this.#t?f(this.#e.client.select(m).from(e`remote.entities_relations`),this.#e.client.select(m).from(E).where(y(this.#e.client.select({id:m.id}).from(e`remote.entities_relations as remote`).where(e`remote.source_key = ${E.sourceKey}`)))):this.#e.client.select(m).from(E),s=this.#e.client.select(m).from(r.as("combined_entities_relations")).$dynamic(),n=this.#e.client.select(m).from(r.as("combined_entities_relations")).$dynamic(),d=S(n,{...t,limit:void 0,skip:void 0,after:void 0,before:void 0}),l=this.#e.client.$count(d),a=t.limit||10,o=S(s,{...t,limit:a+1}),[h,N]=await Promise.all([o.run(),l]),p=h.rows,w=p.length>a;return{items:p.slice(0,a).map(T=>C(T)).filter(T=>T!==null),hasMore:w,total:N}}async getEntityRelationById(t){const n=(await(this.#t?f(this.#e.client.select(m).from(e`remote.entities_relations`).where(u(E.id,t)),this.#e.client.select(m).from(E).where(c(u(E.id,t),y(this.#e.client.select({id:m.id}).from(e`remote.entities_relations as remote`).where(e`remote.id = ${E.id}`))))):this.#e.client.select(m).from(E).where(u(E.id,t))).run()).rows[0];return n?C(n):null}async getEntitiesWithRelations(t={},r){return this.#r.getEntitiesWithRelations(t,r)}async getEntityWithRelationsByKey(t,r,s){return this.#r.getEntityWithRelationsByKey(t,r,s)}async getRelationsForEntity(t,r,s){return this.#i.getRelationsForEntity(t,r,s)}async getRelatedEntities(t,r={}){return this.#i.getRelatedEntities(t,r)}async getCatalogFilters({entitiesTypes:t=[],emptyFilters:r=[]}){if(!r.length)return{};try{return await this.#s(t),(r.includes("domains")||r.includes("owners"))&&await this.#n(),await this.#o(r)}catch(s){return console.error("Error fetching catalog filters:",s),{}}finally{await this.#l()}}async#s(t){if(this.#t?await this.#e.client.run(e`
+      `;return this.#e.client.select({type:e`type`,count:F()}).from(e`(SELECT * FROM (${i}) WHERE rn = 1) as highest_version_entities`).groupBy(e`type`)}return this.#e.client.select({type:t.type,count:F()}).from(t).where(u(_(t.isCurrent,!0),_(t.isDeleted,!1))).groupBy(t.type)}async getEntityById(i,s){const{rbacTeams:r,excludedTypes:n,excludedEntities:o}=s||{},c=A(n,o,"remote.entities"),a=A(n,o,"entities"),E=(await(this.#t?p(this.#e.client.select(S("remote.entities")).from(e`remote.entities`).leftJoin(e`remote.entities_attributes`,_(t.key,d.entityKey)).where(u(e`remote.entities.id = ${i}`,T(r,"remote.entities_attributes"),c)),this.#e.client.select(S("entities")).from(t).leftJoin(d,_(t.key,d.entityKey)).where(u(_(t.id,i),T(r,"entities_attributes"),a))):this.#e.client.select(S("entities")).from(t).leftJoin(d,_(t.key,d.entityKey)).where(u(_(t.id,i),T(r,"entities_attributes"),a))).run()).rows[0];return E?g(E):null}async getOutdatedEntities(i){const s=this.#t?p(this.#e.client.select(h).from(e`remote.entities`),this.#e.client.select(h).from(t).where(f(this.#e.client.select({id:h.id}).from(e`remote.entities as remote`).where(e`remote.key = ${t.key}`)))):this.#e.client.select(h).from(t),r=this.#e.client.select(h).from(s.as("combined_entities")).$dynamic(),{whereCondition:n}=P(r,i),o=J(e`combined_entities.scorecards_status = 'OUTDATED'`,e`combined_entities.scorecards_status IS NULL`),c=n?u(n,o):o;return(await r.where(c).run()).rows.map(l=>g(l)).filter(l=>l!==null)}async getEntitiesRelations(i={}){const s=this.#t?p(this.#e.client.select(m).from(e`remote.entities_relations`),this.#e.client.select(m).from(y).where(f(this.#e.client.select({id:m.id}).from(e`remote.entities_relations as remote`).where(e`remote.source_key = ${y.sourceKey}`)))):this.#e.client.select(m).from(y),r=this.#e.client.select(m).from(s.as("combined_entities_relations")).$dynamic(),n=this.#e.client.select(m).from(s.as("combined_entities_relations")).$dynamic(),o=R(n,{...i,limit:void 0,skip:void 0,after:void 0,before:void 0}),c=this.#e.client.$count(o),a=i.limit||10,l=R(r,{...i,limit:a+1}),[N,E]=await Promise.all([l.run(),c]),k=N.rows,O=k.length>a;return{items:k.slice(0,a).map(w=>b(w)).filter(w=>w!==null),hasMore:O,total:E}}async getEntityRelationById(i){const n=(await(this.#t?p(this.#e.client.select(m).from(e`remote.entities_relations`).where(_(y.id,i)),this.#e.client.select(m).from(y).where(u(_(y.id,i),f(this.#e.client.select({id:m.id}).from(e`remote.entities_relations as remote`).where(e`remote.id = ${y.id}`))))):this.#e.client.select(m).from(y).where(_(y.id,i))).run()).rows[0];return n?b(n):null}async getEntitiesWithRelations({paginationParams:i,rbacTeams:s,excludedEntities:r,excludedTypes:n}){return this.#s.getEntitiesWithRelations({paginationParams:i,rbacTeams:s,excludedEntities:r,excludedTypes:n})}async getEntityWithRelationsByKey({entityKey:i,filter:s,rbacTeams:r,excludedTypes:n,excludedEntities:o}){return this.#s.getEntityWithRelationsByKey({entityKey:i,filter:s,rbacTeams:r,excludedTypes:n,excludedEntities:o})}async getRelationsForEntity(i,s,r){return this.#i.getRelationsForEntity(i,s,r)}async getRelatedEntities({key:i,paginationParams:s,rbacTeams:r,excludedTypes:n,excludedEntities:o}){return this.#i.getRelatedEntities({key:i,paginationParams:s,rbacTeams:r,excludedTypes:n,excludedEntities:o})}async getCatalogFilters({entitiesTypes:i=[],emptyFilters:s=[],rbacTeams:r,excludedTypes:n,excludedEntities:o}){if(!s.length)return{};try{return await this.#r({entitiesTypes:i,rbacTeams:r,excludedTypes:n,excludedEntities:o}),(s.includes("domains")||s.includes("owners"))&&await this.#o(),await this.#a(s)}catch(c){return console.error("Error fetching catalog filters:",c),{}}finally{await this.#c()}}async#r({entitiesTypes:i,rbacTeams:s,excludedTypes:r,excludedEntities:n}){const o=Y(s,"ea"),c=this.#n(r,n);if(this.#t){const a=["e.is_current = 1","e.is_deleted = 0"];o&&a.push(o),c&&a.push(c.replace(/ENTITY_ALIAS/g,"e"));const l=["r.key IS NULL","e.is_current = 1","e.is_deleted = 0"];o&&l.push(o),c&&l.push(c.replace(/ENTITY_ALIAS/g,"e")),await this.#e.client.run(e.raw(`
         CREATE TEMP TABLE IF NOT EXISTS temp_combined_entities AS
         SELECT 
           e.key,
@@ -17,7 +17,8 @@ import{and as c,count as v,eq as u,isNotNull as D,notExists as y,or as $,sql as
           e.tags,
           e.metadata
         FROM remote.entities e
-        WHERE e.is_current = 1
+        LEFT JOIN remote.entities_attributes ea ON ea.entity_key = e.key
+        WHERE ${a.join(" AND ")}
         UNION ALL
         SELECT 
           e.key,
@@ -26,26 +27,28 @@ import{and as c,count as v,eq as u,isNotNull as D,notExists as y,or as $,sql as
           e.metadata
         FROM entities e
         LEFT JOIN remote.entities r ON r.key = e.key AND r.is_current = 1
-        WHERE r.key IS NULL AND e.is_current = 1
-      `):await this.#e.client.run(e`
+        LEFT JOIN entities_attributes ea ON ea.entity_key = e.key
+        WHERE ${l.join(" AND ")}
+      `))}else{const a=["e.is_current = 1","e.is_deleted = 0"];o&&a.push(o),c&&a.push(c.replace(/ENTITY_ALIAS/g,"e")),await this.#e.client.run(e.raw(`
         CREATE TEMP TABLE IF NOT EXISTS temp_combined_entities AS
         SELECT 
-          key,
-          type,
-          tags,
-          metadata
-        FROM entities
-        WHERE is_current = 1
-      `),t.length){const r=t.map(s=>`'${s.replace(/'/g,"''")}'`).join(",");await this.#e.client.run(e.raw(`
+          e.key,
+          e.type,
+          e.tags,
+          e.metadata
+        FROM entities e
+        LEFT JOIN entities_attributes ea ON ea.entity_key = e.key
+        WHERE ${a.join(" AND ")}
+      `))}if(i.length){const a=i.map(l=>`'${l.replace(/'/g,"''")}'`).join(",");await this.#e.client.run(e.raw(`
           CREATE TEMP TABLE IF NOT EXISTS temp_filtered_entities AS
           SELECT * FROM temp_combined_entities
-          WHERE type IN (${r})
+          WHERE type IN (${a})
         `))}else await this.#e.client.run(e`
         CREATE TEMP TABLE IF NOT EXISTS temp_filtered_entities AS
         SELECT * FROM temp_combined_entities
       `);await this.#e.client.run(e`
       CREATE INDEX IF NOT EXISTS idx_temp_filtered_type ON temp_filtered_entities(type)
-    `)}async#n(){this.#t?await this.#e.client.run(e`
+    `)}#n(i,s){const r=[];if(i&&i.length>0){const n=i.map(o=>`'${o.replace(/'/g,"''")}'`).join(", ");r.push(`ENTITY_ALIAS.type NOT IN (${n})`)}if(s&&s.length>0){const n=s.map(o=>`'${o.replace(/'/g,"''")}'`).join(", ");r.push(`ENTITY_ALIAS.key NOT IN (${n})`)}return r.length>0?`(${r.join(" AND ")})`:null}async#o(){this.#t?await this.#e.client.run(e`
         CREATE TEMP TABLE IF NOT EXISTS temp_combined_relations AS
         SELECT 
           source_key,
@@ -75,12 +78,12 @@ import{and as c,count as v,eq as u,isNotNull as D,notExists as y,or as $,sql as
       CREATE INDEX IF NOT EXISTS idx_temp_rel_target ON temp_combined_relations(target_key)
     `),await this.#e.client.run(e`
       CREATE INDEX IF NOT EXISTS idx_temp_rel_relation ON temp_combined_relations(source_to_target_relation)
-    `)}async#o(t){const r={},s=[],n=t.filter(a=>a.startsWith("metadata."));t.includes("type")&&s.push(`
+    `)}async#a(i){const s={},r=[],n=i.filter(a=>a.startsWith("metadata."));i.includes("type")&&r.push(`
         SELECT 'type' as filter_name, type as value, COUNT(*) as count
         FROM temp_filtered_entities
         WHERE type IS NOT NULL
         GROUP BY type
-      `),t.includes("tags")&&s.push(`
+      `),i.includes("tags")&&r.push(`
         SELECT 'tags' as filter_name, tag.value as value, COUNT(DISTINCT tfe.key) as count
         FROM temp_filtered_entities tfe,
              json_each(COALESCE(tfe.tags, json_array())) as tag
@@ -89,7 +92,7 @@ import{and as c,count as v,eq as u,isNotNull as D,notExists as y,or as $,sql as
           AND tag.value IS NOT NULL
           AND tag.value != ''
         GROUP BY tag.value
-      `),t.includes("domains")&&s.push(`
+      `),i.includes("domains")&&r.push(`
         SELECT 'domains' as filter_name, tcr.source_key as value, COUNT(DISTINCT tfe.key) as count
         FROM temp_combined_relations tcr
         INNER JOIN temp_filtered_entities tfe ON tfe.key = tcr.target_key
@@ -97,7 +100,7 @@ import{and as c,count as v,eq as u,isNotNull as D,notExists as y,or as $,sql as
         WHERE tce.type = 'domain'
           AND tcr.source_to_target_relation = 'hasParts'
         GROUP BY tcr.source_key
-      `),t.includes("owners")&&s.push(`
+      `),i.includes("owners")&&r.push(`
         SELECT 'owners' as filter_name, owner_key as value, COUNT(DISTINCT entity_key) as count
         FROM (
           SELECT 
@@ -117,7 +120,7 @@ import{and as c,count as v,eq as u,isNotNull as D,notExists as y,or as $,sql as
         INNER JOIN temp_combined_entities tce ON tce.key = owner_key
         WHERE owner_key IS NOT NULL
         GROUP BY owner_key
-      `);for(const a of n)await this.#a(a,r);if(s.length===0)return r;const d=s.join(" UNION ALL "),l=await this.#e.client.run(e.raw(d));if(l?.rows)for(const a of l.rows){const o=a.filter_name,h=a.value,N=Number(a.count)||0;r[o]||(r[o]=[]),h&&r[o].push({value:h,count:N})}return r}async#a(t,r){const s=t.substring(9),n=`$.${U(s)}`,d=await this.#e.client.run(e.raw(`
+      `);for(const a of n)await this.#l(a,s);if(r.length===0)return s;const o=r.join(" UNION ALL "),c=await this.#e.client.run(e.raw(o));if(c?.rows)for(const a of c.rows){const l=a.filter_name,N=a.value,E=Number(a.count)||0;s[l]||(s[l]=[]),N&&s[l].push({value:N,count:E})}return s}async#l(i,s){const r=i.substring(9),n=`$.${Q(r)}`,o=await this.#e.client.run(e.raw(`
         SELECT json_extract(metadata, '${n}') as value, COUNT(*) as count
         FROM temp_filtered_entities
         WHERE metadata IS NOT NULL
@@ -125,4 +128,4 @@ import{and as c,count as v,eq as u,isNotNull as D,notExists as y,or as $,sql as
           AND json_extract(metadata, '${n}') IS NOT NULL
           AND json_extract(metadata, '${n}') != ''
         GROUP BY value
-      `));d?.rows&&(r[t]=d.rows.map(l=>({value:l.value,count:Number(l.count)||0})).filter(l=>l.value))}async#l(){try{await this.#e.client.run(e`DROP TABLE IF EXISTS temp_combined_entities`),await this.#e.client.run(e`DROP TABLE IF EXISTS temp_filtered_entities`),await this.#e.client.run(e`DROP TABLE IF EXISTS temp_combined_relations`)}catch(t){F.error("Error cleaning up temp tables:",t)}}}function U(O){return O.replace(/[^a-zA-Z0-9._-]/g,"")}export{te as CatalogEntitiesLocalReadRepository};
+      `));o?.rows&&(s[i]=o.rows.map(c=>({value:c.value,count:Number(c.count)||0})).filter(c=>c.value))}async#c(){try{await this.#e.client.run(e`DROP TABLE IF EXISTS temp_combined_entities`),await this.#e.client.run(e`DROP TABLE IF EXISTS temp_filtered_entities`),await this.#e.client.run(e`DROP TABLE IF EXISTS temp_combined_relations`)}catch(i){q.error("Error cleaning up temp tables:",i)}}}function Q(L){return L.replace(/[^a-zA-Z0-9._-]/g,"")}export{Ee as CatalogEntitiesLocalReadRepository};