@andrew_l/toolkit 0.2.5 → 0.2.8

package/dist/index.cjs

@@ -822,14 +822,14 @@ function createWithCache({
     getPointer,
     argToKeyOptions
   };
-  const wrapFn = (...args) => {
+  const wrapFn = function(...args) {
     const storage = getBucket(getPointer());
     const cacheKey = args.map((v) => argToKey(v, argToKeyOptions)).join("_");
     if (storage.has(cacheKey)) {
       const value = storage.get(cacheKey);
       return isAsync ? Promise.resolve(value) : value;
     }
-    const newValue = fn(...args);
+    const newValue = fn.apply(this, args);
     if (isPromise(newValue)) {
       return newValue.then((value) => {
         storage.set(cacheKey, value);
@@ -1388,13 +1388,13 @@ function withCacheBucketBatch({
     }
     return fnCache;
   };
-  const wrapFn = async (values) => {
+  const wrapFn = async function(values) {
     const result = /* @__PURE__ */ new Map();
     let fnCache = getBucket();
     const batchSet = /* @__PURE__ */ new Set();
     const drainMaybe = async () => {
       if (!batchSet.size) return;
-      const items = await resolver(Array.from(batchSet));
+      const items = await resolver.call(this, Array.from(batchSet));
       for (let idx = 0; idx < items.length; idx++) {
         const item = items[idx];
         if (!isObject(item)) continue;
@@ -3491,19 +3491,37 @@ function tryStringify(o) {
   }
 }
 
-const IS_DEV = env.isDevelopment || env.bool("DEV", false);
+const LEVEL_NUM = {
+  debug: 0,
+  log: 1,
+  info: 2,
+  warn: 3,
+  error: 4
+};
+let currentLogLevel = LEVEL_NUM.log;
+const loggerSetLevel = (level) => {
+  number$1(LEVEL_NUM[level], `Invalid log level: ${level}`);
+  currentLogLevel = LEVEL_NUM[level];
+};
 const logger = (...baseArgs) => {
+  if (isString(baseArgs[0]?.url)) {
+    baseArgs[0] = baseArgs[0]?.url;
+  }
   if (typeof baseArgs[0] === "string" && baseArgs[0][0] !== "[") {
     baseArgs[0] = `[${baseArgs[0].split("/").at(-1).split("?", 1)[0]}]`;
   }
   const writeLog = (level, ...[pattern, ...args]) => {
+    const levelNum = LEVEL_NUM[level];
+    if (levelNum < currentLogLevel) {
+      return;
+    }
     if (!isString(pattern)) {
       console[level](...baseArgs, pattern, ...args);
       return;
     }
     const unusedArgs = [];
     const formatted = sprintf(pattern, args, unusedArgs);
-    console[level](...baseArgs, ...formatted, ...unusedArgs);
+    console[level](...baseArgs, formatted, ...unusedArgs);
   };
   const log = writeLog.bind(null, "log");
   const info = writeLog.bind(null, "info");
@@ -3521,9 +3539,6 @@ const logger = (...baseArgs) => {
     debug,
     extend
   };
-  Object.defineProperty(instance, "debug", {
-    get: () => IS_DEV ? debug : noop
-  });
   return instance;
 };
 
@@ -4562,6 +4577,7 @@ exports.isoToFlagEmoji = isoToFlagEmoji;
 exports.kebabCase = kebabCase;
 exports.keyBy = keyBy;
 exports.logger = logger;
+exports.loggerSetLevel = loggerSetLevel;
 exports.lowerCase = lowerCase;
 exports.luminance = luminance;
 exports.maskingEmail = maskingEmail;