@useparagon/core 1.0.8-canary.4 → 1.0.8-canary.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -54,7 +54,7 @@ class IntegrationRequestStep extends step_1.Step {
54
54
  params: (0, resolver_utils_1.resolveParamsToSources)(santizeKeyValuePairs(initParams.params || {}), resolvers_interface_1.DataType.STRING, undefined, this.dependencies),
55
55
  headers: (0, resolver_utils_1.resolveParamsToSources)(santizeKeyValuePairs(initParams.headers || {}), resolvers_interface_1.DataType.STRING, undefined, this.dependencies),
56
56
  body: isJsonBody
57
- ? (0, resolver_utils_1.resolveParamsToSources)(santizeKeyValuePairs(initParams.body || {}), resolvers_interface_1.DataType.STRING, undefined, this.dependencies)
57
+ ? (0, resolver_utils_1.resolveParamsToSources)(santizeKeyValuePairs(initParams.body || {}), resolvers_interface_1.DataType.ANY, undefined, this.dependencies)
58
58
  : [],
59
59
  rawBody: !isJsonBody
60
60
  ? (0, resolver_utils_1.resolveToTokenizedSource)(santizeKeyValuePairs({ body: initParams.body || '' }).body, resolvers_interface_1.DataType.STRING, this.dependencies)
@@ -1 +1 @@
1
- {"version":3,"file":"integrationRequest.step.js","sourceRoot":"","sources":["../../../../src/steps/library/integrationRequest/integrationRequest.step.ts"],"names":[],"mappings":";;;AAAA,kDAA6D;AAC7D,oEAA6E;AAC7E,sEAI2C;AAC3C,gFAAgF;AAChF,qCAAkC;AAClC,yDAAiE;AAYjE,MAAa,sBACX,SAAQ,WAAI;IAUZ,IAAI,GACF,yBAAQ,CAAC,0BAA0B,CAAC;IAK9B,WAAW,CAA8B;IAKjD,UAAU,CAAoC;IAK9C,IAAI,MAAM;QACR,OAAO,IAAA,yCAAyB,EAC9B,IAAI,EACJ,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,EACb,mCAAuB,CAAC,cAAc,CACvC,CAAC;IACJ,CAAC;IAED,YAAY,MAAmC;QAC7C,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC;QAC1B,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;IAC/C,CAAC;IAKD,mBAAmB;QACjB,MAAM,WAAW,GAA4B,IAAI,CAAC;QAClD,MAAM,UAAU,GAAgC,IAAI,CAAC,WAAW,CAAC;QACjE,MAAM,UAAU,GAAY,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,QAAS,CAAC,CAAC;QAE3E,MAAM,iBAAiB,GAAG,UAAU,CAAC,UAAU;YAC7C,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC;gBACpB,IAAI,MAAM;oBACR,OAAO,IAAA,yCAAyB,EAC9B,WAAW,EACX,GAAG,EAAE,CAAC,WAAW,CAAC,EAAE,EACpB,mCAAuB,CAAC,cAAc,EACtC,EAAE,CACH,CAAC;gBACJ,CAAC;aACF,CAAC;YACJ,CAAC,CAAC,SAAS,CAAC;QAQd,MAAM,oBAAoB,GAAG,CAC3B,KAAQ,EACL,EAAE;YACL,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;gBACzC,IAAI,OAAO,KAAK,KAAK,UAAU,EAAE,CAAC;oBAChC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;gBACtB,CAAC;gBAED,IAAI,CAAC,iBAAiB,EAAE,CAAC;oBACvB,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;gBACtE,CAAC;gBACD,OAAO;oBACL,GAAG;oBACH,KAAK,CACH,IAAA,yCAAyB,EACvB,WAAW,EACX,GAAG,EAAE,CAAC,WAAW,CAAC,EAAE,EACpB,mCAAuB,CAAC,mBAAmB,EAC3C,CAAC,mBAAmB,EAAE,WAAW,CAAC,CACnC,CACF;iBACF,CAAC;YACJ,CAAC,CAAC,CACE,CAAC;QACT,CAAC,CAAC;QAEF,OAAO;YACL,UAAU,EAAE,IAAI,CAAC,YAAY,EAAE,eAAgB;YAC/C,QAAQ,EAAE,UAAU,CAAC,QAA2B;YAChD,UAAU,EAAE,UAAU,CAAC,MAAoB;YAC3C,cAAc,EAAE,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC;YAC7C,aAAa,EAAE,OAAO,CAAC,UAAU,CAAC,uBAAuB,CAAC;YAC1D,GAAG,EAAE,IAAA,yCAAwB,EAC3B,oBAAoB,CAAC,EAAE,GAAG,EAAE,UAAU,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,EACjD,8BAAQ,CAAC,MAAM,EACf,IAAI,CAAC,YAAY,CAClB;YACD,MAAM,EAAE,IAAA,uCAAsB,EAC5B,oBAAoB,CAAC,UAAU,CAAC,MAAM,IAAI,EAAE,CAAC,EAC7C,8BAAQ,CAAC,MAAM,EACf,SAAS,EACT,IAAI,CAAC,YAAY,CAClB;YACD,OAAO,EAAE,IAAA,uCAAsB,EAC7B,oBAAoB,CAAC,UAAU,CAAC,OAAO,IAAI,EAAE,CAAC,EAC9C,8BAAQ,CAAC,MAAM,EACf,SAAS,EACT,IAAI,CAAC,YAAY,CAClB;YACD,IAAI,EAAE,UAAU;gBACd,CAAC,CAAC,IAAA,uCAAsB,EACpB,oBAAoB,CACjB,UAAU,CAAC,IAAgC,IAAI,EAAE,CACnD,EACD,8BAAQ,CAAC,MAAM,EACf,SAAS,EACT,IAAI,CAAC,YAAY,CAClB;gBACH,CAAC,CAAC,EAAE;YACN,OAAO,EAAE,CAAC,UAAU;gBAClB,CAAC,CAAC,IAAA,yCAAwB,EACtB,oBAAoB,CAAC,EAAE,IAAI,EAAE,UAAU,CAAC,IAAI,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,EAC1D,8BAAQ,CAAC,MAAM,EACf,IAAI,CAAC,YAAY,CAClB;gBACH,CAAC,CAAC,SAAS;YACb,iBAAiB,EAAE,iBAAiB;gBAClC,CAAC,CAAC;oBACE,OAAO,EAAE,IAAI;oBACb,IAAI,EAAE,OAAO;oBACb,MAAM,EAAE,IAAA,yCAAwB,EAC9B,iBAAiB,CAAC,UAAU,EAC5B,8BAAQ,CAAC,GAAG,EACZ,IAAI,CAAC,YAAY,CAClB;oBACD,SAAS,EAAE,IAAA,yCAAwB,EACjC,iBAAiB,CAAC,SAAS,EAC3B,8BAAQ,CAAC,MAAM,EACf,IAAI,CAAC,YAAY,CAClB;oBACD,aAAa,EAAE,IAAA,gCAAe,EAC5B,iBAAiB,CAAC,aAAa,EAC/B,8BAAQ,CAAC,GAAG,EACZ,IAAI,CAAC,YAAY,CAClB,CAAC,WAAW,CAAiB;iBAC/B;gBACH,CAAC,CAAC,SAAS;SACd,CAAC;IACJ,CAAC;CACF;AA9JD,wDA8JC"}
1
+ {"version":3,"file":"integrationRequest.step.js","sourceRoot":"","sources":["../../../../src/steps/library/integrationRequest/integrationRequest.step.ts"],"names":[],"mappings":";;;AAAA,kDAA6D;AAC7D,oEAA6E;AAC7E,sEAI2C;AAC3C,gFAAgF;AAChF,qCAAkC;AAClC,yDAAiE;AAYjE,MAAa,sBACX,SAAQ,WAAI;IAUZ,IAAI,GACF,yBAAQ,CAAC,0BAA0B,CAAC;IAK9B,WAAW,CAA8B;IAKjD,UAAU,CAAoC;IAK9C,IAAI,MAAM;QACR,OAAO,IAAA,yCAAyB,EAC9B,IAAI,EACJ,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,EACb,mCAAuB,CAAC,cAAc,CACvC,CAAC;IACJ,CAAC;IAED,YAAY,MAAmC;QAC7C,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC;QAC1B,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;IAC/C,CAAC;IAKD,mBAAmB;QACjB,MAAM,WAAW,GAA4B,IAAI,CAAC;QAClD,MAAM,UAAU,GAAgC,IAAI,CAAC,WAAW,CAAC;QACjE,MAAM,UAAU,GAAY,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,QAAS,CAAC,CAAC;QAE3E,MAAM,iBAAiB,GAAG,UAAU,CAAC,UAAU;YAC7C,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC;gBACpB,IAAI,MAAM;oBACR,OAAO,IAAA,yCAAyB,EAC9B,WAAW,EACX,GAAG,EAAE,CAAC,WAAW,CAAC,EAAE,EACpB,mCAAuB,CAAC,cAAc,EACtC,EAAE,CACH,CAAC;gBACJ,CAAC;aACF,CAAC;YACJ,CAAC,CAAC,SAAS,CAAC;QAQd,MAAM,oBAAoB,GAAG,CAC3B,KAAQ,EACL,EAAE;YACL,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;gBACzC,IAAI,OAAO,KAAK,KAAK,UAAU,EAAE,CAAC;oBAChC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;gBACtB,CAAC;gBAED,IAAI,CAAC,iBAAiB,EAAE,CAAC;oBACvB,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;gBACtE,CAAC;gBACD,OAAO;oBACL,GAAG;oBACH,KAAK,CACH,IAAA,yCAAyB,EACvB,WAAW,EACX,GAAG,EAAE,CAAC,WAAW,CAAC,EAAE,EACpB,mCAAuB,CAAC,mBAAmB,EAC3C,CAAC,mBAAmB,EAAE,WAAW,CAAC,CACnC,CACF;iBACF,CAAC;YACJ,CAAC,CAAC,CACE,CAAC;QACT,CAAC,CAAC;QAEF,OAAO;YACL,UAAU,EAAE,IAAI,CAAC,YAAY,EAAE,eAAgB;YAC/C,QAAQ,EAAE,UAAU,CAAC,QAA2B;YAChD,UAAU,EAAE,UAAU,CAAC,MAAoB;YAC3C,cAAc,EAAE,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC;YAC7C,aAAa,EAAE,OAAO,CAAC,UAAU,CAAC,uBAAuB,CAAC;YAC1D,GAAG,EAAE,IAAA,yCAAwB,EAC3B,oBAAoB,CAAC,EAAE,GAAG,EAAE,UAAU,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,EACjD,8BAAQ,CAAC,MAAM,EACf,IAAI,CAAC,YAAY,CAClB;YACD,MAAM,EAAE,IAAA,uCAAsB,EAC5B,oBAAoB,CAAC,UAAU,CAAC,MAAM,IAAI,EAAE,CAAC,EAC7C,8BAAQ,CAAC,MAAM,EACf,SAAS,EACT,IAAI,CAAC,YAAY,CAClB;YACD,OAAO,EAAE,IAAA,uCAAsB,EAC7B,oBAAoB,CAAC,UAAU,CAAC,OAAO,IAAI,EAAE,CAAC,EAC9C,8BAAQ,CAAC,MAAM,EACf,SAAS,EACT,IAAI,CAAC,YAAY,CAClB;YACD,IAAI,EAAE,UAAU;gBACd,CAAC,CAAC,IAAA,uCAAsB,EACpB,oBAAoB,CACjB,UAAU,CAAC,IAAgC,IAAI,EAAE,CACnD,EACD,8BAAQ,CAAC,GAAG,EACZ,SAAS,EACT,IAAI,CAAC,YAAY,CAClB;gBACH,CAAC,CAAC,EAAE;YACN,OAAO,EAAE,CAAC,UAAU;gBAClB,CAAC,CAAC,IAAA,yCAAwB,EACtB,oBAAoB,CAAC,EAAE,IAAI,EAAE,UAAU,CAAC,IAAI,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,EAC1D,8BAAQ,CAAC,MAAM,EACf,IAAI,CAAC,YAAY,CAClB;gBACH,CAAC,CAAC,SAAS;YACb,iBAAiB,EAAE,iBAAiB;gBAClC,CAAC,CAAC;oBACE,OAAO,EAAE,IAAI;oBACb,IAAI,EAAE,OAAO;oBACb,MAAM,EAAE,IAAA,yCAAwB,EAC9B,iBAAiB,CAAC,UAAU,EAC5B,8BAAQ,CAAC,GAAG,EACZ,IAAI,CAAC,YAAY,CAClB;oBACD,SAAS,EAAE,IAAA,yCAAwB,EACjC,iBAAiB,CAAC,SAAS,EAC3B,8BAAQ,CAAC,MAAM,EACf,IAAI,CAAC,YAAY,CAClB;oBACD,aAAa,EAAE,IAAA,gCAAe,EAC5B,iBAAiB,CAAC,aAAa,EAC/B,8BAAQ,CAAC,GAAG,EACZ,IAAI,CAAC,YAAY,CAClB,CAAC,WAAW,CAAiB;iBAC/B;gBACH,CAAC,CAAC,SAAS;SACd,CAAC;IACJ,CAAC;CACF;AA9JD,wDA8JC"}
@@ -25,7 +25,6 @@ export type StepDependencies = {
25
25
  inputSources?: InputSource[];
26
26
  secrets?: ISecret[];
27
27
  integrationType?: string;
28
- workflowName?: string;
29
28
  };
30
29
  export type IStep = IActionStep | IActionTriggerStep | IConditionalStep | ICronStep | IDelayStep | IEndpointStep | IEventStep | IFanOutStep | IFunctionStep | IIntegrationEnabledStep | IIntegrationRequestStep | IRequestStep | IResponseStep | IUnSelectedStep;
31
30
  export * from './step.interface-base';
@@ -1 +1 @@
1
- {"version":3,"file":"step.interface.js","sourceRoot":"","sources":["../../src/steps/step.interface.ts"],"names":[],"mappings":";;;AAyFA,gEAAsC"}
1
+ {"version":3,"file":"step.interface.js","sourceRoot":"","sources":["../../src/steps/step.interface.ts"],"names":[],"mappings":";;;AAuFA,gEAAsC"}
@@ -6,8 +6,7 @@ export declare enum Unit {
6
6
  MINUTES = "MINUTES",
7
7
  HOURLY = "HOURLY",
8
8
  DAILY = "DAILY",
9
- WEEKLY = "WEEKLY",
10
- CUSTOM = "CUSTOM"
9
+ WEEKLY = "WEEKLY"
11
10
  }
12
11
  export declare enum Weekday {
13
12
  MONDAY = "MONDAY",
@@ -45,12 +44,7 @@ export type WeeklySchedule<T = Time> = {
45
44
  weekday: Weekday;
46
45
  time: T;
47
46
  };
48
- export type CustomSchedule = {
49
- unit: Unit.CUSTOM;
50
- expression: string;
51
- timezone: string;
52
- };
53
- export type Schedule = SecondsSchedule | MinutesSchedule | HourlySchedule | DailySchedule | WeeklySchedule | CustomSchedule;
47
+ export type Schedule = SecondsSchedule | MinutesSchedule | HourlySchedule | DailySchedule | WeeklySchedule;
54
48
  export type Timezone = {
55
49
  offset: string;
56
50
  label: string;
@@ -8,7 +8,6 @@ var Unit;
8
8
  Unit["HOURLY"] = "HOURLY";
9
9
  Unit["DAILY"] = "DAILY";
10
10
  Unit["WEEKLY"] = "WEEKLY";
11
- Unit["CUSTOM"] = "CUSTOM";
12
11
  })(Unit || (exports.Unit = Unit = {}));
13
12
  var Weekday;
14
13
  (function (Weekday) {
@@ -1 +1 @@
1
- {"version":3,"file":"cron.interface.js","sourceRoot":"","sources":["../../../src/triggers/cron/cron.interface.ts"],"names":[],"mappings":";;;AAIA,IAAY,IAOX;AAPD,WAAY,IAAI;IACd,2BAAmB,CAAA;IACnB,2BAAmB,CAAA;IACnB,yBAAiB,CAAA;IACjB,uBAAe,CAAA;IACf,yBAAiB,CAAA;IACjB,yBAAiB,CAAA;AACnB,CAAC,EAPW,IAAI,oBAAJ,IAAI,QAOf;AAED,IAAY,OAQX;AARD,WAAY,OAAO;IACjB,4BAAiB,CAAA;IACjB,8BAAmB,CAAA;IACnB,kCAAuB,CAAA;IACvB,gCAAqB,CAAA;IACrB,4BAAiB,CAAA;IACjB,gCAAqB,CAAA;IACrB,4BAAiB,CAAA;AACnB,CAAC,EARW,OAAO,uBAAP,OAAO,QAQlB"}
1
+ {"version":3,"file":"cron.interface.js","sourceRoot":"","sources":["../../../src/triggers/cron/cron.interface.ts"],"names":[],"mappings":";;;AAIA,IAAY,IAMX;AAND,WAAY,IAAI;IACd,2BAAmB,CAAA;IACnB,2BAAmB,CAAA;IACnB,yBAAiB,CAAA;IACjB,uBAAe,CAAA;IACf,yBAAiB,CAAA;AACnB,CAAC,EANW,IAAI,oBAAJ,IAAI,QAMf;AAED,IAAY,OAQX;AARD,WAAY,OAAO;IACjB,4BAAiB,CAAA;IACjB,8BAAmB,CAAA;IACnB,kCAAuB,CAAA;IACvB,gCAAqB,CAAA;IACrB,4BAAiB,CAAA;IACjB,gCAAqB,CAAA;IACrB,4BAAiB,CAAA;AACnB,CAAC,EARW,OAAO,uBAAP,OAAO,QAQlB"}
@@ -1,6 +1,6 @@
1
1
  import { Schedule } from './cron.interface';
2
- export declare const getCronOptions: (schedule: Schedule, timezone?: string) => {
2
+ export declare const getCronOptions: (schedule: Schedule) => {
3
3
  cron: string;
4
- timezone?: string | undefined;
4
+ timeZone?: string;
5
5
  };
6
6
  export declare const getSchedule: (cron: string, timezone?: string) => Schedule;
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.getSchedule = exports.getCronOptions = void 0;
4
4
  const cron_parser_1 = require("cron-parser");
5
5
  const cron_interface_1 = require("./cron.interface");
6
- const getCronOptions = (schedule, timezone = 'America/Los_Angeles') => {
6
+ const getCronOptions = (schedule) => {
7
7
  switch (schedule.unit) {
8
8
  case cron_interface_1.Unit.SECONDS:
9
9
  return { cron: `*/${schedule.seconds} * * * * *` };
@@ -20,7 +20,7 @@ const getCronOptions = (schedule, timezone = 'America/Los_Angeles') => {
20
20
  const dailyHours = Math.floor(schedule.time.minutes / 60);
21
21
  return {
22
22
  cron: `0 ${dailyMinutes} ${dailyHours} */${schedule.days} * *`,
23
- timezone,
23
+ timeZone: 'America/Los_Angeles',
24
24
  };
25
25
  case cron_interface_1.Unit.WEEKLY:
26
26
  const weeklyMinutes = schedule.time.minutes % 60;
@@ -28,108 +28,62 @@ const getCronOptions = (schedule, timezone = 'America/Los_Angeles') => {
28
28
  const weeklyWeekday = Object.keys(cron_interface_1.Weekday).indexOf(schedule.weekday) + 1;
29
29
  return {
30
30
  cron: `0 ${weeklyMinutes} ${weeklyHours} * * ${weeklyWeekday}`,
31
- timezone,
32
- };
33
- case cron_interface_1.Unit.CUSTOM:
34
- return {
35
- cron: schedule.expression,
36
- timezone,
31
+ timeZone: 'America/Los_Angeles',
37
32
  };
38
33
  }
39
34
  };
40
35
  exports.getCronOptions = getCronOptions;
41
- const extractPart = (cronExpression, index) => {
42
- const expressionParts = cronExpression.split(' ');
43
- return expressionParts.length === 5
44
- ? expressionParts[index]
45
- : expressionParts[index + 1];
46
- };
47
- const extractValue = (cronExpression, index) => {
48
- return extractPart(cronExpression, index).replace('*/', '');
49
- };
50
- const validateRange = (value, min, max, name, cron) => {
51
- if (isNaN(value) || value < min || value > max) {
52
- throw new Error(`Invalid ${name} value in cron expression "${cron}". The value must be between ${min} and ${max}.`);
53
- }
54
- return true;
55
- };
56
- const validateSeconds = (cron) => validateRange(parseInt(extractValue(cron, 0)), 0, 59, 'seconds', cron);
57
- const validateMinutes = (cron) => validateRange(parseInt(extractValue(cron, 1)), 0, 59, 'minutes', cron);
58
- const validateHours = (cron) => validateRange(parseInt(extractValue(cron, 2)), 1, 23, 'hours', cron);
59
- const validateDays = (cron) => validateRange(parseInt(extractValue(cron, 2)), 1, 31, 'days', cron);
60
- const sanitizeExpression = (cronExpression) => {
61
- const parts = cronExpression.split(' ');
62
- return parts.length > 5 ? parts.slice(-5).join(' ') : parts.join(' ');
63
- };
64
36
  const getSchedule = (cron, timezone = 'America/Los_Angeles') => {
65
- let parser;
66
- try {
67
- parser = (0, cron_parser_1.parseExpression)(cron);
68
- }
69
- catch (err) {
70
- throw new Error(`An error occurred while parsing the cron expression "${cron}": ${err.message}`);
71
- }
37
+ const parser = (0, cron_parser_1.parseExpression)(cron);
72
38
  const firstIteration = parser.next().toDate();
73
39
  const secondIteration = parser.next().toDate();
74
40
  const diffSeconds = Math.floor((secondIteration.getTime() - firstIteration.getTime()) / 1000);
75
- if (diffSeconds < 60 || (diffSeconds === 60 && validateSeconds(cron))) {
76
- const secondsFromExpression = parseInt(extractValue(cron, 0));
41
+ if (diffSeconds < 60) {
77
42
  return {
78
43
  unit: cron_interface_1.Unit.SECONDS,
79
- seconds: secondsFromExpression,
44
+ seconds: diffSeconds,
80
45
  };
81
46
  }
82
47
  const diffMinutes = Math.floor(diffSeconds / 60);
83
- if (diffMinutes < 60 || (diffMinutes === 60 && validateMinutes(cron))) {
84
- const minutesFromExpression = parseInt(extractValue(cron, 1));
48
+ if (diffMinutes < 60) {
85
49
  return {
86
50
  unit: cron_interface_1.Unit.MINUTES,
87
- minutes: minutesFromExpression,
51
+ minutes: diffMinutes,
88
52
  };
89
53
  }
90
54
  const diffHours = Math.floor(diffMinutes / 60);
91
- if (diffHours < 24 || (diffHours === 24 && validateHours(cron))) {
92
- const minuteFromExpression = parseInt(extractValue(cron, 1));
93
- const hoursFromExpression = parseInt(extractValue(cron, 2));
94
- const offset = isNaN(minuteFromExpression) ? 1 : minuteFromExpression;
95
- return offset % 5 === 0
96
- ? {
97
- unit: cron_interface_1.Unit.HOURLY,
98
- hours: hoursFromExpression,
99
- offset,
100
- }
101
- : { unit: cron_interface_1.Unit.CUSTOM, expression: sanitizeExpression(cron), timezone };
55
+ if (diffHours < 24) {
56
+ return {
57
+ unit: cron_interface_1.Unit.HOURLY,
58
+ hours: diffHours,
59
+ offset: (diffMinutes / 60) % 60,
60
+ };
102
61
  }
103
62
  const diffDays = Math.floor(diffHours / 24);
104
63
  const minutes = firstIteration.getHours() * 60 + firstIteration.getMinutes();
105
64
  if (diffDays !== 7) {
106
- validateDays(cron);
107
- return minutes % 15 === 0
108
- ? {
109
- unit: cron_interface_1.Unit.DAILY,
110
- days: diffDays,
111
- time: {
112
- minutes,
113
- timezone,
114
- },
115
- }
116
- : { unit: cron_interface_1.Unit.CUSTOM, expression: sanitizeExpression(cron), timezone };
65
+ return {
66
+ unit: cron_interface_1.Unit.DAILY,
67
+ days: diffDays,
68
+ time: {
69
+ minutes,
70
+ timezone,
71
+ },
72
+ };
117
73
  }
118
74
  const weekday = new Intl.DateTimeFormat('en-US', {
119
75
  weekday: 'long',
120
76
  })
121
77
  .format(firstIteration)
122
78
  .toUpperCase();
123
- return minutes % 15 === 0
124
- ? {
125
- unit: cron_interface_1.Unit.WEEKLY,
126
- weekday,
127
- time: {
128
- minutes,
129
- timezone: timezone,
130
- },
131
- }
132
- : { unit: cron_interface_1.Unit.CUSTOM, expression: sanitizeExpression(cron), timezone };
79
+ return {
80
+ unit: cron_interface_1.Unit.WEEKLY,
81
+ weekday,
82
+ time: {
83
+ minutes,
84
+ timezone: timezone,
85
+ },
86
+ };
133
87
  };
134
88
  exports.getSchedule = getSchedule;
135
89
  //# sourceMappingURL=cron.utils.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"cron.utils.js","sourceRoot":"","sources":["../../../src/triggers/cron/cron.utils.ts"],"names":[],"mappings":";;;AAAA,6CAA8D;AAE9D,qDAA2D;AAOpD,MAAM,cAAc,GAAG,CAC5B,QAAkB,EAClB,QAAQ,GAAG,qBAAqB,EACK,EAAE;IACvC,QAAQ,QAAQ,CAAC,IAAI,EAAE,CAAC;QACtB,KAAK,qBAAI,CAAC,OAAO;YACf,OAAO,EAAE,IAAI,EAAE,KAAK,QAAQ,CAAC,OAAO,YAAY,EAAE,CAAC;QACrD,KAAK,qBAAI,CAAC,OAAO;YACf,OAAO;gBACL,IAAI,EAAE,OAAO,QAAQ,CAAC,OAAO,UAAU;aACxC,CAAC;QACJ,KAAK,qBAAI,CAAC,MAAM;YACd,OAAO;gBACL,IAAI,EAAE,KAAK,QAAQ,CAAC,MAAM,MAAM,QAAQ,CAAC,KAAK,QAAQ;aACvD,CAAC;QACJ,KAAK,qBAAI,CAAC,KAAK;YACb,MAAM,YAAY,GAAW,QAAQ,CAAC,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;YACxD,MAAM,UAAU,GAAW,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC,CAAC;YAClE,OAAO;gBACL,IAAI,EAAE,KAAK,YAAY,IAAI,UAAU,MAAM,QAAQ,CAAC,IAAI,MAAM;gBAC9D,QAAQ;aACT,CAAC;QACJ,KAAK,qBAAI,CAAC,MAAM;YACd,MAAM,aAAa,GAAW,QAAQ,CAAC,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;YACzD,MAAM,WAAW,GAAW,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC,CAAC;YACnE,MAAM,aAAa,GACjB,MAAM,CAAC,IAAI,CAAC,wBAAO,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YACrD,OAAO;gBACL,IAAI,EAAE,KAAK,aAAa,IAAI,WAAW,QAAQ,aAAa,EAAE;gBAC9D,QAAQ;aACT,CAAC;QACJ,KAAK,qBAAI,CAAC,MAAM;YACd,OAAO;gBACL,IAAI,EAAE,QAAQ,CAAC,UAAU;gBACzB,QAAQ;aACT,CAAC;IACN,CAAC;AACH,CAAC,CAAC;AArCW,QAAA,cAAc,kBAqCzB;AAEF,MAAM,WAAW,GAAG,CAAC,cAAsB,EAAE,KAAa,EAAE,EAAE;IAC5D,MAAM,eAAe,GAAG,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAClD,OAAO,eAAe,CAAC,MAAM,KAAK,CAAC;QACjC,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC;QACxB,CAAC,CAAC,eAAe,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;AACjC,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,cAAsB,EAAE,KAAa,EAAE,EAAE;IAC7D,OAAO,WAAW,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;AAC9D,CAAC,CAAC;AAEF,MAAM,aAAa,GAAG,CACpB,KAAa,EACb,GAAW,EACX,GAAW,EACX,IAAY,EACZ,IAAY,EACZ,EAAE;IACF,IAAI,KAAK,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,GAAG,IAAI,KAAK,GAAG,GAAG,EAAE,CAAC;QAC/C,MAAM,IAAI,KAAK,CACb,WAAW,IAAI,8BAA8B,IAAI,gCAAgC,GAAG,QAAQ,GAAG,GAAG,CACnG,CAAC;IACJ,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,IAAY,EAAE,EAAE,CACvC,aAAa,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;AAEzE,MAAM,eAAe,GAAG,CAAC,IAAY,EAAE,EAAE,CACvC,aAAa,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;AAEzE,MAAM,aAAa,GAAG,CAAC,IAAY,EAAE,EAAE,CACrC,aAAa,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;AAEvE,MAAM,YAAY,GAAG,CAAC,IAAY,EAAE,EAAE,CACpC,aAAa,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;AAEtE,MAAM,kBAAkB,GAAG,CAAC,cAAsB,EAAE,EAAE;IACpD,MAAM,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACxC,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACxE,CAAC,CAAC;AAMK,MAAM,WAAW,GAAG,CACzB,IAAY,EACZ,WAAmB,qBAAqB,EAC9B,EAAE;IACZ,IAAI,MAAsB,CAAC;IAC3B,IAAI,CAAC;QACH,MAAM,GAAG,IAAA,6BAAe,EAAC,IAAI,CAAC,CAAC;IACjC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CACb,wDAAwD,IAAI,MACzD,GAAW,CAAC,OACf,EAAE,CACH,CAAC;IACJ,CAAC;IACD,MAAM,cAAc,GAAS,MAAM,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC;IACpD,MAAM,eAAe,GAAS,MAAM,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC;IAErD,MAAM,WAAW,GAAW,IAAI,CAAC,KAAK,CACpC,CAAC,eAAe,CAAC,OAAO,EAAE,GAAG,cAAc,CAAC,OAAO,EAAE,CAAC,GAAG,IAAI,CAC9D,CAAC;IACF,IAAI,WAAW,GAAG,EAAE,IAAI,CAAC,WAAW,KAAK,EAAE,IAAI,eAAe,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;QACtE,MAAM,qBAAqB,GAAG,QAAQ,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAE9D,OAAO;YACL,IAAI,EAAE,qBAAI,CAAC,OAAO;YAClB,OAAO,EAAE,qBAAqB;SAC/B,CAAC;IACJ,CAAC;IACD,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,GAAG,EAAE,CAAC,CAAC;IACjD,IAAI,WAAW,GAAG,EAAE,IAAI,CAAC,WAAW,KAAK,EAAE,IAAI,eAAe,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;QACtE,MAAM,qBAAqB,GAAG,QAAQ,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAE9D,OAAO;YACL,IAAI,EAAE,qBAAI,CAAC,OAAO;YAClB,OAAO,EAAE,qBAAqB;SAC/B,CAAC;IACJ,CAAC;IACD,MAAM,SAAS,GAAW,IAAI,CAAC,KAAK,CAAC,WAAW,GAAG,EAAE,CAAC,CAAC;IACvD,IAAI,SAAS,GAAG,EAAE,IAAI,CAAC,SAAS,KAAK,EAAE,IAAI,aAAa,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;QAChE,MAAM,oBAAoB,GAAG,QAAQ,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAC7D,MAAM,mBAAmB,GAAG,QAAQ,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAE5D,MAAM,MAAM,GAAG,KAAK,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,oBAAoB,CAAC;QAEtE,OAAO,MAAM,GAAG,CAAC,KAAK,CAAC;YACrB,CAAC,CAAC;gBACE,IAAI,EAAE,qBAAI,CAAC,MAAM;gBACjB,KAAK,EAAE,mBAAmB;gBAC1B,MAAM;aACP;YACH,CAAC,CAAC,EAAE,IAAI,EAAE,qBAAI,CAAC,MAAM,EAAE,UAAU,EAAE,kBAAkB,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,CAAC;IAC5E,CAAC;IAED,MAAM,QAAQ,GAAW,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,EAAE,CAAC,CAAC;IACpD,MAAM,OAAO,GACX,cAAc,CAAC,QAAQ,EAAE,GAAG,EAAE,GAAG,cAAc,CAAC,UAAU,EAAE,CAAC;IAE/D,IAAI,QAAQ,KAAK,CAAC,EAAE,CAAC;QACnB,YAAY,CAAC,IAAI,CAAC,CAAC;QACnB,OAAO,OAAO,GAAG,EAAE,KAAK,CAAC;YACvB,CAAC,CAAC;gBACE,IAAI,EAAE,qBAAI,CAAC,KAAK;gBAChB,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE;oBACJ,OAAO;oBACP,QAAQ;iBACT;aACF;YACH,CAAC,CAAC,EAAE,IAAI,EAAE,qBAAI,CAAC,MAAM,EAAE,UAAU,EAAE,kBAAkB,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,CAAC;IAC5E,CAAC;IAED,MAAM,OAAO,GAAY,IAAI,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE;QACxD,OAAO,EAAE,MAAM;KAChB,CAAC;SACC,MAAM,CAAC,cAAc,CAAC;SACtB,WAAW,EAAa,CAAC;IAE5B,OAAO,OAAO,GAAG,EAAE,KAAK,CAAC;QACvB,CAAC,CAAC;YACE,IAAI,EAAE,qBAAI,CAAC,MAAM;YACjB,OAAO;YACP,IAAI,EAAE;gBACJ,OAAO;gBACP,QAAQ,EAAE,QAAQ;aACnB;SACF;QACH,CAAC,CAAC,EAAE,IAAI,EAAE,qBAAI,CAAC,MAAM,EAAE,UAAU,EAAE,kBAAkB,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,CAAC;AAC5E,CAAC,CAAC;AAvFW,QAAA,WAAW,eAuFtB"}
1
+ {"version":3,"file":"cron.utils.js","sourceRoot":"","sources":["../../../src/triggers/cron/cron.utils.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@useparagon/core",
3
- "version": "1.0.8-canary.4",
3
+ "version": "v1.0.8-canary.6",
4
4
  "description": "Core libraries for paragraph",
5
5
  "repository": "https://github.com/useparagon/paragraph",
6
6
  "packageManager": "pnpm@8.10.5",