@icure/cardinal-sdk 2.5.0 → 2.6.0

package/filters/PatientFilters.d.mts

@@ -1,4 +1,4 @@
-import { BaseFilterOptions, BaseSortableFilterOptions, FilterOptions, SortableFilterOptions } from '../cardinal-sdk-ts.mjs';
+import { BaseFilterOptions, FilterOptions, SortableFilterOptions } from '../cardinal-sdk-ts.mjs';
 import { EntityReferenceInGroup } from '../model/EntityReferenceInGroup.mjs';
 import { Patient } from '../model/Patient.mjs';
 import { Identifier } from '../model/base/Identifier.mjs';
@@ -40,55 +40,48 @@ interface PatientFiltersFactory {
      *  an identifier that has the same exact [Identifier.system] and [Identifier.value] as one of the provided
      *  [identifiers]. Other properties of the provided identifiers are ignored.
      *
-     *  These options are sortable. When sorting using these options the patients will be in the same order as the input
-     *  identifiers. In case an entity has multiple identifiers only the first matching identifier is considered for the
-     *  sorting.
-     *
      *  @param identifiers a list of identifiers
      *  @param dataOwnerId a data owner id
      *  @return options for patient filtering
      */
-    byIdentifiersForDataOwner(dataOwnerId: string, identifiers: Array<Identifier>): BaseSortableFilterOptions<Patient>;
+    byIdentifiersForDataOwner(dataOwnerId: string, identifiers: Array<Identifier>): BaseFilterOptions<Patient>;
     /**
      *
      *  In-group version of [byIdentifiersForDataOwner].
      *  The data owner can be from a different group than the group of the user executing the query.
      */
-    byIdentifiersForDataOwnerInGroup(dataOwner: EntityReferenceInGroup, identifiers: Array<Identifier>): BaseSortableFilterOptions<Patient>;
+    byIdentifiersForDataOwnerInGroup(dataOwner: EntityReferenceInGroup, identifiers: Array<Identifier>): BaseFilterOptions<Patient>;
     /**
      *
      *  Options for patient filtering which match all the patients shared directly (i.e. ignoring hierarchies) with a specific data owner that have
      *  [Patient.ssin] matching one of the provided ssins.
-     *  These options are sortable. When sorting using these options the patients will be in the same order as the
-     *  provided ssins.
      *
      *  @param ssins a list of ssins
      *  @param dataOwnerId a data owner id
      */
-    bySsinsForDataOwner(dataOwnerId: string, ssins: Array<string>): BaseSortableFilterOptions<Patient>;
+    bySsinsForDataOwner(dataOwnerId: string, ssins: Array<string>): BaseFilterOptions<Patient>;
     /**
      *
      *  In-group version of [bySsinsForDataOwner].
      *  The data owner can be from a different group than the group of the user executing the query.
      */
-    bySsinsForDataOwnerInGroup(dataOwner: EntityReferenceInGroup, ssins: Array<string>): BaseSortableFilterOptions<Patient>;
+    bySsinsForDataOwnerInGroup(dataOwner: EntityReferenceInGroup, ssins: Array<string>): BaseFilterOptions<Patient>;
     /**
      *
      *  Options for patient filtering which match all the patients shared directly (i.e. ignoring hierarchies) with a specific data owner that have
      *  [Patient.dateOfBirth] between the provided values (inclusive).
-     *  These options are sortable. When sorting using these options the patients will be ordered by date of birth.
      *
      *  @param fromDate the start date in YYYYMMDD format (inclusive)
      *  @param toDate the end date in YYYYMMDD format (inclusive)
      *  @param dataOwnerId a data owner id
      */
-    byDateOfBirthBetweenForDataOwner(dataOwnerId: string, fromDate: number, toDate: number): BaseSortableFilterOptions<Patient>;
+    byDateOfBirthBetweenForDataOwner(dataOwnerId: string, fromDate: number, toDate: number): BaseFilterOptions<Patient>;
     /**
      *
      *  In-group version of [byDateOfBirthBetweenForDataOwner].
      *  The data owner can be from a different group than the group of the user executing the query.
      */
-    byDateOfBirthBetweenForDataOwnerInGroup(dataOwner: EntityReferenceInGroup, fromDate: number, toDate: number): BaseSortableFilterOptions<Patient>;
+    byDateOfBirthBetweenForDataOwnerInGroup(dataOwner: EntityReferenceInGroup, fromDate: number, toDate: number): BaseFilterOptions<Patient>;
     /**
      *
      *  Options for patient filtering which match all the patients shared directly (i.e. ignoring hierarchies) with a specific data owner that have the
@@ -111,9 +104,6 @@ interface PatientFiltersFactory {
      *  provided [Patient.gender], and optionally also the provided [Patient.education] and [Patient.profession].
      *  Note you can only provide profession if you have provided the education.
      *
-     *  These options are sortable. When sorting using these options the patients will be ordered first by education
-     *  then by profession.
-     *
      *  @param gender the patient gender.
      *  @param education the patient education. If not provided patient the education of the patient will be ignored by
      *  this filter.
@@ -125,7 +115,7 @@ interface PatientFiltersFactory {
     byGenderEducationProfessionForDataOwner(dataOwnerId: string, gender: Gender, options?: {
         education?: string | undefined;
         profession?: string | undefined;
-    }): BaseSortableFilterOptions<Patient>;
+    }): BaseFilterOptions<Patient>;
     /**
      *
      *  In-group version of [byGenderEducationProfessionForDataOwner].
@@ -134,7 +124,7 @@ interface PatientFiltersFactory {
     byGenderEducationProfessionForDataOwnerInGroup(dataOwner: EntityReferenceInGroup, gender: Gender, options?: {
         education?: string | undefined;
         profession?: string | undefined;
-    }): BaseSortableFilterOptions<Patient>;
+    }): BaseFilterOptions<Patient>;
     /**
      *
      *  Options for patient filtering which match all the patients shared directly (i.e. ignoring hierarchies) with a specific data owner that have the
@@ -156,28 +146,22 @@ interface PatientFiltersFactory {
      *  an address with a [Patient.addresses] where one of the [Address.telecoms] has a [Telecom.telecomNumber] that
      *  starts with the provided [searchString].
      *
-     *  These options are sortable. When sorting using these options the patients will be ordered lexicographically by
-     *  the matching telecom number.
-     *
      *  @param searchString start of a patient telecom. Non-alphanumeric characters are ignored.
      *  @param dataOwnerId a data owner id
      */
-    byTelecomForDataOwner(dataOwnerId: string, searchString: string): BaseSortableFilterOptions<Patient>;
+    byTelecomForDataOwner(dataOwnerId: string, searchString: string): BaseFilterOptions<Patient>;
     /**
      *
      *  In-group version of [byTelecomForDataOwner].
      *  The data owner can be from a different group than the group of the user executing the query.
      */
-    byTelecomForDataOwnerInGroup(dataOwner: EntityReferenceInGroup, searchString: string): BaseSortableFilterOptions<Patient>;
+    byTelecomForDataOwnerInGroup(dataOwner: EntityReferenceInGroup, searchString: string): BaseFilterOptions<Patient>;
     /**
      *
      *  Options for patient filtering which match all the patients shared directly (i.e. ignoring hierarchies) with a specific data owner that have at least
      *  an [Patient.addresses] where the [Address.street] or [Address.city] contain the provided [searchString] and
      *  [Address.postalCode] matches the provided [postalCode].
-     *  Additionally you can limit the search to a specific house number.
-     *
-     *  These options are sortable. When sorting using these options the patients will be ordered lexicographically first
-     *  by the matching portion of street+city, then by postal code and finally by house number.
+     *  Additionally, you can limit the search to a specific house number.
      *
      *  @param searchString part of a patient address street or city
      *  @param postalCode the patient postal code
@@ -186,7 +170,7 @@ interface PatientFiltersFactory {
      */
     byAddressPostalCodeHouseNumberForDataOwner(dataOwnerId: string, searchString: string, postalCode: string, options?: {
         houseNumber?: string | undefined;
-    }): BaseSortableFilterOptions<Patient>;
+    }): BaseFilterOptions<Patient>;
     /**
      *
      *  In-group version of [byAddressPostalCodeHouseNumberForDataOwner].
@@ -194,60 +178,50 @@ interface PatientFiltersFactory {
      */
     byAddressPostalCodeHouseNumberForDataOwnerInGroup(dataOwner: EntityReferenceInGroup, searchString: string, postalCode: string, options?: {
         houseNumber?: string | undefined;
-    }): BaseSortableFilterOptions<Patient>;
+    }): BaseFilterOptions<Patient>;
     /**
      *
      *  Options for patient filtering which match all the patients shared directly (i.e. ignoring hierarchies) with a specific data owner that have at least
      *  an [Patient.addresses] where the [Address.street], [Address.postalCode] or [Address.city] contain the provided
      *  [searchString].
      *
-     *  These options are sortable. When sorting using these options the patients will be ordered lexicographically first
-     *  by the matching portion of street+postalCode+city, then by postal code and finally by house number.
-     *
      *  @param searchString part of a patient address street, postal code, or city
      *  @param dataOwnerId a data owner id
      */
