@royalschedule/maps 2.2.79 → 2.2.81

package/dist/RS/v2/from/collections.d.ts

@@ -1,5 +1,6 @@
+import { Constraint } from '../types/constraints';
 import { Settings } from '../types/settings';
-import { Collection } from '../types/collections';
 import { Course as SourceCourse } from '../../../core/types/courses';
-declare let reduceCourses: (courses: (Collection | Collection[])[], teachersList: string[], groupsList: string[], settings: Settings, overlapGroup?: number) => SourceCourse[];
+import { Deserialized } from '../../../core/types/common';
+declare let reduceCourses: (courses: NonNullable<Constraint['events']>, teachersList: string[], groupsList: string[], settings: Settings, overlapGroup?: number) => Deserialized<SourceCourse>[];
 export default reduceCourses;

package/dist/RS/v2/from/collections.js

@@ -26,12 +26,12 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 function _course(course, teachersList, groupsList, settings) {
-  var _course$groups, _course$groups2;
+  var _course$potentialCent, _course$groups, _course$groups2, _doc$teachers$length, _doc$teachers, _doc$groups$length, _doc$groups;
 
   var overlapGroup = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : null;
   var idKey = settings.collectionIdKey;
-  if (!idKey) throw new Error('property "collectionIdKey" in settings is undefined');
-  if (!course[idKey]) throw new Error('A course missing a unique key');
+  if (!idKey) throw new Error('(RS::V2::From::Dependencies) Property "collectionIdKey" in settings is undefined');
+  if (!course[idKey]) throw new Error('(RS::V2::From::Dependencies) A course missing a unique key');
 
   var doc = _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
     ids: course[idKey]
@@ -50,7 +50,7 @@ function _course(course, teachersList, groupsList, settings) {
   }), 'weight' in course && {
     weight: course.weight
   }), 'potentialCenter' in course && {
-    potentialCenter: course.potentialCenter
+    potentialCenter: (_course$potentialCent = course.potentialCenter) === null || _course$potentialCent === void 0 ? void 0 : _course$potentialCent.toString()
   }), course.dependencies && {
     locations: (0, _availableDependencies.default)(course.dependencies, settings)
   }), course.intervals && {
@@ -69,7 +69,7 @@ function _course(course, teachersList, groupsList, settings) {
     if (groupsList.indexOf(gId) != -1) return acc.concat(gId);
     return acc;
   }, []);
-  if (doc.teachers.length + doc.groups.length !== (course.groups || []).length) throw new Error("Length of teachers + groups does not match length of groups in input for course ".concat(course[idKey]));
+  if (((_doc$teachers$length = (_doc$teachers = doc.teachers) === null || _doc$teachers === void 0 ? void 0 : _doc$teachers.length) !== null && _doc$teachers$length !== void 0 ? _doc$teachers$length : 0) + ((_doc$groups$length = (_doc$groups = doc.groups) === null || _doc$groups === void 0 ? void 0 : _doc$groups.length) !== null && _doc$groups$length !== void 0 ? _doc$groups$length : 0) !== (course.groups || []).length) throw new Error("(RS::V2::From::Dependencies) Length of teachers + groups does not match length of groups in input for course ".concat(course[idKey]));
   if ((course.events || []).length) doc.events = (0, _courseEvents.default)(course.events, course, teachersList, groupsList, settings);
   return doc;
 }
@@ -80,11 +80,13 @@ var reduceCourses = function reduceCourses(courses, teachersList, groupsList, se
     if (Array.isArray(course)) {
       var _overlapGroup = overlapGroup++;
 
-      return acc.concat(course.map(innerCourse => {
-        return _course(innerCourse, teachersList, groupsList, settings, _overlapGroup);
-      }));
+      return acc.concat(course.reduce((acc, innerCourse) => {
+        if (!('events' in innerCourse)) return acc;
+        return acc.concat(_course(innerCourse, teachersList, groupsList, settings, _overlapGroup));
+      }, []));
     }
 
+    if (!('events' in course)) return acc;
     return acc.concat(_course(course, teachersList, groupsList, settings));
   }, []);
 };

package/dist/RS/v2/from/collections.js.map

@@ -1 +1 @@
-{"version":3,"file":"collections.js","mappings":"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","names":["_course","course","teachersList","groupsList","settings","overlapGroup","idKey","collectionIdKey","Error","doc","ids","toString","name","displayName","subject","color","minBreakLength","density","weight","potentialCenter","dependencies","locations","intervals","lockedTimes","days","teachers","groups","flat","reduce","acc","gId","indexOf","concat","length","events","reduceCourses","courses","Array","isArray","_overlapGroup","map","innerCourse"],"sourceRoot":"","sources":["../../../../src/RS/v2/from/collections.ts"],"sourcesContent":[null]}
+{"version":3,"file":"collections.js","mappings":";;;;;;;AAEA;;AACA;;AACA;;AACA;;AACA;;AACA;;;;;;;;;;AAWA,SAASA,OAAT,CAAiBC,MAAjB,EACiBC,YADjB,EAEiBC,UAFjB,EAGiBC,QAHjB,EAImD;EAAA;;EAAA,IAAlCC,YAAkC,uEAAJ,IAAI;EAEjD,IAAMC,KAAK,GAAqBF,QAAQ,CAACG,eAAzC;EAEA,IAAI,CAAED,KAAN,EACE,MAAM,IAAIE,KAAJ,CAAU,kFAAV,CAAN;EAEF,IAAI,CAAEP,MAAM,CAACK,KAAD,CAAZ,EACE,MAAM,IAAIE,KAAJ,CAAU,4DAAV,CAAN;;EAEA,IAAIC,GAAG;IACLC,GAAG,EAA2CT,MAAM,CAACK,KAAD;EAD/C,GAEDD,YAAY,IAAI,IAAjB,IAA8C;IAAEA,YAAY,EAAKA,YAAY,CAACM,QAAb;EAAnB,CAF5C,GAGFV,MAAM,CAACW,IAAP,IAA8C;IAAEC,WAAW,EAAMZ,MAAM,CAACW;EAA1B,CAH5C,GAIFX,MAAM,CAACa,OAAP,IAA8C;IAAEA,OAAO,EAAUb,MAAM,CAACa;EAA1B,CAJ5C,GAKFb,MAAM,CAACc,KAAP,IAA8C;IAAEA,KAAK,EAAYd,MAAM,CAACc;EAA1B,CAL5C,GAMF,oBAAqBd,MAArB,IAA8C;IAAEe,cAAc,EAAG,2BAAYf,MAAM,CAACe,cAAnB;EAAnB,CAN5C,GAOF,aAAqBf,MAArB,IAA8C;IAAEgB,OAAO,EAAUhB,MAAM,CAACgB;EAA1B,CAP5C,GAQF,YAAqBhB,MAArB,IAA8C;IAAEiB,MAAM,EAAWjB,MAAM,CAACiB;EAA1B,CAR5C,GASF,qBAAqBjB,MAArB,IAA8C;IAAEkB,eAAe,2BAAElB,MAAM,CAACkB,eAAT,0DAAE,sBAAwBR,QAAxB;EAAnB,CAT5C,GAUFV,MAAM,CAACmB,YAAP,IAA8C;IAAEC,SAAS,EAAQ,oCAAsBpB,MAAM,CAACmB,YAA7B,EAA2ChB,QAA3C;EAAnB,CAV5C,GAWFH,MAAM,CAACqB,SAAP,IAA8C;IAAEA,SAAS,EAAQ,wBAAUrB,MAAM,CAACqB,SAAjB;EAAnB,CAX5C,GAYFrB,MAAM,CAACsB,WAAP,IAA8C;IAAEA,WAAW,EAAM,0BAAWtB,MAAM,CAACsB,WAAlB;EAAnB,CAZ5C,GAaFtB,MAAM,CAACuB,IAAP,IAA8C;IAAEA,IAAI,EAAa,mBAAKvB,MAAM,CAACuB,IAAZ,EAAkBpB,QAAlB;EAAnB,CAb5C,CAAP;;EAgBAK,GAAG,CAACgB,QAAJ,qBAAexB,MAAM,CAACyB,MAAtB,mDAAe,eAAeC,IAAf,GAAsBC,MAAtB,CAA6B,CAACC,GAAD,EAAaC,GAAb,KAA4B;IACtE,IAAI5B,YAAY,CAAC6B,OAAb,CAAqBD,GAArB,KAA6B,CAAC,CAAlC,EACE,OAAOD,GAAG,CAACG,MAAJ,CAAWF,GAAX,CAAP;IACF,OAAOD,GAAP;EACD,CAJc,EAIZ,EAJY,CAAf;EAMApB,GAAG,CAACiB,MAAJ,sBAAazB,MAAM,CAACyB,MAApB,oDAAa,gBAAeC,IAAf,GAAsBC,MAAtB,CAA6B,CAACC,GAAD,EAAgBC,GAAhB,KAA+B;IACvE,IAAI3B,UAAU,CAAC4B,OAAX,CAAmBD,GAAnB,KAA2B,CAAC,CAAhC,EACE,OAAOD,GAAG,CAACG,MAAJ,CAAWF,GAAX,CAAP;IACF,OAAOD,GAAP;EACD,CAJY,EAIV,EAJU,CAAb;EAMA,IAAK,0CAACpB,GAAG,CAACgB,QAAL,kDAAC,cAAcQ,MAAf,uEAAyB,CAAzB,0CAA+BxB,GAAG,CAACiB,MAAnC,gDAA+B,YAAYO,MAA3C,mEAAqD,CAArD,CAAD,KAA8D,CAAChC,MAAM,CAACyB,MAAP,IAAiB,EAAlB,EAAsBO,MAAxF,EACE,MAAM,IAAIzB,KAAJ,wHAA2HP,MAAM,CAACK,KAAD,CAAjI,EAAN;EAEF,IAAI,CAACL,MAAM,CAACiC,MAAP,IAAiB,EAAlB,EAAsBD,MAA1B,EACExB,GAAG,CAACyB,MAAJ,GAAa,2BAAajC,MAAM,CAACiC,MAApB,EAA6BjC,MAA7B,EAAqCC,YAArC,EAAmDC,UAAnD,EAA+DC,QAA/D,CAAb;EAEF,OAAOK,GAAP;AACH;;AAED,IAAI0B,aAAa,GAAG,SAAhBA,aAAgB,CAACC,OAAD,EACClC,YADD,EAECC,UAFD,EAGCC,QAHD,EAI6B;EAAA,IAA5BC,YAA4B,uEAAL,CAAK;EAE/C,OAAO+B,OAAO,CAACR,MAAR,CAAe,CAACC,GAAD,EAAoC5B,MAApC,KAA8C;IAElE,IAAIoC,KAAK,CAACC,OAAN,CAAcrC,MAAd,CAAJ,EAA2B;MACzB,IAAIsC,aAAa,GAAGlC,YAAY,EAAhC;;MACA,OAAOwB,GAAG,CAACG,MAAJ,CAAW/B,MAAM,CAAC2B,MAAP,CAAc,CAACC,GAAD,EAAoCW,WAApC,KAAmD;QACjF,IAAI,EAAG,YAAYA,WAAf,CAAJ,EACE,OAAOX,GAAP;QACF,OAAOA,GAAG,CAACG,MAAJ,CAAWhC,OAAO,CAACwC,WAAD,EAActC,YAAd,EAA4BC,UAA5B,EAAwCC,QAAxC,EAAkDmC,aAAlD,CAAlB,CAAP;MACD,CAJiB,EAIf,EAJe,CAAX,CAAP;IAMD;;IAED,IAAI,EAAG,YAAYtC,MAAf,CAAJ,EACE,OAAO4B,GAAP;IAEF,OAAOA,GAAG,CAACG,MAAJ,CAAWhC,OAAO,CAACC,MAAD,EAASC,YAAT,EAAuBC,UAAvB,EAAmCC,QAAnC,CAAlB,CAAP;EACD,CAhBM,EAgBJ,EAhBI,CAAP;AAiBD,CAvBD;;eAyBe+B,a","names":["_course","course","teachersList","groupsList","settings","overlapGroup","idKey","collectionIdKey","Error","doc","ids","toString","name","displayName","subject","color","minBreakLength","density","weight","potentialCenter","dependencies","locations","intervals","lockedTimes","days","teachers","groups","flat","reduce","acc","gId","indexOf","concat","length","events","reduceCourses","courses","Array","isArray","_overlapGroup","innerCourse"],"sourceRoot":"","sources":["../../../../src/RS/v2/from/collections.ts"],"sourcesContent":[null]}

