wapi-client 0.12.0-beta.2 → 0.12.0-beta.3

package/dist/fns/list-exports/list-exports.cjs

@@ -45,12 +45,10 @@ function listExports(options, input, fnOptions) {
   const { client } = options;
   const inputCopy = zodValidator.validateInputWOptions(input, fnOptions);
   const date = (0, import_utils.convertToString)(inputCopy == null ? void 0 : inputCopy.date);
-  fnOptions = (0, import_utils.checkFnOptionsOrderBy)(
-    fnOptions != null ? fnOptions : {}
-  );
+  const txOptions = (0, import_utils.mergeFnOptionsOrderBy)(inputCopy.options);
   return client.api.listExportMany({
     export: __spreadValues(__spreadValues({}, date ? { date } : {}), inputCopy.type ? { type: inputCopy.type } : {}),
-    options: fnOptions
+    options: txOptions
   });
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/fns/list-exports/list-exports.js

@@ -16,7 +16,7 @@ var __spreadValues = (a, b) => {
 };
 
 // src/fns/list-exports/list-exports.ts
-import { checkFnOptionsOrderBy, convertToString } from "../../lib/utils";
+import { convertToString, mergeFnOptionsOrderBy } from "../../lib/utils";
 import { getValidator } from "../../lib/validation";
 import { listExportsFnInputSchema } from "./list-exports.schema.zod";
 var zodValidator = getValidator(listExportsFnInputSchema);
@@ -24,12 +24,10 @@ function listExports(options, input, fnOptions) {
   const { client } = options;
   const inputCopy = zodValidator.validateInputWOptions(input, fnOptions);
   const date = convertToString(inputCopy == null ? void 0 : inputCopy.date);
-  fnOptions = checkFnOptionsOrderBy(
-    fnOptions != null ? fnOptions : {}
-  );
+  const txOptions = mergeFnOptionsOrderBy(inputCopy.options);
   return client.api.listExportMany({
     export: __spreadValues(__spreadValues({}, date ? { date } : {}), inputCopy.type ? { type: inputCopy.type } : {}),
-    options: fnOptions
+    options: txOptions
   });
 }
 export {

package/dist/lib/ts-utils.browser.cjs

@@ -19,13 +19,9 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/lib/ts-utils.ts
 var ts_utils_exports = {};
 __export(ts_utils_exports, {
-  createEnumFromTuple: () => createEnumFromTuple,
-  toMutable: () => toMutable
+  createEnumFromTuple: () => createEnumFromTuple
 });
 module.exports = __toCommonJS(ts_utils_exports);
-function toMutable(inp) {
-  return inp;
-}
 function createEnumFromTuple(tuple) {
   return tuple.reduce(
     (acc, key) => {

package/dist/lib/ts-utils.browser.js

@@ -1,7 +1,4 @@
 // src/lib/ts-utils.ts
-function toMutable(inp) {
-  return inp;
-}
 function createEnumFromTuple(tuple) {
   return tuple.reduce(
     (acc, key) => {
@@ -12,6 +9,5 @@ function createEnumFromTuple(tuple) {
   );
 }
 export {
-  createEnumFromTuple,
-  toMutable
+  createEnumFromTuple
 };

package/dist/lib/ts-utils.cjs

@@ -19,13 +19,9 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/lib/ts-utils.ts
 var ts_utils_exports = {};
 __export(ts_utils_exports, {
-  createEnumFromTuple: () => createEnumFromTuple,
-  toMutable: () => toMutable
+  createEnumFromTuple: () => createEnumFromTuple
 });
 module.exports = __toCommonJS(ts_utils_exports);
-function toMutable(inp) {
-  return inp;
-}
 function createEnumFromTuple(tuple) {
   return tuple.reduce(
     (acc, key) => {
@@ -37,6 +33,5 @@ function createEnumFromTuple(tuple) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  createEnumFromTuple,
-  toMutable
+  createEnumFromTuple
 });

package/dist/lib/ts-utils.d.ts

@@ -1,8 +1,3 @@
-export type Mutable<T> = {
-    -readonly [P in keyof T]: Mutable<T[P]>;
-};
-export type RemoveFromTuple<T extends unknown[], U extends unknown[]> = T extends [infer A, ...infer B] ? A extends U[number] ? RemoveFromTuple<B, U> : [A, ...RemoveFromTuple<B, U>] : [];
-export declare function toMutable<T>(inp: T): Mutable<T>;
 export declare function createEnumFromTuple<T extends readonly string[]>(tuple: T): Readonly<{
     [K in T[number]]: K;
 }>;

package/dist/lib/ts-utils.js

@@ -1,7 +1,4 @@
 // src/lib/ts-utils.ts
-function toMutable(inp) {
-  return inp;
-}
 function createEnumFromTuple(tuple) {
   return tuple.reduce(
     (acc, key) => {
@@ -12,6 +9,5 @@ function createEnumFromTuple(tuple) {
   );
 }
 export {
-  createEnumFromTuple,
-  toMutable
+  createEnumFromTuple
 };

package/dist/lib/utils.browser.cjs

@@ -1,7 +1,21 @@
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __objRest = (source, exclude) => {
+  var target = {};
+  for (var prop in source)
+    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
+      target[prop] = source[prop];
+  if (source != null && __getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
+        target[prop] = source[prop];
+    }
+  return target;
+};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -20,7 +34,6 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var utils_exports = {};
 __export(utils_exports, {
   checkCopyObject: () => checkCopyObject,
-  checkFnOptionsOrderBy: () => checkFnOptionsOrderBy,
   convertToNumber: () => convertToNumber,
   convertToString: () => convertToString,
   copyObject: () => copyObject,
@@ -35,8 +48,8 @@ __export(utils_exports, {
   isDate: () => isDate,
   isDateTime: () => isDateTime,
   isFutureDate: () => isFutureDate,
+  mergeFnOptionsOrderBy: () => mergeFnOptionsOrderBy,
   modifyObject: () => modifyObject,
-  omit: () => omit,
   orderByToOrder: () => orderByToOrder,
   toQueryString: () => toQueryString,
   wait: () => wait
@@ -179,11 +192,6 @@ function checkCopyObject(input, property, value) {
   copy[property] = value;
   return copy;
 }
-function omit(input, omitKey) {
-  const copy = copyObject(input);
-  delete copy[omitKey];
-  return copy;
-}
 function getForeign(value) {
   const stringValue = inputToString(value);
   if (stringValue === void 0 || stringValue === null) {
@@ -257,20 +265,12 @@ function orderByToOrder(orderBy) {
     };
   });
 }
-function checkFnOptionsOrderBy(input) {
-  if (!input) {
-    return void 0;
-  }
-  if (!input.order_by) {
-    return input;
-  }
-  const orderBy = input.order_by;
-  delete input.order_by;
-  if (input.order) {
-    return input;
+function mergeFnOptionsOrderBy(options) {
+  const _a = options, { order_by: orderBy } = _a, outputOptions = __objRest(_a, ["order_by"]);
+  if (!outputOptions.order && orderBy) {
+    outputOptions.order = orderByToOrder(orderBy);
   }
-  input.order = orderByToOrder(orderBy);
-  return input;
+  return outputOptions;
 }
 function convertToString(input) {
   if (input === void 0 || input === null) {

package/dist/lib/utils.browser.js

@@ -1,3 +1,19 @@
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __objRest = (source, exclude) => {
+  var target = {};
+  for (var prop in source)
+    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
+      target[prop] = source[prop];
+  if (source != null && __getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
+        target[prop] = source[prop];
+    }
+  return target;
+};
+
 // src/lib/utils.ts
 import { InputError, ValidationError } from "./errors.browser.js";
 
@@ -136,11 +152,6 @@ function checkCopyObject(input, property, value) {
   copy[property] = value;
   return copy;
 }
-function omit(input, omitKey) {
-  const copy = copyObject(input);
-  delete copy[omitKey];
-  return copy;
-}
 function getForeign(value) {
   const stringValue = inputToString(value);
   if (stringValue === void 0 || stringValue === null) {
@@ -214,20 +225,12 @@ function orderByToOrder(orderBy) {
     };
   });
 }
-function checkFnOptionsOrderBy(input) {
-  if (!input) {
-    return void 0;
-  }
-  if (!input.order_by) {
-    return input;
-  }
-  const orderBy = input.order_by;
-  delete input.order_by;
-  if (input.order) {
-    return input;
+function mergeFnOptionsOrderBy(options) {
+  const _a = options, { order_by: orderBy } = _a, outputOptions = __objRest(_a, ["order_by"]);
+  if (!outputOptions.order && orderBy) {
+    outputOptions.order = orderByToOrder(orderBy);
   }
-  input.order = orderByToOrder(orderBy);
-  return input;
+  return outputOptions;
 }
 function convertToString(input) {
   if (input === void 0 || input === null) {
@@ -277,7 +280,6 @@ function isDateTime(str) {
 }
 export {
   checkCopyObject,
-  checkFnOptionsOrderBy,
   convertToNumber,
   convertToString,
   copyObject,
@@ -292,8 +294,8 @@ export {
   isDate,
   isDateTime,
   isFutureDate,
+  mergeFnOptionsOrderBy,
   modifyObject,
-  omit,
   orderByToOrder,
   toQueryString,
   wait

package/dist/lib/utils.cjs

@@ -21,6 +21,18 @@ var __spreadValues = (a, b) => {
   return a;
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+var __objRest = (source, exclude) => {
+  var target = {};
+  for (var prop in source)
+    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
+      target[prop] = source[prop];
+  if (source != null && __getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
+        target[prop] = source[prop];
+    }
+  return target;
+};
 var __commonJS = (cb, mod) => function __require() {
   return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
 };
@@ -638,7 +650,6 @@ var require_cjs = __commonJS({
 var utils_exports = {};
 __export(utils_exports, {
   checkCopyObject: () => checkCopyObject,
-  checkFnOptionsOrderBy: () => checkFnOptionsOrderBy,
   convertToNumber: () => convertToNumber,
   convertToString: () => convertToString,
   copyObject: () => copyObject,
@@ -653,8 +664,8 @@ __export(utils_exports, {
   isDate: () => isDate,
   isDateTime: () => isDateTime,
   isFutureDate: () => isFutureDate,
+  mergeFnOptionsOrderBy: () => mergeFnOptionsOrderBy,
   modifyObject: () => modifyObject,
-  omit: () => omit,
   orderByToOrder: () => orderByToOrder,
   toQueryString: () => toQueryString,
   wait: () => wait
@@ -743,11 +754,6 @@ function checkCopyObject(input, property, value) {
   copy[property] = value;
   return copy;
 }
-function omit(input, omitKey) {
-  const copy = copyObject(input);
-  delete copy[omitKey];
-  return copy;
-}
 function getForeign(value) {
   const stringValue = inputToString(value);
   if (stringValue === void 0 || stringValue === null) {
@@ -821,20 +827,12 @@ function orderByToOrder(orderBy) {
     };
   });
 }
-function checkFnOptionsOrderBy(input) {
-  if (!input) {
-    return void 0;
-  }
-  if (!input.order_by) {
-    return input;
-  }
-  const orderBy = input.order_by;
-  delete input.order_by;
-  if (input.order) {
-    return input;
+function mergeFnOptionsOrderBy(options) {
+  const _a = options, { order_by: orderBy } = _a, outputOptions = __objRest(_a, ["order_by"]);
+  if (!outputOptions.order && orderBy) {
+    outputOptions.order = orderByToOrder(orderBy);
   }
-  input.order = orderByToOrder(orderBy);
-  return input;
+  return outputOptions;
 }
 function convertToString(input) {
   if (input === void 0 || input === null) {
@@ -885,7 +883,6 @@ function isDateTime(str) {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   checkCopyObject,
-  checkFnOptionsOrderBy,
   convertToNumber,
   convertToString,
   copyObject,
@@ -900,8 +897,8 @@ function isDateTime(str) {
   isDate,
   isDateTime,
   isFutureDate,
+  mergeFnOptionsOrderBy,
   modifyObject,
-  omit,
   orderByToOrder,
   toQueryString,
   wait

package/dist/lib/utils.d.ts

@@ -11,7 +11,6 @@ export declare function wait(time: number): Promise<void>;
 export declare function getIdentifier(): string;
 export declare function copyObject<T>(input: T): T;
 export declare function checkCopyObject<T>(input: T, property: string, value: unknown): T;
-export declare function omit<InputObject, OmitKey extends string>(input: InputObject, omitKey: OmitKey): Omit<InputObject, OmitKey>;
 type ForeignType = {
     foreign: string;
 };
@@ -36,11 +35,10 @@ export declare function modifyObject<R>(orig: unknown, modifications: {
     [k: string]: string | ((i: any) => any);
 }): R;
 export declare function orderByToOrder(orderBy: string): ITxOrderingInput[];
-export declare function checkFnOptionsOrderBy<T extends undefined>(input?: T): undefined;
-export declare function checkFnOptionsOrderBy<T extends {
-    order_by?: string;
+export declare function mergeFnOptionsOrderBy<T extends {
+    order_by?: string | undefined;
     order?: ITxOrderingInput[];
-}>(input?: T): Omit<T, 'order_by'>;
+}>(options: T): Omit<T, 'order_by'>;
 export declare function convertToString(input?: unknown): string | undefined;
 export declare function convertToNumber(input: string | number): number;
 export declare function isFutureDate(dateString: string): boolean;

package/dist/lib/utils.js

@@ -27,6 +27,18 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
   if (typeof require !== "undefined") return require.apply(this, arguments);
   throw Error('Dynamic require of "' + x + '" is not supported');
 });
+var __objRest = (source, exclude) => {
+  var target = {};
+  for (var prop in source)
+    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
+      target[prop] = source[prop];
+  if (source != null && __getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
+        target[prop] = source[prop];
+    }
+  return target;
+};
 var __commonJS = (cb, mod) => function __require2() {
   return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
 };
@@ -719,11 +731,6 @@ function checkCopyObject(input, property, value) {
   copy[property] = value;
   return copy;
 }
-function omit(input, omitKey) {
-  const copy = copyObject(input);
-  delete copy[omitKey];
-  return copy;
-}
 function getForeign(value) {
   const stringValue = inputToString(value);
   if (stringValue === void 0 || stringValue === null) {
@@ -797,20 +804,12 @@ function orderByToOrder(orderBy) {
     };
   });
 }
-function checkFnOptionsOrderBy(input) {
-  if (!input) {
-    return void 0;
-  }
-  if (!input.order_by) {
-    return input;
-  }
-  const orderBy = input.order_by;
-  delete input.order_by;
-  if (input.order) {
-    return input;
+function mergeFnOptionsOrderBy(options) {
+  const _a = options, { order_by: orderBy } = _a, outputOptions = __objRest(_a, ["order_by"]);
+  if (!outputOptions.order && orderBy) {
+    outputOptions.order = orderByToOrder(orderBy);
   }
-  input.order = orderByToOrder(orderBy);
-  return input;
+  return outputOptions;
 }
 function convertToString(input) {
   if (input === void 0 || input === null) {
@@ -860,7 +859,6 @@ function isDateTime(str) {
 }
 export {
   checkCopyObject,
-  checkFnOptionsOrderBy,
   convertToNumber,
   convertToString,
   copyObject,
@@ -875,8 +873,8 @@ export {
   isDate,
   isDateTime,
   isFutureDate,
+  mergeFnOptionsOrderBy,
   modifyObject,
-  omit,
   orderByToOrder,
   toQueryString,
   wait

package/dist/types/index.d.ts

@@ -1831,11 +1831,6 @@ declare module 'wapi-client/lib/errors' {
     };
 }
 declare module 'wapi-client/lib/ts-utils' {
-    export type Mutable<T> = {
-        -readonly [P in keyof T]: Mutable<T[P]>;
-    };
-    export type RemoveFromTuple<T extends unknown[], U extends unknown[]> = T extends [infer A, ...infer B] ? A extends U[number] ? RemoveFromTuple<B, U> : [A, ...RemoveFromTuple<B, U>] : [];
-    export function toMutable<T>(inp: T): Mutable<T>;
     export function createEnumFromTuple<T extends readonly string[]>(tuple: T): Readonly<{
         [K in T[number]]: K;
     }>;
@@ -1843,7 +1838,7 @@ declare module 'wapi-client/lib/ts-utils' {
 declare module 'wapi-client/db/consts' {
     import z from 'zod';
     export type Metadata = {
-        [key: string]: string | boolean | number | null | Metadata | (string | boolean | number | null | Metadata)[];
+        [key: string]: string | boolean | number | null | Metadata | undefined | (string | boolean | number | null | Metadata | undefined)[];
     } | null;
     export const MetadataSchema: z.ZodType<Metadata>;
     export const DatetimeSchema: z.ZodUnion<[z.ZodString, z.ZodString, z.ZodString]>;
@@ -2950,7 +2945,6 @@ declare module 'wapi-client/lib/utils' {
     export function getIdentifier(): string;
     export function copyObject<T>(input: T): T;
     export function checkCopyObject<T>(input: T, property: string, value: unknown): T;
-    export function omit<InputObject, OmitKey extends string>(input: InputObject, omitKey: OmitKey): Omit<InputObject, OmitKey>;
     type ForeignType = {
         foreign: string;
     };
@@ -2975,11 +2969,10 @@ declare module 'wapi-client/lib/utils' {
         [k: string]: string | ((i: any) => any);
     }): R;
     export function orderByToOrder(orderBy: string): ITxOrderingInput[];
-    export function checkFnOptionsOrderBy<T extends undefined>(input?: T): undefined;
-    export function checkFnOptionsOrderBy<T extends {
-        order_by?: string;
+    export function mergeFnOptionsOrderBy<T extends {
+        order_by?: string | undefined;
         order?: ITxOrderingInput[];
-    }>(input?: T): Omit<T, 'order_by'>;
+    }>(options: T): Omit<T, 'order_by'>;
     export function convertToString(input?: unknown): string | undefined;
     export function convertToNumber(input: string | number): number;
     export function isFutureDate(dateString: string): boolean;
@@ -65475,9 +65468,10 @@ declare module 'wapi-client/fns/index' {
 }
 declare module 'wapi-client/fns/consts.enums' {
     import z from 'zod';
-    import { iFnFindOptionsExtraSchema, iFnFindOptionsSchema, allowedStringIntSchema, allowedStringNumberSchema } from 'wapi-client/fns/consts';
+    import { iFnFindOptionsExtraSchema, iFnFindOptionsSchema, allowedStringPositiveNumericSchema, allowedStringIntSchema, allowedStringNumberSchema } from 'wapi-client/fns/consts';
     export type IFnFindOptionsExtra = z.infer<typeof iFnFindOptionsExtraSchema>;
     export type IFnFindOptions = z.infer<typeof iFnFindOptionsSchema>;
+    export type AllowedStringPositiveNumeric = z.infer<typeof allowedStringPositiveNumericSchema>;
     export type AllowedStringInt = z.infer<typeof allowedStringIntSchema>;
     export type AllowedStringNumber = z.infer<typeof allowedStringNumberSchema>;
 }