@royalschedule/maps 4.0.13 → 4.0.15

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

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

package/dist/RS/from/schedules.js

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

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

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

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

@@ -34,7 +34,8 @@ function fromCollections(courses, settings, options, periodsMap) {
 			days: parseDays(course.days, settings),
 			minBreakLength: parseMinimumBreakLength(course.minBreakLength),
 			lockedTimes: attachLockedTimes(course.lockedTimes, options),
-			period: getPeriodIndex(course.period, periodsMap, options)
+			period: getPeriodIndex(course.period, periodsMap, options),
+			_period: course.period ? getVertexId(course.period, options) : void 0
 		};
 		if (options.meta) doc.meta = omitBy({
 			color: course.color,

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

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

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

@@ -1,3 +1,4 @@
+import { getVertexId } from "../../../core/util.js";
 import { getPeriodIndex, min2hrs, toTimeFloat } from "./util/util.js";
 import { computesDefaultIntervalId, getDefaultInterval } from "./intervals.js";
 import { parseIntervals } from "./util/parse-intervals.js";
@@ -23,7 +24,8 @@ function parseDefault(settings, periodsMap, options) {
 		groupWeight: settings.defaultGroupWeight ?? 0,
 		collectionWeight: settings.defaultCourseWeight ?? 0,
 		eventWeight: settings.defaultEventWeight ?? 0,
-		period: getPeriodIndex(settings.period ?? DEFAULT_PERIOD_ID, periodsMap, options)
+		period: getPeriodIndex(settings.period ?? DEFAULT_PERIOD_ID, periodsMap, options),
+		_period: settings.period ? getVertexId(settings.period, options) : void 0
 	};
 	return res;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"default.js","names":["res: Types.defaultValues"],"sources":["../../../../src/RS/to/input/default.ts"],"sourcesContent":["import type { Types } from '../../types';\nimport { computesDefaultIntervalId, getDefaultInterval } from './intervals';\nimport { parseIntervals } from './util/parse-intervals';\nimport { getPeriodIndex, min2hrs, toTimeFloat } from './util/util';\nimport type { ConnectedTypes } from '../../make-connected';\nimport { DEFAULT_PERIOD_ID } from './periods';\n\nexport function parseDefault (\n  settings:   ConnectedTypes.divisionSettings,\n  periodsMap: Map<string | undefined, number>,\n  options:    Types.parsedToOptions\n): Types.defaultValues {\n  const maxNumWorkingHours = options.useMaximumScheduleSpan\n    ? min2hrs(settings.defaultMaximumScheduleSpan?.daily) ?? false\n    : settings.defaultMaxNumWorkingHours                  ?? false;\n\n  const maxNumDailyWorkingHours = options.useMaximumScheduleSpan\n    ? min2hrs(settings.defaultMaximumScheduleSpan?.daily) ?? false\n    : settings.defaultMaxNumDailyWorkingHours             ?? false;\n\n  const res: Types.defaultValues = {\n    intervals: options.oldFormat\n      ? parseIntervals(getDefaultInterval(settings), undefined, settings)!\n      : computesDefaultIntervalId(settings, options),\n\n    groupMinBreakLength:      settings.defaultGroupMinimumBreakLength      ?? 0,\n    dependencyMinBreakLength: settings.defaultDependencyMinimumBreakLength ?? 0,\n    eventMinBreakLength:      settings.defaultEventMinimumBreakLength      ?? 0,\n\n    potentialCenter: toTimeFloat(settings.potentialCenter ?? '12:00'),\n    eventDensity:    settings.defaultEventDensity ?? 0,\n\n    maxEventLengthVariance: settings.defaultEventDurationVariance ?? 0,\n\n    maxNumWorkingHours:      maxNumWorkingHours,\n    maxNumDailyWorkingHours: maxNumDailyWorkingHours,\n\n    dependencyRank: settings.defaultDependencyRank ?? 0,\n    groupRank:      settings.defaultGroupRank      ?? 0,\n    dayRank:        settings.defaultDayRank        ?? 0,\n\n    groupWeight:      settings.defaultGroupWeight  ?? 0,\n    collectionWeight: settings.defaultCourseWeight ?? 0,\n    eventWeight:      settings.defaultEventWeight  ?? 0,\n\n    period: getPeriodIndex(settings.period ?? DEFAULT_PERIOD_ID, periodsMap, options)\n  };\n\n  return res;\n};"],"mappings":";;;;;;AAOA,SAAgB,aACd,UACA,YACA,SACqB;CACrB,MAAM,qBAAqB,QAAQ,yBAC/B,QAAQ,SAAS,4BAA4B,UAAU,QACvD,SAAS,6BAA8C;CAE3D,MAAM,0BAA0B,QAAQ,yBACpC,QAAQ,SAAS,4BAA4B,UAAU,QACvD,SAAS,kCAA8C;CAE3D,MAAMA,MAA2B;EAC/B,WAAW,QAAQ,YACf,eAAe,mBAAmB,WAAW,QAAW,YACxD,0BAA0B,UAAU;EAExC,qBAA0B,SAAS,kCAAuC;EAC1E,0BAA0B,SAAS,uCAAuC;EAC1E,qBAA0B,SAAS,kCAAuC;EAE1E,iBAAiB,YAAY,SAAS,mBAAmB;EACzD,cAAiB,SAAS,uBAAuB;EAEjD,wBAAwB,SAAS,gCAAgC;EAExC;EACA;EAEzB,gBAAgB,SAAS,yBAAyB;EAClD,WAAgB,SAAS,oBAAyB;EAClD,SAAgB,SAAS,kBAAyB;EAElD,aAAkB,SAAS,sBAAuB;EAClD,kBAAkB,SAAS,uBAAuB;EAClD,aAAkB,SAAS,sBAAuB;EAElD,QAAQ,eAAe,SAAS,UAAU,mBAAmB,YAAY;;AAG3E,QAAO"}
+{"version":3,"file":"default.js","names":["res: Types.defaultValues"],"sources":["../../../../src/RS/to/input/default.ts"],"sourcesContent":["import type { Types } from '../../types';\nimport { computesDefaultIntervalId, getDefaultInterval } from './intervals';\nimport { parseIntervals } from './util/parse-intervals';\nimport { getPeriodIndex, min2hrs, toTimeFloat } from './util/util';\nimport type { ConnectedTypes } from '../../make-connected';\nimport { DEFAULT_PERIOD_ID } from './periods';\nimport { getVertexId } from '../../../core/util';\n\nexport function parseDefault (\n  settings:   ConnectedTypes.divisionSettings,\n  periodsMap: Map<string | undefined, number>,\n  options:    Types.parsedToOptions\n): Types.defaultValues {\n  const maxNumWorkingHours = options.useMaximumScheduleSpan\n    ? min2hrs(settings.defaultMaximumScheduleSpan?.daily) ?? false\n    : settings.defaultMaxNumWorkingHours                  ?? false;\n\n  const maxNumDailyWorkingHours = options.useMaximumScheduleSpan\n    ? min2hrs(settings.defaultMaximumScheduleSpan?.daily) ?? false\n    : settings.defaultMaxNumDailyWorkingHours             ?? false;\n\n  const res: Types.defaultValues = {\n    intervals: options.oldFormat\n      ? parseIntervals(getDefaultInterval(settings), undefined, settings)!\n      : computesDefaultIntervalId(settings, options),\n\n    groupMinBreakLength:      settings.defaultGroupMinimumBreakLength      ?? 0,\n    dependencyMinBreakLength: settings.defaultDependencyMinimumBreakLength ?? 0,\n    eventMinBreakLength:      settings.defaultEventMinimumBreakLength      ?? 0,\n\n    potentialCenter: toTimeFloat(settings.potentialCenter ?? '12:00'),\n    eventDensity:    settings.defaultEventDensity ?? 0,\n\n    maxEventLengthVariance: settings.defaultEventDurationVariance ?? 0,\n\n    maxNumWorkingHours:      maxNumWorkingHours,\n    maxNumDailyWorkingHours: maxNumDailyWorkingHours,\n\n    dependencyRank: settings.defaultDependencyRank ?? 0,\n    groupRank:      settings.defaultGroupRank      ?? 0,\n    dayRank:        settings.defaultDayRank        ?? 0,\n\n    groupWeight:      settings.defaultGroupWeight  ?? 0,\n    collectionWeight: settings.defaultCourseWeight ?? 0,\n    eventWeight:      settings.defaultEventWeight  ?? 0,\n\n    period:  getPeriodIndex(settings.period ?? DEFAULT_PERIOD_ID, periodsMap, options),\n    _period: settings.period ? getVertexId(settings.period, options) : undefined,\n  };\n\n  return res;\n};"],"mappings":";;;;;;;AAQA,SAAgB,aACd,UACA,YACA,SACqB;CACrB,MAAM,qBAAqB,QAAQ,yBAC/B,QAAQ,SAAS,4BAA4B,UAAU,QACvD,SAAS,6BAA8C;CAE3D,MAAM,0BAA0B,QAAQ,yBACpC,QAAQ,SAAS,4BAA4B,UAAU,QACvD,SAAS,kCAA8C;CAE3D,MAAMA,MAA2B;EAC/B,WAAW,QAAQ,YACf,eAAe,mBAAmB,WAAW,QAAW,YACxD,0BAA0B,UAAU;EAExC,qBAA0B,SAAS,kCAAuC;EAC1E,0BAA0B,SAAS,uCAAuC;EAC1E,qBAA0B,SAAS,kCAAuC;EAE1E,iBAAiB,YAAY,SAAS,mBAAmB;EACzD,cAAiB,SAAS,uBAAuB;EAEjD,wBAAwB,SAAS,gCAAgC;EAExC;EACA;EAEzB,gBAAgB,SAAS,yBAAyB;EAClD,WAAgB,SAAS,oBAAyB;EAClD,SAAgB,SAAS,kBAAyB;EAElD,aAAkB,SAAS,sBAAuB;EAClD,kBAAkB,SAAS,uBAAuB;EAClD,aAAkB,SAAS,sBAAuB;EAElD,QAAS,eAAe,SAAS,UAAU,mBAAmB,YAAY;EAC1E,SAAS,SAAS,SAAS,YAAY,SAAS,QAAQ,WAAW;;AAGrE,QAAO"}

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

@@ -33,6 +33,7 @@ function parseEvents(events, settings, options, periodsMap) {
 			potentialCenter: event.centerOfAttraction ? parseFloat(event.centerOfAttraction.replace(":", ".")) : void 0,
 			forcedOverlapId: event.overlapSpecies?.species?.find(({ to }) => to == event)?.id,
 			period: getPeriodIndex(event.period, periodsMap, options),
+			_period: event.period ? getVertexId(event.period, options) : void 0,
 			days: parseDays(event.days, settings),
 			dependencies: parseLocationReferences(event.locations, options),
 			groups: parseGroupReferences({

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

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

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

@@ -3,7 +3,7 @@ import { extractUniqueIntervals } from "./intervals.js";
 import { fromTeachers } from "./teachers.js";
 import { fromCollections } from "./collections.js";
 import { parseSettings } from "./settings.js";
-import { parsePeriods } from "./periods.js";
+import { _parsePeriods, parsePeriods } from "./periods.js";
 import { parseDefault } from "./default.js";
 import { fromDynamicLockedTimes } from "./dynamic-locked-times.js";
 import { fromGroups } from "./groups.js";
@@ -40,6 +40,7 @@ function parseInput(data, options = {}) {
 		settings: parseSettings(_settings),
 		default: parseDefault(_settings, periodsMap, options),
 		periods,
+		_periods: _parsePeriods(_periods, _division, options),
 		intervals: options.oldFormat ? void 0 : extractUniqueIntervals(_settings, _groups, _teachers, _courses, _events, _lockedTimes, options),
 		dependencies: fromLocations(_locations, _settings, options),
 		groups: fromGroups(_groups, _settings, options).concat(fromTeachers(_teachers, _settings, options)),

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

@@ -1 +1 @@
-{"version":3,"file":"input.js","names":["out: Types.scheduleData"],"sources":["../../../../src/RS/to/input/input.ts"],"sourcesContent":["import type { Types } from '../../types';\nimport { fromLocations } from './dependencies';\nimport { fromTeachers } from './teachers';\nimport { fromCollections } from './collections';\nimport { parseSettings } from './settings';\nimport { parseDefault } from './default';\nimport { fromDynamicLockedTimes } from './dynamic-locked-times';\nimport { parsePeriods } from './periods';\nimport type { ConnectedScheduleData } from '../../make-connected';\nimport { fromGroups } from './groups';\nimport { extractUniqueIntervals } from './intervals';\nimport { extractUniqueIndividuals } from './individuals';\n\nexport function parseInput (\n  data:    ConnectedScheduleData,\n  options: Types.parsedToOptions = {}\n): Types.scheduleData {\n\n  const _settings    = data.settings;\n  const _division    = data.division;\n  const _groups      = data.groups      ?? [];\n  const _teachers    = data.teachers    ?? [];\n  const _locations   = data.locations   ?? [];\n  const _events      = data.events      ?? [];\n  const _lockedTimes = data.lockedTimes ?? [];\n  const _courses     = data.courses     ?? [];\n  const _persons     = data.persons     ?? [];\n  const _periods     = data.periods     ?? [];\n\n\n  ////\n  //// replace empty/null intervals with undefined\n  ////\n  [_groups, _teachers, _locations, _courses, _events, _lockedTimes].forEach(entities => {\n    entities.forEach(entity => {\n      if      (entity.intervals && entity.intervals.length == 0) entity.intervals = undefined;\n      else if (entity.intervals === null                       ) entity.intervals = undefined;\n    });\n  });\n\n\n  const { map: periodsMap, matrix: periodsMatrix } = parsePeriods(_periods, _division, options);\n  const periods = periodsMatrix?.length ? periodsMatrix : undefined;  // cannot be an empty string\n\n  const out: Types.scheduleData = {\n    settings: parseSettings(_settings),\n    default:  parseDefault (_settings, periodsMap, options),\n\n    periods: periods,\n\n    intervals: options.oldFormat ? undefined : extractUniqueIntervals(_settings, _groups, _teachers, _courses, _events, _lockedTimes, options),\n\n    dependencies: fromLocations(_locations, _settings, options),\n\n    groups: fromGroups(_groups, _settings, options)\n      .concat(fromTeachers(_teachers, _settings, options)),\n\n    individuals: options.oldFormat ? undefined : extractUniqueIndividuals(_persons, _courses, _events, _lockedTimes, options),\n\n    events: [\n      ...fromCollections(_courses, _settings, options, periodsMap),\n      ...fromDynamicLockedTimes(_lockedTimes, _settings, options)\n    ]\n  };\n  return out;\n};"],"mappings":";;;;;;;;;;;;AAaA,SAAgB,WACd,MACA,UAAiC,IACb;CAEpB,MAAM,YAAe,KAAK;CAC1B,MAAM,YAAe,KAAK;CAC1B,MAAM,UAAe,KAAK,UAAe;CACzC,MAAM,YAAe,KAAK,YAAe;CACzC,MAAM,aAAe,KAAK,aAAe;CACzC,MAAM,UAAe,KAAK,UAAe;CACzC,MAAM,eAAe,KAAK,eAAe;CACzC,MAAM,WAAe,KAAK,WAAe;CACzC,MAAM,WAAe,KAAK,WAAe;CACzC,MAAM,WAAe,KAAK,WAAe;AAMzC;EAAC;EAAS;EAAW;EAAY;EAAU;EAAS;GAAc,SAAQ,aAAY;AACpF,WAAS,SAAQ,WAAU;AACzB,OAAS,OAAO,aAAa,OAAO,UAAU,UAAU,EAAG,QAAO,YAAY;YACrE,OAAO,cAAc,KAA6B,QAAO,YAAY;;;CAKlF,MAAM,EAAE,KAAK,YAAY,QAAQ,kBAAkB,aAAa,UAAU,WAAW;CACrF,MAAM,UAAU,eAAe,SAAS,gBAAgB;CAExD,MAAMA,MAA0B;EAC9B,UAAU,cAAc;EACxB,SAAU,aAAc,WAAW,YAAY;EAEtC;EAET,WAAW,QAAQ,YAAY,SAAY,uBAAuB,WAAW,SAAS,WAAW,UAAU,SAAS,cAAc;EAElI,cAAc,cAAc,YAAY,WAAW;EAEnD,QAAQ,WAAW,SAAS,WAAW,SACpC,OAAO,aAAa,WAAW,WAAW;EAE7C,aAAa,QAAQ,YAAY,SAAY,yBAAyB,UAAU,UAAU,SAAS,cAAc;EAEjH,QAAQ,CACN,GAAG,gBAAgB,UAAU,WAAW,SAAS,aACjD,GAAG,uBAAuB,cAAc,WAAW;;AAGvD,QAAO"}
+{"version":3,"file":"input.js","names":["out: Types.scheduleData"],"sources":["../../../../src/RS/to/input/input.ts"],"sourcesContent":["import type { Types } from '../../types';\nimport { fromLocations } from './dependencies';\nimport { fromTeachers } from './teachers';\nimport { fromCollections } from './collections';\nimport { parseSettings } from './settings';\nimport { parseDefault } from './default';\nimport { fromDynamicLockedTimes } from './dynamic-locked-times';\nimport { parsePeriods, _parsePeriods } from './periods';\nimport type { ConnectedScheduleData } from '../../make-connected';\nimport { fromGroups } from './groups';\nimport { extractUniqueIntervals } from './intervals';\nimport { extractUniqueIndividuals } from './individuals';\n\nexport function parseInput (\n  data:    ConnectedScheduleData,\n  options: Types.parsedToOptions = {}\n): Types.scheduleData {\n\n  const _settings    = data.settings;\n  const _division    = data.division;\n  const _groups      = data.groups      ?? [];\n  const _teachers    = data.teachers    ?? [];\n  const _locations   = data.locations   ?? [];\n  const _events      = data.events      ?? [];\n  const _lockedTimes = data.lockedTimes ?? [];\n  const _courses     = data.courses     ?? [];\n  const _persons     = data.persons     ?? [];\n  const _periods     = data.periods     ?? [];\n\n\n  ////\n  //// replace empty/null intervals with undefined\n  ////\n  [_groups, _teachers, _locations, _courses, _events, _lockedTimes].forEach(entities => {\n    entities.forEach(entity => {\n      if      (entity.intervals && entity.intervals.length == 0) entity.intervals = undefined;\n      else if (entity.intervals === null                       ) entity.intervals = undefined;\n    });\n  });\n\n\n  const { map: periodsMap, matrix: periodsMatrix } = parsePeriods(_periods, _division, options);\n  const periods = periodsMatrix?.length ? periodsMatrix : undefined;  // cannot be an empty string\n\n  const out: Types.scheduleData = {\n    settings: parseSettings(_settings),\n    default:  parseDefault (_settings, periodsMap, options),\n\n    periods:  periods,\n    _periods: _parsePeriods(_periods, _division, options),\n\n    intervals: options.oldFormat ? undefined : extractUniqueIntervals(_settings, _groups, _teachers, _courses, _events, _lockedTimes, options),\n\n    dependencies: fromLocations(_locations, _settings, options),\n\n    groups: fromGroups(_groups, _settings, options)\n      .concat(fromTeachers(_teachers, _settings, options)),\n\n    individuals: options.oldFormat ? undefined : extractUniqueIndividuals(_persons, _courses, _events, _lockedTimes, options),\n\n    events: [\n      ...fromCollections(_courses, _settings, options, periodsMap),\n      ...fromDynamicLockedTimes(_lockedTimes, _settings, options)\n    ]\n  };\n  return out;\n};"],"mappings":";;;;;;;;;;;;AAaA,SAAgB,WACd,MACA,UAAiC,IACb;CAEpB,MAAM,YAAe,KAAK;CAC1B,MAAM,YAAe,KAAK;CAC1B,MAAM,UAAe,KAAK,UAAe;CACzC,MAAM,YAAe,KAAK,YAAe;CACzC,MAAM,aAAe,KAAK,aAAe;CACzC,MAAM,UAAe,KAAK,UAAe;CACzC,MAAM,eAAe,KAAK,eAAe;CACzC,MAAM,WAAe,KAAK,WAAe;CACzC,MAAM,WAAe,KAAK,WAAe;CACzC,MAAM,WAAe,KAAK,WAAe;AAMzC;EAAC;EAAS;EAAW;EAAY;EAAU;EAAS;GAAc,SAAQ,aAAY;AACpF,WAAS,SAAQ,WAAU;AACzB,OAAS,OAAO,aAAa,OAAO,UAAU,UAAU,EAAG,QAAO,YAAY;YACrE,OAAO,cAAc,KAA6B,QAAO,YAAY;;;CAKlF,MAAM,EAAE,KAAK,YAAY,QAAQ,kBAAkB,aAAa,UAAU,WAAW;CACrF,MAAM,UAAU,eAAe,SAAS,gBAAgB;CAExD,MAAMA,MAA0B;EAC9B,UAAU,cAAc;EACxB,SAAU,aAAc,WAAW,YAAY;EAErC;EACV,UAAU,cAAc,UAAU,WAAW;EAE7C,WAAW,QAAQ,YAAY,SAAY,uBAAuB,WAAW,SAAS,WAAW,UAAU,SAAS,cAAc;EAElI,cAAc,cAAc,YAAY,WAAW;EAEnD,QAAQ,WAAW,SAAS,WAAW,SACpC,OAAO,aAAa,WAAW,WAAW;EAE7C,aAAa,QAAQ,YAAY,SAAY,yBAAyB,UAAU,UAAU,SAAS,cAAc;EAEjH,QAAQ,CACN,GAAG,gBAAgB,UAAU,WAAW,SAAS,aACjD,GAAG,uBAAuB,cAAc,WAAW;;AAGvD,QAAO"}

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

@@ -1,14 +1,14 @@
 import { getIdKey, getVertexId } from "../../../core/util.js";
 import { makeChainable } from "../../../common/make-chainable/index.js";
-import { anyRangesOverlap } from "../../../common/functions.js";
+import { anyRangesOverlap, rangesOverlap } from "../../../common/functions.js";
 import { groupBy } from "lodash-es";
 import moment from "moment";
 
 //#region src/RS/to/input/periods.ts
 function createRange({ start, end }) {
 	return {
-		start: moment.utc(start).clone().startOf("isoWeek").startOf("day"),
-		end: moment.utc(end).clone().endOf("isoWeek").endOf("day")
+		start: moment.utc(start).clone().startOf("isoWeek"),
+		end: moment.utc(end).clone().endOf("isoWeek")
 	};
 }
 /**
@@ -42,7 +42,50 @@ function parsePeriods(periods, division, options) {
 		matrix
 	};
 }
+function _parsePeriods(periods, division, options) {
+	const divisionRange = createRange(division);
+	const weeksMap = /* @__PURE__ */ new Map();
+	for (const x = divisionRange.start.clone(); x.isSameOrBefore(divisionRange.end); x.add(1, "week")) weeksMap.set(x.toISOString(), false);
+	const out = periods?.map((p) => {
+		const id = getVertexId(p, options);
+		const clippedRanges = p.ranges.map((r) => createRange(r)).filter((r) => rangesOverlap(r, divisionRange)).map((r) => ({
+			start: moment.max(r.start, divisionRange.start).clone(),
+			end: moment.min(r.end, divisionRange.end).clone()
+		}));
+		const activeWeeksMap = new Map(weeksMap);
+		clippedRanges.forEach((r) => {
+			for (const x = r.start.clone(); x.isSameOrBefore(r.end); x.add(1, "week")) {
+				const key = x.toISOString();
+				activeWeeksMap.set(key, true);
+			}
+		});
+		const weeks = Array.from(activeWeeksMap.entries()).sort((a, b) => moment.utc(a[0]).diff(moment.utc(b[0]))).map((x) => x[1] ? "1" : "0").join("");
+		const overlaps = weeks.length <= 64 ? weeks : "";
+		return {
+			id,
+			weeks,
+			overlaps
+		};
+	});
+	if (weeksMap.size > 64 && out && out.length <= 64) for (let i = 0; i < out.length; i++) {
+		let overlaps = "";
+		for (let j = 0; j < out.length; j++) {
+			if (i == j) {
+				overlaps += "1";
+				continue;
+			}
+			let overlap = false;
+			for (let k = 0; k < out[i].weeks.length; k++) if (out[i].weeks[k] === "1" && out[j].weeks[k] === "1") {
+				overlap = true;
+				break;
+			}
+			overlaps += overlap ? "1" : "0";
+		}
+		out[i].overlaps = overlaps;
+	}
+	return out;
+}
 
 //#endregion
-export { DEFAULT_PERIOD_ID, parsePeriods };
+export { DEFAULT_PERIOD_ID, _parsePeriods, parsePeriods };
 //# sourceMappingURL=periods.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"periods.js","names":["x"],"sources":["../../../../src/RS/to/input/periods.ts"],"sourcesContent":["import { groupBy } from 'lodash-es';\nimport moment from 'moment';\nimport { getIdKey, getVertexId } from '../../../core/util';\nimport type { Interval } from '../../../core/types/common/intervals';\nimport type { ConnectedTypes } from '../../make-connected';\nimport type { Types } from '../../types';\nimport { anyRangesOverlap } from '../../../common/functions';\nimport { makeChainable } from '../../../common/make-chainable';\n\ntype Range = Partial<Interval<string | moment.Moment | Date>>;\ntype DateRange = Interval<moment.Moment>;\n\nfunction createRange ({ start, end }: Range): DateRange {\n  return {\n    start: moment.utc(start).clone()\n      .startOf('isoWeek')\n      .startOf('day'),\n    end: moment.utc(end).clone()\n      .endOf  ('isoWeek')\n      .endOf  ('day')\n  };\n}\n\ntype Out = {\n  map:     Map<string | undefined, number>,\n  matrix?: string\n};\n\n/**\n * Used by the default values as the id if no period is specified.\n */\nexport const DEFAULT_PERIOD_ID = 'DEFAULT_PERIOD';\n\nexport function parsePeriods (\n  periods:  ConnectedTypes.period[] | undefined,\n  division: ConnectedTypes.division,\n  options:  Types.parsedToOptions\n): Out {\n  const idKey = getIdKey(options);\n\n  // if empty periods are given, return empty map only\n  if (!periods?.length) {\n    return { map: new Map<string | undefined, number>() };\n  }\n\n  // convert the ranges to moment ranges\n  const parsedPeriods = periods.map(x => ({ id: getVertexId(x, idKey) as string | undefined, ranges: x.ranges.map(r => createRange(r)) }));\n\n  // add default period that includes all weeks\n  parsedPeriods.push({ id: DEFAULT_PERIOD_ID, ranges: [createRange(division)] });\n\n  // Compute a pairwise binary overlapping string for each periods and group those that have identical such string.\n  // The latter so that the number of periods may be reduced by omitting periods that overlap identically\n  const grouped = makeChainable(parsedPeriods)\n    .chain(\n      x => x\n        .map(x => ({\n          ...x,\n          overlap: parsedPeriods.map(y => anyRangesOverlap(x.ranges, y.ranges) ? '1' : '0').join('')\n        })),\n      x => groupBy(x, x => x.overlap),\n      x => Object.values(x)\n        .map((x, i) => ({ ids: x.map(x => x.id), index: i,  ranges: x[0].ranges }))\n    )\n    .value;\n\n  // Merge the pairwise binary overlapping string and store it as a matrix string.\n  const matrix = grouped\n    .map(x => grouped\n      .map(y => anyRangesOverlap(x.ranges, y.ranges) ? '1' : '0')\n      .join('')\n    )\n    .join('');\n\n  if (matrix == '' || matrix == '0') {\n    throw new Error('(RS::To::parsePeriods) invalid matrix value: ' + matrix);\n  }\n\n  // Also store in a map what period id corresponds to which row in the matrix.\n  const indexMap = new Map(\n    grouped.flatMap(xs => xs.ids.map(id => ([id, xs.index]) as const))\n  );\n\n  return { map: indexMap, matrix };\n}\n\n"],"mappings":";;;;;;;AAYA,SAAS,YAAa,EAAE,OAAO,OAAyB;AACtD,QAAO;EACL,OAAO,OAAO,IAAI,OAAO,QACtB,QAAQ,WACR,QAAQ;EACX,KAAK,OAAO,IAAI,KAAK,QAClB,MAAQ,WACR,MAAQ;;;;;;AAYf,MAAa,oBAAoB;AAEjC,SAAgB,aACd,SACA,UACA,SACK;CACL,MAAM,QAAQ,SAAS;AAGvB,KAAI,CAAC,SAAS,OACZ,QAAO,EAAE,qBAAK,IAAI;CAIpB,MAAM,gBAAgB,QAAQ,KAAI,OAAM;EAAE,IAAI,YAAY,GAAG;EAA8B,QAAQ,EAAE,OAAO,KAAI,MAAK,YAAY;;AAGjI,eAAc,KAAK;EAAE,IAAI;EAAmB,QAAQ,CAAC,YAAY;;CAIjE,MAAM,UAAU,cAAc,eAC3B,OACC,MAAK,EACF,KAAI,SAAM;EACT,GAAGA;EACH,SAAS,cAAc,KAAI,MAAK,iBAAiBA,IAAE,QAAQ,EAAE,UAAU,MAAM,KAAK,KAAK;OAE3F,MAAK,QAAQ,IAAG,QAAKA,IAAE,WACvB,MAAK,OAAO,OAAO,GAChB,KAAK,KAAG,OAAO;EAAE,KAAKA,IAAE,KAAI,QAAKA,IAAE;EAAK,OAAO;EAAI,QAAQA,IAAE,GAAG;MAEpE;CAGH,MAAM,SAAS,QACZ,KAAI,MAAK,QACP,KAAI,MAAK,iBAAiB,EAAE,QAAQ,EAAE,UAAU,MAAM,KACtD,KAAK,KAEP,KAAK;AAER,KAAI,UAAU,MAAM,UAAU,IAC5B,OAAM,IAAI,MAAM,kDAAkD;CAIpE,MAAM,WAAW,IAAI,IACnB,QAAQ,SAAQ,OAAM,GAAG,IAAI,KAAI,OAAO,CAAC,IAAI,GAAG;AAGlD,QAAO;EAAE,KAAK;EAAU"}
+{"version":3,"file":"periods.js","names":["x"],"sources":["../../../../src/RS/to/input/periods.ts"],"sourcesContent":["import { groupBy } from 'lodash-es';\nimport moment from 'moment';\nimport { getIdKey, getVertexId } from '../../../core/util';\nimport type { Interval } from '../../../core/types/common/intervals';\nimport type { ConnectedTypes } from '../../make-connected';\nimport type { Types } from '../../types';\nimport { anyRangesOverlap, rangesOverlap } from '../../../common/functions';\nimport { makeChainable } from '../../../common/make-chainable';\n\ntype Range = Partial<Interval<string | moment.Moment | Date>>;\ntype DateRange = Interval<moment.Moment>;\n\nfunction createRange ({ start, end }: Range): DateRange {\n  return {\n    start: moment.utc(start).clone().startOf('isoWeek'),\n    end:   moment.utc(end  ).clone().endOf  ('isoWeek')\n  };\n}\n\ntype Out = {\n  map:     Map<string | undefined, number>,\n  matrix?: string\n};\n\n/**\n * Used by the default values as the id if no period is specified.\n */\nexport const DEFAULT_PERIOD_ID = 'DEFAULT_PERIOD';\n\nexport function parsePeriods (\n  periods:  ConnectedTypes.period[] | undefined,\n  division: ConnectedTypes.division,\n  options:  Types.parsedToOptions\n): Out {\n  const idKey = getIdKey(options);\n\n  // if empty periods are given, return empty map only\n  if (!periods?.length) {\n    return { map: new Map<string | undefined, number>() };\n  }\n\n  // convert the ranges to moment ranges\n  const parsedPeriods = periods.map(x => ({ id: getVertexId(x, idKey) as string | undefined, ranges: x.ranges.map(r => createRange(r)) }));\n\n  // add default period that includes all weeks\n  parsedPeriods.push({ id: DEFAULT_PERIOD_ID, ranges: [createRange(division)] });\n\n  // Compute a pairwise binary overlapping string for each periods and group those that have identical such string.\n  // The latter so that the number of periods may be reduced by omitting periods that overlap identically\n  const grouped = makeChainable(parsedPeriods)\n    .chain(\n      x => x\n        .map(x => ({\n          ...x,\n          overlap: parsedPeriods.map(y => anyRangesOverlap(x.ranges, y.ranges) ? '1' : '0').join('')\n        })),\n      x => groupBy(x, x => x.overlap),\n      x => Object.values(x)\n        .map((x, i) => ({ ids: x.map(x => x.id), index: i,  ranges: x[0].ranges }))\n    )\n    .value;\n\n  // Merge the pairwise binary overlapping string and store it as a matrix string.\n  const matrix = grouped\n    .map(x => grouped\n      .map(y => anyRangesOverlap(x.ranges, y.ranges) ? '1' : '0')\n      .join('')\n    )\n    .join('');\n\n  if (matrix == '' || matrix == '0') {\n    throw new Error('(RS::To::parsePeriods) invalid matrix value: ' + matrix);\n  }\n\n  // Also store in a map what period id corresponds to which row in the matrix.\n  const indexMap = new Map(\n    grouped.flatMap(xs => xs.ids.map(id => ([id, xs.index]) as const))\n  );\n\n  return { map: indexMap, matrix };\n}\n\n\nexport function _parsePeriods (\n  periods:  ConnectedTypes.period[] | undefined,\n  division: ConnectedTypes.division,\n  options:  Types.parsedToOptions\n): Types.period[] | undefined {\n  const divisionRange = createRange(division);\n\n  // build a mapping of week starts to boolean active flags\n  const weeksMap = new Map<string, boolean>();\n  for (const x = divisionRange.start.clone(); x.isSameOrBefore(divisionRange.end); x.add(1, 'week')) {\n    weeksMap.set(x.toISOString(), false);\n  }\n\n  const out = periods?.map((p): Types.period => {\n    const id = getVertexId(p, options);\n\n    // preserve only the ranges that lay within the division range\n    const clippedRanges = p.ranges\n      .map(r => createRange(r))\n      .filter(r => rangesOverlap(r, divisionRange))\n      .map(r => ({\n        start: moment.max(r.start, divisionRange.start).clone(),\n        end:   moment.min(r.end,   divisionRange.end  ).clone()\n      }));\n\n    // get the active weeks by checking which weeks in the division are covered by the clipped ranges\n    const activeWeeksMap = new Map(weeksMap);\n    clippedRanges.forEach(r => {\n      for (const x = r.start.clone(); x.isSameOrBefore(r.end); x.add(1, 'week')) {\n        const key = x.toISOString();\n        activeWeeksMap.set(key, true);\n      }\n    });\n\n    // build the active weeks string\n    const weeks = Array.from(activeWeeksMap.entries())\n      .sort((a, b) => moment.utc(a[0]).diff(moment.utc(b[0])))\n      .map(x => x[1] ? '1' : '0')\n      .join('');\n\n    const overlaps = weeks.length <= 64 ? weeks : '';\n\n    return { id, weeks, overlaps };\n  });\n\n  // If there are more than 64 weeks but less than or equal to 64 periods, we compute the overlap between periods directly.\n  if (weeksMap.size > 64 && out && out.length <= 64) {\n    for (let i = 0; i < out.length; i++) {\n      let overlaps = '';\n      for (let j = 0; j < out.length; j++) {\n        // self-overlap\n        if (i == j) {\n          overlaps += '1';\n          continue;\n        }\n\n        // overlap with other periods\n        let overlap = false;\n        for (let k = 0; k < out[i].weeks.length; k++) {\n          if (out[i].weeks[k] === '1' && out[j].weeks[k] === '1') {\n            overlap = true;\n            break;\n          }\n        }\n        overlaps += overlap ? '1' : '0';\n      }\n      out[i].overlaps = overlaps;\n    }\n  }\n\n  return out;\n}"],"mappings":"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"}

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

@@ -5,8 +5,11 @@ function parseSettings(settings) {
 	return {
 		numDays: settings.numDays,
 		discretization: settings.discretization,
+		periodIdKey: "id",
+		intervalIdKey: "id",
 		dependencyIdKey: "id",
 		groupIdKey: "id",
+		individualIdKey: "id",
 		collectionIdKey: "id",
 		eventIdKey: "id"
 	};

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

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

package/dist/RS/to/schedules.js

@@ -2,6 +2,7 @@ import { CoreMap } from "../../core/index.js";
 import { parseInput } from "./input/input.js";
 import { makeConnected } from "../make-connected.js";
 import { initialConfiguration } from "./initial-configuration.js";
+import { structure } from "../types/to.js";
 import { pick } from "lodash-es";
 
 //#region src/RS/to/schedules.ts
@@ -25,7 +26,7 @@ function schedules(data, _options = {}) {
 	const connectedData = makeConnected(data);
 	return {
 		meta: {
-			structure: "RS/algorithm-3.0.0",
+			structure,
 			division: pick(data.division, "displayName", "start", "end")
 		},
 		algorithmParameters: { weights: options.algorithmWeightParameters },

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

@@ -1 +1 @@
-{"version":3,"file":"schedules.js","names":["partialScheduleOptions: Types.parsedToOptions['partialScheduleOptions']"],"sources":["../../../src/RS/to/schedules.ts"],"sourcesContent":["import { pick } from 'lodash-es';\nimport { parseInput } from './input/input';\nimport { makeConnected } from '../make-connected';\nimport { initialConfiguration } from './initial-configuration';\nimport type { Types } from '../types';\nimport { CoreMap } from '../../core';\n\nexport function schedules (\n  data:     Types.toInput,\n  _options: Types.toOptions = {}\n): Types.toOutput {\n  ////\n  //// parse the options\n  ////\n  const options = ((): Types.parsedToOptions => {\n    const x = _options.partialScheduleOptions;\n    const partialScheduleOptions: Types.parsedToOptions['partialScheduleOptions'] = x\n      ? {\n        includedEvents:        x.includedEvents    ? new Set(x.includedEvents)    : undefined,\n        includedLocations:     x.includedLocations ? new Set(x.includedLocations) : undefined,\n        omittedEventsHandling: x.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  // we will work only with connected schedule data\n  const connectedData = makeConnected(data);\n\n  return {\n    meta: {\n      structure: 'RS/algorithm-3.0.0' satisfies Types.structure,\n      division:  pick(data.division, 'displayName', 'start', 'end'),\n    },\n    algorithmParameters: {\n      weights: options.algorithmWeightParameters,\n    },\n    input: parseInput(connectedData, options),\n    ...options.appendCoreData && { coreData: CoreMap.to.schedules(data) },\n    ...options.appendOutput   && { output: initialConfiguration(connectedData.events, connectedData.lockedTimes, options) },\n  };\n};"],"mappings":";;;;;;;AAOA,SAAgB,UACd,MACA,WAA4B,IACZ;CAIhB,MAAM,iBAAwC;EAC5C,MAAM,IAAI,SAAS;EACnB,MAAMA,yBAA0E,IAC5E;GACA,gBAAuB,EAAE,iBAAoB,IAAI,IAAI,EAAE,kBAAqB;GAC5E,mBAAuB,EAAE,oBAAoB,IAAI,IAAI,EAAE,qBAAqB;GAC5E,uBAAuB,EAAE;MAEzB;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;;CAOzB,MAAM,gBAAgB,cAAc;AAEpC,QAAO;EACL,MAAM;GACJ,WAAW;GACX,UAAW,KAAK,KAAK,UAAU,eAAe,SAAS;;EAEzD,qBAAqB,EACnB,SAAS,QAAQ;EAEnB,OAAO,WAAW,eAAe;EACjC,GAAG,QAAQ,kBAAkB,EAAE,UAAU,QAAQ,GAAG,UAAU;EAC9D,GAAG,QAAQ,gBAAkB,EAAE,QAAQ,qBAAqB,cAAc,QAAQ,cAAc,aAAa"}
+{"version":3,"file":"schedules.js","names":["partialScheduleOptions: Types.parsedToOptions['partialScheduleOptions']"],"sources":["../../../src/RS/to/schedules.ts"],"sourcesContent":["import { pick } from 'lodash-es';\nimport { parseInput } from './input/input';\nimport { makeConnected } from '../make-connected';\nimport { initialConfiguration } from './initial-configuration';\nimport type { Types } from '../types';\nimport { CoreMap } from '../../core';\nimport { structure } from '../types/to';\n\nexport function schedules (\n  data:     Types.toInput,\n  _options: Types.toOptions = {}\n): Types.toOutput {\n  ////\n  //// parse the options\n  ////\n  const options = ((): Types.parsedToOptions => {\n    const x = _options.partialScheduleOptions;\n    const partialScheduleOptions: Types.parsedToOptions['partialScheduleOptions'] = x\n      ? {\n        includedEvents:        x.includedEvents    ? new Set(x.includedEvents)    : undefined,\n        includedLocations:     x.includedLocations ? new Set(x.includedLocations) : undefined,\n        omittedEventsHandling: x.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  // we will work only with connected schedule data\n  const connectedData = makeConnected(data);\n\n  return {\n    meta: {\n      structure: structure,\n      division:  pick(data.division, 'displayName', 'start', 'end'),\n    },\n    algorithmParameters: {\n      weights: options.algorithmWeightParameters,\n    },\n    input: parseInput(connectedData, options),\n    ...options.appendCoreData && { coreData: CoreMap.to.schedules(data) },\n    ...options.appendOutput   && { output: initialConfiguration(connectedData.events, connectedData.lockedTimes, options) },\n  };\n};"],"mappings":";;;;;;;;AAQA,SAAgB,UACd,MACA,WAA4B,IACZ;CAIhB,MAAM,iBAAwC;EAC5C,MAAM,IAAI,SAAS;EACnB,MAAMA,yBAA0E,IAC5E;GACA,gBAAuB,EAAE,iBAAoB,IAAI,IAAI,EAAE,kBAAqB;GAC5E,mBAAuB,EAAE,oBAAoB,IAAI,IAAI,EAAE,qBAAqB;GAC5E,uBAAuB,EAAE;MAEzB;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;;CAOzB,MAAM,gBAAgB,cAAc;AAEpC,QAAO;EACL,MAAM;GACO;GACX,UAAW,KAAK,KAAK,UAAU,eAAe,SAAS;;EAEzD,qBAAqB,EACnB,SAAS,QAAQ;EAEnB,OAAO,WAAW,eAAe;EACjC,GAAG,QAAQ,kBAAkB,EAAE,UAAU,QAAQ,GAAG,UAAU;EAC9D,GAAG,QAAQ,gBAAkB,EAAE,QAAQ,qBAAqB,cAAc,QAAQ,cAAc,aAAa"}

package/dist/RS/types/collections.d.ts

@@ -16,7 +16,14 @@ interface Collection {
   days?: (Types.day | number)[];
   groups?: Types.groupReference[][];
   dependencies?: (Types.availableDependency[] | Types.availableDependency)[];
+  /**
+   * @deprecated to be replaced by `_period` in future versions
+   */
   period?: number;
+  /**
+   * @deprecated to be renamed to `period` in future versions
+   */
+  _period?: string;
   maxEventLengthVariance?: number;
   distributionKey?: string | string[];
   meta?: Record<string, unknown>;

package/dist/RS/types/default.d.ts

@@ -17,7 +17,14 @@ interface Default {
   groupWeight: number;
   collectionWeight: number;
   eventWeight: number;
+  /**
+   * @deprecated To be replaced by `_period` in future versions
+   */
   period?: number;
+  /**
+   * @deprecated To be renamed `period` in future versions
+   */
+  _period?: string;
 }
 //#endregion
 export { Default };

package/dist/RS/types/events.d.ts

@@ -17,7 +17,14 @@ interface Event {
   day?: number;
   groups?: Types.groupReference[][];
   dependencies?: (Types.availableDependency[] | Types.availableDependency | string | string[])[];
+  /**
+   * @deprecated to be replaced by `_period` in future versions
+   */
   period?: number;
+  /**
+   * @deprecated to be renamed to `period` in future versions
+   */
+  _period?: string;
   forcedOverlapId?: string;
   distributionKey?: string | string[];
   meta?: Record<string, unknown>;

package/dist/RS/types/index.d.ts

@@ -7,6 +7,7 @@ import { LockedTime } from "./locked-times.js";
 import { RootInterval } from "./root-intervals.js";
 import { Settings } from "./settings.js";
 import { Event } from "./events.js";
+import { Period } from "./period.js";
 import { AvailableDependency, BreakLength, Day, GroupReference, Interval } from "./shared.js";
 import { ParsedToOptions, Structure, ToInput, ToOptions, ToOutput } from "./to.js";
 import { EventConfiguration } from "./event-configuration.js";
@@ -17,7 +18,11 @@ import { ScheduleData } from "./schedule-data.js";
 declare namespace Types {
   type settings = Settings;
   type defaultValues = Default;
+  /**
+   * @deprecated To be replaced by `Types.period` in future versions
+   */
   type periods = string;
+  type period = Period;
   type rootInterval = RootInterval;
   type dependency = Dependency;
   type group = Group;

package/dist/RS/types/period.d.ts

@@ -0,0 +1,27 @@
+//#region src/RS/types/period.d.ts
+type Period = {
+  id: string;
+  /**
+   * A binary string (containing only ones and zeros) representing the weeks this period is active in. All periods `weeks` strings
+   * have the same length to make it unambiguous which week each position corresponds to.
+   */
+  weeks: string;
+  /**
+   * The logical and operation between two period's binary `overlaps` strings is used to determine whether they overlap,
+   * i.e., are active during at least one common week.
+   *
+   * There are three cases for the format of this string:
+   *
+   * 1. If there are less than 64 weeks this string is simply a copy of the `weeks` string.
+   *
+   * 2. If there are more than 64 weeks but less than or equal to 64 periods, we compute the overlaps directly. This binary string
+   * then has the same length as the number of periods and a '1' at position j indicates that the period overlaps with the one whose
+   * index is j. There is at least one '1' in the string at the position corresponding to its own index (self-overlap).
+   *
+   * 3. If there are more than 64 weeks and more than 64 periods this string is empty, as the overlaps cannot not be stored in 64 bits.
+   */
+  overlaps: string;
+};
+//#endregion
+export { Period };
+//# sourceMappingURL=period.d.ts.map

package/dist/RS/types/schedule-data.d.ts

@@ -4,7 +4,14 @@ import { Types } from "./index.js";
 interface ScheduleData {
   settings?: Types.settings;
   default?: Types.defaultValues;
+  /**
+   * @deprecated To be replaced by `periodsList` in future versions
+   */
   periods?: string;
+  /**
+   * @deprecated To be renamed `periods` in future versions
+   */
+  _periods?: Types.period[];
   events?: (Types.event | Types.collection | (Types.event | Types.collection)[])[];
   groups?: Types.group[];
   dependencies?: Types.dependency[];

package/dist/RS/types/settings.d.ts

@@ -2,8 +2,11 @@
 interface Settings {
   numDays: number;
   discretization: number;
+  periodIdKey: 'id';
+  intervalIdKey: 'id';
   dependencyIdKey: 'id';
   groupIdKey: 'id';
+  individualIdKey: 'id';
   collectionIdKey: 'id';
   eventIdKey: 'id';
 }

package/dist/RS/types/to.d.ts

@@ -40,7 +40,8 @@ interface ToOptions extends BaseOptions {
 interface ParsedToOptions extends Omit<ToOptions, 'partialScheduleOptions'> {
   partialScheduleOptions?: PartialScheduleOptions<Set<string>>;
 }
-type Structure = 'RS/algorithm-3.0.0';
+declare const structure = "RS/algorithm-5.0.1";
+type Structure = typeof structure;
 interface ToOutput {
   meta: {
     structure?: Structure;

package/dist/RS/types/to.js

@@ -0,0 +1,6 @@
+//#region src/RS/types/to.ts
+const structure = "RS/algorithm-5.0.1";
+
+//#endregion
+export { structure };
+//# sourceMappingURL=to.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"to.js","names":[],"sources":["../../../src/RS/types/to.ts"],"sourcesContent":["import type { BaseOptions } from '../../common/types';\nimport type { CoreTypes } from '../../core';\nimport type { MixedScheduleData } from '../make-connected';\nimport type { Types } from './';\nimport type { AlgorithmWeightParameters } from './algorithm-parameters';\n\n\nexport type ToInput = MixedScheduleData;\n\ntype PartialScheduleOptions<IDs extends Array<string> | Set<string>> = {\n  /** @description undefined means all included */\n  includedEvents?:       IDs;\n  /** @description undefined means all included */\n  includedLocations?:    IDs;\n  omittedEventsHandling: 'ignore' | 'freeze';\n};\n\nexport interface ToOptions extends BaseOptions {\n  meta?:           boolean;\n  isPrivateId?:    boolean;\n  isPublicId?:     boolean;\n  appendCoreData?: boolean;\n  appendOutput?:   boolean;\n\n  /**\n   * @deprecated\n   * If true, the mapping becomes the same as the previous version 2 one. That means:\n   *\n   * - New root level entries: `intervals` and `individuals`\n   * - As the there is now a root level `intervals` the former may be references from `Collection.intervals`, `Group.intervals` etc.\n   * - The `Collection.groups` and `Event.groups` supports referencing `individuals` (and `individuals sets`) in addition to `groups`\n   * - The `Group.forbidOverlappingEvents` has been removed.\n   * - The `Group.disableDayLengthPunishment` has been replaced by `Group.minimizeGaps`\n   */\n  oldFormat?: boolean;\n\n  partialScheduleOptions?: PartialScheduleOptions<Array<string> | Set<string>>\n\n  algorithmWeightParameters?: AlgorithmWeightParameters;\n\n  /**\n   * to be used before whe have migrated from \"maxNumWorkingHours\" and \"maxNumDailyWorkingHours\" to \"maximumScheduleSpan\"\n   */\n  useMaximumScheduleSpan?: boolean;\n}\n\nexport interface ParsedToOptions extends Omit<ToOptions, 'partialScheduleOptions'> {\n  partialScheduleOptions?: PartialScheduleOptions<Set<string>>\n}\n\nexport const structure = 'RS/algorithm-5.0.1';\nexport type Structure = typeof structure;\nexport interface ToOutput {\n  meta:      {\n    structure?: Structure;\n    division:   Pick<CoreTypes.division, 'displayName' | 'start' | 'end'>;\n  };\n  algorithmParameters?: {\n    weights?: AlgorithmWeightParameters;\n  };\n  score?:    [number, number, number, number];\n  input:     Types.scheduleData;\n  output?:   Types.configuration[];\n  coreData?: Partial<CoreTypes.serialized.schedule>;\n}"],"mappings":";AAkDA,MAAa,YAAY"}

package/dist/core/to/schedules.d.ts

@@ -40,7 +40,9 @@ type Out = {
     structure: string;
   };
 };
-declare function export_default(schedule: Partial<Types.mixed.schedule>): Out;
+declare function export_default(schedule: Partial<Types.mixed.schedule> & {
+  configurations?: Types.mixed.configuration[];
+}): Out;
 //#endregion
 export { export_default };
 //# sourceMappingURL=schedules.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"schedules.js","names":["options: BaseOptions","_division","_settings","_exceptions","_periods","_locations","_teachers","_groups","_persons","_courses","_events","_lockedTimes","_overlapGroups","_rootIntervals","_syllabuses","_configurations"],"sources":["../../../src/core/to/schedules.ts"],"sourcesContent":["import type { CoreTypes } from '../';\nimport _exceptions from './exceptions';\nimport _periods from './periods';\nimport _locations from './locations';\nimport _teachers from './teachers';\nimport _groups from './groups';\nimport _persons from './persons';\nimport _courses from './courses';\nimport _events from './events';\nimport _lockedTimes from './locked-times';\nimport _overlapGroups from './overlap-groups';\nimport _rootIntervals from './root-intervals';\nimport _settings from './settings';\nimport _division from './division';\nimport _syllabuses from './syllabuses';\nimport _configurations from './configurations';\nimport type { InternalIdKey } from '../types/common';\nimport type { InternalKeysOmitted } from './util';\nimport type { BaseOptions } from '../../common/types';\n\nexport namespace OutTypes {\n  export type division      = Omit<InternalKeysOmitted<CoreTypes.serialized.division>, InternalIdKey>;\n  export type settings      = InternalKeysOmitted<CoreTypes.serialized.divisionSettings>;\n  export type configuration = InternalKeysOmitted<CoreTypes.serialized.configuration   >;\n  export type exception     = InternalKeysOmitted<CoreTypes.serialized.exception       >;\n  export type period        = InternalKeysOmitted<CoreTypes.serialized.period          >;\n  export type location      = InternalKeysOmitted<CoreTypes.serialized.location        >;\n  export type teacher       = InternalKeysOmitted<CoreTypes.serialized.teacher         >;\n  export type group         = InternalKeysOmitted<CoreTypes.serialized.group           >;\n  export type person        = InternalKeysOmitted<CoreTypes.serialized.person          >;\n  export type course        = InternalKeysOmitted<CoreTypes.serialized.course          >;\n  export type event         = InternalKeysOmitted<CoreTypes.serialized.event           >;\n  export type lockedTime    = InternalKeysOmitted<CoreTypes.serialized.lockedTime      >;\n  export type overlapGroup  = InternalKeysOmitted<CoreTypes.serialized.overlapGroup    >;\n  export type rootInterval  = InternalKeysOmitted<CoreTypes.serialized.rootInterval    >;\n  export type syllabus      = InternalKeysOmitted<CoreTypes.serialized.syllabus        >;\n}\n\ntype Out = {\n  division?:       OutTypes.division;\n  settings?:       OutTypes.settings;\n  exceptions?:     OutTypes.exception[];\n  periods?:        OutTypes.period[];\n  locations?:      OutTypes.location[];\n  teachers?:       OutTypes.teacher[];\n  groups?:         OutTypes.group[];\n  persons?:        OutTypes.person[];\n  courses?:        OutTypes.course[];\n  events?:         OutTypes.event[];\n  lockedTimes?:    OutTypes.lockedTime[];\n  overlapGroups?:  OutTypes.overlapGroup[];\n  rootIntervals?:  OutTypes.rootInterval[];\n  syllabuses?:     OutTypes.syllabus[];\n  configurations?: OutTypes.configuration[];\n\n  meta: { structure: string };\n};\n\nexport default function (\n  schedule: Partial<CoreTypes.mixed.schedule>\n): Out {\n  const options: BaseOptions = {};\n\n  return {\n    meta: { structure: 'RS/core-2.0.0' },\n    ...schedule.divisions      && { division:       _division      (schedule.divisions,      options) },\n    ...schedule.settings       && { settings:       _settings      (schedule.settings,       options) },\n    ...schedule.exceptions     && { exceptions:     _exceptions    (schedule.exceptions,     options) },\n    ...schedule.periods        && { periods:        _periods       (schedule.periods,        options) },\n    ...schedule.locations      && { locations:      _locations     (schedule.locations,      options) },\n    ...schedule.teachers       && { teachers:       _teachers      (schedule.teachers,       options) },\n    ...schedule.groups         && { groups:         _groups        (schedule.groups,         options) },\n    ...schedule.persons        && { persons:        _persons       (schedule.persons,        options) },\n    ...schedule.courses        && { courses:        _courses       (schedule.courses,        options) },\n    ...schedule.events         && { events:         _events        (schedule.events,         options) },\n    ...schedule.lockedTimes    && { lockedTimes:    _lockedTimes   (schedule.lockedTimes,    options) },\n    ...schedule.overlapGroups  && { overlapGroups:  _overlapGroups (schedule.overlapGroups,  options) },\n    ...schedule.rootIntervals  && { rootIntervals:  _rootIntervals (schedule.rootIntervals,  options) },\n    ...schedule.syllabuses     && { syllabuses:     _syllabuses    (schedule.syllabuses,     options) },\n    ...schedule.configurations && { configurations: _configurations(schedule.configurations, options) },\n  };\n}"],"mappings":";;;;;;;;;;;;;;;;;AA0DA,2BACE,UACK;CACL,MAAMA,UAAuB;AAE7B,QAAO;EACL,MAAM,EAAE,WAAW;EACnB,GAAG,SAAS,aAAkB,EAAE,UAAgBC,iBAAgB,SAAS,WAAgB;EACzF,GAAG,SAAS,YAAkB,EAAE,UAAgBC,iBAAgB,SAAS,UAAgB;EACzF,GAAG,SAAS,cAAkB,EAAE,YAAgBC,mBAAgB,SAAS,YAAgB;EACzF,GAAG,SAAS,WAAkB,EAAE,SAAgBC,gBAAgB,SAAS,SAAgB;EACzF,GAAG,SAAS,aAAkB,EAAE,WAAgBC,kBAAgB,SAAS,WAAgB;EACzF,GAAG,SAAS,YAAkB,EAAE,UAAgBC,iBAAgB,SAAS,UAAgB;EACzF,GAAG,SAAS,UAAkB,EAAE,QAAgBC,eAAgB,SAAS,QAAgB;EACzF,GAAG,SAAS,WAAkB,EAAE,SAAgBC,gBAAgB,SAAS,SAAgB;EACzF,GAAG,SAAS,WAAkB,EAAE,SAAgBC,gBAAgB,SAAS,SAAgB;EACzF,GAAG,SAAS,UAAkB,EAAE,QAAgBC,eAAgB,SAAS,QAAgB;EACzF,GAAG,SAAS,eAAkB,EAAE,aAAgBC,qBAAgB,SAAS,aAAgB;EACzF,GAAG,SAAS,iBAAkB,EAAE,eAAgBC,uBAAgB,SAAS,eAAgB;EACzF,GAAG,SAAS,iBAAkB,EAAE,eAAgBC,uBAAgB,SAAS,eAAgB;EACzF,GAAG,SAAS,cAAkB,EAAE,YAAgBC,mBAAgB,SAAS,YAAgB;EACzF,GAAG,SAAS,kBAAkB,EAAE,gBAAgBC,uBAAgB,SAAS,gBAAgB"}
+{"version":3,"file":"schedules.js","names":["options: BaseOptions","_division","_settings","_exceptions","_periods","_locations","_teachers","_groups","_persons","_courses","_events","_lockedTimes","_overlapGroups","_rootIntervals","_syllabuses","_configurations"],"sources":["../../../src/core/to/schedules.ts"],"sourcesContent":["import type { CoreTypes } from '../';\nimport _exceptions from './exceptions';\nimport _periods from './periods';\nimport _locations from './locations';\nimport _teachers from './teachers';\nimport _groups from './groups';\nimport _persons from './persons';\nimport _courses from './courses';\nimport _events from './events';\nimport _lockedTimes from './locked-times';\nimport _overlapGroups from './overlap-groups';\nimport _rootIntervals from './root-intervals';\nimport _settings from './settings';\nimport _division from './division';\nimport _syllabuses from './syllabuses';\nimport _configurations from './configurations';\nimport type { InternalIdKey } from '../types/common';\nimport type { InternalKeysOmitted } from './util';\nimport type { BaseOptions } from '../../common/types';\n\nexport namespace OutTypes {\n  export type division      = Omit<InternalKeysOmitted<CoreTypes.serialized.division>, InternalIdKey>;\n  export type settings      = InternalKeysOmitted<CoreTypes.serialized.divisionSettings>;\n  export type configuration = InternalKeysOmitted<CoreTypes.serialized.configuration   >;\n  export type exception     = InternalKeysOmitted<CoreTypes.serialized.exception       >;\n  export type period        = InternalKeysOmitted<CoreTypes.serialized.period          >;\n  export type location      = InternalKeysOmitted<CoreTypes.serialized.location        >;\n  export type teacher       = InternalKeysOmitted<CoreTypes.serialized.teacher         >;\n  export type group         = InternalKeysOmitted<CoreTypes.serialized.group           >;\n  export type person        = InternalKeysOmitted<CoreTypes.serialized.person          >;\n  export type course        = InternalKeysOmitted<CoreTypes.serialized.course          >;\n  export type event         = InternalKeysOmitted<CoreTypes.serialized.event           >;\n  export type lockedTime    = InternalKeysOmitted<CoreTypes.serialized.lockedTime      >;\n  export type overlapGroup  = InternalKeysOmitted<CoreTypes.serialized.overlapGroup    >;\n  export type rootInterval  = InternalKeysOmitted<CoreTypes.serialized.rootInterval    >;\n  export type syllabus      = InternalKeysOmitted<CoreTypes.serialized.syllabus        >;\n}\n\ntype Out = {\n  division?:       OutTypes.division;\n  settings?:       OutTypes.settings;\n  exceptions?:     OutTypes.exception[];\n  periods?:        OutTypes.period[];\n  locations?:      OutTypes.location[];\n  teachers?:       OutTypes.teacher[];\n  groups?:         OutTypes.group[];\n  persons?:        OutTypes.person[];\n  courses?:        OutTypes.course[];\n  events?:         OutTypes.event[];\n  lockedTimes?:    OutTypes.lockedTime[];\n  overlapGroups?:  OutTypes.overlapGroup[];\n  rootIntervals?:  OutTypes.rootInterval[];\n  syllabuses?:     OutTypes.syllabus[];\n  configurations?: OutTypes.configuration[];\n\n  meta: { structure: string };\n};\n\nexport default function (\n  schedule: Partial<CoreTypes.mixed.schedule> & { configurations?: CoreTypes.mixed.configuration[] },\n): Out {\n  const options: BaseOptions = {};\n\n  return {\n    meta: { structure: 'RS/core-2.0.0' },\n    ...schedule.divisions      && { division:       _division      (schedule.divisions,      options) },\n    ...schedule.settings       && { settings:       _settings      (schedule.settings,       options) },\n    ...schedule.exceptions     && { exceptions:     _exceptions    (schedule.exceptions,     options) },\n    ...schedule.periods        && { periods:        _periods       (schedule.periods,        options) },\n    ...schedule.locations      && { locations:      _locations     (schedule.locations,      options) },\n    ...schedule.teachers       && { teachers:       _teachers      (schedule.teachers,       options) },\n    ...schedule.groups         && { groups:         _groups        (schedule.groups,         options) },\n    ...schedule.persons        && { persons:        _persons       (schedule.persons,        options) },\n    ...schedule.courses        && { courses:        _courses       (schedule.courses,        options) },\n    ...schedule.events         && { events:         _events        (schedule.events,         options) },\n    ...schedule.lockedTimes    && { lockedTimes:    _lockedTimes   (schedule.lockedTimes,    options) },\n    ...schedule.overlapGroups  && { overlapGroups:  _overlapGroups (schedule.overlapGroups,  options) },\n    ...schedule.rootIntervals  && { rootIntervals:  _rootIntervals (schedule.rootIntervals,  options) },\n    ...schedule.syllabuses     && { syllabuses:     _syllabuses    (schedule.syllabuses,     options) },\n    ...schedule.configurations && { configurations: _configurations(schedule.configurations, options) },\n  };\n}"],"mappings":";;;;;;;;;;;;;;;;;AA0DA,2BACE,UACK;CACL,MAAMA,UAAuB;AAE7B,QAAO;EACL,MAAM,EAAE,WAAW;EACnB,GAAG,SAAS,aAAkB,EAAE,UAAgBC,iBAAgB,SAAS,WAAgB;EACzF,GAAG,SAAS,YAAkB,EAAE,UAAgBC,iBAAgB,SAAS,UAAgB;EACzF,GAAG,SAAS,cAAkB,EAAE,YAAgBC,mBAAgB,SAAS,YAAgB;EACzF,GAAG,SAAS,WAAkB,EAAE,SAAgBC,gBAAgB,SAAS,SAAgB;EACzF,GAAG,SAAS,aAAkB,EAAE,WAAgBC,kBAAgB,SAAS,WAAgB;EACzF,GAAG,SAAS,YAAkB,EAAE,UAAgBC,iBAAgB,SAAS,UAAgB;EACzF,GAAG,SAAS,UAAkB,EAAE,QAAgBC,eAAgB,SAAS,QAAgB;EACzF,GAAG,SAAS,WAAkB,EAAE,SAAgBC,gBAAgB,SAAS,SAAgB;EACzF,GAAG,SAAS,WAAkB,EAAE,SAAgBC,gBAAgB,SAAS,SAAgB;EACzF,GAAG,SAAS,UAAkB,EAAE,QAAgBC,eAAgB,SAAS,QAAgB;EACzF,GAAG,SAAS,eAAkB,EAAE,aAAgBC,qBAAgB,SAAS,aAAgB;EACzF,GAAG,SAAS,iBAAkB,EAAE,eAAgBC,uBAAgB,SAAS,eAAgB;EACzF,GAAG,SAAS,iBAAkB,EAAE,eAAgBC,uBAAgB,SAAS,eAAgB;EACzF,GAAG,SAAS,cAAkB,EAAE,YAAgBC,mBAAgB,SAAS,YAAgB;EACzF,GAAG,SAAS,kBAAkB,EAAE,gBAAgBC,uBAAgB,SAAS,gBAAgB"}

package/dist/identify/constants/index.d.ts

@@ -100,7 +100,7 @@ declare const maps: readonly [{
   readonly name: "Royal Schedule Algorithm";
   readonly map: typeof RSMap;
   readonly meta: {
-    readonly structure: "RS/algorithm-3.0.0";
+    readonly structure: "RS/algorithm-5.0.1";
   };
 }, {
   readonly structure: {

package/dist/identify/constants/index.js

@@ -4,6 +4,7 @@ import { PlanDigitalMap } from "../../PlanDigital/index.js";
 import { AdmentumMap } from "../../Admentum/index.js";
 import { IdunSoftMap } from "../../IdunSoft/index.js";
 import { Skola24Map } from "../../Skola24/index.js";
+import { structure } from "../../RS/types/to.js";
 import { RSMap } from "../../RS/index.js";
 import { ExcelMap } from "../../Excel/index.js";
 
@@ -289,7 +290,7 @@ const maps = [
 		structure: RS_structure,
 		name: "Royal Schedule Algorithm",
 		map: RSMap,
-		meta: { structure: "RS/algorithm-3.0.0" }
+		meta: { structure }
 	},
 	{
 		structure: core_structure,

package/dist/identify/constants/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["SchoolSoft_structure: (keyof SchoolSoftFileTypes.event)[]"],"sources":["../../../src/identify/constants/index.ts"],"sourcesContent":["import { CoreMap } from '../../core';\nimport type { SchoolSoftFileTypes } from '../../SchoolSoft';\nimport { SchoolSoftMap } from '../../SchoolSoft';\nimport { PlanDigitalMap } from '../../PlanDigital';\nimport { AdmentumMap } from '../../Admentum';\nimport { IdunSoftMap } from '../../IdunSoft';\nimport { Skola24Map } from '../../Skola24';\nimport { RSMap } from '../../RS';\nimport { ExcelMap } from '../../Excel';\nimport type { Types as RSTypes } from '../../RS/types';\n\n\nconst core_structure = {\n  groups:    ['id'],\n  locations: ['id'],\n  teachers:  ['id'],\n  courses:   ['id', 'events', 'groups', 'subject', 'teachers'],\n};\n\nconst excel_structure = {\n  meta:      [['structure']],\n  courses:   [],\n  groups:    [],\n  locations: [],\n};\n\nconst RS_structure = {\n  events: ['output', 'coreData'],\n};\n\nconst Admentum_structure = {\n  schools:                  ['url', 'id', 'unit_code', 'school_code', 'school_type', 'name'],\n  schedule:                 ['url', 'id', 'school_id', 'school_year', 'start_date', 'end_date', 'start_time', 'end_time', 'is_active', 'archived_at'],\n  rooms:                    ['url', 'id', 'school_id', 'name', 'category', 'capacity'],\n  teachers:                 ['url', 'id', 'school_id', 'email', 'first_name', 'last_name', 'role', 'current_primary_group', 'account_id'],\n  principals:               ['url', 'id', 'school_id', 'email', 'first_name', 'last_name', 'role', 'current_primary_group', 'account_id'],\n  courses:                  ['url', 'id', 'school_id', 'schedule_id', 'name', 'subject_code', 'start_date', 'end_date', 'teachers', 'gymnasium_course'],\n  schedule_groups:          ['url', 'id', 'eid', 'school_id', 'schedule', 'name', 'guid', 'teachers', 'users_primary_groups', 'subjects', 'courses'],\n  primary_groups:           ['url', 'id', 'eid', 'school_id', 'schedule', 'grade', 'name', 'guid', 'teachers', 'start_date', 'end_date', 'start_date_display', 'end_date_display'],\n  schedule_events:          ['url', 'id', 'eid', 'school_id', 'schedule_id', 'start_time', 'end_time', 'rooms', 'teachers', 'schedule_groups', 'primary_groups', 'weekly_interval'],\n  schedule_event_instances: ['url', 'id', 'school_id', 'start_date', 'end_date', 'schedule_event'],\n  lessons:                  ['url', 'id', 'school_id', 'date', 'info', 'teachers', 'room', 'weekday'],\n  lesson_infos:             ['url', 'id', 'eid', 'school_id', 'schedule_id', 'start', 'end', 'duration', 'room', 'subject', 'teachers', 'groups', 'weekly_interval'],\n};\n\nconst IdunSoft_structure = {\n  Grupp:   ['ID', 'Klassnamn'],\n  Lärare:  ['ID', 'Namn'],\n  Rum:     ['ID', 'Namn'],\n  Ämne:    ['Ämne', 'Betygskod'],\n  Lektion: ['LektionID', 'Ämne', 'Starttid', 'Sluttid', 'Lektionslängd', 'LärareID', 'GruppID', 'RumID', 'VeckodagID']\n};\n\nconst Skola24_txt_structure = null;\n\nconst Skola24_mdb_structure = {\n  unit_tblroom:               [ 'PK', 'ID' ],\n  school_tblsubject:          [ 'PK', 'ID' ],\n  school_tblteacher:          [ 'PK', 'ID' ],\n  school_tblgroup:            [ 'PK', 'ID', 'bClass' ],\n  school_tblplan:             [ 'PK', 'FKSubject' ],\n  school_tblcourse:           [ ],\n  school_tblschedule:         [ 'PK', 'Length', 'StartTime', 'DayOfWeek', 'FKSubject', 'CalcActualWeeks' ],\n  school_tblgroup_group:      [ 'FKGroup', 'FKGroupCon' ],\n  school_tblplan_period:      [ 'FKPlan', 'FKPeriod' ],\n  school_tblplan_teacher:     [ 'FKPlan', 'FKTeacher' ],\n  school_tblplan_group:       [ 'FKPlan', 'FKGroup' ],\n  unit_tblperiod_date:        [ 'FKPeriod', 'StartDate', 'EndDate' ],\n  school_tblschedule_period:  [ 'FKSchedule', 'FKPeriod' ],\n  school_tblschedule_teacher: [ 'FKSchedule', 'FKTeacher' ],\n  school_tblschedule_group:   [ 'FKSchedule', 'FKGroup' ],\n  school_tblschedule_room:    [ 'FKSchedule', 'FKRoom' ]\n};\n\n// this is only temporary\nconst PlanDigital_structure = {\n  'Perioder':                 [ 'Namn', 'Tidsenhet' ],\n  'Tabell Tjänstefördelning': [ 'Gruppnamn', 'Klass', 'Kurskod', 'Sign', 'Poäng', 'Anteckningar', 'Antal', 'Ämne', 'Kursnamn' ]\n};\n\nconst SchoolSoft_structure: (keyof SchoolSoftFileTypes.event)[] = [\n  'id',\n  'group',\n  'dayid',\n  'day',\n  'starttime',\n  'length',\n  'teacher',\n  'subject',\n  'room',\n  'period',\n  'inweek',\n  'exweek',\n  'exclass',\n  'realweeks'\n];\n\nexport const maps = [\n  {\n    structure: Skola24_txt_structure,\n    matchType: 'string',\n    name:      'Skola24 (txt)',\n    map:       Skola24Map.TXT,\n    meta:      { structure: '' }\n  }, {\n    structure: Admentum_structure,\n    name:      'Admentum',\n    map:       AdmentumMap,\n    meta:      { structure: '' }\n  }, {\n    structure: SchoolSoft_structure,\n    name:      'SchoolSoft',\n    map:       SchoolSoftMap,\n    meta:      { structure: '' }\n  }, {\n    structure: PlanDigital_structure,\n    name:      'Plan Digital',\n    map:       PlanDigitalMap,\n    meta:      { structure: '' }\n  }, {\n    structure: IdunSoft_structure,\n    name:      'IdunSoft',\n    map:       IdunSoftMap,\n    meta:      { structure: '' }\n  }, {\n    structure: Skola24_mdb_structure,\n    name:      'Skola24 (mdb)',\n    map:       Skola24Map.MDB,\n    meta:      { structure: '' }\n  }, {\n    structure: RS_structure,\n    name:      'Royal Schedule Algorithm',\n    map:       RSMap,\n    meta:      { structure: 'RS/algorithm-3.0.0' satisfies RSTypes.structure }\n  }, {\n  //   structure: core_structure,\n  //   name:      'Royal Schedule',\n  //   map:       CoreMap.V1,\n  //   meta:      { structure: 'RS/core-1.0.0' }\n  // }, {\n    structure: core_structure,\n    name:      'Royal Schedule',\n    map:       CoreMap,\n    meta:      { structure: 'RS/core-2.0.0' }\n  }, {\n    structure: excel_structure,\n    name:      'Royal Schedule Excel',\n    map:       ExcelMap.V1,\n    meta:      { structure: 'RS/Excel-1.0.0' }\n  }, {\n    structure: excel_structure,\n    name:      'Royal Schedule Excel',\n    map:       ExcelMap.V2,\n    meta:      { structure: 'RS/Excel-2.0.0' }\n  }\n] as const;"],"mappings":"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"}
+{"version":3,"file":"index.js","names":["SchoolSoft_structure: (keyof SchoolSoftFileTypes.event)[]","RSstructure"],"sources":["../../../src/identify/constants/index.ts"],"sourcesContent":["import { CoreMap } from '../../core';\nimport type { SchoolSoftFileTypes } from '../../SchoolSoft';\nimport { SchoolSoftMap } from '../../SchoolSoft';\nimport { PlanDigitalMap } from '../../PlanDigital';\nimport { AdmentumMap } from '../../Admentum';\nimport { IdunSoftMap } from '../../IdunSoft';\nimport { Skola24Map } from '../../Skola24';\nimport { RSMap } from '../../RS';\nimport { ExcelMap } from '../../Excel';\nimport { structure as RSstructure } from '../../RS/types/to';\n\n\nconst core_structure = {\n  groups:    ['id'],\n  locations: ['id'],\n  teachers:  ['id'],\n  courses:   ['id', 'events', 'groups', 'subject', 'teachers'],\n};\n\nconst excel_structure = {\n  meta:      [['structure']],\n  courses:   [],\n  groups:    [],\n  locations: [],\n};\n\nconst RS_structure = {\n  events: ['output', 'coreData'],\n};\n\nconst Admentum_structure = {\n  schools:                  ['url', 'id', 'unit_code', 'school_code', 'school_type', 'name'],\n  schedule:                 ['url', 'id', 'school_id', 'school_year', 'start_date', 'end_date', 'start_time', 'end_time', 'is_active', 'archived_at'],\n  rooms:                    ['url', 'id', 'school_id', 'name', 'category', 'capacity'],\n  teachers:                 ['url', 'id', 'school_id', 'email', 'first_name', 'last_name', 'role', 'current_primary_group', 'account_id'],\n  principals:               ['url', 'id', 'school_id', 'email', 'first_name', 'last_name', 'role', 'current_primary_group', 'account_id'],\n  courses:                  ['url', 'id', 'school_id', 'schedule_id', 'name', 'subject_code', 'start_date', 'end_date', 'teachers', 'gymnasium_course'],\n  schedule_groups:          ['url', 'id', 'eid', 'school_id', 'schedule', 'name', 'guid', 'teachers', 'users_primary_groups', 'subjects', 'courses'],\n  primary_groups:           ['url', 'id', 'eid', 'school_id', 'schedule', 'grade', 'name', 'guid', 'teachers', 'start_date', 'end_date', 'start_date_display', 'end_date_display'],\n  schedule_events:          ['url', 'id', 'eid', 'school_id', 'schedule_id', 'start_time', 'end_time', 'rooms', 'teachers', 'schedule_groups', 'primary_groups', 'weekly_interval'],\n  schedule_event_instances: ['url', 'id', 'school_id', 'start_date', 'end_date', 'schedule_event'],\n  lessons:                  ['url', 'id', 'school_id', 'date', 'info', 'teachers', 'room', 'weekday'],\n  lesson_infos:             ['url', 'id', 'eid', 'school_id', 'schedule_id', 'start', 'end', 'duration', 'room', 'subject', 'teachers', 'groups', 'weekly_interval'],\n};\n\nconst IdunSoft_structure = {\n  Grupp:   ['ID', 'Klassnamn'],\n  Lärare:  ['ID', 'Namn'],\n  Rum:     ['ID', 'Namn'],\n  Ämne:    ['Ämne', 'Betygskod'],\n  Lektion: ['LektionID', 'Ämne', 'Starttid', 'Sluttid', 'Lektionslängd', 'LärareID', 'GruppID', 'RumID', 'VeckodagID']\n};\n\nconst Skola24_txt_structure = null;\n\nconst Skola24_mdb_structure = {\n  unit_tblroom:               [ 'PK', 'ID' ],\n  school_tblsubject:          [ 'PK', 'ID' ],\n  school_tblteacher:          [ 'PK', 'ID' ],\n  school_tblgroup:            [ 'PK', 'ID', 'bClass' ],\n  school_tblplan:             [ 'PK', 'FKSubject' ],\n  school_tblcourse:           [ ],\n  school_tblschedule:         [ 'PK', 'Length', 'StartTime', 'DayOfWeek', 'FKSubject', 'CalcActualWeeks' ],\n  school_tblgroup_group:      [ 'FKGroup', 'FKGroupCon' ],\n  school_tblplan_period:      [ 'FKPlan', 'FKPeriod' ],\n  school_tblplan_teacher:     [ 'FKPlan', 'FKTeacher' ],\n  school_tblplan_group:       [ 'FKPlan', 'FKGroup' ],\n  unit_tblperiod_date:        [ 'FKPeriod', 'StartDate', 'EndDate' ],\n  school_tblschedule_period:  [ 'FKSchedule', 'FKPeriod' ],\n  school_tblschedule_teacher: [ 'FKSchedule', 'FKTeacher' ],\n  school_tblschedule_group:   [ 'FKSchedule', 'FKGroup' ],\n  school_tblschedule_room:    [ 'FKSchedule', 'FKRoom' ]\n};\n\n// this is only temporary\nconst PlanDigital_structure = {\n  'Perioder':                 [ 'Namn', 'Tidsenhet' ],\n  'Tabell Tjänstefördelning': [ 'Gruppnamn', 'Klass', 'Kurskod', 'Sign', 'Poäng', 'Anteckningar', 'Antal', 'Ämne', 'Kursnamn' ]\n};\n\nconst SchoolSoft_structure: (keyof SchoolSoftFileTypes.event)[] = [\n  'id',\n  'group',\n  'dayid',\n  'day',\n  'starttime',\n  'length',\n  'teacher',\n  'subject',\n  'room',\n  'period',\n  'inweek',\n  'exweek',\n  'exclass',\n  'realweeks'\n];\n\nexport const maps = [\n  {\n    structure: Skola24_txt_structure,\n    matchType: 'string',\n    name:      'Skola24 (txt)',\n    map:       Skola24Map.TXT,\n    meta:      { structure: '' }\n  }, {\n    structure: Admentum_structure,\n    name:      'Admentum',\n    map:       AdmentumMap,\n    meta:      { structure: '' }\n  }, {\n    structure: SchoolSoft_structure,\n    name:      'SchoolSoft',\n    map:       SchoolSoftMap,\n    meta:      { structure: '' }\n  }, {\n    structure: PlanDigital_structure,\n    name:      'Plan Digital',\n    map:       PlanDigitalMap,\n    meta:      { structure: '' }\n  }, {\n    structure: IdunSoft_structure,\n    name:      'IdunSoft',\n    map:       IdunSoftMap,\n    meta:      { structure: '' }\n  }, {\n    structure: Skola24_mdb_structure,\n    name:      'Skola24 (mdb)',\n    map:       Skola24Map.MDB,\n    meta:      { structure: '' }\n  }, {\n    structure: RS_structure,\n    name:      'Royal Schedule Algorithm',\n    map:       RSMap,\n    meta:      { structure: RSstructure }\n  }, {\n  //   structure: core_structure,\n  //   name:      'Royal Schedule',\n  //   map:       CoreMap.V1,\n  //   meta:      { structure: 'RS/core-1.0.0' }\n  // }, {\n    structure: core_structure,\n    name:      'Royal Schedule',\n    map:       CoreMap,\n    meta:      { structure: 'RS/core-2.0.0' }\n  }, {\n    structure: excel_structure,\n    name:      'Royal Schedule Excel',\n    map:       ExcelMap.V1,\n    meta:      { structure: 'RS/Excel-1.0.0' }\n  }, {\n    structure: excel_structure,\n    name:      'Royal Schedule Excel',\n    map:       ExcelMap.V2,\n    meta:      { structure: 'RS/Excel-2.0.0' }\n  }\n] as const;"],"mappings":"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"}

package/dist/identify/index.js

@@ -7,6 +7,13 @@ import * as z from "zod";
 function keysOf(docs) {
 	return makeChainable(docs).chain((x) => Array.isArray(x) ? x : [x], (x) => x.flatMap((x$1) => x$1 && typeof x$1 === "object" ? Object.keys(x$1) : []), (x) => uniq(x)).value;
 }
+function sameMajorStructure(a, b) {
+	const normalize = (s) => {
+		const m = s.match(/^(.*?)-v?(\d+)(?:\.\d+){0,2}$/i);
+		return m ? `${m[1]}-${m[2]}` : s;
+	};
+	return normalize(a) === normalize(b);
+}
 function identify(schedule) {
 	const similarities = {
 		none: [],
@@ -18,7 +25,7 @@ function identify(schedule) {
 	const MetaStructure = z.object({ meta: z.union([z.object({ structure: z.string() }), z.array(z.unknown()).transform((arr) => arr.at(0)).pipe(z.object({ structure: z.string() }))]) });
 	const res = MetaStructure.safeParse(schedule);
 	if (res.data) {
-		const determined = maps.find((x) => x.meta.structure === res.data.meta.structure);
+		const determined = maps.find((x) => sameMajorStructure(x.meta.structure, res.data.meta.structure));
 		if (determined) {
 			similarities.determined = determined;
 			return similarities;

package/dist/identify/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["x","similarities: IdentifiedMaps","collections: string[]","structureKeys: string[]"],"sources":["../../src/identify/index.ts"],"sourcesContent":["import { difference, isEqual, sortBy, uniq } from 'lodash-es';\nimport type { IdentifiedMaps } from './types';\nimport { maps } from './constants';\nimport * as z from 'zod';\nimport { makeChainable } from '../common/make-chainable';\nexport type { MapInstance, MapName, IdentifiedMaps } from './types';\nexport { maps } from './constants';\n\n\nfunction keysOf (docs: unknown): string[] {\n  return makeChainable(docs)\n    .chain(\n      x => Array.isArray(x) ? x as unknown[] : [x],\n      x => x.flatMap(x => x && typeof x === 'object' ? Object.keys(x) : []),\n      x => uniq(x)\n    )\n    .value;\n}\n\nexport function identify (schedule: unknown): IdentifiedMaps {\n  const similarities: IdentifiedMaps = {\n    none:   [],\n    weak:   [],\n    strong: [],\n    error:  [],\n  };\n\n  if (!schedule) return similarities;\n\n  ////\n  //// check if the schedule is a meta tagged file and thus identifiable by its structure.\n  ////\n  const MetaStructure = z.object({\n    meta: z.union([\n      z.object({\n        structure: z.string()\n      }),\n      z.array(z.unknown())\n        .transform(arr => arr.at(0))\n        .pipe(z.object({\n          structure: z.string()\n        }))\n    ])\n  });\n  const res = MetaStructure.safeParse(schedule);\n  if (res.data) {\n    const determined = maps.find(x => x.meta.structure === res.data.meta.structure);\n    if (determined) {\n      similarities.determined = determined;\n      return similarities;\n    }\n  }\n\n\n  ////\n  //// not a meta tagged file, so we check the structure.\n  ////\n  const collections: string[] = Array.isArray(schedule) ? keysOf(schedule) : Object.keys(schedule);\n  if (!collections.length) return similarities;\n\n  maps.forEach(mapping => {\n    const { structure } = mapping;\n\n    try {\n      if ('matchType' in mapping && typeof schedule === mapping.matchType) {\n        similarities.strong.push(mapping);\n        return;\n      }\n\n      if (!structure) {\n        similarities.none.push(mapping);\n        return;\n      }\n\n      const _collections = Array.isArray(structure) ? structure : Object.keys(structure);\n\n      /*\n        is shallow structure .\n      */\n      if (Array.isArray(schedule)) {\n\n        if (!Array.isArray(structure)) {\n          similarities.none.push(mapping);\n          return;\n        }\n\n        if (isEqual(sortBy(_collections), sortBy(collections))) {\n          similarities.strong.push(mapping);\n          return;\n        }\n\n        if (difference(sortBy(_collections), sortBy(collections)).length < _collections.length) {\n          similarities.weak.push(mapping);\n          return;\n        }\n\n        similarities.none.push(mapping);\n        return;\n      }\n\n      /*\n        is deep structure .\n      */\n\n\n      /*\n        every key is present in file.\n      */\n      if (_collections.every(collection => {\n        if (!(schedule && typeof schedule == 'object' && collection in schedule)) return false;\n        const scheduleKeys = keysOf(schedule[collection as keyof typeof schedule]);\n\n        if (!(collection in structure)) return false;\n        const structureKeys: string[] = structure[collection as keyof typeof structure] as string[];\n\n        return scheduleKeys.every(key => structureKeys.includes(key));\n      })) {\n        similarities.strong.push(mapping);\n        return;\n      }\n\n      /*\n        some keys is present in file.\n      */\n      if (_collections.some(collection => {\n        if (!(schedule && typeof schedule == 'object' && collection in schedule)) return false;\n        const scheduleKeys = keysOf(schedule[collection as keyof typeof schedule]);\n\n        if (!(collection in structure)) return false;\n        const structureKeys: string[] = structure[collection as keyof typeof structure] as string[];\n\n        return scheduleKeys.some(key => structureKeys.includes(key));\n      })) {\n        similarities.weak.push(mapping);\n        return;\n      }\n\n      similarities.none.push(mapping);\n    } catch  {\n      similarities.error.push(mapping);\n    }\n  });\n\n  return similarities;\n}\n"],"mappings":";;;;;;AASA,SAAS,OAAQ,MAAyB;AACxC,QAAO,cAAc,MAClB,OACC,MAAK,MAAM,QAAQ,KAAK,IAAiB,CAAC,KAC1C,MAAK,EAAE,SAAQ,QAAKA,OAAK,OAAOA,QAAM,WAAW,OAAO,KAAKA,OAAK,MAClE,MAAK,KAAK,IAEX;;AAGL,SAAgB,SAAU,UAAmC;CAC3D,MAAMC,eAA+B;EACnC,MAAQ;EACR,MAAQ;EACR,QAAQ;EACR,OAAQ;;AAGV,KAAI,CAAC,SAAU,QAAO;CAKtB,MAAM,gBAAgB,EAAE,OAAO,EAC7B,MAAM,EAAE,MAAM,CACZ,EAAE,OAAO,EACP,WAAW,EAAE,aAEf,EAAE,MAAM,EAAE,WACP,WAAU,QAAO,IAAI,GAAG,IACxB,KAAK,EAAE,OAAO,EACb,WAAW,EAAE;CAIrB,MAAM,MAAM,cAAc,UAAU;AACpC,KAAI,IAAI,MAAM;EACZ,MAAM,aAAa,KAAK,MAAK,MAAK,EAAE,KAAK,cAAc,IAAI,KAAK,KAAK;AACrE,MAAI,YAAY;AACd,gBAAa,aAAa;AAC1B,UAAO;;;CAQX,MAAMC,cAAwB,MAAM,QAAQ,YAAY,OAAO,YAAY,OAAO,KAAK;AACvF,KAAI,CAAC,YAAY,OAAQ,QAAO;AAEhC,MAAK,SAAQ,YAAW;EACtB,MAAM,EAAE,cAAc;AAEtB,MAAI;AACF,OAAI,eAAe,WAAW,OAAO,aAAa,QAAQ,WAAW;AACnE,iBAAa,OAAO,KAAK;AACzB;;AAGF,OAAI,CAAC,WAAW;AACd,iBAAa,KAAK,KAAK;AACvB;;GAGF,MAAM,eAAe,MAAM,QAAQ,aAAa,YAAY,OAAO,KAAK;AAKxE,OAAI,MAAM,QAAQ,WAAW;AAE3B,QAAI,CAAC,MAAM,QAAQ,YAAY;AAC7B,kBAAa,KAAK,KAAK;AACvB;;AAGF,QAAI,QAAQ,OAAO,eAAe,OAAO,eAAe;AACtD,kBAAa,OAAO,KAAK;AACzB;;AAGF,QAAI,WAAW,OAAO,eAAe,OAAO,cAAc,SAAS,aAAa,QAAQ;AACtF,kBAAa,KAAK,KAAK;AACvB;;AAGF,iBAAa,KAAK,KAAK;AACvB;;AAWF,OAAI,aAAa,OAAM,eAAc;AACnC,QAAI,EAAE,YAAY,OAAO,YAAY,YAAY,cAAc,UAAW,QAAO;IACjF,MAAM,eAAe,OAAO,SAAS;AAErC,QAAI,EAAE,cAAc,WAAY,QAAO;IACvC,MAAMC,gBAA0B,UAAU;AAE1C,WAAO,aAAa,OAAM,QAAO,cAAc,SAAS;OACtD;AACF,iBAAa,OAAO,KAAK;AACzB;;AAMF,OAAI,aAAa,MAAK,eAAc;AAClC,QAAI,EAAE,YAAY,OAAO,YAAY,YAAY,cAAc,UAAW,QAAO;IACjF,MAAM,eAAe,OAAO,SAAS;AAErC,QAAI,EAAE,cAAc,WAAY,QAAO;IACvC,MAAMA,gBAA0B,UAAU;AAE1C,WAAO,aAAa,MAAK,QAAO,cAAc,SAAS;OACrD;AACF,iBAAa,KAAK,KAAK;AACvB;;AAGF,gBAAa,KAAK,KAAK;UAChB;AACP,gBAAa,MAAM,KAAK;;;AAI5B,QAAO"}
+{"version":3,"file":"index.js","names":["x","similarities: IdentifiedMaps","collections: string[]","structureKeys: string[]"],"sources":["../../src/identify/index.ts"],"sourcesContent":["import { difference, isEqual, sortBy, uniq } from 'lodash-es';\nimport type { IdentifiedMaps } from './types';\nimport { maps } from './constants';\nimport * as z from 'zod';\nimport { makeChainable } from '../common/make-chainable';\nexport type { MapInstance, MapName, IdentifiedMaps } from './types';\nexport { maps } from './constants';\n\n\nfunction keysOf (docs: unknown): string[] {\n  return makeChainable(docs)\n    .chain(\n      x => Array.isArray(x) ? x as unknown[] : [x],\n      x => x.flatMap(x => x && typeof x === 'object' ? Object.keys(x) : []),\n      x => uniq(x)\n    )\n    .value;\n}\n\nfunction sameMajorStructure (a: string, b: string): boolean {\n  const normalize = (s: string) => {\n    // Matches: \"<prefix>-<major>[.<minor>[.<patch>]]\", optional leading 'v'\n    const m = s.match(/^(.*?)-v?(\\d+)(?:\\.\\d+){0,2}$/i);\n    return m ? `${m[1]}-${m[2]}` : s;\n  };\n  return normalize(a) === normalize(b);\n}\n\nexport function identify (schedule: unknown): IdentifiedMaps {\n  const similarities: IdentifiedMaps = {\n    none:   [],\n    weak:   [],\n    strong: [],\n    error:  [],\n  };\n\n  if (!schedule) return similarities;\n\n  ////\n  //// check if the schedule is a meta tagged file and thus identifiable by its structure.\n  ////\n  const MetaStructure = z.object({\n    meta: z.union([\n      z.object({\n        structure: z.string()\n      }),\n      z.array(z.unknown())\n        .transform(arr => arr.at(0))\n        .pipe(z.object({\n          structure: z.string()\n        }))\n    ])\n  });\n  const res = MetaStructure.safeParse(schedule);\n  if (res.data) {\n    // structure on the type \"RS/mapName-X.Y.Z\"\n    const determined = maps.find(x => sameMajorStructure(x.meta.structure, res.data.meta.structure));\n    if (determined) {\n      similarities.determined = determined;\n      return similarities;\n    }\n  }\n\n\n  ////\n  //// not a meta tagged file, so we check the structure.\n  ////\n  const collections: string[] = Array.isArray(schedule) ? keysOf(schedule) : Object.keys(schedule);\n  if (!collections.length) return similarities;\n\n  maps.forEach(mapping => {\n    const { structure } = mapping;\n\n    try {\n      if ('matchType' in mapping && typeof schedule === mapping.matchType) {\n        similarities.strong.push(mapping);\n        return;\n      }\n\n      if (!structure) {\n        similarities.none.push(mapping);\n        return;\n      }\n\n      const _collections = Array.isArray(structure) ? structure : Object.keys(structure);\n\n      /*\n        is shallow structure .\n      */\n      if (Array.isArray(schedule)) {\n\n        if (!Array.isArray(structure)) {\n          similarities.none.push(mapping);\n          return;\n        }\n\n        if (isEqual(sortBy(_collections), sortBy(collections))) {\n          similarities.strong.push(mapping);\n          return;\n        }\n\n        if (difference(sortBy(_collections), sortBy(collections)).length < _collections.length) {\n          similarities.weak.push(mapping);\n          return;\n        }\n\n        similarities.none.push(mapping);\n        return;\n      }\n\n      /*\n        is deep structure .\n      */\n\n\n      /*\n        every key is present in file.\n      */\n      if (_collections.every(collection => {\n        if (!(schedule && typeof schedule == 'object' && collection in schedule)) return false;\n        const scheduleKeys = keysOf(schedule[collection as keyof typeof schedule]);\n\n        if (!(collection in structure)) return false;\n        const structureKeys: string[] = structure[collection as keyof typeof structure] as string[];\n\n        return scheduleKeys.every(key => structureKeys.includes(key));\n      })) {\n        similarities.strong.push(mapping);\n        return;\n      }\n\n      /*\n        some keys is present in file.\n      */\n      if (_collections.some(collection => {\n        if (!(schedule && typeof schedule == 'object' && collection in schedule)) return false;\n        const scheduleKeys = keysOf(schedule[collection as keyof typeof schedule]);\n\n        if (!(collection in structure)) return false;\n        const structureKeys: string[] = structure[collection as keyof typeof structure] as string[];\n\n        return scheduleKeys.some(key => structureKeys.includes(key));\n      })) {\n        similarities.weak.push(mapping);\n        return;\n      }\n\n      similarities.none.push(mapping);\n    } catch  {\n      similarities.error.push(mapping);\n    }\n  });\n\n  return similarities;\n}\n"],"mappings":";;;;;;AASA,SAAS,OAAQ,MAAyB;AACxC,QAAO,cAAc,MAClB,OACC,MAAK,MAAM,QAAQ,KAAK,IAAiB,CAAC,KAC1C,MAAK,EAAE,SAAQ,QAAKA,OAAK,OAAOA,QAAM,WAAW,OAAO,KAAKA,OAAK,MAClE,MAAK,KAAK,IAEX;;AAGL,SAAS,mBAAoB,GAAW,GAAoB;CAC1D,MAAM,aAAa,MAAc;EAE/B,MAAM,IAAI,EAAE,MAAM;AAClB,SAAO,IAAI,GAAG,EAAE,GAAG,GAAG,EAAE,OAAO;;AAEjC,QAAO,UAAU,OAAO,UAAU;;AAGpC,SAAgB,SAAU,UAAmC;CAC3D,MAAMC,eAA+B;EACnC,MAAQ;EACR,MAAQ;EACR,QAAQ;EACR,OAAQ;;AAGV,KAAI,CAAC,SAAU,QAAO;CAKtB,MAAM,gBAAgB,EAAE,OAAO,EAC7B,MAAM,EAAE,MAAM,CACZ,EAAE,OAAO,EACP,WAAW,EAAE,aAEf,EAAE,MAAM,EAAE,WACP,WAAU,QAAO,IAAI,GAAG,IACxB,KAAK,EAAE,OAAO,EACb,WAAW,EAAE;CAIrB,MAAM,MAAM,cAAc,UAAU;AACpC,KAAI,IAAI,MAAM;EAEZ,MAAM,aAAa,KAAK,MAAK,MAAK,mBAAmB,EAAE,KAAK,WAAW,IAAI,KAAK,KAAK;AACrF,MAAI,YAAY;AACd,gBAAa,aAAa;AAC1B,UAAO;;;CAQX,MAAMC,cAAwB,MAAM,QAAQ,YAAY,OAAO,YAAY,OAAO,KAAK;AACvF,KAAI,CAAC,YAAY,OAAQ,QAAO;AAEhC,MAAK,SAAQ,YAAW;EACtB,MAAM,EAAE,cAAc;AAEtB,MAAI;AACF,OAAI,eAAe,WAAW,OAAO,aAAa,QAAQ,WAAW;AACnE,iBAAa,OAAO,KAAK;AACzB;;AAGF,OAAI,CAAC,WAAW;AACd,iBAAa,KAAK,KAAK;AACvB;;GAGF,MAAM,eAAe,MAAM,QAAQ,aAAa,YAAY,OAAO,KAAK;AAKxE,OAAI,MAAM,QAAQ,WAAW;AAE3B,QAAI,CAAC,MAAM,QAAQ,YAAY;AAC7B,kBAAa,KAAK,KAAK;AACvB;;AAGF,QAAI,QAAQ,OAAO,eAAe,OAAO,eAAe;AACtD,kBAAa,OAAO,KAAK;AACzB;;AAGF,QAAI,WAAW,OAAO,eAAe,OAAO,cAAc,SAAS,aAAa,QAAQ;AACtF,kBAAa,KAAK,KAAK;AACvB;;AAGF,iBAAa,KAAK,KAAK;AACvB;;AAWF,OAAI,aAAa,OAAM,eAAc;AACnC,QAAI,EAAE,YAAY,OAAO,YAAY,YAAY,cAAc,UAAW,QAAO;IACjF,MAAM,eAAe,OAAO,SAAS;AAErC,QAAI,EAAE,cAAc,WAAY,QAAO;IACvC,MAAMC,gBAA0B,UAAU;AAE1C,WAAO,aAAa,OAAM,QAAO,cAAc,SAAS;OACtD;AACF,iBAAa,OAAO,KAAK;AACzB;;AAMF,OAAI,aAAa,MAAK,eAAc;AAClC,QAAI,EAAE,YAAY,OAAO,YAAY,YAAY,cAAc,UAAW,QAAO;IACjF,MAAM,eAAe,OAAO,SAAS;AAErC,QAAI,EAAE,cAAc,WAAY,QAAO;IACvC,MAAMA,gBAA0B,UAAU;AAE1C,WAAO,aAAa,MAAK,QAAO,cAAc,SAAS;OACrD;AACF,iBAAa,KAAK,KAAK;AACvB;;AAGF,gBAAa,KAAK,KAAK;UAChB;AACP,gBAAa,MAAM,KAAK;;;AAI5B,QAAO"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@royalschedule/maps",
   "description": "",
-  "version": "4.0.13",
+  "version": "4.0.15",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -76,12 +76,12 @@
     "iconv-lite": "^0.7.0",
     "lodash-es": "^4.17.21",
     "moment": "^2.30.1",
-    "mongoose": "^8.18.0",
+    "mongoose": "^8.19.0",
     "nanoid": "^5.1.5",
     "papaparse": "^5.5.3",
     "ts-expect": "^1.3.0",
     "uuid": "^11.1.0",
     "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz",
-    "zod": "^4.1.5"
+    "zod": "^4.1.11"
   }
 }