@aneuhold/core-ts-db-lib 1.0.121 → 2.0.1

package/lib/services/dashboard/Task/TaskService.ts

@@ -0,0 +1,189 @@
+import { ObjectId } from 'bson';
+import DashboardTask, {
+  DashboardTaskMap
+} from '../../../documents/dashboard/Task.js';
+import { DashboardTaskListFilterSettings } from '../../../embedded-types/dashboard/task/FilterSettings.js';
+import { RecurrenceFrequency } from '../../../embedded-types/dashboard/task/RecurrenceInfo.js';
+import {
+  DashboardTaskListSortSettings,
+  DashboardTaskSortDirection
+} from '../../../embedded-types/dashboard/task/SortSettings.js';
+import { DashboardTagSettings } from '../../../embedded-types/dashboard/userConfig/Tags.js';
+import DashboardTaskFilterService, {
+  DashboardTaskFilterResult
+} from './TaskFilterService.js';
+import DashboardTaskRecurrenceService from './TaskRecurrenceService.js';
+import DashboardTaskSortService from './TaskSortService.js';
+
+/**
+ * A type for the task filter settings for a particular task.
+ */
+export type DashboardTaskFilterTaskInfo = {
+  taskId: string;
+  allChildrenIds: string[];
+};
+
+export type DashboardTaskFilterAndSortResult = {
+  filteredAndSortedIds: string[];
+  /**
+   * The IDs of the tasks that were filtered, but still apply to the same
+   * category. Does not include tasks that were filtered because of grand
+   * children tasks.
+   */
+  removedIds: string[];
+};
+
+export default class DashboardTaskService {
+  /**
+   * Gets all the children task IDs for the given parent task IDs.
+   */
+  static getChildrenIds = (
+    allUserTasks: DashboardTask[],
+    parentTaskIds: ObjectId[]
+  ): ObjectId[] => {
+    const parentToTaskIdsDict: Record<string, string[]> = {};
+    const taskIdToTaskDict: Record<string, DashboardTask> = {};
+    allUserTasks.forEach((task) => {
+      taskIdToTaskDict[task._id.toString()] = task;
+      if (task.parentTaskId) {
+        if (!parentToTaskIdsDict[task.parentTaskId.toString()]) {
+          parentToTaskIdsDict[task.parentTaskId.toString()] = [];
+        }
+        parentToTaskIdsDict[task.parentTaskId.toString()].push(
+          task._id.toString()
+        );
+      }
+    });
+    const childrenIds: ObjectId[] = [];
+    parentTaskIds.forEach((taskId) => {
+      const task = taskIdToTaskDict[taskId.toString()];
+      if (task) {
+        const childrenTaskIds = this.getChildrenTaskIds(
+          taskIdToTaskDict,
+          parentToTaskIdsDict,
+          taskId.toString()
+        );
+        childrenIds.push(...childrenTaskIds.map((id) => new ObjectId(id)));
+      }
+    });
+    return childrenIds;
+  };
+
+  /**
+   * Gets the next frequency date from the provided basis date. Returns null
+   * if the provided frequency is in an invalid state.
+   */
+  static getNextFrequencyDate(
+    basisDate: Date,
+    frequency: RecurrenceFrequency
+  ): Date | null {
+    return DashboardTaskRecurrenceService.getNextFrequencyDate(
+      basisDate,
+      frequency
+    );
+  }
+
+  /**
+   * Moves the start and due date forward by one frequency.
+   *
+   * This does not take into account the recurrence effect. That should be
+   * handled on the frontend.
+   *
+   * Makes no changes if the state of the task is invalid for recurrence or
+   * there isn't recurrence info.
+   */
+  static updateDatesForRecurrence(task: DashboardTask): void {
+    DashboardTaskRecurrenceService.updateDatesForRecurrence(task);
+  }
+
+  /**
+   * Gets the filtered and sorted set of task ids for a particular category.
+   *
+   * @param category the category of the tasks to filter
+   * @param filterSettings the filter settings for a task if there are any.
+   * Otherwise, this will use the default filter settings for the user. If
+   * the user does not have filter settings, then it will use the default.
+   */
+  static getFilteredAndSortedTaskIds(
+    taskMap: DashboardTaskMap,
+    category: string,
+    filterSettings: DashboardTaskListFilterSettings,
+    sortSettings: DashboardTaskListSortSettings,
+    tagSettings: DashboardTagSettings,
+    taskInfo?: DashboardTaskFilterTaskInfo
+  ): DashboardTaskFilterAndSortResult {
+    let filterResult: DashboardTaskFilterResult;
+
+    if (!taskInfo) {
+      filterResult = DashboardTaskFilterService.filter(
+        taskMap,
+        Object.keys(taskMap),
+        filterSettings,
+        category
+      );
+    } else {
+      filterResult = DashboardTaskFilterService.filter(
+        taskMap,
+        taskInfo.allChildrenIds,
+        filterSettings,
+        category,
+        taskInfo.taskId
+      );
+    }
+    return {
+      filteredAndSortedIds: DashboardTaskSortService.sort(
+        taskMap,
+        filterResult.resultIds,
+        sortSettings,
+        tagSettings
+      ),
+      removedIds: filterResult.removedIds
+    };
+  }
+
+  /**
+   * Gets a map of task IDs to tag header names. Used only for when sorting by
+   * tags. If the first task in the list has no high-priority tags, then
+   * noPriorityTagsIndicator will be used as the header name.
+   */
+  static getTagHeaderMap(
+    taskMap: DashboardTaskMap,
+    taskIds: string[],
+    userId: string,
+    tagSettings: DashboardTagSettings,
+    noPriorityTagsIndicator: string,
+    sortDirection: DashboardTaskSortDirection
+  ): Record<string, string> {
+    return DashboardTaskSortService.getTagHeaderMap(
+      taskMap,
+      taskIds,
+      userId,
+      tagSettings,
+      noPriorityTagsIndicator,
+      sortDirection
+    );
+  }
+
+  private static getChildrenTaskIds(
+    taskIdToTaskDict: Record<string, DashboardTask>,
+    parentToTaskIdsDict: Record<string, string[]>,
+    taskId: string
+  ): string[] {
+    const childrenIds = parentToTaskIdsDict[taskId];
+    if (!childrenIds) {
+      return [];
+    }
+    childrenIds.forEach((childId) => {
+      const childTask = taskIdToTaskDict[childId];
+      if (childTask) {
+        const grandchildrenIds = this.getChildrenTaskIds(
+          taskIdToTaskDict,
+          parentToTaskIdsDict,
+          childId
+        );
+        childrenIds.push(...grandchildrenIds);
+      }
+    });
+    return childrenIds;
+  }
+}