-    byAddressForDataOwner(dataOwnerId: string, searchString: string): BaseSortableFilterOptions<Patient>;
+    byAddressForDataOwner(dataOwnerId: string, searchString: string): BaseFilterOptions<Patient>;
     /**
      *
      *  In-group version of [byAddressForDataOwner].
      *  The data owner can be from a different group than the group of the user executing the query.
      */
-    byAddressForDataOwnerInGroup(dataOwner: EntityReferenceInGroup, searchString: string): BaseSortableFilterOptions<Patient>;
+    byAddressForDataOwnerInGroup(dataOwner: EntityReferenceInGroup, searchString: string): BaseFilterOptions<Patient>;
     /**
      *
      *  Options for patient filtering which match all the patients shared directly (i.e. ignoring hierarchies) with the current data owner that have at least
      *  an identifier that has the same exact [Identifier.system] and [Identifier.value] as one of the provided
      *  [identifiers]. Other properties of the provided identifiers are ignored.
      *
-     *  These options are sortable. When sorting using these options the patients will be in the same order as the input
-     *  identifiers. In case an entity has multiple identifiers only the first matching identifier is considered for the
-     *  sorting.
-     *
      *  @param identifiers a list of identifiers
      *  @return options for patient filtering
      */
-    byIdentifiersForSelf(identifiers: Array<Identifier>): SortableFilterOptions<Patient>;
+    byIdentifiersForSelf(identifiers: Array<Identifier>): FilterOptions<Patient>;
     /**
      *
      *  Options for patient filtering which match all the patients shared directly (i.e. ignoring hierarchies) with the current data owner that have
      *  [Patient.ssin] matching one of the provided ssins.
-     *  These options are sortable. When sorting using these options the patients will be in the same order as the
-     *  provided ssins.
      *
      *  @param ssins a list of ssins
      */
