@directus/api 19.1.1 → 19.3.0

package/dist/telemetry/utils/get-item-count.d.ts

@@ -3,13 +3,17 @@ export interface CollectionCount {
     collection: string;
     count: number;
 }
+export interface CollectionCountTask {
+    collection: string;
+    where?: readonly [string, string, string | boolean | number];
+}
 /**
- * Get the item count of the given collection in the given database
+ * Get the item count of the given task in the given database
  * @param db Knex instance to count against
- * @param collection Table to count rows in
+ * @param task Task to count rows for
  * @returns Collection name and count
  */
-export declare const countCollection: (db: Knex, collection: string) => Promise<CollectionCount>;
+export declare const countCollection: (db: Knex, task: CollectionCountTask) => Promise<CollectionCount>;
 /**
  * Merge the given collection count in the object accumulator
  * Intended for use with .reduce()
@@ -19,8 +23,8 @@ export declare const countCollection: (db: Knex, collection: string) => Promise<
  */
 export declare const mergeResults: (acc: Record<string, number>, value: CollectionCount) => Record<string, number>;
 /**
- * Get an object of item counts for the given collections
+ * Get an object of item counts for the given tasks
  * @param db Database instance to get counts in
- * @param collections Array of table names to get count from
+ * @param tasks Array of tasks to get count for
  */
-export declare const getItemCount: <T extends readonly string[]>(db: Knex, collections: T) => Promise<Record<T[number], number>>;
+export declare const getItemCount: <T extends readonly CollectionCountTask[]>(db: Knex, tasks: T) => Promise<Record<T[number]["collection"], number>>;

package/dist/telemetry/utils/get-item-count.js

@@ -1,14 +1,18 @@
 import {} from 'knex';
 import pLimit from 'p-limit';
 /**
- * Get the item count of the given collection in the given database
+ * Get the item count of the given task in the given database
  * @param db Knex instance to count against
- * @param collection Table to count rows in
+ * @param task Task to count rows for
  * @returns Collection name and count
  */