package/lib/services/dashboard/Task/TaskSortService.d.ts

@@ -1,6 +1,6 @@
-import { DashboardTaskMap } from '../../../documents/dashboard/Task';
-import { DashboardTaskListSortSettings, DashboardTaskSortDirection } from '../../../embedded-types/dashboard/task/SortSettings';
-import { DashboardTagSettings } from '../../../embedded-types/dashboard/userConfig/Tags';
+import { DashboardTaskMap } from '../../../documents/dashboard/Task.js';
+import { DashboardTaskListSortSettings, DashboardTaskSortDirection } from '../../../embedded-types/dashboard/task/SortSettings.js';
+import { DashboardTagSettings } from '../../../embedded-types/dashboard/userConfig/Tags.js';
 /**
  * A service for sorting tasks.
  */

package/lib/services/dashboard/Task/TaskSortService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TaskSortService.d.ts","sourceRoot":"","sources":["../../../../src/services/dashboard/Task/TaskSortService.ts"],"names":[],"mappings":"AAAA,OAAsB,EACpB,gBAAgB,EACjB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EACL,6BAA6B,EAE7B,0BAA0B,EAC3B,MAAM,qDAAqD,CAAC;AAC7D,OAAO,EAAE,oBAAoB,EAAE,MAAM,mDAAmD,CAAC;AAEzF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,wBAAwB;IAC3C;;OAEG;IACH,MAAM,CAAC,IAAI,CACT,OAAO,EAAE,gBAAgB,EACzB,OAAO,EAAE,MAAM,EAAE,EACjB,YAAY,EAAE,6BAA6B,EAC3C,WAAW,EAAE,oBAAoB;IA0BnC;;;;OAIG;IACH,MAAM,CAAC,eAAe,CACpB,OAAO,EAAE,gBAAgB,EACzB,OAAO,EAAE,MAAM,EAAE,EACjB,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,oBAAoB,EACjC,uBAAuB,EAAE,MAAM,EAC/B,aAAa,EAAE,0BAA0B,GACxC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAkCzB,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAkElC;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,qBAAqB;IAepC;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,0BAA0B;IAezC,OAAO,CAAC,MAAM,CAAC,qBAAqB;CAgCrC"}
+{"version":3,"file":"TaskSortService.d.ts","sourceRoot":"./src/","sources":["services/dashboard/Task/TaskSortService.ts"],"names":[],"mappings":"AAAA,OAAsB,EACpB,gBAAgB,EACjB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EACL,6BAA6B,EAE7B,0BAA0B,EAC3B,MAAM,wDAAwD,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,sDAAsD,CAAC;AAE5F;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,wBAAwB;IAC3C;;OAEG;IACH,MAAM,CAAC,IAAI,CACT,OAAO,EAAE,gBAAgB,EACzB,OAAO,EAAE,MAAM,EAAE,EACjB,YAAY,EAAE,6BAA6B,EAC3C,WAAW,EAAE,oBAAoB;IA0BnC;;;;OAIG;IACH,MAAM,CAAC,eAAe,CACpB,OAAO,EAAE,gBAAgB,EACzB,OAAO,EAAE,MAAM,EAAE,EACjB,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,oBAAoB,EACjC,uBAAuB,EAAE,MAAM,EAC/B,aAAa,EAAE,0BAA0B,GACxC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAkCzB,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAkElC;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,qBAAqB;IAepC;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,0BAA0B;IAezC,OAAO,CAAC,MAAM,CAAC,qBAAqB;CAgCrC"}