package/dist/RS/v2/from/course-events.d.ts

@@ -1,5 +1,8 @@
 import { Settings } from '../types/settings';
 import { CourseEvent } from '../types/course-events';
 import { Collection } from '../types/collections';
-declare const _default: (courseEvents: (CourseEvent | number)[], course: Collection, teachersList: string[], groupsList: string[], settings: Settings) => any;
+import { Types as CoreTypes } from '../../../core/types';
+import { Serialized, Deserialized } from '../../../core/types/common';
+declare type RetrunType = Deserialized<CoreTypes.courseEvent> & Serialized<Pick<CoreTypes.courseEvent, 'teachers' | 'groups'>>;
+declare const _default: (courseEvents: (CourseEvent | number)[], course: Collection, teachersList: string[], groupsList: string[], settings: Settings) => RetrunType[];
 export default _default;

package/dist/RS/v2/from/course-events.js

@@ -28,9 +28,9 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 var _default = (courseEvents, course, teachersList, groupsList, settings) => {
   var collectionIdKey = settings.collectionIdKey;
   var eventIdKey = settings.eventIdKey;
-  if (!collectionIdKey) throw new Error('property "collectionIdKey" in settings is undefined');
+  if (!collectionIdKey) throw new Error('(RS::V2::From::Dependencies) Property "collectionIdKey" in settings is undefined');
   return courseEvents.reduce((acc, event) => {
-    var _event$groups, _event$groups2;
+    var _event$groups, _event$groups2, _event$potentialCente;
 
     switch (typeof event) {
       case 'number':
@@ -65,7 +65,7 @@ var _default = (courseEvents, course, teachersList, groupsList, settings) => {
           fixedStart = true;
           start = (0, _getDate.default)(day, event.start.toFixed(2).replace('.', ':'));
           end = start.clone().add(event.length, 'minutes');
-          if (start.day() != end.day()) throw new Error('course event have fixed time such that the event span multiple days');
+          if (start.day() != end.day()) throw new Error('(RS::V2::From::Dependencies) Course event have fixed time such that the event span multiple days');
         }
 
         return acc.concat(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
@@ -86,7 +86,7 @@ var _default = (courseEvents, course, teachersList, groupsList, settings) => {
         }), 'weight' in event && {
           weight: event.weight
         }), 'potentialCenter' in event && {
-          potentialCenter: event.potentialCenter
+          potentialCenter: (_event$potentialCente = event.potentialCenter) === null || _event$potentialCente === void 0 ? void 0 : _event$potentialCente.toString()
         }), 'minBreakLength' in event && {
           minBreakLength: (0, _breakLengths.default)(event.minBreakLength)
         }), 'maxLengthVariance' in event && {
@@ -106,7 +106,7 @@ var _default = (courseEvents, course, teachersList, groupsList, settings) => {
         }));
 
       default:
-        throw new Error("course event is neither number nor object, course ".concat(course[collectionIdKey]));
+        throw new Error("(RS::V2::From::Dependencies) Course event is neither number nor object, course ".concat(course[collectionIdKey]));
     }
   }, []);
 };

package/dist/RS/v2/from/course-events.js.map

@@ -1 +1 @@
-{"version":3,"file":"course-events.js","mappings":"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","names":["courseEvents","course","teachersList","groupsList","settings","collectionIdKey","eventIdKey","Error","reduce","acc","event","concat","duration","ids","length","Object","assign","teachers","groups","flat","gId","includes","fixedStart","start","end","day","toFixed","replace","clone","add","preferredDuration","parked","name","displayName","density","weight","potentialCenter","minBreakLength","durationVariance","maxLengthVariance","intervals","lockedTimes","dependencies","locations","days"],"sourceRoot":"","sources":["../../../../src/RS/v2/from/course-events.ts"],"sourcesContent":[null]}
+{"version":3,"file":"course-events.js","mappings":"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","names":["courseEvents","course","teachersList","groupsList","settings","collectionIdKey","eventIdKey","Error","reduce","acc","event","concat","duration","ids","length","Object","assign","teachers","groups","flat","gId","includes","fixedStart","start","end","day","toFixed","replace","clone","add","preferredDuration","parked","name","displayName","density","weight","potentialCenter","toString","minBreakLength","durationVariance","maxLengthVariance","intervals","lockedTimes","dependencies","locations","days"],"sourceRoot":"","sources":["../../../../src/RS/v2/from/course-events.ts"],"sourcesContent":[null]}

package/dist/RS/v2/from/days.d.ts

@@ -1,4 +1,4 @@
 import { Settings } from '../types/settings';
 import { Day } from '../types/days';
-declare const _default: (days: Day[] | number[] | any, settings: Settings) => any;
+declare const _default: (days: (Day | number)[], settings: Settings) => import("../../../core/types/days").Day[];
 export default _default;

package/dist/RS/v2/from/days.js.map

@@ -1 +1 @@
-{"version":3,"file":"days.js","mappings":";;;;;;;eAGe,CAACA,IAAD,EACCC,QADD,KAC4B;EAEzC,OAAOD,IAAI,CAACE,GAAL,CAAUC,GAAD,IAAa;IAC3B,QAAO,OAAOA,GAAd;MACE,KAAK,QAAL;QACE,OAAO;UAAEA;QAAF,CAAP;;MACF,KAAK,QAAL;QACE,OAAOA,GAAP;;MACF;QACE,MAAM,IAAIC,KAAJ,CAAU,iCAAV,CAAN;IANJ;EAQD,CATM,CAAP;AAUD,C","names":["days","settings","map","day","Error"],"sourceRoot":"","sources":["../../../../src/RS/v2/from/days.ts"],"sourcesContent":[null]}
+{"version":3,"file":"days.js","mappings":";;;;;;;eAKe,CAACA,IAAD,EACCC,QADD,KACuB;EAEpC,OAAOD,IAAI,CAACE,GAAL,CAAUC,GAAD,IAAuB;IACrC,QAAO,OAAOA,GAAd;MACE,KAAK,QAAL;QACE,OAAO;UAAEA;QAAF,CAAP;;MACF,KAAK,QAAL;QACE,OAAOA,GAAP;;MACF;QACE,MAAM,IAAIC,KAAJ,CAAU,iCAAV,CAAN;IANJ;EAQD,CATM,CAAP;AAUD,C","names":["days","settings","map","day","Error"],"sourceRoot":"","sources":["../../../../src/RS/v2/from/days.ts"],"sourcesContent":[null]}

package/dist/RS/v2/from/dependencies.d.ts

@@ -1,4 +1,6 @@
 import { Dependency } from '../types/dependencies';
 import { Settings } from '../types/settings';
-declare const _default: (dependencies: (Dependency | string)[], settings: Settings) => any[];
+import { Types as CoreTypes } from '../../../core/types';
+import { Deserialized } from '../../../core/types/common';
+declare const _default: (dependencies: (Dependency | string)[], settings: Settings) => Deserialized<CoreTypes.location>[];
 export default _default;

package/dist/RS/v2/from/dependencies.js

@@ -23,7 +23,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 var _default = (dependencies, settings) => {
   var idKey = settings.dependencyIdKey;
-  if (!idKey) throw new Error('property "dependencyIdKey" in settings is undefined');
+  if (!idKey) throw new Error('(RS::V2::From::Dependencies) Property "dependencyIdKey" in settings is undefined');
   return dependencies.map(dependency => {
     switch (typeof dependency) {
       case 'string':
@@ -32,7 +32,7 @@ var _default = (dependencies, settings) => {
         };
 
       case 'object':
-        if (!dependency[idKey]) throw new Error('A dependency does not have a unique key');
+        if (!dependency[idKey]) throw new Error('(RS::V2::From::Dependencies) A dependency does not have a unique key');
         return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
           ids: dependency[idKey]
         }, 'minBreakLength' in dependency && {
@@ -50,7 +50,7 @@ var _default = (dependencies, settings) => {
         });
 
       default:
-        throw new Error('dependency is neither string nor object');
+        throw new Error('(RS::V2::From::Dependencies) Dependency is neither string nor object');
     }
   }, []);
 };

package/dist/RS/v2/from/dependencies.js.map

