@kth/om-kursen-ladok-client 2.0.6 → 2.1.1

package/dist/supportApis/supportUtils.js

@@ -0,0 +1,116 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.extractDepartmentFlatsFromSchoolsWithDepartments = exports.filterOutDepartmentsWithoutCourses = exports.getSchoolsWithDepartments = exports.getSchoolNameFromLadokOrganisation = exports.flattenDepartment = exports.getSubDepartments = void 0;
+const typeChecking_1 = require("../utils/typeChecking");
+/**
+ * Retrieves the sub-departments for a given organisation (typically a school) by traversing the organisation hierarchy.
+ *
+ * This function recursively finds all departments under the specified organisation UID, optionally filtering out deprecated departments.
+ * Each department is represented as a hierarchical tree structure, where each node contains its name, code, and any sub-departments.
+ *
+ * @param params - The parameters for retrieving sub-departments.
+ * @param params.uid - The UID of the parent organisation (e.g., a school).
+ * @param params.organisationskopplingar - Array of organisation connection objects describing the hierarchy.
+ * @param params.organisationer - Array of organisation objects.
+ * @param params.language - The language to use for department names.
+ * @param params.includeDeprecatedDepartments - If true, include deprecated departments; otherwise, only include current departments. Defaults to false.
+ * @returns An array of Department objects representing the hierarchical structure of sub-departments.
+ *
+ * @see handleSchools (in coursesByOrgUtil.ts) for usage in filtering schools and departments with courses.
+ * @see extractSchoolsWithDepartments (in createSupportApis.ts) for usage in building school/department lists.
+ */
+const getSubDepartments = ({ uid, organisationskopplingar, organisationer, language, includeDeprecatedDepartments = false, }) => {
+    const matchingDepartmentKopplingar = organisationskopplingar.filter(koppling => koppling.OverliggandeRef.Uid === uid);
+    const matchingDepartments = matchingDepartmentKopplingar
+        .map(koppling => {
+        var _a;
+        const department = organisationer.find(org => org.Uid === koppling.UnderliggandeRef.Uid);
+        if (!department)
+            return null;
+        if (!includeDeprecatedDepartments && !isCurrentDepartment(department))
+            return null;
+        const name = getDepartmentNameFromLadokOrganisation(department, language);
+        return {
+            name,
+            code: (_a = department.Organisationskod) !== null && _a !== void 0 ? _a : '',
+            departments: (0, exports.getSubDepartments)({ uid: department.Uid, organisationskopplingar, organisationer, language }),
+        };
+    })
+        .filter(department => department !== null);
+    return matchingDepartments;
+};
+exports.getSubDepartments = getSubDepartments;
+const isCurrentDepartment = (organisation) => {
+    var _a, _b;
+    return !((_a = organisation.Giltighetsperiod) === null || _a === void 0 ? void 0 : _a.Slutdatum) || new Date((_b = organisation.Giltighetsperiod) === null || _b === void 0 ? void 0 : _b.Slutdatum) > new Date();
+};
+const getDepartmentNameFromLadokOrganisation = (org, language) => {
+    var _a;
+    let name = (_a = org.Benamning[language].split('/')[1]) !== null && _a !== void 0 ? _a : org.Benamning.sv;
+    return name;
+};
+const flattenDepartment = ({ name, code, departments }) => {
+    if (departments.length === 0) {
+        return [{ code, name }];
+    }
+    return [{ code, name }, ...departments.flatMap(exports.flattenDepartment)];
+};
+exports.flattenDepartment = flattenDepartment;
+const getSchoolNameFromLadokOrganisation = (org, language) => {
+    var _a;
+    let name = (_a = org.Benamning[language].split('/')[1]) !== null && _a !== void 0 ? _a : org.Benamning.sv;
+    name = name.replace(/^(Skolan för |School of )/, '');
+    name = `${name.charAt(0).toUpperCase()}${name.slice(1)}`;
+    return name;
+};
+exports.getSchoolNameFromLadokOrganisation = getSchoolNameFromLadokOrganisation;
+/**
+ * Retrieves a list of schools and their associated departments based on provided organisation data and school codes.
+ *
+ * This function filters the given organisations to include only those matching the specified school codes,
+ * then constructs a list of schools, each with its departments. Departments are determined by traversing the
+ * organisation hierarchy and flattening the department structure. Only departments whose codes start with the
+ * school's code are included.
+ *
+ * @param organisationer - Array of organisation objects representing schools and departments.
+ * @param organisationskopplingar - Array of organisation connection objects describing the hierarchy.
+ * @param language - The language to use for school and department names.
+ * @param schoolCodes - Array of school codes to include in the result.
+ * @returns An array of objects, each representing a school with its code, name, and filtered departments.
+ */
+const getSchoolsWithDepartments = ({ organisationer, organisationskopplingar, language, schoolCodes, }) => {
+    const currentSchoolOrganisations = organisationer.filter(organisation => schoolCodes.includes(organisation.Organisationskod));
+    const schoolsWithDepartments = currentSchoolOrganisations.map(school => {
+        const departmentHierarchy = (0, exports.getSubDepartments)({
+            uid: school.Uid,
+            organisationskopplingar,
+            organisationer,
+            language,
+            includeDeprecatedDepartments: true,
+        });
+        const allDepartments = departmentHierarchy.flatMap(exports.flattenDepartment);
+        // This filters out departments like "9A"
+        const departments = allDepartments.filter(department => department.code.startsWith(school.Organisationskod));
+        return {
+            departmentPrefix: school.Organisationskod,
+            name: (0, exports.getSchoolNameFromLadokOrganisation)(school, language),
+            departments,
+        };
+    });
+    schoolsWithDepartments.sort((a, b) => a.name.localeCompare(b.name));
+    return schoolsWithDepartments;
+};
+exports.getSchoolsWithDepartments = getSchoolsWithDepartments;
+const filterOutDepartmentsWithoutCourses = (departments, departmentCodesWithCourses) => {
+    const schools = departments.map(school => {
+        const departments = school.departments.filter(department => departmentCodesWithCourses.includes(department.code));
+        if (departments.length === 0)
+            return null;
+        return Object.assign(Object.assign({}, school), { departments });
+    });
+    return schools.filter(typeChecking_1.isDefined);
+};
+exports.filterOutDepartmentsWithoutCourses = filterOutDepartmentsWithoutCourses;
+const extractDepartmentFlatsFromSchoolsWithDepartments = (schoolsWithDepartments) => schoolsWithDepartments.flatMap(({ departments }) => departments.flat());
+exports.extractDepartmentFlatsFromSchoolsWithDepartments = extractDepartmentFlatsFromSchoolsWithDepartments;
+//# sourceMappingURL=supportUtils.js.map

