@royalschedule/maps 4.0.14 → 4.0.16

package/dist/PlanDigital/from/schedules.js.map

@@ -1 +1 @@
-{"version":3,"file":"schedules.js","names":["warnings: string[]","errors:   string[]","groups","teachers"],"sources":["../../../src/PlanDigital/from/schedules.ts"],"sourcesContent":["import { size, countBy, sum } from 'lodash-es';\nimport type { CoreTypes } from '../../core';\nimport type { Types as PlanDigitalTypes } from '../types';\nimport type { InternalIdKey } from '../../core/types/common';\n\nnamespace OutTypes {\n  export type group   = Omit<CoreTypes.serialized.group,   InternalIdKey>;\n  export type teacher = Omit<CoreTypes.serialized.teacher, InternalIdKey>;\n  export type course  = Omit<CoreTypes.serialized.course,  InternalIdKey>;\n}\n\ntype Out = {\n  groups?:   OutTypes.group[];\n  teachers?: OutTypes.teacher[];\n  courses?:  OutTypes.course[];\n  meta?: {\n    errors?:   string[];\n    warnings?: string[];\n  };\n};\n\nexport default (\n  input:   PlanDigitalTypes.schedule,\n  options: PlanDigitalTypes.options\n): Out => {\n  // gather all import related warnings/errors\n  const warnings: string[] = [];\n  const errors:   string[] = [];\n\n  // there must be at least a single period\n  if (!input['Perioder'].length) {\n    errors.push('The schedule data does not contain any periods.');\n    return { meta: { errors } };\n  }\n\n  // ensure that at least one period is selected\n  const selectedPeriods = options.selectedPeriods;\n  if (!selectedPeriods?.length) {\n    errors.push('No periods were selected.');\n    return { meta: { errors } };\n  }\n\n  // ensure that the selected periods exist\n  for (const x of options.selectedPeriods ?? []) {\n    if (!input['Perioder'].some(p => p.Namn == x)) {\n      errors.push(`The selected period ${x} does not exist.`);\n      return { meta: { errors } };\n    }\n  }\n\n  // ensure that all periods use the same time unit\n  const numUnits = size(countBy(input['Perioder'].map(x => x.Tidsenhet)));\n  if (numUnits > 1) {\n    errors.push('Different time periods used for different periods.');\n    return { meta: { errors } };\n  }\n  const timeUnit = input['Perioder'][0].Tidsenhet;\n\n\n  ////\n  //// fetch courses, groups, and teachers\n  ////\n  const courses    = new Array<OutTypes.course>();\n  const teacherSet = new Set<string>();\n  const groupSet   = new Set<string>();\n  input['Tabell Tjänstefördelning'].forEach(c => {\n    // check if the course should be taken into account\n    // (the course must then have some scheduled time during the selected periods)\n    const periodTimes = selectedPeriods.map(x => c[`Tid ${x}`] ?? 0);\n    if (sum(periodTimes) == 0) return;\n\n    const displayName = c[options.displayName ?? 'Gruppnamn'];\n    const subject     = c['Kurskod'];\n    const groups      = c['Klass']?.split(',').map(x => x.trim());\n    const teachers    = c['Sign'] ?.split(',').map(x => x.trim());\n\n    // fetch the expected schedule time in whatever units\n    const periodTime         = size(countBy(periodTimes)) == 1 ? periodTimes[0] : undefined;\n    const minutesPerWeek     = timeUnit == 'Minuter/Vecka'         ? periodTime     : undefined;\n    const expectedTotalHours = timeUnit == 'Timmar/Period'         ? periodTime     : undefined;\n\n    // add groups and teachers\n    teachers.forEach(x => teacherSet.add(x));\n    groups.forEach(x   => groupSet.add(x));\n\n    // add course\n    courses.push({\n      displayName,\n      subject,\n      teachers: teachers.map(to => ({ to })),\n      groups:   groups  .map(to => ({ to })),\n\n      ...(minutesPerWeek     != undefined && { minutesPerWeek     }),\n      ...(expectedTotalHours != undefined && { expectedTotalHours })\n    });\n\n  });\n\n\n  const teachers = [...teacherSet].map(ids => ({ ids, displayName: ids }));\n  const groups   = [...groupSet  ].map(ids => ({ ids, displayName: ids, species: 'class' as const }));\n  return { groups, teachers, courses,\n    meta: {\n      ...( errors.length   && { errors:   errors   } ),\n      ...( warnings.length && { warnings: warnings } )\n    }\n  };\n};"],"mappings":";;;AAqBA,yBACE,OACA,YACQ;CAER,MAAMA,WAAqB;CAC3B,MAAMC,SAAqB;AAG3B,KAAI,CAAC,MAAM,YAAY,QAAQ;AAC7B,SAAO,KAAK;AACZ,SAAO,EAAE,MAAM,EAAE;;CAInB,MAAM,kBAAkB,QAAQ;AAChC,KAAI,CAAC,iBAAiB,QAAQ;AAC5B,SAAO,KAAK;AACZ,SAAO,EAAE,MAAM,EAAE;;AAInB,MAAK,MAAM,KAAK,QAAQ,mBAAmB,GACzC,KAAI,CAAC,MAAM,YAAY,MAAK,MAAK,EAAE,QAAQ,IAAI;AAC7C,SAAO,KAAK,uBAAuB,EAAE;AACrC,SAAO,EAAE,MAAM,EAAE;;CAKrB,MAAM,WAAW,KAAK,QAAQ,MAAM,YAAY,KAAI,MAAK,EAAE;AAC3D,KAAI,WAAW,GAAG;AAChB,SAAO,KAAK;AACZ,SAAO,EAAE,MAAM,EAAE;;CAEnB,MAAM,WAAW,MAAM,YAAY,GAAG;CAMtC,MAAM,UAAa,IAAI;CACvB,MAAM,6BAAa,IAAI;CACvB,MAAM,2BAAa,IAAI;AACvB,OAAM,4BAA4B,SAAQ,MAAK;EAG7C,MAAM,cAAc,gBAAgB,KAAI,MAAK,EAAE,OAAO,QAAQ;AAC9D,MAAI,IAAI,gBAAgB,EAAG;EAE3B,MAAM,cAAc,EAAE,QAAQ,eAAe;EAC7C,MAAM,UAAc,EAAE;EACtB,MAAMC,WAAc,EAAE,UAAU,MAAM,KAAK,KAAI,MAAK,EAAE;EACtD,MAAMC,aAAc,EAAE,SAAU,MAAM,KAAK,KAAI,MAAK,EAAE;EAGtD,MAAM,aAAqB,KAAK,QAAQ,iBAAiB,IAAI,YAAY,KAAK;EAC9E,MAAM,iBAAqB,YAAY,kBAA0B,aAAiB;EAClF,MAAM,qBAAqB,YAAY,kBAA0B,aAAiB;AAGlF,aAAS,SAAQ,MAAK,WAAW,IAAI;AACrC,WAAO,SAAQ,MAAO,SAAS,IAAI;AAGnC,UAAQ,KAAK;GACX;GACA;GACA,UAAUA,WAAS,KAAI,QAAO,EAAE;GAChC,QAAUD,SAAS,KAAI,QAAO,EAAE;GAEhC,GAAI,kBAAsB,UAAa,EAAE;GACzC,GAAI,sBAAsB,UAAa,EAAE;;;CAM7C,MAAM,WAAW,CAAC,GAAG,YAAY,KAAI,SAAQ;EAAE;EAAK,aAAa;;CACjE,MAAM,SAAW,CAAC,GAAG,UAAY,KAAI,SAAQ;EAAE;EAAK,aAAa;EAAK,SAAS;;AAC/E,QAAO;EAAE;EAAQ;EAAU;EACzB,MAAM;GACJ,GAAK,OAAO,UAAY,EAAY;GACpC,GAAK,SAAS,UAAU,EAAY"}
+{"version":3,"file":"schedules.js","names":["warnings: string[]","errors:   string[]","teachers"],"sources":["../../../src/PlanDigital/from/schedules.ts"],"sourcesContent":["import { size, countBy, sum } from 'lodash-es';\nimport type { CoreTypes } from '../../core';\nimport type { Types as PlanDigitalTypes } from '../types';\nimport type { InternalIdKey } from '../../core/types/common';\n\nnamespace OutTypes {\n  export type group   = Omit<CoreTypes.Serialized.Group,   InternalIdKey>;\n  export type teacher = Omit<CoreTypes.Serialized.Teacher, InternalIdKey>;\n  export type course  = Omit<CoreTypes.Serialized.Course,  InternalIdKey>;\n}\n\ntype Out = {\n  groups?:   OutTypes.group[];\n  teachers?: OutTypes.teacher[];\n  courses?:  OutTypes.course[];\n  meta?: {\n    errors?:   string[];\n    warnings?: string[];\n  };\n};\n\nexport default (\n  input:   PlanDigitalTypes.schedule,\n  options: PlanDigitalTypes.options\n): Out => {\n  // gather all import related warnings/errors\n  const warnings: string[] = [];\n  const errors:   string[] = [];\n\n  // there must be at least a single period\n  if (!input['Perioder'].length) {\n    errors.push('The schedule data does not contain any periods.');\n    return { meta: { errors } };\n  }\n\n  // ensure that at least one period is selected\n  const selectedPeriods = options.selectedPeriods;\n  if (!selectedPeriods?.length) {\n    errors.push('No periods were selected.');\n    return { meta: { errors } };\n  }\n\n  // ensure that the selected periods exist\n  for (const x of options.selectedPeriods ?? []) {\n    if (!input['Perioder'].some(p => p.Namn == x)) {\n      errors.push(`The selected period ${x} does not exist.`);\n      return { meta: { errors } };\n    }\n  }\n\n  // ensure that all periods use the same time unit\n  const numUnits = size(countBy(input['Perioder'].map(x => x.Tidsenhet)));\n  if (numUnits > 1) {\n    errors.push('Different time periods used for different periods.');\n    return { meta: { errors } };\n  }\n  const timeUnit = input['Perioder'][0].Tidsenhet;\n\n\n  ////\n  //// fetch courses, groups, and teachers\n  ////\n  const courses    = new Array<OutTypes.course>();\n  const teacherSet = new Set<string>();\n  const groupSet   = new Set<string>();\n  input['Tabell Tjänstefördelning'].forEach(c => {\n    // check if the course should be taken into account\n    // (the course must then have some scheduled time during the selected periods)\n    const periodTimes = selectedPeriods.map(x => c[`Tid ${x}`] ?? 0);\n    if (sum(periodTimes) == 0) return;\n\n    const displayName = c[options.displayName ?? 'Gruppnamn'];\n    const subject     = c['Kurskod'];\n    const groups      = c['Klass']?.split(',').map(x => x.trim());\n    const teachers    = c['Sign'] ?.split(',').map(x => x.trim());\n\n    // fetch the expected schedule time in whatever units\n    const periodTime         = size(countBy(periodTimes)) == 1 ? periodTimes[0] : undefined;\n    const minutesPerWeek     = timeUnit == 'Minuter/Vecka'         ? periodTime     : undefined;\n    const expectedTotalHours = timeUnit == 'Timmar/Period'         ? periodTime     : undefined;\n\n    // add groups and teachers\n    teachers.forEach(x => teacherSet.add(x));\n    groups.forEach(x   => groupSet.add(x));\n\n    // add course\n    courses.push({\n      displayName,\n      subject,\n      teachers: teachers.map(to => ({ to })),\n      groups:   groups  .map(to => ({ to })),\n\n      ...(minutesPerWeek     != undefined && { minutesPerWeek     }),\n      ...(expectedTotalHours != undefined && { expectedTotalHours })\n    });\n\n  });\n\n\n  const teachers = [...teacherSet].map(ids => ({ ids, displayName: ids }));\n  const groups   = [...groupSet  ].map(ids => ({ ids, displayName: ids, species: 'class' as const }));\n  return { groups, teachers, courses,\n    meta: {\n      ...( errors.length   && { errors:   errors   } ),\n      ...( warnings.length && { warnings: warnings } )\n    }\n  };\n};"],"mappings":";;;AAqBA,yBACE,OACA,YACQ;CAER,MAAMA,WAAqB,EAAE;CAC7B,MAAMC,SAAqB,EAAE;AAG7B,KAAI,CAAC,MAAM,YAAY,QAAQ;AAC7B,SAAO,KAAK,kDAAkD;AAC9D,SAAO,EAAE,MAAM,EAAE,QAAQ,EAAE;;CAI7B,MAAM,kBAAkB,QAAQ;AAChC,KAAI,CAAC,iBAAiB,QAAQ;AAC5B,SAAO,KAAK,4BAA4B;AACxC,SAAO,EAAE,MAAM,EAAE,QAAQ,EAAE;;AAI7B,MAAK,MAAM,KAAK,QAAQ,mBAAmB,EAAE,CAC3C,KAAI,CAAC,MAAM,YAAY,MAAK,MAAK,EAAE,QAAQ,EAAE,EAAE;AAC7C,SAAO,KAAK,uBAAuB,EAAE,kBAAkB;AACvD,SAAO,EAAE,MAAM,EAAE,QAAQ,EAAE;;AAM/B,KADiB,KAAK,QAAQ,MAAM,YAAY,KAAI,MAAK,EAAE,UAAU,CAAC,CAAC,GACxD,GAAG;AAChB,SAAO,KAAK,qDAAqD;AACjE,SAAO,EAAE,MAAM,EAAE,QAAQ,EAAE;;CAE7B,MAAM,WAAW,MAAM,YAAY,GAAG;CAMtC,MAAM,UAAa,IAAI,OAAwB;CAC/C,MAAM,6BAAa,IAAI,KAAa;CACpC,MAAM,2BAAa,IAAI,KAAa;AACpC,OAAM,4BAA4B,SAAQ,MAAK;EAG7C,MAAM,cAAc,gBAAgB,KAAI,MAAK,EAAE,OAAO,QAAQ,EAAE;AAChE,MAAI,IAAI,YAAY,IAAI,EAAG;EAE3B,MAAM,cAAc,EAAE,QAAQ,eAAe;EAC7C,MAAM,UAAc,EAAE;EACtB,MAAM,SAAc,EAAE,UAAU,MAAM,IAAI,CAAC,KAAI,MAAK,EAAE,MAAM,CAAC;EAC7D,MAAMC,aAAc,EAAE,SAAU,MAAM,IAAI,CAAC,KAAI,MAAK,EAAE,MAAM,CAAC;EAG7D,MAAM,aAAqB,KAAK,QAAQ,YAAY,CAAC,IAAI,IAAI,YAAY,KAAK;EAC9E,MAAM,iBAAqB,YAAY,kBAA0B,aAAiB;EAClF,MAAM,qBAAqB,YAAY,kBAA0B,aAAiB;AAGlF,aAAS,SAAQ,MAAK,WAAW,IAAI,EAAE,CAAC;AACxC,SAAO,SAAQ,MAAO,SAAS,IAAI,EAAE,CAAC;AAGtC,UAAQ,KAAK;GACX;GACA;GACA,UAAUA,WAAS,KAAI,QAAO,EAAE,IAAI,EAAE;GACtC,QAAU,OAAS,KAAI,QAAO,EAAE,IAAI,EAAE;GAEtC,GAAI,kBAAsB,UAAa,EAAE,gBAAoB;GAC7D,GAAI,sBAAsB,UAAa,EAAE,oBAAoB;GAC9D,CAAC;GAEF;CAGF,MAAM,WAAW,CAAC,GAAG,WAAW,CAAC,KAAI,SAAQ;EAAE;EAAK,aAAa;EAAK,EAAE;AAExE,QAAO;EAAE,QADQ,CAAC,GAAG,SAAW,CAAC,KAAI,SAAQ;GAAE;GAAK,aAAa;GAAK,SAAS;GAAkB,EAAE;EAClF;EAAU;EACzB,MAAM;GACJ,GAAK,OAAO,UAAY,EAAY,QAAU;GAC9C,GAAK,SAAS,UAAU,EAAY,UAAU;GAC/C;EACF"}

