-
Notifications
You must be signed in to change notification settings - Fork 97
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(types): build uniontypes too (#765)
* feat(types): build uniontypes too Signed-off-by: Matt Roberts <code@rbrts.uk> * fix(build): include unions in index Signed-off-by: Matt Roberts <code@rbrts.uk> * chore(deps): upgrade codegen to latest release Signed-off-by: Matt Roberts <code@rbrts.uk> --------- Signed-off-by: Matt Roberts <code@rbrts.uk>
- Loading branch information
Showing
10 changed files
with
7,392 additions
and
103 deletions.
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| /* | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| import { ModelManager, ModelFile, Concerto } from '@accordproject/concerto-core'; | ||
| const { MetaModelUtil, MetaModelNamespace } = require('@accordproject/concerto-metamodel'); | ||
| import { createGenerator } from "ts-json-schema-generator"; | ||
| import Ajv from "ajv"; | ||
| import path from "path"; | ||
| import fs from 'fs'; | ||
|
|
||
| test('Chained TypeScript and JSONSchema conversion respects inheritance when flattening subclasses to a union type', () => { | ||
|
|
||
| // TS to JSON Schema conversion | ||
| const config = { | ||
| path: path.resolve('../src/generated/union/concerto-metamodel@1.0.0.ts'), | ||
| tsconfig: path.resolve('../concerto-types/tsconfig.json'), | ||
| type: 'IDecorator', | ||
| } | ||
| const jsonSchema = createGenerator(config).createSchema(config.type); | ||
|
|
||
| const staticJsonSchemaResult = JSON.parse(fs.readFileSync('src/fixtures/decorator.jsonschema.json', 'utf8')); | ||
| expect(jsonSchema).toStrictEqual(staticJsonSchemaResult); | ||
|
|
||
| // Test instance | ||
| const data = { | ||
| $class: `concerto.metamodel@1.0.0.Decorator`, | ||
| name: 'displayName', | ||
| arguments: [ | ||
| { | ||
| value: 'Account ID', | ||
| $class: `concerto.metamodel@1.0.0.DecoratorString`, | ||
| } | ||
| ], | ||
| } | ||
|
|
||
| // Validate the instance with Ajv, a JSON Schema validator | ||
| const ajv = new Ajv() | ||
| const validate = ajv.compile(jsonSchema) | ||
| const valid = validate(data) | ||
| expect(validate.errors).toBeNull(); | ||
|
|
||
| // Validate the instance with Concerto | ||
| const modelManager = new ModelManager(); | ||
| modelManager.addModelFile(new ModelFile(modelManager, MetaModelUtil.metaModelAst, undefined, MetaModelNamespace)); | ||
| const concerto = new Concerto(modelManager); | ||
| expect(() => concerto.validate(data)).not.toThrow(); | ||
| }); |
193 changes: 193 additions & 0 deletions
193
packages/concerto-types/src/fixtures/decorator.jsonschema.json
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,193 @@ | ||
| { | ||
| "$schema": "http://json-schema.org/draft-07/schema#", | ||
| "$ref": "#/definitions/IDecorator", | ||
| "definitions": { | ||
| "IDecorator": { | ||
| "type": "object", | ||
| "properties": { | ||
| "$class": { | ||
| "type": "string" | ||
| }, | ||
| "name": { | ||
| "type": "string" | ||
| }, | ||
| "arguments": { | ||
| "type": "array", | ||
| "items": { | ||
| "$ref": "#/definitions/DecoratorLiteralUnion" | ||
| } | ||
| }, | ||
| "location": { | ||
| "$ref": "#/definitions/IRange" | ||
| } | ||
| }, | ||
| "required": [ | ||
| "$class", | ||
| "name" | ||
| ], | ||
| "additionalProperties": false | ||
| }, | ||
| "DecoratorLiteralUnion": { | ||
| "anyOf": [ | ||
| { | ||
| "$ref": "#/definitions/IDecoratorString" | ||
| }, | ||
| { | ||
| "$ref": "#/definitions/IDecoratorNumber" | ||
| }, | ||
| { | ||
| "$ref": "#/definitions/IDecoratorBoolean" | ||
| }, | ||
| { | ||
| "$ref": "#/definitions/IDecoratorTypeReference" | ||
| } | ||
| ] | ||
| }, | ||
| "IDecoratorString": { | ||
| "type": "object", | ||
| "properties": { | ||
| "$class": { | ||
| "type": "string" | ||
| }, | ||
| "location": { | ||
| "$ref": "#/definitions/IRange" | ||
| }, | ||
| "value": { | ||
| "type": "string" | ||
| } | ||
| }, | ||
| "required": [ | ||
| "$class", | ||
| "value" | ||
| ], | ||
| "additionalProperties": false | ||
| }, | ||
| "IRange": { | ||
| "type": "object", | ||
| "properties": { | ||
| "$class": { | ||
| "type": "string" | ||
| }, | ||
| "start": { | ||
| "$ref": "#/definitions/IPosition" | ||
| }, | ||
| "end": { | ||
| "$ref": "#/definitions/IPosition" | ||
| }, | ||
| "source": { | ||
| "type": "string" | ||
| } | ||
| }, | ||
| "required": [ | ||
| "$class", | ||
| "end", | ||
| "start" | ||
| ], | ||
| "additionalProperties": false | ||
| }, | ||
| "IPosition": { | ||
| "type": "object", | ||
| "properties": { | ||
| "$class": { | ||
| "type": "string" | ||
| }, | ||
| "line": { | ||
| "type": "number" | ||
| }, | ||
| "column": { | ||
| "type": "number" | ||
| }, | ||
| "offset": { | ||
| "type": "number" | ||
| } | ||
| }, | ||
| "required": [ | ||
| "$class", | ||
| "column", | ||
| "line", | ||
| "offset" | ||
| ], | ||
| "additionalProperties": false | ||
| }, | ||
| "IDecoratorNumber": { | ||
| "type": "object", | ||
| "properties": { | ||
| "$class": { | ||
| "type": "string" | ||
| }, | ||
| "location": { | ||
| "$ref": "#/definitions/IRange" | ||
| }, | ||
| "value": { | ||
| "type": "number" | ||
| } | ||
| }, | ||
| "required": [ | ||
| "$class", | ||
| "value" | ||
| ], | ||
| "additionalProperties": false | ||
| }, | ||
| "IDecoratorBoolean": { | ||
| "type": "object", | ||
| "properties": { | ||
| "$class": { | ||
| "type": "string" | ||
| }, | ||
| "location": { | ||
| "$ref": "#/definitions/IRange" | ||
| }, | ||
| "value": { | ||
| "type": "boolean" | ||
| } | ||
| }, | ||
| "required": [ | ||
| "$class", | ||
| "value" | ||
| ], | ||
| "additionalProperties": false | ||
| }, | ||
| "IDecoratorTypeReference": { | ||
| "type": "object", | ||
| "properties": { | ||
| "$class": { | ||
| "type": "string" | ||
| }, | ||
| "location": { | ||
| "$ref": "#/definitions/IRange" | ||
| }, | ||
| "type": { | ||
| "$ref": "#/definitions/ITypeIdentifier" | ||
| }, | ||
| "isArray": { | ||
| "type": "boolean" | ||
| } | ||
| }, | ||
| "required": [ | ||
| "$class", | ||
| "isArray", | ||
| "type" | ||
| ], | ||
| "additionalProperties": false | ||
| }, | ||
| "ITypeIdentifier": { | ||
| "type": "object", | ||
| "properties": { | ||
| "$class": { | ||
| "type": "string" | ||
| }, | ||
| "name": { | ||
| "type": "string" | ||
| }, | ||
| "namespace": { | ||
| "type": "string" | ||
| } | ||
| }, | ||
| "required": [ | ||
| "$class", | ||
| "name" | ||
| ], | ||
| "additionalProperties": false | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.