@studyportals/search-api-interface 1.2.3-8 → 2.0.1-0

package/index.d.ts

@@ -1,3 +1,4 @@
+import { HitsTotalRelation } from "./src/HitsTotalRelation";
 import { DegreeTypeEnum } from "./src/organisations/DegreeTypeEnum";
 import { DeliveryMethodEnum } from "./src/organisations/DeliveryMethodEnum";
 import { IOrganisationSearchFilters } from "./src/organisations/IOrganisationSearchFilters";
@@ -5,13 +6,11 @@ import { IOrganisationSearchResponse } from "./src/organisations/IOrganisationSe
 import { OrganisationSearchFilters } from "./src/organisations/OrganisationSearchFilters";
 import { OrganisationSearchInput } from "./src/organisations/OrganisationSearchInput";
 import { SearchApiOrganisationClient } from "./src/organisations/SearchApiOrganisationClient";
+import { IProgrammeResult } from "./src/programmes/IProgrammeResult";
 import { IProgrammeSearchFilters } from "./src/programmes/IProgrammeSearchFilters";
 import { IProgrammeSearchResponse } from "./src/programmes/IProgrammeSearchResponse";
-import { IProgrammeResult } from "./src/programmes/IProgrammeResult";
 import { ProgrammeSearchFilters } from "./src/programmes/ProgrammeSearchFilters";
 import { ProgrammeSearchInput } from "./src/programmes/ProgrammeSearchInput";
-import { RangeDTO } from "./src/programmes/RangeDTO";
 import { SearchApiProgrammeClient } from "./src/programmes/SearchApiProgrammeClient";
-import { FacetOptionValue } from "./src/facets/FacetOptionValue";
-import { FacetResponseType } from "./src/facets/FacetResponseType";
-export { SearchApiOrganisationClient, IOrganisationSearchResponse, IOrganisationSearchFilters, OrganisationSearchFilters, SearchApiProgrammeClient, IProgrammeSearchResponse, IProgrammeSearchFilters, ProgrammeSearchFilters, IProgrammeResult, OrganisationSearchInput, ProgrammeSearchInput, DegreeTypeEnum, DeliveryMethodEnum, RangeDTO, FacetOptionValue, FacetResponseType };
+import { FacetResponseType, FacetValues } from "./src/facets/FacetResponseType";
+export { SearchApiOrganisationClient, IOrganisationSearchResponse, IOrganisationSearchFilters, OrganisationSearchFilters, SearchApiProgrammeClient, IProgrammeSearchResponse, IProgrammeSearchFilters, ProgrammeSearchFilters, OrganisationSearchInput, ProgrammeSearchInput, IProgrammeResult, DegreeTypeEnum, DeliveryMethodEnum, HitsTotalRelation, FacetResponseType, FacetValues };

package/index.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FacetOptionValue = exports.DeliveryMethodEnum = exports.DegreeTypeEnum = exports.IProgrammeResult = exports.ProgrammeSearchFilters = exports.IProgrammeSearchFilters = exports.SearchApiProgrammeClient = exports.OrganisationSearchFilters = exports.IOrganisationSearchFilters = exports.SearchApiOrganisationClient = void 0;
+exports.HitsTotalRelation = exports.DeliveryMethodEnum = exports.DegreeTypeEnum = exports.IProgrammeResult = exports.ProgrammeSearchFilters = exports.IProgrammeSearchFilters = exports.SearchApiProgrammeClient = exports.OrganisationSearchFilters = exports.IOrganisationSearchFilters = exports.SearchApiOrganisationClient = void 0;
+const HitsTotalRelation_1 = require("./src/HitsTotalRelation");
+Object.defineProperty(exports, "HitsTotalRelation", { enumerable: true, get: function () { return HitsTotalRelation_1.HitsTotalRelation; } });
 const DegreeTypeEnum_1 = require("./src/organisations/DegreeTypeEnum");
 Object.defineProperty(exports, "DegreeTypeEnum", { enumerable: true, get: function () { return DegreeTypeEnum_1.DegreeTypeEnum; } });
 const DeliveryMethodEnum_1 = require("./src/organisations/DeliveryMethodEnum");
