Merge pull request #812 from aws-amplify/merge-main-gen2

* build(deps): bump tar from 6.2.0 to 6.2.1

Bumps [tar](https://github.com/isaacs/node-tar) from 6.2.0 to 6.2.1.
- [Release notes](https://github.com/isaacs/node-tar/releases)
- [Changelog](https://github.com/isaacs/node-tar/blob/main/CHANGELOG.md)
- [Commits](isaacs/node-tar@v6.2.0...v6.2.1)

---
updated-dependencies:
- dependency-name: tar
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

* fix: use standalone ajv validation for model introspection schema (#807)

* fix: use standalone ajv validation for model introspection schema

* test: add unit tests for validator

* fix: missing targetNames in hasOne reference

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Dane Pilcher <[email protected]>

Author: 3 people

.eslintrc.js

@@ -268,6 +268,9 @@ module.exports = {
     '/packages/*/CHANGELOG.md',
 
     // Ignore lint in e2e test apps
-    'test-apps'
+    'test-apps',
+
+    // Ignore lint for standalone JSON validation function
+    '/packages/appsync-modelgen-plugin/src/validate-cjs.js'
   ]
 };

packages/appsync-modelgen-plugin/package.json

@@ -18,18 +18,18 @@
     "codegen"
   ],
   "scripts": {
-    "build": "tsc",
+    "build": "yarn generate-schemas && yarn generate-standalone-validation-function && tsc",
     "watch": "tsc -w",
     "test-watch": "jest --watch",
     "test": "jest",
-    "generate-schemas": "ts-node ./scripts/generateSchemas.ts",
+    "generate-schemas": "ts-node ./scripts/generateSchemas.ts --overwrite",
+    "generate-standalone-validation-function": "ts-node ./scripts/generateStandaloneValidationFunction.ts",
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
     "@graphql-codegen/plugin-helpers": "^1.18.8",
     "@graphql-codegen/visitor-plugin-common": "^1.22.0",
     "@graphql-tools/utils": "^6.0.18",
-    "ajv": "^6.10.0",
     "chalk": "^3.0.0",
     "change-case": "^4.1.1",
     "graphql-transformer-common": "^4.25.1",
@@ -45,6 +45,7 @@
     "@types/fs-extra": "^8.1.2",
     "@types/node": "^12.12.6",
     "@types/pluralize": "0.0.29",
+    "ajv": "^8.12.0",
     "graphql": "^15.5.0",
     "java-ast": "^0.3.0",
     "ts-json-schema-generator": "1.0.0"

packages/appsync-modelgen-plugin/scripts/generateStandaloneValidationFunction.ts

@@ -0,0 +1,14 @@
+import Ajv from 'ajv';
+import modelIntrospectionSchemaDefinition from '../schemas/introspection/1/ModelIntrospectionSchema.json'
+import { join } from 'path';
+import { writeFileSync } from 'fs';
+
+const standaloneCode = require("ajv/dist/standalone").default
+
+const ajv = new Ajv({ code: { source: true } });
+const validate = ajv.compile(modelIntrospectionSchemaDefinition);
+
+let moduleCode = standaloneCode(ajv, validate)
+
+// Now you can write the module code to file
+writeFileSync(join(__dirname, "../src/validate-cjs.js"), moduleCode)

packages/appsync-modelgen-plugin/src/__tests__/validate.test.ts

@@ -0,0 +1,41 @@
+const validateModelIntrospectionSchema = require('../validate-cjs');
+import { ModelIntrospectionSchema } from '../interfaces/introspection'
+
+describe('Standalone validation function', () => {
+  const validSchema: ModelIntrospectionSchema = {
+    version: 1, 
+    models: {},
+    nonModels: {},
+    enums: {},
+  }
+  it('should pass on the valid schema', () => {
+    const result = validateModelIntrospectionSchema(validSchema);
+    expect(result).toBe(true);
+  });
+  describe('should fail on the invalid schema', () => {
+    it('invalid version', () => {
+      const schema = {
+        ...validSchema,
+        version: 100, 
+      };
+      const result = validateModelIntrospectionSchema(schema);
+      expect(result).toBe(false);
+    });
+    it('invalid fields', () => {
+      const schema = {
+        ...validSchema,
+        invalidField: {}
+      };
+      const result = validateModelIntrospectionSchema(schema);
+      expect(result).toBe(false);
+    });
+    it('missing required fields', () => {
+      const schema = {
+        ...validSchema,
+      };
+      delete (schema as any).models;
+      const result = validateModelIntrospectionSchema(schema);
+      expect(result).toBe(false);
+    });
+  });
+});

packages/appsync-modelgen-plugin/src/__tests__/visitors/__snapshots__/appsync-model-introspection-visitor.test.ts.snap

@@ -3692,7 +3692,8 @@ exports[`custom references double linked references 1`] = `
                         \\"connectionType\\": \\"HAS_ONE\\",
                         \\"associatedWith\\": [
                             \\"bar1Id\\"
-                        ]
+                        ],
+                        \\"targetNames\\": []
                     }
                 },
                 \\"bar2\\": {
@@ -3707,7 +3708,8 @@ exports[`custom references double linked references 1`] = `
                         \\"connectionType\\": \\"HAS_ONE\\",
                         \\"associatedWith\\": [
                             \\"bar2Id\\"
-                        ]
+                        ],
+                        \\"targetNames\\": []
                     }
                 },
                 \\"createdAt\\": {
@@ -4244,7 +4246,8 @@ exports[`custom references sets the association to the references field for hasO
                         \\"connectionType\\": \\"HAS_ONE\\",
                         \\"associatedWith\\": [
                             \\"primaryId\\"
-                        ]
+                        ],
+                        \\"targetNames\\": []
                     }
                 },
                 \\"createdAt\\": {
@@ -4467,7 +4470,8 @@ exports[`custom references sets the association to the references field for hasO
                         \\"connectionType\\": \\"HAS_ONE\\",
                         \\"associatedWith\\": [
                             \\"primaryId\\"
-                        ]
+                        ],
+                        \\"targetNames\\": []
                     }
                 },
                 \\"createdAt\\": {

packages/appsync-modelgen-plugin/src/validate-cjs.js

@@ -3,11 +3,9 @@ import { GraphQLSchema } from "graphql";
 import { Argument, AssociationType, Field, Fields, FieldType, ModelAttribute, ModelIntrospectionSchema, PrimaryKeyInfo, SchemaEnum, SchemaModel, SchemaMutation, SchemaNonModel, SchemaQuery, SchemaSubscription, Input, InputFieldType } from "../interfaces/introspection";
 import { METADATA_SCALAR_MAP } from "../scalars";
 import { CodeGenConnectionType } from "../utils/process-connections";
-import { RawAppSyncModelConfig, ParsedAppSyncModelConfig, AppSyncModelVisitor, CodeGenEnum, CodeGenField, CodeGenModel, CodeGenPrimaryKeyType, CodeGenQuery, CodeGenSubscription, CodeGenMutation, CodeGenInputObject, CodeGenUnion, CodeGenInterface } from "./appsync-visitor";
-import fs from 'fs';
-import path from 'path';
-import Ajv from 'ajv';
-import modelIntrospectionSchema from '../schemas/introspection/1/ModelIntrospectionSchema.json';
+import { RawAppSyncModelConfig, ParsedAppSyncModelConfig, AppSyncModelVisitor, CodeGenEnum, CodeGenField, CodeGenModel, CodeGenPrimaryKeyType, CodeGenQuery, CodeGenSubscription, CodeGenMutation, CodeGenInputObject } from "./appsync-visitor";
+
+const validateModelIntrospectionSchema = require('../validate-cjs');
 
 type UnionFieldType = { union: string };
 type InterfaceFieldType = { interface: string };
@@ -19,15 +17,13 @@ export class AppSyncModelIntrospectionVisitor<
   TPluginConfig extends ParsedAppSyncModelIntrospectionConfig = ParsedAppSyncModelIntrospectionConfig
 > extends AppSyncModelVisitor<TRawConfig, TPluginConfig> {
   private readonly introspectionVersion = 1;
-  private schemaValidator: Ajv.ValidateFunction;
   constructor(
     schema: GraphQLSchema,
     rawConfig: TRawConfig,
     additionalConfig: Partial<TPluginConfig>,
     defaultScalars: NormalizedScalarsMap = DEFAULT_SCALARS,
   ) {
     super(schema, rawConfig, additionalConfig, defaultScalars);
-    this.schemaValidator = new Ajv().compile(modelIntrospectionSchema);
   }
 
   generate(): string {
@@ -42,8 +38,8 @@ export class AppSyncModelIntrospectionVisitor<
     );
 
     const modelIntrosepctionSchema = this.generateModelIntrospectionSchema();
-    if (!this.schemaValidator(modelIntrosepctionSchema)) {
-      throw new Error(`Data did not validate against the supplied schema. Underlying errors were ${JSON.stringify(this.schemaValidator.errors)}`);
+    if (!validateModelIntrospectionSchema(modelIntrosepctionSchema)) {
+      throw new Error(`Data did not validate against the supplied schema. Underlying errors were ${JSON.stringify(validateModelIntrospectionSchema.errors)}`);
     }
     return JSON.stringify(modelIntrosepctionSchema, null, 4);
   }
@@ -119,7 +115,7 @@ export class AppSyncModelIntrospectionVisitor<
         connectionAttribute.associatedWith = connectionInfo.associatedWithFields.map(f => this.getFieldName(f));
       } else if (connectionInfo.kind === CodeGenConnectionType.HAS_ONE) {
           connectionAttribute.associatedWith = connectionInfo.associatedWithFields.map(f => this.getFieldName(f));
-          connectionAttribute.targetNames = connectionInfo.targetNames;
+          connectionAttribute.targetNames = connectionInfo.targetNames ?? [];
       } else {
         connectionAttribute.targetNames = connectionInfo.targetNames;
       }

packages/appsync-modelgen-plugin/src/visitors/appsync-model-introspection-visitor.ts

@@ -2,7 +2,8 @@
   "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "rootDir": "src",
-    "outDir": "lib"
+    "outDir": "lib",
+    "allowJs": true,
   },
   "include": [
     "src/**/*",
@@ -11,6 +12,7 @@
   "exclude": [
     "scripts",
     "lib",
-    "src/__tests__"
+    "src/__tests__",
+    "coverage",
   ]
 }

packages/appsync-modelgen-plugin/tsconfig.json

@@ -6125,7 +6125,7 @@ ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.6, ajv@~6.12.6:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^8.0.1, ajv@^8.11.0:
+ajv@^8.0.1, ajv@^8.11.0, ajv@^8.12.0:
   version "8.12.0"
   resolved "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1"
   integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==
@@ -13560,9 +13560,9 @@ tar-stream@~2.2.0:
     readable-stream "^3.1.1"
 
 tar@^6.1.0, tar@^6.1.11, tar@^6.1.2:
-  version "6.2.0"
-  resolved "https://registry.npmjs.org/tar/-/tar-6.2.0.tgz#b14ce49a79cb1cd23bc9b016302dea5474493f73"
-  integrity sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a"
+  integrity sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==
   dependencies:
     chownr "^2.0.0"
     fs-minipass "^2.0.0"