@naturalcycles/js-lib 15.5.2 → 15.6.1

package/dist/browser/analytics.util.d.ts

@@ -1,11 +1,10 @@
 declare global {
-    interface Window {
-        dataLayer: any[];
-        gtag: (...args: any[]) => void;
-    }
+    var dataLayer: any[];
+    var gtag: (...args: any[]) => void;
+    var hj: (...args: any[]) => void;
 }
 /**
- * Pass enabled = false to only init window.gtag, but not load actual gtag script (e.g in dev mode).
+ * Pass enabled = false to only init globalThis.gtag, but not load actual gtag script (e.g in dev mode).
  */
 export declare function loadGTag(gtagId: string, enabled?: boolean): Promise<void>;
 export declare function loadGTM(gtmId: string, enabled?: boolean): Promise<void>;

package/dist/browser/analytics.util.js

@@ -1,20 +1,19 @@
 import { isServerSide } from '../index.js';
 import { loadScript } from './script.util.js';
-/* eslint-disable unicorn/prefer-global-this */
 /**
- * Pass enabled = false to only init window.gtag, but not load actual gtag script (e.g in dev mode).
+ * Pass enabled = false to only init globalThis.gtag, but not load actual gtag script (e.g in dev mode).
  */
 export async function loadGTag(gtagId, enabled = true) {
     if (isServerSide())
         return;
-    window.dataLayer ||= [];
-    window.gtag ||= function gtag() {
+    globalThis.dataLayer ||= [];
+    globalThis.gtag ||= function gtag() {
         // biome-ignore lint/complexity/useArrowFunction: ok
         // biome-ignore lint/complexity/noArguments: ok
-        window.dataLayer.push(arguments);
+        globalThis.dataLayer.push(arguments);
     };
-    window.gtag('js', new Date());
-    window.gtag('config', gtagId);
+    globalThis.gtag('js', new Date());
+    globalThis.gtag('config', gtagId);
     if (!enabled)
         return;
     await loadScript(`https://www.googletagmanager.com/gtag/js?id=${gtagId}`);
@@ -22,8 +21,8 @@ export async function loadGTag(gtagId, enabled = true) {
 export async function loadGTM(gtmId, enabled = true) {
     if (isServerSide())
         return;
-    window.dataLayer ||= [];
-    window.dataLayer.push({
+    globalThis.dataLayer ||= [];
+    globalThis.dataLayer.push({
         'gtm.start': Date.now(),
         event: 'gtm.js',
     });
@@ -49,6 +48,6 @@ export function loadHotjar(hjid) {
         r.async = 1;
         r.src = t + h._hjSettings.hjid + j + h._hjSettings.hjsv;
         a.append(r);
-    })(window, document, 'https://static.hotjar.com/c/hotjar-', '.js?sv=');
+    })(globalThis, document, 'https://static.hotjar.com/c/hotjar-', '.js?sv=');
     /* eslint-enable */
 }

package/dist/zod/customZod.d.ts

@@ -0,0 +1,6 @@
+import { z as z4, ZodType } from 'zod/v4';
+import { customZodSchemas } from './zod.shared.schemas.js';
+type ExtendedZod = Omit<typeof z4, keyof typeof customZodSchemas | 'iso'> & typeof customZodSchemas;
+declare const z: ExtendedZod;
+type zInfer<T> = z4.infer<T>;
+export { z, type zInfer, ZodType };

package/dist/zod/customZod.js

@@ -0,0 +1,4 @@
+import { z as z4, ZodType } from 'zod/v4';
+import { customZodSchemas } from './zod.shared.schemas.js';
+const z = { ...z4, ...customZodSchemas };
+export { z, ZodType };

package/dist/zod/index.d.ts

@@ -1,4 +1,3 @@
+export * from './customZod.js';
 export * from './zod.shared.schemas.js';
 export * from './zod.util.js';
-import { z, ZodType } from 'zod/v4';
-export { z, ZodType };

package/dist/zod/index.js

@@ -1,4 +1,3 @@
+export * from './customZod.js';
 export * from './zod.shared.schemas.js';
 export * from './zod.util.js';
-import { z, ZodType } from 'zod/v4';
-export { z, ZodType };

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

@@ -1,32 +1,38 @@
 import { z } from 'zod/v4';
 export declare const TS_2500 = 16725225600;
 export declare const TS_2000 = 946684800;
-export declare const zUnixTimestamp: z.ZodNumber;
-export declare const zUnixTimestamp2000: z.ZodNumber;
-export declare const zUnixTimestampMillis: z.ZodNumber;
-export declare const zUnixTimestampMillis2000: z.ZodNumber;
-export declare const zSemVer: z.ZodString;
-export declare const zIsoDate: z.ZodString;
-export declare const zEmail: z.ZodPipe<z.ZodString, z.ZodTransform<string, string>>;
-export declare const zEmailNoLowercase: z.ZodString;
+export declare const zUnixTimestamp: () => z.ZodNumber;
+export declare const zUnixTimestamp2000: () => z.ZodNumber;
+export declare const zUnixTimestampMillis: () => z.ZodNumber;
+export declare const zUnixTimestampMillis2000: () => z.ZodNumber;
+export declare const zSemVer: () => z.ZodString;
+export declare const zIsoDate: () => z.ZodString;
+export declare const zEmail: () => z.ZodEmail;
 export declare const BASE62_REGEX: RegExp;
 export declare const BASE64_REGEX: RegExp;
 export declare const BASE64URL_REGEX: RegExp;
-export declare const zBase62: z.ZodString;
-export declare const zBase64: z.ZodString;
-export declare const zBase64Url: z.ZodString;
+export declare const zBase62: () => z.ZodString;
+export declare const zBase64: () => z.ZodString;
+export declare const zBase64Url: () => z.ZodString;
 export declare const JWT_REGEX: RegExp;
-export declare const zJwt: z.ZodString;
-export declare const zId: z.ZodString;
-export declare const zIdBase62: z.ZodString;
-export declare const zIdBase64: z.ZodString;
-export declare const zIdBase64Url: z.ZodString;
+export declare const zJwt: () => z.ZodString;
 /**
  * "Slug" - a valid URL, filename, etc.
  */
-export declare const zSlug: z.ZodString;
-export declare const zBaseDBEntity: z.ZodObject<{
-    id: z.ZodString;
-    created: z.ZodOptional<z.ZodNumber>;
-    updated: z.ZodOptional<z.ZodNumber>;
-}, z.core.$strip>;
+export declare const zSlug: () => z.ZodString;
+export declare const zIanaTimezone: () => z.ZodEnum;
+export declare const customZodSchemas: {
+    base62: () => z.ZodString;
+    base64: () => z.ZodString;
+    base64Url: () => z.ZodString;
+    email: () => z.ZodEmail;
+    ianaTimezone: () => z.ZodEnum;
+    isoDate: () => z.ZodString;
+    jwt: () => z.ZodString;
+    slug: () => z.ZodString;
+    semver: () => z.ZodString;
+    unixTimestamp: () => z.ZodNumber;
+    unixTimestamp2000: () => z.ZodNumber;
+    unixTimestampMillis: () => z.ZodNumber;
+    unixTimestampMillis2000: () => z.ZodNumber;
+};

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

@@ -1,103 +1,75 @@
 import { z } from 'zod/v4';
 export const TS_2500 = 16725225600; // 2500-01-01
 export const TS_2000 = 946684800; // 2000-01-01
-export const zUnixTimestamp = z
+export const zUnixTimestamp = () => z
     .number()
     .int()
     .min(0)
     .max(TS_2500, 'Must be a UnixTimestamp number')
     // .transform(v => v as UnixTimestamp) // breaks jsonSchema
     .describe('UnixTimestamp');
-export const zUnixTimestamp2000 = z
+export const zUnixTimestamp2000 = () => z
     .number()
     .int()
     .min(TS_2000)
     .max(TS_2500, 'Must be a UnixTimestamp number after 2000-01-01')
     // .transform(v => v as UnixTimestamp)
     .describe('UnixTimestamp2000');
-export const zUnixTimestampMillis = z
+export const zUnixTimestampMillis = () => z
     .number()
     .int()
     .min(0)
     .max(TS_2500 * 1000, 'Must be a UnixTimestampMillis number')
     // .transform(v => v as UnixTimestampMillis)
     .describe('UnixTimestampMillis');
-export const zUnixTimestampMillis2000 = z
+export const zUnixTimestampMillis2000 = () => z
     .number()
     .int()
     .min(TS_2000 * 1000)
     .max(TS_2500 * 1000, 'Must be a UnixTimestampMillis number after 2000-01-01')
     // .transform(v => v as UnixTimestampMillis)
     .describe('UnixTimestampMillis2000');
-export const zSemVer = z
+export const zSemVer = () => z
     .string()
     .regex(/^[0-9]+\.[0-9]+\.[0-9]+$/, 'Must be a SemVer string')
     .describe('SemVer');
-export const zIsoDate = z
+export const zIsoDate = () => z
     .string()
     .refine(v => {
     return /^\d{4}-\d{2}-\d{2}$/.test(v);
 }, 'Must be an IsoDateString')
-    // .transform(v => v as IsoDate)
     .describe('IsoDateString');
-export const zEmail = z
-    .string()
-    .trim()
-    .email() // keeping as-is, so trim happens before email validation
-    .transform(s => s.toLowerCase()) // breaks toJsonSchema
-    .describe('Email');
-export const zEmailNoLowercase = z
-    .string()
-    .trim()
-    .email() // keeping as-is, so trim happens before email validation
-    // .transform(s => s.toLowerCase()) // breaks toJsonSchema
-    .describe('Email');
+export const zEmail = () => z.email().describe('Email');
 export const BASE62_REGEX = /^[a-zA-Z0-9]+$/;
 export const BASE64_REGEX = /^[A-Za-z0-9+/]+={0,2}$/;
-export const BASE64URL_REGEX = /^[\w-/]+$/;
-export const zBase62 = z
-    .string()
-    .regex(BASE62_REGEX, 'Must be a base62 string')
-    .describe('Base62String');
-export const zBase64 = z
-    .string()
-    .regex(BASE64_REGEX, 'Must be a base64 string')
-    .describe('Base64String');
-export const zBase64Url = z
-    .string()
-    .regex(BASE64URL_REGEX, 'Must be a base64url string')
-    .describe('Base64UrlString');
+export const BASE64URL_REGEX = /^[\w\-/]+$/;
+export const zBase62 = () => z.string().regex(BASE62_REGEX, 'Must be a base62 string').describe('Base62String');
+export const zBase64 = () => z.string().regex(BASE64_REGEX, 'Must be a base64 string').describe('Base64String');
+export const zBase64Url = () => z.string().regex(BASE64URL_REGEX, 'Must be a base64url string').describe('Base64UrlString');
 export const JWT_REGEX = /^[\w-]+\.[\w-]+\.[\w-]+$/;
-export const zJwt = z.string().regex(JWT_REGEX, 'Must be a JWT string').describe('JWTString');
-export const zId = z
-    .string()
-    .regex(/^[a-zA-Z0-9_]{6,64}$/, 'Must be an id string (6 to 64 chars long)')
-    .describe('IdString');
-export const zIdBase62 = z
-    .string()
-    .regex(/^[a-zA-Z0-9]{8,64}$/, 'Must be a base62 id string')
-    .describe('Base62Id');
-export const zIdBase64 = z
-    .string()
-    .regex(/^[A-Za-z0-9+/]{6,62}={0,2}$/, 'Must be a base64 id string')
-    .describe('Base64Id');
-export const zIdBase64Url = z
-    .string()
-    .regex(/^[\w-/]{8,64}$/, 'Must be a base64url id string')
-    .describe('Base64UrlId');
+export const zJwt = () => z.string().regex(JWT_REGEX, 'Must be a JWT string').describe('JWTString');
 /**
  * "Slug" - a valid URL, filename, etc.
  */
-export const zSlug = z
+export const zSlug = () => z
     .string()
     .regex(/^[a-z0-9-]{1,255}$/, 'Must be a slug string')
     .describe('Slug');
-export const zBaseDBEntity = z
-    .object({
-    id: z.string(),
-    // created/updated are intentionally optional here
-    created: zUnixTimestamp2000.optional(),
-    updated: zUnixTimestamp2000.optional(),
-})
-    .describe('BaseDBEntity');
-// export const zSavedDBEntity = zBaseDBEntity.required().describe('SavedDBEntity')
+export const zIanaTimezone = () => z
+    // UTC is added to assist unit-testing, which uses UTC by default (not technically a valid Iana timezone identifier)
+    .enum([...Intl.supportedValuesOf('timeZone'), 'UTC']);
+export const customZodSchemas = {
+    base62: zBase62,
+    base64: zBase64,
+    base64Url: zBase64Url,
+    email: zEmail,
+    ianaTimezone: zIanaTimezone,
+    isoDate: zIsoDate,
+    jwt: zJwt,
+    slug: zSlug,
+    semver: zSemVer,
+    unixTimestamp: zUnixTimestamp,
+    unixTimestamp2000: zUnixTimestamp2000,
+    unixTimestampMillis: zUnixTimestampMillis,
+    unixTimestampMillis2000: zUnixTimestampMillis2000,
+};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/js-lib",
   "type": "module",
-  "version": "15.5.2",
+  "version": "15.6.1",
   "dependencies": {
     "tslib": "^2",
     "zod": "^3"

package/src/browser/analytics.util.ts

@@ -2,28 +2,25 @@ import { isServerSide } from '../index.js'
 import { loadScript } from './script.util.js'
 
 declare global {
-  interface Window {
-    dataLayer: any[]
-    gtag: (...args: any[]) => void
-  }
+  var dataLayer: any[]
+  var gtag: (...args: any[]) => void
+  var hj: (...args: any[]) => void
 }
 
-/* eslint-disable unicorn/prefer-global-this */
-
 /**
- * Pass enabled = false to only init window.gtag, but not load actual gtag script (e.g in dev mode).
+ * Pass enabled = false to only init globalThis.gtag, but not load actual gtag script (e.g in dev mode).
  */
 export async function loadGTag(gtagId: string, enabled = true): Promise<void> {
   if (isServerSide()) return
 
-  window.dataLayer ||= []
-  window.gtag ||= function gtag() {
+  globalThis.dataLayer ||= []
+  globalThis.gtag ||= function gtag() {
     // biome-ignore lint/complexity/useArrowFunction: ok
     // biome-ignore lint/complexity/noArguments: ok
-    window.dataLayer.push(arguments)
+    globalThis.dataLayer.push(arguments)
   }
-  window.gtag('js', new Date())
-  window.gtag('config', gtagId)
+  globalThis.gtag('js', new Date())
+  globalThis.gtag('config', gtagId)
 
   if (!enabled) return
 
@@ -33,8 +30,8 @@ export async function loadGTag(gtagId: string, enabled = true): Promise<void> {
 export async function loadGTM(gtmId: string, enabled = true): Promise<void> {
   if (isServerSide()) return
 
-  window.dataLayer ||= []
-  window.dataLayer.push({
+  globalThis.dataLayer ||= []
+  globalThis.dataLayer.push({
     'gtm.start': Date.now(),
     event: 'gtm.js',
   })
@@ -63,6 +60,6 @@ export function loadHotjar(hjid: number): void {
     r.async = 1
     r.src = t + h._hjSettings.hjid + j + h._hjSettings.hjsv
     a.append(r)
-  })(window, document, 'https://static.hotjar.com/c/hotjar-', '.js?sv=')
+  })(globalThis, document, 'https://static.hotjar.com/c/hotjar-', '.js?sv=')
   /* eslint-enable */
 }

package/src/zod/customZod.ts

@@ -0,0 +1,11 @@
+import { z as z4, ZodType } from 'zod/v4'
+import { customZodSchemas } from './zod.shared.schemas.js'
+
+type ExtendedZod = Omit<typeof z4, keyof typeof customZodSchemas | 'iso'> & typeof customZodSchemas
+
+const z: ExtendedZod = { ...z4, ...customZodSchemas }
+
+// eslint-disable-next-line @typescript-eslint/naming-convention
+type zInfer<T> = z4.infer<T>
+
+export { z, type zInfer, ZodType }

package/src/zod/index.ts

@@ -1,5 +1,3 @@
+export * from './customZod.js'
 export * from './zod.shared.schemas.js'
 export * from './zod.util.js'
-import { z, ZodType } from 'zod/v4'
-
-export { z, ZodType }

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

@@ -3,113 +3,101 @@ import { z } from 'zod/v4'
 export const TS_2500 = 16725225600 // 2500-01-01
 export const TS_2000 = 946684800 // 2000-01-01
 
-export const zUnixTimestamp = z
-  .number()
-  .int()
-  .min(0)
-  .max(TS_2500, 'Must be a UnixTimestamp number')
-  // .transform(v => v as UnixTimestamp) // breaks jsonSchema
-  .describe('UnixTimestamp')
-export const zUnixTimestamp2000 = z
-  .number()
-  .int()
-  .min(TS_2000)
-  .max(TS_2500, 'Must be a UnixTimestamp number after 2000-01-01')
-  // .transform(v => v as UnixTimestamp)
-  .describe('UnixTimestamp2000')
-export const zUnixTimestampMillis = z
-  .number()
-  .int()
-  .min(0)
-  .max(TS_2500 * 1000, 'Must be a UnixTimestampMillis number')
-  // .transform(v => v as UnixTimestampMillis)
-  .describe('UnixTimestampMillis')
-export const zUnixTimestampMillis2000 = z
-  .number()
-  .int()
-  .min(TS_2000 * 1000)
-  .max(TS_2500 * 1000, 'Must be a UnixTimestampMillis number after 2000-01-01')
-  // .transform(v => v as UnixTimestampMillis)
-  .describe('UnixTimestampMillis2000')
-
-export const zSemVer = z
-  .string()
-  .regex(/^[0-9]+\.[0-9]+\.[0-9]+$/, 'Must be a SemVer string')
-  .describe('SemVer')
-
-export const zIsoDate = z
-  .string()
-  .refine(v => {
-    return /^\d{4}-\d{2}-\d{2}$/.test(v)
-  }, 'Must be an IsoDateString')
-  // .transform(v => v as IsoDate)
-  .describe('IsoDateString')
-
-export const zEmail = z
-  .string()
-  .trim()
-  .email() // keeping as-is, so trim happens before email validation
-  .transform(s => s.toLowerCase()) // breaks toJsonSchema
-  .describe('Email')
-
-export const zEmailNoLowercase = z
-  .string()
-  .trim()
-  .email() // keeping as-is, so trim happens before email validation
-  // .transform(s => s.toLowerCase()) // breaks toJsonSchema
-  .describe('Email')
+export const zUnixTimestamp = (): z.ZodNumber =>
+  z
+    .number()
+    .int()
+    .min(0)
+    .max(TS_2500, 'Must be a UnixTimestamp number')
+    // .transform(v => v as UnixTimestamp) // breaks jsonSchema
+    .describe('UnixTimestamp')
+
+export const zUnixTimestamp2000 = (): z.ZodNumber =>
+  z
+    .number()
+    .int()
+    .min(TS_2000)
+    .max(TS_2500, 'Must be a UnixTimestamp number after 2000-01-01')
+    // .transform(v => v as UnixTimestamp)
+    .describe('UnixTimestamp2000')
+
+export const zUnixTimestampMillis = (): z.ZodNumber =>
+  z
+    .number()
+    .int()
+    .min(0)
+    .max(TS_2500 * 1000, 'Must be a UnixTimestampMillis number')
+    // .transform(v => v as UnixTimestampMillis)
+    .describe('UnixTimestampMillis')
+
+export const zUnixTimestampMillis2000 = (): z.ZodNumber =>
+  z
+    .number()
+    .int()
+    .min(TS_2000 * 1000)
+    .max(TS_2500 * 1000, 'Must be a UnixTimestampMillis number after 2000-01-01')
+    // .transform(v => v as UnixTimestampMillis)
+    .describe('UnixTimestampMillis2000')
+
+export const zSemVer = (): z.ZodString =>
+  z
+    .string()
+    .regex(/^[0-9]+\.[0-9]+\.[0-9]+$/, 'Must be a SemVer string')
+    .describe('SemVer')
+
+export const zIsoDate = (): z.ZodString =>
+  z
+    .string()
+    .refine(v => {
+      return /^\d{4}-\d{2}-\d{2}$/.test(v)
+    }, 'Must be an IsoDateString')
+    .describe('IsoDateString')
+
+export const zEmail = (): z.ZodEmail => z.email().describe('Email')
 
 export const BASE62_REGEX = /^[a-zA-Z0-9]+$/
 export const BASE64_REGEX = /^[A-Za-z0-9+/]+={0,2}$/
-export const BASE64URL_REGEX = /^[\w-/]+$/
-export const zBase62 = z
-  .string()
-  .regex(BASE62_REGEX, 'Must be a base62 string')
-  .describe('Base62String')
-export const zBase64 = z
-  .string()
-  .regex(BASE64_REGEX, 'Must be a base64 string')
-  .describe('Base64String')
-export const zBase64Url = z
-  .string()
-  .regex(BASE64URL_REGEX, 'Must be a base64url string')
-  .describe('Base64UrlString')
+export const BASE64URL_REGEX = /^[\w\-/]+$/
+
+export const zBase62 = (): z.ZodString =>
+  z.string().regex(BASE62_REGEX, 'Must be a base62 string').describe('Base62String')
+
+export const zBase64 = (): z.ZodString =>
+  z.string().regex(BASE64_REGEX, 'Must be a base64 string').describe('Base64String')
+
+export const zBase64Url = (): z.ZodString =>
+  z.string().regex(BASE64URL_REGEX, 'Must be a base64url string').describe('Base64UrlString')
 
 export const JWT_REGEX = /^[\w-]+\.[\w-]+\.[\w-]+$/
-export const zJwt = z.string().regex(JWT_REGEX, 'Must be a JWT string').describe('JWTString')
-
-export const zId = z
-  .string()
-  .regex(/^[a-zA-Z0-9_]{6,64}$/, 'Must be an id string (6 to 64 chars long)')
-  .describe('IdString')
-export const zIdBase62 = z
-  .string()
-  .regex(/^[a-zA-Z0-9]{8,64}$/, 'Must be a base62 id string')
-  .describe('Base62Id')
-export const zIdBase64 = z
-  .string()
-  .regex(/^[A-Za-z0-9+/]{6,62}={0,2}$/, 'Must be a base64 id string')
-  .describe('Base64Id')
-export const zIdBase64Url = z
-  .string()
-  .regex(/^[\w-/]{8,64}$/, 'Must be a base64url id string')
-  .describe('Base64UrlId')
+export const zJwt = (): z.ZodString =>
+  z.string().regex(JWT_REGEX, 'Must be a JWT string').describe('JWTString')
 
 /**
  * "Slug" - a valid URL, filename, etc.
  */
-export const zSlug = z
-  .string()
-  .regex(/^[a-z0-9-]{1,255}$/, 'Must be a slug string')
-  .describe('Slug')
-
-export const zBaseDBEntity = z
-  .object({
-    id: z.string(),
-    // created/updated are intentionally optional here
-    created: zUnixTimestamp2000.optional(),
-    updated: zUnixTimestamp2000.optional(),
-  })
-  .describe('BaseDBEntity')
-
-// export const zSavedDBEntity = zBaseDBEntity.required().describe('SavedDBEntity')
+export const zSlug = (): z.ZodString =>
+  z
+    .string()
+    .regex(/^[a-z0-9-]{1,255}$/, 'Must be a slug string')
+    .describe('Slug')
+
+export const zIanaTimezone = (): z.ZodEnum =>
+  z
+    // UTC is added to assist unit-testing, which uses UTC by default (not technically a valid Iana timezone identifier)
+    .enum([...Intl.supportedValuesOf('timeZone'), 'UTC'])
+
+export const customZodSchemas = {
+  base62: zBase62,
+  base64: zBase64,
+  base64Url: zBase64Url,
+  email: zEmail,
+  ianaTimezone: zIanaTimezone,
+  isoDate: zIsoDate,
+  jwt: zJwt,
+  slug: zSlug,
+  semver: zSemVer,
+  unixTimestamp: zUnixTimestamp,
+  unixTimestamp2000: zUnixTimestamp2000,
+  unixTimestampMillis: zUnixTimestampMillis,
+  unixTimestampMillis2000: zUnixTimestampMillis2000,
+}