@enfyra/sdk-nuxt 0.3.19 → 0.3.21

package/package.json

@@ -1,15 +1,16 @@
 {
   "name": "@enfyra/sdk-nuxt",
-  "version": "0.3.19",
+  "version": "0.3.21",
+  "type": "module",
   "description": "Nuxt SDK for Enfyra CMS",
   "repository": {
     "type": "git",
-    "url": "https://github.com/dothinh115/enfyra-sdk-nuxt.git"
+    "url": "https://github.com/enfyra/sdk-nuxt.git"
   },
   "bugs": {
-    "url": "https://github.com/dothinh115/enfyra-sdk-nuxt/issues"
+    "url": "https://github.com/enfyra/sdk-nuxt/issues"
   },
-  "homepage": "https://github.com/dothinh115/enfyra-sdk-nuxt#readme",
+  "homepage": "https://github.com/enfyra/sdk-nuxt#readme",
   "main": "./dist/module.mjs",
   "types": "./dist/types.d.ts",
   "exports": {
@@ -18,17 +19,13 @@
       "require": "./dist/module.cjs",
       "types": "./dist/types.d.ts"
     },
-    "./src/composables/useEnfyraApi": {
-      "types": "./src/composables/useEnfyraApi.ts",
-      "import": "./src/composables/useEnfyraApi.ts"
-    },
-    "./src/composables/useEnfyraAuth": {
-      "types": "./src/composables/useEnfyraAuth.ts",
-      "import": "./src/composables/useEnfyraAuth.ts"
+    "./runtime/*": {
+      "types": "./dist/runtime/*.d.ts",
+      "import": "./dist/runtime/*.js"
     },
     "./types": {
-      "types": "./dist/types/index.d.ts",
-      "import": "./dist/types/index.js"
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js"
     }
   },
   "files": [
@@ -61,6 +58,7 @@
     "vue": "^3.0.0"
   },
   "dependencies": {
+    "defu": "^6.1.4",
     "h3": "^1.15.4",
     "ofetch": "^1.3.3"
   },
@@ -74,4 +72,4 @@
     "vite-plugin-dts": "^4.3.0",
     "vitest": "^3.2.4"
   }
-}
+}

package/src/module.ts

@@ -2,10 +2,13 @@ import {
   defineNuxtModule,
   createResolver,
   addServerHandler,
-  addImportsDir,
+  addImports,
   addPlugin,
+  addTypeTemplate,
+  useLogger,
 } from "@nuxt/kit";
