@royalschedule/maps 4.0.3 → 4.0.5

package/dist/Additio/to/index.d.ts

@@ -1,6 +1,6 @@
 import { Types } from "../../core/types/index.js";
 import { Types as Types$1 } from "../types/index.js";
-import * as xlsx1 from "xlsx";
+import * as xlsx0 from "xlsx";
 
 //#region src/Additio/to/index.d.ts
 declare class export_default {
@@ -14,7 +14,7 @@ declare class export_default {
     courses: Types.mixed.course[];
     events: Types.mixed.event[];
     lockedTimes: Types.mixed.lockedTime[];
-  }, _options?: Types$1.options) => xlsx1.WorkBook;
+  }, _options?: Types$1.options) => xlsx0.WorkBook;
 }
 //#endregion
 export { export_default };

package/dist/PlanDigital/index.d.ts

@@ -13,78 +13,77 @@ declare class PlanDigitalMap {
   static from: {
     schedules: (input: Types.schedule, options: Types.options) => {
       groups?: {
+        exceptions?: string[] | undefined;
+        lockedTimes?: string[] | undefined;
         ids?: ID | undefined;
         createdAt?: DateType | undefined;
         updatedAt?: DateType | undefined;
         lastModifiedBy?: unknown;
         belongsTo?: string | undefined;
-        exceptions?: string[] | undefined;
-        lockedTimes?: string[] | undefined;
         rank?: number | undefined;
-        days?: Day[] | undefined;
         displayName?: string | undefined;
+        lunch?: string[] | undefined;
+        intervals?: AllowedInterval[] | undefined;
+        days?: Day[] | undefined;
         minBreakLength?: BreakLength | undefined;
+        tags?: Tag[] | undefined;
         maximumScheduleSpan?: MaximumScheduleSpan | undefined;
         forbidOverlappingEvents?: boolean | undefined;
         disableDayLengthPunishment?: boolean | undefined;
         weight?: number | undefined;
+        rootInterval?: string | undefined;
+        maxNumWorkingHours?: number | boolean | undefined;
+        maxNumDailyWorkingHours?: number | number[] | boolean | undefined;
         species?: "class" | undefined;
         parentGroups?: string[] | undefined;
         subGroups?: string[] | undefined;
-        lunch?: string[] | undefined;
         members?: string[] | undefined;
-        intervals?: AllowedInterval[] | undefined;
-        rootInterval?: string | undefined;
-        tags?: Tag[] | undefined;
-        maxNumWorkingHours?: number | boolean | undefined;
-        maxNumDailyWorkingHours?: number | number[] | boolean | undefined;
       }[];
       teachers?: {
+        exceptions?: string[] | undefined;
+        lockedTimes?: string[] | undefined;
         ids?: ID | undefined;
         createdAt?: DateType | undefined;
         updatedAt?: DateType | undefined;
         lastModifiedBy?: unknown;
         belongsTo?: string | undefined;
-        exceptions?: string[] | undefined;
-        lockedTimes?: string[] | undefined;
         rank?: number | undefined;
-        days?: Day[] | undefined;
         displayName?: string | undefined;
+        lunch?: string[] | undefined;
+        intervals?: AllowedInterval[] | undefined;
+        days?: Day[] | undefined;
         minBreakLength?: BreakLength | undefined;
+        tags?: Tag[] | undefined;
+        plannedScheduledDuration?: PlannedScheduledDuration | undefined;
         maximumScheduleSpan?: MaximumScheduleSpan | undefined;
         forbidOverlappingEvents?: boolean | undefined;
         disableDayLengthPunishment?: boolean | undefined;
         weight?: number | undefined;
-        lunch?: string[] | undefined;
-        intervals?: AllowedInterval[] | undefined;
+        person?: string | undefined;
         rootInterval?: string | undefined;
-        tags?: Tag[] | undefined;
+        signature?: string | undefined;
         maxNumWorkingHours?: number | boolean | undefined;
         maxNumDailyWorkingHours?: number | number[] | boolean | undefined;
-        person?: string | undefined;
-        plannedScheduledDuration?: PlannedScheduledDuration | undefined;
-        signature?: string | undefined;
       }[];
       courses?: {
-        ids?: ID | undefined;
-        createdAt?: DateType | undefined;
-        updatedAt?: DateType | undefined;
-        lastModifiedBy?: unknown;
-        belongsTo?: string | undefined;
         exceptions?: string[] | undefined;
-        type?: string | undefined;
         groups?: GroupReference<string, string>[] | undefined;
         teachers?: PersonReference<string>[] | undefined;
         locations?: AvailableLocation<string>[] | undefined;
         events?: string[] | undefined;
         lockedTimes?: string[] | undefined;
-        days?: Day[] | undefined;
-        weeks?: number[] | undefined;
+        ids?: ID | undefined;
+        createdAt?: DateType | undefined;
+        updatedAt?: DateType | undefined;
+        lastModifiedBy?: unknown;
+        belongsTo?: string | undefined;
         displayName?: string | undefined;
-        minBreakLength?: BreakLength | undefined;
-        weight?: number | undefined;
         intervals?: AllowedInterval[] | undefined;
+        days?: Day[] | undefined;
+        minBreakLength?: BreakLength | undefined;
         tags?: Tag[] | undefined;
+        weeks?: number[] | undefined;
+        weight?: number | undefined;
         period?: string | undefined;
         participants?: PersonReference<string>[] | undefined;
         density?: number | undefined;
@@ -92,6 +91,7 @@ declare class PlanDigitalMap {
         color?: string | undefined;
         eventDurationVariance?: number | undefined;
         totalTime?: string | undefined;
+        type?: string | undefined;
         comment?: string | undefined;
         startDate?: DateType | undefined;
         endDate?: DateType | undefined;

package/dist/RS/to/input/collections.js

@@ -5,6 +5,7 @@ import { attachLockedTimes } from "./util/attach-locked-times.js";
 import { parseDays } from "./util/parse-days.js";
 import { parseMinimumBreakLength } from "./util/parse-minimum-break-length.js";
 import { parseIntervals } from "./util/parse-intervals.js";
+import { getDefaultInterval } from "./intervals.js";
 import { parseGroupReferences } from "./util/parse-group-references.js";
 import { parseLocationReferences } from "./util/parse-location-references.js";
 import { parseEvents } from "./events.js";
@@ -12,8 +13,10 @@ import { groupBy, omitBy, values } from "lodash-es";
 
 //#region src/RS/to/input/collections.ts
 function fromCollections(courses, settings, options, periodsMap) {
+	const defaultInterval = getDefaultInterval(settings);
 	const collections = courses.map((course) => {
 		const id = getVertexId(course, options);
+		const intervals = course.intervals ?? defaultInterval;
 		const doc = {
 			id,
 			weight: course.weight,
@@ -27,7 +30,7 @@ function fromCollections(courses, settings, options, periodsMap) {
 				type: "course",
 				item: course
 			}, options),
-			intervals: options.oldFormat ? parseIntervals(course.intervals, void 0, settings) : idOf.intervalPairReference(course.intervals, void 0, options),
+			intervals: options.oldFormat ? parseIntervals(intervals, void 0, settings) : idOf.intervalPairReference(intervals, void 0, options),
 			days: parseDays(course.days, settings),
 			minBreakLength: parseMinimumBreakLength(course.minBreakLength),
 			lockedTimes: attachLockedTimes(course.lockedTimes, options),

package/dist/RS/to/input/collections.js.map

@@ -1 +1 @@
-{"version":3,"file":"collections.js","names":["doc: Types.collection & { overlapGroupId?: string }","x"],"sources":["../../../../src/RS/to/input/collections.ts"],"sourcesContent":["import { groupBy, omitBy, values } from 'lodash-es';\nimport { attachLockedTimes } from './util/attach-locked-times';\nimport { parseEvents } from './events';\nimport { parseMinimumBreakLength } from './util/parse-minimum-break-length';\nimport { parseGroupReferences } from './util/parse-group-references';\nimport type { ConnectedTypes } from '../../make-connected';\nimport { getVertexId } from '../../../core/util';\nimport { getPeriodIndex, idOf } from './util/util';\nimport { parseLocationReferences } from './util/parse-location-references';\nimport { parseDays } from './util/parse-days';\nimport { parseIntervals } from './util/parse-intervals';\nimport type { Types } from '../../types';\nimport { makeChainable } from '../../../common/make-chainable';\n\nexport function fromCollections (\n  courses:    ConnectedTypes.course[],\n  settings:   ConnectedTypes.divisionSettings,\n  options:    Types.parsedToOptions,\n  periodsMap: Map<string | undefined, number>,\n): (Types.collection[] | Types.collection)[] {\n  const collections = courses\n    .map(course => {\n      const id = getVertexId(course, options);\n\n      const doc: Types.collection & { overlapGroupId?: string } = {\n        id,\n\n        weight:                 course.weight,\n        density:                course.density,\n        maxEventLengthVariance: course.eventDurationVariance,\n        potentialCenter:        course.centerOfAttraction ? parseFloat(course.centerOfAttraction.replace(':', '.')) : undefined,\n        distributionKey:        id,\n\n        events:       parseEvents               (course.events, settings, options, periodsMap),\n        dependencies: parseLocationReferences   (course.locations, options),\n        groups:       parseGroupReferences      ({ type: 'course', item: course }, options),\n        intervals:    options.oldFormat\n          ? parseIntervals(course.intervals, undefined, settings)\n          : idOf.intervalPairReference(course.intervals, undefined, options),\n        days:           parseDays                 (course.days, settings),\n        minBreakLength: parseMinimumBreakLength   (course.minBreakLength),\n        lockedTimes:    attachLockedTimes         (course.lockedTimes, options),\n        period:         getPeriodIndex            (course.period, periodsMap, options),\n      };\n\n      if (options.meta) {\n        doc.meta = omitBy({\n          color: course.color,\n          ids:   course.ids,\n          name:  course.displayName,\n        }, x => x == null);\n      }\n\n      // temporarily attach overlap group\n      doc.overlapGroupId = course.overlapGroup\n        ? getVertexId(course.overlapGroup, options)\n        : undefined;\n\n      return omitBy(doc, x => x == null) as Types.collection & { overlapGroupId?: string };\n    });\n\n  const overlapping = makeChainable(collections)\n    .chain(\n      x => x.filter(x => x.overlapGroupId != null),\n      x => groupBy(x, x => x.overlapGroupId),\n      x => values(x)\n        .map(xs => xs.map(x => {\n          delete x.overlapGroupId; // remove overlapGroupId from individual collections\n          return x as Types.collection;\n        }))\n    )\n    .value;\n\n  const plain = collections\n    .filter(x => x.overlapGroupId == null)\n    .map(x => {\n      delete x.overlapGroupId; // remove overlapGroupId from individual collections\n      return x as Types.collection;\n    });\n\n  return overlapping.concat(plain);\n};"],"mappings":";;;;;;;;;;;;;AAcA,SAAgB,gBACd,SACA,UACA,SACA,YAC2C;CAC3C,MAAM,cAAc,QACjB,KAAI,WAAU;EACb,MAAM,KAAK,YAAY,QAAQ;EAE/B,MAAMA,MAAsD;GAC1D;GAEA,QAAwB,OAAO;GAC/B,SAAwB,OAAO;GAC/B,wBAAwB,OAAO;GAC/B,iBAAwB,OAAO,qBAAqB,WAAW,OAAO,mBAAmB,QAAQ,KAAK,QAAQ;GAC9G,iBAAwB;GAExB,QAAc,YAA2B,OAAO,QAAQ,UAAU,SAAS;GAC3E,cAAc,wBAA2B,OAAO,WAAW;GAC3D,QAAc,qBAA2B;IAAE,MAAM;IAAU,MAAM;MAAU;GAC3E,WAAc,QAAQ,YAClB,eAAe,OAAO,WAAW,QAAW,YAC5C,KAAK,sBAAsB,OAAO,WAAW,QAAW;GAC5D,MAAgB,UAA2B,OAAO,MAAM;GACxD,gBAAgB,wBAA2B,OAAO;GAClD,aAAgB,kBAA2B,OAAO,aAAa;GAC/D,QAAgB,eAA2B,OAAO,QAAQ,YAAY;;AAGxE,MAAI,QAAQ,KACV,KAAI,OAAO,OAAO;GAChB,OAAO,OAAO;GACd,KAAO,OAAO;GACd,MAAO,OAAO;MACb,MAAK,KAAK;AAIf,MAAI,iBAAiB,OAAO,eACxB,YAAY,OAAO,cAAc,WACjC;AAEJ,SAAO,OAAO,MAAK,MAAK,KAAK;;CAGjC,MAAM,cAAc,cAAc,aAC/B,OACC,MAAK,EAAE,QAAO,QAAKC,IAAE,kBAAkB,QACvC,MAAK,QAAQ,IAAG,QAAKA,IAAE,kBACvB,MAAK,OAAO,GACT,KAAI,OAAM,GAAG,KAAI,QAAK;AACrB,SAAOA,IAAE;AACT,SAAOA;MAGZ;CAEH,MAAM,QAAQ,YACX,QAAO,MAAK,EAAE,kBAAkB,MAChC,KAAI,MAAK;AACR,SAAO,EAAE;AACT,SAAO;;AAGX,QAAO,YAAY,OAAO"}
+{"version":3,"file":"collections.js","names":["doc: Types.collection & { overlapGroupId?: string }","x"],"sources":["../../../../src/RS/to/input/collections.ts"],"sourcesContent":["import { groupBy, omitBy, values } from 'lodash-es';\nimport { attachLockedTimes } from './util/attach-locked-times';\nimport { parseEvents } from './events';\nimport { parseMinimumBreakLength } from './util/parse-minimum-break-length';\nimport { parseGroupReferences } from './util/parse-group-references';\nimport type { ConnectedTypes } from '../../make-connected';\nimport { getVertexId } from '../../../core/util';\nimport { getPeriodIndex, idOf } from './util/util';\nimport { parseLocationReferences } from './util/parse-location-references';\nimport { parseDays } from './util/parse-days';\nimport { parseIntervals } from './util/parse-intervals';\nimport type { Types } from '../../types';\nimport { makeChainable } from '../../../common/make-chainable';\nimport { getDefaultInterval } from './intervals';\n\nexport function fromCollections (\n  courses:    ConnectedTypes.course[],\n  settings:   ConnectedTypes.divisionSettings,\n  options:    Types.parsedToOptions,\n  periodsMap: Map<string | undefined, number>,\n): (Types.collection[] | Types.collection)[] {\n  const defaultInterval = getDefaultInterval(settings);\n\n  const collections = courses\n    .map(course => {\n      const id        = getVertexId(course, options);\n      const intervals = course.intervals ?? defaultInterval;\n\n      const doc: Types.collection & { overlapGroupId?: string } = {\n        id,\n\n        weight:                 course.weight,\n        density:                course.density,\n        maxEventLengthVariance: course.eventDurationVariance,\n        potentialCenter:        course.centerOfAttraction ? parseFloat(course.centerOfAttraction.replace(':', '.')) : undefined,\n        distributionKey:        id,\n\n        events:       parseEvents               (course.events, settings, options, periodsMap),\n        dependencies: parseLocationReferences   (course.locations, options),\n        groups:       parseGroupReferences      ({ type: 'course', item: course }, options),\n        intervals:    options.oldFormat\n          ? parseIntervals(intervals, undefined, settings)\n          : idOf.intervalPairReference(intervals, undefined, options),\n        days:           parseDays                 (course.days, settings),\n        minBreakLength: parseMinimumBreakLength   (course.minBreakLength),\n        lockedTimes:    attachLockedTimes         (course.lockedTimes, options),\n        period:         getPeriodIndex            (course.period, periodsMap, options),\n      };\n\n      if (options.meta) {\n        doc.meta = omitBy({\n          color: course.color,\n          ids:   course.ids,\n          name:  course.displayName,\n        }, x => x == null);\n      }\n\n      // temporarily attach overlap group\n      doc.overlapGroupId = course.overlapGroup\n        ? getVertexId(course.overlapGroup, options)\n        : undefined;\n\n      return omitBy(doc, x => x == null) as Types.collection & { overlapGroupId?: string };\n    });\n\n  const overlapping = makeChainable(collections)\n    .chain(\n      x => x.filter(x => x.overlapGroupId != null),\n      x => groupBy(x, x => x.overlapGroupId),\n      x => values(x)\n        .map(xs => xs.map(x => {\n          delete x.overlapGroupId; // remove overlapGroupId from individual collections\n          return x as Types.collection;\n        }))\n    )\n    .value;\n\n  const plain = collections\n    .filter(x => x.overlapGroupId == null)\n    .map(x => {\n      delete x.overlapGroupId; // remove overlapGroupId from individual collections\n      return x as Types.collection;\n    });\n\n  return overlapping.concat(plain);\n};"],"mappings":";;;;;;;;;;;;;;AAeA,SAAgB,gBACd,SACA,UACA,SACA,YAC2C;CAC3C,MAAM,kBAAkB,mBAAmB;CAE3C,MAAM,cAAc,QACjB,KAAI,WAAU;EACb,MAAM,KAAY,YAAY,QAAQ;EACtC,MAAM,YAAY,OAAO,aAAa;EAEtC,MAAMA,MAAsD;GAC1D;GAEA,QAAwB,OAAO;GAC/B,SAAwB,OAAO;GAC/B,wBAAwB,OAAO;GAC/B,iBAAwB,OAAO,qBAAqB,WAAW,OAAO,mBAAmB,QAAQ,KAAK,QAAQ;GAC9G,iBAAwB;GAExB,QAAc,YAA2B,OAAO,QAAQ,UAAU,SAAS;GAC3E,cAAc,wBAA2B,OAAO,WAAW;GAC3D,QAAc,qBAA2B;IAAE,MAAM;IAAU,MAAM;MAAU;GAC3E,WAAc,QAAQ,YAClB,eAAe,WAAW,QAAW,YACrC,KAAK,sBAAsB,WAAW,QAAW;GACrD,MAAgB,UAA2B,OAAO,MAAM;GACxD,gBAAgB,wBAA2B,OAAO;GAClD,aAAgB,kBAA2B,OAAO,aAAa;GAC/D,QAAgB,eAA2B,OAAO,QAAQ,YAAY;;AAGxE,MAAI,QAAQ,KACV,KAAI,OAAO,OAAO;GAChB,OAAO,OAAO;GACd,KAAO,OAAO;GACd,MAAO,OAAO;MACb,MAAK,KAAK;AAIf,MAAI,iBAAiB,OAAO,eACxB,YAAY,OAAO,cAAc,WACjC;AAEJ,SAAO,OAAO,MAAK,MAAK,KAAK;;CAGjC,MAAM,cAAc,cAAc,aAC/B,OACC,MAAK,EAAE,QAAO,QAAKC,IAAE,kBAAkB,QACvC,MAAK,QAAQ,IAAG,QAAKA,IAAE,kBACvB,MAAK,OAAO,GACT,KAAI,OAAM,GAAG,KAAI,QAAK;AACrB,SAAOA,IAAE;AACT,SAAOA;MAGZ;CAEH,MAAM,QAAQ,YACX,QAAO,MAAK,EAAE,kBAAkB,MAChC,KAAI,MAAK;AACR,SAAO,EAAE;AACT,SAAO;;AAGX,QAAO,YAAY,OAAO"}

package/dist/RS/to/input/dynamic-locked-times.js

@@ -2,14 +2,15 @@ import { getDayIndex, getVertexId } from "../../../core/util.js";
 import { makeChainable } from "../../../common/make-chainable/index.js";
 import { idOf } from "./util/util.js";
 import { parseIntervals } from "./util/parse-intervals.js";
+import { getDefaultInterval } from "./intervals.js";
 import { parseGroupReferences } from "./util/parse-group-references.js";
 import { toDayAndStart } from "./events.js";
 import { groupBy, omitBy, uniq } from "lodash-es";
 
 //#region src/RS/to/input/dynamic-locked-times.ts
-function parse(lockedTime, settings, options) {
+function parse(lockedTime, settings, options, defaultInterval) {
 	const duration = lockedTime.duration;
-	if (!duration || duration < 5) throw new Error("(RS::V3::To::DynamicLockedTimes) Length of a locked time is less than 5 min");
+	if (!duration || duration < 5) throw new Error("(RS::To::DynamicLockedTimes) Length of a locked time is less than 5 min");
 	const dependencyReferences = makeChainable(lockedTime.coalesced ?? []).chain((x) => x.filter((x$1) => x$1.toModel == "locations").map((x$1) => getVertexId(x$1.to, options)), (x) => uniq(x), (x) => x.map((x$1) => [x$1])).value;
 	const days = lockedTime.intervals ? makeChainable(lockedTime.intervals).chain((x) => x.map((x$1) => getDayIndex(x$1.start)), (x) => uniq(x)).value : void 0;
 	const day = days?.length == 1 ? days[0] : void 0;
@@ -18,6 +19,7 @@ function parse(lockedTime, settings, options) {
 		if (!allowedByEvery) return;
 	}
 	const distributionKey = lockedTime.type == "COMPLEMENTARY_TIME" ? "COMPLEMENTARY_TIME." + lockedTime.tags?.at(0)?.value : void 0;
+	const intervals = lockedTime.intervals ?? defaultInterval;
 	const doc = {
 		id: idOf.lockedTime(lockedTime, options),
 		length: duration,
@@ -28,7 +30,7 @@ function parse(lockedTime, settings, options) {
 			item: lockedTime
 		}, options),
 		dependencies: dependencyReferences,
-		intervals: options.oldFormat ? parseIntervals(lockedTime.intervals, void 0, settings) : idOf.intervalPairReference(lockedTime.intervals, void 0, options),
+		intervals: options.oldFormat ? parseIntervals(intervals, void 0, settings) : idOf.intervalPairReference(intervals, void 0, options),
 		distributionKey,
 		...days && { days },
 		...day && { day }
@@ -54,11 +56,12 @@ function parse(lockedTime, settings, options) {
 	return omitBy(doc, (x) => x == null);
 }
 function fromDynamicLockedTimes(lockedTimes, settings, options) {
-	const complementaryHours = makeChainable(lockedTimes).chain((x) => x.filter((x$1) => x$1.type == "COMPLEMENTARY_TIME").map((x$1) => parse(x$1, settings, options)).filter((x$1) => !!x$1), (x) => groupBy(x, (x$1) => [x$1.distributionKey].flat().toSorted().join("|")), (x) => Object.entries(x).map(([id, events]) => ({
+	const defaultInterval = getDefaultInterval(settings);
+	const complementaryHours = makeChainable(lockedTimes).chain((x) => x.filter((x$1) => x$1.type == "COMPLEMENTARY_TIME").map((x$1) => parse(x$1, settings, options, defaultInterval)).filter((x$1) => !!x$1), (x) => groupBy(x, (x$1) => [x$1.distributionKey].flat().toSorted().join("|")), (x) => Object.entries(x).map(([id, events]) => ({
 		id,
 		events
 	}))).value;
-	const lunches = lockedTimes.filter((x) => x.type == "LUNCH").map((lockedTime) => parse(lockedTime, settings, options)).filter((x) => !!x);
+	const lunches = lockedTimes.filter((x) => x.type == "LUNCH").map((lockedTime) => parse(lockedTime, settings, options, defaultInterval)).filter((x) => !!x);
 	return [...complementaryHours, ...lunches];
 }
 

package/dist/RS/to/input/dynamic-locked-times.js.map

@@ -1 +1 @@
-{"version":3,"file":"dynamic-locked-times.js","names":["x","doc: Types.event"],"sources":["../../../../src/RS/to/input/dynamic-locked-times.ts"],"sourcesContent":["import { groupBy, omitBy, uniq } from 'lodash-es';\nimport type { ConnectedTypes } from '../../make-connected';\nimport { getDayIndex, getVertexId } from '../../../core/util';\nimport { idOf } from './util/util';\nimport { parseGroupReferences } from './util/parse-group-references';\nimport { parseIntervals } from './util/parse-intervals';\nimport type { Types } from '../../types';\nimport { makeChainable } from '../../../common/make-chainable';\nimport { toDayAndStart } from './events';\n\nfunction parse (\n  lockedTime: ConnectedTypes.lockedTime,\n  settings:   ConnectedTypes.divisionSettings,\n  options:    Types.parsedToOptions,\n) {\n  const duration = lockedTime.duration;\n  if (!duration || duration < 5) throw new Error('(RS::V3::To::DynamicLockedTimes) Length of a locked time is less than 5 min');\n\n  const dependencyReferences = makeChainable(lockedTime.coalesced ?? [])\n    .chain(\n      x => x\n        .filter(x => x.toModel == 'locations')\n        .map(x => getVertexId(x.to, options)),\n      x => uniq(x),\n      x => x.map(x => [x])\n    )\n    .value;\n\n  const days = lockedTime.intervals\n    ? makeChainable(lockedTime.intervals)\n      .chain(\n        x => x.map(x => getDayIndex(x.start)),\n        x => uniq(x),\n      )\n      .value\n    : undefined;\n  const day = days?.length == 1 ? days[0] : undefined;\n\n  // ignore locked times that reside on days that are not part of any coalesced's days\n  if (day != null && lockedTime.coalesced) {\n    const allowedByEvery = lockedTime.coalesced.every(x => !x.to.days?.length || x.to.days.some(x => x.day == day));\n    if (!allowedByEvery) return;\n  }\n\n  // each type (tag) of complementary hours should distribute evenly\n  const distributionKey = lockedTime.type == 'COMPLEMENTARY_TIME'\n    ? 'COMPLEMENTARY_TIME.' + lockedTime.tags?.at(0)?.value\n    : undefined;\n\n  const doc: Types.event = {\n    id:                idOf.lockedTime(lockedTime, options),\n    length:            duration,\n    minBreakLength:    false,\n    maxLengthVariance: lockedTime.durationVariance,\n    groups:            parseGroupReferences({ type: 'lockedTime', item: lockedTime }, options),\n    dependencies:      dependencyReferences,\n    intervals:         options.oldFormat\n      ? parseIntervals(lockedTime.intervals, undefined, settings)\n      : idOf.intervalPairReference(lockedTime.intervals, undefined, options),\n    distributionKey,\n    ...days && { days },\n    ...day && { day },\n  };\n\n\n  ////\n  //// filter based on partialScheduleOptions\n  ////\n  if (options.partialScheduleOptions) {\n    const { includedEvents, omittedEventsHandling } = options.partialScheduleOptions;\n    if (includedEvents && !includedEvents.has(doc.id)) {\n\n      if (omittedEventsHandling == 'ignore') return;\n\n      if (omittedEventsHandling == 'freeze') {\n        // must not be parked and have a start and duration to be frozen, otherwise it's ignored\n        if (lockedTime.parked || !lockedTime.start || !lockedTime.duration) return;\n\n        // fix day, start and end\n        Object.assign(doc, toDayAndStart(lockedTime.start));\n        doc.length = lockedTime.duration;\n        doc.maxLengthVariance = 0;\n\n        // override intervals and days to not cause conflicts\n        const numDays = settings.numDays ?? 5;\n        doc.days      = Array.from({ length: numDays }, (_, i) => i);\n        doc.intervals = Array.from({ length: numDays }, () => [{ beg: 0, end: 23.55 }]);\n\n        // fix locations\n        // > locations are always fixed for locked times\n      }\n    }\n  }\n\n  return omitBy(doc, x => x == null) as Types.event;\n}\n\nexport function fromDynamicLockedTimes (\n  lockedTimes: ConnectedTypes.lockedTime[],\n  settings:    ConnectedTypes.divisionSettings,\n  options:     Types.parsedToOptions,\n): (Types.collection | Types.event)[] {\n\n  const complementaryHours = makeChainable(lockedTimes)\n    .chain(\n      x => x\n        .filter(x => x.type == 'COMPLEMENTARY_TIME')\n        .map(x => parse(x, settings, options))\n        .filter(x => !!x),\n      x => groupBy(x, x => [x.distributionKey].flat().toSorted().join('|')),\n      x => Object.entries(x)\n        .map(([id, events]) => ({ id, events }) as Types.collection),\n    )\n    .value;\n\n  const lunches = lockedTimes\n    .filter(x => x.type == 'LUNCH')\n    .map(lockedTime => parse(lockedTime, settings, options))\n    .filter(x => !!x);\n\n  return [...complementaryHours, ...lunches];\n};"],"mappings":";;;;;;;;;AAUA,SAAS,MACP,YACA,UACA,SACA;CACA,MAAM,WAAW,WAAW;AAC5B,KAAI,CAAC,YAAY,WAAW,EAAG,OAAM,IAAI,MAAM;CAE/C,MAAM,uBAAuB,cAAc,WAAW,aAAa,IAChE,OACC,MAAK,EACF,QAAO,QAAKA,IAAE,WAAW,aACzB,KAAI,QAAK,YAAYA,IAAE,IAAI,YAC9B,MAAK,KAAK,KACV,MAAK,EAAE,KAAI,QAAK,CAACA,OAElB;CAEH,MAAM,OAAO,WAAW,YACpB,cAAc,WAAW,WACxB,OACC,MAAK,EAAE,KAAI,QAAK,YAAYA,IAAE,UAC9B,MAAK,KAAK,IAEX,QACD;CACJ,MAAM,MAAM,MAAM,UAAU,IAAI,KAAK,KAAK;AAG1C,KAAI,OAAO,QAAQ,WAAW,WAAW;EACvC,MAAM,iBAAiB,WAAW,UAAU,OAAM,MAAK,CAAC,EAAE,GAAG,MAAM,UAAU,EAAE,GAAG,KAAK,MAAK,QAAKA,IAAE,OAAO;AAC1G,MAAI,CAAC,eAAgB;;CAIvB,MAAM,kBAAkB,WAAW,QAAQ,uBACvC,wBAAwB,WAAW,MAAM,GAAG,IAAI,QAChD;CAEJ,MAAMC,MAAmB;EACvB,IAAmB,KAAK,WAAW,YAAY;EAC/C,QAAmB;EACnB,gBAAmB;EACnB,mBAAmB,WAAW;EAC9B,QAAmB,qBAAqB;GAAE,MAAM;GAAc,MAAM;KAAc;EAClF,cAAmB;EACnB,WAAmB,QAAQ,YACvB,eAAe,WAAW,WAAW,QAAW,YAChD,KAAK,sBAAsB,WAAW,WAAW,QAAW;EAChE;EACA,GAAG,QAAQ,EAAE;EACb,GAAG,OAAO,EAAE;;AAOd,KAAI,QAAQ,wBAAwB;EAClC,MAAM,EAAE,gBAAgB,0BAA0B,QAAQ;AAC1D,MAAI,kBAAkB,CAAC,eAAe,IAAI,IAAI,KAAK;AAEjD,OAAI,yBAAyB,SAAU;AAEvC,OAAI,yBAAyB,UAAU;AAErC,QAAI,WAAW,UAAU,CAAC,WAAW,SAAS,CAAC,WAAW,SAAU;AAGpE,WAAO,OAAO,KAAK,cAAc,WAAW;AAC5C,QAAI,SAAS,WAAW;AACxB,QAAI,oBAAoB;IAGxB,MAAM,UAAU,SAAS,WAAW;AACpC,QAAI,OAAY,MAAM,KAAK,EAAE,QAAQ,YAAY,GAAG,MAAM;AAC1D,QAAI,YAAY,MAAM,KAAK,EAAE,QAAQ,iBAAiB,CAAC;KAAE,KAAK;KAAG,KAAK;;;;;AAQ5E,QAAO,OAAO,MAAK,MAAK,KAAK;;AAG/B,SAAgB,uBACd,aACA,UACA,SACoC;CAEpC,MAAM,qBAAqB,cAAc,aACtC,OACC,MAAK,EACF,QAAO,QAAKD,IAAE,QAAQ,sBACtB,KAAI,QAAK,MAAMA,KAAG,UAAU,UAC5B,QAAO,QAAK,CAAC,CAACA,OACjB,MAAK,QAAQ,IAAG,QAAK,CAACA,IAAE,iBAAiB,OAAO,WAAW,KAAK,QAChE,MAAK,OAAO,QAAQ,GACjB,KAAK,CAAC,IAAI,aAAa;EAAE;EAAI;MAEjC;CAEH,MAAM,UAAU,YACb,QAAO,MAAK,EAAE,QAAQ,SACtB,KAAI,eAAc,MAAM,YAAY,UAAU,UAC9C,QAAO,MAAK,CAAC,CAAC;AAEjB,QAAO,CAAC,GAAG,oBAAoB,GAAG"}
+{"version":3,"file":"dynamic-locked-times.js","names":["x","doc: Types.event"],"sources":["../../../../src/RS/to/input/dynamic-locked-times.ts"],"sourcesContent":["import { groupBy, omitBy, uniq } from 'lodash-es';\nimport type { ConnectedTypes } from '../../make-connected';\nimport { getDayIndex, getVertexId } from '../../../core/util';\nimport { idOf } from './util/util';\nimport { parseGroupReferences } from './util/parse-group-references';\nimport { parseIntervals } from './util/parse-intervals';\nimport type { Types } from '../../types';\nimport { makeChainable } from '../../../common/make-chainable';\nimport { toDayAndStart } from './events';\nimport { getDefaultInterval } from './intervals';\nimport type { AllowedInterval } from '../../../core/types/common/intervals';\n\nfunction parse (\n  lockedTime:      ConnectedTypes.lockedTime,\n  settings:        ConnectedTypes.divisionSettings,\n  options:         Types.parsedToOptions,\n  defaultInterval: AllowedInterval[]\n) {\n  const duration = lockedTime.duration;\n  if (!duration || duration < 5) throw new Error('(RS::To::DynamicLockedTimes) Length of a locked time is less than 5 min');\n\n  const dependencyReferences = makeChainable(lockedTime.coalesced ?? [])\n    .chain(\n      x => x\n        .filter(x => x.toModel == 'locations')\n        .map(x => getVertexId(x.to, options)),\n      x => uniq(x),\n      x => x.map(x => [x])\n    )\n    .value;\n\n  const days = lockedTime.intervals\n    ? makeChainable(lockedTime.intervals)\n      .chain(\n        x => x.map(x => getDayIndex(x.start)),\n        x => uniq(x),\n      )\n      .value\n    : undefined;\n  const day = days?.length == 1 ? days[0] : undefined;\n\n  // ignore locked times that reside on days that are not part of any coalesced's days\n  if (day != null && lockedTime.coalesced) {\n    const allowedByEvery = lockedTime.coalesced.every(x => !x.to.days?.length || x.to.days.some(x => x.day == day));\n    if (!allowedByEvery) return;\n  }\n\n  // each type (tag) of complementary hours should distribute evenly\n  const distributionKey = lockedTime.type == 'COMPLEMENTARY_TIME'\n    ? 'COMPLEMENTARY_TIME.' + lockedTime.tags?.at(0)?.value\n    : undefined;\n\n  const intervals = lockedTime.intervals ?? defaultInterval;\n\n  const doc: Types.event = {\n    id:                idOf.lockedTime(lockedTime, options),\n    length:            duration,\n    minBreakLength:    false,\n    maxLengthVariance: lockedTime.durationVariance,\n    groups:            parseGroupReferences({ type: 'lockedTime', item: lockedTime }, options),\n    dependencies:      dependencyReferences,\n    intervals:         options.oldFormat\n      ? parseIntervals(intervals, undefined, settings)\n      : idOf.intervalPairReference(intervals, undefined, options),\n    distributionKey,\n    ...days && { days },\n    ...day && { day },\n  };\n\n\n  ////\n  //// filter based on partialScheduleOptions\n  ////\n  if (options.partialScheduleOptions) {\n    const { includedEvents, omittedEventsHandling } = options.partialScheduleOptions;\n    if (includedEvents && !includedEvents.has(doc.id)) {\n\n      if (omittedEventsHandling == 'ignore') return;\n\n      if (omittedEventsHandling == 'freeze') {\n        // must not be parked and have a start and duration to be frozen, otherwise it's ignored\n        if (lockedTime.parked || !lockedTime.start || !lockedTime.duration) return;\n\n        // fix day, start and end\n        Object.assign(doc, toDayAndStart(lockedTime.start));\n        doc.length = lockedTime.duration;\n        doc.maxLengthVariance = 0;\n\n        // override intervals and days to not cause conflicts\n        const numDays = settings.numDays ?? 5;\n        doc.days      = Array.from({ length: numDays }, (_, i) => i);\n        doc.intervals = Array.from({ length: numDays }, () => [{ beg: 0, end: 23.55 }]);\n\n        // fix locations\n        // > locations are always fixed for locked times\n      }\n    }\n  }\n\n  return omitBy(doc, x => x == null) as Types.event;\n}\n\nexport function fromDynamicLockedTimes (\n  lockedTimes: ConnectedTypes.lockedTime[],\n  settings:    ConnectedTypes.divisionSettings,\n  options:     Types.parsedToOptions,\n): (Types.collection | Types.event)[] {\n  const defaultInterval = getDefaultInterval(settings);\n\n  const complementaryHours = makeChainable(lockedTimes)\n    .chain(\n      x => x\n        .filter(x => x.type == 'COMPLEMENTARY_TIME')\n        .map(x => parse(x, settings, options, defaultInterval))\n        .filter(x => !!x),\n      x => groupBy(x, x => [x.distributionKey].flat().toSorted().join('|')),\n      x => Object.entries(x)\n        .map(([id, events]) => ({ id, events }) as Types.collection),\n    )\n    .value;\n\n  const lunches = lockedTimes\n    .filter(x => x.type == 'LUNCH')\n    .map(lockedTime => parse(lockedTime, settings, options, defaultInterval))\n    .filter(x => !!x);\n\n  return [...complementaryHours, ...lunches];\n};"],"mappings":";;;;;;;;;;AAYA,SAAS,MACP,YACA,UACA,SACA,iBACA;CACA,MAAM,WAAW,WAAW;AAC5B,KAAI,CAAC,YAAY,WAAW,EAAG,OAAM,IAAI,MAAM;CAE/C,MAAM,uBAAuB,cAAc,WAAW,aAAa,IAChE,OACC,MAAK,EACF,QAAO,QAAKA,IAAE,WAAW,aACzB,KAAI,QAAK,YAAYA,IAAE,IAAI,YAC9B,MAAK,KAAK,KACV,MAAK,EAAE,KAAI,QAAK,CAACA,OAElB;CAEH,MAAM,OAAO,WAAW,YACpB,cAAc,WAAW,WACxB,OACC,MAAK,EAAE,KAAI,QAAK,YAAYA,IAAE,UAC9B,MAAK,KAAK,IAEX,QACD;CACJ,MAAM,MAAM,MAAM,UAAU,IAAI,KAAK,KAAK;AAG1C,KAAI,OAAO,QAAQ,WAAW,WAAW;EACvC,MAAM,iBAAiB,WAAW,UAAU,OAAM,MAAK,CAAC,EAAE,GAAG,MAAM,UAAU,EAAE,GAAG,KAAK,MAAK,QAAKA,IAAE,OAAO;AAC1G,MAAI,CAAC,eAAgB;;CAIvB,MAAM,kBAAkB,WAAW,QAAQ,uBACvC,wBAAwB,WAAW,MAAM,GAAG,IAAI,QAChD;CAEJ,MAAM,YAAY,WAAW,aAAa;CAE1C,MAAMC,MAAmB;EACvB,IAAmB,KAAK,WAAW,YAAY;EAC/C,QAAmB;EACnB,gBAAmB;EACnB,mBAAmB,WAAW;EAC9B,QAAmB,qBAAqB;GAAE,MAAM;GAAc,MAAM;KAAc;EAClF,cAAmB;EACnB,WAAmB,QAAQ,YACvB,eAAe,WAAW,QAAW,YACrC,KAAK,sBAAsB,WAAW,QAAW;EACrD;EACA,GAAG,QAAQ,EAAE;EACb,GAAG,OAAO,EAAE;;AAOd,KAAI,QAAQ,wBAAwB;EAClC,MAAM,EAAE,gBAAgB,0BAA0B,QAAQ;AAC1D,MAAI,kBAAkB,CAAC,eAAe,IAAI,IAAI,KAAK;AAEjD,OAAI,yBAAyB,SAAU;AAEvC,OAAI,yBAAyB,UAAU;AAErC,QAAI,WAAW,UAAU,CAAC,WAAW,SAAS,CAAC,WAAW,SAAU;AAGpE,WAAO,OAAO,KAAK,cAAc,WAAW;AAC5C,QAAI,SAAS,WAAW;AACxB,QAAI,oBAAoB;IAGxB,MAAM,UAAU,SAAS,WAAW;AACpC,QAAI,OAAY,MAAM,KAAK,EAAE,QAAQ,YAAY,GAAG,MAAM;AAC1D,QAAI,YAAY,MAAM,KAAK,EAAE,QAAQ,iBAAiB,CAAC;KAAE,KAAK;KAAG,KAAK;;;;;AAQ5E,QAAO,OAAO,MAAK,MAAK,KAAK;;AAG/B,SAAgB,uBACd,aACA,UACA,SACoC;CACpC,MAAM,kBAAkB,mBAAmB;CAE3C,MAAM,qBAAqB,cAAc,aACtC,OACC,MAAK,EACF,QAAO,QAAKD,IAAE,QAAQ,sBACtB,KAAI,QAAK,MAAMA,KAAG,UAAU,SAAS,kBACrC,QAAO,QAAK,CAAC,CAACA,OACjB,MAAK,QAAQ,IAAG,QAAK,CAACA,IAAE,iBAAiB,OAAO,WAAW,KAAK,QAChE,MAAK,OAAO,QAAQ,GACjB,KAAK,CAAC,IAAI,aAAa;EAAE;EAAI;MAEjC;CAEH,MAAM,UAAU,YACb,QAAO,MAAK,EAAE,QAAQ,SACtB,KAAI,eAAc,MAAM,YAAY,UAAU,SAAS,kBACvD,QAAO,MAAK,CAAC,CAAC;AAEjB,QAAO,CAAC,GAAG,oBAAoB,GAAG"}

package/dist/RS/to/input/events.js

@@ -4,6 +4,7 @@ import { attachLockedTimes } from "./util/attach-locked-times.js";
 import { parseDays } from "./util/parse-days.js";
 import { parseMinimumBreakLength } from "./util/parse-minimum-break-length.js";
 import { parseIntervals } from "./util/parse-intervals.js";
+import { getDefaultInterval } from "./intervals.js";
 import { parseGroupReferences } from "./util/parse-group-references.js";
 import { parseLocationReferences, parseSelectedLocations } from "./util/parse-location-references.js";
 import { omitBy } from "lodash-es";
@@ -17,10 +18,12 @@ function toDayAndStart(start) {
 	};
 }
 function parseEvents(events, settings, options, periodsMap) {
+	const defaultInterval = getDefaultInterval(settings);
 	return (events ?? []).map((event) => {
 		const id = getVertexId(event, options);
+		const intervals = event.intervals ?? event.course?.intervals ?? defaultInterval;
 		const duration = event.preferredDuration ?? event.duration;
-		if (!duration) throw new Error(`(RS::V3::To::Events) Event "${id}" has no duration`);
+		if (!duration) throw new Error(`(RS::To::Events) Event "${id}" has no duration`);
 		const doc = {
 			id: idOf.event(event, options),
 			length: duration,
@@ -36,7 +39,7 @@ function parseEvents(events, settings, options, periodsMap) {
 				type: "event",
 				item: event
 			}, options),
-			intervals: options.oldFormat ? parseIntervals(event.intervals, void 0, settings) : idOf.intervalPairReference(event.intervals, void 0, options),
+			intervals: options.oldFormat ? parseIntervals(intervals, void 0, settings) : idOf.intervalPairReference(intervals, void 0, options),
 			lockedTimes: attachLockedTimes(event.lockedTimes, options),
 			minBreakLength: parseMinimumBreakLength(event.minBreakLength)
 		};

package/dist/RS/to/input/events.js.map

@@ -1 +1 @@
-{"version":3,"file":"events.js","names":["doc: Types.event","id"],"sources":["../../../../src/RS/to/input/events.ts"],"sourcesContent":["import moment from 'moment';\nimport { omitBy } from 'lodash-es';\nimport { parseMinimumBreakLength } from './util/parse-minimum-break-length';\nimport { attachLockedTimes } from './util/attach-locked-times';\nimport type { Types } from '../../types';\nimport { parseGroupReferences } from './util/parse-group-references';\nimport { parseLocationReferences, parseSelectedLocations } from './util/parse-location-references';\nimport type { ConnectedTypes } from '../../make-connected';\nimport { getDayIndex, getVertexId } from '../../../core/util';\nimport { getPeriodIndex, idOf } from './util/util';\nimport { parseDays } from './util/parse-days';\nimport type { DateType } from '../../../common/types';\nimport { parseIntervals } from './util/parse-intervals';\n\nexport function toDayAndStart (start: DateType) {\n  return {\n    start: parseFloat(moment.utc(start).format('HH.mm')),\n    day:   getDayIndex(start)\n  };\n}\n\nexport function parseEvents (\n  events:     ConnectedTypes.event[] | undefined,\n  settings:   ConnectedTypes.divisionSettings,\n  options:    Types.parsedToOptions,\n  periodsMap: Map<string | undefined, number>\n): Types.event[] {\n\n  return (events ?? [])\n    .map((event): Types.event | undefined => {\n      const id = getVertexId(event, options);\n\n      const duration = event.preferredDuration ?? event.duration;  // temporary, should be preferred duration only!\n      if (!duration) throw new Error(`(RS::V3::To::Events) Event \"${id}\" has no duration`);\n\n      const doc: Types.event = {\n        id:                idOf.event(event, options),\n        length:            duration,\n        maxLengthVariance: event.durationVariance,\n        weight:            event.weight,\n        density:           event.density,\n        potentialCenter:   event.centerOfAttraction ? parseFloat(event.centerOfAttraction.replace(':', '.')) : undefined,\n        forcedOverlapId:   event.overlapSpecies?.species?.find(({ to }) => to == event)?.id,\n\n        period:       getPeriodIndex            (event.period, periodsMap, options),\n        days:         parseDays                 (event.days, settings),\n        dependencies: parseLocationReferences   (event.locations, options),\n        groups:       parseGroupReferences      ({ type: 'event', item: event }, options),\n        intervals:    options.oldFormat\n          ? parseIntervals(event.intervals, undefined, settings)\n          : idOf.intervalPairReference(event.intervals, undefined, options),\n        lockedTimes:    attachLockedTimes         (event.lockedTimes, options),\n        minBreakLength: parseMinimumBreakLength   (event.minBreakLength),\n      };\n\n      // if the event has a fixed day and start\n      if (event.fixedStart && event.start) {\n        Object.assign(doc, toDayAndStart(event.start));\n      }\n\n      if (options.meta) {\n        doc.meta = omitBy({\n          name:        event.displayName,\n          ids:         event.ids,\n          parked:      event.parked,\n          visible:     event.visible,\n          start:       event.start       ? moment.utc(event.start)                : undefined,\n          end:         event.end         ? moment.utc(event.start)                : undefined,\n          course:      event.course      ? getVertexId(event.course, options)     : undefined,\n          inLocations: event.inLocations ? parseSelectedLocations(event, options) : undefined\n        }, x => x == null);\n      }\n\n      ////\n      //// filter events based on partialScheduleOptions\n      ////\n      if (options.partialScheduleOptions) {\n        const { includedEvents, omittedEventsHandling } = options.partialScheduleOptions;\n        if (includedEvents && !includedEvents.has(doc.id)) {  // collection.id  => take into account dynamic locked times too!\n\n          if (omittedEventsHandling == 'ignore') return;\n\n          if (omittedEventsHandling == 'freeze') {\n            // must not be parked and have a start and duration to be frozen, otherwise it's ignored\n            if (event.parked || !event.start || !event.duration) return;\n\n            // fix day, start and end\n            Object.assign(doc, toDayAndStart(event.start));\n            doc.length = event.duration;\n            doc.maxLengthVariance = 0;\n\n            // override intervals and days to not cause conflicts\n            const numDays = settings.numDays ?? 5;\n            doc.days      = Array.from({ length: numDays }, (_, i) => i);\n            doc.intervals = Array.from({ length: numDays }, () => [{ beg: 0, end: 23.55 }]);\n\n            // fix locations\n            doc.dependencies = (event.inLocations ?? [])\n              .filter((x): x is NonNullable<typeof x> => !!x)\n              .map(x => {\n                const id = getVertexId(x, options);\n\n                // filter location references based on partial schedule options\n                const includedLocations = options.partialScheduleOptions?.includedLocations;\n                if (includedLocations && !includedLocations.has(id)) return;\n\n                return [{ dependency: id }] as Types.availableDependency[];\n              })\n              .filter(x => x != null);\n          }\n\n        }\n      }\n\n      return omitBy(doc, x => x == null) as Types.event;\n    })\n    .filter((x): x is NonNullable<typeof x> => !!x);\n}"],"mappings":";;;;;;;;;;;;AAcA,SAAgB,cAAe,OAAiB;AAC9C,QAAO;EACL,OAAO,WAAW,OAAO,IAAI,OAAO,OAAO;EAC3C,KAAO,YAAY;;;AAIvB,SAAgB,YACd,QACA,UACA,SACA,YACe;AAEf,SAAQ,UAAU,IACf,KAAK,UAAmC;EACvC,MAAM,KAAK,YAAY,OAAO;EAE9B,MAAM,WAAW,MAAM,qBAAqB,MAAM;AAClD,MAAI,CAAC,SAAU,OAAM,IAAI,MAAM,+BAA+B,GAAG;EAEjE,MAAMA,MAAmB;GACvB,IAAmB,KAAK,MAAM,OAAO;GACrC,QAAmB;GACnB,mBAAmB,MAAM;GACzB,QAAmB,MAAM;GACzB,SAAmB,MAAM;GACzB,iBAAmB,MAAM,qBAAqB,WAAW,MAAM,mBAAmB,QAAQ,KAAK,QAAQ;GACvG,iBAAmB,MAAM,gBAAgB,SAAS,MAAM,EAAE,SAAS,MAAM,QAAQ;GAEjF,QAAc,eAA2B,MAAM,QAAQ,YAAY;GACnE,MAAc,UAA2B,MAAM,MAAM;GACrD,cAAc,wBAA2B,MAAM,WAAW;GAC1D,QAAc,qBAA2B;IAAE,MAAM;IAAS,MAAM;MAAS;GACzE,WAAc,QAAQ,YAClB,eAAe,MAAM,WAAW,QAAW,YAC3C,KAAK,sBAAsB,MAAM,WAAW,QAAW;GAC3D,aAAgB,kBAA2B,MAAM,aAAa;GAC9D,gBAAgB,wBAA2B,MAAM;;AAInD,MAAI,MAAM,cAAc,MAAM,MAC5B,QAAO,OAAO,KAAK,cAAc,MAAM;AAGzC,MAAI,QAAQ,KACV,KAAI,OAAO,OAAO;GAChB,MAAa,MAAM;GACnB,KAAa,MAAM;GACnB,QAAa,MAAM;GACnB,SAAa,MAAM;GACnB,OAAa,MAAM,QAAc,OAAO,IAAI,MAAM,SAAwB;GAC1E,KAAa,MAAM,MAAc,OAAO,IAAI,MAAM,SAAwB;GAC1E,QAAa,MAAM,SAAc,YAAY,MAAM,QAAQ,WAAe;GAC1E,aAAa,MAAM,cAAc,uBAAuB,OAAO,WAAW;MACzE,MAAK,KAAK;AAMf,MAAI,QAAQ,wBAAwB;GAClC,MAAM,EAAE,gBAAgB,0BAA0B,QAAQ;AAC1D,OAAI,kBAAkB,CAAC,eAAe,IAAI,IAAI,KAAK;AAEjD,QAAI,yBAAyB,SAAU;AAEvC,QAAI,yBAAyB,UAAU;AAErC,SAAI,MAAM,UAAU,CAAC,MAAM,SAAS,CAAC,MAAM,SAAU;AAGrD,YAAO,OAAO,KAAK,cAAc,MAAM;AACvC,SAAI,SAAS,MAAM;AACnB,SAAI,oBAAoB;KAGxB,MAAM,UAAU,SAAS,WAAW;AACpC,SAAI,OAAY,MAAM,KAAK,EAAE,QAAQ,YAAY,GAAG,MAAM;AAC1D,SAAI,YAAY,MAAM,KAAK,EAAE,QAAQ,iBAAiB,CAAC;MAAE,KAAK;MAAG,KAAK;;AAGtE,SAAI,gBAAgB,MAAM,eAAe,IACtC,QAAQ,MAAkC,CAAC,CAAC,GAC5C,KAAI,MAAK;MACR,MAAMC,OAAK,YAAY,GAAG;MAG1B,MAAM,oBAAoB,QAAQ,wBAAwB;AAC1D,UAAI,qBAAqB,CAAC,kBAAkB,IAAIA,MAAK;AAErD,aAAO,CAAC,EAAE,YAAYA;QAEvB,QAAO,MAAK,KAAK;;;;AAM1B,SAAO,OAAO,MAAK,MAAK,KAAK;IAE9B,QAAQ,MAAkC,CAAC,CAAC"}
+{"version":3,"file":"events.js","names":["doc: Types.event","id"],"sources":["../../../../src/RS/to/input/events.ts"],"sourcesContent":["import moment from 'moment';\nimport { omitBy } from 'lodash-es';\nimport { parseMinimumBreakLength } from './util/parse-minimum-break-length';\nimport { attachLockedTimes } from './util/attach-locked-times';\nimport type { Types } from '../../types';\nimport { parseGroupReferences } from './util/parse-group-references';\nimport { parseLocationReferences, parseSelectedLocations } from './util/parse-location-references';\nimport type { ConnectedTypes } from '../../make-connected';\nimport { getDayIndex, getVertexId } from '../../../core/util';\nimport { getPeriodIndex, idOf } from './util/util';\nimport { parseDays } from './util/parse-days';\nimport type { DateType } from '../../../common/types';\nimport { parseIntervals } from './util/parse-intervals';\nimport { getDefaultInterval } from './intervals';\n\nexport function toDayAndStart (start: DateType) {\n  return {\n    start: parseFloat(moment.utc(start).format('HH.mm')),\n    day:   getDayIndex(start)\n  };\n}\n\nexport function parseEvents (\n  events:     ConnectedTypes.event[] | undefined,\n  settings:   ConnectedTypes.divisionSettings,\n  options:    Types.parsedToOptions,\n  periodsMap: Map<string | undefined, number>\n): Types.event[] {\n  const defaultInterval = getDefaultInterval(settings);\n\n  return (events ?? [])\n    .map((event): Types.event | undefined => {\n      const id        = getVertexId(event, options);\n      const intervals = event.intervals ?? event.course?.intervals ?? defaultInterval;\n\n      const duration = event.preferredDuration ?? event.duration;  // temporary, should be preferred duration only!\n      if (!duration) throw new Error(`(RS::To::Events) Event \"${id}\" has no duration`);\n\n      const doc: Types.event = {\n        id:                idOf.event(event, options),\n        length:            duration,\n        maxLengthVariance: event.durationVariance,\n        weight:            event.weight,\n        density:           event.density,\n        potentialCenter:   event.centerOfAttraction ? parseFloat(event.centerOfAttraction.replace(':', '.')) : undefined,\n        forcedOverlapId:   event.overlapSpecies?.species?.find(({ to }) => to == event)?.id,\n\n        period:       getPeriodIndex            (event.period, periodsMap, options),\n        days:         parseDays                 (event.days, settings),\n        dependencies: parseLocationReferences   (event.locations, options),\n        groups:       parseGroupReferences      ({ type: 'event', item: event }, options),\n        intervals:    options.oldFormat\n          ? parseIntervals(intervals, undefined, settings)\n          : idOf.intervalPairReference(intervals, undefined, options),\n        lockedTimes:    attachLockedTimes         (event.lockedTimes, options),\n        minBreakLength: parseMinimumBreakLength   (event.minBreakLength),\n      };\n\n      // if the event has a fixed day and start\n      if (event.fixedStart && event.start) {\n        Object.assign(doc, toDayAndStart(event.start));\n      }\n\n      if (options.meta) {\n        doc.meta = omitBy({\n          name:        event.displayName,\n          ids:         event.ids,\n          parked:      event.parked,\n          visible:     event.visible,\n          start:       event.start       ? moment.utc(event.start)                : undefined,\n          end:         event.end         ? moment.utc(event.start)                : undefined,\n          course:      event.course      ? getVertexId(event.course, options)     : undefined,\n          inLocations: event.inLocations ? parseSelectedLocations(event, options) : undefined\n        }, x => x == null);\n      }\n\n      ////\n      //// filter events based on partialScheduleOptions\n      ////\n      if (options.partialScheduleOptions) {\n        const { includedEvents, omittedEventsHandling } = options.partialScheduleOptions;\n        if (includedEvents && !includedEvents.has(doc.id)) {  // collection.id  => take into account dynamic locked times too!\n\n          if (omittedEventsHandling == 'ignore') return;\n\n          if (omittedEventsHandling == 'freeze') {\n            // must not be parked and have a start and duration to be frozen, otherwise it's ignored\n            if (event.parked || !event.start || !event.duration) return;\n\n            // fix day, start and end\n            Object.assign(doc, toDayAndStart(event.start));\n            doc.length = event.duration;\n            doc.maxLengthVariance = 0;\n\n            // override intervals and days to not cause conflicts\n            const numDays = settings.numDays ?? 5;\n            doc.days      = Array.from({ length: numDays }, (_, i) => i);\n            doc.intervals = Array.from({ length: numDays }, () => [{ beg: 0, end: 23.55 }]);\n\n            // fix locations\n            doc.dependencies = (event.inLocations ?? [])\n              .filter((x): x is NonNullable<typeof x> => !!x)\n              .map(x => {\n                const id = getVertexId(x, options);\n\n                // filter location references based on partial schedule options\n                const includedLocations = options.partialScheduleOptions?.includedLocations;\n                if (includedLocations && !includedLocations.has(id)) return;\n\n                return [{ dependency: id }] as Types.availableDependency[];\n              })\n              .filter(x => x != null);\n          }\n\n        }\n      }\n\n      return omitBy(doc, x => x == null) as Types.event;\n    })\n    .filter((x): x is NonNullable<typeof x> => !!x);\n}"],"mappings":";;;;;;;;;;;;;AAeA,SAAgB,cAAe,OAAiB;AAC9C,QAAO;EACL,OAAO,WAAW,OAAO,IAAI,OAAO,OAAO;EAC3C,KAAO,YAAY;;;AAIvB,SAAgB,YACd,QACA,UACA,SACA,YACe;CACf,MAAM,kBAAkB,mBAAmB;AAE3C,SAAQ,UAAU,IACf,KAAK,UAAmC;EACvC,MAAM,KAAY,YAAY,OAAO;EACrC,MAAM,YAAY,MAAM,aAAa,MAAM,QAAQ,aAAa;EAEhE,MAAM,WAAW,MAAM,qBAAqB,MAAM;AAClD,MAAI,CAAC,SAAU,OAAM,IAAI,MAAM,2BAA2B,GAAG;EAE7D,MAAMA,MAAmB;GACvB,IAAmB,KAAK,MAAM,OAAO;GACrC,QAAmB;GACnB,mBAAmB,MAAM;GACzB,QAAmB,MAAM;GACzB,SAAmB,MAAM;GACzB,iBAAmB,MAAM,qBAAqB,WAAW,MAAM,mBAAmB,QAAQ,KAAK,QAAQ;GACvG,iBAAmB,MAAM,gBAAgB,SAAS,MAAM,EAAE,SAAS,MAAM,QAAQ;GAEjF,QAAc,eAA2B,MAAM,QAAQ,YAAY;GACnE,MAAc,UAA2B,MAAM,MAAM;GACrD,cAAc,wBAA2B,MAAM,WAAW;GAC1D,QAAc,qBAA2B;IAAE,MAAM;IAAS,MAAM;MAAS;GACzE,WAAc,QAAQ,YAClB,eAAe,WAAW,QAAW,YACrC,KAAK,sBAAsB,WAAW,QAAW;GACrD,aAAgB,kBAA2B,MAAM,aAAa;GAC9D,gBAAgB,wBAA2B,MAAM;;AAInD,MAAI,MAAM,cAAc,MAAM,MAC5B,QAAO,OAAO,KAAK,cAAc,MAAM;AAGzC,MAAI,QAAQ,KACV,KAAI,OAAO,OAAO;GAChB,MAAa,MAAM;GACnB,KAAa,MAAM;GACnB,QAAa,MAAM;GACnB,SAAa,MAAM;GACnB,OAAa,MAAM,QAAc,OAAO,IAAI,MAAM,SAAwB;GAC1E,KAAa,MAAM,MAAc,OAAO,IAAI,MAAM,SAAwB;GAC1E,QAAa,MAAM,SAAc,YAAY,MAAM,QAAQ,WAAe;GAC1E,aAAa,MAAM,cAAc,uBAAuB,OAAO,WAAW;MACzE,MAAK,KAAK;AAMf,MAAI,QAAQ,wBAAwB;GAClC,MAAM,EAAE,gBAAgB,0BAA0B,QAAQ;AAC1D,OAAI,kBAAkB,CAAC,eAAe,IAAI,IAAI,KAAK;AAEjD,QAAI,yBAAyB,SAAU;AAEvC,QAAI,yBAAyB,UAAU;AAErC,SAAI,MAAM,UAAU,CAAC,MAAM,SAAS,CAAC,MAAM,SAAU;AAGrD,YAAO,OAAO,KAAK,cAAc,MAAM;AACvC,SAAI,SAAS,MAAM;AACnB,SAAI,oBAAoB;KAGxB,MAAM,UAAU,SAAS,WAAW;AACpC,SAAI,OAAY,MAAM,KAAK,EAAE,QAAQ,YAAY,GAAG,MAAM;AAC1D,SAAI,YAAY,MAAM,KAAK,EAAE,QAAQ,iBAAiB,CAAC;MAAE,KAAK;MAAG,KAAK;;AAGtE,SAAI,gBAAgB,MAAM,eAAe,IACtC,QAAQ,MAAkC,CAAC,CAAC,GAC5C,KAAI,MAAK;MACR,MAAMC,OAAK,YAAY,GAAG;MAG1B,MAAM,oBAAoB,QAAQ,wBAAwB;AAC1D,UAAI,qBAAqB,CAAC,kBAAkB,IAAIA,MAAK;AAErD,aAAO,CAAC,EAAE,YAAYA;QAEvB,QAAO,MAAK,KAAK;;;;AAM1B,SAAO,OAAO,MAAK,MAAK,KAAK;IAE9B,QAAQ,MAAkC,CAAC,CAAC"}

package/dist/RS/to/input/groups.js

@@ -4,11 +4,15 @@ import { parseDays } from "./util/parse-days.js";
 import { parseMaxWorkingHours } from "./util/parse-max-working-hours.js";
 import { parseMinimumBreakLength } from "./util/parse-minimum-break-length.js";
 import { parseIntervals } from "./util/parse-intervals.js";
+import { getDefaultInterval } from "./intervals.js";
 import { omitBy } from "lodash-es";
 
 //#region src/RS/to/input/groups.ts
 function fromGroups(groups, settings, options) {
+	const defaultInterval = getDefaultInterval(settings);
 	return groups.filter((group) => group.species == "class").map((group) => {
+		const intervals = group.intervals ?? defaultInterval;
+		const rootInterval = group.rootInterval ?? settings.defaultRootInterval;
 		const doc = {
 			id: idOf.group(group, options),
 			group_type: "classes",
@@ -17,7 +21,7 @@ function fromGroups(groups, settings, options) {
 			minimizeDependencyAlternation: false,
 			forbidOverlappingEvents: options.oldFormat ? group.forbidOverlappingEvents : void 0,
 			disableDayLengthPunishment: options.oldFormat ? group.disableDayLengthPunishment : void 0,
-			intervals: options.oldFormat ? parseIntervals(group.intervals, group.rootInterval ?? settings.defaultRootInterval, settings) : idOf.intervalPairReference(group.intervals, group.rootInterval, options),
+			intervals: options.oldFormat ? parseIntervals(intervals, rootInterval, settings) : idOf.intervalPairReference(intervals, rootInterval, options),
 			days: parseDays(group.days, settings),
 			lockedTimes: attachLockedTimes(group.lockedTimes, options),
 			minBreakLength: parseMinimumBreakLength(group.minBreakLength),

package/dist/RS/to/input/groups.js.map

@@ -1 +1 @@
-{"version":3,"file":"groups.js","names":["doc: Types.group"],"sources":["../../../../src/RS/to/input/groups.ts"],"sourcesContent":["import { omitBy } from 'lodash-es';\nimport type { Types } from '../../types';\nimport type { ConnectedTypes } from '../../make-connected';\nimport { parseDays } from './util/parse-days';\nimport { attachLockedTimes } from './util/attach-locked-times';\nimport { parseMinimumBreakLength } from './util/parse-minimum-break-length';\nimport { parseMaxWorkingHours } from './util/parse-max-working-hours';\nimport { idOf } from './util/util';\nimport { parseIntervals } from './util/parse-intervals';\n\nexport function fromGroups (\n  groups:   ConnectedTypes.group[],\n  settings: ConnectedTypes.divisionSettings,\n  options:  Types.parsedToOptions\n): Types.group[] {\n\n  return groups\n    .filter(group => group.species == 'class')\n    .map(group => {\n      const doc: Types.group = {\n        id:                            idOf.group(group, options),\n        group_type:                    'classes',\n        weight:                        group.weight,\n        minimizeGaps:                  true,\n        minimizeDependencyAlternation: false,\n        forbidOverlappingEvents:       options.oldFormat ? group.forbidOverlappingEvents : undefined,  // Deprecated in v3\n        disableDayLengthPunishment:    options.oldFormat ? group.disableDayLengthPunishment : undefined,  // Deprecated in v3\n        intervals:                     options.oldFormat\n          ? parseIntervals(group.intervals, group.rootInterval ?? settings.defaultRootInterval, settings)\n          : idOf.intervalPairReference(group.intervals, group.rootInterval, options),\n        days:           parseDays                 (group.days, settings),\n        lockedTimes:    attachLockedTimes         (group.lockedTimes, options),\n        minBreakLength: parseMinimumBreakLength   (group.minBreakLength),\n\n        ...parseMaxWorkingHours(group, options),\n      };\n\n      if (options.meta) {\n        doc.meta = omitBy({\n          ids:  group.ids,\n          name: group.displayName,\n        }, x => x == null);\n      }\n\n      return omitBy(doc, x => x == null) as Types.group;\n    });\n};\n"],"mappings":";;;;;;;;;AAUA,SAAgB,WACd,QACA,UACA,SACe;AAEf,QAAO,OACJ,QAAO,UAAS,MAAM,WAAW,SACjC,KAAI,UAAS;EACZ,MAAMA,MAAmB;GACvB,IAA+B,KAAK,MAAM,OAAO;GACjD,YAA+B;GAC/B,QAA+B,MAAM;GACrC,cAA+B;GAC/B,+BAA+B;GAC/B,yBAA+B,QAAQ,YAAY,MAAM,0BAA0B;GACnF,4BAA+B,QAAQ,YAAY,MAAM,6BAA6B;GACtF,WAA+B,QAAQ,YACnC,eAAe,MAAM,WAAW,MAAM,gBAAgB,SAAS,qBAAqB,YACpF,KAAK,sBAAsB,MAAM,WAAW,MAAM,cAAc;GACpE,MAAgB,UAA2B,MAAM,MAAM;GACvD,aAAgB,kBAA2B,MAAM,aAAa;GAC9D,gBAAgB,wBAA2B,MAAM;GAEjD,GAAG,qBAAqB,OAAO;;AAGjC,MAAI,QAAQ,KACV,KAAI,OAAO,OAAO;GAChB,KAAM,MAAM;GACZ,MAAM,MAAM;MACX,MAAK,KAAK;AAGf,SAAO,OAAO,MAAK,MAAK,KAAK"}
+{"version":3,"file":"groups.js","names":["doc: Types.group"],"sources":["../../../../src/RS/to/input/groups.ts"],"sourcesContent":["import { omitBy } from 'lodash-es';\nimport type { Types } from '../../types';\nimport type { ConnectedTypes } from '../../make-connected';\nimport { parseDays } from './util/parse-days';\nimport { attachLockedTimes } from './util/attach-locked-times';\nimport { parseMinimumBreakLength } from './util/parse-minimum-break-length';\nimport { parseMaxWorkingHours } from './util/parse-max-working-hours';\nimport { idOf } from './util/util';\nimport { parseIntervals } from './util/parse-intervals';\nimport { getDefaultInterval } from './intervals';\n\nexport function fromGroups (\n  groups:   ConnectedTypes.group[],\n  settings: ConnectedTypes.divisionSettings,\n  options:  Types.parsedToOptions\n): Types.group[] {\n  const defaultInterval = getDefaultInterval(settings);\n\n  return groups\n    .filter(group => group.species == 'class')\n    .map(group => {\n      const intervals    = group.intervals    ?? defaultInterval;\n      const rootInterval = group.rootInterval ?? settings.defaultRootInterval;\n\n      const doc: Types.group = {\n        id:                            idOf.group(group, options),\n        group_type:                    'classes',\n        weight:                        group.weight,\n        minimizeGaps:                  true,\n        minimizeDependencyAlternation: false,\n        forbidOverlappingEvents:       options.oldFormat ? group.forbidOverlappingEvents : undefined,  // Deprecated in v3\n        disableDayLengthPunishment:    options.oldFormat ? group.disableDayLengthPunishment : undefined,  // Deprecated in v3\n        intervals:                     options.oldFormat\n          ? parseIntervals(intervals, rootInterval, settings)\n          : idOf.intervalPairReference(intervals, rootInterval, options),\n        days:           parseDays                 (group.days, settings),\n        lockedTimes:    attachLockedTimes         (group.lockedTimes, options),\n        minBreakLength: parseMinimumBreakLength   (group.minBreakLength),\n\n        ...parseMaxWorkingHours(group, options),\n      };\n\n      if (options.meta) {\n        doc.meta = omitBy({\n          ids:  group.ids,\n          name: group.displayName,\n        }, x => x == null);\n      }\n\n      return omitBy(doc, x => x == null) as Types.group;\n    });\n};\n"],"mappings":";;;;;;;;;;AAWA,SAAgB,WACd,QACA,UACA,SACe;CACf,MAAM,kBAAkB,mBAAmB;AAE3C,QAAO,OACJ,QAAO,UAAS,MAAM,WAAW,SACjC,KAAI,UAAS;EACZ,MAAM,YAAe,MAAM,aAAgB;EAC3C,MAAM,eAAe,MAAM,gBAAgB,SAAS;EAEpD,MAAMA,MAAmB;GACvB,IAA+B,KAAK,MAAM,OAAO;GACjD,YAA+B;GAC/B,QAA+B,MAAM;GACrC,cAA+B;GAC/B,+BAA+B;GAC/B,yBAA+B,QAAQ,YAAY,MAAM,0BAA0B;GACnF,4BAA+B,QAAQ,YAAY,MAAM,6BAA6B;GACtF,WAA+B,QAAQ,YACnC,eAAe,WAAW,cAAc,YACxC,KAAK,sBAAsB,WAAW,cAAc;GACxD,MAAgB,UAA2B,MAAM,MAAM;GACvD,aAAgB,kBAA2B,MAAM,aAAa;GAC9D,gBAAgB,wBAA2B,MAAM;GAEjD,GAAG,qBAAqB,OAAO;;AAGjC,MAAI,QAAQ,KACV,KAAI,OAAO,OAAO;GAChB,KAAM,MAAM;GACZ,MAAM,MAAM;MACX,MAAK,KAAK;AAGf,SAAO,OAAO,MAAK,MAAK,KAAK"}

package/dist/RS/to/input/input.js

@@ -1,8 +1,8 @@
 import { fromLocations } from "./dependencies.js";
+import { extractUniqueIntervals } from "./intervals.js";
 import { fromTeachers } from "./teachers.js";
 import { fromCollections } from "./collections.js";
 import { parseSettings } from "./settings.js";
-import { extractUniqueIntervals } from "./intervals.js";
 import { parseDefault } from "./default.js";
 import { fromDynamicLockedTimes } from "./dynamic-locked-times.js";
 import { parsePeriods } from "./periods.js";
@@ -21,6 +21,19 @@ function parseInput(schedule, options = {}) {
 	const courses = schedule.courses ?? [];
 	const periods = schedule.periods ?? [];
 	const persons = schedule.persons ?? [];
+	[
+		groups,
+		teachers,
+		locations,
+		courses,
+		events,
+		lockedTimes
+	].forEach((entities) => {
+		entities.forEach((entity) => {
+			if (entity.intervals && entity.intervals.length == 0) entity.intervals = void 0;
+			else if (entity.intervals === null) entity.intervals = void 0;
+		});
+	});
 	const { map: periodsMap, matrix: periodsMatrix } = parsePeriods(periods, division, options);
 	const data = {
 		settings: parseSettings(settings),

package/dist/RS/to/input/input.js.map

@@ -1 +1 @@
-{"version":3,"file":"input.js","names":["data: Types.scheduleData"],"sources":["../../../../src/RS/to/input/input.ts"],"sourcesContent":["import type { Types } from '../../types';\nimport { fromLocations } from './dependencies';\nimport { fromTeachers } from './teachers';\nimport { fromCollections } from './collections';\nimport { parseSettings } from './settings';\nimport { parseDefault } from './default';\nimport { fromDynamicLockedTimes } from './dynamic-locked-times';\nimport { parsePeriods } from './periods';\nimport type { ConnectedScheduleData } from '../../make-connected';\nimport { fromGroups } from './groups';\nimport { extractUniqueIntervals } from './intervals';\nimport { extractUniqueIndividuals } from './individuals';\n\nexport function parseInput (\n  schedule: ConnectedScheduleData,\n  options:  Types.parsedToOptions = {}\n): Types.scheduleData {\n\n  const settings      = schedule.settings;\n  const division      = schedule.division;\n  const groups        = schedule.groups        ?? [];\n  const teachers      = schedule.teachers      ?? [];\n  const locations     = schedule.locations     ?? [];\n  const events        = schedule.events        ?? [];\n  const lockedTimes   = schedule.lockedTimes   ?? [];\n  const courses       = schedule.courses       ?? [];\n  const periods       = schedule.periods       ?? [];\n  const persons       = schedule.persons       ?? [];\n\n  const { map: periodsMap, matrix: periodsMatrix } = parsePeriods(periods, division, options);\n\n  const data: Types.scheduleData = {\n    settings: parseSettings(settings),\n    default:  parseDefault (settings, periodsMap, options),\n\n    periods: periodsMatrix?.length ? periodsMatrix : undefined, // cannot be empty string\n\n    intervals: options.oldFormat ? undefined : extractUniqueIntervals(settings, groups, teachers, courses, events, lockedTimes, options),\n\n    dependencies: fromLocations(locations, settings, options),\n\n    groups: fromGroups(groups, settings, options)\n      .concat(fromTeachers(teachers, settings, options)),\n\n    individuals: options.oldFormat ? undefined : extractUniqueIndividuals(persons, courses, events, lockedTimes, options),\n\n    events: new Array<Types.collection | Types.collection[] | Types.event[]>()\n      .concat(fromCollections(courses, settings, options, periodsMap))\n      .concat(fromDynamicLockedTimes(lockedTimes, settings, options)),\n  };\n\n  return data;\n};"],"mappings":";;;;;;;;;;;;AAaA,SAAgB,WACd,UACA,UAAkC,IACd;CAEpB,MAAM,WAAgB,SAAS;CAC/B,MAAM,WAAgB,SAAS;CAC/B,MAAM,SAAgB,SAAS,UAAiB;CAChD,MAAM,WAAgB,SAAS,YAAiB;CAChD,MAAM,YAAgB,SAAS,aAAiB;CAChD,MAAM,SAAgB,SAAS,UAAiB;CAChD,MAAM,cAAgB,SAAS,eAAiB;CAChD,MAAM,UAAgB,SAAS,WAAiB;CAChD,MAAM,UAAgB,SAAS,WAAiB;CAChD,MAAM,UAAgB,SAAS,WAAiB;CAEhD,MAAM,EAAE,KAAK,YAAY,QAAQ,kBAAkB,aAAa,SAAS,UAAU;CAEnF,MAAMA,OAA2B;EAC/B,UAAU,cAAc;EACxB,SAAU,aAAc,UAAU,YAAY;EAE9C,SAAS,eAAe,SAAS,gBAAgB;EAEjD,WAAW,QAAQ,YAAY,SAAY,uBAAuB,UAAU,QAAQ,UAAU,SAAS,QAAQ,aAAa;EAE5H,cAAc,cAAc,WAAW,UAAU;EAEjD,QAAQ,WAAW,QAAQ,UAAU,SAClC,OAAO,aAAa,UAAU,UAAU;EAE3C,aAAa,QAAQ,YAAY,SAAY,yBAAyB,SAAS,SAAS,QAAQ,aAAa;EAE7G,QAAQ,IAAI,QACT,OAAO,gBAAgB,SAAS,UAAU,SAAS,aACnD,OAAO,uBAAuB,aAAa,UAAU;;AAG1D,QAAO"}
+{"version":3,"file":"input.js","names":["data: Types.scheduleData"],"sources":["../../../../src/RS/to/input/input.ts"],"sourcesContent":["import type { Types } from '../../types';\nimport { fromLocations } from './dependencies';\nimport { fromTeachers } from './teachers';\nimport { fromCollections } from './collections';\nimport { parseSettings } from './settings';\nimport { parseDefault } from './default';\nimport { fromDynamicLockedTimes } from './dynamic-locked-times';\nimport { parsePeriods } from './periods';\nimport type { ConnectedScheduleData } from '../../make-connected';\nimport { fromGroups } from './groups';\nimport { extractUniqueIntervals } from './intervals';\nimport { extractUniqueIndividuals } from './individuals';\n\nexport function parseInput (\n  schedule: ConnectedScheduleData,\n  options:  Types.parsedToOptions = {}\n): Types.scheduleData {\n\n  const settings      = schedule.settings;\n  const division      = schedule.division;\n  const groups        = schedule.groups        ?? [];\n  const teachers      = schedule.teachers      ?? [];\n  const locations     = schedule.locations     ?? [];\n  const events        = schedule.events        ?? [];\n  const lockedTimes   = schedule.lockedTimes   ?? [];\n  const courses       = schedule.courses       ?? [];\n  const periods       = schedule.periods       ?? [];\n  const persons       = schedule.persons       ?? [];\n\n\n  ////\n  //// replace empty/null intervals with undefined\n  ////\n  [groups, teachers, locations, courses, events, lockedTimes].forEach(entities => {\n    entities.forEach(entity => {\n      if      (entity.intervals && entity.intervals.length == 0) entity.intervals = undefined;\n      else if (entity.intervals === null                       ) entity.intervals = undefined;\n    });\n  });\n\n\n  const { map: periodsMap, matrix: periodsMatrix } = parsePeriods(periods, division, options);\n\n  const data: Types.scheduleData = {\n    settings: parseSettings(settings),\n    default:  parseDefault (settings, periodsMap, options),\n\n    periods: periodsMatrix?.length ? periodsMatrix : undefined, // cannot be empty string\n\n    intervals: options.oldFormat ? undefined : extractUniqueIntervals(settings, groups, teachers, courses, events, lockedTimes, options),\n\n    dependencies: fromLocations(locations, settings, options),\n\n    groups: fromGroups(groups, settings, options)\n      .concat(fromTeachers(teachers, settings, options)),\n\n    individuals: options.oldFormat ? undefined : extractUniqueIndividuals(persons, courses, events, lockedTimes, options),\n\n    events: new Array<Types.collection | Types.collection[] | Types.event[]>()\n      .concat(fromCollections(courses, settings, options, periodsMap))\n      .concat(fromDynamicLockedTimes(lockedTimes, settings, options)),\n  };\n\n  return data;\n};"],"mappings":";;;;;;;;;;;;AAaA,SAAgB,WACd,UACA,UAAkC,IACd;CAEpB,MAAM,WAAgB,SAAS;CAC/B,MAAM,WAAgB,SAAS;CAC/B,MAAM,SAAgB,SAAS,UAAiB;CAChD,MAAM,WAAgB,SAAS,YAAiB;CAChD,MAAM,YAAgB,SAAS,aAAiB;CAChD,MAAM,SAAgB,SAAS,UAAiB;CAChD,MAAM,cAAgB,SAAS,eAAiB;CAChD,MAAM,UAAgB,SAAS,WAAiB;CAChD,MAAM,UAAgB,SAAS,WAAiB;CAChD,MAAM,UAAgB,SAAS,WAAiB;AAMhD;EAAC;EAAQ;EAAU;EAAW;EAAS;EAAQ;GAAa,SAAQ,aAAY;AAC9E,WAAS,SAAQ,WAAU;AACzB,OAAS,OAAO,aAAa,OAAO,UAAU,UAAU,EAAG,QAAO,YAAY;YACrE,OAAO,cAAc,KAA6B,QAAO,YAAY;;;CAKlF,MAAM,EAAE,KAAK,YAAY,QAAQ,kBAAkB,aAAa,SAAS,UAAU;CAEnF,MAAMA,OAA2B;EAC/B,UAAU,cAAc;EACxB,SAAU,aAAc,UAAU,YAAY;EAE9C,SAAS,eAAe,SAAS,gBAAgB;EAEjD,WAAW,QAAQ,YAAY,SAAY,uBAAuB,UAAU,QAAQ,UAAU,SAAS,QAAQ,aAAa;EAE5H,cAAc,cAAc,WAAW,UAAU;EAEjD,QAAQ,WAAW,QAAQ,UAAU,SAClC,OAAO,aAAa,UAAU,UAAU;EAE3C,aAAa,QAAQ,YAAY,SAAY,yBAAyB,SAAS,SAAS,QAAQ,aAAa;EAE7G,QAAQ,IAAI,QACT,OAAO,gBAAgB,SAAS,UAAU,SAAS,aACnD,OAAO,uBAAuB,aAAa,UAAU;;AAG1D,QAAO"}

package/dist/RS/to/input/intervals.js

@@ -25,7 +25,7 @@ function standardizeIntervals(intervals, settings) {
 */
 function toFloatIntervals(intervals) {
 	return intervals?.map((i, day) => {
-		if (!i.start || !i.end) throw new Error(`(RS::V3::To::convertIntervals) Interval missing start or end for day ${day}: ${JSON.stringify(i)}`);
+		if (!i.start || !i.end) throw new Error(`(RS::To::convertIntervals) Interval missing start or end for day ${day}: ${JSON.stringify(i)}`);
 		const start = parseFloat(moment.utc(i.start).format("HH.mm"));
 		const end = parseFloat(moment.utc(i.end).format("HH.mm"));
 		return {
@@ -40,10 +40,10 @@ function toFloatIntervals(intervals) {
 function combineAndMapIntervals(_intervals, rootInterval, settings) {
 	const intervals = toFloatIntervals(standardizeIntervals(_intervals, settings));
 	if (rootInterval) {
-		if (!intervals) throw new Error("(RS::V3::To::parseIntervals) no accompanying intervals for rootInterval");
+		if (!intervals) throw new Error("(RS::To::parseIntervals) no accompanying intervals for rootInterval");
 		return makeChainable(rootInterval.intervals).chain((x) => groupBy(x, (i) => getDayIndex(i.start)), (x) => Object.entries(x).map(([day, is]) => {
 			const limits = intervals.at(parseInt(day));
-			if (!limits) throw new Error(`(RS::V3::To::Intervals) Day ${day} not found in dayStartAndEnds`);
+			if (!limits) throw new Error(`(RS::To::Intervals) Day ${day} not found in dayStartAndEnds`);
 			return is.map((i) => ({
 				beg: parseFloat(moment.utc(i.start).format("HH.mm")),
 				end: parseFloat(moment.utc(i.end).format("HH.mm")),
@@ -58,8 +58,8 @@ function combineAndMapIntervals(_intervals, rootInterval, settings) {
 */
 function getDefaultInterval(settings) {
 	const { dayStart, dayEnd } = settings;
-	if (!dayStart) throw new Error("(RS::V3::To::getDefaultInterval) \"settings.dayStart\" is falsy");
-	if (!dayEnd) throw new Error("(RS::V3::To::getDefaultInterval) \"settings.dayEnd\" is falsy");
+	if (!dayStart) throw new Error("(RS::To::getDefaultInterval) \"settings.dayStart\" is falsy");
+	if (!dayEnd) throw new Error("(RS::To::getDefaultInterval) \"settings.dayEnd\" is falsy");
 	return [{
 		start: dayStart,
 		end: dayEnd
@@ -76,14 +76,26 @@ function computesDefaultIntervalId(settings, options) {
 */
 function extractUniqueIntervals(settings, groups, teachers, courses, events, lockedTimes, options) {
 	const defaultInterval = getDefaultInterval(settings);
-	const withRootIntervals = new Array().concat(groups, teachers).map((item) => ({
-		id: idOf.intervalPairReference(item.intervals, item.rootIntervals, options),
-		data: [item.intervals ?? defaultInterval, item.rootIntervals ?? settings.defaultRootInterval]
-	}));
-	const withoutRootIntervals = new Array().concat({ intervals: defaultInterval }, courses, events, lockedTimes).map((item) => ({
-		id: idOf.intervalPairReference(item.intervals, void 0, options),
-		data: [item.intervals ?? defaultInterval, void 0]
-	}));
+	const withRootIntervals = [...groups, ...teachers].map((item) => {
+		const intervals = item.intervals ?? defaultInterval;
+		const rootInterval = item.rootInterval ?? settings.defaultRootInterval;
+		return {
+			id: idOf.intervalPairReference(intervals, rootInterval, options),
+			data: [intervals, rootInterval]
+		};
+	});
+	const withoutRootIntervals = [
+		{ intervals: defaultInterval },
+		...courses,
+		...events,
+		...lockedTimes
+	].map((item) => {
+		const interval = item.intervals ?? ("course" in item ? item.course?.intervals : void 0) ?? defaultInterval;
+		return {
+			id: idOf.intervalPairReference(interval, void 0, options),
+			data: [interval, void 0]
+		};
+	});
 	return makeChainable(withRootIntervals).chain((x) => x.concat(withoutRootIntervals), (x) => uniqBy(x, (x$1) => x$1.id), (x) => x.map(({ id, data: [_intervals, rootInterval] }) => {
 		const value = combineAndMapIntervals(_intervals, rootInterval, settings);
 		if (!value) return;

package/dist/RS/to/input/intervals.js.map

@@ -1 +1 @@
-{"version":3,"file":"intervals.js","names":["x"],"sources":["../../../../src/RS/to/input/intervals.ts"],"sourcesContent":["import moment from 'moment';\nimport { groupBy, uniqBy } from 'lodash-es';\nimport type { Types } from '../../types';\nimport type { ConnectedTypes } from '../../make-connected';\nimport type { AllowedInterval } from '../../../core/types/common/intervals';\nimport { idOf } from './util/util';\nimport { getDayIndex } from '../../../core/util';\nimport type { DateType } from '../../../common/types';\nimport type { RootInterval } from '../../../core/types/root-intervals';\nimport { makeChainable } from '../../../common/make-chainable';\n\n/**\n * Removes the shorthand notation (a single day to represent all days)\n */\nfunction standardizeIntervals (\n  intervals:     AllowedInterval[] | undefined,\n  settings:      ConnectedTypes.divisionSettings\n): AllowedInterval[] | undefined {\n  if (intervals?.length == 1) {\n    const i = intervals[0];\n    const start = moment.utc(i.start, 'HH:mm');\n    const end   = moment.utc(i.end,   'HH:mm');\n    return Array.from({ length: settings.numDays }, () => ({ start: start.clone(), end: end.clone() }));\n  }\n\n  return intervals;\n}\n\n/**\n * Converts the intervals to float type intervals\n */\nfunction toFloatIntervals (\n  intervals: AllowedInterval[] | undefined\n): { beg: number, end: number }[] | undefined {\n  return intervals?.map((i, day: number) => {\n    if (!i.start || !i.end) throw new Error(`(RS::V3::To::convertIntervals) Interval missing start or end for day ${day}: ${JSON.stringify(i)}`);\n    const start = parseFloat(moment.utc(i.start).format('HH.mm'));\n    const end   = parseFloat(moment.utc(i.end  ).format('HH.mm'));\n    return { beg: start, end: end };\n  });\n}\n\n/**\n * Converts\n */\nfunction combineAndMapIntervals (\n  _intervals:    AllowedInterval[]           | undefined,\n  rootInterval:  ConnectedTypes.rootInterval | undefined,\n  settings:      ConnectedTypes.divisionSettings\n): Types.interval[][] | undefined {\n  const intervals = toFloatIntervals(standardizeIntervals(_intervals, settings));\n\n  if (rootInterval) {\n    if (!intervals) throw new Error('(RS::V3::To::parseIntervals) no accompanying intervals for rootInterval');\n    return makeChainable(rootInterval.intervals)\n      .chain(\n        x => groupBy(x, i => getDayIndex(i.start)),\n        x => Object.entries(x)\n          .map(([day, is]) => {\n            const limits = intervals.at(parseInt(day));\n            if (!limits) throw new Error(`(RS::V3::To::Intervals) Day ${day} not found in dayStartAndEnds`);\n\n            // remove all block intervals that lay outside the day start and end\n            return is\n              .map(i => ({\n                beg:    parseFloat(moment.utc(i.start).format('HH.mm')),\n                end:    parseFloat(moment.utc(i.end  ).format('HH.mm')),\n                binary: true\n              } satisfies Types.interval))\n              .filter(i => i.beg >= limits.beg && i.end <= limits.end);\n          })\n      )\n      .value;\n  }\n  if (intervals) {\n    return intervals.map(i => [i]);\n  }\n  return;\n};\n\n/**\n * extracts the default interval given the division settings\n */\nexport function getDefaultInterval (settings: ConnectedTypes.divisionSettings): AllowedInterval[] {\n  const { dayStart, dayEnd } = settings;\n  if (!dayStart) throw new Error('(RS::V3::To::getDefaultInterval) \"settings.dayStart\" is falsy');\n  if (!dayEnd  ) throw new Error('(RS::V3::To::getDefaultInterval) \"settings.dayEnd\" is falsy');\n  return [{ start: dayStart, end: dayEnd }];\n}\n\n/**\n * Computes the default interval id given the division settings\n */\nexport function computesDefaultIntervalId (\n  settings: ConnectedTypes.divisionSettings,\n  options:  Types.parsedToOptions\n): string {\n  return idOf.intervalPairReference(getDefaultInterval(settings), undefined, options);\n}\n\n/**\n * Extracts all unique intervals and interval-root interval pairs used by the provided entities\n */\nexport function extractUniqueIntervals (\n  settings:    ConnectedTypes.divisionSettings,\n  groups:      ConnectedTypes.group[],\n  teachers:    ConnectedTypes.teacher[],\n  courses:     ConnectedTypes.course[],\n  events:      ConnectedTypes.event[],\n  lockedTimes: ConnectedTypes.lockedTime[],\n  options:  Types.parsedToOptions\n): Types.rootInterval[] {\n  const defaultInterval = getDefaultInterval(settings);\n\n  type Item            = { intervals?: AllowedInterval[]; rootIntervals?: ConnectedTypes.rootInterval };\n  type InheritedWithId = { id: string, data: [AllowedInterval<DateType>[] | undefined, RootInterval | undefined] };\n\n  // apply interval inheritance to the entities carrying root intervals\n  const withRootIntervals = new Array<Item>()\n    .concat(groups, teachers)\n    .map((item): InheritedWithId => ({\n      id:   idOf.intervalPairReference(item.intervals, item.rootIntervals, options),\n      data: [\n        item.intervals     ?? defaultInterval,\n        item.rootIntervals ?? settings.defaultRootInterval\n      ]\n    }));\n\n  const withoutRootIntervals = new Array<Item>()\n    .concat({ intervals: defaultInterval }, courses, events, lockedTimes)\n    .map((item): InheritedWithId => ({\n      id:   idOf.intervalPairReference(item.intervals, undefined, options),\n      data: [\n        item.intervals ?? defaultInterval,\n        undefined\n      ]\n    }));\n\n  return makeChainable(withRootIntervals)\n    .chain(\n      x => x.concat(withoutRootIntervals),\n      x => uniqBy(x, x => x.id),\n      x => x\n        .map(({ id, data: [_intervals, rootInterval] }) => {\n          // compute the corresponding root interval for each interval pair\n          const value = combineAndMapIntervals(_intervals, rootInterval, settings);\n          if (!value) return;\n          return { id, value } as Required<Types.rootInterval>;\n        })\n        .filter(x => x != null)\n    )\n    .value;\n};\n"],"mappings":";;;;;;;;;;AAcA,SAAS,qBACP,WACA,UAC+B;AAC/B,KAAI,WAAW,UAAU,GAAG;EAC1B,MAAM,IAAI,UAAU;EACpB,MAAM,QAAQ,OAAO,IAAI,EAAE,OAAO;EAClC,MAAM,MAAQ,OAAO,IAAI,EAAE,KAAO;AAClC,SAAO,MAAM,KAAK,EAAE,QAAQ,SAAS,kBAAkB;GAAE,OAAO,MAAM;GAAS,KAAK,IAAI;;;AAG1F,QAAO;;;;;AAMT,SAAS,iBACP,WAC4C;AAC5C,QAAO,WAAW,KAAK,GAAG,QAAgB;AACxC,MAAI,CAAC,EAAE,SAAS,CAAC,EAAE,IAAK,OAAM,IAAI,MAAM,wEAAwE,IAAI,IAAI,KAAK,UAAU;EACvI,MAAM,QAAQ,WAAW,OAAO,IAAI,EAAE,OAAO,OAAO;EACpD,MAAM,MAAQ,WAAW,OAAO,IAAI,EAAE,KAAO,OAAO;AACpD,SAAO;GAAE,KAAK;GAAY;;;;;;;AAO9B,SAAS,uBACP,YACA,cACA,UACgC;CAChC,MAAM,YAAY,iBAAiB,qBAAqB,YAAY;AAEpE,KAAI,cAAc;AAChB,MAAI,CAAC,UAAW,OAAM,IAAI,MAAM;AAChC,SAAO,cAAc,aAAa,WAC/B,OACC,MAAK,QAAQ,IAAG,MAAK,YAAY,EAAE,UACnC,MAAK,OAAO,QAAQ,GACjB,KAAK,CAAC,KAAK,QAAQ;GAClB,MAAM,SAAS,UAAU,GAAG,SAAS;AACrC,OAAI,CAAC,OAAQ,OAAM,IAAI,MAAM,+BAA+B,IAAI;AAGhE,UAAO,GACJ,KAAI,OAAM;IACT,KAAQ,WAAW,OAAO,IAAI,EAAE,OAAO,OAAO;IAC9C,KAAQ,WAAW,OAAO,IAAI,EAAE,KAAO,OAAO;IAC9C,QAAQ;OAET,QAAO,MAAK,EAAE,OAAO,OAAO,OAAO,EAAE,OAAO,OAAO;MAG3D;;AAEL,KAAI,UACF,QAAO,UAAU,KAAI,MAAK,CAAC;;;;;AAQ/B,SAAgB,mBAAoB,UAA8D;CAChG,MAAM,EAAE,UAAU,WAAW;AAC7B,KAAI,CAAC,SAAU,OAAM,IAAI,MAAM;AAC/B,KAAI,CAAC,OAAU,OAAM,IAAI,MAAM;AAC/B,QAAO,CAAC;EAAE,OAAO;EAAU,KAAK;;;;;;AAMlC,SAAgB,0BACd,UACA,SACQ;AACR,QAAO,KAAK,sBAAsB,mBAAmB,WAAW,QAAW;;;;;AAM7E,SAAgB,uBACd,UACA,QACA,UACA,SACA,QACA,aACA,SACsB;CACtB,MAAM,kBAAkB,mBAAmB;CAM3C,MAAM,oBAAoB,IAAI,QAC3B,OAAO,QAAQ,UACf,KAAK,UAA2B;EAC/B,IAAM,KAAK,sBAAsB,KAAK,WAAW,KAAK,eAAe;EACrE,MAAM,CACJ,KAAK,aAAiB,iBACtB,KAAK,iBAAiB,SAAS;;CAIrC,MAAM,uBAAuB,IAAI,QAC9B,OAAO,EAAE,WAAW,mBAAmB,SAAS,QAAQ,aACxD,KAAK,UAA2B;EAC/B,IAAM,KAAK,sBAAsB,KAAK,WAAW,QAAW;EAC5D,MAAM,CACJ,KAAK,aAAa,iBAClB;;AAIN,QAAO,cAAc,mBAClB,OACC,MAAK,EAAE,OAAO,wBACd,MAAK,OAAO,IAAG,QAAKA,IAAE,MACtB,MAAK,EACF,KAAK,EAAE,IAAI,MAAM,CAAC,YAAY,oBAAoB;EAEjD,MAAM,QAAQ,uBAAuB,YAAY,cAAc;AAC/D,MAAI,CAAC,MAAO;AACZ,SAAO;GAAE;GAAI;;IAEd,QAAO,QAAKA,OAAK,OAErB"}
+{"version":3,"file":"intervals.js","names":["x"],"sources":["../../../../src/RS/to/input/intervals.ts"],"sourcesContent":["import moment from 'moment';\nimport { groupBy, uniqBy } from 'lodash-es';\nimport type { Types } from '../../types';\nimport type { ConnectedTypes } from '../../make-connected';\nimport type { AllowedInterval } from '../../../core/types/common/intervals';\nimport { idOf } from './util/util';\nimport { getDayIndex } from '../../../core/util';\nimport type { DateType } from '../../../common/types';\nimport type { RootInterval } from '../../../core/types/root-intervals';\nimport { makeChainable } from '../../../common/make-chainable';\n\n/**\n * Removes the shorthand notation (a single day to represent all days)\n */\nfunction standardizeIntervals (\n  intervals:     AllowedInterval[] | undefined,\n  settings:      ConnectedTypes.divisionSettings\n): AllowedInterval[] | undefined {\n  if (intervals?.length == 1) {\n    const i = intervals[0];\n    const start = moment.utc(i.start, 'HH:mm');\n    const end   = moment.utc(i.end,   'HH:mm');\n    return Array.from({ length: settings.numDays }, () => ({ start: start.clone(), end: end.clone() }));\n  }\n\n  return intervals;\n}\n\n/**\n * Converts the intervals to float type intervals\n */\nfunction toFloatIntervals (\n  intervals: AllowedInterval[] | undefined\n): { beg: number, end: number }[] | undefined {\n  return intervals?.map((i, day: number) => {\n    if (!i.start || !i.end) throw new Error(`(RS::To::convertIntervals) Interval missing start or end for day ${day}: ${JSON.stringify(i)}`);\n    const start = parseFloat(moment.utc(i.start).format('HH.mm'));\n    const end   = parseFloat(moment.utc(i.end  ).format('HH.mm'));\n    return { beg: start, end: end };\n  });\n}\n\n/**\n * Converts\n */\nfunction combineAndMapIntervals (\n  _intervals:    AllowedInterval[]           | undefined,\n  rootInterval:  ConnectedTypes.rootInterval | undefined,\n  settings:      ConnectedTypes.divisionSettings\n): Types.interval[][] | undefined {\n  const intervals = toFloatIntervals(standardizeIntervals(_intervals, settings));\n\n  if (rootInterval) {\n    if (!intervals) throw new Error('(RS::To::parseIntervals) no accompanying intervals for rootInterval');\n    return makeChainable(rootInterval.intervals)\n      .chain(\n        x => groupBy(x, i => getDayIndex(i.start)),\n        x => Object.entries(x)\n          .map(([day, is]) => {\n            const limits = intervals.at(parseInt(day));\n            if (!limits) throw new Error(`(RS::To::Intervals) Day ${day} not found in dayStartAndEnds`);\n\n            // remove all block intervals that lay outside the day start and end\n            return is\n              .map(i => ({\n                beg:    parseFloat(moment.utc(i.start).format('HH.mm')),\n                end:    parseFloat(moment.utc(i.end  ).format('HH.mm')),\n                binary: true\n              } satisfies Types.interval))\n              .filter(i => i.beg >= limits.beg && i.end <= limits.end);\n          })\n      )\n      .value;\n  }\n  if (intervals) {\n    return intervals.map(i => [i]);\n  }\n  return;\n};\n\n/**\n * extracts the default interval given the division settings\n */\nexport function getDefaultInterval (settings: ConnectedTypes.divisionSettings): AllowedInterval[] {\n  const { dayStart, dayEnd } = settings;\n  if (!dayStart) throw new Error('(RS::To::getDefaultInterval) \"settings.dayStart\" is falsy');\n  if (!dayEnd  ) throw new Error('(RS::To::getDefaultInterval) \"settings.dayEnd\" is falsy');\n  return [{ start: dayStart, end: dayEnd }];\n}\n\n/**\n * Computes the default interval id given the division settings\n */\nexport function computesDefaultIntervalId (\n  settings: ConnectedTypes.divisionSettings,\n  options:  Types.parsedToOptions\n): string {\n  return idOf.intervalPairReference(getDefaultInterval(settings), undefined, options);\n}\n\n/**\n * Extracts all unique intervals and interval-root interval pairs used by the provided entities\n */\nexport function extractUniqueIntervals (\n  settings:    ConnectedTypes.divisionSettings,\n  groups:      ConnectedTypes.group[],\n  teachers:    ConnectedTypes.teacher[],\n  courses:     ConnectedTypes.course[],\n  events:      ConnectedTypes.event[],\n  lockedTimes: ConnectedTypes.lockedTime[],\n  options:  Types.parsedToOptions\n): Types.rootInterval[] {\n  const defaultInterval = getDefaultInterval(settings);\n\n  type InheritedWithId = { id: string, data: [AllowedInterval<DateType>[] | undefined, RootInterval | undefined] };\n\n  const withRootIntervals = [...groups, ...teachers]\n    .map((item): InheritedWithId => {\n      const intervals    = item.intervals    ?? defaultInterval;\n      const rootInterval = item.rootInterval ?? settings.defaultRootInterval;\n\n      return {\n        id:   idOf.intervalPairReference(intervals, rootInterval, options),\n        data: [intervals, rootInterval]\n      };\n    });\n\n  const withoutRootIntervals = [{ intervals: defaultInterval }, ...courses, ...events, ...lockedTimes]\n    .map((item): InheritedWithId => {\n      const interval = item.intervals ?? ('course' in item ? item.course?.intervals : undefined) ?? defaultInterval;\n\n      return {\n        id:   idOf.intervalPairReference(interval, undefined, options),\n        data: [interval, undefined]\n      };\n    });\n\n  return makeChainable(withRootIntervals)\n    .chain(\n      x => x.concat(withoutRootIntervals),\n      x => uniqBy(x, x => x.id),\n      x => x\n        .map(({ id, data: [_intervals, rootInterval] }) => {\n          // compute the corresponding root interval for each interval pair\n          const value = combineAndMapIntervals(_intervals, rootInterval, settings);\n          if (!value) return;\n          return { id, value } as Required<Types.rootInterval>;\n        })\n        .filter(x => x != null)\n    )\n    .value;\n};\n"],"mappings":";;;;;;;;;;AAcA,SAAS,qBACP,WACA,UAC+B;AAC/B,KAAI,WAAW,UAAU,GAAG;EAC1B,MAAM,IAAI,UAAU;EACpB,MAAM,QAAQ,OAAO,IAAI,EAAE,OAAO;EAClC,MAAM,MAAQ,OAAO,IAAI,EAAE,KAAO;AAClC,SAAO,MAAM,KAAK,EAAE,QAAQ,SAAS,kBAAkB;GAAE,OAAO,MAAM;GAAS,KAAK,IAAI;;;AAG1F,QAAO;;;;;AAMT,SAAS,iBACP,WAC4C;AAC5C,QAAO,WAAW,KAAK,GAAG,QAAgB;AACxC,MAAI,CAAC,EAAE,SAAS,CAAC,EAAE,IAAK,OAAM,IAAI,MAAM,oEAAoE,IAAI,IAAI,KAAK,UAAU;EACnI,MAAM,QAAQ,WAAW,OAAO,IAAI,EAAE,OAAO,OAAO;EACpD,MAAM,MAAQ,WAAW,OAAO,IAAI,EAAE,KAAO,OAAO;AACpD,SAAO;GAAE,KAAK;GAAY;;;;;;;AAO9B,SAAS,uBACP,YACA,cACA,UACgC;CAChC,MAAM,YAAY,iBAAiB,qBAAqB,YAAY;AAEpE,KAAI,cAAc;AAChB,MAAI,CAAC,UAAW,OAAM,IAAI,MAAM;AAChC,SAAO,cAAc,aAAa,WAC/B,OACC,MAAK,QAAQ,IAAG,MAAK,YAAY,EAAE,UACnC,MAAK,OAAO,QAAQ,GACjB,KAAK,CAAC,KAAK,QAAQ;GAClB,MAAM,SAAS,UAAU,GAAG,SAAS;AACrC,OAAI,CAAC,OAAQ,OAAM,IAAI,MAAM,2BAA2B,IAAI;AAG5D,UAAO,GACJ,KAAI,OAAM;IACT,KAAQ,WAAW,OAAO,IAAI,EAAE,OAAO,OAAO;IAC9C,KAAQ,WAAW,OAAO,IAAI,EAAE,KAAO,OAAO;IAC9C,QAAQ;OAET,QAAO,MAAK,EAAE,OAAO,OAAO,OAAO,EAAE,OAAO,OAAO;MAG3D;;AAEL,KAAI,UACF,QAAO,UAAU,KAAI,MAAK,CAAC;;;;;AAQ/B,SAAgB,mBAAoB,UAA8D;CAChG,MAAM,EAAE,UAAU,WAAW;AAC7B,KAAI,CAAC,SAAU,OAAM,IAAI,MAAM;AAC/B,KAAI,CAAC,OAAU,OAAM,IAAI,MAAM;AAC/B,QAAO,CAAC;EAAE,OAAO;EAAU,KAAK;;;;;;AAMlC,SAAgB,0BACd,UACA,SACQ;AACR,QAAO,KAAK,sBAAsB,mBAAmB,WAAW,QAAW;;;;;AAM7E,SAAgB,uBACd,UACA,QACA,UACA,SACA,QACA,aACA,SACsB;CACtB,MAAM,kBAAkB,mBAAmB;CAI3C,MAAM,oBAAoB,CAAC,GAAG,QAAQ,GAAG,UACtC,KAAK,SAA0B;EAC9B,MAAM,YAAe,KAAK,aAAgB;EAC1C,MAAM,eAAe,KAAK,gBAAgB,SAAS;AAEnD,SAAO;GACL,IAAM,KAAK,sBAAsB,WAAW,cAAc;GAC1D,MAAM,CAAC,WAAW;;;CAIxB,MAAM,uBAAuB;EAAC,EAAE,WAAW;EAAmB,GAAG;EAAS,GAAG;EAAQ,GAAG;GACrF,KAAK,SAA0B;EAC9B,MAAM,WAAW,KAAK,cAAc,YAAY,OAAO,KAAK,QAAQ,YAAY,WAAc;AAE9F,SAAO;GACL,IAAM,KAAK,sBAAsB,UAAU,QAAW;GACtD,MAAM,CAAC,UAAU;;;AAIvB,QAAO,cAAc,mBAClB,OACC,MAAK,EAAE,OAAO,wBACd,MAAK,OAAO,IAAG,QAAKA,IAAE,MACtB,MAAK,EACF,KAAK,EAAE,IAAI,MAAM,CAAC,YAAY,oBAAoB;EAEjD,MAAM,QAAQ,uBAAuB,YAAY,cAAc;AAC/D,MAAI,CAAC,MAAO;AACZ,SAAO;GAAE;GAAI;;IAEd,QAAO,QAAKA,OAAK,OAErB"}

package/dist/RS/to/input/periods.js

@@ -31,7 +31,7 @@ function parsePeriods(periods, division, options) {
 		ranges: x$1[0].ranges
 	}))).value;
 	const matrix = grouped.map((x) => grouped.map((y) => anyRangesOverlap(x.ranges, y.ranges) ? "1" : "0").join("")).join("");
-	if (matrix == "" || matrix == "0") throw new Error("(RS::V3::To::parsePeriods) invalid matrix value: " + matrix);
+	if (matrix == "" || matrix == "0") throw new Error("(RS::To::parsePeriods) invalid matrix value: " + matrix);
 	const indexMap = new Map(grouped.flatMap((xs) => xs.ids.map((id) => [id, xs.index])));
 	return {
 		map: indexMap,

package/dist/RS/to/input/periods.js.map

@@ -1 +1 @@
-{"version":3,"file":"periods.js","names":["x"],"sources":["../../../../src/RS/to/input/periods.ts"],"sourcesContent":["import { groupBy } from 'lodash-es';\nimport moment from 'moment';\nimport { getIdKey, getVertexId } from '../../../core/util';\nimport type { Interval } from '../../../core/types/common/intervals';\nimport type { ConnectedTypes } from '../../make-connected';\nimport type { Types } from '../../types';\nimport { anyRangesOverlap } from '../../../common/functions';\nimport { makeChainable } from '../../../common/make-chainable';\n\ntype Range = Partial<Interval<string | moment.Moment | Date>>;\ntype DateRange = Interval<moment.Moment>;\n\nfunction createRange ({ start, end }: Range): DateRange {\n  return {\n    start: moment.utc(start).clone()\n      .startOf('isoWeek')\n      .startOf('day'),\n    end: moment.utc(end).clone()\n      .endOf  ('isoWeek')\n      .endOf  ('day')\n  };\n}\n\ntype Out = {\n  map:     Map<string | undefined, number>,\n  matrix?: string\n};\n\nexport function parsePeriods (\n  periods:  ConnectedTypes.period[] | undefined,\n  division: ConnectedTypes.division,\n  options:  Types.parsedToOptions\n): Out {\n  const idKey = getIdKey(options);\n\n  // if empty periods are given, return empty map only\n  if (!periods?.length) {\n    return { map: new Map<string | undefined, number>() };\n  }\n\n  // convert the ranges to moment ranges\n  const parsedPeriods = periods.map(x => ({ id: getVertexId(x, idKey) as string | undefined, ranges: x.ranges.map(r => createRange(r)) }));\n\n  // add default period that includes all weeks\n  parsedPeriods.push({ id: undefined, ranges: [createRange(division)] });\n\n  // Compute a pairwise binary overlapping string for each periods and group those that have identical such string.\n  // The latter so that the number of periods may be reduced by omitting periods that overlap identically\n  const grouped = makeChainable(parsedPeriods)\n    .chain(\n      x => x\n        .map(x => ({\n          ...x,\n          overlap: parsedPeriods.map(y => anyRangesOverlap(x.ranges, y.ranges) ? '1' : '0').join('')\n        })),\n      x => groupBy(x, x => x.overlap),\n      x => Object.values(x)\n        .map((x, i) => ({ ids: x.map(x => x.id), index: i,  ranges: x[0].ranges }))\n    )\n    .value;\n\n  // Merge the pairwise binary overlapping string and store it as a matrix string.\n  const matrix = grouped\n    .map(x => grouped\n      .map(y => anyRangesOverlap(x.ranges, y.ranges) ? '1' : '0')\n      .join('')\n    )\n    .join('');\n\n  if (matrix == '' || matrix == '0') {\n    throw new Error('(RS::V3::To::parsePeriods) invalid matrix value: ' + matrix);\n  }\n\n  // Also store in a map what period id corresponds to which row in the matrix.\n  const indexMap = new Map(\n    grouped.flatMap(xs => xs.ids.map(id => ([id, xs.index]) as const))\n  );\n\n  return { map: indexMap, matrix };\n}\n\n"],"mappings":";;;;;;;AAYA,SAAS,YAAa,EAAE,OAAO,OAAyB;AACtD,QAAO;EACL,OAAO,OAAO,IAAI,OAAO,QACtB,QAAQ,WACR,QAAQ;EACX,KAAK,OAAO,IAAI,KAAK,QAClB,MAAQ,WACR,MAAQ;;;AASf,SAAgB,aACd,SACA,UACA,SACK;CACL,MAAM,QAAQ,SAAS;AAGvB,KAAI,CAAC,SAAS,OACZ,QAAO,EAAE,qBAAK,IAAI;CAIpB,MAAM,gBAAgB,QAAQ,KAAI,OAAM;EAAE,IAAI,YAAY,GAAG;EAA8B,QAAQ,EAAE,OAAO,KAAI,MAAK,YAAY;;AAGjI,eAAc,KAAK;EAAE,IAAI;EAAW,QAAQ,CAAC,YAAY;;CAIzD,MAAM,UAAU,cAAc,eAC3B,OACC,MAAK,EACF,KAAI,SAAM;EACT,GAAGA;EACH,SAAS,cAAc,KAAI,MAAK,iBAAiBA,IAAE,QAAQ,EAAE,UAAU,MAAM,KAAK,KAAK;OAE3F,MAAK,QAAQ,IAAG,QAAKA,IAAE,WACvB,MAAK,OAAO,OAAO,GAChB,KAAK,KAAG,OAAO;EAAE,KAAKA,IAAE,KAAI,QAAKA,IAAE;EAAK,OAAO;EAAI,QAAQA,IAAE,GAAG;MAEpE;CAGH,MAAM,SAAS,QACZ,KAAI,MAAK,QACP,KAAI,MAAK,iBAAiB,EAAE,QAAQ,EAAE,UAAU,MAAM,KACtD,KAAK,KAEP,KAAK;AAER,KAAI,UAAU,MAAM,UAAU,IAC5B,OAAM,IAAI,MAAM,sDAAsD;CAIxE,MAAM,WAAW,IAAI,IACnB,QAAQ,SAAQ,OAAM,GAAG,IAAI,KAAI,OAAO,CAAC,IAAI,GAAG;AAGlD,QAAO;EAAE,KAAK;EAAU"}
+{"version":3,"file":"periods.js","names":["x"],"sources":["../../../../src/RS/to/input/periods.ts"],"sourcesContent":["import { groupBy } from 'lodash-es';\nimport moment from 'moment';\nimport { getIdKey, getVertexId } from '../../../core/util';\nimport type { Interval } from '../../../core/types/common/intervals';\nimport type { ConnectedTypes } from '../../make-connected';\nimport type { Types } from '../../types';\nimport { anyRangesOverlap } from '../../../common/functions';\nimport { makeChainable } from '../../../common/make-chainable';\n\ntype Range = Partial<Interval<string | moment.Moment | Date>>;\ntype DateRange = Interval<moment.Moment>;\n\nfunction createRange ({ start, end }: Range): DateRange {\n  return {\n    start: moment.utc(start).clone()\n      .startOf('isoWeek')\n      .startOf('day'),\n    end: moment.utc(end).clone()\n      .endOf  ('isoWeek')\n      .endOf  ('day')\n  };\n}\n\ntype Out = {\n  map:     Map<string | undefined, number>,\n  matrix?: string\n};\n\nexport function parsePeriods (\n  periods:  ConnectedTypes.period[] | undefined,\n  division: ConnectedTypes.division,\n  options:  Types.parsedToOptions\n): Out {\n  const idKey = getIdKey(options);\n\n  // if empty periods are given, return empty map only\n  if (!periods?.length) {\n    return { map: new Map<string | undefined, number>() };\n  }\n\n  // convert the ranges to moment ranges\n  const parsedPeriods = periods.map(x => ({ id: getVertexId(x, idKey) as string | undefined, ranges: x.ranges.map(r => createRange(r)) }));\n\n  // add default period that includes all weeks\n  parsedPeriods.push({ id: undefined, ranges: [createRange(division)] });\n\n  // Compute a pairwise binary overlapping string for each periods and group those that have identical such string.\n  // The latter so that the number of periods may be reduced by omitting periods that overlap identically\n  const grouped = makeChainable(parsedPeriods)\n    .chain(\n      x => x\n        .map(x => ({\n          ...x,\n          overlap: parsedPeriods.map(y => anyRangesOverlap(x.ranges, y.ranges) ? '1' : '0').join('')\n        })),\n      x => groupBy(x, x => x.overlap),\n      x => Object.values(x)\n        .map((x, i) => ({ ids: x.map(x => x.id), index: i,  ranges: x[0].ranges }))\n    )\n    .value;\n\n  // Merge the pairwise binary overlapping string and store it as a matrix string.\n  const matrix = grouped\n    .map(x => grouped\n      .map(y => anyRangesOverlap(x.ranges, y.ranges) ? '1' : '0')\n      .join('')\n    )\n    .join('');\n\n  if (matrix == '' || matrix == '0') {\n    throw new Error('(RS::To::parsePeriods) invalid matrix value: ' + matrix);\n  }\n\n  // Also store in a map what period id corresponds to which row in the matrix.\n  const indexMap = new Map(\n    grouped.flatMap(xs => xs.ids.map(id => ([id, xs.index]) as const))\n  );\n\n  return { map: indexMap, matrix };\n}\n\n"],"mappings":";;;;;;;AAYA,SAAS,YAAa,EAAE,OAAO,OAAyB;AACtD,QAAO;EACL,OAAO,OAAO,IAAI,OAAO,QACtB,QAAQ,WACR,QAAQ;EACX,KAAK,OAAO,IAAI,KAAK,QAClB,MAAQ,WACR,MAAQ;;;AASf,SAAgB,aACd,SACA,UACA,SACK;CACL,MAAM,QAAQ,SAAS;AAGvB,KAAI,CAAC,SAAS,OACZ,QAAO,EAAE,qBAAK,IAAI;CAIpB,MAAM,gBAAgB,QAAQ,KAAI,OAAM;EAAE,IAAI,YAAY,GAAG;EAA8B,QAAQ,EAAE,OAAO,KAAI,MAAK,YAAY;;AAGjI,eAAc,KAAK;EAAE,IAAI;EAAW,QAAQ,CAAC,YAAY;;CAIzD,MAAM,UAAU,cAAc,eAC3B,OACC,MAAK,EACF,KAAI,SAAM;EACT,GAAGA;EACH,SAAS,cAAc,KAAI,MAAK,iBAAiBA,IAAE,QAAQ,EAAE,UAAU,MAAM,KAAK,KAAK;OAE3F,MAAK,QAAQ,IAAG,QAAKA,IAAE,WACvB,MAAK,OAAO,OAAO,GAChB,KAAK,KAAG,OAAO;EAAE,KAAKA,IAAE,KAAI,QAAKA,IAAE;EAAK,OAAO;EAAI,QAAQA,IAAE,GAAG;MAEpE;CAGH,MAAM,SAAS,QACZ,KAAI,MAAK,QACP,KAAI,MAAK,iBAAiB,EAAE,QAAQ,EAAE,UAAU,MAAM,KACtD,KAAK,KAEP,KAAK;AAER,KAAI,UAAU,MAAM,UAAU,IAC5B,OAAM,IAAI,MAAM,kDAAkD;CAIpE,MAAM,WAAW,IAAI,IACnB,QAAQ,SAAQ,OAAM,GAAG,IAAI,KAAI,OAAO,CAAC,IAAI,GAAG;AAGlD,QAAO;EAAE,KAAK;EAAU"}

package/dist/RS/to/input/settings.js

@@ -1,7 +1,7 @@
 //#region src/RS/to/input/settings.ts
 function parseSettings(settings) {
-	if (!settings.numDays) throw new Error("(RS::V3::To::parseSettings) numDays is falsy");
-	if (!settings.discretization) throw new Error("(RS::V3::To::parseSettings) discretization is falsy");
+	if (!settings.numDays) throw new Error("(RS::To::parseSettings) numDays is falsy");
+	if (!settings.discretization) throw new Error("(RS::To::parseSettings) discretization is falsy");
 	return {
 		numDays: settings.numDays,
 		discretization: settings.numDays,

package/dist/RS/to/input/settings.js.map

@@ -1 +1 @@
-{"version":3,"file":"settings.js","names":[],"sources":["../../../../src/RS/to/input/settings.ts"],"sourcesContent":["import type { Types } from '../../types';\nimport type { ConnectedTypes } from '../../make-connected';\n\nexport function parseSettings (settings: ConnectedTypes.divisionSettings): Types.settings {\n\n  if (!settings.numDays)        throw new Error('(RS::V3::To::parseSettings) numDays is falsy');\n  if (!settings.discretization) throw new Error('(RS::V3::To::parseSettings) discretization is falsy');\n\n  return {\n    numDays:        settings.numDays,\n    discretization: settings.numDays,\n\n    dependencyIdKey: 'id',\n    groupIdKey:      'id',\n    collectionIdKey: 'id',\n    eventIdKey:      'id'\n  };\n};"],"mappings":";AAGA,SAAgB,cAAe,UAA2D;AAExF,KAAI,CAAC,SAAS,QAAgB,OAAM,IAAI,MAAM;AAC9C,KAAI,CAAC,SAAS,eAAgB,OAAM,IAAI,MAAM;AAE9C,QAAO;EACL,SAAgB,SAAS;EACzB,gBAAgB,SAAS;EAEzB,iBAAiB;EACjB,YAAiB;EACjB,iBAAiB;EACjB,YAAiB"}
+{"version":3,"file":"settings.js","names":[],"sources":["../../../../src/RS/to/input/settings.ts"],"sourcesContent":["import type { Types } from '../../types';\nimport type { ConnectedTypes } from '../../make-connected';\n\nexport function parseSettings (settings: ConnectedTypes.divisionSettings): Types.settings {\n\n  if (!settings.numDays)        throw new Error('(RS::To::parseSettings) numDays is falsy');\n  if (!settings.discretization) throw new Error('(RS::To::parseSettings) discretization is falsy');\n\n  return {\n    numDays:        settings.numDays,\n    discretization: settings.numDays,\n\n    dependencyIdKey: 'id',\n    groupIdKey:      'id',\n    collectionIdKey: 'id',\n    eventIdKey:      'id'\n  };\n};"],"mappings":";AAGA,SAAgB,cAAe,UAA2D;AAExF,KAAI,CAAC,SAAS,QAAgB,OAAM,IAAI,MAAM;AAC9C,KAAI,CAAC,SAAS,eAAgB,OAAM,IAAI,MAAM;AAE9C,QAAO;EACL,SAAgB,SAAS;EACzB,gBAAgB,SAAS;EAEzB,iBAAiB;EACjB,YAAiB;EACjB,iBAAiB;EACjB,YAAiB"}

package/dist/RS/to/input/teachers.js

@@ -4,11 +4,15 @@ import { parseDays } from "./util/parse-days.js";
 import { parseMaxWorkingHours } from "./util/parse-max-working-hours.js";
 import { parseMinimumBreakLength } from "./util/parse-minimum-break-length.js";
 import { parseIntervals } from "./util/parse-intervals.js";
+import { getDefaultInterval } from "./intervals.js";
 import { omitBy } from "lodash-es";
 
 //#region src/RS/to/input/teachers.ts
 function fromTeachers(teachers, settings, options) {
+	const defaultInterval = getDefaultInterval(settings);
 	return teachers.map((teacher) => {
+		const intervals = teacher.intervals ?? defaultInterval;
+		const rootInterval = teacher.rootInterval ?? settings.defaultRootInterval;
 		const doc = {
 			id: idOf.teacher(teacher, options),
 			group_type: "personal",
@@ -17,7 +21,7 @@ function fromTeachers(teachers, settings, options) {
 			forbidOverlappingEvents: options.oldFormat ? teacher.forbidOverlappingEvents : void 0,
 			disableDayLengthPunishment: options.oldFormat ? teacher.disableDayLengthPunishment : void 0,
 			weight: teacher.weight,
-			intervals: options.oldFormat ? parseIntervals(teacher.intervals, teacher.rootInterval ?? settings.defaultRootInterval, settings) : idOf.intervalPairReference(teacher.intervals, teacher.rootInterval, options),
+			intervals: options.oldFormat ? parseIntervals(intervals, rootInterval, settings) : idOf.intervalPairReference(intervals, rootInterval, options),
 			days: parseDays(teacher.days, settings),
 			lockedTimes: attachLockedTimes(teacher.lockedTimes, options),
 			minBreakLength: parseMinimumBreakLength(teacher.minBreakLength),

package/dist/RS/to/input/teachers.js.map

@@ -1 +1 @@
-{"version":3,"file":"teachers.js","names":["doc: Types.group"],"sources":["../../../../src/RS/to/input/teachers.ts"],"sourcesContent":["import { omitBy } from 'lodash-es';\nimport type { Types } from '../../types';\nimport type { ConnectedTypes } from '../../make-connected';\nimport { parseMaxWorkingHours } from './util/parse-max-working-hours';\nimport { parseDays } from './util/parse-days';\nimport { attachLockedTimes } from './util/attach-locked-times';\nimport { parseMinimumBreakLength } from './util/parse-minimum-break-length';\nimport { idOf } from './util/util';\nimport { parseIntervals } from './util/parse-intervals';\n\nexport function fromTeachers (\n  teachers: ConnectedTypes.teacher[],\n  settings: ConnectedTypes.divisionSettings,\n  options:  Types.parsedToOptions\n): Types.group[] {\n  return teachers\n    .map(teacher => {\n      const doc: Types.group = {\n        id:                            idOf.teacher(teacher, options),\n        group_type:                    'personal',\n        minimizeGaps:                  false,\n        minimizeDependencyAlternation: true,\n        forbidOverlappingEvents:       options.oldFormat ? teacher.forbidOverlappingEvents : undefined,  // Deprecated in v3\n        disableDayLengthPunishment:    options.oldFormat ? teacher.disableDayLengthPunishment : undefined,  // Deprecated in v3\n        weight:                        teacher.weight,\n        intervals:                     options.oldFormat\n          ? parseIntervals(teacher.intervals, teacher.rootInterval ?? settings.defaultRootInterval, settings)\n          : idOf.intervalPairReference(teacher.intervals, teacher.rootInterval, options),\n        days:           parseDays                 (teacher.days, settings),\n        lockedTimes:    attachLockedTimes         (teacher.lockedTimes, options),\n        minBreakLength: parseMinimumBreakLength   (teacher.minBreakLength),\n\n        ...parseMaxWorkingHours(teacher, options),\n      };\n\n      if (options.meta) {\n        doc.meta = omitBy({\n          ids:  teacher.ids,\n          name: teacher.displayName,\n        }, x => x == null);\n      }\n\n      return omitBy(doc, x => x == null) as Types.group;\n    });\n};\n"],"mappings":";;;;;;;;;AAUA,SAAgB,aACd,UACA,UACA,SACe;AACf,QAAO,SACJ,KAAI,YAAW;EACd,MAAMA,MAAmB;GACvB,IAA+B,KAAK,QAAQ,SAAS;GACrD,YAA+B;GAC/B,cAA+B;GAC/B,+BAA+B;GAC/B,yBAA+B,QAAQ,YAAY,QAAQ,0BAA0B;GACrF,4BAA+B,QAAQ,YAAY,QAAQ,6BAA6B;GACxF,QAA+B,QAAQ;GACvC,WAA+B,QAAQ,YACnC,eAAe,QAAQ,WAAW,QAAQ,gBAAgB,SAAS,qBAAqB,YACxF,KAAK,sBAAsB,QAAQ,WAAW,QAAQ,cAAc;GACxE,MAAgB,UAA2B,QAAQ,MAAM;GACzD,aAAgB,kBAA2B,QAAQ,aAAa;GAChE,gBAAgB,wBAA2B,QAAQ;GAEnD,GAAG,qBAAqB,SAAS;;AAGnC,MAAI,QAAQ,KACV,KAAI,OAAO,OAAO;GAChB,KAAM,QAAQ;GACd,MAAM,QAAQ;MACb,MAAK,KAAK;AAGf,SAAO,OAAO,MAAK,MAAK,KAAK"}
+{"version":3,"file":"teachers.js","names":["doc: Types.group"],"sources":["../../../../src/RS/to/input/teachers.ts"],"sourcesContent":["import { omitBy } from 'lodash-es';\nimport type { Types } from '../../types';\nimport type { ConnectedTypes } from '../../make-connected';\nimport { parseMaxWorkingHours } from './util/parse-max-working-hours';\nimport { parseDays } from './util/parse-days';\nimport { attachLockedTimes } from './util/attach-locked-times';\nimport { parseMinimumBreakLength } from './util/parse-minimum-break-length';\nimport { idOf } from './util/util';\nimport { parseIntervals } from './util/parse-intervals';\nimport { getDefaultInterval } from './intervals';\n\nexport function fromTeachers (\n  teachers: ConnectedTypes.teacher[],\n  settings: ConnectedTypes.divisionSettings,\n  options:  Types.parsedToOptions\n): Types.group[] {\n  const defaultInterval = getDefaultInterval(settings);\n\n  return teachers\n    .map(teacher => {\n      const intervals    = teacher.intervals    ?? defaultInterval;\n      const rootInterval = teacher.rootInterval ?? settings.defaultRootInterval;\n\n      const doc: Types.group = {\n        id:                            idOf.teacher(teacher, options),\n        group_type:                    'personal',\n        minimizeGaps:                  false,\n        minimizeDependencyAlternation: true,\n        forbidOverlappingEvents:       options.oldFormat ? teacher.forbidOverlappingEvents : undefined,  // Deprecated in v3\n        disableDayLengthPunishment:    options.oldFormat ? teacher.disableDayLengthPunishment : undefined,  // Deprecated in v3\n        weight:                        teacher.weight,\n        intervals:                     options.oldFormat\n          ? parseIntervals(intervals, rootInterval, settings)\n          : idOf.intervalPairReference(intervals, rootInterval, options),\n        days:           parseDays                 (teacher.days, settings),\n        lockedTimes:    attachLockedTimes         (teacher.lockedTimes, options),\n        minBreakLength: parseMinimumBreakLength   (teacher.minBreakLength),\n\n        ...parseMaxWorkingHours(teacher, options),\n      };\n\n      if (options.meta) {\n        doc.meta = omitBy({\n          ids:  teacher.ids,\n          name: teacher.displayName,\n        }, x => x == null);\n      }\n\n      return omitBy(doc, x => x == null) as Types.group;\n    });\n};\n"],"mappings":";;;;;;;;;;AAWA,SAAgB,aACd,UACA,UACA,SACe;CACf,MAAM,kBAAkB,mBAAmB;AAE3C,QAAO,SACJ,KAAI,YAAW;EACd,MAAM,YAAe,QAAQ,aAAgB;EAC7C,MAAM,eAAe,QAAQ,gBAAgB,SAAS;EAEtD,MAAMA,MAAmB;GACvB,IAA+B,KAAK,QAAQ,SAAS;GACrD,YAA+B;GAC/B,cAA+B;GAC/B,+BAA+B;GAC/B,yBAA+B,QAAQ,YAAY,QAAQ,0BAA0B;GACrF,4BAA+B,QAAQ,YAAY,QAAQ,6BAA6B;GACxF,QAA+B,QAAQ;GACvC,WAA+B,QAAQ,YACnC,eAAe,WAAW,cAAc,YACxC,KAAK,sBAAsB,WAAW,cAAc;GACxD,MAAgB,UAA2B,QAAQ,MAAM;GACzD,aAAgB,kBAA2B,QAAQ,aAAa;GAChE,gBAAgB,wBAA2B,QAAQ;GAEnD,GAAG,qBAAqB,SAAS;;AAGnC,MAAI,QAAQ,KACV,KAAI,OAAO,OAAO;GAChB,KAAM,QAAQ;GACd,MAAM,QAAQ;MACb,MAAK,KAAK;AAGf,SAAO,OAAO,MAAK,MAAK,KAAK"}

package/dist/RS/to/input/util/attach-locked-times.js

@@ -6,7 +6,7 @@ function attachLockedTimes(lockedTimes, options) {
 	return lockedTimes?.map((lockedTime) => {
 		const { start: startDate, end: endDate } = parseDateInterval(lockedTime, "locked time");
 		const length = endDate.diff(startDate, "minutes");
-		if (length < 5) throw new Error("(RS::V3::To::LockedTimes) Length of a locked time is less than 5 min");
+		if (length < 5) throw new Error("(RS::To::LockedTimes) Length of a locked time is less than 5 min");
 		const start = parseFloat(startDate.format("HH.mm"));
 		const doc = {
 			day: getDayIndex(startDate),

package/dist/RS/to/input/util/attach-locked-times.js.map

@@ -1 +1 @@
-{"version":3,"file":"attach-locked-times.js","names":["doc: Types.lockedTime"],"sources":["../../../../../src/RS/to/input/util/attach-locked-times.ts"],"sourcesContent":["import { omitBy } from 'lodash-es';\nimport type { Types } from '../../../types';\nimport type { ConnectedTypes } from '../../../make-connected';\nimport { getDayIndex, getVertexId, parseDateInterval } from '../../../../core/util';\n\nexport function attachLockedTimes (\n  lockedTimes: ConnectedTypes.lockedTime[] | null | undefined,\n  options:     Types.parsedToOptions\n): Types.lockedTime[] | undefined {\n\n  return lockedTimes?.map(lockedTime => {\n    const { start: startDate, end: endDate } = parseDateInterval(lockedTime, 'locked time');\n\n    const length = endDate.diff(startDate, 'minutes');\n    if (length < 5) throw new Error('(RS::V3::To::LockedTimes) Length of a locked time is less than 5 min');\n\n    const start = parseFloat(startDate.format('HH.mm'));\n\n    const doc: Types.lockedTime = {\n      day:    getDayIndex(startDate),\n      start:  start,\n      length: length,\n    };\n\n    if (options.meta) {\n      doc.meta = omitBy({\n        id:      getVertexId(lockedTime, options),\n        visible: lockedTime.visible,\n        name:    lockedTime.displayName,\n      }, x => x == null);\n    }\n\n    return omitBy(doc, x => x == null) as Types.lockedTime;\n  });\n};"],"mappings":";;;;AAKA,SAAgB,kBACd,aACA,SACgC;AAEhC,QAAO,aAAa,KAAI,eAAc;EACpC,MAAM,EAAE,OAAO,WAAW,KAAK,YAAY,kBAAkB,YAAY;EAEzE,MAAM,SAAS,QAAQ,KAAK,WAAW;AACvC,MAAI,SAAS,EAAG,OAAM,IAAI,MAAM;EAEhC,MAAM,QAAQ,WAAW,UAAU,OAAO;EAE1C,MAAMA,MAAwB;GAC5B,KAAQ,YAAY;GACZ;GACA;;AAGV,MAAI,QAAQ,KACV,KAAI,OAAO,OAAO;GAChB,IAAS,YAAY,YAAY;GACjC,SAAS,WAAW;GACpB,MAAS,WAAW;MACnB,MAAK,KAAK;AAGf,SAAO,OAAO,MAAK,MAAK,KAAK"}
+{"version":3,"file":"attach-locked-times.js","names":["doc: Types.lockedTime"],"sources":["../../../../../src/RS/to/input/util/attach-locked-times.ts"],"sourcesContent":["import { omitBy } from 'lodash-es';\nimport type { Types } from '../../../types';\nimport type { ConnectedTypes } from '../../../make-connected';\nimport { getDayIndex, getVertexId, parseDateInterval } from '../../../../core/util';\n\nexport function attachLockedTimes (\n  lockedTimes: ConnectedTypes.lockedTime[] | null | undefined,\n  options:     Types.parsedToOptions\n): Types.lockedTime[] | undefined {\n\n  return lockedTimes?.map(lockedTime => {\n    const { start: startDate, end: endDate } = parseDateInterval(lockedTime, 'locked time');\n\n    const length = endDate.diff(startDate, 'minutes');\n    if (length < 5) throw new Error('(RS::To::LockedTimes) Length of a locked time is less than 5 min');\n\n    const start = parseFloat(startDate.format('HH.mm'));\n\n    const doc: Types.lockedTime = {\n      day:    getDayIndex(startDate),\n      start:  start,\n      length: length,\n    };\n\n    if (options.meta) {\n      doc.meta = omitBy({\n        id:      getVertexId(lockedTime, options),\n        visible: lockedTime.visible,\n        name:    lockedTime.displayName,\n      }, x => x == null);\n    }\n\n    return omitBy(doc, x => x == null) as Types.lockedTime;\n  });\n};"],"mappings":";;;;AAKA,SAAgB,kBACd,aACA,SACgC;AAEhC,QAAO,aAAa,KAAI,eAAc;EACpC,MAAM,EAAE,OAAO,WAAW,KAAK,YAAY,kBAAkB,YAAY;EAEzE,MAAM,SAAS,QAAQ,KAAK,WAAW;AACvC,MAAI,SAAS,EAAG,OAAM,IAAI,MAAM;EAEhC,MAAM,QAAQ,WAAW,UAAU,OAAO;EAE1C,MAAMA,MAAwB;GAC5B,KAAQ,YAAY;GACZ;GACA;;AAGV,MAAI,QAAQ,KACV,KAAI,OAAO,OAAO;GAChB,IAAS,YAAY,YAAY;GACjC,SAAS,WAAW;GACpB,MAAS,WAAW;MACnB,MAAK,KAAK;AAGf,SAAO,OAAO,MAAK,MAAK,KAAK"}

package/dist/RS/to/input/util/parse-group-references.js

@@ -40,16 +40,16 @@ function parseGroupReferences(itemAndType, options) {
 		...(sources.teachers ?? []).map((x) => idOf.teacher(x.to, options)),
 		...mergeWithParentGroups(sources.groups ?? [], options).flatMap((ref) => {
 			if (ref.to.species == "class") return idOf.group(ref.to, options);
-			return (ref.to.members ?? []).filter((x) => !ref.exclude?.includes(x)).map((x) => x.group ? getVertexId(x.group, options) : void 0).filter((x) => x != null);
+			return (ref.to.members ?? []).filter((x) => !ref.exclude?.includes(x)).map((x) => x.group ? idOf.group(x.group, options) : void 0).filter((x) => x != null);
 		}),
-		...(sources.participants ?? []).map((x) => x.to.group ? getVertexId(x.to.group, options) : void 0).filter((x) => x != null)
+		...(sources.participants ?? []).map((x) => x.to.group ? idOf.group(x.to.group, options) : void 0).filter((x) => x != null)
 	]).chain((x) => uniq(x).map((x$1) => [x$1])).value;
 	const teacherReferences = (sources.teachers ?? []).map((x) => ({ group: idOf.teacher(x.to, options) }));
 	const groupReferences = mergeWithParentGroups(sources.groups ?? [], options).map((x) => {
 		if (x.to.species != "class" || x.exclude?.length) return { individuals: idOf.groupReference(x, options) };
 		return { group: idOf.group(x.to, options) };
 	});
-	const participantReferences = sources.participants ? { individuals: sources.participants.map((x) => idOf.person(x.to, options)) } : void 0;
+	const participantReferences = sources.participants?.length ? { individuals: sources.participants.map((x) => idOf.person(x.to, options)) } : void 0;
 	return teacherReferences.concat(groupReferences, participantReferences ? [participantReferences] : []).map((x) => [x]);
 }
 

package/dist/RS/to/input/util/parse-group-references.js.map

@@ -1 +1 @@
-{"version":3,"file":"parse-group-references.js","names":["x"],"sources":["../../../../../src/RS/to/input/util/parse-group-references.ts"],"sourcesContent":["import { groupBy, uniq } from 'lodash-es';\nimport type { ConnectedTypes } from '../../../make-connected';\nimport { idOf } from './util';\nimport { getVertexId } from '../../../../core/util';\nimport type { GroupReference, PersonReference } from '../../../../core/types/common';\nimport type { Types } from '../../../types';\nimport { makeChainable } from '../../../../common/make-chainable';\n\n/**\n * Merges group references with their parent groups while ensuring that a group is present at\n * most once and that parent groups are prioritized as they carry no member exclusions.\n */\nfunction mergeWithParentGroups (\n  references: GroupReference<ConnectedTypes.group, ConnectedTypes.person>[],\n  options:    Types.parsedToOptions\n): GroupReference<ConnectedTypes.group, ConnectedTypes.person>[] {\n  return makeChainable(references)\n    .chain(\n      x => x.flatMap((x): ((typeof x) & { isParentGroup?: boolean })[] => ([\n        x, ...(x.to.parentGroups ?? []).map(y => ({ to: y, isParentGroup: true }))\n      ])),\n      x => groupBy(x, x => getVertexId(x.to, options)),\n      x => Object.values(x)\n        .map(xs => xs.find(x => x.isParentGroup) ?? xs.at(0))\n        .filter(x => x != null)\n    )\n    .value;\n}\n\ntype ItemAndType =\n  | { item: ConnectedTypes.course,     type: 'course'     }\n  | { item: ConnectedTypes.event,      type: 'event'      }\n  | { item: ConnectedTypes.lockedTime, type: 'lockedTime' };\n\ntype Source = {\n  teachers?:     PersonReference<ConnectedTypes.teacher>[];\n  groups?:       GroupReference<ConnectedTypes.group, ConnectedTypes.person>[];\n  participants?: PersonReference<ConnectedTypes.person>[];\n};\n\n/**\n * Returns the source of group, teacher, and participant references for a given item while taking into account event inheritance.\n */\nfunction getSources (itemAndType: ItemAndType): Source {\n  if (itemAndType.type == 'lockedTime') return {\n    teachers: itemAndType.item.coalesced?.filter(x => x.toModel == 'teachers'),\n    groups:   itemAndType.item.coalesced?.filter(x => x.toModel == 'groups'  )\n  };\n\n  const item = itemAndType.item;\n  const teachersSource = item.teachers\n    ? item\n    : ('course' in item && item.course ? item.course : item);\n  const groupsAndParticipantsSource = (item.groups || item.participants)\n    ? item\n    : ('course' in item && item.course ? item.course : item);\n  return {\n    teachers:     teachersSource.teachers                  ?? undefined,\n    groups:       groupsAndParticipantsSource.groups       ?? undefined,\n    participants: groupsAndParticipantsSource.participants ?? undefined\n  };\n}\n\n/**\n * Parses group references from a course or event while carrying out event inheritance and taking into account parent groups.\n */\nexport function parseGroupReferences (\n  itemAndType: ItemAndType,\n  options:     Types.parsedToOptions\n): Types.groupReference[][] {\n  const sources = getSources(itemAndType);\n\n  // if interested in the old format we care only about references to groups\n  if (options.oldFormat) {\n    return makeChainable([\n      ...(sources.teachers ?? [])\n        .map(x => idOf.teacher(x.to, options)),\n      ...mergeWithParentGroups(sources.groups ?? [], options)\n        .flatMap(ref => {\n          if (ref.to.species == 'class') return idOf.group(ref.to, options);\n\n          // if not a class fetch the remaining group member's parent group\n          return (ref.to.members ?? [])\n            .filter(x => !ref.exclude?.includes(x))\n            .map(x => x.group ? getVertexId(x.group, options) : undefined)\n            .filter(x => x != null);\n        }),\n      ...(sources.participants ?? [])\n        .map(x => x.to.group ? getVertexId(x.to.group, options) : undefined)\n        .filter(x => x != null)\n    ])\n      .chain(\n        x => uniq(x).map(x => [x])\n      )\n      .value;\n  }\n\n  const teacherReferences = (sources.teachers ?? [])\n    .map((x): Types.groupReference => ({ group: idOf.teacher(x.to, options) }));\n\n  const groupReferences = mergeWithParentGroups(sources.groups ?? [], options)\n    .map((x): Types.groupReference => {\n      if (x.to.species != 'class' || x.exclude?.length) return { individuals: idOf.groupReference(x, options) };   // use individuals set if not a plain group reference\n      return { group: idOf.group(x.to, options) };\n    });\n\n  const participantReferences = sources.participants\n    ? { individuals: sources.participants.map(x => idOf.person(x.to, options)) } as Types.groupReference\n    : undefined;\n\n  // combine all references\n  return teacherReferences\n    .concat(\n      groupReferences,\n      participantReferences ? [participantReferences] : []\n    )\n    .map(x => [x]);\n}"],"mappings":";;;;;;;;;;AAYA,SAAS,sBACP,YACA,SAC+D;AAC/D,QAAO,cAAc,YAClB,OACC,MAAK,EAAE,SAAS,QAAqD,CACnEA,KAAG,IAAIA,IAAE,GAAG,gBAAgB,IAAI,KAAI,OAAM;EAAE,IAAI;EAAG,eAAe;SAEpE,MAAK,QAAQ,IAAG,QAAK,YAAYA,IAAE,IAAI,YACvC,MAAK,OAAO,OAAO,GAChB,KAAI,OAAM,GAAG,MAAK,QAAKA,IAAE,kBAAkB,GAAG,GAAG,IACjD,QAAO,QAAKA,OAAK,OAErB;;;;;AAiBL,SAAS,WAAY,aAAkC;AACrD,KAAI,YAAY,QAAQ,aAAc,QAAO;EAC3C,UAAU,YAAY,KAAK,WAAW,QAAO,MAAK,EAAE,WAAW;EAC/D,QAAU,YAAY,KAAK,WAAW,QAAO,MAAK,EAAE,WAAW;;CAGjE,MAAM,OAAO,YAAY;CACzB,MAAM,iBAAiB,KAAK,WACxB,OACC,YAAY,QAAQ,KAAK,SAAS,KAAK,SAAS;CACrD,MAAM,8BAA+B,KAAK,UAAU,KAAK,eACrD,OACC,YAAY,QAAQ,KAAK,SAAS,KAAK,SAAS;AACrD,QAAO;EACL,UAAc,eAAe,YAA6B;EAC1D,QAAc,4BAA4B,UAAgB;EAC1D,cAAc,4BAA4B,gBAAgB;;;;;;AAO9D,SAAgB,qBACd,aACA,SAC0B;CAC1B,MAAM,UAAU,WAAW;AAG3B,KAAI,QAAQ,UACV,QAAO,cAAc;EACnB,IAAI,QAAQ,YAAY,IACrB,KAAI,MAAK,KAAK,QAAQ,EAAE,IAAI;EAC/B,GAAG,sBAAsB,QAAQ,UAAU,IAAI,SAC5C,SAAQ,QAAO;AACd,OAAI,IAAI,GAAG,WAAW,QAAS,QAAO,KAAK,MAAM,IAAI,IAAI;AAGzD,WAAQ,IAAI,GAAG,WAAW,IACvB,QAAO,MAAK,CAAC,IAAI,SAAS,SAAS,IACnC,KAAI,MAAK,EAAE,QAAQ,YAAY,EAAE,OAAO,WAAW,QACnD,QAAO,MAAK,KAAK;;EAExB,IAAI,QAAQ,gBAAgB,IACzB,KAAI,MAAK,EAAE,GAAG,QAAQ,YAAY,EAAE,GAAG,OAAO,WAAW,QACzD,QAAO,MAAK,KAAK;IAEnB,OACC,MAAK,KAAK,GAAG,KAAI,QAAK,CAACA,OAExB;CAGL,MAAM,qBAAqB,QAAQ,YAAY,IAC5C,KAAK,OAA6B,EAAE,OAAO,KAAK,QAAQ,EAAE,IAAI;CAEjE,MAAM,kBAAkB,sBAAsB,QAAQ,UAAU,IAAI,SACjE,KAAK,MAA4B;AAChC,MAAI,EAAE,GAAG,WAAW,WAAW,EAAE,SAAS,OAAQ,QAAO,EAAE,aAAa,KAAK,eAAe,GAAG;AAC/F,SAAO,EAAE,OAAO,KAAK,MAAM,EAAE,IAAI;;CAGrC,MAAM,wBAAwB,QAAQ,eAClC,EAAE,aAAa,QAAQ,aAAa,KAAI,MAAK,KAAK,OAAO,EAAE,IAAI,cAC/D;AAGJ,QAAO,kBACJ,OACC,iBACA,wBAAwB,CAAC,yBAAyB,IAEnD,KAAI,MAAK,CAAC"}
+{"version":3,"file":"parse-group-references.js","names":["x"],"sources":["../../../../../src/RS/to/input/util/parse-group-references.ts"],"sourcesContent":["import { groupBy, uniq } from 'lodash-es';\nimport type { ConnectedTypes } from '../../../make-connected';\nimport { idOf } from './util';\nimport { getVertexId } from '../../../../core/util';\nimport type { GroupReference, PersonReference } from '../../../../core/types/common';\nimport type { Types } from '../../../types';\nimport { makeChainable } from '../../../../common/make-chainable';\n\n/**\n * Merges group references with their parent groups while ensuring that a group is present at\n * most once and that parent groups are prioritized as they carry no member exclusions.\n */\nfunction mergeWithParentGroups (\n  references: GroupReference<ConnectedTypes.group, ConnectedTypes.person>[],\n  options:    Types.parsedToOptions\n): GroupReference<ConnectedTypes.group, ConnectedTypes.person>[] {\n  return makeChainable(references)\n    .chain(\n      x => x.flatMap((x): ((typeof x) & { isParentGroup?: boolean })[] => ([\n        x, ...(x.to.parentGroups ?? []).map(y => ({ to: y, isParentGroup: true }))\n      ])),\n      x => groupBy(x, x => getVertexId(x.to, options)),\n      x => Object.values(x)\n        .map(xs => xs.find(x => x.isParentGroup) ?? xs.at(0))\n        .filter(x => x != null)\n    )\n    .value;\n}\n\ntype ItemAndType =\n  | { item: ConnectedTypes.course,     type: 'course'     }\n  | { item: ConnectedTypes.event,      type: 'event'      }\n  | { item: ConnectedTypes.lockedTime, type: 'lockedTime' };\n\ntype Source = {\n  teachers?:     PersonReference<ConnectedTypes.teacher>[];\n  groups?:       GroupReference<ConnectedTypes.group, ConnectedTypes.person>[];\n  participants?: PersonReference<ConnectedTypes.person>[];\n};\n\n/**\n * Returns the source of group, teacher, and participant references for a given item while taking into account event inheritance.\n */\nfunction getSources (itemAndType: ItemAndType): Source {\n  if (itemAndType.type == 'lockedTime') return {\n    teachers: itemAndType.item.coalesced?.filter(x => x.toModel == 'teachers'),\n    groups:   itemAndType.item.coalesced?.filter(x => x.toModel == 'groups'  )\n  };\n\n  const item = itemAndType.item;\n  const teachersSource = item.teachers\n    ? item\n    : ('course' in item && item.course ? item.course : item);\n  const groupsAndParticipantsSource = (item.groups || item.participants)\n    ? item\n    : ('course' in item && item.course ? item.course : item);\n  return {\n    teachers:     teachersSource.teachers                  ?? undefined,\n    groups:       groupsAndParticipantsSource.groups       ?? undefined,\n    participants: groupsAndParticipantsSource.participants ?? undefined\n  };\n}\n\n/**\n * Parses group references from a course or event while carrying out event inheritance and taking into account parent groups.\n */\nexport function parseGroupReferences (\n  itemAndType: ItemAndType,\n  options:     Types.parsedToOptions\n): Types.groupReference[][] {\n  const sources = getSources(itemAndType);\n\n  // if interested in the old format we care only about references to groups\n  if (options.oldFormat) {\n    return makeChainable([\n      ...(sources.teachers ?? [])\n        .map(x => idOf.teacher(x.to, options)),\n      ...mergeWithParentGroups(sources.groups ?? [], options)\n        .flatMap(ref => {\n          if (ref.to.species == 'class') return idOf.group(ref.to, options);\n\n          // if not a class fetch the remaining group member's parent group\n          return (ref.to.members ?? [])\n            .filter(x => !ref.exclude?.includes(x))\n            .map(x => x.group ? idOf.group(x.group, options) : undefined)\n            .filter(x => x != null);\n        }),\n      ...(sources.participants ?? [])\n        .map(x => x.to.group ? idOf.group(x.to.group, options) : undefined)\n        .filter(x => x != null)\n    ])\n      .chain(\n        x => uniq(x).map(x => [x])\n      )\n      .value;\n  }\n\n  const teacherReferences = (sources.teachers ?? [])\n    .map((x): Types.groupReference => ({ group: idOf.teacher(x.to, options) }));\n\n  const groupReferences = mergeWithParentGroups(sources.groups ?? [], options)\n    .map((x): Types.groupReference => {\n      if (x.to.species != 'class' || x.exclude?.length) return { individuals: idOf.groupReference(x, options) };   // use individuals set if not a plain group reference\n      return { group: idOf.group(x.to, options) };\n    });\n\n  const participantReferences = sources.participants?.length\n    ? { individuals: sources.participants.map(x => idOf.person(x.to, options)) } as Types.groupReference\n    : undefined;\n\n  // combine all references\n  return teacherReferences\n    .concat(\n      groupReferences,\n      participantReferences ? [participantReferences] : []\n    )\n    .map(x => [x]);\n}"],"mappings":";;;;;;;;;;AAYA,SAAS,sBACP,YACA,SAC+D;AAC/D,QAAO,cAAc,YAClB,OACC,MAAK,EAAE,SAAS,QAAqD,CACnEA,KAAG,IAAIA,IAAE,GAAG,gBAAgB,IAAI,KAAI,OAAM;EAAE,IAAI;EAAG,eAAe;SAEpE,MAAK,QAAQ,IAAG,QAAK,YAAYA,IAAE,IAAI,YACvC,MAAK,OAAO,OAAO,GAChB,KAAI,OAAM,GAAG,MAAK,QAAKA,IAAE,kBAAkB,GAAG,GAAG,IACjD,QAAO,QAAKA,OAAK,OAErB;;;;;AAiBL,SAAS,WAAY,aAAkC;AACrD,KAAI,YAAY,QAAQ,aAAc,QAAO;EAC3C,UAAU,YAAY,KAAK,WAAW,QAAO,MAAK,EAAE,WAAW;EAC/D,QAAU,YAAY,KAAK,WAAW,QAAO,MAAK,EAAE,WAAW;;CAGjE,MAAM,OAAO,YAAY;CACzB,MAAM,iBAAiB,KAAK,WACxB,OACC,YAAY,QAAQ,KAAK,SAAS,KAAK,SAAS;CACrD,MAAM,8BAA+B,KAAK,UAAU,KAAK,eACrD,OACC,YAAY,QAAQ,KAAK,SAAS,KAAK,SAAS;AACrD,QAAO;EACL,UAAc,eAAe,YAA6B;EAC1D,QAAc,4BAA4B,UAAgB;EAC1D,cAAc,4BAA4B,gBAAgB;;;;;;AAO9D,SAAgB,qBACd,aACA,SAC0B;CAC1B,MAAM,UAAU,WAAW;AAG3B,KAAI,QAAQ,UACV,QAAO,cAAc;EACnB,IAAI,QAAQ,YAAY,IACrB,KAAI,MAAK,KAAK,QAAQ,EAAE,IAAI;EAC/B,GAAG,sBAAsB,QAAQ,UAAU,IAAI,SAC5C,SAAQ,QAAO;AACd,OAAI,IAAI,GAAG,WAAW,QAAS,QAAO,KAAK,MAAM,IAAI,IAAI;AAGzD,WAAQ,IAAI,GAAG,WAAW,IACvB,QAAO,MAAK,CAAC,IAAI,SAAS,SAAS,IACnC,KAAI,MAAK,EAAE,QAAQ,KAAK,MAAM,EAAE,OAAO,WAAW,QAClD,QAAO,MAAK,KAAK;;EAExB,IAAI,QAAQ,gBAAgB,IACzB,KAAI,MAAK,EAAE,GAAG,QAAQ,KAAK,MAAM,EAAE,GAAG,OAAO,WAAW,QACxD,QAAO,MAAK,KAAK;IAEnB,OACC,MAAK,KAAK,GAAG,KAAI,QAAK,CAACA,OAExB;CAGL,MAAM,qBAAqB,QAAQ,YAAY,IAC5C,KAAK,OAA6B,EAAE,OAAO,KAAK,QAAQ,EAAE,IAAI;CAEjE,MAAM,kBAAkB,sBAAsB,QAAQ,UAAU,IAAI,SACjE,KAAK,MAA4B;AAChC,MAAI,EAAE,GAAG,WAAW,WAAW,EAAE,SAAS,OAAQ,QAAO,EAAE,aAAa,KAAK,eAAe,GAAG;AAC/F,SAAO,EAAE,OAAO,KAAK,MAAM,EAAE,IAAI;;CAGrC,MAAM,wBAAwB,QAAQ,cAAc,SAChD,EAAE,aAAa,QAAQ,aAAa,KAAI,MAAK,KAAK,OAAO,EAAE,IAAI,cAC/D;AAGJ,QAAO,kBACJ,OACC,iBACA,wBAAwB,CAAC,yBAAyB,IAEnD,KAAI,MAAK,CAAC"}

package/dist/RS/to/input/util/parse-intervals.js

@@ -20,9 +20,9 @@ function getDayLimits(intervals, settings) {
 			start: start.clone(),
 			end: end.clone()
 		}));
-	} else throw new Error(`(RS::V3::To::Intervals) Intervals length ${intervals.length} does not match settings.numDays ${settings.numDays}`);
+	} else throw new Error(`(RS::To::Intervals) Intervals length ${intervals.length} does not match settings.numDays ${settings.numDays}`);
 	return intervals.map((i, day) => {
-		if (!i.start || !i.end) throw new Error(`(RS::V3::To::Intervals) Interval missing start or end for day ${day}`);
+		if (!i.start || !i.end) throw new Error(`(RS::To::Intervals) Interval missing start or end for day ${day}`);
 		const start = parseFloat(moment.utc(i.start).format("HH.mm"));
 		const end = parseFloat(moment.utc(i.end).format("HH.mm"));
 		return {
@@ -40,7 +40,7 @@ function parseIntervals(intervals, rootInterval, settings) {
 		const dayLimits = getDayLimits(intervals, settings);
 		return makeChainable(rootInterval.intervals).chain((x) => groupBy(x, (x$1) => getDayIndex(x$1.start)), (x) => Object.entries(x).map(([day, xs]) => {
 			const limit = dayLimits.at(parseInt(day));
-			if (!limit) throw new Error(`(RS::V3::To::Intervals) Day ${day} not found in dayStartAndEnds`);
+			if (!limit) throw new Error(`(RS::To::Intervals) Day ${day} not found in dayStartAndEnds`);
 			return xs.map((x$1) => ({
 				beg: parseFloat(moment.utc(x$1.start).format("HH.mm")),
 				end: parseFloat(moment.utc(x$1.end).format("HH.mm")),

package/dist/RS/to/input/util/parse-intervals.js.map

@@ -1 +1 @@
-{"version":3,"file":"parse-intervals.js","names":["x"],"sources":["../../../../../src/RS/to/input/util/parse-intervals.ts"],"sourcesContent":["import moment from 'moment';\nimport { groupBy } from 'lodash-es';\nimport type { ConnectedTypes } from '../../../make-connected';\nimport type { AllowedInterval } from '../../../../core/types/common/intervals';\nimport { getDayIndex } from '../../../../core/util';\nimport type { Types } from '../../../types';\nimport { makeChainable } from '../../../../common/make-chainable';\n\nfunction getDayLimits (\n  intervals: AllowedInterval[] | undefined,\n  settings: ConnectedTypes.divisionSettings\n): { beg: number, end: number }[] {\n  // remove short-hand notation (a single interval for all days)\n  if (!intervals) {\n    const start = moment.utc(settings.dayStart, 'HH:mm');\n    const end   = moment.utc(settings.dayEnd,   'HH:mm');\n    intervals = Array.from({ length: settings.numDays }, () => ({ start: start.clone(), end: end.clone() }));\n  }\n  else if (intervals.length == 1) {\n    const i = intervals[0];\n    const start = moment.utc(i.start, 'HH:mm');\n    const end   = moment.utc(i.end,   'HH:mm');\n    intervals = Array.from({ length: settings.numDays }, () => ({ start: start.clone(), end: end.clone() }));\n  } else {\n    throw new Error(`(RS::V3::To::Intervals) Intervals length ${intervals.length} does not match settings.numDays ${settings.numDays}`);\n  }\n\n  // the day start and end times of each day\n  return intervals.map((i, day: number) => {\n    if (!i.start || !i.end) throw new Error(`(RS::V3::To::Intervals) Interval missing start or end for day ${day}`);\n    const start = parseFloat(moment.utc(i.start).format('HH.mm'));\n    const end   = parseFloat(moment.utc(i.end  ).format('HH.mm'));\n    return { beg: start, end: end };\n  });\n}\n\n\n/**\n * @deprecated The old way of parsing intervals\n */\nexport function parseIntervals (\n  intervals:     AllowedInterval[]           | undefined,\n  rootInterval:  ConnectedTypes.rootInterval | undefined,\n  settings:      ConnectedTypes.divisionSettings\n): Types.interval[][] | undefined {\n  // if only intervals are provided\n  if (intervals && !rootInterval) return getDayLimits(intervals, settings).map(i => [i]);\n\n  // if root intervals are present\n  if (rootInterval) {\n    const dayLimits = getDayLimits(intervals, settings);\n    return makeChainable(rootInterval.intervals)\n      .chain(\n        x => groupBy(x, x => getDayIndex(x.start)),\n        x => Object.entries(x)\n          .map(([day, xs]) => {\n            const limit = dayLimits.at(parseInt(day));\n            if (!limit) throw new Error(`(RS::V3::To::Intervals) Day ${day} not found in dayStartAndEnds`);\n\n            // remove all block intervals that lay outside the day start and end\n            return xs\n              .map(x => ({\n                beg:    parseFloat(moment.utc(x.start).format('HH.mm')),\n                end:    parseFloat(moment.utc(x.end  ).format('HH.mm')),\n                binary: true\n              } satisfies Types.interval))\n              .filter(x => x.beg >= limit.beg && x.end <= limit.end);\n          })\n      )\n      .value;\n  }\n\n  // only remaining case here is \"!intervals && !rootInterval\"\n  return;\n};\n"],"mappings":";;;;;;AAQA,SAAS,aACP,WACA,UACgC;AAEhC,KAAI,CAAC,WAAW;EACd,MAAM,QAAQ,OAAO,IAAI,SAAS,UAAU;EAC5C,MAAM,MAAQ,OAAO,IAAI,SAAS,QAAU;AAC5C,cAAY,MAAM,KAAK,EAAE,QAAQ,SAAS,kBAAkB;GAAE,OAAO,MAAM;GAAS,KAAK,IAAI;;YAEtF,UAAU,UAAU,GAAG;EAC9B,MAAM,IAAI,UAAU;EACpB,MAAM,QAAQ,OAAO,IAAI,EAAE,OAAO;EAClC,MAAM,MAAQ,OAAO,IAAI,EAAE,KAAO;AAClC,cAAY,MAAM,KAAK,EAAE,QAAQ,SAAS,kBAAkB;GAAE,OAAO,MAAM;GAAS,KAAK,IAAI;;OAE7F,OAAM,IAAI,MAAM,4CAA4C,UAAU,OAAO,mCAAmC,SAAS;AAI3H,QAAO,UAAU,KAAK,GAAG,QAAgB;AACvC,MAAI,CAAC,EAAE,SAAS,CAAC,EAAE,IAAK,OAAM,IAAI,MAAM,iEAAiE;EACzG,MAAM,QAAQ,WAAW,OAAO,IAAI,EAAE,OAAO,OAAO;EACpD,MAAM,MAAQ,WAAW,OAAO,IAAI,EAAE,KAAO,OAAO;AACpD,SAAO;GAAE,KAAK;GAAY;;;;;;;AAQ9B,SAAgB,eACd,WACA,cACA,UACgC;AAEhC,KAAI,aAAa,CAAC,aAAc,QAAO,aAAa,WAAW,UAAU,KAAI,MAAK,CAAC;AAGnF,KAAI,cAAc;EAChB,MAAM,YAAY,aAAa,WAAW;AAC1C,SAAO,cAAc,aAAa,WAC/B,OACC,MAAK,QAAQ,IAAG,QAAK,YAAYA,IAAE,UACnC,MAAK,OAAO,QAAQ,GACjB,KAAK,CAAC,KAAK,QAAQ;GAClB,MAAM,QAAQ,UAAU,GAAG,SAAS;AACpC,OAAI,CAAC,MAAO,OAAM,IAAI,MAAM,+BAA+B,IAAI;AAG/D,UAAO,GACJ,KAAI,SAAM;IACT,KAAQ,WAAW,OAAO,IAAIA,IAAE,OAAO,OAAO;IAC9C,KAAQ,WAAW,OAAO,IAAIA,IAAE,KAAO,OAAO;IAC9C,QAAQ;OAET,QAAO,QAAKA,IAAE,OAAO,MAAM,OAAOA,IAAE,OAAO,MAAM;MAGzD"}
+{"version":3,"file":"parse-intervals.js","names":["x"],"sources":["../../../../../src/RS/to/input/util/parse-intervals.ts"],"sourcesContent":["import moment from 'moment';\nimport { groupBy } from 'lodash-es';\nimport type { ConnectedTypes } from '../../../make-connected';\nimport type { AllowedInterval } from '../../../../core/types/common/intervals';\nimport { getDayIndex } from '../../../../core/util';\nimport type { Types } from '../../../types';\nimport { makeChainable } from '../../../../common/make-chainable';\n\nfunction getDayLimits (\n  intervals: AllowedInterval[] | undefined,\n  settings: ConnectedTypes.divisionSettings\n): { beg: number, end: number }[] {\n  // remove short-hand notation (a single interval for all days)\n  if (!intervals) {\n    const start = moment.utc(settings.dayStart, 'HH:mm');\n    const end   = moment.utc(settings.dayEnd,   'HH:mm');\n    intervals = Array.from({ length: settings.numDays }, () => ({ start: start.clone(), end: end.clone() }));\n  }\n  else if (intervals.length == 1) {\n    const i = intervals[0];\n    const start = moment.utc(i.start, 'HH:mm');\n    const end   = moment.utc(i.end,   'HH:mm');\n    intervals = Array.from({ length: settings.numDays }, () => ({ start: start.clone(), end: end.clone() }));\n  } else {\n    throw new Error(`(RS::To::Intervals) Intervals length ${intervals.length} does not match settings.numDays ${settings.numDays}`);\n  }\n\n  // the day start and end times of each day\n  return intervals.map((i, day: number) => {\n    if (!i.start || !i.end) throw new Error(`(RS::To::Intervals) Interval missing start or end for day ${day}`);\n    const start = parseFloat(moment.utc(i.start).format('HH.mm'));\n    const end   = parseFloat(moment.utc(i.end  ).format('HH.mm'));\n    return { beg: start, end: end };\n  });\n}\n\n\n/**\n * @deprecated The old way of parsing intervals\n */\nexport function parseIntervals (\n  intervals:     AllowedInterval[]           | undefined,\n  rootInterval:  ConnectedTypes.rootInterval | undefined,\n  settings:      ConnectedTypes.divisionSettings\n): Types.interval[][] | undefined {\n  // if only intervals are provided\n  if (intervals && !rootInterval) return getDayLimits(intervals, settings).map(i => [i]);\n\n  // if root intervals are present\n  if (rootInterval) {\n    const dayLimits = getDayLimits(intervals, settings);\n    return makeChainable(rootInterval.intervals)\n      .chain(\n        x => groupBy(x, x => getDayIndex(x.start)),\n        x => Object.entries(x)\n          .map(([day, xs]) => {\n            const limit = dayLimits.at(parseInt(day));\n            if (!limit) throw new Error(`(RS::To::Intervals) Day ${day} not found in dayStartAndEnds`);\n\n            // remove all block intervals that lay outside the day start and end\n            return xs\n              .map(x => ({\n                beg:    parseFloat(moment.utc(x.start).format('HH.mm')),\n                end:    parseFloat(moment.utc(x.end  ).format('HH.mm')),\n                binary: true\n              } satisfies Types.interval))\n              .filter(x => x.beg >= limit.beg && x.end <= limit.end);\n          })\n      )\n      .value;\n  }\n\n  // only remaining case here is \"!intervals && !rootInterval\"\n  return;\n};\n"],"mappings":";;;;;;AAQA,SAAS,aACP,WACA,UACgC;AAEhC,KAAI,CAAC,WAAW;EACd,MAAM,QAAQ,OAAO,IAAI,SAAS,UAAU;EAC5C,MAAM,MAAQ,OAAO,IAAI,SAAS,QAAU;AAC5C,cAAY,MAAM,KAAK,EAAE,QAAQ,SAAS,kBAAkB;GAAE,OAAO,MAAM;GAAS,KAAK,IAAI;;YAEtF,UAAU,UAAU,GAAG;EAC9B,MAAM,IAAI,UAAU;EACpB,MAAM,QAAQ,OAAO,IAAI,EAAE,OAAO;EAClC,MAAM,MAAQ,OAAO,IAAI,EAAE,KAAO;AAClC,cAAY,MAAM,KAAK,EAAE,QAAQ,SAAS,kBAAkB;GAAE,OAAO,MAAM;GAAS,KAAK,IAAI;;OAE7F,OAAM,IAAI,MAAM,wCAAwC,UAAU,OAAO,mCAAmC,SAAS;AAIvH,QAAO,UAAU,KAAK,GAAG,QAAgB;AACvC,MAAI,CAAC,EAAE,SAAS,CAAC,EAAE,IAAK,OAAM,IAAI,MAAM,6DAA6D;EACrG,MAAM,QAAQ,WAAW,OAAO,IAAI,EAAE,OAAO,OAAO;EACpD,MAAM,MAAQ,WAAW,OAAO,IAAI,EAAE,KAAO,OAAO;AACpD,SAAO;GAAE,KAAK;GAAY;;;;;;;AAQ9B,SAAgB,eACd,WACA,cACA,UACgC;AAEhC,KAAI,aAAa,CAAC,aAAc,QAAO,aAAa,WAAW,UAAU,KAAI,MAAK,CAAC;AAGnF,KAAI,cAAc;EAChB,MAAM,YAAY,aAAa,WAAW;AAC1C,SAAO,cAAc,aAAa,WAC/B,OACC,MAAK,QAAQ,IAAG,QAAK,YAAYA,IAAE,UACnC,MAAK,OAAO,QAAQ,GACjB,KAAK,CAAC,KAAK,QAAQ;GAClB,MAAM,QAAQ,UAAU,GAAG,SAAS;AACpC,OAAI,CAAC,MAAO,OAAM,IAAI,MAAM,2BAA2B,IAAI;AAG3D,UAAO,GACJ,KAAI,SAAM;IACT,KAAQ,WAAW,OAAO,IAAIA,IAAE,OAAO,OAAO;IAC9C,KAAQ,WAAW,OAAO,IAAIA,IAAE,KAAO,OAAO;IAC9C,QAAQ;OAET,QAAO,QAAKA,IAAE,OAAO,MAAM,OAAOA,IAAE,OAAO,MAAM;MAGzD"}

package/dist/RS/to/input/util/parse-minimum-break-length.js

@@ -4,14 +4,14 @@ function parseMinimumBreakLength(value) {
 	if (typeof value === "boolean") return value;
 	if (typeof value === "number") return value;
 	if (Array.isArray(value)) {
-		if (value.length !== 2) throw new Error("(RS::V3::To::BreakLengths) BreakLength array must have exactly two elements");
+		if (value.length !== 2) throw new Error("(RS::To::BreakLengths) BreakLength array must have exactly two elements");
 		const [bef, aft] = value;
 		return {
 			bef,
 			aft
 		};
 	}
-	throw new Error("(RS::V3::To::BreakLengths) BreakLength is neither boolean, number or number array");
+	throw new Error("(RS::To::BreakLengths) BreakLength is neither boolean, number or number array");
 }
 
 //#endregion

package/dist/RS/to/input/util/parse-minimum-break-length.js.map

@@ -1 +1 @@
-{"version":3,"file":"parse-minimum-break-length.js","names":[],"sources":["../../../../../src/RS/to/input/util/parse-minimum-break-length.ts"],"sourcesContent":["import type { CoreTypes } from '../../../../core';\nimport type { Types } from '../../../types';\n\nexport function parseMinimumBreakLength (value: CoreTypes.breakLength | null | undefined): Types.breakLength | undefined {\n  if (value == null) return;\n\n  if (typeof value === 'boolean') return value;\n  if (typeof value === 'number') return value;\n\n  if (Array.isArray(value)) {\n    if (value.length !== 2) throw new Error('(RS::V3::To::BreakLengths) BreakLength array must have exactly two elements');\n    const [bef, aft] = value;\n    return { bef, aft };\n  }\n\n  throw new Error('(RS::V3::To::BreakLengths) BreakLength is neither boolean, number or number array');\n};\n"],"mappings":";AAGA,SAAgB,wBAAyB,OAAgF;AACvH,KAAI,SAAS,KAAM;AAEnB,KAAI,OAAO,UAAU,UAAW,QAAO;AACvC,KAAI,OAAO,UAAU,SAAU,QAAO;AAEtC,KAAI,MAAM,QAAQ,QAAQ;AACxB,MAAI,MAAM,WAAW,EAAG,OAAM,IAAI,MAAM;EACxC,MAAM,CAAC,KAAK,OAAO;AACnB,SAAO;GAAE;GAAK;;;AAGhB,OAAM,IAAI,MAAM"}
+{"version":3,"file":"parse-minimum-break-length.js","names":[],"sources":["../../../../../src/RS/to/input/util/parse-minimum-break-length.ts"],"sourcesContent":["import type { CoreTypes } from '../../../../core';\nimport type { Types } from '../../../types';\n\nexport function parseMinimumBreakLength (value: CoreTypes.breakLength | null | undefined): Types.breakLength | undefined {\n  if (value == null) return;\n\n  if (typeof value === 'boolean') return value;\n  if (typeof value === 'number') return value;\n\n  if (Array.isArray(value)) {\n    if (value.length !== 2) throw new Error('(RS::To::BreakLengths) BreakLength array must have exactly two elements');\n    const [bef, aft] = value;\n    return { bef, aft };\n  }\n\n  throw new Error('(RS::To::BreakLengths) BreakLength is neither boolean, number or number array');\n};\n"],"mappings":";AAGA,SAAgB,wBAAyB,OAAgF;AACvH,KAAI,SAAS,KAAM;AAEnB,KAAI,OAAO,UAAU,UAAW,QAAO;AACvC,KAAI,OAAO,UAAU,SAAU,QAAO;AAEtC,KAAI,MAAM,QAAQ,QAAQ;AACxB,MAAI,MAAM,WAAW,EAAG,OAAM,IAAI,MAAM;EACxC,MAAM,CAAC,KAAK,OAAO;AACnB,SAAO;GAAE;GAAK;;;AAGhB,OAAM,IAAI,MAAM"}

package/dist/RS/to/input/util/util.js

@@ -14,7 +14,7 @@ function getPeriodIndex(period, periodsMap, options) {
 	if (!period) return;
 	const id = getVertexId(period, options);
 	const periodIndex = periodsMap.get(id);
-	if (periodIndex === void 0) throw new Error(`(RS::V3::To::getPeriodIndex) Period "${id}" is not in periodsMap`);
+	if (periodIndex === void 0) throw new Error(`(RS::To::getPeriodIndex) Period "${id}" is not in periodsMap`);
 	return periodIndex;
 }
 const COLLECTION_ID = {
@@ -51,7 +51,12 @@ let idOf;
 	}
 	_idOf.groupReference = groupReference;
 	function intervalPairReference(interval, rootInterval, options) {
-		return (rootInterval ? getVertexId(rootInterval, options) + "&" : "") + JSON.stringify(interval);
+		if (interval === null) interval = void 0;
+		if (rootInterval === null) rootInterval = void 0;
+		if (interval && interval.length == 0) interval = void 0;
+		if (rootInterval && rootInterval.intervals.length == 0) rootInterval = void 0;
+		const out = (rootInterval ? getVertexId(rootInterval, options) + "&" : "") + JSON.stringify(interval);
+		return out;
 	}
 	_idOf.intervalPairReference = intervalPairReference;
 })(idOf || (idOf = {}));

package/dist/RS/to/input/util/util.js.map

@@ -1 +1 @@
-{"version":3,"file":"util.js","names":["person","group","teacher","event","lockedTime"],"sources":["../../../../../src/RS/to/input/util/util.ts"],"sourcesContent":["import type { ConnectedTypes } from '../../../make-connected';\nimport type { Types } from '../../../types';\nimport type { Collection, GroupReference } from '../../../../core/types/common';\nimport { getVertexId } from '../../../../core/util';\nimport type { AllowedInterval } from '../../../../core/types/common/intervals';\n\nexport function min2hrs (min: number | undefined | null) {\n  return min ? min / 60 : undefined;\n}\n\n/**\n * Converts a time string in the format \"HH:MM\" to a float representation, e.g., \"12:30\" becomes 12.3.\n */\nexport function toTimeFloat (str: string) {\n  return parseFloat(str.replace(':', '.'));\n}\n\nexport function getPeriodIndex (\n  period:     ConnectedTypes.period | undefined | null,\n  periodsMap: Map<string | undefined, number>,\n  options:    Types.parsedToOptions\n): number | undefined {\n  if (!period) return;\n  const id = getVertexId(period, options);\n  const periodIndex = periodsMap.get(id);\n  if (periodIndex === undefined) throw new Error(`(RS::V3::To::getPeriodIndex) Period \"${id}\" is not in periodsMap`);\n  return periodIndex;\n}\n\nexport const COLLECTION_ID = {\n  persons:     'persons',\n  groups:      'groups',\n  teachers:    'teachers',\n  events:      'events',\n  lockedTimes: 'lockedtimes',\n} satisfies Partial<Record<Collection, string>>;\n\n/**\n * returns a combined id for the vertex or edge by combining the type(s) and id(s).\n */\nexport namespace idOf {\n  /** `persons.id` */\n  export function person (\n    person:  ConnectedTypes.person | string,\n    options: Types.parsedToOptions\n  ): string {\n    return `${COLLECTION_ID.persons}.${ getVertexId(person, options) }`;\n  }\n\n  /** `groups.id` */\n  export function group (\n    group:   ConnectedTypes.group,\n    options: Types.parsedToOptions\n  ): string {\n    return `${COLLECTION_ID.groups}.${ getVertexId(group, options) }`;\n  }\n\n  /** `teachers.id` */\n  export function teacher (\n    teacher: ConnectedTypes.teacher,\n    options: Types.parsedToOptions\n  ): string {\n    return `${COLLECTION_ID.teachers}.${ getVertexId(teacher, options) }`;\n  }\n\n  /** `events.id` */\n  export function event (\n    event:   ConnectedTypes.event,\n    options: Types.parsedToOptions\n  ): string {\n    return `${COLLECTION_ID.events}.${ getVertexId(event, options) }`;\n  }\n\n  /** `lockedtimes.id` */\n  export function lockedTime (\n    lockedTime: ConnectedTypes.lockedTime,\n    options:    Types.parsedToOptions\n  ): string {\n    return `${COLLECTION_ID.lockedTimes}.${ getVertexId(lockedTime, options) }`;\n  }\n\n  /** `groups.id<.exclude.id1.id2...>` */\n  export function groupReference (\n    group:   GroupReference<ConnectedTypes.group, ConnectedTypes.person>,\n    options: Types.parsedToOptions\n  ): string {\n    return `${COLLECTION_ID.groups}.${ getVertexId(group.to, options) }`\n      + (group.exclude?.length\n        ? '.exclude.' + group.exclude\n          .map(x => getVertexId(x, options))\n          .sort()\n          .join('.')\n        : '');\n  }\n\n  /** `<rootIntervalsId&>JSON.stringify(intervals)>` */\n  export function intervalPairReference (\n    interval:     AllowedInterval[]           | undefined,\n    rootInterval: ConnectedTypes.rootInterval | undefined,\n    options:      Types.parsedToOptions\n  ): string {\n    return (rootInterval ? getVertexId(rootInterval, options) + '&' : '') + JSON.stringify(interval);\n  }\n}\n"],"mappings":";;;AAMA,SAAgB,QAAS,KAAgC;AACvD,QAAO,MAAM,MAAM,KAAK;;;;;AAM1B,SAAgB,YAAa,KAAa;AACxC,QAAO,WAAW,IAAI,QAAQ,KAAK;;AAGrC,SAAgB,eACd,QACA,YACA,SACoB;AACpB,KAAI,CAAC,OAAQ;CACb,MAAM,KAAK,YAAY,QAAQ;CAC/B,MAAM,cAAc,WAAW,IAAI;AACnC,KAAI,gBAAgB,OAAW,OAAM,IAAI,MAAM,wCAAwC,GAAG;AAC1F,QAAO;;AAGT,MAAa,gBAAgB;CAC3B,SAAa;CACb,QAAa;CACb,UAAa;CACb,QAAa;CACb,aAAa;;;;CAQN,SAAS,OACd,UACA,SACQ;AACR,SAAO,GAAG,cAAc,QAAQ,GAAI,YAAYA,UAAQ;;;CAInD,SAAS,MACd,SACA,SACQ;AACR,SAAO,GAAG,cAAc,OAAO,GAAI,YAAYC,SAAO;;;CAIjD,SAAS,QACd,WACA,SACQ;AACR,SAAO,GAAG,cAAc,SAAS,GAAI,YAAYC,WAAS;;;CAIrD,SAAS,MACd,SACA,SACQ;AACR,SAAO,GAAG,cAAc,OAAO,GAAI,YAAYC,SAAO;;;CAIjD,SAAS,WACd,cACA,SACQ;AACR,SAAO,GAAG,cAAc,YAAY,GAAI,YAAYC,cAAY;;;CAI3D,SAAS,eACd,SACA,SACQ;AACR,SAAO,GAAG,cAAc,OAAO,GAAI,YAAYH,QAAM,IAAI,cACpDA,QAAM,SAAS,SACd,cAAcA,QAAM,QACnB,KAAI,MAAK,YAAY,GAAG,UACxB,OACA,KAAK,OACN;;;CAID,SAAS,sBACd,UACA,cACA,SACQ;AACR,UAAQ,eAAe,YAAY,cAAc,WAAW,MAAM,MAAM,KAAK,UAAU"}
+{"version":3,"file":"util.js","names":["person","group","teacher","event","lockedTime"],"sources":["../../../../../src/RS/to/input/util/util.ts"],"sourcesContent":["import type { ConnectedTypes } from '../../../make-connected';\nimport type { Types } from '../../../types';\nimport type { Collection, GroupReference } from '../../../../core/types/common';\nimport { getVertexId } from '../../../../core/util';\nimport type { AllowedInterval } from '../../../../core/types/common/intervals';\n\nexport function min2hrs (min: number | undefined | null) {\n  return min ? min / 60 : undefined;\n}\n\n/**\n * Converts a time string in the format \"HH:MM\" to a float representation, e.g., \"12:30\" becomes 12.3.\n */\nexport function toTimeFloat (str: string) {\n  return parseFloat(str.replace(':', '.'));\n}\n\nexport function getPeriodIndex (\n  period:     ConnectedTypes.period | undefined | null,\n  periodsMap: Map<string | undefined, number>,\n  options:    Types.parsedToOptions\n): number | undefined {\n  if (!period) return;\n  const id = getVertexId(period, options);\n  const periodIndex = periodsMap.get(id);\n  if (periodIndex === undefined) throw new Error(`(RS::To::getPeriodIndex) Period \"${id}\" is not in periodsMap`);\n  return periodIndex;\n}\n\nexport const COLLECTION_ID = {\n  persons:     'persons',\n  groups:      'groups',\n  teachers:    'teachers',\n  events:      'events',\n  lockedTimes: 'lockedtimes',\n} satisfies Partial<Record<Collection, string>>;\n\n/**\n * returns a combined id for the vertex or edge by combining the type(s) and id(s).\n */\nexport namespace idOf {\n  /** `persons.id` */\n  export function person (\n    person:  ConnectedTypes.person | string,\n    options: Types.parsedToOptions\n  ): string {\n    return `${COLLECTION_ID.persons}.${ getVertexId(person, options) }`;\n  }\n\n  /** `groups.id` */\n  export function group (\n    group:   ConnectedTypes.group,\n    options: Types.parsedToOptions\n  ): string {\n    return `${COLLECTION_ID.groups}.${ getVertexId(group, options) }`;\n  }\n\n  /** `teachers.id` */\n  export function teacher (\n    teacher: ConnectedTypes.teacher,\n    options: Types.parsedToOptions\n  ): string {\n    return `${COLLECTION_ID.teachers}.${ getVertexId(teacher, options) }`;\n  }\n\n  /** `events.id` */\n  export function event (\n    event:   ConnectedTypes.event,\n    options: Types.parsedToOptions\n  ): string {\n    return `${COLLECTION_ID.events}.${ getVertexId(event, options) }`;\n  }\n\n  /** `lockedtimes.id` */\n  export function lockedTime (\n    lockedTime: ConnectedTypes.lockedTime,\n    options:    Types.parsedToOptions\n  ): string {\n    return `${COLLECTION_ID.lockedTimes}.${ getVertexId(lockedTime, options) }`;\n  }\n\n  /** `groups.id<.exclude.id1.id2...>` */\n  export function groupReference (\n    group:   GroupReference<ConnectedTypes.group, ConnectedTypes.person>,\n    options: Types.parsedToOptions\n  ): string {\n    return `${COLLECTION_ID.groups}.${ getVertexId(group.to, options) }`\n      + (group.exclude?.length\n        ? '.exclude.' + group.exclude\n          .map(x => getVertexId(x, options))\n          .sort()\n          .join('.')\n        : '');\n  }\n\n  /** `<rootIntervalsId&>JSON.stringify(intervals)>` */\n  export function intervalPairReference (\n    interval:     AllowedInterval[]           | undefined,\n    rootInterval: ConnectedTypes.rootInterval | undefined,\n    options:      Types.parsedToOptions\n  ): string {\n    // replace null with undefined\n    if (interval     === null) interval     = undefined;\n    if (rootInterval === null) rootInterval = undefined;\n\n    // replace empty intervals with undefined\n    if (interval     && interval              .length == 0) interval     = undefined;\n    if (rootInterval && rootInterval.intervals.length == 0) rootInterval = undefined;\n\n    const out = (rootInterval ? getVertexId(rootInterval, options) + '&' : '') + JSON.stringify(interval);\n    return out;\n  }\n}\n"],"mappings":";;;AAMA,SAAgB,QAAS,KAAgC;AACvD,QAAO,MAAM,MAAM,KAAK;;;;;AAM1B,SAAgB,YAAa,KAAa;AACxC,QAAO,WAAW,IAAI,QAAQ,KAAK;;AAGrC,SAAgB,eACd,QACA,YACA,SACoB;AACpB,KAAI,CAAC,OAAQ;CACb,MAAM,KAAK,YAAY,QAAQ;CAC/B,MAAM,cAAc,WAAW,IAAI;AACnC,KAAI,gBAAgB,OAAW,OAAM,IAAI,MAAM,oCAAoC,GAAG;AACtF,QAAO;;AAGT,MAAa,gBAAgB;CAC3B,SAAa;CACb,QAAa;CACb,UAAa;CACb,QAAa;CACb,aAAa;;;;CAQN,SAAS,OACd,UACA,SACQ;AACR,SAAO,GAAG,cAAc,QAAQ,GAAI,YAAYA,UAAQ;;;CAInD,SAAS,MACd,SACA,SACQ;AACR,SAAO,GAAG,cAAc,OAAO,GAAI,YAAYC,SAAO;;;CAIjD,SAAS,QACd,WACA,SACQ;AACR,SAAO,GAAG,cAAc,SAAS,GAAI,YAAYC,WAAS;;;CAIrD,SAAS,MACd,SACA,SACQ;AACR,SAAO,GAAG,cAAc,OAAO,GAAI,YAAYC,SAAO;;;CAIjD,SAAS,WACd,cACA,SACQ;AACR,SAAO,GAAG,cAAc,YAAY,GAAI,YAAYC,cAAY;;;CAI3D,SAAS,eACd,SACA,SACQ;AACR,SAAO,GAAG,cAAc,OAAO,GAAI,YAAYH,QAAM,IAAI,cACpDA,QAAM,SAAS,SACd,cAAcA,QAAM,QACnB,KAAI,MAAK,YAAY,GAAG,UACxB,OACA,KAAK,OACN;;;CAID,SAAS,sBACd,UACA,cACA,SACQ;AAER,MAAI,aAAiB,KAAM,YAAe;AAC1C,MAAI,iBAAiB,KAAM,gBAAe;AAG1C,MAAI,YAAgB,SAAuB,UAAU,EAAG,YAAe;AACvE,MAAI,gBAAgB,aAAa,UAAU,UAAU,EAAG,gBAAe;EAEvE,MAAM,OAAO,eAAe,YAAY,cAAc,WAAW,MAAM,MAAM,KAAK,UAAU;AAC5F,SAAO"}

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

@@ -1,12 +1,12 @@
 import { BaseOptions } from "../../../common/types.js";
 import { Types } from "../../../core/types/index.js";
-import * as xlsx0 from "xlsx";
+import * as xlsx1 from "xlsx";
 
 //#region src/SchoolSoft/file/to/index.d.ts
 declare class export_default {
   static schedules: (schedule: Types.mixed.schedule & {
     division?: Types.mixed.division;
-  }, options?: BaseOptions) => xlsx0.WorkBook;
+  }, options?: BaseOptions) => xlsx1.WorkBook;
 }
 //#endregion
 export { export_default };

package/dist/Skola24/txt/types/index.d.ts

@@ -105,20 +105,6 @@ type Warning = { [key in keyof ErrorType]: {
   code: key;
   context: ErrorType[key];
 } }[keyof ErrorType];
-declare namespace Types {
-  type room = Room;
-  type subject = Subject;
-  type teacher = Teacher;
-  type group = Group;
-  type course = Course;
-  type periodGeneral = PeriodGeneral;
-  type period = Period;
-  type ta = TA;
-  type lesson = Lesson;
-  type student = Student;
-  type errorType = ErrorType;
-  type errorCode = ErrorCode;
-}
 type Options = {
   /**
    * Specifies which field to use as the source for creating additional scheduling periods.
@@ -135,6 +121,21 @@ type Options = {
    */
   includeEventsMissingCourse?: boolean;
 };
+declare namespace Types {
+  type room = Room;
+  type subject = Subject;
+  type teacher = Teacher;
+  type group = Group;
+  type course = Course;
+  type periodGeneral = PeriodGeneral;
+  type period = Period;
+  type ta = TA;
+  type lesson = Lesson;
+  type student = Student;
+  type errorType = ErrorType;
+  type errorCode = ErrorCode;
+  type options = Options;
+}
 //#endregion
 export { Options, Types, Warning };
 //# sourceMappingURL=index.d.ts.map

package/dist/core/types/courses.d.ts

@@ -40,6 +40,9 @@ type Course = Vertex & {
   endDate?: DateType;
   exceptions?: Exception[];
   lockedTimes?: LockedTime[];
+  /**
+   * @note an empty array is the same as undefined
+   */
   intervals?: AllowedInterval[];
   centerOfAttraction?: string | null;
   syllabus?: Syllabus;

package/dist/core/types/groups.d.ts

@@ -27,6 +27,9 @@ type Group = Vertex & {
   lockedTimes?: LockedTime[];
   lunch?: LockedTime[];
   members?: Person[];
+  /**
+   * @note an empty array is the same as undefined
+   */
   intervals?: AllowedInterval[];
   rootInterval?: RootInterval;
   days?: Day[];

package/dist/core/types/teachers.d.ts

@@ -25,6 +25,9 @@ type Teacher = Vertex & {
   exceptions?: Exception[];
   lockedTimes?: LockedTime[];
   lunch?: LockedTime[];
+  /**
+   * @note an empty array is the same as undefined
+   */
   intervals?: AllowedInterval[];
   rootInterval?: RootInterval;
   days?: Day[];

package/dist/core/util.js

@@ -28,13 +28,13 @@ function getDayIndex(value) {
 	return (day + 6) % 7;
 }
 function parseDateInterval(interval, type) {
-	if (!interval.start) throw new Error(`(RS::V3::To::validateInterval) The interval ${type ? `"${type}"` : ""} is missing a start time`);
-	if (!interval.end) throw new Error(`(RS::V3::To::validateInterval) The interval ${type ? `"${type}"` : ""} is missing an end time`);
+	if (!interval.start) throw new Error(`(RS::To::validateInterval) The interval ${type ? `"${type}"` : ""} is missing a start time`);
+	if (!interval.end) throw new Error(`(RS::To::validateInterval) The interval ${type ? `"${type}"` : ""} is missing an end time`);
 	const start = moment.utc(interval.start);
 	const end = moment.utc(interval.end);
-	if (!start.isValid()) throw new Error(`(RS::V3::To::validateInterval) The interval ${type ? `"${type}"` : ""} has an invalid start time`);
-	if (!end.isValid()) throw new Error(`(RS::V3::To::validateInterval) The interval ${type ? `"${type}"` : ""} has an invalid end time`);
-	if (end.isSameOrBefore(start)) throw new Error(`(RS::V3::To::validateInterval) The interval ${type ? `"${type}"` : ""} is invalid: end time is before or equal to start time`);
+	if (!start.isValid()) throw new Error(`(RS::To::validateInterval) The interval ${type ? `"${type}"` : ""} has an invalid start time`);
+	if (!end.isValid()) throw new Error(`(RS::To::validateInterval) The interval ${type ? `"${type}"` : ""} has an invalid end time`);
+	if (end.isSameOrBefore(start)) throw new Error(`(RS::To::validateInterval) The interval ${type ? `"${type}"` : ""} is invalid: end time is before or equal to start time`);
 	return {
 		start,
 		end

package/dist/core/util.js.map

@@ -1 +1 @@
-{"version":3,"file":"util.js","names":["MongooseTypes"],"sources":["../../src/core/util.ts"],"sourcesContent":["import moment from 'moment';\nimport { Types as MongooseTypes } from 'mongoose';\nimport type { IdKey, InternalIdKey, SerializedVertex, Vertex } from './types/common';\nimport type { Interval } from './types/common/intervals';\nimport type { DateType } from '../common/types';\n\n/**\n * Returns the ID key to use for vertices, which can be either `id`, `_id`, or `ids`.\n */\nexport function getIdKey ({ idKey }: { idKey?: IdKey }) {\n  return idKey ?? 'id';\n}\n\n/**\n * Returns the ID of a vertex, which can be either `_id`, `id`, or `ids`.\n */\nexport function getVertexId (\n  edge:   Vertex | Omit<Vertex, InternalIdKey> | SerializedVertex,\n  _idKey: IdKey | { idKey?: IdKey }\n): string {\n  if (typeof edge === 'string') return edge;\n  if (edge instanceof MongooseTypes.ObjectId) return edge.toString();\n\n  const idKey = typeof _idKey === 'string' ? _idKey : getIdKey(_idKey);\n  if (idKey == '_id' && idKey in edge) return edge._id.toString();\n  if (idKey == 'id'  && idKey in edge) return edge.id;\n  if (idKey == 'ids' && edge.ids     ) return edge.ids;\n\n  throw new Error(`Unable to get vertex ID \"${idKey}\" from edge: ${JSON.stringify(edge)}`);\n}\n\n\n/**\n * Returns the day index in the range 0-6, where 0 is Monday and 6 is Sunday.\n */\nexport function getDayIndex (value: DateType | number): number {\n  const day = typeof value === 'number' ? value : moment.utc(value).day();\n  return (day + 6) % 7;\n}\n\nexport function parseDateInterval (interval: Partial<Interval<DateType>>, type?: string): Interval<moment.Moment> {\n  if (!interval.start) throw new Error(`(RS::V3::To::validateInterval) The interval ${type ? `\"${type}\"` : ''} is missing a start time`);\n  if (!interval.end  ) throw new Error(`(RS::V3::To::validateInterval) The interval ${type ? `\"${type}\"` : ''} is missing an end time`);\n\n  const start = moment.utc(interval.start);\n  const end   = moment.utc(interval.end);\n  if (!start.isValid()) throw new Error(`(RS::V3::To::validateInterval) The interval ${type ? `\"${type}\"` : ''} has an invalid start time`);\n  if (!end  .isValid()) throw new Error(`(RS::V3::To::validateInterval) The interval ${type ? `\"${type}\"` : ''} has an invalid end time`);\n\n  if (end.isSameOrBefore(start)) throw new Error(`(RS::V3::To::validateInterval) The interval ${type ? `\"${type}\"` : ''} is invalid: end time is before or equal to start time`);\n\n  return { start, end };\n}"],"mappings":";;;;;;;AASA,SAAgB,SAAU,EAAE,SAA4B;AACtD,QAAO,SAAS;;;;;AAMlB,SAAgB,YACd,MACA,QACQ;AACR,KAAI,OAAO,SAAS,SAAU,QAAO;AACrC,KAAI,gBAAgBA,MAAc,SAAU,QAAO,KAAK;CAExD,MAAM,QAAQ,OAAO,WAAW,WAAW,SAAS,SAAS;AAC7D,KAAI,SAAS,SAAS,SAAS,KAAM,QAAO,KAAK,IAAI;AACrD,KAAI,SAAS,QAAS,SAAS,KAAM,QAAO,KAAK;AACjD,KAAI,SAAS,SAAS,KAAK,IAAU,QAAO,KAAK;AAEjD,OAAM,IAAI,MAAM,4BAA4B,MAAM,eAAe,KAAK,UAAU;;;;;AAOlF,SAAgB,YAAa,OAAkC;CAC7D,MAAM,MAAM,OAAO,UAAU,WAAW,QAAQ,OAAO,IAAI,OAAO;AAClE,SAAQ,MAAM,KAAK;;AAGrB,SAAgB,kBAAmB,UAAuC,MAAwC;AAChH,KAAI,CAAC,SAAS,MAAO,OAAM,IAAI,MAAM,+CAA+C,OAAO,IAAI,KAAK,KAAK,GAAG;AAC5G,KAAI,CAAC,SAAS,IAAO,OAAM,IAAI,MAAM,+CAA+C,OAAO,IAAI,KAAK,KAAK,GAAG;CAE5G,MAAM,QAAQ,OAAO,IAAI,SAAS;CAClC,MAAM,MAAQ,OAAO,IAAI,SAAS;AAClC,KAAI,CAAC,MAAM,UAAW,OAAM,IAAI,MAAM,+CAA+C,OAAO,IAAI,KAAK,KAAK,GAAG;AAC7G,KAAI,CAAC,IAAM,UAAW,OAAM,IAAI,MAAM,+CAA+C,OAAO,IAAI,KAAK,KAAK,GAAG;AAE7G,KAAI,IAAI,eAAe,OAAQ,OAAM,IAAI,MAAM,+CAA+C,OAAO,IAAI,KAAK,KAAK,GAAG;AAEtH,QAAO;EAAE;EAAO"}
+{"version":3,"file":"util.js","names":["MongooseTypes"],"sources":["../../src/core/util.ts"],"sourcesContent":["import moment from 'moment';\nimport { Types as MongooseTypes } from 'mongoose';\nimport type { IdKey, InternalIdKey, SerializedVertex, Vertex } from './types/common';\nimport type { Interval } from './types/common/intervals';\nimport type { DateType } from '../common/types';\n\n/**\n * Returns the ID key to use for vertices, which can be either `id`, `_id`, or `ids`.\n */\nexport function getIdKey ({ idKey }: { idKey?: IdKey }) {\n  return idKey ?? 'id';\n}\n\n/**\n * Returns the ID of a vertex, which can be either `_id`, `id`, or `ids`.\n */\nexport function getVertexId (\n  edge:   Vertex | Omit<Vertex, InternalIdKey> | SerializedVertex,\n  _idKey: IdKey | { idKey?: IdKey }\n): string {\n  if (typeof edge === 'string') return edge;\n  if (edge instanceof MongooseTypes.ObjectId) return edge.toString();\n\n  const idKey = typeof _idKey === 'string' ? _idKey : getIdKey(_idKey);\n  if (idKey == '_id' && idKey in edge) return edge._id.toString();\n  if (idKey == 'id'  && idKey in edge) return edge.id;\n  if (idKey == 'ids' && edge.ids     ) return edge.ids;\n\n  throw new Error(`Unable to get vertex ID \"${idKey}\" from edge: ${JSON.stringify(edge)}`);\n}\n\n\n/**\n * Returns the day index in the range 0-6, where 0 is Monday and 6 is Sunday.\n */\nexport function getDayIndex (value: DateType | number): number {\n  const day = typeof value === 'number' ? value : moment.utc(value).day();\n  return (day + 6) % 7;\n}\n\nexport function parseDateInterval (interval: Partial<Interval<DateType>>, type?: string): Interval<moment.Moment> {\n  if (!interval.start) throw new Error(`(RS::To::validateInterval) The interval ${type ? `\"${type}\"` : ''} is missing a start time`);\n  if (!interval.end  ) throw new Error(`(RS::To::validateInterval) The interval ${type ? `\"${type}\"` : ''} is missing an end time`);\n\n  const start = moment.utc(interval.start);\n  const end   = moment.utc(interval.end);\n  if (!start.isValid()) throw new Error(`(RS::To::validateInterval) The interval ${type ? `\"${type}\"` : ''} has an invalid start time`);\n  if (!end  .isValid()) throw new Error(`(RS::To::validateInterval) The interval ${type ? `\"${type}\"` : ''} has an invalid end time`);\n\n  if (end.isSameOrBefore(start)) throw new Error(`(RS::To::validateInterval) The interval ${type ? `\"${type}\"` : ''} is invalid: end time is before or equal to start time`);\n\n  return { start, end };\n}"],"mappings":";;;;;;;AASA,SAAgB,SAAU,EAAE,SAA4B;AACtD,QAAO,SAAS;;;;;AAMlB,SAAgB,YACd,MACA,QACQ;AACR,KAAI,OAAO,SAAS,SAAU,QAAO;AACrC,KAAI,gBAAgBA,MAAc,SAAU,QAAO,KAAK;CAExD,MAAM,QAAQ,OAAO,WAAW,WAAW,SAAS,SAAS;AAC7D,KAAI,SAAS,SAAS,SAAS,KAAM,QAAO,KAAK,IAAI;AACrD,KAAI,SAAS,QAAS,SAAS,KAAM,QAAO,KAAK;AACjD,KAAI,SAAS,SAAS,KAAK,IAAU,QAAO,KAAK;AAEjD,OAAM,IAAI,MAAM,4BAA4B,MAAM,eAAe,KAAK,UAAU;;;;;AAOlF,SAAgB,YAAa,OAAkC;CAC7D,MAAM,MAAM,OAAO,UAAU,WAAW,QAAQ,OAAO,IAAI,OAAO;AAClE,SAAQ,MAAM,KAAK;;AAGrB,SAAgB,kBAAmB,UAAuC,MAAwC;AAChH,KAAI,CAAC,SAAS,MAAO,OAAM,IAAI,MAAM,2CAA2C,OAAO,IAAI,KAAK,KAAK,GAAG;AACxG,KAAI,CAAC,SAAS,IAAO,OAAM,IAAI,MAAM,2CAA2C,OAAO,IAAI,KAAK,KAAK,GAAG;CAExG,MAAM,QAAQ,OAAO,IAAI,SAAS;CAClC,MAAM,MAAQ,OAAO,IAAI,SAAS;AAClC,KAAI,CAAC,MAAM,UAAW,OAAM,IAAI,MAAM,2CAA2C,OAAO,IAAI,KAAK,KAAK,GAAG;AACzG,KAAI,CAAC,IAAM,UAAW,OAAM,IAAI,MAAM,2CAA2C,OAAO,IAAI,KAAK,KAAK,GAAG;AAEzG,KAAI,IAAI,eAAe,OAAQ,OAAM,IAAI,MAAM,2CAA2C,OAAO,IAAI,KAAK,KAAK,GAAG;AAElH,QAAO;EAAE;EAAO"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@royalschedule/maps",
   "description": "",
-  "version": "4.0.3",
+  "version": "4.0.5",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",