@spoosh/angular 0.10.2 → 0.11.0

package/dist/index.js

@@ -1,48 +1,33 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/index.ts
-var src_exports = {};
-__export(src_exports, {
-  create: () => create
-});
-module.exports = __toCommonJS(src_exports);
-
 // src/injectRead/index.ts
-var import_core = require("@angular/core");
-var import_core2 = require("@spoosh/core");
+import {
+  signal,
+  effect,
+  DestroyRef,
+  inject,
+  untracked
+} from "@angular/core";
+import {
+  createOperationController,
+  createSelectorProxy,
+  resolvePath,
+  resolveTags
+} from "@spoosh/core";
 function createInjectRead(options) {
   const { api, stateManager, eventEmitter, pluginExecutor } = options;
   return function injectRead(readFn, readOptions) {
-    const destroyRef = (0, import_core.inject)(import_core.DestroyRef);
+    const destroyRef = inject(DestroyRef);
     const {
       enabled: enabledOption = true,
       tags,
       ...pluginOpts
     } = readOptions ?? {};
     const getEnabled = () => typeof enabledOption === "function" ? enabledOption() : enabledOption;
-    const dataSignal = (0, import_core.signal)(void 0);
-    const errorSignal = (0, import_core.signal)(void 0);
-    const loadingSignal = (0, import_core.signal)(true);
-    const fetchingSignal = (0, import_core.signal)(false);
-    const inputSignal = (0, import_core.signal)({});
-    const metaSignal = (0, import_core.signal)({});
+    const dataSignal = signal(void 0);
+    const errorSignal = signal(void 0);
+    const loadingSignal = signal(true);
+    const fetchingSignal = signal(false);
+    const inputSignal = signal({});
+    const metaSignal = signal({});
     let currentController = null;
     let currentQueryKey = null;
     let baseQueryKey = null;
@@ -56,7 +41,7 @@ function createInjectRead(options) {
         call: null,
         selector: null
       };
-      const selectorProxy = (0, import_core2.createSelectorProxy)(
+      const selectorProxy = createSelectorProxy(
         (result2) => {
           selectorResult.call = result2.call;
           selectorResult.selector = result2.selector;
@@ -69,7 +54,7 @@ function createInjectRead(options) {
       if (currentSubscription) {
         currentSubscription();
       }
-      const controller = (0, import_core2.createOperationController)({
+      const controller = createOperationController({
         operationType: "read",
         path: capturedCall.path,
         method: capturedCall.method,
@@ -136,11 +121,11 @@ function createInjectRead(options) {
     }
     const initialRequestOptions = initialCapturedCall.options;
     const initialPathSegments = initialCapturedCall.path.split("/").filter(Boolean);
-    const initialResolvedPath = (0, import_core2.resolvePath)(
+    const initialResolvedPath = resolvePath(
       initialPathSegments,
       initialRequestOptions?.params
     );
-    const initialResolvedTags = (0, import_core2.resolveTags)(
+    const initialResolvedTags = resolveTags(
       tags !== void 0 ? { tags } : void 0,
       initialResolvedPath
     );
@@ -153,7 +138,7 @@ function createInjectRead(options) {
     baseQueryKey = initialQueryKey;
     loadingSignal.set(false);
     let wasEnabled = false;
-    (0, import_core.effect)(
+    effect(
       () => {
         const isEnabled = getEnabled();
         const selectorResult = captureSelector();
@@ -165,8 +150,8 @@ function createInjectRead(options) {
         }
         const requestOptions = capturedCall.options;
         const pathSegments = capturedCall.path.split("/").filter(Boolean);
-        const resolvedPath = (0, import_core2.resolvePath)(pathSegments, requestOptions?.params);
-        const resolvedTags = (0, import_core2.resolveTags)(
+        const resolvedPath = resolvePath(pathSegments, requestOptions?.params);
+        const resolvedTags = resolveTags(
           tags !== void 0 ? { tags } : void 0,
           resolvedPath
         );
@@ -211,7 +196,7 @@ function createInjectRead(options) {
           if (isEnabled) {
             controller.mount();
             isMounted = true;
-            (0, import_core.untracked)(() => {
+            untracked(() => {
               executeWithTracking(controller, false);
             });
           } else {
@@ -221,7 +206,7 @@ function createInjectRead(options) {
           if (isEnabled && !isMounted) {
             currentController.mount();
             isMounted = true;
-            (0, import_core.untracked)(() => {
+            untracked(() => {
               executeWithTracking(currentController, false);
             });
           } else if (!isEnabled && isMounted) {
@@ -237,7 +222,7 @@ function createInjectRead(options) {
           "refetch",
           (event) => {
             if (event.queryKey === currentQueryKey && currentController) {
-              (0, import_core.untracked)(() => {
+              untracked(() => {
                 executeWithTracking(currentController, true);
               });
             }
@@ -250,7 +235,7 @@ function createInjectRead(options) {
               (tag) => currentResolvedTags.includes(tag)
             );
             if (hasMatch && currentController) {
-              (0, import_core.untracked)(() => {
+              untracked(() => {
                 executeWithTracking(currentController, true);
               });
             }
@@ -258,7 +243,7 @@ function createInjectRead(options) {
         );
         const unsubRefetchAll = eventEmitter.on("refetchAll", () => {
           if (currentController) {
-            (0, import_core.untracked)(() => {
+            untracked(() => {
               executeWithTracking(currentController, true);
             });
           }
@@ -310,8 +295,8 @@ function createInjectRead(options) {
         return executeWithTracking(currentController, force, overrideOptions);
       }
       const params = mergedOptions?.params;
-      const newResolvedPath = (0, import_core2.resolvePath)(pathSegments, params);
-      const newResolvedTags = (0, import_core2.resolveTags)(
+      const newResolvedPath = resolvePath(pathSegments, params);
+      const newResolvedTags = resolveTags(
         tags !== void 0 ? { tags } : void 0,
         newResolvedPath
       );
@@ -341,18 +326,23 @@ function createInjectRead(options) {
 }
 
 // src/injectWrite/index.ts
-var import_core3 = require("@angular/core");
-var import_core4 = require("@spoosh/core");
+import { signal as signal2, effect as effect2, DestroyRef as DestroyRef2, inject as inject2 } from "@angular/core";
+import {
+  createOperationController as createOperationController2,
+  createSelectorProxy as createSelectorProxy2,
+  resolvePath as resolvePath2,
+  resolveTags as resolveTags2
+} from "@spoosh/core";
 function createInjectWrite(options) {
   const { api, stateManager, pluginExecutor, eventEmitter } = options;
   function injectWrite(writeFn, writeOptions) {
-    const destroyRef = (0, import_core3.inject)(import_core3.DestroyRef);
+    const destroyRef = inject2(DestroyRef2);
     const captureSelector = () => {
       const selectorResult = {
         call: null,
         selector: null
       };
-      const selectorProxy = (0, import_core4.createSelectorProxy)(
+      const selectorProxy = createSelectorProxy2(
         (result2) => {
           selectorResult.call = result2.call;
           selectorResult.selector = result2.selector;
@@ -370,11 +360,11 @@ function createInjectWrite(options) {
     let currentQueryKey = null;
     let currentController = null;
     let currentSubscription = null;
-    const dataSignal = (0, import_core3.signal)(void 0);
-    const errorSignal = (0, import_core3.signal)(void 0);
-    const loadingSignal = (0, import_core3.signal)(false);
-    const lastTriggerOptionsSignal = (0, import_core3.signal)(void 0);
-    const metaSignal = (0, import_core3.signal)({});
+    const dataSignal = signal2(void 0);
+    const errorSignal = signal2(void 0);
+    const loadingSignal = signal2(false);
+    const lastTriggerOptionsSignal = signal2(void 0);
+    const metaSignal = signal2({});
     destroyRef.onDestroy(() => {
       if (currentSubscription) {
         currentSubscription();
@@ -387,8 +377,8 @@ function createInjectWrite(options) {
       const selectedEndpoint = captureSelector();
       const params = triggerOptions?.params;
       const pathSegments = selectedEndpoint.path.split("/").filter(Boolean);
-      const resolvedPath = (0, import_core4.resolvePath)(pathSegments, params);
-      const tags = (0, import_core4.resolveTags)(triggerOptions, resolvedPath);
+      const resolvedPath = resolvePath2(pathSegments, params);
+      const tags = resolveTags2(triggerOptions, resolvedPath);
       const queryKey = stateManager.createQueryKey({
         path: selectedEndpoint.path,
         method: selectedEndpoint.method,
@@ -399,7 +389,7 @@ function createInjectWrite(options) {
         if (currentSubscription) {
           currentSubscription();
         }
-        const controller = (0, import_core4.createOperationController)({
+        const controller = createOperationController2({
           operationType: "write",
           path: selectedEndpoint.path,
           method: selectedEndpoint.method,
@@ -447,8 +437,8 @@ function createInjectWrite(options) {
         loadingSignal.set(false);
       }
     };
-    const inputSignal = (0, import_core3.signal)({});
-    (0, import_core3.effect)(
+    const inputSignal = signal2({});
+    effect2(
       () => {
         const opts = lastTriggerOptionsSignal();
         const inputInner = {};
@@ -480,12 +470,24 @@ function createInjectWrite(options) {
 }
 
 // src/injectPages/index.ts
-var import_core5 = require("@angular/core");
-var import_core6 = require("@spoosh/core");
+import {
+  signal as signal3,
+  computed,
+  effect as effect3,
+  DestroyRef as DestroyRef3,
+  inject as inject3,
+  untracked as untracked2
+} from "@angular/core";
+import {
+  createInfiniteReadController,
+  createSelectorProxy as createSelectorProxy3,
+  resolvePath as resolvePath3,
+  resolveTags as resolveTags3
+} from "@spoosh/core";
 function createInjectPages(options) {
   const { api, stateManager, eventEmitter, pluginExecutor } = options;
   return function injectPages(readFn, readOptions) {
-    const destroyRef = (0, import_core5.inject)(import_core5.DestroyRef);
+    const destroyRef = inject3(DestroyRef3);
     const {
       enabled: enabledOption = true,
       tags,
@@ -509,7 +511,7 @@ function createInjectPages(options) {
         call: null,
         selector: null
       };
-      const selectorProxy = (0, import_core6.createSelectorProxy)(
+      const selectorProxy = createSelectorProxy3(
         (result2) => {
           selectorResult.call = result2.call;
           selectorResult.selector = result2.selector;
@@ -524,14 +526,14 @@ function createInjectPages(options) {
       return selectorResult.call;
     };
     const instanceId = `angular-${Math.random().toString(36).slice(2)}`;
-    const dataSignal = (0, import_core5.signal)(void 0);
-    const pagesSignal = (0, import_core5.signal)([]);
-    const errorSignal = (0, import_core5.signal)(void 0);
-    const loadingSignal = (0, import_core5.signal)(false);
-    const canFetchNextSignal = (0, import_core5.signal)(false);
-    const canFetchPrevSignal = (0, import_core5.signal)(false);
-    const fetchingNextSignal = (0, import_core5.signal)(false);
-    const fetchingPrevSignal = (0, import_core5.signal)(false);
+    const dataSignal = signal3(void 0);
+    const pagesSignal = signal3([]);
+    const errorSignal = signal3(void 0);
+    const loadingSignal = signal3(false);
+    const canFetchNextSignal = signal3(false);
+    const canFetchPrevSignal = signal3(false);
+    const fetchingNextSignal = signal3(false);
+    const fetchingPrevSignal = signal3(false);
     let currentController = null;
     let currentQueryKey = null;
     let currentSubscription = null;
@@ -554,7 +556,7 @@ function createInjectPages(options) {
     const triggerFetch = () => {
       if (!currentController) return;
       const currentState = currentController.getState();
-      const isFetching = (0, import_core5.untracked)(
+      const isFetching = untracked2(
         () => fetchingNextSignal() || fetchingPrevSignal()
       );
       if (currentState.data === void 0 && !isFetching) {
@@ -586,7 +588,7 @@ function createInjectPages(options) {
         params: requestOptions?.params,
         body: requestOptions?.body
       };
-      const controller = (0, import_core6.createInfiniteReadController)({
+      const controller = createInfiniteReadController({
         path: capturedCall.path,
         method: capturedCall.method,
         tags: resolvedTags,
@@ -654,11 +656,11 @@ function createInjectPages(options) {
     const initialCapturedCall = captureSelector();
     const initialRequestOptions = initialCapturedCall.options;
     const initialPathSegments = initialCapturedCall.path.split("/").filter(Boolean);
-    const initialResolvedPath = (0, import_core6.resolvePath)(
+    const initialResolvedPath = resolvePath3(
       initialPathSegments,
       initialRequestOptions?.params
     );
-    const initialResolvedTags = (0, import_core6.resolveTags)(
+    const initialResolvedTags = resolveTags3(
       tags !== void 0 ? { tags } : void 0,
       initialResolvedPath
     );
@@ -668,14 +670,14 @@ function createInjectPages(options) {
       options: initialCapturedCall.options
     });
     createController(initialCapturedCall, initialResolvedTags, initialQueryKey);
-    (0, import_core5.effect)(
+    effect3(
       () => {
         const isEnabled = getEnabled();
         const capturedCall = captureSelector();
         const requestOptions = capturedCall.options;
         const pathSegments = capturedCall.path.split("/").filter(Boolean);
-        const resolvedPath = (0, import_core6.resolvePath)(pathSegments, requestOptions?.params);
-        const resolvedTags = (0, import_core6.resolveTags)(
+        const resolvedPath = resolvePath3(pathSegments, requestOptions?.params);
+        const resolvedTags = resolveTags3(
           tags !== void 0 ? { tags } : void 0,
           resolvedPath
         );
@@ -710,7 +712,7 @@ function createInjectPages(options) {
           }
           controller.mount();
           isMounted = true;
-          (0, import_core5.untracked)(() => {
+          untracked2(() => {
             loadingSignal.set(true);
             fetchingNextSignal.set(true);
             errorSignal.set(void 0);
@@ -723,7 +725,7 @@ function createInjectPages(options) {
         } else if (!isMounted && currentController) {
           currentController.mount();
           isMounted = true;
-          (0, import_core5.untracked)(() => {
+          untracked2(() => {
             triggerFetch();
           });
         }
@@ -789,7 +791,7 @@ function createInjectPages(options) {
     const abort = () => {
       currentController?.abort();
     };
-    const fetchingSignal = (0, import_core5.computed)(
+    const fetchingSignal = computed(
       () => fetchingNextSignal() || fetchingPrevSignal()
     );
     const result = {
@@ -812,18 +814,21 @@ function createInjectPages(options) {
 }
 
 // src/injectQueue/index.ts
-var import_core7 = require("@angular/core");
-var import_core8 = require("@spoosh/core");
+import { signal as signal4, DestroyRef as DestroyRef4, inject as inject4 } from "@angular/core";
+import {
+  createSelectorProxy as createSelectorProxy4,
+  createQueueController
+} from "@spoosh/core";
 function createInjectQueue(options) {
   const { api, stateManager, pluginExecutor, eventEmitter } = options;
   function injectQueue(queueFn, queueOptions) {
-    const destroyRef = (0, import_core7.inject)(import_core7.DestroyRef);
+    const destroyRef = inject4(DestroyRef4);
     const captureSelector = () => {
       const selectorResult = {
         call: null,
         selector: null
       };
-      const selectorProxy = (0, import_core8.createSelectorProxy)(
+      const selectorProxy = createSelectorProxy4(
         (result) => {
           selectorResult.call = result.call;
           selectorResult.selector = result.selector;
@@ -847,14 +852,14 @@ function createInjectQueue(options) {
       operationType: "queue",
       hookOptions
     };
-    const controller = (0, import_core8.createQueueController)(config, {
+    const controller = createQueueController(config, {
       api,
       stateManager,
       eventEmitter,
       pluginExecutor
     });
-    const tasksSignal = (0, import_core7.signal)(controller.getQueue());
-    const statsSignal = (0, import_core7.signal)(controller.getStats());
+    const tasksSignal = signal4(controller.getQueue());
+    const statsSignal = signal4(controller.getStats());
     const unsubscribe = controller.subscribe(() => {
       tasksSignal.set(controller.getQueue());
       statsSignal.set(controller.getStats());
@@ -917,16 +922,16 @@ function create(instance) {
   for (const plugin of plugins) {
     plugin.setup?.(setupContext);
   }
-  const instanceApiContext = {
-    api,
+  const apiContext = {
+    spoosh: api,
     stateManager,
     eventEmitter,
     pluginExecutor
   };
-  const instanceApis = plugins.reduce(
+  const pluginApis = plugins.reduce(
     (acc, plugin) => {
-      if (plugin.instanceApi) {
-        return { ...acc, ...plugin.instanceApi(instanceApiContext) };
+      if (plugin.api) {
+        return { ...acc, ...plugin.api(apiContext) };
       }
       return acc;
     },
@@ -937,6 +942,9 @@ function create(instance) {
     injectWrite,
     injectPages,
     injectQueue,
-    ...instanceApis
+    ...pluginApis
   };
 }
+export {
+  create
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spoosh/angular",
-  "version": "0.10.2",
+  "version": "0.11.0",
   "license": "MIT",
   "description": "Angular signals integration for Spoosh API toolkit",
   "keywords": [
@@ -23,24 +23,24 @@
   "publishConfig": {
     "access": "public"
   },
+  "type": "module",
   "files": [
     "dist"
   ],
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "import": "./dist/index.mjs",
-      "require": "./dist/index.js"
+      "import": "./dist/index.js"
     }
   },
   "peerDependencies": {
-    "@spoosh/core": ">=0.15.0",
+    "@spoosh/core": ">=0.17.0",
     "@angular/core": ">=16.0.0"
   },
   "devDependencies": {
     "@angular/core": "^21.1.0",
-    "@spoosh/core": "0.16.0",
-    "@spoosh/test-utils": "0.3.0"
+    "@spoosh/test-utils": "0.3.0",
+    "@spoosh/core": "0.17.0"
   },
   "scripts": {
     "dev": "tsup --watch",