@inzombieland/nuxt-common 1.16.11 → 1.16.12

package/dist/module.json

@@ -1,6 +1,6 @@
 {
   "name": "@inzombieland/nuxt-common",
-  "version": "1.16.11",
+  "version": "1.16.12",
   "configKey": "nuxt-common",
   "builder": {
     "@nuxt/module-builder": "0.6.0",

package/dist/module.mjs

@@ -2,7 +2,7 @@ import { fileURLToPath } from 'node:url';
 import { defineNuxtModule, createResolver, addServerHandler, addImportsDir, addPlugin, addComponent } from '@nuxt/kit';
 
 const name = "@inzombieland/nuxt-common";
-const version = "1.16.11";
+const version = "1.16.12";
 
 const module = defineNuxtModule({
   meta: {

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

@@ -18,18 +18,12 @@ export declare const config: {
         };
     };
 };
-declare const fetch: Fetch, getUser: () => Promise<{
-    token?: string | null;
-    user?: import("src/runtime/packages/api/use-user").User | null;
-}>, getVisitorIdentifier: () => Promise<void>, useApiFetch: () => Fetch, userActions: {
+declare const fetch: Fetch, getUser: () => Promise<import("src/runtime/packages/api/types").GetUserResponse>, getVisitorIdentifier: () => Promise<void>, useApiFetch: () => Fetch, userActions: {
     signIn: (body: {
         username: string;
         password: string;
         rememberMe: boolean;
-    }) => Promise<{
-        token?: string | null;
-        user?: import("src/runtime/packages/api/use-user").User | null;
-    } | {
+    }) => Promise<import("src/runtime/packages/api/types").GetUserResponse | {
         key: string;
     }>;
     logout: () => Promise<void>;

package/dist/runtime/api/user-actions.d.ts

@@ -3,10 +3,7 @@ export declare const signIn: (body: {
     username: string;
     password: string;
     rememberMe: boolean;
-}) => Promise<{
-    token?: string | null;
-    user?: import("src/runtime/packages/api").User | null;
-} | {
+}) => Promise<import("src/runtime/packages/api/types").GetUserResponse | {
     key: string;
 }>;
 export declare const logout: () => Promise<void>;
@@ -19,10 +16,7 @@ export declare const signInByCodeVerifyCode: (body: {
     key: string;
     code: string;
     rememberMe?: boolean;
-}) => Promise<{
-    token?: string | null;
-    user?: import("src/runtime/packages/api").User | null;
-}>;
+}) => Promise<import("src/runtime/packages/api/types").GetUserResponse>;
 export declare const signUp: (body: {
     email: string;
     password: string;

package/dist/runtime/packages/api/get-user.d.ts

@@ -1,8 +1,2 @@
-import { type User } from "./use-user";
-import type { Fetch, FetchConfig } from "./types";
-type GetUserResponse = {
-    token?: string | null;
-    user?: User | null;
-};
+import type { Fetch, FetchConfig, GetUserResponse } from "./types";
 export declare const createApiGetUser: (fetch: Fetch, config: FetchConfig) => () => Promise<GetUserResponse>;
-export {};

package/dist/runtime/packages/api/index.d.ts

@@ -4,10 +4,7 @@ export { useUser, type User } from "./use-user";
 export { getVisitor, getVisitorId, type Visitor } from "./get-visitor";
 export declare function initApiFetch($fetch: Fetch, config: FetchConfig): {
     fetch: Fetch;
-    getUser: () => Promise<{
-        token?: string | null;
-        user?: import("src/runtime/api").User | null;
-    }>;
+    getUser: () => Promise<import("./types").GetUserResponse>;
     getVisitorIdentifier: () => Promise<void>;
     useApiFetch: () => Fetch;
     userActions: {
@@ -15,10 +12,7 @@ export declare function initApiFetch($fetch: Fetch, config: FetchConfig): {
             username: string;
             password: string;
             rememberMe: boolean;
-        }) => Promise<{
-            token?: string | null;
-            user?: import("src/runtime/api").User | null;
-        } | {
+        }) => Promise<import("./types").GetUserResponse | {
             key: string;
         }>;
         logout: () => Promise<void>;

package/dist/runtime/packages/api/index.mjs

@@ -1,9 +1,9 @@
-import { createApiFetch, flush, setToken } from "./api-client.mjs";
+import { createApiFetch } from "./api-client.mjs";
 import { createApiGetUser } from "./get-user.mjs";
 import { createApiGetVisitorIdentifier } from "./get-visitor.mjs";
 import { createApiRefreshToken } from "./refresh-token.mjs";
 import { useApiActions } from "./use-api-actions.mjs";
-import { useUser } from "./use-user.mjs";
+import { createApiUserActions } from "./user-actions.mjs";
 export { useUser } from "./use-user.mjs";
 export { getVisitor, getVisitorId } from "./get-visitor.mjs";
 const apiActions = useApiActions();
@@ -12,39 +12,12 @@ export function initApiFetch($fetch, config) {
   const getUser = createApiGetUser(fetch, config);
   const getVisitorIdentifier = createApiGetVisitorIdentifier(config);
   const refreshToken = createApiRefreshToken(fetch, config);
+  const useApiFetch = () => fetch;
+  const userActions = createApiUserActions(fetch, config, getUser);
   apiActions.value = {
     initialized: true,
     getVisitorIdentifier,
     refreshToken
   };
-  const useApiFetch = () => fetch;
-  const userActions = {
-    signIn: async (body) => {
-      const response = await fetch("/account/0/signin", {
-        body,
-        method: "POST",
-        ...config.useRequestHeaders?.(["cookie"]) ?? {}
-      });
-      const { accessToken, key, ...rest } = response;
-      if (!accessToken) {
-        if (key) {
-          return { key };
-        }
-        throw rest;
-      }
-      setToken(accessToken);
-      return await getUser();
-    },
-    logout: async () => {
-      const user = useUser();
-      try {
-        if (user.value) {
-          await fetch("/account/1/logout", { method: "POST" });
-        }
-      } finally {
-        flush();
-      }
-    }
-  };
   return { fetch, getUser, getVisitorIdentifier, useApiFetch, userActions };
 }

package/dist/runtime/packages/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inzombieland/api",
-  "version": "1.16.10",
+  "version": "1.16.12",
   "type": "module",
   "license": "ISC",
   "main": "./index.mjs",

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

@@ -1,3 +1,4 @@
+import type { User } from "./use-user";
 import type { FetchOptions, FetchRequest, FetchResponse } from "ofetch";
 import type { ZodError } from "zod";
 export type FetchExtraOptions = FetchOptions & {
@@ -36,6 +37,10 @@ export type FetchConfig = {
     getDevice: () => Promise<string> | string;
     useRequestHeaders?: (include: string[]) => {};
 };
+export type GetUserResponse = {
+    token?: string | null;
+    user?: User | null;
+};
 export type ActiveSession = {
     id: string;
     visitorId: string;

package/dist/runtime/packages/api/user-actions.d.ts

@@ -0,0 +1,11 @@
+import type { Fetch, FetchConfig, GetUserResponse } from "./types";
+export declare const createApiUserActions: (fetch: Fetch, config: FetchConfig, getUser: () => Promise<GetUserResponse>) => {
+    signIn: (body: {
+        username: string;
+        password: string;
+        rememberMe: boolean;
+    }) => Promise<GetUserResponse | {
+        key: string;
+    }>;
+    logout: () => Promise<void>;
+};

package/dist/runtime/packages/api/user-actions.mjs

@@ -0,0 +1,35 @@
+import { flush, setToken } from "./api-client.mjs";
+import { once } from "./helpers/index.mjs";
+import { useUser } from "./use-user.mjs";
+export const createApiUserActions = once(
+  (fetch, config, getUser) => {
+    return {
+      signIn: async (body) => {
+        const response = await fetch("/account/0/signin", {
+          body,
+          method: "POST",
+          ...config.useRequestHeaders?.(["cookie"]) ?? {}
+        });
+        const { accessToken, key, ...rest } = response;
+        if (!accessToken) {
+          if (key) {
+            return { key };
+          }
+          throw rest;
+        }
+        setToken(accessToken);
+        return await getUser();
+      },
+      logout: async () => {
+        const user = useUser();
+        try {
+          if (user.value) {
+            await fetch("/account/1/logout", { method: "POST" });
+          }
+        } finally {
+          flush();
+        }
+      }
+    };
+  }
+);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inzombieland/nuxt-common",
-  "version": "1.16.11",
+  "version": "1.16.12",
   "license": "ISC",
   "type": "module",
   "exports": {