@anweb/nuxt-ancore 1.7.0 → 1.7.2

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "AnCore",
   "configKey": "ancore",
-  "version": "1.7.0",
+  "version": "1.7.2",
   "builder": {
     "@nuxt/module-builder": "1.0.1",
     "unbuild": "3.5.0"

package/dist/runtime/composables/useAnData.d.ts

@@ -1,9 +1,15 @@
 import type { NitroFetchOptions, NitroFetchRequest } from 'nitropack';
 import { type Ref, type ComputedRef } from 'vue';
 import { useAsyncData } from '#app';
-interface TConfig {
+import type { UseEventBusReturn } from '@vueuse/core';
+import type { KeysOf, PickFrom } from '#app/composables/asyncData';
+interface TConfig<TData> {
     request: NitroFetchRequest;
     apiConfig?: NitroFetchOptions<string>;
+    events?: {
+        bus: UseEventBusReturn<any, any>;
+        callback: (target: PickFrom<TData, KeysOf<TData>> | undefined, updated: TData) => PickFrom<TData, KeysOf<TData>> | undefined;
+    }[];
 }
 interface TUseAnData<TData, TError> {
     init: () => Promise<void>;
@@ -13,5 +19,5 @@ interface TUseAnData<TData, TError> {
     error: ComputedRef<TError>;
     status: ReturnType<typeof useAsyncData>['status'];
 }
-export declare const useAnData: <TData = unknown, TError = unknown>(config: TConfig) => TUseAnData<TData, TError>;
+export declare const useAnData: <TData = unknown, TError = unknown>(config: TConfig<TData>) => TUseAnData<TData, TError>;
 export {};

package/dist/runtime/composables/useAnData.js

@@ -19,6 +19,14 @@ export const useAnData = (config) => {
     () => userApi(request.value, { method: "GET", ...config.apiConfig || {} }),
     { immediate: false }
   );
+  if (config.events) {
+    for (const event of config.events) {
+      event.bus.on((updated) => {
+        const result = event.callback(data.value, updated);
+        if (result !== void 0) data.value = result;
+      });
+    }
+  }
   return {
     init: execute,
     loading,

package/dist/runtime/composables/useAnList.d.ts

@@ -1,21 +1,16 @@
 import type { NitroFetchOptions, NitroFetchRequest } from 'nitropack';
 import { type UseEventBusReturn } from '@vueuse/core';
-import type { TWS as TWSDefault } from '#ancore/types';
-interface TConfig<TData, TFilter, TWS extends TWSDefault> {
+interface TConfig<TData, TFilter> {
     request: NitroFetchRequest;
     filter?: TFilter;
     reverse?: boolean;
     events?: {
         bus: UseEventBusReturn<any, any>;
-        callback: (list: TData[], count: number, data: any) => number | void;
-    }[];
-    ws?: {
-        type: TWS['type'];
-        callback: (list: TData[], count: number, data: any) => number | void;
+        callback: (list: TData[], count: number, data: any) => number | undefined;
     }[];
     apiConfig?: NitroFetchOptions<string>;
 }
-declare const _default: <TData, TFilter = unknown, TWS extends TWSDefault = TWSDefault>(config: TConfig<TData, TFilter, TWS>) => {
+declare const _default: <TData, TFilter = unknown>(config: TConfig<TData, TFilter>) => {
     init: (newFilter?: TFilter) => Promise<void>;
     inited: import("vue").Ref<boolean, boolean>;
     filter: [Partial<TFilter>] extends [import("vue").Ref<any, any>] ? import("@vue/shared").IfAny<import("vue").Ref<any, any> & Partial<TFilter>, import("vue").Ref<import("vue").Ref<any, any> & Partial<TFilter>, import("vue").Ref<any, any> & Partial<TFilter>>, import("vue").Ref<any, any> & Partial<TFilter>> : import("vue").Ref<import("vue").UnwrapRef<Partial<TFilter>>, Partial<TFilter> | import("vue").UnwrapRef<Partial<TFilter>>>;

package/dist/runtime/composables/useAnList.js

@@ -1,9 +1,7 @@
-import { useEventBus } from "@vueuse/core";
 import { computed, ref, reactive, watch } from "vue";
 import { useAsyncData } from "#app";
 import { userApi, toQuery } from "../utils/index.js";
 export default (config) => {
-  const busWS = useEventBus("ws");
   const inited = ref(false);
   const filter = ref(config.filter || {});
   const items = reactive([]);
@@ -20,23 +18,12 @@ export default (config) => {
       for (const event of config.events) {
         event.bus.on((data2) => {
           const newCount = event.callback(items, count.value || 0, data2);
-          if (newCount || newCount === 0) {
+          if (newCount !== void 0) {
             count.value = newCount;
           }
         });
       }
     }
-    if (config.ws) {
-      busWS.on((data2) => {
-        const event = config.ws?.find((item) => item.type === data2.type);
-        if (event) {
-          const newCount = event.callback(items, count.value || 0, data2.data);
-          if (newCount || newCount === 0) {
-            count.value = newCount;
-          }
-        }
-      });
-    }
     inited.value = true;
   };
   const refresh = () => {

package/dist/runtime/types/index.d.ts

@@ -1,4 +1,3 @@
 export * from './api.js';
 export * from './global.js';
-export * from './ws.js';
 export * from './responseList.js';

package/dist/runtime/types/index.js

@@ -1,4 +1,3 @@
 export * from "./api";
 export * from "./global";
-export * from "./ws";
 export * from "./responseList";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@anweb/nuxt-ancore",
-	"version": "1.7.0",
+	"version": "1.7.2",
 	"description": "AnCore Nuxt module",
 	"repository": "https://github.com/ANLTD/ancore",
 	"license": "MIT",

package/dist/runtime/types/ws.d.ts

@@ -1,4 +0,0 @@
-export interface TWS {
-	type: string
-	data: unknown
-}