hide-a-bed 7.1.1 → 7.1.3

package/dist/cjs/index.cjs

@@ -198,28 +198,21 @@ const RequestOptions = zod.z.strictObject({
 
 //#endregion
 //#region schema/config.mts
-const anyArgs = zod.z.array(zod.z.any());
-const LoggerSchema = zod.z.object({
-	error: zod.z.function({
-		input: anyArgs,
-		output: zod.z.void()
-	}).optional(),
-	warn: zod.z.function({
-		input: anyArgs,
-		output: zod.z.void()
-	}).optional(),
-	info: zod.z.function({
-		input: anyArgs,
-		output: zod.z.void()
-	}).optional(),
-	debug: zod.z.function({
-		input: anyArgs,
-		output: zod.z.void()
-	}).optional()
-}).or(zod.z.function({
-	input: anyArgs,
-	output: zod.z.void()
-}));
+const loggerLevels = [
+	"error",
+	"warn",
+	"info",
+	"debug"
+];
+const isLoggerMethod = (value) => typeof value === "function";
+const LoggerSchema = zod.z.custom((value) => {
+	if (isLoggerMethod(value)) return true;
+	if (value === null || typeof value !== "object") return false;
+	return loggerLevels.every((level) => {
+		const method = value[level];
+		return method === void 0 || isLoggerMethod(method);
+	});
+}, { message: "logger must be a function or object with optional error, warn, info, and debug methods" });
 const CouchAuth = zod.z.strictObject({
 	username: zod.z.string().describe("basic auth username for CouchDB requests"),
 	password: zod.z.string().describe("basic auth password for CouchDB requests")
@@ -575,6 +568,10 @@ const createNoopLogger = () => ({
 	info: noop,
 	debug: noop
 });
+const bindLoggerMethod = (logger, level) => {
+	const method = logger[level];
+	return typeof method === "function" ? method.bind(logger) : noop;
+};
 function createLogger(config) {
 	if (config["~normalizedLogger"]) return config["~normalizedLogger"];
 	if (!config.logger) {
@@ -595,10 +592,10 @@ function createLogger(config) {
 	}
 	const loggerObj = config.logger;
 	const normalized = {
-		error: loggerObj.error ?? noop,
-		warn: loggerObj.warn ?? noop,
-		info: loggerObj.info ?? noop,
-		debug: loggerObj.debug ?? noop
+		error: bindLoggerMethod(loggerObj, "error"),
+		warn: bindLoggerMethod(loggerObj, "warn"),
+		info: bindLoggerMethod(loggerObj, "info"),
+		debug: bindLoggerMethod(loggerObj, "debug")
 	};
 	config["~normalizedLogger"] = normalized;
 	return normalized;

package/dist/esm/index.mjs

@@ -166,28 +166,21 @@ const RequestOptions = z$1.strictObject({
 
 //#endregion
 //#region schema/config.mts
-const anyArgs = z$1.array(z$1.any());
-const LoggerSchema = z$1.object({
-	error: z$1.function({
-		input: anyArgs,
-		output: z$1.void()
-	}).optional(),
-	warn: z$1.function({
-		input: anyArgs,
-		output: z$1.void()
-	}).optional(),
-	info: z$1.function({
-		input: anyArgs,
-		output: z$1.void()
-	}).optional(),
-	debug: z$1.function({
-		input: anyArgs,
-		output: z$1.void()
-	}).optional()
-}).or(z$1.function({
-	input: anyArgs,
-	output: z$1.void()
-}));
+const loggerLevels = [
+	"error",
+	"warn",
+	"info",
+	"debug"
+];
+const isLoggerMethod = (value) => typeof value === "function";
+const LoggerSchema = z$1.custom((value) => {
+	if (isLoggerMethod(value)) return true;
+	if (value === null || typeof value !== "object") return false;
+	return loggerLevels.every((level) => {
+		const method = value[level];
+		return method === void 0 || isLoggerMethod(method);
+	});
+}, { message: "logger must be a function or object with optional error, warn, info, and debug methods" });
 const CouchAuth = z$1.strictObject({
 	username: z$1.string().describe("basic auth username for CouchDB requests"),
 	password: z$1.string().describe("basic auth password for CouchDB requests")
@@ -543,6 +536,10 @@ const createNoopLogger = () => ({
 	info: noop,
 	debug: noop
 });
+const bindLoggerMethod = (logger, level) => {
+	const method = logger[level];
+	return typeof method === "function" ? method.bind(logger) : noop;
+};
 function createLogger(config) {
 	if (config["~normalizedLogger"]) return config["~normalizedLogger"];
 	if (!config.logger) {
@@ -563,10 +560,10 @@ function createLogger(config) {
 	}
 	const loggerObj = config.logger;
 	const normalized = {
-		error: loggerObj.error ?? noop,
-		warn: loggerObj.warn ?? noop,
-		info: loggerObj.info ?? noop,
-		debug: loggerObj.debug ?? noop
+		error: bindLoggerMethod(loggerObj, "error"),
+		warn: bindLoggerMethod(loggerObj, "warn"),
+		info: bindLoggerMethod(loggerObj, "info"),
+		debug: bindLoggerMethod(loggerObj, "debug")
 	};
 	config["~normalizedLogger"] = normalized;
 	return normalized;

package/impl/utils/logger.mts

@@ -27,6 +27,11 @@ const createNoopLogger = (): Logger => ({
   debug: noop
 })
 
+const bindLoggerMethod = (logger: Partial<Logger>, level: keyof Logger): LoggerMethod => {
+  const method = logger[level]
+  return typeof method === 'function' ? method.bind(logger) : noop
+}
+
 export function createLogger(config: CouchConfigInput): Logger {
   if (config['~normalizedLogger']) {
     return config['~normalizedLogger']
@@ -52,10 +57,10 @@ export function createLogger(config: CouchConfigInput): Logger {
 
   const loggerObj = config.logger as Partial<Logger>
   const normalized: Logger = {
-    error: loggerObj.error ?? noop,
-    warn: loggerObj.warn ?? noop,
-    info: loggerObj.info ?? noop,
-    debug: loggerObj.debug ?? noop
+    error: bindLoggerMethod(loggerObj, 'error'),
+    warn: bindLoggerMethod(loggerObj, 'warn'),
+    info: bindLoggerMethod(loggerObj, 'info'),
+    debug: bindLoggerMethod(loggerObj, 'debug')
   }
   config['~normalizedLogger'] = normalized
   return normalized

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hide-a-bed",
-  "version": "7.1.1",
+  "version": "7.1.3",
   "description": "An abstraction over couchdb calls that includes easy mock/stubs with pouchdb",
   "keywords": [
     "couchdb",

package/schema/config.mts

@@ -2,16 +2,35 @@ import { z } from 'zod'
 import type { StandardSchemaV1 } from '../types/standard-schema.ts'
 import { RequestOptions } from './request.mts'
 
-const anyArgs = z.array(z.any())
+type LoggerMethod = (...args: unknown[]) => void
+type ObjectLogger = Partial<Record<'error' | 'warn' | 'info' | 'debug', LoggerMethod>>
+type FunctionLogger = (level: keyof ObjectLogger, ...args: unknown[]) => void
+type ConfigLogger = ObjectLogger | FunctionLogger
 
-const LoggerSchema = z
-  .object({
-    error: z.function({ input: anyArgs, output: z.void() }).optional(),
-    warn: z.function({ input: anyArgs, output: z.void() }).optional(),
-    info: z.function({ input: anyArgs, output: z.void() }).optional(),
-    debug: z.function({ input: anyArgs, output: z.void() }).optional()
-  })
-  .or(z.function({ input: anyArgs, output: z.void() }))
+const loggerLevels = ['error', 'warn', 'info', 'debug'] as const
+
+const isLoggerMethod = (value: unknown): value is LoggerMethod => typeof value === 'function'
+
+const LoggerSchema = z.custom<ConfigLogger>(
+  value => {
+    if (isLoggerMethod(value)) {
+      return true
+    }
+
+    if (value === null || typeof value !== 'object') {
+      return false
+    }
+
+    return loggerLevels.every(level => {
+      const method = (value as Record<string, unknown>)[level]
+      return method === undefined || isLoggerMethod(method)
+    })
+  },
+  {
+    message:
+      'logger must be a function or object with optional error, warn, info, and debug methods'
+  }
+)
 
 export const CouchAuth = z.strictObject({
   username: z.string().describe('basic auth username for CouchDB requests'),

package/types/output/impl/utils/logger.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"logger.d.mts","sourceRoot":"","sources":["../../../../impl/utils/logger.mts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAE/D,KAAK,YAAY,GAAG,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAA;AAEhD,MAAM,MAAM,MAAM,GAAG;IACnB,KAAK,EAAE,YAAY,CAAA;IACnB,IAAI,EAAE,YAAY,CAAA;IAClB,IAAI,EAAE,YAAY,CAAA;IAClB,KAAK,EAAE,YAAY,CAAA;CACpB,CAAA;AAoBD,wBAAgB,YAAY,CAAC,MAAM,EAAE,gBAAgB,GAAG,MAAM,CAgC7D"}
+{"version":3,"file":"logger.d.mts","sourceRoot":"","sources":["../../../../impl/utils/logger.mts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAE/D,KAAK,YAAY,GAAG,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAA;AAEhD,MAAM,MAAM,MAAM,GAAG;IACnB,KAAK,EAAE,YAAY,CAAA;IACnB,IAAI,EAAE,YAAY,CAAA;IAClB,IAAI,EAAE,YAAY,CAAA;IAClB,KAAK,EAAE,YAAY,CAAA;CACpB,CAAA;AAyBD,wBAAgB,YAAY,CAAC,MAAM,EAAE,gBAAgB,GAAG,MAAM,CAgC7D"}

package/types/output/schema/config.d.mts

@@ -1,6 +1,10 @@
 import { z } from 'zod';
 import type { StandardSchemaV1 } from '../types/standard-schema.ts';
 import { RequestOptions } from './request.mts';
+type LoggerMethod = (...args: unknown[]) => void;
+type ObjectLogger = Partial<Record<'error' | 'warn' | 'info' | 'debug', LoggerMethod>>;
+type FunctionLogger = (level: keyof ObjectLogger, ...args: unknown[]) => void;
+type ConfigLogger = ObjectLogger | FunctionLogger;
 export declare const CouchAuth: z.ZodObject<{
     username: z.ZodString;
     password: z.ZodString;
@@ -14,12 +18,7 @@ export declare const CouchConfig: z.ZodObject<{
     bindWithRetry: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     couch: z.ZodCustom<string | URL, string | URL>;
     initialDelay: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
-    logger: z.ZodOptional<z.ZodUnion<[z.ZodObject<{
-        error: z.ZodOptional<z.ZodFunction<z.ZodArray<z.ZodAny>, z.ZodVoid>>;
-        warn: z.ZodOptional<z.ZodFunction<z.ZodArray<z.ZodAny>, z.ZodVoid>>;
-        info: z.ZodOptional<z.ZodFunction<z.ZodArray<z.ZodAny>, z.ZodVoid>>;
-        debug: z.ZodOptional<z.ZodFunction<z.ZodArray<z.ZodAny>, z.ZodVoid>>;
-    }, z.core.$strip>, z.ZodFunction<z.ZodArray<z.ZodAny>, z.ZodVoid>]>>;
+    logger: z.ZodOptional<z.ZodCustom<ConfigLogger, ConfigLogger>>;
     maxRetries: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
     request: z.ZodOptional<z.ZodType<RequestOptions, RequestOptions, z.core.$ZodTypeInternals<RequestOptions, RequestOptions>>>;
     throwOnGetNotFound: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
@@ -31,4 +30,5 @@ export type CouchAuth = StandardSchemaV1.InferOutput<typeof CouchAuth>;
 export type CouchAuthInput = StandardSchemaV1.InferInput<typeof CouchAuth>;
 export type CouchConfig = StandardSchemaV1.InferOutput<typeof CouchConfig>;
 export type CouchConfigInput = StandardSchemaV1.InferInput<typeof CouchConfig>;
+export {};
 //# sourceMappingURL=config.d.mts.map

package/types/output/schema/config.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.mts","sourceRoot":"","sources":["../../../schema/config.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AACvB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAA;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAa9C,eAAO,MAAM,SAAS;;;kBAGpB,CAAA;AAWF,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;kBA6BY,CAAA;AAEpC,MAAM,MAAM,SAAS,GAAG,gBAAgB,CAAC,WAAW,CAAC,OAAO,SAAS,CAAC,CAAA;AACtE,MAAM,MAAM,cAAc,GAAG,gBAAgB,CAAC,UAAU,CAAC,OAAO,SAAS,CAAC,CAAA;AAC1E,MAAM,MAAM,WAAW,GAAG,gBAAgB,CAAC,WAAW,CAAC,OAAO,WAAW,CAAC,CAAA;AAC1E,MAAM,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,UAAU,CAAC,OAAO,WAAW,CAAC,CAAA"}
+{"version":3,"file":"config.d.mts","sourceRoot":"","sources":["../../../schema/config.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AACvB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAA;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAE9C,KAAK,YAAY,GAAG,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAA;AAChD,KAAK,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,EAAE,YAAY,CAAC,CAAC,CAAA;AACtF,KAAK,cAAc,GAAG,CAAC,KAAK,EAAE,MAAM,YAAY,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAA;AAC7E,KAAK,YAAY,GAAG,YAAY,GAAG,cAAc,CAAA;AA2BjD,eAAO,MAAM,SAAS;;;kBAGpB,CAAA;AAWF,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;kBA6BY,CAAA;AAEpC,MAAM,MAAM,SAAS,GAAG,gBAAgB,CAAC,WAAW,CAAC,OAAO,SAAS,CAAC,CAAA;AACtE,MAAM,MAAM,cAAc,GAAG,gBAAgB,CAAC,UAAU,CAAC,OAAO,SAAS,CAAC,CAAA;AAC1E,MAAM,MAAM,WAAW,GAAG,gBAAgB,CAAC,WAAW,CAAC,OAAO,WAAW,CAAC,CAAA;AAC1E,MAAM,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,UAAU,CAAC,OAAO,WAAW,CAAC,CAAA"}