@aws-amplify/graphql-model-transformer 1.1.1-alpha.5 → 1.1.1

package/src/__tests__/__snapshots__/model-transformer.test.ts.snap

@@ -3893,6 +3893,399 @@ $util.toJson($UpdateItem)
 ## [End] Mutation Update resolver. **"
 `;
 
+exports[`ModelTransformer:  should successfully transform simple Embeddable type (non-model) schema 1`] = `
+"
+type NonModelType {
+  id: ID!
+  title: String!
+}
+
+input ModelStringInput {
+  ne: String
+  eq: String
+  le: String
+  lt: String
+  ge: String
+  gt: String
+  contains: String
+  notContains: String
+  between: [String]
+  beginsWith: String
+  attributeExists: Boolean
+  attributeType: ModelAttributeTypes
+  size: ModelSizeInput
+}
+
+input ModelIntInput {
+  ne: Int
+  eq: Int
+  le: Int
+  lt: Int
+  ge: Int
+  gt: Int
+  between: [Int]
+  attributeExists: Boolean
+  attributeType: ModelAttributeTypes
+}
+
+input ModelFloatInput {
+  ne: Float
+  eq: Float
+  le: Float
+  lt: Float
+  ge: Float
+  gt: Float
+  between: [Float]
+  attributeExists: Boolean
+  attributeType: ModelAttributeTypes
+}
+
+input ModelBooleanInput {
+  ne: Boolean
+  eq: Boolean
+  attributeExists: Boolean
+  attributeType: ModelAttributeTypes
+}
+
+input ModelIDInput {
+  ne: ID
+  eq: ID
+  le: ID
+  lt: ID
+  ge: ID
+  gt: ID
+  contains: ID
+  notContains: ID
+  between: [ID]
+  beginsWith: ID
+  attributeExists: Boolean
+  attributeType: ModelAttributeTypes
+  size: ModelSizeInput
+}
+
+input ModelSubscriptionStringInput {
+  ne: String
+  eq: String
+  le: String
+  lt: String
+  ge: String
+  gt: String
+  contains: String
+  notContains: String
+  between: [String]
+  beginsWith: String
+  in: [String]
+  notIn: [String]
+}
+
+input ModelSubscriptionIntInput {
+  ne: Int
+  eq: Int
+  le: Int
+  lt: Int
+  ge: Int
+  gt: Int
+  between: [Int]
+  in: [Int]
+  notIn: [Int]
+}
+
+input ModelSubscriptionFloatInput {
+  ne: Float
+  eq: Float
+  le: Float
+  lt: Float
+  ge: Float
+  gt: Float
+  between: [Float]
+  in: [Float]
+  notIn: [Float]
+}
+
+input ModelSubscriptionBooleanInput {
+  ne: Boolean
+  eq: Boolean
+}
+
+input ModelSubscriptionIDInput {
+  ne: ID
+  eq: ID
+  le: ID
+  lt: ID
+  ge: ID
+  gt: ID
+  contains: ID
+  notContains: ID
+  between: [ID]
+  beginsWith: ID
+  in: [ID]
+  notIn: [ID]
+}
+
+enum ModelAttributeTypes {
+  binary
+  binarySet
+  bool
+  list
+  map
+  number
+  numberSet
+  string
+  stringSet
+  _null
+}
+
+input ModelSizeInput {
+  ne: Int
+  eq: Int
+  le: Int
+  lt: Int
+  ge: Int
+  gt: Int
+  between: [Int]
+}
+
+enum ModelSortDirection {
+  ASC
+  DESC
+}
+
+"
+`;
+
+exports[`ModelTransformer:  should successfully transform simple non-capitalized Model/Embeddable type (non-model) name schema 1`] = `
+"
+type modelType {
+  id: ID!
+  title: String!
+  nonModelTypeValue: nonModelType
+  createdAt: AWSDateTime!
+  updatedAt: AWSDateTime!
+}
+
+type nonModelType {
+  id: ID!
+  title: String!
+}
+
+input ModelStringInput {
+  ne: String
+  eq: String
+  le: String
+  lt: String
+  ge: String
+  gt: String
+  contains: String
+  notContains: String
+  between: [String]
+  beginsWith: String
+  attributeExists: Boolean
+  attributeType: ModelAttributeTypes
+  size: ModelSizeInput
+}
+
+input ModelIntInput {
+  ne: Int
+  eq: Int
+  le: Int
+  lt: Int
+  ge: Int
+  gt: Int
+  between: [Int]
+  attributeExists: Boolean
+  attributeType: ModelAttributeTypes
+}
+
+input ModelFloatInput {
+  ne: Float
+  eq: Float
+  le: Float
+  lt: Float
+  ge: Float
+  gt: Float
+  between: [Float]
+  attributeExists: Boolean
+  attributeType: ModelAttributeTypes
+}
+
+input ModelBooleanInput {
+  ne: Boolean
+  eq: Boolean
+  attributeExists: Boolean
+  attributeType: ModelAttributeTypes
+}
+
+input ModelIDInput {
+  ne: ID
+  eq: ID
+  le: ID
+  lt: ID
+  ge: ID
+  gt: ID
+  contains: ID
+  notContains: ID
+  between: [ID]
+  beginsWith: ID
+  attributeExists: Boolean
+  attributeType: ModelAttributeTypes
+  size: ModelSizeInput
+}
+
+input ModelSubscriptionStringInput {
+  ne: String
+  eq: String
+  le: String
+  lt: String
+  ge: String
+  gt: String
+  contains: String
+  notContains: String
+  between: [String]
+  beginsWith: String
+  in: [String]
+  notIn: [String]
+}
+
+input ModelSubscriptionIntInput {
+  ne: Int
+  eq: Int
+  le: Int
+  lt: Int
+  ge: Int
+  gt: Int
+  between: [Int]
+  in: [Int]
+  notIn: [Int]
+}
+
+input ModelSubscriptionFloatInput {
+  ne: Float
+  eq: Float
+  le: Float
+  lt: Float
+  ge: Float
+  gt: Float
+  between: [Float]
+  in: [Float]
+  notIn: [Float]
+}
+
+input ModelSubscriptionBooleanInput {
+  ne: Boolean
+  eq: Boolean
+}
+
+input ModelSubscriptionIDInput {
+  ne: ID
+  eq: ID
+  le: ID
+  lt: ID
+  ge: ID
+  gt: ID
+  contains: ID
+  notContains: ID
+  between: [ID]
+  beginsWith: ID
+  in: [ID]
+  notIn: [ID]
+}
+
+enum ModelAttributeTypes {
+  binary
+  binarySet
+  bool
+  list
+  map
+  number
+  numberSet
+  string
+  stringSet
+  _null
+}
+
+input ModelSizeInput {
+  ne: Int
+  eq: Int
+  le: Int
+  lt: Int
+  ge: Int
+  gt: Int
+  between: [Int]
+}
+
+enum ModelSortDirection {
+  ASC
+  DESC
+}
+
+input NonModelTypeInput {
+  id: ID
+  title: String!
+}
+
+type ModelModelTypeConnection {
+  items: [modelType]!
+  nextToken: String
+}
+
+input ModelModelTypeFilterInput {
+  id: ModelIDInput
+  title: ModelStringInput
+  and: [ModelModelTypeFilterInput]
+  or: [ModelModelTypeFilterInput]
+  not: ModelModelTypeFilterInput
+}
+
+type Query {
+  getModelType(id: ID!): modelType
+  listModelTypes(filter: ModelModelTypeFilterInput, limit: Int, nextToken: String): ModelModelTypeConnection
+}
+
+input ModelModelTypeConditionInput {
+  title: ModelStringInput
+  and: [ModelModelTypeConditionInput]
+  or: [ModelModelTypeConditionInput]
+  not: ModelModelTypeConditionInput
+}
+
+input CreateModelTypeInput {
+  id: ID
+  title: String!
+  nonModelTypeValue: NonModelTypeInput
+}
+
+input UpdateModelTypeInput {
+  id: ID!
+  title: String
+  nonModelTypeValue: NonModelTypeInput
+}
+
+input DeleteModelTypeInput {
+  id: ID!
+}
+
+type Mutation {
+  createModelType(input: CreateModelTypeInput!, condition: ModelModelTypeConditionInput): modelType
+  updateModelType(input: UpdateModelTypeInput!, condition: ModelModelTypeConditionInput): modelType
+  deleteModelType(input: DeleteModelTypeInput!, condition: ModelModelTypeConditionInput): modelType
+}
+
+input ModelSubscriptionModelTypeFilterInput {
+  id: ModelSubscriptionIDInput
+  title: ModelSubscriptionStringInput
+  and: [ModelSubscriptionModelTypeFilterInput]
+  or: [ModelSubscriptionModelTypeFilterInput]
+}
+
+type Subscription {
+  onCreateModelType(filter: ModelSubscriptionModelTypeFilterInput): modelType @aws_subscribe(mutations: [\\"createModelType\\"])
+  onUpdateModelType(filter: ModelSubscriptionModelTypeFilterInput): modelType @aws_subscribe(mutations: [\\"updateModelType\\"])
+  onDeleteModelType(filter: ModelSubscriptionModelTypeFilterInput): modelType @aws_subscribe(mutations: [\\"deleteModelType\\"])
+}
+
+"
+`;
+
 exports[`ModelTransformer:  should support timestamp parameters when generating resolvers and output schema 1`] = `
 "
 type Post {

package/src/__tests__/model-transformer.test.ts

@@ -41,6 +41,51 @@ describe('ModelTransformer: ', () => {
     parse(out.schema);
   });
 
+  // should successfully transform simple Embeddable type (non-model) schema
+  it('should successfully transform simple Embeddable type (non-model) schema', async () => {
+    const validSchema = `
+      type NonModelType {
+          id: ID!
+          title: String!
+      }
+      `;
+    const transformer = new GraphQLTransform({
+      transformers: [new ModelTransformer()],
+      featureFlags,
+    });
+    const out = transformer.transform(validSchema);
+    expect(out).toBeDefined();
+
+    validateModelSchema(parse(out.schema));
+    parse(out.schema);
+    expect(out.schema).toMatchSnapshot();
+  });
+  // should successfully transform simple non-capitalized Embeddable type (non-model) name schema
+  it('should successfully transform simple non-capitalized Model/Embeddable type (non-model) name schema', async () => {
+    const alsoValidSchema = `
+      type modelType @model {
+          id: ID!
+          title: String!
+          nonModelTypeValue: nonModelType
+      }
+      type nonModelType {
+          id: ID!
+          title: String!
+      }
+      `;
+    const transformer = new GraphQLTransform({
+      transformers: [new ModelTransformer()],
+      featureFlags,
+    });
+    const out = transformer.transform(alsoValidSchema);
+    expect(out).toBeDefined();
+    
+    validateModelSchema(parse(out.schema));
+    parse(out.schema);
+    expect(out.schema).toMatchSnapshot();
+    expect(out.schema).toContain("input NonModelTypeInput")
+  });
+
   it('should support custom query overrides', () => {
     const validSchema = `type Post @model(queries: { get: "customGetPost", list: "customListPost" }) {
           id: ID!

package/src/graphql-model-transformer.ts

@@ -63,6 +63,7 @@ import {
   SyncResourceIDs,
   toCamelCase,
   toPascalCase,
+  toUpper,
 } from 'graphql-transformer-common';
 import {
   addDirectivesToOperation,
@@ -1084,7 +1085,7 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
 
   private isModelField = (name: string): boolean => (!!this.typesWithModelDirective.has(name));
 
-  private getNonModelInputObjectName = (name: string): string => `${name}Input`;
+  private getNonModelInputObjectName = (name: string): string => `${toUpper(name)}Input`;
 
   /**
    * Model directive automatically adds id, created and updated time stamps to the filed, if they are configured