@@ -11,14 +13,12 @@ const OrganisationSearchFilters_1 = require("./src/organisations/OrganisationSea
 Object.defineProperty(exports, "OrganisationSearchFilters", { enumerable: true, get: function () { return OrganisationSearchFilters_1.OrganisationSearchFilters; } });
 const SearchApiOrganisationClient_1 = require("./src/organisations/SearchApiOrganisationClient");
 Object.defineProperty(exports, "SearchApiOrganisationClient", { enumerable: true, get: function () { return SearchApiOrganisationClient_1.SearchApiOrganisationClient; } });
-const IProgrammeSearchFilters_1 = require("./src/programmes/IProgrammeSearchFilters");
-Object.defineProperty(exports, "IProgrammeSearchFilters", { enumerable: true, get: function () { return IProgrammeSearchFilters_1.IProgrammeSearchFilters; } });
 const IProgrammeResult_1 = require("./src/programmes/IProgrammeResult");
 Object.defineProperty(exports, "IProgrammeResult", { enumerable: true, get: function () { return IProgrammeResult_1.IProgrammeResult; } });
+const IProgrammeSearchFilters_1 = require("./src/programmes/IProgrammeSearchFilters");
+Object.defineProperty(exports, "IProgrammeSearchFilters", { enumerable: true, get: function () { return IProgrammeSearchFilters_1.IProgrammeSearchFilters; } });
 const ProgrammeSearchFilters_1 = require("./src/programmes/ProgrammeSearchFilters");
 Object.defineProperty(exports, "ProgrammeSearchFilters", { enumerable: true, get: function () { return ProgrammeSearchFilters_1.ProgrammeSearchFilters; } });
 const SearchApiProgrammeClient_1 = require("./src/programmes/SearchApiProgrammeClient");
 Object.defineProperty(exports, "SearchApiProgrammeClient", { enumerable: true, get: function () { return SearchApiProgrammeClient_1.SearchApiProgrammeClient; } });
-const FacetOptionValue_1 = require("./src/facets/FacetOptionValue");
-Object.defineProperty(exports, "FacetOptionValue", { enumerable: true, get: function () { return FacetOptionValue_1.FacetOptionValue; } });
 //# sourceMappingURL=index.js.map

package/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":";;;AAAA,uEAAoE;AAgCnE,+FAhCQ,+BAAc,OAgCR;AA/Bf,+EAA4E;AAgC3E,mGAhCQ,uCAAkB,OAgCR;AA/BnB,+FAA4F;AAkB3F,2GAlBQ,uDAA0B,OAkBR;AAhB3B,6FAA0F;AAiBzF,0GAjBQ,qDAAyB,OAiBR;AAf1B,iGAA8F;AAY7F,4GAZQ,yDAA2B,OAYR;AAX5B,sFAAmF;AAkBlF,wGAlBQ,iDAAuB,OAkBR;AAhBxB,wEAAqE;AAkBpE,iGAlBQ,mCAAgB,OAkBR;AAjBjB,oFAAiF;AAgBhF,uGAhBQ,+CAAsB,OAgBR;AAbvB,wFAAqF;AAUpF,yGAVQ,mDAAwB,OAUR;AATzB,oEAAiE;AAsBhE,iGAtBQ,mCAAgB,OAsBR"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":";;;AAAA,+DAA4D;AAiC3D,kGAjCQ,qCAAiB,OAiCR;AAhClB,uEAAoE;AA8BnE,+FA9BQ,+BAAc,OA8BR;AA7Bf,+EAA4E;AA8B3E,mGA9BQ,uCAAkB,OA8BR;AA7BnB,+FAA4F;AAgB3F,2GAhBQ,uDAA0B,OAgBR;AAd3B,6FAA0F;AAezF,0GAfQ,qDAAyB,OAeR;AAb1B,iGAA8F;AAU7F,4GAVQ,yDAA2B,OAUR;AAT5B,wEAAqE;AAqBpE,iGArBQ,mCAAgB,OAqBR;AApBjB,sFAAmF;AAelF,wGAfQ,iDAAuB,OAeR;AAbxB,oFAAiF;AAchF,uGAdQ,+CAAsB,OAcR;AAZvB,wFAAqF;AASpF,yGATQ,mDAAwB,OASR"}

package/package.json

