nuxt-directus-sdk 0.0.4 → 0.0.6

package/dist/module.d.mts

@@ -1,6 +1,6 @@
 import * as _nuxt_schema from '@nuxt/schema';
 import { Query } from '@directus/sdk';
-import { AllDirectusCollections } from '#build/types/directus';
+import { DirectusSchema } from '#build/types/directus';
 
 interface ModuleOptions {
     /**
@@ -24,9 +24,9 @@ interface ModuleOptions {
     /**
      * Directus Auth Options
      * @default {}
-     * @type Query<AllDirectusCollections, AllDirectusCollections['directus_users']>
+     * @type Query<DirectusSchema, DirectusSchema['directus_users']>
      */
-    fetchUserParams?: Query<AllDirectusCollections, AllDirectusCollections['directus_users']>;
+    fetchUserParams?: Query<DirectusSchema, DirectusSchema['directus_users']>;
     /**
      * Add Directus Admin in Nuxt Devtools
      *
@@ -72,11 +72,17 @@ interface ModuleOptions {
      */
     cookieSecure?: boolean;
     /**
-     * The Secure attribute for auth cookies.
+     * The prefix to your custom types
      * @type string
      * @default ''
      */
     typePrefix?: string;
+    /**
+     * A path to redirect a user to when not logged in using auth middleware
+     * @type string
+     * @default '/login'
+     */
+    loginPath?: 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 { AllDirectusCollections } from '#build/types/directus';
+import { DirectusSchema } from '#build/types/directus';
 
 interface ModuleOptions {
     /**
@@ -24,9 +24,9 @@ interface ModuleOptions {
     /**
      * Directus Auth Options
      * @default {}
-     * @type Query<AllDirectusCollections, AllDirectusCollections['directus_users']>
+     * @type Query<DirectusSchema, DirectusSchema['directus_users']>
      */
-    fetchUserParams?: Query<AllDirectusCollections, AllDirectusCollections['directus_users']>;
+    fetchUserParams?: Query<DirectusSchema, DirectusSchema['directus_users']>;
     /**
      * Add Directus Admin in Nuxt Devtools
      *
@@ -72,11 +72,17 @@ interface ModuleOptions {
      */
     cookieSecure?: boolean;
     /**
-     * The Secure attribute for auth cookies.
+     * The prefix to your custom types
      * @type string
      * @default ''
      */
     typePrefix?: string;
+    /**
+     * A path to redirect a user to when not logged in using auth middleware
+     * @type string
+     * @default '/login'
+     */
+    loginPath?: string;
 }
 declare const _default: _nuxt_schema.NuxtModule<ModuleOptions>;
 

package/dist/module.json

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

package/dist/module.mjs

@@ -5,55 +5,62 @@ import { createDirectus, authentication, rest, readCollections, readFields, read
 import { pascalCase } from 'change-case';
 
 const name = "nuxt-directus-sdk";
-const version = "0.0.4";
+const version = "0.0.6";
 
 function warn(message) {
   useLogger("nuxt-directus-sdk").warn(message);
 }
+function joinTypes(types) {
+  return types.map((x) => `  ${x};`).join("\n");
+}
 async function generateTypes(options) {
+  let types = "";
+  const aliases = [];
   const collections = await getCollections(options);
-  let typeValues = "";
-  const types = [];
   Object.values(collections).forEach((collection) => {
-    const collectionName = collection.collection;
-    const typeName = collectionName.startsWith("directus_") ? pascalCase(collectionName) : pascalCase(`${options.prefix}${collectionName}`);
-    types.push(`${collectionName}: ${typeName}[]`);
-    typeValues += `export type ${typeName} = {
+    const name = collection.collection;
+    const typeName = name.startsWith("directus_") ? pascalCase(name) : pascalCase(`${options.prefix}${name}`);
+    types += `export type ${typeName} = {
 `;
     collection.fields.forEach((field) => {
       if (field.meta?.interface?.startsWith("presentation-"))
         return;
-      typeValues += "  ";
-      typeValues += field.field.includes("-") ? `"${field.field}"` : field.field;
+      types += "  ";
+      types += field.field.includes("-") ? `"${field.field}"` : field.field;
       if (field.schema?.is_nullable)
-        typeValues += "?";
-      typeValues += ": ";
-      typeValues += getType(field);
-      typeValues += ";\n";
+        types += "?";
+      types += ": ";
+      types += getType(field);
+      types += ";\n";
     });
-    typeValues += "};\n\n";
+    types += "};\n\n";
+    aliases.push(`${name}: ${typeName}[]`);
   });
+  const allTypes = joinTypes(aliases);
+  const schemaTypes = joinTypes(aliases.filter((item) => {
+    return item.startsWith("directus_users") || !item.startsWith("directus_");
+  }));
   return `
   // This file is auto-generated by @nuxtjs/directus-sdk
-  ${typeValues}
+  ${types}
 
   export interface AllDirectusCollections {
-    ${types.map((x) => `  ${x};`).join("\n")}
+    ${allTypes}
   };
 
   export interface DirectusSchema {
-    ${types.filter((item) => !item.startsWith("directus_")).map((x) => `  ${x};`).join("\n")}
+    ${schemaTypes}
   };
 
   declare global {
-    ${typeValues.replaceAll("export type", "type")}
+    ${types.replaceAll("export type", "type")}
 
     interface AllDirectusCollections {
-      ${types.map((x) => `  ${x};`).join("\n")}
+      ${allTypes}
     };
 
     interface DirectusSchema {
-      ${types.filter((item) => !item.startsWith("directus_")).map((x) => `  ${x};`).join("\n")}
+      ${schemaTypes}
     };
   }
 
@@ -90,8 +97,8 @@ async function getCollections(options) {
   const directus = createDirectus(options.url).with(authentication("json", { autoRefresh: false })).with(rest());
   directus.setToken(options.token);
   const collections = {};
-  const rawCollections = await directus.request(readCollections());
-  rawCollections.sort((a, b) => a.collection.localeCompare(b.collection)).forEach((collection) => {
+  const directusCollections = await directus.request(readCollections());
+  directusCollections.sort((a, b) => a.collection.localeCompare(b.collection)).forEach((collection) => {
     collections[collection.collection] = { ...collection, fields: [] };
   });
   const fields = await directus.request(readFields());
@@ -157,7 +164,8 @@ const module = defineNuxtModule({
     cookieMaxAgeRefreshToken: 604800,
     cookieSameSite: "lax",
     cookieSecure: false,
-    typePrefix: ""
+    typePrefix: "",
+    loginPath: "/login"
   },
   async setup(options, nuxt) {
     if (!tryResolveModule("@directus/sdk")) {

package/dist/runtime/middleware/auth.d.ts

@@ -0,0 +1,8 @@
+type MiddlewareMeta = boolean;
+declare module '#app/../pages/runtime/composables' {
+    interface PageMeta {
+        auth?: MiddlewareMeta;
+    }
+}
+declare const _default: any;
+export default _default;

package/dist/runtime/middleware/auth.mjs

@@ -0,0 +1,16 @@
+import {
+  defineNuxtRouteMiddleware,
+  navigateTo,
+  useDirectusAuth,
+  useRuntimeConfig
+} from "#imports";
+export default defineNuxtRouteMiddleware((to) => {
+  const config = useRuntimeConfig();
+  const user = useDirectusAuth().user;
+  if (!user.value) {
+    return navigateTo({
+      path: config.public.directus.loginPath ?? "/login",
+      query: { redirect: to.path !== "/" ? encodeURIComponent(to.path) : void 0 }
+    });
+  }
+});

package/dist/runtime/plugin.mjs

@@ -1,7 +1,8 @@
 import { fromUrl, parseDomain } from "parse-domain";
+import auth from "./middleware/auth.mjs";
 import { useDomain, useSubdomain } from "./composables/domain.mjs";
 import { useDirectusAuth } from "./composables/auth.mjs";
-import { addRouteMiddleware, defineNuxtPlugin, navigateTo, useRuntimeConfig } from "#app";
+import { addRouteMiddleware, defineNuxtPlugin, useRuntimeConfig } from "#app";
 export default defineNuxtPlugin(async (nuxt) => {
   const domain = useDomain();
   const subdomain = useSubdomain();
@@ -25,13 +26,5 @@ export default defineNuxtPlugin(async (nuxt) => {
   const config = useRuntimeConfig();
   if (config.public.directus.fetchUser)
     await useDirectusAuth().fetchUser();
-  addRouteMiddleware("auth", async (to) => {
-    const user = useDirectusAuth().user;
-    if (!user.value) {
-      return navigateTo({
-        path: "/login",
-        query: { redirect: to.path !== "/" ? encodeURIComponent(to.path) : void 0 }
-      });
-    }
-  });
+  addRouteMiddleware("auth", auth);
 });

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

@@ -1,8 +1,2 @@
-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>;
+import type { GenerateOptions } from './generate.types';
+export declare function generateTypes(options: GenerateOptions): Promise<string>;

package/dist/runtime/types/generate.mjs

@@ -4,50 +4,57 @@ import { pascalCase } from "change-case";
 function warn(message) {
   useLogger("nuxt-directus-sdk").warn(message);
 }
+function joinTypes(types) {
+  return types.map((x) => `  ${x};`).join("\n");
+}
 export async function generateTypes(options) {
+  let types = "";
+  const aliases = [];
   const collections = await getCollections(options);
-  let typeValues = "";
-  const types = [];
   Object.values(collections).forEach((collection) => {
-    const collectionName = collection.collection;
-    const typeName = collectionName.startsWith("directus_") ? pascalCase(collectionName) : pascalCase(`${options.prefix}${collectionName}`);
-    types.push(`${collectionName}: ${typeName}[]`);
-    typeValues += `export type ${typeName} = {
+    const name = collection.collection;
+    const typeName = name.startsWith("directus_") ? pascalCase(name) : pascalCase(`${options.prefix}${name}`);
+    types += `export type ${typeName} = {
 `;
     collection.fields.forEach((field) => {
       if (field.meta?.interface?.startsWith("presentation-"))
         return;
-      typeValues += "  ";
-      typeValues += field.field.includes("-") ? `"${field.field}"` : field.field;
+      types += "  ";
+      types += field.field.includes("-") ? `"${field.field}"` : field.field;
       if (field.schema?.is_nullable)
-        typeValues += "?";
-      typeValues += ": ";
-      typeValues += getType(field);
-      typeValues += ";\n";
+        types += "?";
+      types += ": ";
+      types += getType(field);
+      types += ";\n";
     });
-    typeValues += "};\n\n";
+    types += "};\n\n";
+    aliases.push(`${name}: ${typeName}[]`);
   });
+  const allTypes = joinTypes(aliases);
+  const schemaTypes = joinTypes(aliases.filter((item) => {
+    return item.startsWith("directus_users") || !item.startsWith("directus_");
+  }));
   return `
   // This file is auto-generated by @nuxtjs/directus-sdk
-  ${typeValues}
+  ${types}
 
   export interface AllDirectusCollections {
-    ${types.map((x) => `  ${x};`).join("\n")}
+    ${allTypes}
   };
 
   export interface DirectusSchema {
-    ${types.filter((item) => !item.startsWith("directus_")).map((x) => `  ${x};`).join("\n")}
+    ${schemaTypes}
   };
 
   declare global {
-    ${typeValues.replaceAll("export type", "type")}
+    ${types.replaceAll("export type", "type")}
 
     interface AllDirectusCollections {
-      ${types.map((x) => `  ${x};`).join("\n")}
+      ${allTypes}
     };
 
     interface DirectusSchema {
-      ${types.filter((item) => !item.startsWith("directus_")).map((x) => `  ${x};`).join("\n")}
+      ${schemaTypes}
     };
   }
 
@@ -80,12 +87,12 @@ function getType(field) {
   }
   return type;
 }
-export async function getCollections(options) {
+async function getCollections(options) {
   const directus = createDirectus(options.url).with(authentication("json", { autoRefresh: false })).with(rest());
   directus.setToken(options.token);
   const collections = {};
-  const rawCollections = await directus.request(readCollections());
-  rawCollections.sort((a, b) => a.collection.localeCompare(b.collection)).forEach((collection) => {
+  const directusCollections = await directus.request(readCollections());
+  directusCollections.sort((a, b) => a.collection.localeCompare(b.collection)).forEach((collection) => {
     collections[collection.collection] = { ...collection, fields: [] };
   });
   const fields = await directus.request(readFields());

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

@@ -11,3 +11,8 @@ export type Collection = DirectusCollection & {
 export interface Collections {
     [collection: string]: Collection;
 }
+export interface GenerateOptions {
+    url: string;
+    token: string;
+    prefix: string;
+}

package/package.json

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