@aws-amplify/data-schema 0.14.12 → 0.14.13

package/lib-esm/src/SchemaProcessor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SchemaProcessor.d.ts","sourceRoot":"","sources":["../../src/SchemaProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,KAAK,cAAc,EAAE,MAAM,eAAe,CAAC;AAsBzE,OAAO,EACL,oBAAoB,EAMrB,MAAM,gCAAgC,CAAC;AA8nDxC;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE;IACjC,MAAM,EAAE,cAAc,CAAC;CACxB,GAAG,oBAAoB,CAiBvB"}
+{"version":3,"file":"SchemaProcessor.d.ts","sourceRoot":"","sources":["../../src/SchemaProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,KAAK,cAAc,EAAE,MAAM,eAAe,CAAC;AAsBzE,OAAO,EACL,oBAAoB,EAMrB,MAAM,gCAAgC,CAAC;AA4nDxC;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE;IACjC,MAAM,EAAE,cAAc,CAAC;CACxB,GAAG,oBAAoB,CAiBvB"}

package/lib-esm/src/SchemaProcessor.js

@@ -155,7 +155,7 @@ function refFieldToGql(fieldDef) {
     }
     return field;
 }
-function transformFunctionHandler(handlers, callSignature) {
+function transformFunctionHandler(handlers, functionFieldName) {
     let gqlHandlerContent = '';
     const lambdaFunctionDefinition = {};
     handlers.forEach((handler, idx) => {
@@ -164,14 +164,12 @@ function transformFunctionHandler(handlers, callSignature) {
             gqlHandlerContent += `@function(name: "${handlerData}") `;
         }
         else if (typeof handlerData.getInstance === 'function') {
-            const fnBaseName = `Fn${capitalize(callSignature)}`;
-            const fnNameSuffix = idx === 0 ? '' : `${idx + 1}`;
-            const fnName = fnBaseName + fnNameSuffix;
+            const fnName = `Fn${capitalize(functionFieldName)}${idx === 0 ? '' : `${idx + 1}`}`;
             lambdaFunctionDefinition[fnName] = handlerData;
             gqlHandlerContent += `@function(name: "${fnName}") `;
         }
         else {
-            throw new Error(`Invalid value specified for ${callSignature} handler.function(). Expected: defineFunction or string.`);
+            throw new Error(`Invalid value specified for ${functionFieldName} handler.function(). Expected: defineFunction or string.`);
         }
     });
     return { gqlHandlerContent, lambdaFunctionDefinition };
@@ -240,7 +238,7 @@ function customOperationToGql(typeName, typeDef, authorization, isCustom = false
     let lambdaFunctionDefinition = {};
     let customSqlDataSourceStrategy;
     if (isFunctionHandler(handlers)) {
-        ({ gqlHandlerContent, lambdaFunctionDefinition } = transformFunctionHandler(handlers, callSignature));
+        ({ gqlHandlerContent, lambdaFunctionDefinition } = transformFunctionHandler(handlers, typeName));
     }
     else if (functionRef) {
         gqlHandlerContent = `@function(name: "${functionRef}") `;
@@ -821,7 +819,7 @@ const schemaPreprocessor = (schema) => {
     const customMutations = [];
     const customSubscriptions = [];
     const jsFunctions = [];
-    let lambdaFunctions = {};
+    const lambdaFunctions = {};
     const customSqlDataSourceStrategies = [];
     const databaseType = schema.data.configuration.database.engine === 'dynamodb'
         ? 'dynamodb'
@@ -859,7 +857,7 @@ const schemaPreprocessor = (schema) => {
             else if (isCustomOperation(typeDef)) {
                 const { typeName: opType } = typeDef.data;
                 const { gqlField, models, jsFunctionForField, lambdaFunctionDefinition, customSqlDataSourceStrategy, } = transformCustomOperations(typeDef, typeName, mostRelevantAuthRules, databaseType, getRefType);
-                lambdaFunctions = lambdaFunctionDefinition;
+                Object.assign(lambdaFunctions, lambdaFunctionDefinition);
                 topLevelTypes.push(...models);
                 if (jsFunctionForField) {
                     jsFunctions.push(jsFunctionForField);