@@ -1,31 +1,31 @@
-{
-	"name": "@studyportals/search-api-interface",
-	"version": "1.2.3-8",
-	"description": "Typescript library containing resources that facilitate integration with SearchApi",
-	"main": "bin/index.js",
-	"scripts": {
-		"compile": "rm -fR bin && npx tsc",
-		"deploy-patch": "npm version patch && npm run deploy",
-		"deploy-minor": "npm version minor && npm run deploy",
-		"deploy-major": "npm version major && npm run deploy",
-		"deploy-beta": "npm version prerelease && npm run prepare-deployment && npm publish ./bin --tag beta",
-		"deploy": "npm run prepare-deployment && npm publish ./bin",
-		"prepare-deployment": "npm run compile && cp package.json bin/package.json",
-		"lint": "eslint . --ext .ts",
-		"lint:fix": "eslint . --ext .ts --fix"
-	},
-	"author": "Seal Team Six",
-	"license": "BSD-3-Clause",
-	"devDependencies": {
-		"@studyportals/code-style": "^1.7.0",
-		"@types/superagent": "^4.1.15",
-		"@typescript-eslint/eslint-plugin": "^5.27.0",
-		"@typescript-eslint/parser": "^5.27.0",
-		"eslint": "^8.17.0",
-		"typescript": "^5.5.4",
-		"typescript-transform-paths": "^3.4.6"
-	},
-	"dependencies": {
-		"@studyportals/search-filters": "4.3.1-5"
-	}
-}
+{
+	"name": "@studyportals/search-api-interface",
+	"version": "2.0.1-0",
+	"description": "Typescript library containing resources that facilitate integration with SearchApi",
+	"main": "index.js",
+	"scripts": {
+		"compile": "rm -fR bin && npx tsc",
+		"deploy-patch": "npm version patch && npm run deploy",
+		"deploy-minor": "npm version minor && npm run deploy",
+		"deploy-major": "npm version major && npm run deploy",
+		"deploy-beta": "npm version prerelease && npm run prepare-deployment && npm publish ./bin --tag beta",
+		"deploy": "npm run prepare-deployment && npm publish ./bin",
+		"prepare-deployment": "npm run compile && cp package.json bin/package.json",
+		"lint": "eslint . --ext .ts",
+		"lint:fix": "eslint . --ext .ts --fix"
+	},
+	"author": "Seal Team Six",
+	"license": "BSD-3-Clause",
+	"devDependencies": {
+		"@studyportals/code-style": "^1.7.0",
+		"@types/superagent": "^4.1.15",
+		"@typescript-eslint/eslint-plugin": "^5.27.0",
+		"@typescript-eslint/parser": "^5.27.0",
+		"eslint": "^8.17.0",
+		"typescript": "^5.5.4",
+		"typescript-transform-paths": "^3.4.6"
+	},
+	"dependencies": {
+		"@studyportals/search-filters": "4.5.4"
+	}
+}

package/src/HitsTotalRelation.d.ts

@@ -0,0 +1,4 @@
+export declare enum HitsTotalRelation {
+    EXACTLY = "exactly",
+    MORE_THAN = "more than"
+}

package/src/HitsTotalRelation.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HitsTotalRelation = void 0;
+var HitsTotalRelation;
+(function (HitsTotalRelation) {
+    HitsTotalRelation["EXACTLY"] = "exactly";
+    HitsTotalRelation["MORE_THAN"] = "more than";
+})(HitsTotalRelation || (exports.HitsTotalRelation = HitsTotalRelation = {}));
+//# sourceMappingURL=HitsTotalRelation.js.map

package/src/HitsTotalRelation.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"HitsTotalRelation.js","sourceRoot":"","sources":["../../src/HitsTotalRelation.ts"],"names":[],"mappings":";;;AAAA,IAAY,iBAGX;AAHD,WAAY,iBAAiB;IAC5B,wCAAiB,CAAA;IACjB,4CAAqB,CAAA;AACtB,CAAC,EAHW,iBAAiB,iCAAjB,iBAAiB,QAG5B"}

package/src/facets/FacetResponseType.d.ts

