@directus/api 14.1.2 → 15.0.0

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

@@ -0,0 +1,30 @@
+import {} from 'knex';
+import { toBoolean } from '../../utils/to-boolean.js';
+export const getUserCount = async (db) => {
+    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')
+        .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.d.ts

@@ -0,0 +1,13 @@
+import { type Knex } from 'knex';
+export interface UserItemCount {
+    collections: number;
+    items: number;
+}
+/**
+ * Sum all passed values together. Meant to be used with .reduce()
+ */
+export declare const sum: (acc: number, val: number) => number;
+/**
+ * Count all the items in the non-system tables
+ */
+export declare const getUserItemCount: (db: Knex) => Promise<UserItemCount>;

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

@@ -0,0 +1,18 @@
+import {} from 'knex';
+import { getSchema } from '../../utils/get-schema.js';
+import { getItemCount } from './get-item-count.js';
+/**
+ * Sum all passed values together. Meant to be used with .reduce()
+ */
+export const sum = (acc, val) => (acc += val);
+/**
+ * Count all the items in the non-system tables
+ */
+export const getUserItemCount = async (db) => {
+    const schema = await getSchema({ database: db });
+    const userCollections = Object.keys(schema.collections).filter((collection) => collection.startsWith('directus_') === false);
+    const counts = await getItemCount(db, userCollections);
+    const collections = userCollections.length;
+    const items = Object.values(counts).reduce(sum, 0);
+    return { collections, items };
+};

package/dist/utils/apply-query.js

@@ -405,9 +405,12 @@ export function applyFilter(knex, schema, rootQuery, rootFilter, collection, ali
             if (column.includes('(') && column.includes(')')) {
                 const functionName = column.split('(')[0];
                 const type = getOutputTypeForFunction(functionName);
-                if (['bigInteger', 'integer', 'float', 'decimal'].includes(type)) {
+                if (['integer', 'float', 'decimal'].includes(type)) {
                     compareValue = Number(compareValue);
                 }
+                else if (type === 'bigInteger') {
+                    compareValue = BigInt(compareValue);
+                }
             }
             // Cast filter value (compareValue) based on type of field being filtered against
             const [collection, field] = key.split('.');
@@ -422,7 +425,7 @@ export function applyFilter(knex, schema, rootQuery, rootFilter, collection, ali
                         compareValue = helpers.date.parse(compareValue);
                     }
                 }
-                if (['bigInteger', 'integer', 'float', 'decimal'].includes(type)) {
+                if (['integer', 'float', 'decimal'].includes(type)) {
                     if (Array.isArray(compareValue)) {
                         compareValue = compareValue.map((val) => Number(val));
                     }
@@ -430,6 +433,14 @@ export function applyFilter(knex, schema, rootQuery, rootFilter, collection, ali
                         compareValue = Number(compareValue);
                     }
                 }
+                if (type === 'bigInteger') {
+                    if (Array.isArray(compareValue)) {
+                        compareValue = compareValue.map((val) => BigInt(val));
+                    }
+                    else {
+                        compareValue = BigInt(compareValue);
+                    }
+                }
             }
             if (operator === '_eq') {
                 dbQuery[logical].where(selectionRaw, '=', compareValue);

package/dist/utils/get-cache-key.js

@@ -1,7 +1,7 @@
 import hash from 'object-hash';
 import url from 'url';
 import { getGraphqlQueryAndVariables } from './get-graphql-query-and-variables.js';
-import { version } from './package.js';
+import { version } from 'directus/version';
 export function getCacheKey(req) {
     const path = url.parse(req.originalUrl).pathname;
     const isGraphQl = path?.startsWith('/graphql');

package/dist/utils/get-ip-from-req.d.ts

@@ -1,2 +1,2 @@
 import type { Request } from 'express';
-export declare function getIPFromReq(req: Request): string;
+export declare function getIPFromReq(req: Request): string | null;

package/dist/utils/get-ip-from-req.js

@@ -13,5 +13,5 @@ export function getIPFromReq(req) {
         }
     }
     // IP addresses starting with ::ffff: are IPv4 addresses in IPv6 format. We can strip the prefix to get back to IPv4
-    return ip.startsWith('::ffff:') ? ip.substring(7) : ip;
+    return ip?.startsWith('::ffff:') ? ip.substring(7) : ip ?? null;
 }

package/dist/utils/get-snapshot.js

@@ -1,10 +1,10 @@
+import { version } from 'directus/version';
 import { fromPairs, isArray, isPlainObject, mapValues, omit, sortBy, toPairs } from 'lodash-es';
 import getDatabase, { getDatabaseClient } from '../database/index.js';
 import { CollectionsService } from '../services/collections.js';
 import { FieldsService } from '../services/fields.js';
 import { RelationsService } from '../services/relations.js';
 import { getSchema } from './get-schema.js';
-import { version } from './package.js';
 import { sanitizeCollection, sanitizeField, sanitizeRelation } from './sanitize-schema.js';
 export async function getSnapshot(options) {
     const database = options?.database ?? getDatabase();

package/dist/utils/get-versioned-hash.js

@@ -1,5 +1,5 @@
+import { version } from 'directus/version';
 import hash from 'object-hash';
-import { version } from './package.js';
 export function getVersionedHash(item) {
     return hash({ item, version });
 }

package/dist/utils/md.d.ts

@@ -1,4 +1,4 @@
 /**
  * Render and sanitize a markdown string
  */
-export declare function md(str: string): string;
+export declare function md(value: string): string;

package/dist/utils/md.js

@@ -3,6 +3,7 @@ import sanitizeHTML from 'sanitize-html';
 /**
  * Render and sanitize a markdown string
  */
-export function md(str) {
-    return sanitizeHTML(marked(str, { headerIds: false, mangle: false }));
+export function md(value) {
+    const markdown = marked.parse(value); /* Would only be a promise if used with async extensions */
+    return sanitizeHTML(markdown);
 }

package/dist/utils/validate-query.js

@@ -96,6 +96,7 @@ function validateFilter(filter) {
             validateFilterPrimitive(nested, '_eq');
         }
         else {
+            // @ts-ignore TODO Check which case this is supposed to cover
             validateFilter(nested);
         }
     }

package/dist/utils/validate-snapshot.js

@@ -4,7 +4,7 @@ import { ALIAS_TYPES } from '../constants.js';
 import { getDatabaseClient } from '../database/index.js';
 import { InvalidPayloadError } from '@directus/errors';
 import { DatabaseClients } from '../types/index.js';
-import { version as currentDirectusVersion } from './package.js';
+import { version } from 'directus/version';
 const snapshotJoiSchema = Joi.object({
     version: Joi.number().valid(1).required(),
     directus: Joi.string().required(),
@@ -51,9 +51,9 @@ export function validateSnapshot(snapshot, force = false) {
     // Bypass checks when "force" option is enabled
     if (force)
         return;
-    if (snapshot.directus !== currentDirectusVersion) {
+    if (snapshot.directus !== version) {
         throw new InvalidPayloadError({
-            reason: `Provided snapshot's directus version ${snapshot.directus} does not match the current instance's version ${currentDirectusVersion}. You can bypass this check by passing the "force" query parameter`,
+            reason: `Provided snapshot's directus version ${snapshot.directus} does not match the current instance's version ${version}. You can bypass this check by passing the "force" query parameter`,
         });
     }
     if (!snapshot.vendor) {

package/dist/websocket/controllers/base.d.ts

@@ -2,6 +2,8 @@
 /// <reference types="node" resolution-mode="require"/>
 /// <reference types="node" resolution-mode="require"/>
 /// <reference types="node" resolution-mode="require"/>
+/// <reference types="node/http.js" />
+/// <reference types="pino-http" />
 import type { IncomingMessage, Server as httpServer } from 'http';
 import type { ParsedUrlQuery } from 'querystring';
 import type { RateLimiterAbstract } from 'rate-limiter-flexible';

package/dist/websocket/controllers/graphql.d.ts

@@ -1,4 +1,6 @@
 /// <reference types="node" resolution-mode="require"/>
+/// <reference types="node/http.js" />
+/// <reference types="pino-http" />
 import type { Server } from 'graphql-ws';
 import type { Server as httpServer } from 'http';
 import type { GraphQLSocket, UpgradeContext, WebSocketClient } from '../types.js';

package/dist/websocket/controllers/graphql.js

@@ -37,7 +37,7 @@ export class GraphQLSubscriptionController extends SocketController {
             send: (data) => new Promise((resolve, reject) => {
                 client.send(data, (err) => (err ? reject(err) : resolve()));
             }),
-            close: (code, reason) => client.close(code, reason),
+            close: (code, reason) => client.close(code, reason), // for standard closures
             onMessage: (cb) => {
                 client.on('parsed-message', async (message) => {
                     try {

package/dist/websocket/controllers/index.d.ts

@@ -1,4 +1,6 @@
 /// <reference types="node" resolution-mode="require"/>
+/// <reference types="node/http.js" />
+/// <reference types="pino-http" />
 import type { Server as httpServer } from 'http';
 import { GraphQLSubscriptionController } from './graphql.js';
 import { WebSocketController } from './rest.js';

package/dist/websocket/controllers/rest.d.ts

@@ -1,4 +1,6 @@
 /// <reference types="node" resolution-mode="require"/>
+/// <reference types="node/http.js" />
+/// <reference types="pino-http" />
 import type { Server as httpServer } from 'http';
 import { WebSocketMessage } from '../messages.js';
 import SocketController from './base.js';

package/dist/websocket/types.d.ts

@@ -1,6 +1,8 @@
 /// <reference types="node" resolution-mode="require"/>
 /// <reference types="node" resolution-mode="require"/>
 /// <reference types="node" resolution-mode="require"/>
+/// <reference types="node/http.js" />
+/// <reference types="pino-http" />
 import type { Accountability, Query } from '@directus/types';
 import type { IncomingMessage } from 'http';
 import type internal from 'stream';
@@ -12,7 +14,7 @@ export type AuthenticationState = {
 };
 export type WebSocketClient = WebSocket & AuthenticationState & {
     uid: string | number;
-    auth_timer: NodeJS.Timer | null;
+    auth_timer: NodeJS.Timeout | null;
 };
 export type UpgradeRequest = IncomingMessage & AuthenticationState;
 export type SubscriptionEvent = 'create' | 'update' | 'delete';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@directus/api",
-  "version": "14.1.2",
+  "version": "15.0.0",
   "description": "Directus is a real-time API and App dashboard for managing SQL database content",
   "keywords": [
     "directus",
@@ -59,168 +59,167 @@
   ],
   "dependencies": {
     "@authenio/samlify-node-xmllint": "2.0.0",
-    "@aws-sdk/client-ses": "3.332.0",
+    "@aws-sdk/client-ses": "3.478.0",
     "@directus/format-title": "10.1.0",
-    "@godaddy/terminus": "4.12.0",
-    "@rollup/plugin-alias": "5.0.0",
-    "@rollup/plugin-node-resolve": "15.0.2",
-    "@rollup/plugin-virtual": "3.0.1",
-    "argon2": "0.31.1",
-    "async": "3.2.4",
-    "axios": "1.4.0",
+    "@godaddy/terminus": "4.12.1",
+    "@rollup/plugin-alias": "5.1.0",
+    "@rollup/plugin-node-resolve": "15.2.3",
+    "@rollup/plugin-virtual": "3.0.2",
+    "argon2": "0.31.2",
+    "async": "3.2.5",
+    "axios": "1.6.2",
     "busboy": "1.6.0",
     "bytes": "3.1.2",
-    "camelcase": "7.0.1",
-    "chalk": "5.2.0",
+    "camelcase": "8.0.0",
+    "chalk": "5.3.0",
     "chokidar": "3.5.3",
-    "commander": "10.0.1",
+    "commander": "11.1.0",
     "content-disposition": "0.5.4",
     "cookie-parser": "1.4.6",
     "cors": "2.8.5",
-    "cron-parser": "4.8.1",
-    "date-fns": "2.30.0",
+    "cron-parser": "4.9.0",
+    "date-fns": "3.0.1",
     "deep-diff": "1.0.2",
     "destroy": "1.2.0",
-    "dotenv": "16.0.3",
+    "dotenv": "16.3.1",
     "encodeurl": "1.0.2",
     "eventemitter2": "6.4.9",
-    "execa": "7.1.1",
+    "execa": "8.0.1",
     "exif-reader": "1.2.0",
     "express": "4.18.2",
-    "flat": "5.0.2",
-    "fs-extra": "11.1.1",
+    "flat": "6.0.1",
+    "fs-extra": "11.2.0",
     "glob-to-regexp": "0.4.1",
     "graphql": "16.8.1",
     "graphql-compose": "9.0.10",
-    "graphql-ws": "5.14.1",
-    "helmet": "7.0.0",
+    "graphql-ws": "5.14.2",
+    "helmet": "7.1.0",
     "icc": "3.0.0",
-    "inquirer": "9.2.4",
+    "inquirer": "9.2.12",
     "ioredis": "5.3.2",
     "isolated-vm": "4.6.0",
-    "joi": "17.9.2",
+    "joi": "17.11.0",
     "js-yaml": "4.1.0",
     "js2xmlparser": "5.0.0",
     "json2csv": "5.0.7",
-    "jsonwebtoken": "9.0.1",
-    "keyv": "4.5.2",
-    "knex": "2.4.2",
+    "jsonwebtoken": "9.0.2",
+    "keyv": "4.5.4",
+    "knex": "3.1.0",
     "ldapjs": "2.3.3",
-    "liquidjs": "10.7.1",
+    "liquidjs": "10.10.0",
     "lodash-es": "4.17.21",
-    "marked": "5.0.2",
+    "marked": "11.1.0",
     "micromustache": "8.0.3",
     "mime-types": "2.1.35",
-    "minimatch": "9.0.1",
+    "minimatch": "9.0.3",
     "ms": "2.1.3",
-    "nanoid": "4.0.2",
+    "nanoid": "5.0.4",
     "node-machine-id": "1.1.12",
     "node-schedule": "2.1.1",
-    "nodemailer": "6.9.2",
+    "nodemailer": "6.9.7",
     "object-hash": "3.0.0",
-    "openapi3-ts": "4.1.2",
-    "openid-client": "5.4.2",
-    "ora": "6.3.1",
+    "openapi3-ts": "4.2.0",
+    "openid-client": "5.6.1",
+    "ora": "7.0.1",
     "otplib": "12.0.1",
-    "p-queue": "7.4.1",
+    "p-limit": "5.0.0",
+    "p-queue": "8.0.1",
     "papaparse": "5.4.1",
-    "pino": "8.14.1",
-    "pino-http": "8.3.3",
+    "pino": "8.17.1",
+    "pino-http": "8.6.0",
     "pino-http-print": "3.1.0",
-    "pino-pretty": "10.0.0",
+    "pino-pretty": "10.3.0",
     "qs": "6.11.2",
-    "rate-limiter-flexible": "2.4.1",
-    "rollup": "3.22.0",
+    "rate-limiter-flexible": "4.0.0",
+    "rollup": "4.9.1",
     "samlify": "2.8.10",
-    "sanitize-html": "2.10.0",
-    "sharp": "0.32.6",
+    "sanitize-html": "2.11.0",
+    "sharp": "0.33.1",
     "snappy": "7.2.2",
-    "stream-json": "1.7.5",
-    "strip-bom-stream": "5.0.0",
+    "stream-json": "1.8.0",
     "tinypool": "0.8.1",
-    "tsx": "4.1.4",
-    "uuid": "9.0.0",
+    "tsx": "4.7.0",
+    "uuid": "9.0.1",
     "uuid-validate": "0.0.3",
     "wellknown": "0.5.0",
-    "ws": "8.14.2",
+    "ws": "8.15.1",
     "zod": "3.22.4",
-    "zod-validation-error": "1.0.1",
-    "@directus/app": "10.13.2",
-    "@directus/errors": "0.2.0",
-    "@directus/constants": "11.0.1",
-    "@directus/extensions": "0.2.0",
-    "@directus/extensions-sdk": "10.2.0",
-    "@directus/pressure": "1.0.13",
-    "@directus/schema": "11.0.0",
-    "@directus/specs": "10.2.4",
-    "@directus/storage-driver-azure": "10.0.14",
-    "@directus/storage-driver-cloudinary": "10.0.14",
-    "@directus/storage-driver-gcs": "10.0.14",
-    "@directus/storage": "10.0.7",
-    "@directus/storage-driver-local": "10.0.14",
-    "@directus/storage-driver-supabase": "1.0.6",
-    "@directus/storage-driver-s3": "10.0.14",
-    "@directus/utils": "11.0.2",
-    "@directus/validation": "0.0.9"
+    "zod-validation-error": "2.1.0",
+    "@directus/constants": "11.0.2",
+    "@directus/extensions": "0.2.1",
+    "@directus/errors": "0.2.1",
+    "@directus/app": "10.13.3",
+    "@directus/extensions-sdk": "10.3.0",
+    "@directus/pressure": "1.0.14",
+    "@directus/specs": "10.2.5",
+    "@directus/storage": "10.0.8",
+    "@directus/storage-driver-azure": "10.0.15",
+    "@directus/schema": "11.0.1",
+    "@directus/storage-driver-cloudinary": "10.0.15",
+    "@directus/storage-driver-gcs": "10.0.15",
+    "@directus/storage-driver-local": "10.0.15",
+    "@directus/validation": "0.0.10",
+    "@directus/utils": "11.0.3",
+    "@directus/storage-driver-s3": "10.0.15",
+    "@directus/storage-driver-supabase": "1.0.7",
+    "directus": "10.8.3"
   },
   "devDependencies": {
-    "@ngneat/falso": "6.4.0",
-    "@types/async": "3.2.20",
-    "@types/busboy": "1.5.0",
-    "@types/bytes": "3.1.1",
-    "@types/content-disposition": "0.5.5",
-    "@types/cookie-parser": "1.4.3",
-    "@types/cors": "2.8.13",
-    "@types/deep-diff": "1.0.2",
-    "@types/destroy": "1.0.0",
-    "@types/encodeurl": "1.0.0",
+    "@ngneat/falso": "7.1.1",
+    "@types/async": "3.2.24",
+    "@types/busboy": "1.5.3",
+    "@types/bytes": "3.1.4",
+    "@types/content-disposition": "0.5.8",
+    "@types/cookie-parser": "1.4.6",
+    "@types/cors": "2.8.17",
+    "@types/deep-diff": "1.0.5",
+    "@types/destroy": "1.0.3",
+    "@types/encodeurl": "1.0.2",
     "@types/exif-reader": "1.0.0",
-    "@types/express": "4.17.17",
-    "@types/express-serve-static-core": "4.17.35",
-    "@types/flat": "5.0.2",
-    "@types/fs-extra": "11.0.1",
-    "@types/glob-to-regexp": "0.4.3",
-    "@types/inquirer": "9.0.3",
-    "@types/js-yaml": "4.0.5",
-    "@types/json2csv": "5.0.3",
-    "@types/jsonwebtoken": "9.0.2",
+    "@types/express": "4.17.21",
+    "@types/express-serve-static-core": "4.17.41",
+    "@types/fs-extra": "11.0.4",
+    "@types/glob-to-regexp": "0.4.4",
+    "@types/inquirer": "9.0.7",
+    "@types/js-yaml": "4.0.9",
+    "@types/json2csv": "5.0.7",
+    "@types/jsonwebtoken": "9.0.5",
     "@types/ldapjs": "2.2.5",
-    "@types/lodash-es": "4.17.7",
-    "@types/marked": "4.3.0",
-    "@types/mime-types": "2.1.1",
-    "@types/ms": "0.7.31",
-    "@types/node": "18.16.12",
-    "@types/node-schedule": "2.1.0",
-    "@types/nodemailer": "6.4.7",
-    "@types/object-hash": "3.0.2",
-    "@types/papaparse": "5.3.9",
-    "@types/qs": "6.9.7",
-    "@types/sanitize-html": "2.9.0",
-    "@types/stream-json": "1.7.3",
-    "@types/supertest": "2.0.12",
-    "@types/uuid": "9.0.1",
-    "@types/uuid-validate": "0.0.1",
-    "@types/wellknown": "0.5.4",
-    "@types/ws": "8.5.8",
-    "@vitest/coverage-v8": "0.34.6",
+    "@types/lodash-es": "4.17.12",
+    "@types/mime-types": "2.1.4",
+    "@types/ms": "0.7.34",
+    "@types/node": "18.19.3",
+    "@types/node-schedule": "2.1.5",
+    "@types/nodemailer": "6.4.14",
+    "@types/object-hash": "3.0.6",
+    "@types/papaparse": "5.3.14",
+    "@types/qs": "6.9.10",
+    "@types/sanitize-html": "2.9.5",
+    "@types/stream-json": "1.7.7",
+    "@types/supertest": "2.0.16",
+    "@types/uuid": "9.0.7",
+    "@types/uuid-validate": "0.0.3",
+    "@types/wellknown": "0.5.8",
+    "@types/ws": "8.5.10",
+    "@vitest/coverage-v8": "1.1.0",
     "copyfiles": "2.4.1",
     "form-data": "4.0.0",
-    "knex-mock-client": "2.0.0",
+    "knex-mock-client": "2.0.1",
     "supertest": "6.3.3",
-    "typescript": "5.2.2",
-    "vitest": "0.34.6",
-    "@directus/random": "0.2.3",
+    "typescript": "5.3.3",
+    "vitest": "1.1.0",
     "@directus/tsconfig": "1.0.1",
-    "@directus/types": "11.0.2"
+    "@directus/types": "11.0.3"
   },
   "optionalDependencies": {
-    "@keyv/redis": "2.5.8",
+    "@keyv/redis": "2.8.1",
     "mysql": "2.18.1",
     "nodemailer-mailgun-transport": "2.1.5",
     "nodemailer-sendgrid": "1.0.3",
-    "pg": "8.11.0",
+    "oracledb": "6.2.0",
+    "pg": "8.11.3",
     "sqlite3": "5.1.6",
-    "tedious": "16.1.0"
+    "tedious": "16.6.1"
   },
   "engines": {
     "node": ">=18.0.0"

package/dist/utils/package.d.ts

@@ -1,2 +0,0 @@
-declare const name: string, version: string;
-export { name, version };

package/dist/utils/package.js

@@ -1,6 +0,0 @@
-import { readFileSync } from 'node:fs';
-import { dirname, resolve } from 'node:path';
-import { fileURLToPath } from 'node:url';
-const __dirname = dirname(fileURLToPath(import.meta.url));
-const { name, version } = JSON.parse(readFileSync(resolve(__dirname, '../../package.json'), 'utf8'));
-export { name, version };

package/dist/utils/telemetry.d.ts

@@ -1 +0,0 @@
-export declare function collectTelemetry(): Promise<void>;

package/dist/utils/telemetry.js

@@ -1,23 +0,0 @@
-import mid from 'node-machine-id';
-import env from '../env.js';
-import logger from '../logger.js';
-import { version } from './package.js';
-export async function collectTelemetry() {
-    const axios = (await import('axios')).default;
-    if (env['TELEMETRY'] !== false) {
-        try {
-            await axios.post('https://telemetry.directus.io/', {
-                version: version,
-                public_url: env['PUBLIC_URL'],
-                project_id: env['KEY'],
-                machine_id: await mid.machineId(),
-                db_client: env['DB_CLIENT'],
-            });
-        }
-        catch (err) {
-            if (env['NODE_ENV'] === 'development') {
-                logger.error(err);
-            }
-        }
-    }
-}