nuxt-directus-sdk 0.0.3 → 0.0.4

package/README.md

@@ -5,14 +5,14 @@
 [![License][license-src]][license-href]
 [![Nuxt][nuxt-src]][nuxt-href]
 
-> A bunch of directus helpers for nuxt applications
+> A Nuxt 3 Directus module that uses the official Directus 11 SDK
 
 - [✨  Release Notes](/CHANGELOG.md)
 
 ## Features
 
-- ⛰  Built-in Directus auth and type generation
-- 🚠  Built-in helpers and utils 
+- ⛰  Directus authentication out of the box
+- 🚠  Automatic type generation based on Directus collections
 
 ## Quick Setup
 

package/dist/module.d.mts

@@ -1,6 +1,6 @@
 import * as _nuxt_schema from '@nuxt/schema';
 import { Query } from '@directus/sdk';
-import { AllCollections } from '#build/types/directus';
+import { AllDirectusCollections } from '#build/types/directus';
 
 interface ModuleOptions {
     /**
@@ -17,21 +17,21 @@ interface ModuleOptions {
     adminToken?: string;
     /**
      * Fetch the user serverside
-    *
-    * @default true
-    */
+     *
+     * @default true
+     */
     fetchUser?: boolean;
     /**
-    * Directus Auth Options
-    * @default {}
-    * @type Query<AllCollections, AllCollections['directus_users']>
-   */
-    fetchUserParams?: Query<AllCollections, AllCollections['directus_users']>;
+     * Directus Auth Options
+     * @default {}
+     * @type Query<AllDirectusCollections, AllDirectusCollections['directus_users']>
+     */
+    fetchUserParams?: Query<AllDirectusCollections, AllDirectusCollections['directus_users']>;
     /**
      * Add Directus Admin in Nuxt Devtools
      *
-     * @default false
-    */
+     * @default true
+     */
     devtools?: boolean;
     /**
      * Token Cookie Name
@@ -40,37 +40,43 @@ interface ModuleOptions {
      */
     cookieNameAccessToken?: string;
     /**
-       * Refresh Token Cookie Name
-       * @type string
-       * @default 'directus_refresh_token'
-       */
+     * Refresh Token Cookie Name
+     * @type string
+     * @default 'directus_refresh_token'
+     */
     cookieNameRefreshToken?: string;
     /**
-       * The max age for auth cookies in seconds.
-       * This should match your directus env key AUTH_TOKEN_TTL
-       * @type string
-       * @default 900
-       */
+     * The max age for auth cookies in seconds.
+     * This should match your directus env key AUTH_TOKEN_TTL
+     * @type string
+     * @default 900
+     */
     cookieMaxAge?: number;
     /**
-       * The max age for auth cookies in seconds.
-       * This should match your directus env key REFRESH_TOKEN_TTL
-       * @type string
-       * @default 604800
-       */
+     * The max age for auth cookies in seconds.
+     * This should match your directus env key REFRESH_TOKEN_TTL
+     * @type string
+     * @default 604800
+     */
     cookieMaxAgeRefreshToken?: number;
     /**
-       * The SameSite attribute for auth cookies.
-       * @type string
-       * @default 'lax'
-       */
+     * The SameSite attribute for auth cookies.
+     * @type string
+     * @default 'lax'
+     */
     cookieSameSite?: 'strict' | 'lax' | 'none' | undefined;
     /**
-       * The Secure attribute for auth cookies.
-       * @type boolean
-       * @default false
-       */
+     * The Secure attribute for auth cookies.
+     * @type boolean
+     * @default false
+     */
     cookieSecure?: boolean;
+    /**
+     * The Secure attribute for auth cookies.
+     * @type string
+     * @default ''
+     */
+    typePrefix?: string;
 }
 declare const _default: _nuxt_schema.NuxtModule<ModuleOptions>;
 

package/dist/module.d.ts

@@ -1,6 +1,6 @@
 import * as _nuxt_schema from '@nuxt/schema';
 import { Query } from '@directus/sdk';
