@royalschedule/maps 2.6.7 → 2.6.9

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

@@ -18,14 +18,14 @@ var _default = function _default(configuration) {
     var [eventAcc, lockedAcc] = _ref;
     var [collection, id] = event.id.split('.');
     if (collection == 'events') eventAcc = eventAcc.concat({
-      [idKey]: event.id,
+      [idKey]: id,
       parked: false,
       inLocations: (_event$dependencies = event.dependencies) !== null && _event$dependencies !== void 0 ? _event$dependencies : [],
       start: _moment.default.utc('1970-01-05T00:00').add(event.day, 'days').add(event.start, 'minutes').toISOString(),
       end: _moment.default.utc('1970-01-05T00:00').add(event.day, 'days').add(event.end, 'minutes').toISOString()
     });
     if (collection == 'lockedtimes') lockedAcc = lockedAcc.concat({
-      [idKey]: event.id,
+      [idKey]: id,
       start: _moment.default.utc('1970-01-05T00:00').add(event.day, 'days').add(event.start, 'minutes').toISOString(),
       end: _moment.default.utc('1970-01-05T00:00').add(event.day, 'days').add(event.end, 'minutes').toISOString()
     });

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

@@ -1 +1 @@
-{"version":3,"file":"placements.js","names":["_moment","_interopRequireDefault","require","_lodash","obj","__esModule","default","_default","configuration","options","arguments","length","undefined","idKey","events","_","reduce","_ref","event","_event$dependencies","eventAcc","lockedAcc","collection","id","split","concat","parked","inLocations","dependencies","start","moment","utc","add","day","toISOString","end","exports"],"sources":["../../../../src/RS/v2/from/placements.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,OAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,OAAA,GAAAF,sBAAA,CAAAC,OAAA;AAAyD,SAAAD,uBAAAG,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAAA,IAAAG,QAAA,GAW1C,SAAAA,SAACC,aAA4B,EAAmG;EAAA,IAAjGC,OAAA,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAmB,EAAE;EAEjE,IAAMG,KAAK,GAAEJ,OAAO,CAACI,KAAK,IAAI,IAAI;EAElC,IAAM;IAAEC;EAAM,CAAE,GAAGN,aAAa,aAAbA,aAAa,cAAbA,aAAa,GAAI,EAAE;EAEtC,OAAOO,eAAC,CAACC,MAAM,CAACF,MAAM,EAAE,CAAAG,IAAA,EAAgGC,KAAgB,KAAI;IAAA,IAAAC,mBAAA;IAAA,IAAnH,CAACC,QAAQ,EAAEC,SAAS,CAAyE,GAAAJ,IAAA;IACpH,IAAM,CAACK,UAAU,EAAEC,EAAE,CAAC,GAAGL,KAAK,CAACK,EAAE,CAACC,KAAK,CAAC,GAAG,CAAC;IAC5C,IAAIF,UAAU,IAAI,QAAQ,EACxBF,QAAQ,GAAGA,QAAQ,CAACK,MAAM,CAAC;MACzB,CAACZ,KAAK,GAAQK,KAAK,CAACK,EAAE;MACtBG,MAAM,EAAQ,KAAK;MACnBC,WAAW,GAAAR,mBAAA,GAAGD,KAAK,CAACU,YAAY,cAAAT,mBAAA,cAAAA,mBAAA,GAAI,EAAE;MACtCU,KAAK,EAASC,eAAM,CAACC,GAAG,CAAC,kBAAkB,CAAC,CAACC,GAAG,CAACd,KAAK,CAACe,GAAG,EAAE,MAAM,CAAC,CAACD,GAAG,CAACd,KAAK,CAACW,KAAK,EAAE,SAAS,CAAC,CAACK,WAAW,EAAE;MAC7GC,GAAG,EAAWL,eAAM,CAACC,GAAG,CAAC,kBAAkB,CAAC,CAACC,GAAG,CAACd,KAAK,CAACe,GAAG,EAAE,MAAM,CAAC,CAACD,GAAG,CAACd,KAAK,CAACiB,GAAG,EAAE,SAAS,CAAC,CAACD,WAAW;KAC1G,CAAC;IACJ,IAAIZ,UAAU,IAAI,aAAa,EAC7BD,SAAS,GAAGA,SAAS,CAACI,MAAM,CAAC;MAC3B,CAACZ,KAAK,GAAQK,KAAK,CAACK,EAAE;MACtBM,KAAK,EAASC,eAAM,CAACC,GAAG,CAAC,kBAAkB,CAAC,CAACC,GAAG,CAACd,KAAK,CAACe,GAAG,EAAE,MAAM,CAAC,CAACD,GAAG,CAACd,KAAK,CAACW,KAAK,EAAE,SAAS,CAAC,CAACK,WAAW,EAAE;MAC7GC,GAAG,EAAWL,eAAM,CAACC,GAAG,CAAC,kBAAkB,CAAC,CAACC,GAAG,CAACd,KAAK,CAACe,GAAG,EAAE,MAAM,CAAC,CAACD,GAAG,CAACd,KAAK,CAACiB,GAAG,EAAE,SAAS,CAAC,CAACD,WAAW;KAC1G,CAAC;IACJ,OAAO,CAACd,QAAQ,EAAEC,SAAS,CAAC;EAC9B,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AACd,CAAC;AAAAe,OAAA,CAAA9B,OAAA,GAAAC,QAAA"}
+{"version":3,"file":"placements.js","names":["_moment","_interopRequireDefault","require","_lodash","obj","__esModule","default","_default","configuration","options","arguments","length","undefined","idKey","events","_","reduce","_ref","event","_event$dependencies","eventAcc","lockedAcc","collection","id","split","concat","parked","inLocations","dependencies","start","moment","utc","add","day","toISOString","end","exports"],"sources":["../../../../src/RS/v2/from/placements.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,OAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,OAAA,GAAAF,sBAAA,CAAAC,OAAA;AAAyD,SAAAD,uBAAAG,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAAA,IAAAG,QAAA,GAW1C,SAAAA,SAACC,aAA4B,EAAmG;EAAA,IAAjGC,OAAA,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAmB,EAAE;EAEjE,IAAMG,KAAK,GAAEJ,OAAO,CAACI,KAAK,IAAI,IAAI;EAElC,IAAM;IAAEC;EAAM,CAAE,GAAGN,aAAa,aAAbA,aAAa,cAAbA,aAAa,GAAI,EAAE;EAEtC,OAAOO,eAAC,CAACC,MAAM,CAACF,MAAM,EAAE,CAAAG,IAAA,EAAgGC,KAAgB,KAAI;IAAA,IAAAC,mBAAA;IAAA,IAAnH,CAACC,QAAQ,EAAEC,SAAS,CAAyE,GAAAJ,IAAA;IACpH,IAAM,CAACK,UAAU,EAAEC,EAAE,CAAC,GAAGL,KAAK,CAACK,EAAE,CAACC,KAAK,CAAC,GAAG,CAAC;IAC5C,IAAIF,UAAU,IAAI,QAAQ,EACxBF,QAAQ,GAAGA,QAAQ,CAACK,MAAM,CAAC;MACzB,CAACZ,KAAK,GAAQU,EAAE;MAChBG,MAAM,EAAQ,KAAK;MACnBC,WAAW,GAAAR,mBAAA,GAAGD,KAAK,CAACU,YAAY,cAAAT,mBAAA,cAAAA,mBAAA,GAAI,EAAE;MACtCU,KAAK,EAASC,eAAM,CAACC,GAAG,CAAC,kBAAkB,CAAC,CAACC,GAAG,CAACd,KAAK,CAACe,GAAG,EAAE,MAAM,CAAC,CAACD,GAAG,CAACd,KAAK,CAACW,KAAK,EAAE,SAAS,CAAC,CAACK,WAAW,EAAE;MAC7GC,GAAG,EAAWL,eAAM,CAACC,GAAG,CAAC,kBAAkB,CAAC,CAACC,GAAG,CAACd,KAAK,CAACe,GAAG,EAAE,MAAM,CAAC,CAACD,GAAG,CAACd,KAAK,CAACiB,GAAG,EAAE,SAAS,CAAC,CAACD,WAAW;KAC1G,CAAC;IACJ,IAAIZ,UAAU,IAAI,aAAa,EAC7BD,SAAS,GAAGA,SAAS,CAACI,MAAM,CAAC;MAC3B,CAACZ,KAAK,GAAQU,EAAE;MAChBM,KAAK,EAASC,eAAM,CAACC,GAAG,CAAC,kBAAkB,CAAC,CAACC,GAAG,CAACd,KAAK,CAACe,GAAG,EAAE,MAAM,CAAC,CAACD,GAAG,CAACd,KAAK,CAACW,KAAK,EAAE,SAAS,CAAC,CAACK,WAAW,EAAE;MAC7GC,GAAG,EAAWL,eAAM,CAACC,GAAG,CAAC,kBAAkB,CAAC,CAACC,GAAG,CAACd,KAAK,CAACe,GAAG,EAAE,MAAM,CAAC,CAACD,GAAG,CAACd,KAAK,CAACiB,GAAG,EAAE,SAAS,CAAC,CAACD,WAAW;KAC1G,CAAC;IACJ,OAAO,CAACd,QAAQ,EAAEC,SAAS,CAAC;EAC9B,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AACd,CAAC;AAAAe,OAAA,CAAA9B,OAAA,GAAAC,QAAA"}

package/dist/SS12000/from/groups.d.ts

@@ -1,5 +1,6 @@
+import { Types as CoreTypes } from '../../core/types';
 import { Group } from '../types/groups';
-declare const _default: (groups: Group[]) => {
+declare const _default: (groups: Group[], options?: Pick<CoreTypes.division, 'start' | 'end'>) => {
     members?: string[] | undefined;
     species?: string | undefined;
     ids: string;

package/dist/SS12000/from/groups.js

@@ -4,12 +4,21 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _moment = _interopRequireDefault(require("moment"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-var _default = groups => {
+function _transformGroupMembers(members, options) {
+  return [...new Set(members === null || members === void 0 ? void 0 : members.filter(member => {
+    if (options !== null && options !== void 0 && options.end && member.startDate && !(0, _moment.default)(member.startDate).isBefore((0, _moment.default)(options.end))) return false;
+    if (options !== null && options !== void 0 && options.start && member.endDate && !(0, _moment.default)(member.endDate).isAfter((0, _moment.default)(options.start))) return false;
+    return true;
+  }).map(member => member.person.id).filter(Boolean))];
+}
+var _default = (groups, options) => {
   if (!Array.isArray(groups)) throw new Error('(SS12000::From::Groups) Group input is not of array type', {
     cause: 'invalid_input'
   });
@@ -19,7 +28,7 @@ var _default = groups => {
   }, group.groupType == 'Klass' && {
     species: 'class'
   }), group.groupMemberships && {
-    members: group.groupMemberships.map(x => x.person.id).filter(Boolean)
+    members: _transformGroupMembers(group.groupMemberships, options)
   }));
 };
 exports.default = _default;

package/dist/SS12000/from/groups.js.map

@@ -1 +1 @@
-{"version":3,"file":"groups.js","names":["groups","Array","isArray","Error","cause","map","group","_objectSpread","ids","id","displayName","groupType","species","groupMemberships","members","x","person","filter","Boolean","exports","default","_default"],"sources":["../../../src/SS12000/from/groups.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;eAMgBA,MAAe,IAAI;EACjC,IAAI,CAAEC,KAAK,CAACC,OAAO,CAACF,MAAM,CAAC,EACzB,MAAM,IAAIG,KAAK,CAAC,0DAA0D,EAAE;IAAEC,KAAK,EAAE;EAAe,CAAE,CAAC;EAEzG,OAAOJ,MAAM,CAACK,GAAG,CAAEC,KAAK,IAAAC,aAAA,CAAAA,aAAA;IACtBC,GAAG,EAAUF,KAAK,CAACG,EAAG;IACtBC,WAAW,EAAEJ,KAAK,CAACI;EAAW,GAC3BJ,KAAK,CAACK,SAAS,IAAI,OAAO,IAAI;IAAEC,OAAO,EAAE;EAAO,CAAE,GAClDN,KAAK,CAACO,gBAAgB,IAAI;IAAEC,OAAO,EAAER,KAAK,CAACO,gBAAgB,CAACR,GAAG,CAACU,CAAC,IAAIA,CAAC,CAACC,MAAM,CAACP,EAAE,CAAC,CAACQ,MAAM,CAACC,OAAO;EAAC,CAAE,CACtG,CAA6B;AACjC,CAAC;AAAAC,OAAA,CAAAC,OAAA,GAAAC,QAAA"}
+{"version":3,"file":"groups.js","names":["_moment","_interopRequireDefault","require","obj","__esModule","default","ownKeys","object","enumerableOnly","keys","Object","getOwnPropertySymbols","symbols","filter","sym","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","target","i","arguments","length","source","forEach","key","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","value","_toPropertyKey","configurable","writable","arg","_toPrimitive","String","input","hint","prim","Symbol","toPrimitive","undefined","res","call","TypeError","Number","_transformGroupMembers","members","options","Set","member","end","startDate","moment","isBefore","start","endDate","isAfter","map","person","id","Boolean","_default","groups","Array","isArray","Error","cause","group","ids","displayName","groupType","species","groupMemberships","exports"],"sources":["../../../src/SS12000/from/groups.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,OAAA,GAAAC,sBAAA,CAAAC,OAAA;AAA0D,SAAAD,uBAAAE,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAAA,SAAAG,QAAAC,MAAA,EAAAC,cAAA,QAAAC,IAAA,GAAAC,MAAA,CAAAD,IAAA,CAAAF,MAAA,OAAAG,MAAA,CAAAC,qBAAA,QAAAC,OAAA,GAAAF,MAAA,CAAAC,qBAAA,CAAAJ,MAAA,GAAAC,cAAA,KAAAI,OAAA,GAAAA,OAAA,CAAAC,MAAA,WAAAC,GAAA,WAAAJ,MAAA,CAAAK,wBAAA,CAAAR,MAAA,EAAAO,GAAA,EAAAE,UAAA,OAAAP,IAAA,CAAAQ,IAAA,CAAAC,KAAA,CAAAT,IAAA,EAAAG,OAAA,YAAAH,IAAA;AAAA,SAAAU,cAAAC,MAAA,aAAAC,CAAA,MAAAA,CAAA,GAAAC,SAAA,CAAAC,MAAA,EAAAF,CAAA,UAAAG,MAAA,WAAAF,SAAA,CAAAD,CAAA,IAAAC,SAAA,CAAAD,CAAA,QAAAA,CAAA,OAAAf,OAAA,CAAAI,MAAA,CAAAc,MAAA,OAAAC,OAAA,WAAAC,GAAA,IAAAC,eAAA,CAAAP,MAAA,EAAAM,GAAA,EAAAF,MAAA,CAAAE,GAAA,SAAAhB,MAAA,CAAAkB,yBAAA,GAAAlB,MAAA,CAAAmB,gBAAA,CAAAT,MAAA,EAAAV,MAAA,CAAAkB,yBAAA,CAAAJ,MAAA,KAAAlB,OAAA,CAAAI,MAAA,CAAAc,MAAA,GAAAC,OAAA,WAAAC,GAAA,IAAAhB,MAAA,CAAAoB,cAAA,CAAAV,MAAA,EAAAM,GAAA,EAAAhB,MAAA,CAAAK,wBAAA,CAAAS,MAAA,EAAAE,GAAA,iBAAAN,MAAA;AAAA,SAAAO,gBAAAxB,GAAA,EAAAuB,GAAA,EAAAK,KAAA,IAAAL,GAAA,GAAAM,cAAA,CAAAN,GAAA,OAAAA,GAAA,IAAAvB,GAAA,IAAAO,MAAA,CAAAoB,cAAA,CAAA3B,GAAA,EAAAuB,GAAA,IAAAK,KAAA,EAAAA,KAAA,EAAAf,UAAA,QAAAiB,YAAA,QAAAC,QAAA,oBAAA/B,GAAA,CAAAuB,GAAA,IAAAK,KAAA,WAAA5B,GAAA;AAAA,SAAA6B,eAAAG,GAAA,QAAAT,GAAA,GAAAU,YAAA,CAAAD,GAAA,2BAAAT,GAAA,gBAAAA,GAAA,GAAAW,MAAA,CAAAX,GAAA;AAAA,SAAAU,aAAAE,KAAA,EAAAC,IAAA,eAAAD,KAAA,iBAAAA,KAAA,kBAAAA,KAAA,MAAAE,IAAA,GAAAF,KAAA,CAAAG,MAAA,CAAAC,WAAA,OAAAF,IAAA,KAAAG,SAAA,QAAAC,GAAA,GAAAJ,IAAA,CAAAK,IAAA,CAAAP,KAAA,EAAAC,IAAA,2BAAAK,GAAA,sBAAAA,GAAA,YAAAE,SAAA,4DAAAP,IAAA,gBAAAF,MAAA,GAAAU,MAAA,EAAAT,KAAA;AAQ1D,SAASU,sBAAsBA,CAC7BC,OAAmC,EACnCC,OAAmD;EAEnD,OAAO,CACL,GAAG,IAAIC,GAAG,CACRF,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEpC,MAAM,CAACuC,MAAM,IAAG;IACvB,IAAIF,OAAO,aAAPA,OAAO,eAAPA,OAAO,CAAEG,GAAG,IAAID,MAAM,CAACE,SAAS,IAAI,CAAE,IAAAC,eAAM,EAACH,MAAM,CAACE,SAAS,CAAC,CAACE,QAAQ,CAAC,IAAAD,eAAM,EAACL,OAAO,CAACG,GAAG,CAAC,CAAC,EAC9F,OAAO,KAAK;IACd,IAAIH,OAAO,aAAPA,OAAO,eAAPA,OAAO,CAAEO,KAAK,IAAIL,MAAM,CAACM,OAAO,IAAI,CAAE,IAAAH,eAAM,EAACH,MAAM,CAACM,OAAO,CAAC,CAACC,OAAO,CAAC,IAAAJ,eAAM,EAACL,OAAO,CAACO,KAAK,CAAC,CAAC,EAC7F,OAAO,KAAK;IACd,OAAO,IAAI;EACb,CAAC,CAAC,CACDG,GAAG,CAAER,MAAM,IAAKA,MAAM,CAACS,MAAM,CAACC,EAAE,CAAC,CACjCjD,MAAM,CAACkD,OAAO,CAAC,CACjB,CACF;AACH;AAAC,IAAAC,QAAA,GAEcA,CACbC,MAAiB,EACjBf,OAAmD,KACjD;EACF,IAAI,CAAEgB,KAAK,CAACC,OAAO,CAACF,MAAM,CAAC,EACzB,MAAM,IAAIG,KAAK,CAAC,0DAA0D,EAAE;IAAEC,KAAK,EAAE;EAAe,CAAE,CAAC;EAEzG,OAAOJ,MAAM,CAACL,GAAG,CAAEU,KAAK,IAAAnD,aAAA,CAAAA,aAAA;IACtBoD,GAAG,EAAUD,KAAK,CAACR,EAAG;IACtBU,WAAW,EAAEF,KAAK,CAACE;EAAW,GAC3BF,KAAK,CAACG,SAAS,IAAI,OAAO,IAAI;IAAEC,OAAO,EAAE;EAAO,CAAE,GAClDJ,KAAK,CAACK,gBAAgB,IAAI;IAC3B1B,OAAO,EAAED,sBAAsB,CAACsB,KAAK,CAACK,gBAAgB,EAAEzB,OAAO;GAChE,CACD,CAA6B;AACjC,CAAC;AAAA0B,OAAA,CAAAvE,OAAA,GAAA2D,QAAA"}

package/dist/SS12000/from/index.d.ts

@@ -39,7 +39,7 @@ export default class {
         ids: string;
         displayName: string | undefined;
     }[];
-    static groups: (groups: import("../types/groups").Group[]) => {
+    static groups: (groups: import("../types/groups").Group[], options?: Pick<import("../../core/v2/types/divisions").Division, "end" | "start"> | undefined) => {
         members?: string[] | undefined;
         species?: string | undefined;
         ids: string;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@royalschedule/maps",
   "description": "",
-  "version": "2.6.7",
+  "version": "2.6.9",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "engines": {