nuxt-directus-sdk 0.0.8 → 0.0.9

package/dist/module.d.mts

@@ -1,6 +1,6 @@
 import * as _nuxt_schema from '@nuxt/schema';
 import { Query } from '@directus/sdk';
-import { DirectusSchema } from '#build/types/directus';
+import { DirectusSchema } from 'nuxt/app';
 
 interface ModuleOptions {
     /**

package/dist/module.d.ts

@@ -1,6 +1,6 @@
 import * as _nuxt_schema from '@nuxt/schema';
 import { Query } from '@directus/sdk';
-import { DirectusSchema } from '#build/types/directus';
+import { DirectusSchema } from 'nuxt/app';
 
 interface ModuleOptions {
     /**

package/dist/module.json

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

package/dist/module.mjs

@@ -1,11 +1,11 @@
 import { defu } from 'defu';
-import { useLogger, defineNuxtModule, tryResolveModule, createResolver, addPlugin, addImportsDir, addComponentsDir, addTypeTemplate, addImportsSources } from '@nuxt/kit';
+import { useLogger, defineNuxtModule, tryResolveModule, createResolver, addPlugin, addImportsDir, addComponentsDir, addImportsSources, addTypeTemplate } 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.8";
+const version = "0.0.9";
 
 function warn(message) {
   useLogger("nuxt-directus-sdk").warn(message);
@@ -41,18 +41,8 @@ async function generateTypes(options) {
     return item.startsWith("directus_users") || !item.startsWith("directus_");
   }));
   return `
-  // This file is auto-generated by @nuxtjs/directus-sdk
-  ${types}
-
-  export interface AllDirectusCollections {
-    ${allTypes}
-  };
-
-  export interface DirectusSchema {
-    ${schemaTypes}
-  };
-
-  declare global {
+  // This file is auto-generated by nuxt-directus-sdk
+  declare module '#app' {
     ${types.replaceAll("export type", "type")}
 
     interface AllDirectusCollections {
@@ -63,7 +53,6 @@ async function generateTypes(options) {
       ${schemaTypes}
     };
   }
-
   export {};
 `;
 }
@@ -194,23 +183,80 @@ const module = defineNuxtModule({
     });
     nuxt.options.css.push("vue-toastification/dist/index.css");
     nuxt.options.build.transpile.push("vue-toastification");
+    const directusSdkImports = {
+      from: "@directus/sdk",
+      imports: [
+        "aggregate",
+        "generateUid",
+        "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"
+      ]
+    };
+    addImportsSources(directusSdkImports);
     nuxt.hook("nitro:config", (nitroConfig) => {
       nitroConfig.alias = nitroConfig.alias || {};
       nitroConfig.externals = defu(typeof nitroConfig.externals === "object" ? nitroConfig.externals : {}, {
         inline: [resolver.resolve("./runtime")]
       });
-      nitroConfig.alias[`#${configKey}`] = resolver.resolve("./runtime/server/services");
+      nitroConfig.imports = nitroConfig.imports || {};
+      nitroConfig.imports.presets = nitroConfig.imports.presets || [];
+      nitroConfig.imports.presets.push(directusSdkImports);
     });
     try {
       const typesPath = addTypeTemplate({
         filename: `types/${configKey}-server.d.ts`,
         getContents: () => [
-          `declare module '#${configKey}' {`,
+          "declare global {",
           `  const useDirectus: typeof import('${resolver.resolve("./runtime/server/services")}').useDirectus`,
           `  const useAdminDirectus: typeof import('${resolver.resolve("./runtime/server/services")}').useAdminDirectus`,
           `  const useDirectusUrl: typeof import('${resolver.resolve("./runtime/server/services")}').useDirectusUrl`,
           `  const useDirectusAccessToken: typeof import('${resolver.resolve("./runtime/server/services")}').useDirectusAccessToken`,
-          "}"
+          "}",
+          `export { useDirectus, useAdminDirectus, useDirectusUrl, useDirectusAccessToken } from '${resolver.resolve("./runtime/server/services")}';`
         ].join("\n")
       }).dst;
       nuxt.hook("prepare:types", (options2) => {
@@ -258,59 +304,6 @@ const module = defineNuxtModule({
         logger.info("Add DIRECTUS_ADMIN_TOKEN to the .env file to generate directus types");
       }
     }
-    addImportsSources({
-      from: "@directus/sdk",
-      imports: [
-        "aggregate",
-        "generateUid",
-        "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/auth.d.ts

@@ -1,5 +1,5 @@
+import type { DirectusUsers } from 'nuxt/app';
 import type { ComputedRef, Ref } from '#imports';
-import type { DirectusUsers } from '#build/types/directus';
 export declare function useDirectusUser(): Ref<DirectusUsers | null>;
 export interface DirectusAuth {
     user: Ref<DirectusUsers | null>;

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

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

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

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

package/dist/runtime/composables/files.mjs

@@ -3,15 +3,15 @@ import { useDirectus, useDirectusUrl } from "./directus.mjs";
 import { useDirectusTokens } from "./tokens.mjs";
 export async function uploadDirectusFile(file, query) {
   const result = await uploadDirectusFiles([file], query);
-  return result[0] ?? null;
+  return Array.isArray(result) ? result[0] : result;
 }
 export async function uploadDirectusFiles(files, query) {
   const directus = useDirectus();
   const formData = new FormData();
-  files.forEach(({ file, data }, i) => {
+  files.forEach(({ file, data }) => {
     if (data) {
       Object.entries(data).forEach(([key, value]) => {
-        formData.set(`file_${i + 1}_${key}`, value);
+        formData.set(key, value);
       });
     }
     formData.set("file", file);
@@ -21,10 +21,13 @@ export async function uploadDirectusFiles(files, query) {
 export function getDirectusAssetUrl(fileId, options) {
   const url = new URL(`${useDirectusUrl()}assets/${fileId}`);
   if (options?.token) {
-    if (typeof options.token === "string")
+    if (typeof options.token === "string") {
       url.searchParams.append("access_token", options.token);
-    else
-      url.searchParams.append("access_token", useDirectusTokens().accessToken.value ?? "");
+    } else if (typeof options.token === "boolean") {
+      const token = useDirectusTokens().accessToken.value;
+      if (token)
+        url.searchParams.append("access_token", token);
+    }
   }
   return url.href;
 }

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

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

package/dist/runtime/types/generate.mjs

@@ -35,18 +35,8 @@ export async function generateTypes(options) {
     return item.startsWith("directus_users") || !item.startsWith("directus_");
   }));
   return `
-  // This file is auto-generated by @nuxtjs/directus-sdk
-  ${types}
-
-  export interface AllDirectusCollections {
-    ${allTypes}
-  };
-
-  export interface DirectusSchema {
-    ${schemaTypes}
-  };
-
-  declare global {
+  // This file is auto-generated by nuxt-directus-sdk
+  declare module '#app' {
     ${types.replaceAll("export type", "type")}
 
     interface AllDirectusCollections {
@@ -57,7 +47,6 @@ export async function generateTypes(options) {
       ${schemaTypes}
     };
   }
-
   export {};
 `;
 }

package/package.json

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