@kth/om-kursen-ladok-client 2.5.4 → 2.5.6

package/dist/createApiClient.js

@@ -31,6 +31,7 @@ const createProgrammeApi_1 = require("./programme/createProgrammeApi");
 const mergeResponses_1 = require("./utils/mergeResponses");
 const getAllEntitiesByUseOfContinuation_1 = require("./utils/getAllEntitiesByUseOfContinuation");
 const responseUtils_1 = require("./utils/responseUtils");
+const statusUtils_1 = require("./utils/statusUtils");
 const filterAndMapCourseInstances = (items, language, partOfProgrammes) => {
     return items
         .map(x => (0, mapCourseInstance_1.mapCourseInstance)(x, language, partOfProgrammes === null || partOfProgrammes === void 0 ? void 0 : partOfProgrammes[x.tillfalle_uid]))
@@ -112,12 +113,16 @@ const createApiClient = (config) => {
             const allEntitiesTerminsKodStart = (0, responseUtils_1.throwIfContinuationError)(resultTerminsKodStart);
             const allEntitiesActiveAndFutureInstances = (0, mergeResponses_1.mergePlainArrays)(allEntitiesPagaendeDatum, allEntitiesTerminsKodStart, item => item.tillfalle_uid);
             if (!allEntitiesActiveAndFutureInstances) {
-                return filterAndMapCourseInstances(allEntitiesActiveAndFutureInstances, language);
+                const mapped = filterAndMapCourseInstances(allEntitiesActiveAndFutureInstances, language);
+                const noDrafts = (0, statusUtils_1.removeDrafts)(mapped);
+                return noDrafts;
             }
             const periods = yield ladokClient.period(); // TODO: Use cached values
             const periodsData = (0, responseUtils_1.throwIfError)(periods);
             const partOfProgrammes = yield (0, partOfProgrammeUtil_1.getPartOfProgrammes)(allEntitiesActiveAndFutureInstances, periodsData.Period, ladokClient);
-            return filterAndMapCourseInstances(allEntitiesActiveAndFutureInstances, language, partOfProgrammes);
+            const mapped = filterAndMapCourseInstances(allEntitiesActiveAndFutureInstances, language, partOfProgrammes);
+            const noDrafts = (0, statusUtils_1.removeDrafts)(mapped);
+            return noDrafts;
         }),
         getCourseInstancesFromPeriod: (courseCode, fromPeriod, language) => __awaiter(void 0, void 0, void 0, function* () {
             const result = yield (0, getAllEntitiesByUseOfContinuation_1.getAllEntitiesByUseOfContinuation)(ladokClient.sokKursTillfalleSlim, Object.assign(Object.assign({}, DEFAULT_COURSE_INSTANCES_QUERY_PARAMS), { kodEllerBenamning: courseCode, terminkodStart: fromPeriod }));

package/dist/createApiClient.js.map

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

package/dist/kth/extractFunctions/extractDiscontinuationData.d.ts

@@ -1,4 +1,3 @@
-import { LadokStatusCode } from '@kth/ladok-attributvarde-utils';
 import { Attributdefinition, AttributdefinitionSlim, Attributvarde } from '@kth/ladok-mellanlager-client';
 import { Language } from '../../utils';
 export interface DiscontinuationData {
@@ -6,4 +5,40 @@ export interface DiscontinuationData {
     avvecklingsbeslut?: string;
     sistaexaminationstermin?: string;
 }
-export declare const extractDiscontinuationData: (attributvarden: Attributvarde<AttributdefinitionSlim | Attributdefinition>[], language: Language, statusCode?: LadokStatusCode) => DiscontinuationData;
+export declare const decideDiscontinuationData: ({ isDiscontinuedLadok, isDiscontinuedMigrated, avvecklingsbeslutLadokMay2025, avvecklingsbeslutLadokSummer2025, avvecklingsbeslutMigrated, sistaexaminationstermin, }: {
+    isDiscontinuedLadok?: boolean;
+    isDiscontinuedMigrated?: boolean;
+    avvecklingsbeslutLadokMay2025?: string;
+    avvecklingsbeslutLadokSummer2025?: string;
+    avvecklingsbeslutMigrated?: string;
+    sistaexaminationstermin?: string;
+}) => {
+    underavveckling: boolean;
+    avvecklingsbeslut: string | undefined;
+    sistaexaminationstermin?: undefined;
+} | {
+    underavveckling: boolean;
+    avvecklingsbeslut: string | undefined;
+    sistaexaminationstermin: string | undefined;
+} | {
+    underavveckling: boolean;
+    avvecklingsbeslut?: undefined;
+    sistaexaminationstermin?: undefined;
+};
+export declare const mapDiscontinuationData: (attributvarden: Attributvarde<AttributdefinitionSlim | Attributdefinition>[], language: Language) => {
+    isDiscontinuedLadok: boolean;
+    isDiscontinuedMigrated: boolean;
+    avvecklingsbeslutLadokMay2025: string | undefined;
+    avvecklingsbeslutLadokSummer2025: string | undefined;
+    avvecklingsbeslutMigrated: string | undefined;
+    sistaexaminationstermin: string | undefined;
+};
+/**
+ * Extracts discontinuation data for the given attributvarden and decides what to show based on the data.
+ * Specification: https://confluence.sys.kth.se/confluence/x/OwehEg
+ *
+ * @param attributvarden
+ * @param language
+ * @returns
+ */
+export declare const extractDiscontinuationData: (attributvarden: Attributvarde<AttributdefinitionSlim | Attributdefinition>[], language: Language) => DiscontinuationData;

package/dist/kth/extractFunctions/extractDiscontinuationData.js

@@ -1,33 +1,52 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractDiscontinuationData = void 0;
+exports.extractDiscontinuationData = exports.mapDiscontinuationData = exports.decideDiscontinuationData = void 0;
 const ladok_attributvarde_utils_1 = require("@kth/ladok-attributvarde-utils");
-const extractDiscontinuationData = (attributvarden, language, statusCode) => {
-    var _a, _b, _c, _d, _e, _f;
-    if (statusCode !== ladok_attributvarde_utils_1.LadokStatusCode.Complete) {
-        return {};
-    }
-    const underavvecklingLadok = (0, ladok_attributvarde_utils_1.extractLokaltAttribut)(attributvarden, 'avvecklad.status', ladok_attributvarde_utils_1.LokaltAttributType.Boolean, true);
-    const avvecklingsbeslutLadok = (_a = (0, ladok_attributvarde_utils_1.extractLokaltAttribut)(attributvarden, 'avvecklingsbeslut2', ladok_attributvarde_utils_1.LokaltAttributType.LocalizedString)) === null || _a === void 0 ? void 0 : _a[language];
-    const avvecklingsbeslutLadokAlternative = (_b = (0, ladok_attributvarde_utils_1.extractLokaltAttribut)(attributvarden, 'avvecklingsbeslut3', ladok_attributvarde_utils_1.LokaltAttributType.LocalizedString)) === null || _b === void 0 ? void 0 : _b[language];
-    const underavvecklingMigrated = ((_c = (0, ladok_attributvarde_utils_1.extractLokaltAttribut)(attributvarden, 'kursstatus', ladok_attributvarde_utils_1.LokaltAttributType.LocalizedString)) === null || _c === void 0 ? void 0 : _c.en) === 'DEACTIVATED';
-    const avvecklingsbeslutMigrated = (_d = (0, ladok_attributvarde_utils_1.extractLokaltAttribut)(attributvarden, 'avvecklingsbeslut', ladok_attributvarde_utils_1.LokaltAttributType.LocalizedString)) === null || _d === void 0 ? void 0 : _d[language];
-    const sistaexaminationstermin = (_e = (0, ladok_attributvarde_utils_1.extractLokaltAttribut)(attributvarden, 'sista.examinationstermin1', ladok_attributvarde_utils_1.LokaltAttributType.LocalizedString)) === null || _e === void 0 ? void 0 : _e[language];
-    if (underavvecklingLadok || underavvecklingMigrated) {
-        const isFromLadok = underavvecklingLadok;
-        const avvecklingsbeslut = isFromLadok
-            ? ((_f = avvecklingsbeslutLadokAlternative !== null && avvecklingsbeslutLadokAlternative !== void 0 ? avvecklingsbeslutLadokAlternative : avvecklingsbeslutLadok) !== null && _f !== void 0 ? _f : avvecklingsbeslutMigrated)
-            : avvecklingsbeslutMigrated;
-        const avvecklingsInfo = {
+const syllabusExtractionUtil_1 = require("../../utils/syllabusExtractionUtil");
+const decideDiscontinuationData = ({ isDiscontinuedLadok, isDiscontinuedMigrated, avvecklingsbeslutLadokMay2025, avvecklingsbeslutLadokSummer2025, avvecklingsbeslutMigrated, sistaexaminationstermin, }) => {
+    if (isDiscontinuedLadok)
+        return {
             underavveckling: true,
-            avvecklingsbeslut,
+            avvecklingsbeslut: avvecklingsbeslutLadokSummer2025 || avvecklingsbeslutLadokMay2025 || avvecklingsbeslutMigrated || undefined,
         };
-        if (!isFromLadok) {
-            avvecklingsInfo.sistaexaminationstermin = sistaexaminationstermin;
-        }
-        return avvecklingsInfo;
-    }
-    return {};
+    if (isDiscontinuedMigrated)
+        return { underavveckling: true, avvecklingsbeslut: avvecklingsbeslutMigrated, sistaexaminationstermin };
+    return { underavveckling: false };
+};
+exports.decideDiscontinuationData = decideDiscontinuationData;
+const mapDiscontinuationData = (attributvarden, language) => {
+    var _a, _b, _c, _d;
+    // set during the discontinuation process in Ladok
+    const isDiscontinuedLadok = (_a = (0, ladok_attributvarde_utils_1.extractLokaltAttribut)(attributvarden, 'avvecklad.status', ladok_attributvarde_utils_1.LokaltAttributType.Boolean, true)) !== null && _a !== void 0 ? _a : false;
+    // set during the discontinuation process in Ladok decided upon in May 2025
+    const avvecklingsbeslutLadokMay2025 = ((_b = (0, ladok_attributvarde_utils_1.extractLokaltAttribut)(attributvarden, 'avvecklingsbeslut2', ladok_attributvarde_utils_1.LokaltAttributType.LocalizedString)) === null || _b === void 0 ? void 0 : _b[language]) ||
+        undefined;
+    // set during the discontinuation process in Ladok decided upon in summer 2025
+    const avvecklingsbeslutLadokSummer2025 = (0, syllabusExtractionUtil_1.extractAndConvertMarkdownToHtml)(attributvarden, 'avvecklingsbeslut3', language);
+    const isDiscontinuedMigrated = ((_c = (0, ladok_attributvarde_utils_1.extractLokaltAttribut)(attributvarden, 'kursstatus', ladok_attributvarde_utils_1.LokaltAttributType.LocalizedString)) === null || _c === void 0 ? void 0 : _c.en) === 'DEACTIVATED';
+    const avvecklingsbeslutMigrated = (0, syllabusExtractionUtil_1.extractAndConvertMarkdownToHtml)(attributvarden, 'avvecklingsbeslut', language);
+    const sistaexaminationstermin = ((_d = (0, ladok_attributvarde_utils_1.extractLokaltAttribut)(attributvarden, 'sista.examinationstermin1', ladok_attributvarde_utils_1.LokaltAttributType.LocalizedString)) === null || _d === void 0 ? void 0 : _d[language]) || undefined;
+    return {
+        isDiscontinuedLadok,
+        isDiscontinuedMigrated,
+        avvecklingsbeslutLadokMay2025,
+        avvecklingsbeslutLadokSummer2025,
+        avvecklingsbeslutMigrated,
+        sistaexaminationstermin,
+    };
+};
+exports.mapDiscontinuationData = mapDiscontinuationData;
+/**
+ * Extracts discontinuation data for the given attributvarden and decides what to show based on the data.
+ * Specification: https://confluence.sys.kth.se/confluence/x/OwehEg
+ *
+ * @param attributvarden
+ * @param language
+ * @returns
+ */
+const extractDiscontinuationData = (attributvarden, language) => {
+    const mapped = (0, exports.mapDiscontinuationData)(attributvarden, language);
+    return (0, exports.decideDiscontinuationData)(mapped);
 };
 exports.extractDiscontinuationData = extractDiscontinuationData;
 //# sourceMappingURL=extractDiscontinuationData.js.map

package/dist/kth/extractFunctions/extractDiscontinuationData.js.map

@@ -1 +1 @@
-{"version":3,"file":"extractDiscontinuationData.js","sourceRoot":"","sources":["../../../src/kth/extractFunctions/extractDiscontinuationData.ts"],"names":[],"mappings":";;;AAAA,8EAA2G;AAUpG,MAAM,0BAA0B,GAAG,CACxC,cAA4E,EAC5E,QAAkB,EAClB,UAA4B,EACP,EAAE;;IACvB,IAAI,UAAU,KAAK,2CAAe,CAAC,QAAQ,EAAE,CAAC;QAC5C,OAAO,EAAE,CAAA;IACX,CAAC;IAED,MAAM,oBAAoB,GAAG,IAAA,iDAAqB,EAChD,cAAc,EACd,kBAAkB,EAClB,8CAAkB,CAAC,OAAO,EAC1B,IAAI,CACL,CAAA;IAED,MAAM,sBAAsB,GAAG,MAAA,IAAA,iDAAqB,EAClD,cAAc,EACd,oBAAoB,EACpB,8CAAkB,CAAC,eAAe,CACnC,0CAAG,QAAQ,CAAC,CAAA;IAEb,MAAM,iCAAiC,GAAG,MAAA,IAAA,iDAAqB,EAC7D,cAAc,EACd,oBAAoB,EACpB,8CAAkB,CAAC,eAAe,CACnC,0CAAG,QAAQ,CAAC,CAAA;IAEb,MAAM,uBAAuB,GAC3B,CAAA,MAAA,IAAA,iDAAqB,EAAC,cAAc,EAAE,YAAY,EAAE,8CAAkB,CAAC,eAAe,CAAC,0CAAE,EAAE,MAAK,aAAa,CAAA;IAE/G,MAAM,yBAAyB,GAAG,MAAA,IAAA,iDAAqB,EACrD,cAAc,EACd,mBAAmB,EACnB,8CAAkB,CAAC,eAAe,CACnC,0CAAG,QAAQ,CAAC,CAAA;IAEb,MAAM,uBAAuB,GAAG,MAAA,IAAA,iDAAqB,EACnD,cAAc,EACd,2BAA2B,EAC3B,8CAAkB,CAAC,eAAe,CACnC,0CAAG,QAAQ,CAAC,CAAA;IAEb,IAAI,oBAAoB,IAAI,uBAAuB,EAAE,CAAC;QACpD,MAAM,WAAW,GAAG,oBAAoB,CAAA;QAExC,MAAM,iBAAiB,GAAG,WAAW;YACnC,CAAC,CAAC,CAAC,MAAA,iCAAiC,aAAjC,iCAAiC,cAAjC,iCAAiC,GAAI,sBAAsB,mCAAI,yBAAyB,CAAC;YAC5F,CAAC,CAAC,yBAAyB,CAAA;QAE7B,MAAM,eAAe,GAAwB;YAC3C,eAAe,EAAE,IAAI;YACrB,iBAAiB;SAClB,CAAA;QAED,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,eAAe,CAAC,uBAAuB,GAAG,uBAAuB,CAAA;QACnE,CAAC;QAED,OAAO,eAAe,CAAA;IACxB,CAAC;IAED,OAAO,EAAE,CAAA;AACX,CAAC,CAAA;AA/DY,QAAA,0BAA0B,8BA+DtC"}
+{"version":3,"file":"extractDiscontinuationData.js","sourceRoot":"","sources":["../../../src/kth/extractFunctions/extractDiscontinuationData.ts"],"names":[],"mappings":";;;AAAA,8EAA0F;AAG1F,+EAAoF;AAQ7E,MAAM,yBAAyB,GAAG,CAAC,EACxC,mBAAmB,EACnB,sBAAsB,EACtB,6BAA6B,EAC7B,gCAAgC,EAChC,yBAAyB,EACzB,uBAAuB,GAQxB,EAAE,EAAE;IACH,IAAI,mBAAmB;QACrB,OAAO;YACL,eAAe,EAAE,IAAI;YACrB,iBAAiB,EACf,gCAAgC,IAAI,6BAA6B,IAAI,yBAAyB,IAAI,SAAS;SAC9G,CAAA;IAEH,IAAI,sBAAsB;QACxB,OAAO,EAAE,eAAe,EAAE,IAAI,EAAE,iBAAiB,EAAE,yBAAyB,EAAE,uBAAuB,EAAE,CAAA;IAEzG,OAAO,EAAE,eAAe,EAAE,KAAK,EAAE,CAAA;AACnC,CAAC,CAAA;AA1BY,QAAA,yBAAyB,6BA0BrC;AAEM,MAAM,sBAAsB,GAAG,CACpC,cAA4E,EAC5E,QAAkB,EAClB,EAAE;;IACF,kDAAkD;IAClD,MAAM,mBAAmB,GACvB,MAAA,IAAA,iDAAqB,EAAC,cAAc,EAAE,kBAAkB,EAAE,8CAAkB,CAAC,OAAO,EAAE,IAAI,CAAC,mCAAI,KAAK,CAAA;IAEtG,2EAA2E;IAC3E,MAAM,6BAA6B,GACjC,CAAA,MAAA,IAAA,iDAAqB,EAAC,cAAc,EAAE,oBAAoB,EAAE,8CAAkB,CAAC,eAAe,CAAC,0CAAG,QAAQ,CAAC;QAC3G,SAAS,CAAA;IAEX,8EAA8E;IAC9E,MAAM,gCAAgC,GAAG,IAAA,wDAA+B,EACtE,cAAc,EACd,oBAAoB,EACpB,QAAQ,CACT,CAAA;IAED,MAAM,sBAAsB,GAC1B,CAAA,MAAA,IAAA,iDAAqB,EAAC,cAAc,EAAE,YAAY,EAAE,8CAAkB,CAAC,eAAe,CAAC,0CAAE,EAAE,MAAK,aAAa,CAAA;IAE/G,MAAM,yBAAyB,GAAG,IAAA,wDAA+B,EAAC,cAAc,EAAE,mBAAmB,EAAE,QAAQ,CAAC,CAAA;IAEhH,MAAM,uBAAuB,GAC3B,CAAA,MAAA,IAAA,iDAAqB,EAAC,cAAc,EAAE,2BAA2B,EAAE,8CAAkB,CAAC,eAAe,CAAC,0CACpG,QAAQ,CACT,KAAI,SAAS,CAAA;IAEhB,OAAO;QACL,mBAAmB;QACnB,sBAAsB;QACtB,6BAA6B;QAC7B,gCAAgC;QAChC,yBAAyB;QACzB,uBAAuB;KACxB,CAAA;AACH,CAAC,CAAA;AAtCY,QAAA,sBAAsB,0BAsClC;AAED;;;;;;;GAOG;AACI,MAAM,0BAA0B,GAAG,CACxC,cAA4E,EAC5E,QAAkB,EACG,EAAE;IACvB,MAAM,MAAM,GAAG,IAAA,8BAAsB,EAAC,cAAc,EAAE,QAAQ,CAAC,CAAA;IAE/D,OAAO,IAAA,iCAAyB,EAAC,MAAM,CAAC,CAAA;AAC1C,CAAC,CAAA;AAPY,QAAA,0BAA0B,8BAOtC"}

package/dist/mapCourseSyllabus.d.ts

@@ -25,6 +25,7 @@ export type KursPlan = {
         avvecklad?: boolean;
         underavveckling?: boolean;
         sistaexaminationstermin?: string;
+        avvecklingsbeslut?: string;
     };
     kursplan: {
         giltigfrom: string | undefined;
@@ -43,7 +44,6 @@ export type KursPlan = {
         kursupplagg: string | undefined;
         sarskildbehorighet: string | undefined;
         gammalutrustning: string | undefined;
-        avvecklingsbeslut: string | undefined;
     };
 };
 export declare const mapCourseSyllabus: (syllabus: SokPlanItem | SokPlanSlimItem, gradingScalesCodes: GradingScalesCodes, examinationModules: FormattedExaminationModules, language: Language) => KursPlan;

package/dist/mapCourseSyllabus.js

@@ -11,8 +11,12 @@ const extractBasicCourseData_1 = require("./kth/extractFunctions/extractBasicCou
 const extractBasicData = (syllabus, language) => {
     return (0, extractBasicCourseData_1.extractBasicCourseData)(syllabus.instans.Attributvarden, language);
 };
-const extractDiscontinuationDataFromPlan = (ladokResponse, language) => {
-    return (0, extractDiscontinuationData_1.extractDiscontinuationData)(ladokResponse.instans.Attributvarden, language);
+const extractLocalizedValue = (value, language) => {
+    if (!value)
+        return undefined;
+    if (typeof value === 'object' && language in value) {
+        return value[language] || undefined;
+    }
 };
 const mapCourseSyllabus = (syllabus, gradingScalesCodes, examinationModules, language) => {
     var _a;
@@ -23,7 +27,9 @@ const mapCourseSyllabus = (syllabus, gradingScalesCodes, examinationModules, lan
     const utbildningstyp = (0, ladok_attributvarde_utils_2.extractUtbildningstyp)(syllabus.instans.Attributvarden);
     if (!(betygsskala === null || betygsskala === void 0 ? void 0 : betygsskala.code))
         throw new Error(`"utbildning.attribut.betygsskala.kod" does not have any value for ${kod}`);
-    const { underavveckling, sistaexaminationstermin } = extractDiscontinuationDataFromPlan(syllabus, language);
+    const { underavveckling, sistaexaminationstermin, avvecklingsbeslut } = (0, extractDiscontinuationData_1.extractDiscontinuationData)(syllabus.instans.Attributvarden, language);
+    const faststallandeRaw = (0, ladok_attributvarde_utils_1.extractLokaltAttribut)(syllabus.AktuellaAttributvarden, `fastallande1`, ladok_attributvarde_utils_1.LokaltAttributType.LocalizedString);
+    const faststallande = extractLocalizedValue(faststallandeRaw, language);
     return {
         course: {
             kod,
@@ -36,6 +42,7 @@ const mapCourseSyllabus = (syllabus, gradingScalesCodes, examinationModules, lan
             avvecklad: (0, ladok_attributvarde_utils_1.extractBoolean)(syllabus.instans.Attributvarden, 'avvecklad'),
             underavveckling,
             sistaexaminationstermin,
+            avvecklingsbeslut,
         },
         kursplan: {
             giltigfrom: (0, courseSyllabusUtil_1.getSemester)(syllabus.GiltigFran),
@@ -45,7 +52,7 @@ const mapCourseSyllabus = (syllabus, gradingScalesCodes, examinationModules, lan
             larandemal: (0, syllabusExtractionUtil_1.extractAndConvertMarkdownToHtml)(syllabus.AktuellaAttributvarden, 'larandemal', language),
             kursinnehall: (0, syllabusExtractionUtil_1.extractAndConvertMarkdownToHtml)(syllabus.AktuellaAttributvarden, 'kursinnehall', language),
             etisktforhallningssatt: (0, syllabusExtractionUtil_1.extractAndConvertMarkdownToHtml)(syllabus.AktuellaAttributvarden, 'etiskt.forhallningssatt', language),
-            faststallande: (0, syllabusExtractionUtil_1.extractAndConvertMarkdownToHtml)(syllabus.AktuellaAttributvarden, 'fastallande1', language),
+            faststallande,
             examinationModules,
             kommentartillexamination: (0, syllabusExtractionUtil_1.extractAndConvertMarkdownToHtml)(syllabus.AktuellaAttributvarden, 'kommentar.till.examination', language),
             ovrigakravforslutbetyg: (0, syllabusExtractionUtil_1.extractAndConvertMarkdownToHtml)(syllabus.AktuellaAttributvarden, 'ovriga.krav.for.slutbeyg', language),
@@ -54,7 +61,6 @@ const mapCourseSyllabus = (syllabus, gradingScalesCodes, examinationModules, lan
             kursupplagg: (0, syllabusExtractionUtil_1.extractAndConvertMarkdownToHtml)(syllabus.AktuellaAttributvarden, 'gammal.kursupplagg', language),
             sarskildbehorighet: (0, syllabusExtractionUtil_1.extractAndConvertMarkdownToHtml)(syllabus.AktuellaAttributvarden, 'sarskild.behorighet', language),
             gammalutrustning: (0, syllabusExtractionUtil_1.extractAndConvertMarkdownToHtml)(syllabus.AktuellaAttributvarden, 'gammal.utrustning', language),
-            avvecklingsbeslut: (0, syllabusExtractionUtil_1.extractAndConvertMarkdownToHtml)(syllabus.AktuellaAttributvarden, 'avvecklingsbeslut', language),
         },
     };
 };

package/dist/mapCourseSyllabus.js.map

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

package/dist/mapCourseVersion.js

@@ -9,9 +9,6 @@ const extractBasicCourseData_1 = require("./kth/extractFunctions/extractBasicCou
 const extractBasicData = (course, language) => {
     return (0, extractBasicCourseData_1.extractBasicCourseData)(course.Attributvarden, language, course.instans_uid);
 };
-const extractDiscontinuationDataFromCourse = (course, language, statusCode) => {
-    return (0, extractDiscontinuationData_1.extractDiscontinuationData)(course.Attributvarden, language, statusCode);
-};
 const mapCourseVersion = (course, language, gradingScalesCodes) => {
     const status = (0, ladok_attributvarde_utils_1.extractLadokStatus)(course.Attributvarden);
     const { kod, benamning, omfattning, uid, versionsnummer } = extractBasicData(course, language);
@@ -19,7 +16,7 @@ const mapCourseVersion = (course, language, gradingScalesCodes) => {
     const huvudomraden = (0, ladok_attributvarde_utils_1.extractHuvudomraden)(course.Attributvarden);
     const organisation = (0, ladok_attributvarde_utils_1.extractOrganisation)(course.Attributvarden);
     const utbildningstyp = (0, ladok_attributvarde_utils_1.extractUtbildningstyp)(course.Attributvarden);
-    const { underavveckling, avvecklingsbeslut, sistaexaminationstermin } = extractDiscontinuationDataFromCourse(course, language, status === null || status === void 0 ? void 0 : status.code);
+    const { underavveckling, avvecklingsbeslut, sistaexaminationstermin } = (0, extractDiscontinuationData_1.extractDiscontinuationData)(course.Attributvarden, language);
     const isMiljo = (0, ladok_attributvarde_utils_1.extractIsMiljo)(course.Attributvarden);
     return {
         uid,

package/dist/mapCourseVersion.js.map

@@ -1 +1 @@
-{"version":3,"file":"mapCourseVersion.js","sourceRoot":"","sources":["../src/mapCourseVersion.ts"],"names":[],"mappings":";;;AAAA,8EASuC;AAGvC,uDAQ6B;AAC7B,mDAAsE;AAEtE,kGAAmH;AACnH,0FAAmG;AAiBnG,MAAM,gBAAgB,GAAG,CACvB,MAAiE,EACjE,QAAkB,EACL,EAAE;IACf,OAAO,IAAA,+CAAsB,EAAC,MAAM,CAAC,cAAc,EAAE,QAAQ,EAAE,MAAM,CAAC,WAAW,CAAC,CAAA;AACpF,CAAC,CAAA;AAED,MAAM,oCAAoC,GAAG,CAC3C,MAAiE,EACjE,QAAkB,EAClB,UAA4B,EACP,EAAE;IACvB,OAAO,IAAA,uDAA0B,EAAC,MAAM,CAAC,cAAc,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAA;AAChF,CAAC,CAAA;AAEM,MAAM,gBAAgB,GAAG,CAC9B,MAAiE,EACjE,QAAkB,EAClB,kBAAsC,EACvB,EAAE;IACjB,MAAM,MAAM,GAAG,IAAA,8CAAkB,EAAC,MAAM,CAAC,cAAc,CAAC,CAAA;IACxD,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,EAAE,cAAc,EAAE,GAAG,gBAAgB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;IAE9F,MAAM,WAAW,GAAG,IAAA,4CAAgB,EAAC,MAAM,CAAC,cAAc,EAAE,iCAAiC,CAAC,CAAA;IAC9F,MAAM,YAAY,GAAG,IAAA,+CAAmB,EAAC,MAAM,CAAC,cAAc,CAAC,CAAA;IAC/D,MAAM,YAAY,GAAG,IAAA,+CAAmB,EAAC,MAAM,CAAC,cAAc,CAAC,CAAA;IAC/D,MAAM,cAAc,GAAG,IAAA,iDAAqB,EAAC,MAAM,CAAC,cAAc,CAAC,CAAA;IAEnE,MAAM,EAAE,eAAe,EAAE,iBAAiB,EAAE,uBAAuB,EAAE,GAAG,oCAAoC,CAC1G,MAAM,EACN,QAAQ,EACR,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,CACb,CAAA;IAED,MAAM,OAAO,GAAG,IAAA,0CAAc,EAAC,MAAM,CAAC,cAAc,CAAC,CAAA;IAErD,OAAO;QACL,GAAG;QACH,cAAc;QACd,GAAG;QACH,SAAS;QACT,UAAU;QACV,YAAY,EAAE,YAAY,IAAI,IAAA,oCAAqB,EAAC,YAAY,EAAE,QAAQ,CAAC;QAC3E,cAAc,EAAE,cAAc,IAAI,IAAA,sCAAuB,EAAC,cAAc,EAAE,QAAQ,CAAC;QACnF,WAAW,EAAE,WAAW,oCACnB,IAAA,iCAAkB,EAAC,WAAW,EAAE,QAAQ,CAAC,KAC5C,SAAS,EAAE,kBAAkB,CAAC,WAAW,CAAC,IAAI,CAAC,GAChD;QACD,YAAY,EAAE,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,iCAAkB,EAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;QACrE,UAAU,EAAE,IAAA,8CAAiC,EAAC,YAAY,EAAE,QAAQ,CAAC;QACrE,SAAS,EAAE,IAAA,0CAAc,EAAC,MAAM,CAAC,cAAc,EAAE,WAAW,CAAC;QAC7D,eAAe;QACf,iBAAiB;QACjB,uBAAuB;QACvB,eAAe,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI;QAC7B,OAAO;KACR,CAAA;AACH,CAAC,CAAA;AA1CY,QAAA,gBAAgB,oBA0C5B"}
+{"version":3,"file":"mapCourseVersion.js","sourceRoot":"","sources":["../src/mapCourseVersion.ts"],"names":[],"mappings":";;;AAAA,8EASuC;AAGvC,uDAQ6B;AAC7B,mDAAsE;AAEtE,kGAA8F;AAC9F,0FAAmG;AAiBnG,MAAM,gBAAgB,GAAG,CACvB,MAAiE,EACjE,QAAkB,EACL,EAAE;IACf,OAAO,IAAA,+CAAsB,EAAC,MAAM,CAAC,cAAc,EAAE,QAAQ,EAAE,MAAM,CAAC,WAAW,CAAC,CAAA;AACpF,CAAC,CAAA;AAEM,MAAM,gBAAgB,GAAG,CAC9B,MAAiE,EACjE,QAAkB,EAClB,kBAAsC,EACvB,EAAE;IACjB,MAAM,MAAM,GAAG,IAAA,8CAAkB,EAAC,MAAM,CAAC,cAAc,CAAC,CAAA;IACxD,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,EAAE,cAAc,EAAE,GAAG,gBAAgB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;IAE9F,MAAM,WAAW,GAAG,IAAA,4CAAgB,EAAC,MAAM,CAAC,cAAc,EAAE,iCAAiC,CAAC,CAAA;IAC9F,MAAM,YAAY,GAAG,IAAA,+CAAmB,EAAC,MAAM,CAAC,cAAc,CAAC,CAAA;IAC/D,MAAM,YAAY,GAAG,IAAA,+CAAmB,EAAC,MAAM,CAAC,cAAc,CAAC,CAAA;IAC/D,MAAM,cAAc,GAAG,IAAA,iDAAqB,EAAC,MAAM,CAAC,cAAc,CAAC,CAAA;IAEnE,MAAM,EAAE,eAAe,EAAE,iBAAiB,EAAE,uBAAuB,EAAE,GAAG,IAAA,uDAA0B,EAChG,MAAM,CAAC,cAAc,EACrB,QAAQ,CACT,CAAA;IAED,MAAM,OAAO,GAAG,IAAA,0CAAc,EAAC,MAAM,CAAC,cAAc,CAAC,CAAA;IAErD,OAAO;QACL,GAAG;QACH,cAAc;QACd,GAAG;QACH,SAAS;QACT,UAAU;QACV,YAAY,EAAE,YAAY,IAAI,IAAA,oCAAqB,EAAC,YAAY,EAAE,QAAQ,CAAC;QAC3E,cAAc,EAAE,cAAc,IAAI,IAAA,sCAAuB,EAAC,cAAc,EAAE,QAAQ,CAAC;QACnF,WAAW,EAAE,WAAW,oCACnB,IAAA,iCAAkB,EAAC,WAAW,EAAE,QAAQ,CAAC,KAC5C,SAAS,EAAE,kBAAkB,CAAC,WAAW,CAAC,IAAI,CAAC,GAChD;QACD,YAAY,EAAE,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,iCAAkB,EAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;QACrE,UAAU,EAAE,IAAA,8CAAiC,EAAC,YAAY,EAAE,QAAQ,CAAC;QACrE,SAAS,EAAE,IAAA,0CAAc,EAAC,MAAM,CAAC,cAAc,EAAE,WAAW,CAAC;QAC7D,eAAe;QACf,iBAAiB;QACjB,uBAAuB;QACvB,eAAe,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI;QAC7B,OAAO;KACR,CAAA;AACH,CAAC,CAAA;AAzCY,QAAA,gBAAgB,oBAyC5B"}

package/dist/mapSearchResult.d.ts

@@ -1,3 +1,4 @@
+import { LadokStatus } from '@kth/ladok-attributvarde-utils';
 import { SokUtbildningsTillfalleItem, SokUtbildningsTillfalleSlimItem } from '@kth/ladok-mellanlager-client';
 import { Language, TranslatedGrunddata, TranslatedOrganisation, TranslatedUtbildningstyp } from './utils/languageUtil';
 export type SearchResultPeriod = {
@@ -37,5 +38,6 @@ export type CourseSearchResult = {
     };
     period?: SearchResultPeriod;
     isMiljo?: boolean;
+    status?: LadokStatus;
 };
 export declare const mapKursTillfalleResult: (courseInstance: SokUtbildningsTillfalleItem | SokUtbildningsTillfalleSlimItem, language: Language) => CourseSearchResult;

package/dist/mapSearchResult.js

@@ -60,6 +60,7 @@ const mapKursTillfalleResult = (courseInstance, language) => {
         },
         schoolCode,
         isMiljo,
+        status: (0, ladok_attributvarde_utils_1.extractLadokStatus)(courseInstance.Attributvarden),
     };
 };
 exports.mapKursTillfalleResult = mapKursTillfalleResult;

package/dist/mapSearchResult.js.map

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

package/dist/search/createSearchApi.js

@@ -20,6 +20,7 @@ const searchService_1 = require("./searchService");
 const supportService_1 = require("../supportApis/supportService");
 const SearchError_1 = require("../utils/SearchError");
 const continuationConfig_1 = require("./continuationConfig");
+const statusUtils_1 = require("../utils/statusUtils");
 const createSearchApi = (ladokClient) => {
     const searchService = new searchService_1.SearchService(ladokClient);
     const supportService = new supportService_1.SupportService(ladokClient);
@@ -34,7 +35,8 @@ const createSearchApi = (ladokClient) => {
                     maxContinuationIterations: continuationConfig_1.SEARCH_MAX_CONTINUATION_ITERATIONS,
                 });
                 const mappedCourses = allCourses.map(course => (0, mapSearchResult_1.mapKursTillfalleResult)(course, language));
-                const groupedCourses = (0, groupSearchResults_1.groupSearchResults)(mappedCourses, filterPeriod);
+                const noDraftCourses = (0, statusUtils_1.removeDrafts)(mappedCourses);
+                const groupedCourses = (0, groupSearchResults_1.groupSearchResults)(noDraftCourses, filterPeriod);
                 // TODO Remove this once we have a query parameter to filter for miljö courses
                 const courseVersionsToShow = (0, searchUtils_1.possiblyFilterByMiljo)(groupedCourses, cleanSearchParams.onlyMHU);
                 const courseInstanceSearchDTOs = courseVersionsToShow.map(mapCourseInstanceSearchDTO_1.mapCourseInstanceSearchDTO);

package/dist/search/createSearchApi.js.map

@@ -1 +1 @@
-{"version":3,"file":"createSearchApi.js","sourceRoot":"","sources":["../../src/search/createSearchApi.ts"],"names":[],"mappings":";;;;;;;;;;;;AAMA,qDAI4B;AAC5B,kGAA8F;AAC9F,wDAA2D;AAC3D,8DAA0D;AAC1D,oDAAmD;AACnD,mFAA+E;AAC/E,mDAA+C;AAC/C,kEAA8D;AAC9D,sDAAsD;AACtD,6DAA8G;AAEvG,MAAM,eAAe,GAAG,CAAC,WAAsC,EAAa,EAAE;IACnF,MAAM,aAAa,GAAG,IAAI,6BAAa,CAAC,WAAW,CAAC,CAAA;IACpD,MAAM,cAAc,GAAG,IAAI,+BAAc,CAAC,WAAW,CAAC,CAAA;IACtD,OAAO;QACL,qBAAqB,EAAE,CAAO,YAAY,EAAE,QAAQ,EAAE,EAAE;YACtD,IAAI,CAAC;gBACH,MAAM,iBAAiB,GAAG,IAAA,0CAA4B,EAAC,YAAY,CAAC,CAAA;gBAEpE,MAAM,cAAc,GAAG,MAAM,cAAc,CAAC,kCAAkC,CAAC,QAAQ,CAAC,CAAA;gBAExF,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,GAAG,IAAA,wDAA0C,EAC/E,iBAAiB,EACjB,cAAc,CACf,CAAA;gBAED,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,MAAM,IAAA,qEAAiC,EAGzE,WAAW,CAAC,gBAAgB,EAAE,YAAY,EAAE;oBAC5C,wBAAwB,EAAE,wDAAmC;oBAC7D,yBAAyB,EAAE,uDAAkC;iBAC9D,CAAC,CAAA;gBAEF,MAAM,aAAa,GAAG,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,IAAA,wCAAsB,EAAC,MAAO,EAAE,QAAQ,CAAC,CAAC,CAAA;gBAEzF,MAAM,cAAc,GAAG,IAAA,uCAAkB,EAAC,aAAa,EAAE,YAAY,CAAC,CAAA;gBAEtE,8EAA8E;gBAC9E,MAAM,oBAAoB,GAAG,IAAA,mCAAqB,EAAC,cAAc,EAAE,iBAAiB,CAAC,OAAO,CAAC,CAAA;gBAE7F,MAAM,wBAAwB,GAAG,oBAAoB,CAAC,GAAG,CAAC,uDAA0B,CAAC,CAAA;gBAErF,OAAO,EAAE,UAAU,EAAE,wBAAwB,EAAE,CAAA;YACjD,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,WAAW,GAAG,IAAA,0BAAa,EAAC,KAAK,CAAC,CAAA;gBACxC,OAAO;oBACL,UAAU,EAAE,EAAE;oBACd,SAAS,EAAE,WAAW,CAAC,SAAS;iBACjC,CAAA;YACH,CAAC;QACH,CAAC,CAAA;QACD,oBAAoB,EAAE,aAAa,CAAC,oBAAoB,CAAC,IAAI,CAAC,aAAa,CAAC;QAC5E,2BAA2B,EAAE,CAAO,gBAAgB,EAAE,QAAQ,EAAE,EAAE;YAChE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,MAAM,aAAa,CAAC,2BAA2B,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAA;YAE3G,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,OAAO;oBACL,wBAAwB,EAAE;wBACxB,cAAc,EAAE,EAAE;wBAClB,UAAU,EAAE,EAAE;wBACd,OAAO,EAAE,EAAE;qBACZ;oBACD,SAAS,EAAE,6BAAe,CAAC,aAAa;iBACzC,CAAA;YACH,CAAC;YAED,OAAO;gBACL,wBAAwB,EAAE;oBACxB,cAAc,EAAE,UAAU,CAAC,IAAI;oBAC/B,UAAU,EAAE,UAAU,CAAC,IAAI;oBAC3B,OAAO;iBACR;gBACD,SAAS,EAAE,6BAAe,CAAC,aAAa;aACzC,CAAA;QACH,CAAC,CAAA;KACF,CAAA;AACH,CAAC,CAAA;AAlEY,QAAA,eAAe,mBAkE3B"}
+{"version":3,"file":"createSearchApi.js","sourceRoot":"","sources":["../../src/search/createSearchApi.ts"],"names":[],"mappings":";;;;;;;;;;;;AAMA,qDAI4B;AAC5B,kGAA8F;AAC9F,wDAA2D;AAC3D,8DAA0D;AAC1D,oDAAmD;AACnD,mFAA+E;AAC/E,mDAA+C;AAC/C,kEAA8D;AAC9D,sDAAsD;AACtD,6DAA8G;AAC9G,sDAAmD;AAE5C,MAAM,eAAe,GAAG,CAAC,WAAsC,EAAa,EAAE;IACnF,MAAM,aAAa,GAAG,IAAI,6BAAa,CAAC,WAAW,CAAC,CAAA;IACpD,MAAM,cAAc,GAAG,IAAI,+BAAc,CAAC,WAAW,CAAC,CAAA;IACtD,OAAO;QACL,qBAAqB,EAAE,CAAO,YAAY,EAAE,QAAQ,EAAE,EAAE;YACtD,IAAI,CAAC;gBACH,MAAM,iBAAiB,GAAG,IAAA,0CAA4B,EAAC,YAAY,CAAC,CAAA;gBAEpE,MAAM,cAAc,GAAG,MAAM,cAAc,CAAC,kCAAkC,CAAC,QAAQ,CAAC,CAAA;gBAExF,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,GAAG,IAAA,wDAA0C,EAC/E,iBAAiB,EACjB,cAAc,CACf,CAAA;gBAED,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,MAAM,IAAA,qEAAiC,EAGzE,WAAW,CAAC,gBAAgB,EAAE,YAAY,EAAE;oBAC5C,wBAAwB,EAAE,wDAAmC;oBAC7D,yBAAyB,EAAE,uDAAkC;iBAC9D,CAAC,CAAA;gBAEF,MAAM,aAAa,GAAG,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,IAAA,wCAAsB,EAAC,MAAO,EAAE,QAAQ,CAAC,CAAC,CAAA;gBAEzF,MAAM,cAAc,GAAG,IAAA,0BAAY,EAAC,aAAa,CAAC,CAAA;gBAElD,MAAM,cAAc,GAAG,IAAA,uCAAkB,EAAC,cAAc,EAAE,YAAY,CAAC,CAAA;gBAEvE,8EAA8E;gBAC9E,MAAM,oBAAoB,GAAG,IAAA,mCAAqB,EAAC,cAAc,EAAE,iBAAiB,CAAC,OAAO,CAAC,CAAA;gBAE7F,MAAM,wBAAwB,GAAG,oBAAoB,CAAC,GAAG,CAAC,uDAA0B,CAAC,CAAA;gBAErF,OAAO,EAAE,UAAU,EAAE,wBAAwB,EAAE,CAAA;YACjD,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,WAAW,GAAG,IAAA,0BAAa,EAAC,KAAK,CAAC,CAAA;gBACxC,OAAO;oBACL,UAAU,EAAE,EAAE;oBACd,SAAS,EAAE,WAAW,CAAC,SAAS;iBACjC,CAAA;YACH,CAAC;QACH,CAAC,CAAA;QACD,oBAAoB,EAAE,aAAa,CAAC,oBAAoB,CAAC,IAAI,CAAC,aAAa,CAAC;QAC5E,2BAA2B,EAAE,CAAO,gBAAgB,EAAE,QAAQ,EAAE,EAAE;YAChE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,MAAM,aAAa,CAAC,2BAA2B,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAA;YAE3G,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,OAAO;oBACL,wBAAwB,EAAE;wBACxB,cAAc,EAAE,EAAE;wBAClB,UAAU,EAAE,EAAE;wBACd,OAAO,EAAE,EAAE;qBACZ;oBACD,SAAS,EAAE,6BAAe,CAAC,aAAa;iBACzC,CAAA;YACH,CAAC;YAED,OAAO;gBACL,wBAAwB,EAAE;oBACxB,cAAc,EAAE,UAAU,CAAC,IAAI;oBAC/B,UAAU,EAAE,UAAU,CAAC,IAAI;oBAC3B,OAAO;iBACR;gBACD,SAAS,EAAE,6BAAe,CAAC,aAAa;aACzC,CAAA;QACH,CAAC,CAAA;KACF,CAAA;AACH,CAAC,CAAA;AApEY,QAAA,eAAe,mBAoE3B"}

package/dist/utils/languageUtil.d.ts

@@ -42,3 +42,4 @@ export declare const translateUtbildningstyp: (utbildningstyp: Utbildningstyp, l
 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;
+export declare const getAlternateLanguage: (language: Language) => LanguageCode;

package/dist/utils/languageUtil.js

@@ -11,7 +11,7 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.translateStudietakt = exports.translateEduLevel = exports.translatedTilltradesniva = exports.translateUtbildningstyp = exports.translateOrganisation = exports.translateGrunddata = exports.isEnglish = exports.LanguageCode = exports.LadokLanguageName = void 0;
+exports.getAlternateLanguage = exports.translateStudietakt = exports.translateEduLevel = exports.translatedTilltradesniva = exports.translateUtbildningstyp = exports.translateOrganisation = exports.translateGrunddata = exports.isEnglish = exports.LanguageCode = exports.LadokLanguageName = void 0;
 var LadokLanguageName;
 (function (LadokLanguageName) {
     LadokLanguageName["Swedish"] = "svensk";
@@ -73,4 +73,8 @@ const translateStudietakt = (studietakt, language) => {
     return Object.assign(Object.assign({}, (0, exports.translateGrunddata)(studietakt, language)), { takt: studietakt.takt });
 };
 exports.translateStudietakt = translateStudietakt;
+const getAlternateLanguage = (language) => {
+    return (0, exports.isEnglish)(language) ? LanguageCode.Swedish : LanguageCode.English;
+};
+exports.getAlternateLanguage = getAlternateLanguage;
 //# sourceMappingURL=languageUtil.js.map

package/dist/utils/languageUtil.js.map

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

package/dist/utils/programmeStructureUtil.d.ts

@@ -9,6 +9,7 @@ export type ProgrammeCourse = StructurePartVersion & Partial<Omit<StructurePartI
         ForstaUndervisningsdatum: string;
         SistaUndervisningsdatum: string;
     }[];
+    type: 'instance' | 'version';
 };
 export type ProgrammeCurriculumFromStructure = {
     studyYears: StudyYear[];

package/dist/utils/programmeStructureUtil.js

@@ -187,7 +187,7 @@ function mergeStructurePartInstancesAndVersions(filteredMappedStructurePartsDivi
         for (const instance of instanceParts) {
             const version = versionMap.get(instance.data.utbildningsinstansUid);
             if (version) {
-                mergedResults.push(Object.assign(Object.assign(Object.assign({}, instance.data), version), { Valvillkor: instance.categorized.Valvillkor }));
+                mergedResults.push(Object.assign(Object.assign(Object.assign({}, instance.data), version), { Valvillkor: instance.categorized.Valvillkor, type: instance.type }));
             }
         }
         // version-only entries (no matching instance)
@@ -201,7 +201,7 @@ function mergeStructurePartInstancesAndVersions(filteredMappedStructurePartsDivi
                     SistaUndervisningsdatum: version.categorized.Slutdatum,
                 },
             ];
-            mergedResults.push(Object.assign(Object.assign({}, version.data), { Tillfallesperioder, Valvillkor: version.categorized.Valvillkor }));
+            mergedResults.push(Object.assign(Object.assign({}, version.data), { Tillfallesperioder, Valvillkor: version.categorized.Valvillkor, type: version.type }));
         }
         return mergedResults;
     });

package/dist/utils/programmeStructureUtil.js.map

@@ -1 +1 @@
-{"version":3,"file":"programmeStructureUtil.js","sourceRoot":"","sources":["../../src/utils/programmeStructureUtil.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"programmeStructureUtil.js","sourceRoot":"","sources":["../../src/utils/programmeStructureUtil.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,gEAAyF;AACzF,0EAA4F;AAC5F,8EAAoF;AACpF,mDAAkE;AAClE,iDAA0C;AAC1C,uDAAmE;AAqC5D,MAAM,WAAW,GAAG,CAAC,OAAe,EAAE,KAAW,EAAE,EAAE;IAC1D,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;IAC7B,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,KAAI,eAAe,EAAE,CAAA;AACvE,CAAC,CAAA;AAHY,QAAA,WAAW,eAGvB;AAEM,MAAM,4BAA4B,GAAG,CAAO,GAAW,EAAE,WAAsC,EAAE,EAAE;IACxG,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,4BAA4B,CAAC,GAAG,CAAC,CAAA;QACpE,OAAO,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,CAAA;IACvB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAA,mBAAW,EAAC,2BAA2B,EAAE,KAAK,CAAC,CAAA;IACvD,CAAC;AACH,CAAC,CAAA,CAAA;AAPY,QAAA,4BAA4B,gCAOxC;AAEM,MAAM,0BAA0B,GAAG,CAAO,GAAW,EAAE,WAAsC,EAAE,EAAE;;IACtG,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,0BAA0B,CAAC,GAAG,CAAC,CAAA;QAClE,OAAO,CAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,0CAAE,aAAa,KAAI,EAAE,CAAA;IAC5C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAA,mBAAW,EAAC,2BAA2B,EAAE,KAAK,CAAC,CAAA;IACvD,CAAC;AACH,CAAC,CAAA,CAAA;AAPY,QAAA,0BAA0B,8BAOtC;AAEM,MAAM,0BAA0B,GAAG,CAAO,WAAmB,EAAE,WAAsC,EAAE,EAAE;IAC9G,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,wBAAwB,CAAC,WAAW,EAAE;YACvE,cAAc,EACZ,2HAA2H;SAC9H,CAAC,CAAA;QACF,OAAO,QAAQ,CAAC,IAAI,CAAA;IACtB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAA,mBAAW,EAAC,qDAAqD,WAAW,GAAG,EAAE,KAAK,CAAC,CAAA;IAC/F,CAAC;AACH,CAAC,CAAA,CAAA;AAVY,QAAA,0BAA0B,8BAUtC;AAEM,MAAM,yBAAyB,GAAG,CAAO,UAAkB,EAAE,WAAsC,EAAE,EAAE;IAC5G,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,sBAAsB,CAAC,UAAU,EAAE;YACnE,cAAc,EACZ,kJAAkJ;SACrJ,CAAC,CAAA;QACF,OAAO,OAAO,CAAC,IAAI,CAAA;IACrB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAA,mBAAW,EAAC,mDAAmD,UAAU,GAAG,EAAE,KAAK,CAAC,CAAA;IAC5F,CAAC;AACH,CAAC,CAAA,CAAA;AAVY,QAAA,yBAAyB,6BAUrC;AAKD,IAAK,kBAKJ;AALD,WAAK,kBAAkB;IACrB,+BAAS,CAAA;IACT,6BAAO,CAAA;IACP,6BAAO,CAAA;IACP,6BAAO,CAAA;AACT,CAAC,EALI,kBAAkB,KAAlB,kBAAkB,QAKtB;AACD,MAAM,cAAc,GAAG,CAAC,WAAwB,EAAsB,EAAE;;IACtE,OAAO,CACL,CAAA,MAAA,MAAA,WAAW,CAAC,cAAc,0CAAE,kBAAkB,0CAAE,WAAW,EAAE;SAC7D,MAAA,MAAA,WAAW,CAAC,cAAc,0CAAE,iBAAiB,0CAAE,WAAW,EAAE,CAAA,CAC7D,CAAA;AACH,CAAC,CAAA;AAED,MAAM,mBAAmB,GAAG,IAAI,GAAG,CAAC,CAAC,SAAS,CAAC,CAAC,CAAA;AAChD,MAAM,oBAAoB,GAAG,CAAC,WAAoB,EAAW,EAAE;IAC7D,OAAO,CAAC,CAAC,WAAW,IAAI,mBAAmB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;AAC9D,CAAC,CAAA;AAED,MAAM,WAAW,GAAG,CAAC,WAAoB,EAAsB,EAAE;IAC/D,QAAQ,WAAW,EAAE,CAAC;QACpB,KAAK,oBAAoB;YACvB,OAAO,kBAAkB,CAAC,EAAE,CAAA;QAC9B,KAAK,eAAe;YAClB,OAAO,kBAAkB,CAAC,CAAC,CAAA;QAC7B,KAAK,QAAQ;YACX,OAAO,kBAAkB,CAAC,CAAC,CAAA;QAC7B;YACE,OAAO,kBAAkB,CAAC,CAAC,CAAA;IAC/B,CAAC;AACH,CAAC,CAAA;AAED,MAAM,wBAAwB,GAAG,CAAC,aAA4B,EAAE,EAAE;IAChE,OAAO,aAAa;SACjB,GAAG,CAAC,WAAW,CAAC,EAAE;QACjB,MAAM,WAAW,GAAG,cAAc,CAAC,WAAW,CAAC,CAAA;QAC/C,IAAI,oBAAoB,CAAC,WAAW,CAAC;YAAE,OAAO,SAAS,CAAA;QAEvD,MAAM,UAAU,GAAG,WAAW,CAAC,WAAW,CAAC,CAAA;QAC3C,uCAAY,WAAW,KAAE,UAAU,IAAE;IACvC,CAAC,CAAC;SACD,MAAM,CAAC,wBAAS,CAAC,CAAA;AACtB,CAAC,CAAA;AAED,SAAe,yBAAyB,CACtC,wBAAkD,EAClD,QAAkB,EAClB,WAAsC;;QAEtC,MAAM,aAAa,GAAG,wBAAwB,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,iBAAiB,CAAC,CAAA;QAC5G,MAAM,YAAY,GAAG,wBAAwB,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,iBAAiB,CAAC,CAAA;QAE5G,MAAM,aAAa,GAAG,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,GAAS,EAAE;YACzD,MAAM,IAAI,GAAG,MAAM,IAAA,kCAA0B,EAAC,IAAI,CAAC,iBAAkB,EAAE,WAAW,CAAC,CAAA;YACnF,IAAI,CAAC,IAAA,wBAAS,EAAC,IAAI,CAAC;gBAAE,OAAO,SAAS,CAAA;YAEtC,OAAO;gBACL,IAAI,EAAE,UAAU;gBAChB,IAAI,EAAE,IAAA,+CAAyB,EAAC,IAAI,EAAE,QAAQ,CAAC;gBAC/C,WAAW,EAAE,IAAI;aACmB,CAAA;QACxC,CAAC,CAAA,CAAC,CAAA;QAEF,MAAM,YAAY,GAAG,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,GAAS,EAAE;YACvD,MAAM,IAAI,GAAG,MAAM,IAAA,iCAAyB,EAAC,IAAI,CAAC,iBAAkB,EAAE,WAAW,CAAC,CAAA;YAClF,IAAI,CAAC,IAAA,wBAAS,EAAC,IAAI,CAAC;gBAAE,OAAO,SAAS,CAAA;YAEtC,OAAO;gBACL,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,IAAA,mDAAwB,EAAC,IAAI,EAAE,QAAQ,CAAC;gBAC9C,WAAW,EAAE,IAAI;aACmB,CAAA;QACxC,CAAC,CAAA,CAAC,CAAA;QAEF,MAAM,CAAC,gBAAgB,EAAE,eAAe,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC5D,IAAA,iDAA+B,EAAC,aAAa,CAAC;YAC9C,IAAA,iDAA+B,EAAC,YAAY,CAAC;SAC9C,CAAC,CAAA;QAEF,OAAO,CAAC,GAAG,gBAAgB,EAAE,GAAG,eAAe,CAAC,CAAC,MAAM,CAAC,wBAAS,CAAC,CAAA;IACpE,CAAC;CAAA;AAED,SAAS,wBAAwB,CAC/B,QAA2C;IAE3C,IAAI,QAAQ,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QACjC,MAAM,cAAc,GAAG,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAA;QACnD,OAAO,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,EAAE,MAAK,6CAAiB,CAAC,cAAc,CAAA;IAChE,CAAC;;QAAM,OAAO,KAAK,CAAA;AACrB,CAAC;AAED,SAAS,aAAa,CACpB,QAA2C;IAE3C,IAAI,QAAQ,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QACjC,MAAM,cAAc,GAAG,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAA;QACnD,OAAO,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,EAAE,MAAK,6CAAiB,CAAC,MAAM,CAAA,CAAC,2CAA2C;IACpG,CAAC;;QAAM,OAAO,KAAK,CAAA;AACrB,CAAC;AAED,SAAS,uBAAuB,CAAC,cAAmD;IAClF,MAAM,yCAAyC,GAA0B,EAAE,CAAA;IAC3E,MAAM,+BAA+B,GAA4B,EAAE,CAAA;IAEnE,cAAc,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE;QACrC,kFAAkF;QAClF,IAAI,wBAAwB,CAAC,aAAa,CAAC,EAAE,CAAC;YAC5C,IAAI,CAAC,+BAA+B,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,GAAG,KAAK,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;gBACjG,+BAA+B,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAA;YAC1D,CAAC;QACH,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC;gBAAE,yCAAyC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;QAClG,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,OAAO,EAAE,yCAAyC,EAAE,+BAA+B,EAAE,CAAA;AACvF,CAAC;AAED,SAAe,sCAAsC,CACnD,yCAA8E,EAC9E,WAAsC,EACtC,QAAkB;;;QAElB,MAAM,aAAa,GAAG,yCAAyC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,CAGpG,CAAA;QAEH,MAAM,YAAY,GAAG,yCAAyC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,CAGlG,CAAA;QAEH,MAAM,YAAY,GAAG,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,GAAS,EAAE;YACxD,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAA;YAC3C,MAAM,OAAO,GAAG,MAAM,IAAA,iCAAyB,EAAC,GAAG,EAAE,WAAW,CAAC,CAAA;YACjE,OAAO,OAAO,CAAA;QAChB,CAAC,CAAA,CAAC,CAAA;QAEF,MAAM,eAAe,GAAG,MAAM,IAAA,iDAA+B,EAAC,YAAY,CAAC,CAAA;QAC3E,MAAM,cAAc,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,mDAAwB,EAAC,CAAE,EAAE,QAAQ,CAAC,CAAC,CAAA;QACvF,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,qBAAqB,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;QAEjF,MAAM,aAAa,GAAG,EAAE,CAAA;QAExB,6BAA6B;QAC7B,KAAK,MAAM,QAAQ,IAAI,aAAa,EAAE,CAAC;YACrC,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAA;YACnE,IAAI,OAAO,EAAE,CAAC;gBACZ,aAAa,CAAC,IAAI,+CACb,QAAQ,CAAC,IAAI,GACb,OAAO,KACV,UAAU,EAAE,QAAQ,CAAC,WAAW,CAAC,UAAU,EAC3C,IAAI,EAAE,QAAQ,CAAC,IAAI,IACnB,CAAA;YACJ,CAAC;QACH,CAAC;QAED,8CAA8C;QAC9C,KAAK,MAAM,OAAO,IAAI,YAAY,EAAE,CAAC;YACnC,yKAAyK;YACzK,IAAI,CAAC,CAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,0CAAE,SAAS,CAAA;gBAAE,SAAQ;YAC9C,MAAM,kBAAkB,GAAG;gBACzB;oBACE,wBAAwB,EAAE,OAAO,CAAC,WAAW,CAAC,UAAU;oBACxD,uBAAuB,EAAE,OAAO,CAAC,WAAW,CAAC,SAAS;iBACvD;aACF,CAAA;YACD,aAAa,CAAC,IAAI,iCACb,OAAO,CAAC,IAAI,KACf,kBAAkB,EAClB,UAAU,EAAE,OAAO,CAAC,WAAW,CAAC,UAAU,EAC1C,IAAI,EAAE,OAAO,CAAC,IAAI,IAClB,CAAA;QACJ,CAAC;QAED,OAAO,aAAa,CAAA;IACtB,CAAC;CAAA;AAEM,MAAM,gCAAgC,GAAG,CAC9C,uBAA+B,EAC/B,QAAkB,EAClB,WAAsC,EAKrC,EAAE;IACH,MAAM,aAAa,GAAG,MAAM,IAAA,oCAA4B,EAAC,uBAAuB,EAAE,WAAW,CAAC,CAAA;IAE9F,MAAM,EAAE,aAAa,GAAG,EAAE,EAAE,SAAS,EAAE,SAAS,GAAG,EAAE,EAAE,GAAG,aAAa,IAAI,EAAE,CAAA;IAC7E,MAAM,wBAAwB,GAAG,wBAAwB,CAAC,aAAa,CAAC,CAAA;IAExE,MAAM,2BAA2B,GAAG,MAAM,yBAAyB,CAAC,wBAAwB,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAA;IAEpH,MAAM,EAAE,yCAAyC,EAAE,+BAA+B,EAAE,GAClF,uBAAuB,CAAC,2BAA2B,CAAC,CAAA;IAEtD,MAAM,+CAA+C,GAAG,MAAM,sCAAsC,CAClG,yCAAyC,EACzC,WAAW,EACX,QAAQ,CACT,CAAA;IAED,OAAO;QACL,gBAAgB,EAAE,+CAA+C;QACjE,wBAAwB,EAAE,+BAA+B;QACzD,SAAS;KACV,CAAA;AACH,CAAC,CAAA,CAAA;AA9BY,QAAA,gCAAgC,oCA8B5C;AAED,MAAM,4BAA4B,GAAG,CACnC,GAAW,EACX,QAAkB,EAClB,WAAsC,EACtC,EAAE;IACF,MAAM,gBAAgB,GAAG,MAAM,WAAW,CAAC,wBAAwB,CAAC,GAAG,EAAE;QACvE,cAAc,EAAE,wDAAwD;KACzE,CAAC,CAAA;IAEF,IAAI,gBAAgB,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QACtC,MAAM,IAAI,KAAK,CAAC,cAAc,gBAAgB,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC,CAAA;IACxE,CAAC;IAED,MAAM,KAAK,GAAG,gBAAgB,CAAC,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,CAAC,GAAG,GAAG,MAAM,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAA;IAChH,MAAM,WAAW,GAAG,IAAA,4CAAgB,EAAC,gBAAgB,CAAC,IAAI,CAAC,cAAc,EAAE,iCAAiC,CAAC,CAAA;IAC7G,MAAM,kBAAkB,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAA;IAExD,MAAM,EACJ,gBAAgB,EAChB,wBAAwB,EAAE,wBAAwB,EAClD,SAAS,GACV,GAAG,MAAM,IAAA,wCAAgC,EAAC,GAAG,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAA;IAEtE,OAAO;QACL,WAAW;QACX,kBAAkB;QAClB,gBAAgB;QAChB,wBAAwB;QACxB,SAAS;KACV,CAAA;AACH,CAAC,CAAA,CAAA;AAED,MAAM,4BAA4B,GAAG,iHAQnC,EAAE,wJAPF,eAAwC,EACxC,eAAuB,EACvB,kBAA0B,EAC1B,QAAkB,EAClB,WAAsC,EACtC,UAAwB,EACxB,iBAAiB,GAAG,KAAK;IAEzB,MAAM,aAAa,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;IACrD,MAAM,WAAW,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAA;IAErE,MAAM,mBAAmB,GAAG,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAS,EAAE;QAC5D,MAAM,OAAO,GAAG,MAAM,IAAA,iCAAyB,EAAC,GAAG,EAAE,WAAW,CAAC,CAAA;QACjE,OAAO,OAAO,CAAA;IAChB,CAAC,CAAA,CAAC,CAAA;IAEF,MAAM,mBAAmB,GAAG,MAAM,IAAA,iDAA+B,EAAC,mBAAmB,CAAC,CAAA;IAEtF,MAAM,qBAAqB,GAAG,mBAAmB;SAC9C,MAAM,CAAC,wBAAS,CAAC;SACjB,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,IAAA,mDAAwB,EAAC,MAAO,EAAE,QAAQ,CAAC,CAAC,CAAA;IAE7D,MAAM,sCAAsC,GAGtC,EAAE,CAAA;IACR,KAAK,MAAM,GAAG,IAAI,aAAa,EAAE,CAAC;QAChC,MAAM,EAAE,gBAAgB,EAAE,SAAS,EAAE,GAAG,MAAM,IAAA,wCAAgC,EAAC,GAAG,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAA;QAC1G,sCAAsC,CAAC,IAAI,CAAC,EAAE,gBAAgB,EAAE,SAAS,EAAE,CAAC,CAAA;IAC9E,CAAC;IAED,OAAO,qBAAqB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;QACjD,UAAU,EAAE,IAAA,qCAAqB,EAC/B,sCAAsC,CAAC,KAAK,CAAC,CAAC,gBAAgB,EAC9D,sCAAsC,CAAC,KAAK,CAAC,CAAC,SAAS,EACvD,UAAU,EACV,eAAe,EACf,kBAAkB,EAClB,iBAAiB,CAClB;QACD,uBAAuB,EAAE;YACvB,2BAA2B,EAAE,IAAI,CAAC,GAAG;YACrC,KAAK,EAAE,IAAI,CAAC,SAAS;SACtB;KACF,CAAC,CAAC,CAAA;AACL,CAAC,CAAA,CAAA;AAEM,MAAM,uBAAuB,GAAG,kEAKQ,EAAE,yGAJ/C,uBAA+B,EAC/B,QAAkB,EAClB,WAAsC,EACtC,iBAAiB,GAAG,KAAK;IAEzB,IAAI,CAAC;QACH,MAAM,EAAE,WAAW,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,SAAS,EAAE,GAC9F,MAAM,4BAA4B,CAAC,uBAAuB,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAA;QAEpF,MAAM,UAAU,GAAG,MAAM,WAAW,CAAC,MAAM,EAAE,CAAA,CAAC,0BAA0B;QAExE,IAAI,UAAU,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YAChC,MAAM,IAAI,KAAK,CAAC,cAAc,UAAU,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC,CAAA;QAClE,CAAC;QAED,MAAM,cAAc,GAAG,IAAA,qCAAqB,EAC1C,gBAAgB,EAChB,SAAS,EACT,UAAU,CAAC,IAAI,CAAC,MAAM,EACtB,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,IAAK,EAClB,kBAAkB,EAClB,iBAAiB,CAClB,CAAA;QACD,MAAM,yBAAyB,GAAG,MAAM,4BAA4B,CAClE,wBAAwB,EACxB,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,IAAK,EAClB,kBAAkB,EAClB,QAAQ,EACR,WAAW,EACX,UAAU,CAAC,IAAI,CAAC,MAAO,EACvB,iBAAiB,CAClB,CAAA;QAED,OAAO,CAAC,EAAE,UAAU,EAAE,cAAc,EAAE,EAAE,GAAG,yBAAyB,CAAC,CAAA;IACvE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAA,mBAAW,EAAC,oCAAoC,EAAE,KAAK,CAAC,CAAA;IAChE,CAAC;AACH,CAAC,CAAA,CAAA;AAtCY,QAAA,uBAAuB,2BAsCnC"}

package/dist/utils/statusUtils.d.ts

@@ -0,0 +1,4 @@
+import { LadokStatus } from '@kth/ladok-attributvarde-utils';
+export declare const removeDrafts: <T extends {
+    status?: Pick<LadokStatus, "code">;
+}>(courses: Array<T>) => T[];

package/dist/utils/statusUtils.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.removeDrafts = void 0;
+const ladok_attributvarde_utils_1 = require("@kth/ladok-attributvarde-utils");
+const removeDrafts = (courses) => {
+    return courses.filter(course => { var _a; return ((_a = course.status) === null || _a === void 0 ? void 0 : _a.code) !== ladok_attributvarde_utils_1.LadokStatusCode.Draft; });
+};
+exports.removeDrafts = removeDrafts;
+//# sourceMappingURL=statusUtils.js.map

package/dist/utils/statusUtils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"statusUtils.js","sourceRoot":"","sources":["../../src/utils/statusUtils.ts"],"names":[],"mappings":";;;AAAA,8EAA6E;AAEtE,MAAM,YAAY,GAAG,CAAmD,OAAiB,EAAE,EAAE;IAClG,OAAO,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,WAAC,OAAA,CAAA,MAAA,MAAM,CAAC,MAAM,0CAAE,IAAI,MAAK,2CAAe,CAAC,KAAK,CAAA,EAAA,CAAC,CAAA;AAChF,CAAC,CAAA;AAFY,QAAA,YAAY,gBAExB"}

package/dist/utils/statusUtils.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/utils/statusUtils.test.js

@@ -0,0 +1,81 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const ladok_attributvarde_utils_1 = require("@kth/ladok-attributvarde-utils");
+const statusUtils_1 = require("./statusUtils");
+const fullInput = [
+    {
+        status: {
+            code: ladok_attributvarde_utils_1.LadokStatusCode.Started,
+        },
+    },
+    {
+        status: {
+            code: ladok_attributvarde_utils_1.LadokStatusCode.Complete,
+        },
+    },
+    {
+        status: {
+            code: 'S4',
+        },
+    },
+    {
+        status: {
+            code: 'foobar',
+        },
+    },
+];
+const missingInput = [
+    { id: 1 },
+    {
+        id: 2,
+        status: {},
+    },
+    {
+        id: 3,
+        status: {
+            code: null,
+        },
+    },
+    {
+        id: 4,
+        status: {
+            code: ladok_attributvarde_utils_1.LadokStatusCode.Complete,
+        },
+    },
+];
+describe('statusUtils', () => {
+    it('does not touch entities not matching draft status', () => {
+        expect((0, statusUtils_1.removeDrafts)(fullInput)).toStrictEqual(fullInput);
+    });
+    it('returns empty array unchanged', () => {
+        expect((0, statusUtils_1.removeDrafts)([])).toStrictEqual([]);
+    });
+    it('does not touch entities with missing status parts', () => {
+        expect((0, statusUtils_1.removeDrafts)(missingInput)).toStrictEqual(missingInput);
+    });
+    it('filters out drafts', () => {
+        expect((0, statusUtils_1.removeDrafts)([
+            {
+                id: 1,
+                status: { code: ladok_attributvarde_utils_1.LadokStatusCode.Draft },
+            },
+            ...fullInput,
+            {
+                id: 42,
+                status: { code: ladok_attributvarde_utils_1.LadokStatusCode.Draft },
+            },
+        ])).toStrictEqual(fullInput);
+        expect((0, statusUtils_1.removeDrafts)([
+            {
+                id: 1,
+                status: { code: ladok_attributvarde_utils_1.LadokStatusCode.Draft },
+            },
+            ...missingInput,
+            {
+                id: 42,
+                status: { code: ladok_attributvarde_utils_1.LadokStatusCode.Draft },
+            },
+        ])).toStrictEqual(missingInput);
+    });
+});
+//# sourceMappingURL=statusUtils.test.js.map

package/dist/utils/statusUtils.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"statusUtils.test.js","sourceRoot":"","sources":["../../src/utils/statusUtils.test.ts"],"names":[],"mappings":";;AAAA,8EAA6E;AAC7E,+CAA4C;AAE5C,MAAM,SAAS,GAAG;IAChB;QACE,MAAM,EAAE;YACN,IAAI,EAAE,2CAAe,CAAC,OAAO;SAC9B;KACF;IACD;QACE,MAAM,EAAE;YACN,IAAI,EAAE,2CAAe,CAAC,QAAQ;SAC/B;KACF;IACD;QACE,MAAM,EAAE;YACN,IAAI,EAAE,IAAuB;SAC9B;KACF;IACD;QACE,MAAM,EAAE;YACN,IAAI,EAAE,QAA2B;SAClC;KACF;CACF,CAAA;AAED,MAAM,YAAY,GAAG;IACnB,EAAE,EAAE,EAAE,CAAC,EAAE;IACT;QACE,EAAE,EAAE,CAAC;QACL,MAAM,EAAE,EAA+B;KACxC;IACD;QACE,EAAE,EAAE,CAAC;QACL,MAAM,EAAE;YACN,IAAI,EAAE,IAAkC;SACzC;KACF;IACD;QACE,EAAE,EAAE,CAAC;QACL,MAAM,EAAE;YACN,IAAI,EAAE,2CAAe,CAAC,QAAQ;SAC/B;KACF;CACF,CAAA;AAED,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IAC3B,EAAE,CAAC,mDAAmD,EAAE,GAAG,EAAE;QAC3D,MAAM,CAAC,IAAA,0BAAY,EAAC,SAAS,CAAC,CAAC,CAAC,aAAa,CAAC,SAAS,CAAC,CAAA;IAC1D,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,+BAA+B,EAAE,GAAG,EAAE;QACvC,MAAM,CAAC,IAAA,0BAAY,EAAC,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,EAAE,CAAC,CAAA;IAC5C,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,mDAAmD,EAAE,GAAG,EAAE;QAC3D,MAAM,CAAC,IAAA,0BAAY,EAAC,YAAY,CAAC,CAAC,CAAC,aAAa,CAAC,YAAY,CAAC,CAAA;IAChE,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,oBAAoB,EAAE,GAAG,EAAE;QAC5B,MAAM,CACJ,IAAA,0BAAY,EAAC;YACX;gBACE,EAAE,EAAE,CAAC;gBACL,MAAM,EAAE,EAAE,IAAI,EAAE,2CAAe,CAAC,KAAK,EAAE;aACxC;YACD,GAAG,SAAS;YACZ;gBACE,EAAE,EAAE,EAAE;gBACN,MAAM,EAAE,EAAE,IAAI,EAAE,2CAAe,CAAC,KAAK,EAAE;aACxC;SACF,CAAC,CACH,CAAC,aAAa,CAAC,SAAS,CAAC,CAAA;QAE1B,MAAM,CACJ,IAAA,0BAAY,EAAC;YACX;gBACE,EAAE,EAAE,CAAC;gBACL,MAAM,EAAE,EAAE,IAAI,EAAE,2CAAe,CAAC,KAAK,EAAE;aACxC;YACD,GAAG,YAAY;YACf;gBACE,EAAE,EAAE,EAAE;gBACN,MAAM,EAAE,EAAE,IAAI,EAAE,2CAAe,CAAC,KAAK,EAAE;aACxC;SACF,CAAC,CACH,CAAC,aAAa,CAAC,YAAY,CAAC,CAAA;IAC/B,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}

package/dist/utils/studyYearUtil.d.ts

@@ -9,7 +9,18 @@ export type StudyYear = {
 export declare const findMatchingPeriod: (date: string, periods: PeriodItem[]) => PeriodItem | undefined;
 export declare const extractYear: (kod: string, startDateIsInSpring?: boolean) => number;
 export declare const isSpring: (kod: string) => boolean;
-export declare const getStudyYearFromDate: (periodEndDate: string, periodDetails: PeriodItem[], mainStartPeriod: string) => number | undefined;
+/**
+ *
+ * @param studyPeriodStartDate Date in string format 2012-08-25, first tuition date of study period
+ * @param periodDetails PeriodItems from ladok period endpoint
+ * @param mainStartPeriod LadokPeriod: HT2011
+ * @returns
+ */
+export declare const getStudyYearFromDate: (studyPeriodStartDate: string, periodDetails: PeriodItem[], mainStartPeriod: string) => {
+    studyYear: number;
+    calendarYear: number;
+} | undefined;
 export declare const generateStudyYearData: (coursesData: ProgrammeCourse[], freeTexts: Fritext[], periodDetails: PeriodItem[], mainStartPeriod: string, lengthStudyYear: number, useOnlyStructures?: boolean) => StudyYear[];
 export declare const getStudyYearFromSemesters: (programmeStartSemester: string, courseStartSemester: string) => number | null;
 export declare const extractStudyYears: (courseInstance: SokUtbildningsTillfalleItem | SokUtbildningsTillfalleSlimItem, programmeInstance: SokUtbildningsTillfalleItem | SokUtbildningsTillfalleSlimItem, periodItems: PeriodItem[]) => number[];
+export declare const assignCoursesToStudyYears: (studyYearToPeriods: Record<number, ProgrammeCourse["Tillfallesperioder"]>, studyYearCourses: Record<number, Map<string, ProgrammeCourse>>, course: ProgrammeCourse) => void;

package/dist/utils/studyYearUtil.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractStudyYears = exports.getStudyYearFromSemesters = exports.generateStudyYearData = exports.getStudyYearFromDate = exports.isSpring = exports.extractYear = exports.findMatchingPeriod = exports.LAST_YEAR_TO_USE_SYLLABUSES_FOR_KURSLISTA = void 0;
+exports.assignCoursesToStudyYears = exports.extractStudyYears = exports.getStudyYearFromSemesters = exports.generateStudyYearData = exports.getStudyYearFromDate = exports.isSpring = exports.extractYear = exports.findMatchingPeriod = exports.LAST_YEAR_TO_USE_SYLLABUSES_FOR_KURSLISTA = void 0;
 const date_fns_1 = require("date-fns");
 const periodUtil_1 = require("./periodUtil");
 const ladok_attributvarde_utils_1 = require("@kth/ladok-attributvarde-utils");
@@ -54,24 +54,38 @@ const isSpring = (kod) => {
     return kod.startsWith('VT') || kod.endsWith('V');
 };
 exports.isSpring = isSpring;
-const getStudyYearFromDate = (periodEndDate, periodDetails, mainStartPeriod) => {
-    const matchedPeriod = (0, exports.findMatchingPeriod)(periodEndDate, periodDetails);
-    if (!matchedPeriod)
+/**
+ *
+ * @param studyPeriodStartDate Date in string format 2012-08-25, first tuition date of study period
+ * @param periodDetails PeriodItems from ladok period endpoint
+ * @param mainStartPeriod LadokPeriod: HT2011
+ * @returns
+ */
+const getStudyYearFromDate = (studyPeriodStartDate, periodDetails, mainStartPeriod) => {
+    // Match date to ladokPeriod
+    const matchedLadokPeriod = (0, exports.findMatchingPeriod)(studyPeriodStartDate, periodDetails);
+    if (!matchedLadokPeriod)
         return;
-    const baseYear = (0, exports.extractYear)(mainStartPeriod, (0, exports.isSpring)(mainStartPeriod));
-    const startStudyYear = (0, exports.extractYear)(matchedPeriod.Kod, (0, exports.isSpring)(mainStartPeriod));
-    return startStudyYear - baseYear + 1;
+    // extract year from MainStartPeriod (HT2011 -> 2011)
+    const baseCalendarYear = (0, exports.extractYear)(mainStartPeriod, (0, exports.isSpring)(mainStartPeriod));
+    // extract year from LadokPeriodKod (HT2012 -> 2012)
+    const studyPeriodCalendarYear = (0, exports.extractYear)(matchedLadokPeriod.Kod, (0, exports.isSpring)(mainStartPeriod));
+    // return studyPeriodCalendarYear - baseCalendarYear + 1
+    return { studyYear: studyPeriodCalendarYear - baseCalendarYear + 1, calendarYear: studyPeriodCalendarYear };
 };
 exports.getStudyYearFromDate = getStudyYearFromDate;
 const generateStudyYearData = (coursesData, freeTexts, periodDetails, mainStartPeriod, lengthStudyYear, useOnlyStructures = false) => {
     const studyYearCourses = {};
     const studyYearFreeTexts = {};
-    const baseYear = (0, exports.extractYear)(mainStartPeriod, (0, exports.isSpring)(mainStartPeriod));
+    const baseCalendarYear = (0, exports.extractYear)(mainStartPeriod, (0, exports.isSpring)(mainStartPeriod));
     // Step 1: Map Fritexts to study years
     freeTexts.forEach(ft => {
         if (!ft.PlaneradPeriodStartDatum)
             return;
-        const studyYear = (0, exports.getStudyYearFromDate)(ft.PlaneradPeriodStartDatum, periodDetails, mainStartPeriod);
+        const res = (0, exports.getStudyYearFromDate)(ft.PlaneradPeriodStartDatum, periodDetails, mainStartPeriod);
+        if (!res)
+            return;
+        const { studyYear } = res;
         if (studyYear && studyYear >= 1 && studyYear <= lengthStudyYear) {
             if (!studyYearFreeTexts[studyYear]) {
                 studyYearFreeTexts[studyYear] = [];
@@ -82,38 +96,35 @@ const generateStudyYearData = (coursesData, freeTexts, periodDetails, mainStartP
     // Step 2: Group courses by study year
     coursesData.forEach(course => {
         const studyYearToPeriods = {};
-        for (const period of course.Tillfallesperioder) {
-            const studyYear = (0, exports.getStudyYearFromDate)(period.ForstaUndervisningsdatum, periodDetails, mainStartPeriod);
-            if (!studyYear) {
+        // Here we build a mapping between studyYear (1-5) and the current courses tillfällesperioder
+        // The course can be given in multiple study years
+        for (const tillfallesperiod of course.Tillfallesperioder) {
+            const res = (0, exports.getStudyYearFromDate)(tillfallesperiod.ForstaUndervisningsdatum, periodDetails, mainStartPeriod);
+            if (!res || !res.studyYear) {
                 console.log(`studyYear could not be found for ${course.kod}`);
                 continue;
             }
+            const { studyYear, calendarYear } = res;
             if (studyYear >= 1 && studyYear <= lengthStudyYear) {
-                const actualStudyYear = baseYear + studyYear - 1;
                 // When useOnlyStructures is true, include all periods regardless of year
                 // Otherwise, only include periods from LAST_YEAR_TO_USE_SYLLABUSES_FOR_KURSLISTA onwards
-                if (useOnlyStructures || actualStudyYear >= exports.LAST_YEAR_TO_USE_SYLLABUSES_FOR_KURSLISTA) {
+                if (useOnlyStructures || calendarYear >= exports.LAST_YEAR_TO_USE_SYLLABUSES_FOR_KURSLISTA) {
                     if (!studyYearToPeriods[studyYear]) {
                         studyYearToPeriods[studyYear] = [];
                     }
-                    studyYearToPeriods[studyYear].push(period);
+                    studyYearToPeriods[studyYear].push(tillfallesperiod);
                 }
             }
         }
         // Assign each course to its respective study years with only relevant Tillfallesperioder
-        Object.entries(studyYearToPeriods).forEach(([yearStr, filteredPeriods]) => {
-            const year = Number(yearStr);
-            if (!studyYearCourses[year])
-                studyYearCourses[year] = [];
-            studyYearCourses[year].push(Object.assign(Object.assign({}, course), { Tillfallesperioder: filteredPeriods }));
-        });
+        (0, exports.assignCoursesToStudyYears)(studyYearToPeriods, studyYearCourses, course);
     });
     // Step 3: Return complete study years with optional freeTexts
     return Array.from({ length: lengthStudyYear }, (_, i) => {
         const yearNumber = i + 1;
         return {
             yearNumber,
-            courses: studyYearCourses[yearNumber] || [],
+            courses: studyYearCourses[yearNumber] ? Array.from(studyYearCourses[yearNumber].values()) : [],
             freeTexts: studyYearFreeTexts[yearNumber] || [],
         };
     });
@@ -145,4 +156,23 @@ const extractStudyYears = (courseInstance, programmeInstance, periodItems) => {
     }, []);
 };
 exports.extractStudyYears = extractStudyYears;
+const assignCoursesToStudyYears = (studyYearToPeriods, studyYearCourses, course) => {
+    Object.entries(studyYearToPeriods).forEach(([yearStr, filteredPeriods]) => {
+        const year = Number(yearStr);
+        if (!studyYearCourses[year]) {
+            studyYearCourses[year] = new Map();
+        }
+        const existingCourse = studyYearCourses[year].get(course.kod);
+        // If no course exists -> add it
+        if (!existingCourse) {
+            studyYearCourses[year].set(course.kod, Object.assign(Object.assign({}, course), { Tillfallesperioder: filteredPeriods }));
+            return;
+        }
+        // If a course exists and the new one is an Instance -> replace it
+        if (course.type === 'instance') {
+            studyYearCourses[year].set(course.kod, Object.assign(Object.assign({}, course), { Tillfallesperioder: filteredPeriods }));
+        }
+    });
+};
+exports.assignCoursesToStudyYears = assignCoursesToStudyYears;
 //# sourceMappingURL=studyYearUtil.js.map

package/dist/utils/studyYearUtil.js.map

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

package/dist/utils/syllabusExtractionUtil.d.ts

@@ -1,8 +1,16 @@
 import { Attributvarde, Attributdefinition, AttributdefinitionSlim } from '@kth/ladok-attributvarde-utils';
 import { Language } from './languageUtil';
 /**
- * Extracts a markdown attribute value, normalizes tables if it's a course list,
+ * Extracts a markdown attribute value, normalizes tables if courseList=true,
  * and converts to HTML. This is specifically designed for program syllabi
  * where course lists need table normalization.
+ * Note that `isCourseList` requires the field to be multiLingual. If monoLingual=true, normalization will not occur.
+ *
+ * @param attributvarden Attributvarden to extract attributName from
+ * @param attributeName The name of the local attribute to extract, e.g. "avvecklingsbeslut" if you want to extract from `utbildning.lokalt.attribut.29.avvecklingsbeslut.sv` or `utbildning.lokalt.attribut.29.avvecklingsbeslut.sv/en`
+ * @param language only used if multiLingual, i.e. if sv/en exist `utbildning.lokalt.attribut.29.avvecklingsbeslut.sv`
+ * @param monoLingual set to true, if there is no nested sv/en at `utbildning.lokalt.attribut.29.avvecklingsbeslut`
+ * @param isCourseList set to true, if markdown tables should be normalized
+ * @returns
  */
-export declare const extractAndConvertMarkdownToHtml: (attributvarden: Attributvarde<Attributdefinition | AttributdefinitionSlim>[], attributeName: string, language: Language, useBaseValue?: boolean, isCourseList?: boolean) => string | undefined;
+export declare const extractAndConvertMarkdownToHtml: (attributvarden: Attributvarde<Attributdefinition | AttributdefinitionSlim>[], attributeName: string, language: Language, monoLingual?: boolean, isCourseList?: boolean) => string | undefined;

package/dist/utils/syllabusExtractionUtil.js

@@ -6,43 +6,43 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.extractAndConvertMarkdownToHtml = void 0;
 const ladok_attributvarde_utils_1 = require("@kth/ladok-attributvarde-utils");
 const showdown_1 = __importDefault(require("showdown"));
+const markdownConverter = new showdown_1.default.Converter({ tables: true });
 /**
- * Extracts a markdown attribute value, normalizes tables if it's a course list,
+ * Extracts a markdown attribute value, normalizes tables if courseList=true,
  * and converts to HTML. This is specifically designed for program syllabi
  * where course lists need table normalization.
+ * Note that `isCourseList` requires the field to be multiLingual. If monoLingual=true, normalization will not occur.
+ *
+ * @param attributvarden Attributvarden to extract attributName from
+ * @param attributeName The name of the local attribute to extract, e.g. "avvecklingsbeslut" if you want to extract from `utbildning.lokalt.attribut.29.avvecklingsbeslut.sv` or `utbildning.lokalt.attribut.29.avvecklingsbeslut.sv/en`
+ * @param language only used if multiLingual, i.e. if sv/en exist `utbildning.lokalt.attribut.29.avvecklingsbeslut.sv`
+ * @param monoLingual set to true, if there is no nested sv/en at `utbildning.lokalt.attribut.29.avvecklingsbeslut`
+ * @param isCourseList set to true, if markdown tables should be normalized
+ * @returns
  */
-const extractAndConvertMarkdownToHtml = (attributvarden, attributeName, language, useBaseValue = false, isCourseList = false) => {
-    // Try Markdown first, then LocalizedString as fallback
-    const markdownResult = [ladok_attributvarde_utils_1.LokaltAttributType.Markdown, ladok_attributvarde_utils_1.LokaltAttributType.LocalizedString]
-        .map(type => useBaseValue
-        ? (0, ladok_attributvarde_utils_1.extractLokaltAttribut)(attributvarden, attributeName, type, true)
-        : (0, ladok_attributvarde_utils_1.extractLokaltAttribut)(attributvarden, attributeName, type))
-        .find(result => result !== undefined);
-    if (!markdownResult)
-        return undefined;
-    // Handle both single string and localized object
-    let rawMarkdown;
-    if (typeof markdownResult === 'string') {
-        rawMarkdown = markdownResult;
-    }
-    else {
-        // For localized objects, try the requested language first, then fallback to sv -> en
-        rawMarkdown = markdownResult[language];
+const extractAndConvertMarkdownToHtml = (attributvarden, attributeName, language, monoLingual = false, isCourseList = false) => {
+    if (monoLingual) {
+        const single = (0, ladok_attributvarde_utils_1.extractLokaltAttribut)(attributvarden, attributeName, ladok_attributvarde_utils_1.LokaltAttributType.Markdown, true);
+        if (!single)
+            return undefined;
+        return convertMarkdownToHtml(single);
     }
-    if (!rawMarkdown)
+    const localized = (0, ladok_attributvarde_utils_1.extractLokaltAttribut)(attributvarden, attributeName, ladok_attributvarde_utils_1.LokaltAttributType.Markdown);
+    if (!localized)
+        return undefined;
+    const raw = localized[language];
+    if (!raw)
         return undefined;
     // Only normalize tables for course lists in programmes
-    const processedMarkdown = isCourseList ? normalizeMarkdownTables(rawMarkdown) : rawMarkdown;
-    return convertMarkdownToHtml(processedMarkdown);
+    const processed = isCourseList ? normalizeMarkdownTables(raw) : raw;
+    return convertMarkdownToHtml(processed);
 };
 exports.extractAndConvertMarkdownToHtml = extractAndConvertMarkdownToHtml;
 /**
  * Converts markdown text to HTML using showdown converter
  */
 const convertMarkdownToHtml = (markdownText) => {
-    if (!markdownText)
-        return undefined;
-    const converter = new showdown_1.default.Converter({ tables: true });
+    const converter = markdownConverter;
     return converter.makeHtml(markdownText);
 };
 /**
@@ -50,8 +50,6 @@ const convertMarkdownToHtml = (markdownText) => {
  * This implements the specific table normalization logic for program course lists.
  */
 const normalizeMarkdownTables = (raw) => {
-    if (!raw)
-        return raw;
     let normalized = raw
         // Step 1: Convert escaped \n to real newlines
         .replace(/\\n/g, '\n')

package/dist/utils/syllabusExtractionUtil.js.map

@@ -1 +1 @@
-{"version":3,"file":"syllabusExtractionUtil.js","sourceRoot":"","sources":["../../src/utils/syllabusExtractionUtil.ts"],"names":[],"mappings":";;;;;;AAAA,8EAMuC;AAEvC,wDAA+B;AAE/B;;;;GAIG;AACI,MAAM,+BAA+B,GAAG,CAC7C,cAA4E,EAC5E,aAAqB,EACrB,QAAkB,EAClB,eAAwB,KAAK,EAC7B,eAAwB,KAAK,EACT,EAAE;IACtB,uDAAuD;IACvD,MAAM,cAAc,GAAI,CAAC,8CAAkB,CAAC,QAAQ,EAAE,8CAAkB,CAAC,eAAe,CAAW;SAChG,GAAG,CAAC,IAAI,CAAC,EAAE,CACV,YAAY;QACV,CAAC,CAAC,IAAA,iDAAqB,EAAC,cAAc,EAAE,aAAa,EAAE,IAAI,EAAE,IAAI,CAAC;QAClE,CAAC,CAAC,IAAA,iDAAqB,EAAC,cAAc,EAAE,aAAa,EAAE,IAAI,CAAC,CAC/D;SACA,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,KAAK,SAAS,CAAC,CAAA;IAEvC,IAAI,CAAC,cAAc;QAAE,OAAO,SAAS,CAAA;IAErC,iDAAiD;IACjD,IAAI,WAA+B,CAAA;IACnC,IAAI,OAAO,cAAc,KAAK,QAAQ,EAAE,CAAC;QACvC,WAAW,GAAG,cAAc,CAAA;IAC9B,CAAC;SAAM,CAAC;QACN,qFAAqF;QACrF,WAAW,GAAG,cAAc,CAAC,QAAQ,CAAC,CAAA;IACxC,CAAC;IAED,IAAI,CAAC,WAAW;QAAE,OAAO,SAAS,CAAA;IAElC,uDAAuD;IACvD,MAAM,iBAAiB,GAAG,YAAY,CAAC,CAAC,CAAC,uBAAuB,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAA;IAC3F,OAAO,qBAAqB,CAAC,iBAAiB,CAAC,CAAA;AACjD,CAAC,CAAA;AAhCY,QAAA,+BAA+B,mCAgC3C;AAED;;GAEG;AACH,MAAM,qBAAqB,GAAG,CAAC,YAAgC,EAAsB,EAAE;IACrF,IAAI,CAAC,YAAY;QAAE,OAAO,SAAS,CAAA;IACnC,MAAM,SAAS,GAAG,IAAI,kBAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAA;IAC1D,OAAO,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAA;AACzC,CAAC,CAAA;AAED;;;GAGG;AACH,MAAM,uBAAuB,GAAG,CAAC,GAAuB,EAAsB,EAAE;IAC9E,IAAI,CAAC,GAAG;QAAE,OAAO,GAAG,CAAA;IAEpB,IAAI,UAAU,GAAG,GAAG;QAClB,8CAA8C;SAC7C,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC;QAEtB,8EAA8E;SAC7E,OAAO,CAAC,gBAAgB,EAAE,EAAE,CAAC;QAE9B,yDAAyD;SACxD,OAAO,CAAC,mBAAmB,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE,CAAC,IAAI,GAAG,GAAG,CAAC;SACzD,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC;QAEtB,iDAAiD;SAChD,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC;QAEvB,2EAA2E;SAC1E,OAAO,CAAC,qBAAqB,EAAE,MAAM,CAAC;QAEvC,2CAA2C;SAC1C,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC,CAAA;IAE7B,OAAO,UAAU,CAAA;AACnB,CAAC,CAAA"}
+{"version":3,"file":"syllabusExtractionUtil.js","sourceRoot":"","sources":["../../src/utils/syllabusExtractionUtil.ts"],"names":[],"mappings":";;;;;;AAAA,8EAMuC;AAEvC,wDAA+B;AAE/B,MAAM,iBAAiB,GAAG,IAAI,kBAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAA;AAElE;;;;;;;;;;;;GAYG;AACI,MAAM,+BAA+B,GAAG,CAC7C,cAA4E,EAC5E,aAAqB,EACrB,QAAkB,EAClB,cAAuB,KAAK,EAC5B,eAAwB,KAAK,EACT,EAAE;IACtB,IAAI,WAAW,EAAE,CAAC;QAChB,MAAM,MAAM,GAAG,IAAA,iDAAqB,EAAC,cAAc,EAAE,aAAa,EAAE,8CAAkB,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;QACtG,IAAI,CAAC,MAAM;YAAE,OAAO,SAAS,CAAA;QAC7B,OAAO,qBAAqB,CAAC,MAAM,CAAC,CAAA;IACtC,CAAC;IAED,MAAM,SAAS,GAAG,IAAA,iDAAqB,EAAC,cAAc,EAAE,aAAa,EAAE,8CAAkB,CAAC,QAAQ,CAAC,CAAA;IACnG,IAAI,CAAC,SAAS;QAAE,OAAO,SAAS,CAAA;IAEhC,MAAM,GAAG,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAA;IAC/B,IAAI,CAAC,GAAG;QAAE,OAAO,SAAS,CAAA;IAE1B,uDAAuD;IACvD,MAAM,SAAS,GAAG,YAAY,CAAC,CAAC,CAAC,uBAAuB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA;IACnE,OAAO,qBAAqB,CAAC,SAAS,CAAC,CAAA;AACzC,CAAC,CAAA;AAtBY,QAAA,+BAA+B,mCAsB3C;AAED;;GAEG;AACH,MAAM,qBAAqB,GAAG,CAAC,YAAoB,EAAU,EAAE;IAC7D,MAAM,SAAS,GAAG,iBAAiB,CAAA;IACnC,OAAO,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAA;AACzC,CAAC,CAAA;AAED;;;GAGG;AACH,MAAM,uBAAuB,GAAG,CAAC,GAAW,EAAU,EAAE;IACtD,IAAI,UAAU,GAAG,GAAG;QAClB,8CAA8C;SAC7C,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC;QAEtB,8EAA8E;SAC7E,OAAO,CAAC,gBAAgB,EAAE,EAAE,CAAC;QAE9B,yDAAyD;SACxD,OAAO,CAAC,mBAAmB,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE,CAAC,IAAI,GAAG,GAAG,CAAC;SACzD,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC;QAEtB,iDAAiD;SAChD,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC;QAEvB,2EAA2E;SAC1E,OAAO,CAAC,qBAAqB,EAAE,MAAM,CAAC;QAEvC,2CAA2C;SAC1C,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC,CAAA;IAE7B,OAAO,UAAU,CAAA;AACnB,CAAC,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kth/om-kursen-ladok-client",
-  "version": "2.5.4",
+  "version": "2.5.6",
   "description": "Om kursen specific logic and mappings, uses both @kth/ladok-mellanlager-client and @kth/ladok-attributevarde-utils.",
   "main": "dist/index.js",
   "files": [
@@ -21,7 +21,7 @@
     "build:publish": "npm install --no-workspaces && npm run build"
   },
   "dependencies": {
-    "@kth/ladok-attributvarde-utils": "1.0.4",
+    "@kth/ladok-attributvarde-utils": "1.0.5",
     "@kth/ladok-mellanlager-client": "1.2.0",
     "date-fns": "^4.1.0",
     "showdown": "^2.1.0"