@aws-cdk/cloudformation-diff 1.122.0 → 1.126.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/lib/diff/util.js +7 -1
  2. package/package.json +5 -8
package/lib/diff/util.js CHANGED
@@ -158,14 +158,20 @@ exports.unionOf = unionOf;
158
158
  */
159
159
  function safeParseFloat(str) {
160
160
  const ret = parseFloat(str);
161
+ const nonNumericRegex = /\d*\.\d+\./;
161
162
  if (ret === 0) {
162
163
  // if the str is exactly '0', that's OK;
163
164
  // but parseFloat() also returns 0 for things like '0.0';
164
165
  // in this case, return NaN, so we'll fall back to string comparison
165
166
  return str === '0' ? ret : NaN;
166
167
  }
168
+ else if (nonNumericRegex.test(str)) {
169
+ // if the str contains non-numeric characters,
170
+ // return NaN, so we'll fall back to string comparison
171
+ return NaN;
172
+ }
167
173
  else {
168
174
  return ret;
169
175
  }
170
176
  }
171
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"util.js","sourceRoot":"","sources":["util.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Compares two objects for equality, deeply. The function handles arguments that are\n * +null+, +undefined+, arrays and objects. For objects, the function will not take the\n * object prototype into account for the purpose of the comparison, only the values of\n * properties reported by +Object.keys+.\n *\n * If both operands can be parsed to equivalent numbers, will return true.\n * This makes diff consistent with CloudFormation, where a numeric 10 and a literal \"10\"\n * are considered equivalent.\n *\n * @param lvalue the left operand of the equality comparison.\n * @param rvalue the right operand of the equality comparison.\n *\n * @returns +true+ if both +lvalue+ and +rvalue+ are equivalent to each other.\n */\nexport function deepEqual(lvalue: any, rvalue: any): boolean {\n  if (lvalue === rvalue) { return true; }\n  // CloudFormation allows passing strings into boolean-typed fields\n  if (((typeof lvalue === 'string' && typeof rvalue === 'boolean') ||\n      (typeof lvalue === 'boolean' && typeof rvalue === 'string')) &&\n      lvalue.toString() === rvalue.toString()) {\n    return true;\n  }\n  // allows a numeric 10 and a literal \"10\" to be equivalent;\n  // this is consistent with CloudFormation.\n  if ((typeof lvalue === 'string' || typeof rvalue === 'string') &&\n      safeParseFloat(lvalue) === safeParseFloat(rvalue)) {\n    return true;\n  }\n  if (typeof lvalue !== typeof rvalue) { return false; }\n  if (Array.isArray(lvalue) !== Array.isArray(rvalue)) { return false; }\n  if (Array.isArray(lvalue) /* && Array.isArray(rvalue) */) {\n    if (lvalue.length !== rvalue.length) { return false; }\n    for (let i = 0 ; i < lvalue.length ; i++) {\n      if (!deepEqual(lvalue[i], rvalue[i])) { return false; }\n    }\n    return true;\n  }\n  if (typeof lvalue === 'object' /* && typeof rvalue === 'object' */) {\n    if (lvalue === null || rvalue === null) {\n      // If both were null, they'd have been ===\n      return false;\n    }\n    const keys = Object.keys(lvalue);\n    if (keys.length !== Object.keys(rvalue).length) { return false; }\n    for (const key of keys) {\n      if (!rvalue.hasOwnProperty(key)) { return false; }\n      if (key === 'DependsOn') {\n        if (!dependsOnEqual(lvalue[key], rvalue[key])) { return false; };\n        // check differences other than `DependsOn`\n        continue;\n      }\n      if (!deepEqual(lvalue[key], rvalue[key])) { return false; }\n    }\n    return true;\n  }\n  // Neither object, nor array: I deduce this is primitive type\n  // Primitive type and not ===, so I deduce not deepEqual\n  return false;\n}\n\n/**\n * Compares two arguments to DependsOn for equality.\n *\n * @param lvalue the left operand of the equality comparison.\n * @param rvalue the right operand of the equality comparison.\n *\n * @returns +true+ if both +lvalue+ and +rvalue+ are equivalent to each other.\n */\nfunction dependsOnEqual(lvalue: any, rvalue: any): boolean {\n  // allows ['Value'] and 'Value' to be equal\n  if (Array.isArray(lvalue) !== Array.isArray(rvalue)) {\n    const array = Array.isArray(lvalue) ? lvalue : rvalue;\n    const nonArray = Array.isArray(lvalue) ? rvalue : lvalue;\n\n    if (array.length === 1 && deepEqual(array[0], nonArray)) {\n      return true;\n    }\n    return false;\n  }\n\n  // allows arrays passed to DependsOn to be equivalent irrespective of element order\n  if (Array.isArray(lvalue) && Array.isArray(rvalue)) {\n    if (lvalue.length !== rvalue.length) { return false; }\n    for (let i = 0 ; i < lvalue.length ; i++) {\n      for (let j = 0 ; j < lvalue.length ; j++) {\n        if ((!deepEqual(lvalue[i], rvalue[j])) && (j === lvalue.length - 1)) {\n          return false;\n        }\n        break;\n      }\n    }\n    return true;\n  }\n\n  return false;\n}\n\n/**\n * Produce the differences between two maps, as a map, using a specified diff function.\n *\n * @param oldValue  the old map.\n * @param newValue  the new map.\n * @param elementDiff the diff function.\n *\n * @returns a map representing the differences between +oldValue+ and +newValue+.\n */\nexport function diffKeyedEntities<T>(\n  oldValue: { [key: string]: any } | undefined,\n  newValue: { [key: string]: any } | undefined,\n  elementDiff: (oldElement: any, newElement: any, key: string) => T): { [name: string]: T } {\n  const result: { [name: string]: T } = {};\n  for (const logicalId of unionOf(Object.keys(oldValue || {}), Object.keys(newValue || {}))) {\n    const oldElement = oldValue && oldValue[logicalId];\n    const newElement = newValue && newValue[logicalId];\n    result[logicalId] = elementDiff(oldElement, newElement, logicalId);\n  }\n  return result;\n}\n\n/**\n * Computes the union of two sets of strings.\n *\n * @param lv the left set of strings.\n * @param rv the right set of strings.\n *\n * @returns a new array containing all elemebts from +lv+ and +rv+, with no duplicates.\n */\nexport function unionOf(lv: string[] | Set<string>, rv: string[] | Set<string>): string[] {\n  const result = new Set(lv);\n  for (const v of rv) {\n    result.add(v);\n  }\n  return new Array(...result);\n}\n\n/**\n * A parseFloat implementation that does the right thing for\n * strings like '0.0.0'\n * (for which JavaScript's parseFloat() returns 0).\n */\nfunction safeParseFloat(str: string): number {\n  const ret = parseFloat(str);\n  if (ret === 0) {\n    // if the str is exactly '0', that's OK;\n    // but parseFloat() also returns 0 for things like '0.0';\n    // in this case, return NaN, so we'll fall back to string comparison\n    return str === '0' ? ret : NaN;\n  } else {\n    return ret;\n  }\n}\n"]}
177
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"util.js","sourceRoot":"","sources":["util.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Compares two objects for equality, deeply. The function handles arguments that are\n * +null+, +undefined+, arrays and objects. For objects, the function will not take the\n * object prototype into account for the purpose of the comparison, only the values of\n * properties reported by +Object.keys+.\n *\n * If both operands can be parsed to equivalent numbers, will return true.\n * This makes diff consistent with CloudFormation, where a numeric 10 and a literal \"10\"\n * are considered equivalent.\n *\n * @param lvalue the left operand of the equality comparison.\n * @param rvalue the right operand of the equality comparison.\n *\n * @returns +true+ if both +lvalue+ and +rvalue+ are equivalent to each other.\n */\nexport function deepEqual(lvalue: any, rvalue: any): boolean {\n  if (lvalue === rvalue) { return true; }\n  // CloudFormation allows passing strings into boolean-typed fields\n  if (((typeof lvalue === 'string' && typeof rvalue === 'boolean') ||\n      (typeof lvalue === 'boolean' && typeof rvalue === 'string')) &&\n      lvalue.toString() === rvalue.toString()) {\n    return true;\n  }\n  // allows a numeric 10 and a literal \"10\" to be equivalent;\n  // this is consistent with CloudFormation.\n  if ((typeof lvalue === 'string' || typeof rvalue === 'string') &&\n      safeParseFloat(lvalue) === safeParseFloat(rvalue)) {\n    return true;\n  }\n  if (typeof lvalue !== typeof rvalue) { return false; }\n  if (Array.isArray(lvalue) !== Array.isArray(rvalue)) { return false; }\n  if (Array.isArray(lvalue) /* && Array.isArray(rvalue) */) {\n    if (lvalue.length !== rvalue.length) { return false; }\n    for (let i = 0 ; i < lvalue.length ; i++) {\n      if (!deepEqual(lvalue[i], rvalue[i])) { return false; }\n    }\n    return true;\n  }\n  if (typeof lvalue === 'object' /* && typeof rvalue === 'object' */) {\n    if (lvalue === null || rvalue === null) {\n      // If both were null, they'd have been ===\n      return false;\n    }\n    const keys = Object.keys(lvalue);\n    if (keys.length !== Object.keys(rvalue).length) { return false; }\n    for (const key of keys) {\n      if (!rvalue.hasOwnProperty(key)) { return false; }\n      if (key === 'DependsOn') {\n        if (!dependsOnEqual(lvalue[key], rvalue[key])) { return false; };\n        // check differences other than `DependsOn`\n        continue;\n      }\n      if (!deepEqual(lvalue[key], rvalue[key])) { return false; }\n    }\n    return true;\n  }\n  // Neither object, nor array: I deduce this is primitive type\n  // Primitive type and not ===, so I deduce not deepEqual\n  return false;\n}\n\n/**\n * Compares two arguments to DependsOn for equality.\n *\n * @param lvalue the left operand of the equality comparison.\n * @param rvalue the right operand of the equality comparison.\n *\n * @returns +true+ if both +lvalue+ and +rvalue+ are equivalent to each other.\n */\nfunction dependsOnEqual(lvalue: any, rvalue: any): boolean {\n  // allows ['Value'] and 'Value' to be equal\n  if (Array.isArray(lvalue) !== Array.isArray(rvalue)) {\n    const array = Array.isArray(lvalue) ? lvalue : rvalue;\n    const nonArray = Array.isArray(lvalue) ? rvalue : lvalue;\n\n    if (array.length === 1 && deepEqual(array[0], nonArray)) {\n      return true;\n    }\n    return false;\n  }\n\n  // allows arrays passed to DependsOn to be equivalent irrespective of element order\n  if (Array.isArray(lvalue) && Array.isArray(rvalue)) {\n    if (lvalue.length !== rvalue.length) { return false; }\n    for (let i = 0 ; i < lvalue.length ; i++) {\n      for (let j = 0 ; j < lvalue.length ; j++) {\n        if ((!deepEqual(lvalue[i], rvalue[j])) && (j === lvalue.length - 1)) {\n          return false;\n        }\n        break;\n      }\n    }\n    return true;\n  }\n\n  return false;\n}\n\n/**\n * Produce the differences between two maps, as a map, using a specified diff function.\n *\n * @param oldValue  the old map.\n * @param newValue  the new map.\n * @param elementDiff the diff function.\n *\n * @returns a map representing the differences between +oldValue+ and +newValue+.\n */\nexport function diffKeyedEntities<T>(\n  oldValue: { [key: string]: any } | undefined,\n  newValue: { [key: string]: any } | undefined,\n  elementDiff: (oldElement: any, newElement: any, key: string) => T): { [name: string]: T } {\n  const result: { [name: string]: T } = {};\n  for (const logicalId of unionOf(Object.keys(oldValue || {}), Object.keys(newValue || {}))) {\n    const oldElement = oldValue && oldValue[logicalId];\n    const newElement = newValue && newValue[logicalId];\n    result[logicalId] = elementDiff(oldElement, newElement, logicalId);\n  }\n  return result;\n}\n\n/**\n * Computes the union of two sets of strings.\n *\n * @param lv the left set of strings.\n * @param rv the right set of strings.\n *\n * @returns a new array containing all elemebts from +lv+ and +rv+, with no duplicates.\n */\nexport function unionOf(lv: string[] | Set<string>, rv: string[] | Set<string>): string[] {\n  const result = new Set(lv);\n  for (const v of rv) {\n    result.add(v);\n  }\n  return new Array(...result);\n}\n\n/**\n * A parseFloat implementation that does the right thing for\n * strings like '0.0.0'\n * (for which JavaScript's parseFloat() returns 0).\n */\nfunction safeParseFloat(str: string): number {\n  const ret = parseFloat(str);\n  const nonNumericRegex = /\\d*\\.\\d+\\./;\n  if (ret === 0) {\n    // if the str is exactly '0', that's OK;\n    // but parseFloat() also returns 0 for things like '0.0';\n    // in this case, return NaN, so we'll fall back to string comparison\n    return str === '0' ? ret : NaN;\n  } else if (nonNumericRegex.test(str)) {\n    // if the str contains non-numeric characters,\n    // return NaN, so we'll fall back to string comparison\n    return NaN;\n  } else {\n    return ret;\n  }\n}\n"]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aws-cdk/cloudformation-diff",
3
- "version": "1.122.0",
3
+ "version": "1.126.0",
4
4
  "description": "Utilities to diff CDK stacks against CloudFormation templates",