@@ -1,5 +1,9 @@
-export type FacetResponseType = {
+type FacetResponseType = {
     filter: string;
+    values: FacetValues[];
+};
+type FacetValues = {
     count: number;
     value: string;
 };
+export { FacetResponseType, FacetValues };

package/src/organisations/IOrganisationSearchResponse.d.ts

@@ -1,5 +1,6 @@
+import { HitsTotalRelation } from "../HitsTotalRelation";
 export interface IOrganisationSearchResponse<T> {
     readonly organisations: readonly T[];
     readonly hitsTotal: number;
-    readonly hitsTotalRelation: "more than" | "exactly";
+    readonly hitsTotalRelation: HitsTotalRelation;
 }

package/src/programmes/IProgrammeSearchFilters.d.ts

@@ -1,20 +1,22 @@
-import { AttendanceFilterOptionValue, DegreeTypeFilterOptionValue, EducationLevelFilterOptionValue, EducationalFormFilterOptionValue, SpecialProgrammesFilterOptionValue } from "@studyportals/search-filters/server";
-import { RangeDTO } from "./RangeDTO";
-import { IFacetFilters } from "../facets/IFacetFilters";
+import { AttendanceFilterOptionValue, DegreeTypeFilterOptionValue, EducationLevelFilterOptionValue, EducationalFormFilterOptionValue, SpecialProgrammesFilterOptionValue, DurationFilterOptionValue, FacetOptionValue } from "@studyportals/search-filters/server-side";
+import { ProgrammeSortType } from "@/src/programmes/ProgrammeSortType";
 export declare class IProgrammeSearchFilters {
     readonly attendances?: AttendanceFilterOptionValue[];
     readonly degreeTypes?: DegreeTypeFilterOptionValue[];
     readonly disciplines?: string[];
-    readonly durations?: RangeDTO[];
+    readonly durations?: DurationFilterOptionValue[];
     readonly educationalLevels?: EducationLevelFilterOptionValue[];
     readonly educationalForms?: EducationalFormFilterOptionValue[];
-    readonly keyword?: string;
+    readonly text?: string;
     readonly areaIds?: string[];
     readonly regionIds?: string[];
     readonly countryIsoCodes?: string[];
     readonly organisationIds?: string[];
     readonly specialProgrammes?: SpecialProgrammesFilterOptionValue[];
-    readonly tuitionFee?: RangeDTO;
+    readonly tuitionFeeMin?: number;
+    readonly tuitionFeeMax?: number;
     readonly nationalityCountryIso?: string;
-    readonly facets?: IFacetFilters;
+    readonly sortBy?: ProgrammeSortType;
+    readonly facets?: FacetOptionValue[];
+    readonly facetsDurations?: DurationFilterOptionValue[];
 }

package/src/programmes/IProgrammeSearchFilters.js.map

@@ -1 +1 @@
-{"version":3,"file":"IProgrammeSearchFilters.js","sourceRoot":"","sources":["../../../src/programmes/IProgrammeSearchFilters.ts"],"names":[],"mappings":";;;AAWA,MAAa,uBAAuB;CAoBnC;AApBD,0DAoBC"}
+{"version":3,"file":"IProgrammeSearchFilters.js","sourceRoot":"","sources":["../../../src/programmes/IProgrammeSearchFilters.ts"],"names":[],"mappings":";;;AAWA,MAAa,uBAAuB;CAyBnC;AAzBD,0DAyBC"}

package/src/programmes/IProgrammeSearchResponse.d.ts

@@ -1,7 +1,8 @@
 import { FacetResponseType } from "../facets/FacetResponseType";
+import { HitsTotalRelation } from "../HitsTotalRelation";
 export interface IProgrammeSearchResponse<T> {
     readonly programmes: readonly T[];
     readonly hitsTotal: number;
-    readonly hitsTotalRelation: "more than" | "exactly";
-    readonly aggregations?: readonly FacetResponseType[];
+    readonly hitsTotalRelation: HitsTotalRelation;
+    readonly facets?: readonly FacetResponseType[];
 }

package/src/programmes/ProgrammeSearchFilters.d.ts

@@ -1,28 +1,26 @@
 import { IProgrammeSearchFilters } from "./IProgrammeSearchFilters";
 import { ProgrammeSearchInput } from "./ProgrammeSearchInput";
-import { AttendanceFilterOptionValue, DegreeTypeFilterOptionValue, EducationLevelFilterOptionValue, EducationalFormFilterOptionValue, SpecialProgrammesFilterOptionValue } from "@studyportals/search-filters/server";
-import { RangeDTO } from "./RangeDTO";
-import { IFacetFilters } from "../facets/IFacetFilters";
+import { AttendanceFilterOptionValue, DegreeTypeFilterOptionValue, EducationLevelFilterOptionValue, EducationalFormFilterOptionValue, SpecialProgrammesFilterOptionValue, DurationFilterOptionValue, FacetOptionValue } from "@studyportals/search-filters/server-side";
+import { ProgrammeSortType } from "@/src/programmes/ProgrammeSortType";
 export declare class ProgrammeSearchFilters implements IProgrammeSearchFilters {
     attendances?: AttendanceFilterOptionValue[];
     degreeTypes?: DegreeTypeFilterOptionValue[];
     disciplines?: string[];
-    durations?: RangeDTO[];
+    durations?: DurationFilterOptionValue[];
     educationalLevels?: EducationLevelFilterOptionValue[];
     educationalForms?: EducationalFormFilterOptionValue[];
-    keyword?: string;
+    text?: string;
     areaIds?: string[];
     regionIds?: string[];
     countryIsoCodes?: string[];
     organisationIds?: string[];
     specialProgrammes?: SpecialProgrammesFilterOptionValue[];
-    tuitionFee?: RangeDTO;
+    tuitionFeeMin?: number;
+    tuitionFeeMax?: number;
     nationalityCountryIso?: string;
-    facets: IFacetFilters;
+    sortBy?: ProgrammeSortType;
+    facets?: FacetOptionValue[];
+    facetsDurations?: DurationFilterOptionValue[];
     from(input: ProgrammeSearchInput): IProgrammeSearchFilters;
-    private parseDurations;
-    private parseTuitionFee;
     private numbersToStringsOrUndefined;
-    private parseFacets;
-    private parseFacetDurations;
 }

package/src/programmes/ProgrammeSearchFilters.js

@@ -5,57 +5,29 @@ class ProgrammeSearchFilters {
     from(input) {
         this.attendances = input.attendances;
         this.degreeTypes = input.degreeTypes;
+        this.durations = input.durations;
         this.disciplines = this.numbersToStringsOrUndefined(input.disciplines);
         this.educationalLevels = input.educationalLevels;
         this.educationalForms = input.educationalForms;
-        this.keyword = input.keyword;
+        this.text = input.text;
         this.areaIds = this.numbersToStringsOrUndefined(input.areaIds);
         this.regionIds = this.numbersToStringsOrUndefined(input.regionIds);
         this.countryIsoCodes = input.countryIsoCodes;
         this.organisationIds = input.organisationIds ? input.organisationIds.map(id => id.toString()) : undefined;
         this.specialProgrammes = input.specialProgrammes;
         this.nationalityCountryIso = input.nationalityCountryIso;
-        this.parseDurations(input);
-        this.parseTuitionFee(input);
-        this.parseFacets(input);
+        this.tuitionFeeMin = input.tuitionFeeMin;
+        this.tuitionFeeMax = input.tuitionFeeMax;
+        this.sortBy = input.sortBy;
+        this.facets = input.facets;
+        this.facetsDurations = input.facetsDurations;
         return this;
     }
-    parseDurations(input) {
-        if (!input.durations)
-            return;
-        this.durations = [];
-        for (const duration of input.durations) {
-            const [min, max] = JSON.parse(duration);
-            this.durations.push({ min, max });
-        }
-    }
-    parseTuitionFee(input) {
-        if (input.tuitionFeeMin || input.tuitionFeeMax) {
-            this.tuitionFee = {
-                min: input.tuitionFeeMin,
-                max: input.tuitionFeeMax,
-            };
-        }
-    }
     numbersToStringsOrUndefined(values) {
         if (values === undefined)
             return;
         return values.map(value => value.toString());
     }
-    parseFacets(input) {
-        var _a;
-        this.facets.facets = ((_a = input.facets) === null || _a === void 0 ? void 0 : _a.facets) || [];
-        this.parseFacetDurations(input);
-    }
-    parseFacetDurations(input) {
-        if (!input.facets.durations)
-            return;
-        this.facets.durations = [];
-        for (const duration of input.facets.durations) {
-            const [min, max] = JSON.parse(duration);
-            this.facets.durations.push({ min, max });
-        }
-    }
 }
 exports.ProgrammeSearchFilters = ProgrammeSearchFilters;
 //# sourceMappingURL=ProgrammeSearchFilters.js.map

package/src/programmes/ProgrammeSearchFilters.js.map

@@ -1 +1 @@
-{"version":3,"file":"ProgrammeSearchFilters.js","sourceRoot":"","sources":["../../../src/programmes/ProgrammeSearchFilters.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ProgrammeSearchFilters.js","sourceRoot":"","sources":["../../../src/programmes/ProgrammeSearchFilters.ts"],"names":[],"mappings":";;;AAcA,MAAa,sBAAsB;IA0B3B,IAAI,CAAC,KAA2B;QACtC,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC;QACrC,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC;QACrC,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC;QACjC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,2BAA2B,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QACvE,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC,iBAAiB,CAAC;QACjD,IAAI,CAAC,gBAAgB,GAAG,KAAK,CAAC,gBAAgB,CAAC;QAC/C,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;QAEvB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,2BAA2B,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC/D,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,2BAA2B,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACnE,IAAI,CAAC,eAAe,GAAG,KAAK,CAAC,eAAe,CAAC;QAE7C,IAAI,CAAC,eAAe,GAAG,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC1G,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC,iBAAiB,CAAC;QACjD,IAAI,CAAC,qBAAqB,GAAG,KAAK,CAAC,qBAAqB,CAAC;QAEzD,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC,aAAa,CAAC;QACzC,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC,aAAa,CAAC;QAEzC,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,CAAA;QAE1B,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;QAC3B,IAAI,CAAC,eAAe,GAAG,KAAK,CAAC,eAAe,CAAC;QAE7C,OAAO,IAAI,CAAC;IACb,CAAC;IAEO,2BAA2B,CAAC,MAA4B;QAC/D,IAAI,MAAM,KAAK,SAAS;YAAE,OAAO;QACjC,OAAO,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC9C,CAAC;CACD;AA1DD,wDA0DC"}

package/src/programmes/ProgrammeSearchInput.d.ts

@@ -1,15 +1,13 @@
-import { AttendanceFilterOptionValue, DegreeTypeFilterOptionValue, DurationFilterOptionValue, EducationLevelFilterOptionValue, EducationalFormFilterOptionValue, SpecialProgrammesFilterOptionValue } from "@studyportals/search-filters/server";
-import { IFacetValues } from "../facets/IFacetValues";
+import { AttendanceFilterOptionValue, DegreeTypeFilterOptionValue, DurationFilterOptionValue, EducationLevelFilterOptionValue, EducationalFormFilterOptionValue, SpecialProgrammesFilterOptionValue, FacetOptionValue } from "@studyportals/search-filters/server-side";
+import { ProgrammeSortType } from "@/src/programmes/ProgrammeSortType";
 export type ProgrammeSearchInput = {
-    resultSize: number;
-    resultOffset: number;
     attendances?: AttendanceFilterOptionValue[];
     degreeTypes?: DegreeTypeFilterOptionValue[];
     disciplines?: number[];
     durations?: DurationFilterOptionValue[];
     educationalLevels?: EducationLevelFilterOptionValue[];
     educationalForms?: EducationalFormFilterOptionValue[];
-    keyword: string;
+    text?: string;
     areaIds?: number[];
     regionIds?: number[];
     countryIsoCodes?: string[];
@@ -17,6 +15,8 @@ export type ProgrammeSearchInput = {
     specialProgrammes?: SpecialProgrammesFilterOptionValue[];
     tuitionFeeMin?: number;
     tuitionFeeMax?: number;
-    nationalityCountryIso: string;
-    facets: IFacetValues;
+    nationalityCountryIso?: string;
+    sortBy?: ProgrammeSortType;
+    facets?: FacetOptionValue[];
+    facetsDurations?: DurationFilterOptionValue[];
 };

package/src/programmes/ProgrammeSortType.d.ts

@@ -0,0 +1,4 @@
+export declare enum ProgrammeSortType {
+    DEFAULT = "default",
+    TUITION = "tuition"
+}

package/src/programmes/ProgrammeSortType.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ProgrammeSortType = void 0;
+var ProgrammeSortType;
+(function (ProgrammeSortType) {
+    ProgrammeSortType["DEFAULT"] = "default";
+    ProgrammeSortType["TUITION"] = "tuition";
+})(ProgrammeSortType || (exports.ProgrammeSortType = ProgrammeSortType = {}));
+//# sourceMappingURL=ProgrammeSortType.js.map

package/src/programmes/ProgrammeSortType.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ProgrammeSortType.js","sourceRoot":"","sources":["../../../src/programmes/ProgrammeSortType.ts"],"names":[],"mappings":";;;AAAA,IAAY,iBAGX;AAHD,WAAY,iBAAiB;IAC5B,wCAAiB,CAAA;IACjB,wCAAiB,CAAA;AAClB,CAAC,EAHW,iBAAiB,iCAAjB,iBAAiB,QAG5B"}

package/src/programmes/SearchApiProgrammeClient.d.ts

@@ -3,11 +3,12 @@ import { IRequestSender, ISuperAgentRequestFactory } from "@studyportals/mb-plat
 import { IProgrammeCard } from "@studyportals/domain-client";
 import { IProgrammeSearchResponse } from "./IProgrammeSearchResponse";
 import { IProgrammeResult } from "./IProgrammeResult";
+import { IProgrammeSearchFilters } from "./IProgrammeSearchFilters";
 export declare class SearchApiProgrammeClient extends SearchApiClientBase {
     private readonly requestFactory;
     private readonly requestSender;
     private readonly programmeCardFactory;
     constructor(apiUriBase: string, requestFactory: ISuperAgentRequestFactory, requestSender: IRequestSender);
-    searchCards(filters: any, resultSize: number, resultOffset: number): Promise<IProgrammeSearchResponse<IProgrammeResult<IProgrammeCard>>>;
+    searchCards(filters: IProgrammeSearchFilters, resultSize: number, resultOffset: number): Promise<IProgrammeSearchResponse<IProgrammeResult<IProgrammeCard>>>;
     searchIds(filters: any, resultSize: number, resultOffset: number): Promise<IProgrammeSearchResponse<string>>;
 }

package/src/programmes/SearchApiProgrammeClient.js

@@ -30,7 +30,7 @@ class SearchApiProgrammeClient extends SearchApiClientBase_1.SearchApiClientBase
                 card: this.programmeCardFactory.fromDescription(result.card),
                 is_premium: result.is_premium
             }));