package/dist/supportApis/supportUtils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"supportUtils.js","sourceRoot":"","sources":["../../src/supportApis/supportUtils.ts"],"names":[],"mappings":"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"}

package/dist/supportApis/types.d.ts

@@ -0,0 +1,12 @@
+export type Department = DepartmentFlat & {
+    departments: Department[];
+};
+export type DepartmentFlat = {
+    name: string;
+    code: string;
+};
+export type SchoolWithDepartments = {
+    departmentPrefix: string;
+    name: string;
+    departments: DepartmentFlat[];
+};

package/dist/supportApis/types.js

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

package/dist/supportApis/types.js.map

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

package/dist/types/OmKursenLadokApiClient.d.ts

@@ -5,16 +5,18 @@ import { Language } from '../utils';
 import { Utbildningsplan } from '../mapUtbildningsplan';
 import { KursPlan } from '../mapCourseSyllabus';
 import { Period } from '@kth/ladok-mellanlager-client/dist/types/endpoints/period';
-import { ProgramInstans } from '../mapProgramInstans';
+import { ProgrammeVersion } from '../mapProgrammeVersion';
 import { ProgramTillfalle } from '../mapProgramTillfalle';
 import { SearchApi } from '../search/types';
 import { ProgramCurriculum } from '../utils/programUtil';
 import { ProgramSyllabus } from '../mapProgramSyllabus';
 import { SupportApi } from '../supportApis/createSupportApis';