-import { AllCollections } from '#build/types/directus';
+import { AllDirectusCollections } from '#build/types/directus';
 
 interface ModuleOptions {
     /**
@@ -17,21 +17,21 @@ interface ModuleOptions {
     adminToken?: string;
     /**
      * Fetch the user serverside
-    *
-    * @default true
-    */
+     *
+     * @default true
+     */
     fetchUser?: boolean;
     /**
-    * Directus Auth Options
-    * @default {}
-    * @type Query<AllCollections, AllCollections['directus_users']>
-   */
-    fetchUserParams?: Query<AllCollections, AllCollections['directus_users']>;
+     * Directus Auth Options
+     * @default {}
+     * @type Query<AllDirectusCollections, AllDirectusCollections['directus_users']>
+     */
+    fetchUserParams?: Query<AllDirectusCollections, AllDirectusCollections['directus_users']>;
     /**
      * Add Directus Admin in Nuxt Devtools
      *
-     * @default false
-    */
+     * @default true
+     */
     devtools?: boolean;
     /**
      * Token Cookie Name
@@ -40,37 +40,43 @@ interface ModuleOptions {
      */
     cookieNameAccessToken?: string;
     /**
-       * Refresh Token Cookie Name
-       * @type string
-       * @default 'directus_refresh_token'
-       */
+     * Refresh Token Cookie Name
+     * @type string
+     * @default 'directus_refresh_token'
+     */
     cookieNameRefreshToken?: string;
     /**
-       * The max age for auth cookies in seconds.
-       * This should match your directus env key AUTH_TOKEN_TTL
-       * @type string
-       * @default 900
-       */
+     * The max age for auth cookies in seconds.
+     * This should match your directus env key AUTH_TOKEN_TTL
+     * @type string
+     * @default 900
+     */
     cookieMaxAge?: number;
     /**
-       * The max age for auth cookies in seconds.
-       * This should match your directus env key REFRESH_TOKEN_TTL
-       * @type string
-       * @default 604800
-       */
+     * The max age for auth cookies in seconds.
+     * This should match your directus env key REFRESH_TOKEN_TTL
+     * @type string
+     * @default 604800
+     */
     cookieMaxAgeRefreshToken?: number;
     /**
-       * The SameSite attribute for auth cookies.
-       * @type string
-       * @default 'lax'
-       */
+     * The SameSite attribute for auth cookies.
+     * @type string
+     * @default 'lax'
+     */
     cookieSameSite?: 'strict' | 'lax' | 'none' | undefined;
     /**
-       * The Secure attribute for auth cookies.
-       * @type boolean
-       * @default false
-       */
+     * The Secure attribute for auth cookies.
+     * @type boolean
+     * @default false
+     */
     cookieSecure?: boolean;
+    /**
+     * The Secure attribute for auth cookies.
+     * @type string
+     * @default ''
+     */
+    typePrefix?: string;
 }
 declare const _default: _nuxt_schema.NuxtModule<ModuleOptions>;
 