-    bySsinsForSelf(ssins: Array<string>): SortableFilterOptions<Patient>;
+    bySsinsForSelf(ssins: Array<string>): FilterOptions<Patient>;
     /**
      *
      *  Options for patient filtering which match all the patients shared directly (i.e. ignoring hierarchies) with the current data owner that have
      *  [Patient.dateOfBirth] between the provided values (inclusive).
-     *  These options are sortable. When sorting using these options the patients will be ordered by date of birth.
      *
      *  @param fromDate the start date in YYYYMMDD format (inclusive)
      *  @param toDate the end date in YYYYMMDD format (inclusive)
      */
-    byDateOfBirthBetweenForSelf(fromDate: number, toDate: number): SortableFilterOptions<Patient>;
+    byDateOfBirthBetweenForSelf(fromDate: number, toDate: number): FilterOptions<Patient>;
     /**
      *
      *  Options for patient filtering which match all the patients shared directly (i.e. ignoring hierarchies) with the current data owner that have the
@@ -263,9 +237,6 @@ interface PatientFiltersFactory {
      *  provided [Patient.gender], and optionally also the provided [Patient.education] and [Patient.profession].
      *  Note you can only provide profession if you have provided the education.
      *
-     *  These options are sortable. When sorting using these options the patients will be ordered first by education
-     *  then by profession.
-     *
      *  @param gender the patient gender.
      *  @param education the patient education. If not provided patient the education of the patient will be ignored by
      *  this filter.
@@ -276,7 +247,7 @@ interface PatientFiltersFactory {
     byGenderEducationProfessionForSelf(gender: Gender, options?: {
         education?: string | undefined;
         profession?: string | undefined;
-    }): SortableFilterOptions<Patient>;
+    }): FilterOptions<Patient>;
     /**
      *
      *  Options for patient filtering which match all the patients shared directly (i.e. ignoring hierarchies) with the current data owner that have the
@@ -291,21 +262,15 @@ interface PatientFiltersFactory {
      *  an address with a [Patient.addresses] where one of the [Address.telecoms] has a [Telecom.telecomNumber] that
      *  starts with the provided [searchString].
      *
-     *  These options are sortable. When sorting using these options the patients will be ordered lexicographically by
-     *  the matching telecom number.
-     *
      *  @param searchString start of a patient telecom. Non-alphanumeric characters are ignored.
      */
