@spoosh/core 0.10.0 → 0.11.0

package/dist/index.mjs

@@ -1,19 +1,3 @@
-// src/middleware.ts
-function createMiddleware(name, phase, handler) {
-  return { name, phase, handler };
-}
-async function applyMiddlewares(context, middlewares, phase) {
-  const phaseMiddlewares = middlewares.filter((m) => m.phase === phase);
-  let ctx = context;
-  for (const middleware of phaseMiddlewares) {
-    ctx = await middleware.handler(ctx);
-  }
-  return ctx;
-}
-function composeMiddlewares(...middlewareLists) {
-  return middlewareLists.flat().filter(Boolean);
-}
-
 // src/utils/buildUrl.ts
 function stringifyQuery(query) {
   const parts = [];
@@ -224,19 +208,20 @@ function resolveRequestBody(rawBody) {
     return void 0;
   }
   if (isSpooshBody(rawBody)) {
-    switch (rawBody.kind) {
+    const body = rawBody;
+    switch (body.kind) {
       case "form":
         return {
-          body: objectToFormData(rawBody.value)
+          body: objectToFormData(body.value)
         };
       case "json":
         return {
-          body: JSON.stringify(rawBody.value),
+          body: JSON.stringify(body.value),
           headers: { "Content-Type": "application/json" }
         };
       case "urlencoded":
         return {
-          body: objectToUrlEncoded(rawBody.value),
+          body: objectToUrlEncoded(body.value),
           headers: { "Content-Type": "application/x-www-form-urlencoded" }
         };
     }
@@ -392,32 +377,15 @@ var delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 var isNetworkError = (err) => err instanceof TypeError;
 var isAbortError = (err) => err instanceof DOMException && err.name === "AbortError";
 async function executeFetch(baseUrl, path, method, defaultOptions, requestOptions, nextTags) {
-  const middlewares = defaultOptions.middlewares ?? [];
-  let context = {
+  return executeCoreFetch({
     baseUrl,
     path,
     method,
     defaultOptions,
     requestOptions,
-    metadata: {}
-  };
-  if (middlewares.length > 0) {
-    context = await applyMiddlewares(context, middlewares, "before");
-  }
-  const response = await executeCoreFetch({
-    baseUrl: context.baseUrl,
-    path: context.path,
-    method: context.method,
-    defaultOptions: context.defaultOptions,
-    requestOptions: context.requestOptions,
-    middlewareFetchInit: context.fetchInit,
+    middlewareFetchInit: void 0,
     nextTags
   });
-  context.response = response;
-  if (middlewares.length > 0) {
-    context = await applyMiddlewares(context, middlewares, "after");
-  }
-  return context.response;
 }
 function buildInputFields(requestOptions) {
   const fields = {};
@@ -452,12 +420,10 @@ async function executeCoreFetch(config) {
     nextTags
   } = config;
   const {
-    middlewares: _,
     headers: defaultHeaders,
     transport: defaultTransport,
     ...fetchDefaults
   } = defaultOptions;
-  void _;
   const inputFields = buildInputFields(requestOptions);
   const maxRetries = requestOptions?.retries ?? 3;
   const baseDelay = requestOptions?.retryDelay ?? 1e3;
@@ -648,7 +614,7 @@ function createInitialState() {
 function generateSelfTagFromKey(key) {
   try {
     const parsed = JSON.parse(key);
-    return parsed.path?.join("/");
+    return parsed.path;
   } catch {
     return void 0;
   }
@@ -790,6 +756,9 @@ function createStateManager() {
     getSize() {
       return cache.size;
     },
+    getSubscribersCount(key) {
+      return subscribers.get(key)?.size ?? 0;
+    },
     setPendingPromise(key, promise) {
       if (promise === void 0) {
         pendingPromises.delete(key);
@@ -903,10 +872,7 @@ function createPluginExecutor(initialPlugins = []) {
       if (!handler) {
         continue;
       }
-      await handler(
-        context,
-        previousContext
-      );
+      await handler(context, previousContext);
     }
   };
   return {
@@ -926,6 +892,7 @@ function createPluginExecutor(initialPlugins = []) {
             return () => middleware(
               context,
               next
+              // eslint-disable-next-line @typescript-eslint/no-explicit-any
             );
           },
           coreFetch
@@ -951,11 +918,6 @@ function createPluginExecutor(initialPlugins = []) {
     createContext(input) {
       const ctx = input;
       ctx.plugins = createPluginAccessor(ctx);
-      ctx.headers = {};
-      ctx.setHeaders = (newHeaders) => {
-        ctx.headers = { ...ctx.headers, ...newHeaders };
-        ctx.requestOptions.headers = ctx.headers;
-      };
       return ctx;
     }
   };
@@ -1083,7 +1045,7 @@ var Spoosh = class _Spoosh {
     return this._instance;
   }
   /**
-   * The type-safe API client for making requests.
+   * The type-safe API interface for making requests.
    *
    * Provides a proxy-based interface for accessing endpoints defined in your schema.
    *
@@ -1189,15 +1151,10 @@ var Spoosh = class _Spoosh {
 };
 
 // src/createClient.ts
-function createClient(config) {
-  const { baseUrl, defaultOptions = {}, middlewares = [] } = config;
-  const optionsWithMiddlewares = {
-    ...defaultOptions,
-    middlewares
-  };
+function createClient(baseUrl, defaultOptions) {
   return createProxyHandler({
     baseUrl,
-    defaultOptions: optionsWithMiddlewares,
+    defaultOptions: defaultOptions || {},
     nextTags: true
   });
 }
@@ -1228,9 +1185,7 @@ function createOperationController(options) {
   let cachedState = initialState;
   let currentRequestTimestamp = Date.now();
   let isFirstExecute = true;
-  const createContext = (requestOptions = {}, requestTimestamp = Date.now()) => {
-    const cached = stateManager.getCache(queryKey);
-    const state = cached?.state ?? createInitialState();
+  const createContext = (requestOptions = {}, requestTimestamp = Date.now(), resolvedHeaders) => {
     const resolvedTags = pluginOptions?.tags ?? tags;
     return pluginExecutor.createContext({
       operationType,
@@ -1240,11 +1195,13 @@ function createOperationController(options) {
       tags: resolvedTags,
       requestTimestamp,
       hookId,
-      requestOptions: { ...initialRequestOptions, ...requestOptions },
-      state,
+      request: {
+        ...initialRequestOptions,
+        ...requestOptions,
+        headers: resolvedHeaders ?? {}
+      },
       metadata,
       pluginOptions,
-      abort: () => abortController?.abort(),
       stateManager,
       eventEmitter
     });
@@ -1254,6 +1211,7 @@ function createOperationController(options) {
     if (cached) {
       stateManager.setCache(queryKey, {
         state: { ...cached.state, ...updater },
+        tags,
         stale: false
       });
     } else {
@@ -1271,21 +1229,24 @@ function createOperationController(options) {
         currentRequestTimestamp = Date.now();
       }
       isFirstExecute = false;
-      const context = createContext(opts, currentRequestTimestamp);
+      const mergedOptions = { ...initialRequestOptions, ...opts };
+      const resolvedHeaders = await resolveHeadersToRecord(
+        mergedOptions.headers
+      );
+      const context = createContext(
+        opts,
+        currentRequestTimestamp,
+        resolvedHeaders
+      );
       if (force) {
         context.forceRefetch = true;
       }
-      context.headers = await resolveHeadersToRecord(
-        context.requestOptions.headers
-      );
-      context.requestOptions.headers = context.headers;
       const coreFetch = async () => {
         abortController = new AbortController();
-        context.requestOptions.signal = abortController.signal;
+        context.request.signal = abortController.signal;
         const fetchPromise = (async () => {
           try {
-            const response = await fetchFn(context.requestOptions);
-            context.response = response;
+            const response = await fetchFn(context.request);
             return response;
           } catch (err) {
             const errorResponse = {
@@ -1293,7 +1254,6 @@ function createOperationController(options) {
               error: err,
               data: void 0
             };
-            context.response = errorResponse;
             return errorResponse;
           }
         })();
@@ -1522,11 +1482,6 @@ function createInfiniteReadController(options) {
     );
   };
   const createContext = (pageKey) => {
-    const initialState = {
-      data: void 0,
-      error: void 0,
-      timestamp: 0
-    };
     return pluginExecutor.createContext({
       operationType: "infiniteRead",
       path,
@@ -1535,11 +1490,9 @@ function createInfiniteReadController(options) {
       tags,
       requestTimestamp: Date.now(),
       hookId,
-      requestOptions: {},
-      state: initialState,
+      request: { headers: {} },
       metadata: /* @__PURE__ */ new Map(),
       pluginOptions,
-      abort: () => abortController?.abort(),
       stateManager,
       eventEmitter
     });
@@ -1566,7 +1519,6 @@ function createInfiniteReadController(options) {
       const fetchPromise = (async () => {
         try {
           const response = await fetchFn(mergedRequest, signal);
-          context.response = response;
           if (signal.aborted) {
             return {
               status: 0,
@@ -1588,7 +1540,6 @@ function createInfiniteReadController(options) {
             error: err,
             data: void 0
           };
-          context.response = errorResponse;
           latestError = err;
           return errorResponse;
         } finally {
@@ -1763,15 +1714,12 @@ export {
   HTTP_METHODS,
   Spoosh,
   __DEV__,
-  applyMiddlewares,
   buildUrl,
-  composeMiddlewares,
   containsFile,
   createClient,
   createEventEmitter,
   createInfiniteReadController,
   createInitialState,
-  createMiddleware,
   createOperationController,
   createPluginExecutor,
   createPluginRegistry,

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@spoosh/core",
-  "version": "0.10.0",
+  "version": "0.11.0",
   "license": "MIT",
-  "description": "Type-safe API client with plugin middleware system",
+  "description": "Type-safe API toolkit with plugin middleware system",
   "keywords": [
     "spoosh",
-    "api-client",
+    "api-toolkit",
     "fetch",
     "typescript",
     "middleware",