package/dist/module.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-directus-sdk",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "configKey": "directus",
   "compatibility": {
     "nuxt": "^3.0.0",

package/dist/module.mjs

@@ -1,13 +1,14 @@
 import { defu } from 'defu';
-import { useLogger, defineNuxtModule, createResolver, addPlugin, addImportsDir, addComponentsDir, addTypeTemplate } from '@nuxt/kit';
+import { useLogger, defineNuxtModule, tryResolveModule, createResolver, addPlugin, addImportsDir, addComponentsDir, addTypeTemplate, addImportsSources } from '@nuxt/kit';
 import { joinURL } from 'ufo';
 import { createDirectus, authentication, rest, readCollections, readFields, readRelations } from '@directus/sdk';
+import { pascalCase } from 'change-case';
 
 const name = "nuxt-directus-sdk";
-const version = "0.0.3";
+const version = "0.0.4";
 
 function warn(message) {
-  useLogger(message);
+  useLogger("nuxt-directus-sdk").warn(message);
 }
 async function generateTypes(options) {
   const collections = await getCollections(options);
@@ -15,7 +16,7 @@ async function generateTypes(options) {
   const types = [];
   Object.values(collections).forEach((collection) => {
     const collectionName = collection.collection;
-    const typeName = pascalCase(collectionName);
+    const typeName = collectionName.startsWith("directus_") ? pascalCase(collectionName) : pascalCase(`${options.prefix}${collectionName}`);
     types.push(`${collectionName}: ${typeName}[]`);
     typeValues += `export type ${typeName} = {
 `;
@@ -32,25 +33,32 @@ async function generateTypes(options) {
     });
     typeValues += "};\n\n";
   });
-  typeValues += `export interface AllCollections {
-${types.map((x) => `  ${x};`).join("\n")}
-};
+  return `
+  // This file is auto-generated by @nuxtjs/directus-sdk
+  ${typeValues}
 
-     interface UsersCollections {
-${types.filter((item) => !item.startsWith("directus_")).map((x) => `  ${x};`).join("\n")}
-};
+  export interface AllDirectusCollections {
+    ${types.map((x) => `  ${x};`).join("\n")}
+  };
 
-     declare global {
-      interface DirectusCollections {
-${types.filter((item) => !item.startsWith("directus_")).map((x) => `  ${x};`).join("\n")}
-};
-    }     
+  export interface DirectusSchema {
+    ${types.filter((item) => !item.startsWith("directus_")).map((x) => `  ${x};`).join("\n")}
+  };
+
+  declare global {
+    ${typeValues.replaceAll("export type", "type")}
+
+    interface AllDirectusCollections {
+      ${types.map((x) => `  ${x};`).join("\n")}
+    };
+
+    interface DirectusSchema {
+      ${types.filter((item) => !item.startsWith("directus_")).map((x) => `  ${x};`).join("\n")}
+    };
+  }
+
+  export {};
 `;
-  typeValues += "\n";
-  return typeValues;
-}
-function pascalCase(str) {
-  return str.split(" ").flatMap((x) => x.split("_")).flatMap((y) => y.split("-")).map((x) => x.charAt(0).toUpperCase() + x.slice(1)).join("");
 }
 function getType(field) {
   let type = "";
@@ -81,11 +89,11 @@ function getType(field) {
 async function getCollections(options) {
   const directus = createDirectus(options.url).with(authentication("json", { autoRefresh: false })).with(rest());
   directus.setToken(options.token);
-  const rawCollections = await directus.request(readCollections());
   const collections = {};
-  rawCollections.sort((a, b) => a.collection.localeCompare(b.collection)).forEach(
-    (collection) => collections[collection.collection] = { ...collection, fields: [] }
-  );
+  const rawCollections = await directus.request(readCollections());
+  rawCollections.sort((a, b) => a.collection.localeCompare(b.collection)).forEach((collection) => {
+    collections[collection.collection] = { ...collection, fields: [] };
+  });
   const fields = await directus.request(readFields());
   fields.sort((a, b) => a.field.localeCompare(b.field)).forEach((field) => {
     if (!collections[field.collection]) {
@@ -106,12 +114,8 @@ async function getCollections(options) {
       warn("No one collection");
       return;
     }
-    const oneField = collections[relation.meta.one_collection]?.fields.find(
-      (field) => field.field === relation.meta.one_field
-    );
-    const manyField = collections[relation.meta.many_collection]?.fields.find(
-      (field) => field.field === relation.meta.many_field
-    );
+    const oneField = collections[relation.meta.one_collection]?.fields.find((field) => field.field === relation.meta.one_field);
+    const manyField = collections[relation.meta.many_collection]?.fields.find((field) => field.field === relation.meta.many_field);
     if (oneField) {
       oneField.relation = {
         type: "many",
@@ -141,9 +145,9 @@ const module = defineNuxtModule({
     }
   },
   defaults: {
-    url: process.env.DIRECTUS_URL,
-    adminToken: process.env.DIRECTUS_ADMIN_TOKEN,
-    devtools: false,
+    url: process.env.DIRECTUS_URL ?? "",
+    adminToken: process.env.DIRECTUS_ADMIN_TOKEN ?? "",
+    devtools: true,
     fetchUser: true,
     fetchUserParams: {},
     cookieNameAccessToken: "directus_access_token",
@@ -152,22 +156,20 @@ const module = defineNuxtModule({
     cookieMaxAge: 900,
     cookieMaxAgeRefreshToken: 604800,
     cookieSameSite: "lax",
-    cookieSecure: false
+    cookieSecure: false,
+    typePrefix: ""
   },
   async setup(options, nuxt) {
+    if (!tryResolveModule("@directus/sdk")) {
+      logger.error("nuxt-directus-sdk requries @directus/sdk^11.0.3, install it with `npm i @directus/sdk`, `yarn add @directus/sdk`, `pnpm add @directus/sdk` or `bun install @directus/sdk`");
+      return;
+    }
     nuxt.options.runtimeConfig[configKey] = { adminToken: options.adminToken ?? "" };
     nuxt.options.runtimeConfig.public = nuxt.options.runtimeConfig.public || {};
     nuxt.options.runtimeConfig.public[configKey] = defu(nuxt.options.runtimeConfig.public[configKey], {
-      url: options.url,
-      fetchUser: options.fetchUser,
-      fetchUserParams: options.fetchUserParams,
-      devtools: options.devtools,
-      cookieNameAccessToken: options.cookieNameAccessToken,
-      cookieNameRefreshToken: options.cookieNameRefreshToken,
-      cookieMaxAge: options.cookieMaxAge,
-      cookieMaxAgeRefreshToken: options.cookieMaxAgeRefreshToken,
-      cookieSameSite: options.cookieSameSite,
-      cookieSecure: options.cookieSecure
+      ...options,
+      // Don't add the admin token to the public key
+      adminToken: null
     });
     const resolver = createResolver(import.meta.url);
     addPlugin(resolver.resolve("./runtime/plugin"));
@@ -233,7 +235,8 @@ const module = defineNuxtModule({
             getContents() {
               return generateTypes({
                 url: options.url,
-                token: options.adminToken
+                token: options.adminToken,
+                prefix: options.typePrefix ?? ""
               });
             }
           }).dst;
@@ -247,6 +250,57 @@ const module = defineNuxtModule({
         logger.info("Add DIRECTUS_ADMIN_TOKEN to the .env file to generate directus types");
       }
     }
+    addImportsSources({
+      from: "@directus/sdk",
+      imports: [
+        "createComment",
+        "updateComment",
+        "deleteComment",
+        "createField",
+        "createItem",
+        "createItems",
+        "deleteField",
+        "deleteFile",
+        "deleteFiles",
+        "readActivities",
+        "readActivity",
+        "deleteItem",
+        "deleteItems",
+        "deleteUser",
+        "deleteUsers",
+        "importFile",
+        "readCollection",
+        "readCollections",
+        "createCollection",
+        "updateCollection",
+        "deleteCollection",
+        "readField",
+        "readFieldsByCollection",
+        "readFields",
+        "readFile",
+        "readFiles",
+        "readItem",
+        "readItems",
+        "readSingleton",
+        "readMe",
+        "createUser",
+        "createUsers",
+        "readUser",
+        "readUsers",
+        "updateField",
+        "updateFile",
+        "updateFiles",
+        "updateFolder",
+        "updateFolders",
+        "updateItem",
+        "updateItems",
+        "updateSingleton",
+        "updateMe",
+        "updateUser",
+        "updateUsers",
+        "withToken"
+      ]
+    });
   }
 });
 

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

@@ -1,4 +1,4 @@
 import type { AuthenticationClient, DirectusClient, RestClient, WebSocketClient } from '@directus/sdk';
-import type { UsersCollections } from '#build/types/directus';
+import type { DirectusSchema } from '#build/types/directus';
 export declare function useDirectusUrl(): string;
-export declare function useDirectus(token?: string): DirectusClient<UsersCollections> & AuthenticationClient<UsersCollections> & RestClient<UsersCollections> & WebSocketClient<UsersCollections>;
+export declare function useDirectus(token?: string): DirectusClient<DirectusSchema> & AuthenticationClient<DirectusSchema> & RestClient<DirectusSchema> & WebSocketClient<DirectusSchema>;

package/dist/runtime/composables/directus.mjs

@@ -2,7 +2,10 @@ import { authentication, createDirectus, realtime, rest } from "@directus/sdk";
 import { useDirectusTokens } from "./tokens.mjs";
 import { useRuntimeConfig } from "#app";
 export function useDirectusUrl() {
-  return useRuntimeConfig().public.directus.url;
+  const url = useRuntimeConfig().public.directus.url;
+  if (url[url.length - 1] !== "/")
+    return `${url}/`;
+  return url;
 }
 function createDirectusStorage() {
   const tokens = useDirectusTokens();

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

@@ -1,5 +1,5 @@
 import type { Query } from '@directus/sdk';
-import type { AllCollections, DirectusFiles } from '#build/types/directus';
+import type { AllDirectusCollections, DirectusFiles } from '#build/types/directus';
 export type DirectusThumbnailFormat = 'jpg' | 'png' | 'webp' | 'tiff';
 export type DirectusThumbnailFit = 'cover' | 'contain' | 'inside' | 'outside';
 export interface DirectusThumbnailOptions {
@@ -9,15 +9,16 @@ export interface DirectusThumbnailOptions {
     fit?: DirectusThumbnailFit;
     format?: DirectusThumbnailFormat;
     withoutEnlargement?: boolean;
-    token?: string;
+    token?: string | boolean;
 }
 interface FileUpload {
     file: File;
     data?: Record<keyof DirectusFiles, string>;
 }
-export declare function uploadDirectusFile(files: FileUpload[], query: Query<AllCollections, AllCollections['directus_files']>): Promise<DirectusFiles[]>;
+export declare function uploadDirectusFile(file: FileUpload, query?: Query<AllDirectusCollections, AllDirectusCollections['directus_files']>): Promise<DirectusFiles | null>;
+export declare function uploadDirectusFiles(files: FileUpload[], query?: Query<AllDirectusCollections, AllDirectusCollections['directus_files']>): Promise<DirectusFiles[]>;
 export declare function getDirectusAssetUrl(fileId: string, options?: {
-    token?: string;
+    token?: string | boolean;
 }): string;
 export declare function getDirectusThumbnailUrl(fileId: string, options?: DirectusThumbnailOptions): string;
 export {};

package/dist/runtime/composables/files.mjs

@@ -1,6 +1,11 @@
 import { uploadFiles } from "@directus/sdk";
 import { useDirectus, useDirectusUrl } from "./directus.mjs";
-export async function uploadDirectusFile(files, query) {
+import { useDirectusTokens } from "./tokens.mjs";
+export async function uploadDirectusFile(file, query) {
+  const result = await uploadDirectusFiles([file], query);
+  return result[0] ?? null;
+}
+export async function uploadDirectusFiles(files, query) {
   const directus = useDirectus();
   const formData = new FormData();
   files.forEach(({ file, data }, i) => {
@@ -14,15 +19,17 @@ export async function uploadDirectusFile(files, query) {
   return await directus.request(uploadFiles(formData, query));
 }
 export function getDirectusAssetUrl(fileId, options) {
-  const directusUrl = useDirectusUrl();
-  const url = new URL(`${directusUrl}assets/${fileId}`);
-  if (options?.token)
-    url.searchParams.append("access_token", options.token);
+  const url = new URL(`${useDirectusUrl()}assets/${fileId}`);
+  if (options?.token) {
+    if (typeof options.token === "string")
+      url.searchParams.append("access_token", options.token);
+    else
+      url.searchParams.append("access_token", useDirectusTokens().accessToken.value ?? "");
+  }
   return url.href;
 }
 export function getDirectusThumbnailUrl(fileId, options) {
-  const directusUrl = useDirectusUrl();
-  const url = new URL(`${directusUrl}assets/${fileId}`);
+  const url = new URL(`${useDirectusUrl()}assets/${fileId}`);
   if (options) {
     if (options.width)
       url.searchParams.append("width", options.width.toFixed(0));
@@ -36,8 +43,12 @@ export function getDirectusThumbnailUrl(fileId, options) {
       url.searchParams.append("fit", options.fit);
     if (options.format)
       url.searchParams.append("format", options.format);
-    if (options.token)
-      url.searchParams.append("access_token", options.token);
+    if (options?.token) {
+      if (typeof options.token === "string")
+        url.searchParams.append("access_token", options.token);
+      else
+        url.searchParams.append("access_token", useDirectusTokens().accessToken.value ?? "");
+    }
   }
   return url.href;
 }

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

@@ -1,5 +1,5 @@
 export declare function useToast(): {
-    log: (message: string) => Promise<void>;
+    log: (message: string, options?: import("vue-toastification/dist/types/types").ToastOptions | undefined) => Promise<void>;
     success: (message: string, options?: (import("vue-toastification/dist/types/types").ToastOptions & {
         type?: import("vue-toastification").TYPE.SUCCESS | undefined;
     }) | undefined) => Promise<void>;

package/dist/runtime/composables/toast.mjs

@@ -1,9 +1,9 @@
 import { useToast as useToastFn } from "vue-toastification";
 export function useToast() {
   const toast = useToastFn();
-  async function log(message) {
+  async function log(message, options) {
     if (process.client)
-      toast(message);
+      toast(message, options);
     else
       console.log(message);
   }

package/dist/runtime/composables/tokens.mjs

@@ -2,7 +2,7 @@ import { useDomain } from "./domain.mjs";
 import { useCookie, useNuxtApp, useRuntimeConfig } from "#app";
 export function getCookieDomain() {
   const domain = useDomain();
-  return !domain.value.includes("localhost") ? `.${domain.value}` : void 0;
+  return domain.value.includes("localhost") || domain.value.includes("127.0.0.1") || domain.value.includes("0.0.0.0") ? void 0 : `.${domain.value}`;
 }
 function directusCookie(name, cookieOptions) {
   const nuxtApp = useNuxtApp();

package/dist/runtime/plugin.mjs

@@ -13,11 +13,13 @@ export default defineNuxtPlugin(async (nuxt) => {
       );
       if (mainDomain)
         domain.value = `${mainDomain}.${topLevelDomains.join(".")}`;
+      else if (host.includes("127.0.0.1") || host.includes("0.0.0.0"))
+        domain.value = host.split(":")?.[0] ?? "";
       else if (host.includes("localhost"))
-        domain.value = host.split(".").at(-1) ?? "";
+        domain.value = host.split(".")?.at(-1) ?? "";
       else
         domain.value = host;
-      subdomain.value = labels[0];
+      subdomain.value = labels?.[0] ?? "";
     }
   }
   const config = useRuntimeConfig();

package/dist/runtime/server/services/directus.d.ts

@@ -1,7 +1,7 @@
 import type { AuthenticationClient, DirectusClient, RestClient } from '@directus/sdk';
 import type { H3Event } from 'h3';
-import type { UsersCollections } from '#build/types/directus';
+import type { DirectusSchema } from '#build/types/directus';
 export declare function useDirectusAccessToken(event: H3Event): string | undefined;
 export declare function useDirectusUrl(): string;
-export declare function useDirectus(token?: string): DirectusClient<UsersCollections> & AuthenticationClient<UsersCollections> & RestClient<UsersCollections>;
-export declare function useAdminDirectus(): DirectusClient<UsersCollections> & AuthenticationClient<UsersCollections> & RestClient<UsersCollections>;
+export declare function useDirectus(token?: string): DirectusClient<DirectusSchema> & AuthenticationClient<DirectusSchema> & RestClient<DirectusSchema>;
+export declare function useAdminDirectus(): DirectusClient<DirectusSchema> & AuthenticationClient<DirectusSchema> & RestClient<DirectusSchema>;

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

@@ -2,6 +2,7 @@ import type { Collections } from './generate.types';
 export interface OASOptions {
     url: string;
     token: string;
+    prefix: string;
 }
 export declare function generateTypes(options: OASOptions): Promise<string>;
 export declare function getCollections(options: OASOptions): Promise<Collections>;

package/dist/runtime/types/generate.mjs

@@ -1,7 +1,8 @@
 import { useLogger } from "@nuxt/kit";
 import { authentication, createDirectus, readCollections, readFields, readRelations, rest } from "@directus/sdk";
+import { pascalCase } from "change-case";
 function warn(message) {
-  useLogger(message);
+  useLogger("nuxt-directus-sdk").warn(message);
 }
 export async function generateTypes(options) {
   const collections = await getCollections(options);
@@ -9,7 +10,7 @@ export async function generateTypes(options) {
   const types = [];
   Object.values(collections).forEach((collection) => {
     const collectionName = collection.collection;
-    const typeName = pascalCase(collectionName);
+    const typeName = collectionName.startsWith("directus_") ? pascalCase(collectionName) : pascalCase(`${options.prefix}${collectionName}`);
     types.push(`${collectionName}: ${typeName}[]`);
     typeValues += `export type ${typeName} = {
 `;
@@ -26,25 +27,32 @@ export async function generateTypes(options) {
     });
     typeValues += "};\n\n";
   });
-  typeValues += `export interface AllCollections {
-${types.map((x) => `  ${x};`).join("\n")}
-};
+  return `
+  // This file is auto-generated by @nuxtjs/directus-sdk
+  ${typeValues}
 
-     interface UsersCollections {
-${types.filter((item) => !item.startsWith("directus_")).map((x) => `  ${x};`).join("\n")}
-};
+  export interface AllDirectusCollections {
+    ${types.map((x) => `  ${x};`).join("\n")}
+  };
 
-     declare global {
-      interface DirectusCollections {
-${types.filter((item) => !item.startsWith("directus_")).map((x) => `  ${x};`).join("\n")}
-};
-    }     
+  export interface DirectusSchema {
+    ${types.filter((item) => !item.startsWith("directus_")).map((x) => `  ${x};`).join("\n")}
+  };
+
+  declare global {
+    ${typeValues.replaceAll("export type", "type")}
+
+    interface AllDirectusCollections {
+      ${types.map((x) => `  ${x};`).join("\n")}
+    };
+
+    interface DirectusSchema {
+      ${types.filter((item) => !item.startsWith("directus_")).map((x) => `  ${x};`).join("\n")}
+    };
+  }
+
+  export {};
 `;
-  typeValues += "\n";
-  return typeValues;
-}
-function pascalCase(str) {
-  return str.split(" ").flatMap((x) => x.split("_")).flatMap((y) => y.split("-")).map((x) => x.charAt(0).toUpperCase() + x.slice(1)).join("");
 }
 function getType(field) {
   let type = "";
@@ -75,11 +83,11 @@ function getType(field) {
 export async function getCollections(options) {
   const directus = createDirectus(options.url).with(authentication("json", { autoRefresh: false })).with(rest());
   directus.setToken(options.token);
-  const rawCollections = await directus.request(readCollections());
   const collections = {};
-  rawCollections.sort((a, b) => a.collection.localeCompare(b.collection)).forEach(
-    (collection) => collections[collection.collection] = { ...collection, fields: [] }
-  );
+  const rawCollections = await directus.request(readCollections());
+  rawCollections.sort((a, b) => a.collection.localeCompare(b.collection)).forEach((collection) => {
+    collections[collection.collection] = { ...collection, fields: [] };
+  });
   const fields = await directus.request(readFields());
   fields.sort((a, b) => a.field.localeCompare(b.field)).forEach((field) => {
     if (!collections[field.collection]) {
@@ -100,12 +108,8 @@ export async function getCollections(options) {
       warn("No one collection");
       return;
     }
-    const oneField = collections[relation.meta.one_collection]?.fields.find(
-      (field) => field.field === relation.meta.one_field
-    );
-    const manyField = collections[relation.meta.many_collection]?.fields.find(
-      (field) => field.field === relation.meta.many_field
-    );
+    const oneField = collections[relation.meta.one_collection]?.fields.find((field) => field.field === relation.meta.one_field);
+    const manyField = collections[relation.meta.many_collection]?.fields.find((field) => field.field === relation.meta.many_field);
     if (oneField) {
       oneField.relation = {
         type: "many",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nuxt-directus-sdk",
   "type": "module",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "A nuxt module that uses the directus SDK",
   "author": "Matthew Rollinson <matt@rolley.io>",
   "license": "MIT",