-    byTelecomForSelf(searchString: string): SortableFilterOptions<Patient>;
+    byTelecomForSelf(searchString: string): FilterOptions<Patient>;
     /**
      *
      *  Options for patient filtering which match all the patients shared directly (i.e. ignoring hierarchies) with the current data owner that have at least
      *  an [Patient.addresses] where the [Address.street] or [Address.city] contain the provided [searchString] and
      *  [Address.postalCode] matches the provided [postalCode].
-     *  Additionally you can limit the search to a specific house number.
-     *
-     *  These options are sortable. When sorting using these options the patients will be ordered lexicographically first
-     *  by the matching portion of street+city, then by postal code and finally by house number.
+     *  Additionally, you can limit the search to a specific house number.
      *
      *  @param searchString part of a patient address street or city
      *  @param postalCode the patient postal code
@@ -313,19 +278,16 @@ interface PatientFiltersFactory {
      */
     byAddressPostalCodeHouseNumberForSelf(searchString: string, postalCode: string, options?: {
         houseNumber?: string | undefined;
-    }): SortableFilterOptions<Patient>;
+    }): FilterOptions<Patient>;
     /**
      *
      *  Options for patient filtering which match all the patients shared directly (i.e. ignoring hierarchies) with the current data owner that have at least
      *  an [Patient.addresses] where the [Address.street], [Address.postalCode] or [Address.city] contain the provided
      *  [searchString].
      *
-     *  These options are sortable. When sorting using these options the patients will be ordered lexicographically first
-     *  by the matching portion of street+postalCode+city, then by postal code and finally by house number.
-     *
      *  @param searchString part of a patient address street, postal code, or city
      */
-    byAddressForSelf(searchString: string): SortableFilterOptions<Patient>;
+    byAddressForSelf(searchString: string): FilterOptions<Patient>;
     /**
      *
      *  Options for patient filtering which match all the patients shared directly (i.e. ignoring hierarchies) with the current data owner

package/filters/ServiceFilters.d.mts

@@ -29,19 +29,16 @@ interface ServiceFiltersFactory {
      *  an identifier that has the same exact [Identifier.system] and [Identifier.value] as one of the provided
      *  [identifiers]. Other properties of the provided identifiers are ignored.
      *
-     *  These options are sortable. When sorting using these options the services will be in the same order as the input
-     *  identifiers. In case an entity has multiple identifiers only the first matching identifier is considered for the
-     *  sorting.
      *  @param identifiers a list of identifiers
      *  @param dataOwnerId a data owner id
      *  @return options for service filtering
      */
-    byIdentifiersForDataOwner(dataOwnerId: string, identifiers: Array<Identifier>): BaseSortableFilterOptions<Service>;
+    byIdentifiersForDataOwner(dataOwnerId: string, identifiers: Array<Identifier>): BaseFilterOptions<Service>;
     /**
      *
      *  In group version of [byIdentifiersForDataOwner].
      */
-    byIdentifiersForDataOwnerInGroup(dataOwner: EntityReferenceInGroup, identifiers: Array<Identifier>): BaseSortableFilterOptions<Service>;
+    byIdentifiersForDataOwnerInGroup(dataOwner: EntityReferenceInGroup, identifiers: Array<Identifier>): BaseFilterOptions<Service>;
     /**
      *
      *  Options for service filtering which match all services shared directly (i.e. ignoring hierarchies) with a specific data owner that have a certain code.
@@ -50,9 +47,6 @@ interface ServiceFiltersFactory {
      *  You can also limit the result to only services that are within a certain [Service.valueDate] timeframe (or [Service.openingDate]
      *  if the first is missing), but in that case you must specify the [codeCode].
      *
-     *  These options are sortable. When sorting using these options the services will be sorted first by [codeCode] then
-     *  by [Service.valueDate].
-     *
      *  @param codeType a code type
      *  @param codeCode a code for the provided code type, or null if you want the filter to accept any entity
      *  with a code of the provided type.
@@ -67,7 +61,7 @@ interface ServiceFiltersFactory {
         codeCode?: string | undefined;
         startOfServiceValueDate?: number | undefined;
         endOfServiceValueDate?: number | undefined;
-    }): BaseSortableFilterOptions<Service>;
+    }): BaseFilterOptions<Service>;
     /**
      *
      *  In group version of [byCodeAndValueDateForDataOwner].
@@ -76,7 +70,7 @@ interface ServiceFiltersFactory {
         codeCode?: string | undefined;
         startOfServiceValueDate?: number | undefined;
         endOfServiceValueDate?: number | undefined;
-    }): BaseSortableFilterOptions<Service>;
+    }): BaseFilterOptions<Service>;
     /**
      *
      *  Options for service filtering which match all services shared directly (i.e. ignoring hierarchies) with a specific data owner that have a certain tag.
@@ -85,9 +79,6 @@ interface ServiceFiltersFactory {
      *  You can also limit the result to only services that are within a certain [Service.valueDate] timeframe (or [Service.openingDate]
      *  if the first is missing), but in that case you must specify the [tagCode].
      *
-     *  These options are sortable. When sorting using these options the services will be sorted first by [tagCode] then
-     *  by [Service.valueDate].
-     *
      *  @param tagType a tag type
      *  @param tagCode a code for the provided tag type, or null if you want the filter to accept any entity
      *  with a tag of the provided type.
@@ -102,7 +93,7 @@ interface ServiceFiltersFactory {
         tagCode?: string | undefined;
         startOfServiceValueDate?: number | undefined;
         endOfServiceValueDate?: number | undefined;
-    }): BaseSortableFilterOptions<Service>;
+    }): BaseFilterOptions<Service>;
     /**
      *
      *  In group version of [byTagAndValueDateForDataOwner].
@@ -111,7 +102,7 @@ interface ServiceFiltersFactory {
         tagCode?: string | undefined;
         startOfServiceValueDate?: number | undefined;
         endOfServiceValueDate?: number | undefined;
-    }): BaseSortableFilterOptions<Service>;
+    }): BaseFilterOptions<Service>;
     /**
      *
      *  Options for service filtering which match all services shared directly (i.e. ignoring hierarchies) with a specific data owner that are linked with one
@@ -124,63 +115,54 @@ interface ServiceFiltersFactory {
      *  simply be ignored.
      *  Note that these may not be used in methods of apis from [CardinalBaseApis].
      *
-     *  These options are sortable. When sorting using these options the services will be sorted by the patients, using
-     *  the same order as the input patients.
      *  @param patients a list of patients.
      *  @param dataOwnerId a data owner id
      */
