From 00c9e0d023f66b53b2018ba4c7fd48f1e0acc0c3 Mon Sep 17 00:00:00 2001
From: emad-salah <emads14@gmail.com>
Date: Tue, 14 Dec 2021 10:58:22 +0100
Subject: [PATCH] Fix yarn lockfile and temporarily disable type checking for
 GunSmith

---
 package.json               |   1 -
 tsconfig.json              |   1 +
 utils/GunSmith/GunSmith.js |   7 ++-
 yarn.lock                  | 122 +++++++++++++++----------------------
 4 files changed, 53 insertions(+), 78 deletions(-)

diff --git a/package.json b/package.json
index 40f43dbf..14f74169 100644
--- a/package.json
+++ b/package.json
@@ -72,7 +72,6 @@
     "@types/eccrypto": "^1.1.2",
     "@types/express": "^4.17.1",
     "@types/gun": "^0.9.2",
-    "@types/istanbul-lib-report": "^3.0.0",
     "@types/jsonwebtoken": "^8.3.7",
     "@types/lodash": "^4.14.168",
     "@types/mocha": "^9.0.0",
diff --git a/tsconfig.json b/tsconfig.json
index 5a1d9159..9ee816c3 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,5 +1,6 @@
 {
   "include": ["./services/gunDB/**/*.*", "./utils/lightningServices/**/*.*"],
+  "exclude": ["./node_modules/**/*.*"],
   "compilerOptions": {
     /* Basic Options */
     // "incremental": true,                   /* Enable incremental compilation */
diff --git a/utils/GunSmith/GunSmith.js b/utils/GunSmith/GunSmith.js
index 235393c2..738f9e62 100644
--- a/utils/GunSmith/GunSmith.js
+++ b/utils/GunSmith/GunSmith.js
@@ -3,7 +3,7 @@
  */
 /* eslint-disable no-use-before-define */
 /* eslint-disable func-style */
-// @ts-check
+// @ts-no-check TODO: Temporarily disabled TS checking due to new GunDB version
 /// <reference path="Smith.ts" />
 /// <reference path="GunT.ts" />
 const uuid = require('uuid/v1')
@@ -133,7 +133,7 @@ let lastAlias = ''
 let lastPass = ''
 /** @type {GunT.UserPair|null} */
 let lastPair = null
-/** @type {import('gun/types/options').IGunConstructorOptions} */
+/** @type {import('gun/types/gun/IGunConstructorOptions').IGunConstructorOptions} */
 let lastOpts = {}
 let isAuthing = false
 
@@ -282,6 +282,7 @@ const forge = () => {
 
     /** @type {Smith.SmithMsgInit} */
     const initMsg = {
+      // @ts-ignore TODO: Fix options typings
       opts: lastOpts,
       type: 'init'
     }
@@ -728,7 +729,7 @@ function createUserReplica() {
 }
 
 /**
- * @param {import('gun/types/options').IGunConstructorOptions} opts
+ * @param {import('gun/types/gun/IGunConstructorOptions').IGunConstructorOptions} opts
  * @returns {Smith.GunSmithNode}
  */
 const Gun = opts => {
diff --git a/yarn.lock b/yarn.lock
index bd386e3a..d8d120fa 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -349,19 +349,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@peculiar/asn1-schema@npm:^2.0.1, @peculiar/asn1-schema@npm:^2.0.8":
-  version: 2.0.8
-  resolution: "@peculiar/asn1-schema@npm:2.0.8"
+"@peculiar/asn1-schema@npm:^2.0.44":
+  version: 2.0.44
+  resolution: "@peculiar/asn1-schema@npm:2.0.44"
   dependencies:
-    "@types/asn1js": ^0.0.1
-    asn1js: ^2.0.26
-    pvtsutils: ^1.0.10
-    tslib: ^1.11.1
-  checksum: edc75d778dbb093a746235bdaa137d45936efd1690f217ca90cf958f8b02db7ba540c56a74419e65cd14a5ffa08761b6a24a30fb228725ccbfcd6bf73341eece
+    "@types/asn1js": ^2.0.2
+    asn1js: ^2.1.1
+    pvtsutils: ^1.2.1
+    tslib: ^2.3.0
+  checksum: e069481cf31701f23a8bdc5018303d27d7da2917741d52ddbce89ae03ea9d41a543dd154201fffabbab8050bda8e7339738368431b6ce40a2dbd9ddf709c6a6c
   languageName: node
   linkType: hard
 
-"@peculiar/json-schema@npm:^1.1.10":
+"@peculiar/json-schema@npm:^1.1.12":
   version: 1.1.12
   resolution: "@peculiar/json-schema@npm:1.1.12"
   dependencies:
@@ -371,15 +371,15 @@ __metadata:
   linkType: hard
 
 "@peculiar/webcrypto@npm:^1.1.1":
-  version: 1.1.2
-  resolution: "@peculiar/webcrypto@npm:1.1.2"
+  version: 1.2.3
+  resolution: "@peculiar/webcrypto@npm:1.2.3"
   dependencies:
-    "@peculiar/asn1-schema": ^2.0.8
-    "@peculiar/json-schema": ^1.1.10
-    pvtsutils: ^1.0.10
-    tslib: ^2.0.0
-    webcrypto-core: ^1.1.2
-  checksum: b511067a472677222fad85e1d16708210d137b4b0c6d2ca4ccf345298ca1e94e8de83db722b82fc876c9afb717d22c36d7ce16adfb5ec1e942570d7245162402
+    "@peculiar/asn1-schema": ^2.0.44
+    "@peculiar/json-schema": ^1.1.12
+    pvtsutils: ^1.2.1
+    tslib: ^2.3.1
+    webcrypto-core: ^1.4.0
+  checksum: dcc7ccdd44d5dc5becf59679e9dc67bef8247a6858a82f807a4dc4268fea4a302fe8505c67a43d77ac42df8b79243a0a6feea4cc342d4ad29da7fb7c549547b6
   languageName: node
   linkType: hard
 
@@ -544,12 +544,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/asn1js@npm:^0.0.1":
-  version: 0.0.1
-  resolution: "@types/asn1js@npm:0.0.1"
-  dependencies:
-    "@types/pvutils": "*"
-  checksum: b75c288f56b2f538d9d791f8623072dbb89858d83856651ed2cf14c2e1e692de3ce96f8ff7e013f4bb7f8e53d8b5a734af6af332dec153fe001dd0bb826fd566
+"@types/asn1js@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "@types/asn1js@npm:2.0.2"
+  checksum: 4079eca4c0916a0cea6bf490fec3bb5d64cd54e99efc0b32dfb1f6636712d47045042b9cd503afd2c0251e1095578dbb7f8d246a088fa1598fdb00ab4c05614f
   languageName: node
   linkType: hard
 
@@ -677,15 +675,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/istanbul-lib-report@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@types/istanbul-lib-report@npm:3.0.0"
-  dependencies:
-    "@types/istanbul-lib-coverage": "*"
-  checksum: 656398b62dc288e1b5226f8880af98087233cdb90100655c989a09f3052b5775bf98ba58a16c5ae642fb66c61aba402e07a9f2bff1d1569e3b306026c59f3f36
-  languageName: node
-  linkType: hard
-
 "@types/istanbul-reports@npm:^3.0.0":
   version: 3.0.1
   resolution: "@types/istanbul-reports@npm:3.0.1"
@@ -802,13 +791,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/pvutils@npm:*":
-  version: 0.0.2
-  resolution: "@types/pvutils@npm:0.0.2"
-  checksum: bc374da5a995f5f9b151288d07a8ab256bd8e50c2527672079da3f4789c9be39d3ce73e18389ab6049506f39bb9b1edd9666507a23677e62cb2425ee9787705c
-  languageName: node
-  linkType: hard
-
 "@types/ramda@types/npm-ramda#dist":
   version: 0.25.0
   resolution: "@types/ramda@https://github.com/types/npm-ramda.git#commit=9529aa3c8ff70ff84afcbc0be83443c00f30ea90"
@@ -1206,12 +1188,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"asn1js@npm:^2.0.26":
-  version: 2.0.26
-  resolution: "asn1js@npm:2.0.26"
+"asn1js@npm:^2.1.1":
+  version: 2.1.1
+  resolution: "asn1js@npm:2.1.1"
   dependencies:
     pvutils: latest
-  checksum: 92bbd54ef5d30d431b39a36e02339ca8bc489bc81c59e9b8a5134f1323b096abb8f01269c4c4db1fc708048b2ef2126c86e28437bc2ed86bef90a675bd9dd0ad
+  checksum: 014598ec01026be14807479d1cd898b96f248be8023ed4dda3c849b6e5fcf846cc20c321df83681cb2c912d8470afe6527b33525e13366d1e80c81b1d03cf810
   languageName: node
   linkType: hard
 
@@ -6133,16 +6115,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pvtsutils@npm:^1.0.10":
-  version: 1.0.10
-  resolution: "pvtsutils@npm:1.0.10"
+"pvtsutils@npm:^1.2.0, pvtsutils@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "pvtsutils@npm:1.2.1"
   dependencies:
-    tslib: ^1.10.0
-  checksum: 34e8189ba9af1c9b2f883a09eb179280167db7c60caa081004246538c41495dd015592e10d3ae62800ed836e99a6fcbaa79ceb62e068c0b5201cb53048bc5a9f
+    tslib: ^2.3.1
+  checksum: 7930149a50f8eb5b9685aa06d0fdffb32a9fa82de964441c5ff26bad02266cf1139e611fcf1d002083e8048572d396ed6e86c5a10d66468582c8183585db40d1
   languageName: node
   linkType: hard
 
-pvutils@latest:
+"pvutils@npm:latest":
   version: 1.0.17
   resolution: "pvutils@npm:1.0.17"
   checksum: 370cc6c7ed2cddeb97e85339f4cac06cc07e3195774b0b8707a7994db0acd73451745cc57209a2bc6d4138b9b14d5ab0335e3614743a91010a74db597428dfe8
@@ -6809,7 +6791,6 @@ pvutils@latest:
     "@types/eccrypto": ^1.1.2
     "@types/express": ^4.17.1
     "@types/gun": ^0.9.2
-    "@types/istanbul-lib-report": ^3.0.0
     "@types/jsonwebtoken": ^8.3.7
     "@types/lodash": ^4.14.168
     "@types/mocha": ^9.0.0
@@ -7565,24 +7546,17 @@ pvutils@latest:
   languageName: node
   linkType: hard
 
-"tslib@npm:^1.10.0, tslib@npm:^1.9.0":
+"tslib@npm:^1.9.0":
   version: 1.10.0
   resolution: "tslib@npm:1.10.0"
   checksum: 1d0450dc6f64b918b14acaf3b956ebe1c72d7401c632adce932a60e3cd8d2a70f6040ceef6a7c3561146c3f29bcf584c41c2e09a5d20a27d6c3057f0d5f2a836
   languageName: node
   linkType: hard
 
-"tslib@npm:^1.11.1, tslib@npm:^1.11.2":
-  version: 1.13.0
-  resolution: "tslib@npm:1.13.0"
-  checksum: 50e9327361f94f328c0715582a7f725f69838ab3c2559d143643c5367262fe14552768ba8cfc65bc7dc924a619aea599b3a28b6653458cdca77bbebaf9bc8df4
-  languageName: node
-  linkType: hard
-
-"tslib@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "tslib@npm:2.0.0"
-  checksum: 7515fd4e5c2cb768056a76f0311559eefcc0f1887d686069aa3a45b78cf33d14c0b7cf89323fad0e819b55de8c2ac0b74e8c29309e6bb8d89a364a4dfb54653e
+"tslib@npm:^2.0.0, tslib@npm:^2.3.0, tslib@npm:^2.3.1":
+  version: 2.3.1
+  resolution: "tslib@npm:2.3.1"
+  checksum: de17a98d4614481f7fcb5cd53ffc1aaf8654313be0291e1bfaee4b4bb31a20494b7d218ff2e15017883e8ea9626599b3b0e0229c18383ba9dce89da2adf15cb9
   languageName: node
   linkType: hard
 
@@ -7867,16 +7841,16 @@ pvutils@latest:
   languageName: node
   linkType: hard
 
-"webcrypto-core@npm:^1.1.2":
-  version: 1.1.2
-  resolution: "webcrypto-core@npm:1.1.2"
+"webcrypto-core@npm:^1.4.0":
+  version: 1.4.0
+  resolution: "webcrypto-core@npm:1.4.0"
   dependencies:
-    "@peculiar/asn1-schema": ^2.0.1
-    "@peculiar/json-schema": ^1.1.10
-    asn1js: ^2.0.26
-    pvtsutils: ^1.0.10
-    tslib: ^1.11.2
-  checksum: 7b027de6abd665f4686d93901ee674e8843ccbc37ec3f5967715bb25a21999ec9fe137e6b98a0bed3f7a01f0f2511988fdbd5b025744a204938395589d2dfa7c
+    "@peculiar/asn1-schema": ^2.0.44
+    "@peculiar/json-schema": ^1.1.12
+    asn1js: ^2.1.1
+    pvtsutils: ^1.2.0
+    tslib: ^2.3.1
+  checksum: 706b98953d87fc9100484303df7a35a0395f78d578dd62abc220039b47d5c0c808164daf8ccd99b0b044628417c4f5b24dda304d7e112a4d09659524f4fc238e
   languageName: node
   linkType: hard
 
@@ -8060,8 +8034,8 @@ pvutils@latest:
   linkType: hard
 
 "ws@npm:^7.2.1":
-  version: 7.3.1
-  resolution: "ws@npm:7.3.1"
+  version: 7.5.6
+  resolution: "ws@npm:7.5.6"
   peerDependencies:
     bufferutil: ^4.0.1
     utf-8-validate: ^5.0.2
@@ -8070,7 +8044,7 @@ pvutils@latest:
       optional: true
     utf-8-validate:
       optional: true
-  checksum: 4dc06da11813b7d7f2b2a662ed372418a0d28846b5ee5bda6cdf45402dbe00d8744e27080acfd4e8a31af093719be55f34a9c6878aa0a76ac4d22e4a3a7c3537
+  checksum: 0c2ffc9a539dd61dd2b00ff6cc5c98a3371e2521011fe23da4b3578bb7ac26cbdf7ca8a68e8e08023c122ae247013216dde2a20c908de415a6bcc87bdef68c87
   languageName: node
   linkType: hard