@naturalcycles/js-lib 15.33.1 → 15.33.3

package/dist/http/fetcher.js

@@ -283,7 +283,7 @@ export class Fetcher {
                 }
             }
             try {
-                res.fetchResponse = await Fetcher.callNativeFetch(req.fullUrl, req.init, this.cfg.fetchFn);
+                res.fetchResponse = await (this.cfg.overrideFetchFn || Fetcher.callNativeFetch)(req.fullUrl, req.init, this.cfg.fetchFn);
                 res.ok = res.fetchResponse.ok;
                 // important to set it to undefined, otherwise it can keep the previous value (from previous try)
                 res.err = undefined;
@@ -399,8 +399,8 @@ export class Fetcher {
      * This method exists to be able to easily mock it.
      * It is static, so mocking applies to ALL instances (even future ones) of Fetcher at once.
      */
-    static async callNativeFetch(url, init, fetchFn = globalThis.fetch) {
-        return (await fetchFn(url, init));
+    static async callNativeFetch(url, init, fetchFn) {
+        return await (fetchFn || globalThis.fetch)(url, init);
     }
     async onNotOkResponse(res) {
         let cause;

package/dist/http/fetcher.model.d.ts

@@ -227,9 +227,23 @@ export interface FetcherOptions {
      */
     debug?: boolean;
     /**
-     * If provided - will be used instead of static `Fetcher.callNativeFetch`.
+     * If provided - will be used instead of `globalThis.fetch`.
+     * Can be used e.g to pass a `fetch` function from `undici` (in Node.js).
+     *
+     * This function IS called from `Fetcher.callNativeFetch`, so
+     * when `callNativeFetch` is mocked - fetchFn is NOT called.
      */
     fetchFn?: FetchFunction;
+    /**
+     * Allows to provide a fetch function that is NOT mocked by `Fetcher.callNativeFetch`.
+     *
+     * By default - consider `fetchFn`, that's what you would need most of the time.
+     *
+     * If you want to pass a fetch function that is NOT mockable - use `overrideFetchFn`.
+     * Example of where it is useful: in backend resourceTestService, which still needs to call
+     * native fetch, while allowing unit tests' fetch calls to be mocked.
+     */
+    overrideFetchFn?: FetchFunction;
     /**
      * Default to true.
      * Set to false to not throw on `!Response.ok`, but simply return `Response.body` as-is (json parsed, etc).
@@ -284,14 +298,14 @@ export type FetcherResponseType = 'json' | 'text' | 'void' | 'arrayBuffer' | 'bl
  * Used to be able to override and provide a different implementation,
  * e.g when mocking.
  */
-export type FetchFunction = (url: string, init: RequestInitCrossPlatform) => Promise<ResponseCrossPlatform>;
+export type FetchFunction = (url: string, init: RequestInit) => Promise<Response>;
 /**
  * A subset of RequestInit that would match both:
  *
  * 1. RequestInit from dom types
  * 2. RequestInit from undici types
  */
-export interface RequestInitCrossPlatform {
+export interface RequestInitLike {
     method?: string;
     referrer?: string;
     keepalive?: boolean;
@@ -299,7 +313,7 @@ export interface RequestInitCrossPlatform {
 /**
  * A subset of Response type that matches both dom and undici types.
  */
-export interface ResponseCrossPlatform {
+export interface ResponseLike {
     ok: boolean;
     status: number;
     statusText: string;

package/dist/zod/zod.shared.schemas.d.ts

@@ -5,6 +5,7 @@ type ZodBranded<T, B> = T & Record<'_zod', Record<'output', B>>;
 export type ZodBrandedString<B> = ZodBranded<z.ZodString, B>;
 export type ZodBrandedInt<B> = ZodBranded<z.ZodInt, B>;
 export type ZodBrandedNumber<B> = ZodBranded<z.ZodNumber, B>;
+export type ZodBrandedIsoDate = ZodBranded<z.ZodISODate, IsoDate>;
 declare function unixTimestamp(): ZodBrandedInt<UnixTimestamp>;
 declare function unixTimestamp2000(): ZodBrandedInt<UnixTimestamp>;
 declare function unixTimestampMillis(): ZodBranded<z.ZodNumber, UnixTimestampMillis>;

package/dist/zod/zod.shared.schemas.js

@@ -42,9 +42,7 @@ function semVer() {
 function isoDate() {
     return z
         .string()
-        .refine(v => {
-        return /^\d{4}-\d{2}-\d{2}$/.test(v);
-    }, 'Must be a YYYY-MM-DD string')
+        .regex(/^\d{4}-\d{2}-\d{2}$/, { error: 'Must be a YYYY-MM-DD string' })
         .describe('IsoDate');
 }
 function email() {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/js-lib",
   "type": "module",
-  "version": "15.33.1",
+  "version": "15.33.3",
   "dependencies": {
     "tslib": "^2",
     "undici": "^7",

package/src/http/fetcher.model.ts

@@ -290,10 +290,25 @@ export interface FetcherOptions {
   debug?: boolean
 
   /**
-   * If provided - will be used instead of static `Fetcher.callNativeFetch`.
+   * If provided - will be used instead of `globalThis.fetch`.
+   * Can be used e.g to pass a `fetch` function from `undici` (in Node.js).
+   *
+   * This function IS called from `Fetcher.callNativeFetch`, so
+   * when `callNativeFetch` is mocked - fetchFn is NOT called.
    */
   fetchFn?: FetchFunction
 
+  /**
+   * Allows to provide a fetch function that is NOT mocked by `Fetcher.callNativeFetch`.
+   *
+   * By default - consider `fetchFn`, that's what you would need most of the time.
+   *
+   * If you want to pass a fetch function that is NOT mockable - use `overrideFetchFn`.
+   * Example of where it is useful: in backend resourceTestService, which still needs to call
+   * native fetch, while allowing unit tests' fetch calls to be mocked.
+   */
+  overrideFetchFn?: FetchFunction
+
   /**
    * Default to true.
    * Set to false to not throw on `!Response.ok`, but simply return `Response.body` as-is (json parsed, etc).
@@ -364,10 +379,7 @@ export type FetcherResponseType =
  * Used to be able to override and provide a different implementation,
  * e.g when mocking.
  */
-export type FetchFunction = (
-  url: string,
-  init: RequestInitCrossPlatform,
-) => Promise<ResponseCrossPlatform>
+export type FetchFunction = (url: string, init: RequestInit) => Promise<Response>
 
 /**
  * A subset of RequestInit that would match both:
@@ -375,7 +387,7 @@ export type FetchFunction = (
  * 1. RequestInit from dom types
  * 2. RequestInit from undici types
  */
-export interface RequestInitCrossPlatform {
+export interface RequestInitLike {
   method?: string
   referrer?: string
   keepalive?: boolean
@@ -384,7 +396,7 @@ export interface RequestInitCrossPlatform {
 /**
  * A subset of Response type that matches both dom and undici types.
  */
-export interface ResponseCrossPlatform {
+export interface ResponseLike {
   ok: boolean
   status: number
   statusText: string

package/src/http/fetcher.ts

@@ -370,7 +370,11 @@ export class Fetcher {
       }
 
       try {
-        res.fetchResponse = await Fetcher.callNativeFetch(req.fullUrl, req.init, this.cfg.fetchFn)
+        res.fetchResponse = await (this.cfg.overrideFetchFn || Fetcher.callNativeFetch)(
+          req.fullUrl,
+          req.init,
+          this.cfg.fetchFn,
+        )
         res.ok = res.fetchResponse.ok
         // important to set it to undefined, otherwise it can keep the previous value (from previous try)
         res.err = undefined
@@ -502,9 +506,9 @@ export class Fetcher {
   static async callNativeFetch(
     url: string,
     init: RequestInitNormalized,
-    fetchFn: FetchFunction = globalThis.fetch,
+    fetchFn?: FetchFunction,
   ): Promise<Response> {
-    return (await fetchFn(url, init)) as Response
+    return await (fetchFn || globalThis.fetch)(url, init)
   }
 
   private async onNotOkResponse(res: FetcherResponse): Promise<void> {

package/src/zod/zod.shared.schemas.ts

@@ -6,6 +6,7 @@ type ZodBranded<T, B> = T & Record<'_zod', Record<'output', B>>
 export type ZodBrandedString<B> = ZodBranded<z.ZodString, B>
 export type ZodBrandedInt<B> = ZodBranded<z.ZodInt, B>
 export type ZodBrandedNumber<B> = ZodBranded<z.ZodNumber, B>
+export type ZodBrandedIsoDate = ZodBranded<z.ZodISODate, IsoDate>
 
 const TS_2500 = 16725225600 // 2500-01-01
 const TS_2000 = 946684800 // 2000-01-01
@@ -56,9 +57,7 @@ function semVer(): z.ZodString {
 function isoDate(): ZodBrandedString<IsoDate> {
   return z
     .string()
-    .refine(v => {
-      return /^\d{4}-\d{2}-\d{2}$/.test(v)
-    }, 'Must be a YYYY-MM-DD string')
+    .regex(/^\d{4}-\d{2}-\d{2}$/, { error: 'Must be a YYYY-MM-DD string' })
     .describe('IsoDate') as ZodBrandedString<IsoDate>
 }