-    byPatientsForDataOwner(dataOwnerId: string, patients: Array<Patient>): SortableFilterOptions<Service>;
+    byPatientsForDataOwner(dataOwnerId: string, patients: Array<Patient>): FilterOptions<Service>;
     /**
      *
      *  In group version of [byPatientsForDataOwner].
      */
-    byPatientsForDataOwnerInGroup(dataOwner: EntityReferenceInGroup, patients: Array<Patient>): SortableFilterOptions<Service>;
+    byPatientsForDataOwnerInGroup(dataOwner: EntityReferenceInGroup, patients: Array<Patient>): FilterOptions<Service>;
     /**
      *
      *  Options for service filtering which match all services shared directly (i.e. ignoring hierarchies) with a specific data owner that are linked with a
      *  patient through one of the provided secret ids.
-     *  These options are sortable. When sorting using these options the services will be sorted by the linked patients
-     *  secret id, using the same order as the input.
+     *
      *  @param secretIds a list of patients secret ids
      *  @param dataOwnerId a data owner id
      */
-    byPatientsSecretIdsForDataOwner(dataOwnerId: string, secretIds: Array<string>): BaseSortableFilterOptions<Service>;
+    byPatientsSecretIdsForDataOwner(dataOwnerId: string, secretIds: Array<string>): BaseFilterOptions<Service>;
     /**
      *
      *  In group version of [byPatientsSecretIdsForDataOwner].
      */
-    byPatientsSecretIdsForDataOwnerInGroup(dataOwner: EntityReferenceInGroup, secretIds: Array<string>): BaseSortableFilterOptions<Service>;
+    byPatientsSecretIdsForDataOwnerInGroup(dataOwner: EntityReferenceInGroup, secretIds: Array<string>): BaseFilterOptions<Service>;
     /**
      *
      *  Options for service filtering which match all services from shared directly (i.e. ignoring hierarchies) with a specific data owner that exist in at
      *  least a [SubContact] (from [Contact.subContacts]) where [SubContact.healthElementId] matches one of the provided
      *  id.
      *
-     *  These options are sortable. When sorting using these options the services will be sorted in the same order as the
-     *  input health element ids. If a service exists in multiple subcontacts only the first subcontact with matching
-     *  health element service is considered for the ordering.
      *  @param healthElementIds a list of health element ids
      *  @param dataOwnerId a data owner id
      */
-    byHealthElementIdFromSubContactForDataOwner(dataOwnerId: string, healthElementIds: Array<string>): BaseSortableFilterOptions<Service>;
+    byHealthElementIdFromSubContactForDataOwner(dataOwnerId: string, healthElementIds: Array<string>): BaseFilterOptions<Service>;
     /**
      *
      *  In group version of [byHealthElementIdFromSubContactForDataOwner].
      */
-    byHealthElementIdFromSubContactForDataOwnerInGroup(dataOwner: EntityReferenceInGroup, healthElementIds: Array<string>): BaseSortableFilterOptions<Service>;
+    byHealthElementIdFromSubContactForDataOwnerInGroup(dataOwner: EntityReferenceInGroup, healthElementIds: Array<string>): BaseFilterOptions<Service>;
     /**
      *
      *  Options for service filtering which match all the services shared directly (i.e. ignoring hierarchies) with the current data owner that have at least
      *  an identifier that has the same exact [Identifier.system] and [Identifier.value] as one of the provided
      *  [identifiers]. Other properties of the provided identifiers are ignored.
      *
-     *  These options are sortable. When sorting using these options the services will be in the same order as the input
-     *  identifiers. In case an entity has multiple identifiers only the first matching identifier is considered for the
-     *  sorting.
      *  @param identifiers a list of identifiers
      *  @return options for service filtering
      */
