diff --git a/packages/concertino/src/index.ts b/packages/concertino/src/index.ts index 2e4861ee6c..b12e0d2572 100644 --- a/packages/concertino/src/index.ts +++ b/packages/concertino/src/index.ts @@ -20,11 +20,10 @@ /* eslint-disable valid-jsdoc */ import { IModels } from '@accordproject/concerto-metamodel'; import { IConcertino } from './spec/concertino.metamodel@4.0.0-alpha.2'; +import schema from './spec/concertino.schema.json'; import { convertToConcertino } from './concertinoSerializer'; import { convertToMetamodel } from './metamodelSerializer'; import Ajv, { ValidateFunction } from 'ajv'; -import { readFileSync } from 'fs'; -import { join } from 'path'; /** * Conversion options for Concertino format. @@ -36,14 +35,12 @@ export interface ConcertinoOptions { version?: string; } -const schema = JSON.parse(readFileSync(join(__dirname, 'spec/concertino.schema.json'), 'utf-8')); - /** * Concertino utility class for converting between Concerto metamodel and Concertino format. */ export class ConcertinoConverter { private options: ConcertinoOptions; - private validate: ValidateFunction; + private validate?: ValidateFunction; private ajv: Ajv; /** @@ -56,7 +53,6 @@ export class ConcertinoConverter { ...options }; this.ajv = new Ajv(); - this.validate = this.ajv.compile(schema); } /** @@ -82,11 +78,19 @@ export class ConcertinoConverter { } public isValid(concertino: IConcertino): boolean { - return this.validate(concertino); + return this.getValidator()(concertino); } public getValidationErrors() { - return this.validate.errors; + return this.validate?.errors ?? null; + } + + private getValidator(): ValidateFunction { + if (!this.validate) { + this.validate = this.ajv.compile(schema); + } + + return this.validate; } } diff --git a/packages/concertino/test/concertino.test.ts b/packages/concertino/test/concertino.test.ts index da9ba0afa1..3f5df9b3cb 100644 --- a/packages/concertino/test/concertino.test.ts +++ b/packages/concertino/test/concertino.test.ts @@ -7,7 +7,8 @@ import { ConcertinoConverter } from '../src/'; import { determineScalarType, dispatchDeclaration, getInheritanceChain, determinePropertyType } from '../src/concertinoSerializer'; import { readdirSync, statSync } from 'fs'; import { IModel, IModels } from '@accordproject/concerto-metamodel'; -import { it, expect, describe } from 'vitest'; +import Ajv from 'ajv'; +import { afterEach, it, expect, describe, vi } from 'vitest'; const loadAllCtoFiles = (dir: string, models: object[]): void => { const files = readdirSync(dir); @@ -32,6 +33,10 @@ const loadAllCtoFiles = (dir: string, models: object[]): void => { }); }; +afterEach(() => { + vi.restoreAllMocks(); +}); + describe('concertino roundtripping (sample models)', () => { const models: IModel[] = []; @@ -64,6 +69,34 @@ describe('concertino roundtripping (sample models)', () => { }); describe('concertino edge cases and error handling', () => { + it('should lazily compile the validator', () => { + const compileSpy = vi.spyOn(Ajv.prototype, 'compile'); + const converter = new ConcertinoConverter(); + const ast = { + $class: 'concerto.metamodel@1.0.0.Models', + models: [{ + $class: 'concerto.metamodel@1.0.0.Model', + namespace: 'sourceUriTest@1.0.0', + sourceUri: 'uri' + }], + }; + + expect(compileSpy).not.toHaveBeenCalled(); + expect(converter.getValidationErrors()).toBeNull(); + + const concertino = converter.fromConcertoMetamodel(ast); + expect(compileSpy).not.toHaveBeenCalled(); + expect(converter.toConcertoMetamodel(concertino)).toStrictEqual(ast); + expect(compileSpy).not.toHaveBeenCalled(); + + expect(converter.isValid(concertino)).toBe(true); + expect(compileSpy).toHaveBeenCalledTimes(1); + expect(converter.getValidationErrors()).toBeNull(); + + expect(converter.isValid(concertino)).toBe(true); + expect(compileSpy).toHaveBeenCalledTimes(1); + }); + it('should roundtrip sourceUri', () => { const converter = new ConcertinoConverter(); const ast = { diff --git a/packages/concertino/tsconfig.json b/packages/concertino/tsconfig.json index 607bc95200..8d0be9334c 100644 --- a/packages/concertino/tsconfig.json +++ b/packages/concertino/tsconfig.json @@ -33,7 +33,7 @@ // "typeRoots": [], /* Specify multiple folders that act like `./node_modules/@types`. */ // "types": [], /* Specify type package names to be included without being referenced in a source file. */ // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ - // "resolveJsonModule": true, /* Enable importing .json files */ + "resolveJsonModule": true, /* Enable importing .json files */ // "noResolve": true, /* Disallow `import`s, `require`s or ``s from expanding the number of files TypeScript should add to a project. */ /* JavaScript Support */