@sap/cds-dk 6.7.1 → 6.8.0

package/lib/init/util/xml.js

@@ -0,0 +1,56 @@
+const cds = require('../../cds')
+const { read } = cds.utils
+const LOG = console
+
+/*
+  Remove the _text attributes and convert value it into array
+  input : "groupId":[{"_text":["customer"]}]
+  output: "groupId":["customer"]
+*/
+function _removeTextAttributes(value, parentElement) {
+  const parentKeys = Object.keys(parentElement._parent)
+  const key = parentKeys[parentKeys.length - 1]
+  const _text = parentElement._parent[key]
+  if (_text.length > 0) {
+      _text[_text.length - 1] = value
+  } else {
+      parentElement._parent[key] = value
+  }
+}
+
+/**
+ * Parse a given string containing xml
+ * used to remove the _text object from converted json i.e. from xml-js.
+ * example: converted json has "groupId":[{"_text":["customer"]}]
+ * and after removing textAttributes (using this function): "groupId":["customer"]
+ * @param xml string to parse
+ * @returns parsed json object
+*/
+
+async function parseXml(pomXmlPath) {
+  const xmljs = require('xml-js')
+  const xmljsParse = {}
+  try {
+      const xml = await read(pomXmlPath, 'utf-8')
+      xmljsParse.project = JSON.parse(xmljs.xml2json(xml, {
+          ignoreComment: true,
+          compact: true,
+          alwaysArray: true,
+          ignoreDeclaration: true,
+          attributesKey: "$",
+          trim: true,
+          nativeType: true,
+          ignoreInstruction: true,
+          ignoreCdata: true,
+          ignoreDoctype: true,
+          textFn: _removeTextAttributes
+      })).project[0]
+      return xmljsParse
+  } catch (e) {
+    // REVISIT: We shouldn't continue with errors
+    LOG.error(`Failed to read file ${pomXmlPath} - skip pom.xml data`)
+    LOG.error(e)
+  }
+}
+
+module.exports = { parseXml }

package/lib/lint/checks.js

@@ -2,7 +2,7 @@ const fs = require("fs");
 const os = require("os");
 const path = require("path");
 const term = require("../util/term");
-const commandUtil = require("../init/util/commandUtil");
+const commandUtil = require("../util/command");
 
 const IS_WIN = os.platform() === "win32";
 const { URLS } = require("../init/constants");

package/lib/lint/io.js

@@ -2,7 +2,7 @@ const path = require("path");
 const yaml = require("@sap/cds-foss")("yaml");
 const term = require("../util/term");
 const { read, write, exists } = require('../cds').utils;
-const { readJSONC } = require("../init/util/fsUtil");
+const { readJSONC } = require("../util/fs");
 const JSONC = require('../util/jsonc');
 
 module.exports = {

package/lib/{init/util/commandUtil.js → util/command.js}

@@ -1,10 +1,12 @@
+// REVISIT: Consolidate with lib/util/exec.js
+
 const cp = require('child_process');
 const os = require('os');
-const cds = require('../../cds');
+const cds = require('../cds');
 const DEBUG = cds.debug('cli');
 
 
-const { IS_WIN } = require('../constants');
+const { IS_WIN } = require('../init/constants');
 
 class CommandUtil {
 

package/lib/{init/util/fsUtil.js → util/fs.js}

@@ -1,6 +1,6 @@
 const { yaml: YAML } = require('@sap/cds-foss')
-const JSONC = require('../../util/jsonc');
-const { read, write } = require('../../cds').utils;
+const JSONC = require('./jsonc');
+const { read, write } = require('../cds').utils;
 
 // REVISIT: Consider merging with template util