From d16a3c32b5a901a2f20a9334e6f3472ff40e2721 Mon Sep 17 00:00:00 2001
From: Stuart Cox <22485529+coxstuart@users.noreply.github.com>
Date: Mon, 25 Apr 2022 08:24:45 -0500
Subject: [PATCH 01/14] Issue #78 - Upgrade to sushi 2.3.0
Signed-off-by: Stuart Cox <22485529+coxstuart@users.noreply.github.com>
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index cb5a56555e..9e1f6eabd6 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
"node": "^16.13.1"
},
"devDependencies": {
- "fsh-sushi": "^2.2.6",
+ "fsh-sushi": "^2.3.0",
"mkdirp": "^1.0.4"
},
"scripts": {
From 877c7ebee4a59142020a81b7b5d8e5091c6f087f Mon Sep 17 00:00:00 2001
From: Stuart Cox <22485529+coxstuart@users.noreply.github.com>
Date: Mon, 25 Apr 2022 08:29:13 -0500
Subject: [PATCH 02/14] Issue #78 - Upgrade to sushi 2.3.0
Signed-off-by: Stuart Cox <22485529+coxstuart@users.noreply.github.com>
---
package-lock.json | 2944 +++++----------------------------------------
1 file changed, 299 insertions(+), 2645 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index a67475869e..731e572531 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,14 +12,14 @@
"node": "^16.13.1"
},
"devDependencies": {
- "fsh-sushi": "^2.2.6",
+ "fsh-sushi": "^2.3.0",
"mkdirp": "^1.0.4"
}
},
"node_modules/fsh-sushi": {
- "version": "2.2.6",
- "resolved": "https://registry.npmjs.org/fsh-sushi/-/fsh-sushi-2.2.6.tgz",
- "integrity": "sha512-FPsOZaWVGrX+Ai+Y49ravrpDkXYoRhxiGjZ1xiV3++VVwP7ZM+CUQP2zP2G5Ieag5C7hWy7vzT6ul8SyEQUT9w==",
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/fsh-sushi/-/fsh-sushi-2.3.0.tgz",
+ "integrity": "sha512-ewb/TI7UobWC1XZXaoLvVSxN6qzv1sBwhVnUxNkDJXFJTtYeZey2gudxCYi7/AqnKjF9uhIdsC2lwECA7i1iVw==",
"dev": true,
"hasShrinkwrap": true,
"dependencies": {
@@ -1493,16 +1493,6 @@
"supports-color": "^7.1.0"
}
},
- "node_modules/fsh-sushi/node_modules/@mrmlnc/readdir-enhanced": {
- "version": "2.2.1",
- "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz",
- "integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==",
- "extraneous": true,
- "dependencies": {
- "call-me-maybe": "^1.0.1",
- "glob-to-regexp": "^0.3.0"
- }
- },
"node_modules/fsh-sushi/node_modules/@nodelib/fs.scandir": {
"version": "2.1.4",
"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz",
@@ -1519,12 +1509,6 @@
"integrity": "sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==",
"extraneous": true
},
- "node_modules/fsh-sushi/node_modules/@nodelib/fs.stat": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz",
- "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==",
- "extraneous": true
- },
"node_modules/fsh-sushi/node_modules/@nodelib/fs.walk": {
"version": "1.2.6",
"resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz",
@@ -2399,57 +2383,6 @@
"sprintf-js": "~1.0.2"
}
},
- "node_modules/fsh-sushi/node_modules/arr-diff": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
- "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
- "extraneous": true
- },
- "node_modules/fsh-sushi/node_modules/arr-flatten": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
- "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
- "extraneous": true
- },
- "node_modules/fsh-sushi/node_modules/arr-union": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
- "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
- "extraneous": true
- },
- "node_modules/fsh-sushi/node_modules/array-union": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
- "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
- "extraneous": true,
- "dependencies": {
- "array-uniq": "^1.0.1"
- }
- },
- "node_modules/fsh-sushi/node_modules/array-uniq": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
- "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
- "extraneous": true
- },
- "node_modules/fsh-sushi/node_modules/array-unique": {
- "version": "0.3.2",
- "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
- "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
- "extraneous": true
- },
- "node_modules/fsh-sushi/node_modules/arrify": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz",
- "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==",
- "extraneous": true
- },
- "node_modules/fsh-sushi/node_modules/assign-symbols": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
- "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
- "extraneous": true
- },
"node_modules/fsh-sushi/node_modules/async": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/async/-/async-3.2.0.tgz",
@@ -2462,12 +2395,6 @@
"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
"extraneous": true
},
- "node_modules/fsh-sushi/node_modules/atob": {
- "version": "2.1.2",
- "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
- "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
- "extraneous": true
- },
"node_modules/fsh-sushi/node_modules/axios": {
"version": "0.21.4",
"resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
@@ -2611,59 +2538,6 @@
"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
"dev": true
},
- "node_modules/fsh-sushi/node_modules/base": {
- "version": "0.11.2",
- "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
- "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
- "extraneous": true,
- "dependencies": {
- "cache-base": "^1.0.1",
- "class-utils": "^0.3.5",
- "component-emitter": "^1.2.1",
- "define-property": "^1.0.0",
- "isobject": "^3.0.1",
- "mixin-deep": "^1.2.0",
- "pascalcase": "^0.1.1"
- }
- },
- "node_modules/fsh-sushi/node_modules/base/node_modules/define-property": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
- "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
- "extraneous": true,
- "dependencies": {
- "is-descriptor": "^1.0.0"
- }
- },
- "node_modules/fsh-sushi/node_modules/base/node_modules/is-accessor-descriptor": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
- "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
- "extraneous": true,
- "dependencies": {
- "kind-of": "^6.0.0"
- }
- },
- "node_modules/fsh-sushi/node_modules/base/node_modules/is-data-descriptor": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
- "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
- "extraneous": true,
- "dependencies": {
- "kind-of": "^6.0.0"
- }
- },
- "node_modules/fsh-sushi/node_modules/base/node_modules/is-descriptor": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
- "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
- "extraneous": true,
- "dependencies": {
- "is-accessor-descriptor": "^1.0.0",
- "is-data-descriptor": "^1.0.0",
- "kind-of": "^6.0.2"
- }
- },
"node_modules/fsh-sushi/node_modules/brace-expansion": {
"version": "1.1.11",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -2674,33 +2548,6 @@
"concat-map": "0.0.1"
}
},
- "node_modules/fsh-sushi/node_modules/braces": {
- "version": "2.3.2",
- "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
- "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
- "extraneous": true,
- "dependencies": {
- "arr-flatten": "^1.1.0",
- "array-unique": "^0.3.2",
- "extend-shallow": "^2.0.1",
- "fill-range": "^4.0.0",
- "isobject": "^3.0.1",
- "repeat-element": "^1.1.2",
- "snapdragon": "^0.8.1",
- "snapdragon-node": "^2.0.1",
- "split-string": "^3.0.2",
- "to-regex": "^3.0.1"
- }
- },
- "node_modules/fsh-sushi/node_modules/braces/node_modules/extend-shallow": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
- "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
- "extraneous": true,
- "dependencies": {
- "is-extendable": "^0.1.0"
- }
- },
"node_modules/fsh-sushi/node_modules/browser-process-hrtime": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
@@ -2750,29 +2597,6 @@
"integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
"extraneous": true
},
- "node_modules/fsh-sushi/node_modules/cache-base": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
- "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
- "extraneous": true,
- "dependencies": {
- "collection-visit": "^1.0.0",
- "component-emitter": "^1.2.1",
- "get-value": "^2.0.6",
- "has-value": "^1.0.0",
- "isobject": "^3.0.1",
- "set-value": "^2.0.0",
- "to-object-path": "^0.3.0",
- "union-value": "^1.0.0",
- "unset-value": "^1.0.0"
- }
- },
- "node_modules/fsh-sushi/node_modules/call-me-maybe": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz",
- "integrity": "sha1-JtII6onje1y95gJQoV8DHBak1ms=",
- "extraneous": true
- },
"node_modules/fsh-sushi/node_modules/callsites": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
@@ -2846,27 +2670,6 @@
"integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==",
"extraneous": true
},
- "node_modules/fsh-sushi/node_modules/class-utils": {
- "version": "0.3.6",
- "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
- "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
- "extraneous": true,
- "dependencies": {
- "arr-union": "^3.1.0",
- "define-property": "^0.2.5",
- "isobject": "^3.0.0",
- "static-extend": "^0.1.1"
- }
- },
- "node_modules/fsh-sushi/node_modules/class-utils/node_modules/define-property": {
- "version": "0.2.5",
- "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
- "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
- "extraneous": true,
- "dependencies": {
- "is-descriptor": "^0.1.0"
- }
- },
"node_modules/fsh-sushi/node_modules/clean-css": {
"version": "4.2.3",
"resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz",
@@ -2916,16 +2719,6 @@
"integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==",
"extraneous": true
},
- "node_modules/fsh-sushi/node_modules/collection-visit": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
- "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
- "extraneous": true,
- "dependencies": {
- "map-visit": "^1.0.0",
- "object-visit": "^1.0.0"
- }
- },
"node_modules/fsh-sushi/node_modules/color": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/color/-/color-3.0.0.tgz",
@@ -3007,12 +2800,6 @@
"integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
"dev": true
},
- "node_modules/fsh-sushi/node_modules/component-emitter": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
- "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
- "extraneous": true
- },
"node_modules/fsh-sushi/node_modules/concat-map": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -3034,10 +2821,25 @@
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
"extraneous": true
},
- "node_modules/fsh-sushi/node_modules/copy-descriptor": {
- "version": "0.1.1",
- "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
- "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
+ "node_modules/fsh-sushi/node_modules/copyfiles": {
+ "version": "2.4.1",
+ "resolved": "https://registry.npmjs.org/copyfiles/-/copyfiles-2.4.1.tgz",
+ "integrity": "sha512-fereAvAvxDrQDOXybk3Qu3dPbOoKoysFMWtkY3mv5BsL8//OSZVL5DCLYqgRfY5cWirgRzlC+WSrxp6Bo3eNZg==",
+ "extraneous": true,
+ "dependencies": {
+ "glob": "^7.0.5",
+ "minimatch": "^3.0.3",
+ "mkdirp": "^1.0.4",
+ "noms": "0.0.0",
+ "through2": "^2.0.1",
+ "untildify": "^4.0.0",
+ "yargs": "^16.1.0"
+ }
+ },
+ "node_modules/fsh-sushi/node_modules/copyfiles/node_modules/mkdirp": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+ "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
"extraneous": true
},
"node_modules/fsh-sushi/node_modules/core-util-is": {
@@ -3046,45 +2848,6 @@
"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
"dev": true
},
- "node_modules/fsh-sushi/node_modules/cp-file": {
- "version": "7.0.0",
- "resolved": "https://registry.npmjs.org/cp-file/-/cp-file-7.0.0.tgz",
- "integrity": "sha512-0Cbj7gyvFVApzpK/uhCtQ/9kE9UnYpxMzaq5nQQC/Dh4iaj5fxp7iEFIullrYwzj8nf0qnsI1Qsx34hAeAebvw==",
- "extraneous": true,
- "dependencies": {
- "graceful-fs": "^4.1.2",
- "make-dir": "^3.0.0",
- "nested-error-stacks": "^2.0.0",
- "p-event": "^4.1.0"
- }
- },
- "node_modules/fsh-sushi/node_modules/cpy": {
- "version": "8.1.2",
- "resolved": "https://registry.npmjs.org/cpy/-/cpy-8.1.2.tgz",
- "integrity": "sha512-dmC4mUesv0OYH2kNFEidtf/skUwv4zePmGeepjyyJ0qTo5+8KhA1o99oIAwVVLzQMAeDJml74d6wPPKb6EZUTg==",
- "extraneous": true,
- "dependencies": {
- "arrify": "^2.0.1",
- "cp-file": "^7.0.0",
- "globby": "^9.2.0",
- "has-glob": "^1.0.0",
- "junk": "^3.1.0",
- "nested-error-stacks": "^2.1.0",
- "p-all": "^2.1.0",
- "p-filter": "^2.1.0",
- "p-map": "^3.0.0"
- }
- },
- "node_modules/fsh-sushi/node_modules/cpy-cli": {
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/cpy-cli/-/cpy-cli-3.1.1.tgz",
- "integrity": "sha512-HCpNdBkQy3rw+uARLuIf0YurqsMXYzBa9ihhSAuxYJcNIrqrSq3BstPfr0cQN38AdMrQiO9Dp4hYy7GtGJsLPg==",
- "extraneous": true,
- "dependencies": {
- "cpy": "^8.0.0",
- "meow": "^6.1.1"
- }
- },
"node_modules/fsh-sushi/node_modules/create-require": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
@@ -3185,12 +2948,6 @@
"integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==",
"extraneous": true
},
- "node_modules/fsh-sushi/node_modules/decode-uri-component": {
- "version": "0.2.0",
- "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
- "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
- "extraneous": true
- },
"node_modules/fsh-sushi/node_modules/dedent": {
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
@@ -3209,45 +2966,6 @@
"integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
"extraneous": true
},
- "node_modules/fsh-sushi/node_modules/define-property": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
- "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
- "extraneous": true,
- "dependencies": {
- "is-descriptor": "^1.0.2",
- "isobject": "^3.0.1"
- }
- },
- "node_modules/fsh-sushi/node_modules/define-property/node_modules/is-accessor-descriptor": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
- "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
- "extraneous": true,
- "dependencies": {
- "kind-of": "^6.0.0"
- }
- },
- "node_modules/fsh-sushi/node_modules/define-property/node_modules/is-data-descriptor": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
- "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
- "extraneous": true,
- "dependencies": {
- "kind-of": "^6.0.0"
- }
- },
- "node_modules/fsh-sushi/node_modules/define-property/node_modules/is-descriptor": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
- "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
- "extraneous": true,
- "dependencies": {
- "is-accessor-descriptor": "^1.0.0",
- "is-data-descriptor": "^1.0.0",
- "kind-of": "^6.0.2"
- }
- },
"node_modules/fsh-sushi/node_modules/del": {
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/del/-/del-5.1.0.tgz",
@@ -3454,15 +3172,6 @@
"yargs": "^16.1.0"
}
},
- "node_modules/fsh-sushi/node_modules/dir-glob": {
- "version": "2.2.2",
- "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz",
- "integrity": "sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==",
- "extraneous": true,
- "dependencies": {
- "path-type": "^3.0.0"
- }
- },
"node_modules/fsh-sushi/node_modules/doctrine": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
@@ -3949,54 +3658,6 @@
"integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
"extraneous": true
},
- "node_modules/fsh-sushi/node_modules/expand-brackets": {
- "version": "2.1.4",
- "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
- "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
- "extraneous": true,
- "dependencies": {
- "debug": "^2.3.3",
- "define-property": "^0.2.5",
- "extend-shallow": "^2.0.1",
- "posix-character-classes": "^0.1.0",
- "regex-not": "^1.0.0",
- "snapdragon": "^0.8.1",
- "to-regex": "^3.0.1"
- }
- },
- "node_modules/fsh-sushi/node_modules/expand-brackets/node_modules/debug": {
- "version": "2.6.9",
- "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
- "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
- "extraneous": true,
- "dependencies": {
- "ms": "2.0.0"
- }
- },
- "node_modules/fsh-sushi/node_modules/expand-brackets/node_modules/define-property": {
- "version": "0.2.5",
- "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
- "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
- "extraneous": true,
- "dependencies": {
- "is-descriptor": "^0.1.0"
- }
- },
- "node_modules/fsh-sushi/node_modules/expand-brackets/node_modules/extend-shallow": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
- "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
- "extraneous": true,
- "dependencies": {
- "is-extendable": "^0.1.0"
- }
- },
- "node_modules/fsh-sushi/node_modules/expand-brackets/node_modules/ms": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
- "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
- "extraneous": true
- },
"node_modules/fsh-sushi/node_modules/expect": {
"version": "27.4.2",
"resolved": "https://registry.npmjs.org/expect/-/expect-27.4.2.tgz",
@@ -4064,88 +3725,6 @@
"integrity": "sha512-tk9o+ld5TWq41DkK14L4wox4s2D9MtTpKaAVzXfr5CUKm5ZK2ExcaFE0qls2W71zE/6R2TxxrK9w2r6svAFDBQ==",
"extraneous": true
},
- "node_modules/fsh-sushi/node_modules/extend-shallow": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
- "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
- "extraneous": true,
- "dependencies": {
- "assign-symbols": "^1.0.0",
- "is-extendable": "^1.0.1"
- }
- },
- "node_modules/fsh-sushi/node_modules/extend-shallow/node_modules/is-extendable": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
- "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
- "extraneous": true,
- "dependencies": {
- "is-plain-object": "^2.0.4"
- }
- },
- "node_modules/fsh-sushi/node_modules/extglob": {
- "version": "2.0.4",
- "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
- "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
- "extraneous": true,
- "dependencies": {
- "array-unique": "^0.3.2",
- "define-property": "^1.0.0",
- "expand-brackets": "^2.1.4",
- "extend-shallow": "^2.0.1",
- "fragment-cache": "^0.2.1",
- "regex-not": "^1.0.0",
- "snapdragon": "^0.8.1",
- "to-regex": "^3.0.1"
- }
- },
- "node_modules/fsh-sushi/node_modules/extglob/node_modules/define-property": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
- "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
- "extraneous": true,
- "dependencies": {
- "is-descriptor": "^1.0.0"
- }
- },
- "node_modules/fsh-sushi/node_modules/extglob/node_modules/extend-shallow": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
- "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
- "extraneous": true,
- "dependencies": {
- "is-extendable": "^0.1.0"
- }
- },
- "node_modules/fsh-sushi/node_modules/extglob/node_modules/is-accessor-descriptor": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
- "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
- "extraneous": true,
- "dependencies": {
- "kind-of": "^6.0.0"
- }
- },
- "node_modules/fsh-sushi/node_modules/extglob/node_modules/is-data-descriptor": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
- "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
- "extraneous": true,
- "dependencies": {
- "kind-of": "^6.0.0"
- }
- },
- "node_modules/fsh-sushi/node_modules/extglob/node_modules/is-descriptor": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
- "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
- "extraneous": true,
- "dependencies": {
- "is-accessor-descriptor": "^1.0.0",
- "is-data-descriptor": "^1.0.0",
- "kind-of": "^6.0.2"
- }
- },
"node_modules/fsh-sushi/node_modules/extract-zip": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
@@ -4175,20 +3754,6 @@
"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
"extraneous": true
},
- "node_modules/fsh-sushi/node_modules/fast-glob": {
- "version": "2.2.7",
- "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz",
- "integrity": "sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==",
- "extraneous": true,
- "dependencies": {
- "@mrmlnc/readdir-enhanced": "^2.2.1",
- "@nodelib/fs.stat": "^1.1.2",
- "glob-parent": "^3.1.0",
- "is-glob": "^4.0.0",
- "merge2": "^1.2.3",
- "micromatch": "^3.1.10"
- }
- },
"node_modules/fsh-sushi/node_modules/fast-json-stable-stringify": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
@@ -4336,45 +3901,6 @@
"flat-cache": "^3.0.4"
}
},
- "node_modules/fsh-sushi/node_modules/fill-range": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
- "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
- "extraneous": true,
- "dependencies": {
- "extend-shallow": "^2.0.1",
- "is-number": "^3.0.0",
- "repeat-string": "^1.6.1",
- "to-regex-range": "^2.1.0"
- }
- },
- "node_modules/fsh-sushi/node_modules/fill-range/node_modules/extend-shallow": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
- "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
- "extraneous": true,
- "dependencies": {
- "is-extendable": "^0.1.0"
- }
- },
- "node_modules/fsh-sushi/node_modules/fill-range/node_modules/is-number": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
- "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
- "extraneous": true,
- "dependencies": {
- "kind-of": "^3.0.2"
- }
- },
- "node_modules/fsh-sushi/node_modules/fill-range/node_modules/kind-of": {
- "version": "3.2.2",
- "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
- "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
- "extraneous": true,
- "dependencies": {
- "is-buffer": "^1.1.5"
- }
- },
"node_modules/fsh-sushi/node_modules/find-up": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
@@ -4417,17 +3943,11 @@
"dev": true
},
"node_modules/fsh-sushi/node_modules/follow-redirects": {
- "version": "1.14.6",
- "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.6.tgz",
- "integrity": "sha512-fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A==",
+ "version": "1.14.9",
+ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz",
+ "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==",
"dev": true
},
- "node_modules/fsh-sushi/node_modules/for-in": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
- "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
- "extraneous": true
- },
"node_modules/fsh-sushi/node_modules/form-data": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
@@ -4439,15 +3959,6 @@
"mime-types": "^2.1.12"
}
},
- "node_modules/fsh-sushi/node_modules/fragment-cache": {
- "version": "0.2.1",
- "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
- "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
- "extraneous": true,
- "dependencies": {
- "map-cache": "^0.2.2"
- }
- },
"node_modules/fsh-sushi/node_modules/fs-extra": {
"version": "8.1.0",
"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
@@ -4525,12 +4036,6 @@
"pump": "^3.0.0"
}
},
- "node_modules/fsh-sushi/node_modules/get-value": {
- "version": "2.0.6",
- "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
- "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
- "extraneous": true
- },
"node_modules/fsh-sushi/node_modules/glob": {
"version": "7.1.7",
"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
@@ -4545,38 +4050,13 @@
"path-is-absolute": "^1.0.0"
}
},
- "node_modules/fsh-sushi/node_modules/glob-parent": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
- "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
- "extraneous": true,
- "dependencies": {
- "is-glob": "^3.1.0",
- "path-dirname": "^1.0.0"
- }
- },
- "node_modules/fsh-sushi/node_modules/glob-parent/node_modules/is-glob": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
- "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+ "node_modules/fsh-sushi/node_modules/globals": {
+ "version": "13.12.0",
+ "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz",
+ "integrity": "sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==",
"extraneous": true,
"dependencies": {
- "is-extglob": "^2.1.0"
- }
- },
- "node_modules/fsh-sushi/node_modules/glob-to-regexp": {
- "version": "0.3.0",
- "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz",
- "integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=",
- "extraneous": true
- },
- "node_modules/fsh-sushi/node_modules/globals": {
- "version": "13.12.0",
- "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz",
- "integrity": "sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==",
- "extraneous": true,
- "dependencies": {
- "type-fest": "^0.20.2"
+ "type-fest": "^0.20.2"
}
},
"node_modules/fsh-sushi/node_modules/globals/node_modules/type-fest": {
@@ -4585,22 +4065,6 @@
"integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
"extraneous": true
},
- "node_modules/fsh-sushi/node_modules/globby": {
- "version": "9.2.0",
- "resolved": "https://registry.npmjs.org/globby/-/globby-9.2.0.tgz",
- "integrity": "sha512-ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg==",
- "extraneous": true,
- "dependencies": {
- "@types/glob": "^7.1.1",
- "array-union": "^1.0.2",
- "dir-glob": "^2.2.2",
- "fast-glob": "^2.2.6",
- "glob": "^7.1.3",
- "ignore": "^4.0.3",
- "pify": "^4.0.1",
- "slash": "^2.0.0"
- }
- },
"node_modules/fsh-sushi/node_modules/graceful-fs": {
"version": "4.2.6",
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
@@ -4628,72 +4092,6 @@
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
"dev": true
},
- "node_modules/fsh-sushi/node_modules/has-glob": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/has-glob/-/has-glob-1.0.0.tgz",
- "integrity": "sha1-mqqe7b/7G6OZCnsAEPtnjuAIEgc=",
- "extraneous": true,
- "dependencies": {
- "is-glob": "^3.0.0"
- }
- },
- "node_modules/fsh-sushi/node_modules/has-glob/node_modules/is-glob": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
- "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
- "extraneous": true,
- "dependencies": {
- "is-extglob": "^2.1.0"
- }
- },
- "node_modules/fsh-sushi/node_modules/has-value": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
- "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
- "extraneous": true,
- "dependencies": {
- "get-value": "^2.0.6",
- "has-values": "^1.0.0",
- "isobject": "^3.0.0"
- }
- },
- "node_modules/fsh-sushi/node_modules/has-values": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
- "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
- "extraneous": true,
- "dependencies": {
- "is-number": "^3.0.0",
- "kind-of": "^4.0.0"
- }
- },
- "node_modules/fsh-sushi/node_modules/has-values/node_modules/is-number": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
- "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
- "extraneous": true,
- "dependencies": {
- "kind-of": "^3.0.2"
- }
- },
- "node_modules/fsh-sushi/node_modules/has-values/node_modules/is-number/node_modules/kind-of": {
- "version": "3.2.2",
- "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
- "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
- "extraneous": true,
- "dependencies": {
- "is-buffer": "^1.1.5"
- }
- },
- "node_modules/fsh-sushi/node_modules/has-values/node_modules/kind-of": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
- "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
- "extraneous": true,
- "dependencies": {
- "is-buffer": "^1.1.5"
- }
- },
"node_modules/fsh-sushi/node_modules/he": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
@@ -4860,36 +4258,12 @@
"integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
"dev": true
},
- "node_modules/fsh-sushi/node_modules/is-accessor-descriptor": {
- "version": "0.1.6",
- "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
- "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
- "extraneous": true,
- "dependencies": {
- "kind-of": "^3.0.2"
- }
- },
- "node_modules/fsh-sushi/node_modules/is-accessor-descriptor/node_modules/kind-of": {
- "version": "3.2.2",
- "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
- "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
- "extraneous": true,
- "dependencies": {
- "is-buffer": "^1.1.5"
- }
- },
"node_modules/fsh-sushi/node_modules/is-arrayish": {
"version": "0.3.2",
"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
"integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==",
"dev": true
},
- "node_modules/fsh-sushi/node_modules/is-buffer": {
- "version": "1.1.6",
- "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
- "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
- "extraneous": true
- },
"node_modules/fsh-sushi/node_modules/is-core-module": {
"version": "2.4.0",
"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.4.0.tgz",
@@ -4899,53 +4273,12 @@
"has": "^1.0.3"
}
},
- "node_modules/fsh-sushi/node_modules/is-data-descriptor": {
- "version": "0.1.4",
- "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
- "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
- "extraneous": true,
- "dependencies": {
- "kind-of": "^3.0.2"
- }
- },
- "node_modules/fsh-sushi/node_modules/is-data-descriptor/node_modules/kind-of": {
- "version": "3.2.2",
- "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
- "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
- "extraneous": true,
- "dependencies": {
- "is-buffer": "^1.1.5"
- }
- },
- "node_modules/fsh-sushi/node_modules/is-descriptor": {
- "version": "0.1.6",
- "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
- "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
- "extraneous": true,
- "dependencies": {
- "is-accessor-descriptor": "^0.1.6",
- "is-data-descriptor": "^0.1.4",
- "kind-of": "^5.0.0"
- }
- },
- "node_modules/fsh-sushi/node_modules/is-descriptor/node_modules/kind-of": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
- "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
- "extraneous": true
- },
"node_modules/fsh-sushi/node_modules/is-docker": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
"integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
"extraneous": true
},
- "node_modules/fsh-sushi/node_modules/is-extendable": {
- "version": "0.1.1",
- "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
- "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
- "extraneous": true
- },
"node_modules/fsh-sushi/node_modules/is-extglob": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
@@ -4997,15 +4330,6 @@
"integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
"extraneous": true
},
- "node_modules/fsh-sushi/node_modules/is-plain-object": {
- "version": "2.0.4",
- "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
- "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
- "extraneous": true,
- "dependencies": {
- "isobject": "^3.0.1"
- }
- },
"node_modules/fsh-sushi/node_modules/is-potential-custom-element-name": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
@@ -5024,12 +4348,6 @@
"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
"extraneous": true
},
- "node_modules/fsh-sushi/node_modules/is-windows": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
- "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
- "extraneous": true
- },
"node_modules/fsh-sushi/node_modules/is-wsl": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
@@ -5051,12 +4369,6 @@
"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
"extraneous": true
},
- "node_modules/fsh-sushi/node_modules/isobject": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
- "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
- "extraneous": true
- },
"node_modules/fsh-sushi/node_modules/istanbul-lib-coverage": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
@@ -7517,27 +6829,12 @@
"tmpl": "1.0.5"
}
},
- "node_modules/fsh-sushi/node_modules/map-cache": {
- "version": "0.2.2",
- "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
- "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
- "extraneous": true
- },
"node_modules/fsh-sushi/node_modules/map-obj": {
"version": "4.2.1",
"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.2.1.tgz",
"integrity": "sha512-+WA2/1sPmDj1dlvvJmB5G6JKfY9dpn7EVBUL06+y6PoljPkh+6V1QihwxNkbcGxCRjt2b0F9K0taiCuo7MbdFQ==",
"extraneous": true
},
- "node_modules/fsh-sushi/node_modules/map-visit": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
- "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
- "extraneous": true,
- "dependencies": {
- "object-visit": "^1.0.0"
- }
- },
"node_modules/fsh-sushi/node_modules/math-random": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz",
@@ -7575,27 +6872,6 @@
"integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
"extraneous": true
},
- "node_modules/fsh-sushi/node_modules/micromatch": {
- "version": "3.1.10",
- "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
- "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
- "extraneous": true,
- "dependencies": {
- "arr-diff": "^4.0.0",
- "array-unique": "^0.3.2",
- "braces": "^2.3.1",
- "define-property": "^2.0.2",
- "extend-shallow": "^3.0.2",
- "extglob": "^2.0.4",
- "fragment-cache": "^0.2.1",
- "kind-of": "^6.0.2",
- "nanomatch": "^1.2.9",
- "object.pick": "^1.3.0",
- "regex-not": "^1.0.0",
- "snapdragon": "^0.8.1",
- "to-regex": "^3.0.2"
- }
- },
"node_modules/fsh-sushi/node_modules/mime-db": {
"version": "1.51.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz",
@@ -7674,25 +6950,6 @@
"yallist": "^4.0.0"
}
},
- "node_modules/fsh-sushi/node_modules/mixin-deep": {
- "version": "1.3.2",
- "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
- "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
- "extraneous": true,
- "dependencies": {
- "for-in": "^1.0.2",
- "is-extendable": "^1.0.1"
- }
- },
- "node_modules/fsh-sushi/node_modules/mixin-deep/node_modules/is-extendable": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
- "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
- "extraneous": true,
- "dependencies": {
- "is-plain-object": "^2.0.4"
- }
- },
"node_modules/fsh-sushi/node_modules/mkdirp": {
"version": "0.5.5",
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
@@ -7708,37 +6965,12 @@
"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
"dev": true
},
- "node_modules/fsh-sushi/node_modules/nanomatch": {
- "version": "1.2.13",
- "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
- "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
- "extraneous": true,
- "dependencies": {
- "arr-diff": "^4.0.0",
- "array-unique": "^0.3.2",
- "define-property": "^2.0.2",
- "extend-shallow": "^3.0.2",
- "fragment-cache": "^0.2.1",
- "is-windows": "^1.0.2",
- "kind-of": "^6.0.2",
- "object.pick": "^1.3.0",
- "regex-not": "^1.0.0",
- "snapdragon": "^0.8.1",
- "to-regex": "^3.0.1"
- }
- },
"node_modules/fsh-sushi/node_modules/natural-compare": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
"integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
"extraneous": true
},
- "node_modules/fsh-sushi/node_modules/nested-error-stacks": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-2.1.0.tgz",
- "integrity": "sha512-AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug==",
- "extraneous": true
- },
"node_modules/fsh-sushi/node_modules/nice-try": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
@@ -7755,11 +6987,36 @@
}
},
"node_modules/fsh-sushi/node_modules/node-fetch": {
- "version": "2.6.1",
- "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
- "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
+ "version": "2.6.7",
+ "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+ "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+ "extraneous": true,
+ "dependencies": {
+ "whatwg-url": "^5.0.0"
+ }
+ },
+ "node_modules/fsh-sushi/node_modules/node-fetch/node_modules/tr46": {
+ "version": "0.0.3",
+ "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+ "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=",
+ "extraneous": true
+ },
+ "node_modules/fsh-sushi/node_modules/node-fetch/node_modules/webidl-conversions": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+ "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=",
"extraneous": true
},
+ "node_modules/fsh-sushi/node_modules/node-fetch/node_modules/whatwg-url": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+ "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
+ "extraneous": true,
+ "dependencies": {
+ "tr46": "~0.0.3",
+ "webidl-conversions": "^3.0.0"
+ }
+ },
"node_modules/fsh-sushi/node_modules/node-int64": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
@@ -7772,6 +7029,40 @@
"integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==",
"extraneous": true
},
+ "node_modules/fsh-sushi/node_modules/noms": {
+ "version": "0.0.0",
+ "resolved": "https://registry.npmjs.org/noms/-/noms-0.0.0.tgz",
+ "integrity": "sha1-2o69nzr51nYJGbJ9nNyAkqczKFk=",
+ "extraneous": true,
+ "dependencies": {
+ "inherits": "^2.0.1",
+ "readable-stream": "~1.0.31"
+ }
+ },
+ "node_modules/fsh-sushi/node_modules/noms/node_modules/isarray": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+ "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+ "extraneous": true
+ },
+ "node_modules/fsh-sushi/node_modules/noms/node_modules/readable-stream": {
+ "version": "1.0.34",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+ "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+ "extraneous": true,
+ "dependencies": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.1",
+ "isarray": "0.0.1",
+ "string_decoder": "~0.10.x"
+ }
+ },
+ "node_modules/fsh-sushi/node_modules/noms/node_modules/string_decoder": {
+ "version": "0.10.31",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+ "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+ "extraneous": true
+ },
"node_modules/fsh-sushi/node_modules/nopt": {
"version": "1.0.10",
"resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz",
@@ -7820,53 +7111,6 @@
"integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==",
"extraneous": true
},
- "node_modules/fsh-sushi/node_modules/object-copy": {
- "version": "0.1.0",
- "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
- "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
- "extraneous": true,
- "dependencies": {
- "copy-descriptor": "^0.1.0",
- "define-property": "^0.2.5",
- "kind-of": "^3.0.3"
- }
- },
- "node_modules/fsh-sushi/node_modules/object-copy/node_modules/define-property": {
- "version": "0.2.5",
- "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
- "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
- "extraneous": true,
- "dependencies": {
- "is-descriptor": "^0.1.0"
- }
- },
- "node_modules/fsh-sushi/node_modules/object-copy/node_modules/kind-of": {
- "version": "3.2.2",
- "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
- "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
- "extraneous": true,
- "dependencies": {
- "is-buffer": "^1.1.5"
- }
- },
- "node_modules/fsh-sushi/node_modules/object-visit": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
- "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
- "extraneous": true,
- "dependencies": {
- "isobject": "^3.0.0"
- }
- },
- "node_modules/fsh-sushi/node_modules/object.pick": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
- "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
- "extraneous": true,
- "dependencies": {
- "isobject": "^3.0.1"
- }
- },
"node_modules/fsh-sushi/node_modules/once": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -7924,45 +7168,6 @@
"word-wrap": "~1.2.3"
}
},
- "node_modules/fsh-sushi/node_modules/p-all": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/p-all/-/p-all-2.1.0.tgz",
- "integrity": "sha512-HbZxz5FONzz/z2gJfk6bFca0BCiSRF8jU3yCsWOen/vR6lZjfPOu/e7L3uFzTW1i0H8TlC3vqQstEJPQL4/uLA==",
- "extraneous": true,
- "dependencies": {
- "p-map": "^2.0.0"
- }
- },
- "node_modules/fsh-sushi/node_modules/p-all/node_modules/p-map": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
- "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
- "extraneous": true
- },
- "node_modules/fsh-sushi/node_modules/p-event": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/p-event/-/p-event-4.2.0.tgz",
- "integrity": "sha512-KXatOjCRXXkSePPb1Nbi0p0m+gQAwdlbhi4wQKJPI1HsMQS9g+Sqp2o+QHziPr7eYJyOZet836KoHEVM1mwOrQ==",
- "extraneous": true,
- "dependencies": {
- "p-timeout": "^3.1.0"
- }
- },
- "node_modules/fsh-sushi/node_modules/p-filter": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/p-filter/-/p-filter-2.1.0.tgz",
- "integrity": "sha512-ZBxxZ5sL2HghephhpGAQdoskxplTwr7ICaehZwLIlfL6acuVgZPm8yBNuRAFBGEqtD/hmUeq9eqLg2ys9Xr/yw==",
- "extraneous": true,
- "dependencies": {
- "p-map": "^2.0.0"
- }
- },
- "node_modules/fsh-sushi/node_modules/p-filter/node_modules/p-map": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
- "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
- "extraneous": true
- },
"node_modules/fsh-sushi/node_modules/p-finally": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
@@ -7996,15 +7201,6 @@
"aggregate-error": "^3.0.0"
}
},
- "node_modules/fsh-sushi/node_modules/p-timeout": {
- "version": "3.2.0",
- "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz",
- "integrity": "sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==",
- "extraneous": true,
- "dependencies": {
- "p-finally": "^1.0.0"
- }
- },
"node_modules/fsh-sushi/node_modules/p-try": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
@@ -8047,18 +7243,6 @@
"integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
"extraneous": true
},
- "node_modules/fsh-sushi/node_modules/pascalcase": {
- "version": "0.1.1",
- "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
- "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
- "extraneous": true
- },
- "node_modules/fsh-sushi/node_modules/path-dirname": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
- "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
- "extraneous": true
- },
"node_modules/fsh-sushi/node_modules/path-exists": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
@@ -8083,21 +7267,6 @@
"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
"extraneous": true
},
- "node_modules/fsh-sushi/node_modules/path-type": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
- "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
- "extraneous": true,
- "dependencies": {
- "pify": "^3.0.0"
- }
- },
- "node_modules/fsh-sushi/node_modules/path-type/node_modules/pify": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
- "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
- "extraneous": true
- },
"node_modules/fsh-sushi/node_modules/pend": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
@@ -8116,12 +7285,6 @@
"integrity": "sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==",
"extraneous": true
},
- "node_modules/fsh-sushi/node_modules/pify": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
- "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
- "extraneous": true
- },
"node_modules/fsh-sushi/node_modules/pirates": {
"version": "4.0.4",
"resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.4.tgz",
@@ -8137,12 +7300,6 @@
"find-up": "^4.0.0"
}
},
- "node_modules/fsh-sushi/node_modules/posix-character-classes": {
- "version": "0.1.1",
- "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
- "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
- "extraneous": true
- },
"node_modules/fsh-sushi/node_modules/prelude-ls": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
@@ -8302,16 +7459,6 @@
"strip-indent": "^3.0.0"
}
},
- "node_modules/fsh-sushi/node_modules/regex-not": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
- "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
- "extraneous": true,
- "dependencies": {
- "extend-shallow": "^3.0.2",
- "safe-regex": "^1.1.0"
- }
- },
"node_modules/fsh-sushi/node_modules/regexpp": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
@@ -8324,18 +7471,6 @@
"integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=",
"dev": true
},
- "node_modules/fsh-sushi/node_modules/repeat-element": {
- "version": "1.1.4",
- "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz",
- "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==",
- "extraneous": true
- },
- "node_modules/fsh-sushi/node_modules/repeat-string": {
- "version": "1.6.1",
- "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
- "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
- "extraneous": true
- },
"node_modules/fsh-sushi/node_modules/require-directory": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -8373,24 +7508,12 @@
"integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
"extraneous": true
},
- "node_modules/fsh-sushi/node_modules/resolve-url": {
- "version": "0.2.1",
- "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
- "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
- "extraneous": true
- },
"node_modules/fsh-sushi/node_modules/resolve.exports": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.0.tgz",
"integrity": "sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==",
"extraneous": true
},
- "node_modules/fsh-sushi/node_modules/ret": {
- "version": "0.1.15",
- "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
- "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
- "extraneous": true
- },
"node_modules/fsh-sushi/node_modules/reusify": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
@@ -8421,15 +7544,6 @@
"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
"dev": true
},
- "node_modules/fsh-sushi/node_modules/safe-regex": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
- "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
- "extraneous": true,
- "dependencies": {
- "ret": "~0.1.10"
- }
- },
"node_modules/fsh-sushi/node_modules/safer-buffer": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
@@ -8469,27 +7583,6 @@
"lru-cache": "^6.0.0"
}
},
- "node_modules/fsh-sushi/node_modules/set-value": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
- "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
- "extraneous": true,
- "dependencies": {
- "extend-shallow": "^2.0.1",
- "is-extendable": "^0.1.1",
- "is-plain-object": "^2.0.3",
- "split-string": "^3.0.1"
- }
- },
- "node_modules/fsh-sushi/node_modules/set-value/node_modules/extend-shallow": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
- "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
- "extraneous": true,
- "dependencies": {
- "is-extendable": "^0.1.0"
- }
- },
"node_modules/fsh-sushi/node_modules/shebang-command": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
@@ -8526,169 +7619,22 @@
"integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
"extraneous": true
},
- "node_modules/fsh-sushi/node_modules/slash": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
- "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
- "extraneous": true
+ "node_modules/fsh-sushi/node_modules/source-map": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+ "dev": true
},
- "node_modules/fsh-sushi/node_modules/snapdragon": {
- "version": "0.8.2",
- "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
- "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
- "extraneous": true,
- "dependencies": {
- "base": "^0.11.1",
- "debug": "^2.2.0",
- "define-property": "^0.2.5",
- "extend-shallow": "^2.0.1",
- "map-cache": "^0.2.2",
- "source-map": "^0.5.6",
- "source-map-resolve": "^0.5.0",
- "use": "^3.1.0"
- }
- },
- "node_modules/fsh-sushi/node_modules/snapdragon-node": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
- "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
- "extraneous": true,
- "dependencies": {
- "define-property": "^1.0.0",
- "isobject": "^3.0.0",
- "snapdragon-util": "^3.0.1"
- }
- },
- "node_modules/fsh-sushi/node_modules/snapdragon-node/node_modules/define-property": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
- "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
- "extraneous": true,
- "dependencies": {
- "is-descriptor": "^1.0.0"
- }
- },
- "node_modules/fsh-sushi/node_modules/snapdragon-node/node_modules/is-accessor-descriptor": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
- "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
- "extraneous": true,
- "dependencies": {
- "kind-of": "^6.0.0"
- }
- },
- "node_modules/fsh-sushi/node_modules/snapdragon-node/node_modules/is-data-descriptor": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
- "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
- "extraneous": true,
- "dependencies": {
- "kind-of": "^6.0.0"
- }
- },
- "node_modules/fsh-sushi/node_modules/snapdragon-node/node_modules/is-descriptor": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
- "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
- "extraneous": true,
- "dependencies": {
- "is-accessor-descriptor": "^1.0.0",
- "is-data-descriptor": "^1.0.0",
- "kind-of": "^6.0.2"
- }
- },
- "node_modules/fsh-sushi/node_modules/snapdragon-util": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
- "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
- "extraneous": true,
- "dependencies": {
- "kind-of": "^3.2.0"
- }
- },
- "node_modules/fsh-sushi/node_modules/snapdragon-util/node_modules/kind-of": {
- "version": "3.2.2",
- "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
- "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
- "extraneous": true,
- "dependencies": {
- "is-buffer": "^1.1.5"
- }
- },
- "node_modules/fsh-sushi/node_modules/snapdragon/node_modules/debug": {
- "version": "2.6.9",
- "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
- "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
- "extraneous": true,
- "dependencies": {
- "ms": "2.0.0"
- }
- },
- "node_modules/fsh-sushi/node_modules/snapdragon/node_modules/define-property": {
- "version": "0.2.5",
- "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
- "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
- "extraneous": true,
- "dependencies": {
- "is-descriptor": "^0.1.0"
- }
- },
- "node_modules/fsh-sushi/node_modules/snapdragon/node_modules/extend-shallow": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
- "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
- "extraneous": true,
- "dependencies": {
- "is-extendable": "^0.1.0"
- }
- },
- "node_modules/fsh-sushi/node_modules/snapdragon/node_modules/ms": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
- "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
- "extraneous": true
- },
- "node_modules/fsh-sushi/node_modules/snapdragon/node_modules/source-map": {
- "version": "0.5.7",
- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
- "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
- "extraneous": true
- },
- "node_modules/fsh-sushi/node_modules/source-map": {
- "version": "0.6.1",
- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
- "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
- "dev": true
- },
- "node_modules/fsh-sushi/node_modules/source-map-resolve": {
- "version": "0.5.3",
- "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
- "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
- "extraneous": true,
- "dependencies": {
- "atob": "^2.1.2",
- "decode-uri-component": "^0.2.0",
- "resolve-url": "^0.2.1",
- "source-map-url": "^0.4.0",
- "urix": "^0.1.0"
- }
- },
- "node_modules/fsh-sushi/node_modules/source-map-support": {
- "version": "0.5.19",
- "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
- "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
+ "node_modules/fsh-sushi/node_modules/source-map-support": {
+ "version": "0.5.19",
+ "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
+ "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
"extraneous": true,
"dependencies": {
"buffer-from": "^1.0.0",
"source-map": "^0.6.0"
}
},
- "node_modules/fsh-sushi/node_modules/source-map-url": {
- "version": "0.4.1",
- "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
- "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
- "extraneous": true
- },
"node_modules/fsh-sushi/node_modules/spdx-correct": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
@@ -8721,15 +7667,6 @@
"integrity": "sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==",
"extraneous": true
},
- "node_modules/fsh-sushi/node_modules/split-string": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
- "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
- "extraneous": true,
- "dependencies": {
- "extend-shallow": "^3.0.0"
- }
- },
"node_modules/fsh-sushi/node_modules/sprintf-js": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
@@ -8757,25 +7694,6 @@
"integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
"extraneous": true
},
- "node_modules/fsh-sushi/node_modules/static-extend": {
- "version": "0.1.2",
- "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
- "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
- "extraneous": true,
- "dependencies": {
- "define-property": "^0.2.5",
- "object-copy": "^0.1.0"
- }
- },
- "node_modules/fsh-sushi/node_modules/static-extend/node_modules/define-property": {
- "version": "0.2.5",
- "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
- "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
- "extraneous": true,
- "dependencies": {
- "is-descriptor": "^0.1.0"
- }
- },
"node_modules/fsh-sushi/node_modules/string_decoder": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
@@ -8936,6 +7854,46 @@
"integrity": "sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w==",
"extraneous": true
},
+ "node_modules/fsh-sushi/node_modules/through2": {
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+ "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+ "extraneous": true,
+ "dependencies": {
+ "readable-stream": "~2.3.6",
+ "xtend": "~4.0.1"
+ }
+ },
+ "node_modules/fsh-sushi/node_modules/through2/node_modules/readable-stream": {
+ "version": "2.3.7",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+ "extraneous": true,
+ "dependencies": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.3",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~2.0.0",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.1.1",
+ "util-deprecate": "~1.0.1"
+ }
+ },
+ "node_modules/fsh-sushi/node_modules/through2/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+ "extraneous": true
+ },
+ "node_modules/fsh-sushi/node_modules/through2/node_modules/string_decoder": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+ "extraneous": true,
+ "dependencies": {
+ "safe-buffer": "~5.1.0"
+ }
+ },
"node_modules/fsh-sushi/node_modules/title-case": {
"version": "3.0.3",
"resolved": "https://registry.npmjs.org/title-case/-/title-case-3.0.3.tgz",
@@ -8957,64 +7915,6 @@
"integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
"extraneous": true
},
- "node_modules/fsh-sushi/node_modules/to-object-path": {
- "version": "0.3.0",
- "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
- "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
- "extraneous": true,
- "dependencies": {
- "kind-of": "^3.0.2"
- }
- },
- "node_modules/fsh-sushi/node_modules/to-object-path/node_modules/kind-of": {
- "version": "3.2.2",
- "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
- "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
- "extraneous": true,
- "dependencies": {
- "is-buffer": "^1.1.5"
- }
- },
- "node_modules/fsh-sushi/node_modules/to-regex": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
- "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
- "extraneous": true,
- "dependencies": {
- "define-property": "^2.0.2",
- "extend-shallow": "^3.0.2",
- "regex-not": "^1.0.2",
- "safe-regex": "^1.1.0"
- }
- },
- "node_modules/fsh-sushi/node_modules/to-regex-range": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
- "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
- "extraneous": true,
- "dependencies": {
- "is-number": "^3.0.0",
- "repeat-string": "^1.6.1"
- }
- },
- "node_modules/fsh-sushi/node_modules/to-regex-range/node_modules/is-number": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
- "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
- "extraneous": true,
- "dependencies": {
- "kind-of": "^3.0.2"
- }
- },
- "node_modules/fsh-sushi/node_modules/to-regex-range/node_modules/kind-of": {
- "version": "3.2.2",
- "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
- "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
- "extraneous": true,
- "dependencies": {
- "is-buffer": "^1.1.5"
- }
- },
"node_modules/fsh-sushi/node_modules/tough-cookie": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
@@ -9161,58 +8061,16 @@
"integrity": "sha512-rRprLwl8RVaS+Qvx3Wh5hPfPBn9++G6xkGlUupya0s5aDmNjI7z3lnRLB3u7sN4OmbB0pWgzhM9BEJyiWAwtAA==",
"dev": true
},
- "node_modules/fsh-sushi/node_modules/union-value": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
- "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
- "extraneous": true,
- "dependencies": {
- "arr-union": "^3.1.0",
- "get-value": "^2.0.6",
- "is-extendable": "^0.1.1",
- "set-value": "^2.0.1"
- }
- },
"node_modules/fsh-sushi/node_modules/universalify": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
"integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
"dev": true
},
- "node_modules/fsh-sushi/node_modules/unset-value": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
- "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
- "extraneous": true,
- "dependencies": {
- "has-value": "^0.3.1",
- "isobject": "^3.0.0"
- }
- },
- "node_modules/fsh-sushi/node_modules/unset-value/node_modules/has-value": {
- "version": "0.3.1",
- "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
- "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
- "extraneous": true,
- "dependencies": {
- "get-value": "^2.0.3",
- "has-values": "^0.1.4",
- "isobject": "^2.0.0"
- }
- },
- "node_modules/fsh-sushi/node_modules/unset-value/node_modules/has-value/node_modules/isobject": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
- "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
- "extraneous": true,
- "dependencies": {
- "isarray": "1.0.0"
- }
- },
- "node_modules/fsh-sushi/node_modules/unset-value/node_modules/has-values": {
- "version": "0.1.4",
- "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
- "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
+ "node_modules/fsh-sushi/node_modules/untildify": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz",
+ "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==",
"extraneous": true
},
"node_modules/fsh-sushi/node_modules/upper-case": {
@@ -9230,18 +8088,6 @@
"punycode": "^2.1.0"
}
},
- "node_modules/fsh-sushi/node_modules/urix": {
- "version": "0.1.0",
- "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
- "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
- "extraneous": true
- },
- "node_modules/fsh-sushi/node_modules/use": {
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
- "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
- "extraneous": true
- },
"node_modules/fsh-sushi/node_modules/utf8-byte-length": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz",
@@ -9471,6 +8317,12 @@
"integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
"extraneous": true
},
+ "node_modules/fsh-sushi/node_modules/xtend": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+ "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+ "extraneous": true
+ },
"node_modules/fsh-sushi/node_modules/yallist": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
@@ -9571,9 +8423,9 @@
},
"dependencies": {
"fsh-sushi": {
- "version": "2.2.6",
- "resolved": "https://registry.npmjs.org/fsh-sushi/-/fsh-sushi-2.2.6.tgz",
- "integrity": "sha512-FPsOZaWVGrX+Ai+Y49ravrpDkXYoRhxiGjZ1xiV3++VVwP7ZM+CUQP2zP2G5Ieag5C7hWy7vzT6ul8SyEQUT9w==",
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/fsh-sushi/-/fsh-sushi-2.3.0.tgz",
+ "integrity": "sha512-ewb/TI7UobWC1XZXaoLvVSxN6qzv1sBwhVnUxNkDJXFJTtYeZey2gudxCYi7/AqnKjF9uhIdsC2lwECA7i1iVw==",
"dev": true,
"requires": {
"antlr4": "~4.8.0",
@@ -11081,16 +9933,6 @@
}
}
},
- "@mrmlnc/readdir-enhanced": {
- "version": "2.2.1",
- "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz",
- "integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==",
- "extraneous": true,
- "requires": {
- "call-me-maybe": "^1.0.1",
- "glob-to-regexp": "^0.3.0"
- }
- },
"@nodelib/fs.scandir": {
"version": "2.1.4",
"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz",
@@ -11109,12 +9951,6 @@
}
}
},
- "@nodelib/fs.stat": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz",
- "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==",
- "extraneous": true
- },
"@nodelib/fs.walk": {
"version": "1.2.6",
"resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz",
@@ -11984,57 +10820,6 @@
"sprintf-js": "~1.0.2"
}
},
- "arr-diff": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
- "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
- "extraneous": true
- },
- "arr-flatten": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
- "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
- "extraneous": true
- },
- "arr-union": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
- "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
- "extraneous": true
- },
- "array-union": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
- "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
- "extraneous": true,
- "requires": {
- "array-uniq": "^1.0.1"
- }
- },
- "array-uniq": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
- "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
- "extraneous": true
- },
- "array-unique": {
- "version": "0.3.2",
- "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
- "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
- "extraneous": true
- },
- "arrify": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz",
- "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==",
- "extraneous": true
- },
- "assign-symbols": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
- "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
- "extraneous": true
- },
"async": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/async/-/async-3.2.0.tgz",
@@ -12047,12 +10832,6 @@
"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
"extraneous": true
},
- "atob": {
- "version": "2.1.2",
- "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
- "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
- "extraneous": true
- },
"axios": {
"version": "0.21.4",
"resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
@@ -12200,61 +10979,6 @@
"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
"dev": true
},
- "base": {
- "version": "0.11.2",
- "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
- "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
- "extraneous": true,
- "requires": {
- "cache-base": "^1.0.1",
- "class-utils": "^0.3.5",
- "component-emitter": "^1.2.1",
- "define-property": "^1.0.0",
- "isobject": "^3.0.1",
- "mixin-deep": "^1.2.0",
- "pascalcase": "^0.1.1"
- },
- "dependencies": {
- "define-property": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
- "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
- "extraneous": true,
- "requires": {
- "is-descriptor": "^1.0.0"
- }
- },
- "is-accessor-descriptor": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
- "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
- "extraneous": true,
- "requires": {
- "kind-of": "^6.0.0"
- }
- },
- "is-data-descriptor": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
- "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
- "extraneous": true,
- "requires": {
- "kind-of": "^6.0.0"
- }
- },
- "is-descriptor": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
- "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
- "extraneous": true,
- "requires": {
- "is-accessor-descriptor": "^1.0.0",
- "is-data-descriptor": "^1.0.0",
- "kind-of": "^6.0.2"
- }
- }
- }
- },
"brace-expansion": {
"version": "1.1.11",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -12265,35 +10989,6 @@
"concat-map": "0.0.1"
}
},
- "braces": {
- "version": "2.3.2",
- "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
- "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
- "extraneous": true,
- "requires": {
- "arr-flatten": "^1.1.0",
- "array-unique": "^0.3.2",
- "extend-shallow": "^2.0.1",
- "fill-range": "^4.0.0",
- "isobject": "^3.0.1",
- "repeat-element": "^1.1.2",
- "snapdragon": "^0.8.1",
- "snapdragon-node": "^2.0.1",
- "split-string": "^3.0.2",
- "to-regex": "^3.0.1"
- },
- "dependencies": {
- "extend-shallow": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
- "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
- "extraneous": true,
- "requires": {
- "is-extendable": "^0.1.0"
- }
- }
- }
- },
"browser-process-hrtime": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
@@ -12343,29 +11038,6 @@
"integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
"extraneous": true
},
- "cache-base": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
- "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
- "extraneous": true,
- "requires": {
- "collection-visit": "^1.0.0",
- "component-emitter": "^1.2.1",
- "get-value": "^2.0.6",
- "has-value": "^1.0.0",
- "isobject": "^3.0.1",
- "set-value": "^2.0.0",
- "to-object-path": "^0.3.0",
- "union-value": "^1.0.0",
- "unset-value": "^1.0.0"
- }
- },
- "call-me-maybe": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz",
- "integrity": "sha1-JtII6onje1y95gJQoV8DHBak1ms=",
- "extraneous": true
- },
"callsites": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
@@ -12439,29 +11111,6 @@
"integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==",
"extraneous": true
},
- "class-utils": {
- "version": "0.3.6",
- "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
- "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
- "extraneous": true,
- "requires": {
- "arr-union": "^3.1.0",
- "define-property": "^0.2.5",
- "isobject": "^3.0.0",
- "static-extend": "^0.1.1"
- },
- "dependencies": {
- "define-property": {
- "version": "0.2.5",
- "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
- "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
- "extraneous": true,
- "requires": {
- "is-descriptor": "^0.1.0"
- }
- }
- }
- },
"clean-css": {
"version": "4.2.3",
"resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz",
@@ -12511,16 +11160,6 @@
"integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==",
"extraneous": true
},
- "collection-visit": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
- "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
- "extraneous": true,
- "requires": {
- "map-visit": "^1.0.0",
- "object-visit": "^1.0.0"
- }
- },
"color": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/color/-/color-3.0.0.tgz",
@@ -12604,12 +11243,6 @@
"integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
"dev": true
},
- "component-emitter": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
- "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
- "extraneous": true
- },
"concat-map": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -12633,11 +11266,27 @@
}
}
},
- "copy-descriptor": {
- "version": "0.1.1",
- "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
- "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
- "extraneous": true
+ "copyfiles": {
+ "version": "https://registry.npmjs.org/copyfiles/-/copyfiles-2.4.1.tgz",
+ "integrity": "sha512-fereAvAvxDrQDOXybk3Qu3dPbOoKoysFMWtkY3mv5BsL8//OSZVL5DCLYqgRfY5cWirgRzlC+WSrxp6Bo3eNZg==",
+ "extraneous": true,
+ "requires": {
+ "glob": "^7.0.5",
+ "minimatch": "^3.0.3",
+ "mkdirp": "^1.0.4",
+ "noms": "0.0.0",
+ "through2": "^2.0.1",
+ "untildify": "^4.0.0",
+ "yargs": "^16.1.0"
+ },
+ "dependencies": {
+ "mkdirp": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+ "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+ "extraneous": true
+ }
+ }
},
"core-util-is": {
"version": "1.0.2",
@@ -12645,44 +11294,6 @@
"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
"dev": true
},
- "cp-file": {
- "version": "7.0.0",
- "resolved": "https://registry.npmjs.org/cp-file/-/cp-file-7.0.0.tgz",
- "integrity": "sha512-0Cbj7gyvFVApzpK/uhCtQ/9kE9UnYpxMzaq5nQQC/Dh4iaj5fxp7iEFIullrYwzj8nf0qnsI1Qsx34hAeAebvw==",
- "extraneous": true,
- "requires": {
- "graceful-fs": "^4.1.2",
- "make-dir": "^3.0.0",
- "nested-error-stacks": "^2.0.0",
- "p-event": "^4.1.0"
- }
- },
- "cpy": {
- "version": "8.1.2",
- "resolved": "https://registry.npmjs.org/cpy/-/cpy-8.1.2.tgz",
- "integrity": "sha512-dmC4mUesv0OYH2kNFEidtf/skUwv4zePmGeepjyyJ0qTo5+8KhA1o99oIAwVVLzQMAeDJml74d6wPPKb6EZUTg==",
- "extraneous": true,
- "requires": {
- "arrify": "^2.0.1",
- "cp-file": "^7.0.0",
- "globby": "^9.2.0",
- "has-glob": "^1.0.0",
- "junk": "^3.1.0",
- "nested-error-stacks": "^2.1.0",
- "p-all": "^2.1.0",
- "p-filter": "^2.1.0",
- "p-map": "^3.0.0"
- }
- },
- "cpy-cli": {
- "version": "https://registry.npmjs.org/cpy-cli/-/cpy-cli-3.1.1.tgz",
- "integrity": "sha512-HCpNdBkQy3rw+uARLuIf0YurqsMXYzBa9ihhSAuxYJcNIrqrSq3BstPfr0cQN38AdMrQiO9Dp4hYy7GtGJsLPg==",
- "extraneous": true,
- "requires": {
- "cpy": "^8.0.0",
- "meow": "^6.1.1"
- }
- },
"create-require": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
@@ -12791,12 +11402,6 @@
"integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==",
"extraneous": true
},
- "decode-uri-component": {
- "version": "0.2.0",
- "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
- "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
- "extraneous": true
- },
"dedent": {
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
@@ -12815,47 +11420,6 @@
"integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
"extraneous": true
},
- "define-property": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
- "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
- "extraneous": true,
- "requires": {
- "is-descriptor": "^1.0.2",
- "isobject": "^3.0.1"
- },
- "dependencies": {
- "is-accessor-descriptor": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
- "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
- "extraneous": true,
- "requires": {
- "kind-of": "^6.0.0"
- }
- },
- "is-data-descriptor": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
- "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
- "extraneous": true,
- "requires": {
- "kind-of": "^6.0.0"
- }
- },
- "is-descriptor": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
- "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
- "extraneous": true,
- "requires": {
- "is-accessor-descriptor": "^1.0.0",
- "is-data-descriptor": "^1.0.0",
- "kind-of": "^6.0.2"
- }
- }
- }
- },
"del": {
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/del/-/del-5.1.0.tgz",
@@ -13060,15 +11624,6 @@
"yargs": "^16.1.0"
}
},
- "dir-glob": {
- "version": "2.2.2",
- "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz",
- "integrity": "sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==",
- "extraneous": true,
- "requires": {
- "path-type": "^3.0.0"
- }
- },
"doctrine": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
@@ -13573,56 +12128,6 @@
"integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
"extraneous": true
},
- "expand-brackets": {
- "version": "2.1.4",
- "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
- "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
- "extraneous": true,
- "requires": {
- "debug": "^2.3.3",
- "define-property": "^0.2.5",
- "extend-shallow": "^2.0.1",
- "posix-character-classes": "^0.1.0",
- "regex-not": "^1.0.0",
- "snapdragon": "^0.8.1",
- "to-regex": "^3.0.1"
- },
- "dependencies": {
- "debug": {
- "version": "2.6.9",
- "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
- "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
- "extraneous": true,
- "requires": {
- "ms": "2.0.0"
- }
- },
- "define-property": {
- "version": "0.2.5",
- "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
- "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
- "extraneous": true,
- "requires": {
- "is-descriptor": "^0.1.0"
- }
- },
- "extend-shallow": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
- "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
- "extraneous": true,
- "requires": {
- "is-extendable": "^0.1.0"
- }
- },
- "ms": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
- "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
- "extraneous": true
- }
- }
- },
"expect": {
"version": "27.4.2",
"resolved": "https://registry.npmjs.org/expect/-/expect-27.4.2.tgz",
@@ -13694,92 +12199,6 @@
}
}
},
- "extend-shallow": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
- "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
- "extraneous": true,
- "requires": {
- "assign-symbols": "^1.0.0",
- "is-extendable": "^1.0.1"
- },
- "dependencies": {
- "is-extendable": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
- "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
- "extraneous": true,
- "requires": {
- "is-plain-object": "^2.0.4"
- }
- }
- }
- },
- "extglob": {
- "version": "2.0.4",
- "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
- "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
- "extraneous": true,
- "requires": {
- "array-unique": "^0.3.2",
- "define-property": "^1.0.0",
- "expand-brackets": "^2.1.4",
- "extend-shallow": "^2.0.1",
- "fragment-cache": "^0.2.1",
- "regex-not": "^1.0.0",
- "snapdragon": "^0.8.1",
- "to-regex": "^3.0.1"
- },
- "dependencies": {
- "define-property": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
- "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
- "extraneous": true,
- "requires": {
- "is-descriptor": "^1.0.0"
- }
- },
- "extend-shallow": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
- "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
- "extraneous": true,
- "requires": {
- "is-extendable": "^0.1.0"
- }
- },
- "is-accessor-descriptor": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
- "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
- "extraneous": true,
- "requires": {
- "kind-of": "^6.0.0"
- }
- },
- "is-data-descriptor": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
- "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
- "extraneous": true,
- "requires": {
- "kind-of": "^6.0.0"
- }
- },
- "is-descriptor": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
- "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
- "extraneous": true,
- "requires": {
- "is-accessor-descriptor": "^1.0.0",
- "is-data-descriptor": "^1.0.0",
- "kind-of": "^6.0.2"
- }
- }
- }
- },
"extract-zip": {
"version": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
"integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
@@ -13808,20 +12227,6 @@
"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
"extraneous": true
},
- "fast-glob": {
- "version": "2.2.7",
- "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz",
- "integrity": "sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==",
- "extraneous": true,
- "requires": {
- "@mrmlnc/readdir-enhanced": "^2.2.1",
- "@nodelib/fs.stat": "^1.1.2",
- "glob-parent": "^3.1.0",
- "is-glob": "^4.0.0",
- "merge2": "^1.2.3",
- "micromatch": "^3.1.10"
- }
- },
"fast-json-stable-stringify": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
@@ -13947,47 +12352,6 @@
"flat-cache": "^3.0.4"
}
},
- "fill-range": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
- "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
- "extraneous": true,
- "requires": {
- "extend-shallow": "^2.0.1",
- "is-number": "^3.0.0",
- "repeat-string": "^1.6.1",
- "to-regex-range": "^2.1.0"
- },
- "dependencies": {
- "extend-shallow": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
- "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
- "extraneous": true,
- "requires": {
- "is-extendable": "^0.1.0"
- }
- },
- "is-number": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
- "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
- "extraneous": true,
- "requires": {
- "kind-of": "^3.0.2"
- }
- },
- "kind-of": {
- "version": "3.2.2",
- "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
- "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
- "extraneous": true,
- "requires": {
- "is-buffer": "^1.1.5"
- }
- }
- }
- },
"find-up": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
@@ -14032,17 +12396,11 @@
"dev": true
},
"follow-redirects": {
- "version": "1.14.6",
- "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.6.tgz",
- "integrity": "sha512-fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A==",
+ "version": "1.14.9",
+ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz",
+ "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==",
"dev": true
},
- "for-in": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
- "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
- "extraneous": true
- },
"form-data": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
@@ -14054,15 +12412,6 @@
"mime-types": "^2.1.12"
}
},
- "fragment-cache": {
- "version": "0.2.1",
- "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
- "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
- "extraneous": true,
- "requires": {
- "map-cache": "^0.2.2"
- }
- },
"fs-extra": {
"version": "8.1.0",
"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
@@ -14140,12 +12489,6 @@
"pump": "^3.0.0"
}
},
- "get-value": {
- "version": "2.0.6",
- "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
- "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
- "extraneous": true
- },
"glob": {
"version": "7.1.7",
"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
@@ -14160,33 +12503,6 @@
"path-is-absolute": "^1.0.0"
}
},
- "glob-parent": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
- "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
- "extraneous": true,
- "requires": {
- "is-glob": "^3.1.0",
- "path-dirname": "^1.0.0"
- },
- "dependencies": {
- "is-glob": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
- "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
- "extraneous": true,
- "requires": {
- "is-extglob": "^2.1.0"
- }
- }
- }
- },
- "glob-to-regexp": {
- "version": "0.3.0",
- "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz",
- "integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=",
- "extraneous": true
- },
"globals": {
"version": "13.12.0",
"resolved": "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz",
@@ -14204,22 +12520,6 @@
}
}
},
- "globby": {
- "version": "9.2.0",
- "resolved": "https://registry.npmjs.org/globby/-/globby-9.2.0.tgz",
- "integrity": "sha512-ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg==",
- "extraneous": true,
- "requires": {
- "@types/glob": "^7.1.1",
- "array-union": "^1.0.2",
- "dir-glob": "^2.2.2",
- "fast-glob": "^2.2.6",
- "glob": "^7.1.3",
- "ignore": "^4.0.3",
- "pify": "^4.0.1",
- "slash": "^2.0.0"
- }
- },
"graceful-fs": {
"version": "4.2.6",
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
@@ -14247,78 +12547,6 @@
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
"dev": true
},
- "has-glob": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/has-glob/-/has-glob-1.0.0.tgz",
- "integrity": "sha1-mqqe7b/7G6OZCnsAEPtnjuAIEgc=",
- "extraneous": true,
- "requires": {
- "is-glob": "^3.0.0"
- },
- "dependencies": {
- "is-glob": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
- "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
- "extraneous": true,
- "requires": {
- "is-extglob": "^2.1.0"
- }
- }
- }
- },
- "has-value": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
- "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
- "extraneous": true,
- "requires": {
- "get-value": "^2.0.6",
- "has-values": "^1.0.0",
- "isobject": "^3.0.0"
- }
- },
- "has-values": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
- "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
- "extraneous": true,
- "requires": {
- "is-number": "^3.0.0",
- "kind-of": "^4.0.0"
- },
- "dependencies": {
- "is-number": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
- "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
- "extraneous": true,
- "requires": {
- "kind-of": "^3.0.2"
- },
- "dependencies": {
- "kind-of": {
- "version": "3.2.2",
- "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
- "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
- "extraneous": true,
- "requires": {
- "is-buffer": "^1.1.5"
- }
- }
- }
- },
- "kind-of": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
- "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
- "extraneous": true,
- "requires": {
- "is-buffer": "^1.1.5"
- }
- }
- }
- },
"he": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
@@ -14489,38 +12717,12 @@
"integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
"dev": true
},
- "is-accessor-descriptor": {
- "version": "0.1.6",
- "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
- "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
- "extraneous": true,
- "requires": {
- "kind-of": "^3.0.2"
- },
- "dependencies": {
- "kind-of": {
- "version": "3.2.2",
- "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
- "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
- "extraneous": true,
- "requires": {
- "is-buffer": "^1.1.5"
- }
- }
- }
- },
"is-arrayish": {
"version": "0.3.2",
"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
"integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==",
"dev": true
},
- "is-buffer": {
- "version": "1.1.6",
- "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
- "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
- "extraneous": true
- },
"is-core-module": {
"version": "2.4.0",
"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.4.0.tgz",
@@ -14530,57 +12732,12 @@
"has": "^1.0.3"
}
},
- "is-data-descriptor": {
- "version": "0.1.4",
- "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
- "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
- "extraneous": true,
- "requires": {
- "kind-of": "^3.0.2"
- },
- "dependencies": {
- "kind-of": {
- "version": "3.2.2",
- "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
- "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
- "extraneous": true,
- "requires": {
- "is-buffer": "^1.1.5"
- }
- }
- }
- },
- "is-descriptor": {
- "version": "0.1.6",
- "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
- "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
- "extraneous": true,
- "requires": {
- "is-accessor-descriptor": "^0.1.6",
- "is-data-descriptor": "^0.1.4",
- "kind-of": "^5.0.0"
- },
- "dependencies": {
- "kind-of": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
- "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
- "extraneous": true
- }
- }
- },
"is-docker": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
"integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
"extraneous": true
},
- "is-extendable": {
- "version": "0.1.1",
- "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
- "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
- "extraneous": true
- },
"is-extglob": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
@@ -14632,15 +12789,6 @@
"integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
"extraneous": true
},
- "is-plain-object": {
- "version": "2.0.4",
- "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
- "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
- "extraneous": true,
- "requires": {
- "isobject": "^3.0.1"
- }
- },
"is-potential-custom-element-name": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
@@ -14659,12 +12807,6 @@
"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
"extraneous": true
},
- "is-windows": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
- "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
- "extraneous": true
- },
"is-wsl": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
@@ -14686,12 +12828,6 @@
"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
"extraneous": true
},
- "isobject": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
- "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
- "extraneous": true
- },
"istanbul-lib-coverage": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
@@ -17224,27 +15360,12 @@
"tmpl": "1.0.5"
}
},
- "map-cache": {
- "version": "0.2.2",
- "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
- "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
- "extraneous": true
- },
"map-obj": {
"version": "4.2.1",
"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.2.1.tgz",
"integrity": "sha512-+WA2/1sPmDj1dlvvJmB5G6JKfY9dpn7EVBUL06+y6PoljPkh+6V1QihwxNkbcGxCRjt2b0F9K0taiCuo7MbdFQ==",
"extraneous": true
},
- "map-visit": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
- "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
- "extraneous": true,
- "requires": {
- "object-visit": "^1.0.0"
- }
- },
"math-random": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz",
@@ -17282,27 +15403,6 @@
"integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
"extraneous": true
},
- "micromatch": {
- "version": "3.1.10",
- "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
- "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
- "extraneous": true,
- "requires": {
- "arr-diff": "^4.0.0",
- "array-unique": "^0.3.2",
- "braces": "^2.3.1",
- "define-property": "^2.0.2",
- "extend-shallow": "^3.0.2",
- "extglob": "^2.0.4",
- "fragment-cache": "^0.2.1",
- "kind-of": "^6.0.2",
- "nanomatch": "^1.2.9",
- "object.pick": "^1.3.0",
- "regex-not": "^1.0.0",
- "snapdragon": "^0.8.1",
- "to-regex": "^3.0.2"
- }
- },
"mime-db": {
"version": "1.51.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz",
@@ -17383,27 +15483,6 @@
"yallist": "^4.0.0"
}
},
- "mixin-deep": {
- "version": "1.3.2",
- "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
- "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
- "extraneous": true,
- "requires": {
- "for-in": "^1.0.2",
- "is-extendable": "^1.0.1"
- },
- "dependencies": {
- "is-extendable": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
- "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
- "extraneous": true,
- "requires": {
- "is-plain-object": "^2.0.4"
- }
- }
- }
- },
"mkdirp": {
"version": "0.5.5",
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
@@ -17419,37 +15498,12 @@
"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
"dev": true
},
- "nanomatch": {
- "version": "1.2.13",
- "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
- "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
- "extraneous": true,
- "requires": {
- "arr-diff": "^4.0.0",
- "array-unique": "^0.3.2",
- "define-property": "^2.0.2",
- "extend-shallow": "^3.0.2",
- "fragment-cache": "^0.2.1",
- "is-windows": "^1.0.2",
- "kind-of": "^6.0.2",
- "object.pick": "^1.3.0",
- "regex-not": "^1.0.0",
- "snapdragon": "^0.8.1",
- "to-regex": "^3.0.1"
- }
- },
"natural-compare": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
"integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
"extraneous": true
},
- "nested-error-stacks": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-2.1.0.tgz",
- "integrity": "sha512-AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug==",
- "extraneous": true
- },
"nice-try": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
@@ -17466,10 +15520,37 @@
}
},
"node-fetch": {
- "version": "2.6.1",
- "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
- "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
- "extraneous": true
+ "version": "2.6.7",
+ "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+ "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+ "extraneous": true,
+ "requires": {
+ "whatwg-url": "^5.0.0"
+ },
+ "dependencies": {
+ "tr46": {
+ "version": "0.0.3",
+ "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+ "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=",
+ "extraneous": true
+ },
+ "webidl-conversions": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+ "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=",
+ "extraneous": true
+ },
+ "whatwg-url": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+ "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
+ "extraneous": true,
+ "requires": {
+ "tr46": "~0.0.3",
+ "webidl-conversions": "^3.0.0"
+ }
+ }
+ }
},
"node-int64": {
"version": "0.4.0",
@@ -17483,6 +15564,42 @@
"integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==",
"extraneous": true
},
+ "noms": {
+ "version": "0.0.0",
+ "resolved": "https://registry.npmjs.org/noms/-/noms-0.0.0.tgz",
+ "integrity": "sha1-2o69nzr51nYJGbJ9nNyAkqczKFk=",
+ "extraneous": true,
+ "requires": {
+ "inherits": "^2.0.1",
+ "readable-stream": "~1.0.31"
+ },
+ "dependencies": {
+ "isarray": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+ "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+ "extraneous": true
+ },
+ "readable-stream": {
+ "version": "1.0.34",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+ "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+ "extraneous": true,
+ "requires": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.1",
+ "isarray": "0.0.1",
+ "string_decoder": "~0.10.x"
+ }
+ },
+ "string_decoder": {
+ "version": "0.10.31",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+ "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+ "extraneous": true
+ }
+ }
+ },
"nopt": {
"version": "1.0.10",
"resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz",
@@ -17533,55 +15650,6 @@
"integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==",
"extraneous": true
},
- "object-copy": {
- "version": "0.1.0",
- "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
- "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
- "extraneous": true,
- "requires": {
- "copy-descriptor": "^0.1.0",
- "define-property": "^0.2.5",
- "kind-of": "^3.0.3"
- },
- "dependencies": {
- "define-property": {
- "version": "0.2.5",
- "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
- "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
- "extraneous": true,
- "requires": {
- "is-descriptor": "^0.1.0"
- }
- },
- "kind-of": {
- "version": "3.2.2",
- "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
- "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
- "extraneous": true,
- "requires": {
- "is-buffer": "^1.1.5"
- }
- }
- }
- },
- "object-visit": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
- "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
- "extraneous": true,
- "requires": {
- "isobject": "^3.0.0"
- }
- },
- "object.pick": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
- "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
- "extraneous": true,
- "requires": {
- "isobject": "^3.0.1"
- }
- },
"once": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -17638,49 +15706,6 @@
"word-wrap": "~1.2.3"
}
},
- "p-all": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/p-all/-/p-all-2.1.0.tgz",
- "integrity": "sha512-HbZxz5FONzz/z2gJfk6bFca0BCiSRF8jU3yCsWOen/vR6lZjfPOu/e7L3uFzTW1i0H8TlC3vqQstEJPQL4/uLA==",
- "extraneous": true,
- "requires": {
- "p-map": "^2.0.0"
- },
- "dependencies": {
- "p-map": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
- "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
- "extraneous": true
- }
- }
- },
- "p-event": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/p-event/-/p-event-4.2.0.tgz",
- "integrity": "sha512-KXatOjCRXXkSePPb1Nbi0p0m+gQAwdlbhi4wQKJPI1HsMQS9g+Sqp2o+QHziPr7eYJyOZet836KoHEVM1mwOrQ==",
- "extraneous": true,
- "requires": {
- "p-timeout": "^3.1.0"
- }
- },
- "p-filter": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/p-filter/-/p-filter-2.1.0.tgz",
- "integrity": "sha512-ZBxxZ5sL2HghephhpGAQdoskxplTwr7ICaehZwLIlfL6acuVgZPm8yBNuRAFBGEqtD/hmUeq9eqLg2ys9Xr/yw==",
- "extraneous": true,
- "requires": {
- "p-map": "^2.0.0"
- },
- "dependencies": {
- "p-map": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
- "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
- "extraneous": true
- }
- }
- },
"p-finally": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
@@ -17714,15 +15739,6 @@
"aggregate-error": "^3.0.0"
}
},
- "p-timeout": {
- "version": "3.2.0",
- "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz",
- "integrity": "sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==",
- "extraneous": true,
- "requires": {
- "p-finally": "^1.0.0"
- }
- },
"p-try": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
@@ -17765,18 +15781,6 @@
"integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
"extraneous": true
},
- "pascalcase": {
- "version": "0.1.1",
- "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
- "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
- "extraneous": true
- },
- "path-dirname": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
- "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
- "extraneous": true
- },
"path-exists": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
@@ -17801,23 +15805,6 @@
"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
"extraneous": true
},
- "path-type": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
- "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
- "extraneous": true,
- "requires": {
- "pify": "^3.0.0"
- },
- "dependencies": {
- "pify": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
- "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
- "extraneous": true
- }
- }
- },
"pend": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
@@ -17836,12 +15823,6 @@
"integrity": "sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==",
"extraneous": true
},
- "pify": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
- "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
- "extraneous": true
- },
"pirates": {
"version": "4.0.4",
"resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.4.tgz",
@@ -17857,12 +15838,6 @@
"find-up": "^4.0.0"
}
},
- "posix-character-classes": {
- "version": "0.1.1",
- "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
- "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
- "extraneous": true
- },
"prelude-ls": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
@@ -18025,16 +16000,6 @@
"strip-indent": "^3.0.0"
}
},
- "regex-not": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
- "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
- "extraneous": true,
- "requires": {
- "extend-shallow": "^3.0.2",
- "safe-regex": "^1.1.0"
- }
- },
"regexpp": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
@@ -18047,18 +16012,6 @@
"integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=",
"dev": true
},
- "repeat-element": {
- "version": "1.1.4",
- "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz",
- "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==",
- "extraneous": true
- },
- "repeat-string": {
- "version": "1.6.1",
- "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
- "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
- "extraneous": true
- },
"require-directory": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -18098,24 +16051,12 @@
"integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
"extraneous": true
},
- "resolve-url": {
- "version": "0.2.1",
- "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
- "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
- "extraneous": true
- },
"resolve.exports": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.0.tgz",
"integrity": "sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==",
"extraneous": true
},
- "ret": {
- "version": "0.1.15",
- "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
- "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
- "extraneous": true
- },
"reusify": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
@@ -18146,15 +16087,6 @@
"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
"dev": true
},
- "safe-regex": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
- "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
- "extraneous": true,
- "requires": {
- "ret": "~0.1.10"
- }
- },
"safer-buffer": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
@@ -18194,29 +16126,6 @@
"lru-cache": "^6.0.0"
}
},
- "set-value": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
- "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
- "extraneous": true,
- "requires": {
- "extend-shallow": "^2.0.1",
- "is-extendable": "^0.1.1",
- "is-plain-object": "^2.0.3",
- "split-string": "^3.0.1"
- },
- "dependencies": {
- "extend-shallow": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
- "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
- "extraneous": true,
- "requires": {
- "is-extendable": "^0.1.0"
- }
- }
- }
- },
"shebang-command": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
@@ -18253,159 +16162,12 @@
"integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
"extraneous": true
},
- "slash": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
- "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
- "extraneous": true
- },
- "snapdragon": {
- "version": "0.8.2",
- "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
- "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
- "extraneous": true,
- "requires": {
- "base": "^0.11.1",
- "debug": "^2.2.0",
- "define-property": "^0.2.5",
- "extend-shallow": "^2.0.1",
- "map-cache": "^0.2.2",
- "source-map": "^0.5.6",
- "source-map-resolve": "^0.5.0",
- "use": "^3.1.0"
- },
- "dependencies": {
- "debug": {
- "version": "2.6.9",
- "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
- "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
- "extraneous": true,
- "requires": {
- "ms": "2.0.0"
- }
- },
- "define-property": {
- "version": "0.2.5",
- "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
- "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
- "extraneous": true,
- "requires": {
- "is-descriptor": "^0.1.0"
- }
- },
- "extend-shallow": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
- "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
- "extraneous": true,
- "requires": {
- "is-extendable": "^0.1.0"
- }
- },
- "ms": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
- "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
- "extraneous": true
- },
- "source-map": {
- "version": "0.5.7",
- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
- "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
- "extraneous": true
- }
- }
- },
- "snapdragon-node": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
- "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
- "extraneous": true,
- "requires": {
- "define-property": "^1.0.0",
- "isobject": "^3.0.0",
- "snapdragon-util": "^3.0.1"
- },
- "dependencies": {
- "define-property": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
- "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
- "extraneous": true,
- "requires": {
- "is-descriptor": "^1.0.0"
- }
- },
- "is-accessor-descriptor": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
- "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
- "extraneous": true,
- "requires": {
- "kind-of": "^6.0.0"
- }
- },
- "is-data-descriptor": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
- "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
- "extraneous": true,
- "requires": {
- "kind-of": "^6.0.0"
- }
- },
- "is-descriptor": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
- "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
- "extraneous": true,
- "requires": {
- "is-accessor-descriptor": "^1.0.0",
- "is-data-descriptor": "^1.0.0",
- "kind-of": "^6.0.2"
- }
- }
- }
- },
- "snapdragon-util": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
- "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
- "extraneous": true,
- "requires": {
- "kind-of": "^3.2.0"
- },
- "dependencies": {
- "kind-of": {
- "version": "3.2.2",
- "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
- "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
- "extraneous": true,
- "requires": {
- "is-buffer": "^1.1.5"
- }
- }
- }
- },
"source-map": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
"dev": true
},
- "source-map-resolve": {
- "version": "0.5.3",
- "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
- "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
- "extraneous": true,
- "requires": {
- "atob": "^2.1.2",
- "decode-uri-component": "^0.2.0",
- "resolve-url": "^0.2.1",
- "source-map-url": "^0.4.0",
- "urix": "^0.1.0"
- }
- },
"source-map-support": {
"version": "0.5.19",
"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
@@ -18416,12 +16178,6 @@
"source-map": "^0.6.0"
}
},
- "source-map-url": {
- "version": "0.4.1",
- "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
- "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
- "extraneous": true
- },
"spdx-correct": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
@@ -18454,15 +16210,6 @@
"integrity": "sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==",
"extraneous": true
},
- "split-string": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
- "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
- "extraneous": true,
- "requires": {
- "extend-shallow": "^3.0.0"
- }
- },
"sprintf-js": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
@@ -18492,27 +16239,6 @@
}
}
},
- "static-extend": {
- "version": "0.1.2",
- "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
- "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
- "extraneous": true,
- "requires": {
- "define-property": "^0.2.5",
- "object-copy": "^0.1.0"
- },
- "dependencies": {
- "define-property": {
- "version": "0.2.5",
- "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
- "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
- "extraneous": true,
- "requires": {
- "is-descriptor": "^0.1.0"
- }
- }
- }
- },
"string_decoder": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
@@ -18673,6 +16399,48 @@
"integrity": "sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w==",
"extraneous": true
},
+ "through2": {
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+ "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+ "extraneous": true,
+ "requires": {
+ "readable-stream": "~2.3.6",
+ "xtend": "~4.0.1"
+ },
+ "dependencies": {
+ "readable-stream": {
+ "version": "2.3.7",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+ "extraneous": true,
+ "requires": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.3",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~2.0.0",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.1.1",
+ "util-deprecate": "~1.0.1"
+ }
+ },
+ "safe-buffer": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+ "extraneous": true
+ },
+ "string_decoder": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+ "extraneous": true,
+ "requires": {
+ "safe-buffer": "~5.1.0"
+ }
+ }
+ }
+ },
"title-case": {
"version": "3.0.3",
"resolved": "https://registry.npmjs.org/title-case/-/title-case-3.0.3.tgz",
@@ -18694,68 +16462,6 @@
"integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
"extraneous": true
},
- "to-object-path": {
- "version": "0.3.0",
- "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
- "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
- "extraneous": true,
- "requires": {
- "kind-of": "^3.0.2"
- },
- "dependencies": {
- "kind-of": {
- "version": "3.2.2",
- "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
- "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
- "extraneous": true,
- "requires": {
- "is-buffer": "^1.1.5"
- }
- }
- }
- },
- "to-regex": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
- "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
- "extraneous": true,
- "requires": {
- "define-property": "^2.0.2",
- "extend-shallow": "^3.0.2",
- "regex-not": "^1.0.2",
- "safe-regex": "^1.1.0"
- }
- },
- "to-regex-range": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
- "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
- "extraneous": true,
- "requires": {
- "is-number": "^3.0.0",
- "repeat-string": "^1.6.1"
- },
- "dependencies": {
- "is-number": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
- "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
- "extraneous": true,
- "requires": {
- "kind-of": "^3.0.2"
- }
- },
- "kind-of": {
- "version": "3.2.2",
- "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
- "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
- "extraneous": true,
- "requires": {
- "is-buffer": "^1.1.5"
- }
- }
- }
- },
"tough-cookie": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
@@ -18905,63 +16611,17 @@
"integrity": "sha512-rRprLwl8RVaS+Qvx3Wh5hPfPBn9++G6xkGlUupya0s5aDmNjI7z3lnRLB3u7sN4OmbB0pWgzhM9BEJyiWAwtAA==",
"dev": true
},
- "union-value": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
- "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
- "extraneous": true,
- "requires": {
- "arr-union": "^3.1.0",
- "get-value": "^2.0.6",
- "is-extendable": "^0.1.1",
- "set-value": "^2.0.1"
- }
- },
"universalify": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
"integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
"dev": true
},
- "unset-value": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
- "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
- "extraneous": true,
- "requires": {
- "has-value": "^0.3.1",
- "isobject": "^3.0.0"
- },
- "dependencies": {
- "has-value": {
- "version": "0.3.1",
- "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
- "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
- "extraneous": true,
- "requires": {
- "get-value": "^2.0.3",
- "has-values": "^0.1.4",
- "isobject": "^2.0.0"
- },
- "dependencies": {
- "isobject": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
- "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
- "extraneous": true,
- "requires": {
- "isarray": "1.0.0"
- }
- }
- }
- },
- "has-values": {
- "version": "0.1.4",
- "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
- "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
- "extraneous": true
- }
- }
+ "untildify": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz",
+ "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==",
+ "extraneous": true
},
"upper-case": {
"version": "1.1.3",
@@ -18978,18 +16638,6 @@
"punycode": "^2.1.0"
}
},
- "urix": {
- "version": "0.1.0",
- "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
- "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
- "extraneous": true
- },
- "use": {
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
- "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
- "extraneous": true
- },
"utf8-byte-length": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz",
@@ -19223,6 +16871,12 @@
"integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
"extraneous": true
},
+ "xtend": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+ "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+ "extraneous": true
+ },
"yallist": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
From 4866063f39a98ed120ffaa0b395291ed4992fdb6 Mon Sep 17 00:00:00 2001
From: Stuart Cox <22485529+coxstuart@users.noreply.github.com>
Date: Mon, 25 Apr 2022 08:29:40 -0500
Subject: [PATCH 03/14] Issued #76 - Remove artifactory references from POM
dependencies
Signed-off-by: Stuart Cox <22485529+coxstuart@users.noreply.github.com>
---
pom.xml | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/pom.xml b/pom.xml
index 84b26cce8d..3976374b63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,18 +23,6 @@
-
-
- ibm-fhir-releases
- IBM FHIR Repository
- https://na.artifactory.swg-devops.com:443/artifactory/wh-fhir-server-releases-maven-local
-
-
- ibm-fhir-snapshots
- IBM FHIR Repository
- https://na.artifactory.swg-devops.com:443/artifactory/wh-fhir-server-snapshots-maven-local
-
-
com.ibm.fhir
From a212bacf54fe5adb4a132afa709a11913ad792fb Mon Sep 17 00:00:00 2001
From: Stuart Cox <22485529+coxstuart@users.noreply.github.com>
Date: Mon, 9 May 2022 16:32:47 -0500
Subject: [PATCH 04/14] Issue #77 - Remove IBM branding, replaced IBM text with
HDC
Signed-off-by: Stuart Cox <22485529+coxstuart@users.noreply.github.com>
---
README.md | 3 +--
data/input/fsh/elements/ProcessMeta.fsh | 8 ++++----
.../resources/appointment/CDM_Apppointment.fsh | 2 +-
.../fsh/resources/careplan/CDM_CarePlan.fsh | 2 +-
.../communication/CDM_Communication.fsh | 2 +-
.../communication/CDM_CommunicationRequest.fsh | 2 +-
.../Engagement_CommunicationRequest_Instance.fsh | 10 +++++-----
.../Engagement_Communication_Instance.fsh | 8 ++++----
.../fsh/resources/condition/CDM_Condition.fsh | 2 +-
.../detected-issue/CDM_DetectedIssue.fsh | 2 +-
.../CareGapDetectedIssue_Instance.fsh | 6 +++---
.../resources/eligibility/CDM_Eligibility.fsh | 2 +-
.../resources/eligibility/CDM_InsurancePlan.fsh | 2 +-
.../fsh/resources/encounter/CDM_Encounter.fsh | 2 +-
.../fsh/resources/initiative/FFV_Initiative.fsh | 2 +-
data/input/fsh/resources/library/CDM_Library.fsh | 2 +-
.../resources/library/CDM_Library_Instance.fsh | 2 +-
.../fsh/resources/location/CDM_Location.fsh | 2 +-
.../location/CDM_MatchLocation_Instance.fsh | 8 ++++----
.../CDM_MatchLocation_Source_EMR1_LocationA.fsh | 2 +-
.../CDM_MatchLocation_Source_EMR2_LocationB.fsh | 2 +-
.../resources/observation/CDM_Observation.fsh | 2 +-
.../observation/MeasurePopulationObservation.fsh | 2 +-
...urePopulationObservation_CareGap_Instance.fsh | 8 ++++----
...ePopulationObservation_Numerator_Instance.fsh | 8 ++++----
.../resources/organization/CDM_Organization.fsh | 2 +-
...nization_IBM.fsh => CDM_Organization_HDC.fsh} | 10 +++++-----
.../patient/CDM_MatchPatient_Instance.fsh | 12 ++++++------
.../CDM_MatchPatient_Source_EMR1_PatientA.fsh | 2 +-
.../CDM_MatchPatient_Source_EMR2_PatientB.fsh | 2 +-
.../CDM_MatchPatient_Source_EMR2_PatientC.fsh | 2 +-
.../CDM_MatchPatient_Source_EMR3_PatientD.fsh | 2 +-
data/input/fsh/resources/patient/CDM_Patient.fsh | 2 +-
.../patient/CDM_Patient_Attributed_Instance.fsh | 16 ++++++++--------
.../CDM_Patient_DoNotContact_Instance.fsh | 2 +-
.../resources/patient/CDM_Patient_Instance.fsh | 2 +-
data/input/fsh/resources/person/CDM_Person.fsh | 2 +-
.../CDM_MatchPractioner_Instance.fsh | 8 ++++----
...M_MatchPractitioner_Source_EMR1_ProviderA.fsh | 2 +-
...M_MatchPractitioner_Source_EMR2_ProviderB.fsh | 2 +-
.../resources/practitioner/CDM_Practitioner.fsh | 2 +-
.../practitioner/CDM_PractitionerRole.fsh | 11 +++++------
...M_PractitionerRole_AdvImputedPCP_Instance.fsh | 4 ++--
...M_PractitionerRole_AttributedPCP_Instance.fsh | 4 ++--
.../practitioner/CDM_Practitioner_Bundle.fsh | 2 +-
.../fsh/resources/procedure/CDM_Procedure.fsh | 2 +-
.../CDM_OrganizationAffiliation.fsh | 2 +-
.../QualityMeasurePatientReport_Instance.fsh | 6 +++---
.../QualityMeasurePractionerReport_Instance.fsh | 6 +++---
.../quality-measure/QualityMeasure_Instance.fsh | 8 ++++----
data/input/fsh/vocabulary/FFVSchedule.fsh | 4 ++--
.../input/fsh/vocabulary/IdentifierTypeCodes.fsh | 6 +++---
.../vocabulary/MajorDiagnosticCategoryCodes.fsh | 4 ++--
.../vocabulary/MeasurePopulationTypeCodes.fsh | 6 +++---
.../input/fsh/vocabulary/MeasureScoringCodes.fsh | 2 +-
data/input/fsh/vocabulary/PatientStatusCodes.fsh | 2 +-
.../input/fsh/vocabulary/ProcedureGroupCodes.fsh | 4 ++--
.../input/fsh/vocabulary/RxMailOrRetailCodes.fsh | 4 ++--
.../fsh/vocabulary/WHPayerClaimStatusCodes.fsh | 4 ++--
.../input/fsh/vocabulary/WhClaimSubtypeCodes.fsh | 4 ++--
.../fsh/vocabulary/WhDiagnosisTypeCodes.fsh | 4 ++--
.../WhPayerClaimAdjustmentTypeCodes.fsh | 4 ++--
.../fsh/vocabulary/WhPayerClaimTypeCodes.fsh | 4 ++--
.../fsh/vocabulary/WhPayerCoverageClassCodes.fsh | 4 ++--
.../vocabulary/WhPayerEducationLevelCodes.fsh | 4 ++--
.../vocabulary/WhPayerEmployeeStatusCodes.fsh | 4 ++--
data/input/fsh/vocabulary/WhPayerGenderCodes.fsh | 4 ++--
.../fsh/vocabulary/WhPayerIndicatorsCodes.fsh | 4 ++--
.../fsh/vocabulary/WhPayerJobTitleCodes.fsh | 2 +-
.../vocabulary/WhPayerMedicareCoverageCodes.fsh | 4 ++--
.../WhPayerMedicationKnowledgeCostType.fsh | 4 ++--
.../fsh/vocabulary/WhPayerProviderTypeCodes.fsh | 6 +++---
.../WhPayerSubscriberRelationshipCodes.fsh | 4 ++--
data/input/pagecontent/index.md | 5 ++---
74 files changed, 151 insertions(+), 154 deletions(-)
rename data/input/fsh/resources/organization/{CDM_Organization_IBM.fsh => CDM_Organization_HDC.fsh} (67%)
diff --git a/README.md b/README.md
index ecdb971cf0..f98254eb64 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
## Introduction
-To build upon FHIR standards, IBM® Watson Health has developed IBM® Health Data Connect. This Common Data Model Implementation Guide supports Health Data Connect data interoperability for a cross-section of healthcare use cases, and refers to the model defined by this implementation guide as the IBM Health Data Connect Common Data Model.
+To build upon FHIR standards, this Whole Health Common Data Model Implementation Guide supports Health Data Connect data interoperability for a cross-section of healthcare use cases, and refers to the model defined by this implementation guide as the Health Data Connect Common Data Model.
The Common Data Model extends the industry-standard, base FHIR specification to support the data model requirements needed by healthcare data platform base capabilities, for example, data lineage and resource matching. In addition, the Common Data Model adds elements to support higher-level value that can be driven by a healthcare data platform, including claims data enrichment, care gap analytics, and patient engagement.
@@ -92,7 +92,6 @@ You must have git configured for signed-by commmits. See [CONTRIBUTING.md](CONT
## License
FHIR® is the registered trademark of HL7 and is used with the permission of HL7. Use of the FHIR trademark does not constitute endorsement of this product by HL7.
-IBM and the IBM logo are trademarks of International Business Machines Corporation, registered in many jurisdictions worldwide. Other product and service names might be trademarks of IBM or other companies. A current list of IBM trademarks is available on [https://ibm.com/trademark](https://ibm.com/trademark).
## Release History
diff --git a/data/input/fsh/elements/ProcessMeta.fsh b/data/input/fsh/elements/ProcessMeta.fsh
index b31c8549b6..71e1e370d6 100644
--- a/data/input/fsh/elements/ProcessMeta.fsh
+++ b/data/input/fsh/elements/ProcessMeta.fsh
@@ -18,11 +18,11 @@ Description: "Data lineage meta with process extensions"
* extension contains ProcessOrganization named processOrganization 0..1
* extension[processOrganization] ^short = "The organizing entity that owns the process that has produced the data held in the FHIR resource or element"
-* extension[processOrganization] ^definition = "The organizing entity that owns the process that has produced the data held in the FHIR resource or element. Example: If an IBM analytic service has been the producer, the process-organization value is IBM."
+* extension[processOrganization] ^definition = "The organizing entity that owns the process that has produced the data held in the FHIR resource or element. Example: If an analytic service has been the producer, the process-organization value should reflect the organaization reponsible for the service."
* extension contains ProcessName named processName 0..1
* extension[processName] ^short = "The name of the process or service that has produced the data held in the FHIR resource or element"
-* extension[processName] ^definition = "The name of the process or service that has produced the data held in the FHIR resource or element. Example: If an IBM analytic service has been the producer, use the process-name as the name of that analytic service."
+* extension[processName] ^definition = "The name of the process or service that has produced the data held in the FHIR resource or element. Example: If an analytic service has been the producer, use the process-name as the name of that analytic service."
* extension contains ProcessVersion named processVersion 0..1
* extension[processVersion] ^short = "The version of either the process or the service that has produced the data held in the FHIR resource or element"
@@ -102,13 +102,13 @@ Description: "The ID of the client as recorded in the data producer or data i
Extension: ProcessOrganization
Id: process-organization
Title: "Process Organization"
-Description: "The organizing entity that owns the process that has produced the data held in the FHIR resource or element. Example: If an IBM analytic service has been the producer, set the process-organization value to IBM."
+Description: "The organizing entity that owns the process that has produced the data held in the FHIR resource or element. Example: If an analytic service has been the producer, the process-organization value should reflect the organaization reponsible for the service."
* value[x] only string
Extension: ProcessName
Id: process-name
Title: "Process Name"
-Description: "The name of the process or service that has produced the data held in the FHIR resource or element. Example: If an IBM analytic service has been the producer, use the process-name as the name of that analytic service."
+Description: "The name of the process or service that has produced the data held in the FHIR resource or element. Example: If an analytic service has been the producer, use the process-name as the name of that analytic service."
* value[x] only string
Extension: ProcessVersion
diff --git a/data/input/fsh/resources/appointment/CDM_Apppointment.fsh b/data/input/fsh/resources/appointment/CDM_Apppointment.fsh
index 66c8cb5821..9f7b12c6e0 100644
--- a/data/input/fsh/resources/appointment/CDM_Apppointment.fsh
+++ b/data/input/fsh/resources/appointment/CDM_Apppointment.fsh
@@ -2,7 +2,7 @@ Profile: CDMAppointment
Parent: Appointment
Id: cdm-appointment
Title: "CDM Appointment"
-Description: "IBM Health Data Connect Common Data Model definition of what fields we currently define for an appointment"
+Description: "Health Data Connect Common Data Model definition of what fields we currently define for an appointment"
* contained 0..0
* meta only ProcessMeta
diff --git a/data/input/fsh/resources/careplan/CDM_CarePlan.fsh b/data/input/fsh/resources/careplan/CDM_CarePlan.fsh
index 084c0ffadc..33adebd0dc 100644
--- a/data/input/fsh/resources/careplan/CDM_CarePlan.fsh
+++ b/data/input/fsh/resources/careplan/CDM_CarePlan.fsh
@@ -2,7 +2,7 @@ Profile: CDMCarePlan
Parent: CarePlan
Id: cdm-careplan
Title: "CDM CarePlan"
-Description: "IBM Health Data Connect Common Data Model definition of what fields we currently define for a care plan"
+Description: "Health Data Connect Common Data Model definition of what fields we currently define for a care plan"
* contained 0..0
* meta only ProcessMeta
diff --git a/data/input/fsh/resources/communication/CDM_Communication.fsh b/data/input/fsh/resources/communication/CDM_Communication.fsh
index 3406c1f6de..0f549b19bd 100644
--- a/data/input/fsh/resources/communication/CDM_Communication.fsh
+++ b/data/input/fsh/resources/communication/CDM_Communication.fsh
@@ -2,7 +2,7 @@ Profile: CDMCommunication
Parent: Communication
Id: cdm-communication
Title: "CDM Communication"
-Description: "IBM Health Data Connect Common Data Model definition of what fields we currently define for a communication"
+Description: "Health Data Connect Common Data Model definition of what fields we currently define for a communication"
* contained 0..0
* meta only ProcessMeta
diff --git a/data/input/fsh/resources/communication/CDM_CommunicationRequest.fsh b/data/input/fsh/resources/communication/CDM_CommunicationRequest.fsh
index c2d0026e61..a6e973368f 100644
--- a/data/input/fsh/resources/communication/CDM_CommunicationRequest.fsh
+++ b/data/input/fsh/resources/communication/CDM_CommunicationRequest.fsh
@@ -2,7 +2,7 @@ Profile: CDMCommunicationRequest
Parent: CommunicationRequest
Id: cdm-communication-request
Title: "CDM CommunicationRequest"
-Description: "IBM Health Data Connect Common Data Model definition of what fields we currently define for a communication request"
+Description: "Health Data Connect Common Data Model definition of what fields we currently define for a communication request"
* contained 0..0
* meta only ProcessMeta
diff --git a/data/input/fsh/resources/communication/Engagement_CommunicationRequest_Instance.fsh b/data/input/fsh/resources/communication/Engagement_CommunicationRequest_Instance.fsh
index 6216f25615..feb799bc76 100644
--- a/data/input/fsh/resources/communication/Engagement_CommunicationRequest_Instance.fsh
+++ b/data/input/fsh/resources/communication/Engagement_CommunicationRequest_Instance.fsh
@@ -2,14 +2,14 @@ Instance: EngagementCommunicationRequestExample
InstanceOf: EngagementCommunicationRequest
Usage: #example
Title: "Engagement Communication Request Example"
-Description: "Example of an engagement communication request to send an Outreach text to a patient concerning a care gap"
+Description: "Example of an engagement communication request to send a SMS text to a patient concerning a care gap"
* meta.source = "http://ibm.com/fhir/engagement"
* meta.profile = "http://ibm.com/fhir/cdm/StructureDefinition/engagement-communication-request"
* meta.extension[tenantId].valueString = "99999"
* meta.extension[ingestionBatchId].valueString = "b069a545-9506-40c6-8498-23de2e189143"
-* meta.extension[processOrganization].valueString = "IBM"
+* meta.extension[processOrganization].valueString = "HDC"
* meta.extension[processType].valueString = "Engagement Communication"
* meta.extension[processName].valueString = "ATC"
* meta.extension[processVersion].valueString = "1.0"
@@ -19,7 +19,7 @@ Description: "Example of an engagement communication request to send an Outre
* identifier[0].type = IdentifierTypeCodeSystem#DRI
* identifier[0].system = "http://ibm.com/fhir/cdm/engagement-communication-request"
* identifier[0].value = "0bd930b0-e2fc-4967-957d-a6719ecde9b4"
-* identifier[0].assigner.display = "IBM"
+* identifier[0].assigner.display = "HDC"
* status = #completed
* statusReason = EngagementCommunicationRequestStatusReasonCodeSystem#request-complete "In-Process - Communication request complete"
@@ -59,7 +59,7 @@ Description: "Example of an engagement communication request to send an Outre
* occurrencePeriod.end = "2020-06-16T20:00:00Z"
* authoredOn = "2020-06-16T03:00:00Z"
-* requester = Reference(IBM)
+* requester = Reference(HDC)
* recipient = Reference(CDMPatientInstance)
-* sender = Reference(IBM)
+* sender = Reference(HDC)
* extension[communicationVendor].valueReference = Reference(CommunicationVendor1)
diff --git a/data/input/fsh/resources/communication/Engagement_Communication_Instance.fsh b/data/input/fsh/resources/communication/Engagement_Communication_Instance.fsh
index f751e0e84a..104b4c27fa 100644
--- a/data/input/fsh/resources/communication/Engagement_Communication_Instance.fsh
+++ b/data/input/fsh/resources/communication/Engagement_Communication_Instance.fsh
@@ -2,14 +2,14 @@ Instance: EngagementCommunicationExample
InstanceOf: EngagementCommunication
Usage: #example
Title: "Engagement Communication Example"
-Description: "Example of an engagement communication to send an Outreach text to a patient concerning a care gap"
+Description: "Example of an engagement communication to send a SMS text to a patient concerning a care gap"
* meta.source = "http://ibm.com/fhir/engagement"
* meta.profile = "http://ibm.com/fhir/cdm/StructureDefinition/engagement-communication"
* meta.extension[tenantId].valueString = "99999"
* meta.extension[ingestionBatchId].valueString = "b069a545-9506-40c6-8498-23de2e189143"
-* meta.extension[processOrganization].valueString = "IBM"
+* meta.extension[processOrganization].valueString = "HDC"
* meta.extension[processType].valueString = "Engagement Communication"
* meta.extension[processName].valueString = "ATC"
* meta.extension[processVersion].valueString = "1.0"
@@ -19,7 +19,7 @@ Description: "Example of an engagement communication to send an Outreach text
* identifier.type = IdentifierTypeCodeSystem#DRI
* identifier.system = "http://ibm.com/fhir/cdm/engagement-communication"
* identifier.value = "de25d288-120e-47c1-bb76-caac8bc3f439"
-* identifier.assigner.display = "IBM"
+* identifier.assigner.display = "HDC"
* basedOn = Reference(EngagementCommunicationRequestExample)
@@ -63,5 +63,5 @@ Description: "Example of an engagement communication to send an Outreach text
* extension[communicationVendor].valueReference = Reference(Genesis)
* recipient = Reference(CDMPatientInstance)
-* sender = Reference(IBM)
+* sender = Reference(HDC)
* extension[communicationVendor].valueReference = Reference(CommunicationVendor1)
diff --git a/data/input/fsh/resources/condition/CDM_Condition.fsh b/data/input/fsh/resources/condition/CDM_Condition.fsh
index 8fc374ea1a..614833f0e5 100644
--- a/data/input/fsh/resources/condition/CDM_Condition.fsh
+++ b/data/input/fsh/resources/condition/CDM_Condition.fsh
@@ -2,7 +2,7 @@ Profile: CDMCondition
Parent: Condition
Id: cdm-condition
Title: "CDM Condition"
-Description: "IBM Health Data Connect Common Data Model definition of what fields we currently define for a condition"
+Description: "Health Data Connect Common Data Model definition of what fields we currently define for a condition"
// Adding inline resources as contained resources for references
* contained 0..*
diff --git a/data/input/fsh/resources/detected-issue/CDM_DetectedIssue.fsh b/data/input/fsh/resources/detected-issue/CDM_DetectedIssue.fsh
index caa933d11b..0608c48a23 100644
--- a/data/input/fsh/resources/detected-issue/CDM_DetectedIssue.fsh
+++ b/data/input/fsh/resources/detected-issue/CDM_DetectedIssue.fsh
@@ -2,7 +2,7 @@ Profile: CDMDetectedIssue
Parent: DetectedIssue
Id: cdm-detected-issue
Title: "CDM Detected Issue"
-Description: "IBM Health Data Connect Common Data Model definition of what fields we currently define for a detected issue"
+Description: "Health Data Connect Common Data Model definition of what fields we currently define for a detected issue"
* contained 0..0
* meta only ProcessMeta
diff --git a/data/input/fsh/resources/detected-issue/CareGapDetectedIssue_Instance.fsh b/data/input/fsh/resources/detected-issue/CareGapDetectedIssue_Instance.fsh
index 322d43a733..d9b3f11918 100644
--- a/data/input/fsh/resources/detected-issue/CareGapDetectedIssue_Instance.fsh
+++ b/data/input/fsh/resources/detected-issue/CareGapDetectedIssue_Instance.fsh
@@ -9,7 +9,7 @@ Description: "Example of an detected issue indicating that the patient was in
* meta.extension[tenantId].valueString = "99999"
* meta.extension[ingestionBatchId].valueString = "b069a545-9506-40c6-8498-23de2e189143"
-* meta.extension[processOrganization].valueString = "IBM"
+* meta.extension[processOrganization].valueString = "HDC"
* meta.extension[processType].valueString = "Cohorting"
* meta.extension[processName].valueString = "Powersearch"
* meta.extension[processVersion].valueString = "1.0"
@@ -18,7 +18,7 @@ Description: "Example of an detected issue indicating that the patient was in
* identifier.type = IdentifierTypeCodeSystem#DRI
* identifier.system = "http://ibm.com/fhir/cdm/care-gap-detected-issue"
* identifier.value = "d90a8ceb-6f1a-4bc6-8d2a-8c00e6ea8a3e"
-* identifier.assigner.display = "IBM"
+* identifier.assigner.display = "HDC"
* status = #final
@@ -43,7 +43,7 @@ Description: "Example of a related care gap detected issue that has been reso
* identifier.type = IdentifierTypeCodeSystem#DRI
* identifier.system = "http://ibm.com/fhir/cdm/care-gap-detected-issue"
* identifier.value = "4dee9608-e1e0-4653-9f75-b7bdb8d3a968"
-* identifier.assigner.display = "IBM"
+* identifier.assigner.display = "HDC"
* status = #final
* patient = Reference(CDMPatientInstance)
diff --git a/data/input/fsh/resources/eligibility/CDM_Eligibility.fsh b/data/input/fsh/resources/eligibility/CDM_Eligibility.fsh
index 831887f656..cb464c502f 100644
--- a/data/input/fsh/resources/eligibility/CDM_Eligibility.fsh
+++ b/data/input/fsh/resources/eligibility/CDM_Eligibility.fsh
@@ -2,7 +2,7 @@ Profile: CDMEligibility
Parent: Bundle
Id: cdm-eligibility
Title: "CDM Eligibility"
-Description: "IBM Health Data Connect Common Data Model definition of what fields we currently define for an eligibility record"
+Description: "Health Data Connect Common Data Model definition of what fields we currently define for an eligibility record"
* type = #document
* meta only ProcessMeta
* entry ^slicing.ordered = false
diff --git a/data/input/fsh/resources/eligibility/CDM_InsurancePlan.fsh b/data/input/fsh/resources/eligibility/CDM_InsurancePlan.fsh
index 584d6a82a8..af91eaaa41 100644
--- a/data/input/fsh/resources/eligibility/CDM_InsurancePlan.fsh
+++ b/data/input/fsh/resources/eligibility/CDM_InsurancePlan.fsh
@@ -2,7 +2,7 @@ Profile: CDMInsurancePlan
Parent: InsurancePlan
Id: cdm-insurance-plan
Title: "CDM Insurance Plan"
-Description: "IBM Health Data Connect Common Data Model definition of what fields we currently define for an insurance plan"
+Description: "Health Data Connect Common Data Model definition of what fields we currently define for an insurance plan"
* contained 0..0
* meta only ProcessMeta
diff --git a/data/input/fsh/resources/encounter/CDM_Encounter.fsh b/data/input/fsh/resources/encounter/CDM_Encounter.fsh
index 405fbac7b2..bb73b080ee 100644
--- a/data/input/fsh/resources/encounter/CDM_Encounter.fsh
+++ b/data/input/fsh/resources/encounter/CDM_Encounter.fsh
@@ -2,7 +2,7 @@ Profile: CDMEncounter
Parent: Encounter
Id: cdm-encounter
Title: "CDM Encounter"
-Description: "IBM Health Data Connect Common Data Model definition of what fields we currently define for an encounter"
+Description: "Health Data Connect Common Data Model definition of what fields we currently define for an encounter"
* contained 0..0
* meta only ProcessMeta
diff --git a/data/input/fsh/resources/initiative/FFV_Initiative.fsh b/data/input/fsh/resources/initiative/FFV_Initiative.fsh
index 93c7834fea..2dcdd44824 100644
--- a/data/input/fsh/resources/initiative/FFV_Initiative.fsh
+++ b/data/input/fsh/resources/initiative/FFV_Initiative.fsh
@@ -4,7 +4,7 @@ Profile: FFVInitiative
Parent: Contract
Id: ffv-initative-resource
Title: "Fee for Value Initative"
-Description: "IBM Health Data Connect Common Data Model definition of what fields we currently define for an FFV initiative record"
+Description: "Health Data Connect Common Data Model definition of what fields we currently define for an FFV initiative record"
* contained 0..0
* meta only ProcessMeta
diff --git a/data/input/fsh/resources/library/CDM_Library.fsh b/data/input/fsh/resources/library/CDM_Library.fsh
index 8e35b10ff2..162bafa170 100644
--- a/data/input/fsh/resources/library/CDM_Library.fsh
+++ b/data/input/fsh/resources/library/CDM_Library.fsh
@@ -2,7 +2,7 @@ Profile: CDMLibrary
Parent: Library
Id: cdm-library
Title: "CDM Library"
-Description: "IBM Health Data Connect Common Data Model definition of what fields we currently define for a library"
+Description: "Health Data Connect Common Data Model definition of what fields we currently define for a library"
* contained 0..0
* meta only ProcessMeta
diff --git a/data/input/fsh/resources/library/CDM_Library_Instance.fsh b/data/input/fsh/resources/library/CDM_Library_Instance.fsh
index 018eeef3d8..786592a040 100644
--- a/data/input/fsh/resources/library/CDM_Library_Instance.fsh
+++ b/data/input/fsh/resources/library/CDM_Library_Instance.fsh
@@ -8,7 +8,7 @@ Description: "Sample library entry for CMS146, including example default para
* identifier[0].type = IdentifierTypeCodeSystem#SSRI
* identifier[0].system = "http://ibm.com/fhir/cdm/cql-library"
* identifier[0].value = "sample-library-CMS146"
-* identifier[0].assigner.display = "IBM"
+* identifier[0].assigner.display = "HDC"
* name = "CMS146_Sample_Cql_Logic_Library"
diff --git a/data/input/fsh/resources/location/CDM_Location.fsh b/data/input/fsh/resources/location/CDM_Location.fsh
index d9281b5fee..6141115b9e 100644
--- a/data/input/fsh/resources/location/CDM_Location.fsh
+++ b/data/input/fsh/resources/location/CDM_Location.fsh
@@ -2,7 +2,7 @@ Profile: CDMLocation
Parent: Location
Id: cdm-location
Title: "CDM Location"
-Description: "IBM Health Data Connect Common Data Model definition of what fields we currently define for a location"
+Description: "Health Data Connect Common Data Model definition of what fields we currently define for a location"
* contained 0..0
* meta only ProcessMeta
diff --git a/data/input/fsh/resources/location/CDM_MatchLocation_Instance.fsh b/data/input/fsh/resources/location/CDM_MatchLocation_Instance.fsh
index 082fc69b98..1cd82a40e8 100644
--- a/data/input/fsh/resources/location/CDM_MatchLocation_Instance.fsh
+++ b/data/input/fsh/resources/location/CDM_MatchLocation_Instance.fsh
@@ -10,7 +10,7 @@ Description: "Sample of a matched location linked to multiple source location
* meta.extension[tenantId].valueString = "99999"
* meta.extension[ingestionBatchId].valueString = "b069a545-9506-40c6-8498-23de2e189143"
-* meta.extension[processOrganization].valueString = "IBM"
+* meta.extension[processOrganization].valueString = "HDC"
* meta.extension[processType].valueString = "Matching"
* meta.extension[processName].valueString = "Location Matching"
* meta.extension[processVersion].valueString = "1.0"
@@ -21,7 +21,7 @@ Description: "Sample of a matched location linked to multiple source location
* identifier[0].type = IdentifierTypeCodeSystem#MDI
* identifier[0].system = "http://ibm.com/fhir/primary/location-match-identifier"
* identifier[0].value = "7610613e-2ecb-4cf5-815c-42a9589b2245"
-* identifier[0].assigner.display = "IBM"
+* identifier[0].assigner.display = "HDC"
* identifier[1].use = #secondary
* identifier[1].type = ID-TYPE#TAX
@@ -43,7 +43,7 @@ Description: "Sample of a matched location linked to multiple source location
* extension[seeAlso][0].extension[matchDetail][0].extension[matchConfidenceScore].valueDecimal = 100.0
////
* extension[seeAlso][0].extension[6].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-organization"
-* extension[seeAlso][0].extension[6].valueString = "IBM"
+* extension[seeAlso][0].extension[6].valueString = "HDC"
* extension[seeAlso][0].extension[7].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-type"
* extension[seeAlso][0].extension[7].valueString = "Location Match"
* extension[seeAlso][0].extension[8].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-name"
@@ -65,7 +65,7 @@ Description: "Sample of a matched location linked to multiple source location
* extension[seeAlso][1].extension[matchDetail][0].extension[matchConfidenceScore].valueDecimal = 100.0
////
* extension[seeAlso][1].extension[6].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-organization"
-* extension[seeAlso][1].extension[6].valueString = "IBM"
+* extension[seeAlso][1].extension[6].valueString = "HDC"
* extension[seeAlso][1].extension[7].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-type"
* extension[seeAlso][1].extension[7].valueString = "Location Match"
* extension[seeAlso][1].extension[8].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-name"
diff --git a/data/input/fsh/resources/location/CDM_MatchLocation_Source_EMR1_LocationA.fsh b/data/input/fsh/resources/location/CDM_MatchLocation_Source_EMR1_LocationA.fsh
index 15abb44e15..221ee1bc98 100644
--- a/data/input/fsh/resources/location/CDM_MatchLocation_Source_EMR1_LocationA.fsh
+++ b/data/input/fsh/resources/location/CDM_MatchLocation_Source_EMR1_LocationA.fsh
@@ -27,6 +27,6 @@ Description: "Sample of a matched source location with mpi guid identifier an
* identifier[2].type = IdentifierTypeCodeSystem#MDI
* identifier[2].system = "http://ibm.com/fhir/primary/location-match-identifier"
* identifier[2].value = "7610613e-2ecb-4cf5-815c-42a9589b2245"
-* identifier[2].assigner.display = "IBM"
+* identifier[2].assigner.display = "HDC"
* name = "Match Family Clinic"
diff --git a/data/input/fsh/resources/location/CDM_MatchLocation_Source_EMR2_LocationB.fsh b/data/input/fsh/resources/location/CDM_MatchLocation_Source_EMR2_LocationB.fsh
index e5fb266aae..9de9434da6 100644
--- a/data/input/fsh/resources/location/CDM_MatchLocation_Source_EMR2_LocationB.fsh
+++ b/data/input/fsh/resources/location/CDM_MatchLocation_Source_EMR2_LocationB.fsh
@@ -27,6 +27,6 @@ Description: "Sample of a matched source location with mpi guid identifier an
* identifier[2].type = IdentifierTypeCodeSystem#MDI
* identifier[2].system = "http://ibm.com/fhir/primary/location-match-identifier"
* identifier[2].value = "7610613e-2ecb-4cf5-815c-42a9589b2245"
-* identifier[2].assigner.display = "IBM"
+* identifier[2].assigner.display = "HDC"
* name = "Match Family Clinic"
diff --git a/data/input/fsh/resources/observation/CDM_Observation.fsh b/data/input/fsh/resources/observation/CDM_Observation.fsh
index 5880230485..28ebfc330a 100644
--- a/data/input/fsh/resources/observation/CDM_Observation.fsh
+++ b/data/input/fsh/resources/observation/CDM_Observation.fsh
@@ -3,7 +3,7 @@ Profile: CDMObservation
Parent: Observation
Id: cdm-observation
Title: "CDM Observation"
-Description: "IBM Health Data Connect Common Data Model definition of what fields we currently define for an observation"
+Description: "Health Data Connect Common Data Model definition of what fields we currently define for an observation"
* contained 0..0
* meta only ProcessMeta
diff --git a/data/input/fsh/resources/observation/MeasurePopulationObservation.fsh b/data/input/fsh/resources/observation/MeasurePopulationObservation.fsh
index 9cc27a4a78..1aec459be1 100644
--- a/data/input/fsh/resources/observation/MeasurePopulationObservation.fsh
+++ b/data/input/fsh/resources/observation/MeasurePopulationObservation.fsh
@@ -2,7 +2,7 @@ Profile: MeasurePopulationObservation
Parent: CDMObservation
Id: measure-population-observation
Title: "Measure Population Observation"
-Description: "Observation created by IBM Health Data Connect to record measure populations for a patient over time"
+Description: "Observation created by Health Data Connect to record measure populations for a patient over time"
* identifier contains
Derived 0..1
diff --git a/data/input/fsh/resources/observation/MeasurePopulationObservation_CareGap_Instance.fsh b/data/input/fsh/resources/observation/MeasurePopulationObservation_CareGap_Instance.fsh
index 54aad2c7b9..07c68d2163 100644
--- a/data/input/fsh/resources/observation/MeasurePopulationObservation_CareGap_Instance.fsh
+++ b/data/input/fsh/resources/observation/MeasurePopulationObservation_CareGap_Instance.fsh
@@ -9,7 +9,7 @@ Description: "Example of an observation indicating that the patient was in a
* meta.extension[tenantId].valueString = "99999"
* meta.extension[ingestionBatchId].valueString = "b069a545-9506-40c6-8498-23de2e189143"
-* meta.extension[processOrganization].valueString = "IBM"
+* meta.extension[processOrganization].valueString = "HDC"
* meta.extension[processType].valueString = "Cohorting"
* meta.extension[processName].valueString = "Powersearch"
* meta.extension[processVersion].valueString = "1.0"
@@ -18,7 +18,7 @@ Description: "Example of an observation indicating that the patient was in a
* identifier.type = IdentifierTypeCodeSystem#DRI
* identifier.system = "http://ibm.com/fhir/cdm/measure-population-observation"
* identifier.value = "9591c85d-2f90-4586-b76d-be8e8ab2a719"
-* identifier.assigner.display = "IBM"
+* identifier.assigner.display = "HDC"
* status = #final
* code = MeasurePopulationTypeCodeSystem#care-gap
@@ -47,7 +47,7 @@ Description: "Example of an observation indicating that the patient was in a
* meta.extension[tenantId].valueString = "99999"
* meta.extension[ingestionBatchId].valueString = "b069a545-9506-40c6-8498-23de2e189143"
-* meta.extension[processOrganization].valueString = "IBM"
+* meta.extension[processOrganization].valueString = "HDC"
* meta.extension[processType].valueString = "Cohorting"
* meta.extension[processName].valueString = "Powersearch"
* meta.extension[processVersion].valueString = "1.0"
@@ -56,7 +56,7 @@ Description: "Example of an observation indicating that the patient was in a
* identifier.type = IdentifierTypeCodeSystem#DRI
* identifier.system = "http://ibm.com/fhir/cdm/measure-population-observation"
* identifier.value = "68d2c2330e254037adbd83eabee6eec4"
-* identifier.assigner.display = "IBM"
+* identifier.assigner.display = "HDC"
* status = #final
* code = MeasurePopulationTypeCodeSystem#care-gap
diff --git a/data/input/fsh/resources/observation/MeasurePopulationObservation_Numerator_Instance.fsh b/data/input/fsh/resources/observation/MeasurePopulationObservation_Numerator_Instance.fsh
index afcfbabab1..ec915ef5c3 100644
--- a/data/input/fsh/resources/observation/MeasurePopulationObservation_Numerator_Instance.fsh
+++ b/data/input/fsh/resources/observation/MeasurePopulationObservation_Numerator_Instance.fsh
@@ -9,7 +9,7 @@ Description: "Example of an observation indicating that the patient was in a
* meta.extension[tenantId].valueString = "99999"
* meta.extension[ingestionBatchId].valueString = "b069a545-9506-40c6-8498-23de2e189143"
-* meta.extension[processOrganization].valueString = "IBM"
+* meta.extension[processOrganization].valueString = "HDC"
* meta.extension[processType].valueString = "Cohorting"
* meta.extension[processName].valueString = "Powersearch"
* meta.extension[processVersion].valueString = "1.0"
@@ -18,7 +18,7 @@ Description: "Example of an observation indicating that the patient was in a
* identifier.type = IdentifierTypeCodeSystem#DRI
* identifier.system = "http://ibm.com/fhir/cdm/measure-population-observation"
* identifier.value = "9591c85d-2f90-4586-b76d-be8e8ab2a719"
-* identifier.assigner.display = "IBM"
+* identifier.assigner.display = "HDC"
* status = #final
* code = MEASURE-POPULATION#numerator
@@ -45,7 +45,7 @@ Description: "Example of an observation indicating that the patient was in a
* meta.extension[tenantId].valueString = "99999"
* meta.extension[ingestionBatchId].valueString = "b069a545-9506-40c6-8498-23de2e189143"
-* meta.extension[processOrganization].valueString = "IBM"
+* meta.extension[processOrganization].valueString = "HDC"
* meta.extension[processType].valueString = "Cohorting"
* meta.extension[processName].valueString = "Powersearch"
* meta.extension[processVersion].valueString = "1.0"
@@ -54,7 +54,7 @@ Description: "Example of an observation indicating that the patient was in a
* identifier.type = IdentifierTypeCodeSystem#DRI
* identifier.system = "http://ibm.com/fhir/cdm/measure-population-observation"
* identifier.value = "6b23568b-dccf-4546-b099-6fb8ec3c84e8"
-* identifier.assigner.display = "IBM"
+* identifier.assigner.display = "HDC"
* status = #final
* code = MEASURE-POPULATION#numerator
diff --git a/data/input/fsh/resources/organization/CDM_Organization.fsh b/data/input/fsh/resources/organization/CDM_Organization.fsh
index 70f09623ad..f29c5e8d82 100644
--- a/data/input/fsh/resources/organization/CDM_Organization.fsh
+++ b/data/input/fsh/resources/organization/CDM_Organization.fsh
@@ -2,7 +2,7 @@ Profile: CDMOrganization
Parent: Organization
Id: cdm-organization
Title: "CDM Organization"
-Description: "IBM Health Data Connect Common Data Model definition of what fields we currently define for a organization"
+Description: "Health Data Connect Common Data Model definition of what fields we currently define for a organization"
* contained 0..0
* meta only ProcessMeta
diff --git a/data/input/fsh/resources/organization/CDM_Organization_IBM.fsh b/data/input/fsh/resources/organization/CDM_Organization_HDC.fsh
similarity index 67%
rename from data/input/fsh/resources/organization/CDM_Organization_IBM.fsh
rename to data/input/fsh/resources/organization/CDM_Organization_HDC.fsh
index d67ba5c51a..aa9599b2e5 100644
--- a/data/input/fsh/resources/organization/CDM_Organization_IBM.fsh
+++ b/data/input/fsh/resources/organization/CDM_Organization_HDC.fsh
@@ -1,8 +1,8 @@
-Instance: IBM
+Instance: HDC
InstanceOf: CDMOrganization
Usage: #example
-Title: "CDM Oganization - IBM"
-Description: "Sample CDM Organization representing IBM"
+Title: "CDM Oganization - HDC"
+Description: "Sample CDM Organization representing Health Data Connect"
* meta.source = "http://ibm.com/wffh/platform"
* meta.profile = "http://ibm.com/fhir/cdm/StructureDefinition/cdm-organization"
@@ -10,8 +10,8 @@ Description: "Sample CDM Organization representing IBM"
* identifier[0].use = #official
* identifier[0].type = IdentifierTypeCodeSystem#SSRI
* identifier[0].system = "http://ibm.com/wffh/organization"
-* identifier[0].value = "IBM"
+* identifier[0].value = "HDC"
-* name = "IBM"
+* name = "HDC"
* active = true
* type = ORGANIZATION-TYPE#bus
\ No newline at end of file
diff --git a/data/input/fsh/resources/patient/CDM_MatchPatient_Instance.fsh b/data/input/fsh/resources/patient/CDM_MatchPatient_Instance.fsh
index 4936b0c9e1..9872dd00be 100644
--- a/data/input/fsh/resources/patient/CDM_MatchPatient_Instance.fsh
+++ b/data/input/fsh/resources/patient/CDM_MatchPatient_Instance.fsh
@@ -10,7 +10,7 @@ Description: "Sample of a matched patient linked to multiple source patients,
* meta.extension[tenantId].valueString = "99999"
* meta.extension[ingestionBatchId].valueString = "b069a545-9506-40c6-8498-23de2e189143"
-* meta.extension[processOrganization].valueString = "IBM"
+* meta.extension[processOrganization].valueString = "HDC"
* meta.extension[processType].valueString = "Matching"
* meta.extension[processName].valueString = "Patient Matching"
* meta.extension[processVersion].valueString = "1.0"
@@ -21,7 +21,7 @@ Description: "Sample of a matched patient linked to multiple source patients,
* identifier[0].type = IdentifierTypeCodeSystem#MDI
* identifier[0].system = "http://ibm.com/fhir/primary/patient-match-identifier"
* identifier[0].value = "c82a8fce-11db-4396-b10c-1150abd1a222"
-* identifier[0].assigner.display = "IBM"
+* identifier[0].assigner.display = "HDC"
* active = true
@@ -48,7 +48,7 @@ Description: "Sample of a matched patient linked to multiple source patients,
* extension[seeAlso][0].extension[matchDetail][1].extension[matchConfidenceScore].valueDecimal = 100.0
/////
* extension[seeAlso][0].extension[7].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-organization"
-* extension[seeAlso][0].extension[7].valueString = "IBM"
+* extension[seeAlso][0].extension[7].valueString = "HDC"
* extension[seeAlso][0].extension[8].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-type"
* extension[seeAlso][0].extension[8].valueString = "Patient Match"
* extension[seeAlso][0].extension[9].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-name"
@@ -74,7 +74,7 @@ Description: "Sample of a matched patient linked to multiple source patients,
* extension[seeAlso][1].extension[matchDetail][1].extension[matchConfidenceScore].valueDecimal = 100.0
/////
* extension[seeAlso][1].extension[7].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-organization"
-* extension[seeAlso][1].extension[7].valueString = "IBM"
+* extension[seeAlso][1].extension[7].valueString = "HDC"
* extension[seeAlso][1].extension[8].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-type"
* extension[seeAlso][1].extension[8].valueString = "Patient Match"
* extension[seeAlso][1].extension[9].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-name"
@@ -104,7 +104,7 @@ Description: "Sample of a matched patient linked to multiple source patients,
* extension[seeAlso][2].extension[matchDetail][2].extension[matchConfidenceScore].valueDecimal = 100.0
/////
* extension[seeAlso][2].extension[8].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-organization"
-* extension[seeAlso][2].extension[8].valueString = "IBM"
+* extension[seeAlso][2].extension[8].valueString = "HDC"
* extension[seeAlso][2].extension[9].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-type"
* extension[seeAlso][2].extension[9].valueString = "Manual Patient Match"
* extension[seeAlso][2].extension[10].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-name"
@@ -138,7 +138,7 @@ Description: "Sample of a matched patient linked to multiple source patients,
* extension[seeAlso][3].extension[8].url = "http://ibm.com/fhir/cdm/StructureDefinition/split-method"
* extension[seeAlso][3].extension[8].valueCodeableConcept = MatchMethodCodeSystem#manual
* extension[seeAlso][3].extension[9].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-organization"
-* extension[seeAlso][3].extension[9].valueString = "IBM"
+* extension[seeAlso][3].extension[9].valueString = "HDC"
* extension[seeAlso][3].extension[10].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-type"
* extension[seeAlso][3].extension[10].valueString = "Manual Patient Split"
* extension[seeAlso][3].extension[11].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-name"
diff --git a/data/input/fsh/resources/patient/CDM_MatchPatient_Source_EMR1_PatientA.fsh b/data/input/fsh/resources/patient/CDM_MatchPatient_Source_EMR1_PatientA.fsh
index 76750339b1..a72672701f 100644
--- a/data/input/fsh/resources/patient/CDM_MatchPatient_Source_EMR1_PatientA.fsh
+++ b/data/input/fsh/resources/patient/CDM_MatchPatient_Source_EMR1_PatientA.fsh
@@ -19,7 +19,7 @@ Description: "Sample of a matched source patient with reference to the match
* identifier[1].type = IdentifierTypeCodeSystem#MDI
* identifier[1].system = "http://ibm.com/fhir/primary/patient-match-identifier"
* identifier[1].value = "c82a8fce-11db-4396-b10c-1150abd1a222"
-* identifier[1].assigner.display = "IBM"
+* identifier[1].assigner.display = "HDC"
* active = true
diff --git a/data/input/fsh/resources/patient/CDM_MatchPatient_Source_EMR2_PatientB.fsh b/data/input/fsh/resources/patient/CDM_MatchPatient_Source_EMR2_PatientB.fsh
index 1f6bf8fca4..83d46c3ac8 100644
--- a/data/input/fsh/resources/patient/CDM_MatchPatient_Source_EMR2_PatientB.fsh
+++ b/data/input/fsh/resources/patient/CDM_MatchPatient_Source_EMR2_PatientB.fsh
@@ -19,7 +19,7 @@ Description: "Sample of a matched source patient with reference to the match
* identifier[1].type = IdentifierTypeCodeSystem#MDI
* identifier[1].system = "http://ibm.com/fhir/primary/patient-match-identifier"
* identifier[1].value = "c82a8fce-11db-4396-b10c-1150abd1a222"
-* identifier[1].assigner.display = "IBM"
+* identifier[1].assigner.display = "HDC"
* active = true
diff --git a/data/input/fsh/resources/patient/CDM_MatchPatient_Source_EMR2_PatientC.fsh b/data/input/fsh/resources/patient/CDM_MatchPatient_Source_EMR2_PatientC.fsh
index c92711e0f7..4279489cce 100644
--- a/data/input/fsh/resources/patient/CDM_MatchPatient_Source_EMR2_PatientC.fsh
+++ b/data/input/fsh/resources/patient/CDM_MatchPatient_Source_EMR2_PatientC.fsh
@@ -19,7 +19,7 @@ Description: "Sample of a matched source patient with reference to the match
* identifier[1].type = IdentifierTypeCodeSystem#MDI
* identifier[1].system = "http://ibm.com/fhir/primary/patient-match-identifier"
* identifier[1].value = "c82a8fce-11db-4396-b10c-1150abd1a222"
-* identifier[1].assigner.display = "IBM"
+* identifier[1].assigner.display = "HDC"
* active = true
diff --git a/data/input/fsh/resources/patient/CDM_MatchPatient_Source_EMR3_PatientD.fsh b/data/input/fsh/resources/patient/CDM_MatchPatient_Source_EMR3_PatientD.fsh
index 38372d96f4..2b40f48f3d 100644
--- a/data/input/fsh/resources/patient/CDM_MatchPatient_Source_EMR3_PatientD.fsh
+++ b/data/input/fsh/resources/patient/CDM_MatchPatient_Source_EMR3_PatientD.fsh
@@ -19,7 +19,7 @@ Description: "Sample of a matched source patient with a reference to the a di
* identifier[1].type = IdentifierTypeCodeSystem#MDI
* identifier[1].system = "http://ibm.com/fhir/primary/patient-match-identifier"
* identifier[1].value = "e00e79d2-684e-4a1a-8f2b-858b2ff9db36"
-* identifier[1].assigner.display = "IBM"
+* identifier[1].assigner.display = "HDC"
* active = true
diff --git a/data/input/fsh/resources/patient/CDM_Patient.fsh b/data/input/fsh/resources/patient/CDM_Patient.fsh
index d730a64460..d5281c929f 100644
--- a/data/input/fsh/resources/patient/CDM_Patient.fsh
+++ b/data/input/fsh/resources/patient/CDM_Patient.fsh
@@ -2,7 +2,7 @@ Profile: CDMPatient
Parent: Patient
Id: cdm-patient
Title: "CDM Patient"
-Description: "IBM Health Data Connect Common Data Model definition of what fields we currently define for a patient"
+Description: "Health Data Connect Common Data Model definition of what fields we currently define for a patient"
* contained 0..0
* meta only ProcessMeta
diff --git a/data/input/fsh/resources/patient/CDM_Patient_Attributed_Instance.fsh b/data/input/fsh/resources/patient/CDM_Patient_Attributed_Instance.fsh
index 9102d528b1..e9a50b13e3 100644
--- a/data/input/fsh/resources/patient/CDM_Patient_Attributed_Instance.fsh
+++ b/data/input/fsh/resources/patient/CDM_Patient_Attributed_Instance.fsh
@@ -20,7 +20,7 @@ Usage: #example
* identifier[1].type = IdentifierTypeCodeSystem#MDI
* identifier[1].system = "http://ibm.com/fhir/primary/patient-match-identifier"
* identifier[1].value = "a491127b-2e01-452f-ba3c-0cc93e986e8c"
-* identifier[1].assigner.display = "IBM"
+* identifier[1].assigner.display = "HDC"
* name.given = "Sam"
* name.family = "Malone"
@@ -40,7 +40,7 @@ Usage: #example
* generalPractitioner[1].extension[referencePeriod].valuePeriod.start = "2019-01-01"
* generalPractitioner[1].extension[referencePeriod].valuePeriod.end = "2019-12-31"
* generalPractitioner[1].extension[2].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-organization"
-* generalPractitioner[1].extension[2].valueString = "IBM"
+* generalPractitioner[1].extension[2].valueString = "HDC"
* generalPractitioner[1].extension[3].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-type"
* generalPractitioner[1].extension[3].valueString = "Practitioner Attribution"
* generalPractitioner[1].extension[4].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-name"
@@ -54,7 +54,7 @@ Usage: #example
* generalPractitioner[2].extension[referenceCode].valueCoding = AttributionSourceCodeSystem#enrollment
* generalPractitioner[2].extension[referencePeriod].valuePeriod.start = "2020-01-01"
* generalPractitioner[2].extension[2].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-organization"
-* generalPractitioner[2].extension[2].valueString = "IBM"
+* generalPractitioner[2].extension[2].valueString = "HDC"
* generalPractitioner[2].extension[3].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-type"
* generalPractitioner[2].extension[3].valueString = "Practitioner Attribution"
* generalPractitioner[2].extension[4].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-name"
@@ -64,12 +64,12 @@ Usage: #example
* generalPractitioner[2].extension[6].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-timestamp"
* generalPractitioner[2].extension[6].valueDateTime = "2020-01-01T03:01:00Z"
// Imputed pcp for Advantage
-* generalPractitioner[3] = Reference(CDMPractitionerRole-Advantage-Imputed-PCP)
+* generalPractitioner[3] = Reference(CDMPractitionerRole-Imputed-PCP)
* generalPractitioner[3].extension[referenceCode][0].valueCoding = AttributionSourceCodeSystem#imputed
-* generalPractitioner[3].extension[referenceCode][1].valueCoding = AttributionProductCodeSystem#advantage
+* generalPractitioner[3].extension[referenceCode][1].valueCoding = AttributionProductCodeSystem#hdc
* generalPractitioner[3].extension[referencePeriod].valuePeriod.start = "2020-02-14"
* generalPractitioner[3].extension[3].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-organization"
-* generalPractitioner[3].extension[3].valueString = "IBM"
+* generalPractitioner[3].extension[3].valueString = "HDC"
* generalPractitioner[3].extension[4].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-type"
* generalPractitioner[3].extension[4].valueString = "Practitioner Attribution"
* generalPractitioner[3].extension[5].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-name"
@@ -85,7 +85,7 @@ Usage: #example
* generalPractitioner[4].extension[referenceCode][2].valueCoding = SNOMED#446050000 "PCP - Primary care physician"
* generalPractitioner[4].extension[referencePeriod].valuePeriod.start = "2020-02-14"
* generalPractitioner[4].extension[4].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-organization"
-* generalPractitioner[4].extension[4].valueString = "IBM"
+* generalPractitioner[4].extension[4].valueString = "HDC"
* generalPractitioner[4].extension[5].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-type"
* generalPractitioner[4].extension[5].valueString = "Practitioner Attribution"
* generalPractitioner[4].extension[6].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-name"
@@ -101,7 +101,7 @@ Usage: #example
* generalPractitioner[5].extension[referenceCode][2].valueCoding = SNOMED#394592004 "Clinical oncology"
* generalPractitioner[5].extension[referencePeriod].valuePeriod.start = "2020-02-14"
* generalPractitioner[5].extension[4].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-organization"
-* generalPractitioner[5].extension[4].valueString = "IBM"
+* generalPractitioner[5].extension[4].valueString = "HDC"
* generalPractitioner[5].extension[5].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-type"
* generalPractitioner[5].extension[5].valueString = "Practitioner Attribution"
* generalPractitioner[5].extension[6].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-name"
diff --git a/data/input/fsh/resources/patient/CDM_Patient_DoNotContact_Instance.fsh b/data/input/fsh/resources/patient/CDM_Patient_DoNotContact_Instance.fsh
index 2d79baa9bb..95526571c0 100644
--- a/data/input/fsh/resources/patient/CDM_Patient_DoNotContact_Instance.fsh
+++ b/data/input/fsh/resources/patient/CDM_Patient_DoNotContact_Instance.fsh
@@ -20,7 +20,7 @@ Usage: #example
* identifier[1].type = IdentifierTypeCodeSystem#MDI
* identifier[1].system = "http://ibm.com/fhir/primary/patient-match-identifier"
* identifier[1].value = "4fd6049c-59c5-4c7b-81b1-88869044535d"
-* identifier[1].assigner.display = "IBM"
+* identifier[1].assigner.display = "HDC"
* name.given = "Norm"
* name.family = "Peterson"
diff --git a/data/input/fsh/resources/patient/CDM_Patient_Instance.fsh b/data/input/fsh/resources/patient/CDM_Patient_Instance.fsh
index 69026ecc6c..e9c4cf23f0 100644
--- a/data/input/fsh/resources/patient/CDM_Patient_Instance.fsh
+++ b/data/input/fsh/resources/patient/CDM_Patient_Instance.fsh
@@ -60,7 +60,7 @@ Description: "Example of a CDMPatient representing a patient ingested from a
* identifier[7].type = IdentifierTypeCodeSystem#MDI
* identifier[7].system = "http://ibm.com/fhir/primary/patient-match-identifier"
* identifier[7].value = "7b78d6de-46cb-4fbb-930d-2a74e24b17fe"
-* identifier[7].assigner.display = "IBM"
+* identifier[7].assigner.display = "HDC"
* active = true
diff --git a/data/input/fsh/resources/person/CDM_Person.fsh b/data/input/fsh/resources/person/CDM_Person.fsh
index 2014bacae2..6f2d4af67f 100644
--- a/data/input/fsh/resources/person/CDM_Person.fsh
+++ b/data/input/fsh/resources/person/CDM_Person.fsh
@@ -2,7 +2,7 @@ Profile: CDMPerson
Parent: Person
Id: cdm-person
Title: "CDM Person"
-Description: "IBM Health Data Connect Common Data Model definition of what fields we currently define for a person"
+Description: "Health Data Connect Common Data Model definition of what fields we currently define for a person"
* contained 0..0
* meta only ProcessMeta
diff --git a/data/input/fsh/resources/practitioner/CDM_MatchPractioner_Instance.fsh b/data/input/fsh/resources/practitioner/CDM_MatchPractioner_Instance.fsh
index fab17e9192..5617b6bb56 100644
--- a/data/input/fsh/resources/practitioner/CDM_MatchPractioner_Instance.fsh
+++ b/data/input/fsh/resources/practitioner/CDM_MatchPractioner_Instance.fsh
@@ -10,7 +10,7 @@ Description: "Sample of a matched practitioner linked to multiple source prac
* meta.extension[tenantId].valueString = "99999"
* meta.extension[ingestionBatchId].valueString = "b069a545-9506-40c6-8498-23de2e189143"
-* meta.extension[processOrganization].valueString = "IBM"
+* meta.extension[processOrganization].valueString = "HDC"
* meta.extension[processType].valueString = "Matching"
* meta.extension[processName].valueString = "Practitioner Matching"
* meta.extension[processVersion].valueString = "1.0"
@@ -21,7 +21,7 @@ Description: "Sample of a matched practitioner linked to multiple source prac
* identifier[0].type = IdentifierTypeCodeSystem#MDI
* identifier[0].system = "http://ibm.com/fhir/primary/practitioner-match-identifier"
* identifier[0].value = "e65bdcac-6e50-4353-8faa-dc147a603468"
-* identifier[0].assigner.display = "IBM"
+* identifier[0].assigner.display = "HDC"
* identifier[1].use = #official
* identifier[1].type = ID-TYPE#PRN
@@ -52,7 +52,7 @@ Description: "Sample of a matched practitioner linked to multiple source prac
* extension[seeAlso][0].extension[matchDetail][1].extension[matchConfidenceScore].valueDecimal = 100.0
////
* extension[seeAlso][0].extension[7].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-organization"
-* extension[seeAlso][0].extension[7].valueString = "IBM"
+* extension[seeAlso][0].extension[7].valueString = "HDC"
* extension[seeAlso][0].extension[8].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-type"
* extension[seeAlso][0].extension[8].valueString = "Practitioner Match"
* extension[seeAlso][0].extension[9].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-name"
@@ -78,7 +78,7 @@ Description: "Sample of a matched practitioner linked to multiple source prac
* extension[seeAlso][1].extension[matchDetail][1].extension[matchConfidenceScore].valueDecimal = 100.0
////
* extension[seeAlso][1].extension[7].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-organization"
-* extension[seeAlso][1].extension[7].valueString = "IBM"
+* extension[seeAlso][1].extension[7].valueString = "HDC"
* extension[seeAlso][1].extension[8].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-type"
* extension[seeAlso][1].extension[8].valueString = "Practitioner Match"
* extension[seeAlso][1].extension[9].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-name"
diff --git a/data/input/fsh/resources/practitioner/CDM_MatchPractitioner_Source_EMR1_ProviderA.fsh b/data/input/fsh/resources/practitioner/CDM_MatchPractitioner_Source_EMR1_ProviderA.fsh
index 876332fcda..8adb97b611 100644
--- a/data/input/fsh/resources/practitioner/CDM_MatchPractitioner_Source_EMR1_ProviderA.fsh
+++ b/data/input/fsh/resources/practitioner/CDM_MatchPractitioner_Source_EMR1_ProviderA.fsh
@@ -26,7 +26,7 @@ Description: "Sample of a matched source practitioner with mpi guid identifie
* identifier[2].type = IdentifierTypeCodeSystem#MDI
* identifier[2].system = "http://ibm.com/fhir/primary/practitioner-match-identifier"
* identifier[2].value = "e65bdcac-6e50-4353-8faa-dc147a603468"
-* identifier[2].assigner.display = "IBM"
+* identifier[2].assigner.display = "HDC"
* name.given = "Rosemary"
* name.given[1] = "B"
diff --git a/data/input/fsh/resources/practitioner/CDM_MatchPractitioner_Source_EMR2_ProviderB.fsh b/data/input/fsh/resources/practitioner/CDM_MatchPractitioner_Source_EMR2_ProviderB.fsh
index 14efda6686..1fa1ff0ac6 100644
--- a/data/input/fsh/resources/practitioner/CDM_MatchPractitioner_Source_EMR2_ProviderB.fsh
+++ b/data/input/fsh/resources/practitioner/CDM_MatchPractitioner_Source_EMR2_ProviderB.fsh
@@ -26,7 +26,7 @@ Description: "Sample of a matched source practitioner with mpi guid identifie
* identifier[2].type = IdentifierTypeCodeSystem#MDI
* identifier[2].system = "http://ibm.com/fhir/primary/practitioner-match-identifier"
* identifier[2].value = "e65bdcac-6e50-4353-8faa-dc147a603468"
-* identifier[2].assigner.display = "IBM"
+* identifier[2].assigner.display = "HDC"
* name.given = "Rosemary"
* name.given[1] = "B"
diff --git a/data/input/fsh/resources/practitioner/CDM_Practitioner.fsh b/data/input/fsh/resources/practitioner/CDM_Practitioner.fsh
index a878ed2812..6df09d7f4a 100644
--- a/data/input/fsh/resources/practitioner/CDM_Practitioner.fsh
+++ b/data/input/fsh/resources/practitioner/CDM_Practitioner.fsh
@@ -2,7 +2,7 @@ Profile: CDMPractitioner
Parent: Practitioner
Id: cdm-practitioner
Title: "CDM Practitioner"
-Description: "IBM Health Data Connect Common Data Model definition of what fields we currently define for a practitioner"
+Description: "Health Data Connect Common Data Model definition of what fields we currently define for a practitioner"
* contained 0..0
* meta only ProcessMeta
diff --git a/data/input/fsh/resources/practitioner/CDM_PractitionerRole.fsh b/data/input/fsh/resources/practitioner/CDM_PractitionerRole.fsh
index d855f57090..f78ebeb9b3 100644
--- a/data/input/fsh/resources/practitioner/CDM_PractitionerRole.fsh
+++ b/data/input/fsh/resources/practitioner/CDM_PractitionerRole.fsh
@@ -2,7 +2,7 @@ Profile: CDMPractitionerRole
Parent: PractitionerRole
Id: cdm-practitioner-role
Title: "CDM Practitioner Role"
-Description: "IBM Health Data Connect Common Data Model definition of what fields we currently define for a practitioner role"
+Description: "Health Data Connect Common Data Model definition of what fields we currently define for a practitioner role"
* contained 0..0
* meta only ProcessMeta
@@ -72,15 +72,14 @@ Description: "IBM Health Data Connect Common Data Model definition of what
* code[Standard].coding contains
NUCCTaxonomy 0..1 and
NUCCType 0..1 and
- IBMType 0..1
+ HDCType 0..1
* code[Standard].coding[NUCCTaxonomy].system = "http://nucc.org/provider-taxonomy"
* code[Standard].coding[NUCCTaxonomy].code 1..1
* code[Standard].coding[NUCCType].system = "http://ibm.com/fhir/cdm/nucc-provider-taxonomy-type"
* code[Standard].coding[NUCCType].code 1..1
-* code[Standard].coding[IBMType].system = "http://ibm.com/fhir/cdm/wh-payer-provider-type"
-* code[Standard].coding[IBMType].code 1..1
-* code[Standard].coding[IBMType].code from WhPractitionerRoleTypeValueSet (preferred)
+* code[Standard].coding[HDCType].system = "http://ibm.com/fhir/cdm/wh-payer-provider-type"
+* code[Standard].coding[HDCType].code 1..1
+* code[Standard].coding[HDCType].code from WhPractitionerRoleTypeValueSet (preferred)
* code[NonStandard].text 1..1
* telecom only CDMContactPoint
-
diff --git a/data/input/fsh/resources/practitioner/CDM_PractitionerRole_AdvImputedPCP_Instance.fsh b/data/input/fsh/resources/practitioner/CDM_PractitionerRole_AdvImputedPCP_Instance.fsh
index c95081a50b..545516a107 100644
--- a/data/input/fsh/resources/practitioner/CDM_PractitionerRole_AdvImputedPCP_Instance.fsh
+++ b/data/input/fsh/resources/practitioner/CDM_PractitionerRole_AdvImputedPCP_Instance.fsh
@@ -10,7 +10,7 @@ Usage: #example
* meta.extension[tenantId].valueString = "99999"
* meta.extension[ingestionBatchId].valueString = "b069a545-9506-40c6-8498-23de2e189143"
-* meta.extension[processOrganization].valueString = "IBM"
+* meta.extension[processOrganization].valueString = "HDC"
* meta.extension[processType].valueString = "Attribution"
* meta.extension[processName].valueString = "AdvantageAtrribution"
* meta.extension[processVersion].valueString = "1.0"
@@ -21,7 +21,7 @@ Usage: #example
* identifier[0].type = IdentifierTypeCodeSystem#DRI
* identifier[0].system = "http://ibm.com/fhir/cdm/advantage-imputed-pcp"
* identifier[0].value = "3cce418a-1006-4914-90b5-70bd3d3af1d8"
-* identifier[0].assigner.display = "IBM Advantage Suite"
+* identifier[0].assigner.display = "HDC"
* active = true
* practitioner = Reference(DrKelly)
diff --git a/data/input/fsh/resources/practitioner/CDM_PractitionerRole_AttributedPCP_Instance.fsh b/data/input/fsh/resources/practitioner/CDM_PractitionerRole_AttributedPCP_Instance.fsh
index dd7afd9fc2..40d0fe62f7 100644
--- a/data/input/fsh/resources/practitioner/CDM_PractitionerRole_AttributedPCP_Instance.fsh
+++ b/data/input/fsh/resources/practitioner/CDM_PractitionerRole_AttributedPCP_Instance.fsh
@@ -10,7 +10,7 @@ Usage: #example
* meta.extension[tenantId].valueString = "99999"
* meta.extension[ingestionBatchId].valueString = "b069a545-9506-40c6-8498-23de2e189143"
-* meta.extension[processOrganization].valueString = "IBM"
+* meta.extension[processOrganization].valueString = "HDC"
* meta.extension[processType].valueString = "Attribution"
* meta.extension[processName].valueString = "EngagementAttribution"
* meta.extension[processVersion].valueString = "1.0"
@@ -21,7 +21,7 @@ Usage: #example
* identifier[0].type = IdentifierTypeCodeSystem#DRI
* identifier[0].system = "http://ibm.com/fhir/cdm/engagement-attributed-pcp"
* identifier[0].value = "dd914419-12db-4367-aa93-5c7930510e19"
-* identifier[0].assigner.display = "IBM"
+* identifier[0].assigner.display = "HDC"
* active = true
* practitioner = Reference(DrKelly)
diff --git a/data/input/fsh/resources/practitioner/CDM_Practitioner_Bundle.fsh b/data/input/fsh/resources/practitioner/CDM_Practitioner_Bundle.fsh
index c643075129..292a8a8868 100644
--- a/data/input/fsh/resources/practitioner/CDM_Practitioner_Bundle.fsh
+++ b/data/input/fsh/resources/practitioner/CDM_Practitioner_Bundle.fsh
@@ -2,7 +2,7 @@ Profile: CDMPractitionerBundle
Parent: Bundle
Id: cdm-practitioner-bundle
Title: "CDM Practitioner Bundle"
-Description: "IBM® Health Data Connect bundle used to package Common Data Model practitioner resources for data ingestion"
+Description: "Health Data Connect bundle used to package Common Data Model practitioner resources for data ingestion"
* meta.profile 1..1
* entry ^slicing.ordered = true
* entry ^slicing.description = "Slice based on entry element type"
diff --git a/data/input/fsh/resources/procedure/CDM_Procedure.fsh b/data/input/fsh/resources/procedure/CDM_Procedure.fsh
index 5253f39624..bc3369586a 100644
--- a/data/input/fsh/resources/procedure/CDM_Procedure.fsh
+++ b/data/input/fsh/resources/procedure/CDM_Procedure.fsh
@@ -2,7 +2,7 @@ Profile: CDMProcedure
Parent: Procedure
Id: cdm-procedure
Title: "CDM Procedure"
-Description: "IBM Health Data Connect Common Data Model definition of what fields we currently define for a procedure"
+Description: "Health Data Connect Common Data Model definition of what fields we currently define for a procedure"
* contained 0..0
* meta only ProcessMeta
diff --git a/data/input/fsh/resources/provider-hierarchy/CDM_OrganizationAffiliation.fsh b/data/input/fsh/resources/provider-hierarchy/CDM_OrganizationAffiliation.fsh
index 87f9fee566..d41504e741 100644
--- a/data/input/fsh/resources/provider-hierarchy/CDM_OrganizationAffiliation.fsh
+++ b/data/input/fsh/resources/provider-hierarchy/CDM_OrganizationAffiliation.fsh
@@ -2,7 +2,7 @@ Profile: CDMOrganizationAffiliation
Parent: OrganizationAffiliation
Id: cdm-organization-affiliation
Title: "CDM Organization Affiliation"
-Description: "IBM® Health Data Connect organization affiliation with versioned hierarchy levels used to relate parent and child organizations"
+Description: "Health Data Connect organization affiliation with versioned hierarchy levels used to relate parent and child organizations"
* contained 0..0
* meta only ProcessMeta
diff --git a/data/input/fsh/resources/quality-measure/QualityMeasurePatientReport_Instance.fsh b/data/input/fsh/resources/quality-measure/QualityMeasurePatientReport_Instance.fsh
index 81d8f30e0d..1b8b68e404 100644
--- a/data/input/fsh/resources/quality-measure/QualityMeasurePatientReport_Instance.fsh
+++ b/data/input/fsh/resources/quality-measure/QualityMeasurePatientReport_Instance.fsh
@@ -9,7 +9,7 @@ Description: "Example measure report containing individual measure results fo
* meta.extension[tenantId].valueString = "99999"
* meta.extension[ingestionBatchId].valueString = "b069a545-9506-40c6-8498-23de2e189143"
-* meta.extension[processOrganization].valueString = "IBM"
+* meta.extension[processOrganization].valueString = "HDC"
* meta.extension[processType].valueString = "Cohorting"
* meta.extension[processName].valueString = "Powersearch"
* meta.extension[processVersion].valueString = "1.0"
@@ -19,14 +19,14 @@ Description: "Example measure report containing individual measure results fo
* identifier.type = ID-TYPE#RI
* identifier.system = "http://ibm.com/fhir/cdm/quality-measure-report"
* identifier.value = "de25d288-120e-47c1-bb76-caac8bc3f439"
-* identifier.assigner.display = "IBM"
+* identifier.assigner.display = "HDC"
* status = #complete
* type = #individual
* subject = Reference(CDMPatientInstance)
* date = "2020-03-01T03:00:00Z"
* extension[measureReportAssignedPractitioner].valueReference = Reference(CDMPractitionerRole-Attributed-PCP)
-* reporter = Reference(IBM)
+* reporter = Reference(HDC)
* period.start = "2020-01-01"
* period.end = "2020-12-31"
diff --git a/data/input/fsh/resources/quality-measure/QualityMeasurePractionerReport_Instance.fsh b/data/input/fsh/resources/quality-measure/QualityMeasurePractionerReport_Instance.fsh
index c0280f0593..17919ed8a9 100644
--- a/data/input/fsh/resources/quality-measure/QualityMeasurePractionerReport_Instance.fsh
+++ b/data/input/fsh/resources/quality-measure/QualityMeasurePractionerReport_Instance.fsh
@@ -22,7 +22,7 @@ Description: "Example measure report containing measure results for an attrib
* meta.extension[tenantId].valueString = "99999"
* meta.extension[ingestionBatchId].valueString = "b069a545-9506-40c6-8498-23de2e189143"
-* meta.extension[processOrganization].valueString = "IBM"
+* meta.extension[processOrganization].valueString = "HDC"
* meta.extension[processType].valueString = "Cohorting"
* meta.extension[processName].valueString = "Powersearch"
* meta.extension[processVersion].valueString = "1.0"
@@ -32,13 +32,13 @@ Description: "Example measure report containing measure results for an attrib
* identifier.type = ID-TYPE#RI
* identifier.system = "http://ibm.com/fhir/cdm/quality-measure-report"
* identifier.value = "36864f66-df3a-47c0-92e2-e8ec2e46eedb"
-* identifier.assigner.display = "IBM"
+* identifier.assigner.display = "HDC"
* status = #complete
* type = #subject-list
* subject = Reference(CDMPractitionerRole-Attributed-PCP)
* date = "2020-03-01T03:00:00Z"
-* reporter = Reference(IBM)
+* reporter = Reference(HDC)
* period.start = "2020-01-01"
* period.end = "2020-12-31"
diff --git a/data/input/fsh/resources/quality-measure/QualityMeasure_Instance.fsh b/data/input/fsh/resources/quality-measure/QualityMeasure_Instance.fsh
index 74f5e22fa0..66859f8faf 100644
--- a/data/input/fsh/resources/quality-measure/QualityMeasure_Instance.fsh
+++ b/data/input/fsh/resources/quality-measure/QualityMeasure_Instance.fsh
@@ -7,7 +7,7 @@ Description: "Example measure containing criteria for measure rules"
* meta.source = "http://ibm.com/fhir/quality-measure"
* meta.profile = "http://ibm.com/fhir/cdm/StructureDefinition/quality-measure"
-* meta.extension[processOrganization].valueString = "IBM"
+* meta.extension[processOrganization].valueString = "HDC"
* meta.extension[processType].valueString = "Measure Authoring"
* meta.extension[processName].valueString = "Measure Authoring Tool (MAT)"
* meta.extension[processVersion].valueString = "1.0"
@@ -17,7 +17,7 @@ Description: "Example measure containing criteria for measure rules"
* identifier[0].type = ID-TYPE#RI
* identifier[0].system = "http://ibm.com/fhir/cdm/quality-measure"
* identifier[0].value = "8f3a1491-a07f-4860-8977-e7dac7398175"
-* identifier[0].assigner.display = "IBM"
+* identifier[0].assigner.display = "HDC"
* url = "https://alvearie.io/alvearie-fhir-ig/Measure-QualityMeasureExample.html"
@@ -31,12 +31,12 @@ Description: "Example measure containing criteria for measure rules"
* lastReviewDate = "2020-01-01"
* effectivePeriod.start = "2020-01-01"
-* publisher = "IBM"
+* publisher = "HDC"
* contact[0].name = "Clinical Informatics"
* contact[0].telecom.system = #email
* contact[0].telecom.value = "ClinicalInformatics@us.ibm.com"
-* publisher = "IBM"
+* publisher = "HDC"
* description = "Percentage of patients 18-75 years of age with diabetes who had a hemoglobin A1c test performed within the measurement period"
* useContext.code = USAGE-CONTEXT-TYPE#focus
diff --git a/data/input/fsh/vocabulary/FFVSchedule.fsh b/data/input/fsh/vocabulary/FFVSchedule.fsh
index a2c410eebe..b321e037b8 100644
--- a/data/input/fsh/vocabulary/FFVSchedule.fsh
+++ b/data/input/fsh/vocabulary/FFVSchedule.fsh
@@ -1,7 +1,7 @@
CodeSystem: FFVScheduleCodeSystem
Id: ffv-schedule
Title: "Health Data Connect FFV Schedule Codes"
-Description: "IBM® Health Data Connect fee for value initiative schedule codes"
+Description: "Health Data Connect fee for value initiative schedule codes"
* ^caseSensitive = true
* #monthly "Monthly"
* #quarterly "Quarterly"
@@ -12,5 +12,5 @@ Description: "IBM® Health Data Connect fee for value initiative schedule cod
ValueSet: FFVScheduleValueSet
Id: ffv-schedule
Title: "Health Data Connect FFV Schedule Value Set"
-Description: "IBM® Health Data Connect valuset defining fee for value initiative schedule codes"
+Description: "Health Data Connect valuset defining fee for value initiative schedule codes"
* codes from system FFVScheduleCodeSystem
diff --git a/data/input/fsh/vocabulary/IdentifierTypeCodes.fsh b/data/input/fsh/vocabulary/IdentifierTypeCodes.fsh
index f03d19a43d..38b6edec73 100644
--- a/data/input/fsh/vocabulary/IdentifierTypeCodes.fsh
+++ b/data/input/fsh/vocabulary/IdentifierTypeCodes.fsh
@@ -1,9 +1,9 @@
CodeSystem: IdentifierTypeCodeSystem
Id: identifier-type
Title: "Identifier Type Codes"
-Description: "Extended set of Identifier type code for IBM Health Data Connect Common Data Model resources"
+Description: "Extended set of Identifier type code for Health Data Connect Common Data Model resources"
* ^caseSensitive = true
-* #DRI "Derived Resource Identifier" "Business identifier for derived resources created by an internal IBM process"
+* #DRI "Derived Resource Identifier" "Business identifier for derived resources created by an internal HDC process"
* #MDI "Match Data Identifier" "Shared business identifier that is created to link matched resources during MDI match processing"
* #RXN "Prescription Number" "RX or prescription number for a drug"
* #SSRI "Source System Row Identifier" "Represents the primary id from the original source system"
@@ -13,7 +13,7 @@ Description: "Extended set of Identifier type code for IBM Health Data Connec
ValueSet: IdentifierTypeValueSet
Id: identifier-type
Title: "Identifier Type Value Set"
-Description: "Extended set of identifier type codes from FHIR HL7 and extended IBM Health Data Connect Common Data Model resource identifiers"
+Description: "Extended set of identifier type codes from FHIR HL7 and extended Health Data Connect Common Data Model resource identifiers"
* codes from system http://terminology.hl7.org/CodeSystem/v2-0203
* codes from system IdentifierTypeCodeSystem
diff --git a/data/input/fsh/vocabulary/MajorDiagnosticCategoryCodes.fsh b/data/input/fsh/vocabulary/MajorDiagnosticCategoryCodes.fsh
index 0434205aff..2e0b8dcb57 100644
--- a/data/input/fsh/vocabulary/MajorDiagnosticCategoryCodes.fsh
+++ b/data/input/fsh/vocabulary/MajorDiagnosticCategoryCodes.fsh
@@ -1,7 +1,7 @@
CodeSystem: WHPayerMajorDiagnosticCategoryCodeSystem
Id: wh-payer-major-diagnostic-category
Title: "Health Data Connect Major Diagnostic Category Codes"
-Description: "IBM® Health Data Connect standard major diagnostic category codes"
+Description: "Health Data Connect standard major diagnostic category codes"
* ^caseSensitive = true
* #0 "Missing/Invalid Diagnosis" "Missing/Invalid Diagnosis"
* #1 "Nervous" "Nervous"
@@ -33,5 +33,5 @@ Description: "IBM® Health Data Connect standard major diagnostic category co
ValueSet: WHPayerMajorDiagnosticCategoryValueSet
Id: wh-payer-major-diagnostic-category
Title: "Major Diagnostic Category Value Set"
-Description: "IBM® Health Data Connect standard value set containing major diagnostic category codes"
+Description: "Health Data Connect standard value set containing major diagnostic category codes"
* codes from system WHPayerMajorDiagnosticCategoryCodeSystem
\ No newline at end of file
diff --git a/data/input/fsh/vocabulary/MeasurePopulationTypeCodes.fsh b/data/input/fsh/vocabulary/MeasurePopulationTypeCodes.fsh
index 74a3d88f4d..ca22d40d80 100644
--- a/data/input/fsh/vocabulary/MeasurePopulationTypeCodes.fsh
+++ b/data/input/fsh/vocabulary/MeasurePopulationTypeCodes.fsh
@@ -1,21 +1,21 @@
CodeSystem: MeasurePopulationTypeCodeSystem
Id: measure-population-type
Title: "Measure Population Type Codes"
-Description: "IBM Watson Health measure population types"
+Description: "Health Data Connect measure population types"
* ^caseSensitive = true
* #care-gap "Care Gap" "The care gap population contains patients and events that are non-compliant for the numerator, lacking the clinical action required to satisfy the conditions of the measure. These exclude pateints or events that are in exclusion or exception populations. The care gap is the primary focus for engagement."
ValueSet: MeasurePopulationTypeValueSet
Id: measure-population-type
Title: "Measure Population Type Value Set"
-Description: "IBM Watson Health measure population types"
+Description: "Health Data Connect measure population types"
* codes from system http://terminology.hl7.org/CodeSystem/measure-population
* codes from system MeasurePopulationTypeCodeSystem
ValueSet: QualityMeasurePopulationTypeValueSet
Id: quality-measure-population-type
Title: "Quality Measure Population Type Value Set"
-Description: "IBM Watson Health measure population types for qualiity measures"
+Description: "Health Data Connect measure population types for qualiity measures"
* codes from system http://terminology.hl7.org/CodeSystem/measure-population
* codes from system MeasurePopulationTypeCodeSystem
* exclude MEASURE-POPULATION#measure-population
diff --git a/data/input/fsh/vocabulary/MeasureScoringCodes.fsh b/data/input/fsh/vocabulary/MeasureScoringCodes.fsh
index f5cbf75928..ff4fc64118 100644
--- a/data/input/fsh/vocabulary/MeasureScoringCodes.fsh
+++ b/data/input/fsh/vocabulary/MeasureScoringCodes.fsh
@@ -1,7 +1,7 @@
ValueSet: QualityMeasureScoringValueSet
Id: quality-measure-scoring
Title: "Quality Measure Scoring Value Set"
-Description: "IBM Watson Health measure scoring methods for qualiity measures"
+Description: "Health Data Connect measure scoring methods for qualiity measures"
* codes from system http://terminology.hl7.org/CodeSystem/measure-scoring
* exclude MEASURE-SCORING#continuous-variable
* exclude MEASURE-SCORING#cohort
diff --git a/data/input/fsh/vocabulary/PatientStatusCodes.fsh b/data/input/fsh/vocabulary/PatientStatusCodes.fsh
index 154c55caf9..7f4979d7bf 100644
--- a/data/input/fsh/vocabulary/PatientStatusCodes.fsh
+++ b/data/input/fsh/vocabulary/PatientStatusCodes.fsh
@@ -52,7 +52,7 @@ Description: "Examples of customer-specific patient status codes"
ValueSet: PatientImportanceValueSet
Id: patient-importance
Title: "Patient Importance Value Set"
-Description: "Patient importance status codes derived from customer-specific code mappings, used to trigger or limit IBM Health Data Connect patient operations."
+Description: "Patient importance status codes derived from customer-specific code mappings, used to trigger or limit Health Data Connect patient operations."
* codes from valueset http://terminology.hl7.org/ValueSet/v3-PatientImportance
* codes from system PatientImportanceCodeSystem
diff --git a/data/input/fsh/vocabulary/ProcedureGroupCodes.fsh b/data/input/fsh/vocabulary/ProcedureGroupCodes.fsh
index a67160ab14..bb51ef3754 100644
--- a/data/input/fsh/vocabulary/ProcedureGroupCodes.fsh
+++ b/data/input/fsh/vocabulary/ProcedureGroupCodes.fsh
@@ -1,7 +1,7 @@
CodeSystem: WHPayerProcedureGroupCodeSystem
Id: wh-payer-procedure-group
Title: "Health Data Connect Procedure Group Codes"
-Description: "IBM® Health Data Connect standard procedure group codes"
+Description: "Health Data Connect standard procedure group codes"
* ^caseSensitive = true
* #1 "Incision & drainage of cyst" "Incision & drainage of cyst"
* #2 "Acne surgery" "Acne surgery"
@@ -203,5 +203,5 @@ Description: "IBM® Health Data Connect standard procedure group codes"
ValueSet: WHPayerProcedureGroupValueSet
Id: wh-payer-procedure-group
Title: "Procedure Group Value Set"
-Description: "IBM® Health Data Connect standard value set containing procedure group codes"
+Description: "Health Data Connect standard value set containing procedure group codes"
* codes from system WHPayerProcedureGroupCodeSystem
diff --git a/data/input/fsh/vocabulary/RxMailOrRetailCodes.fsh b/data/input/fsh/vocabulary/RxMailOrRetailCodes.fsh
index 5d67da73b0..478d98ed67 100644
--- a/data/input/fsh/vocabulary/RxMailOrRetailCodes.fsh
+++ b/data/input/fsh/vocabulary/RxMailOrRetailCodes.fsh
@@ -1,7 +1,7 @@
CodeSystem: RxMailOrRetailCodeSystem
Id: rx-mail-or-retail
Title: "Rx Mail Or Retail Codes"
-Description: "IBM® Health Data Connect standard codes indicating the purchase place of the prescription."
+Description: "Health Data Connect standard codes indicating the purchase place of the prescription."
* ^caseSensitive = true
* #m "Mail Order" "Mail Order"
* #r "Retail" "Retail"
@@ -9,5 +9,5 @@ Description: "IBM® Health Data Connect standard codes indicating the purchas
ValueSet: RxMailOrRetailValueSet
Id: rx-mail-or-retail
Title: "Rx Mail Or Retail Value Set"
-Description: "IBM® Health Data Connect standard value set indicating the purchase place of the prescription."
+Description: "Health Data Connect standard value set indicating the purchase place of the prescription."
* codes from system RxMailOrRetailCodeSystem
\ No newline at end of file
diff --git a/data/input/fsh/vocabulary/WHPayerClaimStatusCodes.fsh b/data/input/fsh/vocabulary/WHPayerClaimStatusCodes.fsh
index 5cdbaa662f..ad1dcaac79 100644
--- a/data/input/fsh/vocabulary/WHPayerClaimStatusCodes.fsh
+++ b/data/input/fsh/vocabulary/WHPayerClaimStatusCodes.fsh
@@ -1,7 +1,7 @@
CodeSystem: WhPayerClaimStatusCodeSystem
Id: wh-payer-claim-status
Title: "Health Data Connect Claim Status Codes"
-Description: "IBM® Health Data Connect standard code for the payment status of the claim."
+Description: "Health Data Connect standard code for the payment status of the claim."
* ^caseSensitive = true
* #P "Paid"
* #A "Adjusted"
@@ -10,5 +10,5 @@ Description: "IBM® Health Data Connect standard code for the payment status
ValueSet: WHPayerClaimStatusValueSet
Id: wh-payer-claim-status
Title: "Health Data Connect Claim Status Codes Value Set"
-Description: "IBM® Health Data Connect standard value set for the payment status of the claim."
+Description: "Health Data Connect standard value set for the payment status of the claim."
* codes from system WhPayerClaimStatusCodeSystem
diff --git a/data/input/fsh/vocabulary/WhClaimSubtypeCodes.fsh b/data/input/fsh/vocabulary/WhClaimSubtypeCodes.fsh
index f48894fd37..8c605cface 100644
--- a/data/input/fsh/vocabulary/WhClaimSubtypeCodes.fsh
+++ b/data/input/fsh/vocabulary/WhClaimSubtypeCodes.fsh
@@ -1,7 +1,7 @@
CodeSystem: WhClaimSubtypeCodeSystem
Id: wh-claim-subtype
Title: "Health Data Connect Claim Subtype Codes"
-Description: "IBM® Health Data Connect standard codes for the claim subtypes used to further define the claim type"
+Description: "Health Data Connect standard codes for the claim subtypes used to further define the claim type"
* ^caseSensitive = true
* #emergency "Emergency" "An indicator that this claim was an emergency"
* #inpatient "Inpatient" "Claims for inpatient institutional admissions"
@@ -11,5 +11,5 @@ Description: "IBM® Health Data Connect standard codes for the claim subtypes
ValueSet: WhClaimSubtypeValueSet
Id: wh-claim-subtype
Title: "Health Data Connect Claim Subtype Value Set"
-Description: "IBM® Health Data Connect value set for the claim subtypes used to further define the claim type"
+Description: "Health Data Connect value set for the claim subtypes used to further define the claim type"
* codes from system WhClaimSubtypeCodeSystem
diff --git a/data/input/fsh/vocabulary/WhDiagnosisTypeCodes.fsh b/data/input/fsh/vocabulary/WhDiagnosisTypeCodes.fsh
index 9c92b4dbfc..061a81ff2f 100644
--- a/data/input/fsh/vocabulary/WhDiagnosisTypeCodes.fsh
+++ b/data/input/fsh/vocabulary/WhDiagnosisTypeCodes.fsh
@@ -1,13 +1,13 @@
CodeSystem: WhDiagnosisTypeCodeSystem
Id: wh-diagnosis-type
Title: "Health Data Connect Diagnosis Type Codes"
-Description: "IBM® Health Data Connect standard codes for the diagnosis codes on a claim"
+Description: "Health Data Connect standard codes for the diagnosis codes on a claim"
* ^caseSensitive = true
* #external-cause "External Cause" "ICD diagnosis external cause code on the facility claim record"
ValueSet: WhDiagnosisTypeValueSet
Id: wh-diagnosis-type
Title: "Health Data Connect Diagnosis Type Value Set"
-Description: "IBM® Health Data Connect value set for the diagnosis codes on a claim"
+Description: "Health Data Connect value set for the diagnosis codes on a claim"
* codes from system WhDiagnosisTypeCodeSystem
* codes from system DIAGNOSIS-TYPE
diff --git a/data/input/fsh/vocabulary/WhPayerClaimAdjustmentTypeCodes.fsh b/data/input/fsh/vocabulary/WhPayerClaimAdjustmentTypeCodes.fsh
index 0611e50da1..4a43b65a38 100644
--- a/data/input/fsh/vocabulary/WhPayerClaimAdjustmentTypeCodes.fsh
+++ b/data/input/fsh/vocabulary/WhPayerClaimAdjustmentTypeCodes.fsh
@@ -1,7 +1,7 @@
CodeSystem: WhPayerClaimAdjustmentTypeCodeSystem
Id: wh-payer-claim-adjustment-type
Title: "Health Data Connect Claim Adjustment Type Codes"
-Description: "IBM® Health Data Connect standard codes for the type of adjustment for the claim"
+Description: "Health Data Connect standard codes for the type of adjustment for the claim"
* ^caseSensitive = true
* #1 "Adjustment (positive or negative adjustment)" "An adjustment is a claim line where one or more of the financial fields display the difference between the original amount and the final amount. Any financial not being adjusted should be zero as well as any quantity."
* #2 "Void (void, reversal or back-out)" "A void is a claim line where all financials and quantities are negated"
@@ -13,5 +13,5 @@ Description: "IBM® Health Data Connect standard codes for the type of adjust
ValueSet: WhPayerClaimAdjustmentTypeValueSet
Id: wh-payer-claim-adjustment-type
Title: "Health Data Connect Claim Adjustment Type Value Set"
-Description: "IBM® Health Data Connect standard value set for the type of adjustment for the claim"
+Description: "Health Data Connect standard value set for the type of adjustment for the claim"
* codes from system WhPayerClaimAdjustmentTypeCodeSystem
diff --git a/data/input/fsh/vocabulary/WhPayerClaimTypeCodes.fsh b/data/input/fsh/vocabulary/WhPayerClaimTypeCodes.fsh
index 54b58f348a..a71abb9d1f 100644
--- a/data/input/fsh/vocabulary/WhPayerClaimTypeCodes.fsh
+++ b/data/input/fsh/vocabulary/WhPayerClaimTypeCodes.fsh
@@ -1,7 +1,7 @@
CodeSystem: WhPayerClaimTypeCodeSystem
Id: wh-payer-claim-type
Title: "Health Data Connect Claim Type Codes"
-Description: "IBM® Health Data Connect stanard codes for the coverage type under which the claim was paid"
+Description: "Health Data Connect stanard codes for the coverage type under which the claim was paid"
* ^caseSensitive = true
* #medical "Medical claim; Institutional/Professional unknown" ""
* #institutional "Institutional; Hospital, clinic and typically inpatient claims" ""
@@ -27,5 +27,5 @@ Description: "IBM® Health Data Connect stanard codes for the coverage type u
ValueSet: ClaimTypeValueSet
Id: claim-type
Title: "Claim Type Value Set"
-Description: "IBM Health Data Connect standard value set for the coverage type under which the claim was paid"
+Description: "Health Data Connect standard value set for the coverage type under which the claim was paid"
* codes from system WhPayerClaimTypeCodeSystem
diff --git a/data/input/fsh/vocabulary/WhPayerCoverageClassCodes.fsh b/data/input/fsh/vocabulary/WhPayerCoverageClassCodes.fsh
index 670bafb339..9692a745c0 100644
--- a/data/input/fsh/vocabulary/WhPayerCoverageClassCodes.fsh
+++ b/data/input/fsh/vocabulary/WhPayerCoverageClassCodes.fsh
@@ -1,7 +1,7 @@
CodeSystem: WhPayerCoverageClassCodeSystem
Id: wh-payer-coverage-class
Title: "Health Data Connect Coverage Class Codes"
-Description: "IBM® Health Data Connect standard code for the coverage class"
+Description: "Health Data Connect standard code for the coverage class"
* ^caseSensitive = true
* #election-tier "Election Tier" "Elected tier for coverage"
* #group-type "Group Type" "Type of group for coverage"
@@ -9,6 +9,6 @@ Description: "IBM® Health Data Connect standard code for the coverage class"
ValueSet: WhPayerCoverageClassValueSet
Id: wh-payer-coverage-class
Title: "Health Data Connect Coverage Class Value Set"
-Description: "IBM® Health Data Connect standard value set for the coverage class"
+Description: "Health Data Connect standard value set for the coverage class"
* codes from system COVERAGE-CLASS
* codes from system WhPayerCoverageClassCodeSystem
diff --git a/data/input/fsh/vocabulary/WhPayerEducationLevelCodes.fsh b/data/input/fsh/vocabulary/WhPayerEducationLevelCodes.fsh
index a29ecb85dd..1d687c5215 100644
--- a/data/input/fsh/vocabulary/WhPayerEducationLevelCodes.fsh
+++ b/data/input/fsh/vocabulary/WhPayerEducationLevelCodes.fsh
@@ -1,7 +1,7 @@
CodeSystem: WhPayerEducationLevelCodeSystem
Id: wh-payer-education-level
Title: "Health Data Connect Education Level Codes"
-Description: "IBM® Health Data Connect standard code for the education level"
+Description: "Health Data Connect standard code for the education level"
* ^caseSensitive = true
* #A "Grade School or Less" "Grade School or Less"
* #B "Some High School" "Some High School"
@@ -14,5 +14,5 @@ Description: "IBM® Health Data Connect standard code for the education level
ValueSet: WhPayerEducationLevelValueSet
Id: wh-payer-education-level
Title: "Health Data Connect Education Level Value Set"
-Description: "IBM® Health Data Connect standard value set for the education level"
+Description: "Health Data Connect standard value set for the education level"
* codes from system WhPayerEducationLevelCodeSystem
diff --git a/data/input/fsh/vocabulary/WhPayerEmployeeStatusCodes.fsh b/data/input/fsh/vocabulary/WhPayerEmployeeStatusCodes.fsh
index c528f8dcb2..059336e721 100644
--- a/data/input/fsh/vocabulary/WhPayerEmployeeStatusCodes.fsh
+++ b/data/input/fsh/vocabulary/WhPayerEmployeeStatusCodes.fsh
@@ -1,7 +1,7 @@
CodeSystem: WhPayerEmployeeStatusCodeSystem
Id: wh-payer-employee-status-code
Title: "Health Data Connect Employee Status Codes"
-Description: "IBM® Health Data Connect standard employee status value set for claims"
+Description: "Health Data Connect standard employee status value set for claims"
* ^caseSensitive = true
* #1 "Active Full Time" "Active Full Time"
* #2 "Active Part-Time/Seasonal" "Active Part-Time/Seasonal"
@@ -16,5 +16,5 @@ Description: "IBM® Health Data Connect standard employee status value set fo
ValueSet: WhPayerEmployeeStatusValueSet
Id: wh-payer-employee-status-code
Title: "Health Data Connect Employee Status Value Set"
-Description: "IBM® Health Data Connect standard employee status value set for claims"
+Description: "Health Data Connect standard employee status value set for claims"
* codes from system WhPayerEmployeeStatusCodeSystem
\ No newline at end of file
diff --git a/data/input/fsh/vocabulary/WhPayerGenderCodes.fsh b/data/input/fsh/vocabulary/WhPayerGenderCodes.fsh
index 8972ec29ac..b46e34bde1 100644
--- a/data/input/fsh/vocabulary/WhPayerGenderCodes.fsh
+++ b/data/input/fsh/vocabulary/WhPayerGenderCodes.fsh
@@ -1,7 +1,7 @@
CodeSystem: WhPayerGenderCodeSystem
Id: wh-payer-gender
Title: "Health Data Connect Gender Codes"
-Description: "IBM® Health Data Connect gender code"
+Description: "Health Data Connect gender code"
* ^caseSensitive = true
* #M "Male" "Male"
* #F "Female" "Female"
@@ -9,5 +9,5 @@ Description: "IBM® Health Data Connect gender code"
ValueSet: WhPayerGenderValueSet
Id: wh-payer-gender
Title: "Health Data Connect Gender Value Set"
-Description: "IBM® Health Data Connect gender value set"
+Description: "Health Data Connect gender value set"
* codes from system WhPayerGenderCodeSystem
diff --git a/data/input/fsh/vocabulary/WhPayerIndicatorsCodes.fsh b/data/input/fsh/vocabulary/WhPayerIndicatorsCodes.fsh
index 7aa97f8072..0f8fd86411 100644
--- a/data/input/fsh/vocabulary/WhPayerIndicatorsCodes.fsh
+++ b/data/input/fsh/vocabulary/WhPayerIndicatorsCodes.fsh
@@ -1,7 +1,7 @@
CodeSystem: WhPayerIndicatorsCodeSystem
Id: wh-payer-indicators
Title: "Health Data Connect Indicator Codes"
-Description: "IBM® Health Data Connect indicator type code"
+Description: "Health Data Connect indicator type code"
* ^caseSensitive = true
* #Y "Yes" "Positive indication"
* #N "No" "Negative indication"
@@ -10,5 +10,5 @@ Description: "IBM® Health Data Connect indicator type code"
ValueSet: WhPayerIndicatorsValueSet
Id: wh-payer-indicators
Title: "Health Data Connect Indicator Value Set"
-Description: "IBM® Health Data Connect indicator type value set"
+Description: "Health Data Connect indicator type value set"
* codes from system WhPayerIndicatorsCodeSystem
diff --git a/data/input/fsh/vocabulary/WhPayerJobTitleCodes.fsh b/data/input/fsh/vocabulary/WhPayerJobTitleCodes.fsh
index 9125aa0d83..dac1022898 100644
--- a/data/input/fsh/vocabulary/WhPayerJobTitleCodes.fsh
+++ b/data/input/fsh/vocabulary/WhPayerJobTitleCodes.fsh
@@ -1,6 +1,6 @@
ValueSet: WhPayerJobTitleValueSet
Id: wh-payer-job-title-code
Title: "Health Data Connect Job Title Value Set"
-Description: "IBM® Health Data Connect value set for the job title, based on Bureau of Labor Statistics, Standard Occupational Classification (SOC) system."
+Description: "Health Data Connect value set for the job title, based on Bureau of Labor Statistics, Standard Occupational Classification (SOC) system."
* codes from system http://terminology.hl7.org/CodeSystem/soc
* codes from system WhPayerSubscriberRelationshipCodeSystem
diff --git a/data/input/fsh/vocabulary/WhPayerMedicareCoverageCodes.fsh b/data/input/fsh/vocabulary/WhPayerMedicareCoverageCodes.fsh
index 8655c32293..5ab55af303 100644
--- a/data/input/fsh/vocabulary/WhPayerMedicareCoverageCodes.fsh
+++ b/data/input/fsh/vocabulary/WhPayerMedicareCoverageCodes.fsh
@@ -1,7 +1,7 @@
CodeSystem: WhPayerMedicareCoverageCodeSystem
Id: wh-payer-medicare-coverage
Title: "Health Data Connect Medicare Coverage Codes"
-Description: "IBM® Health Data Connect standard code for the type of Medicare coverage, if any, for the person"
+Description: "Health Data Connect standard code for the type of Medicare coverage, if any, for the person"
* ^caseSensitive = true
* #2 "Both Parts A and B" "Both Parts A and B"
* #3 "Parts A, B and D" "Parts A, B and D"
@@ -15,5 +15,5 @@ Description: "IBM® Health Data Connect standard code for the type of Medicar
ValueSet: WhPayerMedicareCoverageValueSet
Id: wh-payer-medicare-coverage
Title: "Health Data Connect Medicare Coverage Value Set"
-Description: "IBM® Health Data Connect standard value set for the type of Medicare coverage, if any, for the person"
+Description: "Health Data Connect standard value set for the type of Medicare coverage, if any, for the person"
* codes from system WhPayerMedicareCoverageCodeSystem
diff --git a/data/input/fsh/vocabulary/WhPayerMedicationKnowledgeCostType.fsh b/data/input/fsh/vocabulary/WhPayerMedicationKnowledgeCostType.fsh
index 9157442a13..778bf8beb5 100644
--- a/data/input/fsh/vocabulary/WhPayerMedicationKnowledgeCostType.fsh
+++ b/data/input/fsh/vocabulary/WhPayerMedicationKnowledgeCostType.fsh
@@ -1,12 +1,12 @@
CodeSystem: WhPayerMedicationKnowledgeCostTypeCodeSystem
Id: medication-knowledge-cost-type
Title: "Health Data Connect Medication Knowledge Cost Type Codes"
-Description: "IBM® Health Data Connect medication knowledge cost type code"
+Description: "Health Data Connect medication knowledge cost type code"
* ^caseSensitive = true
* #federal-upper-limit "The federal upper limit price for the NDC of a drug claim"
ValueSet: WhPayerMedicationKnowledgeCostTypValueSet
Id: medication-knowledge-cost-type
Title: "Health Data Connect Medication Knowledge Cost Type Value Set"
-Description: "IBM® Health Data Connect medication knowledge cost type value set"
+Description: "Health Data Connect medication knowledge cost type value set"
* codes from system WhPayerMedicationKnowledgeCostTypeCodeSystem
diff --git a/data/input/fsh/vocabulary/WhPayerProviderTypeCodes.fsh b/data/input/fsh/vocabulary/WhPayerProviderTypeCodes.fsh
index cc69cfbc9a..cc200e6f2e 100644
--- a/data/input/fsh/vocabulary/WhPayerProviderTypeCodes.fsh
+++ b/data/input/fsh/vocabulary/WhPayerProviderTypeCodes.fsh
@@ -1,7 +1,7 @@
CodeSystem: WhPayerProviderTypeCodeSystem
Id: wh-payer-provider-type
Title: "Health Data Connect Provider Type Codes"
-Description: "IBM® Health Data Connect standard provider type code as reported on the claim."
+Description: "Health Data Connect standard provider type code as reported on the claim."
* ^caseSensitive = true
* #1 "Acute Care Hospital" ""
* #5 "Ambulatory Surgery Centers" ""
@@ -142,13 +142,13 @@ Description: "IBM® Health Data Connect standard provider type code as report
ValueSet: WhOrganizationTypeValueSet
Id: wh-organization-type
Title: "WH Organization Value Set"
-Description: "IBM Health Data Connect standard values for organization type"
+Description: "Health Data Connect standard values for organization type"
* codes from system WhPayerProviderTypeCodeSystem
* codes from system ORGANIZATION-TYPE
ValueSet: WhPractitionerRoleTypeValueSet
Id: wh-practitioner-role-type
Title: "WH Practitioner Role Type Value Set"
-Description: "IBM Health Data Connect standard values for practitioner role type"
+Description: "Health Data Connect standard values for practitioner role type"
* codes from system WhPayerProviderTypeCodeSystem
* codes from system PRACTITIONER-ROLE
diff --git a/data/input/fsh/vocabulary/WhPayerSubscriberRelationshipCodes.fsh b/data/input/fsh/vocabulary/WhPayerSubscriberRelationshipCodes.fsh
index d3938e8d06..da3d855e40 100644
--- a/data/input/fsh/vocabulary/WhPayerSubscriberRelationshipCodes.fsh
+++ b/data/input/fsh/vocabulary/WhPayerSubscriberRelationshipCodes.fsh
@@ -1,13 +1,13 @@
CodeSystem: WhPayerSubscriberRelationshipCodeSystem
Id: wh-payer-subscriber-relationship
Title: "Health Data Connect Subscriber Relationship Codes"
-Description: "IBM® Health Data Connect subscriber relationship value set for the relationship of the member to the contract holder"
+Description: "Health Data Connect subscriber relationship value set for the relationship of the member to the contract holder"
* ^caseSensitive = true
* #childother "The beneficiary can only be identified as a child or other dependent of the Subscriber." ""
ValueSet: WhPayerSubscriberRelationshipCodeValueSet
Id: wh-payer-subscriber-relationship
Title: "Health Data Connect Subscriber Relationship Value Set"
-Description: "IBM® Health Data Connect subscriber relationship value set for the relationship of the member to the contract holder"
+Description: "Health Data Connect subscriber relationship value set for the relationship of the member to the contract holder"
* codes from system http://terminology.hl7.org/CodeSystem/subscriber-relationship
* codes from system WhPayerSubscriberRelationshipCodeSystem
\ No newline at end of file
diff --git a/data/input/pagecontent/index.md b/data/input/pagecontent/index.md
index e2de7091a1..ad77e9ae4b 100644
--- a/data/input/pagecontent/index.md
+++ b/data/input/pagecontent/index.md
@@ -1,8 +1,8 @@
-### About FHIR and IBM Health Data Connect
+### About FHIR and Whole Health Data Connect
The Fast Healthcare Interoperability Resource (**FHIR**) is a standard for healthcare data exchange, published by the [Health Level Seven International](http://www.hl7.org/) (HL7®) standards organization.
-To build upon FHIR standards, [IBM® Watson Health](https://www.ibm.com/watson-health) has developed **IBM® Health Data Connect**. This Common Data Model Implementation Guide supports Health Data Connect data interoperability for a cross-section of healthcare use cases, and refers to the model defined by this implementation guide as the IBM Health Data Connect Common Data Model.
+To build upon FHIR standards, Whole Health Data Connect is a Common Data Model Implementation Guide designed to support data interoperability for a cross-section of healthcare use cases, and refers to the model defined by this implementation guide as the Health Data Connect Common Data Model.
### About the Common Data Model
@@ -20,7 +20,6 @@ This Implementation Guide is an extensive data reference. As a recommended launc
### License
FHIR® is the registered trademark of HL7 and is used with the permission of HL7. Use of the FHIR trademark does not constitute endorsement of this product by HL7.
-IBM and the IBM logo are trademarks of International Business Machines Corporation, registered in many jurisdictions worldwide. Other product and service names might be trademarks of IBM or other companies. A current list of IBM trademarks is available on [https://ibm.com/trademark](https://ibm.com/trademark).
### Release History
From febea96768b9d065c3df710a10bebaf30def98e0 Mon Sep 17 00:00:00 2001
From: Stuart Cox <22485529+coxstuart@users.noreply.github.com>
Date: Mon, 9 May 2022 16:36:59 -0500
Subject: [PATCH 05/14] Issue #77 - Remove IBM branding, replaced claro.com
text with acme.com
Signed-off-by: Stuart Cox <22485529+coxstuart@users.noreply.github.com>
---
.../CDM_Patient_WithDataQualityInsights_Instance.fsh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/data/input/fsh/resources/patient/CDM_Patient_WithDataQualityInsights_Instance.fsh b/data/input/fsh/resources/patient/CDM_Patient_WithDataQualityInsights_Instance.fsh
index 27039f2b22..cba02810cc 100644
--- a/data/input/fsh/resources/patient/CDM_Patient_WithDataQualityInsights_Instance.fsh
+++ b/data/input/fsh/resources/patient/CDM_Patient_WithDataQualityInsights_Instance.fsh
@@ -11,10 +11,10 @@ Description: "CDM Patient example where data quality process has specified va
//header for phone insights
* meta.extension[insight][0].extension[path].valueString = "contact.telecom.value(where system = 'phone')"
-* meta.extension[insight][0].extension[insightId].valueIdentifier.system = "http://www.claro.com/insights"
+* meta.extension[insight][0].extension[insightId].valueIdentifier.system = "http://www.acme.com/insights"
* meta.extension[insight][0].extension[insightId].valueIdentifier.value = "data-state-id-2"
-* meta.extension[insight][0].extension[sourceId].valueIdentifier.system = "http://www.claro.com/analytics/phone-validator"
-* meta.extension[insight][0].extension[sourceId].valueIdentifier.value = "watson-md"
+* meta.extension[insight][0].extension[sourceId].valueIdentifier.system = "http://www.acme.com/analytics/phone-validator"
+* meta.extension[insight][0].extension[sourceId].valueIdentifier.value = "coyote-md"
* meta.extension[insight][0].extension[detected].valueDateTime = "2020-01-01T03:01:00Z"
* meta.extension[insight][0].extension[category].valueCodeableConcept = InsightCategoryCodeSystem#data-quality
From f7b5e9060e6a6223eb6a9497b4a356497364c233 Mon Sep 17 00:00:00 2001
From: Stuart Cox <22485529+coxstuart@users.noreply.github.com>
Date: Mon, 9 May 2022 16:37:40 -0500
Subject: [PATCH 06/14] Issue #77 - Remove IBM branding, replaced IBM and
engagment product branding
Signed-off-by: Stuart Cox <22485529+coxstuart@users.noreply.github.com>
---
data/input/fsh/vocabulary/Attribution.fsh | 8 ++++----
.../input/fsh/vocabulary/EnagementProductCodes.fsh | 14 +++++++-------
.../vocabulary/EngagementCommunicationCodes.fsh | 2 +-
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/data/input/fsh/vocabulary/Attribution.fsh b/data/input/fsh/vocabulary/Attribution.fsh
index a387c31ced..8e6793e685 100644
--- a/data/input/fsh/vocabulary/Attribution.fsh
+++ b/data/input/fsh/vocabulary/Attribution.fsh
@@ -5,8 +5,8 @@ Description: "Types of attribution used to associate a patient to a provider"
* ^caseSensitive = true
* #adv-imputed-pcp "Advantage Imputed PCP" "Primary care physician imputed by the Advantage pipeline"
* #client-emr-pcp "Client EMR PCP" "Primary care physician recorded in a client's PMS or EMR system"
-* #eng-attr-pcp "Engagement Attributed PCP" "Primary care physician attributed by the Engagement pipeline"
-* #eng-attr-specialist "Engagement Attributed Specialist" "Specialist physician attributed by the Engagement pipeline"
+* #eng-attr-pcp "Engagement Attributed PCP" "Primary care physician attributed by the patient engagement pipeline"
+* #eng-attr-specialist "Engagement Attributed Specialist" "Specialist physician attributed by the patient engagement pipeline"
* #enrollment "Enrollment" "Practitioner provided on the eligibility record"
ValueSet: AttributionCodeValueSet
@@ -37,8 +37,8 @@ Id: attribution-product
Title: "Attribution Product Codes"
Description: "Product that associate a patient to a practitioner"
* ^caseSensitive = true
-* #advantage "Advantage Suite" "Primary care physician imputed by the Advantage pipeline"
-* #engagement "Engagement" "Practitioner attributed by the Engagement pipeline"
+* #advantage "Advantage Suite" "Primary care physician imputed by the Advantage pipeline"
+* #engagement "Engagement" "Practitioner attributed by the Engagement pipeline"
ValueSet: AttributionProductValueSet
Id: attribution-product
diff --git a/data/input/fsh/vocabulary/EnagementProductCodes.fsh b/data/input/fsh/vocabulary/EnagementProductCodes.fsh
index 78e1050961..3cd034ecc5 100644
--- a/data/input/fsh/vocabulary/EnagementProductCodes.fsh
+++ b/data/input/fsh/vocabulary/EnagementProductCodes.fsh
@@ -1,16 +1,16 @@
+/*
CodeSystem: EngagementProductCodeSystem
Id: eng-product
Title: "Engagement Product Codes"
-Description: "IBM Watson Health engagement products"
+Description: "Health Data Connect engagement products"
* ^caseSensitive = true
-* #campaign "Campaign" "Custom campaigns configured by customers in IBM® Phytel Coordinate"
-* #coordinate "Coordinate" "Coordinate communications"
-* #ihe "IHE" "IBM® Intelligent Health Engagement"
-* #outreach "Outreach" "Automated outreach communications based on care gaps"
-* #remind "Remind" "Automated appointment reminders"
+* #campaign "Campaign" "Custom campaigns configured for patient engagment"
+* #care-gap "Care Gap" "Automated comminications based on cohorting and patient care gaps"
+* #appt-reminder "Remind" "Automated appointment reminders"
ValueSet: EngagementProductValueSet
Id: eng-product
Title: "Engagement Product Value Set"
-Description: "IBM Watson Health engagement products"
+Description: ""Health Data Connect engagement products"
* codes from system EngagementProductCodeSystem
+*/
diff --git a/data/input/fsh/vocabulary/EngagementCommunicationCodes.fsh b/data/input/fsh/vocabulary/EngagementCommunicationCodes.fsh
index 7b1372acba..9e8296c17d 100644
--- a/data/input/fsh/vocabulary/EngagementCommunicationCodes.fsh
+++ b/data/input/fsh/vocabulary/EngagementCommunicationCodes.fsh
@@ -41,7 +41,7 @@ Description: "Status codes detailing the reason and status history for an Eng
* #np-sender-email-disabled "Not Processed - Email disabled for sender" "CommunicationRequest not processed because sender has email communications disabled."
* #np-sender-sms-disabled "Not Processed - SMS text disabled for sender" "CommunicationRequest not processed because sender has SMS text communications disabled."
* #np-service-refused "Not Processed - Service refused" "CommunicationRequest not processed because the patient indicates they refuse the service."
-* #np-std-outreach-pending "Not Processed - Standard outreach pending" "CommunicationRequest not processed because conversation was not activated after multiple attempts. Standard outreach communication sent."
+* #np-std-care-gap-pending "Not Processed - Standard care gap pending" "CommunicationRequest not processed because conversation was not activated after multiple attempts. Standard care gap communication sent."
* #np-tenant-email-disabled "Not Processed - Email disabled for tenant" "CommunicationRequest not processed because tenant has email communications disabled."
* #np-tenant-sms-disabled "Not Processed - SMS text disabled for tenant" "CommunicationRequest not processed because tenant has SMS text communications disabled."
* #np-today-holiday "Not Processed - Today is a holiday" "CommunicationRequest not processed because tenant has this date configured as a holiday."
From e101b7ffa3e11c4ec7c761040e4de3825d62c701 Mon Sep 17 00:00:00 2001
From: Stuart Cox <22485529+coxstuart@users.noreply.github.com>
Date: Mon, 9 May 2022 16:54:27 -0500
Subject: [PATCH 07/14] Issue #77 - Remove IBM branding, replaced IBM and
engagment ihe product branding
Signed-off-by: Stuart Cox <22485529+coxstuart@users.noreply.github.com>
---
data/input/fsh/extensions/CommunicationExtensions.fsh | 2 +-
.../fsh/resources/communication/Engagement_Communication.fsh | 4 ++--
.../communication/Engagement_CommunicationRequest.fsh | 4 ++--
.../Engagement_CommunicationRequest_Instance.fsh | 2 +-
.../communication/Engagement_Communication_Instance.fsh | 2 +-
data/input/fsh/vocabulary/EnagementProductCodes.fsh | 4 +---
6 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/data/input/fsh/extensions/CommunicationExtensions.fsh b/data/input/fsh/extensions/CommunicationExtensions.fsh
index a9f9aae338..d391f757c8 100644
--- a/data/input/fsh/extensions/CommunicationExtensions.fsh
+++ b/data/input/fsh/extensions/CommunicationExtensions.fsh
@@ -45,7 +45,7 @@ Description: "Mode of communication (phone | sms | email | mail | chat)"
Extension: ConversationType
Id: conversation-type
Title: "Conversation Type"
-Description: "Type of conversation, used for ihe chat communications"
+Description: "Type of conversation, used for chat communications"
* value[x] only CodeableConcept
* valueCodeableConcept from EngagementConversationTypeValueSet (extensible)
diff --git a/data/input/fsh/resources/communication/Engagement_Communication.fsh b/data/input/fsh/resources/communication/Engagement_Communication.fsh
index 06e98a5610..d01a01835e 100644
--- a/data/input/fsh/resources/communication/Engagement_Communication.fsh
+++ b/data/input/fsh/resources/communication/Engagement_Communication.fsh
@@ -28,8 +28,8 @@ Description: "This profile is a record of an engagement communication to a pa
* extension contains ConversationType named conversationType 0..1
* extension[conversationType].valueCodeableConcept from EngagementConversationTypeValueSet (extensible)
-* extension[conversationType] ^short = "Type of conversation, used for ihe chat communications"
-* extension[conversationType] ^definition = "Type of conversation, used for ihe chat communications"
+* extension[conversationType] ^short = "Type of conversation, used for chat communications"
+* extension[conversationType] ^definition = "Type of conversation, used for chat communications"
* extension contains CommunicationReengagement named communicationReengagement 0..1
* extension[communicationReengagement] ^short = "Sequence for subsequent communication attempts to reengage the patient"
diff --git a/data/input/fsh/resources/communication/Engagement_CommunicationRequest.fsh b/data/input/fsh/resources/communication/Engagement_CommunicationRequest.fsh
index 46ad6f1651..6a3175a6cc 100644
--- a/data/input/fsh/resources/communication/Engagement_CommunicationRequest.fsh
+++ b/data/input/fsh/resources/communication/Engagement_CommunicationRequest.fsh
@@ -25,8 +25,8 @@ Description: "This profile is a record of an engagement request for a communi
* extension contains ConversationType named conversationType 0..1
* extension[conversationType].valueCodeableConcept from EngagementConversationTypeValueSet (extensible)
-* extension[conversationType] ^short = "Type of conversation, used for ihe chat communications"
-* extension[conversationType] ^definition = "Type of conversation, used for ihe chat communications"
+* extension[conversationType] ^short = "Type of conversation, used for chat communications"
+* extension[conversationType] ^definition = "Type of conversation, used for chat communications"
* extension contains CommunicationReengagement named communicationReengagement 0..1
* extension[communicationReengagement] ^short = "Sequence for subsequent communication attempts to reengage the patient"
diff --git a/data/input/fsh/resources/communication/Engagement_CommunicationRequest_Instance.fsh b/data/input/fsh/resources/communication/Engagement_CommunicationRequest_Instance.fsh
index feb799bc76..62e6c44529 100644
--- a/data/input/fsh/resources/communication/Engagement_CommunicationRequest_Instance.fsh
+++ b/data/input/fsh/resources/communication/Engagement_CommunicationRequest_Instance.fsh
@@ -29,7 +29,7 @@ Description: "Example of an engagement communication request to send a SMS te
* priority = #routine
* category = COMMUNICATION-CATEGORY#notification
-* extension[communicationProduct].valueCodeableConcept = EngagementProductCodeSystem#ihe
+* extension[communicationProduct].valueCodeableConcept = EngagementProductCodeSystem#care-gap
* extension[conversationType].valueCodeableConcept = EngagementConversationTypeCodeSystem#gap-in-care
* extension[communicationOnBehalfOf].valueReference = Reference(CDMPractitionerRole-Attributed-PCP)
diff --git a/data/input/fsh/resources/communication/Engagement_Communication_Instance.fsh b/data/input/fsh/resources/communication/Engagement_Communication_Instance.fsh
index 104b4c27fa..13d60fd32e 100644
--- a/data/input/fsh/resources/communication/Engagement_Communication_Instance.fsh
+++ b/data/input/fsh/resources/communication/Engagement_Communication_Instance.fsh
@@ -34,7 +34,7 @@ Description: "Example of an engagement communication to send a SMS text to a
* priority = #routine
* category = COMMUNICATION-CATEGORY#notification
-* extension[communicationProduct].valueCodeableConcept = EngagementProductCodeSystem#ihe
+* extension[communicationProduct].valueCodeableConcept = EngagementProductCodeSystem#care-gap
* extension[conversationType].valueCodeableConcept = EngagementConversationTypeCodeSystem#gap-in-care
* extension[communicationOnBehalfOf].valueReference = Reference(CDMPractitionerRole-Attributed-PCP)
diff --git a/data/input/fsh/vocabulary/EnagementProductCodes.fsh b/data/input/fsh/vocabulary/EnagementProductCodes.fsh
index 3cd034ecc5..e2bb4cdb64 100644
--- a/data/input/fsh/vocabulary/EnagementProductCodes.fsh
+++ b/data/input/fsh/vocabulary/EnagementProductCodes.fsh
@@ -1,4 +1,3 @@
-/*
CodeSystem: EngagementProductCodeSystem
Id: eng-product
Title: "Engagement Product Codes"
@@ -11,6 +10,5 @@ Description: "Health Data Connect engagement products"
ValueSet: EngagementProductValueSet
Id: eng-product
Title: "Engagement Product Value Set"
-Description: ""Health Data Connect engagement products"
+Description: "Health Data Connect engagement products"
* codes from system EngagementProductCodeSystem
-*/
From 01d019c29c2ebcb478720f7cb99735dc4aaebf8f Mon Sep 17 00:00:00 2001
From: Stuart Cox <22485529+coxstuart@users.noreply.github.com>
Date: Mon, 9 May 2022 16:54:41 -0500
Subject: [PATCH 08/14] Issue #77 - Remove IBM branding, replaced IBM and
engagment ihe product branding
Signed-off-by: Stuart Cox <22485529+coxstuart@users.noreply.github.com>
---
.../patient/CDM_Patient_OptOut_Instance.fsh | 36 +++++++++----------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/data/input/fsh/resources/patient/CDM_Patient_OptOut_Instance.fsh b/data/input/fsh/resources/patient/CDM_Patient_OptOut_Instance.fsh
index 4cb34f677d..dc65ae06ac 100644
--- a/data/input/fsh/resources/patient/CDM_Patient_OptOut_Instance.fsh
+++ b/data/input/fsh/resources/patient/CDM_Patient_OptOut_Instance.fsh
@@ -33,62 +33,62 @@ Usage: #example
* extension[communicationOptOut][0].extension[statedReason].valueCodeableConcept.text = "Global opt-out example: all products, all communication modes, all conversation types"
* extension[communicationOptOut][0].extension[effectivePeriod].valuePeriod.start = "2020-01-01T00:00:00Z"
* extension[communicationOptOut][0].extension[2].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-organization"
-* extension[communicationOptOut][0].extension[2].valueString = "IBM"
+* extension[communicationOptOut][0].extension[2].valueString = "HDC"
* extension[communicationOptOut][0].extension[3].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-type"
* extension[communicationOptOut][0].extension[3].valueString = "Patient Portal"
* extension[communicationOptOut][0].extension[4].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-name"
-* extension[communicationOptOut][0].extension[4].valueString = "IHE"
+* extension[communicationOptOut][0].extension[4].valueString = "care-gap"
* extension[communicationOptOut][0].extension[5].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-version"
* extension[communicationOptOut][0].extension[5].valueString = "1.0"
* extension[communicationOptOut][0].extension[6].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-timestamp"
* extension[communicationOptOut][0].extension[6].valueDateTime = "2020-01-01T13:01:00Z"
* extension[communicationOptOut][1].extension[statedReason].valueCodeableConcept = EngagementOptOutReasonCodeSystem#other
-* extension[communicationOptOut][1].extension[statedReason].valueCodeableConcept.text = "Product-specific opt-out example: IHE only, all modes, health reminders only)"
-* extension[communicationOptOut][1].extension[communicationProduct].valueCodeableConcept = EngagementProductCodeSystem#ihe
+* extension[communicationOptOut][1].extension[statedReason].valueCodeableConcept.text = "Product-specific opt-out example: care-gap only, all modes, health reminders only)"
+* extension[communicationOptOut][1].extension[communicationProduct].valueCodeableConcept = EngagementProductCodeSystem#care-gap
* extension[communicationOptOut][1].extension[conversationType].valueCodeableConcept = EngagementConversationTypeCodeSystem#gap-in-care
* extension[communicationOptOut][1].extension[effectivePeriod].valuePeriod.start = "2020-01-01T00:00:00Z"
* extension[communicationOptOut][1].extension[4].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-organization"
-* extension[communicationOptOut][1].extension[4].valueString = "IBM"
+* extension[communicationOptOut][1].extension[4].valueString = "HDC"
* extension[communicationOptOut][1].extension[5].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-type"
* extension[communicationOptOut][1].extension[5].valueString = "Patient Portal"
* extension[communicationOptOut][1].extension[6].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-name"
-* extension[communicationOptOut][1].extension[6].valueString = "IHE"
+* extension[communicationOptOut][1].extension[6].valueString = "care-gap"
* extension[communicationOptOut][1].extension[7].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-version"
* extension[communicationOptOut][1].extension[7].valueString = "1.0"
* extension[communicationOptOut][1].extension[8].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-timestamp"
* extension[communicationOptOut][1].extension[8].valueDateTime = "2020-01-01T13:01:00Z"
* extension[communicationOptOut][2].extension[statedReason].valueCodeableConcept = EngagementOptOutReasonCodeSystem#other
-* extension[communicationOptOut][2].extension[statedReason].valueCodeableConcept.text = "Product-specific opt-out example: IHE only, all modes, appointment reminders only)"
-* extension[communicationOptOut][2].extension[communicationProduct].valueCodeableConcept = EngagementProductCodeSystem#ihe
+* extension[communicationOptOut][2].extension[statedReason].valueCodeableConcept.text = "Product-specific opt-out example: care-gap only, all modes, appointment reminders only)"
+* extension[communicationOptOut][2].extension[communicationProduct].valueCodeableConcept = EngagementProductCodeSystem#care-gap
* extension[communicationOptOut][2].extension[conversationType].valueCodeableConcept = EngagementConversationTypeCodeSystem#appointment-reminder
* extension[communicationOptOut][2].extension[effectivePeriod].valuePeriod.start = "2020-01-01T00:00:00Z"
* extension[communicationOptOut][2].extension[4].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-organization"
-* extension[communicationOptOut][2].extension[4].valueString = "IBM"
+* extension[communicationOptOut][2].extension[4].valueString = "HDC"
* extension[communicationOptOut][2].extension[5].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-type"
* extension[communicationOptOut][2].extension[5].valueString = "Patient Portal"
* extension[communicationOptOut][2].extension[6].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-name"
-* extension[communicationOptOut][2].extension[6].valueString = "IHE"
+* extension[communicationOptOut][2].extension[6].valueString = "care-gap"
* extension[communicationOptOut][2].extension[7].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-version"
* extension[communicationOptOut][2].extension[7].valueString = "1.0"
* extension[communicationOptOut][2].extension[8].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-timestamp"
* extension[communicationOptOut][2].extension[8].valueDateTime = "2020-01-01T13:01:00Z"
* extension[communicationOptOut][3].extension[statedReason].valueCodeableConcept = EngagementOptOutReasonCodeSystem#other
-* extension[communicationOptOut][3].extension[statedReason].valueCodeableConcept.text = "Product-specific opt-out example: IHE only, sms text only, limited to one care gap)"
-* extension[communicationOptOut][3].extension[communicationProduct].valueCodeableConcept = EngagementProductCodeSystem#ihe
+* extension[communicationOptOut][3].extension[statedReason].valueCodeableConcept.text = "Product-specific opt-out example: care-gap only, sms text only, limited to one care gap)"
+* extension[communicationOptOut][3].extension[communicationProduct].valueCodeableConcept = EngagementProductCodeSystem#care-gap
* extension[communicationOptOut][3].extension[communicationMode].valueCodeableConcept = EngagementCommunicationModeCodeSystem#sms
* extension[communicationOptOut][3].extension[effectivePeriod].valuePeriod.start = "2020-01-01T00:00:00Z"
//* extension[communicationOptOut][3].extension[communicationCareGap].valueString = "dm-hba1c-caregap-poor-control"
* extension[communicationOptOut][3].extension[4].url = "http://ibm.com/fhir/cdm/StructureDefinition/communication-care-gap"
* extension[communicationOptOut][3].extension[4].valueString = "dm-hba1c-caregap-poor-control"
* extension[communicationOptOut][3].extension[5].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-organization"
-* extension[communicationOptOut][3].extension[5].valueString = "IBM"
+* extension[communicationOptOut][3].extension[5].valueString = "HDC"
* extension[communicationOptOut][3].extension[6].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-type"
* extension[communicationOptOut][3].extension[6].valueString = "Patient Portal"
* extension[communicationOptOut][3].extension[7].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-name"
-* extension[communicationOptOut][3].extension[7].valueString = "IHE"
+* extension[communicationOptOut][3].extension[7].valueString = "care-gap"
* extension[communicationOptOut][3].extension[8].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-version"
* extension[communicationOptOut][3].extension[8].valueString = "1.0"
* extension[communicationOptOut][3].extension[9].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-timestamp"
@@ -96,16 +96,16 @@ Usage: #example
* extension[communicationOptOut][4].extension[statedReason].valueCodeableConcept = EngagementOptOutReasonCodeSystem#other
-* extension[communicationOptOut][4].extension[statedReason].valueCodeableConcept.text = "TEMPORARY product-specific opt-out example: IHE only, all modes, all conversation types, all care gaps"
-* extension[communicationOptOut][4].extension[communicationProduct].valueCodeableConcept = EngagementProductCodeSystem#ihe
+* extension[communicationOptOut][4].extension[statedReason].valueCodeableConcept.text = "TEMPORARY product-specific opt-out example: care-gap only, all modes, all conversation types, all care gaps"
+* extension[communicationOptOut][4].extension[communicationProduct].valueCodeableConcept = EngagementProductCodeSystem#care-gap
* extension[communicationOptOut][4].extension[effectivePeriod].valuePeriod.start = "2020-01-01T00:00:00Z"
* extension[communicationOptOut][4].extension[effectivePeriod].valuePeriod.end = "2020-03-30T00:00:00Z"
* extension[communicationOptOut][4].extension[3].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-organization"
-* extension[communicationOptOut][4].extension[3].valueString = "IBM"
+* extension[communicationOptOut][4].extension[3].valueString = "HDC"
* extension[communicationOptOut][4].extension[4].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-type"
* extension[communicationOptOut][4].extension[4].valueString = "Patient Portal"
* extension[communicationOptOut][4].extension[5].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-name"
-* extension[communicationOptOut][4].extension[5].valueString = "IHE"
+* extension[communicationOptOut][4].extension[5].valueString = "care-gap"
* extension[communicationOptOut][4].extension[6].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-version"
* extension[communicationOptOut][4].extension[6].valueString = "1.0"
* extension[communicationOptOut][4].extension[7].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-timestamp"
From 7409dfbb6974567e43d12055259fdf1db9fc6ab6 Mon Sep 17 00:00:00 2001
From: Stuart Cox <22485529+coxstuart@users.noreply.github.com>
Date: Mon, 9 May 2022 16:55:27 -0500
Subject: [PATCH 09/14] Issue #77 - Remove IBM branding, replaced IBM and
engagment ihe product branding
Signed-off-by: Stuart Cox <22485529+coxstuart@users.noreply.github.com>
---
.../fsh/resources/patient/CDM_Patient_Attributed_Instance.fsh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/input/fsh/resources/patient/CDM_Patient_Attributed_Instance.fsh b/data/input/fsh/resources/patient/CDM_Patient_Attributed_Instance.fsh
index e9a50b13e3..222224d5a2 100644
--- a/data/input/fsh/resources/patient/CDM_Patient_Attributed_Instance.fsh
+++ b/data/input/fsh/resources/patient/CDM_Patient_Attributed_Instance.fsh
@@ -66,7 +66,7 @@ Usage: #example
// Imputed pcp for Advantage
* generalPractitioner[3] = Reference(CDMPractitionerRole-Imputed-PCP)
* generalPractitioner[3].extension[referenceCode][0].valueCoding = AttributionSourceCodeSystem#imputed
-* generalPractitioner[3].extension[referenceCode][1].valueCoding = AttributionProductCodeSystem#hdc
+* generalPractitioner[3].extension[referenceCode][1].valueCoding = AttributionProductCodeSystem#care-gap
* generalPractitioner[3].extension[referencePeriod].valuePeriod.start = "2020-02-14"
* generalPractitioner[3].extension[3].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-organization"
* generalPractitioner[3].extension[3].valueString = "HDC"
From c3dce6a85137cccad81aa939f4479f4960b0b06a Mon Sep 17 00:00:00 2001
From: Stuart Cox <22485529+coxstuart@users.noreply.github.com>
Date: Mon, 9 May 2022 17:05:11 -0500
Subject: [PATCH 10/14] Issue #77 - Remove IBM branding, replaced IBM and
engagment ihe product branding
Signed-off-by: Stuart Cox <22485529+coxstuart@users.noreply.github.com>
---
.../fsh/resources/patient/CDM_Patient_Attributed_Instance.fsh | 2 +-
.../input/fsh/resources/patient/CDM_Patient_OptOut_Instance.fsh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/data/input/fsh/resources/patient/CDM_Patient_Attributed_Instance.fsh b/data/input/fsh/resources/patient/CDM_Patient_Attributed_Instance.fsh
index 222224d5a2..0c5ea46cdd 100644
--- a/data/input/fsh/resources/patient/CDM_Patient_Attributed_Instance.fsh
+++ b/data/input/fsh/resources/patient/CDM_Patient_Attributed_Instance.fsh
@@ -66,7 +66,7 @@ Usage: #example
// Imputed pcp for Advantage
* generalPractitioner[3] = Reference(CDMPractitionerRole-Imputed-PCP)
* generalPractitioner[3].extension[referenceCode][0].valueCoding = AttributionSourceCodeSystem#imputed
-* generalPractitioner[3].extension[referenceCode][1].valueCoding = AttributionProductCodeSystem#care-gap
+* generalPractitioner[3].extension[referenceCode][1].valueCoding = AttributionProductCodeSystem#engagement
* generalPractitioner[3].extension[referencePeriod].valuePeriod.start = "2020-02-14"
* generalPractitioner[3].extension[3].url = "http://ibm.com/fhir/cdm/StructureDefinition/process-organization"
* generalPractitioner[3].extension[3].valueString = "HDC"
diff --git a/data/input/fsh/resources/patient/CDM_Patient_OptOut_Instance.fsh b/data/input/fsh/resources/patient/CDM_Patient_OptOut_Instance.fsh
index dc65ae06ac..c612179e71 100644
--- a/data/input/fsh/resources/patient/CDM_Patient_OptOut_Instance.fsh
+++ b/data/input/fsh/resources/patient/CDM_Patient_OptOut_Instance.fsh
@@ -20,7 +20,7 @@ Usage: #example
* identifier[1].type = IdentifierTypeCodeSystem#MDI
* identifier[1].system = "http://ibm.com/fhir/primary/patient-match-identifier"
* identifier[1].value = "82587288-b8d8-4c3a-a3a6-4f3ba901cc7e"
-* identifier[1].assigner.display = "IBM"
+* identifier[1].assigner.display = "HDC"
* name.given = "Frasier"
* name.family = "Crane"
From 9fe0ac2e2431d8d71f1e860a046577b61839ab38 Mon Sep 17 00:00:00 2001
From: Stuart Cox <22485529+coxstuart@users.noreply.github.com>
Date: Tue, 10 May 2022 13:49:41 -0500
Subject: [PATCH 11/14] Issue #80 - Add InsuredRank and InsuredCategory
extensions to CDMEncounter profile
Signed-off-by: Stuart Cox <22485529+coxstuart@users.noreply.github.com>
---
.../fsh/extensions/EncounterExtensions.fsh | 20 +++++++++++++++++++
.../fsh/resources/encounter/CDM_Encounter.fsh | 6 +++++-
.../fsh/vocabulary/InsuredCategoryCodes.fsh | 20 +++++++++++++++++++
3 files changed, 45 insertions(+), 1 deletion(-)
create mode 100644 data/input/fsh/extensions/EncounterExtensions.fsh
create mode 100644 data/input/fsh/vocabulary/InsuredCategoryCodes.fsh
diff --git a/data/input/fsh/extensions/EncounterExtensions.fsh b/data/input/fsh/extensions/EncounterExtensions.fsh
new file mode 100644
index 0000000000..3a182bb143
--- /dev/null
+++ b/data/input/fsh/extensions/EncounterExtensions.fsh
@@ -0,0 +1,20 @@
+Extension: InsuredRank
+Id: insured-rank
+Title: "Insured Rank"
+Description: "Ordered rank to associate with an insurance option within a particular context (such as an Encounter)"
+* value[x] only positiveInt
+
+Extension: InsuredCategory
+Id: insured-category
+Title: "Insured Category"
+Description: "Category of insurance"
+* value[x] only CodeableConcept
+* valueCodeableConcept from InsuredCategoryValueSet (extensible)
+
+Extension: Insured
+Id: insured
+Title: "Insured"
+Description: "Container for elements providing insurance context"
+* extension contains
+ InsuredRank named insuredRank 0..1 and
+ InsuredCategory named insuredCategory 0..*
diff --git a/data/input/fsh/resources/encounter/CDM_Encounter.fsh b/data/input/fsh/resources/encounter/CDM_Encounter.fsh
index bb73b080ee..119b47e37c 100644
--- a/data/input/fsh/resources/encounter/CDM_Encounter.fsh
+++ b/data/input/fsh/resources/encounter/CDM_Encounter.fsh
@@ -27,4 +27,8 @@ Description: "Health Data Connect Common Data Model definition of what fields
* identifier[Source].system 1..1
* identifier[Source].value 1..1
-* class from EncounterClassValueSet (extensible)
\ No newline at end of file
+* class from EncounterClassValueSet (extensible)
+
+* extension contains Insured named insured 0..*
+* extension[insured] ^short = "Insurance context for the encounter"
+* extension[insured] ^definition = "Insurance context for the encounter"
\ No newline at end of file
diff --git a/data/input/fsh/vocabulary/InsuredCategoryCodes.fsh b/data/input/fsh/vocabulary/InsuredCategoryCodes.fsh
new file mode 100644
index 0000000000..9d23caaa58
--- /dev/null
+++ b/data/input/fsh/vocabulary/InsuredCategoryCodes.fsh
@@ -0,0 +1,20 @@
+CodeSystem: InsuredCategoryCodeSystem
+Id: insured-category
+Title: "Insured Category Code System"
+Description: "Code system that defines a category of insurance"
+* ^caseSensitive = true
+* #PRIVATE "Private" "Private"
+* #MEDICARE "Medicare" "Medicare"
+* #RESEARCH "Research" "Research"
+* #DENTAL "Dental" "Dental"
+* #MEDICAID "Medicaid" "Medicaid"
+* #OTHERPUBLIC "Other Public" "Other Public"
+* #OTHER "Other" "Other"
+* #UNKNOWN "Unknown" "Unknown"
+* #SELFPAY "Self Pay" "Self Pay"
+
+ValueSet: InsuredCategoryValueSet
+Id: insured-category
+Title: "Insured Category Value Set"
+Description: "Value set that defines a category of insurance"
+* codes from system InsuredCategoryCodeSystem
From e61a83e5d688e75c45b009bd88350b4e057d500e Mon Sep 17 00:00:00 2001
From: Stuart Cox <22485529+coxstuart@users.noreply.github.com>
Date: Tue, 10 May 2022 13:50:11 -0500
Subject: [PATCH 12/14] Issue #77 - Remove IBM branding, removed Watson logo
Signed-off-by: Stuart Cox <22485529+coxstuart@users.noreply.github.com>
---
.../content/assets/images/alvearieLogo.png | Bin 48830 -> 0 bytes
.../includes/_append.fragment-header.html | 6 +++++-
2 files changed, 5 insertions(+), 1 deletion(-)
delete mode 100644 data/alvearie-template/package/content/assets/images/alvearieLogo.png
diff --git a/data/alvearie-template/package/content/assets/images/alvearieLogo.png b/data/alvearie-template/package/content/assets/images/alvearieLogo.png
deleted file mode 100644
index 603ec134f2bcc18b62eebb84552fb469d47dc517..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 48830
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