+import { ProgrammeApi } from '../programme/types';
 export type OmKursenLadokApiClient = {
     getLatestCourseVersion: (courseCode: string, language: Language) => Promise<(Course & ResponseInfo) | ResponseInfo>;
     getLatestCourseVersionIncludingCancelled: (courseCode: string, language: Language) => Promise<(Course & ResponseInfo) | ResponseInfo>;
     Search: SearchApi;
+    Programme: ProgrammeApi;
     getActiveCourseRounds: (courseCode: string, language: Language) => Promise<CourseRound[] | undefined>;
     getActiveAndFutureCourseRounds: (courseCode: string, language: Language) => Promise<CourseRound[] | undefined>;
     getCourseRoundsFromPeriod: (courseCode: string, fromPeriod: string, language: Language) => Promise<CourseRound[] | undefined>;
@@ -25,7 +27,7 @@ export type OmKursenLadokApiClient = {
     getActiveProgramInstance: (programCode: string, semester: string, language: Language) => Promise<ProgramTillfalle | undefined>;
     getProgramCurriculum: (programCode: string, semester: string, language: Language) => Promise<ProgramCurriculum[]>;
     getProgramVersion: (programCode: string, semester: string, language: Language) => Promise<{
-        programInstans: ProgramInstans | undefined;
+        programInstans: ProgrammeVersion | undefined;
         statusCode: number;
     }>;
     getUtbildningstilfalleStructure: (utbildningstillfalleUID: string, language: Language) => Promise<any>;

package/dist/utils/AcademicSemester.d.ts

@@ -0,0 +1,43 @@
+export declare enum SemesterNumber {
+    Spring = 1,
+    Autumn = 2
+}
+export declare enum LadokPeriod {
+    Spring = "VT",
+    Autumn = "HT"
+}
+export type AcademicSemesterJSON = {
+    year: number;
+    semesterNumber: SemesterNumber;
+};
+export declare class AcademicSemester {
+    readonly year: number;
+    readonly semesterNumber: SemesterNumber;
+    constructor(year: number, semesterNumber: SemesterNumber);
+    private static readonly semesterNumberToLadok;
+    private static readonly ladokToSemesterNumber;
+    /**
+     * Creates an AcademicSemester from a Ladok period string like "VT2024" or "HT2024".
+     * Returns undefined if the input does not match the expected format.
+     */
+    static fromLadokPeriodString(input: string): AcademicSemester | undefined;
+    /**
+     * Creates an AcademicSemester from a KTH semester string like "20241" for VT2024 or "20242" for HT2024.
+     * Returns undefined if the input does not match the expected format.
+     */
+    static fromKTHSemesterString(semester: string): AcademicSemester | undefined;
+    /**
+     * Create from a plain JSON object, as produced by toJSON().
+     */
+    static fromJSON({ year, semesterNumber }: AcademicSemesterJSON): AcademicSemester;
+    /**
+     * Returns a KTH semester string in the format 20241 for VT2024 or 20242 for HT2024.
+     */
+    toKTHSemesterString(): string;
+    /**
+     * Returns a Ladok period string in the format VT2024 for spring semester or HT2024 for autumn semester.
+     */
+    toLadokPeriodString(): string;
+    toString(): string;
+    toJSON(): AcademicSemesterJSON;
+}

package/dist/utils/AcademicSemester.js

@@ -0,0 +1,82 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AcademicSemester = exports.LadokPeriod = exports.SemesterNumber = void 0;
+var SemesterNumber;
+(function (SemesterNumber) {
+    SemesterNumber[SemesterNumber["Spring"] = 1] = "Spring";
+    SemesterNumber[SemesterNumber["Autumn"] = 2] = "Autumn";
+})(SemesterNumber || (exports.SemesterNumber = SemesterNumber = {}));
+var LadokPeriod;
+(function (LadokPeriod) {
+    LadokPeriod["Spring"] = "VT";
+    LadokPeriod["Autumn"] = "HT";
+})(LadokPeriod || (exports.LadokPeriod = LadokPeriod = {}));
+class AcademicSemester {
+    constructor(year, semesterNumber) {
+        this.year = year;
+        this.semesterNumber = semesterNumber;
+    }
+    /**
+     * Creates an AcademicSemester from a Ladok period string like "VT2024" or "HT2024".
+     * Returns undefined if the input does not match the expected format.
+     */
+    static fromLadokPeriodString(input) {
+        const uppercaseInput = input.toUpperCase();
+        const match = uppercaseInput.match(/^(VT|HT)(\d{4})$/);
+        if (!match)
+            return undefined;
+        const [, code, yearStr] = match;
+        return new AcademicSemester(Number(yearStr), AcademicSemester.ladokToSemesterNumber[code]);
+    }
+    /**
+     * Creates an AcademicSemester from a KTH semester string like "20241" for VT2024 or "20242" for HT2024.
+     * Returns undefined if the input does not match the expected format.
+     */
+    static fromKTHSemesterString(semester) {
+        const match = semester.match(/^(\d{4})([12])$/);
+        if (!match)
+            return undefined;
+        const [, yearStr, semCode] = match;
+        return new AcademicSemester(Number(yearStr), Number(semCode));
+    }
+    /**
+     * Create from a plain JSON object, as produced by toJSON().
+     */
+    static fromJSON({ year, semesterNumber }) {
+        return new AcademicSemester(year, semesterNumber);
+    }
+    /**
+     * Returns a KTH semester string in the format 20241 for VT2024 or 20242 for HT2024.
+     */
+    toKTHSemesterString() {
+        return `${this.year}${this.semesterNumber}`;
+    }
+    /**
+     * Returns a Ladok period string in the format VT2024 for spring semester or HT2024 for autumn semester.
+     */
+    toLadokPeriodString() {
+        const period = AcademicSemester.semesterNumberToLadok[this.semesterNumber];
+        return `${period}${this.year}`;
+    }
+    toString() {
+        return this.toLadokPeriodString();
+    }
+    toJSON() {
+        return {
+            year: this.year,
+            semesterNumber: this.semesterNumber,
+        };
+    }
+}
+exports.AcademicSemester = AcademicSemester;
+// Map SemesterNumber to LadokPeriod
+AcademicSemester.semesterNumberToLadok = {
+    [SemesterNumber.Spring]: LadokPeriod.Spring,
+    [SemesterNumber.Autumn]: LadokPeriod.Autumn,
+};
+// Map LadokPeriod back to SemesterNumber
+AcademicSemester.ladokToSemesterNumber = {
+    [LadokPeriod.Spring]: SemesterNumber.Spring,
+    [LadokPeriod.Autumn]: SemesterNumber.Autumn,
+};
+//# sourceMappingURL=AcademicSemester.js.map

package/dist/utils/AcademicSemester.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"AcademicSemester.js","sourceRoot":"","sources":["../../src/utils/AcademicSemester.ts"],"names":[],"mappings":";;;AAAA,IAAY,cAGX;AAHD,WAAY,cAAc;IACxB,uDAAU,CAAA;IACV,uDAAU,CAAA;AACZ,CAAC,EAHW,cAAc,8BAAd,cAAc,QAGzB;AAED,IAAY,WAGX;AAHD,WAAY,WAAW;IACrB,4BAAa,CAAA;IACb,4BAAa,CAAA;AACf,CAAC,EAHW,WAAW,2BAAX,WAAW,QAGtB;AAOD,MAAa,gBAAgB;IAI3B,YAAY,IAAY,EAAE,cAA8B;QACtD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAChB,IAAI,CAAC,cAAc,GAAG,cAAc,CAAA;IACtC,CAAC;IAcD;;;OAGG;IACI,MAAM,CAAC,qBAAqB,CAAC,KAAa;QAC/C,MAAM,cAAc,GAAG,KAAK,CAAC,WAAW,EAAE,CAAA;QAC1C,MAAM,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAA;QACtD,IAAI,CAAC,KAAK;YAAE,OAAO,SAAS,CAAA;QAC5B,MAAM,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,GAAG,KAAK,CAAA;QAC/B,OAAO,IAAI,gBAAgB,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,gBAAgB,CAAC,qBAAqB,CAAC,IAAmB,CAAC,CAAC,CAAA;IAC3G,CAAC;IAED;;;OAGG;IACI,MAAM,CAAC,qBAAqB,CAAC,QAAgB;QAClD,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAA;QAC/C,IAAI,CAAC,KAAK;YAAE,OAAO,SAAS,CAAA;QAC5B,MAAM,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,GAAG,KAAK,CAAA;QAClC,OAAO,IAAI,gBAAgB,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,OAAO,CAAmB,CAAC,CAAA;IACjF,CAAC;IAED;;OAEG;IACI,MAAM,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,cAAc,EAAwB;QACnE,OAAO,IAAI,gBAAgB,CAAC,IAAI,EAAE,cAAc,CAAC,CAAA;IACnD,CAAC;IAED;;OAEG;IACH,mBAAmB;QACjB,OAAO,GAAG,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,cAAc,EAAE,CAAA;IAC7C,CAAC;IAED;;OAEG;IACH,mBAAmB;QACjB,MAAM,MAAM,GAAG,gBAAgB,CAAC,qBAAqB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;QAC1E,OAAO,GAAG,MAAM,GAAG,IAAI,CAAC,IAAI,EAAE,CAAA;IAChC,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,mBAAmB,EAAE,CAAA;IACnC,CAAC;IAED,MAAM;QACJ,OAAO;YACL,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,cAAc,EAAE,IAAI,CAAC,cAAc;SACpC,CAAA;IACH,CAAC;;AA3EH,4CA4EC;AAnEC,oCAAoC;AACZ,sCAAqB,GAAwC;IACnF,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC,MAAM;IAC3C,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC,MAAM;CAC5C,CAAA;AAED,yCAAyC;AACjB,sCAAqB,GAAwC;IACnF,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,cAAc,CAAC,MAAM;IAC3C,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,cAAc,CAAC,MAAM;CAC5C,CAAA"}

package/dist/{search → utils}/SearchError.d.ts

@@ -23,10 +23,17 @@ export declare class SearchError extends Error {
      * @returns
      */
     static noRestrictions(): SearchError;
+    /**
+     * Creates a new SearchError with errorCode MISSING_PARAMETER and the given message.
+     * @param message
+     * @returns
+     */
+    static missingParameter(message: string): SearchError;
 }
 export declare enum SearchErrorCode {
     UNKNOWN_ERROR = "unknownError",
     OVERFLOW = "search-error-overflow",
     KOD_OR_BENAMNING_MISSING = "errorKodEllerBenamning",
-    NO_RESTRICTIONS = "errorNoRestrictions"
+    NO_RESTRICTIONS = "errorNoRestrictions",
+    MISSING_PARAMETER = "errorMissingParameter"
 }

package/dist/{search → utils}/SearchError.js

@@ -38,6 +38,14 @@ class SearchError extends Error {
     static noRestrictions() {
         return new SearchError(SearchErrorCode.NO_RESTRICTIONS);
     }
+    /**
+     * Creates a new SearchError with errorCode MISSING_PARAMETER and the given message.
+     * @param message
+     * @returns
+     */
+    static missingParameter(message) {
+        return new SearchError(SearchErrorCode.MISSING_PARAMETER, message);
+    }
 }
 exports.SearchError = SearchError;
 // TODO Benni refactor naming convention to be more consistent, make sure it is in sync with KP
@@ -47,5 +55,6 @@ var SearchErrorCode;
     SearchErrorCode["OVERFLOW"] = "search-error-overflow";
     SearchErrorCode["KOD_OR_BENAMNING_MISSING"] = "errorKodEllerBenamning";
     SearchErrorCode["NO_RESTRICTIONS"] = "errorNoRestrictions";
+    SearchErrorCode["MISSING_PARAMETER"] = "errorMissingParameter";
 })(SearchErrorCode || (exports.SearchErrorCode = SearchErrorCode = {}));
 //# sourceMappingURL=SearchError.js.map