package/lib/services/dashboard/Task/TaskSortService.js

@@ -1,10 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const SortSettings_1 = require("../../../embedded-types/dashboard/task/SortSettings");
+import { DashboardTaskSortBy, DashboardTaskSortDirection } from '../../../embedded-types/dashboard/task/SortSettings.js';
 /**
  * A service for sorting tasks.
  */
-class DashboardTaskSortService {
+export default class DashboardTaskSortService {
     /**
      * Sorts the provided task IDs based on the provided sort settings.
      */
@@ -58,7 +56,7 @@ class DashboardTaskSortService {
     }
     static getTaskSortFunction(sortBy, sortDirection, tagSettings, userId) {
         switch (sortBy) {
-            case SortSettings_1.DashboardTaskSortBy.tags:
+            case DashboardTaskSortBy.tags:
                 return (taskA, taskB) => {
                     const highestPriorityTagA = this.getHighestPriorityTagValue(taskA, userId, tagSettings, sortDirection);
                     const highestPriorityTagB = this.getHighestPriorityTagValue(taskB, userId, tagSettings, sortDirection);
@@ -70,7 +68,7 @@ class DashboardTaskSortService {
                     }
                     return -1 * sortDirection;
                 };
-            case SortSettings_1.DashboardTaskSortBy.title:
+            case DashboardTaskSortBy.title:
                 return (taskA, taskB) => {
                     const titleA = taskA.title;
                     const titleB = taskB.title;
@@ -130,7 +128,7 @@ class DashboardTaskSortService {
         if (!tags || tags.length === 0)
             return priorityTag;
         let highestPriority = 0;
-        const isAscending = sortDirection === SortSettings_1.DashboardTaskSortDirection.ascending;
+        const isAscending = sortDirection === DashboardTaskSortDirection.ascending;
         // If the sort direction is descending, then we want to start with the
         // lowest priority number.
         if (isAscending) {
@@ -150,4 +148,4 @@ class DashboardTaskSortService {
         return priorityTag;
     }
 }
-exports.default = DashboardTaskSortService;
+//# sourceMappingURL=TaskSortService.js.map

package/lib/services/dashboard/Task/TaskSortService.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"TaskSortService.js","sourceRoot":"./src/","sources":["services/dashboard/Task/TaskSortService.ts"],"names":[],"mappings":"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"}

package/lib/services/dashboard/Task/TaskSortService.ts

@@ -0,0 +1,229 @@
+import DashboardTask, {
+  DashboardTaskMap
+} from '../../../documents/dashboard/Task.js';
+import {
+  DashboardTaskListSortSettings,
+  DashboardTaskSortBy,
+  DashboardTaskSortDirection
+} from '../../../embedded-types/dashboard/task/SortSettings.js';
+import { DashboardTagSettings } from '../../../embedded-types/dashboard/userConfig/Tags.js';
+
+/**
+ * A service for sorting tasks.
+ */
+export default class DashboardTaskSortService {
+  /**
+   * Sorts the provided task IDs based on the provided sort settings.
+   */
+  static sort(
+    taskMap: DashboardTaskMap,
+    taskIds: string[],
+    sortSettings: DashboardTaskListSortSettings,
+    tagSettings: DashboardTagSettings
+  ) {
+    return taskIds.sort((idA, idB) => {
+      const taskA = taskMap[idA];
+      const taskB = taskMap[idB];
+
+      if (!taskA || !taskB || sortSettings.sortList.length === 0) return 0;
+
+      for (const sortSetting of sortSettings.sortList) {
+        const { sortBy } = sortSetting;
+        const { sortDirection } = sortSetting;
+
+        const result = this.getTaskSortFunction(
+          sortBy,
+          sortDirection,
+          tagSettings,
+          sortSettings.userId
+        )(taskA, taskB);
+        if (result !== 0) {
+          return result;
+        }
+      }
+      return 0;
+    });
+  }
+
+  /**
+   * Gets a map of task IDs to tag header names. Used only for when sorting by
+   * tags. If the first task in the list has no high-priority tags, then
+   * noPriorityTagsIndicator will be used as the header name.
+   */
+  static getTagHeaderMap(
+    taskMap: DashboardTaskMap,
+    taskIds: string[],
+    userId: string,
+    tagSettings: DashboardTagSettings,
+    noPriorityTagsIndicator: string,
+    sortDirection: DashboardTaskSortDirection
+  ): Record<string, string> {
+    const tagHeaderMap: Record<string, string> = {};
+    if (taskIds.length === 0 || taskIds.length === 1) return tagHeaderMap;
+    const firstTask = taskMap[taskIds[0]];
+    if (!firstTask) return tagHeaderMap;
+    let tag = this.getHighestPriorityTag(
+      firstTask,
+      userId,
+      tagSettings,
+      sortDirection
+    );
+    if (!tag) {
+      tagHeaderMap[taskIds[0]] = noPriorityTagsIndicator;
+    } else {
+      tagHeaderMap[taskIds[0]] = tag;
+    }
+    for (let i = 1; i < taskIds.length; i += 1) {
+      const task = taskMap[taskIds[i]];
+      if (task) {
+        const taskTag = this.getHighestPriorityTag(
+          task,
+          userId,
+          tagSettings,
+          sortDirection
+        );
+        if (taskTag !== tag && tag !== noPriorityTagsIndicator) {
+          tag = taskTag || noPriorityTagsIndicator;
+          tagHeaderMap[taskIds[i]] = tag;
+        }
+      }
+    }
+    return tagHeaderMap;
+  }
+
+  private static getTaskSortFunction(
+    sortBy: DashboardTaskSortBy,
+    sortDirection: DashboardTaskSortDirection,
+    tagSettings: DashboardTagSettings,
+    userId: string
+  ) {
+    switch (sortBy) {
+      case DashboardTaskSortBy.tags:
+        return (taskA: DashboardTask, taskB: DashboardTask) => {
+          const highestPriorityTagA = this.getHighestPriorityTagValue(
+            taskA,
+            userId,
+            tagSettings,
+            sortDirection
+          );
+          const highestPriorityTagB = this.getHighestPriorityTagValue(
+            taskB,
+            userId,
+            tagSettings,
+            sortDirection
+          );
+
+          if (highestPriorityTagA === highestPriorityTagB) {
+            return 0;
+          }
+          if (highestPriorityTagA > highestPriorityTagB) {
+            return 1 * sortDirection;
+          }
+          return -1 * sortDirection;
+        };
+      case DashboardTaskSortBy.title:
+        return (taskA: DashboardTask, taskB: DashboardTask) => {
+          const titleA = taskA.title;
+          const titleB = taskB.title;
+
+          if (!titleA || !titleB) return 0;
+
+          return titleA.localeCompare(titleB) * sortDirection;
+        };
+      default:
+        return (taskA: DashboardTask, taskB: DashboardTask) => {
+          const valueA = taskA[sortBy];
+          const valueB = taskB[sortBy];
+
+          if (!valueA && !valueB) return 0;
+          // One doesn't have a value, it should be sorted to the bottom.
+          // Purposefully not using the sortDirection here.
+          if (valueA && !valueB) return -1;
+          if (!valueA && valueB) return 1;
+
+          if (!valueA || !valueB) return 0;
+
+          if (valueA instanceof Date && valueB instanceof Date) {
+            if (valueA.getTime() === valueB.getTime()) return 0;
+            if (valueA.getTime() > valueB.getTime()) return 1 * sortDirection;
+            if (valueA.getTime() < valueB.getTime()) return -1 * sortDirection;
+            return 0;
+          }
+
+          if (valueA > valueB) return 1 * sortDirection;
+          if (valueA < valueB) return -1 * sortDirection;
+          return 0;
+        };
+    }
+  }
+
+  /**
+   * Gets the highest priority tag for the provided task. If there are no tags,
+   * or if there are no tags with a priority, then this will return null.
+   */
+  private static getHighestPriorityTag(
+    task: DashboardTask,
+    userId: string,
+    tagSettings: DashboardTagSettings,
+    sortDirection: DashboardTaskSortDirection
+  ): string | null {
+    const priorityTag = this.getPriorityTagForTask(
+      task,
+      userId,
+      tagSettings,
+      sortDirection
+    );
+    return priorityTag ? priorityTag.tag : null;
+  }
+
+  /**
+   * Gets the highest priority tag value for the provided task.
+   */
+  private static getHighestPriorityTagValue(
+    task: DashboardTask,
+    userId: string,
+    tagSettings: DashboardTagSettings,
+    sortDirection: DashboardTaskSortDirection
+  ) {
+    const priorityTag = this.getPriorityTagForTask(
+      task,
+      userId,
+      tagSettings,
+      sortDirection
+    );
+    return priorityTag ? priorityTag.priority : 0;
+  }
+
+  private static getPriorityTagForTask(
+    task: DashboardTask,
+    userId: string,
+    tagSettings: DashboardTagSettings,
+    sortDirection: DashboardTaskSortDirection
+  ): { tag: string; priority: number } | null {
+    let priorityTag: { tag: string; priority: number } | null = null;
+    const tags = task.tags[userId];
+    if (!tags || tags.length === 0) return priorityTag;
+
+    let highestPriority = 0;
+    const isAscending = sortDirection === DashboardTaskSortDirection.ascending;
+    // If the sort direction is descending, then we want to start with the
+    // lowest priority number.
+    if (isAscending) {
+      highestPriority = Number.MAX_SAFE_INTEGER;
+    }
+    tags.forEach((tag) => {
+      const priority = tagSettings[tag]?.priority ?? 0;
+      if (
+        (isAscending && priority < highestPriority) ||
+        (!isAscending && priority > highestPriority)
+      ) {
+        highestPriority = priority;
+        priorityTag = { tag, priority };
+      }
+    });
+    if (highestPriority === 0) {
+      return null;
+    }
+    return priorityTag;
+  }
+}

package/package.json

@@ -1,12 +1,33 @@
 {
   "name": "@aneuhold/core-ts-db-lib",
-  "version": "1.0.121",
+  "author": "Anton G. Neuhold Jr.",
+  "license": "MIT",
+  "version": "2.0.1",
   "description": "A core database library used for personal projects",
+  "packageManager": "yarn@4.5.1",
+  "type": "module",
+  "scripts": {
+    "build": "rimraf lib && tsc --project tsconfig.build.json && tsx ./scripts/copyTsFiles.ts",
+    "lint": "eslint",
+    "test": "vitest run",
+    "jsr:validate": "tb pkg validateJsr",
+    "checkAll": "yarn build && yarn lint && yarn test && yarn jsr:validate",
+    "jsr:publish": "tb pkg publishJsr",
+    "upgrade:core": "yarn up '@aneuhold/*'",
+    "upgrade:all": "yarn up"
+  },
   "main": "lib/index.js",
+  "module": "lib/index.js",
   "types": "lib/index.d.ts",
-  "author": "Anton G Neuhold Jr <agneuhold@gmail.com>",
-  "license": "MIT",
-  "packageManager": "yarn@4.5.0",
+  "files": [
+    "lib/**/*"
+  ],
+  "exports": {
+    ".": {
+      "types": "./lib/index.d.ts",
+      "import": "./lib/index.js"
+    }
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/aneuhold/core-ts-db-lib.git"
@@ -15,40 +36,26 @@
     "url": "https://github.com/aneuhold/core-ts-db-lib/issues"
   },
   "homepage": "https://github.com/aneuhold/core-ts-db-lib#readme",
-  "files": [
-    "lib/**/*"
-  ],
   "keywords": [
-    "Scripting",
+    "Database",
+    "MongoDB",
+    "TypeScript",
     "Node.js"
   ],
-  "scripts": {
-    "pushpub": "yarn build && npm version patch && git push",
-    "build": "tsc",
-    "watch": "tsc -w",
-    "link:local": "cd lib && yarn link",
-    "link:core-ts-lib": "yarn link @aneuhold/core-ts-lib",
-    "unlink:local": "cd lib && yarn unlink",
-    "unlink:core-ts-lib": "yarn unlink @aneuhold/core-ts-lib && yarn install --force",
-    "upgrade:all": "yarn up",
-    "upgrade:core": "yarn up '@aneuhold/*'",
-    "test": "jest",
-    "lint": "eslint"
-  },
   "dependencies": {
-    "@aneuhold/core-ts-lib": "^1.1.52",
+    "@aneuhold/core-ts-lib": "^2.0.6",
     "bson": "^6.2.0"
   },
   "devDependencies": {
     "@aneuhold/eslint-config": "^1.0.37",
-    "@types/jest": "^29.5.13",
+    "@aneuhold/main-scripts": "^2.0.6",
     "@types/node": "^20.16.10",
-    "@types/node-fetch": "^2.6.11",
     "eslint": "^9.13.0",
-    "jest": "^29.7.0",
+    "jsr": "^0.13.2",
     "prettier": "^3.3.3",
-    "ts-jest": "^29.2.5",
-    "ts-node": "^10.9.2",
-    "typescript": "^5.6.2"
+    "rimraf": "^6.0.1",
+    "tsx": "^4.19.1",
+    "typescript": "^5.6.2",
+    "vitest": "^2.1.3"
   }
 }

package/lib/schemas/validators/ValidateUtil.spec.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=ValidateUtil.spec.d.ts.map

package/lib/schemas/validators/ValidateUtil.spec.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ValidateUtil.spec.d.ts","sourceRoot":"","sources":["../../../src/schemas/validators/ValidateUtil.spec.ts"],"names":[],"mappings":""}

package/lib/schemas/validators/ValidateUtil.spec.js

@@ -1,64 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const ValidateUtil_1 = __importDefault(require("./ValidateUtil"));
-describe('Validate', () => {
-    let errorsArray;
-    let parentObject;
-    beforeEach(() => {
-        errorsArray = [];
-        parentObject = {};
-    });
-    it('should validate optional string', () => {
-        const validate = new ValidateUtil_1.default(parentObject, errorsArray);
-        parentObject.testField = 123;
-        validate.optionalString('testField');
-        expect(errorsArray).toContain('testField must be a string or undefined');
-        errorsArray = [];
-        parentObject.testField = 'test';
-        validate.optionalString('testField');
-        expect(errorsArray.length).toBe(0);
-    });
-    it('should validate optional number', () => {
-        const validate = new ValidateUtil_1.default(parentObject, errorsArray);
-        parentObject.testField = true;
-        validate.optionalNumber('testField');
-        expect(errorsArray).toContain('testField must be a number or undefined');
-        errorsArray = [];
-        parentObject.testField = 123;
-        validate.optionalNumber('testField');
-        expect(errorsArray.length).toBe(0);
-    });
-    it('should validate optional boolean', () => {
-        const validate = new ValidateUtil_1.default(parentObject, errorsArray);
-        parentObject.testField = 123;
-        validate.optionalBoolean('testField');
-        expect(errorsArray).toContain('testField must be a boolean or undefined');
-        errorsArray = [];
-        parentObject.testField = true;
-        validate.optionalBoolean('testField');
-        expect(errorsArray.length).toBe(0);
-    });
-    it('should validate optional array', () => {
-        const validate = new ValidateUtil_1.default(parentObject, errorsArray);
-        parentObject.testField = 123;
-        validate.optionalArray('testField');
-        expect(errorsArray).toContain('testField must be an array or undefined');
-        errorsArray = [];
-        parentObject.testField = [];
-        validate.optionalArray('testField');
-        expect(errorsArray.length).toBe(0);
-    });
-    it('should validate required object', () => {
-        const validate = new ValidateUtil_1.default(parentObject, errorsArray);
-        parentObject.testField = [];
-        validate.object('testField', {});
-        expect(errorsArray).toContain('testField must be an object');
-        errorsArray = [];
-        parentObject.testField = {};
-        validate.object('testField', {});
-        expect(errorsArray.length).toBe(0);
-    });
-});

package/lib/services/DocumentService.spec.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=DocumentService.spec.d.ts.map

package/lib/services/DocumentService.spec.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"DocumentService.spec.d.ts","sourceRoot":"","sources":["../../src/services/DocumentService.spec.ts"],"names":[],"mappings":""}