@sap-ux/telemetry 0.4.23 → 0.4.25

package/dist/tooling-telemetry/data-processor.js

@@ -14,6 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.spawnCommand = exports.getCommonProperties = exports.processToolsSuiteTelemetry = void 0;
 const btp_utils_1 = require("@sap-ux/btp-utils");
+const ui5_config_1 = require("@sap-ux/ui5-config");
 const axios_1 = __importDefault(require("axios"));
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
@@ -120,7 +121,7 @@ function getAppProperties(appPath) {
         if (applicationType === 'Fiori Reuse') {
             odataSource = types_1.ODataSource.UNKNOWN;
         }
-        const sourceTemplate = yield getManifestSourceTemplate(appPath);
+        const sourceTemplate = yield getSourceTemplate(appPath);
         const appProgrammingLanguage = yield (0, info_1.getAppProgrammingLanguage)(appPath);
         const output = {};
         output[types_1.CommonProperties.TemplateType] = templateType;
@@ -277,33 +278,53 @@ function getInternalVsExternal() {
     return config_state_1.ToolingTelemetrySettings.internalFeature ? 'internal' : 'external';
 }
 /**
- * Read the manifest.json for the app and locate the tools id.
+ * Retrieves the source template configuration from either the standard manifest.json or
+ * the ui5.yaml based on the project type.
  *
- * @param appPath appPath Root folder path of Fiori app
- * @returns sourceTemplate section of data from manifest.json
+ * @param {string} appPath - The file system path to the application directory.
+ * @returns {Promise<SourceTemplate>} A promise that resolves to the source template configuration object.
  */
-function getManifestSourceTemplate(appPath) {
-    var _a, _b, _c, _d;
+function getSourceTemplate(appPath) {
+    var _a, _b, _c;
     return __awaiter(this, void 0, void 0, function* () {
-        let sourceTemplate = {};
+        const paths = {
+            manifest: path_1.default.join(appPath, 'webapp', 'manifest.json'),
+            appdescr: path_1.default.join(appPath, 'webapp', 'manifest.appdescr_variant'),
+            ui5Yaml: path_1.default.join(appPath, 'ui5.yaml')
+        };
         try {
-            const manifestPath = path_1.default.join(appPath, 'webapp', 'manifest.json');
-            if (fs_1.default.existsSync(manifestPath)) {
-                const manifestStr = yield fs_1.default.promises.readFile(manifestPath, 'utf-8');
+            if (fs_1.default.existsSync(paths.manifest)) {
+                const manifestStr = yield fs_1.default.promises.readFile(paths.manifest, 'utf-8');
                 const manifest = JSON.parse(manifestStr);
-                sourceTemplate = (_a = manifest['sap.app']) === null || _a === void 0 ? void 0 : _a.sourceTemplate;
+                return populateSourceTemplate((_b = (_a = manifest['sap.app']) === null || _a === void 0 ? void 0 : _a.sourceTemplate) !== null && _b !== void 0 ? _b : {});
+            }
+            if (fs_1.default.existsSync(paths.appdescr) && fs_1.default.existsSync(paths.ui5Yaml)) {
+                const baseUi5ConfigContent = yield fs_1.default.promises.readFile(paths.ui5Yaml, 'utf-8');
+                const ui5Config = yield ui5_config_1.UI5Config.newInstance(baseUi5ConfigContent);
+                const adp = ui5Config.getCustomConfiguration('adp');
+                return populateSourceTemplate((_c = adp === null || adp === void 0 ? void 0 : adp.support) !== null && _c !== void 0 ? _c : {});
             }
         }
-        catch (_e) {
-            // Failed to read manifest.json
+        catch (_d) {
+            // Failed to read manifest.json or manifest.appdescr_variant
         }
-        sourceTemplate = sourceTemplate !== null && sourceTemplate !== void 0 ? sourceTemplate : {};
-        sourceTemplate.id = (_b = sourceTemplate.id) !== null && _b !== void 0 ? _b : '';
-        sourceTemplate.version = (_c = sourceTemplate.version) !== null && _c !== void 0 ? _c : '';
-        sourceTemplate.toolsId = (_d = sourceTemplate.toolsId) !== null && _d !== void 0 ? _d : types_1.ToolsId.NO_TOOLS_ID;
-        return sourceTemplate;
+        return populateSourceTemplate({});
     });
 }
+/**
+ * Populates default values for the source template if not specified.
+ *
+ * @param {SourceTemplate} sourceTemplate - Source template object potentially lacking defaults.
+ * @returns {SourceTemplate} Source template with defaults populated.
+ */
+function populateSourceTemplate(sourceTemplate) {
+    var _a, _b, _c;
+    return {
+        id: (_a = sourceTemplate.id) !== null && _a !== void 0 ? _a : '',
+        version: (_b = sourceTemplate.version) !== null && _b !== void 0 ? _b : '',
+        toolsId: (_c = sourceTemplate.toolsId) !== null && _c !== void 0 ? _c : types_1.ToolsId.NO_TOOLS_ID
+    };
+}
 /**
  * Get node.js runtime version.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap-ux/telemetry",
-  "version": "0.4.23",
+  "version": "0.4.25",
   "description": "Library for sending usage telemetry data",
   "repository": {
     "type": "git",
@@ -19,9 +19,9 @@
     "performance-now": "2.1.0",
     "yaml": "2.3.3",
     "@sap-ux/store": "0.5.0",
-    "@sap-ux/project-access": "1.20.0",
+    "@sap-ux/project-access": "1.20.1",
     "@sap-ux/btp-utils": "0.14.4",
-    "@sap-ux/ui5-config": "0.22.4",
+    "@sap-ux/ui5-config": "0.22.5",
     "@sap-ux/logger": "0.5.1"
   },
   "devDependencies": {