@qlover/fe-corekit 3.1.1 → 3.2.1

package/dist/index.js

@@ -2809,6 +2809,9 @@ var RequestAdapterFetch = class {
     if (!baseURL) {
       return url;
     }
+    if (url.startsWith(baseURL)) {
+      return url;
+    }
     if (baseURL.endsWith("/") && url.startsWith("/")) {
       return baseURL.slice(0, -1) + url;
     }
@@ -3755,12 +3758,18 @@ var SimpleUrlBuilder = class {
             basePath = "/" + basePath;
           }
           let combinedPath = basePath;
-          if (!combinedPath.endsWith("/") && !url.startsWith("/")) {
-            combinedPath += "/";
+          if (!combinedPath.endsWith("/") || !url.startsWith("/")) {
+            if (!combinedPath.endsWith("/")) {
+              combinedPath += "/";
+            }
           }
           combinedPath += url.replace(/^\//, "");
           urlObject = new URL(combinedPath, "http://temp");
           shouldReturnPathOnly = true;
+        } else if (base && base === "api") {
+          const combinedPath = "/api/" + url.replace(/^\//, "");
+          urlObject = new URL(combinedPath, "http://temp");
+          shouldReturnPathOnly = true;
         } else if (base) {
           urlObject = new URL(url, "http://temp");
           shouldReturnPathOnly = true;
@@ -3966,6 +3975,9 @@ var RequestPlugin = class {
   onBefore(ctx) {
     ctx.setParameters(this.mergeConfig(ctx.parameters));
   }
+  startsWith(url, baseUrl) {
+    return url.startsWith(baseUrl);
+  }
   /**
    * Main request handler
    *
@@ -3979,6 +3991,9 @@ var RequestPlugin = class {
     const mergedConfig = this.createConfig(config);
     const processedData = this.processRequestData(mergedConfig);
     const builtUrl = this.buildUrl(mergedConfig);
+    if (builtUrl && mergedConfig.baseURL && this.startsWith(builtUrl, mergedConfig.baseURL)) {
+      delete mergedConfig.baseURL;
+    }
     const injectedHeaders = this.injectHeaders(mergedConfig);
     return Object.assign(mergedConfig, {
       data: processedData,
@@ -4839,71 +4854,45 @@ var Base64Serializer = class {
 
 // src/storage/impl/KeyStorage.ts
 var KeyStorage = class {
-  constructor(key, options = {}) {
+  constructor(key, storage) {
     this.key = key;
-    this.options = options;
-    try {
-      const localValue = options.storage?.getItem(key);
-      this.value = localValue ?? null;
-    } catch {
-      this.value = null;
-    }
+    this.storage = storage;
   }
   value;
-  mergeOptions(options) {
-    return {
-      ...this.options,
-      ...options
-    };
-  }
-  /**
-   * @override
-   */
-  getKey() {
-    return this.key;
-  }
-  /**
-   * @override
-   */
-  getValue() {
-    return this.value;
-  }
   /**
    * @override
    */
   get(options) {
-    const { storage, ...reset } = this.mergeOptions(options);
-    if (this.value != null) {
-      return this.value;
+    if (!this.storage) {
+      return this.value ?? null;
     }
-    if (storage) {
-      const val = storage.getItem(this.key, void 0, reset);
-      if (val == null) {
-        this.remove();
-        return null;
-      }
-      this.value = val;
-      return val;
+    const val = this.storage.getItem(this.key, options);
+    if (val == null) {
+      this.remove();
+      return null;
     }
-    return this.value;
+    this.value = val;
+    return val;
   }
   /**
    * @override
    */
-  set(token, options) {
-    const { storage, ...reset } = this.mergeOptions(options);
-    this.value = token;
-    if (storage) {
-      storage.setItem(this.key, token, reset);
+  set(value, options) {
+    if (!this.storage) {
+      this.value = value;
+      return;
     }
+    this.storage.setItem(this.key, value, options);
   }
   /**
    * @override
    */
   remove(options) {
-    const { storage, ...reset } = this.mergeOptions(options);
-    this.value = null;
-    storage?.removeItem(this.key, reset);
+    if (!this.storage) {
+      this.value = null;
+      return;
+    }
+    this.storage.removeItem(this.key, options);
   }
 };
 
@@ -4938,7 +4927,6 @@ var ObjectStorage = class {
   /**
    * Gets the number of items stored in the memory cache
    *
-   * @override
    * @returns The number of stored items in memory
    *
    * @example
@@ -5016,12 +5004,9 @@ var ObjectStorage = class {
     if (!storeValue) {
       return _dv;
     }
-    const value = this.serializer ? this.serializer.deserialize(storeValue, _dv) : storeValue;
+    const value = typeof storeValue === "string" && this.serializer ? this.serializer.deserialize(storeValue, _dv) : storeValue;
     return this.getRawValue(value, _dv);
   }
-  /**
-   * @override
-   */
   getRawValue(value, defaultValue) {
     if (this.isStorageValue(value)) {
       if (this.isExpired(value)) {
@@ -5115,268 +5100,146 @@ var ObjectStorage = class {
   isStorageValue(value) {
     return typeof value === "object" && value !== null && "key" in value && "value" in value;
   }
-  /**
-   * Gets the serializer instance
-   *
-   * Significance: Provides access to the serialization logic
-   * Core idea: Expose serializer for advanced use cases
-   * Main function: Return the serializer instance
-   * Main purpose: Enable direct access to serialization when needed
-   *
-   * @returns The serializer instance
-   *
-   * @example
-   * ```typescript
-   * const serializer = storage.getSerializer();
-   * if (serializer) {
-   *   // Direct access to serializer
-   * }
-   * ```
-   */
-  getSerializer() {
-    return this.serializer;
-  }
 };
 
-// src/storage/impl/SyncStorage.ts
-function toPipeValue(pipe) {
-  if ("type" in pipe && "pipe" in pipe) {
-    return pipe;
-  }
-  if ("serialize" in pipe && "deserialize" in pipe) {
-    return { pipe, type: "serialize" };
-  }
-  if ("encrypt" in pipe && "decrypt" in pipe) {
-    return { pipe, type: "encrypt" };
+// src/storage/utils/isStorage.ts
+var storageMethods = ["setItem", "getItem", "removeItem", "clear"];
+function isStorage(storage) {
+  if (storage == null || typeof storage !== "object") {
+    return false;
   }
-  if ("setItem" in pipe && "getItem" in pipe && "removeItem" in pipe && "clear" in pipe) {
-    return { pipe, type: "storage" };
+  for (const method of storageMethods) {
+    if (storage[method] == null || typeof storage[method] !== "function") {
+      return false;
+    }
   }
-  return null;
+  return true;
 }
-var operationMaps = {
-  setItem: {
-    serialize: (pipe, args) => pipe.serialize(...args),
-    encrypt: (pipe, args) => pipe.encrypt(...args),
-    storage: (pipe, args) => pipe.setItem(...args)
-  },
-  getItem: {
-    serialize: (pipe, args) => pipe.deserialize(...args),
-    encrypt: (pipe, args) => pipe.decrypt(...args),
-    storage: (pipe, args) => pipe.getItem(...args)
-  }
-};
-var SyncStorage = class {
-  /**
-   * Creates a new SyncStorage instance with pipeline support
-   *
-   * @param storage - Primary storage backend (e.g., localStorage, sessionStorage)
-   * @param pipes - Optional pipe or array of pipes for data transformation
-   *
-   * @example Single pipe
-   * ```typescript
-   * const storage = new SyncStorage(
-   *   localStorage,
-   *   new JSONSerializer()
-   * );
-   * ```
-   *
-   * @example Multiple pipes
-   * ```typescript
-   * const storage = new SyncStorage(
-   *   localStorage,
-   *   [
-   *     new JSONSerializer(),
-   *     new AESEncryptor('secret-key')
-   *   ]
-   * );
-   * ```
-   *
-   * @example No pipes (direct storage)
-   * ```typescript
-   * const storage = new SyncStorage(localStorage);
-   * // Data stored as-is without transformation
-   * ```
-   */
-  constructor(storage, pipes = []) {
-    this.storage = storage;
-    this.pipes = (Array.isArray(pipes) ? pipes : [pipes]).map((p) => toPipeValue(p)).filter((p) => p != null);
+
+// src/storage/utils/createStoragePlugin.ts
+function createStoragePluginWithStorage(storage) {
+  return {
+    get: storage.getItem.bind(storage),
+    set: storage.setItem.bind(storage),
+    remove: storage.removeItem.bind(storage),
+    clear: storage.clear.bind(storage),
+    type: "storage"
+  };
+}
+function isSerializer(plugin) {
+  return typeof plugin === "object" && plugin !== null && "serialize" in plugin && "deserialize" in plugin;
+}
+function isEncryptor(plugin) {
+  return typeof plugin === "object" && plugin !== null && "encrypt" in plugin && "decrypt" in plugin;
+}
+function createStoragePlugin(plugins) {
+  if (Array.isArray(plugins)) {
+    return plugins.map((plugin) => {
+      if (isSerializer(plugin)) {
+        return {
+          get: (_key, value) => plugin.deserialize(
+            value
+          ),
+          set: (_key, value) => plugin.serialize(value),
+          type: "serializer"
+        };
+      } else if (isEncryptor(plugin)) {
+        return {
+          get: (_key, value) => plugin.decrypt(
+            value
+          ),
+          set: (_key, value) => plugin.encrypt(value),
+          type: "encryptor"
+        };
+      } else if (isStorage(plugin)) {
+        return createStoragePluginWithStorage(plugin);
+      }
+      return plugin;
+    });
   }
+  return [createStoragePluginWithStorage(plugins)];
+}
+
+// src/storage/impl/StorageExecutor.ts
+var StorageExecutor = class {
+  plugins = [];
   /**
-   * Internal pipe value list with pre-determined types
-   *
-   * Stores the processed pipeline of transformations that will be
-   * applied to data during storage and retrieval operations.
-   *
-   * @protected
-   */
-  pipes;
-  /**
-   * Get the number of items in the primary storage
-   *
-   * Returns the count of items in the primary storage backend only.
-   * Does not include items in intermediate storage layers.
-   *
-   * @override
-   * @returns Number of items in primary storage
+   * Builds the plugin list from either a single `StorageInterface` or an array whose last element
+   * is the backing storage and preceding elements are transformers (e.g. serializer, encryptor).
    *
-   * @example
-   * ```typescript
-   * console.log(storage.length); // 5
-   * storage.setItem('newKey', 'value');
-   * console.log(storage.length); // 6
-   * ```
+   * @param plugins - Single storage instance or tuple of `[ ...transformers, storage ]`
    */
-  get length() {
-    return this.storage.length;
+  constructor(plugins) {
+    this.plugins = createStoragePlugin(plugins);
   }
   /**
-   * Store a value with pipeline processing
-   *
-   * Processes the value through the configured pipeline (serialization,
-   * encryption, intermediate storage) before storing in the primary storage.
-   *
-   * Pipeline execution:
-   * 1. Apply serialization (if configured)
-   * 2. Apply encryption (if configured)
-   * 3. Store in intermediate storage layers (if configured)
-   * 4. Store in primary storage
+   * Writes value through the plugin chain (forward). Each plugin may return a transformed value for the next.
    *
    * @override
-   * @template T - Type of value to store
-   * @param key - Storage key
-   * @param value - Value to store
-   * @param options - Optional storage options (e.g., expiration)
-   *
-   * @example Basic storage
-   * ```typescript
-   * storage.setItem('user', { id: 1, name: 'John' });
-   * ```
-   *
-   * @example With options
-   * ```typescript
-   * storage.setItem('session', { token: 'abc' }, { expire: 3600 });
-   * ```
    */
   setItem(key, value, options) {
-    let processedValue = value;
-    for (const currentPipe of this.pipes) {
-      const { type, pipe } = currentPipe;
-      if (type === "storage") {
-        pipe.setItem(
-          key,
-          processedValue,
-          options
-        );
-      } else {
-        const result = operationMaps.setItem[type](
-          // @ts-expect-error
-          pipe,
-          [processedValue]
-        );
-        if (result != null) {
-          processedValue = result;
-        }
+    let finalValue = value;
+    for (const plugin of this.plugins) {
+      const result = plugin.set(key, finalValue, options);
+      if (result !== void 0) {
+        finalValue = result;
       }
     }
-    this.storage.setItem(key, processedValue, options);
   }
   /**
-   * Retrieve a value with pipeline processing
+   * Reads value through the plugin chain in reverse order.
    *
-   * Retrieves the value from storage and processes it through the pipeline
-   * in reverse order (decryption, deserialization) to restore the original value.
+   * **Multiple storage plugins:** When the pipeline contains more than one storage plugin (e.g.
+   * `[sessionStorage, localStorage]`), getItem **only uses the value from the last storage** (the
+   * plugin at the end of the array). The iteration runs from tail to head; the first storage plugin
+   * encountered (which is the last in the array) is the only one whose `get` result is used. All
+   * other storage plugins are skipped and their values are ignored. This ensures a single, well-defined
+   * read source (e.g. prefer localStorage over sessionStorage when both are in the chain).
    *
-   * Retrieval strategy:
-   * 1. Try to retrieve from primary storage
-   * 2. If not found, try intermediate storage layers (in reverse order)
-   * 3. Apply decryption (if configured)
-   * 4. Apply deserialization (if configured)
-   * 5. Return processed value or default
+   * Pipe plugins (serializer, encryptor, etc.) are always applied to transform the value read from
+   * that single storage. If no value is found, returns `defaultValue` when provided, otherwise `null`.
    *
    * @override
-   * @template T - Type of value to retrieve
-   * @param key - Storage key
-   * @param defaultValue - Default value if key not found
-   * @param options - Optional retrieval options
-   * @returns Retrieved value or default, `null` if not found and no default
-   *
-   * @example Basic retrieval
-   * ```typescript
-   * const user = storage.getItem('user');
-   * if (user) {
-   *   console.log(user.name);
-   * }
-   * ```
-   *
-   * @example With default value
-   * ```typescript
-   * const config = storage.getItem('config', { theme: 'light' });
-   * console.log(config.theme); // 'light' if not found
-   * ```
    */
   getItem(key, defaultValue, options) {
-    let processedValue = this.storage.getItem(key, defaultValue, options);
-    if (processedValue == null) {
-      const reversedPipes2 = [...this.pipes].reverse();
-      for (const currentPipe of reversedPipes2) {
-        const { type, pipe } = currentPipe;
-        if (type !== "storage") {
-          continue;
-        }
-        const res = operationMaps.getItem[type](pipe, [
-          key,
-          processedValue,
-          options
-        ]);
-        if (res != null) {
-          processedValue = res;
-          break;
-        }
-      }
-    }
-    if (processedValue == null) {
-      return defaultValue ?? null;
-    }
-    const reversedPipes = [...this.pipes].reverse();
-    for (const currentPipe of reversedPipes) {
-      const { type, pipe } = currentPipe;
-      if (type === "storage") {
+    const lastIndex = this.plugins.length - 1;
+    let finalValue;
+    let storageHasValue = false;
+    for (let i = lastIndex; i >= 0; i--) {
+      const plugin = this.plugins[i];
+      const isStoragePlugin = plugin.type === "storage";
+      if (isStoragePlugin && storageHasValue) {
         continue;
       }
-      processedValue = operationMaps.getItem[type](
-        pipe,
-        [processedValue]
-      );
-    }
-    if (processedValue !== null && this.storage.getRawValue) {
-      processedValue = this.storage.getRawValue(processedValue, options);
+      const result = plugin.get(key, finalValue, options);
+      if (result !== void 0) {
+        finalValue = result;
+        if (isStoragePlugin) {
+          storageHasValue = true;
+        }
+      }
     }
-    return processedValue ?? null;
+    return finalValue ?? defaultValue ?? null;
   }
   /**
-   * Delete data items, delete from all storage layers
+   * Removes item for the given key from all plugins that implement `remove`.
    *
    * @override
-   * @param key - Storage key
-   * @param options - Delete options
    */
   removeItem(key, options) {
-    this.storage.removeItem(key, options);
-    this.pipes.filter((p) => p.type === "storage").forEach((p) => {
-      p.pipe.removeItem(key, options);
-    });
+    for (const plugin of this.plugins) {
+      plugin.remove?.(key, options);
+    }
   }
   /**
-     * Clear all data, including storage in the pipeline
-  
-     * @override
-        */
+   * Clears data in all plugins that implement `clear`.
+   *
+   * @override
+   */
   clear() {
-    this.storage.clear();
-    this.pipes.filter((p) => p.type === "storage").forEach((p) => {
-      p.pipe.clear();
-    });
+    for (const plugin of this.plugins) {
+      plugin.clear?.();
+    }
   }
 };
 export {
@@ -5411,15 +5274,20 @@ export {
   ResponsePlugin,
   RetryPlugin,
   SimpleUrlBuilder,
-  SyncStorage,
+  StorageExecutor,
   appendHeaders,
   createAbortPromise,
+  createStoragePlugin,
+  createStoragePluginWithStorage,
   hasObjectKey,
   hasObjectKeyWithValue,
   isAbortError,
   isAbsoluteUrl,
   isAsString,
+  isEncryptor,
   isRequestAdapterResponse,
+  isSerializer,
+  isStorage,
   normalizeHookNames,
   raceWithAbort,
   runPluginHook,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@qlover/fe-corekit",
   "description": "A corekit for frontwork",
-  "version": "3.1.1",
+  "version": "3.2.1",
   "private": false,
   "type": "module",
   "files": [
@@ -11,15 +11,43 @@
   ],
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
-  "browser": "./dist/index.iife.js",
   "types": "./dist/index.d.ts",
   "exports": {
     "./package.json": "./package.json",
     ".": {
       "types": "./dist/index.d.ts",
       "import": "./dist/index.js",
-      "browser": "./dist/index.iife.js",
       "require": "./dist/index.cjs"
+    },
+    "./aborter": {
+      "types": "./dist/aborter/index.d.ts",
+      "import": "./dist/aborter/index.js",
+      "require": "./dist/aborter/index.cjs"
+    },
+    "./encrypt": {
+      "types": "./dist/encrypt/index.d.ts",
+      "import": "./dist/encrypt/index.js",
+      "require": "./dist/encrypt/index.cjs"
+    },
+    "./executor": {
+      "types": "./dist/executor/index.d.ts",
+      "import": "./dist/executor/index.js",
+      "require": "./dist/executor/index.cjs"
+    },
+    "./request": {
+      "types": "./dist/request/index.d.ts",
+      "import": "./dist/request/index.js",
+      "require": "./dist/request/index.cjs"
+    },
+    "./serializer": {
+      "types": "./dist/serializer/index.d.ts",
+      "import": "./dist/serializer/index.js",
+      "require": "./dist/serializer/index.cjs"
+    },
+    "./storage": {
+      "types": "./dist/storage/index.d.ts",
+      "import": "./dist/storage/index.js",
+      "require": "./dist/storage/index.cjs"
     }
   },
   "repository": {