-
Notifications
You must be signed in to change notification settings - Fork 59
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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
- Loading branch information
1 parent
a9e6cbd
commit 9f55941
Showing
8 changed files
with
74 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 14 additions & 0 deletions
14
packages/appsync-modelgen-plugin/scripts/generateStandaloneValidationFunction.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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) |
41 changes: 41 additions & 0 deletions
41
packages/appsync-modelgen-plugin/src/__tests__/validate.test.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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); | ||
}); | ||
}); | ||
}); |
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters