@fabriktor/fx 0.0.68 → 0.0.70

package/dist/src/payrolls/payrolls.js

@@ -3,10 +3,9 @@
 // Licensed under the Apache License, Version 2.0 (the "License"); you may
 // not use this file except in compliance with the License. You may obtain
 // a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
-import { OwnerIDKey, } from "@fabriktor/schema";
 import { errResolveFailed } from "../core/err.js";
 import { requiredOperationID } from "../core/id.js";
-import { runSearch } from "../core/search.js";
+import { runOwnerSearch, } from "../core/search.js";
 const resourcePayable = "payable";
 const msgCreatedPayableIDMissing = "Created payable response did not contain an ID.";
 const msgPayableMissing = "Payable could not be resolved after the mutation.";
@@ -52,14 +51,9 @@ export class PayrollsFX {
         return await this.findPayable(opts.id);
     }
     async searchPayables(opts) {
-        return await runSearch({
+        return await runOwnerSearch({
+            ...opts,
             search: (searchOpts) => this.payrolls.searchManyPayables(searchOpts),
-            query: {
-                [OwnerIDKey]: opts.owner_id,
-            },
-            q: opts.q,
-            page: opts.page,
-            per_page: opts.per_page,
         });
     }
     async createPayroll(opts) {
@@ -72,14 +66,9 @@ export class PayrollsFX {
         return await this.findPayroll(opts.id);
     }
     async searchPayrolls(opts) {
-        return await runSearch({
+        return await runOwnerSearch({
+            ...opts,
             search: (searchOpts) => this.payrolls.searchManyPayrolls(searchOpts),
-            query: {
-                [OwnerIDKey]: opts.owner_id,
-            },
-            q: opts.q,
-            page: opts.page,
-            per_page: opts.per_page,
         });
     }
     async createPayConfig(opts) {
@@ -92,14 +81,9 @@ export class PayrollsFX {
         return await this.findPayConfig(opts.id);
     }
     async searchPayConfigs(opts) {
-        return await runSearch({
+        return await runOwnerSearch({
+            ...opts,
             search: (searchOpts) => this.payrolls.searchManyPayConfigs(searchOpts),
-            query: {
-                [OwnerIDKey]: opts.owner_id,
-            },
-            q: opts.q,
-            page: opts.page,
-            per_page: opts.per_page,
         });
     }
     async createHourBank(opts) {
@@ -112,14 +96,9 @@ export class PayrollsFX {
         return await this.findHourBank(opts.id);
     }
     async searchHourBanks(opts) {
-        return await runSearch({
+        return await runOwnerSearch({
+            ...opts,
             search: (searchOpts) => this.payrolls.searchManyHourBanks(searchOpts),
-            query: {
-                [OwnerIDKey]: opts.owner_id,
-            },
-            q: opts.q,
-            page: opts.page,
-            per_page: opts.per_page,
         });
     }
     async createAdjustment(opts) {
@@ -132,14 +111,9 @@ export class PayrollsFX {
         return await this.findAdjustment(opts.id);
     }
     async searchAdjustments(opts) {
-        return await runSearch({
+        return await runOwnerSearch({
+            ...opts,
             search: (searchOpts) => this.payrolls.searchManyAdjustments(searchOpts),
-            query: {
-                [OwnerIDKey]: opts.owner_id,
-            },
-            q: opts.q,
-            page: opts.page,
-            per_page: opts.per_page,
         });
     }
     async createAdjustmentFolder(opts) {
@@ -152,14 +126,9 @@ export class PayrollsFX {
         return await this.findAdjustmentFolder(opts.id);
     }
     async searchAdjustmentFolders(opts) {
-        return await runSearch({
+        return await runOwnerSearch({
+            ...opts,
             search: (searchOpts) => this.payrolls.searchManyAdjustmentFolders(searchOpts),
-            query: {
-                [OwnerIDKey]: opts.owner_id,
-            },
-            q: opts.q,
-            page: opts.page,
-            per_page: opts.per_page,
         });
     }
     async createAdjustmentRecord(opts) {
@@ -172,14 +141,9 @@ export class PayrollsFX {
         return await this.findAdjustmentRecord(opts.id);
     }
     async searchAdjustmentRecords(opts) {
-        return await runSearch({
+        return await runOwnerSearch({
+            ...opts,
             search: (searchOpts) => this.payrolls.searchManyAdjustmentRecords(searchOpts),
-            query: {
-                [OwnerIDKey]: opts.owner_id,
-            },
-            q: opts.q,
-            page: opts.page,
-            per_page: opts.per_page,
         });
     }
     async createAdjustmentAggregate(opts) {
@@ -192,14 +156,9 @@ export class PayrollsFX {
         return await this.findAdjustmentAggregate(opts.id);
     }
     async searchAdjustmentAggregates(opts) {
-        return await runSearch({
+        return await runOwnerSearch({
+            ...opts,
             search: (searchOpts) => this.payrolls.searchManyAdjustmentAggregates(searchOpts),
-            query: {
-                [OwnerIDKey]: opts.owner_id,
-            },
-            q: opts.q,
-            page: opts.page,
-            per_page: opts.per_page,
         });
     }
     async createEmployeePayConfig(opts) {
@@ -212,14 +171,9 @@ export class PayrollsFX {
         return await this.findEmployeePayConfig(opts.id);
     }
     async searchEmployeePayConfigs(opts) {
-        return await runSearch({
+        return await runOwnerSearch({
+            ...opts,
             search: (searchOpts) => this.payrolls.searchManyEmployeePayConfigs(searchOpts),
-            query: {
-                [OwnerIDKey]: opts.owner_id,
-            },
-            q: opts.q,
-            page: opts.page,
-            per_page: opts.per_page,
         });
     }
     async createPayrollProgram(opts) {
@@ -232,14 +186,9 @@ export class PayrollsFX {
         return await this.findPayrollProgram(opts.id);
     }
     async searchPayrollPrograms(opts) {
-        return await runSearch({
+        return await runOwnerSearch({
+            ...opts,
             search: (searchOpts) => this.payrolls.searchManyPayrollPrograms(searchOpts),
-            query: {
-                [OwnerIDKey]: opts.owner_id,
-            },
-            q: opts.q,
-            page: opts.page,
-            per_page: opts.per_page,
         });
     }
     async setAdjustmentArchived(opts) {

package/dist/src/routes/routes.d.ts

@@ -1,6 +1,6 @@
 import type { RoutesOperator } from "@fabriktor/client";
-import { type ClientAvailability, type Route, type RouteTeam, type Tag, type Tracking } from "@fabriktor/schema";
-import { type SearchPage } from "../core/search.js";
+import type { ClientAvailability, Route, RouteTeam, Tag, Tracking } from "@fabriktor/schema";
+import { type OwnerSearchOptions, type SearchPage } from "../core/search.js";
 type RouteInsertOptions = Parameters<RoutesOperator["insertOneRoute"]>[0];
 type RouteReplaceOptions = Parameters<RoutesOperator["replaceOneRoute"]>[0];
 type TagInsertOptions = Parameters<RoutesOperator["insertOneTag"]>[0];
@@ -13,12 +13,6 @@ type RouteTeamInsertOptions = Parameters<RoutesOperator["insertOneRouteTeam"]>[0
 type RouteTeamReplaceOptions = Parameters<RoutesOperator["replaceOneRouteTeam"]>[0];
 type RouteInsert = RouteInsertOptions["in"];
 type RouteAvailability = NonNullable<Awaited<ReturnType<RoutesOperator["getAvailability"]>>["value"]>;
-type SearchRouteRecordsOptions = {
-    owner_id: string;
-    q?: string;
-    page?: number;
-    per_page?: number;
-};
 export type CreateRouteOptions = {
     in: RouteInsert;
     availability: RouteAvailability;
@@ -28,7 +22,7 @@ export type CreateRouteResult = CreateValidatedRouteResult;
 export type ReplaceRouteOptions = RouteReplaceOptions;
 export type CreateTagOptions = TagInsertOptions;
 export type ReplaceTagOptions = TagReplaceOptions;
-export type SearchTagsOptions = SearchRouteRecordsOptions;
+export type SearchTagsOptions = OwnerSearchOptions;
 export type SearchTagsPage = SearchPage<Tag>;
 export type CreateClientAvailabilityOptions = ClientAvailabilityInsertOptions;
 export type ReplaceClientAvailabilityOptions = ClientAvailabilityReplaceOptions;
@@ -36,7 +30,7 @@ export type CreateTrackingOptions = TrackingInsertOptions;
 export type ReplaceTrackingOptions = TrackingReplaceOptions;
 export type CreateRouteTeamOptions = RouteTeamInsertOptions;
 export type ReplaceRouteTeamOptions = RouteTeamReplaceOptions;
-export type SearchRouteTeamsOptions = SearchRouteRecordsOptions;
+export type SearchRouteTeamsOptions = OwnerSearchOptions;
 export type SearchRouteTeamsPage = SearchPage<RouteTeam>;
 export type RoutesFXOptions = {
     routes: RoutesOperator;

package/dist/src/routes/routes.js

@@ -3,10 +3,9 @@
 // Licensed under the Apache License, Version 2.0 (the "License"); you may
 // not use this file except in compliance with the License. You may obtain
 // a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
-import { OwnerIDKey, } from "@fabriktor/schema";
 import { errResolveFailed, errValidation } from "../core/err.js";
 import { requiredOperationID } from "../core/id.js";
-import { runSearch } from "../core/search.js";
+import { runOwnerSearch, } from "../core/search.js";
 const maxHour = 23;
 const maxMinute = 59;
 const maxMinuteOfDay = 1440;
@@ -63,14 +62,9 @@ export class RoutesFX {
         return await this.findTag(opts.id);
     }
     async searchTags(opts) {
-        return await runSearch({
+        return await runOwnerSearch({
+            ...opts,
             search: (searchOpts) => this.routes.searchManyTags(searchOpts),
-            query: {
-                [OwnerIDKey]: opts.owner_id,
-            },
-            q: opts.q,
-            page: opts.page,
-            per_page: opts.per_page,
         });
     }
     async createClientAvailability(opts) {
@@ -101,14 +95,9 @@ export class RoutesFX {
         return await this.findRouteTeam(opts.id);
     }
     async searchRouteTeams(opts) {
-        return await runSearch({
+        return await runOwnerSearch({
+            ...opts,
             search: (searchOpts) => this.routes.searchManyRouteTeams(searchOpts),
-            query: {
-                [OwnerIDKey]: opts.owner_id,
-            },
-            q: opts.q,
-            page: opts.page,
-            per_page: opts.per_page,
         });
     }
     async findRoute(id) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fabriktor/fx",
-  "version": "0.0.68",
+  "version": "0.0.70",
   "description": "![Fabriktor Logo](./img/fabriktor-character.gif)",
   "type": "module",
   "exports": {
@@ -17,7 +17,7 @@
     "typescript": "^6.0.3"
   },
   "dependencies": {
-    "@fabriktor/client": "0.0.62",
+    "@fabriktor/client": "0.0.63",
     "@fabriktor/schema": "0.0.45"
   }
 }