-import { ENFYRA_API_PREFIX } from "./constants/config";
+import { defu } from "defu";
+import { ENFYRA_API_PREFIX } from "./runtime/constants/config";
 
 export interface ModuleOptions {
   apiUrl: string;
@@ -16,12 +19,18 @@ export default defineNuxtModule<ModuleOptions>({
   meta: {
     name: "@enfyra/sdk-nuxt",
     configKey: "enfyraSDK",
+    compatibility: {
+      nuxt: ">=3.0.0",
+    },
   },
   defaults: {
     apiUrl: "",
     apiPrefix: ENFYRA_API_PREFIX,
   },
   setup(options, nuxt) {
+    const logger = useLogger("enfyra-sdk");
+    const { resolve } = createResolver(import.meta.url);
+
     const normalizedOptions = {
       ...options,
       apiUrl:
@@ -30,53 +39,84 @@ export default defineNuxtModule<ModuleOptions>({
           : options.apiUrl,
       apiPrefix:
         typeof options.apiPrefix === "string"
-          ? (options.apiPrefix.trim() 
-              ? "/" + options.apiPrefix.replace(/^\/+|\/+$/g, "").replace(/\/+/g, "/")
-              : ENFYRA_API_PREFIX)
+          ? options.apiPrefix.trim()
+            ? "/" +
+            options.apiPrefix
+              .replace(/^\/+|\/+$/g, "")
+              .replace(/\/+/g, "/")
+            : ENFYRA_API_PREFIX
           : ENFYRA_API_PREFIX,
     };
 
     const apiPrefix = normalizedOptions.apiPrefix;
-    const { resolve } = createResolver(import.meta.url);
 
     if (!normalizedOptions.apiUrl) {
-      console.warn(
-        `[Enfyra SDK Nuxt] Missing required configuration:\n` +
-          `- apiUrl is required\n` +
-          `Please configure it in your nuxt.config.ts:\n` +
-          `enfyraSDK: {\n` +
-          `  apiUrl: 'https://your-api-url'\n` +
-          `}`
+      logger.warn(
+        `Missing required configuration:\n` +
+        `- apiUrl is required\n` +
+        `Please configure it in your nuxt.config.ts:\n` +
+        `enfyraSDK: {\n` +
+        `  apiUrl: 'https://your-api-url'\n` +
+        `}`
+      );
+
+      nuxt.options.runtimeConfig.public.enfyraSDK = defu(
+        nuxt.options.runtimeConfig.public.enfyraSDK || {},
+        {
+          ...normalizedOptions,
+          apiPrefix: apiPrefix,
+          configError: true,
+          configErrorMessage:
+            "Enfyra SDK: apiUrl is required. Please configure it in nuxt.config.ts",
+        }
       );
-      
-      nuxt.options.runtimeConfig.public.enfyraSDK = {
-        ...normalizedOptions,
-        apiPrefix: apiPrefix,
-        configError: true,
-        configErrorMessage: 'Enfyra SDK: apiUrl is required. Please configure it in nuxt.config.ts'
-      };
     } else {
-      nuxt.options.runtimeConfig.public.enfyraSDK = {
-        ...normalizedOptions,
-        apiPrefix: apiPrefix,
-      };
+      nuxt.options.runtimeConfig.public.enfyraSDK = defu(
+        nuxt.options.runtimeConfig.public.enfyraSDK || {},
+        {
+          ...normalizedOptions,
+          apiPrefix: apiPrefix,
+        }
+      );
     }
 
-
     if (!normalizedOptions.apiUrl) {
       addPlugin({
         src: resolve("./runtime/plugin/config-error.client"),
-        mode: 'client'
+        mode: "client",
       });
     }
-    
-    addImportsDir(resolve("./composables"));
 
-    nuxt.hook('prepare:types', ({ declarations, references }: any) => {
-      references.push({
-        path: resolve('./types/nuxt-imports.d.ts'),
-      })
-    })
+    addImports([
+      {
+        name: "useEnfyraApi",
+        from: resolve("./runtime/composables/useEnfyraApi"),
+      },
+      {
+        name: "useEnfyraAuth",
+        from: resolve("./runtime/composables/useEnfyraAuth"),
+      },
+    ]);
+    addTypeTemplate({
+      filename: "types/enfyra-sdk.d.ts",
+      getContents: () => `
+import type { ApiOptions, UseEnfyraApiSSRReturn, UseEnfyraApiClientReturn } from '@enfyra/sdk-nuxt/types'
+
+declare module '#imports' {
+  export function useEnfyraApi<T = any>(
+    path: (() => string) | string,
+    opts: ApiOptions<T> & { ssr: true }
+  ): UseEnfyraApiSSRReturn<T>
+
+  export function useEnfyraApi<T = any>(
+    path: (() => string) | string,
+    opts?: ApiOptions<T> & { ssr?: false | undefined }
+  ): UseEnfyraApiClientReturn<T>
+
+  export function useEnfyraAuth(): import('@enfyra/sdk-nuxt/types').UseEnfyraAuthReturn
+}
+`,
+    });
 
     addServerHandler({
       handler: resolve("./runtime/server/middleware/auth"),
@@ -95,7 +135,6 @@ export default defineNuxtModule<ModuleOptions>({
       method: "post",
     });
 
-
     addServerHandler({
       route: "/assets/**",
       handler: resolve("./runtime/server/api/all"),

package/src/{composables → runtime/composables}/useEnfyraApi.ts

@@ -1,4 +1,4 @@
-import { ref, unref, toRaw } from "vue";
+import { ref, unref, toRaw, computed } from "vue";
 import type {
   ApiOptions,
   ApiError,
@@ -6,7 +6,7 @@ import type {
   UseEnfyraApiSSRReturn,
   UseEnfyraApiClientReturn,
   BatchProgress,
-} from "../types";
+} from "../../types";
 import { $fetch } from "../utils/http";
 import { getAppUrl, normalizeUrl } from "../utils/url";
 import { ENFYRA_API_PREFIX } from "../constants/config";
@@ -68,13 +68,13 @@ export function useEnfyraApi<T = any>(
     const clientHeaders = process.client
       ? {}
       : useRequestHeaders([
-          "authorization",
-          "cookie",
-          "user-agent",
-          "accept",
-          "accept-language",
-          "referer",
-        ]);
+        "authorization",
+        "cookie",
+        "user-agent",
+        "accept",
+        "accept-language",
+        "referer",
+      ]);
 
     const serverHeaders = { ...clientHeaders };
     delete serverHeaders.connection;
@@ -83,7 +83,7 @@ export function useEnfyraApi<T = any>(
     delete serverHeaders["content-length"];
 
     const nuxtApp = useNuxtApp()
-    
+
     const fetchOptions: any = {
       method: method as any,
       body: body,
@@ -94,7 +94,6 @@ export function useEnfyraApi<T = any>(
       },
     };
 
-    // Pass all useFetch-specific options
     if (key !== undefined) {
       fetchOptions.key = key;
     }
@@ -125,7 +124,6 @@ export function useEnfyraApi<T = any>(
     if (opts.getCachedData !== undefined) {
       fetchOptions.getCachedData = opts.getCachedData;
     } else {
-      // Auto-add getCachedData to ensure cache is used in SPA navigation
       fetchOptions.getCachedData = (cacheKey: string) => {
         return nuxtApp.payload.data[cacheKey] || nuxtApp.static.data[cacheKey]
       }
@@ -141,13 +139,13 @@ export function useEnfyraApi<T = any>(
     }
 
     const result = useFetch<T>(finalUrl, fetchOptions);
+
     
-    // Map pending to loading for better naming
-    // useFetch returns AsyncData with 'pending', but UseEnfyraApiSSRReturn uses 'loading'
+    const loading = computed(() => result.status.value === 'pending');
+
     return {
       ...result,
-      loading: result.pending,
-      pending: result.pending, // Keep for backward compatibility
+      loading,
     } as UseEnfyraApiSSRReturn<T>;
   }
   const data = ref<T | null>(null);
@@ -207,13 +205,13 @@ export function useEnfyraApi<T = any>(
 
         const chunks = effectiveBatchSize
           ? Array.from(
-              { length: Math.ceil(items.length / effectiveBatchSize) },
-              (_, i) =>
-                items.slice(
-                  i * effectiveBatchSize,
-                  i * effectiveBatchSize + effectiveBatchSize
-                )
-            )
+            { length: Math.ceil(items.length / effectiveBatchSize) },
+            (_, i) =>
+              items.slice(
+                i * effectiveBatchSize,
+                i * effectiveBatchSize + effectiveBatchSize
+              )
+          )
           : [items];
 
         const totalBatches = chunks.length;

package/src/{composables → runtime/composables}/useEnfyraAuth.ts

@@ -1,5 +1,5 @@
 import { ref, computed } from "vue";
-import type { LoginPayload, User, UseEnfyraAuthReturn } from "../types/auth";
+import type { LoginPayload, User, UseEnfyraAuthReturn } from "../../types/auth";
 import { useEnfyraApi } from "./useEnfyraApi";
 
 const me = ref<User | null>(null);
@@ -33,7 +33,7 @@ export function useEnfyraAuth() {
 
     try {
       const queryParams: any = {};
-      
+
       if (options?.fields && options.fields.length > 0) {
         queryParams.fields = options.fields.join(",");
       }

package/src/runtime/server/api/all.ts

@@ -1,5 +1,5 @@
 import { defineEventHandler } from "h3";
-import { proxyToAPI } from "../../../utils/server/proxy";
+import { proxyToAPI } from "../../utils/server/proxy";
 
 export default defineEventHandler(async (event) => {
   return proxyToAPI(event);

package/src/runtime/server/api/login.post.ts

@@ -12,8 +12,8 @@ import {
   ACCESS_TOKEN_KEY,
   REFRESH_TOKEN_KEY,
   EXP_TIME_KEY,
-} from "../../../constants/auth";
-import { normalizeUrl } from "../../../utils/url";
+} from "../../constants/auth";
+import { normalizeUrl } from "../../utils/url";
 
 export default defineEventHandler(async (event) => {
   const config = useRuntimeConfig();

package/src/runtime/server/api/logout.post.ts

@@ -5,8 +5,8 @@ import {
   ACCESS_TOKEN_KEY,
   REFRESH_TOKEN_KEY,
   EXP_TIME_KEY,
-} from "../../../constants/auth";
-import { normalizeUrl } from "../../../utils/url";
+} from "../../constants/auth";
+import { normalizeUrl } from "../../utils/url";
 
 export default defineEventHandler(async (event) => {
   const config = useRuntimeConfig();

package/src/runtime/server/middleware/auth.ts

@@ -3,8 +3,8 @@ import { useRuntimeConfig } from "#imports";
 import {
   validateTokens,
   refreshAccessToken,
-} from "../../../utils/server/refreshToken";
-import { REFRESH_TOKEN_KEY } from "../../../constants/auth";
+} from "../../utils/server/refreshToken";
+import { REFRESH_TOKEN_KEY } from "../../constants/auth";
 
 export default defineEventHandler(async (event) => {
   if (

package/src/runtime/shims.d.ts

@@ -0,0 +1,64 @@
+declare module "#imports" {
+    export const useRuntimeConfig: () => {
+        public: {
+            enfyraSDK?: {
+                apiUrl?: string;
+                apiPrefix?: string;
+                configError?: boolean;
+                configErrorMessage?: string;
+            };
+        };
+        [key: string]: any;
+    };
+
+    export const useRequestHeaders: (
+        headers?: string[]
+    ) => Record<string, string | undefined>;
+
+    export const useRequestURL: () => URL;
+
+    export const useFetch: <T = any>(
+        url: string | (() => string),
+        options?: any
+    ) => any;
+
+    export const useNuxtApp: () => {
+        payload: {
+            data: Record<string, any>;
+            [key: string]: any;
+        };
+        static: {
+            data: Record<string, any>;
+            [key: string]: any;
+        };
+        [key: string]: any;
+    };
+
+    export const defineNuxtPlugin: (plugin: any) => any;
+
+    export const defineCachedEventHandler: (
+        handler: any,
+        options?: any
+    ) => any;
+    export const getCookie: (
+        event: any,
+        name: string
+    ) => string | undefined;
+    export const setCookie: (
+        event: any,
+        name: string,
+        value: string,
+        options?: any
+    ) => void;
+    export const deleteCookie: (
+        event: any,
+        name: string,
+        options?: any
+    ) => void;
+    export const createError: (options: {
+        statusCode?: number;
+        statusMessage?: string;
+        message?: string;
+        data?: any;
+    }) => Error;
+}

package/src/{utils → runtime/utils}/server/proxy.ts

@@ -1,7 +1,7 @@
 import { H3Event, proxyRequest } from "h3";
 import { useRuntimeConfig } from "#imports";
 import { ENFYRA_API_PREFIX } from "../../constants/config";
-import { normalizeUrl } from "../../utils/url";
+import { normalizeUrl } from "../url";
 
 export function proxyToAPI(event: H3Event, customPath?: string) {
   const config = useRuntimeConfig();

package/src/{utils → runtime/utils}/server/refreshToken.ts

@@ -5,7 +5,7 @@ import {
   REFRESH_TOKEN_KEY,
   EXP_TIME_KEY,
 } from "../../constants/auth";
-import { normalizeUrl } from "../../utils/url";
+import { normalizeUrl } from "../url";
 
 interface TokenValidationResult {
   accessToken: string | null;
@@ -18,8 +18,7 @@ export function decodeJWT(token: string): any {
     if (parts.length !== 3) {
       return null;
     }
-    
-    // Decode the payload (second part)
+
     const payload = parts[1];
     const decodedPayload = Buffer.from(payload, "base64url").toString("utf-8");
     return JSON.parse(decodedPayload);
@@ -34,8 +33,7 @@ export function isAccessTokenExpired(accessToken: string): boolean {
   if (!decoded || !decoded.exp) {
     return true;
   }
-  
-  // JWT exp is in seconds, Date.now() is in milliseconds
+
   const expirationTime = decoded.exp * 1000;
   return Date.now() >= expirationTime;
 }
@@ -84,7 +82,6 @@ export async function refreshAccessToken(
     return newAccessToken;
   } catch (error) {
     console.warn("Token refresh failed:", error);
-    // On refresh failure, clear all auth-related cookies at server side
     deleteCookie(event, ACCESS_TOKEN_KEY);
     deleteCookie(event, REFRESH_TOKEN_KEY);
     deleteCookie(event, EXP_TIME_KEY);

package/src/{utils → runtime/utils}/url.ts

@@ -1,21 +1,14 @@
-/**
- * Normalizes URL segments to avoid double slashes when concatenating
- * Removes trailing slashes from base URL and leading slashes from path segments
- * Also normalizes multiple consecutive slashes within segments
- */
 export function normalizeUrl(...segments: (string | undefined | null)[]): string {
   const validSegments = segments.filter((s): s is string => Boolean(s));
   if (validSegments.length === 0) return '';
 
-  // First segment is the base URL - remove trailing slashes
   let result = validSegments[0].replace(/\/+$/, '');
 
-  // For remaining segments, remove leading and trailing slashes, normalize internal slashes, then join
   for (let i = 1; i < validSegments.length; i++) {
     const segment = validSegments[i]
-      .replace(/^\/+/, '') // Remove leading slashes
-      .replace(/\/+$/, '')  // Remove trailing slashes
-      .replace(/\/+/g, '/'); // Normalize multiple consecutive slashes to single slash
+      .replace(/^\/+/, '')
+      .replace(/\/+$/, '')
+      .replace(/\/+/g, '/');
     if (segment) {
       result += '/' + segment;
     }
@@ -24,9 +17,6 @@ export function normalizeUrl(...segments: (string | undefined | null)[]): string
   return result;
 }
 
-/**
- * Joins URL paths safely, avoiding double slashes
- */
 export function joinUrlPath(...paths: (string | undefined | null)[]): string {
   const validPaths = paths.filter((p): p is string => Boolean(p));
   if (validPaths.length === 0) return '';

package/src/types/index.ts

@@ -120,9 +120,8 @@ import type { AsyncData } from 'nuxt/app';
 export interface UseEnfyraApiSSRReturn<T> extends Omit<AsyncData<T | null, ApiError>, 'pending' | 'error'> {
   data: Ref<T | null>;
   loading: Ref<boolean>;
-  error: Ref<ApiError | null>; // Use null instead of undefined for consistency
+  error: Ref<ApiError | null>;
   refresh: () => Promise<void>;
-  // Keep pending for backward compatibility, but it's an alias of loading
   pending?: Ref<boolean>;
 }
 

package/dist/composables/useEnfyraApi.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"useEnfyraApi.d.ts","sourceRoot":"","sources":["../../src/composables/useEnfyraApi.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,UAAU,EAGV,qBAAqB,EACrB,wBAAwB,EAEzB,MAAM,UAAU,CAAC;AA4BlB,wBAAgB,YAAY,CAAC,CAAC,GAAG,GAAG,EAClC,IAAI,EAAE,CAAC,MAAM,MAAM,CAAC,GAAG,MAAM,EAC7B,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG;IAAE,GAAG,EAAE,IAAI,CAAA;CAAE,GAClC,qBAAqB,CAAC,CAAC,CAAC,CAAC;AAE5B,wBAAgB,YAAY,CAAC,CAAC,GAAG,GAAG,EAClC,IAAI,EAAE,CAAC,MAAM,MAAM,CAAC,GAAG,MAAM,EAC7B,IAAI,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG;IAAE,GAAG,CAAC,EAAE,KAAK,GAAG,SAAS,CAAA;CAAE,GACjD,wBAAwB,CAAC,CAAC,CAAC,CAAC"}