-            return Object.assign(Object.assign({}, result), { programmes: programmeResults, aggregations: (_a = result.aggregations) !== null && _a !== void 0 ? _a : [] });
+            return Object.assign(Object.assign({}, result), { programmes: programmeResults, facets: (_a = result.facets) !== null && _a !== void 0 ? _a : [] });
         });
     }
     searchIds(filters, resultSize, resultOffset) {

package/src/programmes/SearchApiProgrammeClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"SearchApiProgrammeClient.js","sourceRoot":"","sources":["../../../src/programmes/SearchApiProgrammeClient.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gEAA6D;AAE7D,+DAAkF;AAKlF,MAAa,wBAAyB,SAAQ,yCAAmB;IAMhE,YAAmB,UAAkB,EACpC,cAAyC,EACzC,aAA6B;QAE7B,KAAK,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;QANhB,yBAAoB,GAAG,IAAI,mCAAmB,EAAE,CAAC;QAQjE,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,oBAAoB,GAAG,IAAI,mCAAmB,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IACtE,CAAC;IAEY,WAAW,CAAC,OAAY,EAAE,UAAkB,EAAE,YAAoB;;;YAC9E,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;iBAClE,KAAK,iCAAM,OAAO,KAAE,UAAU,EAAE,YAAY,IAAG,CAAC;YAElD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAgE,OAAO,CAAC,CAAC;YACnI,MAAM,gBAAgB,GAAgD,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBACtG,IAAI,EAAE,IAAI,CAAC,oBAAoB,CAAC,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC;gBAC5D,UAAU,EAAE,MAAM,CAAC,UAAU;aAC7B,CAAC,CAAC,CAAC;YAEJ,uCACI,MAAM,KACT,UAAU,EAAE,gBAAgB,EAC5B,YAAY,EAAE,MAAA,MAAM,CAAC,YAAY,mCAAI,EAAE,IACvC;QACF,CAAC;KAAA;IAEY,SAAS,CAAC,OAAY,EAAE,UAAkB,EAAE,YAAoB;;YAC5E,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;iBACtE,KAAK,iCAAM,OAAO,KAAE,UAAU,EAAE,YAAY,IAAG,CAAC;YAElD,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAmC,OAAO,CAAC,CAAC;QAC/F,CAAC;KAAA;CACD;AAxCD,4DAwCC"}
+{"version":3,"file":"SearchApiProgrammeClient.js","sourceRoot":"","sources":["../../../src/programmes/SearchApiProgrammeClient.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gEAA6D;AAE7D,+DAAkF;AAMlF,MAAa,wBAAyB,SAAQ,yCAAmB;IAMhE,YAAmB,UAAkB,EACpC,cAAyC,EACzC,aAA6B;QAE7B,KAAK,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;QANhB,yBAAoB,GAAG,IAAI,mCAAmB,EAAE,CAAC;QAQjE,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,oBAAoB,GAAG,IAAI,mCAAmB,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IACtE,CAAC;IAEY,WAAW,CAAC,OAAgC,EAAE,UAAkB,EAAE,YAAoB;;;YAClG,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;iBAClE,KAAK,iCAAM,OAAO,KAAE,UAAU,EAAE,YAAY,IAAG,CAAC;YAElD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAgE,OAAO,CAAC,CAAC;YACnI,MAAM,gBAAgB,GAAgD,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBACtG,IAAI,EAAE,IAAI,CAAC,oBAAoB,CAAC,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC;gBAC5D,UAAU,EAAE,MAAM,CAAC,UAAU;aAC7B,CAAC,CAAC,CAAC;YAEJ,uCACI,MAAM,KACT,UAAU,EAAE,gBAAgB,EAC5B,MAAM,EAAE,MAAA,MAAM,CAAC,MAAM,mCAAI,EAAE,IAC3B;QACF,CAAC;KAAA;IAEY,SAAS,CAAC,OAAY,EAAE,UAAkB,EAAE,YAAoB;;YAC5E,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;iBACtE,KAAK,iCAAM,OAAO,KAAE,UAAU,EAAE,YAAY,IAAG,CAAC;YAElD,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAmC,OAAO,CAAC,CAAC;QAC/F,CAAC;KAAA;CACD;AAxCD,4DAwCC"}

package/src/facets/FacetOptionValue.d.ts

@@ -1,13 +0,0 @@
-export declare enum FacetOptionValue {
-    METHODS = "methods",
-    LEVELS = "level",
-    DISCIPLINES = "disciplines",
-    EDUCATIONAL_FORMS = "educational_forms",
-    AREAS = "areas",
-    REGIONS = "regions",
-    DEGREE = "degree",
-    SPECIAL_STUDY = "special_study",
-    COUNTRY_CODES = "countryCodes",
-    ORGANISATIONS_ID = "organisationId",
-    DURATIONS = "durations"
-}

package/src/facets/FacetOptionValue.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=FacetOptionValue.js.map

package/src/facets/FacetOptionValue.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"FacetOptionValue.js","sourceRoot":"","sources":["../../../src/facets/FacetOptionValue.ts"],"names":[],"mappings":""}

package/src/facets/IFacetFilters.d.ts

@@ -1,5 +0,0 @@
-import { RangeDTO } from "../programmes/RangeDTO";
-export interface IFacetFilters {
-    facets: string[];
-    durations?: RangeDTO[];
-}

package/src/facets/IFacetFilters.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=IFacetFilters.js.map

package/src/facets/IFacetFilters.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"IFacetFilters.js","sourceRoot":"","sources":["../../../src/facets/IFacetFilters.ts"],"names":[],"mappings":""}

package/src/facets/IFacetValues.d.ts

@@ -1,6 +0,0 @@
-import { DurationFilterOptionValue } from "@studyportals/search-filters/server";
-import { FacetOptionValue } from "./FacetOptionValue";
-export interface IFacetValues {
-    readonly facets: FacetOptionValue[];
-    readonly durations?: DurationFilterOptionValue[];
-}

package/src/facets/IFacetValues.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=IFacetValues.js.map

package/src/facets/IFacetValues.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"IFacetValues.js","sourceRoot":"","sources":["../../../src/facets/IFacetValues.ts"],"names":[],"mappings":""}

package/src/programmes/RangeDTO.d.ts

@@ -1,4 +0,0 @@
-export interface RangeDTO {
-    min?: number;
-    max?: number;
-}

package/src/programmes/RangeDTO.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=RangeDTO.js.map

package/src/programmes/RangeDTO.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"RangeDTO.js","sourceRoot":"","sources":["../../../src/programmes/RangeDTO.ts"],"names":[],"mappings":""}