@ciwergrp/nuxid 1.2.2 → 1.4.0

package/console/request.mjs

@@ -233,6 +233,7 @@ async function run() {
   if (globalArgs.includes('--help') || globalArgs.includes('-h')) {
     console.log('\nUsage: pnpm nuxid make:request [options]\n');
     console.log('Options:');
+    console.log('  -a, --app <name>      Target app under ./apps/<name>');
     console.log('  -p, --prefix <dir>    Override the target prefix (default: project\'s config or \'app\')');
     console.log('  -h, --help            Show this help message\n');
     console.log('Examples:');
@@ -288,9 +289,22 @@ async function run() {
   const fileName = `${camelCaseName}Request.ts`;
 
   const argv = process.argv.slice(2);
+  let appName;
   let cliPrefix;
   for (let i = 0; i < argv.length; i++) {
     const a = argv[i];
+    if (a.startsWith('--app=')) {
+      appName = a.split('=')[1];
+    }
+    if (a === '--app' && argv[i + 1] !== undefined) {
+      appName = argv[i + 1];
+    }
+    if (a.startsWith('-a=')) {
+      appName = a.split('=')[1];
+    }
+    if (a === '-a' && argv[i + 1] !== undefined) {
+      appName = argv[i + 1];
+    }
     if (a.startsWith('--prefix=')) {
       cliPrefix = a.split('=')[1];
       break;
@@ -312,11 +326,14 @@ async function run() {
   const configuredPrefix = loadPrefixFromProjectConfig();
   const prefix = cliPrefix !== undefined ? cliPrefix : (typeof configuredPrefix === 'string' ? configuredPrefix : 'app');
 
-  const baseDir = prefix === '' ? cwd() : path.join(cwd(), prefix);
-  const targetDir = path.join(baseDir, 'requests');
+  const baseDir = appName ? path.join(cwd(), 'apps', appName) : cwd();
+  const targetRoot = prefix === '' ? baseDir : path.join(baseDir, prefix);
+  const targetDir = path.join(targetRoot, 'requests');
   const targetPath = path.join(targetDir, fileName);
 
   const shownPrefix = prefix === '' ? '(project root)' : prefix;
+  const shownApp = appName ? `apps/${appName}` : '(project root)';
+  console.log(`${colors.dim}App: ${colors.cyan}${shownApp}${colors.reset}`);
   console.log(`${colors.dim}Using prefix: ${colors.cyan}${shownPrefix}${colors.reset} -> ${colors.dim}${path.relative(cwd(), targetDir) || '.'}${colors.reset}`);
 
   const writeFileAndLint = () => {

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "@ciwergrp/nuxid",
   "configKey": "nuxid",
-  "version": "1.2.2",
+  "version": "1.4.0",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

package/dist/runtime/fetcher/cursor.d.ts

@@ -13,6 +13,7 @@ export interface CursorMetaConfig {
 }
 export interface CursorFetchOptions<TRequest extends NitroFetchRequest = NitroFetchRequest> {
     lazy?: boolean;
+    immediate?: boolean;
     pollInterval?: number;
     fetcher?: typeof $fetch;
     fetchOptions?: NitroFetchOptions<TRequest>;
@@ -20,7 +21,7 @@ export interface CursorFetchOptions<TRequest extends NitroFetchRequest = NitroFe
     itemKey?: string;
     cursorParam?: string;
 }
-export declare function useCursorHttp<T extends Record<string, any> = any, TResponse extends APIResponseCursor<T> = APIResponseCursor<T>, TRequest extends NitroFetchRequest = NitroFetchRequest>(url: TRequest, options?: CursorFetchOptions<TRequest>): {
+export declare function useCursorHttp<T extends Record<string, any> = any, TResponse extends APIResponseCursor<T> = APIResponseCursor<T>, TRequest extends NitroFetchRequest = NitroFetchRequest>(url: TRequest, options?: CursorFetchOptions<TRequest>): Promise<{
     data: import("vue").Ref<TResponse | undefined, TResponse | undefined>;
     loading: Readonly<import("vue").Ref<boolean, boolean>>;
     error: Readonly<import("vue").Ref<Error | null, Error | null>>;
@@ -28,4 +29,5 @@ export declare function useCursorHttp<T extends Record<string, any> = any, TResp
     isLoadMoreTriggered: Readonly<import("vue").Ref<boolean, boolean>>;
     loadMore: () => Promise<void>;
     refresh: () => Promise<void>;
-};
+    init: () => Promise<void>;
+}>;

package/dist/runtime/fetcher/cursor.js

@@ -1,5 +1,5 @@
 import { isRef, onUnmounted, readonly, ref, shallowRef, watch } from "vue";
-export function useCursorHttp(url, options) {
+export async function useCursorHttp(url, options) {
   function findReactiveSources(obj) {
     const sources = [];
     if (!obj || typeof obj !== "object") {
@@ -38,6 +38,7 @@ export function useCursorHttp(url, options) {
   }
   const {
     lazy = false,
+    immediate = true,
     pollInterval,
     fetcher,
     fetchOptions,
@@ -56,6 +57,7 @@ export function useCursorHttp(url, options) {
     unwrapReactiveObject(fetchOptions)
   );
   let pollTimer = null;
+  let fetchPromise = null;
   const fetcherFn = fetcher ?? globalThis.$fetch;
   if (!fetcherFn) {
     throw new Error("Nuxt $fetch is not available in the current context");
@@ -83,25 +85,35 @@ export function useCursorHttp(url, options) {
   };
   const fetchData = async (fetchUrl, params) => {
     if (loading.value) {
-      return;
+      return fetchPromise ?? Promise.resolve();
     }
     if (!hasNextPage.value && data.value) {
-      return;
+      return Promise.resolve();
     }
     loading.value = true;
     error.value = null;
+    const promise = (async () => {
+      try {
+        const response = await fetcherFn(fetchUrl, params);
+        data.value = {
+          ...response,
+          data: [...data.value?.data ?? [], ...response.data]
+        };
+        nextCursor.value = normalizeCursorValue(response.meta?.[cursorKey]);
+        hasNextPage.value = response.meta?.[hasMoreKey] ?? false;
+      } catch (e) {
+        error.value = e;
+      } finally {
+        loading.value = false;
+      }
+    })();
+    fetchPromise = promise;
     try {
-      const response = await fetcherFn(fetchUrl, params);
-      data.value = {
-        ...response,
-        data: [...data.value?.data ?? [], ...response.data]
-      };
-      nextCursor.value = normalizeCursorValue(response.meta?.[cursorKey]);
-      hasNextPage.value = response.meta?.[hasMoreKey] ?? false;
-    } catch (e) {
-      error.value = e;
+      await promise;
     } finally {
-      loading.value = false;
+      if (fetchPromise === promise) {
+        fetchPromise = null;
+      }
     }
   };
   const pollData = async () => {
@@ -144,6 +156,12 @@ export function useCursorHttp(url, options) {
     isLoadMoreTriggered.value = false;
     await fetchData(initialUrl, currentParams.value);
   };
+  const init = async () => {
+    if (data.value) {
+      return;
+    }
+    await fetchData(initialUrl, currentParams.value);
+  };
   const reactiveSources = findReactiveSources(fetchOptions);
   if (reactiveSources.length > 0) {
     watch(
@@ -163,8 +181,8 @@ export function useCursorHttp(url, options) {
       clearInterval(pollTimer);
     }
   });
-  if (!lazy) {
-    void fetchData(initialUrl, currentParams.value);
+  if (!lazy && immediate) {
+    await init();
   }
   return {
     data,
@@ -173,6 +191,7 @@ export function useCursorHttp(url, options) {
     hasNextPage: readonly(hasNextPage),
     isLoadMoreTriggered: readonly(isLoadMoreTriggered),
     loadMore,
-    refresh
+    refresh,
+    init
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ciwergrp/nuxid",
-  "version": "1.2.2",
+  "version": "1.4.0",
   "description": "All-in-one essential modules for Nuxt",
   "repository": {
     "type": "git",