@rio-cloud/cdk-v2-constructs 7.13.6 → 7.13.7

package/node_modules/fast-xml-parser/src/xmlparser/OrderedObjParser.js

@@ -3,7 +3,7 @@
 
 import {getAllMatches, isExist} from '../util.js';
 import xmlNode from './xmlNode.js';
-import readDocType from './DocTypeReader.js';
+import DocTypeReader from './DocTypeReader.js';
 import toNumber from "strnum";
 import getIgnoreAttributesFn from "../ignoreAttributes.js";
 
@@ -41,8 +41,8 @@ export default class OrderedObjParser{
       "copyright" : { regex: /&(copy|#169);/g, val: "©" },
       "reg" : { regex: /&(reg|#174);/g, val: "®" },
       "inr" : { regex: /&(inr|#8377);/g, val: "₹" },
-      "num_dec": { regex: /&#([0-9]{1,7});/g, val : (_, str) => String.fromCodePoint(Number.parseInt(str, 10)) },
-      "num_hex": { regex: /&#x([0-9a-fA-F]{1,6});/g, val : (_, str) => String.fromCodePoint(Number.parseInt(str, 16)) },
+      "num_dec": { regex: /&#([0-9]{1,7});/g, val : (_, str) => fromCodePoint(str, 10, "&#") },
+      "num_hex": { regex: /&#x([0-9a-fA-F]{1,6});/g, val : (_, str) => fromCodePoint(str, 16, "&#x") },
     };
     this.addExternalEntities = addExternalEntities;
     this.parseXml = parseXml;
@@ -55,6 +55,20 @@ export default class OrderedObjParser{
     this.saveTextToParentTag = saveTextToParentTag;
     this.addChild = addChild;
     this.ignoreAttributesFn = getIgnoreAttributesFn(this.options.ignoreAttributes)
+
+    if(this.options.stopNodes && this.options.stopNodes.length > 0){
+      this.stopNodesExact = new Set();
+      this.stopNodesWildcard = new Set();
+      for(let i = 0; i < this.options.stopNodes.length; i++){
+        const stopNodeExp = this.options.stopNodes[i];
+        if(typeof stopNodeExp !== 'string') continue;
+        if(stopNodeExp.startsWith("*.")){
+          this.stopNodesWildcard.add(stopNodeExp.substring(2));
+        }else{
+          this.stopNodesExact.add(stopNodeExp);
+        }
+      }
+    }
   }
 
 }
@@ -126,7 +140,7 @@ function resolveNameSpace(tagname) {
 //const attrsRegx = new RegExp("([\\w\\-\\.\\:]+)\\s*=\\s*(['\"])((.|\n)*?)\\2","gm");
 const attrsRegx = new RegExp('([^\\s=]+)\\s*(=\\s*([\'"])([\\s\\S]*?)\\3)?', 'gm');
 
-function buildAttributesMap(attrStr, jPath, tagName) {
+function buildAttributesMap(attrStr, jPath) {
   if (this.options.ignoreAttributes !== true && typeof attrStr === 'string') {
     // attrStr = attrStr.replace(/\r?\n/g, ' ');
     //attrStr = attrStr || attrStr.trim();
@@ -189,6 +203,7 @@ const parseXml = function(xmlData) {
   let currentNode = xmlObj;
   let textData = "";
   let jPath = "";
+  const docTypeReader = new DocTypeReader(this.options.processEntities);
   for(let i=0; i< xmlData.length; i++){//for each char in XML data
     const ch = xmlData[i];
     if(ch === '<'){
@@ -237,14 +252,14 @@ const parseXml = function(xmlData) {
 
         textData = this.saveTextToParentTag(textData, currentNode, jPath);
         if( (this.options.ignoreDeclaration && tagData.tagName === "?xml") || this.options.ignorePiTags){
-
+          //do nothing
         }else{
   
           const childNode = new xmlNode(tagData.tagName);
           childNode.add(this.options.textNodeName, "");
           
           if(tagData.tagName !== tagData.tagExp && tagData.attrExpPresent){
-            childNode[":@"] = this.buildAttributesMap(tagData.tagExp, jPath, tagData.tagName);
+            childNode[":@"] = this.buildAttributesMap(tagData.tagExp, jPath);
           }
           this.addChild(currentNode, childNode, jPath, i);
         }
@@ -262,7 +277,7 @@ const parseXml = function(xmlData) {
         }
         i = endIndex;
       } else if( xmlData.substr(i + 1, 2) === '!D') {
-        const result = readDocType(xmlData, i);
+        const result = docTypeReader.readDocType(xmlData, i);
         this.docTypeEntities = result.entities;
         i = result.i;
       }else if(xmlData.substr(i + 1, 2) === '![') {
@@ -291,7 +306,12 @@ const parseXml = function(xmlData) {
         let closeIndex = result.closeIndex;
 
         if (this.options.transformTagName) {
-          tagName = this.options.transformTagName(tagName);
+          //console.log(tagExp, tagName)
+          const newTagName = this.options.transformTagName(tagName);
+          if(tagExp === tagName) {
+            tagExp = newTagName
+          }
+          tagName = newTagName;
         }
         
         //save text as child node
@@ -312,7 +332,7 @@ const parseXml = function(xmlData) {
           jPath += jPath ? "." + tagName : tagName;
         }
         const startIndex = i;
-        if (this.isItStopNode(this.options.stopNodes, jPath, tagName)) {
+        if (this.isItStopNode(this.stopNodesExact, this.stopNodesWildcard, jPath, tagName)) {
           let tagContent = "";
           //self-closing tag
           if(tagExp.length > 0 && tagExp.lastIndexOf("/") === tagExp.length - 1){
@@ -342,7 +362,8 @@ const parseXml = function(xmlData) {
           const childNode = new xmlNode(tagName);
 
           if(tagName !== tagExp && attrExpPresent){
-            childNode[":@"] = this.buildAttributesMap(tagExp, jPath, tagName);
+            childNode[":@"] = this.buildAttributesMap(tagExp, jPath
+            );
           }
           if(tagContent) {
             tagContent = this.parseTextData(tagContent, tagName, jPath, true, attrExpPresent, true, true);
@@ -364,12 +385,16 @@ const parseXml = function(xmlData) {
             }
             
             if(this.options.transformTagName) {
-              tagName = this.options.transformTagName(tagName);
+              const newTagName = this.options.transformTagName(tagName);
+              if(tagExp === tagName) {
+                tagExp = newTagName
+              }
+              tagName = newTagName;
             }
 
             const childNode = new xmlNode(tagName);
             if(tagName !== tagExp && attrExpPresent){
-              childNode[":@"] = this.buildAttributesMap(tagExp, jPath, tagName);
+              childNode[":@"] = this.buildAttributesMap(tagExp, jPath);
             }
             this.addChild(currentNode, childNode, jPath, startIndex);
             jPath = jPath.substr(0, jPath.lastIndexOf("."));
@@ -380,7 +405,7 @@ const parseXml = function(xmlData) {
             this.tagsNodeStack.push(currentNode);
             
             if(tagName !== tagExp && attrExpPresent){
-              childNode[":@"] = this.buildAttributesMap(tagExp, jPath, tagName);
+              childNode[":@"] = this.buildAttributesMap(tagExp, jPath);
             }
             this.addChild(currentNode, childNode, jPath, startIndex);
             currentNode = childNode;
@@ -401,6 +426,7 @@ function addChild(currentNode, childNode, jPath, startIndex){
   if (!this.options.captureMetaData) startIndex = undefined;
   const result = this.options.updateTag(childNode.tagname, jPath, childNode[":@"])
   if(result === false){
+    //do nothing
   } else if(typeof result === "string"){
     childNode.tagname = result
     currentNode.addChild(childNode, startIndex);
@@ -450,17 +476,14 @@ function saveTextToParentTag(textData, currentNode, jPath, isLeafNode) {
 
 //TODO: use jPath to simplify the logic
 /**
- * 
- * @param {string[]} stopNodes 
+ * @param {Set} stopNodesExact
+ * @param {Set} stopNodesWildcard
  * @param {string} jPath
- * @param {string} currentTagName 
+ * @param {string} currentTagName
  */
-function isItStopNode(stopNodes, jPath, currentTagName){
-  const allNodesExp = "*." + currentTagName;
-  for (const stopNodePath in stopNodes) {
-    const stopNodeExp = stopNodes[stopNodePath];
-    if( allNodesExp === stopNodeExp || jPath === stopNodeExp  ) return true;
-  }
+function isItStopNode(stopNodesExact, stopNodesWildcard, jPath, currentTagName){
+  if(stopNodesWildcard && stopNodesWildcard.has(currentTagName)) return true;
+  if(stopNodesExact && stopNodesExact.has(jPath)) return true;
   return false;
 }
 
@@ -604,3 +627,13 @@ function parseValue(val, shouldParse, options) {
     }
   }
 }
+
+function fromCodePoint(str, base, prefix){
+  const codePoint = Number.parseInt(str, base);
+
+  if (codePoint >= 0 && codePoint <= 0x10FFFF) {
+      return String.fromCodePoint(codePoint);
+  } else {
+      return prefix +str + ";";
+  }
+}

package/node_modules/fast-xml-parser/src/xmlparser/XMLParser.js

@@ -13,16 +13,16 @@ export default class XMLParser{
     }
     /**
      * Parse XML dats to JS object 
-     * @param {string|Buffer} xmlData 
+     * @param {string|Uint8Array} xmlData 
      * @param {boolean|Object} validationOption 
      */
     parse(xmlData,validationOption){
-        if(typeof xmlData === "string"){
-        }else if( xmlData.toString){
+        if(typeof xmlData !== "string" && xmlData.toString){
             xmlData = xmlData.toString();
-        }else{
+        }else if(typeof xmlData !== "string"){
             throw new Error("XML data is accepted in String or Bytes[] form.")
         }
+        
         if( validationOption){
             if(validationOption === true) validationOption = {}; //validate with default options
             

package/package.json

@@ -15,7 +15,7 @@
   ],
   "main": "lib/index.js",
   "license": "Apache-2.0",
-  "version": "7.13.6",
+  "version": "7.13.7",
   "types": "lib/index.d.ts",
   "stability": "stable",
   "exports": {
@@ -137,7 +137,8 @@
     "js-yaml"
   ],
   "overrides": {
-    "form-data": ">=4.0.4"
+    "form-data": ">=4.0.4",
+    "fast-xml-parser": ">=5.3.4"
   },
   "jest": {
     "testMatch": [

package/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "7.13.6"
+  "version": "7.13.7"
 }

package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/structIterator.js

@@ -1,40 +0,0 @@
-import { NormalizedSchema } from "@smithy/core/schema";
-export function* serializingStructIterator(ns, sourceObject) {
-    if (ns.isUnitSchema()) {
-        return;
-    }
-    const struct = ns.getSchema();
-    for (let i = 0; i < struct[4].length; ++i) {
-        const key = struct[4][i];
-        const memberSchema = struct[5][i];
-        const memberNs = new NormalizedSchema([memberSchema, 0], key);
-        if (!(key in sourceObject) && !memberNs.isIdempotencyToken()) {
-            continue;
-        }
-        yield [key, memberNs];
-    }
-}
-export function* deserializingStructIterator(ns, sourceObject, nameTrait) {
-    if (ns.isUnitSchema()) {
-        return;
-    }
-    const struct = ns.getSchema();
-    let keysRemaining = Object.keys(sourceObject).filter((k) => k !== "__type").length;
-    for (let i = 0; i < struct[4].length; ++i) {
-        if (keysRemaining === 0) {
-            break;
-        }
-        const key = struct[4][i];
-        const memberSchema = struct[5][i];
-        const memberNs = new NormalizedSchema([memberSchema, 0], key);
-        let serializationKey = key;
-        if (nameTrait) {
-            serializationKey = memberNs.getMergedTraits()[nameTrait] ?? key;
-        }
-        if (!(serializationKey in sourceObject)) {
-            continue;
-        }
-        yield [key, memberNs];
-        keysRemaining -= 1;
-    }
-}

package/node_modules/@aws-sdk/core/dist-types/submodules/protocols/structIterator.d.ts

@@ -1,27 +0,0 @@
-import { NormalizedSchema } from "@smithy/core/schema";
-/**
- * @internal
- */
-type SourceObject = Record<string, any>;
-/**
- * For serialization use only.
- * @internal
- *
- * @param ns - normalized schema object.
- * @param sourceObject - source object from serialization.
- */
-export declare function serializingStructIterator(ns: NormalizedSchema, sourceObject: SourceObject): Generator<any[], void, unknown>;
-/**
- * For deserialization use only.
- * Yields a subset of NormalizedSchema::structIterator matched to the source object keys.
- * This is a performance optimization to avoid creation of NormalizedSchema member
- * objects for members that are undefined in the source data object but may be numerous
- * in the schema/model.
- * @internal
- *
- * @param ns - normalized schema object.
- * @param sourceObject - source object from deserialization.
- * @param nameTrait - xmlName or jsonName trait to look for.
- */
-export declare function deserializingStructIterator(ns: NormalizedSchema, sourceObject: SourceObject, nameTrait?: "xmlName" | "jsonName" | false): Generator<any[], void, unknown>;
-export {};

package/node_modules/@aws-sdk/core/dist-types/ts3.4/submodules/protocols/structIterator.d.ts

@@ -1,12 +0,0 @@
-import { NormalizedSchema } from "@smithy/core/schema";
-type SourceObject = Record<string, any>;
-export declare function serializingStructIterator(
-  ns: NormalizedSchema,
-  sourceObject: SourceObject
-): Generator<any[], void, unknown>;
-export declare function deserializingStructIterator(
-  ns: NormalizedSchema,
-  sourceObject: SourceObject,
-  nameTrait?: "xmlName" | "jsonName" | false
-): Generator<any[], void, unknown>;
-export {};

package/node_modules/@datadog/datadog-api-client/dist/packages/datadog-api-client-v1/models/DistributionWidgetHistogramRequestType.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"DistributionWidgetHistogramRequestType.js","sourceRoot":"","sources":["../../../../packages/datadog-api-client-v1/models/DistributionWidgetHistogramRequestType.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAWU,QAAA,SAAS,GAAG,WAAW,CAAC"}

package/node_modules/@datadog/datadog-api-client/dist/packages/datadog-api-client-v2/models/AWSCCMConfig.js

@@ -1,30 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AWSCCMConfig = void 0;
-/**
- * AWS Cloud Cost Management config.
- */
-class AWSCCMConfig {
-    constructor() { }
-    /**
-     * @ignore
-     */
-    static getAttributeTypeMap() {
-        return AWSCCMConfig.attributeTypeMap;
-    }
-}
-exports.AWSCCMConfig = AWSCCMConfig;
-/**
- * @ignore
- */
-AWSCCMConfig.attributeTypeMap = {
-    dataExportConfigs: {
-        baseName: "data_export_configs",
-        type: "Array<DataExportConfig>",
-    },
-    additionalProperties: {
-        baseName: "additionalProperties",
-        type: "{ [key: string]: any; }",
-    },
-};
-//# sourceMappingURL=AWSCCMConfig.js.map

package/node_modules/@datadog/datadog-api-client/dist/packages/datadog-api-client-v2/models/AWSCCMConfig.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"AWSCCMConfig.js","sourceRoot":"","sources":["../../../../packages/datadog-api-client-v2/models/AWSCCMConfig.ts"],"names":[],"mappings":";;;AASA;;GAEG;AACH,MAAa,YAAY;IAuCvB,gBAAsB,CAAC;IAPvB;;OAEG;IACH,MAAM,CAAC,mBAAmB;QACxB,OAAO,YAAY,CAAC,gBAAgB,CAAC;IACvC,CAAC;;AArCH,oCAwCC;AAtBC;;GAEG;AACa,6BAAgB,GAAqB;IACnD,iBAAiB,EAAE;QACjB,QAAQ,EAAE,qBAAqB;QAC/B,IAAI,EAAE,yBAAyB;KAChC;IACD,oBAAoB,EAAE;QACpB,QAAQ,EAAE,sBAAsB;QAChC,IAAI,EAAE,yBAAyB;KAChC;CACF,CAAC"}

package/node_modules/@datadog/datadog-api-client/dist/packages/datadog-api-client-v2/models/DataExportConfig.js

@@ -1,51 +0,0 @@
-"use strict";
-/**
- * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
- * This product includes software developed at Datadog (https://www.datadoghq.com/).
- * Copyright 2020-Present Datadog, Inc.
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DataExportConfig = void 0;
-/**
- * AWS Cost and Usage Report data export configuration.
- */
-class DataExportConfig {
-    constructor() { }
-    /**
-     * @ignore
-     */
-    static getAttributeTypeMap() {
-        return DataExportConfig.attributeTypeMap;
-    }
-}
-exports.DataExportConfig = DataExportConfig;
-/**
- * @ignore
- */
-DataExportConfig.attributeTypeMap = {
-    bucketName: {
-        baseName: "bucket_name",
-        type: "string",
-    },
-    bucketRegion: {
-        baseName: "bucket_region",
-        type: "string",
-    },
-    reportName: {
-        baseName: "report_name",
-        type: "string",
-    },
-    reportPrefix: {
-        baseName: "report_prefix",
-        type: "string",
-    },
-    reportType: {
-        baseName: "report_type",
-        type: "string",
-    },
-    additionalProperties: {
-        baseName: "additionalProperties",
-        type: "{ [key: string]: any; }",
-    },
-};
-//# sourceMappingURL=DataExportConfig.js.map

package/node_modules/@datadog/datadog-api-client/dist/packages/datadog-api-client-v2/models/DataExportConfig.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"DataExportConfig.js","sourceRoot":"","sources":["../../../../packages/datadog-api-client-v2/models/DataExportConfig.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAIH;;GAEG;AACH,MAAa,gBAAgB;IAuE3B,gBAAsB,CAAC;IAPvB;;OAEG;IACH,MAAM,CAAC,mBAAmB;QACxB,OAAO,gBAAgB,CAAC,gBAAgB,CAAC;IAC3C,CAAC;;AArEH,4CAwEC;AAtCC;;GAEG;AACa,iCAAgB,GAAqB;IACnD,UAAU,EAAE;QACV,QAAQ,EAAE,aAAa;QACvB,IAAI,EAAE,QAAQ;KACf;IACD,YAAY,EAAE;QACZ,QAAQ,EAAE,eAAe;QACzB,IAAI,EAAE,QAAQ;KACf;IACD,UAAU,EAAE;QACV,QAAQ,EAAE,aAAa;QACvB,IAAI,EAAE,QAAQ;KACf;IACD,YAAY,EAAE;QACZ,QAAQ,EAAE,eAAe;QACzB,IAAI,EAAE,QAAQ;KACf;IACD,UAAU,EAAE;QACV,QAAQ,EAAE,aAAa;QACvB,IAAI,EAAE,QAAQ;KACf;IACD,oBAAoB,EAAE;QACpB,QAAQ,EAAE,sBAAsB;QAChC,IAAI,EAAE,yBAAyB;KAChC;CACF,CAAC"}

package/node_modules/@datadog/datadog-api-client/dist/packages/datadog-api-client-v2/models/ObservabilityPipelineKafkaSourceLibrdkafkaOption.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ObservabilityPipelineKafkaSourceLibrdkafkaOption.js","sourceRoot":"","sources":["../../../../packages/datadog-api-client-v2/models/ObservabilityPipelineKafkaSourceLibrdkafkaOption.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAIH;;GAEG;AACH,MAAa,gDAAgD;IAiD3D,gBAAsB,CAAC;IAPvB;;OAEG;IACH,MAAM,CAAC,mBAAmB;QACxB,OAAO,gDAAgD,CAAC,gBAAgB,CAAC;IAC3E,CAAC;;AA/CH,4GAkDC;AA5BC;;GAEG;AACa,iEAAgB,GAAqB;IACnD,IAAI,EAAE;QACJ,QAAQ,EAAE,MAAM;QAChB,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,IAAI;KACf;IACD,KAAK,EAAE;QACL,QAAQ,EAAE,OAAO;QACjB,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,IAAI;KACf;IACD,oBAAoB,EAAE;QACpB,QAAQ,EAAE,sBAAsB;QAChC,IAAI,EAAE,yBAAyB;KAChC;CACF,CAAC"}

package/node_modules/@datadog/datadog-api-client/dist/packages/datadog-api-client-v2/models/ObservabilityPipelineKafkaSourceSasl.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ObservabilityPipelineKafkaSourceSasl.js","sourceRoot":"","sources":["../../../../packages/datadog-api-client-v2/models/ObservabilityPipelineKafkaSourceSasl.ts"],"names":[],"mappings":";;;AASA;;GAEG;AACH,MAAa,oCAAoC;IAuC/C,gBAAsB,CAAC;IAPvB;;OAEG;IACH,MAAM,CAAC,mBAAmB;QACxB,OAAO,oCAAoC,CAAC,gBAAgB,CAAC;IAC/D,CAAC;;AArCH,oFAwCC;AAtBC;;GAEG;AACa,qDAAgB,GAAqB;IACnD,SAAS,EAAE;QACT,QAAQ,EAAE,WAAW;QACrB,IAAI,EAAE,uDAAuD;KAC9D;IACD,oBAAoB,EAAE;QACpB,QAAQ,EAAE,sBAAsB;QAChC,IAAI,EAAE,yBAAyB;KAChC;CACF,CAAC"}

package/node_modules/@datadog/datadog-api-client/dist/packages/datadog-api-client-v2/models/ObservabilityPipelinePipelineKafkaSourceSaslMechanism.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ObservabilityPipelinePipelineKafkaSourceSaslMechanism.js","sourceRoot":"","sources":["../../../../packages/datadog-api-client-v2/models/ObservabilityPipelinePipelineKafkaSourceSaslMechanism.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAaU,QAAA,KAAK,GAAG,OAAO,CAAC;AAChB,QAAA,mBAAmB,GAAG,eAAe,CAAC;AACtC,QAAA,mBAAmB,GAAG,eAAe,CAAC"}