-export const countCollection = async (db, collection) => {
-    const count = await db.count('*', { as: 'count' }).from(collection).first();
-    return { collection, count: Number(count?.['count'] ?? 0) };
+export const countCollection = async (db, task) => {
+    const query = db.count('*', { as: 'count' }).from(task.collection);
+    if (task.where) {
+        query.where(...task.where);
+    }
+    const count = await query.first();
+    return { collection: task.collection, count: Number(count?.['count'] ?? 0) };
 };
 /**
  * Merge the given collection count in the object accumulator
@@ -22,15 +26,15 @@ export const mergeResults = (acc, value) => {
     return acc;
 };
 /**
- * Get an object of item counts for the given collections
+ * Get an object of item counts for the given tasks
  * @param db Database instance to get counts in
- * @param collections Array of table names to get count from
+ * @param tasks Array of tasks to get count for
  */
-export const getItemCount = async (db, collections) => {
+export const getItemCount = async (db, tasks) => {
     // Counts can be a little heavy if the table is very large, so we'll only ever execute 3 of these
     // queries simultaneously to not overload the database
     const limit = pLimit(3);
-    const calls = collections.map((collection) => limit(countCollection, db, collection));
+    const calls = tasks.map((task) => limit(countCollection, db, task));
     const results = await Promise.all(calls);
     return results.reduce(mergeResults, {});
 };

package/dist/telemetry/utils/get-role-counts-by-roles.d.ts

@@ -0,0 +1,6 @@
+import type { Knex } from 'knex';
+import { type AccessTypeCount } from './get-user-count.js';
+/**
+ * Get the role type counts by role IDs
+ */
+export declare function getRoleCountsByRoles(db: Knex, roles: string[]): Promise<AccessTypeCount>;

package/dist/telemetry/utils/get-role-counts-by-roles.js

@@ -0,0 +1,27 @@
+import { toBoolean } from '@directus/utils';
+import {} from './get-user-count.js';
+/**
+ * Get the role type counts by role IDs
+ */
+export async function getRoleCountsByRoles(db, roles) {
+    const counts = {
+        admin: 0,
+        app: 0,
+        api: 0,
+    };
+    const result = (await db.select('id', 'admin_access', 'app_access').from('directus_roles').whereIn('id', roles));
+    for (const role of result) {
+        const adminAccess = toBoolean(role.admin_access);
+        const appAccess = toBoolean(role.app_access);
+        if (adminAccess) {
+            counts.admin++;
+        }
+        else if (appAccess) {
+            counts.app++;
+        }
+        else {
+            counts.api++;
+        }
+    }
+    return counts;
+}

package/dist/telemetry/utils/get-role-counts-by-users.d.ts

@@ -0,0 +1,11 @@
+import type { PrimaryKey } from '@directus/types';
+import type { Knex } from 'knex';
+import type { AccessTypeCount } from './get-user-count.js';
+type CountOptions = {
+    inactiveUsers?: boolean;
+};
+/**
+ * Get the role type counts by user IDs
+ */
+export declare function getRoleCountsByUsers(db: Knex, userIds: PrimaryKey[], options?: CountOptions): Promise<AccessTypeCount>;
+export {};

package/dist/telemetry/utils/get-role-counts-by-users.js

@@ -0,0 +1,34 @@
+import { toBoolean } from '@directus/utils';
+/**
+ * Get the role type counts by user IDs
+ */
+export async function getRoleCountsByUsers(db, userIds, options = {}) {
+    const counts = {
+        admin: 0,
+        app: 0,
+        api: 0,
+    };
+    const result = await db
+        .count('directus_users.id', { as: 'count' })
+        .select('directus_roles.admin_access', 'directus_roles.app_access')
+        .from('directus_users')
+        .whereIn('directus_users.id', userIds)
+        .andWhere('directus_users.status', options.inactiveUsers ? '!=' : '=', 'active')
+        .leftJoin('directus_roles', 'directus_users.role', '=', 'directus_roles.id')
+        .groupBy('directus_roles.admin_access', 'directus_roles.app_access');
+    for (const record of result) {
+        const adminAccess = toBoolean(record.admin_access);
+        const appAccess = toBoolean(record.app_access);
+        const count = Number(record.count);
+        if (adminAccess) {
+            counts.admin += count;
+        }
+        else if (appAccess) {
+            counts.app += count;
+        }
+        else {
+            counts.api += count;
+        }
+    }
+    return counts;
+}

package/dist/telemetry/utils/get-user-count.d.ts

@@ -1,7 +1,8 @@
+import type { PrimaryKey } from '@directus/types';
 import { type Knex } from 'knex';
-export interface UserCount {
+export interface AccessTypeCount {
     admin: number;
     app: number;
     api: number;
 }
-export declare const getUserCount: (db: Knex) => Promise<UserCount>;
+export declare const getUserCount: (db: Knex, ignoreIds?: PrimaryKey[]) => Promise<AccessTypeCount>;

package/dist/telemetry/utils/get-user-count.js

@@ -1,6 +1,6 @@
 import { toBoolean } from '@directus/utils';
 import {} from 'knex';
-export const getUserCount = async (db) => {
+export const getUserCount = async (db, ignoreIds = []) => {
     const counts = {
         admin: 0,
         app: 0,
@@ -10,20 +10,23 @@ export const getUserCount = async (db) => {
         .count('directus_users.id', { as: 'count' })
         .select('directus_roles.admin_access', 'directus_roles.app_access')
         .from('directus_users')
+        .whereNotIn('directus_users.id', ignoreIds)
+        .andWhere('directus_users.status', 'active')
         .leftJoin('directus_roles', 'directus_users.role', '=', 'directus_roles.id')
+        .where('directus_users.status', '=', 'active')
         .groupBy('directus_roles.admin_access', 'directus_roles.app_access'));
     for (const record of result) {
         const adminAccess = toBoolean(record.admin_access);
         const appAccess = toBoolean(record.app_access);
         const count = Number(record.count);
         if (adminAccess) {
-            counts.admin = count;
+            counts.admin += count;
         }
         else if (appAccess) {
-            counts.app = count;
+            counts.app += count;
         }
         else {
-            counts.api = count;
+            counts.api += count;
         }
     }
     return counts;

package/dist/telemetry/utils/get-user-counts-by-roles.d.ts

@@ -0,0 +1,7 @@
+import type { PrimaryKey } from '@directus/types';
+import type { Knex } from 'knex';
+import { type AccessTypeCount } from './get-user-count.js';
+/**
+ * Get the user type counts by role IDs
+ */
+export declare function getUserCountsByRoles(db: Knex, roleIds: PrimaryKey[]): Promise<AccessTypeCount>;

package/dist/telemetry/utils/get-user-counts-by-roles.js

@@ -0,0 +1,35 @@
+import { toBoolean } from '@directus/utils';
+import {} from './get-user-count.js';
+/**
+ * Get the user type counts by role IDs
+ */
+export async function getUserCountsByRoles(db, roleIds) {
+    const counts = {
+        admin: 0,
+        app: 0,
+        api: 0,
+    };
+    const result = (await db
+        .count('directus_users.id', { as: 'count' })
+        .select('directus_roles.admin_access', 'directus_roles.app_access')
+        .from('directus_users')
+        .whereIn('directus_roles.id', roleIds)
+        .andWhere('directus_users.status', '=', 'active')
+        .leftJoin('directus_roles', 'directus_users.role', '=', 'directus_roles.id')
+        .groupBy('directus_roles.admin_access', 'directus_roles.app_access'));
+    for (const record of result) {
+        const adminAccess = toBoolean(record.admin_access);
+        const appAccess = toBoolean(record.app_access);
+        const count = Number(record.count);
+        if (adminAccess) {
+            counts.admin += count;
+        }
+        else if (appAccess) {
+            counts.app += count;
+        }
+        else {
+            counts.api += count;
+        }
+    }
+    return counts;
+}

package/dist/telemetry/utils/get-user-item-count.js

@@ -1,7 +1,7 @@
+import { isSystemCollection } from '@directus/system-data';
 import {} from 'knex';
 import { getSchema } from '../../utils/get-schema.js';
 import { getItemCount } from './get-item-count.js';
-import { isSystemCollection } from '@directus/system-data';
 /**
  * Sum all passed values together. Meant to be used with .reduce()
  */
@@ -11,7 +11,9 @@ export const sum = (acc, val) => (acc += val);
  */
 export const getUserItemCount = async (db) => {
     const schema = await getSchema({ database: db });
-    const userCollections = Object.keys(schema.collections).filter((collection) => isSystemCollection(collection) === false);
+    const userCollections = Object.keys(schema.collections)
+        .filter((collection) => isSystemCollection(collection) === false)
+        .map((collection) => ({ collection }));
     const counts = await getItemCount(db, userCollections);
     const collections = userCollections.length;
     const items = Object.values(counts).reduce(sum, 0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@directus/api",
-  "version": "19.1.1",
+  "version": "19.3.0",
   "description": "Directus is a real-time API and App dashboard for managing SQL database content",
   "keywords": [
     "directus",
@@ -67,7 +67,7 @@
     "@types/cookie": "0.6.0",
     "argon2": "0.40.1",
     "async": "3.2.5",
-    "axios": "1.6.8",
+    "axios": "1.7.2",
     "busboy": "1.6.0",
     "bytes": "3.1.2",
     "camelcase": "8.0.0",
@@ -92,11 +92,11 @@
     "fs-extra": "11.2.0",
     "glob-to-regexp": "0.4.1",
     "graphql": "16.8.1",
-    "graphql-compose": "9.0.10",
+    "graphql-compose": "9.0.11",
     "graphql-ws": "5.16.0",
     "helmet": "7.1.0",
     "icc": "3.0.0",
-    "inquirer": "9.2.20",
+    "inquirer": "9.2.22",
     "ioredis": "5.4.1",
     "ip-matching": "2.1.2",
     "isolated-vm": "4.7.2",
@@ -108,7 +108,7 @@
     "keyv": "4.5.4",
     "knex": "3.1.0",
     "ldapjs": "2.3.3",
-    "liquidjs": "10.12.0",
+    "liquidjs": "10.13.1",
     "lodash-es": "4.17.21",
     "marked": "12.0.2",
     "micromustache": "8.0.3",
@@ -121,14 +121,14 @@
     "node-schedule": "2.1.1",
     "nodemailer": "6.9.13",
     "object-hash": "3.0.0",
-    "openapi3-ts": "4.3.1",
+    "openapi3-ts": "4.3.2",
     "openid-client": "5.6.5",
     "ora": "8.0.1",
     "otplib": "12.0.1",
     "p-limit": "5.0.0",
     "p-queue": "8.0.1",
     "papaparse": "5.4.1",
-    "pino": "9.0.0",
+    "pino": "9.1.0",
     "pino-http": "9.0.0",
     "pino-http-print": "3.1.0",
     "pino-pretty": "11.0.0",
@@ -146,29 +146,29 @@
     "ws": "8.17.0",
     "zod": "3.23.8",
     "zod-validation-error": "3.2.0",
+    "@directus/app": "12.1.3",
+    "@directus/env": "1.1.6",
     "@directus/constants": "11.0.4",
-    "@directus/app": "12.1.1",
-    "@directus/extensions": "1.0.5",
-    "@directus/env": "1.1.4",
-    "@directus/extensions-registry": "1.0.5",
-    "@directus/errors": "0.3.0",
+    "@directus/errors": "0.3.2",
+    "@directus/extensions": "1.0.7",
+    "@directus/extensions-registry": "1.0.7",
     "@directus/format-title": "10.1.2",
-    "@directus/extensions-sdk": "11.0.5",
-    "@directus/memory": "1.0.7",
-    "@directus/pressure": "1.0.19",
+    "@directus/extensions-sdk": "11.0.7",
+    "@directus/pressure": "1.0.20",
+    "@directus/memory": "1.0.9",
     "@directus/schema": "11.0.2",
-    "@directus/storage": "10.0.12",
-    "@directus/storage-driver-azure": "10.0.20",
-    "@directus/storage-driver-cloudinary": "10.0.20",
-    "@directus/storage-driver-gcs": "10.0.21",
-    "@directus/storage-driver-local": "10.0.19",
-    "@directus/specs": "10.2.9",
-    "@directus/storage-driver-s3": "10.0.21",
-    "@directus/storage-driver-supabase": "1.0.12",
-    "@directus/system-data": "1.0.3",
-    "@directus/utils": "11.0.8",
-    "@directus/validation": "0.0.15",
-    "directus": "10.11.1"
+    "@directus/specs": "10.2.10",
+    "@directus/storage": "10.0.13",
+    "@directus/storage-driver-azure": "10.0.22",
+    "@directus/storage-driver-cloudinary": "10.0.22",
+    "@directus/storage-driver-gcs": "10.0.23",
+    "@directus/storage-driver-local": "10.0.20",
+    "@directus/storage-driver-supabase": "1.0.14",
+    "@directus/storage-driver-s3": "10.0.23",
+    "@directus/system-data": "1.0.4",
+    "@directus/utils": "11.0.9",
+    "directus": "10.12.0",
+    "@directus/validation": "0.0.17"
   },
   "devDependencies": {
     "@ngneat/falso": "7.2.0",
@@ -211,7 +211,7 @@
     "vitest": "1.5.3",
     "@directus/random": "0.2.8",
     "@directus/tsconfig": "1.0.1",
-    "@directus/types": "11.1.1"
+    "@directus/types": "11.1.2"
   },
   "optionalDependencies": {
     "@keyv/redis": "2.8.4",