@royalschedule/maps 3.3.14 → 3.3.16

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

@@ -1,4 +1,5 @@
 import { Types } from "../../core/v2/types/index.js";
+import { Options } from "../types/schedules.js";
 import * as xlsx0 from "xlsx";
 
 //#region src/Additio/to/index.d.ts
@@ -12,7 +13,8 @@ declare class export_default {
     teachers: Types.teacher[];
     courses: Types.course[];
     events: Types.event[];
-  }) => xlsx0.WorkBook;
+    lockedTimes: Types.lockedTime[];
+  }, options?: Options) => xlsx0.WorkBook;
 }
 //#endregion
 export { export_default };

package/dist/Additio/to/schedules.js

@@ -7,7 +7,7 @@ const getId = (ref) => {
 	if (typeof ref == "string") return ref;
 	return ref.id.toString();
 };
-var schedules_default = (schedule) => {
+var schedules_default = (schedule, options = {}) => {
 	const periodsMap = new Map(schedule.periods.map((x) => [getId(x), x]));
 	periodsMap.set("", { ranges: [{
 		start: schedule.division.start,
@@ -31,20 +31,20 @@ var schedules_default = (schedule) => {
 	const groupsMap = new Map(schedule.groups.map((x) => [getId(x), x]));
 	const teachersMap = new Map(schedule.teachers.map((x) => [getId(x), x]));
 	const coursesMap = new Map(schedule.courses.map((x) => [getId(x), x]));
-	const events = schedule.events.reduce((acc, event) => {
-		if (event.parked) return acc;
-		const course = coursesMap.get(getId(event.course));
-		if (!course) return acc;
-		const start = moment.utc(event.start);
-		const end = moment.utc(event.end);
-		const periodId = getId(event.period ?? course.period ?? schedule.settings.period);
+	const events = (options.includeEvents ?? true ? schedule.events : []).map((x) => {
+		if (x.parked) return;
+		const course = coursesMap.get(getId(x.course));
+		if (!course) return;
+		const start = moment.utc(x.start);
+		const end = moment.utc(x.end);
+		const periodId = getId(x.period ?? course.period ?? schedule.settings.period);
 		const inWeeks = inWeeksMap.get(periodId);
-		const locations = (event.inLocations ?? []).map((x) => x ? locationsMap.get(getId(x)) : null).filter((x) => !!x);
-		const teachers = (event.teachers ?? course.teachers ?? []).map((x) => teachersMap.get(getId(x.to))).filter((x) => !!x);
-		const groups = (event.groups ?? course.groups ?? []).map((x) => groupsMap.get(getId(x.to))).filter((x) => !!x);
+		const locations = (x.inLocations ?? []).map((x$1) => x$1 ? locationsMap.get(getId(x$1)) : null).filter((x$1) => !!x$1);
+		const teachers = (x.teachers ?? course.teachers ?? []).map((x$1) => teachersMap.get(getId(x$1.to))).filter((x$1) => !!x$1);
+		const groups = (x.groups ?? course.groups ?? []).map((x$1) => groupsMap.get(getId(x$1.to))).filter((x$1) => !!x$1);
 		const out = {
-			id: event._id?.toString(),
-			externalid: event.ids?.toString(),
+			id: x._id?.toString(),
+			externalid: x.ids?.toString(),
 			groupid: course.ids,
 			group: course.displayName,
 			dayid: (start.day() + 6) % 7,
@@ -52,16 +52,31 @@ var schedules_default = (schedule) => {
 			length: end.diff(start, "minutes"),
 			subject: course.subject,
 			inweek: inWeeks,
-			roomid: locations.map((x) => x.ids).join(", "),
-			room: locations.map((x) => x.displayName).join(", "),
-			teacherid: teachers.map((x) => x.ids).join(", "),
-			teacher: teachers.map((x) => x.displayName).join(", "),
-			classid: groups.map((x) => x.ids).join(", "),
-			class: groups.map((x) => x.displayName).join(", ")
+			roomid: locations.map((x$1) => x$1.ids).join(", "),
+			room: locations.map((x$1) => x$1.displayName).join(", "),
+			teacherid: teachers.map((x$1) => x$1.ids).join(", "),
+			teacher: teachers.map((x$1) => x$1.displayName).join(", "),
+			classid: groups.map((x$1) => x$1.ids).join(", "),
+			class: groups.map((x$1) => x$1.displayName).join(", ")
 		};
-		return acc.concat(out);
-	}, []);
-	return toXlsx(events);
+		return out;
+	}).filter((x) => !!x);
+	const complementaryTimes = (options.includeComplementaryTimes ?? true ? schedule.lockedTimes : []).filter((x) => x.type == "COMPLEMENTARY_TIME").map((x) => {
+		if (x.parked) return;
+		const start = moment.utc(x.start);
+		const end = moment.utc(x.end);
+		const teachers = (x.coalesced ?? []).filter((x$1) => x$1.toModel == "teachers").map((x$1) => teachersMap.get(getId(x$1.to))).filter((x$1) => !!x$1);
+		const out = {
+			id: x._id?.toString(),
+			dayid: (start.day() + 6) % 7,
+			startTime: start.format("HHmm"),
+			length: end.diff(start, "minutes"),
+			teacherid: teachers.map((x$1) => x$1.ids).join(", "),
+			teacher: teachers.map((x$1) => x$1.displayName).join(", ")
+		};
+		return out;
+	}).filter((x) => !!x);
+	return toXlsx([...events, ...complementaryTimes]);
 };
 function toXlsx(events) {
 	const wb = XLSX$1.utils.book_new();

package/dist/Additio/to/schedules.js.map

@@ -1 +1 @@
-{"version":3,"file":"schedules.js","names":["weeks","out: OutEvent","XLSX"],"sources":["../../../src/Additio/to/schedules.ts"],"sourcesContent":["import * as XLSX                                from 'xlsx';\nimport moment                              from 'moment';\nimport { Types                           } from 'mongoose';\n\nimport { Types as CoreTypes } from '../../core/types';\n\ntype OutEvent = {\n  id?:         string;\n  externalid?: string;\n  groupid?:    string;\n  group?:      string;\n  dayid?:      number;\n  startTime?:  string;\n  length?:     number;\n  subject?:    string;\n  roomid?:     string;\n  room?:       string;\n  teacherid?:  string;\n  teacher?:    string;\n  classid?:    string;\n  class?:      string;\n  inweek?:     string;\n};\n\ntype Schedule = {\n  division:  CoreTypes.division;\n  settings:  CoreTypes.divisionSettings;\n  periods:   CoreTypes.period[];\n  locations: CoreTypes.location[];\n  groups:    CoreTypes.group[];\n  teachers:  CoreTypes.teacher[];\n  courses:   CoreTypes.course[];\n  events:    CoreTypes.event[];\n};\n\n\nconst getId = (ref: { id?: string } | Types.ObjectId | string | undefined): string => {\n  if (!ref) return '';\n  if (typeof ref == 'string') return ref;\n  return ref.id!.toString();\n};\n\nexport default (\n  schedule: Schedule\n): XLSX.WorkBook => {\n\n  // a map of period.id -> period\n  const periodsMap = new Map(schedule.periods.map(x => [getId(x), x]));\n  periodsMap.set('', { ranges: [{ start: schedule.division.start, end: schedule.division.end }] });\n\n  // a map of period.id -> inWeeks\n  const inWeeksMap = new Map<string, string>();\n  periodsMap.forEach((period, id) => {\n    const weeks = period.ranges\n      .map(x => {\n        // fetch all weeks between start and end\n        const start = moment.utc(x.start);\n        const end   = moment.utc(x.end);\n        const weeks = new Array<number>();\n        while (start.isBefore(end)) {\n          weeks.push(start.week());\n          start.add(1, 'week');\n        }\n        return weeks;\n      })\n      .flat()\n      .join(', ');\n\n    inWeeksMap.set(id, weeks);\n  });\n\n  // a map of location.id -> location\n  const locationsMap = new Map(schedule.locations.map(x => [getId(x), x]));\n\n  // a map of group.id -> group\n  const groupsMap = new Map(schedule.groups.map(x => [getId(x), x]));\n\n  // a map of teacher.id -> teacher\n  const teachersMap = new Map(schedule.teachers.map(x => [getId(x), x]));\n\n  // a map of course.id -> course\n  const coursesMap = new Map(schedule.courses.map(x => [getId(x), x]));\n\n\n  const events = schedule.events.reduce((acc, event) => {\n    // ignore parked events\n    if (event.parked) return acc;\n\n    // must have a course\n    const course = coursesMap.get(getId(event.course));\n    if (!course) return acc;\n\n    const start = moment.utc(event.start);\n    const end   = moment.utc(event.end);\n\n    const periodId = getId(event.period ?? course.period ?? schedule.settings.period);\n    const inWeeks = inWeeksMap.get(periodId);\n\n    const locations = (event.inLocations                 ?? []).map(x =>  x ? locationsMap.get(getId(x   )) : null).filter((x): x is NonNullable<typeof x> => !!x);\n    const teachers  = (event.teachers ?? course.teachers ?? []).map(x =>      teachersMap .get(getId(x.to))       ).filter((x): x is NonNullable<typeof x> => !!x);\n    const groups    = (event.groups   ?? course.groups   ?? []).map(x =>      groupsMap   .get(getId(x.to))       ).filter((x): x is NonNullable<typeof x> => !!x);\n\n    const out: OutEvent = {\n      id:         event._id?.toString(),\n      externalid: event.ids?.toString(),\n      groupid:    course.ids,\n      group:      course.displayName,\n      dayid:      (start.day() + 6) % 7,\n      startTime:  start.format('HHmm'),\n      length:     end.diff(start, 'minutes'),\n      subject:    course.subject,\n      inweek:     inWeeks,\n      roomid:     locations.map(x => x.ids        ).join(', '),\n      room:       locations.map(x => x.displayName).join(', '),\n      teacherid:  teachers .map(x => x.ids        ).join(', '),\n      teacher:    teachers .map(x => x.displayName).join(', '),\n      classid:    groups   .map(x => x.ids        ).join(', '),\n      class:      groups   .map(x => x.displayName).join(', ')\n    };\n    return acc.concat(out);\n  }, [] as OutEvent[]);\n\n  // return toXlsx(events);\n  return toXlsx(events);\n};\n\nfunction toXlsx (events: OutEvent[]): XLSX.WorkBook {\n  const wb = XLSX.utils.book_new();\n\n  XLSX.utils.book_append_sheet(wb, XLSX.utils.json_to_sheet(events), 'royal schedule export');\n\n  return wb;\n}"],"mappings":";;;;AAoCA,MAAM,SAAS,QAAuE;AACpF,KAAI,CAAC,IAAK,QAAO;AACjB,KAAI,OAAO,OAAO,SAAU,QAAO;AACnC,QAAO,IAAI,GAAI;;AAGjB,yBACE,aACkB;CAGlB,MAAM,aAAa,IAAI,IAAI,SAAS,QAAQ,KAAI,MAAK,CAAC,MAAM,IAAI;AAChE,YAAW,IAAI,IAAI,EAAE,QAAQ,CAAC;EAAE,OAAO,SAAS,SAAS;EAAO,KAAK,SAAS,SAAS;;CAGvF,MAAM,6BAAa,IAAI;AACvB,YAAW,SAAS,QAAQ,OAAO;EACjC,MAAM,QAAQ,OAAO,OAClB,KAAI,MAAK;GAER,MAAM,QAAQ,OAAO,IAAI,EAAE;GAC3B,MAAM,MAAQ,OAAO,IAAI,EAAE;GAC3B,MAAMA,UAAQ,IAAI;AAClB,UAAO,MAAM,SAAS,MAAM;AAC1B,YAAM,KAAK,MAAM;AACjB,UAAM,IAAI,GAAG;;AAEf,UAAOA;KAER,OACA,KAAK;AAER,aAAW,IAAI,IAAI;;CAIrB,MAAM,eAAe,IAAI,IAAI,SAAS,UAAU,KAAI,MAAK,CAAC,MAAM,IAAI;CAGpE,MAAM,YAAY,IAAI,IAAI,SAAS,OAAO,KAAI,MAAK,CAAC,MAAM,IAAI;CAG9D,MAAM,cAAc,IAAI,IAAI,SAAS,SAAS,KAAI,MAAK,CAAC,MAAM,IAAI;CAGlE,MAAM,aAAa,IAAI,IAAI,SAAS,QAAQ,KAAI,MAAK,CAAC,MAAM,IAAI;CAGhE,MAAM,SAAS,SAAS,OAAO,QAAQ,KAAK,UAAU;AAEpD,MAAI,MAAM,OAAQ,QAAO;EAGzB,MAAM,SAAS,WAAW,IAAI,MAAM,MAAM;AAC1C,MAAI,CAAC,OAAQ,QAAO;EAEpB,MAAM,QAAQ,OAAO,IAAI,MAAM;EAC/B,MAAM,MAAQ,OAAO,IAAI,MAAM;EAE/B,MAAM,WAAW,MAAM,MAAM,UAAU,OAAO,UAAU,SAAS,SAAS;EAC1E,MAAM,UAAU,WAAW,IAAI;EAE/B,MAAM,aAAa,MAAM,eAA+B,IAAI,KAAI,MAAM,IAAI,aAAa,IAAI,MAAM,MAAS,MAAM,QAAQ,MAAkC,CAAC,CAAC;EAC5J,MAAM,YAAa,MAAM,YAAY,OAAO,YAAY,IAAI,KAAI,MAAU,YAAa,IAAI,MAAM,EAAE,MAAa,QAAQ,MAAkC,CAAC,CAAC;EAC5J,MAAM,UAAa,MAAM,UAAY,OAAO,UAAY,IAAI,KAAI,MAAU,UAAa,IAAI,MAAM,EAAE,MAAa,QAAQ,MAAkC,CAAC,CAAC;EAE5J,MAAMC,MAAgB;GACpB,IAAY,MAAM,KAAK;GACvB,YAAY,MAAM,KAAK;GACvB,SAAY,OAAO;GACnB,OAAY,OAAO;GACnB,QAAa,MAAM,QAAQ,KAAK;GAChC,WAAY,MAAM,OAAO;GACzB,QAAY,IAAI,KAAK,OAAO;GAC5B,SAAY,OAAO;GACnB,QAAY;GACZ,QAAY,UAAU,KAAI,MAAK,EAAE,KAAa,KAAK;GACnD,MAAY,UAAU,KAAI,MAAK,EAAE,aAAa,KAAK;GACnD,WAAY,SAAU,KAAI,MAAK,EAAE,KAAa,KAAK;GACnD,SAAY,SAAU,KAAI,MAAK,EAAE,aAAa,KAAK;GACnD,SAAY,OAAU,KAAI,MAAK,EAAE,KAAa,KAAK;GACnD,OAAY,OAAU,KAAI,MAAK,EAAE,aAAa,KAAK;;AAErD,SAAO,IAAI,OAAO;IACjB;AAGH,QAAO,OAAO;;AAGhB,SAAS,OAAQ,QAAmC;CAClD,MAAM,KAAKC,OAAK,MAAM;AAEtB,QAAK,MAAM,kBAAkB,IAAIA,OAAK,MAAM,cAAc,SAAS;AAEnE,QAAO"}
+{"version":3,"file":"schedules.js","names":["weeks","x","out: OutEvent","XLSX"],"sources":["../../../src/Additio/to/schedules.ts"],"sourcesContent":["import * as XLSX                                from 'xlsx';\nimport moment                              from 'moment';\nimport { Types                           } from 'mongoose';\n\nimport { Types as CoreTypes } from '../../core/types';\nimport { Options } from '../types/schedules';\n\ntype OutEvent = {\n  id?:         string;\n  externalid?: string;\n  groupid?:    string;\n  group?:      string;\n  dayid?:      number;\n  startTime?:  string;\n  length?:     number;\n  subject?:    string;\n  roomid?:     string;\n  room?:       string;\n  teacherid?:  string;\n  teacher?:    string;\n  classid?:    string;\n  class?:      string;\n  inweek?:     string;\n};\n\ntype Schedule = {\n  division:    CoreTypes.division;\n  settings:    CoreTypes.divisionSettings;\n  periods:     CoreTypes.period[];\n  locations:   CoreTypes.location[];\n  groups:      CoreTypes.group[];\n  teachers:    CoreTypes.teacher[];\n  courses:     CoreTypes.course[];\n  events:      CoreTypes.event[];\n  lockedTimes: CoreTypes.lockedTime[];\n};\n\n\nconst getId = (ref: { id?: string } | Types.ObjectId | string | undefined): string => {\n  if (!ref) return '';\n  if (typeof ref == 'string') return ref;\n  return ref.id!.toString();\n};\n\nexport default (\n  schedule: Schedule,\n  options:  Options = { }\n): XLSX.WorkBook => {\n\n  // a map of period.id -> period\n  const periodsMap = new Map(schedule.periods.map(x => [getId(x), x]));\n  periodsMap.set('', { ranges: [{ start: schedule.division.start, end: schedule.division.end }] });\n\n  // a map of period.id -> inWeeks\n  const inWeeksMap = new Map<string, string>();\n  periodsMap.forEach((period, id) => {\n    const weeks = period.ranges\n      .map(x => {\n        // fetch all weeks between start and end\n        const start = moment.utc(x.start);\n        const end   = moment.utc(x.end);\n        const weeks = new Array<number>();\n        while (start.isBefore(end)) {\n          weeks.push(start.week());\n          start.add(1, 'week');\n        }\n        return weeks;\n      })\n      .flat()\n      .join(', ');\n\n    inWeeksMap.set(id, weeks);\n  });\n\n  // a map of location.id -> location\n  const locationsMap = new Map(schedule.locations.map(x => [getId(x), x]));\n\n  // a map of group.id -> group\n  const groupsMap = new Map(schedule.groups.map(x => [getId(x), x]));\n\n  // a map of teacher.id -> teacher\n  const teachersMap = new Map(schedule.teachers.map(x => [getId(x), x]));\n\n  // a map of course.id -> course\n  const coursesMap = new Map(schedule.courses.map(x => [getId(x), x]));\n\n  const events = (options.includeEvents ?? true ? schedule.events : [])\n    .map(x => {\n      // ignore parked events\n      if (x.parked) return;\n\n      // must have a course\n      const course = coursesMap.get(getId(x.course));\n      if (!course) return;\n\n      const start = moment.utc(x.start);\n      const end   = moment.utc(x.end);\n\n      const periodId = getId(x.period ?? course.period ?? schedule.settings.period);\n      const inWeeks = inWeeksMap.get(periodId);\n\n      const locations = (x.inLocations                 ?? []).map(x =>  x ? locationsMap.get(getId(x   )) : null).filter(x => !!x);\n      const teachers  = (x.teachers ?? course.teachers ?? []).map(x =>      teachersMap .get(getId(x.to))       ).filter(x => !!x);\n      const groups    = (x.groups   ?? course.groups   ?? []).map(x =>      groupsMap   .get(getId(x.to))       ).filter(x => !!x);\n\n      const out: OutEvent = {\n        id:         x._id?.toString(),\n        externalid: x.ids?.toString(),\n        groupid:    course.ids,\n        group:      course.displayName,\n        dayid:      (start.day() + 6) % 7,\n        startTime:  start.format('HHmm'),\n        length:     end.diff(start, 'minutes'),\n        subject:    course.subject,\n        inweek:     inWeeks,\n        roomid:     locations.map(x => x.ids        ).join(', '),\n        room:       locations.map(x => x.displayName).join(', '),\n        teacherid:  teachers .map(x => x.ids        ).join(', '),\n        teacher:    teachers .map(x => x.displayName).join(', '),\n        classid:    groups   .map(x => x.ids        ).join(', '),\n        class:      groups   .map(x => x.displayName).join(', ')\n      };\n      return out;\n    })\n    .filter(x => !!x);\n\n  const complementaryTimes = (options.includeComplementaryTimes ?? true ? schedule.lockedTimes : [])\n    .filter(x => x.type == 'COMPLEMENTARY_TIME')\n    .map(x => {\n      // ignore parked events\n      if (x.parked) return;\n\n      const start = moment.utc(x.start);\n      const end   = moment.utc(x.end);\n\n      const teachers = (x.coalesced ?? [])\n        .filter(x => x.toModel == 'teachers')\n        .map(x => teachersMap.get(getId(x.to)))\n        .filter(x => !!x);\n\n      const out: OutEvent = {\n        id:        x._id?.toString(),\n        dayid:     (start.day() + 6) % 7,\n        startTime: start.format('HHmm'),\n        length:    end.diff(start, 'minutes'),\n        teacherid: teachers .map(x => x.ids        ).join(', '),\n        teacher:   teachers .map(x => x.displayName).join(', '),\n      };\n      return out;\n    })\n    .filter(x => !!x);\n\n  return toXlsx([...events, ...complementaryTimes]);\n};\n\nfunction toXlsx (events: OutEvent[]): XLSX.WorkBook {\n  const wb = XLSX.utils.book_new();\n\n  XLSX.utils.book_append_sheet(wb, XLSX.utils.json_to_sheet(events), 'royal schedule export');\n\n  return wb;\n}"],"mappings":"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"}

package/dist/Additio/types/schedules.d.ts

@@ -6,6 +6,10 @@ import { ScheduleGroup } from "./schedule-groups.js";
 import { Lesson } from "./lessons.js";
 
 //#region src/Additio/types/schedules.d.ts
+type Options = {
+  includeEvents?: boolean;
+  includeComplementaryTimes?: boolean;
+};
 type Schedule = {
   start_date: Date;
   end_date: Date;
@@ -23,5 +27,5 @@ type Schedule = {
   lessons: Lesson[];
 };
 //#endregion
-export { Schedule };
+export { Options, Schedule };
 //# sourceMappingURL=schedules.d.ts.map

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

@@ -1,9 +1,9 @@
 import { Types } from "../../core/v2/types/index.js";
-import * as xlsx1 from "xlsx";
+import * as xlsx2 from "xlsx";
 
 //#region src/PlanDigital/to/index.d.ts
 declare class export_default {
-  static schedules: (courseEvents: Types.course[]) => xlsx1.WorkBook;
+  static schedules: (courseEvents: Types.course[]) => xlsx2.WorkBook;
 }
 //#endregion
 export { export_default };

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

@@ -1,8 +1,8 @@
-import available_dependencies_default from "./available-dependencies.js";
 import days_default from "./days.js";
 import locked_times_default from "./locked-times.js";
 import break_lengths_default from "./break-lengths.js";
 import intervals_default from "./intervals.js";
+import available_dependencies_default from "./available-dependencies.js";
 import { mapGroupReferences } from "./course-events/groups.js";
 import course_events_default from "./course-events/index.js";
 import { groupBy, omit, values } from "lodash-es";

package/dist/RS/v3/to/constraints.js

@@ -11,23 +11,7 @@ import { parsePeriods } from "./periods.js";
 import { pick } from "lodash-es";
 
 //#region src/RS/v3/to/constraints.ts
-var constraints_default = (schedule, _options = {}) => {
-	const options = (() => {
-		const pso = _options.partialScheduleOptions;
-		const partialScheduleOptions = pso ? {
-			includedEvents: pso.includedEvents ? new Set(pso.includedEvents) : void 0,
-			includedLocations: pso.includedLocations ? new Set(pso.includedLocations) : void 0,
-			omittedEventsHandling: pso.omittedEventsHandling
-		} : void 0;
-		return {
-			..._options,
-			partialScheduleOptions
-		};
-	})();
-	if (options.partialScheduleOptions?.includedEvents?.size) options.partialScheduleOptions.includedEvents = new Set([...options.partialScheduleOptions.includedEvents].map((x) => {
-		if (x.startsWith("events.") || x.startsWith("lockedTimes.")) return x;
-		return `events.${x}`;
-	}));
+var constraints_default = (schedule, options = {}) => {
 	schedule = structuredClone(schedule);
 	if (schedule == null) return {};
 	const idKey = options.idKey || "id";

package/dist/RS/v3/to/constraints.js.map

@@ -1 +1 @@
-{"version":3,"file":"constraints.js","names":["partialScheduleOptions: ParsedOutOptions['partialScheduleOptions']","idKey: keyof CoreTypes.course","groupMap","_destructure","data: Constraint","getSettings","getDefault","getCollections","getDependencies","getGroups","getTeachers","getDynamicLockedTimes"],"sources":["../../../../src/RS/v3/to/constraints.ts"],"sourcesContent":["import { pick } from 'lodash-es';\n\nimport { Types as CoreTypes              } from '../../../core/types';\nimport { Deserialized                    } from '../../../core/types';\n\nimport { Constraint                      } from '../types/constraints';\nimport { OutOptions, ParsedOutOptions    } from '../types/out-options';\n\nimport _destructure                        from './destructure';\nimport getDependencies                     from './dependencies';\nimport getTeachers                         from './teachers';\nimport getGroups                           from './groups';\nimport getCollections                      from './collections';\nimport getSettings                         from './settings';\nimport getDefault                          from './default';\nimport getDynamicLockedTimes               from './dynamic-locked-times';\nimport { parsePeriods                    } from './periods';\nimport { personsToIndividuals,\n  groupsToIndividuals,\n  teachersToIndividuals           } from './individuals';\n\nexport default (\n  schedule: Partial<Deserialized<CoreTypes.schedule> & { division: Deserialized<CoreTypes.division> }>,\n  _options:  OutOptions = {}\n): Constraint => {\n  ////\n  //// parse the output options\n  ////\n  const options = ((): ParsedOutOptions => {\n    const pso = _options.partialScheduleOptions;\n    const partialScheduleOptions: ParsedOutOptions['partialScheduleOptions'] = pso\n      ? {\n        includedEvents:        pso.includedEvents    ? new Set(pso.includedEvents)    : undefined,\n        includedLocations:     pso.includedLocations ? new Set(pso.includedLocations) : undefined,\n        omittedEventsHandling: pso.omittedEventsHandling\n      }\n      : undefined;\n\n    return { ..._options, partialScheduleOptions };\n  })();\n\n  ////\n  //// for backward compatibility: add default collection to included events set\n  ////\n  if (options.partialScheduleOptions?.includedEvents?.size) {\n    options.partialScheduleOptions.includedEvents = new Set(\n      [...options.partialScheduleOptions.includedEvents]\n        .map(x => {\n          // should start with 'events.' or 'lockedTimes.' prefix\n          if (x.startsWith('events.') || x.startsWith('lockedTimes.')) return x;\n          return `events.${x}`;\n        })\n    );\n  }\n\n\n  // clone schedule to avoid mutating the original object\n  schedule = structuredClone(schedule);\n\n  if (schedule == null) return {};\n  const idKey: keyof CoreTypes.course = options.idKey || 'id';\n\n  const settings = schedule.settings;\n  if (!settings) throw new Error('settings missing in schedule');\n\n  const area          = schedule.area;\n  const groups        = schedule.groups        ?? [];\n  const teachers      = schedule.teachers      ?? [];\n  const locations     = schedule.locations     ?? [];\n  const events        = schedule.events        ?? [];\n  const overlapGroups = schedule.overlapGroups ?? [];\n  const courses       = schedule.courses       ?? [];\n  const periods       = schedule.periods       ?? [];\n  const persons       = schedule.persons       ?? [];\n\n  ////\n  //// populate some group references to ensure that the types are correct\n  ////\n  {\n    const groupMap = new Map(groups\n      .map(x => ([x[idKey]?.toString(), x] as const))\n      .filter(x => !!x[0])\n    );\n    // group.parentGroups\n    groups?.forEach(item => {\n      if (!item.parentGroups) return;\n      item.parentGroups = item.parentGroups\n        .map((x: Deserialized<CoreTypes.group> | string) => {\n          return typeof x === 'string' ? groupMap.get(x) : groupMap.get(x[idKey]?.toString());\n        })\n        .filter((x): x is NonNullable<typeof x> => !!x);\n    });\n    // course.groups.to and event.groups.to\n    courses.concat(events).forEach(item => {\n      if (!item.groups) return;\n      item.groups.forEach((x: { to: Deserialized<CoreTypes.group> | string }) => {\n        const group = typeof x.to === 'string' ? groupMap.get(x.to) : groupMap.get(x.to[idKey]?.toString());\n        if (group) x.to = group;\n      });\n    });\n  }\n\n  // unfortunately the division is set either as \"division\" or \"divisions\" so we need to handle both cases\n  const division = schedule.divisions ?? schedule.division;\n\n  // map periods\n  const { map: periodsMap, matrix: periodsMatrix } = parsePeriods(periods, pick(division, 'start', 'end'));\n\n  const destructMap = _destructure(courses, events, groups, settings, options);\n\n  const data: Constraint = {\n    settings: getSettings(settings),\n    default:  getDefault(settings, periodsMap, options),\n    ...periodsMatrix && { periods: periodsMatrix },\n    ...area && {\n      areas: {\n        breakLengthMatrix: area.breakLengthMatrix,\n        list:              area.list\n      }\n    },\n    // intervals:    getRootIntervals(rootIntervals, settings!),\n    events:       getCollections(courses, events, overlapGroups, settings, options, periodsMap, destructMap),\n    dependencies: getDependencies(locations, settings, options),\n    groups:       getGroups(groups, settings, options)\n      .concat(getTeachers(teachers, settings, options)),\n    individuals: personsToIndividuals(persons, settings, options)\n      .concat(groupsToIndividuals(groups, settings, options))\n      .concat(teachersToIndividuals(teachers, settings, options)),\n  };\n\n  /*\n    create map of groups if some groups are destructed\n    groupMap: group id -> group\n  */\n  const groupMap = new Map<string, Deserialized<CoreTypes.group>>();\n  if (destructMap.size) {\n    groups?.forEach(x => groupMap.set(x[idKey]!.toString(), x));\n\n    /*\n      Find group and clone and substitute id with person id\n    */\n    data.individuals = data.individuals?.concat(Array.from(destructMap.values()));\n  }\n\n  /*\n    handle groups.lunch and teachers.lunch\n    append to events list\n  */\n  const lunchSet = new Set<string>();\n  /**\n   * Only add lunch if the group is a class\n   */\n  if (groups?.some(group => 'lunch' in group))\n    data.events = (data.events ?? []).concat(getDynamicLockedTimes(groups.filter(x => x.species == 'class'), settings, options, lunchSet, destructMap));\n\n  if (teachers?.some(teacher => 'lunch' in teacher || 'complementaryTimes' in teacher))\n    data.events = (data.events ?? []).concat(getDynamicLockedTimes(teachers, settings, options, lunchSet));\n\n  return data;\n};"],"mappings":"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"}
+{"version":3,"file":"constraints.js","names":["idKey: keyof CoreTypes.course","groupMap","_destructure","data: Constraint","getSettings","getDefault","getCollections","getDependencies","getGroups","getTeachers","getDynamicLockedTimes"],"sources":["../../../../src/RS/v3/to/constraints.ts"],"sourcesContent":["import { pick } from 'lodash-es';\n\nimport { Types as CoreTypes              } from '../../../core/types';\nimport { Deserialized                    } from '../../../core/types';\n\nimport { Constraint                      } from '../types/constraints';\nimport { ParsedOutOptions } from '../types/out-options';\n\nimport _destructure                        from './destructure';\nimport getDependencies                     from './dependencies';\nimport getTeachers                         from './teachers';\nimport getGroups                           from './groups';\nimport getCollections                      from './collections';\nimport getSettings                         from './settings';\nimport getDefault                          from './default';\nimport getDynamicLockedTimes               from './dynamic-locked-times';\nimport { parsePeriods                    } from './periods';\nimport { personsToIndividuals,\n  groupsToIndividuals,\n  teachersToIndividuals           } from './individuals';\n\nexport default (\n  schedule: Partial<Deserialized<CoreTypes.schedule> & { division: Deserialized<CoreTypes.division> }>,\n  options:  ParsedOutOptions = {}\n): Constraint => {\n\n  // clone schedule to avoid mutating the original object\n  schedule = structuredClone(schedule);\n\n  if (schedule == null) return {};\n  const idKey: keyof CoreTypes.course = options.idKey || 'id';\n\n  const settings = schedule.settings;\n  if (!settings) throw new Error('settings missing in schedule');\n\n  const area          = schedule.area;\n  const groups        = schedule.groups        ?? [];\n  const teachers      = schedule.teachers      ?? [];\n  const locations     = schedule.locations     ?? [];\n  const events        = schedule.events        ?? [];\n  const overlapGroups = schedule.overlapGroups ?? [];\n  const courses       = schedule.courses       ?? [];\n  const periods       = schedule.periods       ?? [];\n  const persons       = schedule.persons       ?? [];\n\n  ////\n  //// populate some group references to ensure that the types are correct\n  ////\n  {\n    const groupMap = new Map(groups\n      .map(x => ([x[idKey]?.toString(), x] as const))\n      .filter(x => !!x[0])\n    );\n    // group.parentGroups\n    groups?.forEach(item => {\n      if (!item.parentGroups) return;\n      item.parentGroups = item.parentGroups\n        .map((x: Deserialized<CoreTypes.group> | string) => {\n          return typeof x === 'string' ? groupMap.get(x) : groupMap.get(x[idKey]?.toString());\n        })\n        .filter((x): x is NonNullable<typeof x> => !!x);\n    });\n    // course.groups.to and event.groups.to\n    courses.concat(events).forEach(item => {\n      if (!item.groups) return;\n      item.groups.forEach((x: { to: Deserialized<CoreTypes.group> | string }) => {\n        const group = typeof x.to === 'string' ? groupMap.get(x.to) : groupMap.get(x.to[idKey]?.toString());\n        if (group) x.to = group;\n      });\n    });\n  }\n\n  // unfortunately the division is set either as \"division\" or \"divisions\" so we need to handle both cases\n  const division = schedule.divisions ?? schedule.division;\n\n  // map periods\n  const { map: periodsMap, matrix: periodsMatrix } = parsePeriods(periods, pick(division, 'start', 'end'));\n\n  const destructMap = _destructure(courses, events, groups, settings, options);\n\n  const data: Constraint = {\n    settings: getSettings(settings),\n    default:  getDefault(settings, periodsMap, options),\n    ...periodsMatrix && { periods: periodsMatrix },\n    ...area && {\n      areas: {\n        breakLengthMatrix: area.breakLengthMatrix,\n        list:              area.list\n      }\n    },\n    // intervals:    getRootIntervals(rootIntervals, settings!),\n    events:       getCollections(courses, events, overlapGroups, settings, options, periodsMap, destructMap),\n    dependencies: getDependencies(locations, settings, options),\n    groups:       getGroups(groups, settings, options)\n      .concat(getTeachers(teachers, settings, options)),\n    individuals: personsToIndividuals(persons, settings, options)\n      .concat(groupsToIndividuals(groups, settings, options))\n      .concat(teachersToIndividuals(teachers, settings, options)),\n  };\n\n  /*\n    create map of groups if some groups are destructed\n    groupMap: group id -> group\n  */\n  const groupMap = new Map<string, Deserialized<CoreTypes.group>>();\n  if (destructMap.size) {\n    groups?.forEach(x => groupMap.set(x[idKey]!.toString(), x));\n\n    /*\n      Find group and clone and substitute id with person id\n    */\n    data.individuals = data.individuals?.concat(Array.from(destructMap.values()));\n  }\n\n  /*\n    handle groups.lunch and teachers.lunch\n    append to events list\n  */\n  const lunchSet = new Set<string>();\n  /**\n   * Only add lunch if the group is a class\n   */\n  if (groups?.some(group => 'lunch' in group))\n    data.events = (data.events ?? []).concat(getDynamicLockedTimes(groups.filter(x => x.species == 'class'), settings, options, lunchSet, destructMap));\n\n  if (teachers?.some(teacher => 'lunch' in teacher || 'complementaryTimes' in teacher))\n    data.events = (data.events ?? []).concat(getDynamicLockedTimes(teachers, settings, options, lunchSet));\n\n  return data;\n};"],"mappings":";;;;;;;;;;;;;AAqBA,2BACE,UACA,UAA6B,OACd;AAGf,YAAW,gBAAgB;AAE3B,KAAI,YAAY,KAAM,QAAO;CAC7B,MAAMA,QAAgC,QAAQ,SAAS;CAEvD,MAAM,WAAW,SAAS;AAC1B,KAAI,CAAC,SAAU,OAAM,IAAI,MAAM;CAE/B,MAAM,OAAgB,SAAS;CAC/B,MAAM,SAAgB,SAAS,UAAiB;CAChD,MAAM,WAAgB,SAAS,YAAiB;CAChD,MAAM,YAAgB,SAAS,aAAiB;CAChD,MAAM,SAAgB,SAAS,UAAiB;CAChD,MAAM,gBAAgB,SAAS,iBAAiB;CAChD,MAAM,UAAgB,SAAS,WAAiB;CAChD,MAAM,UAAgB,SAAS,WAAiB;CAChD,MAAM,UAAgB,SAAS,WAAiB;CAKhD;EACE,MAAMC,aAAW,IAAI,IAAI,OACtB,KAAI,MAAM,CAAC,EAAE,QAAQ,YAAY,IACjC,QAAO,MAAK,CAAC,CAAC,EAAE;AAGnB,UAAQ,SAAQ,SAAQ;AACtB,OAAI,CAAC,KAAK,aAAc;AACxB,QAAK,eAAe,KAAK,aACtB,KAAK,MAA8C;AAClD,WAAO,OAAO,MAAM,WAAWA,WAAS,IAAI,KAAKA,WAAS,IAAI,EAAE,QAAQ;MAEzE,QAAQ,MAAkC,CAAC,CAAC;;AAGjD,UAAQ,OAAO,QAAQ,SAAQ,SAAQ;AACrC,OAAI,CAAC,KAAK,OAAQ;AAClB,QAAK,OAAO,SAAS,MAAsD;IACzE,MAAM,QAAQ,OAAO,EAAE,OAAO,WAAWA,WAAS,IAAI,EAAE,MAAMA,WAAS,IAAI,EAAE,GAAG,QAAQ;AACxF,QAAI,MAAO,GAAE,KAAK;;;;CAMxB,MAAM,WAAW,SAAS,aAAa,SAAS;CAGhD,MAAM,EAAE,KAAK,YAAY,QAAQ,kBAAkB,aAAa,SAAS,KAAK,UAAU,SAAS;CAEjG,MAAM,cAAcC,oBAAa,SAAS,QAAQ,QAAQ,UAAU;CAEpE,MAAMC,OAAmB;EACvB,UAAUC,iBAAY;EACtB,SAAUC,gBAAW,UAAU,YAAY;EAC3C,GAAG,iBAAiB,EAAE,SAAS;EAC/B,GAAG,QAAQ,EACT,OAAO;GACL,mBAAmB,KAAK;GACxB,MAAmB,KAAK;;EAI5B,QAAcC,oBAAe,SAAS,QAAQ,eAAe,UAAU,SAAS,YAAY;EAC5F,cAAcC,qBAAgB,WAAW,UAAU;EACnD,QAAcC,eAAU,QAAQ,UAAU,SACvC,OAAOC,iBAAY,UAAU,UAAU;EAC1C,aAAa,qBAAqB,SAAS,UAAU,SAClD,OAAO,oBAAoB,QAAQ,UAAU,UAC7C,OAAO,sBAAsB,UAAU,UAAU;;CAOtD,MAAM,2BAAW,IAAI;AACrB,KAAI,YAAY,MAAM;AACpB,UAAQ,SAAQ,MAAK,SAAS,IAAI,EAAE,OAAQ,YAAY;AAKxD,OAAK,cAAc,KAAK,aAAa,OAAO,MAAM,KAAK,YAAY;;CAOrE,MAAM,2BAAW,IAAI;;;;AAIrB,KAAI,QAAQ,MAAK,UAAS,WAAW,OACnC,MAAK,UAAU,KAAK,UAAU,IAAI,OAAOC,6BAAsB,OAAO,QAAO,MAAK,EAAE,WAAW,UAAU,UAAU,SAAS,UAAU;AAExI,KAAI,UAAU,MAAK,YAAW,WAAW,WAAW,wBAAwB,SAC1E,MAAK,UAAU,KAAK,UAAU,IAAI,OAAOA,6BAAsB,UAAU,UAAU,SAAS;AAE9F,QAAO"}

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

@@ -1,7 +1,6 @@
 import intervals_default from "./intervals.js";
 import { toDayAndStart } from "./course-events/index.js";
 import moment from "moment";
-import { pick } from "lodash-es";
 import { nanoid } from "nanoid";
 
 //#region src/RS/v3/to/dynamic-locked-times.ts
@@ -21,66 +20,76 @@ function mapCoalescedReferences(coalesced, options, destructMap) {
 	].map((x) => [x]);
 	return out;
 }
+function parseDynamicLockedTime(lockedTime, parent, idKey, settings, options, set, destructMap) {
+	const { _id, intervals, duration, durationVariance, coalesced } = lockedTime;
+	const id = (lockedTime[idKey] || _id)?.toString() ?? nanoid();
+	if (set.has(id)) return;
+	set.add(id);
+	if (duration == null) throw new Error("(RS::V3::To::DynamicLockedTimes) Length of a locked time is null");
+	if (duration < 5) throw new Error("(RS::V3::To::DynamicLockedTimes) Length of a locked time is less than 5 min");
+	if (!coalesced) throw new Error("(RS::V3::To::DynamicLockedTimes) Length of a locked time is less than 5 min");
+	let days = intervals?.length ? intervals.map(({ start }) => (moment(start).day() + 6) % 7) : void 0;
+	if (days) days = [...new Set(days)];
+	const day = days?.length == 1 ? days[0] : void 0;
+	if (day != null && parent.days?.length && !parent.days.some((x) => x.day == day)) return;
+	const groups = mapCoalescedReferences(coalesced, options, destructMap);
+	const distributionKey = lockedTime.type == "COMPLEMENTARY_TIME" ? "COMPLEMENTARY_TIME." + lockedTime.tags?.at(0)?.value : void 0;
+	const doc = {
+		id: `${parent.lunch == null ? "virtual" : "lockedTimes"}.${id}`,
+		groups: [...new Set(groups.filter(Boolean))],
+		dependencies: [...new Set(coalesced.filter((x) => x.toModel == "locations").map(({ to }) => to[idKey]?.toString()).filter(Boolean))].map((x) => [x]),
+		length: duration,
+		minBreakLength: false,
+		intervals: intervals?.length ? intervals_default(intervals, settings) : void 0,
+		...distributionKey && { distributionKey },
+		...days && { days },
+		...day && { day },
+		...durationVariance != null && { maxLengthVariance: durationVariance }
+	};
+	if (options.partialScheduleOptions) {
+		const { includedEvents, omittedEventsHandling } = options.partialScheduleOptions;
+		if (includedEvents && !includedEvents.has(doc.id)) {
+			if (omittedEventsHandling == "ignore") return;
+			if (omittedEventsHandling == "freeze") {
+				if (lockedTime.parked || !lockedTime.start || !lockedTime.duration) return;
+				Object.assign(doc, toDayAndStart(lockedTime.start));
+				doc.length = lockedTime.duration;
+				doc.maxLengthVariance = 0;
+				const numDays = settings.numDays ?? 5;
+				doc.days = Array.from({ length: numDays }, (_, i) => i);
+				doc.intervals = Array.from({ length: numDays }, () => [{
+					beg: 0,
+					end: 23.55
+				}]);
+			}
+		}
+	}
+	return doc;
+}
 var dynamic_locked_times_default = (docs, settings, options, set, destructMap) => {
 	const idKey = options.idKey ?? "id";
-	return docs.filter((x) => !!x).reduce((acc, group) => {
-		let lunch = group.lunch;
-		if (lunch == null) lunch = settings.defaultLunch?.map((lunch$1) => ({
-			...lunch$1,
-			coalesced: [{
-				to: pick(group, idKey),
-				toModel: ""
-			}]
+	const lunches = docs.filter((x) => !!x).map((group) => {
+		return (group.lunch ?? []).map((lockedTime) => {
+			return parseDynamicLockedTime(lockedTime, group, idKey, settings, options, set, destructMap);
+		}).filter((x) => x != null);
+	}).flat();
+	const complementaryTimes = (() => {
+		const grouped = docs.filter((x) => !!x).map((group) => {
+			return (("complementaryTimes" in group ? group.complementaryTimes : null) ?? []).map((lockedTime) => {
+				return parseDynamicLockedTime(lockedTime, group, idKey, settings, options, set, destructMap);
+			}).filter((x) => x != null);
+		}).flat().reduce((acc, x) => {
+			const key = [x.distributionKey || "NO_DISTRIBUTION_KEY"].flat().toSorted().join("|");
+			if (acc[key]) acc[key].push(x);
+			else acc[key] = [x];
+			return acc;
+		}, {});
+		return Object.entries(grouped).map(([id, events]) => ({
+			id,
+			events
 		}));
-		if ("complementaryTimes" in group) lunch = lunch?.concat(group.complementaryTimes ?? []);
-		if (lunch == null) return acc;
-		return acc.concat(lunch.reduce((acc$1, lockedTime) => {
-			const { _id, intervals, duration, durationVariance, coalesced } = lockedTime;
-			const id = (lockedTime[idKey] || _id)?.toString() ?? nanoid();
-			if (set.has(id)) return acc$1;
-			set.add(id);
-			if (duration == null) throw new Error("(RS::V3::To::DynamicLockedTimes) Length of a locked time is null");
-			if (duration < 5) throw new Error("(RS::V3::To::DynamicLockedTimes) Length of a locked time is less than 5 min");
-			if (!coalesced) throw new Error("(RS::V3::To::DynamicLockedTimes) Length of a locked time is less than 5 min");
-			let days = intervals?.length ? intervals.map(({ start }) => (moment(start).day() + 6) % 7) : void 0;
-			if (days) days = [...new Set(days)];
-			const day = days?.length == 1 ? days[0] : void 0;
-			if (day != null && group.days?.length && !group.days.some((x) => x.day == day)) return acc$1;
-			const groups = mapCoalescedReferences(coalesced, options, destructMap);
-			const distributionKey = lockedTime.type == "COMPLEMENTARY_TIME" ? "COMPLEMENTARY_TIME." + lockedTime.tags?.at(0)?.value : void 0;
-			const doc = {
-				id: `${group.lunch == null ? "virtual" : "lockedTimes"}.${id}`,
-				groups: [...new Set(groups.filter(Boolean))],
-				dependencies: [...new Set(coalesced.filter((x) => x.toModel == "locations").map(({ to }) => to[idKey]?.toString()).filter(Boolean))].map((x) => [x]),
-				length: duration,
-				minBreakLength: false,
-				intervals: intervals?.length ? intervals_default(intervals, settings) : void 0,
-				...distributionKey && { distributionKey },
-				...days && { days },
-				...day && { day },
-				...durationVariance != null && { maxLengthVariance: durationVariance }
-			};
-			if (options.partialScheduleOptions) {
-				const { includedEvents, omittedEventsHandling } = options.partialScheduleOptions;
-				if (includedEvents && !includedEvents.has(doc.id)) {
-					if (omittedEventsHandling == "ignore") return acc$1;
-					if (omittedEventsHandling == "freeze") {
-						if (lockedTime.parked || !lockedTime.start || !lockedTime.duration) return acc$1;
-						Object.assign(doc, toDayAndStart(lockedTime.start));
-						doc.length = lockedTime.duration;
-						doc.maxLengthVariance = 0;
-						const numDays = settings.numDays ?? 5;
-						doc.days = Array.from({ length: numDays }, (_, i) => i);
-						doc.intervals = Array.from({ length: numDays }, () => [{
-							beg: 0,
-							end: 23.55
-						}]);
-					}
-				}
-			}
-			return acc$1.concat(doc);
-		}, []));
-	}, []).flat().filter(Boolean);
+	})();
+	return [...lunches, ...complementaryTimes];
 };
 
 //#endregion

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

@@ -1 +1 @@
-{"version":3,"file":"dynamic-locked-times.js","names":["idKey: 'id' | '_id' | 'ids'","lunch","id: string","acc","doc: CourseEvent","_intervals"],"sources":["../../../../src/RS/v3/to/dynamic-locked-times.ts"],"sourcesContent":["import moment                              from 'moment';\nimport { nanoid                          } from 'nanoid';\nimport { pick } from 'lodash-es';\n\nimport { ParsedOutOptions as OutOptions  } from '../types/out-options';\nimport { CourseEvent                     } from '../types/course-events';\nimport { Individual                      } from '../types/individuals';\n\nimport _intervals                          from './intervals';\n\nimport { Types as CoreTypes              } from '../../../core/types';\nimport { Deserialized                    } from '../../../core/types';\nimport { toDayAndStart } from './course-events';\n\nfunction mapCoalescedReferences (\n  coalesced:     Deserialized<CoreTypes.lockedTime>['coalesced'],\n  options:       OutOptions,\n  destructMap?:  Map<string | null, Individual>\n) {\n  const idKey = options.idKey || 'id';\n\n  if (!coalesced) return [];\n\n  const teachers     = coalesced.filter(x => x.toModel == 'teachers');\n  const groups       = coalesced.filter(x => x.toModel == 'groups');\n  const participants = coalesced.filter(x => x.toModel == 'persons');\n\n  const teacherIds     = teachers    .map(({ to }) => to[idKey]).filter((x): x is NonNullable<typeof x> => !!x)\n    .map(x => ({ individuals: ['teachers.individuals.' + x.toString()] }));\n  const groupIds       = groups      .map(({ to }) => to[idKey]).filter((x): x is NonNullable<typeof x> => !!x)\n    .map(x => 'groups.' + x.toString());\n  const participantIds = participants.map(({ to }) => to[idKey]).filter((x): x is NonNullable<typeof x> => !!x)\n    .map(x => ({ individuals: ['persons.'  + x.toString()] }));\n\n\n  const out = [...new Set(teacherIds), ...new Set(groupIds), ...new Set(participantIds)].map(x => [x]);\n  return out;\n}\n\nexport default (\n  docs:         (Deserialized<CoreTypes.group> | Deserialized<CoreTypes.teacher>)[],\n  settings:     Deserialized<CoreTypes.divisionSettings>,\n  options:      OutOptions,\n  set:          Set<string>,\n  destructMap?: Map<string | null, Individual>\n) => {\n  //let docs: SourceLockedTime[] = (Array.isArray(lockedTimes) ? lockedTimes : [lockedTimes]);\n  const idKey: 'id' | '_id' | 'ids' = (options.idKey ?? 'id');\n\n  return docs\n    .filter(x => !!x)\n    .reduce((acc: CourseEvent[], group): CourseEvent[] => {\n      let lunch = group.lunch;\n      if (lunch == null) {\n        lunch = settings.defaultLunch?.map(lunch => ({ ...lunch, coalesced: [{ to: pick(group, idKey), toModel: '' }] }));\n      }\n\n      if ('complementaryTimes' in group) {\n        lunch = lunch?.concat(group.complementaryTimes ?? []);\n      }\n\n      if (lunch == null)\n        return acc;\n\n      return acc.concat(\n        lunch.reduce((acc: CourseEvent[], lockedTime) => {\n\n          const { _id, intervals, duration, durationVariance, coalesced } = lockedTime;\n\n          const id: string = (lockedTime[idKey as keyof CoreTypes.lockedTime] || _id)?.toString() ?? nanoid();\n\n          if (set.has(id))\n            return acc;\n\n          set.add(id);\n\n          if (duration == null)\n            throw new Error('(RS::V3::To::DynamicLockedTimes) Length of a locked time is null');\n\n          if (duration < 5)\n            throw new Error('(RS::V3::To::DynamicLockedTimes) Length of a locked time is less than 5 min');\n\n          if (!coalesced)\n            throw new Error('(RS::V3::To::DynamicLockedTimes) Length of a locked time is less than 5 min');\n\n          /*\n            find the day(s) the events should be placed on\n          */\n          let days = intervals?.length\n            ? intervals.map(({ start }) => (moment(start).day() + 6) % 7)\n            : undefined;\n          if (days) days = [...new Set(days)];\n          const day = days?.length == 1 ? days[0] : undefined;\n\n          // ignore locked times that reside on days that are not part of the group's days\n          if (day != null && group.days?.length && !group.days.some(x => x.day == day)) return acc;\n\n          const groups = mapCoalescedReferences(coalesced, options, destructMap);\n\n          const distributionKey = lockedTime.type == 'COMPLEMENTARY_TIME'\n            ? 'COMPLEMENTARY_TIME.' + lockedTime.tags?.at(0)?.value\n            : undefined;\n\n\n          const doc: CourseEvent = {\n            id:           `${ group.lunch == null ? 'virtual' : 'lockedTimes' }.${ id }`,\n            groups:       [...new Set(groups.filter(Boolean))],\n            dependencies: [...new Set(coalesced.filter(x => x.toModel == 'locations').map(({ to }) => to[idKey]?.toString()!)\n              .filter(Boolean))].map(x => [x]),\n            length:         duration,\n            minBreakLength: false,\n            intervals:      intervals?.length ? _intervals(intervals, settings) : undefined,\n            ...distributionKey && { distributionKey },\n            ...days && { days },\n            ...day && { day },\n            ...durationVariance != null  && { maxLengthVariance: durationVariance },\n          };\n\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)) {\n\n              if (omittedEventsHandling == 'ignore') return acc;\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 acc;\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 acc.concat(doc);\n        }, []));\n\n    }, [])\n    .flat()\n    .filter(Boolean);\n};"],"mappings":"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"}
+{"version":3,"file":"dynamic-locked-times.js","names":["id: string","doc: CourseEvent","_intervals","idKey: 'id' | '_id' | 'ids'"],"sources":["../../../../src/RS/v3/to/dynamic-locked-times.ts"],"sourcesContent":["import moment                              from 'moment';\nimport { nanoid                          } from 'nanoid';\n\nimport { ParsedOutOptions as OutOptions  } from '../types/out-options';\nimport { CourseEvent                     } from '../types/course-events';\nimport { Collection                      } from '../types/collections';\nimport { Individual                      } from '../types/individuals';\n\nimport _intervals                          from './intervals';\n\nimport { Types as CoreTypes              } from '../../../core/types';\nimport { Deserialized                    } from '../../../core/types';\nimport { toDayAndStart } from './course-events';\n\nfunction mapCoalescedReferences (\n  coalesced:     Deserialized<CoreTypes.lockedTime>['coalesced'],\n  options:       OutOptions,\n  destructMap?:  Map<string | null, Individual>\n) {\n  const idKey = options.idKey || 'id';\n\n  if (!coalesced) return [];\n\n  const teachers     = coalesced.filter(x => x.toModel == 'teachers');\n  const groups       = coalesced.filter(x => x.toModel == 'groups');\n  const participants = coalesced.filter(x => x.toModel == 'persons');\n\n  const teacherIds     = teachers    .map(({ to }) => to[idKey]).filter((x): x is NonNullable<typeof x> => !!x)\n    .map(x => ({ individuals: ['teachers.individuals.' + x.toString()] }));\n  const groupIds       = groups      .map(({ to }) => to[idKey]).filter((x): x is NonNullable<typeof x> => !!x)\n    .map(x => 'groups.' + x.toString());\n  const participantIds = participants.map(({ to }) => to[idKey]).filter((x): x is NonNullable<typeof x> => !!x)\n    .map(x => ({ individuals: ['persons.'  + x.toString()] }));\n\n\n  const out = [...new Set(teacherIds), ...new Set(groupIds), ...new Set(participantIds)].map(x => [x]);\n  return out;\n}\n\n\nfunction parseDynamicLockedTime (\n  lockedTime:   Deserialized<CoreTypes.lockedTime>,\n  parent:       Deserialized<CoreTypes.group> | Deserialized<CoreTypes.teacher>,\n  //\n  idKey:        'id' | '_id' | 'ids',\n  settings:     Deserialized<CoreTypes.divisionSettings>,\n  options:      OutOptions,\n  set:          Set<string>,\n  destructMap?: Map<string | null, Individual>\n) {\n\n  const { _id, intervals, duration, durationVariance, coalesced } = lockedTime;\n\n  const id: string = (lockedTime[idKey as keyof CoreTypes.lockedTime] || _id)?.toString() ?? nanoid();\n\n  if (set.has(id)) return;\n\n  set.add(id);\n\n  if (duration == null)\n    throw new Error('(RS::V3::To::DynamicLockedTimes) Length of a locked time is null');\n\n  if (duration < 5)\n    throw new Error('(RS::V3::To::DynamicLockedTimes) Length of a locked time is less than 5 min');\n\n  if (!coalesced)\n    throw new Error('(RS::V3::To::DynamicLockedTimes) Length of a locked time is less than 5 min');\n\n  /*\n    find the day(s) the events should be placed on\n  */\n  let days = intervals?.length\n    ? intervals.map(({ start }) => (moment(start).day() + 6) % 7)\n    : undefined;\n  if (days) days = [...new Set(days)];\n  const day = days?.length == 1 ? days[0] : undefined;\n\n  // ignore locked times that reside on days that are not part of the group's days\n  if (day != null && parent.days?.length && !parent.days.some(x => x.day == day)) return;\n\n  const groups = mapCoalescedReferences(coalesced, options, destructMap);\n\n  const distributionKey = lockedTime.type == 'COMPLEMENTARY_TIME'\n    ? 'COMPLEMENTARY_TIME.' + lockedTime.tags?.at(0)?.value\n    : undefined;\n\n\n  const doc: CourseEvent = {\n    id:             `${ parent.lunch == null ? 'virtual' : 'lockedTimes' }.${ id }`,\n    groups:         [...new Set(groups.filter(Boolean))],\n    dependencies:   [...new Set(coalesced.filter(x => x.toModel == 'locations').map(({ to }) => to[idKey]?.toString()!).filter(Boolean))].map(x => [x]),\n    length:         duration,\n    minBreakLength: false,\n    intervals:      intervals?.length ? _intervals(intervals, settings) : undefined,\n    ...distributionKey && { distributionKey },\n    ...days && { days },\n    ...day && { day },\n    ...durationVariance != null  && { maxLengthVariance: durationVariance },\n  };\n\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)) {\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 doc;\n}\n\n\n\nexport default (\n  docs:         (Deserialized<CoreTypes.group> | Deserialized<CoreTypes.teacher>)[],\n  settings:     Deserialized<CoreTypes.divisionSettings>,\n  options:      OutOptions,\n  set:          Set<string>,\n  destructMap?: Map<string | null, Individual>\n) => {\n  const idKey: 'id' | '_id' | 'ids' = (options.idKey ?? 'id');\n\n  const lunches = docs\n    .filter(x => !!x)\n    .map(group => {\n      return (group.lunch ?? [])\n        .map(lockedTime => {\n          return parseDynamicLockedTime(lockedTime, group, idKey, settings, options, set, destructMap);\n        })\n        .filter(x => x != null);\n    })\n    .flat();\n\n  const complementaryTimes = (() => {\n    const grouped = docs\n      .filter(x => !!x)\n      .map(group => {\n        return (('complementaryTimes' in group ? group.complementaryTimes : null) ?? [])\n          .map(lockedTime => {\n            return parseDynamicLockedTime(lockedTime, group, idKey, settings, options, set, destructMap);\n          })\n          .filter(x => x != null);\n      })\n      .flat()\n      // group by distribution key\n      .reduce<Record<string, CourseEvent[]>>((acc, x) => {\n        const key = [x.distributionKey || 'NO_DISTRIBUTION_KEY'].flat().toSorted().join('|');\n        if (acc[key]) acc[key].push(x);\n        else          acc[key] = [x];\n        return acc;\n      }, { })\n\n    // create a group out of each _complementaryTimes group\n    return Object.entries(grouped).map(([id, events]): Collection => ({ id, events }));\n  })();\n\n  return  [...lunches, ...complementaryTimes];\n};"],"mappings":"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"}

package/dist/RS/v3/to/index.d.ts

@@ -15,36 +15,14 @@ import { Types as Types$1 } from "../../../core/v2/types/index.js";
 import { Deserialized, Serialized } from "../../../core/types/index.js";
 import { AlgorithmWeightParameters } from "../types/algorithm-parameters.js";
 import { Configuration } from "../types/configurations.js";
-import { Settings } from "../types/settings.js";
-import { LockedTime as LockedTime$1 } from "../types/locked-times.js";
-import { Interval as Interval$1 } from "../types/intervals.js";
-import { Collection } from "../types/collections.js";
-import { Group } from "../types/groups.js";
-import { Individual } from "../types/individuals.js";
 import { Constraint } from "../types/constraints.js";
-import { OutOptions, ParsedOutOptions } from "../types/out-options.js";
-import { export_default } from "./available-dependencies.js";
-import { export_default as export_default$1 } from "./course-events/index.js";
-import { export_default as export_default$2 } from "./dependencies.js";
+import { OutOptions } from "../types/out-options.js";
 import * as mongoose5 from "mongoose";
 import * as lodash1 from "lodash";
 
 //#region src/RS/v3/to/index.d.ts
-declare class export_default$3 {
-  static availableDependency: typeof export_default;
-  static configuration: (events: Deserialized<Types$1.event>[], options: ParsedOutOptions) => Configuration[];
-  static constraints: (schedule: Partial<Deserialized<Types$1.schedule> & {
-    division: Deserialized<Types$1.division>;
-  }>, _options?: OutOptions) => Constraint;
-  static courseEvent: typeof export_default$1;
-  static course: (courses: Deserialized<Types$1.course> | Deserialized<Types$1.course>[], events: Deserialized<Types$1.event>[] | undefined, overlapGroups: Deserialized<Types$1.overlapGroup>[] | undefined, settings: Types$1.divisionSettings, options: ParsedOutOptions, periodsMap: Map<string | undefined, number>, destructMap?: Map<string | null, Individual>) => (Collection[] | Collection)[];
-  static day: (days: Types$1.day[], numDays: number) => number[];
-  static dependency: typeof export_default$2;
-  static group: (groups: Deserialized<Types$1.group>[] | Deserialized<Types$1.group>, settings: Types$1.divisionSettings, options: ParsedOutOptions) => Group[];
-  static interval: (intervals: Types$1.interval[] | undefined, settings: Types$1.divisionSettings, rootInterval?: Types$1.rootInterval) => Interval$1[][];
-  static lockedTime: (lockedTimes: Types$1.lockedTime[] | Types$1.lockedTime, options: ParsedOutOptions) => LockedTime$1[] | never;
-  static persons: (persons: Deserialized<Types$1.person>[] | Deserialized<Types$1.person>, settings: Types$1.divisionSettings, options: ParsedOutOptions) => Group[];
-  static schedules: (schedule: Deserialized<Types$1.schedule>, options?: OutOptions) => {
+declare class export_default {
+  static schedules: (schedule: Deserialized<Types$1.schedule>, _options?: OutOptions) => {
     input: Constraint;
     output?: Configuration[] | undefined;
     coreData?: {
@@ -282,9 +260,7 @@ declare class export_default$3 {
       weights: AlgorithmWeightParameters | undefined;
     };
   };
-  static setting: (settings: Types$1.divisionSettings) => Settings;
-  static teacher: (teachers: Deserialized<Types$1.teacher>[] | Deserialized<Types$1.teacher>, settings: Types$1.divisionSettings, options: ParsedOutOptions) => Group[];
 }
 //#endregion
-export { export_default$3 as export_default };
+export { export_default };
 //# sourceMappingURL=index.d.ts.map

package/dist/RS/v3/to/index.js

@@ -1,34 +1,8 @@
-import available_dependencies_default from "./available-dependencies.js";
-import configurations_default from "./configurations.js";
-import days_default from "./days.js";
-import locked_times_default from "./locked-times.js";
-import dependencies_default from "./dependencies.js";
-import intervals_default from "./intervals.js";
-import teachers_default from "./teachers.js";
-import groups_default from "./groups.js";
-import course_events_default from "./course-events/index.js";
-import collections_default from "./collections.js";
-import settings_default from "./settings.js";
-import constraints_default from "./constraints.js";
-import persons_default from "./persons.js";
 import schedules_default from "./schedules.js";
 
 //#region src/RS/v3/to/index.ts
 var to_default = class {
-	static availableDependency = available_dependencies_default;
-	static configuration = configurations_default;
-	static constraints = constraints_default;
-	static courseEvent = course_events_default;
-	static course = collections_default;
-	static day = days_default;
-	static dependency = dependencies_default;
-	static group = groups_default;
-	static interval = intervals_default;
-	static lockedTime = locked_times_default;
-	static persons = persons_default;
 	static schedules = schedules_default;
-	static setting = settings_default;
-	static teacher = teachers_default;
 };
 
 //#endregion

package/dist/RS/v3/to/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["_availableDependency","_configuration","_constraints","_courseEvent","_collection","_day","_dependency","_group","_interval","_lockedTime","_persons","_schedules","_setting","_teacher"],"sources":["../../../../src/RS/v3/to/index.ts"],"sourcesContent":["import _availableDependency                from './available-dependencies';\nimport _configuration                      from './configurations';\nimport _constraints                        from './constraints';\nimport _courseEvent                        from './course-events';\nimport _collection                         from './collections';\nimport _day                                from './days';\nimport _dependency                         from './dependencies';\nimport _group                              from './groups';\nimport _interval                           from './intervals';\nimport _lockedTime                         from './locked-times';\nimport _persons                            from './persons';\nimport _schedules                          from './schedules';\nimport _setting                            from './settings';\nimport _teacher                            from './teachers';\n\nexport default class {\n  static availableDependency = _availableDependency;\n  static configuration       = _configuration;\n  static constraints         = _constraints;\n  static courseEvent         = _courseEvent;\n  static course              = _collection;\n  static day                 = _day;\n  static dependency          = _dependency;\n  static group               = _group;\n  static interval            = _interval;\n  static lockedTime          = _lockedTime;\n  static persons             = _persons;\n  static schedules           = _schedules;\n  static setting             = _setting;\n  static teacher             = _teacher;\n}"],"mappings":";;;;;;;;;;;;;;;;AAeA,uBAAqB;CACnB,OAAO,sBAAsBA;CAC7B,OAAO,gBAAsBC;CAC7B,OAAO,cAAsBC;CAC7B,OAAO,cAAsBC;CAC7B,OAAO,SAAsBC;CAC7B,OAAO,MAAsBC;CAC7B,OAAO,aAAsBC;CAC7B,OAAO,QAAsBC;CAC7B,OAAO,WAAsBC;CAC7B,OAAO,aAAsBC;CAC7B,OAAO,UAAsBC;CAC7B,OAAO,YAAsBC;CAC7B,OAAO,UAAsBC;CAC7B,OAAO,UAAsBC"}
+{"version":3,"file":"index.js","names":["_schedules"],"sources":["../../../../src/RS/v3/to/index.ts"],"sourcesContent":["\nimport _schedules from './schedules';\n\nexport default class {\n  static schedules = _schedules;\n}"],"mappings":";;;AAGA,uBAAqB;CACnB,OAAO,YAAYA"}

package/dist/RS/v3/to/schedules.js

@@ -1,11 +1,27 @@
 import { CoreMap } from "../../../core/index.js";
-import configurations_default from "./configurations.js";
 import constraints_default from "./constraints.js";
+import configurations_default from "./configurations.js";
 import "../../../index.js";
 import { pick } from "lodash-es";
 
 //#region src/RS/v3/to/schedules.ts
-var schedules_default = (schedule, options = {}) => {
+var schedules_default = (schedule, _options = {}) => {
+	const options = (() => {
+		const pso = _options.partialScheduleOptions;
+		const partialScheduleOptions = pso ? {
+			includedEvents: pso.includedEvents ? new Set(pso.includedEvents) : void 0,
+			includedLocations: pso.includedLocations ? new Set(pso.includedLocations) : void 0,
+			omittedEventsHandling: pso.omittedEventsHandling
+		} : void 0;
+		return {
+			..._options,
+			partialScheduleOptions
+		};
+	})();
+	if (options.partialScheduleOptions?.includedEvents?.size) options.partialScheduleOptions.includedEvents = new Set([...options.partialScheduleOptions.includedEvents].map((x) => {
+		if (x.startsWith("events.") || x.startsWith("lockedTimes.")) return x;
+		return `events.${x}`;
+	}));
 	return {
 		meta: {
 			structure: "RS/algorithm-3.0.0",

package/dist/RS/v3/to/schedules.js.map

@@ -1 +1 @@
-{"version":3,"file":"schedules.js","names":["_configurations","_constraints"],"sources":["../../../../src/RS/v3/to/schedules.ts"],"sourcesContent":["import { pick }                                   from 'lodash-es';\n\nimport { Types as CoreTypes              } from '../../../core/types';\nimport { Deserialized                    } from '../../../core/types';\nimport { CoreMap                         } from '../../../index';\n\nimport { Schedule                        } from '../types/schedules';\nimport { OutOptions                      } from '../types/out-options';\n\nimport _constraints                        from './constraints';\nimport _configurations                     from './configurations';\n\nexport default (schedule: Deserialized<CoreTypes.schedule>, options: OutOptions = {}) => {\n\n  return {\n    meta: {\n      structure: 'RS/algorithm-3.0.0',\n      division:  pick(schedule.divisions, 'displayName', 'start', 'end'),\n    },\n    algorithmParameters: {\n      weights: options.algorithmWeightParameters,\n    },\n    ...options.appendCoreData && { coreData: CoreMap.to.schedules(JSON.parse(JSON.stringify(schedule))) },\n    ...options.appendOutput && schedule.events && { output: _configurations(schedule.events, options) },\n    input: _constraints(schedule, options),\n  } satisfies Schedule;\n};"],"mappings":";;;;;;;AAYA,yBAAgB,UAA4C,UAAsB,OAAO;AAEvF,QAAO;EACL,MAAM;GACJ,WAAW;GACX,UAAW,KAAK,SAAS,WAAW,eAAe,SAAS;;EAE9D,qBAAqB,EACnB,SAAS,QAAQ;EAEnB,GAAG,QAAQ,kBAAkB,EAAE,UAAU,QAAQ,GAAG,UAAU,KAAK,MAAM,KAAK,UAAU;EACxF,GAAG,QAAQ,gBAAgB,SAAS,UAAU,EAAE,QAAQA,uBAAgB,SAAS,QAAQ;EACzF,OAAOC,oBAAa,UAAU"}
+{"version":3,"file":"schedules.js","names":["partialScheduleOptions: ParsedOutOptions['partialScheduleOptions']","_configurations","_constraints"],"sources":["../../../../src/RS/v3/to/schedules.ts"],"sourcesContent":["import { pick }                                   from 'lodash-es';\n\nimport { Types as CoreTypes              } from '../../../core/types';\nimport { Deserialized                    } from '../../../core/types';\nimport { CoreMap                         } from '../../../index';\n\nimport { Schedule                        } from '../types/schedules';\nimport { OutOptions, ParsedOutOptions    } from '../types/out-options';\n\nimport _constraints                        from './constraints';\nimport _configurations                     from './configurations';\n\nexport default (schedule: Deserialized<CoreTypes.schedule>, _options: OutOptions = {}) => {\n\n  ////\n  //// parse the output options\n  ////\n  const options = ((): ParsedOutOptions => {\n    const pso = _options.partialScheduleOptions;\n    const partialScheduleOptions: ParsedOutOptions['partialScheduleOptions'] = pso\n      ? {\n        includedEvents:        pso.includedEvents    ? new Set(pso.includedEvents)    : undefined,\n        includedLocations:     pso.includedLocations ? new Set(pso.includedLocations) : undefined,\n        omittedEventsHandling: pso.omittedEventsHandling\n      }\n      : undefined;\n\n    return { ..._options, partialScheduleOptions };\n  })();\n\n  ////\n  //// for backward compatibility: add default collection to included events set\n  ////\n  if (options.partialScheduleOptions?.includedEvents?.size) {\n    options.partialScheduleOptions.includedEvents = new Set(\n      [...options.partialScheduleOptions.includedEvents]\n        .map(x => {\n          // should start with 'events.' or 'lockedTimes.' prefix\n          if (x.startsWith('events.') || x.startsWith('lockedTimes.')) return x;\n          return `events.${x}`;\n        })\n    );\n  }\n\n  return {\n    meta: {\n      structure: 'RS/algorithm-3.0.0',\n      division:  pick(schedule.divisions, 'displayName', 'start', 'end'),\n    },\n    algorithmParameters: {\n      weights: options.algorithmWeightParameters,\n    },\n    ...options.appendCoreData && { coreData: CoreMap.to.schedules(JSON.parse(JSON.stringify(schedule))) },\n    ...options.appendOutput && schedule.events && { output: _configurations(schedule.events, options) },\n    input: _constraints(schedule, options),\n  } satisfies Schedule;\n};"],"mappings":";;;;;;;AAYA,yBAAgB,UAA4C,WAAuB,OAAO;CAKxF,MAAM,iBAAmC;EACvC,MAAM,MAAM,SAAS;EACrB,MAAMA,yBAAqE,MACvE;GACA,gBAAuB,IAAI,iBAAoB,IAAI,IAAI,IAAI,kBAAqB;GAChF,mBAAuB,IAAI,oBAAoB,IAAI,IAAI,IAAI,qBAAqB;GAChF,uBAAuB,IAAI;MAE3B;AAEJ,SAAO;GAAE,GAAG;GAAU;;;AAMxB,KAAI,QAAQ,wBAAwB,gBAAgB,KAClD,SAAQ,uBAAuB,iBAAiB,IAAI,IAClD,CAAC,GAAG,QAAQ,uBAAuB,gBAChC,KAAI,MAAK;AAER,MAAI,EAAE,WAAW,cAAc,EAAE,WAAW,gBAAiB,QAAO;AACpE,SAAO,UAAU;;AAKzB,QAAO;EACL,MAAM;GACJ,WAAW;GACX,UAAW,KAAK,SAAS,WAAW,eAAe,SAAS;;EAE9D,qBAAqB,EACnB,SAAS,QAAQ;EAEnB,GAAG,QAAQ,kBAAkB,EAAE,UAAU,QAAQ,GAAG,UAAU,KAAK,MAAM,KAAK,UAAU;EACxF,GAAG,QAAQ,gBAAgB,SAAS,UAAU,EAAE,QAAQC,uBAAgB,SAAS,QAAQ;EACzF,OAAOC,oBAAa,UAAU"}

package/dist/RS/v3/types/out-options.d.ts

@@ -18,9 +18,6 @@ interface OutOptions {
   algorithmWeightParameters?: AlgorithmWeightParameters;
   useMaximumScheduleSpan?: boolean;
 }
-type ParsedOutOptions = Omit<OutOptions, 'partialScheduleOptions'> & {
-  partialScheduleOptions?: PartialScheduleOptions<Set<string>>;
-};
 //#endregion
-export { OutOptions, ParsedOutOptions };
+export { OutOptions };
 //# sourceMappingURL=out-options.d.ts.map

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

@@ -1,5 +1,5 @@
 import { Types } from "../../../core/v2/types/index.js";
-import * as xlsx2 from "xlsx";
+import * as xlsx1 from "xlsx";
 
 //#region src/SchoolSoft/file/to/index.d.ts
 declare class export_default {
@@ -13,7 +13,7 @@ declare class export_default {
     events: Types.event[];
     periods: Types.period[];
     persons: Types.person[];
-  }) => xlsx2.WorkBook;
+  }) => xlsx1.WorkBook;
 }
 //#endregion
 export { export_default };

package/package.json

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

package/dist/RS/v3/to/available-dependencies.d.ts

@@ -1,10 +0,0 @@
-import { Types } from "../../../core/v2/types/index.js";
-import { Deserialized } from "../../../core/types/index.js";
-import { AvailableDependency } from "../types/available-dependencies.js";
-import { ParsedOutOptions } from "../types/out-options.js";
-
-//#region src/RS/v3/to/available-dependencies.d.ts
-declare function export_default(availableLocations: Deserialized<Types.availableLocation>[], options: ParsedOutOptions): AvailableDependency[][];
-//#endregion
-export { export_default };
-//# sourceMappingURL=available-dependencies.d.ts.map

package/dist/RS/v3/to/course-events/index.d.ts

@@ -1,13 +0,0 @@
-import { Types } from "../../../../core/v2/types/index.js";
-import { Deserialized } from "../../../../core/types/index.js";
-import { CourseEvent } from "../../types/course-events.js";
-import { Individual } from "../../types/individuals.js";
-import { ParsedOutOptions } from "../../types/out-options.js";
-import moment from "moment";
-
-//#region src/RS/v3/to/course-events/index.d.ts
-
-declare function export_default(courseEvents: Deserialized<Types.event>[] | Deserialized<Types.event>, overlapGroups: Deserialized<Types.overlapGroup>[] | undefined, settings: Types.divisionSettings, options: ParsedOutOptions, periodsMap: Map<string | undefined, number>, destructMap?: Map<string | null, Individual>): CourseEvent[];
-//#endregion
-export { export_default };
-//# sourceMappingURL=index.d.ts.map

package/dist/RS/v3/to/dependencies.d.ts

@@ -1,10 +0,0 @@
-import { Types } from "../../../core/v2/types/index.js";
-import { Deserialized } from "../../../core/types/index.js";
-import { Dependency } from "../types/dependencies.js";
-import { ParsedOutOptions } from "../types/out-options.js";
-
-//#region src/RS/v3/to/dependencies.d.ts
-declare function export_default(locations: Deserialized<Types.location>[], settings: Types.divisionSettings, options: ParsedOutOptions): Dependency[];
-//#endregion
-export { export_default };
-//# sourceMappingURL=dependencies.d.ts.map

package/dist/RS/v3/to/persons.js

@@ -1,22 +0,0 @@
-//#region src/RS/v3/to/persons.ts
-var persons_default = (persons, settings, options) => {
-	if (persons == null) return [];
-	const idKey = options.idKey || "id";
-	return (Array.isArray(persons) ? persons : [persons]).filter((x) => !x.group).map((person, index) => {
-		if (person[idKey] == void 0) throw new Error(`(RS::V3::To::Persons) A person must have an id, index: ${index}`);
-		const doc = {
-			id: `persons.${person[idKey].toString()}`,
-			group_type: "persons",
-			minimizeDependencyAlternation: false
-		};
-		if (options.meta) Object.assign(doc, {
-			...person.ids && { ids: person.ids },
-			...person.firstName && { name: `${person.firstName} ${person.lastName}` }
-		});
-		return doc;
-	}, []);
-};
-
-//#endregion
-export { persons_default as default };
-//# sourceMappingURL=persons.js.map

package/dist/RS/v3/to/persons.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"persons.js","names":["idKey: keyof CoreTypes.person","doc: Group"],"sources":["../../../../src/RS/v3/to/persons.ts"],"sourcesContent":["import { Group                           } from '../types/groups';\nimport { ParsedOutOptions as OutOptions  } from '../types/out-options';\n\nimport { Types as CoreTypes              } from '../../../core/types';\nimport { Deserialized                    } from '../../../core/types';\n\nexport default (persons:   Deserialized<CoreTypes.person>[] | Deserialized<CoreTypes.person>,\n  settings: CoreTypes.divisionSettings,\n  options:  OutOptions): Group[] => {\n  if (persons == null)\n    return [];\n\n  const idKey: keyof CoreTypes.person = options.idKey || 'id';\n\n  return (Array.isArray(persons) ? persons : [persons]).filter(x => !x.group).map((person, index) => {\n\n    if (person[idKey] == undefined) throw new Error(`(RS::V3::To::Persons) A person must have an id, index: ${ index }`);\n\n    const doc: Group = {\n      id:                            `persons.${ person[idKey]!.toString() }`,\n      group_type:                    'persons',\n      minimizeDependencyAlternation: false,\n    };\n\n    if (options.meta) {\n      Object.assign(doc, {\n        ...person.ids                           && { ids:                        person.ids },\n        ...person.firstName                     && { name:                       `${ person.firstName } ${ person.lastName }` },\n      });\n    }\n\n    return doc;\n  }, []);\n};\n"],"mappings":";AAMA,uBAAgB,SACd,UACA,YAAkC;AAClC,KAAI,WAAW,KACb,QAAO;CAET,MAAMA,QAAgC,QAAQ,SAAS;AAEvD,SAAQ,MAAM,QAAQ,WAAW,UAAU,CAAC,UAAU,QAAO,MAAK,CAAC,EAAE,OAAO,KAAK,QAAQ,UAAU;AAEjG,MAAI,OAAO,UAAU,OAAW,OAAM,IAAI,MAAM,0DAA2D;EAE3G,MAAMC,MAAa;GACjB,IAA+B,WAAY,OAAO,OAAQ;GAC1D,YAA+B;GAC/B,+BAA+B;;AAGjC,MAAI,QAAQ,KACV,QAAO,OAAO,KAAK;GACjB,GAAG,OAAO,OAAiC,EAAE,KAA4B,OAAO;GAChF,GAAG,OAAO,aAAiC,EAAE,MAA4B,GAAI,OAAO,UAAW,GAAI,OAAO;;AAI9G,SAAO;IACN"}