@royalschedule/maps 3.3.16 → 4.0.0

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

@@ -1,5 +1,4 @@
-import { Types } from "../../core/v2/types/index.js";
-import { Deserialized } from "../../core/types/index.js";
+import { Types } from "../../core/types/index.js";
 import { Event } from "./types/events.js";
 import { export_default } from "./to/index.js";
 import { Options, Types as Types$1 } from "./types/index.js";
@@ -7,7 +6,7 @@ import { Options, Types as Types$1 } from "./types/index.js";
 //#region src/SchoolSoft/file/index.d.ts
 declare class Map {
   static from: {
-    schedules: (input: Deserialized<Event>[], options?: Options) => Types.division;
+    schedules: (input: Event[], options?: Options) => Partial<Types.serializedWithoutInternalId.schedule>;
   };
   static to: typeof export_default;
 }

package/dist/SchoolSoft/file/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["_from","_to"],"sources":["../../../src/SchoolSoft/file/index.ts"],"sourcesContent":["import _to                                 from './to';\nimport _from                               from './from';\nimport { Types                           } from './types';\n\nexport class Map {\n  static from = _from;\n  static to   = _to;\n}\n\nexport type { Types };"],"mappings":";;;;AAIA,IAAa,MAAb,MAAiB;CACf,OAAO,OAAOA;CACd,OAAO,KAAOC"}
+{"version":3,"file":"index.js","names":["_from","_to"],"sources":["../../../src/SchoolSoft/file/index.ts"],"sourcesContent":["import _to from './to';\nimport _from from './from';\nimport type { Types } from './types';\n\nexport class Map {\n  static from = _from;\n  static to   = _to;\n}\n\nexport { Types };"],"mappings":";;;;AAIA,IAAa,MAAb,MAAiB;CACf,OAAO,OAAOA;CACd,OAAO,KAAOC"}

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

@@ -1,19 +1,12 @@
-import { Types } from "../../../core/v2/types/index.js";
-import * as xlsx1 from "xlsx";
+import { BaseOptions } from "../../../common/types.js";
+import { Types } from "../../../core/types/index.js";
+import * as xlsx0 from "xlsx";
 
 //#region src/SchoolSoft/file/to/index.d.ts
 declare class export_default {
-  static schedules: (schedule: {
-    division: Types.division;
-    settings: Types.divisionSettings;
-    groups: Types.group[];
-    teachers: Types.teacher[];
-    locations: Types.location[];
-    courses: Types.course[];
-    events: Types.event[];
-    periods: Types.period[];
-    persons: Types.person[];
-  }) => xlsx1.WorkBook;
+  static schedules: (schedule: Types.mixed.schedule & {
+    division?: Types.mixed.division;
+  }, options?: BaseOptions) => xlsx0.WorkBook;
 }
 //#endregion
 export { export_default };

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

@@ -1,76 +1,74 @@
-import moment from "moment";
-import * as XLSX$1 from "xlsx";
+import { getDayIndex, getVertexId } from "../../../core/util.js";
+import { makeChainable } from "../../../common/make-chainable/index.js";
 import { orderBy, uniq } from "lodash-es";
+import moment from "moment";
+import XLSX from "xlsx";
 
 //#region src/SchoolSoft/file/to/schedules.ts
