@ui5/task-adaptation 1.1.3 → 1.3.0

package/CHANGELOG.md

@@ -2,7 +2,13 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-A list of unreleased changes can be found [here](https://github.com/SAP/ui5-task-adaptation/compare/v1.1.3...HEAD).
+A list of unreleased changes can be found [here](https://github.com/SAP/ui5-task-adaptation/compare/v1.3.0...HEAD).
+
+<a name="v1.3.0"></a>
+## [v1.3.0] - 2024-03-22
+
+<a name="v1.2.0"></a>
+## [v1.2.0] - 2024-03-05
 
 <a name="v1.1.3"></a>
 ## [v1.1.3] - 2024-02-26
@@ -82,6 +88,8 @@ A list of unreleased changes can be found [here](https://github.com/SAP/ui5-task
 <a name="v1.0.0"></a>
 ## v1.0.0 - 2020-12-09
 
+[v1.3.0]: https://github.com/SAP/ui5-task-adaptation/compare/v1.2.0...v1.3.0
+[v1.2.0]: https://github.com/SAP/ui5-task-adaptation/compare/v1.1.3...v1.2.0
 [v1.1.3]: https://github.com/SAP/ui5-task-adaptation/compare/v1.1.2...v1.1.3
 [v1.1.2]: https://github.com/SAP/ui5-task-adaptation/compare/v1.1.1...v1.1.2
 [v1.1.1]: https://github.com/SAP/ui5-task-adaptation/compare/v1.1.0...v1.1.1

package/dist/annotationManager.d.ts

@@ -1,6 +1,6 @@
-import AbapRepoManager from "./repositories/abapRepoManager";
-import { IConfiguration } from "./model/types";
-import Language from "./model/language";
+import AbapRepoManager from "./repositories/abapRepoManager.js";
+import { IConfiguration } from "./model/types.js";
+import Language from "./model/language.js";
 export interface IAnnotationFiles {
     annotationName: string;
     annotationFileName: string;

package/dist/annotationManager.js

@@ -1,30 +1,30 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const baseAppManager_1 = require("./baseAppManager");
-const dataSourceManager_1 = require("./annotations/dataSource/dataSourceManager");
-const i18nManager_1 = require("./i18nManager");
-const serviceRequestor_1 = require("./annotations/serviceRequestor");
-const path_1 = require("path");
+import BaseAppManager from "./baseAppManager.js";
+import DataSourceManager from "./annotations/dataSource/dataSourceManager.js";
+import I18nManager from "./i18nManager.js";
+import ServiceRequestor from "./annotations/serviceRequestor.js";
+import { posix as path } from "path";
 const I18N_DEFAULT_PATH = "i18n/annotations";
 const I18N_DEFAULT_MODEL_NAME = "@i18n";
 const SAPUI5 = "sap.ui5";
-class AnnotationManager {
+export default class AnnotationManager {
+    abapRepoManager;
+    configuration;
     constructor(configuration, abapRepoManager) {
-        this.ANNOTATIONS_FOLDER = "annotations";
         this.configuration = configuration;
         this.abapRepoManager = abapRepoManager;
     }
+    ANNOTATIONS_FOLDER = "annotations";
     async process(renamedBaseAppManifest, languages) {
-        const { id } = baseAppManager_1.default.getIdVersion(renamedBaseAppManifest);
-        baseAppManager_1.default.validateProperty(id, "sap.app/id");
+        const { id } = BaseAppManager.getIdVersion(renamedBaseAppManifest);
+        BaseAppManager.validateProperty(id, "sap.app/id");
         const normalisedId = this.normalizeAppVariantId(id);
         //TODO: switch to this after resolving @i18n custom model
         const modelName = I18N_DEFAULT_MODEL_NAME; //`i18n_a9n_${normalisedId}`;
-        const i18nPathName = path_1.posix.join(I18N_DEFAULT_PATH, normalisedId);
-        const i18nManager = new i18nManager_1.default(modelName, id, languages);
-        const serviceRequestor = new serviceRequestor_1.default(this.configuration, this.abapRepoManager);
-        const dataSourceManager = new dataSourceManager_1.default();
-        dataSourceManager.addDataSources(renamedBaseAppManifest["sap.app"]?.dataSources, this.configuration);
+        const i18nPathName = path.join(I18N_DEFAULT_PATH, normalisedId);
+        const i18nManager = new I18nManager(modelName, id, languages);
+        const serviceRequestor = new ServiceRequestor(this.configuration, this.abapRepoManager);
+        const dataSourceManager = new DataSourceManager();
+        dataSourceManager.addDataSources(renamedBaseAppManifest["sap.app"]?.dataSources);
         const annotationFiles = await dataSourceManager.createAnnotationFiles(languages, i18nManager, serviceRequestor);
         const i18nFiles = i18nManager.createFiles(i18nPathName);
         if (i18nManager.hasTranslations()) {
@@ -76,5 +76,4 @@ class AnnotationManager {
         }
     }
 }
-exports.default = AnnotationManager;
 //# sourceMappingURL=annotationManager.js.map

package/dist/annotations/comparator/comparator.js

@@ -1,12 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Diff = void 0;
-const commonUtil_1 = require("../../util/commonUtil");
-const annotationDiffStructureError_1 = require("../../model/annotationDiffStructureError");
-const interchangableCase_1 = require("./interchangableCase");
-const metadataJsonUtil_1 = require("../converter/metadataJsonUtil");
-const xmlUtil_1 = require("../../util/xmlUtil");
-class Diff {
+import { insertInArray, traverse } from "../../util/commonUtil.js";
+import AnnotationDiffStructureError from "../../model/annotationDiffStructureError.js";
+import InterchangableCase from "./interchangableCase.js";
+import MetadataJsonUtil from "../converter/metadataJsonUtil.js";
+import XmlUtil from "../../util/xmlUtil.js";
+export class Diff {
+    __old;
+    __new;
     constructor(__old, __new) {
         this.__old = __old;
         this.__new = __new;
@@ -15,18 +14,19 @@ class Diff {
         return `{ __old: ${this.__old},  __new: ${this.__new} }`;
     }
 }
-exports.Diff = Diff;
-class Comparator {
+export default class Comparator {
+    diffs = new Set();
+    xml_a;
+    xml_b;
     constructor(xml_a, xml_b) {
-        this.diffs = new Set();
         this.xml_a = xml_a;
         this.xml_b = xml_b;
     }
     compare() {
-        const json_a = typeof this.xml_a === "string" ? xmlUtil_1.default.xmlToJson(this.xml_a) : this.xml_a;
-        const json_b = typeof this.xml_b === "string" ? xmlUtil_1.default.xmlToJson(this.xml_b) : this.xml_b;
-        const scheme_a = metadataJsonUtil_1.default.getSchemaNode(json_a);
-        const scheme_b = metadataJsonUtil_1.default.getSchemaNode(json_b);
+        const json_a = typeof this.xml_a === "string" ? XmlUtil.xmlToJson(this.xml_a) : this.xml_a;
+        const json_b = typeof this.xml_b === "string" ? XmlUtil.xmlToJson(this.xml_b) : this.xml_b;
+        const scheme_a = MetadataJsonUtil.getSchemaNode(json_a);
+        const scheme_b = MetadataJsonUtil.getSchemaNode(json_b);
         if (scheme_a && scheme_b) {
             // we compare only Annotations, other types are left as it is
             this.traverseCompare(scheme_a, scheme_b, "Annotations");
@@ -45,7 +45,7 @@ class Comparator {
             // When during traversing we end up in primitives like string, we
             // compare the values. If one of them is not primitive or oone of
             // them is undefined, we throw exception (see test 06, 07).
-            throw new annotationDiffStructureError_1.default({ a, b });
+            throw new AnnotationDiffStructureError({ a, b });
         }
         else if (typeof a !== "object" && typeof b !== "object") {
             // If primitive values are not same - we assume they are
@@ -71,7 +71,7 @@ class Comparator {
                         else {
                             // If the number of items of nodes without id are
                             // different, we throw error (see test 08).
-                            throw new annotationDiffStructureError_1.default({ a, b });
+                            throw new AnnotationDiffStructureError({ a, b });
                         }
                     }
                 }
@@ -153,8 +153,14 @@ class Comparator {
         return simpleIdentifiers.get(property);
     }
 }
-exports.default = Comparator;
 class Includer {
+    ALL_DIFF_CASES = [
+        new InterchangableCase()
+    ];
+    diffCases = new Array();
+    shouldClear;
+    target;
+    property;
     /**
      * It will decide what to do with the item missing in one language.
      * @param target an array which might miss the item
@@ -165,10 +171,6 @@ class Includer {
      * they will have empty values. Because we don't know what should be there.
      */
     constructor(target, property, shouldClear = true) {
-        this.ALL_DIFF_CASES = [
-            new interchangableCase_1.default()
-        ];
-        this.diffCases = new Array();
         this.shouldClear = shouldClear;
         this.target = target;
         this.property = property;
@@ -189,7 +191,7 @@ class Includer {
         // language or default language value if missing in other language
         // (see test 03).
         const clone = Includer.cloneAndClear(source[index], this.shouldClear);
-        (0, commonUtil_1.insertInArray)(this.target, index, clone);
+        insertInArray(this.target, index, clone);
         // Some annotations like Label, QuickInfo or Heading are
         // interchangable so if QuickInfo is missing we can copy the value
         // from Label or Heading (see test 01).
@@ -208,7 +210,7 @@ class Includer {
     static cloneAndClear(obj, shouldClear = true) {
         const clone = structuredClone(obj);
         if (shouldClear) {
-            (0, commonUtil_1.traverse)(clone, [], (json, key) => {
+            traverse(clone, [], (json, key) => {
                 if (typeof key !== "string" || !simpleIdentifiersReversed.has(key)) {
                     json[key] = "";
                 }
@@ -218,13 +220,15 @@ class Includer {
     }
 }
 class Items {
+    idProperty;
+    array;
+    objectMap = null;
     /**
      * Map of id per item which is lazy initialized if needed
      * @param array
      * @param idProperty
      */
     constructor(array, idProperty) {
-        this.objectMap = null;
         this.array = array;
         this.idProperty = idProperty;
     }

package/dist/annotations/comparator/diffCase.js

@@ -1,3 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};
 //# sourceMappingURL=diffCase.js.map

package/dist/annotations/comparator/interchangableCase.d.ts

@@ -1,4 +1,4 @@
-import DiffCase from "./diffCase";
+import DiffCase from "./diffCase.js";
 export default class InterchangableCase implements DiffCase {
     accept(target: any[], i: number, name: string): void;
     /**

package/dist/annotations/comparator/interchangableCase.js

@@ -1,13 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const comparator_1 = require("./comparator");
-class InterchangableCase {
-    constructor() {
-        // If one of the terms is missing, its values can be filled by others.
-        // Usually Heading or QuickInfo is missing. So we order terms by source
-        // priority (take from label first).
-        this.interchangableTerms = ["SAP__common.Label", "SAP__common.Heading", "SAP__common.QuickInfo"];
-    }
+import { Diff } from "./comparator.js";
+export default class InterchangableCase {
     accept(target, i, name) {
         if (name === "Annotation" && this.interchangableTerms.includes(target[i]?._attributes?.Term)) {
             const source = this.findByPriority(target, i);
@@ -31,7 +23,7 @@ class InterchangableCase {
      */
     getSourceValue(source, attribute) {
         let value = source._attributes[attribute];
-        if (value instanceof comparator_1.Diff) {
+        if (value instanceof Diff) {
             value = value.__old;
         }
         return value;
@@ -50,6 +42,10 @@ class InterchangableCase {
             .map(item => item._attributes?.Term)
             .some(term => this.interchangableTerms.includes(term));
     }
+    // If one of the terms is missing, its values can be filled by others.
+    // Usually Heading or QuickInfo is missing. So we order terms by source
+    // priority (take from label first).
+    interchangableTerms = ["SAP__common.Label", "SAP__common.Heading", "SAP__common.QuickInfo"];
     findByPriority(annotations, index) {
         for (const interchangableTerm of this.interchangableTerms) {
             for (const annotation of annotations) {
@@ -61,5 +57,4 @@ class InterchangableCase {
         }
     }
 }
-exports.default = InterchangableCase;
 //# sourceMappingURL=interchangableCase.js.map

package/dist/annotations/converter/metadataJsonReferenceUtil.js

@@ -1,10 +1,9 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const metadataJsonUtil_1 = require("./metadataJsonUtil");
-class MetadataJsonReferenceUtil {
+import MetadataJsonUtil from "./metadataJsonUtil.js";
+export default class MetadataJsonReferenceUtil {
+    json;
+    aliases = null;
+    namespaces = null;
     constructor(json) {
-        this.aliases = null;
-        this.namespaces = null;
         this.json = json;
     }
     aliasToNamespace(target) {
@@ -30,10 +29,10 @@ class MetadataJsonReferenceUtil {
     initReferences() {
         if (!this.aliases || !this.namespaces) {
             const references = new Array();
-            for (const ref of metadataJsonUtil_1.default.getReferences(this.json)) {
+            for (const ref of MetadataJsonUtil.getReferences(this.json)) {
                 references.push(...ref.includes);
             }
-            references.push(metadataJsonUtil_1.default.getSchemaReference(this.json));
+            references.push(MetadataJsonUtil.getSchemaReference(this.json));
             this.aliases = new Map();
             this.namespaces = new Map();
             for (const mapping of references) {
@@ -46,5 +45,4 @@ class MetadataJsonReferenceUtil {
         }
     }
 }
-exports.default = MetadataJsonReferenceUtil;
 //# sourceMappingURL=metadataJsonReferenceUtil.js.map

package/dist/annotations/converter/metadataJsonUtil.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MetadataInclude = exports.MetadataReference = void 0;
-class MetadataJsonUtil {
+export default class MetadataJsonUtil {
     static mapAnnotationsPerTarget(json) {
         const annotations = Array.isArray(json) ? json : this.getAnnotations(json);
         return new Map(annotations.map((json, index) => [json?._attributes?.Target, { json, index }]));
@@ -42,10 +39,10 @@ class MetadataJsonUtil {
         }
     }
 }
-exports.default = MetadataJsonUtil;
-class MetadataReference {
+export class MetadataReference {
+    uri;
+    includes = new Array();
     constructor(referenceJson) {
-        this.includes = new Array();
         this.uri = referenceJson._attributes.Uri;
         for (const include of MetadataJsonUtil.toArrayReadOnly(referenceJson["edmx:Include"])) {
             this.includes.push(MetadataInclude.fromJson(include));
@@ -56,8 +53,9 @@ class MetadataReference {
         return include?.alias;
     }
 }
-exports.MetadataReference = MetadataReference;
-class MetadataInclude {
+export class MetadataInclude {
+    namespace;
+    alias;
     constructor(alias, namespace) {
         this.alias = alias;
         this.namespace = namespace;
@@ -69,5 +67,4 @@ class MetadataInclude {
         return new MetadataInclude(json?._attributes?.Alias, json?._attributes?.Namespace);
     }
 }
-exports.MetadataInclude = MetadataInclude;
 //# sourceMappingURL=metadataJsonUtil.js.map

package/dist/annotations/converter/ui5JsonConverter.js

@@ -1,9 +1,9 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const ui5MetadataJsonUtil_1 = require("./ui5MetadataJsonUtil");
-class UI5JsonConverter {
+import UI5JsonParser from "./ui5MetadataJsonUtil.js";
+export default class UI5JsonConverter {
+    config;
+    oAnnotationConfig;
     static convertAnnotations(json) {
-        const annotationsNode = ui5MetadataJsonUtil_1.default.getAnnotationsNode(json);
+        const annotationsNode = UI5JsonParser.getAnnotationsNode(json);
         if (annotationsNode) {
             return Object.entries(annotationsNode).map(([target, annotations]) => this.processAnnotations(annotations, target));
         }
@@ -249,5 +249,4 @@ class UI5JsonConverter {
         }
     }
 }
-exports.default = UI5JsonConverter;
 //# sourceMappingURL=ui5JsonConverter.js.map

package/dist/annotations/converter/ui5MetadataJsonUtil.js

@@ -1,6 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-class UI5MetadataJsonUtil {
+export default class UI5MetadataJsonUtil {
     static getAnnotationsNode(json) {
         for (const key of Object.keys(json)) {
             if (json[key].$kind === "Schema") {
@@ -9,5 +7,4 @@ class UI5MetadataJsonUtil {
         }
     }
 }
-exports.default = UI5MetadataJsonUtil;
 //# sourceMappingURL=ui5MetadataJsonUtil.js.map

package/dist/annotations/converter/ui5XmlConverter.js

@@ -1,8 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const { V2MetadataConverter, V4MetadataConverter } = require("../../../dist/bundle-odata");
-const jsdom_1 = require("jsdom");
-class UI5XmlConverter {
+import { V2MetadataConverter, V4MetadataConverter } from "../../../dist/bundle.js";
+import { JSDOM } from "jsdom";
+export default class UI5XmlConverter {
     static convertV2(xml) {
         return new V2MetadataConverter().convertXMLMetadata(this.getDocument(xml));
     }
@@ -10,8 +8,7 @@ class UI5XmlConverter {
         return new V4MetadataConverter().convertXMLMetadata(this.getDocument(xml));
     }
     static getDocument(xml) {
-        return (new jsdom_1.JSDOM(xml, { contentType: "application/xml" })).window._document;
+        return (new JSDOM(xml, { contentType: "application/xml" })).window._document;
     }
 }
-exports.default = UI5XmlConverter;
 //# sourceMappingURL=ui5XmlConverter.js.map

package/dist/annotations/dataSource/dataSource.d.ts

@@ -1,8 +1,8 @@
-import I18nManager from "../../i18nManager";
-import { IAnnotationDownloadParams } from "./dataSourceOData";
-import Language from "../../model/language";
-import ServiceRequestor from "../serviceRequestor";
-import Transformer from "../transformers/transformer";
+import I18nManager from "../../i18nManager.js";
+import { IAnnotationDownloadParams } from "./dataSourceOData.js";
+import Language from "../../model/language.js";
+import ServiceRequestor from "../serviceRequestor.js";
+import Transformer from "../transformers/transformer.js";
 export default class DataSource {
     protected name: string;
     private uri;

package/dist/annotations/dataSource/dataSource.js

@@ -1,15 +1,16 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const xmlUtil_1 = require("../../util/xmlUtil");
-class DataSource {
+import XmlUtil from "../../util/xmlUtil.js";
+export default class DataSource {
+    name;
+    uri;
+    jsonTransformers = new Array();
     constructor(name, uri) {
-        this.jsonTransformers = new Array();
         this.name = name;
         this.uri = uri;
     }
     /**
      * Update the json of the dataSources in manifest.json
      */
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     updateManifest(_) {
         // to be overriden in children
     }
@@ -22,7 +23,7 @@ class DataSource {
     async createAnnotationFile(languages, i18nManager, serviceRequestor) {
         const annotationJsons = this.getPromisesPerLanguage(languages, serviceRequestor);
         const annotationJson = await i18nManager.populateTranslations(annotationJsons);
-        const xml = xmlUtil_1.default.jsonToXml(await annotationJson.json);
+        const xml = XmlUtil.jsonToXml(await annotationJson.json);
         return {
             filename: this.getFilename(),
             xml
@@ -51,12 +52,11 @@ class DataSource {
         return this.afterXmlDownload({ xml: languageXmlContent, language, serviceRequestor, uri: this.uri });
     }
     async afterXmlDownload({ xml, language, serviceRequestor, uri }) {
-        let json = xmlUtil_1.default.xmlToJson(xml);
+        let json = XmlUtil.xmlToJson(xml);
         for (const transformer of this.jsonTransformers) {
             json = await transformer.transform({ xml, json, language, serviceRequestor, uri });
         }
         return json;
     }
 }
-exports.default = DataSource;
 //# sourceMappingURL=dataSource.js.map

package/dist/annotations/dataSource/dataSourceManager.d.ts

@@ -1,13 +1,12 @@
-import I18nManager from "../../i18nManager";
-import { IConfiguration } from "../../model/types";
-import Language from "../../model/language";
-import ServiceRequestor from "../serviceRequestor";
+import I18nManager from "../../i18nManager.js";
+import Language from "../../model/language.js";
+import ServiceRequestor from "../serviceRequestor.js";
 export default class DataSourceManager {
     private dataSources;
     /**
      * Parses dataSources from manifest.json.
      * @param dataSourcesJson manifest.json/sap.app/dataSources node
      */
-    addDataSources(dataSourcesJson: any, config: IConfiguration): void;
+    addDataSources(dataSourcesJson: any): void;
     createAnnotationFiles(languages: Language[], i18nManager: I18nManager, serviceRequestor: ServiceRequestor): Promise<Map<string, string>>;
 }

package/dist/annotations/dataSource/dataSourceManager.js

@@ -1,31 +1,24 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const dataSourceOData_1 = require("./dataSourceOData");
-const dataSourceODataAnnotation_1 = require("./dataSourceODataAnnotation");
-const dataSourceODataAnnotationBeta_1 = require("./dataSourceODataAnnotationBeta");
-const path_1 = require("path");
-class DataSourceManager {
-    constructor() {
-        this.dataSources = new Array();
-    }
+import DataSourceOData from "./dataSourceOData.js";
+import DataSourceODataAnnotation from "./dataSourceODataAnnotation.js";
+import path from "path/posix";
+export default class DataSourceManager {
+    dataSources = new Array();
     /**
      * Parses dataSources from manifest.json.
      * @param dataSourcesJson manifest.json/sap.app/dataSources node
      */
-    addDataSources(dataSourcesJson, config) {
+    addDataSources(dataSourcesJson) {
         if (!dataSourcesJson) {
             return;
         }
         const odataAnnotationMap = new Map();
-        if (config.enableBetaFeatures) {
-            // Loop over OData first to collect linked annotation names
-            for (const [name, dataSource] of Object.entries(dataSourcesJson)) {
-                if (dataSource.uri?.startsWith("/") && dataSource.type === "OData") {
-                    const uri = path_1.posix.normalize(dataSource.uri + "/$metadata");
-                    const odata = new dataSourceOData_1.default(name, uri, dataSource);
-                    odata.getAnnotations().forEach(annotation => odataAnnotationMap.set(annotation, uri));
-                    this.dataSources.push(odata);
-                }
+        // Loop over OData first to collect linked annotation names
+        for (const [name, dataSource] of Object.entries(dataSourcesJson)) {
+            if (dataSource.uri?.startsWith("/") && dataSource.type === "OData") {
+                const uri = path.normalize(dataSource.uri + "/$metadata");
+                const odata = new DataSourceOData(name, uri, dataSource);
+                odata.getAnnotations().forEach(annotation => odataAnnotationMap.set(annotation, uri));
+                this.dataSources.push(odata);
             }
         }
         // If ODataAnnotation is in OData annotations, pass metadata url to it
@@ -33,12 +26,7 @@ class DataSourceManager {
             const uri = dataSource.uri;
             const metadataUrl = odataAnnotationMap.get(name);
             if (uri?.startsWith("/") && dataSource.type === "ODataAnnotation") {
-                if (config.enableBetaFeatures) {
-                    this.dataSources.push(new dataSourceODataAnnotationBeta_1.default(name, uri, dataSource, metadataUrl));
-                }
-                else {
-                    this.dataSources.push(new dataSourceODataAnnotation_1.default(name, uri, dataSource));
-                }
+                this.dataSources.push(new DataSourceODataAnnotation(name, uri, dataSource, metadataUrl));
             }
         }
         for (const dataSource of this.dataSources) {
@@ -54,5 +42,4 @@ class DataSourceManager {
         return annotationFiles;
     }
 }
-exports.default = DataSourceManager;
 //# sourceMappingURL=dataSourceManager.js.map

package/dist/annotations/dataSource/dataSourceOData.d.ts

@@ -1,6 +1,6 @@
-import DataSource from "./dataSource";
-import Language from "../../model/language";
-import ServiceRequestor from "../serviceRequestor";
+import DataSource from "./dataSource.js";
+import Language from "../../model/language.js";
+import ServiceRequestor from "../serviceRequestor.js";
 export interface IAnnotationDownloadParams {
     uri: string;
     xml: string;

package/dist/annotations/dataSource/dataSourceOData.js

@@ -1,20 +1,19 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const convertV2ToV4_1 = require("../transformers/convertV2ToV4");
-const dataSource_1 = require("./dataSource");
-const makeAnnotationNamespaceUnique_1 = require("../transformers/makeAnnotationNamespaceUnique");
-const removeAllSchemaNodesExceptAnnotations_1 = require("../transformers/removeAllSchemaNodesExceptAnnotations");
-const traverseReferences_1 = require("../transformers/traverseReferences");
-const commonUtil_1 = require("../../util/commonUtil");
-class DataSourceOData extends dataSource_1.default {
+import ConvertV2ToV4 from "../transformers/convertV2ToV4.js";
+import DataSource from "./dataSource.js";
+import MakeAnnotationNamespaceUnique from "../transformers/makeAnnotationNamespaceUnique.js";
+import RemoveAllSchemaNodesExceptAnnotations from "../transformers/removeAllSchemaNodesExceptAnnotations.js";
+import TraverseReferences from "../transformers/traverseReferences.js";
+import { getUniqueName } from "../../util/commonUtil.js";
+export default class DataSourceOData extends DataSource {
+    dataSourceJson;
     constructor(name, uri, dataSourceJson) {
         super(name, uri);
         this.dataSourceJson = dataSourceJson;
         this.jsonTransformers = [
-            new traverseReferences_1.default(),
-            new convertV2ToV4_1.default(),
-            new removeAllSchemaNodesExceptAnnotations_1.default(),
-            new makeAnnotationNamespaceUnique_1.default()
+            new TraverseReferences(),
+            new ConvertV2ToV4(),
+            new RemoveAllSchemaNodesExceptAnnotations(),
+            new MakeAnnotationNamespaceUnique()
         ];
     }
     updateManifest(manifestDataSources) {
@@ -23,7 +22,7 @@ class DataSourceOData extends dataSource_1.default {
     }
     addNewODataAnnotation(manifestDataSources) {
         const newAnnotationNameTemplate = `annotation_${this.name}`;
-        let newAnnotationName = (0, commonUtil_1.getUniqueName)(Object.keys(manifestDataSources), newAnnotationNameTemplate);
+        let newAnnotationName = getUniqueName(Object.keys(manifestDataSources), newAnnotationNameTemplate);
         this.getAnnotations().unshift(newAnnotationName);
         manifestDataSources[newAnnotationName] = {
             type: "ODataAnnotation",
@@ -43,5 +42,4 @@ class DataSourceOData extends dataSource_1.default {
         return this.getSettings().annotations;
     }
 }
-exports.default = DataSourceOData;
 //# sourceMappingURL=dataSourceOData.js.map

package/dist/annotations/dataSource/dataSourceODataAnnotation.d.ts

@@ -1,6 +1,6 @@
-import DataSource from "./dataSource";
+import DataSource from "./dataSource.js";
 export default class DataSourceODataAnnotation extends DataSource {
     private dataSourceJson;
-    constructor(name: string, uri: string, dataSourceJson: any);
+    constructor(name: string, uri: string, dataSourceJson: any, metadataUrl: string | undefined);
     updateManifest(): void;
 }

package/dist/annotations/dataSource/dataSourceODataAnnotation.js

@@ -1,14 +1,16 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const dataSource_1 = require("./dataSource");
-class DataSourceODataAnnotation extends dataSource_1.default {
-    constructor(name, uri, dataSourceJson) {
+import DataSource from "./dataSource.js";
+import TraverseReferences from "../transformers/traverseReferences.js";
+export default class DataSourceODataAnnotation extends DataSource {
+    dataSourceJson;
+    constructor(name, uri, dataSourceJson, metadataUrl) {
         super(name, uri);
         this.dataSourceJson = dataSourceJson;
+        this.jsonTransformers = [
+            new TraverseReferences(metadataUrl)
+        ];
     }
     updateManifest() {
         this.dataSourceJson.uri = this.getFilename();
     }
 }
-exports.default = DataSourceODataAnnotation;
 //# sourceMappingURL=dataSourceODataAnnotation.js.map