From d96d96082af4ac233af77d51abebba9c2aea5160 Mon Sep 17 00:00:00 2001 From: Shreyansh Giri Date: Sun, 15 Nov 2026 14:01:19 +0530 Subject: [PATCH 1/2] fix(concerto-cto): escape ObjectProperty default values in Printer.toCTO Signed-off-by: Shreyansh Giri --- packages/concerto-cto/src/printer.ts | 2 +- packages/concerto-cto/test/printer.js | 62 +++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 1 deletion(-) diff --git a/packages/concerto-cto/src/printer.ts b/packages/concerto-cto/src/printer.ts index f8c08b26f8..e5245c7261 100644 --- a/packages/concerto-cto/src/printer.ts +++ b/packages/concerto-cto/src/printer.ts @@ -244,7 +244,7 @@ function modifiersFromMetaModel(mm: any): string { break; case `${MetaModelNamespace}.ObjectProperty`: if (mm.defaultValue !== undefined) { - defaultString += ` default="${mm.defaultValue}"`; + defaultString += ` default=${toStringLiteral(mm.defaultValue)}`; } break; } diff --git a/packages/concerto-cto/test/printer.js b/packages/concerto-cto/test/printer.js index 2592a590dc..801a15c076 100644 --- a/packages/concerto-cto/test/printer.js +++ b/packages/concerto-cto/test/printer.js @@ -139,6 +139,68 @@ describe('parser', () => { reparsed.declarations[0].properties[0].defaultValue.should.equal('he said "hi"'); }); + it('Should escape quotes and backslashes in ObjectProperty default values', () => { + const cto = Printer.toCTO({ + $class: 'concerto.metamodel@1.0.0.Model', + namespace: 'org.acme@1.0.0', + imports: [], + declarations: [{ + $class: 'concerto.metamodel@1.0.0.ConceptDeclaration', + name: 'C', + isAbstract: false, + properties: [{ + $class: 'concerto.metamodel@1.0.0.ObjectProperty', + name: 'quoted', + type: { + $class: 'concerto.metamodel@1.0.0.TypeIdentifier', + name: 'Status' + }, + isArray: false, + isOptional: false, + defaultValue: 'he said "hi"' + }, { + $class: 'concerto.metamodel@1.0.0.ObjectProperty', + name: 'slashed', + type: { + $class: 'concerto.metamodel@1.0.0.TypeIdentifier', + name: 'Status' + }, + isArray: false, + isOptional: false, + defaultValue: 'a\b' + }] + }], + }); + cto.should.include('default="he said \\"hi\\""'); + cto.should.include('default="a\\b"'); + }); + + it('Should produce parseable CTO for ObjectProperty defaults containing quotes', () => { + const cto = Printer.toCTO({ + $class: 'concerto.metamodel@1.0.0.Model', + namespace: 'org.acme@1.0.0', + imports: [], + declarations: [{ + $class: 'concerto.metamodel@1.0.0.ConceptDeclaration', + name: 'C', + isAbstract: false, + properties: [{ + $class: 'concerto.metamodel@1.0.0.ObjectProperty', + name: 'quoted', + type: { + $class: 'concerto.metamodel@1.0.0.TypeIdentifier', + name: 'Status' + }, + isArray: false, + isOptional: false, + defaultValue: 'he said "hi"' + }] + }], + }); + const reparsed = Parser.parse(cto); + reparsed.declarations[0].properties[0].defaultValue.should.equal('he said "hi"'); + }); + it('Should escape quotes in decorator string arguments', () => { const cto = Printer.toCTO({ $class: 'concerto.metamodel@1.0.0.Model', From e642e4bf14fea9923d5e763111f46f203acefd30 Mon Sep 17 00:00:00 2001 From: Shreyansh Giri Date: Mon, 16 Nov 2026 09:50:16 +0530 Subject: [PATCH 2/2] test(concerto-cto): use literal backslash in printer default escaping tests Signed-off-by: Shreyansh Giri --- packages/concerto-cto/test/printer.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/concerto-cto/test/printer.js b/packages/concerto-cto/test/printer.js index 801a15c076..f4752c0b33 100644 --- a/packages/concerto-cto/test/printer.js +++ b/packages/concerto-cto/test/printer.js @@ -109,12 +109,12 @@ describe('parser', () => { name: 'slashed', isArray: false, isOptional: false, - defaultValue: 'a\b' + defaultValue: 'a\\b' }] }], }); cto.should.include('default="he said \\"hi\\""'); - cto.should.include('default="a\\b"'); + cto.should.include('default="a\\\\b"'); }); it('Should produce parseable CTO for String defaults containing quotes', () => { @@ -167,12 +167,12 @@ describe('parser', () => { }, isArray: false, isOptional: false, - defaultValue: 'a\b' + defaultValue: 'a\\b' }] }], }); cto.should.include('default="he said \\"hi\\""'); - cto.should.include('default="a\\b"'); + cto.should.include('default="a\\\\b"'); }); it('Should produce parseable CTO for ObjectProperty defaults containing quotes', () => {