@go-avro/avro-js 0.0.4-beta.21 → 0.0.4-beta.23

package/dist/types/api/Job.d.ts

@@ -31,5 +31,6 @@ declare module '../../types/api/Job' {
 }
 export declare class Job {
     constructor(init?: Partial<Job>);
-    portionDone: () => number;
+    portionDone: (fallback: Date) => number;
+    isDone: (fallback: Date) => boolean;
 }

package/dist/types/api/Job.js

@@ -2,11 +2,14 @@ import { Task } from "../../types/api/Task";
 import { RouteJob } from "../../types/api/RouteJob";
 export class Job {
     constructor(init) {
-        this.portionDone = () => {
+        this.portionDone = (fallback) => {
             if (!this.tasks || this.tasks.length === 0) {
                 return 0;
             }
-            return this.tasks.filter(t => t.isDone?.()).length / this.tasks.length;
+            return this.tasks.filter(t => t.isDone?.(fallback)).length / this.tasks.length;
+        };
+        this.isDone = (fallback) => {
+            return this.portionDone(fallback) === 1;
         };
         Object.assign(this, init);
         if (init?.tasks) {

package/dist/types/api/Route.d.ts

@@ -1,5 +1,6 @@
 import { RouteJob } from "../../types/api/RouteJob";
 export declare const FrequencyType: {
+    readonly ONCE: "ONCE";
     readonly DAILY: "DAILY";
     readonly WEEKLY: "WEEKLY";
     readonly BIWEEKLY: "BIWEEKLY";
@@ -30,5 +31,7 @@ declare module '../../types/api/Route' {
 }
 export declare class Route {
     constructor(init?: Partial<Route>);
-    getNextOccurrences: (count?: number) => number[];
+    getNextOccurrences: (count?: number) => (Date | null)[];
+    getNextOccurrence: (after?: Date) => Date | null;
+    getPreviousOccurrence: (before?: Date) => Date | null;
 }

package/dist/types/api/Route.js

@@ -1,5 +1,6 @@
 import { RouteJob } from "../../types/api/RouteJob";
 export const FrequencyType = {
+    ONCE: "ONCE",
     DAILY: "DAILY",
     WEEKLY: "WEEKLY",
     BIWEEKLY: "BIWEEKLY",
@@ -9,37 +10,59 @@ export const FrequencyType = {
 export class Route {
     constructor(init) {
         this.getNextOccurrences = (count = 1) => {
-            if (!this.frequency) {
-                return [];
+            let next_occurrences = [];
+            for (let i = 0; i < count; i++) {
+                next_occurrences.push(this.getNextOccurrence(next_occurrences.length > 0 ? next_occurrences[next_occurrences.length - 1] ?? new Date() : new Date()));
             }
-            const occurrences = [];
-            let nextOccurrence = this.start_time;
-            const now = Date.now();
-            while (occurrences.length < count) {
-                if (nextOccurrence > now) {
-                    occurrences.push(nextOccurrence);
-                }
+            return next_occurrences;
+        };
+        this.getNextOccurrence = (after = new Date()) => {
+            let next_occurrence = new Date(this.start_time * 1000);
+            while (next_occurrence <= after) {
                 switch (this.frequency) {
+                    case FrequencyType.ONCE:
+                        return null;
                     case FrequencyType.DAILY:
-                        nextOccurrence += 24 * 60 * 60 * 1000;
+                        next_occurrence.setDate(next_occurrence.getDate() + 1);
                         break;
                     case FrequencyType.WEEKLY:
-                        nextOccurrence += 7 * 24 * 60 * 60 * 1000;
+                        next_occurrence.setDate(next_occurrence.getDate() + 7);
                         break;
                     case FrequencyType.BIWEEKLY:
-                        nextOccurrence += 14 * 24 * 60 * 60 * 1000;
+                        next_occurrence.setDate(next_occurrence.getDate() + 14);
                         break;
                     case FrequencyType.MONTHLY:
-                        nextOccurrence += 30 * 24 * 60 * 60 * 1000;
+                        next_occurrence.setMonth(next_occurrence.getMonth() + 1);
                         break;
                     case FrequencyType.YEARLY:
-                        nextOccurrence += 365 * 24 * 60 * 60 * 1000;
+                        next_occurrence.setFullYear(next_occurrence.getFullYear() + 1);
                         break;
-                    default:
-                        throw new Error("Invalid frequency");
                 }
             }
-            return occurrences;
+            return next_occurrence;
+        };
+        this.getPreviousOccurrence = (before = new Date()) => {
+            let previous_occurrence = new Date(this.start_time * 1000);
+            switch (this.frequency) {
+                case FrequencyType.ONCE:
+                    return null;
+                case FrequencyType.DAILY:
+                    previous_occurrence.setDate(previous_occurrence.getDate() - 1);
+                    break;
+                case FrequencyType.WEEKLY:
+                    previous_occurrence.setDate(previous_occurrence.getDate() - 7);
+                    break;
+                case FrequencyType.BIWEEKLY:
+                    previous_occurrence.setDate(previous_occurrence.getDate() - 14);
+                    break;
+                case FrequencyType.MONTHLY:
+                    previous_occurrence.setMonth(previous_occurrence.getMonth() - 1);
+                    break;
+                case FrequencyType.YEARLY:
+                    previous_occurrence.setFullYear(previous_occurrence.getFullYear() - 1);
+                    break;
+            }
+            return previous_occurrence <= before ? previous_occurrence : null;
         };
         Object.assign(this, init);
         if (init?.jobs) {

package/dist/types/api/Task.d.ts

@@ -53,5 +53,5 @@ export declare class Task {
     computeNextTaskState: (isCustomer: boolean, action: "accept" | "modify" | "reject") => TaskStatus;
     getPrepaidEventsRemaining: () => number;
     getPrepaidMonthsRemaining: () => number;
-    isDone: (fallback?: number) => number | boolean;
+    isDone: (fallback: Date) => boolean | 1;
 }

package/dist/types/api/Task.js

@@ -51,7 +51,7 @@ export class Task {
                 return acc;
             }, 0);
         };
-        this.isDone = (fallback = 0) => {
+        this.isDone = (fallback) => {
             if (!this.status || this.status !== TaskStatus.ACTIVE) {
                 return 1;
             }
@@ -59,8 +59,8 @@ export class Task {
                 return this.overdue_time <= 0;
             }
             else {
-                // If frequency is 0, task falls back to company.indicator_lifetime
-                return this.last_completed_event?.time_ended ?? 0 > (new Date().getTime() / 1000 - fallback);
+                // If frequency is 0, use fallback
+                return new Date(this.last_completed_event?.time_ended ?? 0 * 1000) > fallback;
             }
         };
         Object.assign(this, init);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@go-avro/avro-js",
-  "version": "0.0.4-beta.21",
+  "version": "0.0.4-beta.23",
   "description": "JS client for Avro backend integration.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",