Skip to content

Commit 6123e71

Browse files
committed
chore: updating source maps
Signed-off-by: Pawel Psztyc <[email protected]>
1 parent 4356f5f commit 6123e71

File tree

7 files changed

+27
-9
lines changed

7 files changed

+27
-9
lines changed

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@api-components/amf-helper-mixin",
33
"description": "A mixin with common functions user by most AMF components to compute AMF values",
4-
"version": "4.5.9",
4+
"version": "4.5.10",
55
"license": "Apache-2.0",
66
"main": "index.js",
77
"module": "index.js",

src/AmfSerializer.js

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1770,17 +1770,29 @@ export class AmfSerializer extends AmfHelperMixin(Object) {
17701770
id: sm['@id'],
17711771
types: sm['@type'].map(this[expandKey].bind(this)),
17721772
});
1773-
const sf = sm[this._getAmfKey(ns.aml.vocabularies.docSourceMaps.synthesizedField)];
1774-
if (Array.isArray(sf) && sf.length) {
1775-
result.synthesizedField = sf.map(i => this.synthesizedField(i))
1773+
const synthesizedField = sm[this._getAmfKey(ns.aml.vocabularies.docSourceMaps.synthesizedField)];
1774+
if (Array.isArray(synthesizedField) && synthesizedField.length) {
1775+
result.synthesizedField = synthesizedField.map(i => this.synthesizedField(i));
17761776
}
17771777
const lexical = sm[this._getAmfKey(ns.aml.vocabularies.docSourceMaps.lexical)];
17781778
if (Array.isArray(lexical) && lexical.length) {
17791779
result.lexical = lexical.map(i => this.synthesizedField(i))
17801780
}
1781-
const te = sm[this._getAmfKey(ns.aml.vocabularies.docSourceMaps.trackedElement)];
1782-
if (Array.isArray(te) && te.length) {
1783-
result.trackedElement = te.map(i => this.synthesizedField(i))
1781+
const trackedElement = sm[this._getAmfKey(ns.aml.vocabularies.docSourceMaps.trackedElement)];
1782+
if (Array.isArray(trackedElement) && trackedElement.length) {
1783+
result.trackedElement = this.synthesizedField(trackedElement[0]);
1784+
}
1785+
const autoName = sm[this._getAmfKey(ns.aml.vocabularies.docSourceMaps.autoGeneratedName)];
1786+
if (Array.isArray(autoName) && autoName.length) {
1787+
result.autoGeneratedName = autoName.map(i => this.synthesizedField(i))
1788+
}
1789+
const jsonSchema = sm[this._getAmfKey(ns.aml.vocabularies.docSourceMaps.parsedJsonSchema)];
1790+
if (Array.isArray(jsonSchema) && jsonSchema.length) {
1791+
result.parsedJsonSchema = this.synthesizedField(jsonSchema[0]);
1792+
}
1793+
const declaredElement = sm[this._getAmfKey(ns.aml.vocabularies.docSourceMaps.declaredElement)];
1794+
if (Array.isArray(declaredElement) && declaredElement.length) {
1795+
result.declaredElement = this.synthesizedField(declaredElement[0]);
17841796
}
17851797
return result;
17861798
}

src/Namespace.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,7 @@ interface DocSourceMaps {
234234
declaredElement: string;
235235
trackedElement: string;
236236
parsedJsonSchema: string;
237+
autoGeneratedName: string;
237238
lexical: string;
238239
synthesizedField: string;
239240
}

src/Namespace.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,7 @@ ns.aml.vocabularies.docSourceMaps.value = `${dsmKey}value`;
248248
ns.aml.vocabularies.docSourceMaps.declaredElement = `${dsmKey}declared-element`;
249249
ns.aml.vocabularies.docSourceMaps.trackedElement = `${dsmKey}tracked-element`;
250250
ns.aml.vocabularies.docSourceMaps.parsedJsonSchema = `${dsmKey}parsed-json-schema`;
251+
ns.aml.vocabularies.docSourceMaps.autoGeneratedName = `${dsmKey}auto-generated-name`;
251252
ns.aml.vocabularies.docSourceMaps.lexical = `${dsmKey}lexical`;
252253
ns.aml.vocabularies.docSourceMaps.synthesizedField = `${dsmKey}synthesized-field`;
253254

src/types.d.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,10 @@ export interface ApiEncoding {
475475
export interface ApiDocumentSourceMaps {
476476
synthesizedField?: ApiSynthesizedField[];
477477
lexical?: ApiSynthesizedField[];
478-
trackedElement?: ApiSynthesizedField[];
478+
trackedElement?: ApiSynthesizedField;
479+
autoGeneratedName?: ApiSynthesizedField[];
480+
parsedJsonSchema?: ApiSynthesizedField;
481+
declaredElement?: ApiSynthesizedField;
479482
}
480483

481484
export interface ApiSynthesizedField {

test/helper/Namepsace.test.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -440,6 +440,7 @@ describe('Namespace', () => {
440440
['declaredElement', `${key}declared-element`],
441441
['trackedElement', `${key}tracked-element`],
442442
['parsedJsonSchema', `${key}parsed-json-schema`],
443+
['autoGeneratedName', `${key}auto-generated-name`],
443444
['lexical', `${key}lexical`],
444445
['synthesizedField', `${key}synthesized-field`],
445446
].forEach(([property, value]) => {

0 commit comments

Comments
 (0)