-const getId = (ref) => {
-	if (typeof ref == "string") return ref;
-	return ref.id.toString();
-};
-const createUndervisningsgrupp = (collection, entity, fallbackName, did, groupPersonsMap, personsMap) => {
-	const SSNs = uniq((entity.groups ?? []).map((x) => {
-		const include = groupPersonsMap.get(getId(x.to))?.map((x$1) => x$1.SSN?.value).filter((x$1) => !!x$1) ?? [];
-		const exclude = x.exclude?.map((x$1) => personsMap.get(getId(x$1))?.SSN?.value).filter((x$1) => !!x$1) ?? [];
-		return include.filter((x$1) => !exclude.includes(x$1));
-	}).concat(entity.participants?.map(({ to }) => personsMap.get(getId(to))?.SSN?.value).filter((x) => !!x) ?? []).flat()).join(", ");
+function createUndervisningsgrupp(collection, entity, fallbackName, did, groupPersonsMap, personsMap, options) {
+	const SSNs = makeChainable(entity.groups ?? []).chain((x) => x.map((x$1) => {
+		const include = groupPersonsMap.get(getVertexId(x$1.to, options))?.map((x$2) => x$2.SSN?.value).filter((x$2) => !!x$2) ?? [];
+		const exclude = x$1.exclude?.map((x$2) => personsMap.get(getVertexId(x$2, options))?.SSN?.value).filter((x$2) => !!x$2) ?? [];
+		return include.filter((x$2) => !exclude.includes(x$2));
+	}).concat(entity.participants?.map(({ to }) => personsMap.get(getVertexId(to, options))?.SSN?.value).filter((x$1) => !!x$1) ?? []).flat(), (x) => uniq(x).join(", ")).value;
 	return {
 		name: entity.displayName ?? fallbackName,
 		socialnumber: SSNs,
-		externalid: `${did}.${entity.id}${collection == "courses" ? "C" : "E"}`,
+		externalid: `${did}.${getVertexId(entity, options)}${collection == "courses" ? "C" : "E"}`,
 		classtype: 0
 	};
-};
-var schedules_default = (schedule) => {
-	const did = schedule.division.id;
-	if (!did) throw new Error("division id is undefined");
-	const periodsMap = new Map(schedule.periods.map((p) => [getId(p), p]));
+}
+var schedules_default = (schedule, options = {}) => {
+	const division = schedule.division ?? schedule.divisions;
+	const did = getVertexId(division, options);
+	const periodsMap = new Map(schedule.periods.map((p) => [getVertexId(p, options), p]));
 	periodsMap.set(void 0, { ranges: [{
-		start: schedule.division.start,
-		end: schedule.division.end
+		start: division.start,
+		end: division.end
 	}] });
 	const groupPersonsMap = /* @__PURE__ */ new Map();
 	schedule.persons.forEach((p) => {
 		if (!p.group) return;
-		const gid = getId(p.group);
+		const gid = getVertexId(p.group, options);
 		if (!groupPersonsMap.has(gid)) groupPersonsMap.set(gid, []);
-		groupPersonsMap.get(gid).push(p);
+		groupPersonsMap.get(gid)?.push(p);
 	});
-	const personsMap = new Map(schedule.persons.map((p) => [getId(p), p]));
-	const teachersMap = new Map(schedule.teachers.map((t) => [getId(t), t]));
-	const coursesMap = new Map(schedule.courses.map((c) => [getId(c), c]));
+	const personsMap = new Map(schedule.persons.map((p) => [getVertexId(p, options), p]));
+	const teachersMap = new Map(schedule.teachers.map((t) => [getVertexId(t, options), t]));
+	const coursesMap = new Map(schedule.courses.map((c) => [getVertexId(c, options), c]));
 	let undervisningsgrupper = new Array();
 	schedule.courses.forEach((c) => {
-		undervisningsgrupper.push(createUndervisningsgrupp("courses", c, "", did, groupPersonsMap, personsMap));
+		undervisningsgrupper.push(createUndervisningsgrupp("courses", c, "", did, groupPersonsMap, personsMap, options));
 	});
 	schedule.groups.forEach((g) => {
-		const SSNs = (groupPersonsMap.get(getId(g)) ?? []).map((x) => x.SSN?.value).filter((x) => !!x).join(", ");
+		const SSNs = (groupPersonsMap.get(getVertexId(g, options)) ?? []).map((x) => x.SSN?.value).filter((x) => !!x).join(", ");
 		undervisningsgrupper.push({
 			name: g.displayName,
 			socialnumber: SSNs,
-			externalid: `${did}.${g.id}G`,
+			externalid: `${did}.${getVertexId(g, options)}G`,
 			classtype: 1
 		});
 	});
 	undervisningsgrupper = orderBy(undervisningsgrupper, ["classtype", "name"], ["desc", "asc"]);
 	const salar = schedule.locations.map((l) => ({
 		name: l.displayName,
-		externalid: `${did}.${l.id}`
+		externalid: `${did}.${getVertexId(l, options)}`
 	}));
 	const lektioner = schedule.events.map((e) => {
 		if (!e.start || !e.end) return null;
 		const start = moment.utc(e.start);
 		const end = moment.utc(e.end);
-		const course = e.course ? coursesMap.get(getId(e.course)) : void 0;
+		const course = e.course ? coursesMap.get(getVertexId(e.course, options)) : void 0;
 		if (!course) return null;
-		let groupexternalid = `${did}.${course.id}C`;
+		let groupexternalid = `${did}.${getVertexId(course, options)}C`;
 		if (e.groups || e.participants) {
-			const UG = createUndervisningsgrupp("events", e, course.displayName, did, groupPersonsMap, personsMap);
+			const UG = createUndervisningsgrupp("events", e, course.displayName, did, groupPersonsMap, personsMap, options);
 			undervisningsgrupper.push(UG);
 			groupexternalid = UG.externalid;
 		}
 		const subject = course.subject;
 		const _period = e.period ?? course.period ?? schedule.settings.period;
-		const period = periodsMap.get(_period ? getId(_period) : void 0);
+		const period = periodsMap.get(_period ? getVertexId(_period, options) : void 0);
 		const weeks = period?.ranges.map((x) => {
 			const start$1 = moment.utc(x.start);
 			const end$1 = moment.utc(x.end);
@@ -81,10 +79,10 @@ var schedules_default = (schedule) => {
 			}
 			return weeks$1;
 		}).flat().join(", ");
-		const teachers = (e.teachers ?? course.teachers ?? []).map((x) => teachersMap.get(getId(x.to))?.ids).filter((x) => !!x).join(", ");
-		const rooms = (e.inLocations ?? []).filter(Boolean).map((x) => `${did}.${getId(x)}`).join(", ");
+		const teachers = (e.teachers ?? course.teachers ?? []).map((x) => teachersMap.get(getVertexId(x.to, options))?.ids).filter((x) => !!x).join(", ");
+		const rooms = (e.inLocations ?? []).filter(Boolean).map((x) => `${did}.${getVertexId(x, options)}`).join(", ");
 		return {
-			dayid: (start.day() + 6) % 7,
+			dayid: getDayIndex(start),
 			starttime: start.format("HHmm"),
 			length: end.diff(start, "minutes"),
 			roomexternalid: rooms,
@@ -94,13 +92,13 @@ var schedules_default = (schedule) => {
 			period: "",
 			groupexternalid,
 			teacherid: teachers,
-			externalref: `${did}.${e.id}`
+			externalref: `${did}.${getVertexId(e, options)}`
 		};
-	}).filter((x) => !!x);
-	const wb = XLSX$1.utils.book_new();
-	XLSX$1.utils.book_append_sheet(wb, XLSX$1.utils.json_to_sheet(undervisningsgrupper), "1. Undervisningsgrupper");
-	XLSX$1.utils.book_append_sheet(wb, XLSX$1.utils.json_to_sheet(salar), "2. Salar");
-	XLSX$1.utils.book_append_sheet(wb, XLSX$1.utils.json_to_sheet(lektioner), "3. Lektioner");
+	}).filter((x) => x != null);
+	const wb = XLSX.utils.book_new();
+	XLSX.utils.book_append_sheet(wb, XLSX.utils.json_to_sheet(undervisningsgrupper), "1. Undervisningsgrupper");
+	XLSX.utils.book_append_sheet(wb, XLSX.utils.json_to_sheet(salar), "2. Salar");
+	XLSX.utils.book_append_sheet(wb, XLSX.utils.json_to_sheet(lektioner), "3. Lektioner");
 	return wb;
 };
 

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