package/dist/utils/SearchError.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SearchError.js","sourceRoot":"","sources":["../../src/utils/SearchError.ts"],"names":[],"mappings":";;;AAAA,MAAa,WAAY,SAAQ,KAAK;IAEpC,YAAoB,SAA0B,EAAE,OAAgB;QAC9D,KAAK,CAAC,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,SAAS,CAAC,CAAA;QAC3B,IAAI,CAAC,IAAI,GAAG,aAAa,CAAA;QACzB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC1B,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,WAAW,CAAC,SAAS,CAAC,CAAA;IACpD,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,OAAO,CAAC,OAAe;QAC5B,OAAO,IAAI,WAAW,CAAC,eAAe,CAAC,aAAa,EAAE,OAAO,CAAC,CAAA;IAChE,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,QAAQ,CAAC,OAAe;QAC7B,OAAO,IAAI,WAAW,CAAC,eAAe,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;IAC3D,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,iBAAiB;QACtB,OAAO,IAAI,WAAW,CAAC,eAAe,CAAC,wBAAwB,CAAC,CAAA;IAClE,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,cAAc;QACnB,OAAO,IAAI,WAAW,CAAC,eAAe,CAAC,eAAe,CAAC,CAAA;IACzD,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,gBAAgB,CAAC,OAAe;QACrC,OAAO,IAAI,WAAW,CAAC,eAAe,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAA;IACpE,CAAC;CACF;AAnDD,kCAmDC;AAED,+FAA+F;AAC/F,IAAY,eAMX;AAND,WAAY,eAAe;IACzB,iDAA8B,CAAA;IAC9B,qDAAkC,CAAA;IAClC,sEAAmD,CAAA;IACnD,0DAAuC,CAAA;IACvC,8DAA2C,CAAA;AAC7C,CAAC,EANW,eAAe,+BAAf,eAAe,QAM1B"}

package/dist/utils/collectionUtils.d.ts

@@ -0,0 +1,4 @@
+/**
+ * Groups an array of items by a given key selector.
+ */
+export declare const groupBy: <T, K>(items: T[], keySelector: (item: T) => K) => Map<K, T[]>;

package/dist/utils/collectionUtils.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.groupBy = void 0;
+/**
+ * Groups an array of items by a given key selector.
+ */
+const groupBy = (items, keySelector) => {
+    const grouped = new Map();
+    for (const item of items) {
+        const key = keySelector(item);
+        if (!grouped.has(key)) {
+            grouped.set(key, []);
+        }
+        grouped.get(key).push(item);
+    }
+    return grouped;
+};
+exports.groupBy = groupBy;
+//# sourceMappingURL=collectionUtils.js.map

package/dist/utils/collectionUtils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"collectionUtils.js","sourceRoot":"","sources":["../../src/utils/collectionUtils.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACI,MAAM,OAAO,GAAG,CAAO,KAAU,EAAE,WAA2B,EAAe,EAAE;IACpF,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAA;IAEjC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,GAAG,GAAG,WAAW,CAAC,IAAI,CAAC,CAAA;QAC7B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YACtB,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;QACtB,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAC9B,CAAC;IAED,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAZY,QAAA,OAAO,WAYnB"}

package/dist/utils/creditsUtil.js

