Update snapshots for improved pluralization

aws-amplify · Oct 17, 2022 · db4ff43 · db4ff43
1 parent d90ddfc
commit db4ff43
Show file tree

Hide file tree

Showing 7 changed files with 198 additions and 161 deletions.
diff --git a/...nc-modelgen-plugin/src/__tests__/visitors/__snapshots__/appsync-java-visitor.test.ts.snap b/...nc-modelgen-plugin/src/__tests__/visitors/__snapshots__/appsync-java-visitor.test.ts.snap
diff --git a/...en-plugin/src/__tests__/visitors/__snapshots__/appsync-json-metadata-visitor.test.ts.snap b/...en-plugin/src/__tests__/visitors/__snapshots__/appsync-json-metadata-visitor.test.ts.snap
@@ -99,6 +99,7 @@ export const schema: Schema = {
     },
     \\"enums\\": {},
     \\"nonModels\\": {},
+    \\"codegenVersion\\": \\"1.0.0\\",
     \\"version\\": \\"bf47977135db257ec69466688eea15d5\\"
 };"
 `;

diff --git a/...c-modelgen-plugin/src/__tests__/visitors/__snapshots__/appsync-swift-visitor.test.ts.snap b/...c-modelgen-plugin/src/__tests__/visitors/__snapshots__/appsync-swift-visitor.test.ts.snap
@@ -63,7 +63,8 @@ extension Post {
   public static let schema = defineSchema { model in
     let post = Post.keys
     
-    model.pluralName = \\"Posts\\"
+    model.listPluralName = \\"Posts\\"
+    model.syncPluralName = \\"Posts\\"
     
     model.attributes(
       .index(fields: [\\"id\\", \\"title\\"], name: nil),
@@ -155,7 +156,8 @@ extension Comment {
   public static let schema = defineSchema { model in
     let comment = Comment.keys
     
-    model.pluralName = \\"Comments\\"
+    model.listPluralName = \\"Comments\\"
+    model.syncPluralName = \\"Comments\\"
     
     model.attributes(
       .index(fields: [\\"id\\", \\"content\\"], name: nil),
@@ -242,7 +244,8 @@ extension ModelCompositePk {
   public static let schema = defineSchema { model in
     let modelCompositePk = ModelCompositePk.keys
     
-    model.pluralName = \\"ModelCompositePks\\"
+    model.listPluralName = \\"ModelCompositePks\\"
+    model.syncPluralName = \\"ModelCompositePks\\"
     
     model.attributes(
       .index(fields: [\\"id\\", \\"dob\\"], name: nil),
@@ -322,7 +325,8 @@ extension ModelExplicitCustomPk {
   public static let schema = defineSchema { model in
     let modelExplicitCustomPk = ModelExplicitCustomPk.keys
     
-    model.pluralName = \\"ModelExplicitCustomPks\\"
+    model.listPluralName = \\"ModelExplicitCustomPks\\"
+    model.syncPluralName = \\"ModelExplicitCustomPks\\"
     
     model.attributes(
       .index(fields: [\\"userId\\"], name: nil),
@@ -400,7 +404,8 @@ extension ModelExplicitDefaultPk {
   public static let schema = defineSchema { model in
     let modelExplicitDefaultPk = ModelExplicitDefaultPk.keys
     
-    model.pluralName = \\"ModelExplicitDefaultPks\\"
+    model.listPluralName = \\"ModelExplicitDefaultPks\\"
+    model.syncPluralName = \\"ModelExplicitDefaultPks\\"
     
     model.attributes(
       .index(fields: [\\"id\\"], name: nil),
@@ -472,7 +477,8 @@ extension ModelImplicitDefaultPk {
   public static let schema = defineSchema { model in
     let modelImplicitDefaultPk = ModelImplicitDefaultPk.keys
     
-    model.pluralName = \\"ModelImplicitDefaultPks\\"
+    model.listPluralName = \\"ModelImplicitDefaultPks\\"
+    model.syncPluralName = \\"ModelImplicitDefaultPks\\"
     
     model.attributes(
       .primaryKey(fields: [modelImplicitDefaultPk.id])
@@ -561,7 +567,8 @@ extension Project {
   public static let schema = defineSchema { model in
     let project = Project.keys
     
-    model.pluralName = \\"Projects\\"
+    model.listPluralName = \\"Projects\\"
+    model.syncPluralName = \\"Projects\\"
     
     model.attributes(
       .index(fields: [\\"projectId\\", \\"name\\"], name: nil),
@@ -649,7 +656,8 @@ extension Team {
   public static let schema = defineSchema { model in
     let team = Team.keys
     
-    model.pluralName = \\"Teams\\"
+    model.listPluralName = \\"Teams\\"
+    model.syncPluralName = \\"Teams\\"
     
     model.attributes(
       .index(fields: [\\"teamId\\", \\"name\\"], name: nil),
@@ -771,7 +779,8 @@ extension ListContainer {
   public static let schema = defineSchema { model in
     let listContainer = ListContainer.keys
     
-    model.pluralName = \\"ListContainers\\"
+    model.listPluralName = \\"ListContainers\\"
+    model.syncPluralName = \\"ListContainers\\"
     
     model.fields(
       .id(),
@@ -878,7 +887,8 @@ extension Todo {
   public static let schema = defineSchema { model in
     let todo = Todo.keys
     
-    model.pluralName = \\"Todos\\"
+    model.listPluralName = \\"Todos\\"
+    model.syncPluralName = \\"Todos\\"
     
     model.fields(
       .id(),
@@ -950,7 +960,8 @@ extension task {
   public static let schema = defineSchema { model in
     let task = task.keys
     
-    model.pluralName = \\"tasks\\"
+    model.listPluralName = \\"tasks\\"
+    model.syncPluralName = \\"tasks\\"
     
     model.fields(
       .id(),

diff --git a/packages/appsync-modelgen-plugin/src/__tests__/visitors/appsync-java-visitor.test.ts b/packages/appsync-modelgen-plugin/src/__tests__/visitors/appsync-java-visitor.test.ts
@@ -11,6 +11,7 @@ const defaultJavaVisitorSettings = {
   transformerVersion: 1,
   generate: CodeGenGenerateEnum.code,
   respectPrimaryKeyAttributesOnConnectionField: false,
+  improvePluralization: true,
 }
 const buildSchemaWithDirectives = (schema: String): GraphQLSchema => {
   return buildSchema([schema, directives, scalars].join('\n'));