@anweb/nuxt-ancore 1.16.1 → 1.16.3

package/dist/module.d.mts

@@ -1,9 +1,14 @@
 import * as _nuxt_schema from '@nuxt/schema';
-import { PublicRuntimeConfig } from 'nuxt/schema';
+import { InitOptions } from 'i18next';
 
 interface ModuleOptions {
     api?: string;
-    i18n?: PublicRuntimeConfig['i18n'];
+    i18n?: InitOptions<unknown> & {
+        cookie?: string;
+        resources?: Record<string, {
+            translation: string | Record<string, unknown>;
+        }>;
+    };
 }
 declare const _default: _nuxt_schema.NuxtModule<ModuleOptions, ModuleOptions, false>;
 

package/dist/module.d.ts

@@ -1,9 +1,14 @@
 import * as _nuxt_schema from '@nuxt/schema';
-import { PublicRuntimeConfig } from 'nuxt/schema';
+import { InitOptions } from 'i18next';
 
 interface ModuleOptions {
     api?: string;
-    i18n?: PublicRuntimeConfig['i18n'];
+    i18n?: InitOptions<unknown> & {
+        cookie?: string;
+        resources?: Record<string, {
+            translation: string | Record<string, unknown>;
+        }>;
+    };
 }
 declare const _default: _nuxt_schema.NuxtModule<ModuleOptions, ModuleOptions, false>;
 

package/dist/module.json

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

package/dist/runtime/components/An/Dialogs/Dialogs.vue

@@ -1,12 +1,34 @@
 <script setup>
-import { useScrollLock } from "@vueuse/core";
+import { watch } from "vue";
 import { useAnDialogs } from "#imports";
 import { AnDialogsItem } from "#components";
 const Dialogs = useAnDialogs();
