directus 9.9.0 → 9.9.1

package/dist/controllers/files.js

@@ -58,6 +58,9 @@ const multipartHandler = (req, res, next) => {
         payload[fieldname] = fieldValue;
     });
     busboy.on('file', async (fieldname, fileStream, filename, encoding, mimetype) => {
+        if (!filename) {
+            return busboy.emit('error', new exceptions_1.InvalidPayloadException(`File is missing filename`));
+        }
         fileCount++;
         if (!payload.title) {
             payload.title = (0, format_title_1.default)(path_1.default.parse(filename).name);

package/dist/database/helpers/fn/dialects/postgres.js

@@ -31,7 +31,11 @@ class FnHelperPostgres extends types_1.FnHelper {
         var _a, _b, _c, _d, _e;
         const type = (_e = (_d = (_c = (_b = (_a = this.schema.collections) === null || _a === void 0 ? void 0 : _a[table]) === null || _b === void 0 ? void 0 : _b.fields) === null || _c === void 0 ? void 0 : _c[column]) === null || _d === void 0 ? void 0 : _d.type) !== null && _e !== void 0 ? _e : 'unknown';
         if (type === 'json') {
-            return this.knex.raw('json_array_length(??.??)', [table, column]);
+            const { dbType } = this.schema.collections[table].fields[column];
+            return this.knex.raw(dbType === 'jsonb' ? 'jsonb_array_length(??.??)' : 'json_array_length(??.??)', [
+                table,
+                column,
+            ]);
         }
         if (type === 'alias') {
             return this._relationalCount(table, column);

package/dist/database/run-ast.js

@@ -107,7 +107,7 @@ async function parseCurrentLevel(schema, collection, children, query) {
         if (!child.relation)
             continue;
         if (child.type === 'm2o') {
-            columnsToSelectInternal.push(child.fieldKey);
+            columnsToSelectInternal.push(child.relation.field);
         }
         if (child.type === 'a2o') {
             columnsToSelectInternal.push(child.relation.field);
@@ -126,7 +126,7 @@ async function parseCurrentLevel(schema, collection, children, query) {
     const columnsToSelect = [...new Set(columnsToSelectInternal)];
     const fieldNodes = columnsToSelect.map((column) => {
         var _a;
-        return (_a = children.find((childNode) => childNode.type === 'field' && childNode.fieldKey === column)) !== null && _a !== void 0 ? _a : {
+        return (_a = children.find((childNode) => childNode.type === 'field' && (childNode.fieldKey === column || childNode.name === column))) !== null && _a !== void 0 ? _a : {
             type: 'field',
             name: column,
             fieldKey: column,
@@ -221,7 +221,7 @@ function mergeWithParentItems(schema, nestedItem, parentItem, nestedNode) {
         for (const parentItem of parentItems) {
             const itemChild = nestedItems.find((nestedItem) => {
                 return (nestedItem[schema.collections[nestedNode.relation.related_collection].primary] ==
-                    parentItem[nestedNode.fieldKey]);
+                    parentItem[nestedNode.relation.field]);
             });
             parentItem[nestedNode.fieldKey] = itemChild || null;
         }

package/dist/database/system-data/fields/collections.yaml

@@ -193,7 +193,7 @@ fields:
 
   - field: item_duplication_fields
     special:
-      - json
+      - cast-json
     interface: system-field-tree
     options:
       collectionField: collection

package/dist/env.js

@@ -87,8 +87,8 @@ const typeMap = {
 };
 let env = {
     ...defaults,
-    ...getEnv(),
     ...process.env,
+    ...getEnv(),
 };
 process.env = env;
 env = processValues(env);
@@ -100,8 +100,8 @@ exports.default = env;
 function refreshEnv() {
     env = {
         ...defaults,
-        ...getEnv(),
         ...process.env,
+        ...getEnv(),
     };
     process.env = env;
     env = processValues(env);

package/dist/services/collections.js

@@ -239,6 +239,8 @@ class CollectionsService {
      */
     async readOne(collectionKey) {
         const result = await this.readMany([collectionKey]);
+        if (result.length === 0)
+            throw new exceptions_1.ForbiddenException();
         return result[0];
     }
     /**

package/dist/services/fields.js

@@ -195,6 +195,8 @@ class FieldsService {
         catch {
             // Do nothing
         }
+        if (!column && !fieldInfo)
+            throw new exceptions_1.ForbiddenException();
         const type = (0, get_local_type_1.default)(column, fieldInfo);
         const data = {
             collection,

package/dist/services/graphql.js

@@ -1175,6 +1175,7 @@ class GraphQLService {
                     continue;
                 selection = selection;
                 let current;
+                let currentAlias = null;
                 // Union type (Many-to-Any)
                 if (selection.kind === 'InlineFragment') {
                     if (selection.typeCondition.name.value.startsWith('__'))
@@ -1187,8 +1188,20 @@ class GraphQLService {
                     if (selection.name.value.startsWith('__'))
                         continue;
                     current = selection.name.value;
+                    if (selection.alias) {
+                        currentAlias = selection.alias.value;
+                    }
                     if (parent) {
                         current = `${parent}.${current}`;
+                        if (currentAlias) {
+                            currentAlias = `${parent}.${currentAlias}`;
+                            // add nested aliases into deep query
+                            if (selection.selectionSet) {
+                                if (!query.deep)
+                                    query.deep = {};
+                                (0, lodash_1.set)(query.deep, parent, (0, lodash_1.merge)((0, lodash_1.get)(query.deep, parent), { _alias: { [selection.alias.value]: selection.name.value } }));
+                            }
+                        }
                     }
                 }
                 if (selection.selectionSet) {
@@ -1203,7 +1216,7 @@ class GraphQLService {
                         }
                     }
                     else {
-                        children = parseFields(selection.selectionSet.selections, current);
+                        children = parseFields(selection.selectionSet.selections, currentAlias !== null && currentAlias !== void 0 ? currentAlias : current);
                     }
                     fields.push(...children);
                 }

package/dist/services/items.js

@@ -354,13 +354,14 @@ class ItemsService {
                         knex: trx,
                         schema: this.schema,
                     });
-                    const revisionIDs = await revisionsService.createMany(await Promise.all(activity.map(async (activity, index) => ({
+                    const revisions = (await Promise.all(activity.map(async (activity, index) => ({
                         activity: activity,
                         collection: this.collection,
                         item: keys[index],
                         data: snapshots && Array.isArray(snapshots) ? JSON.stringify(snapshots[index]) : JSON.stringify(snapshots),
                         delta: await payloadService.prepareDelta(payloadWithTypeCasting),
-                    }))));
+                    })))).filter((revision) => revision.delta);
+                    const revisionIDs = await revisionsService.createMany(revisions);
                     for (let i = 0; i < revisionIDs.length; i++) {
                         const revisionID = revisionIDs[i];
                         if (opts === null || opts === void 0 ? void 0 : opts.onRevisionCreate) {
@@ -529,7 +530,8 @@ class ItemsService {
                     defaults[name] = null;
                     continue;
                 }
-                defaults[name] = field.defaultValue;
+                if (field.defaultValue)
+                    defaults[name] = field.defaultValue;
             }
             return defaults;
         }

package/dist/services/payload.d.ts

@@ -65,6 +65,6 @@ export declare class PayloadService {
      * Transforms the input partial payload to match the output structure, to have consistency
      * between delta and data
      */
-    prepareDelta(data: Partial<Item>): Promise<string>;
+    prepareDelta(data: Partial<Item>): Promise<string | null>;
 }
 export {};

package/dist/services/payload.js

@@ -578,6 +578,8 @@ class PayloadService {
             }
         }
         payload = await this.processValues('read', payload);
+        if (Object.keys(payload).length === 0)
+            return null;
         return JSON.stringify(payload);
     }
 }

package/dist/services/specifications.js

@@ -315,9 +315,7 @@ class OASSpecsService {
                                                     schema: {
                                                         properties: {
                                                             data: {
-                                                                items: {
-                                                                    $ref: `#/components/schemas/${tag.name}`,
-                                                                },
+                                                                $ref: `#/components/schemas/${tag.name}`,
                                                             },
                                                         },
                                                     },

package/dist/services/users.js

@@ -140,8 +140,11 @@ class UsersService extends items_1.ItemsService {
      * Update many users by primary key
      */
     async updateMany(keys, data, opts) {
+        var _a, _b;
         if (data.role) {
-            const newRole = await this.knex.select('admin_access').from('directus_roles').where('id', data.role).first();
+            // data.role will be an object with id with GraphQL mutations
+            const roleId = (_b = (_a = data.role) === null || _a === void 0 ? void 0 : _a.id) !== null && _b !== void 0 ? _b : data.role;
+            const newRole = await this.knex.select('admin_access').from('directus_roles').where('id', roleId).first();
             if (!(newRole === null || newRole === void 0 ? void 0 : newRole.admin_access)) {
                 await this.checkRemainingAdminExistence(keys);
             }

package/dist/utils/apply-query.js

@@ -228,7 +228,7 @@ function applyFilter(knex, schema, rootQuery, rootFilter, collection, subQuery =
                     subQueryKnex
                         .select({ [field]: column })
                         .from(collection)
-                        .whereNotNull(field);
+                        .whereNotNull(column);
                     applyQuery(knex, relation.collection, subQueryKnex, { filter }, schema, true);
                 };
                 if (((_a = Object.keys(value)) === null || _a === void 0 ? void 0 : _a[0]) === '_none') {

package/dist/utils/get-ast-from-query.js

@@ -75,9 +75,17 @@ async function getASTFromQuery(collection, query, schema, options) {
         const relationalStructure = {};
         for (const fieldKey of fields) {
             let name = fieldKey;
-            const isAlias = (_a = (query.alias && name in query.alias)) !== null && _a !== void 0 ? _a : false;
-            if (isAlias) {
-                name = query.alias[fieldKey];
+            if (query.alias) {
+                // check for field alias (is is one of the key)
+                if (name in query.alias) {
+                    name = query.alias[fieldKey];
+                }
+                // check for junction alias (it is one of the value instead of the key)
+                if (Object.values(query.alias).includes(name)) {
+                    const aliasKey = Object.keys(query.alias).find((key) => { var _a; return ((_a = query.alias) === null || _a === void 0 ? void 0 : _a[key]) === name; });
+                    if (aliasKey && fieldKey !== aliasKey)
+                        name = aliasKey;
+                }
             }
             const isRelational = name.includes('.') ||
                 // We'll always treat top level o2m fields as a related item. This is an alias field, otherwise it won't return
@@ -162,6 +170,10 @@ async function getASTFromQuery(collection, query, schema, options) {
                 if (permissions && permissions.some((permission) => permission.collection === relatedCollection) === false) {
                     continue;
                 }
+                // update query alias for children parseFields
+                const deepAlias = (_a = getDeepQuery((deep === null || deep === void 0 ? void 0 : deep[fieldKey]) || {})) === null || _a === void 0 ? void 0 : _a.alias;
+                if (!(0, lodash_1.isEmpty)(deepAlias))
+                    query.alias = deepAlias;
                 child = {
                     type: relationType,
                     name: relatedCollection,

package/dist/utils/get-schema.js

@@ -8,6 +8,7 @@ const schema_1 = __importDefault(require("@directus/schema"));
 const utils_1 = require("@directus/shared/utils");
 const lodash_1 = require("lodash");
 const cache_1 = require("../cache");
+const constants_1 = require("../constants");
 const database_1 = __importDefault(require("../database"));
 const collections_1 = require("../database/system-data/collections");
 const fields_1 = require("../database/system-data/fields");
@@ -113,6 +114,8 @@ async function getDatabaseSchema(database, schemaInspector) {
         const existing = result.collections[field.collection].fields[field.field];
         const column = schemaOverview[field.collection].columns[field.field];
         const special = field.special ? (0, utils_1.toArray)(field.special) : [];
+        if (constants_1.ALIAS_TYPES.some((type) => special.includes(type)) === false && !existing)
+            continue;
         const type = (existing && (0, get_local_type_1.default)(column, { special })) || 'alias';
         let validation = (_a = field.validation) !== null && _a !== void 0 ? _a : null;
         if (validation && typeof validation === 'string')

package/dist/utils/reduce-schema.js

@@ -10,7 +10,7 @@ const lodash_1 = require("lodash");
  * @returns Reduced schema
  */
 function reduceSchema(schema, permissions, actions = ['create', 'read', 'update', 'delete']) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e;
     const reduced = {
         collections: {},
         relations: [],
@@ -25,19 +25,27 @@ function reduceSchema(schema, permissions, actions = ['create', 'read', 'update'
         return acc;
     }, {})) !== null && _a !== void 0 ? _a : {};
     for (const [collectionName, collection] of Object.entries(schema.collections)) {
-        if (permissions === null || permissions === void 0 ? void 0 : permissions.some((permission) => permission.collection === collectionName && actions.includes(permission.action))) {
-            const fields = {};
-            for (const [fieldName, field] of Object.entries(schema.collections[collectionName].fields)) {
-                if (((_b = allowedFieldsInCollection[collectionName]) === null || _b === void 0 ? void 0 : _b.includes('*')) ||
-                    ((_c = allowedFieldsInCollection[collectionName]) === null || _c === void 0 ? void 0 : _c.includes(fieldName))) {
-                    fields[fieldName] = field;
-                }
+        if (!(permissions === null || permissions === void 0 ? void 0 : permissions.some((permission) => permission.collection === collectionName && actions.includes(permission.action)))) {
+            continue;
+        }
+        const fields = {};
+        for (const [fieldName, field] of Object.entries(schema.collections[collectionName].fields)) {
+            if (!((_b = allowedFieldsInCollection[collectionName]) === null || _b === void 0 ? void 0 : _b.includes('*')) &&
+                !((_c = allowedFieldsInCollection[collectionName]) === null || _c === void 0 ? void 0 : _c.includes(fieldName))) {
+                continue;
+            }
+            const relatedCollection = ((_d = schema.relations.find((relation) => relation.collection === collectionName && relation.field === fieldName)) === null || _d === void 0 ? void 0 : _d.related_collection) ||
+                ((_e = schema.relations.find((relation) => { var _a; return relation.related_collection === collectionName && ((_a = relation.meta) === null || _a === void 0 ? void 0 : _a.one_field) === fieldName; })) === null || _e === void 0 ? void 0 : _e.collection);
+            if (relatedCollection &&
+                !(permissions === null || permissions === void 0 ? void 0 : permissions.some((permission) => permission.collection === relatedCollection && actions.includes(permission.action)))) {
+                continue;
             }
-            reduced.collections[collectionName] = {
-                ...collection,
-                fields,
-            };
+            fields[fieldName] = field;
         }
+        reduced.collections[collectionName] = {
+            ...collection,
+            fields,
+        };
     }
     reduced.relations = schema.relations.filter((relation) => {
         var _a, _b, _c;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "directus",
-	"version": "9.9.0",
+	"version": "9.9.1",
 	"license": "GPL-3.0-only",
 	"homepage": "https://github.com/directus/directus#readme",
 	"description": "Directus is a real-time API and App dashboard for managing SQL database content.",
@@ -78,16 +78,16 @@
 	],
 	"dependencies": {
 		"@aws-sdk/client-ses": "^3.40.0",
-		"@directus/app": "9.9.0",
-		"@directus/drive": "9.9.0",
-		"@directus/drive-azure": "9.9.0",
-		"@directus/drive-gcs": "9.9.0",
-		"@directus/drive-s3": "9.9.0",
-		"@directus/extensions-sdk": "9.9.0",
-		"@directus/format-title": "9.9.0",
-		"@directus/schema": "9.9.0",
-		"@directus/shared": "9.9.0",
-		"@directus/specs": "9.9.0",
+		"@directus/app": "9.9.1",
+		"@directus/drive": "9.9.1",
+		"@directus/drive-azure": "9.9.1",
+		"@directus/drive-gcs": "9.9.1",
+		"@directus/drive-s3": "9.9.1",
+		"@directus/extensions-sdk": "9.9.1",
+		"@directus/format-title": "9.9.1",
+		"@directus/schema": "9.9.1",
+		"@directus/shared": "9.9.1",
+		"@directus/specs": "9.9.1",
 		"@godaddy/terminus": "^4.9.0",
 		"@rollup/plugin-alias": "^3.1.9",
 		"@rollup/plugin-virtual": "^2.0.3",
@@ -173,7 +173,7 @@
 		"sqlite3": "^5.0.2",
 		"tedious": "^13.0.0"
 	},
-	"gitHead": "fb252ca4cef57de1aa8d1914db6bc85730902e81",
+	"gitHead": "ed780aceba707c714e0b0aa01a953d141a5c800e",
 	"devDependencies": {
 		"@types/async": "3.2.10",
 		"@types/body-parser": "1.19.2",