5
5
  "main": "lib/index.js",
6
6
  "types": "lib/index.d.ts",
@@ -23,21 +23,21 @@
23
23
  },
24
24
  "license": "Apache-2.0",
25
25
  "dependencies": {
26
- "@aws-cdk/cfnspec": "1.122.0",
26
+ "@aws-cdk/cfnspec": "1.126.0",
27
27
  "@types/node": "^10.17.60",
28
28
  "colors": "^1.4.0",
29
29
  "diff": "^5.0.0",
30
30
  "fast-deep-equal": "^3.1.3",
31
- "string-width": "^4.2.2",
31
+ "string-width": "^4.2.3",
32
32
  "table": "^6.7.1"
33
33
  },
34
34
  "devDependencies": {
35
+ "@aws-cdk/cdk-build-tools": "1.126.0",
36
+ "@aws-cdk/pkglint": "1.126.0",
35
37
  "@types/jest": "^26.0.24",
36
38
  "@types/string-width": "^4.0.1",
37
- "cdk-build-tools": "1.122.0",
38
39
  "fast-check": "^2.17.0",
39
40
  "jest": "^26.6.3",
40
- "pkglint": "1.122.0",
41
41
  "ts-jest": "^26.5.6"
42
42
  },
43
43
  "repository": {
@@ -55,9 +55,6 @@
55
55
  },
56
56
  "stability": "stable",
57
57
  "maturity": "stable",
58
- "cdk-build": {
59
- "jest": true
60
- },
61
58
  "publishConfig": {
62
59
  "tag": "latest"
63
60
  }