@kinotic-ai/persistence 3.0.0 → 4.0.0

package/dist/index.cjs

@@ -198,12 +198,12 @@ function $Role(roles) {
 }
 // packages/persistence/src/api/IEntitiesRepository.ts
 var import_core = require("@kinotic-ai/core");
-var APP_API_ZONE = "app_api";
+var APP_API_ZONE = "app-api";
 
 class EntitiesRepository {
   serviceProxy;
   constructor(kinotic) {
-    this.serviceProxy = kinotic.serviceProxy(`${APP_API_ZONE}.org.kinotic.persistence.api.services.JsonEntitiesRepository`);
+    this.serviceProxy = kinotic.serviceProxy(`${APP_API_ZONE}~org.kinotic.persistence.api.services.JsonEntitiesRepository`);
   }
   bulkSave(entityDefinitionId, entities) {
     return this.serviceProxy.invoke("bulkSave", [entityDefinitionId, entities]);
@@ -269,7 +269,7 @@ var import_core2 = require("@kinotic-ai/core");
 class AdminEntitiesRepository {
   serviceProxy;
   constructor(kinotic) {
-    this.serviceProxy = kinotic.serviceProxy(`${APP_API_ZONE}.org.kinotic.persistence.api.services.AdminJsonEntitiesRepository`);
+    this.serviceProxy = kinotic.serviceProxy(`${APP_API_ZONE}~org.kinotic.persistence.api.services.AdminJsonEntitiesRepository`);
   }
   count(entityDefinitionId, tenantSelection) {
     return this.serviceProxy.invoke("count", [entityDefinitionId, tenantSelection]);

package/dist/index.d.cts

@@ -90,102 +90,14 @@ import { C3Decorator } from "@kinotic-ai/idl";
 * This class denotes {@link C3Decorator} that can be applied to an {@link EntityService} using the {@link EntityServiceDecoratorsDecorator}
 */
 declare abstract class EntityServiceDecorator extends C3Decorator {}
-import { IEntityService } from "@/api/IEntityService";
-type IfFunction<
-	T,
-	U
-> = T extends (...args: any[]) => any ? U : never;
-type MethodsOf<T> = { [K in keyof T] : IfFunction<T[K], K> }[keyof T];
-type ExcludedMethods = "namedQuery" | "namedQueryPage";
-type FilteredMethods<T> = Exclude<MethodsOf<T>, ExcludedMethods>;
-type DecoratedFunction = FilteredMethods<IEntityService<any>> | "allCreate" | "allRead" | "allUpdate" | "allDelete";
-/**
-* Configuration for the {@link EntityServiceDecoratorsDecorator}
-* This is a map of method names to an array of decorators that should be applied to that method
-*/
-type EntityServiceDecoratorsConfig = Partial<Record<DecoratedFunction, EntityServiceDecorator[]>>;
-/**
-* Signifies that a property is an auto-generated ID for the entity.
-*/
-declare function AutoGeneratedId(_value: undefined, _context: ClassFieldDecoratorContext): void;
-/**
-* Signifies that a property is a discriminator for the entity.
-* This is used to determine the type of the entity when deserializing from JSON.
-* @param propertyName the name of the property to use as the discriminator
-*/
-declare function Discriminator(_propertyName: string): (_value: undefined, _context: ClassFieldDecoratorContext) => void;
-/**
-* Signifies that a class is a Entity.
-* This is required to define the class as an entity in the Kinotic framework.
-* @param multiTenancyType the type of multi-tenancy to use for this entity
-* @param entityType the type of entity to use for this entity
-*/
-declare function Entity(_multiTenancyType?: MultiTenancyType, _entityType?: EntityType): (_value: Function, _context: ClassDecoratorContext<any>) => void;
-/**
-* A class Decorator when applied to an Entity will configure Decorators to be applied to the EntityService
-* @param config the {@link EntityServiceDecoratorsConfig} to use
-*/
-declare function EntityServiceDecorators(_config: EntityServiceDecoratorsConfig): (_value: Function, _context: ClassDecoratorContext<any>) => void;
-/**
-* Provides configuration for the Elasticsearch index.
-* This can be used to override the default index settings and mappings used by Kinotic.
-*/
-declare function EsIndexConfiguration(_value: EsIndexConfigurationData): (_target: Function, _context: ClassDecoratorContext<any>) => void;
-declare function Flattened(_value: undefined, _context: ClassFieldDecoratorContext): void;
-/**
-* Signifies that a property is the ID of the entity.
-*/
-declare function Id(_value: undefined, _context: ClassFieldDecoratorContext): void;
-declare function Nested(_value: undefined, _context: ClassFieldDecoratorContext): void;
-/**
-* Signifies that a property is not indexed in Elasticsearch.
-*/
-declare function NotIndexed(_value: undefined, _context: ClassFieldDecoratorContext): void;
-declare function NotNull(_value: undefined, _context: ClassFieldDecoratorContext): void;
-declare function Policy(_policies: string[][]): (_value: unknown, _context: ClassDecoratorContext<any> | ClassFieldDecoratorContext | ClassMethodDecoratorContext) => void;
-declare function Precision(_precisionType?: PrecisionType): (_value: undefined, _context: ClassFieldDecoratorContext) => void;
-declare function Query(_statements: string): (_value: Function, _context: ClassMethodDecoratorContext) => void;
-declare function Role(_roles: string[]): (_value: unknown, _context: ClassDecoratorContext<any> | ClassFieldDecoratorContext | ClassMethodDecoratorContext) => void;
-declare function Text(_value: undefined, _context: ClassFieldDecoratorContext): void;
-/**
-* This is used for data streams to signify the field that should be used as the time reference.
-*/
-declare function TimeReference(_value: undefined, _context: ClassFieldDecoratorContext): void;
-declare function Version(_value: undefined, _context: ClassFieldDecoratorContext): void;
-declare function TenantId(_value: undefined, _context: ClassFieldDecoratorContext): void;
-import { C3Decorator as C3Decorator2 } from "@kinotic-ai/idl";
-/**
-* Provides a way to add decorators to an entity service
-*/
-declare class EntityServiceDecoratorsDecorator extends C3Decorator2 {
-	config: EntityServiceDecoratorsConfig;
-	constructor();
-}
-declare class PolicyDecorator extends EntityServiceDecorator {
-	policies: string[][];
-	constructor(policies: string[][]);
-}
-/**
-* Provides a mechanism to apply the @Policy decorator to an {@link EntityService}
-* @param policies to be supplied
-*/
-declare function $Policy(policies: string[][]): PolicyDecorator;
-declare class RoleDecorator extends EntityServiceDecorator {
-	roles: string[];
-	constructor(roles: string[]);
-}
-/**
-* Provides a mechanism to apply the @Role decorator to an {@link EntityService}
-* @param roles to be supplied
-*/
-declare function $Role(roles: string[]): RoleDecorator;
+import { Pageable as Pageable2, IterablePage as IterablePage2 } from "@kinotic-ai/core";
 import { IKinotic } from "@kinotic-ai/core";
 import { IServiceProxy, Page, Pageable, IterablePage } from "@kinotic-ai/core";
 /**
 * The zone for the platform's application facing data services, such as entity persistence
 * and named query execution — where the services backing these repositories are hosted.
 */
-declare const APP_API_ZONE = "app_api";
+declare const APP_API_ZONE = "app-api";
 interface IEntitiesRepository {
 	/**
 	* Saves all given entities.
@@ -350,118 +262,6 @@ declare class EntitiesRepository implements IEntitiesRepository {
 	syncIndex(entityDefinitionId: string): Promise<void>;
 	update<T>(entityDefinitionId: string, entity: T): Promise<T>;
 }
-import { IKinotic as IKinotic2 } from "@kinotic-ai/core";
-import { IServiceProxy as IServiceProxy2, Page as Page2, Pageable as Pageable2, IterablePage as IterablePage2 } from "@kinotic-ai/core";
-type TenantSelection = string[];
-interface IAdminEntitiesRepository {
-	/**
-	* Returns the number of entities available.
-	* @param structureId the id of the structure to count
-	* @param tenantSelection the list of tenants to use when retrieving the entity records
-	* @return {@link Promise} emitting the number of entities.
-	*/
-	count(entityDefinitionId: string, tenantSelection: TenantSelection): Promise<number>;
-	/**
-	* Returns the number of entities available for the given query.
-	*
-	* @param entityDefinitionId the id of the structure to save the entity for
-	* @param query       the query used to limit result
-	* @param tenantSelection the list of tenants to use when retrieving the entity records
-	* @return Promise    emitting the number of entities
-	*/
-	countByQuery(entityDefinitionId: string, query: string, tenantSelection: TenantSelection): Promise<number>;
-	/**
-	* Deletes the entity with the given id.
-	*
-	* @param entityDefinitionId the id of the structure to save the entity for
-	* @param id          must not be {@literal null}
-	* @return {@link Promise} emitting when delete is complete
-	* @throws IllegalArgumentException in case the given {@literal id} is {@literal null}
-	*/
-	deleteById(entityDefinitionId: string, id: TenantSpecificId): Promise<void>;
-	/**
-	* Deletes the entity with the given id.
-	*
-	* @param entityDefinitionId the id of the structure to save the entity for
-	* @param query      the query used to filter records to delete, must not be {@literal null}
-	* @param tenantSelection the list of tenants to use when deleting the entity records
-	* @return Promise signaling when operation has completed
-	* @throws Error in case the given {@literal query} is {@literal null}
-	*/
-	deleteByQuery(entityDefinitionId: string, query: string, tenantSelection: TenantSelection): Promise<void>;
-	/**
-	* Returns a {@link IterablePage} of entities meeting the paging restriction provided in the {@link Pageable} object.
-	*
-	* @param entityDefinitionId the id of the structure to save the entity for
-	* @param tenantSelection the list of tenants to use when retrieving the entity records
-	* @param pageable    the page settings to be used
-	* @return a page of entities
-	*/
-	findAll<T>(entityDefinitionId: string, tenantSelection: TenantSelection, pageable: Pageable2): Promise<IterablePage2<T>>;
-	/**
-	* Retrieves an entity by its id.
-	*
-	* @param entityDefinitionId the id of the structure to save the entity for
-	* @param id          must not be {@literal null}
-	* @return {@link Promise} with the entity with the given id or {@link Promise} emitting null if none found
-	* @throws IllegalArgumentException in case the given {@literal id} is {@literal null}
-	*/
-	findById<T>(entityDefinitionId: string, id: TenantSpecificId): Promise<T | null>;
-	/**
-	* Retrieves a list of entities by their id.
-	*
-	* @param entityDefinitionId the id of the structure to save the entity for
-	* @param ids      must not be {@literal null}
-	* @return Promise emitting the entities with the given ids or Promise emitting null if none found
-	* @throws Error in case the given {@literal ids} is {@literal null}
-	*/
-	findByIds<T>(entityDefinitionId: string, ids: TenantSpecificId[]): Promise<T[]>;
-	/**
-	* Executes a named query.
-	* @param entityDefinitionId the id of the structure that this named query is defined for
-	* @param queryName the name of the function that defines the query
-	* @param parameters to pass to the query
-	* @returns Promise with the result of the query
-	*/
-	namedQuery<T>(entityDefinitionId: string, queryName: string, parameters: QueryParameter[]): Promise<T>;
-	/**
-	* Executes a named query and returns a Page of results.
-	* @param entityDefinitionId the id of the structure that this named query is defined for
-	* @param queryName the name of the function that defines the query
-	* @param parameters to pass to the query
-	* @param pageable the page settings to be used
-	* @returns Promise with the result of the query
-	*/
-	namedQueryPage<T>(entityDefinitionId: string, queryName: string, parameters: QueryParameter[], pageable: Pageable2): Promise<IterablePage2<T>>;
-	/**
-	* Returns a {@link IterablePage} of entities matching the search text and paging restriction provided in the {@link Pageable} object.
-	*
-	* @param entityDefinitionId the id of the structure to save the entity for
-	* @param searchText  the text to search for entities for
-	* @param tenantSelection the list of tenants to use when retrieving the entity records
-	* @param pageable    the page settings to be used
-	* @return a page of entities
-	*/
-	search<T>(entityDefinitionId: string, searchText: string, tenantSelection: TenantSelection, pageable: Pageable2): Promise<IterablePage2<T>>;
-}
-declare class AdminEntitiesRepository implements IAdminEntitiesRepository {
-	protected serviceProxy: IServiceProxy2;
-	constructor(kinotic: IKinotic2);
-	count(entityDefinitionId: string, tenantSelection: TenantSelection): Promise<number>;
-	countByQuery(entityDefinitionId: string, query: string, tenantSelection: TenantSelection): Promise<number>;
-	deleteById(entityDefinitionId: string, id: TenantSpecificId): Promise<void>;
-	deleteByQuery(entityDefinitionId: string, query: string, tenantSelection: TenantSelection): Promise<void>;
-	findAll<T>(entityDefinitionId: string, tenantSelection: TenantSelection, pageable: Pageable2): Promise<IterablePage2<T>>;
-	findAllSinglePage<T>(entityDefinitionId: string, tenantSelection: TenantSelection, pageable: Pageable2): Promise<Page2<T>>;
-	findById<T>(entityDefinitionId: string, id: TenantSpecificId): Promise<T>;
-	findByIds<T>(entityDefinitionId: string, ids: TenantSpecificId[]): Promise<T[]>;
-	namedQuery<T>(entityDefinitionId: string, queryName: string, parameters: QueryParameter[]): Promise<T>;
-	namedQueryPage<T>(entityDefinitionId: string, queryName: string, parameters: QueryParameter[], pageable: Pageable2): Promise<IterablePage2<T>>;
-	namedQuerySinglePage<T>(entityDefinitionId: string, queryName: string, parameters: QueryParameter[], pageable: Pageable2): Promise<Page2<T>>;
-	search<T>(entityDefinitionId: string, searchText: string, tenantSelection: TenantSelection, pageable: Pageable2): Promise<IterablePage2<T>>;
-	searchSinglePage<T>(entityDefinitionId: string, searchText: string, tenantSelection: TenantSelection, pageable: Pageable2): Promise<Page2<T>>;
-}
-import { Pageable as Pageable3, IterablePage as IterablePage3 } from "@kinotic-ai/core";
 /**
 * This is the base interface for all entity repositories.
 * It provides the basic CRUD operations for entities.
@@ -531,7 +331,7 @@ interface IEntityRepository<T> {
 	* @param pageable the page settings to be used
 	* @return a page of entities
 	*/
-	findAll(pageable: Pageable3): Promise<IterablePage3<T>>;
+	findAll(pageable: Pageable2): Promise<IterablePage2<T>>;
 	/**
 	* Retrieves an entity by its id.
 	*
@@ -562,7 +362,7 @@ interface IEntityRepository<T> {
 	* @param pageable the page settings to be used
 	* @returns Promise with the result of the query
 	*/
-	namedQueryPage<U>(queryName: string, queryParameters: QueryParameter[], pageable: Pageable3): Promise<IterablePage3<U>>;
+	namedQueryPage<U>(queryName: string, queryParameters: QueryParameter[], pageable: Pageable2): Promise<IterablePage2<U>>;
 	/**
 	* Saves a given entity. This will override all data if there is an existing entity with the same id.
 	* Use the returned instance for further operations as the save operation might have changed the entity instance.
@@ -579,7 +379,7 @@ interface IEntityRepository<T> {
 	* @param pageable   the page settings to be used
 	* @return a page of entities
 	*/
-	search(searchText: string, pageable: Pageable3): Promise<IterablePage3<T>>;
+	search(searchText: string, pageable: Pageable2): Promise<IterablePage2<T>>;
 	/**
 	* This operation makes all the recent writes immediately available for search.
 	* @return a Promise that resolves when the operation is complete
@@ -613,18 +413,217 @@ declare class EntityRepository<T> implements IEntityRepository<T> {
 	countByQuery(query: string): Promise<number>;
 	deleteById(id: string): Promise<void>;
 	deleteByQuery(query: string): Promise<void>;
-	findAll(pageable: Pageable3): Promise<IterablePage3<T>>;
+	findAll(pageable: Pageable2): Promise<IterablePage2<T>>;
 	findById(id: string): Promise<T | null>;
 	findByIds(ids: string[]): Promise<T[]>;
 	namedQuery<U>(queryName: string, queryParameters: QueryParameter[]): Promise<U>;
-	namedQueryPage<U>(queryName: string, queryParameters: QueryParameter[], pageable: Pageable3): Promise<IterablePage3<U>>;
+	namedQueryPage<U>(queryName: string, queryParameters: QueryParameter[], pageable: Pageable2): Promise<IterablePage2<U>>;
 	save(entity: T): Promise<T>;
-	search(searchText: string, pageable: Pageable3): Promise<IterablePage3<T>>;
+	search(searchText: string, pageable: Pageable2): Promise<IterablePage2<T>>;
 	syncIndex(): Promise<void>;
 	update(entity: T): Promise<T>;
 	protected beforeBulkSaveOrUpdate(entities: T[]): Promise<T[]>;
 	protected beforeSaveOrUpdate(entity: T): Promise<T>;
 }
+type IfFunction<
+	T,
+	U
+> = T extends (...args: any[]) => any ? U : never;
+type MethodsOf<T> = { [K in keyof T] : IfFunction<T[K], K> }[keyof T];
+type ExcludedMethods = "namedQuery" | "namedQueryPage";
+type FilteredMethods<T> = Exclude<MethodsOf<T>, ExcludedMethods>;
+type DecoratedFunction = FilteredMethods<IEntityRepository<any>> | "allCreate" | "allRead" | "allUpdate" | "allDelete";
+/**
+* Configuration for the {@link EntityServiceDecoratorsDecorator}
+* This is a map of method names to an array of decorators that should be applied to that method
+*/
+type EntityServiceDecoratorsConfig = Partial<Record<DecoratedFunction, EntityServiceDecorator[]>>;
+/**
+* Signifies that a property is an auto-generated ID for the entity.
+*/
+declare function AutoGeneratedId(_value: undefined, _context: ClassFieldDecoratorContext): void;
+/**
+* Signifies that a property is a discriminator for the entity.
+* This is used to determine the type of the entity when deserializing from JSON.
+* @param propertyName the name of the property to use as the discriminator
+*/
+declare function Discriminator(_propertyName: string): (_value: undefined, _context: ClassFieldDecoratorContext) => void;
+/**
+* Signifies that a class is a Entity.
+* This is required to define the class as an entity in the Kinotic framework.
+* @param multiTenancyType the type of multi-tenancy to use for this entity
+* @param entityType the type of entity to use for this entity
+*/
+declare function Entity(_multiTenancyType?: MultiTenancyType, _entityType?: EntityType): (_value: Function, _context: ClassDecoratorContext<any>) => void;
+/**
+* A class Decorator when applied to an Entity will configure Decorators to be applied to the EntityService
+* @param config the {@link EntityServiceDecoratorsConfig} to use
+*/
+declare function EntityServiceDecorators(_config: EntityServiceDecoratorsConfig): (_value: Function, _context: ClassDecoratorContext<any>) => void;
+/**
+* Provides configuration for the Elasticsearch index.
+* This can be used to override the default index settings and mappings used by Kinotic.
+*/
+declare function EsIndexConfiguration(_value: EsIndexConfigurationData): (_target: Function, _context: ClassDecoratorContext<any>) => void;
+declare function Flattened(_value: undefined, _context: ClassFieldDecoratorContext): void;
+/**
+* Signifies that a property is the ID of the entity.
+*/
+declare function Id(_value: undefined, _context: ClassFieldDecoratorContext): void;
+declare function Nested(_value: undefined, _context: ClassFieldDecoratorContext): void;
+/**
+* Signifies that a property is not indexed in Elasticsearch.
+*/
+declare function NotIndexed(_value: undefined, _context: ClassFieldDecoratorContext): void;
+declare function NotNull(_value: undefined, _context: ClassFieldDecoratorContext): void;
+declare function Policy(_policies: string[][]): (_value: unknown, _context: ClassDecoratorContext<any> | ClassFieldDecoratorContext | ClassMethodDecoratorContext) => void;
+declare function Precision(_precisionType?: PrecisionType): (_value: undefined, _context: ClassFieldDecoratorContext) => void;
+declare function Query(_statements: string): (_value: Function, _context: ClassMethodDecoratorContext) => void;
+declare function Role(_roles: string[]): (_value: unknown, _context: ClassDecoratorContext<any> | ClassFieldDecoratorContext | ClassMethodDecoratorContext) => void;
+declare function Text(_value: undefined, _context: ClassFieldDecoratorContext): void;
+/**
+* This is used for data streams to signify the field that should be used as the time reference.
+*/
+declare function TimeReference(_value: undefined, _context: ClassFieldDecoratorContext): void;
+declare function Version(_value: undefined, _context: ClassFieldDecoratorContext): void;
+declare function TenantId(_value: undefined, _context: ClassFieldDecoratorContext): void;
+import { C3Decorator as C3Decorator2 } from "@kinotic-ai/idl";
+/**
+* Provides a way to add decorators to an entity service
+*/
+declare class EntityServiceDecoratorsDecorator extends C3Decorator2 {
+	config: EntityServiceDecoratorsConfig;
+	constructor();
+}
+declare class PolicyDecorator extends EntityServiceDecorator {
+	policies: string[][];
+	constructor(policies: string[][]);
+}
+/**
+* Provides a mechanism to apply the @Policy decorator to an {@link EntityService}
+* @param policies to be supplied
+*/
+declare function $Policy(policies: string[][]): PolicyDecorator;
+declare class RoleDecorator extends EntityServiceDecorator {
+	roles: string[];
+	constructor(roles: string[]);
+}
+/**
+* Provides a mechanism to apply the @Role decorator to an {@link EntityService}
+* @param roles to be supplied
+*/
+declare function $Role(roles: string[]): RoleDecorator;
+import { IKinotic as IKinotic2 } from "@kinotic-ai/core";
+import { IServiceProxy as IServiceProxy2, Page as Page2, Pageable as Pageable3, IterablePage as IterablePage3 } from "@kinotic-ai/core";
+type TenantSelection = string[];
+interface IAdminEntitiesRepository {
+	/**
+	* Returns the number of entities available.
+	* @param structureId the id of the structure to count
+	* @param tenantSelection the list of tenants to use when retrieving the entity records
+	* @return {@link Promise} emitting the number of entities.
+	*/
+	count(entityDefinitionId: string, tenantSelection: TenantSelection): Promise<number>;
+	/**
+	* Returns the number of entities available for the given query.
+	*
+	* @param entityDefinitionId the id of the structure to save the entity for
+	* @param query       the query used to limit result
+	* @param tenantSelection the list of tenants to use when retrieving the entity records
+	* @return Promise    emitting the number of entities
+	*/
+	countByQuery(entityDefinitionId: string, query: string, tenantSelection: TenantSelection): Promise<number>;
+	/**
+	* Deletes the entity with the given id.
+	*
+	* @param entityDefinitionId the id of the structure to save the entity for
+	* @param id          must not be {@literal null}
+	* @return {@link Promise} emitting when delete is complete
+	* @throws IllegalArgumentException in case the given {@literal id} is {@literal null}
+	*/
+	deleteById(entityDefinitionId: string, id: TenantSpecificId): Promise<void>;
+	/**
+	* Deletes the entity with the given id.
+	*
+	* @param entityDefinitionId the id of the structure to save the entity for
+	* @param query      the query used to filter records to delete, must not be {@literal null}
+	* @param tenantSelection the list of tenants to use when deleting the entity records
+	* @return Promise signaling when operation has completed
+	* @throws Error in case the given {@literal query} is {@literal null}
+	*/
+	deleteByQuery(entityDefinitionId: string, query: string, tenantSelection: TenantSelection): Promise<void>;
+	/**
+	* Returns a {@link IterablePage} of entities meeting the paging restriction provided in the {@link Pageable} object.
+	*
+	* @param entityDefinitionId the id of the structure to save the entity for
+	* @param tenantSelection the list of tenants to use when retrieving the entity records
+	* @param pageable    the page settings to be used
+	* @return a page of entities
+	*/
+	findAll<T>(entityDefinitionId: string, tenantSelection: TenantSelection, pageable: Pageable3): Promise<IterablePage3<T>>;
+	/**
+	* Retrieves an entity by its id.
+	*
+	* @param entityDefinitionId the id of the structure to save the entity for
+	* @param id          must not be {@literal null}
+	* @return {@link Promise} with the entity with the given id or {@link Promise} emitting null if none found
+	* @throws IllegalArgumentException in case the given {@literal id} is {@literal null}
+	*/
+	findById<T>(entityDefinitionId: string, id: TenantSpecificId): Promise<T | null>;
+	/**
+	* Retrieves a list of entities by their id.
+	*
+	* @param entityDefinitionId the id of the structure to save the entity for
+	* @param ids      must not be {@literal null}
+	* @return Promise emitting the entities with the given ids or Promise emitting null if none found
+	* @throws Error in case the given {@literal ids} is {@literal null}
+	*/
+	findByIds<T>(entityDefinitionId: string, ids: TenantSpecificId[]): Promise<T[]>;
+	/**
+	* Executes a named query.
+	* @param entityDefinitionId the id of the structure that this named query is defined for
+	* @param queryName the name of the function that defines the query
+	* @param parameters to pass to the query
+	* @returns Promise with the result of the query
+	*/
+	namedQuery<T>(entityDefinitionId: string, queryName: string, parameters: QueryParameter[]): Promise<T>;
+	/**
+	* Executes a named query and returns a Page of results.
+	* @param entityDefinitionId the id of the structure that this named query is defined for
+	* @param queryName the name of the function that defines the query
+	* @param parameters to pass to the query
+	* @param pageable the page settings to be used
+	* @returns Promise with the result of the query
+	*/
+	namedQueryPage<T>(entityDefinitionId: string, queryName: string, parameters: QueryParameter[], pageable: Pageable3): Promise<IterablePage3<T>>;
+	/**
+	* Returns a {@link IterablePage} of entities matching the search text and paging restriction provided in the {@link Pageable} object.
+	*
+	* @param entityDefinitionId the id of the structure to save the entity for
+	* @param searchText  the text to search for entities for
+	* @param tenantSelection the list of tenants to use when retrieving the entity records
+	* @param pageable    the page settings to be used
+	* @return a page of entities
+	*/
+	search<T>(entityDefinitionId: string, searchText: string, tenantSelection: TenantSelection, pageable: Pageable3): Promise<IterablePage3<T>>;
+}
+declare class AdminEntitiesRepository implements IAdminEntitiesRepository {
+	protected serviceProxy: IServiceProxy2;
+	constructor(kinotic: IKinotic2);
+	count(entityDefinitionId: string, tenantSelection: TenantSelection): Promise<number>;
+	countByQuery(entityDefinitionId: string, query: string, tenantSelection: TenantSelection): Promise<number>;
+	deleteById(entityDefinitionId: string, id: TenantSpecificId): Promise<void>;
+	deleteByQuery(entityDefinitionId: string, query: string, tenantSelection: TenantSelection): Promise<void>;
+	findAll<T>(entityDefinitionId: string, tenantSelection: TenantSelection, pageable: Pageable3): Promise<IterablePage3<T>>;
+	findAllSinglePage<T>(entityDefinitionId: string, tenantSelection: TenantSelection, pageable: Pageable3): Promise<Page2<T>>;
+	findById<T>(entityDefinitionId: string, id: TenantSpecificId): Promise<T>;
+	findByIds<T>(entityDefinitionId: string, ids: TenantSpecificId[]): Promise<T[]>;
+	namedQuery<T>(entityDefinitionId: string, queryName: string, parameters: QueryParameter[]): Promise<T>;
+	namedQueryPage<T>(entityDefinitionId: string, queryName: string, parameters: QueryParameter[], pageable: Pageable3): Promise<IterablePage3<T>>;
+	namedQuerySinglePage<T>(entityDefinitionId: string, queryName: string, parameters: QueryParameter[], pageable: Pageable3): Promise<Page2<T>>;
+	search<T>(entityDefinitionId: string, searchText: string, tenantSelection: TenantSelection, pageable: Pageable3): Promise<IterablePage3<T>>;
+	searchSinglePage<T>(entityDefinitionId: string, searchText: string, tenantSelection: TenantSelection, pageable: Pageable3): Promise<Page2<T>>;
+}
 import { Pageable as Pageable4, IterablePage as IterablePage4 } from "@kinotic-ai/core";
 /**
 * This is the base interface for all admin entity repositories.
@@ -745,7 +744,7 @@ declare class AdminEntityRepository<T> implements IAdminEntityRepository<T> {
 	deleteById(id: TenantSpecificId): Promise<void>;
 	deleteByQuery(query: string, tenantSelection: TenantSelection): Promise<void>;
 	findAll(tenantSelection: TenantSelection, pageable: Pageable4): Promise<IterablePage4<T>>;
-	findById(id: TenantSpecificId): Promise<T>;
+	findById(id: TenantSpecificId): Promise<T | null>;
 	findByIds(ids: TenantSpecificId[]): Promise<T[]>;
 	namedQuery<U>(queryName: string, queryParameters: QueryParameter[]): Promise<U>;
 	namedQueryPage<U>(queryName: string, queryParameters: QueryParameter[], pageable: Pageable4): Promise<IterablePage4<U>>;

package/dist/index.d.ts

@@ -90,102 +90,14 @@ import { C3Decorator } from "@kinotic-ai/idl";
 * This class denotes {@link C3Decorator} that can be applied to an {@link EntityService} using the {@link EntityServiceDecoratorsDecorator}
 */
 declare abstract class EntityServiceDecorator extends C3Decorator {}
-import { IEntityService } from "@/api/IEntityService";
-type IfFunction<
-	T,
-	U
-> = T extends (...args: any[]) => any ? U : never;
-type MethodsOf<T> = { [K in keyof T] : IfFunction<T[K], K> }[keyof T];
-type ExcludedMethods = "namedQuery" | "namedQueryPage";
-type FilteredMethods<T> = Exclude<MethodsOf<T>, ExcludedMethods>;
-type DecoratedFunction = FilteredMethods<IEntityService<any>> | "allCreate" | "allRead" | "allUpdate" | "allDelete";
-/**
-* Configuration for the {@link EntityServiceDecoratorsDecorator}
-* This is a map of method names to an array of decorators that should be applied to that method
-*/
-type EntityServiceDecoratorsConfig = Partial<Record<DecoratedFunction, EntityServiceDecorator[]>>;
-/**
-* Signifies that a property is an auto-generated ID for the entity.
-*/
-declare function AutoGeneratedId(_value: undefined, _context: ClassFieldDecoratorContext): void;
-/**
-* Signifies that a property is a discriminator for the entity.
-* This is used to determine the type of the entity when deserializing from JSON.
-* @param propertyName the name of the property to use as the discriminator
-*/
-declare function Discriminator(_propertyName: string): (_value: undefined, _context: ClassFieldDecoratorContext) => void;
-/**
-* Signifies that a class is a Entity.
-* This is required to define the class as an entity in the Kinotic framework.
-* @param multiTenancyType the type of multi-tenancy to use for this entity
-* @param entityType the type of entity to use for this entity
-*/
-declare function Entity(_multiTenancyType?: MultiTenancyType, _entityType?: EntityType): (_value: Function, _context: ClassDecoratorContext<any>) => void;
-/**
-* A class Decorator when applied to an Entity will configure Decorators to be applied to the EntityService
-* @param config the {@link EntityServiceDecoratorsConfig} to use
-*/
-declare function EntityServiceDecorators(_config: EntityServiceDecoratorsConfig): (_value: Function, _context: ClassDecoratorContext<any>) => void;
-/**
-* Provides configuration for the Elasticsearch index.
-* This can be used to override the default index settings and mappings used by Kinotic.
-*/
-declare function EsIndexConfiguration(_value: EsIndexConfigurationData): (_target: Function, _context: ClassDecoratorContext<any>) => void;
-declare function Flattened(_value: undefined, _context: ClassFieldDecoratorContext): void;
-/**
-* Signifies that a property is the ID of the entity.
-*/
-declare function Id(_value: undefined, _context: ClassFieldDecoratorContext): void;
-declare function Nested(_value: undefined, _context: ClassFieldDecoratorContext): void;
-/**
-* Signifies that a property is not indexed in Elasticsearch.
-*/
-declare function NotIndexed(_value: undefined, _context: ClassFieldDecoratorContext): void;
-declare function NotNull(_value: undefined, _context: ClassFieldDecoratorContext): void;
-declare function Policy(_policies: string[][]): (_value: unknown, _context: ClassDecoratorContext<any> | ClassFieldDecoratorContext | ClassMethodDecoratorContext) => void;
-declare function Precision(_precisionType?: PrecisionType): (_value: undefined, _context: ClassFieldDecoratorContext) => void;
-declare function Query(_statements: string): (_value: Function, _context: ClassMethodDecoratorContext) => void;
-declare function Role(_roles: string[]): (_value: unknown, _context: ClassDecoratorContext<any> | ClassFieldDecoratorContext | ClassMethodDecoratorContext) => void;
-declare function Text(_value: undefined, _context: ClassFieldDecoratorContext): void;
-/**
-* This is used for data streams to signify the field that should be used as the time reference.
-*/
-declare function TimeReference(_value: undefined, _context: ClassFieldDecoratorContext): void;
-declare function Version(_value: undefined, _context: ClassFieldDecoratorContext): void;
-declare function TenantId(_value: undefined, _context: ClassFieldDecoratorContext): void;
-import { C3Decorator as C3Decorator2 } from "@kinotic-ai/idl";
-/**
-* Provides a way to add decorators to an entity service
-*/
-declare class EntityServiceDecoratorsDecorator extends C3Decorator2 {
-	config: EntityServiceDecoratorsConfig;
-	constructor();
-}
-declare class PolicyDecorator extends EntityServiceDecorator {
-	policies: string[][];
-	constructor(policies: string[][]);
-}
-/**
-* Provides a mechanism to apply the @Policy decorator to an {@link EntityService}
-* @param policies to be supplied
-*/
-declare function $Policy(policies: string[][]): PolicyDecorator;
-declare class RoleDecorator extends EntityServiceDecorator {
-	roles: string[];
-	constructor(roles: string[]);
-}
-/**
-* Provides a mechanism to apply the @Role decorator to an {@link EntityService}
-* @param roles to be supplied
-*/
-declare function $Role(roles: string[]): RoleDecorator;
+import { Pageable as Pageable2, IterablePage as IterablePage2 } from "@kinotic-ai/core";
 import { IKinotic } from "@kinotic-ai/core";
 import { IServiceProxy, Page, Pageable, IterablePage } from "@kinotic-ai/core";
 /**
 * The zone for the platform's application facing data services, such as entity persistence
 * and named query execution — where the services backing these repositories are hosted.
 */
-declare const APP_API_ZONE = "app_api";
+declare const APP_API_ZONE = "app-api";
 interface IEntitiesRepository {
 	/**
 	* Saves all given entities.
@@ -350,118 +262,6 @@ declare class EntitiesRepository implements IEntitiesRepository {
 	syncIndex(entityDefinitionId: string): Promise<void>;
 	update<T>(entityDefinitionId: string, entity: T): Promise<T>;
 }
-import { IKinotic as IKinotic2 } from "@kinotic-ai/core";
-import { IServiceProxy as IServiceProxy2, Page as Page2, Pageable as Pageable2, IterablePage as IterablePage2 } from "@kinotic-ai/core";
-type TenantSelection = string[];
-interface IAdminEntitiesRepository {
-	/**
-	* Returns the number of entities available.
-	* @param structureId the id of the structure to count
-	* @param tenantSelection the list of tenants to use when retrieving the entity records
-	* @return {@link Promise} emitting the number of entities.
-	*/
-	count(entityDefinitionId: string, tenantSelection: TenantSelection): Promise<number>;
-	/**
-	* Returns the number of entities available for the given query.
-	*
-	* @param entityDefinitionId the id of the structure to save the entity for
-	* @param query       the query used to limit result
-	* @param tenantSelection the list of tenants to use when retrieving the entity records
-	* @return Promise    emitting the number of entities
-	*/
-	countByQuery(entityDefinitionId: string, query: string, tenantSelection: TenantSelection): Promise<number>;
-	/**
-	* Deletes the entity with the given id.
-	*
-	* @param entityDefinitionId the id of the structure to save the entity for
-	* @param id          must not be {@literal null}
-	* @return {@link Promise} emitting when delete is complete
-	* @throws IllegalArgumentException in case the given {@literal id} is {@literal null}
-	*/
-	deleteById(entityDefinitionId: string, id: TenantSpecificId): Promise<void>;
-	/**
-	* Deletes the entity with the given id.
-	*
-	* @param entityDefinitionId the id of the structure to save the entity for
-	* @param query      the query used to filter records to delete, must not be {@literal null}
-	* @param tenantSelection the list of tenants to use when deleting the entity records
-	* @return Promise signaling when operation has completed
-	* @throws Error in case the given {@literal query} is {@literal null}
-	*/
-	deleteByQuery(entityDefinitionId: string, query: string, tenantSelection: TenantSelection): Promise<void>;
-	/**
-	* Returns a {@link IterablePage} of entities meeting the paging restriction provided in the {@link Pageable} object.
-	*
-	* @param entityDefinitionId the id of the structure to save the entity for
-	* @param tenantSelection the list of tenants to use when retrieving the entity records
-	* @param pageable    the page settings to be used
-	* @return a page of entities
-	*/
-	findAll<T>(entityDefinitionId: string, tenantSelection: TenantSelection, pageable: Pageable2): Promise<IterablePage2<T>>;
-	/**
-	* Retrieves an entity by its id.
-	*
-	* @param entityDefinitionId the id of the structure to save the entity for
-	* @param id          must not be {@literal null}
-	* @return {@link Promise} with the entity with the given id or {@link Promise} emitting null if none found
-	* @throws IllegalArgumentException in case the given {@literal id} is {@literal null}
-	*/
-	findById<T>(entityDefinitionId: string, id: TenantSpecificId): Promise<T | null>;
-	/**
-	* Retrieves a list of entities by their id.
-	*
-	* @param entityDefinitionId the id of the structure to save the entity for
-	* @param ids      must not be {@literal null}
-	* @return Promise emitting the entities with the given ids or Promise emitting null if none found
-	* @throws Error in case the given {@literal ids} is {@literal null}
-	*/
-	findByIds<T>(entityDefinitionId: string, ids: TenantSpecificId[]): Promise<T[]>;
-	/**
-	* Executes a named query.
-	* @param entityDefinitionId the id of the structure that this named query is defined for
-	* @param queryName the name of the function that defines the query
-	* @param parameters to pass to the query
-	* @returns Promise with the result of the query
-	*/
-	namedQuery<T>(entityDefinitionId: string, queryName: string, parameters: QueryParameter[]): Promise<T>;
-	/**
-	* Executes a named query and returns a Page of results.
-	* @param entityDefinitionId the id of the structure that this named query is defined for
-	* @param queryName the name of the function that defines the query
-	* @param parameters to pass to the query
-	* @param pageable the page settings to be used
-	* @returns Promise with the result of the query
-	*/
-	namedQueryPage<T>(entityDefinitionId: string, queryName: string, parameters: QueryParameter[], pageable: Pageable2): Promise<IterablePage2<T>>;
-	/**
-	* Returns a {@link IterablePage} of entities matching the search text and paging restriction provided in the {@link Pageable} object.
-	*
-	* @param entityDefinitionId the id of the structure to save the entity for
-	* @param searchText  the text to search for entities for
-	* @param tenantSelection the list of tenants to use when retrieving the entity records
-	* @param pageable    the page settings to be used
-	* @return a page of entities
-	*/
-	search<T>(entityDefinitionId: string, searchText: string, tenantSelection: TenantSelection, pageable: Pageable2): Promise<IterablePage2<T>>;
-}
-declare class AdminEntitiesRepository implements IAdminEntitiesRepository {
-	protected serviceProxy: IServiceProxy2;
-	constructor(kinotic: IKinotic2);
-	count(entityDefinitionId: string, tenantSelection: TenantSelection): Promise<number>;
-	countByQuery(entityDefinitionId: string, query: string, tenantSelection: TenantSelection): Promise<number>;
-	deleteById(entityDefinitionId: string, id: TenantSpecificId): Promise<void>;
-	deleteByQuery(entityDefinitionId: string, query: string, tenantSelection: TenantSelection): Promise<void>;
-	findAll<T>(entityDefinitionId: string, tenantSelection: TenantSelection, pageable: Pageable2): Promise<IterablePage2<T>>;
-	findAllSinglePage<T>(entityDefinitionId: string, tenantSelection: TenantSelection, pageable: Pageable2): Promise<Page2<T>>;
-	findById<T>(entityDefinitionId: string, id: TenantSpecificId): Promise<T>;
-	findByIds<T>(entityDefinitionId: string, ids: TenantSpecificId[]): Promise<T[]>;
-	namedQuery<T>(entityDefinitionId: string, queryName: string, parameters: QueryParameter[]): Promise<T>;
-	namedQueryPage<T>(entityDefinitionId: string, queryName: string, parameters: QueryParameter[], pageable: Pageable2): Promise<IterablePage2<T>>;
-	namedQuerySinglePage<T>(entityDefinitionId: string, queryName: string, parameters: QueryParameter[], pageable: Pageable2): Promise<Page2<T>>;
-	search<T>(entityDefinitionId: string, searchText: string, tenantSelection: TenantSelection, pageable: Pageable2): Promise<IterablePage2<T>>;
-	searchSinglePage<T>(entityDefinitionId: string, searchText: string, tenantSelection: TenantSelection, pageable: Pageable2): Promise<Page2<T>>;
-}
-import { Pageable as Pageable3, IterablePage as IterablePage3 } from "@kinotic-ai/core";
 /**
 * This is the base interface for all entity repositories.
 * It provides the basic CRUD operations for entities.
@@ -531,7 +331,7 @@ interface IEntityRepository<T> {
 	* @param pageable the page settings to be used
 	* @return a page of entities
 	*/
-	findAll(pageable: Pageable3): Promise<IterablePage3<T>>;
+	findAll(pageable: Pageable2): Promise<IterablePage2<T>>;
 	/**
 	* Retrieves an entity by its id.
 	*
@@ -562,7 +362,7 @@ interface IEntityRepository<T> {
 	* @param pageable the page settings to be used
 	* @returns Promise with the result of the query
 	*/
-	namedQueryPage<U>(queryName: string, queryParameters: QueryParameter[], pageable: Pageable3): Promise<IterablePage3<U>>;
+	namedQueryPage<U>(queryName: string, queryParameters: QueryParameter[], pageable: Pageable2): Promise<IterablePage2<U>>;
 	/**
 	* Saves a given entity. This will override all data if there is an existing entity with the same id.
 	* Use the returned instance for further operations as the save operation might have changed the entity instance.
@@ -579,7 +379,7 @@ interface IEntityRepository<T> {
 	* @param pageable   the page settings to be used
 	* @return a page of entities
 	*/
-	search(searchText: string, pageable: Pageable3): Promise<IterablePage3<T>>;
+	search(searchText: string, pageable: Pageable2): Promise<IterablePage2<T>>;
 	/**
 	* This operation makes all the recent writes immediately available for search.
 	* @return a Promise that resolves when the operation is complete
@@ -613,18 +413,217 @@ declare class EntityRepository<T> implements IEntityRepository<T> {
 	countByQuery(query: string): Promise<number>;
 	deleteById(id: string): Promise<void>;
 	deleteByQuery(query: string): Promise<void>;
-	findAll(pageable: Pageable3): Promise<IterablePage3<T>>;
+	findAll(pageable: Pageable2): Promise<IterablePage2<T>>;
 	findById(id: string): Promise<T | null>;
 	findByIds(ids: string[]): Promise<T[]>;
 	namedQuery<U>(queryName: string, queryParameters: QueryParameter[]): Promise<U>;
-	namedQueryPage<U>(queryName: string, queryParameters: QueryParameter[], pageable: Pageable3): Promise<IterablePage3<U>>;
+	namedQueryPage<U>(queryName: string, queryParameters: QueryParameter[], pageable: Pageable2): Promise<IterablePage2<U>>;
 	save(entity: T): Promise<T>;
-	search(searchText: string, pageable: Pageable3): Promise<IterablePage3<T>>;
+	search(searchText: string, pageable: Pageable2): Promise<IterablePage2<T>>;
 	syncIndex(): Promise<void>;
 	update(entity: T): Promise<T>;
 	protected beforeBulkSaveOrUpdate(entities: T[]): Promise<T[]>;
 	protected beforeSaveOrUpdate(entity: T): Promise<T>;
 }
+type IfFunction<
+	T,
+	U
+> = T extends (...args: any[]) => any ? U : never;
+type MethodsOf<T> = { [K in keyof T] : IfFunction<T[K], K> }[keyof T];
+type ExcludedMethods = "namedQuery" | "namedQueryPage";
+type FilteredMethods<T> = Exclude<MethodsOf<T>, ExcludedMethods>;
+type DecoratedFunction = FilteredMethods<IEntityRepository<any>> | "allCreate" | "allRead" | "allUpdate" | "allDelete";
+/**
+* Configuration for the {@link EntityServiceDecoratorsDecorator}
+* This is a map of method names to an array of decorators that should be applied to that method
+*/
+type EntityServiceDecoratorsConfig = Partial<Record<DecoratedFunction, EntityServiceDecorator[]>>;
+/**
+* Signifies that a property is an auto-generated ID for the entity.
+*/
+declare function AutoGeneratedId(_value: undefined, _context: ClassFieldDecoratorContext): void;
+/**
+* Signifies that a property is a discriminator for the entity.
+* This is used to determine the type of the entity when deserializing from JSON.
+* @param propertyName the name of the property to use as the discriminator
+*/
+declare function Discriminator(_propertyName: string): (_value: undefined, _context: ClassFieldDecoratorContext) => void;
+/**
+* Signifies that a class is a Entity.
+* This is required to define the class as an entity in the Kinotic framework.
+* @param multiTenancyType the type of multi-tenancy to use for this entity
+* @param entityType the type of entity to use for this entity
+*/
+declare function Entity(_multiTenancyType?: MultiTenancyType, _entityType?: EntityType): (_value: Function, _context: ClassDecoratorContext<any>) => void;
+/**
+* A class Decorator when applied to an Entity will configure Decorators to be applied to the EntityService
+* @param config the {@link EntityServiceDecoratorsConfig} to use
+*/
+declare function EntityServiceDecorators(_config: EntityServiceDecoratorsConfig): (_value: Function, _context: ClassDecoratorContext<any>) => void;
+/**
+* Provides configuration for the Elasticsearch index.
+* This can be used to override the default index settings and mappings used by Kinotic.
+*/
+declare function EsIndexConfiguration(_value: EsIndexConfigurationData): (_target: Function, _context: ClassDecoratorContext<any>) => void;
+declare function Flattened(_value: undefined, _context: ClassFieldDecoratorContext): void;
+/**
+* Signifies that a property is the ID of the entity.
+*/
+declare function Id(_value: undefined, _context: ClassFieldDecoratorContext): void;
+declare function Nested(_value: undefined, _context: ClassFieldDecoratorContext): void;
+/**
+* Signifies that a property is not indexed in Elasticsearch.
+*/
+declare function NotIndexed(_value: undefined, _context: ClassFieldDecoratorContext): void;
+declare function NotNull(_value: undefined, _context: ClassFieldDecoratorContext): void;
+declare function Policy(_policies: string[][]): (_value: unknown, _context: ClassDecoratorContext<any> | ClassFieldDecoratorContext | ClassMethodDecoratorContext) => void;
+declare function Precision(_precisionType?: PrecisionType): (_value: undefined, _context: ClassFieldDecoratorContext) => void;
+declare function Query(_statements: string): (_value: Function, _context: ClassMethodDecoratorContext) => void;
+declare function Role(_roles: string[]): (_value: unknown, _context: ClassDecoratorContext<any> | ClassFieldDecoratorContext | ClassMethodDecoratorContext) => void;
+declare function Text(_value: undefined, _context: ClassFieldDecoratorContext): void;
+/**
+* This is used for data streams to signify the field that should be used as the time reference.
+*/
+declare function TimeReference(_value: undefined, _context: ClassFieldDecoratorContext): void;
+declare function Version(_value: undefined, _context: ClassFieldDecoratorContext): void;
+declare function TenantId(_value: undefined, _context: ClassFieldDecoratorContext): void;
+import { C3Decorator as C3Decorator2 } from "@kinotic-ai/idl";
+/**
+* Provides a way to add decorators to an entity service
+*/
+declare class EntityServiceDecoratorsDecorator extends C3Decorator2 {
+	config: EntityServiceDecoratorsConfig;
+	constructor();
+}
+declare class PolicyDecorator extends EntityServiceDecorator {
+	policies: string[][];
+	constructor(policies: string[][]);
+}
+/**
+* Provides a mechanism to apply the @Policy decorator to an {@link EntityService}
+* @param policies to be supplied
+*/
+declare function $Policy(policies: string[][]): PolicyDecorator;
+declare class RoleDecorator extends EntityServiceDecorator {
+	roles: string[];
+	constructor(roles: string[]);
+}
+/**
+* Provides a mechanism to apply the @Role decorator to an {@link EntityService}
+* @param roles to be supplied
+*/
+declare function $Role(roles: string[]): RoleDecorator;
+import { IKinotic as IKinotic2 } from "@kinotic-ai/core";
+import { IServiceProxy as IServiceProxy2, Page as Page2, Pageable as Pageable3, IterablePage as IterablePage3 } from "@kinotic-ai/core";
+type TenantSelection = string[];
+interface IAdminEntitiesRepository {
+	/**
+	* Returns the number of entities available.
+	* @param structureId the id of the structure to count
+	* @param tenantSelection the list of tenants to use when retrieving the entity records
+	* @return {@link Promise} emitting the number of entities.
+	*/
+	count(entityDefinitionId: string, tenantSelection: TenantSelection): Promise<number>;
+	/**
+	* Returns the number of entities available for the given query.
+	*
+	* @param entityDefinitionId the id of the structure to save the entity for
+	* @param query       the query used to limit result
+	* @param tenantSelection the list of tenants to use when retrieving the entity records
+	* @return Promise    emitting the number of entities
+	*/
+	countByQuery(entityDefinitionId: string, query: string, tenantSelection: TenantSelection): Promise<number>;
+	/**
+	* Deletes the entity with the given id.
+	*
+	* @param entityDefinitionId the id of the structure to save the entity for
+	* @param id          must not be {@literal null}
+	* @return {@link Promise} emitting when delete is complete
+	* @throws IllegalArgumentException in case the given {@literal id} is {@literal null}
+	*/
+	deleteById(entityDefinitionId: string, id: TenantSpecificId): Promise<void>;
+	/**
+	* Deletes the entity with the given id.
+	*
+	* @param entityDefinitionId the id of the structure to save the entity for
+	* @param query      the query used to filter records to delete, must not be {@literal null}
+	* @param tenantSelection the list of tenants to use when deleting the entity records
+	* @return Promise signaling when operation has completed
+	* @throws Error in case the given {@literal query} is {@literal null}
+	*/
+	deleteByQuery(entityDefinitionId: string, query: string, tenantSelection: TenantSelection): Promise<void>;
+	/**
+	* Returns a {@link IterablePage} of entities meeting the paging restriction provided in the {@link Pageable} object.
+	*
+	* @param entityDefinitionId the id of the structure to save the entity for
+	* @param tenantSelection the list of tenants to use when retrieving the entity records
+	* @param pageable    the page settings to be used
+	* @return a page of entities
+	*/
+	findAll<T>(entityDefinitionId: string, tenantSelection: TenantSelection, pageable: Pageable3): Promise<IterablePage3<T>>;
+	/**
+	* Retrieves an entity by its id.
+	*
+	* @param entityDefinitionId the id of the structure to save the entity for
+	* @param id          must not be {@literal null}
+	* @return {@link Promise} with the entity with the given id or {@link Promise} emitting null if none found
+	* @throws IllegalArgumentException in case the given {@literal id} is {@literal null}
+	*/
+	findById<T>(entityDefinitionId: string, id: TenantSpecificId): Promise<T | null>;
+	/**
+	* Retrieves a list of entities by their id.
+	*
+	* @param entityDefinitionId the id of the structure to save the entity for
+	* @param ids      must not be {@literal null}
+	* @return Promise emitting the entities with the given ids or Promise emitting null if none found
+	* @throws Error in case the given {@literal ids} is {@literal null}
+	*/
+	findByIds<T>(entityDefinitionId: string, ids: TenantSpecificId[]): Promise<T[]>;
+	/**
+	* Executes a named query.
+	* @param entityDefinitionId the id of the structure that this named query is defined for
+	* @param queryName the name of the function that defines the query
+	* @param parameters to pass to the query
+	* @returns Promise with the result of the query
+	*/
+	namedQuery<T>(entityDefinitionId: string, queryName: string, parameters: QueryParameter[]): Promise<T>;
+	/**
+	* Executes a named query and returns a Page of results.
+	* @param entityDefinitionId the id of the structure that this named query is defined for
+	* @param queryName the name of the function that defines the query
+	* @param parameters to pass to the query
+	* @param pageable the page settings to be used
+	* @returns Promise with the result of the query
+	*/
+	namedQueryPage<T>(entityDefinitionId: string, queryName: string, parameters: QueryParameter[], pageable: Pageable3): Promise<IterablePage3<T>>;
+	/**
+	* Returns a {@link IterablePage} of entities matching the search text and paging restriction provided in the {@link Pageable} object.
+	*
+	* @param entityDefinitionId the id of the structure to save the entity for
+	* @param searchText  the text to search for entities for
+	* @param tenantSelection the list of tenants to use when retrieving the entity records
+	* @param pageable    the page settings to be used
+	* @return a page of entities
+	*/
+	search<T>(entityDefinitionId: string, searchText: string, tenantSelection: TenantSelection, pageable: Pageable3): Promise<IterablePage3<T>>;
+}
+declare class AdminEntitiesRepository implements IAdminEntitiesRepository {
+	protected serviceProxy: IServiceProxy2;
+	constructor(kinotic: IKinotic2);
+	count(entityDefinitionId: string, tenantSelection: TenantSelection): Promise<number>;
+	countByQuery(entityDefinitionId: string, query: string, tenantSelection: TenantSelection): Promise<number>;
+	deleteById(entityDefinitionId: string, id: TenantSpecificId): Promise<void>;
+	deleteByQuery(entityDefinitionId: string, query: string, tenantSelection: TenantSelection): Promise<void>;
+	findAll<T>(entityDefinitionId: string, tenantSelection: TenantSelection, pageable: Pageable3): Promise<IterablePage3<T>>;
+	findAllSinglePage<T>(entityDefinitionId: string, tenantSelection: TenantSelection, pageable: Pageable3): Promise<Page2<T>>;
+	findById<T>(entityDefinitionId: string, id: TenantSpecificId): Promise<T>;
+	findByIds<T>(entityDefinitionId: string, ids: TenantSpecificId[]): Promise<T[]>;
+	namedQuery<T>(entityDefinitionId: string, queryName: string, parameters: QueryParameter[]): Promise<T>;
+	namedQueryPage<T>(entityDefinitionId: string, queryName: string, parameters: QueryParameter[], pageable: Pageable3): Promise<IterablePage3<T>>;
+	namedQuerySinglePage<T>(entityDefinitionId: string, queryName: string, parameters: QueryParameter[], pageable: Pageable3): Promise<Page2<T>>;
+	search<T>(entityDefinitionId: string, searchText: string, tenantSelection: TenantSelection, pageable: Pageable3): Promise<IterablePage3<T>>;
+	searchSinglePage<T>(entityDefinitionId: string, searchText: string, tenantSelection: TenantSelection, pageable: Pageable3): Promise<Page2<T>>;
+}
 import { Pageable as Pageable4, IterablePage as IterablePage4 } from "@kinotic-ai/core";
 /**
 * This is the base interface for all admin entity repositories.
@@ -745,7 +744,7 @@ declare class AdminEntityRepository<T> implements IAdminEntityRepository<T> {
 	deleteById(id: TenantSpecificId): Promise<void>;
 	deleteByQuery(query: string, tenantSelection: TenantSelection): Promise<void>;
 	findAll(tenantSelection: TenantSelection, pageable: Pageable4): Promise<IterablePage4<T>>;
-	findById(id: TenantSpecificId): Promise<T>;
+	findById(id: TenantSpecificId): Promise<T | null>;
 	findByIds(ids: TenantSpecificId[]): Promise<T[]>;
 	namedQuery<U>(queryName: string, queryParameters: QueryParameter[]): Promise<U>;
 	namedQueryPage<U>(queryName: string, queryParameters: QueryParameter[], pageable: Pageable4): Promise<IterablePage4<U>>;

package/dist/index.js

@@ -119,12 +119,12 @@ function $Role(roles) {
 import {
   FunctionalIterablePage
 } from "@kinotic-ai/core";
-var APP_API_ZONE = "app_api";
+var APP_API_ZONE = "app-api";
 
 class EntitiesRepository {
   serviceProxy;
   constructor(kinotic) {
-    this.serviceProxy = kinotic.serviceProxy(`${APP_API_ZONE}.org.kinotic.persistence.api.services.JsonEntitiesRepository`);
+    this.serviceProxy = kinotic.serviceProxy(`${APP_API_ZONE}~org.kinotic.persistence.api.services.JsonEntitiesRepository`);
   }
   bulkSave(entityDefinitionId, entities) {
     return this.serviceProxy.invoke("bulkSave", [entityDefinitionId, entities]);
@@ -192,7 +192,7 @@ import {
 class AdminEntitiesRepository {
   serviceProxy;
   constructor(kinotic) {
-    this.serviceProxy = kinotic.serviceProxy(`${APP_API_ZONE}.org.kinotic.persistence.api.services.AdminJsonEntitiesRepository`);
+    this.serviceProxy = kinotic.serviceProxy(`${APP_API_ZONE}~org.kinotic.persistence.api.services.AdminJsonEntitiesRepository`);
   }
   count(entityDefinitionId, tenantSelection) {
     return this.serviceProxy.invoke("count", [entityDefinitionId, tenantSelection]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kinotic-ai/persistence",
-  "version": "3.0.0",
+  "version": "4.0.0",
   "type": "module",
   "files": [
     "dist"
@@ -32,14 +32,14 @@
     "coverage": "bun test --coverage --pass-with-no-tests"
   },
   "peerDependencies": {
-    "@kinotic-ai/core": ">=3.0.0"
+    "@kinotic-ai/core": ">=4.0.0"
   },
   "dependencies": {
     "@kinotic-ai/idl": "1.0.10",
     "rxjs": "^7.8.2"
   },
   "devDependencies": {
-    "@kinotic-ai/core": "3.0.0",
+    "@kinotic-ai/core": "4.0.0",
     "@types/node": "^25.3.2",
     "tslib": "^2.8.1",
     "typescript": "^5.9.3"