directus 9.12.2 → 9.14.1

package/dist/services/files.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist/services/flows.d.ts

@@ -6,6 +6,7 @@ export declare class FlowsService extends ItemsService<FlowRaw> {
     createOne(data: Partial<Item>, opts?: MutationOptions): Promise<PrimaryKey>;
     createMany(data: Partial<Item>[], opts?: MutationOptions): Promise<PrimaryKey[]>;
     updateOne(key: PrimaryKey, data: Partial<Item>, opts?: MutationOptions): Promise<PrimaryKey>;
+    updateBatch(data: Partial<Item>[], opts?: MutationOptions): Promise<PrimaryKey[]>;
     updateMany(keys: PrimaryKey[], data: Partial<Item>, opts?: MutationOptions): Promise<PrimaryKey[]>;
     deleteOne(key: PrimaryKey, opts?: MutationOptions): Promise<PrimaryKey>;
     deleteMany(keys: PrimaryKey[], opts?: MutationOptions): Promise<PrimaryKey[]>;

package/dist/services/flows.js

@@ -25,6 +25,12 @@ class FlowsService extends items_1.ItemsService {
         await flowManager.reload();
         return result;
     }
+    async updateBatch(data, opts) {
+        const flowManager = (0, flows_1.getFlowManager)();
+        const result = await super.updateBatch(data, opts);
+        await flowManager.reload();
+        return result;
+    }
     async updateMany(keys, data, opts) {
         const flowManager = (0, flows_1.getFlowManager)();
         const result = await super.updateMany(keys, data, opts);

package/dist/services/{graphql.d.ts → graphql/index.d.ts}

@@ -1,12 +1,10 @@
 import { BaseException } from '@directus/shared/exceptions';
 import { Accountability, Query, SchemaOverview } from '@directus/shared/types';
-import { ArgumentNode, FormattedExecutionResult, FragmentDefinitionNode, GraphQLError, GraphQLResolveInfo, GraphQLScalarType, GraphQLSchema, ObjectFieldNode, SelectionNode } from 'graphql';
+import { ArgumentNode, FormattedExecutionResult, FragmentDefinitionNode, GraphQLError, GraphQLResolveInfo, GraphQLSchema, ObjectFieldNode, SelectionNode } from 'graphql';
 import { ObjectTypeComposer, SchemaComposer } from 'graphql-compose';
 import { Knex } from 'knex';
-import { AbstractServiceOptions, GraphQLParams, Item } from '../types';
-import { ItemsService } from './items';
-export declare const GraphQLGeoJSON: GraphQLScalarType;
-export declare const GraphQLDate: GraphQLScalarType;
+import { AbstractServiceOptions, GraphQLParams, Item } from '../../types';
+import { ItemsService } from '../items';
 export declare class GraphQLService {
     accountability: Accountability | null;
     knex: Knex;

package/dist/services/{graphql.js → graphql/index.js}

@@ -3,70 +3,56 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GraphQLService = exports.GraphQLDate = exports.GraphQLGeoJSON = void 0;
+exports.GraphQLService = void 0;
 const types_1 = require("@directus/shared/types");
 const argon2_1 = __importDefault(require("argon2"));
 const graphql_1 = require("graphql");
 const graphql_compose_1 = require("graphql-compose");
 const lodash_1 = require("lodash");
 const ms_1 = __importDefault(require("ms"));
-const cache_1 = require("../cache");
-const constants_1 = require("../constants");
-const database_1 = __importDefault(require("../database"));
-const env_1 = __importDefault(require("../env"));
-const exceptions_1 = require("../exceptions");
-const extensions_1 = require("../extensions");
-const generate_hash_1 = require("../utils/generate-hash");
-const get_graphql_type_1 = require("../utils/get-graphql-type");
-const reduce_schema_1 = require("../utils/reduce-schema");
-const sanitize_query_1 = require("../utils/sanitize-query");
-const validate_query_1 = require("../utils/validate-query");
-const activity_1 = require("./activity");
-const authentication_1 = require("./authentication");
-const collections_1 = require("./collections");
-const fields_1 = require("./fields");
-const files_1 = require("./files");
-const flows_1 = require("./flows");
-const folders_1 = require("./folders");
-const items_1 = require("./items");
-const notifications_1 = require("./notifications");
-const operations_1 = require("./operations");
-const permissions_1 = require("./permissions");
-const presets_1 = require("./presets");
-const relations_1 = require("./relations");
-const revisions_1 = require("./revisions");
-const roles_1 = require("./roles");
-const server_1 = require("./server");
-const settings_1 = require("./settings");
-const shares_1 = require("./shares");
-const specifications_1 = require("./specifications");
-const tfa_1 = require("./tfa");
-const users_1 = require("./users");
-const utils_1 = require("./utils");
-const webhooks_1 = require("./webhooks");
-const GraphQLVoid = new graphql_1.GraphQLScalarType({
-    name: 'Void',
-    description: 'Represents NULL values',
-    serialize() {
-        return null;
-    },
-    parseValue() {
-        return null;
-    },
-    parseLiteral() {
-        return null;
-    },
-});
-exports.GraphQLGeoJSON = new graphql_1.GraphQLScalarType({
-    ...graphql_compose_1.GraphQLJSON,
-    name: 'GraphQLGeoJSON',
-    description: 'GeoJSON value',
-});
-exports.GraphQLDate = new graphql_1.GraphQLScalarType({
-    ...graphql_1.GraphQLString,
-    name: 'Date',
-    description: 'ISO8601 Date values',
-});
+const cache_1 = require("../../cache");
+const constants_1 = require("../../constants");
+const database_1 = __importDefault(require("../../database"));
+const env_1 = __importDefault(require("../../env"));
+const exceptions_1 = require("../../exceptions");
+const extensions_1 = require("../../extensions");
+const generate_hash_1 = require("../../utils/generate-hash");
+const get_graphql_type_1 = require("../../utils/get-graphql-type");
+const reduce_schema_1 = require("../../utils/reduce-schema");
+const sanitize_query_1 = require("../../utils/sanitize-query");
+const validate_query_1 = require("../../utils/validate-query");
+const activity_1 = require("../activity");
+const authentication_1 = require("../authentication");
+const collections_1 = require("../collections");
+const fields_1 = require("../fields");
+const files_1 = require("../files");
+const flows_1 = require("../flows");
+const folders_1 = require("../folders");
+const items_1 = require("../items");
+const notifications_1 = require("../notifications");
+const operations_1 = require("../operations");
+const permissions_1 = require("../permissions");
+const presets_1 = require("../presets");
+const relations_1 = require("../relations");
+const revisions_1 = require("../revisions");
+const roles_1 = require("../roles");
+const server_1 = require("../server");
+const settings_1 = require("../settings");
+const shares_1 = require("../shares");
+const specifications_1 = require("../specifications");
+const tfa_1 = require("../tfa");
+const users_1 = require("../users");
+const utils_1 = require("../utils");
+const webhooks_1 = require("../webhooks");
+const date_1 = require("./types/date");
+const geojson_1 = require("./types/geojson");
+const string_or_float_1 = require("./types/string-or-float");
+const void_1 = require("./types/void");
+const add_path_to_validation_error_1 = require("./utils/add-path-to-validation-error");
+const validationRules = Array.from(graphql_1.specifiedRules);
+if (env_1.default.GRAPHQL_INTROSPECTION === false) {
+    validationRules.push(graphql_1.NoSchemaIntrospectionCustomRule);
+}
 /**
  * These should be ignored in the context of GraphQL, and/or are replaced by a custom resolver (for non-standard structures)
  */
@@ -91,16 +77,7 @@ class GraphQLService {
     async execute({ document, variables, operationName, contextValue, }) {
         var _a;
         const schema = this.getSchema();
-        const validationErrors = (0, graphql_1.validate)(schema, document, [
-            ...graphql_1.specifiedRules,
-            (context) => ({
-                Field(node) {
-                    if (env_1.default.GRAPHQL_INTROSPECTION === false && (node.name.value === '__schema' || node.name.value === '__type')) {
-                        context.reportError(new graphql_1.GraphQLError('GraphQL introspection is not allowed. The query contained __schema or __type.', [node]));
-                    }
-                },
-            }),
-        ]);
+        const validationErrors = (0, graphql_1.validate)(schema, document, validationRules).map((validationError) => (0, add_path_to_validation_error_1.addPathToValidationError)(validationError));
         if (validationErrors.length > 0) {
             throw new exceptions_1.GraphQLValidationException({ graphqlErrors: validationErrors });
         }
@@ -180,7 +157,7 @@ class GraphQLService {
         else {
             schemaComposer.Query.addFields({
                 _empty: {
-                    type: GraphQLVoid,
+                    type: void_1.GraphQLVoid,
                     description: "There's no data to query.",
                 },
             });
@@ -209,6 +186,7 @@ class GraphQLService {
                 }
                 else {
                     acc[`update_${collectionName}_items`] = UpdateCollectionTypes[collection.collection].getResolver(`update_${collection.collection}_items`);
+                    acc[`update_${collectionName}_batch`] = UpdateCollectionTypes[collection.collection].getResolver(`update_${collection.collection}_batch`);
                     acc[`update_${collectionName}_item`] = UpdateCollectionTypes[collection.collection].getResolver(`update_${collection.collection}_item`);
                 }
                 return acc;
@@ -512,32 +490,33 @@ class GraphQLService {
                     },
                 },
             });
+            // Uses StringOrFloat rather than Float to support api dynamic variables (like `$NOW`)
             const NumberFilterOperators = schemaComposer.createInputTC({
                 name: 'number_filter_operators',
                 fields: {
                     _eq: {
-                        type: graphql_1.GraphQLFloat,
+                        type: string_or_float_1.GraphQLStringOrFloat,
                     },
                     _neq: {
-                        type: graphql_1.GraphQLFloat,
+                        type: string_or_float_1.GraphQLStringOrFloat,
                     },
                     _in: {
-                        type: new graphql_1.GraphQLList(graphql_1.GraphQLFloat),
+                        type: new graphql_1.GraphQLList(string_or_float_1.GraphQLStringOrFloat),
                     },
                     _nin: {
-                        type: new graphql_1.GraphQLList(graphql_1.GraphQLFloat),
+                        type: new graphql_1.GraphQLList(string_or_float_1.GraphQLStringOrFloat),
                     },
                     _gt: {
-                        type: graphql_1.GraphQLFloat,
+                        type: string_or_float_1.GraphQLStringOrFloat,
                     },
                     _gte: {
-                        type: graphql_1.GraphQLFloat,
+                        type: string_or_float_1.GraphQLStringOrFloat,
                     },
                     _lt: {
-                        type: graphql_1.GraphQLFloat,
+                        type: string_or_float_1.GraphQLStringOrFloat,
                     },
                     _lte: {
-                        type: graphql_1.GraphQLFloat,
+                        type: string_or_float_1.GraphQLStringOrFloat,
                     },
                     _null: {
                         type: graphql_1.GraphQLBoolean,
@@ -551,22 +530,22 @@ class GraphQLService {
                 name: 'geometry_filter_operators',
                 fields: {
                     _eq: {
-                        type: exports.GraphQLGeoJSON,
+                        type: geojson_1.GraphQLGeoJSON,
                     },
                     _neq: {
-                        type: exports.GraphQLGeoJSON,
+                        type: geojson_1.GraphQLGeoJSON,
                     },
                     _intersects: {
-                        type: exports.GraphQLGeoJSON,
+                        type: geojson_1.GraphQLGeoJSON,
                     },
                     _nintersects: {
-                        type: exports.GraphQLGeoJSON,
+                        type: geojson_1.GraphQLGeoJSON,
                     },
                     _intersects_bbox: {
-                        type: exports.GraphQLGeoJSON,
+                        type: geojson_1.GraphQLGeoJSON,
                     },
                     _nintersects_bbox: {
-                        type: exports.GraphQLGeoJSON,
+                        type: geojson_1.GraphQLGeoJSON,
                     },
                 },
             });
@@ -637,10 +616,10 @@ class GraphQLService {
                             case graphql_1.GraphQLFloat:
                                 filterOperatorType = NumberFilterOperators;
                                 break;
-                            case exports.GraphQLDate:
+                            case date_1.GraphQLDate:
                                 filterOperatorType = DateFilterOperators;
                                 break;
-                            case exports.GraphQLGeoJSON:
+                            case geojson_1.GraphQLGeoJSON:
                                 filterOperatorType = GeometryFilterOperators;
                                 break;
                             default:
@@ -782,7 +761,7 @@ class GraphQLService {
                         },
                     type: collection.singleton
                         ? ReadCollectionTypes[collection.collection]
-                        : [ReadCollectionTypes[collection.collection]],
+                        : new graphql_1.GraphQLNonNull(new graphql_1.GraphQLList(new graphql_1.GraphQLNonNull(ReadCollectionTypes[collection.collection].getType()))),
                     resolve: async ({ info, context }) => {
                         const result = await self.resolveQuery(info);
                         context.data = result;
@@ -791,7 +770,7 @@ class GraphQLService {
                 });
                 ReadCollectionTypes[collection.collection].addResolver({
                     name: `${collection.collection}_aggregated`,
-                    type: [AggregatedFunctions[collection.collection]],
+                    type: new graphql_1.GraphQLNonNull(new graphql_1.GraphQLList(new graphql_1.GraphQLNonNull(AggregatedFunctions[collection.collection].getType()))),
                     args: {
                         groupBy: new graphql_1.GraphQLList(graphql_1.GraphQLString),
                         filter: ReadableCollectionFilterTypes[collection.collection],
@@ -901,7 +880,9 @@ class GraphQLService {
                 if (Object.keys(creatableFields).length > 0) {
                     CreateCollectionTypes[collection.collection].addResolver({
                         name: `create_${collection.collection}_items`,
-                        type: collectionIsReadable ? [ReadCollectionTypes[collection.collection]] : graphql_1.GraphQLBoolean,
+                        type: collectionIsReadable
+                            ? new graphql_1.GraphQLNonNull(new graphql_1.GraphQLList(new graphql_1.GraphQLNonNull(ReadCollectionTypes[collection.collection].getType())))
+                            : graphql_1.GraphQLBoolean,
                         args: collectionIsReadable
                             ? ReadCollectionTypes[collection.collection].getResolver(collection.collection).getArgs()
                             : undefined,
@@ -949,9 +930,26 @@ class GraphQLService {
                         });
                     }
                     else {
+                        UpdateCollectionTypes[collection.collection].addResolver({
+                            name: `update_${collection.collection}_batch`,
+                            type: collectionIsReadable
+                                ? new graphql_1.GraphQLNonNull(new graphql_1.GraphQLList(new graphql_1.GraphQLNonNull(ReadCollectionTypes[collection.collection].getType())))
+                                : graphql_1.GraphQLBoolean,
+                            args: {
+                                ...(collectionIsReadable
+                                    ? ReadCollectionTypes[collection.collection].getResolver(collection.collection).getArgs()
+                                    : {}),
+                                data: [
+                                    (0, graphql_compose_1.toInputObjectType)(UpdateCollectionTypes[collection.collection]).setTypeName(`update_${collection.collection}_input`).NonNull,
+                                ],
+                            },
+                            resolve: async ({ args, info }) => await self.resolveMutation(args, info),
+                        });
                         UpdateCollectionTypes[collection.collection].addResolver({
                             name: `update_${collection.collection}_items`,
-                            type: collectionIsReadable ? [ReadCollectionTypes[collection.collection]] : graphql_1.GraphQLBoolean,
+                            type: collectionIsReadable
+                                ? new graphql_1.GraphQLNonNull(new graphql_1.GraphQLList(new graphql_1.GraphQLNonNull(ReadCollectionTypes[collection.collection].getType())))
+                                : graphql_1.GraphQLBoolean,
                             args: {
                                 ...(collectionIsReadable
                                     ? ReadCollectionTypes[collection.collection].getResolver(collection.collection).getArgs()
@@ -1065,10 +1063,14 @@ class GraphQLService {
             collection = `directus_${collection}`;
         const selections = this.replaceFragmentsInSelections((_b = (_a = info.fieldNodes[0]) === null || _a === void 0 ? void 0 : _a.selectionSet) === null || _b === void 0 ? void 0 : _b.selections, info.fragments);
         const query = this.getQuery(args, selections || [], info.variableValues);
-        const singleton = collection.endsWith('_items') === false &&
+        const singleton = collection.endsWith('_batch') === false &&
+            collection.endsWith('_items') === false &&
             collection.endsWith('_item') === false &&
             collection in this.schema.collections;
-        const single = collection.endsWith('_items') === false;
+        const single = collection.endsWith('_items') === false && collection.endsWith('_batch') === false;
+        const batchUpdate = action === 'update' && collection.endsWith('_batch');
+        if (collection.endsWith('_batch'))
+            collection = collection.slice(0, -6);
         if (collection.endsWith('_items'))
             collection = collection.slice(0, -6);
         if (collection.endsWith('_item'))
@@ -1099,7 +1101,13 @@ class GraphQLService {
                     return hasQuery ? await service.readMany(keys, query) : true;
                 }
                 if (action === 'update') {
-                    const keys = await service.updateMany(args.ids, args.data);
+                    const keys = [];
+                    if (batchUpdate) {
+                        keys.push(...(await service.updateBatch(args.data)));
+                    }
+                    else {
+                        keys.push(...(await service.updateMany(args.ids, args.data)));
+                    }
                     return hasQuery ? await service.readMany(keys, query) : true;
                 }
                 if (action === 'delete') {
@@ -1232,7 +1240,7 @@ class GraphQLService {
                             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 } }));
+                                (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 } }));
                             }
                         }
                     }
@@ -1261,7 +1269,7 @@ class GraphQLService {
                         if (!query.deep)
                             query.deep = {};
                         const args = this.parseArgs(selection.arguments, variableValues);
-                        (0, lodash_1.set)(query.deep, currentAlias !== null && currentAlias !== void 0 ? currentAlias : current, (0, lodash_1.merge)((0, lodash_1.get)(query.deep, currentAlias !== null && currentAlias !== void 0 ? currentAlias : current), (0, lodash_1.mapKeys)((0, sanitize_query_1.sanitizeQuery)(args, this.accountability), (value, key) => `_${key}`)));
+                        (0, lodash_1.set)(query.deep, currentAlias !== null && currentAlias !== void 0 ? currentAlias : current, (0, lodash_1.merge)({}, (0, lodash_1.get)(query.deep, currentAlias !== null && currentAlias !== void 0 ? currentAlias : current), (0, lodash_1.mapKeys)((0, sanitize_query_1.sanitizeQuery)(args, this.accountability), (value, key) => `_${key}`)));
                     }
                 }
             }
@@ -1307,7 +1315,7 @@ class GraphQLService {
                 continue;
             const aggregateProperty = aggregationGroup.name.value;
             query.aggregate[aggregateProperty] =
-                (_b = (_a = aggregationGroup.selectionSet) === null || _a === void 0 ? void 0 : _a.selections.filter((selectionNode) => { var _a; return !((_a = selectionNode) === null || _a === void 0 ? void 0 : _a.name.value.startsWith('__')); }).map((selectionNode) => {
+                (_b = (_a = aggregationGroup.selectionSet) === null || _a === void 0 ? void 0 : _a.selections.filter((selectionNode) => !(selectionNode === null || selectionNode === void 0 ? void 0 : selectionNode.name.value.startsWith('__'))).map((selectionNode) => {
                     selectionNode = selectionNode;
                     return selectionNode.name.value;
                 })) !== null && _b !== void 0 ? _b : [];
@@ -1808,7 +1816,7 @@ class GraphQLService {
                 },
             },
             utils_cache_clear: {
-                type: GraphQLVoid,
+                type: void_1.GraphQLVoid,
                 resolve: async () => {
                     var _a;
                     if (((_a = this.accountability) === null || _a === void 0 ? void 0 : _a.admin) !== true) {
@@ -1859,7 +1867,7 @@ class GraphQLService {
             });
             schemaComposer.Query.addFields({
                 collections: {
-                    type: [Collection],
+                    type: new graphql_1.GraphQLNonNull(new graphql_1.GraphQLList(new graphql_1.GraphQLNonNull(Collection.getType()))),
                     resolve: async () => {
                         const collectionsService = new collections_1.CollectionsService({
                             accountability: this.accountability,
@@ -1920,7 +1928,7 @@ class GraphQLService {
             });
             schemaComposer.Query.addFields({
                 fields: {
-                    type: [Field],
+                    type: new graphql_1.GraphQLNonNull(new graphql_1.GraphQLList(new graphql_1.GraphQLNonNull(Field.getType()))),
                     resolve: async () => {
                         const service = new fields_1.FieldsService({
                             accountability: this.accountability,
@@ -1930,7 +1938,7 @@ class GraphQLService {
                     },
                 },
                 fields_in_collection: {
-                    type: [Field],
+                    type: new graphql_1.GraphQLNonNull(new graphql_1.GraphQLList(new graphql_1.GraphQLNonNull(Field.getType()))),
                     args: {
                         collection: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
                     },
@@ -1988,7 +1996,7 @@ class GraphQLService {
             });
             schemaComposer.Query.addFields({
                 relations: {
-                    type: [Relation],
+                    type: new graphql_1.GraphQLNonNull(new graphql_1.GraphQLList(new graphql_1.GraphQLNonNull(Relation.getType()))),
                     resolve: async () => {
                         const service = new relations_1.RelationsService({
                             accountability: this.accountability,
@@ -1998,7 +2006,7 @@ class GraphQLService {
                     },
                 },
                 relations_in_collection: {
-                    type: [Relation],
+                    type: new graphql_1.GraphQLNonNull(new graphql_1.GraphQLList(new graphql_1.GraphQLNonNull(Relation.getType()))),
                     args: {
                         collection: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
                     },

package/dist/services/graphql/types/date.d.ts

@@ -0,0 +1,2 @@
+import { GraphQLScalarType } from 'graphql';
+export declare const GraphQLDate: GraphQLScalarType;

package/dist/services/graphql/types/date.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GraphQLDate = void 0;
+const graphql_1 = require("graphql");
+exports.GraphQLDate = new graphql_1.GraphQLScalarType({
+    ...graphql_1.GraphQLString,
+    name: 'Date',
+    description: 'ISO8601 Date values',
+});

package/dist/services/graphql/types/geojson.d.ts

@@ -0,0 +1,2 @@
+import { GraphQLScalarType } from 'graphql';
+export declare const GraphQLGeoJSON: GraphQLScalarType;

package/dist/services/graphql/types/geojson.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GraphQLGeoJSON = void 0;
+const graphql_1 = require("graphql");
+const graphql_compose_1 = require("graphql-compose");
+exports.GraphQLGeoJSON = new graphql_1.GraphQLScalarType({
+    ...graphql_compose_1.GraphQLJSON,
+    name: 'GraphQLGeoJSON',
+    description: 'GeoJSON value',
+});

package/dist/services/graphql/types/string-or-float.d.ts

@@ -0,0 +1,5 @@
+import { GraphQLScalarType } from 'graphql';
+/**
+ * Adopted from https://kamranicus.com/handling-multiple-scalar-types-in-graphql/
+ */
+export declare const GraphQLStringOrFloat: GraphQLScalarType;

package/dist/services/graphql/types/string-or-float.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GraphQLStringOrFloat = void 0;
+const graphql_1 = require("graphql");
+/**
+ * Adopted from https://kamranicus.com/handling-multiple-scalar-types-in-graphql/
+ */
+exports.GraphQLStringOrFloat = new graphql_1.GraphQLScalarType({
+    name: 'GraphQLStringOrFloat',
+    description: 'A Float or a String',
+    serialize(value) {
+        if (typeof value !== 'string' && typeof value !== 'number') {
+            throw new Error('Value must be either a String or a Float');
+        }
+        return value;
+    },
+    parseValue(value) {
+        if (typeof value !== 'string' && typeof value !== 'number') {
+            throw new Error('Value must be either a String or a Float');
+        }
+        return value;
+    },
+    parseLiteral(ast) {
+        switch (ast.kind) {
+            case graphql_1.Kind.INT:
+            case graphql_1.Kind.FLOAT:
+                return Number(ast.value);
+            case graphql_1.Kind.STRING:
+                return ast.value;
+            default:
+                throw new Error('Value must be either a String or a Float');
+        }
+    },
+});

package/dist/services/graphql/types/void.d.ts

@@ -0,0 +1,2 @@
+import { GraphQLScalarType } from 'graphql';
+export declare const GraphQLVoid: GraphQLScalarType;

package/dist/services/graphql/types/void.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GraphQLVoid = void 0;
+const graphql_1 = require("graphql");
+exports.GraphQLVoid = new graphql_1.GraphQLScalarType({
+    name: 'Void',
+    description: 'Represents NULL values',
+    serialize() {
+        return null;
+    },
+    parseValue() {
+        return null;
+    },
+    parseLiteral() {
+        return null;
+    },
+});

package/dist/services/graphql/utils/add-path-to-validation-error.d.ts

@@ -0,0 +1,2 @@
+import { GraphQLError } from 'graphql';
+export declare function addPathToValidationError(validationError: GraphQLError): GraphQLError;

package/dist/services/graphql/utils/add-path-to-validation-error.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addPathToValidationError = void 0;
+const graphql_1 = require("graphql");
+function addPathToValidationError(validationError) {
+    var _a, _b, _c;
+    const token = (_c = (_b = (_a = validationError.nodes) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.loc) === null || _c === void 0 ? void 0 : _c.startToken;
+    if (!token)
+        return validationError;
+    let prev = token;
+    const queryRegex = /query_[A-Za-z0-9]{8}/;
+    while (prev) {
+        if (prev.kind === 'Name' && prev.value && queryRegex.test(prev.value)) {
+            return (0, graphql_1.locatedError)(validationError, validationError.nodes, [prev.value]);
+        }
+        prev = prev.prev;
+    }
+    return (0, graphql_1.locatedError)(validationError, validationError.nodes);
+}
+exports.addPathToValidationError = addPathToValidationError;

package/dist/services/import-export.js

@@ -20,7 +20,6 @@ const env_1 = __importDefault(require("../env"));
 const exceptions_1 = require("../exceptions");
 const logger_1 = __importDefault(require("../logger"));
 const get_date_formatted_1 = require("../utils/get-date-formatted");
-const parse_json_1 = require("../utils/parse-json");
 const files_1 = require("./files");
 const items_1 = require("./items");
 const notifications_1 = require("./notifications");
@@ -31,12 +30,12 @@ class ImportService {
         this.schema = options.schema;
     }
     async import(collection, mimetype, stream) {
-        var _a, _b, _c, _d, _e;
-        if (collection.startsWith('directus_'))
+        var _a, _b, _c, _d, _e, _f;
+        if (((_a = this.accountability) === null || _a === void 0 ? void 0 : _a.admin) !== true && collection.startsWith('directus_'))
             throw new exceptions_1.ForbiddenException();
-        const createPermissions = (_b = (_a = this.accountability) === null || _a === void 0 ? void 0 : _a.permissions) === null || _b === void 0 ? void 0 : _b.find((permission) => permission.collection === collection && permission.action === 'create');
-        const updatePermissions = (_d = (_c = this.accountability) === null || _c === void 0 ? void 0 : _c.permissions) === null || _d === void 0 ? void 0 : _d.find((permission) => permission.collection === collection && permission.action === 'update');
-        if (((_e = this.accountability) === null || _e === void 0 ? void 0 : _e.admin) !== true && (!createPermissions || !updatePermissions)) {
+        const createPermissions = (_c = (_b = this.accountability) === null || _b === void 0 ? void 0 : _b.permissions) === null || _c === void 0 ? void 0 : _c.find((permission) => permission.collection === collection && permission.action === 'create');
+        const updatePermissions = (_e = (_d = this.accountability) === null || _d === void 0 ? void 0 : _d.permissions) === null || _e === void 0 ? void 0 : _e.find((permission) => permission.collection === collection && permission.action === 'update');
+        if (((_f = this.accountability) === null || _f === void 0 ? void 0 : _f.admin) !== true && (!createPermissions || !updatePermissions)) {
             throw new exceptions_1.ForbiddenException();
         }
         switch (mimetype) {
@@ -102,8 +101,13 @@ class ImportService {
                         }
                         else {
                             try {
-                                const parsedJson = (0, parse_json_1.parseJSON)(value);
-                                (0, lodash_1.set)(result, key, parsedJson);
+                                const parsedJson = (0, utils_1.parseJSON)(value);
+                                if (typeof parsedJson === 'number') {
+                                    (0, lodash_1.set)(result, key, value);
+                                }
+                                else {
+                                    (0, lodash_1.set)(result, key, parsedJson);
+                                }
                             }
                             catch {
                                 (0, lodash_1.set)(result, key, value);

package/dist/services/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];