@aws-amplify/graphql-model-transformer 0.7.0-auth-dir-v-next.4 → 0.7.0-ext14.0

package/src/resolvers/query.ts

@@ -34,13 +34,18 @@ export const generateGetRequestTemplate = (): string => {
       ref('ctx.stash.metadata.modelObjectKey'),
       compoundExpression([
         set(ref('expression'), str('')),
+        set(ref('expressionNames'), obj({})),
         set(ref('expressionValues'), obj({})),
         forEach(ref('item'), ref('ctx.stash.metadata.modelObjectKey.entrySet()'), [
-          set(ref('expression'), str('$expression$item.key = :$item.key AND ')),
-          qref(methodCall(ref('expressionValues.put'), str(':$item.key'), ref('item.value'))),
+          set(ref('expression'), str('$expression#keyCount$velocityCount = :valueCount$velocityCount AND ')),
+          qref(methodCall(ref('expressionNames.put'), str('#keyCount$velocityCount'), ref('item.key'))),
+          qref(methodCall(ref('expressionValues.put'), str(':valueCount$velocityCount'), ref('item.value'))),
         ]),
         set(ref('expression'), methodCall(ref('expression.replaceAll'), str('AND $'), str(''))),
-        set(ref('query'), obj({ expression: ref('expression'), expressionValues: ref('expressionValues') })),
+        set(
+          ref('query'),
+          obj({ expression: ref('expression'), expressionNames: ref('expressionNames'), expressionValues: ref('expressionValues') }),
+        ),
       ]),
       set(
         ref('query'),
@@ -109,10 +114,7 @@ export const generateListRequestTemplate = (): string => {
       not(isNullOrEmpty(authFilter)),
       compoundExpression([
         set(ref('filter'), authFilter),
-        iff(
-          not(isNullOrEmpty(ref('ctx.args.filter'))),
-          set(ref('filter'), list([obj({ and: list([ref('filter'), ref('ctx.args.filter')]) })])),
-        ),
+        iff(not(isNullOrEmpty(ref('ctx.args.filter'))), set(ref('filter'), obj({ and: list([ref('filter'), ref('ctx.args.filter')]) }))),
       ]),
       iff(not(isNullOrEmpty(ref('ctx.args.filter'))), set(ref('filter'), ref('ctx.args.filter'))),
     ),
@@ -164,10 +166,7 @@ export const generateSyncRequestTemplate = (): string => {
         not(isNullOrEmpty(authFilter)),
         compoundExpression([
           set(ref('filter'), authFilter),
-          iff(
-            not(isNullOrEmpty(ref('ctx.args.filter'))),
-            set(ref('filter'), list([obj({ and: list([ref('filter'), ref('ctx.args.filter')]) })])),
-          ),
+          iff(not(isNullOrEmpty(ref('ctx.args.filter'))), set(ref('filter'), obj({ and: list([ref('filter'), ref('ctx.args.filter')]) }))),
         ]),
         iff(not(isNullOrEmpty(ref('ctx.args.filter'))), set(ref('filter'), ref('ctx.args.filter'))),
       ),

package/src/resolvers/subscriptions.ts

@@ -7,5 +7,5 @@ export const generateSubscriptionRequestTemplate = (): string => {
 
 export const generateSubscriptionResponseTemplate = (): string => {
   const statements: Expression[] = [toJson(nul())];
-  return printBlock('Subscription Resonse template')(compoundExpression(statements));
+  return printBlock('Subscription Response template')(compoundExpression(statements));
 };

package/src/wrappers/object-definition-wrapper.ts

@@ -1,5 +1,5 @@
+import { DirectiveWrapper } from '@aws-amplify/graphql-transformer-core';
 import {
-  ArgumentNode,
   DirectiveNode,
   DocumentNode,
   EnumTypeDefinitionNode,
@@ -11,13 +11,10 @@ import {
   ListTypeNode,
   Location,
   NamedTypeNode,
-  NameNode,
   NonNullTypeNode,
   ObjectTypeDefinitionNode,
   StringValueNode,
   TypeNode,
-  valueFromASTUntyped,
-  ValueNode,
 } from 'graphql';
 import {
   DEFAULT_SCALARS,
@@ -29,53 +26,6 @@ import {
   withNamedNodeNamed,
 } from 'graphql-transformer-common';
 
-// Todo: to be moved to core later. context.output.getObject would return wrapper type so its easier to manipulate
-// objects
-
-export class ArgumentWrapper {
-  public readonly name: NameNode;
-  public readonly value: ValueNode;
-  constructor(argument: ArgumentNode) {
-    this.name = argument.name;
-    this.value = argument.value;
-  }
-  serialize = (): ArgumentNode => {
-    return {
-      kind: 'Argument',
-      name: this.name,
-      value: this.value,
-    };
-  };
-}
-
-export class DirectiveWrapper {
-  private arguments: ArgumentWrapper[] = [];
-  private name: NameNode;
-  private location?: Location;
-  constructor(node: DirectiveNode) {
-    this.name = node.name;
-    this.arguments = (node.arguments || []).map(arg => new ArgumentWrapper(arg));
-    this.location = this.location;
-  }
-  public serialize = (): DirectiveNode => {
-    return {
-      kind: 'Directive',
-      name: this.name,
-      arguments: this.arguments.map(arg => arg.serialize()),
-    };
-  };
-  public getArguments = <T>(defaultValue: Required<T>): Required<T> => {
-    const argValues = this.arguments.reduce(
-      (acc: Record<string, any>, arg: ArgumentWrapper) => ({
-        ...acc,
-        [arg.name.value]: valueFromASTUntyped(arg.value),
-      }),
-      {},
-    );
-    return Object.assign(defaultValue, argValues);
-  };
-}
-
 export class GenericFieldWrapper {
   protected type: TypeNode;
   public readonly directives: DirectiveWrapper[];
@@ -295,7 +245,7 @@ export class FieldWrapper extends GenericFieldWrapper {
       field.makeNonNullable();
     }
     if (isList) {
-      field.wrapListType();
+      field.wrapListType().makeNonNullable();
     }
     return field;
   };