-    byIdentifiersForSelf(identifiers: Array<Identifier>): SortableFilterOptions<Service>;
+    byIdentifiersForSelf(identifiers: Array<Identifier>): FilterOptions<Service>;
     /**
      *
      *  Options for service filtering which match all services shared directly (i.e. ignoring hierarchies) with the current data owner that have a certain code.
@@ -189,9 +171,6 @@ interface ServiceFiltersFactory {
      *  You can also limit the result to only services that are within a certain [Service.valueDate] timeframe (or [Service.openingDate]
      *  if the first is missing), but in that case you must specify the [codeCode].
      *
-     *  These options are sortable. When sorting using these options the services will be sorted first by [codeCode] then
-     *  by [Service.valueDate].
-     *
      *  @param codeType a code type
      *  @param codeCode a code for the provided code type, or null if you want the filter to accept any entity
      *  with a code of the provided type.
@@ -205,7 +184,7 @@ interface ServiceFiltersFactory {
         codeCode?: string | undefined;
         startOfServiceValueDate?: number | undefined;
         endOfServiceValueDate?: number | undefined;
-    }): SortableFilterOptions<Service>;
+    }): FilterOptions<Service>;
     /**
      *
      *  Options for service filtering which match all services shared directly (i.e. ignoring hierarchies) with the current data owner that have a certain tag.
@@ -214,9 +193,6 @@ interface ServiceFiltersFactory {
      *  You can also limit the result to only services that are within a certain [Service.valueDate] timeframe (or [Service.openingDate]
      *  if the first is missing), but in that case you must specify the [tagCode].
      *
-     *  These options are sortable. When sorting using these options the services will be sorted first by [tagCode] then
-     *  by [Service.valueDate].
-     *
      *  @param tagType a tag type
      *  @param tagCode a code for the provided tag type, or null if you want the filter to accept any entity
      *  with a tag of the provided type.
@@ -230,7 +206,7 @@ interface ServiceFiltersFactory {
         tagCode?: string | undefined;
         startOfServiceValueDate?: number | undefined;
         endOfServiceValueDate?: number | undefined;
-    }): SortableFilterOptions<Service>;
+    }): FilterOptions<Service>;
     /**
      *
      *  Options for service filtering which match all services shared directly (i.e. ignoring hierarchies) with the current data owner that are linked with one
@@ -243,35 +219,26 @@ interface ServiceFiltersFactory {
      *  simply be ignored.
      *  Note that these may not be used in methods of apis from [CardinalBaseApis].
      *
-     *  These options are sortable. When sorting using these options the services will be sorted by the patients, using
-     *  the same order as the input patients.
-     *
      *  @param patients a list of patients.
      */
-    byPatientsForSelf(patients: Array<Patient>): SortableFilterOptions<Service>;
+    byPatientsForSelf(patients: Array<Patient>): FilterOptions<Service>;
     /**
      *
      *  Options for service filtering which match all services shared directly (i.e. ignoring hierarchies) with the current data owner that are linked with a
      *  patient through one of the provided secret ids.
-     *  These options are sortable. When sorting using these options the services will be sorted by the linked patients
-     *  secret id, using the same order as the input.
      *
      *  @param secretIds a list of patients secret ids
      */
-    byPatientsSecretIdsForSelf(secretIds: Array<string>): SortableFilterOptions<Service>;
+    byPatientsSecretIdsForSelf(secretIds: Array<string>): FilterOptions<Service>;
     /**
      *
      *  Options for service filtering which match all services from shared directly (i.e. ignoring hierarchies) with the current data owner that exist in at
      *  least a [SubContact] (from [Contact.subContacts]) where [SubContact.healthElementId] matches one of the provided
      *  id.
      *
-     *  These options are sortable. When sorting using these options the services will be sorted in the same order as the
-     *  input health element ids. If a service exists in multiple subcontacts only the first subcontact with matching
-     *  health element service is considered for the ordering.
-     *
      *  @param healthElementIds a list of health element ids
      */
