@anweb/nuxt-ancore 1.11.1 → 1.12.1

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "AnCore",
   "configKey": "ancore",
-  "version": "1.11.1",
+  "version": "1.12.1",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

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

@@ -4,9 +4,10 @@ interface TStructureItem<TData> {
     default: TData;
     rules?: RuleItem[];
 }
-export declare const useAnForm: <TForm extends object>(params: Record<keyof TForm, TStructureItem<TForm[keyof TForm]>>, data?: Partial<TForm> | null) => {
+export declare const useAnForm: <TForm extends object, TData extends Partial<TForm> | null | (Record<string, any> & Partial<TForm>) = Partial<TForm> | null>(params: Record<keyof TForm, TStructureItem<TForm[keyof TForm]>>, data?: TData) => {
     state: [TForm] extends [import("vue").Ref<any, any>] ? import("@vue/shared").IfAny<TForm, import("vue").Ref<TForm, TForm>, TForm> : import("vue").Ref<import("vue").UnwrapRef<TForm>, TForm | import("vue").UnwrapRef<TForm>>;
-    merge: (data: TForm) => void;
+    diff: import("vue").ComputedRef<Partial<TForm>>;
+    merge: (data: Partial<TForm>, commit?: true) => void;
     validator: {
         check: () => Promise<UseAsyncValidatorExecuteReturn>;
         errors: [Partial<Record<keyof TForm, string>>] extends [import("vue").Ref<any, any>] ? import("@vue/shared").IfAny<import("vue").Ref<any, any> & Partial<Record<keyof TForm, string>>, import("vue").Ref<import("vue").Ref<any, any> & Partial<Record<keyof TForm, string>>, import("vue").Ref<any, any> & Partial<Record<keyof TForm, string>>>, import("vue").Ref<any, any> & Partial<Record<keyof TForm, string>>> : import("vue").Ref<import("vue").UnwrapRef<Partial<Record<keyof TForm, string>>>, Partial<Record<keyof TForm, string>> | import("vue").UnwrapRef<Partial<Record<keyof TForm, string>>>>;

package/dist/runtime/composables/useAnForm.js

@@ -21,10 +21,13 @@ export const useAnForm = (params, data) => {
     initValidate();
     void nextTick(History.clear);
   };
-  const merge = (data2) => {
+  const merge = (data2, commit) => {
     for (const key of keys) {
       state.value[key] = data2[key];
     }
+    if (commit) {
+      void nextTick(History.clear);
+    }
   };
   const initValidate = () => {
     const rules = {};
@@ -57,15 +60,23 @@ export const useAnForm = (params, data) => {
     const last = JSON.stringify(History.last.value.snapshot);
     return firstOne !== last;
   });
+  const diff = computed(() => {
+    const changed = {};
+    for (const key of keys) {
+      if (JSON.stringify(state.value[key]) !== JSON.stringify(first.value[key])) {
+        changed[key] = state.value[key];
+      }
+    }
+    return changed;
+  });
   watch(state, () => {
     errors.value = {};
   }, { deep: true });
   init();
   return {
     state,
-    merge: (data2) => {
-      merge(data2);
-    },
+    diff,
+    merge,
     validator: {
       check: () => {
         return validatorExecute();

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

@@ -1,4 +1,5 @@
 import type { NitroFetchOptions, NitroFetchRequest } from 'nitropack';
+import type { TInfiniteScroll } from '#ancore/types';
 interface TConfig<TFilter> {
     request: NitroFetchRequest;
     apiConfig?: NitroFetchOptions<string>;
@@ -9,6 +10,7 @@ interface TConfig<TFilter> {
 }
 export declare const useAnList: <TData, TFilter extends object = {}>(initConfig: TConfig<TFilter>) => {
     init: () => Promise<void>;
+    infiniteScroll: (scrollConfig?: TInfiniteScroll) => void;
     filter: TFilter;
     params: Record<string, unknown> | undefined;
     items: TData[];

package/dist/runtime/composables/useAnList.js

@@ -1,9 +1,11 @@
 import { ref, reactive, watch, computed } from "vue";
+import { useInfiniteScroll } from "@vueuse/core";
 import { useAnData } from "./useAnData.js";
 export const useAnList = (initConfig) => {
   const config = ref(initConfig);
   const items = reactive([]);
   const count = ref(null);
+  let resetInfiniteScroll;
   const init = async () => {
     await data.init();
     refresh();
@@ -20,10 +22,30 @@ export const useAnList = (initConfig) => {
       items.push(...data.data.value.items);
     }
     setCount(data.data.value.count);
+    resetInfiniteScroll?.();
   };
   const setCount = (value) => {
     count.value = value;
   };
+  const infiniteScroll = (scrollConfig) => {
+    const onLoadMore = scrollConfig?.onLoadMore || (() => {
+      if (!config.value.filter) config.value.filter = {};
+      config.value.filter[config.value.skipField || "skip"] = items.length;
+    });
+    const canLoadMore = scrollConfig?.options?.canLoadMore || (() => {
+      return (scrollConfig?.canLoadMore?.() ?? true) && inited.value && items.length < (count.value || 0) && // @ts-ignore
+      !!config.value.filter.limit;
+    });
+    const { reset } = useInfiniteScroll(
+      scrollConfig?.element || window,
+      onLoadMore,
+      {
+        ...scrollConfig?.options,
+        canLoadMore
+      }
+    );
+    resetInfiniteScroll = reset;
+  };
   const inited = computed(() => data.status.value !== "idle");
   if (!config.value.apiConfig) {
     config.value.apiConfig = {};
@@ -37,6 +59,7 @@ export const useAnList = (initConfig) => {
   watch(data.data, refresh);
   return {
     init,
+    infiniteScroll,
     filter: config.value.filter,
     params: config.value.params,
     items,

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

@@ -1,7 +1,2 @@
-import type { NitroFetchRequest, NitroFetchOptions } from 'nitropack'
-
-
-export type TApi = <TData = unknown, TError = unknown>(
-	request: NitroFetchRequest,
-	opts: NitroFetchOptions<string>
-) => Promise<TData>
+import type { NitroFetchRequest, NitroFetchOptions } from 'nitropack';
+export type TApi = <TData = unknown, TError = unknown>(request: NitroFetchRequest, opts: NitroFetchOptions<string>) => Promise<TData>;

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

@@ -0,0 +1 @@
+export type TArgument<TFn extends (...args: any[]) => any, Index extends number> = Index extends keyof Parameters<TFn> ? Parameters<TFn>[Index] : never;

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

@@ -1,3 +1,5 @@
 export * from './api.js';
+export * from './argument.js';
 export * from './global.js';
+export * from './infiniteScroll.js';
 export * from './responseList.js';

package/dist/runtime/types/index.js

@@ -1,3 +1,5 @@
-export * from "./api";
+export * from "./api.js";
+export * from "./argument.js";
 export * from "./global";
-export * from "./responseList";
+export * from "./infiniteScroll.js";
+export * from "./responseList.js";

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

@@ -0,0 +1,8 @@
+import type { TArgument } from '#ancore/types';
+import type { useInfiniteScroll } from '@vueuse/core';
+export interface TInfiniteScroll {
+    element?: TArgument<typeof useInfiniteScroll, 0>;
+    onLoadMore?: TArgument<typeof useInfiniteScroll, 1>;
+    options?: TArgument<typeof useInfiniteScroll, 2>;
+    canLoadMore?: () => boolean;
+}

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

@@ -1,4 +1,4 @@
-export interface TResponseList<TData> {
-	items: TData[]
-	count: number
-}
+export interface TResponseList<TData> {
+    items: TData[];
+    count: number;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@anweb/nuxt-ancore",
-	"version": "1.11.1",
+	"version": "1.12.1",
 	"description": "AnCore Nuxt module",
 	"repository": "https://github.com/ANLTD/ancore",
 	"license": "MIT",
@@ -32,20 +32,19 @@
 		"release:major": "npm run prepack && changelogen --major --release && npm publish --access public && git push --follow-tags"
 	},
 	"dependencies": {
-		"@nuxt/kit": "^4.1.2",
-		"@vueuse/core": "^13.9.0",
-		"@vueuse/integrations": "^13.9.0",
+		"@nuxt/kit": "^4.2.0",
+		"@vueuse/core": "^14.0.0",
+		"@vueuse/integrations": "^14.0.0",
 		"async-validator": "^4.2.5",
-		"hash-wasm": "^4.12.0",
-		"i18next": "^25.5.2"
+		"i18next": "^25.6.0"
 	},
 	"devDependencies": {
-		"@nuxt/devtools": "^2.6.3",
+		"@nuxt/devtools": "^3.0.0",
 		"@nuxt/module-builder": "^1.0.2",
-		"@nuxt/schema": "^4.1.2",
+		"@nuxt/schema": "^4.2.0",
 		"@types/node": "latest",
 		"changelogen": "^0.6.2",
-		"nuxt": "^4.1.2",
-		"typescript": "~5.9.2"
+		"nuxt": "^4.2.0",
+		"typescript": "~5.9.3"
 	}
 }