@@ -1 +1 @@
-{"version":3,"file":"dependencies.js","mappings":";;;;;;;AAAA;;AACA;;AACA;;AACA;;;;;;;;;;eAKe,CAACA,YAAD,EACCC,QADD,KACqC;EAClD,IAAMC,KAAK,GAAqBD,QAAQ,CAACE,eAAzC;EAEA,IAAI,CAAED,KAAN,EACE,MAAM,IAAIE,KAAJ,CAAU,qDAAV,CAAN;EAEF,OAAOJ,YAAY,CAACK,GAAb,CAAkBC,UAAD,IAAoC;IAC1D,QAAO,OAAOA,UAAd;MACE,KAAK,QAAL;QACE,OAAO;UACLC,GAAG,EAAQD;QADN,CAAP;;MAGF,KAAK,QAAL;QAEE,IAAI,CAAEA,UAAU,CAACJ,KAAD,CAAhB,EACE,MAAM,IAAIE,KAAJ,CAAU,yCAAV,CAAN;QAEF;UACEG,GAAG,EAAoDD,UAAU,CAACJ,KAAD;QADnE,GAEK,oBAAoBI,UAApB,IAAkC;UAAEE,cAAc,EAAE,2BAAYF,UAAU,CAACE,cAAvB;QAAlB,CAFvC,GAGKF,UAAU,CAACG,IAAX,IAAkC;UAAEC,WAAW,EAAKJ,UAAU,CAACG;QAA7B,CAHvC,GAIKH,UAAU,CAACK,IAAX,IAAkC;UAAEA,IAAI,EAAYL,UAAU,CAACK;QAA7B,CAJvC,GAKKL,UAAU,CAACM,IAAX,IAAkC;UAAEA,IAAI,EAAY,mBAAKN,UAAU,CAACM,IAAhB,EAAsBX,QAAtB;QAAlB,CALvC,GAMKK,UAAU,CAACO,SAAX,IAAkC;UAAEA,SAAS,EAAO,wBAAUP,UAAU,CAACO,SAArB;QAAlB,CANvC,GAOKP,UAAU,CAACQ,WAAX,IAAkC;UAAEA,WAAW,EAAK,0BAAWR,UAAU,CAACQ,WAAtB;QAAlB,CAPvC;;MASF;QACE,MAAM,IAAIV,KAAJ,CAAU,yCAAV,CAAN;IApBJ;EAuBD,CAxBM,EAwBJ,EAxBI,CAAP;AA0BD,C","names":["dependencies","settings","idKey","dependencyIdKey","Error","map","dependency","ids","minBreakLength","name","displayName","area","days","intervals","lockedTimes"],"sourceRoot":"","sources":["../../../../src/RS/v2/from/dependencies.ts"],"sourcesContent":[null]}
+{"version":3,"file":"dependencies.js","mappings":";;;;;;;AAAA;;AACA;;AACA;;AACA;;;;;;;;;;eAQe,CAACA,YAAD,EACCC,QADD,KACkE;EAC/E,IAAMC,KAAK,GAAqBD,QAAQ,CAACE,eAAzC;EAEA,IAAI,CAAED,KAAN,EACE,MAAM,IAAIE,KAAJ,CAAU,kFAAV,CAAN;EAEF,OAAOJ,YAAY,CAACK,GAAb,CAAiBC,UAAU,IAAG;IACnC,QAAO,OAAOA,UAAd;MACE,KAAK,QAAL;QACE,OAAO;UACLC,GAAG,EAAQD;QADN,CAAP;;MAGF,KAAK,QAAL;QAEE,IAAI,CAAEA,UAAU,CAACJ,KAAD,CAAhB,EACE,MAAM,IAAIE,KAAJ,CAAU,sEAAV,CAAN;QAEF;UACEG,GAAG,EAAoDD,UAAU,CAACJ,KAAD;QADnE,GAEK,oBAAoBI,UAApB,IAAkC;UAAEE,cAAc,EAAE,2BAAYF,UAAU,CAACE,cAAvB;QAAlB,CAFvC,GAGKF,UAAU,CAACG,IAAX,IAAkC;UAAEC,WAAW,EAAKJ,UAAU,CAACG;QAA7B,CAHvC,GAIKH,UAAU,CAACK,IAAX,IAAkC;UAAEA,IAAI,EAAYL,UAAU,CAACK;QAA7B,CAJvC,GAKKL,UAAU,CAACM,IAAX,IAAkC;UAAEA,IAAI,EAAY,mBAAKN,UAAU,CAACM,IAAhB,EAAsBX,QAAtB;QAAlB,CALvC,GAMKK,UAAU,CAACO,SAAX,IAAkC;UAAEA,SAAS,EAAO,wBAAUP,UAAU,CAACO,SAArB;QAAlB,CANvC,GAOKP,UAAU,CAACQ,WAAX,IAAkC;UAAEA,WAAW,EAAK,0BAAWR,UAAU,CAACQ,WAAtB;QAAlB,CAPvC;;MASF;QACE,MAAM,IAAIV,KAAJ,CAAU,sEAAV,CAAN;IApBJ;EAuBD,CAxBM,EAwBJ,EAxBI,CAAP;AA0BD,C","names":["dependencies","settings","idKey","dependencyIdKey","Error","map","dependency","ids","minBreakLength","name","displayName","area","days","intervals","lockedTimes"],"sourceRoot":"","sources":["../../../../src/RS/v2/from/dependencies.ts"],"sourcesContent":[null]}

package/dist/RS/v2/from/groups.d.ts

@@ -1,5 +1,6 @@
 import { Group } from '../types/groups';
 import { Settings } from '../types/settings';
 import { Group as SourceGroup } from '../../../core/types/groups';
-declare const _default: (groups: Group[], settings: Settings) => SourceGroup[];
+import { Deserialized } from '../../../core/types/common';
+declare const _default: (groups: Group[], settings: Settings) => Deserialized<SourceGroup>[];
 export default _default;

package/dist/RS/v2/from/groups.js