@@ -1 +1 @@
-{"version":3,"file":"schedules.js","names":["x","start","end","weeks","XLSX"],"sources":["../../../../src/SchoolSoft/file/to/schedules.ts"],"sourcesContent":["import * as XLSX                           from 'xlsx';\nimport moment                              from 'moment';\nimport { orderBy, uniq } from 'lodash-es';\nimport { Types                           } from 'mongoose';\n\nimport { Types as CoreTypes              } from '../../../core/types';\n\ntype Schedule = {\n  division:  CoreTypes.division;\n  settings:  CoreTypes.divisionSettings;\n  groups:    CoreTypes.group[];\n  teachers:  CoreTypes.teacher[];\n  locations: CoreTypes.location[];\n  courses:   CoreTypes.course[];\n  events:    CoreTypes.event[];\n  periods:   CoreTypes.period[];\n  persons:   CoreTypes.person[];\n};\n\ntype Undervisningsgrupp = {\n  name?:        string;\n  socialnumber: string;\n  externalid:   string;\n  classtype:    1 | 0;\n};\n\nconst getId = (ref: { id?: string } | Types.ObjectId | string): string => {\n  if (typeof ref == 'string') return ref;\n  return ref.id!.toString();\n};\n\nconst createUndervisningsgrupp = (\n  collection:      'courses' | 'events',\n  entity:          Pick<CoreTypes.course | CoreTypes.event, 'id' | 'displayName' | 'groups' | 'participants'>,\n  fallbackName:    string | undefined,\n  did:             string,\n  groupPersonsMap: Map<string, CoreTypes.person[]>,\n  personsMap:      Map<string, CoreTypes.person>\n): Undervisningsgrupp => {\n  const SSNs = uniq(\n    (entity.groups ?? [])\n      .map(x => {\n        const include = groupPersonsMap.get(getId(x.to))?.map(x => x.SSN?.value)\n          .filter((x): x is string => !!x) ?? [];\n        const exclude = x.exclude?.map(x => personsMap.get(getId(x))?.SSN?.value).filter((x): x is string => !!x) ?? [];\n        return include.filter(x => !exclude.includes(x));\n      })\n      .concat(entity.participants?.map(({ to }) => personsMap.get(getId(to))?.SSN?.value).filter((x): x is string => !!x) ?? [])\n      .flat()\n  )\n    .join(', ');\n\n  return {\n    name:         entity.displayName ?? fallbackName,\n    socialnumber: SSNs,\n    externalid:   `${did}.${entity.id}${collection == 'courses' ? 'C' : 'E'}`,\n    classtype:    0\n  };\n};\n\nexport default (schedule: Schedule): XLSX.WorkBook => {\n  // must have a division id\n  const did = schedule.division.id!;\n  if (!did) throw new Error('division id is undefined');\n\n  // a map of period id -> period\n  const periodsMap = new Map(schedule.periods.map(p => [getId(p) as string | undefined, p]));\n  periodsMap.set(undefined, { ranges: [{ start: schedule.division.start, end: schedule.division.end }] });\n\n  // a map of group id -> persons\n  const groupPersonsMap = new Map<string, CoreTypes.person[]>();\n  schedule.persons.forEach(p => {\n    if (!p.group) return;\n    const gid = getId(p.group);\n    if (!groupPersonsMap.has(gid)) groupPersonsMap.set(gid, []);\n    groupPersonsMap.get(gid)!.push(p);\n  });\n\n  // a map of person id -> person\n  const personsMap = new Map(schedule.persons.map(p => [getId(p), p]));\n\n  // a map of teacher id -> teacher\n  const teachersMap = new Map(schedule.teachers.map(t => [getId(t), t]));\n\n  // a map of course id -> course\n  const coursesMap = new Map(schedule.courses.map(c => [getId(c), c]));\n\n\n  ////\n  //// kurser, grupper -> undervisningsgrupper\n  ////\n  let undervisningsgrupper = new Array<Undervisningsgrupp>();\n  schedule.courses.forEach(c => {\n    undervisningsgrupper.push(createUndervisningsgrupp('courses', c, '', did, groupPersonsMap, personsMap));\n  });\n  schedule.groups.forEach(g => {\n    const SSNs = (groupPersonsMap.get(getId(g))?? [])\n      .map(x => x.SSN?.value)\n      .filter((x): x is string => !!x)\n      .join(', ');\n\n    undervisningsgrupper.push({\n      name:         g.displayName,\n      socialnumber: SSNs,\n      externalid:   `${did}.${g.id}G`,\n      classtype:    1\n    });\n  });\n\n  // for convenience, sort first by classtype in descending order, then by name\n  undervisningsgrupper = orderBy(undervisningsgrupper, ['classtype', 'name'], ['desc', 'asc']);\n\n  // console.log(undervisningsgrupper);\n\n\n  ////\n  //// salar\n  ////\n  const salar = schedule.locations\n    .map(l => ({\n      name:       l.displayName,\n      externalid: `${did}.${l.id}`\n    }));\n  // console.log(salar);\n\n\n  ////\n  //// lektioner\n  ////\n  const lektioner = schedule.events\n    .map(e => {\n    // must have start and end\n      if (!e.start || !e.end) return null;\n      const start = moment.utc(e.start);\n      const end   = moment.utc(e.end);\n\n      // must have course\n      const course = e.course ? coursesMap.get(getId(e.course)) : undefined;\n      if (!course) return null;\n      let groupexternalid = `${did}.${course.id}C`;\n\n      // if the event overrides the course's groups or participants, create a new overlap group from the event\n      if (e.groups || e.participants) {\n        const UG = createUndervisningsgrupp('events', e, course.displayName, did, groupPersonsMap, personsMap);\n        undervisningsgrupper.push(UG);\n        groupexternalid = UG.externalid;\n      }\n\n      const subject = course.subject;\n      const _period  = e.period ?? course.period ?? schedule.settings.period;\n      const period = periodsMap.get(_period ? getId(_period) : undefined);\n\n      const weeks = period?.ranges.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      }).flat()\n        .join(', ');\n\n      const teachers = (e.teachers ?? course.teachers ?? [])\n        .map(x => teachersMap.get(getId(x.to))?.ids)\n        .filter((x): x is string => !!x)\n        .join(', ');\n\n      const rooms = (e.inLocations as CoreTypes.location[] ?? [])\n        .filter(Boolean)\n        .map(x => `${did}.${getId(x)}`)\n        .join(', ');\n\n      return {\n        dayid:           (start.day() + 6) % 7,\n        starttime:       start.format('HHmm'),\n        length:          end.diff(start, 'minutes'),\n        roomexternalid:  rooms,\n        subject:         subject,\n        exweek:          '',\n        inweek:          weeks,\n        period:          '',\n        groupexternalid: groupexternalid,\n        teacherid:       teachers,\n        externalref:     `${did}.${e.id}`,\n      };\n    })\n    .filter((x): x is NonNullable<typeof x> => !!x);\n  // console.log(lektioner);\n\n\n  ////\n  //// store in workbook\n  ////\n  const wb = XLSX.utils.book_new();\n  XLSX.utils.book_append_sheet(wb, XLSX.utils.json_to_sheet(undervisningsgrupper), '1. Undervisningsgrupper');\n  XLSX.utils.book_append_sheet(wb, XLSX.utils.json_to_sheet(salar),                '2. Salar');\n  XLSX.utils.book_append_sheet(wb, XLSX.utils.json_to_sheet(lektioner),            '3. Lektioner');\n\n  return wb;\n};\n"],"mappings":"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"}
+{"version":3,"file":"schedules.js","names":["x","start","end","weeks"],"sources":["../../../../src/SchoolSoft/file/to/schedules.ts"],"sourcesContent":["import XLSX from 'xlsx';\nimport moment from 'moment';\nimport { orderBy, uniq } from 'lodash-es';\nimport type { CoreTypes } from '../../../core';\nimport { getDayIndex, getVertexId } from '../../../core/util';\nimport type { BaseOptions } from '../../../common/types';\nimport { makeChainable } from '../../../common/make-chainable';\n\n\ntype Undervisningsgrupp = {\n  name?:        string;\n  socialnumber: string;\n  externalid:   string;\n  classtype:    1 | 0;\n};\n\nfunction createUndervisningsgrupp (\n  collection:      'courses' | 'events',\n  entity:          CoreTypes.mixed.course | CoreTypes.mixed.event,\n  fallbackName:    string | undefined,\n  did:             string,\n  groupPersonsMap: Map<string, CoreTypes.mixed.person[]>,\n  personsMap:      Map<string, CoreTypes.mixed.person>,\n  options:         BaseOptions\n): Undervisningsgrupp {\n  const SSNs = makeChainable(entity.groups ?? [])\n    .chain(\n      x => x\n        .map(x => {\n          const include = groupPersonsMap.get(getVertexId(x.to, options))?.map(x => x.SSN?.value)\n            .filter((x): x is string => !!x) ?? [];\n          const exclude = x.exclude?.map(x => personsMap.get(getVertexId(x, options))?.SSN?.value).filter((x): x is string => !!x) ?? [];\n          return include.filter(x => !exclude.includes(x));\n        })\n        .concat(entity.participants?.map(({ to }) => personsMap.get(getVertexId(to, options))?.SSN?.value).filter((x): x is string => !!x) ?? [])\n        .flat(),\n      x => uniq(x).join(', ')\n    )\n    .value;\n\n  return {\n    name:         entity.displayName ?? fallbackName,\n    socialnumber: SSNs,\n    externalid:   `${did}.${getVertexId(entity, options)}${collection == 'courses' ? 'C' : 'E'}`,\n    classtype:    0\n  };\n};\n\nexport default (\n  schedule: CoreTypes.mixed.schedule & { division?: CoreTypes.mixed.division },\n  options:  BaseOptions = {}\n): XLSX.WorkBook => {\n  const division = schedule.division ?? schedule.divisions;\n\n  // must have a division id\n  const did = getVertexId(division, options);\n\n  // a map of period id -> period\n  const periodsMap = new Map(schedule.periods.map(p => [getVertexId(p, options) as string | undefined, p as Pick<CoreTypes.mixed.period, 'ranges'>]));\n  periodsMap.set(undefined, { ranges: [{ start: division.start, end: division.end }] });\n\n  // a map of group id -> persons\n  const groupPersonsMap = new Map<string, CoreTypes.mixed.person[]>();\n  schedule.persons.forEach(p => {\n    if (!p.group) return;\n    const gid = getVertexId(p.group, options);\n    if (!groupPersonsMap.has(gid)) groupPersonsMap.set(gid, []);\n    groupPersonsMap.get(gid)?.push(p);\n  });\n\n  // a map of person id -> person\n  const personsMap = new Map(schedule.persons.map(p => [getVertexId(p, options), p]));\n\n  // a map of teacher id -> teacher\n  const teachersMap = new Map(schedule.teachers.map(t => [getVertexId(t, options), t]));\n\n  // a map of course id -> course\n  const coursesMap = new Map(schedule.courses.map(c => [getVertexId(c, options), c]));\n\n\n  ////\n  //// kurser, grupper -> undervisningsgrupper\n  ////\n  let undervisningsgrupper = new Array<Undervisningsgrupp>();\n  schedule.courses.forEach(c => {\n    undervisningsgrupper.push(createUndervisningsgrupp('courses', c, '', did, groupPersonsMap, personsMap, options));\n  });\n  schedule.groups.forEach(g => {\n    const SSNs = (groupPersonsMap.get(getVertexId(g, options))?? [])\n      .map(x => x.SSN?.value)\n      .filter((x): x is string => !!x)\n      .join(', ');\n\n    undervisningsgrupper.push({\n      name:         g.displayName,\n      socialnumber: SSNs,\n      externalid:   `${did}.${getVertexId(g, options)}G`,\n      classtype:    1\n    });\n  });\n\n  // for convenience, sort first by classtype in descending order, then by name\n  undervisningsgrupper = orderBy(undervisningsgrupper, ['classtype', 'name'], ['desc', 'asc']);\n\n\n  ////\n  //// salar\n  ////\n  const salar = schedule.locations\n    .map(l => ({\n      name:       l.displayName,\n      externalid: `${did}.${getVertexId(l, options)}`\n    }));\n\n\n  ////\n  //// lektioner\n  ////\n  const lektioner = schedule.events\n    .map(e => {\n    // must have start and end\n      if (!e.start || !e.end) return null;\n      const start = moment.utc(e.start);\n      const end   = moment.utc(e.end);\n\n      // must have course\n      const course = e.course ? coursesMap.get(getVertexId(e.course, options)) : undefined;\n      if (!course) return null;\n      let groupexternalid = `${did}.${getVertexId(course, options)}C`;\n\n      // if the event overrides the course's groups or participants, create a new overlap group from the event\n      if (e.groups || e.participants) {\n        const UG = createUndervisningsgrupp('events', e, course.displayName, did, groupPersonsMap, personsMap, options);\n        undervisningsgrupper.push(UG);\n        groupexternalid = UG.externalid;\n      }\n\n      const subject = course.subject;\n      const _period  = e.period ?? course.period ?? schedule.settings.period;\n      const period = periodsMap.get(_period ? getVertexId(_period, options) : undefined);\n\n      const weeks = period?.ranges.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      }).flat()\n        .join(', ');\n\n      const teachers = (e.teachers ?? course.teachers ?? [])\n        .map(x => teachersMap.get(getVertexId(x.to, options))?.ids)\n        .filter((x): x is string => !!x)\n        .join(', ');\n\n      const rooms = (e.inLocations as CoreTypes.location[] ?? [])\n        .filter(Boolean)\n        .map(x => `${did}.${getVertexId(x, options)}`)\n        .join(', ');\n\n      return {\n        dayid:           getDayIndex(start),\n        starttime:       start.format('HHmm'),\n        length:          end.diff(start, 'minutes'),\n        roomexternalid:  rooms,\n        subject:         subject,\n        exweek:          '',\n        inweek:          weeks,\n        period:          '',\n        groupexternalid: groupexternalid,\n        teacherid:       teachers,\n        externalref:     `${did}.${getVertexId(e, options)}`,\n      };\n    })\n    .filter(x => x != null);\n\n\n  ////\n  //// store in workbook\n  ////\n  const wb = XLSX.utils.book_new();\n  XLSX.utils.book_append_sheet(wb, XLSX.utils.json_to_sheet(undervisningsgrupper), '1. Undervisningsgrupper');\n  XLSX.utils.book_append_sheet(wb, XLSX.utils.json_to_sheet(salar),                '2. Salar');\n  XLSX.utils.book_append_sheet(wb, XLSX.utils.json_to_sheet(lektioner),            '3. Lektioner');\n\n  return wb;\n};\n"],"mappings":"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"}

