@yassidev/nuxt-directus 0.0.22 → 0.0.23

package/dist/module.d.mts

@@ -546,12 +546,6 @@ interface ProxyOptions {
 interface ModuleOptions {
     url?: string;
     accessToken?: string;
-    composables?: false | {
-        enabled?: boolean;
-        mode?: 'graphql' | 'rest';
-        client?: boolean;
-        server?: boolean;
-    };
     i18n?: false | {
         enabled?: boolean;
         sync?: boolean;
@@ -573,18 +567,7 @@ interface ModuleOptions {
         enabled?: boolean;
         alias?: string;
     };
-    auth?: false | AuthConfig;
 }
-type AuthConfig = {
-    enabled?: boolean;
-} & ({
-    mode: 'static';
-    token?: string;
-} | {
-    mode: 'cookie' | 'session';
-    autoRefresh?: boolean;
-    cookieName?: string;
-});
 declare const _default: _nuxt_schema.NuxtModule<ModuleOptions, ModuleOptions, false>;
 
 export { _default as default };

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "directus",
   "configKey": "directus",
-  "version": "0.0.22",
+  "version": "0.0.23",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

package/dist/module.mjs

@@ -1,4 +1,4 @@
-import { defineNuxtModule, useLogger, updateRuntimeConfig, hasNuxtModule, createResolver, addImportsDir, addImports, addServerImportsDir, addServerImports, addTemplate, addTypeTemplate } from 'nuxt/kit';
+import { defineNuxtModule, useLogger, createResolver, addImports, addServerImports, updateRuntimeConfig, hasNuxtModule, addTemplate, addTypeTemplate } from 'nuxt/kit';
 import { generateDirectusTypes } from 'directus-sdk-typegen';
 import { fetchTranslations, syncTranslations } from '../dist/runtime/server.js';
 import { unwatchFile, watchFile, watch as watch$1, stat as stat$1, readFileSync, existsSync } from 'node:fs';
@@ -1807,33 +1807,40 @@ const module$1 = defineNuxtModule({
     }
     nuxt.options.typescript.hoist ??= [];
     nuxt.options.typescript.hoist.push("@directus/sdk");
-    const auth = config.auth.enabled ? {
-      mode: config.auth.mode,
-      autoRefresh: config.auth.mode === "cookie" || config.auth.mode === "session" ? config.auth.autoRefresh : void 0,
-      cookieName: config.auth.mode === "cookie" || config.auth.mode === "session" ? config.auth.cookieName : void 0,
-      token: config.auth.mode === "static" ? config.auth.token ?? config.accessToken : void 0
-    } : void 0;
+    const { resolve } = createResolver(import.meta.url);
+    addImports([
+      {
+        name: "createBaseDirectus",
+        from: resolve("./runtime/client")
+      },
+      {
+        name: "handleDirectusError",
+        from: resolve("./runtime/client")
+      }
+    ]);
+    addServerImports([{
+      name: "createBaseDirectus",
+      from: resolve("./runtime/client")
+    }, {
+      name: "handleDirectusError",
+      from: resolve("./runtime/client")
+    }]);
     updateRuntimeConfig({
       [NAME]: {
         url: config.url,
         accessToken: config.accessToken,
-        i18nPrefix: config.i18n.prefix,
-        auth
+        i18nPrefix: config.i18n.prefix
       },
       public: {
         [NAME]: {
-          url: config.composables.client ? config.url : void 0,
-          i18nPrefix: config.i18n.prefix,
-          auth
+          url: config.url,
+          i18nPrefix: config.i18n.prefix
         }
       }
     });
     if (config.types.enabled) {
       setupTypes(config, nuxt, logger);
     }
-    if (config.composables.enabled) {
-      setupComposables(config, nuxt, logger);
-    }
     if (config.i18n.enabled) {
       if (!hasNuxtModule("@nuxtjs/i18n")) return logger.error("@nuxtjs/i18n is not installed! Please install it to use the i18n features of this module.");
       setupI18n(config, nuxt, logger);
@@ -1854,39 +1861,16 @@ function normalizeConfig(options, nuxt) {
     i18n: options.i18n === false ? { enabled: false } : options.i18n,
     types: options.types === false ? { enabled: false } : options.types,
     proxy: options.proxy === false ? { enabled: false } : options.proxy,
-    image: options.image === false ? { enabled: false } : options.image,
-    composables: options.composables === false ? { enabled: false } : options.composables,
-    auth: options.auth === false ? { enabled: false } : options.auth
+    image: options.image === false ? { enabled: false } : options.image
   }, {
     url: process.env.DIRECTUS_URL ?? "http://localhost:8055",
     accessToken: process.env.DIRECTUS_ACCESS_TOKEN || process.env.DIRECTUS_ADMIN_TOKEN || "",
     i18n: { enabled: hasNuxtModule("@nuxtjs/i18n"), sync: nuxt.options.dev, prefix: void 0 },
     types: { enabled: nuxt.options.dev, transform: [] },
     proxy: { enabled: true, path: "/directus", options: {} },
-    image: { enabled: hasNuxtModule("@nuxt/image"), alias: "directus" },
-    composables: { enabled: true, mode: "rest", client: true, server: false },
-    auth: { enabled: true, mode: "cookie", autoRefresh: true, cookieName: "auth_token" }
+    image: { enabled: hasNuxtModule("@nuxt/image"), alias: "directus" }
   });
 }
-function setupComposables(config, nuxt, logger) {
-  const { resolve } = createResolver(import.meta.url);
-  const path = resolve(`./runtime/composables`);
-  const name = config.composables.mode === "graphql" ? "useDirectusGraphql" : "useDirectusRest";
-  const mainImport = {
-    name,
-    as: "useDirectus",
-    from: join(path, "useDirectus")
-  };
-  if (config.composables.client) {
-    addImportsDir(path);
-    addImports(mainImport);
-  }
-  if (config.composables.server) {
-    addServerImportsDir(path);
-    addServerImports(mainImport);
-  }
-  logger.info(`Composables have been registered (mode: ${config.composables.mode}).`);
-}
 function setupI18n(config, nuxt, logger) {
   const { resolve } = createResolver(import.meta.url);
   const codes = (nuxt.options.i18n?.locales || []).map((locale) => typeof locale === "string" ? locale : locale.code);

package/dist/runtime/client.d.ts

@@ -1,7 +1,11 @@
+import type { FetchContext, FetchResponse } from 'ofetch';
 /**
  * Create base directus instance.
  */
 export declare function createBaseDirectus(): import("@directus/sdk").DirectusClient<import('#directus/types').Schema>;
+export declare function handleDirectusError({ response }: FetchContext<unknown> & {
+    response: FetchResponse<any>;
+}): void;
 /**
  * Get i18n translations.
  */

package/dist/runtime/client.js

@@ -1,7 +1,7 @@
 import { NAME } from "./constants.js";
-import { authentication, createDirectus, staticToken } from "@directus/sdk";
+import { createDirectus } from "@directus/sdk";
 import { parseHost, joinURL } from "ufo";
-import { createError, useCookie, useRuntimeConfig } from "#imports";
+import { createError, useRuntimeConfig } from "#imports";
 import { fetchTranslations } from "./server.js";
 function getRuntimeConfig() {
   if (import.meta.server) return useRuntimeConfig()[NAME];
@@ -17,58 +17,16 @@ function getRuntimeClientDirectusURL(path) {
   return hasHost ? path : joinURL(window.location.origin, path);
 }
 export function createBaseDirectus() {
-  const { url, auth } = getRuntimeConfig();
-  const instance = createDirectus(url, {
-    globals: {
-      fetch: $fetch.create({
-        async onRequest({ options }) {
-          if (!auth?.cookieName) return;
-          const token = useCookie(auth.cookieName).value;
-          if (token) {
-            options.headers.set("Authorization", `Bearer ${token}`);
-          }
-        },
-        async onResponse({ response, options, request }) {
-          try {
-            if (!auth?.cookieName) return;
-            if (request.toString().endsWith("/auth/login")) {
-              const { mode } = JSON.parse(String(options.body));
-              if (mode === "cookie") {
-                const { access_token, expires } = response._data.data;
-                useCookie(auth.cookieName, {
-                  expires: expires ? new Date(Date.now() + expires * 1e3) : void 0
-                }).value = access_token;
-              }
-            }
-          } catch (error) {
-            console.error("Error handling response:", error);
-          }
-        },
-        onResponseError({ response }) {
-          const [error] = response._data.errors || [];
-          if (!error) return;
-          throw createError({
-            status: response.status,
-            message: error.message
-          });
-        }
-      })
-    }
+  const { url } = getRuntimeConfig();
+  return createDirectus(url);
+}
+export function handleDirectusError({ response }) {
+  const [error] = response._data?.errors || [];
+  if (!error) return;
+  throw createError({
+    status: response.status,
+    message: error.message
   });
-  if (auth.mode === "static") {
-    instance.with(staticToken(auth.token));
-  } else if (auth.mode === "cookie") {
-    instance.with(authentication("cookie", {
-      autoRefresh: auth.autoRefresh,
-      credentials: "include"
-    }));
-  } else if (auth.mode === "session") {
-    instance.with(authentication("session", {
-      autoRefresh: auth.autoRefresh,
-      credentials: "include"
-    }));
-  }
-  return instance;
 }
 export async function getI18nTranslations(locale, config = getRuntimeConfig()) {
   const data = await fetchTranslations(locale, config);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yassidev/nuxt-directus",
-  "version": "0.0.22",
+  "version": "0.0.23",
   "description": "A Nuxt module for better integration with Directus CMS.",
   "repository": "yassilah/nuxt-directus",
   "license": "MIT",

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

@@ -1,8 +0,0 @@
-/**
- * Use directus (rest)
- */
-export declare function useDirectusRest(): import("@directus/sdk").DirectusClient<import('#directus/types').Schema> & import("@directus/sdk").RestClient<import('#directus/types').Schema>;
-/**
- * Use directus (rest)
- */
-export declare function useDirectusGraphql(): import("@directus/sdk").DirectusClient<import('#directus/types').Schema> & import("@directus/sdk").GraphqlClient<import('#directus/types').Schema>;

package/dist/runtime/composables/useDirectus.js

@@ -1,8 +0,0 @@
-import { rest, graphql } from "@directus/sdk";
-import { createBaseDirectus } from "./../client.js";
-export function useDirectusRest() {
-  return createBaseDirectus().with(rest());
-}
-export function useDirectusGraphql() {
-  return createBaseDirectus().with(graphql());
-}