@spoosh/core 0.12.1 → 0.13.0

package/dist/index.js

@@ -24,6 +24,7 @@ __export(src_exports, {
   Spoosh: () => Spoosh,
   __DEV__: () => __DEV__,
   buildUrl: () => buildUrl,
+  clone: () => clone,
   containsFile: () => containsFile,
   createClient: () => createClient,
   createEventEmitter: () => createEventEmitter,
@@ -35,6 +36,7 @@ __export(src_exports, {
   createProxyHandler: () => createProxyHandler,
   createSelectorProxy: () => createSelectorProxy,
   createStateManager: () => createStateManager,
+  createTracer: () => createTracer,
   executeFetch: () => executeFetch,
   extractMethodFromSelector: () => extractMethodFromSelector,
   extractPathFromSelector: () => extractPathFromSelector,
@@ -358,6 +360,56 @@ function resolvePath(path, params) {
 var isNetworkError = (err) => err instanceof TypeError;
 var isAbortError = (err) => err instanceof DOMException && err.name === "AbortError";
 
+// src/utils/clone.ts
+function clone(value, seen = /* @__PURE__ */ new WeakMap()) {
+  if (value === void 0 || value === null || typeof value !== "object") {
+    return value;
+  }
+  if (seen.has(value)) {
+    return seen.get(value);
+  }
+  if (Array.isArray(value)) {
+    const arr = [];
+    seen.set(value, arr);
+    return value.map((v) => clone(v, seen));
+  }
+  if (value instanceof Date) {
+    return new Date(value.getTime());
+  }
+  if (value instanceof RegExp) {
+    return new RegExp(value.source, value.flags);
+  }
+  if (value.constructor !== Object) {
+    return value;
+  }
+  const obj = {};
+  seen.set(value, obj);
+  for (const key in value) {
+    if (Object.prototype.hasOwnProperty.call(value, key)) {
+      obj[key] = clone(value[key], seen);
+    }
+  }
+  return obj;
+}
+
+// src/utils/tracer.ts
+function createTracer(plugin, trace) {
+  const step = (stage, reason, options) => {
+    trace?.step(() => ({
+      plugin,
+      stage,
+      reason,
+      color: options?.color,
+      diff: options?.diff
+    }));
+  };
+  return {
+    return: (msg, options) => step("return", msg, options),
+    log: (msg, options) => step("log", msg, options),
+    skip: (msg, options) => step("skip", msg, options)
+  };
+}
+
 // src/transport/fetch.ts
 var fetchTransport = async (url, init) => {
   const res = await fetch(url, init);
@@ -529,6 +581,9 @@ async function executeCoreFetch(config) {
   const resolvedTransport = resolveTransport(
     requestOptions?.transport ?? defaultTransport
   );
+  if (requestOptions && headers) {
+    requestOptions.headers = headers;
+  }
   try {
     const result = await resolvedTransport(
       url,
@@ -544,9 +599,10 @@ async function executeCoreFetch(config) {
         ...inputFields
       };
     }
+    const error = result.data !== void 0 && result.data !== "" ? result.data : {};
     return {
       status: result.status,
-      error: result.data,
+      error,
       headers: result.headers,
       data: void 0,
       ...inputFields
@@ -698,7 +754,7 @@ function createStateManager() {
         if (entry.tags) {
           existing.tags = entry.tags;
         }
-        if (entry.previousData !== void 0) {
+        if ("previousData" in entry) {
           existing.previousData = entry.previousData;
         }
         if (entry.stale !== void 0) {
@@ -879,6 +935,7 @@ function createPluginExecutor(initialPlugins = []) {
   validateDependencies(initialPlugins);
   const plugins = sortByPriority(initialPlugins);
   const frozenPlugins = Object.freeze([...plugins]);
+  const contextEnhancers = [];
   const createPluginAccessor = (context) => ({
     get(name) {
       const plugin = plugins.find((p) => p.name === name);
@@ -917,41 +974,47 @@ function createPluginExecutor(initialPlugins = []) {
         (p) => p.operations.includes(operationType)
       );
       const middlewares = applicablePlugins.filter((p) => p.middleware).map((p) => p.middleware);
+      const tracedCoreFetch = async () => {
+        const fetchTracer = context.tracer?.("spoosh:fetch");
+        fetchTracer?.log("Network request");
+        return coreFetch();
+      };
       let response;
       if (middlewares.length === 0) {
-        response = await coreFetch();
+        response = await tracedCoreFetch();
       } else {
         const chain = middlewares.reduceRight(
-          (next, middleware) => {
-            return () => middleware(
-              context,
-              next
-              // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            );
-          },
-          coreFetch
+          (next, middleware) => () => middleware(context, next),
+          tracedCoreFetch
         );
         response = await chain();
       }
       for (const plugin of applicablePlugins) {
         if (plugin.afterResponse) {
-          const newResponse = await plugin.afterResponse(
-            context,
-            response
-          );
+          const newResponse = await plugin.afterResponse(context, response);
           if (newResponse) {
             response = newResponse;
           }
         }
       }
+      context.eventEmitter.emit(
+        "spoosh:request-complete",
+        { context, queryKey: context.queryKey }
+      );
       return response;
     },
     getPlugins() {
       return frozenPlugins;
     },
+    registerContextEnhancer(enhancer) {
+      contextEnhancers.push(enhancer);
+    },
     createContext(input) {
       const ctx = input;
       ctx.plugins = createPluginAccessor(ctx);
+      for (const enhancer of contextEnhancers) {
+        enhancer(ctx);
+      }
       return ctx;
     }
   };
@@ -1002,12 +1065,12 @@ var Spoosh = class _Spoosh {
   /**
    * Adds plugins to the Spoosh instance.
    *
-   * Returns a **new** Spoosh instance with updated plugin types (immutable pattern).
-   * Each call to `.use()` replaces the previous plugins rather than adding to them.
+   * Returns a configured Spoosh instance with the specified plugins.
+   * Can only be called once - the returned instance does not have `.use()`.
    *
    * @template TNewPlugins - The const tuple type of the new plugins array
    * @param plugins - Array of plugin instances to use
-   * @returns A new Spoosh instance with the specified plugins
+   * @returns A configured Spoosh instance (without `.use()` method)
    *
    * ```ts
    * const spoosh = new Spoosh<Schema, Error>('/api').use([
@@ -1499,7 +1562,7 @@ function createInfiniteReadController(options) {
       (key) => stateManager.subscribeCache(key, notify)
     );
   };
-  const createContext = (pageKey) => {
+  const createContext = (pageKey, requestOptions) => {
     return pluginExecutor.createContext({
       operationType: "infiniteRead",
       path,
@@ -1508,7 +1571,12 @@ function createInfiniteReadController(options) {
       tags,
       requestTimestamp: Date.now(),
       instanceId,
-      request: { headers: {} },
+      request: {
+        headers: {},
+        query: requestOptions?.query,
+        params: requestOptions?.params,
+        body: requestOptions?.body
+      },
       temp: /* @__PURE__ */ new Map(),
       pluginOptions,
       stateManager,
@@ -1532,7 +1600,7 @@ function createInfiniteReadController(options) {
     notify();
     abortController = new AbortController();
     const signal = abortController.signal;
-    const context = createContext(pageKey);
+    const context = createContext(pageKey, mergedRequest);
     const coreFetch = async () => {
       const fetchPromise = (async () => {
         try {
@@ -1687,7 +1755,7 @@ function createInfiniteReadController(options) {
       loadFromTracker();
       cachedState = computeState();
       subscribeToPages();
-      const context = createContext(trackerKey);
+      const context = createContext(trackerKey, initialRequest);
       pluginExecutor.executeLifecycle("onMount", "infiniteRead", context);
       refetchUnsubscribe = eventEmitter.on("refetch", (event) => {
         const isRelevant = event.queryKey === trackerKey || pageKeys.includes(event.queryKey);
@@ -1704,7 +1772,7 @@ function createInfiniteReadController(options) {
       }
     },
     unmount() {
-      const context = createContext(trackerKey);
+      const context = createContext(trackerKey, initialRequest);
       pluginExecutor.executeLifecycle("onUnmount", "infiniteRead", context);
       pageSubscriptions.forEach((unsub) => unsub());
       pageSubscriptions = [];
@@ -1712,7 +1780,7 @@ function createInfiniteReadController(options) {
       refetchUnsubscribe = null;
     },
     update(previousContext) {
-      const context = createContext(trackerKey);
+      const context = createContext(trackerKey, initialRequest);
       pluginExecutor.executeUpdateLifecycle(
         "infiniteRead",
         context,
@@ -1720,7 +1788,7 @@ function createInfiniteReadController(options) {
       );
     },
     getContext() {
-      return createContext(trackerKey);
+      return createContext(trackerKey, initialRequest);
     },
     setPluginOptions(opts) {
       pluginOptions = opts;

package/dist/index.mjs

@@ -295,6 +295,56 @@ function resolvePath(path, params) {
 var isNetworkError = (err) => err instanceof TypeError;
 var isAbortError = (err) => err instanceof DOMException && err.name === "AbortError";
 
+// src/utils/clone.ts
+function clone(value, seen = /* @__PURE__ */ new WeakMap()) {
+  if (value === void 0 || value === null || typeof value !== "object") {
+    return value;
+  }
+  if (seen.has(value)) {
+    return seen.get(value);
+  }
+  if (Array.isArray(value)) {
+    const arr = [];
+    seen.set(value, arr);
+    return value.map((v) => clone(v, seen));
+  }
+  if (value instanceof Date) {
+    return new Date(value.getTime());
+  }
+  if (value instanceof RegExp) {
+    return new RegExp(value.source, value.flags);
+  }
+  if (value.constructor !== Object) {
+    return value;
+  }
+  const obj = {};
+  seen.set(value, obj);
+  for (const key in value) {
+    if (Object.prototype.hasOwnProperty.call(value, key)) {
+      obj[key] = clone(value[key], seen);
+    }
+  }
+  return obj;
+}
+
+// src/utils/tracer.ts
+function createTracer(plugin, trace) {
+  const step = (stage, reason, options) => {
+    trace?.step(() => ({
+      plugin,
+      stage,
+      reason,
+      color: options?.color,
+      diff: options?.diff
+    }));
+  };
+  return {
+    return: (msg, options) => step("return", msg, options),
+    log: (msg, options) => step("log", msg, options),
+    skip: (msg, options) => step("skip", msg, options)
+  };
+}
+
 // src/transport/fetch.ts
 var fetchTransport = async (url, init) => {
   const res = await fetch(url, init);
@@ -466,6 +516,9 @@ async function executeCoreFetch(config) {
   const resolvedTransport = resolveTransport(
     requestOptions?.transport ?? defaultTransport
   );
+  if (requestOptions && headers) {
+    requestOptions.headers = headers;
+  }
   try {
     const result = await resolvedTransport(
       url,
@@ -481,9 +534,10 @@ async function executeCoreFetch(config) {
         ...inputFields
       };
     }
+    const error = result.data !== void 0 && result.data !== "" ? result.data : {};
     return {
       status: result.status,
-      error: result.data,
+      error,
       headers: result.headers,
       data: void 0,
       ...inputFields
@@ -635,7 +689,7 @@ function createStateManager() {
         if (entry.tags) {
           existing.tags = entry.tags;
         }
-        if (entry.previousData !== void 0) {
+        if ("previousData" in entry) {
           existing.previousData = entry.previousData;
         }
         if (entry.stale !== void 0) {
@@ -816,6 +870,7 @@ function createPluginExecutor(initialPlugins = []) {
   validateDependencies(initialPlugins);
   const plugins = sortByPriority(initialPlugins);
   const frozenPlugins = Object.freeze([...plugins]);
+  const contextEnhancers = [];
   const createPluginAccessor = (context) => ({
     get(name) {
       const plugin = plugins.find((p) => p.name === name);
@@ -854,41 +909,47 @@ function createPluginExecutor(initialPlugins = []) {
         (p) => p.operations.includes(operationType)
       );
       const middlewares = applicablePlugins.filter((p) => p.middleware).map((p) => p.middleware);
+      const tracedCoreFetch = async () => {
+        const fetchTracer = context.tracer?.("spoosh:fetch");
+        fetchTracer?.log("Network request");
+        return coreFetch();
+      };
       let response;
       if (middlewares.length === 0) {
-        response = await coreFetch();
+        response = await tracedCoreFetch();
       } else {
         const chain = middlewares.reduceRight(
-          (next, middleware) => {
-            return () => middleware(
-              context,
-              next
-              // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            );
-          },
-          coreFetch
+          (next, middleware) => () => middleware(context, next),
+          tracedCoreFetch
         );
         response = await chain();
       }
       for (const plugin of applicablePlugins) {
         if (plugin.afterResponse) {
-          const newResponse = await plugin.afterResponse(
-            context,
-            response
-          );
+          const newResponse = await plugin.afterResponse(context, response);
           if (newResponse) {
             response = newResponse;
           }
         }
       }
+      context.eventEmitter.emit(
+        "spoosh:request-complete",
+        { context, queryKey: context.queryKey }
+      );
       return response;
     },
     getPlugins() {
       return frozenPlugins;
     },
+    registerContextEnhancer(enhancer) {
+      contextEnhancers.push(enhancer);
+    },
     createContext(input) {
       const ctx = input;
       ctx.plugins = createPluginAccessor(ctx);
+      for (const enhancer of contextEnhancers) {
+        enhancer(ctx);
+      }
       return ctx;
     }
   };
@@ -939,12 +1000,12 @@ var Spoosh = class _Spoosh {
   /**
    * Adds plugins to the Spoosh instance.
    *
-   * Returns a **new** Spoosh instance with updated plugin types (immutable pattern).
-   * Each call to `.use()` replaces the previous plugins rather than adding to them.
+   * Returns a configured Spoosh instance with the specified plugins.
+   * Can only be called once - the returned instance does not have `.use()`.
    *
    * @template TNewPlugins - The const tuple type of the new plugins array
    * @param plugins - Array of plugin instances to use
-   * @returns A new Spoosh instance with the specified plugins
+   * @returns A configured Spoosh instance (without `.use()` method)
    *
    * ```ts
    * const spoosh = new Spoosh<Schema, Error>('/api').use([
@@ -1436,7 +1497,7 @@ function createInfiniteReadController(options) {
       (key) => stateManager.subscribeCache(key, notify)
     );
   };
-  const createContext = (pageKey) => {
+  const createContext = (pageKey, requestOptions) => {
     return pluginExecutor.createContext({
       operationType: "infiniteRead",
       path,
@@ -1445,7 +1506,12 @@ function createInfiniteReadController(options) {
       tags,
       requestTimestamp: Date.now(),
       instanceId,
-      request: { headers: {} },
+      request: {
+        headers: {},
+        query: requestOptions?.query,
+        params: requestOptions?.params,
+        body: requestOptions?.body
+      },
       temp: /* @__PURE__ */ new Map(),
       pluginOptions,
       stateManager,
@@ -1469,7 +1535,7 @@ function createInfiniteReadController(options) {
     notify();
     abortController = new AbortController();
     const signal = abortController.signal;
-    const context = createContext(pageKey);
+    const context = createContext(pageKey, mergedRequest);
     const coreFetch = async () => {
       const fetchPromise = (async () => {
         try {
@@ -1624,7 +1690,7 @@ function createInfiniteReadController(options) {
       loadFromTracker();
       cachedState = computeState();
       subscribeToPages();
-      const context = createContext(trackerKey);
+      const context = createContext(trackerKey, initialRequest);
       pluginExecutor.executeLifecycle("onMount", "infiniteRead", context);
       refetchUnsubscribe = eventEmitter.on("refetch", (event) => {
         const isRelevant = event.queryKey === trackerKey || pageKeys.includes(event.queryKey);
@@ -1641,7 +1707,7 @@ function createInfiniteReadController(options) {
       }
     },
     unmount() {
-      const context = createContext(trackerKey);
+      const context = createContext(trackerKey, initialRequest);
       pluginExecutor.executeLifecycle("onUnmount", "infiniteRead", context);
       pageSubscriptions.forEach((unsub) => unsub());
       pageSubscriptions = [];
@@ -1649,7 +1715,7 @@ function createInfiniteReadController(options) {
       refetchUnsubscribe = null;
     },
     update(previousContext) {
-      const context = createContext(trackerKey);
+      const context = createContext(trackerKey, initialRequest);
       pluginExecutor.executeUpdateLifecycle(
         "infiniteRead",
         context,
@@ -1657,7 +1723,7 @@ function createInfiniteReadController(options) {
       );
     },
     getContext() {
-      return createContext(trackerKey);
+      return createContext(trackerKey, initialRequest);
     },
     setPluginOptions(opts) {
       pluginOptions = opts;
@@ -1670,6 +1736,7 @@ export {
   Spoosh,
   __DEV__,
   buildUrl,
+  clone,
   containsFile,
   createClient,
   createEventEmitter,
@@ -1681,6 +1748,7 @@ export {
   createProxyHandler,
   createSelectorProxy,
   createStateManager,
+  createTracer,
   executeFetch,
   extractMethodFromSelector,
   extractPathFromSelector,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spoosh/core",
-  "version": "0.12.1",
+  "version": "0.13.0",
   "license": "MIT",
   "description": "Type-safe API toolkit with plugin middleware system",
   "keywords": [