package/dist/PlanDigital/index.d.ts

@@ -1,106 +1,121 @@
-import { DateType } from "../common/types.js";
-import { AvailableLocation, GroupReference, ID, PersonReference } from "../core/types/common/index.js";
-import { BreakLength } from "../core/types/common/break-lengths.js";
-import { AllowedInterval } from "../core/types/common/intervals.js";
-import { Day } from "../core/types/common/days.js";
-import { MaximumScheduleSpan } from "../core/types/common/maximum-schedule-span.js";
-import { Tag } from "../core/types/common/tag.js";
-import { PlannedScheduledDuration } from "../core/types/common/planned-schedule-duration.js";
+import { Day } from "../core/interfaces/vertices/properties/days.js";
+import { Interval } from "../core/interfaces/vertices/properties/intervals.js";
+import { Tag } from "../core/interfaces/vertices/properties/tags.js";
+import { MaximumScheduleSpan } from "../core/interfaces/vertices/properties/maximum-schedule-span.js";
+import { PlannedScheduledDuration } from "../core/interfaces/vertices/properties/planned-scheduled-duration.js";
+import { MinBreakLength } from "../core/interfaces/vertices/properties/min-break-length.js";
 import { Types } from "./types/index.js";
+import "../index.js";
 
 //#region src/PlanDigital/index.d.ts
 declare class PlanDigitalMap {
   static from: {
     schedules: (input: Types.schedule, options: Types.options) => {
       groups?: {
+        ids?: string | undefined;
         exceptions?: string[] | undefined;
         lockedTimes?: string[] | undefined;
-        createdAt?: DateType | undefined;
-        updatedAt?: DateType | undefined;
-        lastModifiedBy?: unknown;
-        ids?: ID | undefined;
-        belongsTo?: string | undefined;
-        rank?: number | undefined;
-        days?: Day[] | undefined;
+        is?: "group" | undefined;
         displayName?: string | undefined;
-        intervals?: AllowedInterval[] | undefined;
-        minBreakLength?: BreakLength | undefined;
+        createdAt?: string | undefined;
+        updatedAt?: string | undefined;
+        lastModifiedBy?: string | undefined;
+        rootInterval?: string | undefined;
+        belongsTo?: string | undefined;
+        tags?: Tag[] | undefined;
+        minBreakLength?: number | undefined;
+        maxNumWorkingHours?: number | false | undefined;
+        maxNumDailyWorkingHours?: number | number[] | false | undefined;
         maximumScheduleSpan?: MaximumScheduleSpan | undefined;
         forbidOverlappingEvents?: boolean | undefined;
         disableDayLengthPunishment?: boolean | undefined;
         weight?: number | undefined;
         species?: "class" | undefined;
+        intervals?: Interval[] | undefined;
+        days?: Day[] | undefined;
         parentGroups?: string[] | undefined;
         subGroups?: string[] | undefined;
         lunch?: string[] | undefined;
         members?: string[] | undefined;
-        rootInterval?: string | undefined;
-        tags?: Tag[] | undefined;
-        maxNumWorkingHours?: number | boolean | undefined;
-        maxNumDailyWorkingHours?: number | number[] | boolean | undefined;
+        derivedParentGroups?: {
+          implicit?: boolean | undefined;
+          explicit?: boolean | undefined;
+          group: string;
+        }[] | undefined;
       }[];
       teachers?: {
+        ids?: string | undefined;
         exceptions?: string[] | undefined;
         lockedTimes?: string[] | undefined;
-        createdAt?: DateType | undefined;
-        updatedAt?: DateType | undefined;
-        lastModifiedBy?: unknown;
-        ids?: ID | undefined;
-        belongsTo?: string | undefined;
-        rank?: number | undefined;
-        days?: Day[] | undefined;
+        is?: "teacher" | undefined;
         displayName?: string | undefined;
-        intervals?: AllowedInterval[] | undefined;
-        minBreakLength?: BreakLength | undefined;
+        createdAt?: string | undefined;
+        updatedAt?: string | undefined;
+        lastModifiedBy?: string | undefined;
+        rootInterval?: string | undefined;
+        person?: string | undefined;
+        belongsTo?: string | undefined;
+        tags?: Tag[] | undefined;
+        minBreakLength?: number | undefined;
+        maxNumWorkingHours?: number | false | undefined;
+        maxNumDailyWorkingHours?: number | number[] | false | undefined;
         maximumScheduleSpan?: MaximumScheduleSpan | undefined;
         forbidOverlappingEvents?: boolean | undefined;
         disableDayLengthPunishment?: boolean | undefined;
         weight?: number | undefined;
+        intervals?: Interval[] | undefined;
+        days?: Day[] | undefined;
         lunch?: string[] | undefined;
-        rootInterval?: string | undefined;
-        tags?: Tag[] | undefined;
-        maxNumWorkingHours?: number | boolean | undefined;
-        maxNumDailyWorkingHours?: number | number[] | boolean | undefined;
-        plannedScheduledDuration?: PlannedScheduledDuration | undefined;
-        person?: string | undefined;
         signature?: string | undefined;
+        plannedScheduledDuration?: PlannedScheduledDuration | undefined;
+        complementaryTimes?: string[] | undefined;
       }[];
       courses?: {
+        ids?: string | undefined;
         exceptions?: string[] | undefined;
-        groups?: GroupReference<string, string>[] | undefined;
-        teachers?: PersonReference<string>[] | undefined;
-        locations?: AvailableLocation<string>[] | undefined;
+        groups?: {
+          groupIndex?: number | undefined;
+          to: string;
+          exclude?: string[] | undefined;
+        }[] | undefined;
+        teachers?: {
+          groupIndex?: number | undefined;
+          to: string;
+        }[] | undefined;
+        locations?: {
+          groupIndex?: number | undefined;
+          rank?: number | undefined;
+          locations: [string];
+        }[] | undefined;
         events?: string[] | undefined;
         lockedTimes?: string[] | undefined;
-        createdAt?: DateType | undefined;
-        updatedAt?: DateType | undefined;
-        lastModifiedBy?: unknown;
-        ids?: ID | undefined;
-        belongsTo?: string | undefined;
-        type?: string | undefined;
-        days?: Day[] | undefined;
-        weeks?: number[] | undefined;
+        is?: "course" | undefined;
         displayName?: string | undefined;
+        createdAt?: string | undefined;
+        updatedAt?: string | undefined;
+        lastModifiedBy?: string | undefined;
+        overlapGroup?: string | undefined;
         period?: string | undefined;
-        intervals?: AllowedInterval[] | undefined;
-        minBreakLength?: BreakLength | undefined;
-        weight?: number | undefined;
+        syllabus?: string | undefined;
+        belongsTo?: string | undefined;
+        type?: string | undefined;
         tags?: Tag[] | undefined;
-        color?: string | undefined;
-        participants?: PersonReference<string>[] | undefined;
-        density?: number | undefined;
+        minBreakLength?: MinBreakLength | undefined;
+        weight?: number | undefined;
+        intervals?: Interval[] | undefined;
+        days?: Day[] | undefined;
         subject?: string | undefined;
+        color?: string | undefined;
         eventDurationVariance?: number | undefined;
-        totalTime?: string | undefined;
-        comment?: string | undefined;
-        startDate?: DateType | undefined;
-        endDate?: DateType | undefined;
         centerOfAttraction?: string | null | undefined;
-        syllabus?: string | undefined;
-        overlapGroup?: string | null | undefined;
+        density?: number | undefined;
         plannedDuration?: string | undefined;
         minutesPerWeek?: number | undefined;
         expectedTotalHours?: number | undefined;
+        participants?: {
+          groupIndex?: number | undefined;
+          to: string;
+        }[] | undefined;
       }[];
       meta?: {
         errors?: string[];

package/dist/Quiculum/file/to/index.d.ts

@@ -1,18 +1,19 @@
 import { Types } from "../../../core/types/index.js";
+import "../../../index.js";
 import * as xlsx0 from "xlsx";
 
 //#region src/Quiculum/file/to/index.d.ts
 declare class export_default {
   static schedules: (schedule: {
-    division: Types.division;
-    settings: Types.divisionSettings;
-    groups: Types.group[];
-    teachers: Types.teacher[];
-    locations: Types.location[];
-    courses: Types.course[];
-    events: Types.event[];
-    periods: Types.period[];
-    persons: Types.person[];
+    division: Types.Deep.Division;
+    settings: Types.Deep.Settings;
+    groups: Types.Deep.Group[];
+    teachers: Types.Deep.Teacher[];
+    locations: Types.Deep.Location[];
+    courses: Types.Deep.Course[];
+    events: Types.Deep.Event[];
+    periods: Types.Deep.Period[];
+    persons: Types.Deep.Person[];
   }) => xlsx0.WorkBook;
 }
 //#endregion

package/dist/Quiculum/file/to/schedules.js

@@ -5,8 +5,7 @@ import XLSX from "xlsx";
 //#region src/Quiculum/file/to/schedules.ts
 var schedules_default = (schedule) => {
 	const options = { idKey: "id" };
-	const did = getVertexId(schedule.division, options);
-	if (!did) throw new Error("division id is undefined");
+	if (!getVertexId(schedule.division, options)) throw new Error("division id is undefined");
 	const periodsMap = new Map(schedule.periods?.map((p) => [getVertexId(p, options), p]));
 	const defaultPeriod = { ranges: [{
 		start: schedule.division.start,
@@ -36,11 +35,9 @@ var schedules_default = (schedule) => {
 		if (!course) return null;
 		const courseName = course.displayName ?? "";
 		const inLocation = e.inLocations?.at(0);
-		const location = inLocation ? locationsMap.get(getVertexId(inLocation, options)) : void 0;
-		const locationName = location?.displayName;
+		const locationName = (inLocation ? locationsMap.get(getVertexId(inLocation, options)) : void 0)?.displayName;
 		const _period = e.period ?? course.period ?? schedule.settings.period;
-		const period = periodsMap.get(_period ? getVertexId(_period, options) : void 0);
-		const weeksInPeriod = period?.ranges.map((x) => {
+		const weeksInPeriod = periodsMap.get(_period ? getVertexId(_period, options) : void 0)?.ranges.map((x) => {
 			const start$1 = moment.utc(x.start);
 			const end$1 = moment.utc(x.end);
 			const weeks = new Array();
@@ -50,7 +47,7 @@ var schedules_default = (schedule) => {
 			}
 			return weeks;
 		}).flat();
-		const allWeeks = defaultPeriod?.ranges.map((x) => {
+		const excludedWeeks = (defaultPeriod?.ranges.map((x) => {
 			const start$1 = moment.utc(x.start);
 			const end$1 = moment.utc(x.end);
 			const weeks = new Array();
@@ -59,8 +56,7 @@ var schedules_default = (schedule) => {
 				start$1.add(1, "week");
 			}
 			return weeks;
-		}).flat();
-		const excludedWeeks = allWeeks.filter((x) => !weeksInPeriod?.includes(x)).join(", ");
+		}).flat()).filter((x) => !weeksInPeriod?.includes(x)).join(", ");
 		const holidaysInPeriod = holidaysInDays.filter((x) => {
 			return weeksInPeriod?.includes(x.week());
 		}).map((x) => x.format("YYYY-MM-DD")).join(", ");

package/dist/Quiculum/file/to/schedules.js.map

@@ -1 +1 @@
-{"version":3,"file":"schedules.js","names":["options: BaseOptions","defaultPeriod: Pick<CoreTypes.period, 'ranges'>","holidaysInDays: moment.Moment[]","start","end"],"sources":["../../../../src/Quiculum/file/to/schedules.ts"],"sourcesContent":["import moment from 'moment';\nimport XLSX from 'xlsx';\nimport type { Types as CoreTypes } from '../../../core/types';\nimport type { BaseOptions } from '../../../common/types';\nimport { getVertexId } from '../../../core/util';\n\ntype Schedule = {\n  division:  CoreTypes.division;\n  settings:  CoreTypes.divisionSettings;\n  groups:    CoreTypes.group[];\n  teachers:  CoreTypes.teacher[];\n  locations: CoreTypes.location[];\n  courses:   CoreTypes.course[];\n  events:    CoreTypes.event[];\n  periods:   CoreTypes.period[];\n  persons:   CoreTypes.person[];\n};\n\n\n\nexport default (\n  schedule: Schedule,\n): XLSX.WorkBook => {\n  const options: BaseOptions = { idKey: 'id' };\n  // must have a division id\n  const did = getVertexId(schedule.division, options);\n  if (!did) throw new Error('division id is undefined');\n\n  // a map of period id -> period\n  const periodsMap = new Map(schedule.periods?.map((p) => [getVertexId(p, options) as string | undefined, p as Pick<CoreTypes.period, 'ranges'>]));\n  const defaultPeriod: Pick<CoreTypes.period, 'ranges'> = {\n    ranges: [{ start: schedule.division.start, end: schedule.division.end }]\n  };\n  periodsMap.set(undefined, defaultPeriod);\n\n  // a map of course id -> course\n  const coursesMap = new Map(schedule.courses?.map((c) => [getVertexId(c, options), c]));\n\n  // a map of location id -> location\n  const locationsMap = new Map(schedule.locations?.map((l) => [getVertexId(l, options), l]));\n\n  // get start and end dates from division in YYYY-MM-DD format\n  const startDate = moment.utc(schedule.division.start).format('YYYY-MM-DD');\n  const endDate = moment.utc(schedule.division.end).format('YYYY-MM-DD');\n  // get schoolyear from division start date in format YY/YY (only considers the start year, for example 2023-01-01 becomes 23/24)\n  const schoolYear = moment.utc(schedule.division.start).format('YY') + '/' +\n    moment.utc(schedule.division.start).add(1, 'year').format('YY');\n\n  const holidays = schedule.settings?.calendarExceptions\n    ?.filter((x) => x.start && x.end);\n\n\n  const holidaysInDays: moment.Moment[] = [];\n\n  if (holidays) {\n    for (const holiday of holidays) {\n      const start = moment.utc(holiday.start);\n      const end = moment.utc(holiday.end);\n      while (start.isBefore(end)) {\n        // Only push weekdays (Monday to Friday)\n        if (start.isoWeekday() < 6) {\n          holidaysInDays.push(start.clone());\n        }\n        start.add(1, 'day');\n      }\n    }\n  }\n\n  ////\n  //// Activities (events)\n  ////\n  const activities = schedule.events\n    ?.map((e) => {\n      // must have start and end\n      if (!e.start || !e.end) return null;\n      const start = moment.utc(e.start);\n      const end = moment.utc(e.end);\n\n      // must have course\n      const course = e.course ? coursesMap.get(getVertexId(e.course, options)) : undefined;\n      if (!course) return null;\n      const courseName = course.displayName ?? '';\n\n      // Location\n      const inLocation = e.inLocations?.at(0);\n      const location = inLocation ? locationsMap.get(getVertexId(inLocation, options)) : undefined;\n      const locationName = location?.displayName;\n\n      const _period = e.period ?? course.period ?? schedule.settings.period;\n      const period = periodsMap.get(_period ? getVertexId(_period, options) : undefined);\n\n      const weeksInPeriod = period?.ranges\n        .map((x) => {\n          // fetch all weeks between start and end\n          const start = moment.utc(x.start);\n          const end = moment.utc(x.end);\n          const weeks = new Array<number>();\n          while (start.isBefore(end)) {\n            weeks.push(start.week());\n            start.add(1, 'week');\n          }\n          return weeks;\n        })\n        .flat();\n\n      const allWeeks = defaultPeriod?.ranges\n        .map((x) => {\n          // fetch all weeks between start and end\n          const start = moment.utc(x.start);\n          const end = moment.utc(x.end);\n          const weeks = new Array<number>();\n          while (start.isBefore(end)) {\n            weeks.push(start.week());\n            start.add(1, 'week');\n          }\n          return weeks;\n        })\n        .flat();\n\n      const excludedWeeks = allWeeks\n        .filter((x) => !weeksInPeriod?.includes(x))\n        .join(', ');\n\n      // Get the holidays in the period (don't include holidays that are not in the period)\n      const holidaysInPeriod = holidaysInDays\n        .filter((x) => {\n          return weeksInPeriod?.includes(x.week());\n        })\n        .map((x) => x.format('YYYY-MM-DD'))\n        .join(', ');\n\n      return {\n        DayOfWeek:               (start.day() + 6) % 7,\n        Duration:                end.diff(start, 'minutes'),\n        EndDate:                 endDate,\n        Name:                    courseName,\n        StartDate:               startDate,\n        StartTime:               start.format('HH:mm'),\n        ExcludeDates:            holidaysInPeriod,\n        ExcludeWeeks:            excludedWeeks,\n        ExternalActivityID:      e.ids,\n        ExternalLocationID:      '',\n        ExternalTeachingGroupID: '',\n        Location:                locationName,\n        SchoolYear:              schoolYear,\n        Teachers:                ''\n      };\n    })\n    .filter((x): x is NonNullable<typeof x> => !!x);\n\n  ////\n  //// store in workbook\n  ////\n  const wb = XLSX.utils.book_new();\n  XLSX.utils.book_append_sheet(wb, XLSX.utils.json_to_sheet(activities), 'Activities');\n\n  return wb;\n};\n"],"mappings":"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"}
+{"version":3,"file":"schedules.js","names":["options: BaseOptions","defaultPeriod: Pick<CoreTypes.Deep.Period, 'ranges'>","holidaysInDays: moment.Moment[]","start","end"],"sources":["../../../../src/Quiculum/file/to/schedules.ts"],"sourcesContent":["import moment from 'moment';\nimport XLSX from 'xlsx';\nimport type { Types as CoreTypes } from '../../../core/types';\nimport type { BaseOptions } from '../../../common/types';\nimport { getVertexId } from '../../../core/util';\n\ntype Schedule = {\n  division:  CoreTypes.Deep.Division;\n  settings:  CoreTypes.Deep.Settings;\n  groups:    CoreTypes.Deep.Group[];\n  teachers:  CoreTypes.Deep.Teacher[];\n  locations: CoreTypes.Deep.Location[];\n  courses:   CoreTypes.Deep.Course[];\n  events:    CoreTypes.Deep.Event[];\n  periods:   CoreTypes.Deep.Period[];\n  persons:   CoreTypes.Deep.Person[];\n};\n\n\n\nexport default (\n  schedule: Schedule,\n): XLSX.WorkBook => {\n  const options: BaseOptions = { idKey: 'id' };\n  // must have a division id\n  const did = getVertexId(schedule.division, options);\n  if (!did) throw new Error('division id is undefined');\n\n  // a map of period id -> period\n  const periodsMap = new Map(schedule.periods?.map((p) => [getVertexId(p, options) as string | undefined, p as Pick<CoreTypes.Deep.Period, 'ranges'>]));\n  const defaultPeriod: Pick<CoreTypes.Deep.Period, 'ranges'> = {\n    ranges: [{ start: schedule.division.start, end: schedule.division.end }]\n  };\n  periodsMap.set(undefined, defaultPeriod);\n\n  // a map of course id -> course\n  const coursesMap = new Map(schedule.courses?.map((c) => [getVertexId(c, options), c]));\n\n  // a map of location id -> location\n  const locationsMap = new Map(schedule.locations?.map((l) => [getVertexId(l, options), l]));\n\n  // get start and end dates from division in YYYY-MM-DD format\n  const startDate = moment.utc(schedule.division.start).format('YYYY-MM-DD');\n  const endDate = moment.utc(schedule.division.end).format('YYYY-MM-DD');\n  // get schoolyear from division start date in format YY/YY (only considers the start year, for example 2023-01-01 becomes 23/24)\n  const schoolYear = moment.utc(schedule.division.start).format('YY') + '/' +\n    moment.utc(schedule.division.start).add(1, 'year').format('YY');\n\n  const holidays = schedule.settings?.calendarExceptions\n    ?.filter((x) => x.start && x.end);\n\n\n  const holidaysInDays: moment.Moment[] = [];\n\n  if (holidays) {\n    for (const holiday of holidays) {\n      const start = moment.utc(holiday.start);\n      const end = moment.utc(holiday.end);\n      while (start.isBefore(end)) {\n        // Only push weekdays (Monday to Friday)\n        if (start.isoWeekday() < 6) {\n          holidaysInDays.push(start.clone());\n        }\n        start.add(1, 'day');\n      }\n    }\n  }\n\n  ////\n  //// Activities (events)\n  ////\n  const activities = schedule.events\n    ?.map((e) => {\n      // must have start and end\n      if (!e.start || !e.end) return null;\n      const start = moment.utc(e.start);\n      const end = moment.utc(e.end);\n\n      // must have course\n      const course = e.course ? coursesMap.get(getVertexId(e.course, options)) : undefined;\n      if (!course) return null;\n      const courseName = course.displayName ?? '';\n\n      // Location\n      const inLocation = e.inLocations?.at(0);\n      const location = inLocation ? locationsMap.get(getVertexId(inLocation, options)) : undefined;\n      const locationName = location?.displayName;\n\n      const _period = e.period ?? course.period ?? schedule.settings.period;\n      const period = periodsMap.get(_period ? getVertexId(_period, options) : undefined);\n\n      const weeksInPeriod = period?.ranges\n        .map((x) => {\n          // fetch all weeks between start and end\n          const start = moment.utc(x.start);\n          const end = moment.utc(x.end);\n          const weeks = new Array<number>();\n          while (start.isBefore(end)) {\n            weeks.push(start.week());\n            start.add(1, 'week');\n          }\n          return weeks;\n        })\n        .flat();\n\n      const allWeeks = defaultPeriod?.ranges\n        .map((x) => {\n          // fetch all weeks between start and end\n          const start = moment.utc(x.start);\n          const end = moment.utc(x.end);\n          const weeks = new Array<number>();\n          while (start.isBefore(end)) {\n            weeks.push(start.week());\n            start.add(1, 'week');\n          }\n          return weeks;\n        })\n        .flat();\n\n      const excludedWeeks = allWeeks\n        .filter((x) => !weeksInPeriod?.includes(x))\n        .join(', ');\n\n      // Get the holidays in the period (don't include holidays that are not in the period)\n      const holidaysInPeriod = holidaysInDays\n        .filter((x) => {\n          return weeksInPeriod?.includes(x.week());\n        })\n        .map((x) => x.format('YYYY-MM-DD'))\n        .join(', ');\n\n      return {\n        DayOfWeek:               (start.day() + 6) % 7,\n        Duration:                end.diff(start, 'minutes'),\n        EndDate:                 endDate,\n        Name:                    courseName,\n        StartDate:               startDate,\n        StartTime:               start.format('HH:mm'),\n        ExcludeDates:            holidaysInPeriod,\n        ExcludeWeeks:            excludedWeeks,\n        ExternalActivityID:      e.ids,\n        ExternalLocationID:      '',\n        ExternalTeachingGroupID: '',\n        Location:                locationName,\n        SchoolYear:              schoolYear,\n        Teachers:                ''\n      };\n    })\n    .filter((x): x is NonNullable<typeof x> => !!x);\n\n  ////\n  //// store in workbook\n  ////\n  const wb = XLSX.utils.book_new();\n  XLSX.utils.book_append_sheet(wb, XLSX.utils.json_to_sheet(activities), 'Activities');\n\n  return wb;\n};\n"],"mappings":"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"}

package/dist/RS/from/division.d.ts

@@ -1,7 +1,8 @@
 import { Types } from "../../core/types/index.js";
+import "../../core/index.js";
 
 //#region src/RS/from/division.d.ts
-declare function division(input: unknown): Pick<Types.division, 'displayName' | 'start' | 'end'>;
+declare function division(input: unknown): undefined | Pick<Types.Deep.Division, 'displayName' | 'start' | 'end'>;
 //#endregion
 export { division };
 //# sourceMappingURL=division.d.ts.map

package/dist/RS/from/division.js

@@ -1,12 +1,15 @@
 //#region src/RS/from/division.ts
 function division(input) {
-	const division$1 = {};
-	if (!input || typeof input != "object" || !("meta" in input) || !input.meta || typeof input.meta != "object" || !("division" in input.meta) || !input.meta.division || typeof input.meta.division != "object") return division$1;
+	if (!input || typeof input != "object" || !("meta" in input) || !input.meta || typeof input.meta != "object" || !("division" in input.meta) || !input.meta.division || typeof input.meta.division != "object") return;
 	const d = input.meta.division;
-	if ("displayName" in d && typeof d.displayName == "string") division$1.displayName = d.displayName;
-	if ("start" in d && typeof d.start == "string") division$1.start = d.start;
-	if ("end" in d && typeof d.end == "string") division$1.end = d.end;
-	return division$1;
+	if (!("displayName" in d && typeof d.displayName == "string")) return;
+	if (!("start" in d && typeof d.start == "string")) return;
+	if (!("end" in d && typeof d.end == "string")) return;
+	return {
+		displayName: d.displayName,
+		start: d.start,
+		end: d.end
+	};
 }
 
 //#endregion

package/dist/RS/from/division.js.map

@@ -1 +1 @@
-{"version":3,"file":"division.js","names":["division: Pick<CoreTypes.division, 'displayName' | 'start' | 'end'>","division"],"sources":["../../../src/RS/from/division.ts"],"sourcesContent":["import type { CoreTypes } from '../../core';\n\nexport function division (input: unknown): Pick<CoreTypes.division, 'displayName' | 'start' | 'end'> {\n  const division: Pick<CoreTypes.division, 'displayName' | 'start' | 'end'> = {};\n\n  if (                                !input               || typeof input               != 'object'\n    || !('meta'     in input     ) || !input.meta          || typeof input.meta          != 'object'\n    || !('division' in input.meta) || !input.meta.division || typeof input.meta.division != 'object'\n  ) return division;\n\n  const d = input.meta.division;\n\n  if ('displayName' in d && typeof d.displayName == 'string') division.displayName = d.displayName;\n  if ('start'       in d && typeof d.start       == 'string') division.start       = d.start;\n  if ('end'         in d && typeof d.end         == 'string') division.end         = d.end;\n\n  return division;\n};"],"mappings":";AAEA,SAAgB,SAAU,OAA2E;CACnG,MAAMA,aAAsE;AAE5E,KAAoC,CAAC,SAAuB,OAAO,SAAuB,YACrF,EAAE,UAAc,UAAe,CAAC,MAAM,QAAiB,OAAO,MAAM,QAAiB,YACrF,EAAE,cAAc,MAAM,SAAS,CAAC,MAAM,KAAK,YAAY,OAAO,MAAM,KAAK,YAAY,SACxF,QAAOC;CAET,MAAM,IAAI,MAAM,KAAK;AAErB,KAAI,iBAAiB,KAAK,OAAO,EAAE,eAAe,SAAU,YAAS,cAAc,EAAE;AACrF,KAAI,WAAiB,KAAK,OAAO,EAAE,SAAe,SAAU,YAAS,QAAc,EAAE;AACrF,KAAI,SAAiB,KAAK,OAAO,EAAE,OAAe,SAAU,YAAS,MAAc,EAAE;AAErF,QAAOA"}
+{"version":3,"file":"division.js","names":[],"sources":["../../../src/RS/from/division.ts"],"sourcesContent":["import type { CoreTypes } from '../../core';\n\nexport function division (input: unknown): undefined | Pick<CoreTypes.Deep.Division, 'displayName' | 'start' | 'end'> {\n\n  if (                                !input               || typeof input               != 'object'\n    || !('meta'     in input     ) || !input.meta          || typeof input.meta          != 'object'\n    || !('division' in input.meta) || !input.meta.division || typeof input.meta.division != 'object'\n  ) return;\n\n  const d = input.meta.division;\n\n  if (!('displayName' in d && typeof d.displayName == 'string')) return;\n  if (!('start'       in d && typeof d.start       == 'string')) return;\n  if (!('end'         in d && typeof d.end         == 'string')) return;\n\n  const division: Pick<CoreTypes.Deep.Division, 'displayName' | 'start' | 'end'> = {\n    displayName: d.displayName,\n    start:       d.start,\n    end:         d.end,\n  };\n  return division;\n};"],"mappings":";AAEA,SAAgB,SAAU,OAA4F;AAEpH,KAAoC,CAAC,SAAuB,OAAO,SAAuB,YACrF,EAAE,UAAc,UAAe,CAAC,MAAM,QAAiB,OAAO,MAAM,QAAiB,YACrF,EAAE,cAAc,MAAM,SAAS,CAAC,MAAM,KAAK,YAAY,OAAO,MAAM,KAAK,YAAY,SACxF;CAEF,MAAM,IAAI,MAAM,KAAK;AAErB,KAAI,EAAE,iBAAiB,KAAK,OAAO,EAAE,eAAe,UAAW;AAC/D,KAAI,EAAE,WAAiB,KAAK,OAAO,EAAE,SAAe,UAAW;AAC/D,KAAI,EAAE,SAAiB,KAAK,OAAO,EAAE,OAAe,UAAW;AAO/D,QALiF;EAC/E,aAAa,EAAE;EACf,OAAa,EAAE;EACf,KAAa,EAAE;EAChB"}

package/dist/RS/from/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":[],"sources":["../../../src/RS/from/index.ts"],"sourcesContent":["import type { FromInterface } from '../../common/types';\nimport { division } from './division';\nimport { schedules } from './schedules';\n\nexport default {\n  division:  division,\n  schedules: schedules,\n} satisfies FromInterface;"],"mappings":";;;;AAIA,mBAAe;CACF;CACA"}
+{"version":3,"file":"index.js","names":[],"sources":["../../../src/RS/from/index.ts"],"sourcesContent":["import type { FromInterface } from '../../common/types';\nimport { division } from './division';\nimport { schedules } from './schedules';\n\nexport default {\n  division:  division,\n  schedules: schedules,\n} satisfies FromInterface;"],"mappings":";;;;AAIA,mBAAe;CACF;CACA;CACZ"}

package/dist/RS/from/schedules.d.ts

@@ -1,8 +1,9 @@
 import { Types as Types$1 } from "../../core/types/index.js";
+import "../../core/index.js";
 import { Types } from "../types/index.js";
 
 //#region src/RS/from/schedules.d.ts
-declare function schedules(input: Partial<Types.toOutput>, options: Pick<Types.toOptions, 'idKey'>): Partial<Types$1.serialized.schedule>;
+declare function schedules(input: Partial<Types.toOutput>, options?: Pick<Types.toOptions, 'idKey'>): Partial<Types$1.SerializedWithOptionalId.Schedule>;
 //#endregion
 export { schedules };
 //# sourceMappingURL=schedules.d.ts.map

package/dist/RS/from/schedules.js

@@ -3,7 +3,8 @@ import { COLLECTION_ID } from "../to/input/util/util.js";
 import moment from "moment";
 
 //#region src/RS/from/schedules.ts
-function schedules(input, options) {
+function schedules(input, options = {}) {
+	if (!options.idKey) options.idKey = "id";
 	const warnings = [];
 	const schedule = input.coreData;
 	const eventConfigurations = input.output?.at(0)?.events;

package/dist/RS/from/schedules.js.map

@@ -1 +1 @@
-{"version":3,"file":"schedules.js","names":["warnings: string[]"],"sources":["../../../src/RS/from/schedules.ts"],"sourcesContent":["import moment from 'moment';\nimport type { Types } from '../types';\nimport { COLLECTION_ID } from '../to/input/util/util';\nimport { getVertexId } from '../../core/util';\nimport type { CoreTypes } from '../../core';\n\nexport function schedules (\n  input:   Partial<Types.toOutput>,\n  options: Pick<Types.toOptions, 'idKey'>\n): Partial<CoreTypes.serialized.schedule> {\n  const warnings: string[] = [];\n\n  const schedule            = input.coreData;\n  const eventConfigurations = input.output?.at(0)?.events;\n\n  if (!schedule           ) throw new Error('Missing `coreData` in input.');\n  if (!eventConfigurations) throw new Error('Missing `output.events` in input.');\n\n  // check on later to ensure that all events are updated\n  const eventsToUpdate = new Set(schedule.events?.map(x => getVertexId(x, options)));\n\n  eventConfigurations.forEach(({ id: collectionAndId, ...placement }) => {\n    // locate the corresponding event/locked time\n    const collection = collectionAndId.split('.')[0] == COLLECTION_ID.events ? 'events' : 'lockedTimes';\n    const id         = collectionAndId.split('.')[1];\n    const event = schedule[collection]?.find(x => getVertexId(x, options) == id);\n\n    if (!event) {\n      warnings.push(`Could not find ${id} (${collectionAndId}) in ${collection} collection.`);\n      return;\n    }\n\n    event.parked   = false;\n    event.start    = moment.utc('1970-01-05T00:00').add(placement.day, 'days').add(placement.start, 'minutes').toISOString();\n    event.end      = moment.utc('1970-01-05T00:00').add(placement.day, 'days').add(placement.end,   'minutes').toISOString();\n    event.duration = placement.end - placement.start;\n\n    if (collection == 'events') {\n      (event as CoreTypes.serialized.event).inLocations = placement.dependencies?.filter(Boolean) ?? [];\n\n      // remove from events to be updates\n      eventsToUpdate.delete(id);\n    }\n  });\n\n  // check if there are events that were not updated\n  if (eventsToUpdate.size) {\n    warnings.push(`The following events were not updated: ${[...eventsToUpdate].join(', ')}`);\n  }\n\n\n  return Object.assign(schedule, {\n    meta: {\n      ...warnings.length && { warnings: warnings }\n    }\n  });\n};"],"mappings":";;;;;AAMA,SAAgB,UACd,OACA,SACwC;CACxC,MAAMA,WAAqB;CAE3B,MAAM,WAAsB,MAAM;CAClC,MAAM,sBAAsB,MAAM,QAAQ,GAAG,IAAI;AAEjD,KAAI,CAAC,SAAqB,OAAM,IAAI,MAAM;AAC1C,KAAI,CAAC,oBAAqB,OAAM,IAAI,MAAM;CAG1C,MAAM,iBAAiB,IAAI,IAAI,SAAS,QAAQ,KAAI,MAAK,YAAY,GAAG;AAExE,qBAAoB,SAAS,EAAE,IAAI,gBAAiB,GAAG,gBAAgB;EAErE,MAAM,aAAa,gBAAgB,MAAM,KAAK,MAAM,cAAc,SAAS,WAAW;EACtF,MAAM,KAAa,gBAAgB,MAAM,KAAK;EAC9C,MAAM,QAAQ,SAAS,aAAa,MAAK,MAAK,YAAY,GAAG,YAAY;AAEzE,MAAI,CAAC,OAAO;AACV,YAAS,KAAK,kBAAkB,GAAG,IAAI,gBAAgB,OAAO,WAAW;AACzE;;AAGF,QAAM,SAAW;AACjB,QAAM,QAAW,OAAO,IAAI,oBAAoB,IAAI,UAAU,KAAK,QAAQ,IAAI,UAAU,OAAO,WAAW;AAC3G,QAAM,MAAW,OAAO,IAAI,oBAAoB,IAAI,UAAU,KAAK,QAAQ,IAAI,UAAU,KAAO,WAAW;AAC3G,QAAM,WAAW,UAAU,MAAM,UAAU;AAE3C,MAAI,cAAc,UAAU;AAC1B,GAAC,MAAqC,cAAc,UAAU,cAAc,OAAO,YAAY;AAG/F,kBAAe,OAAO;;;AAK1B,KAAI,eAAe,KACjB,UAAS,KAAK,0CAA0C,CAAC,GAAG,gBAAgB,KAAK;AAInF,QAAO,OAAO,OAAO,UAAU,EAC7B,MAAM,EACJ,GAAG,SAAS,UAAU,EAAY"}
+{"version":3,"file":"schedules.js","names":["warnings: string[]"],"sources":["../../../src/RS/from/schedules.ts"],"sourcesContent":["import moment from 'moment';\nimport type { Types } from '../types';\nimport { COLLECTION_ID } from '../to/input/util/util';\nimport { getVertexId } from '../../core/util';\nimport type { CoreTypes } from '../../core';\n\nexport function schedules (\n  input:   Partial<Types.toOutput>,\n  options: Pick<Types.toOptions, 'idKey'> = {}\n): Partial<CoreTypes.SerializedWithOptionalId.Schedule> {\n  // set default idKey if not provided\n  if (!options.idKey) options.idKey = 'id';\n\n  const warnings: string[] = [];\n\n  const schedule            = input.coreData;\n  const eventConfigurations = input.output?.at(0)?.events;\n\n  if (!schedule           ) throw new Error('Missing `coreData` in input.');\n  if (!eventConfigurations) throw new Error('Missing `output.events` in input.');\n\n  // check on later to ensure that all events are updated\n  const eventsToUpdate = new Set(schedule.events?.map(x => getVertexId(x, options)));\n\n  eventConfigurations.forEach(({ id: collectionAndId, ...placement }) => {\n    // locate the corresponding event/locked time\n    const collection = collectionAndId.split('.')[0] == COLLECTION_ID.events ? 'events' : 'lockedTimes';\n    const id         = collectionAndId.split('.')[1];\n    const event = schedule[collection]?.find(x => getVertexId(x, options) == id);\n\n    if (!event) {\n      warnings.push(`Could not find ${id} (${collectionAndId}) in ${collection} collection.`);\n      return;\n    }\n\n    event.parked   = false;\n    event.start    = moment.utc('1970-01-05T00:00').add(placement.day, 'days').add(placement.start, 'minutes').toISOString();\n    event.end      = moment.utc('1970-01-05T00:00').add(placement.day, 'days').add(placement.end,   'minutes').toISOString();\n    event.duration = placement.end - placement.start;\n\n    if (collection == 'events') {\n      (event as CoreTypes.Serialized.Event).inLocations = placement.dependencies?.filter(Boolean) ?? [];\n\n      // remove from events to be updates\n      eventsToUpdate.delete(id);\n    }\n  });\n\n  // check if there are events that were not updated\n  if (eventsToUpdate.size) {\n    warnings.push(`The following events were not updated: ${[...eventsToUpdate].join(', ')}`);\n  }\n\n\n  return Object.assign(schedule, {\n    meta: {\n      ...warnings.length && { warnings: warnings }\n    }\n  });\n};"],"mappings":";;;;;AAMA,SAAgB,UACd,OACA,UAA0C,EAAE,EACU;AAEtD,KAAI,CAAC,QAAQ,MAAO,SAAQ,QAAQ;CAEpC,MAAMA,WAAqB,EAAE;CAE7B,MAAM,WAAsB,MAAM;CAClC,MAAM,sBAAsB,MAAM,QAAQ,GAAG,EAAE,EAAE;AAEjD,KAAI,CAAC,SAAqB,OAAM,IAAI,MAAM,+BAA+B;AACzE,KAAI,CAAC,oBAAqB,OAAM,IAAI,MAAM,oCAAoC;CAG9E,MAAM,iBAAiB,IAAI,IAAI,SAAS,QAAQ,KAAI,MAAK,YAAY,GAAG,QAAQ,CAAC,CAAC;AAElF,qBAAoB,SAAS,EAAE,IAAI,gBAAiB,GAAG,gBAAgB;EAErE,MAAM,aAAa,gBAAgB,MAAM,IAAI,CAAC,MAAM,cAAc,SAAS,WAAW;EACtF,MAAM,KAAa,gBAAgB,MAAM,IAAI,CAAC;EAC9C,MAAM,QAAQ,SAAS,aAAa,MAAK,MAAK,YAAY,GAAG,QAAQ,IAAI,GAAG;AAE5E,MAAI,CAAC,OAAO;AACV,YAAS,KAAK,kBAAkB,GAAG,IAAI,gBAAgB,OAAO,WAAW,cAAc;AACvF;;AAGF,QAAM,SAAW;AACjB,QAAM,QAAW,OAAO,IAAI,mBAAmB,CAAC,IAAI,UAAU,KAAK,OAAO,CAAC,IAAI,UAAU,OAAO,UAAU,CAAC,aAAa;AACxH,QAAM,MAAW,OAAO,IAAI,mBAAmB,CAAC,IAAI,UAAU,KAAK,OAAO,CAAC,IAAI,UAAU,KAAO,UAAU,CAAC,aAAa;AACxH,QAAM,WAAW,UAAU,MAAM,UAAU;AAE3C,MAAI,cAAc,UAAU;AAC1B,GAAC,MAAqC,cAAc,UAAU,cAAc,OAAO,QAAQ,IAAI,EAAE;AAGjG,kBAAe,OAAO,GAAG;;GAE3B;AAGF,KAAI,eAAe,KACjB,UAAS,KAAK,0CAA0C,CAAC,GAAG,eAAe,CAAC,KAAK,KAAK,GAAG;AAI3F,QAAO,OAAO,OAAO,UAAU,EAC7B,MAAM,EACJ,GAAG,SAAS,UAAU,EAAY,UAAU,EAC7C,EACF,CAAC"}

package/dist/RS/make-connected.d.ts

@@ -1,22 +1,23 @@
-import { Mixed } from "../core/vertex-mapping.js";
-import { Types } from "../core/types/index.js";
+import "../core/types/common/index.js";
+import { Mixed } from "../core/interfaces/vertices/index.js";
+import "../core/index.js";
+import "./types/index.js";
 
 //#region src/RS/make-connected.d.ts
-
 type _Schedule = {
-  division: Mixed<Types.division>;
-  divisions: Mixed<Types.division>;
-  settings: Mixed<Types.divisionSettings>;
-  groups: Mixed<Types.group>[];
-  teachers: Mixed<Types.teacher>[];
-  locations: Mixed<Types.location>[];
-  periods: Mixed<Types.period>[];
-  persons: Mixed<Types.person>[];
-  rootIntervals: Mixed<Types.rootInterval>[];
-  lockedTimes: Mixed<Types.lockedTime>[];
-  overlapGroups: Mixed<Types.overlapGroup>[];
-  courses: Mixed<Types.course>[];
-  events: Mixed<Types.event>[];
+  division: Mixed.Division;
+  divisions: Mixed.Division;
+  settings: Mixed.Settings;
+  groups: Mixed.Group[];
+  teachers: Mixed.Teacher[];
+  locations: Mixed.Location[];
+  periods: Mixed.Period[];
+  persons: Mixed.Person[];
+  rootIntervals: Mixed.RootInterval[];
+  lockedTimes: Mixed.LockedTime[];
+  overlapGroups: Mixed.OverlapGroup[];
+  courses: Mixed.Course[];
+  events: Mixed.Event[];
 };
 type MixedScheduleData = Partial<_Schedule>;
 //#endregion