@contentful/app-scripts 1.13.4 → 1.15.0

package/lib/types.d.ts

@@ -10,11 +10,12 @@ export interface FunctionAppAction {
     allowNetworks?: string[];
     entryFile?: string;
 }
-export interface DeliveryFunction {
+export interface ContentfulFunction {
     id: string;
     name: string;
     description: string;
     path: string;
+    accepts: string[];
     allowNetworks?: string[];
     entryFile?: string;
 }
@@ -69,5 +70,5 @@ export interface UploadSettings {
     userAgentApplication?: string;
     host?: string;
     actions?: FunctionAppAction[];
-    deliveryFunctions?: DeliveryFunction[];
+    functions?: ContentfulFunction[];
 }

package/lib/upload/build-upload-settings.js

@@ -7,7 +7,7 @@ const utils_1 = require("../utils");
 const constants_1 = require("../constants");
 async function buildAppUploadSettings(options) {
     const actionsManifest = (0, utils_1.getEntityFromManifest)('actions');
-    const deliveryFnManifest = (0, utils_1.getEntityFromManifest)('deliveryFunctions');
+    const functionManifest = (0, utils_1.getEntityFromManifest)('functions');
     const prompts = [];
     const { bundleDir, comment, skipActivation, host } = options;
     if (!bundleDir) {
@@ -47,7 +47,7 @@ async function buildAppUploadSettings(options) {
         comment,
         host,
         actions: actionsManifest,
-        deliveryFunctions: deliveryFnManifest,
+        functions: functionManifest,
         ...appUploadSettings,
         ...appInfo,
     };

package/lib/upload/create-app-bundle.js

@@ -10,7 +10,7 @@ const utils_1 = require("../utils");
 const contentful_management_1 = require("contentful-management");
 const create_app_upload_1 = require("./create-app-upload");
 async function createAppBundleFromUpload(settings, appUploadId) {
-    const { accessToken, host, userAgentApplication, comment, actions, deliveryFunctions } = settings;
+    const { accessToken, host, userAgentApplication, comment, actions, functions } = settings;
     const clientSpinner = (0, ora_1.default)('Verifying your upload...').start();
     const client = (0, contentful_management_1.createClient)({
         accessToken,
@@ -27,7 +27,7 @@ async function createAppBundleFromUpload(settings, appUploadId) {
             appUploadId,
             comment: comment && comment.length > 0 ? comment : undefined,
             actions,
-            deliveryFunctions,
+            functions,
         });
     }
     catch (err) {

package/lib/upload/get-upload-settings-args.js

@@ -18,7 +18,7 @@ const requiredOptions = {
 async function getUploadSettingsArgs(options) {
     const validateSpinner = (0, ora_1.default)('Validating your input...').start();
     const actionsManifest = (0, utils_1.getEntityFromManifest)('actions');
-    const deliveryFnManifest = (0, utils_1.getEntityFromManifest)('deliveryFunctions');
+    const functionManifest = (0, utils_1.getEntityFromManifest)('functions');
     const { bundleDir, comment, skipActivation, host, userAgentApplication } = options;
     try {
         (0, validate_arguments_1.validateArguments)(requiredOptions, options, 'upload');
@@ -31,7 +31,7 @@ async function getUploadSettingsArgs(options) {
             host,
             userAgentApplication,
             actions: actionsManifest,
-            deliveryFunctions: deliveryFnManifest,
+            functions: functionManifest,
         };
     }
     catch (err) {

package/lib/utils.d.ts

@@ -1,12 +1,12 @@
 import { Definition } from './definition-api';
 import { Organization } from './organization-api';
-import { DeliveryFunction, FunctionAppAction } from './types';
+import { ContentfulFunction, FunctionAppAction } from './types';
 export declare const throwValidationException: (subject: string, message?: string, details?: string) => never;
 export declare const isValidNetwork: (address: string) => boolean;
 export declare const stripProtocol: (url: string) => string;
 export declare const showCreationError: (subject: string, message: string) => void;
 export declare const throwError: (err: Error, message: string) => never;
 export declare const selectFromList: <T extends Definition | Organization>(list: T[], message: string, cachedOptionEnvVar: string) => Promise<T>;
-type Entities<Type> = Type extends 'actions' ? Omit<FunctionAppAction, 'entryFile'>[] : Omit<DeliveryFunction, 'entryFile'>[];
-export declare function getEntityFromManifest<Type extends 'actions' | 'deliveryFunctions'>(type: Type): Entities<Type> | undefined;
+type Entities<Type> = Type extends 'actions' ? Omit<FunctionAppAction, 'entryFile'>[] : Omit<ContentfulFunction, 'entryFile'>[];
+export declare function getEntityFromManifest<Type extends 'actions' | 'functions'>(type: Type): Entities<Type> | undefined;
 export {};

package/lib/utils.js

@@ -86,22 +86,32 @@ function getEntityFromManifest(type) {
         if (!Array.isArray(manifest[type]) || manifest[type].length === 0) {
             return;
         }
-        logProgress(`${type === 'actions' ? 'App Actions' : 'Delivery functions'} found in ${chalk_1.default.bold(DEFAULT_MANIFEST_PATH)}.`);
+        logProgress(`${type === 'actions' ? 'App Actions' : 'functions'} found in ${chalk_1.default.bold(DEFAULT_MANIFEST_PATH)}.`);
+        const fieldMappingEvent = "graphql.field.mapping";
+        const queryEvent = "graphql.query";
         const items = manifest[type].map((item) => {
             const allowNetworks = Array.isArray(item.allowNetworks)
                 ? item.allowNetworks.map(exports.stripProtocol)
                 : [];
+            const accepts = 'accepts' in item && Array.isArray(item.accepts) ? item.accepts : undefined;
+            const hasInvalidEvent = accepts?.some((event) => ![fieldMappingEvent, queryEvent].includes(event));
             const hasInvalidNetwork = allowNetworks.find((netWork) => !(0, exports.isValidNetwork)(netWork));
             if (hasInvalidNetwork) {
                 console.log(`${chalk_1.default.red('Error:')} Invalid IP address ${hasInvalidNetwork} found in the allowNetworks array for ${type} "${item.name}".`);
                 // eslint-disable-next-line no-process-exit
                 process.exit(1);
             }
+            if (hasInvalidEvent) {
+                console.log(`${chalk_1.default.red('Error:')} Invalid events ${hasInvalidEvent} found in the accepts array for ${type} "${item.name}".`);
+                // eslint-disable-next-line no-process-exit
+                process.exit(1);
+            }
             // EntryFile is not used but we do want to strip it
             // eslint-disable-next-line no-unused-vars
             const { entryFile: _, ...itemWithoutEntryFile } = item;
             return {
                 ...itemWithoutEntryFile,
+                ...(accepts && { accepts }),
                 allowNetworks,
             };
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/app-scripts",
-  "version": "1.13.4",
+  "version": "1.15.0",
   "description": "A collection of scripts for building Contentful Apps",
   "author": "Contentful GmbH",
   "license": "MIT",
@@ -51,16 +51,16 @@
     "adm-zip": "0.5.10",
     "bottleneck": "2.19.5",
     "chalk": "4.1.2",
-    "commander": "11.1.0",
-    "contentful-management": "11.14.0",
-    "dotenv": "16.4.1",
-    "ignore": "5.3.0",
+    "commander": "12.0.0",
+    "contentful-management": "11.16.0",
+    "dotenv": "16.4.4",
+    "ignore": "5.3.1",
     "inquirer": "8.2.6",
     "lodash": "4.17.21",
     "open": "8.4.2",
     "ora": "5.4.1"
   },
-  "gitHead": "066fdea1ac876ddc748e5a2361efe68afe0d800e",
+  "gitHead": "ca1260e5b969a8b5a1ff1104fbb2431cbf420ca3",
   "devDependencies": {
     "@tsconfig/node18": "18.2.2",
     "@types/adm-zip": "0.5.5",