-    byHealthElementIdFromSubContactForSelf(healthElementIds: Array<string>): SortableFilterOptions<Service>;
+    byHealthElementIdFromSubContactForSelf(healthElementIds: Array<string>): FilterOptions<Service>;
     /**
      *
      *  Filter options that match all services with one of the provided ids.

package/kotlin-kotlin-stdlib.mjs

@@ -48,12 +48,6 @@ if (typeof Math.clz32 === 'undefined') {
     };
   }(Math.log, Math.LN2);
 }
-if (typeof String.prototype.startsWith === 'undefined') {
-  Object.defineProperty(String.prototype, 'startsWith', {value: function (searchString, position) {
-    position = position || 0;
-    return this.lastIndexOf(searchString, position) === position;
-  }});
-}
 if (typeof String.prototype.endsWith === 'undefined') {
   Object.defineProperty(String.prototype, 'endsWith', {value: function (searchString, position) {
     var subjectString = this.toString();
@@ -65,6 +59,12 @@ if (typeof String.prototype.endsWith === 'undefined') {
     return lastIndex !== -1 && lastIndex === position;
   }});
 }
+if (typeof String.prototype.startsWith === 'undefined') {
+  Object.defineProperty(String.prototype, 'startsWith', {value: function (searchString, position) {
+    position = position || 0;
+    return this.lastIndexOf(searchString, position) === position;
+  }});
+}
 //endregion
 //region block: imports
 var imul_0 = Math.imul;

package/kotlinx-coroutines-core.mjs

@@ -235,6 +235,11 @@ initMetadataForClass(BufferedChannelIterator, 'BufferedChannelIterator', VOID, V
 initMetadataForCoroutine($sendCOROUTINE$, CoroutineImpl);
 initMetadataForCoroutine($receiveCOROUTINE$, CoroutineImpl);
 initMetadataForCoroutine($receiveCatchingCOROUTINE$, CoroutineImpl);
+function close$default(cause, $super) {
+  cause = cause === VOID ? null : cause;
+  return $super === VOID ? this.s1d(cause) : $super.s1d.call(this, cause);
+}
+initMetadataForInterface(SendChannel, 'SendChannel', VOID, VOID, VOID, [1]);
 function cancel$default_0(cause, $super) {
   cause = cause === VOID ? null : cause;
   var tmp;
@@ -247,12 +252,7 @@ function cancel$default_0(cause, $super) {
   return tmp;
 }
 initMetadataForInterface(ReceiveChannel, 'ReceiveChannel', VOID, VOID, VOID, [0]);
-function close$default(cause, $super) {
-  cause = cause === VOID ? null : cause;
-  return $super === VOID ? this.s1d(cause) : $super.s1d.call(this, cause);
-}
-initMetadataForInterface(SendChannel, 'SendChannel', VOID, VOID, VOID, [1]);
-initMetadataForClass(BufferedChannel, 'BufferedChannel', VOID, VOID, [ReceiveChannel, SendChannel], [1, 4, 0, 3]);
+initMetadataForClass(BufferedChannel, 'BufferedChannel', VOID, VOID, [SendChannel, ReceiveChannel], [1, 4, 0, 3]);
 initMetadataForClass(WaiterEB, 'WaiterEB');
 initMetadataForClass(ReceiveCatching, 'ReceiveCatching', VOID, VOID, [Waiter]);
 initMetadataForObject(Factory, 'Factory');
@@ -262,7 +262,7 @@ initMetadataForCompanion(Companion);
 initMetadataForClass(ChannelResult, 'ChannelResult');
 initMetadataForClass(ClosedReceiveChannelException, 'ClosedReceiveChannelException', VOID, NoSuchElementException);
 initMetadataForClass(ClosedSendChannelException, 'ClosedSendChannelException', VOID, IllegalStateException);
-initMetadataForClass(ChannelCoroutine, 'ChannelCoroutine', VOID, AbstractCoroutine, [ReceiveChannel, SendChannel], [1, 0]);
+initMetadataForClass(ChannelCoroutine, 'ChannelCoroutine', VOID, AbstractCoroutine, [SendChannel, ReceiveChannel], [1, 0]);
 initMetadataForClass(ConflatedBufferedChannel, 'ConflatedBufferedChannel', VOID, BufferedChannel, VOID, [1, 0]);
 initMetadataForInterface(ProducerScope, 'ProducerScope', VOID, VOID, [CoroutineScope, SendChannel], [1]);
 initMetadataForClass(ProducerCoroutine, 'ProducerCoroutine', VOID, ChannelCoroutine, [ProducerScope], [1, 0]);

package/model/User.d.mts

@@ -141,6 +141,12 @@ export declare namespace User {
         loginIdentifiers: Array<LoginIdentifier>;
         verifiedEmail: boolean | undefined;
         verifiedMobilePhone: boolean | undefined;
+        /**
+         *
+         *
+         *   True if the user has 2fa enabled for login with password
+         */
+        uses2fa: boolean | undefined;
         constructor(partial: Partial<SystemMetadata> & Pick<SystemMetadata, "roles" | "isAdmin" | "inheritsRoles">);
         toJSON(): object;
         static fromJSON(json: any, ignoreUnknownKeys?: boolean, path?: Array<string>): SystemMetadata;