@@ -4,6 +4,7 @@ exports.formatCreditsWithUnitLabel = exports.getCreditsUnit = void 0;
 const getCreditsUnit = (utbildningstyp, language) => {
     switch (utbildningstyp.creditsUnit.code) {
         case 'HP':
+        case 'HP-K':
             return language === 'sv' ? 'hp' : 'credits';
         case 'FUP':
             return 'fup';

package/dist/utils/creditsUtil.js.map

@@ -1 +1 @@
-{"version":3,"file":"creditsUtil.js","sourceRoot":"","sources":["../../src/utils/creditsUtil.ts"],"names":[],"mappings":";;;AAGO,MAAM,cAAc,GAAG,CAAC,cAA8B,EAAE,QAAkB,EAAE,EAAE;IACnF,QAAQ,cAAc,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;QACxC,KAAK,IAAI;YACP,OAAO,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAA;QAC7C,KAAK,KAAK;YACR,OAAO,KAAK,CAAA;QACd;YACE,OAAO,cAAc,CAAC,WAAW,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAA;IAC9D,CAAC;AACH,CAAC,CAAA;AATY,QAAA,cAAc,kBAS1B;AAED,MAAM,aAAa,GAAG,CAAC,UAAkB,EAAE,QAAkB,EAAE,EAAE,CAC/D,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAA;AAExD,MAAM,0BAA0B,GAAG,CACxC,UAAkB,EAClB,cAA0C,EAC1C,QAAkB,EAClB,EAAE;IACF,MAAM,OAAO,GAAG,aAAa,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;IACnD,MAAM,IAAI,GAAG,cAAc,CAAC,CAAC,CAAC,IAAA,sBAAc,EAAC,cAAc,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IAC3E,OAAO,GAAG,OAAO,IAAI,IAAI,EAAE,CAAA;AAC7B,CAAC,CAAA;AARY,QAAA,0BAA0B,8BAQtC"}
+{"version":3,"file":"creditsUtil.js","sourceRoot":"","sources":["../../src/utils/creditsUtil.ts"],"names":[],"mappings":";;;AAGO,MAAM,cAAc,GAAG,CAAC,cAA8B,EAAE,QAAkB,EAAE,EAAE;IACnF,QAAQ,cAAc,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;QACxC,KAAK,IAAI,CAAC;QACV,KAAK,MAAM;YACT,OAAO,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAA;QAC7C,KAAK,KAAK;YACR,OAAO,KAAK,CAAA;QACd;YACE,OAAO,cAAc,CAAC,WAAW,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAA;IAC9D,CAAC;AACH,CAAC,CAAA;AAVY,QAAA,cAAc,kBAU1B;AAED,MAAM,aAAa,GAAG,CAAC,UAAkB,EAAE,QAAkB,EAAE,EAAE,CAC/D,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAA;AAExD,MAAM,0BAA0B,GAAG,CACxC,UAAkB,EAClB,cAA0C,EAC1C,QAAkB,EAClB,EAAE;IACF,MAAM,OAAO,GAAG,aAAa,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;IACnD,MAAM,IAAI,GAAG,cAAc,CAAC,CAAC,CAAC,IAAA,sBAAc,EAAC,cAAc,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IAC3E,OAAO,GAAG,OAAO,IAAI,IAAI,EAAE,CAAA;AAC7B,CAAC,CAAA;AARY,QAAA,0BAA0B,8BAQtC"}

package/dist/utils/errorUtils.d.ts

@@ -1,4 +1,4 @@
-import { SearchError } from '../search/SearchError';
+import { SearchError } from '../utils/SearchError';
 /**
  * This function contains a utility to convert an unknown error into a SearchError.
  * This was inspired by this blog post: https://kentcdodds.com/blog/get-a-catch-block-error-message-with-typescript

package/dist/utils/errorUtils.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toSearchError = void 0;
-const SearchError_1 = require("../search/SearchError");
+const SearchError_1 = require("../utils/SearchError");
 /**
  * This function contains a utility to convert an unknown error into a SearchError.
  * This was inspired by this blog post: https://kentcdodds.com/blog/get-a-catch-block-error-message-with-typescript

package/dist/utils/errorUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"errorUtils.js","sourceRoot":"","sources":["../../src/utils/errorUtils.ts"],"names":[],"mappings":";;;AAAA,uDAAmD;AAEnD;;;;;;GAMG;AAEH;;;;GAIG;AACI,MAAM,aAAa,GAAG,CAAC,UAAmB,EAAe,EAAE;IAChE,IAAI,aAAa,CAAC,UAAU,CAAC;QAAE,OAAO,UAAU,CAAA;IAEhD,IAAI,kBAAkB,CAAC,UAAU,CAAC,EAAE,CAAC;QACnC,OAAO,yBAAW,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;IAChD,CAAC;IAED,OAAO,yBAAW,CAAC,OAAO,CAAC,sBAAsB,CAAC,UAAU,CAAC,CAAC,CAAA;AAChE,CAAC,CAAA;AARY,QAAA,aAAa,iBAQzB;AAED,MAAM,aAAa,GAAG,CAAC,KAAc,EAAwB,EAAE;IAC7D,OAAO,CACL,OAAO,KAAK,KAAK,QAAQ;QACzB,KAAK,KAAK,IAAI;QACd,MAAM,IAAI,KAAK;QACf,OAAQ,KAAiC,CAAC,IAAI,KAAK,QAAQ;QAC3D,KAAK,CAAC,IAAI,KAAK,aAAa;QAC5B,KAAK,YAAY,yBAAW,CAC7B,CAAA;AACH,CAAC,CAAA;AAMD,SAAS,kBAAkB,CAAC,KAAc;IACxC,OAAO,CACL,OAAO,KAAK,KAAK,QAAQ;QACzB,KAAK,KAAK,IAAI;QACd,SAAS,IAAI,KAAK;QAClB,OAAQ,KAAiC,CAAC,OAAO,KAAK,QAAQ,CAC/D,CAAA;AACH,CAAC;AAED,MAAM,sBAAsB,GAAG,CAAC,UAAmB,EAAU,EAAE;IAC7D,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAA;IACnC,CAAC;IAAC,WAAM,CAAC;QACP,gEAAgE;QAChE,6CAA6C;QAC7C,OAAO,MAAM,CAAC,UAAU,CAAC,CAAA;IAC3B,CAAC;AACH,CAAC,CAAA"}
+{"version":3,"file":"errorUtils.js","sourceRoot":"","sources":["../../src/utils/errorUtils.ts"],"names":[],"mappings":";;;AAAA,sDAAkD;AAElD;;;;;;GAMG;AAEH;;;;GAIG;AACI,MAAM,aAAa,GAAG,CAAC,UAAmB,EAAe,EAAE;IAChE,IAAI,aAAa,CAAC,UAAU,CAAC;QAAE,OAAO,UAAU,CAAA;IAEhD,IAAI,kBAAkB,CAAC,UAAU,CAAC,EAAE,CAAC;QACnC,OAAO,yBAAW,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;IAChD,CAAC;IAED,OAAO,yBAAW,CAAC,OAAO,CAAC,sBAAsB,CAAC,UAAU,CAAC,CAAC,CAAA;AAChE,CAAC,CAAA;AARY,QAAA,aAAa,iBAQzB;AAED,MAAM,aAAa,GAAG,CAAC,KAAc,EAAwB,EAAE;IAC7D,OAAO,CACL,OAAO,KAAK,KAAK,QAAQ;QACzB,KAAK,KAAK,IAAI;QACd,MAAM,IAAI,KAAK;QACf,OAAQ,KAAiC,CAAC,IAAI,KAAK,QAAQ;QAC3D,KAAK,CAAC,IAAI,KAAK,aAAa;QAC5B,KAAK,YAAY,yBAAW,CAC7B,CAAA;AACH,CAAC,CAAA;AAMD,SAAS,kBAAkB,CAAC,KAAc;IACxC,OAAO,CACL,OAAO,KAAK,KAAK,QAAQ;QACzB,KAAK,KAAK,IAAI;QACd,SAAS,IAAI,KAAK;QAClB,OAAQ,KAAiC,CAAC,OAAO,KAAK,QAAQ,CAC/D,CAAA;AACH,CAAC;AAED,MAAM,sBAAsB,GAAG,CAAC,UAAmB,EAAU,EAAE;IAC7D,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAA;IACnC,CAAC;IAAC,WAAM,CAAC;QACP,gEAAgE;QAChE,6CAA6C;QAC7C,OAAO,MAAM,CAAC,UAAU,CAAC,CAAA;IAC3B,CAAC;AACH,CAAC,CAAA"}

package/dist/{search/utils → utils}/getAllEntitiesByUseOfContinuation.d.ts

@@ -1,4 +1,5 @@
 import { MellanlagringSearchResponse, SokUtbildningsInstansSlimQuery, SokUtbildningsTillfalleSlimQuery } from '@kth/ladok-mellanlager-client';
+import { ContinuationOptions } from '../search/types';
 export declare const getAllEntitiesByUseOfContinuation: <T, K extends SokUtbildningsInstansSlimQuery | SokUtbildningsTillfalleSlimQuery>(apiCall: (requestQuery: K, requestHeader?: {
     continuationToken?: string;
-}) => Promise<MellanlagringSearchResponse<T>>, requestQuery: K) => Promise<T[]>;
+}) => Promise<MellanlagringSearchResponse<T>>, requestQuery: K, { maxSearchResultsToReturn, maxContinuationIterations, }?: ContinuationOptions) => Promise<T[]>;

package/dist/{search/utils → utils}/getAllEntitiesByUseOfContinuation.js

@@ -10,17 +10,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAllEntitiesByUseOfContinuation = void 0;
-const SearchError_1 = require("../SearchError");
+const SearchError_1 = require("../utils/SearchError");
 const MAX_SEARCH_RESULTS_TO_RETURN = 300; // TODO Benni, make sure to adjust this. We do not want to have more than 250 results in the UI, but here it could be more
 const MAX_CONTINUATION_ITERATIONS = 4;
-const getAllEntitiesByUseOfContinuation = (apiCall, requestQuery) => __awaiter(void 0, void 0, void 0, function* () {
+const getAllEntitiesByUseOfContinuation = (apiCall_1, requestQuery_1, ...args_1) => __awaiter(void 0, [apiCall_1, requestQuery_1, ...args_1], void 0, function* (apiCall, requestQuery, { maxSearchResultsToReturn = MAX_SEARCH_RESULTS_TO_RETURN, maxContinuationIterations = MAX_CONTINUATION_ITERATIONS, } = {}) {
     var _a;
     let continuationToken = undefined;
     let iterationCount = 0;
     let allEntities = [];
     do {
-        if (iterationCount >= MAX_CONTINUATION_ITERATIONS) {
-            throw SearchError_1.SearchError.overflow(`Maximum number of continuation iterations reached: ${MAX_CONTINUATION_ITERATIONS}`);
+        if (iterationCount >= maxContinuationIterations) {
+            throw SearchError_1.SearchError.overflow(`Maximum number of continuation iterations reached: ${maxContinuationIterations}`);
         }
         const requestHeader = Object.assign({}, (continuationToken !== null && continuationToken !== undefined && { continuationToken }));
         const result = yield apiCall(requestQuery, requestHeader);
@@ -37,7 +37,7 @@ const getAllEntitiesByUseOfContinuation = (apiCall, requestQuery) => __awaiter(v
             return [];
         }
         allEntities = allEntities.concat(result.items);
-        if (allEntities.length > MAX_SEARCH_RESULTS_TO_RETURN) {
+        if (allEntities.length > maxSearchResultsToReturn) {
             throw SearchError_1.SearchError.overflow(`Maximum number of entities exceeded: ${allEntities.length}`);
         }
         continuationToken = (_a = result.searchMeta.continuationToken) !== null && _a !== void 0 ? _a : undefined;

package/dist/utils/getAllEntitiesByUseOfContinuation.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getAllEntitiesByUseOfContinuation.js","sourceRoot":"","sources":["../../src/utils/getAllEntitiesByUseOfContinuation.ts"],"names":[],"mappings":";;;;;;;;;;;;AAKA,sDAAkD;AAGlD,MAAM,4BAA4B,GAAG,GAAG,CAAA,CAAC,0HAA0H;AACnK,MAAM,2BAA2B,GAAG,CAAC,CAAA;AAE9B,MAAM,iCAAiC,GAAG,uCAejC,EAAE,8EAXhB,OAK4C,EAC5C,YAAe,EACf,EACE,wBAAwB,GAAG,4BAA4B,EACvD,yBAAyB,GAAG,2BAA2B,MAChC,EAAE;;IAE3B,IAAI,iBAAiB,GAAuB,SAAS,CAAA;IACrD,IAAI,cAAc,GAAG,CAAC,CAAA;IACtB,IAAI,WAAW,GAAQ,EAAE,CAAA;IAEzB,GAAG,CAAC;QACF,IAAI,cAAc,IAAI,yBAAyB,EAAE,CAAC;YAChD,MAAM,yBAAW,CAAC,QAAQ,CAAC,sDAAsD,yBAAyB,EAAE,CAAC,CAAA;QAC/G,CAAC;QACD,MAAM,aAAa,qBACd,CAAC,iBAAiB,KAAK,IAAI,IAAI,iBAAiB,KAAK,SAAS,IAAI,EAAE,iBAAiB,EAAE,CAAC,CAC5F,CAAA;QACD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,YAAY,EAAE,aAAa,CAAC,CAAA;QAEzD,oGAAoG;QACpG,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC/B,MAAM,yBAAW,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QACnC,CAAC;QAED,oGAAoG;QACpG,IAAI,MAAM,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YAC5B,MAAM,yBAAW,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,CAAA;QACxD,CAAC;QAED,IAAI,MAAM,CAAC,UAAU,CAAC,cAAc,KAAK,CAAC,EAAE,CAAC;YAC3C,mHAAmH;YACnH,OAAO,EAAE,CAAA;QACX,CAAC;QAED,WAAW,GAAG,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QAE9C,IAAI,WAAW,CAAC,MAAM,GAAG,wBAAwB,EAAE,CAAC;YAClD,MAAM,yBAAW,CAAC,QAAQ,CAAC,wCAAwC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAA;QAC1F,CAAC;QAED,iBAAiB,GAAG,MAAA,MAAM,CAAC,UAAU,CAAC,iBAAiB,mCAAI,SAAS,CAAA;QACpE,cAAc,EAAE,CAAA;IAClB,CAAC,QAAQ,iBAAiB,EAAC;IAE3B,OAAO,WAAW,CAAA;AACpB,CAAC,CAAA,CAAA;AAvDY,QAAA,iCAAiC,qCAuD7C"}

package/dist/utils/index.d.ts

@@ -4,3 +4,4 @@ export * from './periodUtil';
 export * from './studyYearUtil';
 export * from './filterCourseRoundUtils';
 export * from './versionUtils';
+export * from './AcademicSemester';

package/dist/utils/index.js

@@ -20,4 +20,5 @@ __exportStar(require("./periodUtil"), exports);
 __exportStar(require("./studyYearUtil"), exports);
 __exportStar(require("./filterCourseRoundUtils"), exports);
 __exportStar(require("./versionUtils"), exports);
+__exportStar(require("./AcademicSemester"), exports);
 //# sourceMappingURL=index.js.map

package/dist/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,6CAA0B;AAC1B,iDAA8B;AAC9B,+CAA4B;AAC5B,kDAA+B;AAC/B,2DAAwC;AACxC,iDAA8B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,6CAA0B;AAC1B,iDAA8B;AAC9B,+CAA4B;AAC5B,kDAA+B;AAC/B,2DAAwC;AACxC,iDAA8B;AAC9B,qDAAkC"}

package/dist/utils/languageUtil.d.ts

@@ -1,5 +1,9 @@
-import { Grunddata, Organisation, Studietakt, Tilltradesniva, Utbildningstyp } from '@kth/ladok-attributvarde-utils';
+import { EduLevel, Grunddata, Organisation, Studietakt, Tilltradesniva, Utbildningstyp } from '@kth/ladok-attributvarde-utils';
 export type Language = 'sv' | 'en';
+export declare enum LanguageCode {
+    Swedish = "sv",
+    English = "en"
+}
 export interface TranslatedGrunddata {
     id: string;
     code: string;
@@ -9,22 +13,20 @@ export interface TranslatedGrunddata {
 export interface TranslatedOrganisation extends TranslatedGrunddata {
     organisationTypeName: string;
 }
+export interface TranslatedEduLevel {
+    code: string;
+    name: string;
+}
 export interface TranslatedUtbildningstyp extends TranslatedGrunddata {
     creditsUnit: {
         code: string;
         sv: string;
         en: string;
     };
-    level: {
-        code: string;
-        name: string;
-    };
+    level: TranslatedEduLevel;
 }
 export interface TranslatedTilltradesniva extends TranslatedGrunddata {
-    level: {
-        code: string;
-        name: string;
-    };
+    level: TranslatedEduLevel;
 }
 export interface TranslatedStudietakt extends TranslatedGrunddata {
     takt: Studietakt['takt'];
@@ -33,4 +35,5 @@ export declare const translateGrunddata: (grunddata: Grunddata, language: Langua
 export declare const translateOrganisation: (organisation: Organisation, language: Language) => TranslatedOrganisation;
 export declare const translateUtbildningstyp: (utbildningstyp: Utbildningstyp, language: Language) => TranslatedUtbildningstyp;
 export declare const translatedTilltradesniva: (utbildningstyp: Tilltradesniva, language: Language) => TranslatedTilltradesniva;
+export declare const translateEduLevel: (eduLevel: EduLevel, language: Language) => TranslatedEduLevel;
 export declare const translateStudietakt: (studietakt: Studietakt, language: Language) => TranslatedStudietakt;

package/dist/utils/languageUtil.js

@@ -11,7 +11,12 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.translateStudietakt = exports.translatedTilltradesniva = exports.translateUtbildningstyp = exports.translateOrganisation = exports.translateGrunddata = void 0;
+exports.translateStudietakt = exports.translateEduLevel = exports.translatedTilltradesniva = exports.translateUtbildningstyp = exports.translateOrganisation = exports.translateGrunddata = exports.LanguageCode = void 0;
+var LanguageCode;
+(function (LanguageCode) {
+    LanguageCode["Swedish"] = "sv";
+    LanguageCode["English"] = "en";
+})(LanguageCode || (exports.LanguageCode = LanguageCode = {}));
 const translateGrunddata = (grunddata, language) => {
     const { id, code } = grunddata, rest = __rest(grunddata, ["id", "code"]);
     return {
@@ -47,6 +52,14 @@ const translatedTilltradesniva = (utbildningstyp, language) => {
         } });
 };
 exports.translatedTilltradesniva = translatedTilltradesniva;
+const translateEduLevel = (eduLevel, language) => {
+    const { code } = eduLevel, rest = __rest(eduLevel, ["code"]);
+    return {
+        code,
+        name: rest[language],
+    };
+};
+exports.translateEduLevel = translateEduLevel;
 const translateStudietakt = (studietakt, language) => {
     return Object.assign(Object.assign({}, (0, exports.translateGrunddata)(studietakt, language)), { takt: studietakt.takt });
 };

package/dist/utils/languageUtil.js.map

@@ -1 +1 @@
-{"version":3,"file":"languageUtil.js","sourceRoot":"","sources":["../../src/utils/languageUtil.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAsCO,MAAM,kBAAkB,GAAG,CAAC,SAAoB,EAAE,QAAkB,EAAuB,EAAE;IAClG,MAAM,EAAE,EAAE,EAAE,IAAI,KAAc,SAAS,EAAlB,IAAI,UAAK,SAAS,EAAjC,cAAqB,CAAY,CAAA;IACvC,OAAO;QACL,EAAE;QACF,IAAI;QACJ,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC;QACpB,SAAS,EAAE,IAAI,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;KACjD,CAAA;AACH,CAAC,CAAA;AARY,QAAA,kBAAkB,sBAQ9B;AAEM,MAAM,qBAAqB,GAAG,CAAC,YAA0B,EAAE,QAAkB,EAA0B,EAAE;IAC9G,uCACK,IAAA,0BAAkB,EAAC,YAAY,EAAE,QAAQ,CAAC,KAC7C,oBAAoB,EAAE,YAAY,CAAC,gBAAgB,CAAC,QAAQ,CAAC,IAC9D;AACH,CAAC,CAAA;AALY,QAAA,qBAAqB,yBAKjC;AAEM,MAAM,uBAAuB,GAAG,CACrC,cAA8B,EAC9B,QAAkB,EACQ,EAAE;IAC5B,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,cAAc,CAAC,WAAW,CAAA;IAC7C,MAAM,KAAoB,cAAc,CAAC,KAAK,EAAxC,EAAE,IAAI,OAAkC,EAA7B,IAAI,cAAf,QAAiB,CAAuB,CAAA;IAC9C,uCACK,IAAA,0BAAkB,EAAC,cAAc,EAAE,QAAQ,CAAC,KAC/C,WAAW,EAAE;YACX,IAAI,EAAE,cAAc,CAAC,WAAW,CAAC,IAAI;YACrC,EAAE;YACF,EAAE;SACH,EACD,KAAK,EAAE;YACL,IAAI;YACJ,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC;SACrB,IACF;AACH,CAAC,CAAA;AAlBY,QAAA,uBAAuB,2BAkBnC;AAEM,MAAM,wBAAwB,GAAG,CACtC,cAA8B,EAC9B,QAAkB,EACQ,EAAE;IAC5B,MAAM,KAAoB,cAAc,CAAC,KAAK,EAAxC,EAAE,IAAI,OAAkC,EAA7B,IAAI,cAAf,QAAiB,CAAuB,CAAA;IAC9C,uCACK,IAAA,0BAAkB,EAAC,cAAc,EAAE,QAAQ,CAAC,KAC/C,KAAK,EAAE;YACL,IAAI;YACJ,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC;SACrB,IACF;AACH,CAAC,CAAA;AAZY,QAAA,wBAAwB,4BAYpC;AAEM,MAAM,mBAAmB,GAAG,CAAC,UAAsB,EAAE,QAAkB,EAAwB,EAAE;IACtG,uCACK,IAAA,0BAAkB,EAAC,UAAU,EAAE,QAAQ,CAAC,KAC3C,IAAI,EAAE,UAAU,CAAC,IAAI,IACtB;AACH,CAAC,CAAA;AALY,QAAA,mBAAmB,uBAK/B"}
+{"version":3,"file":"languageUtil.js","sourceRoot":"","sources":["../../src/utils/languageUtil.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAWA,IAAY,YAGX;AAHD,WAAY,YAAY;IACtB,8BAAc,CAAA;IACd,8BAAc,CAAA;AAChB,CAAC,EAHW,YAAY,4BAAZ,YAAY,QAGvB;AAmCM,MAAM,kBAAkB,GAAG,CAAC,SAAoB,EAAE,QAAkB,EAAuB,EAAE;IAClG,MAAM,EAAE,EAAE,EAAE,IAAI,KAAc,SAAS,EAAlB,IAAI,UAAK,SAAS,EAAjC,cAAqB,CAAY,CAAA;IACvC,OAAO;QACL,EAAE;QACF,IAAI;QACJ,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC;QACpB,SAAS,EAAE,IAAI,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;KACjD,CAAA;AACH,CAAC,CAAA;AARY,QAAA,kBAAkB,sBAQ9B;AAEM,MAAM,qBAAqB,GAAG,CAAC,YAA0B,EAAE,QAAkB,EAA0B,EAAE;IAC9G,uCACK,IAAA,0BAAkB,EAAC,YAAY,EAAE,QAAQ,CAAC,KAC7C,oBAAoB,EAAE,YAAY,CAAC,gBAAgB,CAAC,QAAQ,CAAC,IAC9D;AACH,CAAC,CAAA;AALY,QAAA,qBAAqB,yBAKjC;AAEM,MAAM,uBAAuB,GAAG,CACrC,cAA8B,EAC9B,QAAkB,EACQ,EAAE;IAC5B,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,cAAc,CAAC,WAAW,CAAA;IAC7C,MAAM,KAAoB,cAAc,CAAC,KAAK,EAAxC,EAAE,IAAI,OAAkC,EAA7B,IAAI,cAAf,QAAiB,CAAuB,CAAA;IAC9C,uCACK,IAAA,0BAAkB,EAAC,cAAc,EAAE,QAAQ,CAAC,KAC/C,WAAW,EAAE;YACX,IAAI,EAAE,cAAc,CAAC,WAAW,CAAC,IAAI;YACrC,EAAE;YACF,EAAE;SACH,EACD,KAAK,EAAE;YACL,IAAI;YACJ,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC;SACrB,IACF;AACH,CAAC,CAAA;AAlBY,QAAA,uBAAuB,2BAkBnC;AAEM,MAAM,wBAAwB,GAAG,CACtC,cAA8B,EAC9B,QAAkB,EACQ,EAAE;IAC5B,MAAM,KAAoB,cAAc,CAAC,KAAK,EAAxC,EAAE,IAAI,OAAkC,EAA7B,IAAI,cAAf,QAAiB,CAAuB,CAAA;IAC9C,uCACK,IAAA,0BAAkB,EAAC,cAAc,EAAE,QAAQ,CAAC,KAC/C,KAAK,EAAE;YACL,IAAI;YACJ,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC;SACrB,IACF;AACH,CAAC,CAAA;AAZY,QAAA,wBAAwB,4BAYpC;AAEM,MAAM,iBAAiB,GAAG,CAAC,QAAkB,EAAE,QAAkB,EAAsB,EAAE;IAC9F,MAAM,EAAE,IAAI,KAAc,QAAQ,EAAjB,IAAI,UAAK,QAAQ,EAA5B,QAAiB,CAAW,CAAA;IAClC,OAAO;QACL,IAAI;QACJ,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC;KACrB,CAAA;AACH,CAAC,CAAA;AANY,QAAA,iBAAiB,qBAM7B;AAEM,MAAM,mBAAmB,GAAG,CAAC,UAAsB,EAAE,QAAkB,EAAwB,EAAE;IACtG,uCACK,IAAA,0BAAkB,EAAC,UAAU,EAAE,QAAQ,CAAC,KAC3C,IAAI,EAAE,UAAU,CAAC,IAAI,IACtB;AACH,CAAC,CAAA;AALY,QAAA,mBAAmB,uBAK/B"}

package/dist/utils/mergeResponses.d.ts

@@ -0,0 +1,3 @@
+import { MellanlagringSearchResponse } from '@kth/ladok-mellanlager-client';
+export declare const mergePlainArrays: <T>(a: T[], b: T[], uniqueItemKey: (item: T) => string) => T[];
+export declare const mergeApiResponses: <T>(a: MellanlagringSearchResponse<T>, b: MellanlagringSearchResponse<T>, uniqueItemKey: (item: T) => string) => MellanlagringSearchResponse<T>;

package/dist/utils/mergeResponses.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mergeApiResponses = exports.mergePlainArrays = void 0;
+const mergePlainArrays = (a, b, uniqueItemKey) => {
+    const mergedItemsMap = new Map();
+    for (const item of a !== null && a !== void 0 ? a : []) {
+        mergedItemsMap.set(uniqueItemKey(item), item);
+    }
+    for (const item of b !== null && b !== void 0 ? b : []) {
+        mergedItemsMap.set(uniqueItemKey(item), item);
+    }
+    return Array.from(mergedItemsMap.values());
+};
+exports.mergePlainArrays = mergePlainArrays;
+const mergeApiResponses = (a, b, uniqueItemKey) => {
+    var _a, _b, _c, _d, _e, _f;
+    if (a.type === 'error')
+        return a;
+    if (b.type === 'error')
+        return b;
+    return {
+        type: 'success',
+        responseInfo: {
+            apiError: a.responseInfo.apiError || b.responseInfo.apiError,
+            statusCode: Math.max(a.responseInfo.statusCode, b.responseInfo.statusCode),
+            statusText: a.responseInfo.statusText || b.responseInfo.statusText,
+        },
+        searchMeta: {
+            pageResultSize: ((_a = a.searchMeta.pageResultSize) !== null && _a !== void 0 ? _a : 0) + ((_b = b.searchMeta.pageResultSize) !== null && _b !== void 0 ? _b : 0),
+            requestCharge: ((_c = a.searchMeta.requestCharge) !== null && _c !== void 0 ? _c : 0) + ((_d = b.searchMeta.requestCharge) !== null && _d !== void 0 ? _d : 0),
+            elapsedTime: Math.max((_e = a.searchMeta.elapsedTime) !== null && _e !== void 0 ? _e : 0, (_f = b.searchMeta.elapsedTime) !== null && _f !== void 0 ? _f : 0),
+        },
+        items: (0, exports.mergePlainArrays)(a.items, b.items, uniqueItemKey),
+    };
+};
+exports.mergeApiResponses = mergeApiResponses;
+//# sourceMappingURL=mergeResponses.js.map