fix: small bugs

Intevel · Nov 6, 2022 · 5080140 · 5080140
1 parent 4ad89b6
commit 5080140
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 38 deletions.
diff --git a/playground/nuxt.config.ts b/playground/nuxt.config.ts
@@ -1,9 +1,8 @@
-import { defineNuxtConfig } from "nuxt";
-import NuxtDirectus from "..";
+import NuxtDirectus from '..'
 
 export default defineNuxtConfig({
   modules: [NuxtDirectus],
   directus: {
-    url: "https://swyi1ut9.directus.app/",
-  },
-});
+    url: '-'
+  }
+})
diff --git a/src/module.ts b/src/module.ts
@@ -1,6 +1,6 @@
 import { resolve } from 'path'
 import { fileURLToPath } from 'url'
-import defu from 'defu'
+import { defu } from 'defu'
 import { defineNuxtModule, addPlugin, addAutoImportDir } from '@nuxt/kit'
 import { DirectusQueryParams } from './runtime/types'
 export interface ModuleOptions {
@@ -42,15 +42,26 @@ export default defineNuxtModule<ModuleOptions>({
     autoFetch: true
   },
   setup (options, nuxt) {
-    nuxt.options.runtimeConfig.public.directus = defu(
-      nuxt.options.runtimeConfig.public.directus,
-      {
-        url: options.url,
-        autoFetch: options.autoFetch,
-        fetchUserParams: options.fetchUserParams,
-        token: options.token
-      }
-    )
+    // Nuxt 2 / Bridge
+    if (!nuxt?.options?.runtimeConfig?.public?.directus) {
+      nuxt.options.publicRuntimeConfig.directus = defu(
+        nuxt.options.publicRuntimeConfig.directus,
+        {
+          url: options.url,
+          autoFetch: options.autoFetch,
+          fetchUserParams: options.fetchUserParams,
+          token: options.token
+        }
+      )
+    }
+
+    // Nuxt 3
+    nuxt.options.runtimeConfig.public.directus = defu(nuxt.options.runtimeConfig.directus, {
+      url: options.url,
+      autoFetch: options.autoFetch,
+      fetchUserParams: options.fetchUserParams,
+      token: options.token
+    })
 
     const runtimeDir = fileURLToPath(new URL('./runtime', import.meta.url))
     nuxt.options.build.transpile.push(runtimeDir)

diff --git a/src/runtime/composables/useDirectus.ts b/src/runtime/composables/useDirectus.ts
@@ -1,4 +1,4 @@
-import type { FetchError, FetchOptions } from 'ohmyfetch'
+import type { FetchOptions } from 'ohmyfetch'
 import { useDirectusUrl } from './useDirectusUrl'
 import { useDirectusToken } from './useDirectusToken'
 import { useNuxtApp, useRuntimeConfig } from '#app'

diff --git a/src/runtime/composables/useDirectusCollections.ts b/src/runtime/composables/useDirectusCollections.ts
@@ -22,14 +22,8 @@ export const useDirectusCollections = () => {
   const getCollection = async <T>(
     data: DirectusCollectionRequest
   ): Promise<T> => {
-    let connectionName = ''
-
-    if (data.name) {
-      connectionName = data.name
-    }
-
     const collection = await directus<{ data: T }>(
-      `/collections/${connectionName}`,
+      `/collections/${data.collection}`,
       {
         method: 'GET'
       }
@@ -51,7 +45,7 @@ export const useDirectusCollections = () => {
     data: DirectusCollectionUpdate
   ): Promise<T> => {
     const collection = await directus<{ data: T }>(
-      `/collections/${data.name}`,
+      `/collections/${data.collection}`,
       {
         method: 'PATCH',
         body: {
@@ -65,7 +59,7 @@ export const useDirectusCollections = () => {
   const deleteCollection = async <T>(
     data: DirectusCollectionRequest
   ): Promise<void> => {
-    await directus<{ data: T }>(`/collections/${data.name}`, {
+    await directus<{ data: T }>(`/collections/${data.collection}`, {
       method: 'DELETE'
     })
   }

diff --git a/src/runtime/types/index.d.ts b/src/runtime/types/index.d.ts
@@ -23,6 +23,19 @@ export interface DirectusPasswordResetCredentials {
   password: string;
 }
 
+export interface DirectusQueryParams {
+  fields?: Array<string>;
+  sort?: string | Array<string>;
+  filter?: Record<string, unknown>;
+  limit?: number;
+  offset?: number;
+  page?: number;
+  alias?: string | Array<string>;
+  deep?: Record<string, unknown>;
+  search?: string;
+  meta?: 'total_count' | 'filter_count' | '*';
+}
+
 export interface DirectusItemRequest {
   collection: string;
   id?: string;
@@ -44,19 +57,6 @@ export interface DirectusItemDeletion {
   items: Array<string> | string;
 }
 
-export interface DirectusQueryParams {
-  fields?: Array<string>;
-  sort?: string | Array<string>;
-  filter?: Record<string, unknown>;
-  limit?: number;
-  offset?: number;
-  page?: number;
-  alias?: string | Array<string>;
-  deep?: Record<string, unknown>;
-  search?: string;
-  meta?: 'total_count' | 'filter_count' | '*';
-}
-
 export type DirectusThumbnailFormat = 'jpg' | 'png' | 'webp' | 'tiff';
 
 export type DirectusThumbnailFit = 'cover' | 'contain' | 'inside' | 'outside';