@aws-amplify/data-schema 0.13.11 → 0.13.12

package/lib-esm/src/CustomOperation.d.ts

@@ -5,7 +5,7 @@ import { Authorization } from './Authorization';
 import { RefType, InternalRef } from './RefType';
 import { EnumType, EnumTypeParamShape } from './EnumType';
 import { CustomType } from './CustomType';
-import type { HandlerType as Handler } from './Handler';
+import type { CustomHandler, FunctionHandler, HandlerType as Handler } from './Handler';
 declare const queryBrand = "queryCustomOperation";
 declare const mutationBrand = "mutationCustomOperation";
 declare const subscriptionBrand = "subscriptionCustomOperation";
@@ -15,7 +15,7 @@ type CustomReturnType = RefType<any> | CustomType<any>;
 type CustomFunctionRefType = string;
 type InternalCustomArguments = Record<string, InternalField>;
 type InternalCustomReturnType = InternalRef;
-type HandlerInputType = Handler | Handler[number];
+type HandlerInputType = FunctionHandler[] | CustomHandler[] | Handler;
 export declare const CustomOperationNames: readonly ["Query", "Mutation", "Subscription"];
 type CustomOperationName = (typeof CustomOperationNames)[number];
 type CustomData = {
@@ -24,7 +24,7 @@ type CustomData = {
     functionRef: string | null;
     authorization: Authorization<any, any, any>[];
     typeName: CustomOperationName;
-    handlers: Handler | null;
+    handlers: Handler[] | null;
 };
 type InternalCustomData = CustomData & {
     arguments: InternalCustomArguments;

package/lib-esm/src/Handler.d.ts

@@ -1,6 +1,6 @@
 import { Brand } from './util';
 import { RefType } from './RefType';
-export type HandlerType = InlineSqlHandler[] | SqlReferenceHandler[] | CustomHandler[] | FunctionHandler[];
+export type HandlerType = InlineSqlHandler | SqlReferenceHandler | CustomHandler | FunctionHandler;
 declare const dataSymbol: unique symbol;
 type AllHandlers = InlineSqlHandler | SqlReferenceHandler | CustomHandler | FunctionHandler;
 export declare function getHandlerData<H extends AllHandlers>(handler: H): H[typeof dataSymbol];

package/lib-esm/src/ModelSchema.d.ts

@@ -45,6 +45,7 @@ export type InternalSchema = {
     data: {
         types: InternalSchemaModels;
         authorization: SchemaAuthorization<any, any, any>[];
+        configuration: SchemaConfig<any, any>;
     };
 };
 export type ModelSchema<T extends ModelSchemaParamShape, UsedMethods extends 'authorization' = never> = Omit<{

package/lib-esm/src/SchemaProcessor.js

@@ -155,8 +155,8 @@ function refFieldToGql(fieldDef) {
     }
     return field;
 }
-function customOperationToGql(typeName, typeDef, authorization, isCustom = false) {
-    const { arguments: fieldArgs, returnType, functionRef } = typeDef.data;
+function customOperationToGql(typeName, typeDef, authorization, isCustom = false, databaseType) {
+    const { arguments: fieldArgs, returnType, functionRef, handlers, } = typeDef.data;
     let callSignature = typeName;
     const implicitModels = [];
     const { authString } = isCustom
@@ -181,10 +181,29 @@ function customOperationToGql(typeName, typeDef, authorization, isCustom = false
         callSignature += `(${gqlFields.join(', ')})`;
         implicitModels.push(...models);
     }
-    const fnString = functionRef ? `@function(name: "${functionRef}") ` : '';
-    const gqlField = `${callSignature}: ${returnTypeName} ${fnString}${authString}`;
+    const handler = handlers && handlers[0];
+    const brand = handler && (0, util_1.getBrand)(handler);
+    let gqlHandlerContent = '';
+    if (functionRef) {
+        gqlHandlerContent = `@function(name: "${functionRef}") `;
+    }
+    else if (databaseType === 'sql' && handler && brand === 'inlineSql') {
+        gqlHandlerContent = `@sql(statement: ${escapeGraphQlString(String((0, Handler_1.getHandlerData)(handler)))}) `;
+    }
+    else if (databaseType === 'sql' && handler && brand === 'sqlReference') {
+        gqlHandlerContent = `@sql(reference: "${(0, Handler_1.getHandlerData)(handler)}") `;
+    }
+    const gqlField = `${callSignature}: ${returnTypeName} ${gqlHandlerContent}${authString}`;
     return { gqlField, models: implicitModels };
 }
+/**
+ * Escape a string that will be used inside of a graphql string.
+ * @param str The input string to be escaped
+ * @returns The string with special charactars escaped
+ */
+function escapeGraphQlString(str) {
+    return JSON.stringify(str);
+}
 /**
  * Tests whether two ModelField definitions are in conflict.
  *
@@ -673,6 +692,9 @@ const schemaPreprocessor = (schema) => {
     const customMutations = [];
     const customSubscriptions = [];
     const jsFunctions = [];
+    const databaseType = schema.data.configuration.database.engine === 'dynamodb'
+        ? 'dynamodb'
+        : 'sql';
     const fkFields = allImpliedFKs(schema);
     const topLevelTypes = Object.entries(schema.data.types);
     const { schemaAuth, functionSchemaAccess } = extractFunctionSchemaAccess(schema.data.authorization);
@@ -703,7 +725,7 @@ const schemaPreprocessor = (schema) => {
             }
             else if (isCustomOperation(typeDef)) {
                 const { typeName: opType } = typeDef.data;
-                const { gqlField, models, jsFunctionForField } = transformCustomOperations(typeDef, typeName, mostRelevantAuthRules);
+                const { gqlField, models, jsFunctionForField } = transformCustomOperations(typeDef, typeName, mostRelevantAuthRules, databaseType);
                 topLevelTypes.push(...models);
                 if (jsFunctionForField) {
                     jsFunctions.push(jsFunctionForField);
@@ -837,7 +859,7 @@ const handleCustom = (handlers, opType, typeName) => {
     };
     return jsFn;
 };
-function transformCustomOperations(typeDef, typeName, authRules) {
+function transformCustomOperations(typeDef, typeName, authRules, databaseType) {
     const { typeName: opType, handlers } = typeDef.data;
     let jsFunctionForField = undefined;
     validateCustomOperations(typeDef, typeName, authRules);
@@ -845,7 +867,7 @@ function transformCustomOperations(typeDef, typeName, authRules) {
         jsFunctionForField = handleCustom(handlers, opType, typeName);
     }
     const isCustom = Boolean(jsFunctionForField);
-    const { gqlField, models } = customOperationToGql(typeName, typeDef, authRules, isCustom);
+    const { gqlField, models } = customOperationToGql(typeName, typeDef, authRules, isCustom, databaseType);
     return { gqlField, models, jsFunctionForField };
 }
 function generateCustomOperationTypes({ queries, mutations, subscriptions, }) {