@merkaly/nuxt 0.1.16 → 0.1.17

package/dist/module.json

@@ -4,7 +4,7 @@
   "compatibility": {
     "nuxt": ">=3.0.0"
   },
-  "version": "0.1.16",
+  "version": "0.1.17",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

package/dist/module.mjs

@@ -1,64 +1,9 @@
-import { defineNuxtModule, createResolver, useLogger, addPlugin, addRouteMiddleware, addImportsDir, addComponentsDir } from '@nuxt/kit';
+import { defineNuxtModule, createResolver, useLogger, addPlugin, addRouteMiddleware, addImportsDir, addComponentsDir, addTypeTemplate } from '@nuxt/kit';
 import { createJiti } from 'jiti';
+import { defu } from 'defu';
 import { existsSync } from 'node:fs';
 import svgLoader from 'vite-svg-loader';
 
-function isPlainObject(value) {
-  if (value === null || typeof value !== "object") {
-    return false;
-  }
-  const prototype = Object.getPrototypeOf(value);
-  if (prototype !== null && prototype !== Object.prototype && Object.getPrototypeOf(prototype) !== null) {
-    return false;
-  }
-  if (Symbol.iterator in value) {
-    return false;
-  }
-  if (Symbol.toStringTag in value) {
-    return Object.prototype.toString.call(value) === "[object Module]";
-  }
-  return true;
-}
-
-function _defu(baseObject, defaults, namespace = ".", merger) {
-  if (!isPlainObject(defaults)) {
-    return _defu(baseObject, {}, namespace, merger);
-  }
-  const object = Object.assign({}, defaults);
-  for (const key in baseObject) {
-    if (key === "__proto__" || key === "constructor") {
-      continue;
-    }
-    const value = baseObject[key];
-    if (value === null || value === void 0) {
-      continue;
-    }
-    if (merger && merger(object, key, value, namespace)) {
-      continue;
-    }
-    if (Array.isArray(value) && Array.isArray(object[key])) {
-      object[key] = [...value, ...object[key]];
-    } else if (isPlainObject(value) && isPlainObject(object[key])) {
-      object[key] = _defu(
-        value,
-        object[key],
-        (namespace ? `${namespace}.` : "") + key.toString(),
-        merger
-      );
-    } else {
-      object[key] = value;
-    }
-  }
-  return object;
-}
-function createDefu(merger) {
-  return (...arguments_) => (
-    // eslint-disable-next-line unicorn/no-array-reduce
-    arguments_.reduce((p, c) => _defu(p, c, "", merger), {})
-  );
-}
-const defu = createDefu();
-
 const module = defineNuxtModule({
   defaults: {
     auth0: {
@@ -125,6 +70,10 @@ const module = defineNuxtModule({
       prefix: "MK"
     });
     nuxt.options["vite"] = defu(nuxt.options["vite"] || {}, { plugins: [svgLoader()] });
+    addTypeTemplate({
+      filename: "types/merkaly.d.ts",
+      src: moduleResolver.resolve("./runtime/types/nuxt.d.ts")
+    });
   }
 });
 

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

@@ -6,7 +6,7 @@ export interface ComposableOptions<TData = unknown, TMeta = Record<string, unkno
 }
 export interface UseApiReturn<TData, TMeta, TParams> {
     abort: () => void;
-    data: Ref<TData | undefined>;
+    data: Ref<TData>;
     error: Ref<Error | undefined>;
     execute: (args?: Partial<TParams>) => Promise<void>;
     loading: Ref<boolean>;

package/dist/runtime/plugins/api.global.js

@@ -3,7 +3,7 @@ import { useAuth } from "#imports";
 export default defineNuxtPlugin(({ provide }) => provide("api", async (url, options = {}) => {
   const { public: $config } = useRuntimeConfig();
   const { tenant, token } = useAuth();
-  $fetch(url, {
+  await $fetch(url, {
     // Determine the base URL
     baseURL: new URL(options.prefix || $config.merkaly.api.prefix || "/", $config.merkaly.api.url).href,
     body: options?.body,

package/dist/runtime/plugins/auth0.client.js

@@ -3,7 +3,7 @@ import { defineNuxtPlugin, useRuntimeConfig } from "#imports";
 import { navigateTo } from "#app";
 import { defu } from "defu";
 import { useAuth } from "../composables/useAuth.js";
-export default defineNuxtPlugin(async (nuxtApp) => {
+export default defineNuxtPlugin(async ({ callHook, hook }) => {
   const { public: $config } = useRuntimeConfig();
   const auth0 = await createAuth0Client({
     cacheLocation: "localstorage",
@@ -29,14 +29,6 @@ export default defineNuxtPlugin(async (nuxtApp) => {
       returnTo: URL.canParse($config.merkaly.auth0.logoutUrl) ? $config.merkaly.auth0.logoutUrl : location.origin.concat($config.merkaly.auth0.logoutUrl)
     }
   });
-  Promise.allSettled([auth0.getUser(), auth0.getTokenSilently()]).then((results) => {
-    const rejected = results.filter((r) => r.status === "rejected");
-    if (rejected.length > 0) {
-      return nuxtApp.callHook("merkaly:auth:error", { errors: rejected.map((r) => r.reason) });
-    }
-    if (user.value) {
-      return nuxtApp.callHook("merkaly:auth:success", { user: user.value, token: token.value });
-    }
-  }).finally(() => isLoading.value = false);
+  hook("app:created", () => Promise.allSettled([auth0.getUser(), auth0.getTokenSilently()]).then(() => callHook("merkaly:auth", user.value)).finally(() => isLoading.value = false));
   return { provide: { auth0 } };
 });

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

@@ -8,8 +8,7 @@ declare module '#app' {
   }
 
   interface RuntimeNuxtHooks {
-    'merkaly:auth:success': (payload: { user: User; token: string }) => void | Promise<void>;
-    'merkaly:auth:error': (payload: { errors: unknown[] }) => void | Promise<void>;
+    'merkaly:auth': (user: User | null) => void | Promise<void>;
   }
 }
 

package/dist/runtime/utils/withAdapter.d.ts

@@ -6,6 +6,7 @@ export interface AdapterOptions {
     params: object;
 }
 export interface AdapterArgs<TData, TMeta, TParams> extends HooksOptions<TData, TMeta, TParams> {
+    immediate?: boolean;
     params?: Partial<TParams>;
 }
 type AdapterCallback<T extends AdapterOptions> = (args: T['params']) => AdapterArgs<T['data'], T['meta'], T['params']>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@merkaly/nuxt",
-  "version": "0.1.16",
+  "version": "0.1.17",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/merkaly-io/nuxt.git"
@@ -27,20 +27,6 @@
   "files": [
     "dist"
   ],
-  "scripts": {
-    "build": "nuxt-module-build build",
-    "build:stub": "nuxt-module-build build --stub",
-    "dev": "pnpm dev:prepare && cd playground && pnpm storybook",
-    "dev:build": "nuxi build playground",
-    "dev:prepare": "pnpm build:stub && nuxi prepare playground",
-    "lint": "eslint .",
-    "prepack": "pnpm build",
-    "prepare": "nuxt-module-build prepare",
-    "release": "pnpm lint && pnpm test && pnpm build && changelogen --release && npm publish --access public && git push --follow-tags",
-    "test": "vitest run",
-    "test:types": "vue-tsc --noEmit && cd playground && vue-tsc --noEmit",
-    "test:watch": "vitest watch"
-  },
   "dependencies": {
     "@auth0/auth0-spa-js": "^2.11.0",
     "@bootstrap-vue-next/nuxt": "^0.42.0",
@@ -78,7 +64,22 @@
     "vitest": "^4.0.6",
     "vue-tsc": "^3.2.1"
   },
+  "optionalDependencies": {
+    "defu": "^6.1.4"
+  },
   "engines": {
     "node": ">=20.0.0"
+  },
+  "scripts": {
+    "build": "nuxt-module-build build",
+    "build:stub": "nuxt-module-build build --stub",
+    "dev": "pnpm dev:prepare && cd playground && pnpm storybook",
+    "dev:build": "nuxi build playground",
+    "dev:prepare": "pnpm build:stub && nuxi prepare playground",
+    "lint": "eslint .",
+    "release": "pnpm lint && pnpm test && pnpm build && changelogen --release && npm publish --access public && git push --follow-tags",
+    "test": "vitest run",
+    "test:types": "vue-tsc --noEmit && cd playground && vue-tsc --noEmit",
+    "test:watch": "vitest watch"
   }
-}
+}