@@ -23,13 +23,13 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 var _default = (groups, settings) => {
   var idKey = settings.groupIdKey;
-  if (!idKey) throw new Error('property "groupIdKey" in settings is undefined');
+  if (!idKey) throw new Error('(RS::V2::From::Groups) Property "groupIdKey" in settings is undefined');
   return groups.reduce((acc, group) => {
     var _group$days, _group$intervals, _group$lockedTimes;
 
-    if (!group.group_type) throw new Error('property "group_type" must exist on all entries in "groups" array');
-    if (!['personal', 'classes'].includes(group.group_type)) throw new Error('Allowed values of "group_type" are "personal" and "classes"');
-    if (!group[idKey]) throw new Error('A group does not have a unique key');
+    if (!group.group_type) throw new Error('(RS::V2::From::Groups) Property "group_type" must exist on all entries in "groups" array');
+    if (!['personal', 'classes'].includes(group.group_type)) throw new Error('(RS::V2::From::Groups) Allowed values of "group_type" are "personal" and "classes"');
+    if (!group[idKey]) throw new Error('(RS::V2::From::Groups) A group does not have a unique key');
     if (group.group_type != 'classes') return acc;
     return acc.concat(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
       ids: group[idKey]

package/dist/RS/v2/from/groups.js.map

@@ -1 +1 @@
-{"version":3,"file":"groups.js","mappings":";;;;;;;AAAA;;AACA;;AACA;;AACA;;;;;;;;;;eAOe,CAACA,MAAD,EACCC,QADD,KACwC;EACrD,IAAMC,KAAK,GAAgBD,QAAQ,CAACE,UAApC;EAEA,IAAI,CAAED,KAAN,EACE,MAAM,IAAIE,KAAJ,CAAU,gDAAV,CAAN;EAEF,OAAOJ,MAAM,CAACK,MAAP,CAAc,CAACC,GAAD,EAAaC,KAAb,KAA6B;IAAA;;IAEhD,IAAI,CAAEA,KAAK,CAACC,UAAZ,EACE,MAAM,IAAIJ,KAAJ,CAAU,mEAAV,CAAN;IAEF,IAAI,CAAE,CAAC,UAAD,EAAa,SAAb,EAAwBK,QAAxB,CAAiCF,KAAK,CAACC,UAAvC,CAAN,EACE,MAAM,IAAIJ,KAAJ,CAAU,6DAAV,CAAN;IAEF,IAAI,CAAEG,KAAK,CAACL,KAAD,CAAX,EACE,MAAM,IAAIE,KAAJ,CAAU,oCAAV,CAAN;IAEF,IAAIG,KAAK,CAACC,UAAN,IAAoB,SAAxB,EAAmC,OAAOF,GAAP;IAEnC,OAAOA,GAAG,CAACI,MAAJ;MACLC,GAAG,EAAuEJ,KAAK,CAACL,KAAD;IAD1E,GAEFK,KAAK,CAACK,IAAN,IAAyC;MAAEC,WAAW,EAAiBN,KAAK,CAACK;IAApC,CAFvC,GAGF,6BAAgCL,KAAhC,IAAyC;MAAEO,uBAAuB,EAAKP,KAAK,CAACO;IAApC,CAHvC,GAIF,wBAAgCP,KAAhC,IAAyC;MAAEQ,kBAAkB,EAAUR,KAAK,CAACQ;IAApC,CAJvC,GAKF,6BAAgCR,KAAhC,IAAyC;MAAES,uBAAuB,EAAKT,KAAK,CAACS;IAApC,CALvC,GAMF,oBAAgCT,KAAhC,IAAyC;MAAEU,cAAc,EAAc,2BAAYV,KAAK,CAACU,cAAlB;IAA9B,CANvC,GAOF,gCAAgCV,KAAhC,IAAyC;MAAEW,0BAA0B,EAAEX,KAAK,CAACW;IAApC,CAPvC,GAQF,YAAgCX,KAAhC,IAAyC;MAAEY,MAAM,EAAsBZ,KAAK,CAACY;IAApC,CARvC,GASF,UAAgCZ,KAAhC,IAAyC;MAAEa,IAAI,EAAwBb,KAAK,CAACa;IAApC,CATvC,GAUF,qBAAK,CAACC,IAAN,4DAAYC,MAAZ,KAAyC;MAAED,IAAI,EAAwB,mBAAKd,KAAK,CAACc,IAAX,EAAiBpB,QAAjB;IAA9B,CAVvC,GAWF,0BAAK,CAACsB,SAAN,sEAAiBD,MAAjB,KAAyC;MAAEC,SAAS,EAAmB,wBAAUhB,KAAK,CAACgB,SAAhB;IAA9B,CAXvC,GAYF,4BAAK,CAACC,WAAN,0EAAmBF,MAAnB,KAAyC;MAAEE,WAAW,EAAiB,0BAAWjB,KAAK,CAACiB,WAAjB;IAA9B,CAZvC,EAAP;EAcD,CA3BM,EA2BJ,EA3BI,CAAP;AA4BD,C","names":["groups","settings","idKey","groupIdKey","Error","reduce","acc","group","group_type","includes","concat","ids","name","displayName","forbidOverlappingEvents","maxNumWorkingHours","maxNumDailyWorkingHours","minBreakLength","disableDayLengthPunishment","weight","rank","days","length","intervals","lockedTimes"],"sourceRoot":"","sources":["../../../../src/RS/v2/from/groups.ts"],"sourcesContent":[null]}
+{"version":3,"file":"groups.js","mappings":";;;;;;;AAAA;;AACA;;AACA;;AACA;;;;;;;;;;eAQe,CAACA,MAAD,EACCC,QADD,KACyB;EACtC,IAAMC,KAAK,GAAGD,QAAQ,CAACE,UAAvB;EAEA,IAAI,CAAED,KAAN,EACE,MAAM,IAAIE,KAAJ,CAAU,uEAAV,CAAN;EAEF,OAAOJ,MAAM,CAACK,MAAP,CAAc,CAACC,GAAD,EAAoCC,KAApC,KAAoD;IAAA;;IAEvE,IAAI,CAAEA,KAAK,CAACC,UAAZ,EACE,MAAM,IAAIJ,KAAJ,CAAU,0FAAV,CAAN;IAEF,IAAI,CAAE,CAAC,UAAD,EAAa,SAAb,EAAwBK,QAAxB,CAAiCF,KAAK,CAACC,UAAvC,CAAN,EACE,MAAM,IAAIJ,KAAJ,CAAU,oFAAV,CAAN;IAEF,IAAI,CAAEG,KAAK,CAACL,KAAD,CAAX,EACE,MAAM,IAAIE,KAAJ,CAAU,2DAAV,CAAN;IAEF,IAAIG,KAAK,CAACC,UAAN,IAAoB,SAAxB,EAAmC,OAAOF,GAAP;IAEnC,OAAOA,GAAG,CAACI,MAAJ;MACLC,GAAG,EAAuEJ,KAAK,CAACL,KAAD;IAD1E,GAEFK,KAAK,CAACK,IAAN,IAAyC;MAAEC,WAAW,EAAiBN,KAAK,CAACK;IAApC,CAFvC,GAGF,6BAAgCL,KAAhC,IAAyC;MAAEO,uBAAuB,EAAKP,KAAK,CAACO;IAApC,CAHvC,GAIF,wBAAgCP,KAAhC,IAAyC;MAAEQ,kBAAkB,EAAUR,KAAK,CAACQ;IAApC,CAJvC,GAKF,6BAAgCR,KAAhC,IAAyC;MAAES,uBAAuB,EAAKT,KAAK,CAACS;IAApC,CALvC,GAMF,oBAAgCT,KAAhC,IAAyC;MAAEU,cAAc,EAAc,2BAAYV,KAAK,CAACU,cAAlB;IAA9B,CANvC,GAOF,gCAAgCV,KAAhC,IAAyC;MAAEW,0BAA0B,EAAEX,KAAK,CAACW;IAApC,CAPvC,GAQF,YAAgCX,KAAhC,IAAyC;MAAEY,MAAM,EAAsBZ,KAAK,CAACY;IAApC,CARvC,GASF,UAAgCZ,KAAhC,IAAyC;MAAEa,IAAI,EAAwBb,KAAK,CAACa;IAApC,CATvC,GAUF,qBAAK,CAACC,IAAN,4DAAYC,MAAZ,KAAyC;MAAED,IAAI,EAAwB,mBAAKd,KAAK,CAACc,IAAX,EAAiBpB,QAAjB;IAA9B,CAVvC,GAWF,0BAAK,CAACsB,SAAN,sEAAiBD,MAAjB,KAAyC;MAAEC,SAAS,EAAmB,wBAAUhB,KAAK,CAACgB,SAAhB;IAA9B,CAXvC,GAYF,4BAAK,CAACC,WAAN,0EAAmBF,MAAnB,KAAyC;MAAEE,WAAW,EAAiB,0BAAWjB,KAAK,CAACiB,WAAjB;IAA9B,CAZvC,EAAP;EAcD,CA3BM,EA2BJ,EA3BI,CAAP;AA4BD,C","names":["groups","settings","idKey","groupIdKey","Error","reduce","acc","group","group_type","includes","concat","ids","name","displayName","forbidOverlappingEvents","maxNumWorkingHours","maxNumDailyWorkingHours","minBreakLength","disableDayLengthPunishment","weight","rank","days","length","intervals","lockedTimes"],"sourceRoot":"","sources":["../../../../src/RS/v2/from/groups.ts"],"sourcesContent":[null]}

package/dist/RS/v2/from/index.d.ts

@@ -1,16 +1,16 @@
 export default class {
     static availableDependency: (data: any, settings: import("../types/settings").Settings) => any;
-    static courseEvent: (courseEvents: (number | import("../types/course-events").CourseEvent)[], course: import("../types/collections").Collection, teachersList: string[], groupsList: string[], settings: import("../types/settings").Settings) => any;
-    static collection: (courses: (import("../types/collections").Collection | import("../types/collections").Collection[])[], teachersList: string[], groupsList: string[], settings: import("../types/settings").Settings, overlapGroup?: number) => import("../../../core/types/courses").Course[];
-    static day: (days: any, settings: import("../types/settings").Settings) => any;
-    static dependency: (dependencies: (string | import("../types/dependencies").Dependency)[], settings: import("../types/settings").Settings) => any[];
-    static group: (groups: import("../types/groups").Group[], settings: import("../types/settings").Settings) => import("../../../core/types/groups").Group[];
+    static courseEvent: (courseEvents: (number | import("../types/course-events").CourseEvent)[], course: import("../types/collections").Collection, teachersList: string[], groupsList: string[], settings: import("../types/settings").Settings) => (import("../../../core/types/common").Deserialized<import("../../../core/types/course-events").CourseEvent> & import("../../../core/types/common").Serialized<Pick<import("../../../core/types/course-events").CourseEvent, "groups" | "teachers">>)[];
+    static collection: (courses: (import("../types/course-events").CourseEvent | import("../types/collections").Collection | (import("../types/course-events").CourseEvent | import("../types/collections").Collection)[])[], teachersList: string[], groupsList: string[], settings: import("../types/settings").Settings, overlapGroup?: number) => import("../../../core/types/common").Deserialized<import("../../../core/types/courses").Course>[];
+    static day: (days: (number | import("../types/days").Day)[], settings: import("../types/settings").Settings) => import("../../../core/types/days").Day[];
+    static dependency: (dependencies: (string | import("../types/dependencies").Dependency)[], settings: import("../types/settings").Settings) => import("../../../core/types/common").Deserialized<import("../../../core/types/locations").Location>[];
+    static group: (groups: import("../types/groups").Group[], settings: import("../types/settings").Settings) => import("../../../core/types/common").Deserialized<import("../../../core/types/groups").Group>[];
     static interval: (intervals: import("../types/intervals").Interval[]) => import("../../../core/types/intervals").Interval[];
-    static lockedTime: (lockedTimes: import("../types/locked-times").LockedTime[]) => import("../../../core/types/locked-times").LockedTime[];
+    static lockedTime: (lockedTimes: import("../types/locked-times").LockedTime[]) => import("../../../core/types/common").Deserialized<import("../../../core/types/locked-times").LockedTime>[];
     static placement: (configuration: import("../types/configurations").Configuration, options?: {
         idKey?: "id" | "_id" | "ids" | undefined;
     }) => [Omit<import("../../../core/types/course-events").CourseEvent, "preferredDuration">[], import("../../../core/types/locked-times").LockedTime[]];
     static schedules: (schedule: import("../types/schedules").Schedule) => import("../../../core/types/common").Deserialized<import("../../../core/types/divisions").Division>;
-    static setting: (settings: import("../types/settings").Settings, _default: import("../types/default").Default) => import("../../../core/types/division-settings").DivisionSettings;
-    static teacher: (teachers: import("../types/groups").Group[], settings: any) => import("../../../core/types/teachers").Teacher[];
+    static setting: (settings: import("../types/settings").Settings, _default: import("../types/default").Default) => Omit<import("../../../core/types/division-settings").DivisionSettings, "belongsTo" | "defaultLunch">;
+    static teacher: (teachers: import("../types/groups").Group[], settings: import("../types/settings").Settings) => import("../../../core/types/common").Deserialized<import("../../../core/types/teachers").Teacher>[];
 }

package/dist/RS/v2/from/locked-times.d.ts

@@ -1,4 +1,5 @@
 import { LockedTime } from '../types/locked-times';
 import { LockedTime as SourceLockedTime } from '../../../core/types/locked-times';
-declare const _default: (lockedTimes: LockedTime[]) => SourceLockedTime[];
+import { Deserialized } from '../../../core/types/common';
+declare const _default: (lockedTimes: LockedTime[]) => Deserialized<SourceLockedTime>[];
 export default _default;

package/dist/RS/v2/from/locked-times.js

@@ -11,9 +11,9 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 var _default = lockedTimes => {
   return lockedTimes.reduce((acc, lockedTime) => {
-    if (lockedTime.day == null) throw new Error('A locked time missing days field');
-    if (lockedTime.start == null) throw new Error('A locked time missing start field');
-    if (!lockedTime.length) throw new Error('A locked time missing length field');
+    if (lockedTime.day == null) throw new Error('(RS::V2::From::Dependencies) A locked time missing days field');
+    if (lockedTime.start == null) throw new Error('(RS::V2::From::Dependencies) A locked time missing start field');
+    if (!lockedTime.length) throw new Error('(RS::V2::From::Dependencies) A locked time missing length field');
     var start = (0, _getDate.default)(lockedTime.day, lockedTime.start.toFixed(2).replace('.', ':'));
     var end = start.clone().add(lockedTime.length, 'minutes');
     return acc.concat({

package/dist/RS/v2/from/locked-times.js.map

@@ -1 +1 @@
-{"version":3,"file":"locked-times.js","mappings":";;;;;;;AAEA;;;;eAMgBA,WAAD,IAAkD;EAC/D,OAAOA,WAAW,CAACC,MAAZ,CAAmB,CAACC,GAAD,EAAWC,UAAX,KAAqC;IAE7D,IAAIA,UAAU,CAACC,GAAX,IAAkB,IAAtB,EACE,MAAM,IAAIC,KAAJ,CAAU,kCAAV,CAAN;IAEF,IAAIF,UAAU,CAACG,KAAX,IAAoB,IAAxB,EACE,MAAM,IAAID,KAAJ,CAAU,mCAAV,CAAN;IAEF,IAAI,CAAEF,UAAU,CAACI,MAAjB,EACE,MAAM,IAAIF,KAAJ,CAAU,oCAAV,CAAN;IAEF,IAAMC,KAAK,GAAG,sBAAQH,UAAU,CAACC,GAAnB,EAAwBD,UAAU,CAACG,KAAX,CAAkBE,OAAlB,CAA0B,CAA1B,EAA6BC,OAA7B,CAAqC,GAArC,EAA0C,GAA1C,CAAxB,CAAd;IACA,IAAMC,GAAG,GAAKJ,KAAK,CAACK,KAAN,GAAcC,GAAd,CAAkBT,UAAU,CAACI,MAA7B,EAAqC,SAArC,CAAd;IAEA,OAAOL,GAAG,CAACW,MAAJ,CAAW;MAChBC,WAAW,EAAEX,UAAU,CAACY,IADR;MAEhBT,KAAK,EAAQA,KAFG;MAGhBI,GAAG,EAAUA;IAHG,CAAX,CAAP;EAKD,CAnBM,EAmBJ,EAnBI,CAAP;AAoBD,C","names":["lockedTimes","reduce","acc","lockedTime","day","Error","start","length","toFixed","replace","end","clone","add","concat","displayName","name"],"sourceRoot":"","sources":["../../../../src/RS/v2/from/locked-times.ts"],"sourcesContent":[null]}
+{"version":3,"file":"locked-times.js","mappings":";;;;;;;AAAA;;;;eAOgBA,WAAD,IAA8B;EAC3C,OAAOA,WAAW,CAACC,MAAZ,CAAmB,CAACC,GAAD,EAAwCC,UAAxC,KAAsD;IAE9E,IAAIA,UAAU,CAACC,GAAX,IAAkB,IAAtB,EACE,MAAM,IAAIC,KAAJ,CAAU,+DAAV,CAAN;IAEF,IAAIF,UAAU,CAACG,KAAX,IAAoB,IAAxB,EACE,MAAM,IAAID,KAAJ,CAAU,gEAAV,CAAN;IAEF,IAAI,CAAEF,UAAU,CAACI,MAAjB,EACE,MAAM,IAAIF,KAAJ,CAAU,iEAAV,CAAN;IAEF,IAAMC,KAAK,GAAG,sBAAQH,UAAU,CAACC,GAAnB,EAAwBD,UAAU,CAACG,KAAX,CAAkBE,OAAlB,CAA0B,CAA1B,EAA6BC,OAA7B,CAAqC,GAArC,EAA0C,GAA1C,CAAxB,CAAd;IACA,IAAMC,GAAG,GAAKJ,KAAK,CAACK,KAAN,GAAcC,GAAd,CAAkBT,UAAU,CAACI,MAA7B,EAAqC,SAArC,CAAd;IAEA,OAAOL,GAAG,CAACW,MAAJ,CAAW;MAChBC,WAAW,EAAEX,UAAU,CAACY,IADR;MAEhBT,KAAK,EAAQA,KAFG;MAGhBI,GAAG,EAAUA;IAHG,CAAX,CAAP;EAKD,CAnBM,EAmBJ,EAnBI,CAAP;AAoBD,C","names":["lockedTimes","reduce","acc","lockedTime","day","Error","start","length","toFixed","replace","end","clone","add","concat","displayName","name"],"sourceRoot":"","sources":["../../../../src/RS/v2/from/locked-times.ts"],"sourcesContent":[null]}

package/dist/RS/v2/from/placements.js.map

@@ -1 +1 @@
-{"version":3,"file":"placements.js","mappings":";;;;;;;AAAA;;AACA;;;;eAYe,kBAACA,aAAD,EAAkH;EAAA,IAAnFC,OAAmF,uEAAhE,EAAgE;EAE/H,IAAMC,KAAK,GAAsBD,OAAO,CAACC,KAAR,IAAiB,IAAlD;EAEA,IAAM;IAAEC;EAAF,IAAaH,aAAb,aAAaA,aAAb,cAAaA,aAAb,GAA8B,EAApC;EAEA,OAAOI,gBAAEC,MAAF,CAASF,MAAT,EAAiB,OAAkFG,KAAlF,KAAsG;IAAA;;IAAA,IAArG,CAACC,QAAD,EAAWC,SAAX,CAAqG;IAC5H,IAAM,CAACC,UAAD,EAAaC,EAAb,IAAmBJ,KAAK,CAACI,EAAN,CAASC,KAAT,CAAe,GAAf,CAAzB;IACA,IAAIF,UAAU,IAAI,QAAlB,EACEF,QAAQ,GAAGA,QAAQ,CAACK,MAAT,CAAgB;MACzB,CAACV,KAAD,GAAcQ,EADW;MAEzBG,MAAM,EAAQ,KAFW;MAGzBC,WAAW,yBAAGR,KAAK,CAACS,YAAT,qEAAyB,EAHX;MAIzBC,KAAK,EAASC,gBAAOC,GAAP,CAAW,kBAAX,EAA+BC,GAA/B,CAAmCb,KAAK,CAACc,GAAzC,EAA8C,MAA9C,EAAsDD,GAAtD,CAA0Db,KAAK,CAACU,KAAhE,EAAuE,SAAvE,EAAkFK,WAAlF,EAJW;MAKzBC,GAAG,EAAWL,gBAAOC,GAAP,CAAW,kBAAX,EAA+BC,GAA/B,CAAmCb,KAAK,CAACc,GAAzC,EAA8C,MAA9C,EAAsDD,GAAtD,CAA0Db,KAAK,CAACgB,GAAhE,EAAqE,SAArE,EAAgFD,WAAhF;IALW,CAAhB,CAAX;IAOF,IAAIZ,UAAU,IAAI,aAAlB,EACED,SAAS,GAAGA,SAAS,CAACI,MAAV,CAAiB;MAC3B,CAACV,KAAD,GAAcQ,EADa;MAE3BM,KAAK,EAASC,gBAAOC,GAAP,CAAW,kBAAX,EAA+BC,GAA/B,CAAmCb,KAAK,CAACc,GAAzC,EAA8C,MAA9C,EAAsDD,GAAtD,CAA0Db,KAAK,CAACU,KAAhE,EAAuE,SAAvE,EAAkFK,WAAlF,EAFa;MAG3BC,GAAG,EAAWL,gBAAOC,GAAP,CAAW,kBAAX,EAA+BC,GAA/B,CAAmCb,KAAK,CAACc,GAAzC,EAA8C,MAA9C,EAAsDD,GAAtD,CAA0Db,KAAK,CAACgB,GAAhE,EAAqE,SAArE,EAAgFD,WAAhF;IAHa,CAAjB,CAAZ;IAKF,OAAO,CAACd,QAAD,EAAWC,SAAX,CAAP;EACD,CAjBM,EAiBJ,CAAC,EAAD,EAAK,EAAL,CAjBI,CAAP;AAkBD,C","names":["configuration","options","idKey","events","_","reduce","event","eventAcc","lockedAcc","collection","id","split","concat","parked","inLocations","dependencies","start","moment","utc","add","day","toISOString","end"],"sourceRoot":"","sources":["../../../../src/RS/v2/from/placements.ts"],"sourcesContent":[null]}
+{"version":3,"file":"placements.js","mappings":";;;;;;;AAAA;;AACA;;;;eAYe,kBAACA,aAAD,EAAkH;EAAA,IAAnFC,OAAmF,uEAAhE,EAAgE;EAE/H,IAAMC,KAAK,GAAED,OAAO,CAACC,KAAR,IAAiB,IAA9B;EAEA,IAAM;IAAEC;EAAF,IAAaH,aAAb,aAAaA,aAAb,cAAaA,aAAb,GAA8B,EAApC;EAEA,OAAOI,gBAAEC,MAAF,CAASF,MAAT,EAAiB,OAAkFG,KAAlF,KAAsG;IAAA;;IAAA,IAArG,CAACC,QAAD,EAAWC,SAAX,CAAqG;IAC5H,IAAM,CAACC,UAAD,EAAaC,EAAb,IAAmBJ,KAAK,CAACI,EAAN,CAASC,KAAT,CAAe,GAAf,CAAzB;IACA,IAAIF,UAAU,IAAI,QAAlB,EACEF,QAAQ,GAAGA,QAAQ,CAACK,MAAT,CAAgB;MACzB,CAACV,KAAD,GAAcQ,EADW;MAEzBG,MAAM,EAAQ,KAFW;MAGzBC,WAAW,yBAAGR,KAAK,CAACS,YAAT,qEAAyB,EAHX;MAIzBC,KAAK,EAASC,gBAAOC,GAAP,CAAW,kBAAX,EAA+BC,GAA/B,CAAmCb,KAAK,CAACc,GAAzC,EAA8C,MAA9C,EAAsDD,GAAtD,CAA0Db,KAAK,CAACU,KAAhE,EAAuE,SAAvE,EAAkFK,WAAlF,EAJW;MAKzBC,GAAG,EAAWL,gBAAOC,GAAP,CAAW,kBAAX,EAA+BC,GAA/B,CAAmCb,KAAK,CAACc,GAAzC,EAA8C,MAA9C,EAAsDD,GAAtD,CAA0Db,KAAK,CAACgB,GAAhE,EAAqE,SAArE,EAAgFD,WAAhF;IALW,CAAhB,CAAX;IAOF,IAAIZ,UAAU,IAAI,aAAlB,EACED,SAAS,GAAGA,SAAS,CAACI,MAAV,CAAiB;MAC3B,CAACV,KAAD,GAAcQ,EADa;MAE3BM,KAAK,EAASC,gBAAOC,GAAP,CAAW,kBAAX,EAA+BC,GAA/B,CAAmCb,KAAK,CAACc,GAAzC,EAA8C,MAA9C,EAAsDD,GAAtD,CAA0Db,KAAK,CAACU,KAAhE,EAAuE,SAAvE,EAAkFK,WAAlF,EAFa;MAG3BC,GAAG,EAAWL,gBAAOC,GAAP,CAAW,kBAAX,EAA+BC,GAA/B,CAAmCb,KAAK,CAACc,GAAzC,EAA8C,MAA9C,EAAsDD,GAAtD,CAA0Db,KAAK,CAACgB,GAAhE,EAAqE,SAArE,EAAgFD,WAAhF;IAHa,CAAjB,CAAZ;IAKF,OAAO,CAACd,QAAD,EAAWC,SAAX,CAAP;EACD,CAjBM,EAiBJ,CAAC,EAAD,EAAK,EAAL,CAjBI,CAAP;AAkBD,C","names":["configuration","options","idKey","events","_","reduce","event","eventAcc","lockedAcc","collection","id","split","concat","parked","inLocations","dependencies","start","moment","utc","add","day","toISOString","end"],"sourceRoot":"","sources":["../../../../src/RS/v2/from/placements.ts"],"sourcesContent":[null]}

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

@@ -5,11 +5,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _lodash = _interopRequireDefault(require("lodash"));
+
 var _dependencies = _interopRequireDefault(require("./dependencies"));
 
-var _teachers = _interopRequireDefault(require("./teachers"));
+var _teachers2 = _interopRequireDefault(require("./teachers"));
 
-var _groups = _interopRequireDefault(require("./groups"));
+var _groups2 = _interopRequireDefault(require("./groups"));
 
 var _collections = _interopRequireDefault(require("./collections"));
 
@@ -34,36 +36,43 @@ var _default2 = schedule => {
       groups,
       events,
       areas
-    }
+    } = {}
   } = schedule;
   var [configuration, ...meta] = schedule.output || [];
-  var teachers;
-  var locations;
-  if (!settings) throw new Error("Settings cannot be undefined");
-  if (dependencies) locations = (0, _dependencies.default)(dependencies, settings);
-  if (groups) teachers = (0, _teachers.default)(groups, settings);
-  if (groups) groups = (0, _groups.default)(groups, settings);
-  if (events) events = (0, _collections.default)(events, (teachers || []).map(x => x.ids), (groups || []).map(x => x.ids), settings);
-  settings = (0, _settings.default)(settings, _default);
 
-  if (configuration) {
-    var _events;
+  var _courses;
+
+  var _groups;
+
+  var _teachers;
 
+  var _locations;
+
+  if (!settings) throw new Error("(RS::V2::From::Dependencies) Settings cannot be undefined");
+  if (dependencies) _locations = (0, _dependencies.default)(dependencies, settings);
+  if (groups) _teachers = (0, _teachers2.default)(groups, settings);
+  if (groups) _groups = (0, _groups2.default)(groups, settings);
+  if (events) _courses = (0, _collections.default)(events, (_teachers || []).map(x => x.ids).filter(Boolean), (_groups || []).map(x => x.ids).filter(Boolean), settings);
+
+  if (configuration) {
     var [_placements] = (0, _placements2.default)(configuration, {
       idKey: 'ids'
     });
     var i = -1;
-    (_events = events) === null || _events === void 0 ? void 0 : _events.forEach(collection => {
+    events === null || events === void 0 ? void 0 : events.forEach(collection => {
       var _collection$events;
 
+      if (Array.isArray(collection)) return;
+      if (!('events' in collection)) return;
       (_collection$events = collection.events) === null || _collection$events === void 0 ? void 0 : _collection$events.forEach(event => {
+        if (_lodash.default.isNumber(event)) return;
         i++;
 
         var _placedEvent = _placements.find(_ref => {
           var {
             ids
           } = _ref;
-          return ids == event.ids;
+          return ids == event.id;
         });
 
         if (_placedEvent) return Object.assign(event, _placedEvent);
@@ -72,18 +81,18 @@ var _default2 = schedule => {
     });
   }
 
-  return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, locations && {
-    locations
-  }), teachers && {
-    teachers
+  return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, _locations && {
+    locations: _locations
+  }), _teachers && {
+    teachers: _teachers
   }), groups && {
-    groups
+    groups: _groups
   }), events && {
-    courses: events
+    courses: _courses
   }), areas && {
     area: areas
   }), settings && {
-    settings
+    settings: (0, _settings.default)(settings, _default)
   });
 };
 

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

@@ -1 +1 @@
-{"version":3,"file":"schedules.js","mappings":";;;;;;;AAKA;;AACA;;AACA;;AACA;;AACA;;AACA;;;;;;;;;;gBAEgBA,QAAD,IAAyD;EAEtE,IAAI;IACFC,KAAK,EAAE;MACLC,QADK;MAELC,OAAO,EAAEC,QAFJ;MAGLC,YAHK;MAILC,MAJK;MAKLC,MALK;MAMLC;IANK;EADL,IASKR,QATT;EAWA,IAAM,CAACS,aAAD,EAAgB,GAAGC,IAAnB,IAA2BV,QAAQ,CAACW,MAAT,IAAmB,EAApD;EAEA,IAAIC,QAAJ;EACA,IAAIC,SAAJ;EAEA,IAAI,CAAEX,QAAN,EACE,MAAM,IAAIY,KAAJ,gCAAN;EAEF,IAAIT,YAAJ,EACEQ,SAAS,GAAM,2BAAgBR,YAAhB,EAA8BH,QAA9B,CAAf;EACF,IAAII,MAAJ,EACEM,QAAQ,GAAO,uBAAYN,MAAZ,EAAoBJ,QAApB,CAAf;EACF,IAAII,MAAJ,EACEA,MAAM,GAAS,qBAAUA,MAAV,EAAkBJ,QAAlB,CAAf;EACF,IAAIK,MAAJ,EACEA,MAAM,GAAS,0BAAeA,MAAf,EACe,CAACK,QAAQ,IAAI,EAAb,EAAiBG,GAAjB,CAAsBC,CAAD,IAAYA,CAAC,CAACC,GAAnC,CADf,EAEe,CAACX,MAAM,IAAI,EAAX,EAAeS,GAAf,CAAoBC,CAAD,IAAYA,CAAC,CAACC,GAAjC,CAFf,EAGef,QAHf,CAAf;EAIFA,QAAQ,GAAS,uBAAYA,QAAZ,EAAsBE,QAAtB,CAAjB;;EAEA,IAAIK,aAAJ,EAAmB;IAAA;;IACjB,IAAM,CAACS,WAAD,IAAgB,0BAAcT,aAAd,EAA6B;MAAEU,KAAK,EAAE;IAAT,CAA7B,CAAtB;IAEA,IAAIC,CAAC,GAAW,CAAC,CAAjB;IAEA,iBAAM,UAAN,0CAAQC,OAAR,CAAiBC,UAAD,IAAoB;MAAA;;MAClC,gCAAU,CAACf,MAAX,0EAAmBc,OAAnB,CAA4BE,KAAD,IAAe;QACxCH,CAAC;;QACD,IAAMI,YAAY,GAAQN,WAAW,CAACO,IAAZ,CAAiB;UAAA,IAAC;YAAER;UAAF,CAAD;UAAA,OAAaA,GAAG,IAAIM,KAAK,CAACN,GAA1B;QAAA,CAAjB,CAA1B;;QAEA,IAAIO,YAAJ,EACE,OAAOE,MAAM,CAACC,MAAP,CAAcJ,KAAd,EAAqBC,YAArB,CAAP;QAEF,OAAOE,MAAM,CAACC,MAAP,CAAcJ,KAAd,EAAqBL,WAAW,CAACE,CAAD,CAAhC,CAAP;MACD,CARD;IASD,CAVD;EAWD;;EAED,+FACKP,SAAS,IAAI;IAAEA;EAAF,CADlB,GAEKD,QAAQ,IAAK;IAAEA;EAAF,CAFlB,GAGKN,MAAM,IAAO;IAAEA;EAAF,CAHlB,GAIKC,MAAM,IAAO;IAAEqB,OAAO,EAAErB;EAAX,CAJlB,GAKKC,KAAK,IAAQ;IAAEqB,IAAI,EAAErB;EAAR,CALlB,GAMKN,QAAQ,IAAK;IAAEA;EAAF,CANlB;AAQD,C","names":["schedule","input","settings","default","_default","dependencies","groups","events","areas","configuration","meta","output","teachers","locations","Error","map","x","ids","_placements","idKey","i","forEach","collection","event","_placedEvent","find","Object","assign","courses","area"],"sourceRoot":"","sources":["../../../../src/RS/v2/from/schedules.ts"],"sourcesContent":[null]}
+{"version":3,"file":"schedules.js","mappings":";;;;;;;AAAA;;AAOA;;AACA;;AACA;;AACA;;AACA;;AACA;;;;;;;;;;gBAEgBA,QAAD,IAAyD;EACtE,IAAI;IACFC,KAAK,EAAE;MACLC,QADK;MAELC,OAAO,EAAEC,QAFJ;MAGLC,YAHK;MAILC,MAJK;MAKLC,MALK;MAMLC;IANK,IAOH;EARF,IASAR,QATJ;EAWA,IAAM,CAACS,aAAD,EAAgB,GAAGC,IAAnB,IAA2BV,QAAQ,CAACW,MAAT,IAAmB,EAApD;;EAEA,IAAIC,QAAJ;;EACA,IAAIC,OAAJ;;EACA,IAAIC,SAAJ;;EACA,IAAIC,UAAJ;;EAEA,IAAI,CAAEb,QAAN,EACE,MAAM,IAAIc,KAAJ,6DAAN;EAEF,IAAIX,YAAJ,EACEU,UAAU,GAAK,2BAAgBV,YAAhB,EAA8BH,QAA9B,CAAf;EACF,IAAII,MAAJ,EACEQ,SAAS,GAAM,wBAAYR,MAAZ,EAAoBJ,QAApB,CAAf;EACF,IAAII,MAAJ,EACEO,OAAO,GAAQ,sBAAUP,MAAV,EAAkBJ,QAAlB,CAAf;EACF,IAAIK,MAAJ,EACEK,QAAQ,GAAO,0BAAeL,MAAf,EACe,CAACO,SAAS,IAAI,EAAd,EAAkBG,GAAlB,CAAsBC,CAAC,IAAGA,CAAC,CAACC,GAA5B,EAAkCC,MAAlC,CAAyCC,OAAzC,CADf,EAEe,CAACR,OAAO,IAAI,EAAZ,EAAgBI,GAAhB,CAAoBC,CAAC,IAAIA,CAAC,CAACC,GAA3B,EAAiCC,MAAjC,CAAwCC,OAAxC,CAFf,EAGenB,QAHf,CAAf;;EAKF,IAAIO,aAAJ,EAAmB;IACjB,IAAM,CAACa,WAAD,IAAgB,0BAAcb,aAAd,EAA6B;MAAEc,KAAK,EAAE;IAAT,CAA7B,CAAtB;IAEA,IAAIC,CAAC,GAAW,CAAC,CAAjB;IAEAjB,MAAM,SAAN,UAAM,WAAN,kBAAM,CAAEkB,OAAR,CAAiBC,UAAD,IAAe;MAAA;;MAC7B,IAAIC,KAAK,CAACC,OAAN,CAAcF,UAAd,CAAJ,EACE;MAEF,IAAI,EAAG,YAAYA,UAAf,CAAJ,EACE;MAEF,gCAAU,CAACnB,MAAX,0EAAmBkB,OAAnB,CAA2BI,KAAK,IAAG;QACjC,IAAIC,gBAAEC,QAAF,CAAWF,KAAX,CAAJ,EACE;QAEFL,CAAC;;QACD,IAAMQ,YAAY,GAAGV,WAAW,CAACW,IAAZ,CAAiB;UAAA,IAAC;YAAEd;UAAF,CAAD;UAAA,OAAaA,GAAG,IAAIU,KAAK,CAACK,EAA1B;QAAA,CAAjB,CAArB;;QAEA,IAAIF,YAAJ,EACE,OAAOG,MAAM,CAACC,MAAP,CAAcP,KAAd,EAAqBG,YAArB,CAAP;QAEF,OAAOG,MAAM,CAACC,MAAP,CAAcP,KAAd,EAAqBP,WAAW,CAACE,CAAD,CAAhC,CAAP;MACD,CAXD;IAYD,CAnBD;EAoBD;;EAED,+FACKT,UAAU,IAAI;IAAEsB,SAAS,EAAEtB;EAAb,CADnB,GAEKD,SAAS,IAAK;IAAEwB,QAAQ,EAAGxB;EAAb,CAFnB,GAGKR,MAAM,IAAQ;IAAEA,MAAM,EAAKO;EAAb,CAHnB,GAIKN,MAAM,IAAQ;IAAEgC,OAAO,EAAI3B;EAAb,CAJnB,GAKKJ,KAAK,IAAS;IAAEgC,IAAI,EAAEhC;EAAR,CALnB,GAMKN,QAAQ,IAAM;IAAEA,QAAQ,EAAE,uBAAYA,QAAZ,EAAsBE,QAAtB;EAAZ,CANnB;AAQD,C","names":["schedule","input","settings","default","_default","dependencies","groups","events","areas","configuration","meta","output","_courses","_groups","_teachers","_locations","Error","map","x","ids","filter","Boolean","_placements","idKey","i","forEach","collection","Array","isArray","event","_","isNumber","_placedEvent","find","id","Object","assign","locations","teachers","courses","area"],"sourceRoot":"","sources":["../../../../src/RS/v2/from/schedules.ts"],"sourcesContent":[null]}

package/dist/RS/v2/from/settings.d.ts

@@ -1,5 +1,5 @@
 import { Settings } from '../types/settings';
 import { Default } from '../types/default';
 import { DivisionSettings } from '../../../core/types/division-settings';
-declare const _default_1: (settings: Settings, _default: Default) => DivisionSettings;
+declare const _default_1: (settings: Settings, _default: Default) => Omit<DivisionSettings, 'belongsTo' | 'defaultLunch'>;
 export default _default_1;

package/dist/RS/v2/from/settings.js.map

@@ -1 +1 @@
-{"version":3,"file":"settings.js","mappings":";;;;;;;AAIA;;;;gBAEe,CAACA,QAAD,EAAqBC,QAArB,KAA4D;EAAA;;EAEzE,IAAIC,IAAI,GAAID,QAAQ,CAACE,mBAArB;EACA,IAAIC,KAAK,GAAGH,QAAQ,CAACI,uBAArB;EAEA,OAAO;IACLC,OAAO,EAA8BN,QAAQ,CAACM,OADzC;IAELC,cAAc,EAAuBP,QAAQ,CAACO,cAFzC;IAILC,QAAQ,2BAA6BP,QAAQ,CAACQ,SAAT,CAAmB,CAAnB,EAAsBC,GAAnD,0DAA6B,sBAA2BC,OAA3B,CAAmC,CAAnC,EAAsCC,OAAtC,CAA8C,GAA9C,EAAmD,GAAnD,CAJhC;IAKLC,MAAM,4BAA+BZ,QAAQ,CAACQ,SAAT,CAAmB,CAAnB,EAAsBK,GAArD,2DAA+B,uBAA2BH,OAA3B,CAAmC,CAAnC,EAAsCC,OAAtC,CAA8C,GAA9C,EAAmD,GAAnD,CALhC;IAOLG,mCAAmC,EAAEd,QAAQ,CAACe,wBAPzC;IAQLC,8BAA8B,EAAOhB,QAAQ,CAACiB,mBARzC;IASLC,8BAA8B,EAAOC,gBAAEC,QAAF,CAAWnB,IAAX,IAAmB,OAAKA,IAAI,CAACoB,GAAL,GAAWpB,IAAI,CAACqB,GAArB,CAAnB,GAA+CH,gBAAEI,QAAF,CAAWtB,IAAX,IAAmBA,IAAnB,GAA0B,CATzG;IAWLuB,eAAe,2BAAsBxB,QAAQ,CAACwB,eAA/B,0DAAsB,sBAA0Bd,OAA1B,CAAkC,CAAlC,EAAqCC,OAArC,CAA6C,GAA7C,EAAkD,GAAlD,CAXhC;IAYLc,mBAAmB,EAAkBzB,QAAQ,CAAC0B,YAZzC;IAcLC,yBAAyB,EAAY3B,QAAQ,CAAC4B,kBAdzC;IAeLC,8BAA8B,EAAOV,gBAAEW,OAAF,CAAU3B,KAAV,IAAmBA,KAAK,CAAC,CAAD,CAAxB,GAA8BA,KAf9D;IAiBL4B,qBAAqB,EAAgB/B,QAAQ,CAACgC,cAjBzC;IAkBLC,gBAAgB,EAAqBjC,QAAQ,CAACkC,SAlBzC;IAmBLC,cAAc,EAAuBnC,QAAQ,CAACoC,OAnBzC;IAqBLC,kBAAkB,EAAmBrC,QAAQ,CAACsC,WArBzC;IAsBLC,kBAAkB,EAAmBvC,QAAQ,CAACwC,WAtBzC;IAuBLC,mBAAmB,EAAkBzC,QAAQ,CAAC0C;EAvBzC,CAAP;AAyBD,C","names":["settings","_default","EMBL","eventMinBreakLength","MNDWH","maxNumDailyWorkingHours","numDays","discretization","dayStart","intervals","beg","toFixed","replace","dayEnd","end","defaultDependencyMinimumBreakLength","dependencyMinBreakLength","defaultGroupMinimumBreakLength","groupMinBreakLength","defaultEventMinimumBreakLength","_","isObject","bef","aft","isNumber","potentialCenter","defaultEventDensity","eventDensity","defaultMaxNumWorkingHours","maxNumWorkingHours","defaultMaxNumDailyWorkingHours","isArray","defaultDependencyRank","dependencyRank","defaultGroupRank","groupRank","defaultDayRank","dayRank","defaultEventWeight","eventWeight","defaultGroupWeight","groupWeight","defaultCourseWeight","collectionWeight"],"sourceRoot":"","sources":["../../../../src/RS/v2/from/settings.ts"],"sourcesContent":[null]}
+{"version":3,"file":"settings.js","mappings":";;;;;;;AAAA;;;;gBAOe,CAACA,QAAD,EAAqBC,QAArB,KAAgG;EAAA;;EAE7G,IAAIC,IAAI,GAAID,QAAQ,CAACE,mBAArB;EACA,IAAIC,KAAK,GAAGH,QAAQ,CAACI,uBAArB;EAEA,OAAO;IACLC,OAAO,EAA8BN,QAAQ,CAACM,OADzC;IAELC,cAAc,EAAuBP,QAAQ,CAACO,cAFzC;IAILC,QAAQ,2BAA6BP,QAAQ,CAACQ,SAAT,CAAmB,CAAnB,EAAsBC,GAAnD,0DAA6B,sBAA2BC,OAA3B,CAAmC,CAAnC,EAAsCC,OAAtC,CAA8C,GAA9C,EAAmD,GAAnD,CAJhC;IAKLC,MAAM,4BAA+BZ,QAAQ,CAACQ,SAAT,CAAmB,CAAnB,EAAsBK,GAArD,2DAA+B,uBAA2BH,OAA3B,CAAmC,CAAnC,EAAsCC,OAAtC,CAA8C,GAA9C,EAAmD,GAAnD,CALhC;IAOLG,mCAAmC,EAAEd,QAAQ,CAACe,wBAPzC;IAQLC,8BAA8B,EAAOhB,QAAQ,CAACiB,mBARzC;IASLC,8BAA8B,EAAOC,gBAAEC,QAAF,CAAWnB,IAAX,IAAmB,OAAKA,IAAI,CAACoB,GAAL,GAAWpB,IAAI,CAACqB,GAArB,CAAnB,GAA+CH,gBAAEI,QAAF,CAAWtB,IAAX,IAAmBA,IAAnB,GAA0B,CATzG;IAWLuB,eAAe,2BAAsBxB,QAAQ,CAACwB,eAA/B,0DAAsB,sBAA0Bd,OAA1B,CAAkC,CAAlC,EAAqCC,OAArC,CAA6C,GAA7C,EAAkD,GAAlD,CAXhC;IAYLc,mBAAmB,EAAkBzB,QAAQ,CAAC0B,YAZzC;IAcLC,yBAAyB,EAAY3B,QAAQ,CAAC4B,kBAdzC;IAeLC,8BAA8B,EAAOV,gBAAEW,OAAF,CAAU3B,KAAV,IAAmBA,KAAK,CAAC,CAAD,CAAxB,GAA8BA,KAf9D;IAiBL4B,qBAAqB,EAAgB/B,QAAQ,CAACgC,cAjBzC;IAkBLC,gBAAgB,EAAqBjC,QAAQ,CAACkC,SAlBzC;IAmBLC,cAAc,EAAuBnC,QAAQ,CAACoC,OAnBzC;IAqBLC,kBAAkB,EAAmBrC,QAAQ,CAACsC,WArBzC;IAsBLC,kBAAkB,EAAmBvC,QAAQ,CAACwC,WAtBzC;IAuBLC,mBAAmB,EAAkBzC,QAAQ,CAAC0C;EAvBzC,CAAP;AAyBD,C","names":["settings","_default","EMBL","eventMinBreakLength","MNDWH","maxNumDailyWorkingHours","numDays","discretization","dayStart","intervals","beg","toFixed","replace","dayEnd","end","defaultDependencyMinimumBreakLength","dependencyMinBreakLength","defaultGroupMinimumBreakLength","groupMinBreakLength","defaultEventMinimumBreakLength","_","isObject","bef","aft","isNumber","potentialCenter","defaultEventDensity","eventDensity","defaultMaxNumWorkingHours","maxNumWorkingHours","defaultMaxNumDailyWorkingHours","isArray","defaultDependencyRank","dependencyRank","defaultGroupRank","groupRank","defaultDayRank","dayRank","defaultEventWeight","eventWeight","defaultGroupWeight","groupWeight","defaultCourseWeight","collectionWeight"],"sourceRoot":"","sources":["../../../../src/RS/v2/from/settings.ts"],"sourcesContent":[null]}

package/dist/RS/v2/from/teachers.d.ts

@@ -1,4 +1,6 @@
 import { Group } from '../types/groups';
+import { Settings } from '../types/settings';
 import { Teacher as SourceTeacher } from '../../../core/types/teachers';
-declare const _default: (teachers: Group[], settings: any) => SourceTeacher[];
+import { Deserialized } from '../../../core/types/common';
+declare const _default: (teachers: Group[], settings: Settings) => Deserialized<SourceTeacher>[];
 export default _default;

package/dist/RS/v2/from/teachers.js

@@ -23,12 +23,12 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 var _default = (teachers, settings) => {
   var idKey = settings.groupIdKey;
-  if (!idKey) throw new Error('property "groupIdKey" in settings is undefined');
+  if (!idKey) throw new Error('(RS::V2::From::Teachers) property "groupIdKey" in settings is undefined');
   return teachers.reduce((acc, teacher) => {
     var _teacher$days, _teacher$intervals, _teacher$lockedTimes;
 
-    if (!['personal', 'classes'].includes(teacher.group_type)) throw new Error('property "group_type" must exist on all entries in "groups" array');
-    if (!teacher[idKey]) throw new Error('A teacher does not have a unique key');
+    if (!['personal', 'classes'].includes(teacher.group_type)) throw new Error('(RS::V2::From::Teachers) property "group_type" must exist on all entries in "groups" array');
+    if (!teacher[idKey]) throw new Error('(RS::V2::From::Teachers) A teacher does not have a unique key');
     if (teacher.group_type != 'personal') return acc;
     return acc.concat(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
       ids: teacher[idKey]

package/dist/RS/v2/from/teachers.js.map

@@ -1 +1 @@
-{"version":3,"file":"teachers.js","mappings":";;;;;;;AAAA;;AACA;;AACA;;AACA;;;;;;;;;;eAMe,CAACA,QAAD,EACCC,QADD,KACqC;EAElD,IAAMC,KAAK,GAAgBD,QAAQ,CAACE,UAApC;EAEA,IAAI,CAAED,KAAN,EACE,MAAM,IAAIE,KAAJ,CAAU,gDAAV,CAAN;EAEF,OAAOJ,QAAQ,CAACK,MAAT,CAAgB,CAACC,GAAD,EAAaC,OAAb,KAA+B;IAAA;;IAEpD,IAAI,CAAE,CAAC,UAAD,EAAa,SAAb,EAAwBC,QAAxB,CAAiCD,OAAO,CAACE,UAAzC,CAAN,EACE,MAAM,IAAIL,KAAJ,CAAU,mEAAV,CAAN;IAEF,IAAI,CAAEG,OAAO,CAACL,KAAD,CAAb,EACE,MAAM,IAAIE,KAAJ,CAAU,sCAAV,CAAN;IAEF,IAAIG,OAAO,CAACE,UAAR,IAAsB,UAA1B,EACE,OAAOH,GAAP;IAEF,OAAOA,GAAG,CAACI,MAAJ;MACLC,GAAG,EAAyEJ,OAAO,CAACL,KAAD;IAD9E,GAEFK,OAAO,CAACK,IAAR,IAA2C;MAAEC,WAAW,EAAiBN,OAAO,CAACK;IAAtC,CAFzC,GAGF,6BAAgCL,OAAhC,IAA2C;MAAEO,uBAAuB,EAAKP,OAAO,CAACO;IAAtC,CAHzC,GAIF,wBAAgCP,OAAhC,IAA2C;MAAEQ,kBAAkB,EAAUR,OAAO,CAACQ;IAAtC,CAJzC,GAKF,6BAAgCR,OAAhC,IAA2C;MAAES,uBAAuB,EAAKT,OAAO,CAACS;IAAtC,CALzC,GAMF,oBAAgCT,OAAhC,IAA2C;MAAEU,cAAc,EAAc,2BAAYV,OAAO,CAACU,cAApB;IAA9B,CANzC,GAOF,gCAAgCV,OAAhC,IAA2C;MAAEW,0BAA0B,EAAEX,OAAO,CAACW;IAAtC,CAPzC,GAQF,YAAgCX,OAAhC,IAA2C;MAAEY,MAAM,EAAsBZ,OAAO,CAACY;IAAtC,CARzC,GASF,UAAgCZ,OAAhC,IAA2C;MAAEa,IAAI,EAAwBb,OAAO,CAACa;IAAtC,CATzC,GAUF,kBAACb,OAAO,CAACc,IAAT,kDAAC,cAAcC,MAAf,KAA2C;MAAED,IAAI,EAAwB,mBAAKd,OAAO,CAACc,IAAb,EAAmBpB,QAAnB;IAA9B,CAVzC,GAWF,uBAACM,OAAO,CAACgB,SAAT,uDAAC,mBAAmBD,MAApB,KAA2C;MAAEC,SAAS,EAAmB,wBAAUhB,OAAO,CAACgB,SAAlB;IAA9B,CAXzC,GAYF,yBAAChB,OAAO,CAACiB,WAAT,yDAAC,qBAAqBF,MAAtB,KAA2C;MAAEE,WAAW,EAAiB,0BAAWjB,OAAO,CAACiB,WAAnB;IAA9B,CAZzC,EAAP;EAcD,CAzBM,EAyBJ,EAzBI,CAAP;AA0BD,C","names":["teachers","settings","idKey","groupIdKey","Error","reduce","acc","teacher","includes","group_type","concat","ids","name","displayName","forbidOverlappingEvents","maxNumWorkingHours","maxNumDailyWorkingHours","minBreakLength","disableDayLengthPunishment","weight","rank","days","length","intervals","lockedTimes"],"sourceRoot":"","sources":["../../../../src/RS/v2/from/teachers.ts"],"sourcesContent":[null]}
+{"version":3,"file":"teachers.js","mappings":";;;;;;;AAAA;;AACA;;AACA;;AACA;;;;;;;;;;eAQe,CAACA,QAAD,EACCC,QADD,KACyB;EAEtC,IAAMC,KAAK,GAAgBD,QAAQ,CAACE,UAApC;EAEA,IAAI,CAAED,KAAN,EACE,MAAM,IAAIE,KAAJ,CAAU,yEAAV,CAAN;EAEF,OAAOJ,QAAQ,CAACK,MAAT,CAAgB,CAACC,GAAD,EAAqCC,OAArC,KAAuD;IAAA;;IAE5E,IAAI,CAAE,CAAC,UAAD,EAAa,SAAb,EAAwBC,QAAxB,CAAiCD,OAAO,CAACE,UAAzC,CAAN,EACE,MAAM,IAAIL,KAAJ,CAAU,4FAAV,CAAN;IAEF,IAAI,CAAEG,OAAO,CAACL,KAAD,CAAb,EACE,MAAM,IAAIE,KAAJ,CAAU,+DAAV,CAAN;IAEF,IAAIG,OAAO,CAACE,UAAR,IAAsB,UAA1B,EACE,OAAOH,GAAP;IAEF,OAAOA,GAAG,CAACI,MAAJ;MACLC,GAAG,EAAyEJ,OAAO,CAACL,KAAD;IAD9E,GAEFK,OAAO,CAACK,IAAR,IAA2C;MAAEC,WAAW,EAAiBN,OAAO,CAACK;IAAtC,CAFzC,GAGF,6BAAgCL,OAAhC,IAA2C;MAAEO,uBAAuB,EAAKP,OAAO,CAACO;IAAtC,CAHzC,GAIF,wBAAgCP,OAAhC,IAA2C;MAAEQ,kBAAkB,EAAUR,OAAO,CAACQ;IAAtC,CAJzC,GAKF,6BAAgCR,OAAhC,IAA2C;MAAES,uBAAuB,EAAKT,OAAO,CAACS;IAAtC,CALzC,GAMF,oBAAgCT,OAAhC,IAA2C;MAAEU,cAAc,EAAc,2BAAYV,OAAO,CAACU,cAApB;IAA9B,CANzC,GAOF,gCAAgCV,OAAhC,IAA2C;MAAEW,0BAA0B,EAAEX,OAAO,CAACW;IAAtC,CAPzC,GAQF,YAAgCX,OAAhC,IAA2C;MAAEY,MAAM,EAAsBZ,OAAO,CAACY;IAAtC,CARzC,GASF,UAAgCZ,OAAhC,IAA2C;MAAEa,IAAI,EAAwBb,OAAO,CAACa;IAAtC,CATzC,GAUF,kBAACb,OAAO,CAACc,IAAT,kDAAC,cAAcC,MAAf,KAA2C;MAAED,IAAI,EAAwB,mBAAKd,OAAO,CAACc,IAAb,EAAmBpB,QAAnB;IAA9B,CAVzC,GAWF,uBAACM,OAAO,CAACgB,SAAT,uDAAC,mBAAmBD,MAApB,KAA2C;MAAEC,SAAS,EAAmB,wBAAUhB,OAAO,CAACgB,SAAlB;IAA9B,CAXzC,GAYF,yBAAChB,OAAO,CAACiB,WAAT,yDAAC,qBAAqBF,MAAtB,KAA2C;MAAEE,WAAW,EAAiB,0BAAWjB,OAAO,CAACiB,WAAnB;IAA9B,CAZzC,EAAP;EAcD,CAzBM,EAyBJ,EAzBI,CAAP;AA0BD,C","names":["teachers","settings","idKey","groupIdKey","Error","reduce","acc","teacher","includes","group_type","concat","ids","name","displayName","forbidOverlappingEvents","maxNumWorkingHours","maxNumDailyWorkingHours","minBreakLength","disableDayLengthPunishment","weight","rank","days","length","intervals","lockedTimes"],"sourceRoot":"","sources":["../../../../src/RS/v2/from/teachers.ts"],"sourcesContent":[null]}

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

@@ -1,12 +1,8 @@
-import { Dependency } from './dependencies';
-import { CourseEvent } from './course-events';
-import { Collection } from './collections';
-import { Group } from './groups';
 export interface Settings {
     numDays: number;
     discretization: number;
-    dependencyIdKey: keyof Dependency;
-    groupIdKey: keyof Group;
-    collectionIdKey: keyof Collection;
-    eventIdKey: keyof CourseEvent;
+    dependencyIdKey: 'id';
+    groupIdKey: 'id';
+    collectionIdKey: 'id';
+    eventIdKey: 'id';
 }

package/dist/core/types/division-settings.d.ts

@@ -23,6 +23,7 @@ export interface DivisionSettingsBare {
     defaultGroupWeight?: number;
     defaultCourseWeight?: number;
     defaultEventDurationVariance?: number;
+    requireForcedOverlappingEventsSets?: boolean;
     defaultLunch?: Edge<LockedTime[]>;
 }
 export interface DivisionSettings extends DivisionSettingsBare {

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

@@ -5,6 +5,7 @@ import { BreakLength } from './break-lengths';
 import { LockedTime } from './locked-times';
 import { Interval } from './intervals';
 import { Day } from './days';
+import { Person } from './persons';
 export interface GroupBare {
     belongsTo?: Edge<Division>;
     ids?: string;
@@ -18,6 +19,7 @@ export interface GroupBare {
     rank?: number;
     lockedTimes?: Edge<LockedTime[]>;
     lunch?: Edge<LockedTime[]>;
+    members?: Edge<Person[]>;
     intervals?: Interval[];
     days?: Day[];
     createdAt?: string;

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

@@ -10,6 +10,8 @@ import { Interval } from './intervals';
 import { LockedTime } from './locked-times';
 import { Division } from './divisions';
 import { DivisionSettings } from './division-settings';
+import { OverlapGroup } from './overlap-groups';
+import { Person } from './persons';
 import { Teacher } from './teachers';
 import { Meta } from './meta';
 export declare module Types {
@@ -25,6 +27,8 @@ export declare module Types {
     type lockedTime = LockedTime;
     type division = Division;
     type divisionSettings = DivisionSettings;
+    type overlapGroup = OverlapGroup;
+    type person = Person;
     type teacher = Teacher;
     type meta = Meta;
 }

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

@@ -1,6 +1,7 @@
 import { Types } from 'mongoose';
 import { Edge } from './common';
 import { Division } from './divisions';
+import { Group } from './groups';
 import { LockedTime } from './locked-times';
 export interface PersonBare {
     belongsTo?: Edge<Division>;
@@ -10,6 +11,7 @@ export interface PersonBare {
     firstname?: string;
     lockedTimes?: Edge<LockedTime[]>;
     lunch?: Edge<LockedTime[]>;
+    group?: Edge<Group>;
     createdAt?: string;
     updatedAt?: string;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@royalschedule/maps",
-  "version": "2.2.79",
+  "version": "2.2.81",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",