package/dist/SchoolSoft/index.d.ts

@@ -1,5 +1,4 @@
-import { Types as Types$2 } from "../core/v2/types/index.js";
-import { Deserialized } from "../core/types/index.js";
+import { Types as Types$2 } from "../core/types/index.js";
 import { Event } from "./file/types/events.js";
 import { export_default } from "./file/to/index.js";
 import { Options, Types } from "./file/types/index.js";
@@ -11,7 +10,7 @@ import { Map as Map$1 } from "./api/index.js";
 declare class SchoolSoftMap {
   static to: typeof export_default;
   static from: {
-    schedules: (input: Deserialized<Event>[], options?: Options) => Types$2.division;
+    schedules: (input: Event[], options?: Options) => Partial<Types$2.serializedWithoutInternalId.schedule>;
   };
   static File: typeof Map;
   static Api: typeof Map$1;

package/dist/SchoolSoft/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["FileMap","ApiMap"],"sources":["../../src/SchoolSoft/index.ts"],"sourcesContent":["import { Map as FileMap } from './file';\nimport { Map as ApiMap  } from './api';\n\nexport class SchoolSoftMap {\n  static to   = FileMap.to;\n  static from = FileMap.from;\n\n  static File = FileMap;\n  static Api  = ApiMap;\n}\n\nexport type { Types as  SchoolSoftFileTypes } from './file';\nexport type { Types as  SchoolSoftApiTypes } from './api';"],"mappings":";;;;AAGA,IAAa,gBAAb,MAA2B;CACzB,OAAO,KAAOA,IAAQ;CACtB,OAAO,OAAOA,IAAQ;CAEtB,OAAO,OAAOA;CACd,OAAO,MAAOC"}
+{"version":3,"file":"index.js","names":["FileMap","ApiMap"],"sources":["../../src/SchoolSoft/index.ts"],"sourcesContent":["import { Map as FileMap } from './file';\nimport { Map as ApiMap  } from './api';\n\nexport class SchoolSoftMap {\n  static to   = FileMap.to;\n  static from = FileMap.from;\n\n  static File = FileMap;\n  static Api  = ApiMap;\n}\n\nexport type { Types as SchoolSoftFileTypes } from './file';\nexport type { Types as SchoolSoftApiTypes } from './api';\n"],"mappings":";;;;AAGA,IAAa,gBAAb,MAA2B;CACzB,OAAO,KAAOA,IAAQ;CACtB,OAAO,OAAOA,IAAQ;CAEtB,OAAO,OAAOA;CACd,OAAO,MAAOC"}