package/model/User.mjs

@@ -251,6 +251,12 @@ export class User {
             this.loginIdentifiers = [];
             this.verifiedEmail = undefined;
             this.verifiedMobilePhone = undefined;
+            /**
+             *
+             *
+             *   True if the user has 2fa enabled for login with password
+             */
+            this.uses2fa = undefined;
             this.roles = partial.roles;
             this.isAdmin = partial.isAdmin;
             this.inheritsRoles = partial.inheritsRoles;
@@ -260,6 +266,8 @@ export class User {
                 this.verifiedEmail = partial.verifiedEmail;
             if ('verifiedMobilePhone' in partial)
                 this.verifiedMobilePhone = partial.verifiedMobilePhone;
+            if ('uses2fa' in partial)
+                this.uses2fa = partial.uses2fa;
         }
         toJSON() {
             const res = {};
@@ -271,6 +279,8 @@ export class User {
                 res['verifiedEmail'] = this.verifiedEmail;
             if (this.verifiedMobilePhone != undefined)
                 res['verifiedMobilePhone'] = this.verifiedMobilePhone;
+            if (this.uses2fa != undefined)
+                res['uses2fa'] = this.uses2fa;
             return res;
         }
         static fromJSON(json, ignoreUnknownKeys = false, path = ['SystemMetadata']) {
@@ -284,6 +294,7 @@ export class User {
                 loginIdentifiers: expectArray(extractEntry(jCpy, 'loginIdentifiers', false, path), false, [...path, ".loginIdentifiers"], (x0, p0) => expectObject(x0, false, ignoreUnknownKeys, p0, LoginIdentifier.fromJSON)),
                 verifiedEmail: expectBoolean(extractEntry(jCpy, 'verifiedEmail', false, path), true, [...path, ".verifiedEmail"]),
                 verifiedMobilePhone: expectBoolean(extractEntry(jCpy, 'verifiedMobilePhone', false, path), true, [...path, ".verifiedMobilePhone"]),
+                uses2fa: expectBoolean(extractEntry(jCpy, 'uses2fa', false, path), true, [...path, ".uses2fa"]),
             });
             if (!ignoreUnknownKeys) {
                 const unused = Object.keys(jCpy);

package/model/base/CryptoActor.mjs

@@ -10,8 +10,8 @@ export var CryptoActor;
             case 'com.icure.cardinal.sdk.model.Device': return Device.fromJSON(json, ignoreUnknownKeys);
             case 'com.icure.cardinal.sdk.model.CryptoActorStub': return CryptoActorStub.fromJSON(json, ignoreUnknownKeys);
             case 'com.icure.cardinal.sdk.model.HealthcareParty': return HealthcareParty.fromJSON(json, ignoreUnknownKeys);
-            case 'com.icure.cardinal.sdk.model.DecryptedPatient': return DecryptedPatient.fromJSON(json, ignoreUnknownKeys);
             case 'com.icure.cardinal.sdk.model.EncryptedPatient': return EncryptedPatient.fromJSON(json, ignoreUnknownKeys);
+            case 'com.icure.cardinal.sdk.model.DecryptedPatient': return DecryptedPatient.fromJSON(json, ignoreUnknownKeys);
             default: throw new Error('Unexpected discriminator for CryptoActor: ' + json.$ktClass);
         }
     }

package/model/embed/form/template/Field.d.mts

@@ -17,4 +17,4 @@ import { TimePicker } from './TimePicker.mjs';
  *  validation rules, and optional codification and tagging.
  *  /
  */
-export type Field = TextField | MeasureField | DatePicker | DateTimePicker | MultipleChoice | TimePicker | DropdownField | RadioButton | NumberField | CheckBox;
+export type Field = DropdownField | DateTimePicker | RadioButton | MultipleChoice | MeasureField | CheckBox | TextField | TimePicker | DatePicker | NumberField;

package/model/embed/form/template/StructureElement.d.mts

@@ -6,7 +6,7 @@ import { FieldsGroup } from './FieldsGroup.mjs';
  *  groups.
  *  /
  */
-export type StructureElement = FieldsGroup | Field;
+export type StructureElement = Field | FieldsGroup;
 export declare namespace StructureElement {
     function fromJSON(json: any, ignoreUnknownKeys?: boolean, path?: Array<string>): StructureElement;
 }