-const isLocked = useScrollLock(import.meta.client ? window : null);
-const onAnimation = () => {
-  isLocked.value = !!Dialogs.items.length;
+let scrollY = 0;
+const lockScroll = () => {
+  scrollY = window.scrollY;
+  document.documentElement.style.overflowY = "scroll";
+  document.body.style.position = "fixed";
+  document.body.style.top = `-${scrollY}px`;
+  document.body.style.left = "0";
+  document.body.style.width = "100%";
 };
+const unlockScroll = () => {
+  document.body.style.position = "";
+  document.body.style.top = "";
+  document.body.style.left = "";
+  document.body.style.width = "";
+  document.documentElement.style.overflowY = "";
+  window.scrollTo(0, scrollY);
+};
+if (import.meta.client) {
+  watch(
+    () => Dialogs.items.length,
+    (count, prev) => {
+      if (count > 0 && (!prev || prev === 0)) lockScroll();
+      else if (count === 0 && prev && prev > 0) unlockScroll();
+    }
+  );
+}
 </script>
 
 <template>
@@ -15,9 +37,6 @@ const onAnimation = () => {
 		name="an-dialogs"
 		tag="div"
 		aria-live="polite"
-
-		@before-enter="onAnimation"
-		@after-leave="onAnimation"
 	>
 		<AnDialogsItem
 			v-for="dialog of Dialogs.items"

package/dist/runtime/components/An/Dropdown.vue

@@ -1,5 +1,4 @@
 <script setup>
-import { v4 } from "uuid";
 import { computed, onMounted, ref, useTemplateRef } from "vue";
 import { onClickOutside, useEventListener } from "@vueuse/core";
 const props = defineProps({
@@ -25,7 +24,7 @@ const name = computed(() => {
 });
 const menuId = computed(() => id.value ? `an-dropdown-menu-${id.value}` : void 0);
 onMounted(() => {
-  id.value = v4();
+  id.value = crypto.randomUUID();
 });
 onClickOutside(refTarget, close);
 useEventListener(document, "keydown", onKeydown);

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

@@ -1,8 +1,7 @@
-import type { NitroFetchOptions, NitroFetchRequest } from 'nitropack';
-import { type Ref, type ComputedRef } from 'vue';
+import type { NitroFetchOptions, NitroFetchRequest, TypedInternalResponse } from 'nitropack';
 import { type AsyncDataRequestStatus } from '#app';
-interface TConfig {
-    request: NitroFetchRequest;
+interface TConfig<Route extends NitroFetchRequest = NitroFetchRequest> {
+    request: Route;
     apiConfig?: NitroFetchOptions<string>;
     params: Record<string, unknown>;
 }
@@ -10,12 +9,12 @@ interface TUseAnData<TData, TError> {
     init: () => Promise<void>;
     set: (data: TData) => void;
     refresh: () => void;
-    config: Ref<TConfig>;
+    config: TConfig;
     params: TConfig['params'];
-    data: Readonly<Ref<TData | undefined>>;
-    status: Readonly<Ref<AsyncDataRequestStatus>>;
-    loading: ComputedRef<boolean>;
-    error: Readonly<Ref<TError | undefined>>;
+    readonly data: TData | undefined;
+    readonly status: AsyncDataRequestStatus;
+    readonly loading: boolean;
+    readonly error: TError | undefined;
 }
-export declare const useAnData: <TData = unknown, TError = unknown>(initConfig: Omit<TConfig, "params"> & Partial<Pick<TConfig, "params">>) => TUseAnData<TData, TError>;
+export declare const useAnData: <TData = void, TError = unknown, Route extends NitroFetchRequest = NitroFetchRequest, _TData = TData extends void ? TypedInternalResponse<Route, unknown, "get"> : TData>(initConfig: Omit<TConfig<Route>, "params"> & Partial<Pick<TConfig<Route>, "params">>) => TUseAnData<_TData, TError>;
 export {};

package/dist/runtime/composables/useAnData.js

@@ -64,12 +64,27 @@ export const useAnData = (initConfig) => {
   return {
     init,
     set,
-    refresh: () => time.value = Date.now(),
-    data,
-    config,
+    refresh: () => {
+      time.value = Date.now();
+    },
+    get data() {
+      return data.value;
+    },
+    get config() {
+      return config.value;
+    },
+    set config(val) {
+      config.value = val;
+    },
     params: config.value.params,
-    status,
-    loading,
-    error
+    get status() {
+      return status.value;
+    },
+    get loading() {
+      return loading.value || status.value === "idle";
+    },
+    get error() {
+      return error.value;
+    }
   };
 };

package/dist/runtime/composables/useAnDialogs.js

@@ -1,4 +1,3 @@
-import { v4 } from "uuid";
 import { useState } from "#app";
 import { markRaw } from "vue";
 export const useAnDialogs = () => {
@@ -6,7 +5,7 @@ export const useAnDialogs = () => {
   const open = (component, params = {}, config = {}) => {
     const data = {
       ...config,
-      id: v4(),
+      id: crypto.randomUUID(),
       component: markRaw(component),
       params
     };

package/dist/runtime/composables/useAnI18n.js

@@ -1,5 +1,7 @@
 import i18next from "i18next";
 import { useRuntimeConfig, useCookie } from "#app";
+const nsMap = /* @__PURE__ */ new WeakMap();
+let nsId = 0;
 export const useAnI18n = (resources) => {
   const returnObj = {
     lang: i18next.language,
@@ -23,14 +25,16 @@ export const useAnI18n = (resources) => {
     }
   };
   if (!resources) return { t: i18next.t, ...returnObj };
-  const ns = JSON.stringify(resources);
-  for (const lang in resources) {
-    try {
-      if (!i18next.hasResourceBundle(lang, ns)) {
+  let ns = nsMap.get(resources);
+  if (!ns) {
+    ns = `c${nsId++}`;
+    nsMap.set(resources, ns);
+    for (const lang in resources) {
+      try {
         i18next.addResourceBundle(lang, ns, resources[lang]);
+      } catch (e) {
+        console.error(`[AnI18n] Failed to add resource bundle for ${lang}:`, e);
       }
-    } catch (e) {
-      console.error(`[AnI18n] Failed to add resource bundle for ${lang}:`, e);
     }
   }
   const t = (key, options = {}) => i18next.t(key, { ns: [ns, "translation"], ...options });

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

@@ -1,9 +1,9 @@
-import type { NitroFetchOptions, NitroFetchRequest } from 'nitropack';
-import { type Ref, type ComputedRef } from 'vue';
-import type { TInfiniteScroll } from '#ancore/types';
+import type { NitroFetchOptions, NitroFetchRequest, TypedInternalResponse } from 'nitropack';
+import type { TInfiniteScroll, TResponseList } from '#ancore/types';
 import { type AsyncDataRequestStatus } from '#app';
-interface TConfig<TFilter> {
-    request: NitroFetchRequest;
+type ExtractListItem<T> = T extends TResponseList<infer U> ? U : unknown;
+interface TConfig<TFilter, Route extends NitroFetchRequest = NitroFetchRequest> {
+    request: Route;
     apiConfig?: NitroFetchOptions<string>;
     filter?: TFilter;
     params?: Record<string, string>;
@@ -16,11 +16,10 @@ interface TUseAnList<TData, TFilter> {
     filter: TFilter;
     params: Record<string, string> | undefined;
     items: TData[];
-    count: Ref<number | null>;
-    inited: ComputedRef<boolean>;
-    status: Readonly<Ref<AsyncDataRequestStatus>>;
-    loading: ComputedRef<boolean>;
-    error: Readonly<Ref<unknown | undefined>>;
+    readonly count: number | null;
+    readonly status: AsyncDataRequestStatus;
+    readonly loading: boolean;
+    readonly error: unknown | undefined;
 }
-export declare const useAnList: <TData, TFilter extends object = {}>(initConfig: TConfig<TFilter>) => TUseAnList<TData, TFilter>;
+export declare const useAnList: <TData = void, TFilter extends object = {}, Route extends NitroFetchRequest = NitroFetchRequest, _TData = TData extends void ? ExtractListItem<TypedInternalResponse<Route, unknown, "get">> : TData>(initConfig: TConfig<TFilter, Route>) => TUseAnList<_TData, TFilter>;
 export {};

package/dist/runtime/composables/useAnList.js

@@ -1,4 +1,4 @@
-import { ref, reactive, watch, computed } from "vue";
+import { ref, reactive, watch } from "vue";
 import { useInfiniteScroll } from "@vueuse/core";
 import { useAnData } from "#imports";
 export const useAnList = (initConfig) => {
@@ -10,17 +10,17 @@ export const useAnList = (initConfig) => {
     await refresh();
   };
   const refresh = () => {
-    if (!data.data.value) return;
+    if (!data.data) return;
     if (!config.value.apiConfig?.query?.[config.value.skipField || "skip"]) {
       count.value = null;
       items.length = 0;
     }
     if (config.value.reverse) {
-      items.unshift(...data.data.value.items);
+      items.unshift(...data.data.items);
     } else {
-      items.push(...data.data.value.items);
+      items.push(...data.data.items);
     }
-    count.value = data.data.value.count;
+    count.value = data.data.count;
   };
   const infiniteScroll = (scrollConfig) => {
     const onLoadMore = scrollConfig?.onLoadMore || (() => {
@@ -28,7 +28,7 @@ export const useAnList = (initConfig) => {
       config.value.filter[config.value.skipField || "skip"] = items.length;
     });
     const canLoadMore = scrollConfig?.options?.canLoadMore || (() => {
-      return (scrollConfig?.canLoadMore?.() ?? true) && inited.value && data.status.value !== "pending" && items.length < (count.value || 0) && !!config.value.filter?.limit;
+      return (scrollConfig?.canLoadMore?.() ?? true) && data.status !== "idle" && data.status !== "pending" && items.length < (count.value || 0) && !!config.value.filter?.limit;
     });
     const { reset } = useInfiniteScroll(
       scrollConfig?.element || window,
@@ -40,7 +40,6 @@ export const useAnList = (initConfig) => {
     );
     return reset;
   };
-  const inited = computed(() => data.status.value !== "idle");
   if (!config.value.apiConfig) {
     config.value.apiConfig = {};
   }
@@ -50,17 +49,32 @@ export const useAnList = (initConfig) => {
     apiConfig: config.value.apiConfig,
     params: config.value.params
   });
-  watch(data.data, refresh);
+  watch(() => data.data, refresh);
   return {
     init,
     infiniteScroll,
-    filter: config.value.filter,
+    get filter() {
+      return config.value.filter;
+    },
+    set filter(val) {
+      config.value.filter = val;
+      if (config.value.apiConfig) {
+        config.value.apiConfig.query = val;
+      }
+    },
     params: config.value.params,
     items,
-    count,
-    inited,
-    status: data.status,
-    loading: data.loading,
-    error: data.error
+    get count() {
+      return count.value;
+    },
+    get status() {
+      return data.status;
+    },
+    get loading() {
+      return data.loading;
+    },
+    get error() {
+      return data.error;
+    }
   };
 };

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

@@ -14,7 +14,7 @@ declare module 'nuxt/schema' {
 	interface PublicRuntimeConfig {
 		i18n?: InitOptions<unknown> & {
 			cookie?: string
-			resources?: Record<string, { translation: string | Record<string, unknown> }>
+			resources?: Record<string, { translation: Record<string, unknown> }>
 		}
 	}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@anweb/nuxt-ancore",
-	"version": "1.16.1",
+	"version": "1.16.3",
 	"description": "AnCore Nuxt module",
 	"repository": "https://github.com/ANLTD/ancore",
 	"license": "MIT",
@@ -27,25 +27,25 @@
 		"dev": "npm run dev:prepare && nuxi dev playground",
 		"dev:build": "nuxi build playground",
 		"dev:prepare": "nuxt-module-build build --stub && nuxt-module-build prepare && nuxi prepare playground",
-		"release:patch": "npm run prepack && changelogen --patch --release && npm publish --access public && git push --follow-tags",
-		"release:minor": "npm run prepack && changelogen --minor --release && npm publish --access public && git push --follow-tags",
-		"release:major": "npm run prepack && changelogen --major --release && npm publish --access public && git push --follow-tags"
+		"release:patch": "npm run prepack && changelogen --patch --release && npm login && npm publish --access public && git push --follow-tags",
+		"release:minor": "npm run prepack && changelogen --minor --release && npm login && npm publish --access public && git push --follow-tags",
+		"release:major": "npm run prepack && changelogen --major --release && npm login && npm publish --access public && git push --follow-tags",
+		"update": "npx -y npm-check-updates -u"
 	},
 	"dependencies": {
-		"@vueuse/core": "^14.2.0",
-		"@vueuse/integrations": "^14.2.0",
+		"@vueuse/core": "^14.2.1",
+		"@vueuse/integrations": "^14.2.1",
 		"async-validator": "^4.2.5",
-		"i18next": "^25.8.0",
-		"uuid": "^13.0.0"
+		"i18next": "^25.8.17"
 	},
 	"devDependencies": {
-		"@nuxt/devtools": "^3.1.1",
-		"@nuxt/kit": "^4.3.0",
+		"@nuxt/devtools": "^3.2.3",
+		"@nuxt/kit": "^4.3.1",
 		"@nuxt/module-builder": "^1.0.2",
-		"@nuxt/schema": "^4.3.0",
+		"@nuxt/schema": "^4.3.1",
 		"@types/node": "latest",
 		"changelogen": "^0.6.2",
-		"nuxt": "^4.3.0",
+		"nuxt": "^4.3.1",
 		"typescript": "~5.9.3"
 	}
 }