package/dist/Schoolity/txt/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["_to"],"sources":["../../../src/Schoolity/txt/index.ts"],"sourcesContent":["import _to                                 from './to';\n\nexport class Map {\n  static to   = _to;\n}\n\nexport type { Types } from './types';"],"mappings":";;;AAEA,IAAa,MAAb,MAAiB;CACf,OAAO,KAAOA"}
+{"version":3,"file":"index.js","names":["_to"],"sources":["../../../src/Schoolity/txt/index.ts"],"sourcesContent":["import _to from './to';\n\nexport class Map {\n  static to = _to;\n}\n\nexport type { Types } from './types';"],"mappings":";;;AAEA,IAAa,MAAb,MAAiB;CACf,OAAO,KAAKA"}

package/dist/Schoolity/txt/to/index.d.ts

@@ -1,9 +1,9 @@
-import { Types } from "../../../core/v2/types/index.js";
-import { Deserialized } from "../../../core/types/index.js";
+import { BaseOptions } from "../../../common/types.js";
+import { Types } from "../../../core/types/index.js";
 
 //#region src/Schoolity/txt/to/index.d.ts
 declare class export_default {
-  static schedules: (division: Deserialized<Types.division>) => string;
+  static schedules: (data: Types.mixed.schedule, options?: BaseOptions) => string;
 }
 //#endregion
 export { export_default };

package/dist/Schoolity/txt/to/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["_schedules"],"sources":["../../../../src/Schoolity/txt/to/index.ts"],"sourcesContent":["import _schedules                          from './schedules';\n\nexport default class {\n  static schedules           = _schedules;\n}"],"mappings":";;;AAEA,uBAAqB;CACnB,OAAO,YAAsBA"}
+{"version":3,"file":"index.js","names":["_schedules"],"sources":["../../../../src/Schoolity/txt/to/index.ts"],"sourcesContent":["import _schedules from './schedules';\n\nexport default class {\n  static schedules = _schedules;\n}"],"mappings":";;;AAEA,uBAAqB;CACnB,OAAO,YAAYA"}