snyk 1.1113.0 → 1.1115.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "snyk",
-  "version": "1.1113.0",
+  "version": "1.1115.0",
   "description": "snyk library and cli utility",
   "files": [
     "*"

package/src/common.ts

@@ -245,9 +245,7 @@ export function downloadExecutable(
     const options = new URL(downloadUrl);
     const temp = path.join(__dirname, Date.now().toString());
     const fileStream = fs.createWriteStream(temp);
-    fileStream.on('error', (e) => {
-      cleanupAfterError(e);
-    });
+    const shasum = createHash('sha256');
 
     const cleanupAfterError = (error: Error) => {
       try {
@@ -259,45 +257,51 @@ export function downloadExecutable(
       resolve(error);
     };
 
+    // shasum events
+    shasum.on('error', cleanupAfterError);
+
+    // filestream events
+    fileStream.on('error', (e) => {
+      cleanupAfterError(e);
+    });
+
+    fileStream.on('finish', () => {
+      // compare shasums
+      const actualShasum = shasum.digest('hex');
+
+      const debugMessage =
+        'Shasums:\n- actual:   ' +
+        actualShasum +
+        '\n- expected: ' +
+        filenameShasum;
+
+      if (filenameShasum && actualShasum != filenameShasum) {
+        cleanupAfterError(Error('Shasum comparison failed!\n' + debugMessage));
+      } else {
+        console.error(debugMessage);
+
+        // finally rename the file and change permissions
+        fs.renameSync(temp, filename);
+        fs.chmodSync(filename, 0o755);
+        console.error('Downloaded successfull! ');
+      }
+
+      resolve(undefined);
+    });
+
     console.error(
       "Downloading from '" + downloadUrl + "' to '" + filename + "'",
     );
 
     const req = https.request(options, (res) => {
-      const shasum = createHash('sha256');
-
-      shasum.on('error', cleanupAfterError);
+      // response events
       res.on('error', cleanupAfterError);
       res.on('end', () => {
-        // compare shasums
-        const actualShasum = shasum.digest('hex');
-
-        const debugMessage =
-          'Shasums:\n- actual:   ' +
-          actualShasum +
-          '\n- expected: ' +
-          filenameShasum;
-
-        if (filenameShasum && actualShasum != filenameShasum) {
-          fileStream.close();
-          shasum.end();
-          cleanupAfterError(
-            Error('Shasum comparison failed!\n' + debugMessage),
-          );
-        } else {
-          console.error(debugMessage);
-
-          // finally rename the file and change permissions
-          fs.renameSync(temp, filename);
-          fs.chmodSync(filename, 0o755);
-          console.error('Downloaded successfull! ');
-
-          shasum.end();
-          fileStream.close();
-          resolve(undefined);
-        }
+        shasum.end();
+        fileStream.end();
       });
 
+      // pipe data
       res.pipe(fileStream);
       res.pipe(shasum);
     });
@@ -317,7 +321,10 @@ export function downloadExecutable(
             'Download failed! Server Response: ' +
               incoming.statusCode +
               ' ' +
-              incoming.statusMessage,
+              incoming.statusMessage +
+              ' (' +
+              downloadUrl +
+              ')',
           ),
         );
       }

package/src/generated/sha256sums.txt

@@ -1,10 +1,10 @@
-25edd6c8122d4ae543e70011ee7c12a9799c4ed27e95fe11fb6a09d5a3eda7e3  docker-mac-signed-bundle.tar.gz
-2c6e639b79589e5f4df4318de7f75b46fdfb8bcb9f8167e466292ea1ec5927cf  snyk-alpine
-d3e2b45e1e578079170b0d42300ac8bdf35ab894cb612186e78c60c5d85b8ee8  snyk-fix.tgz
-762089b89140f316648fa581702c3d8c7f735b5ab36f19b481dc538262ee250b  snyk-for-docker-desktop-darwin-arm64.tar.gz
-151505e83102f2aef3e3bfb1e8618bfe3b27d13070f22a18e7cfc37bf4b030b3  snyk-for-docker-desktop-darwin-x64.tar.gz
-e4c8f2afb7d4885e6d4da6286092587a3f2c912f4720aeb69e2a316196cc0e7b  snyk-linux-arm64
-9c4ad8cc87b44c48500fddcfa08dae580b13c91f9b700251e5eca3a155c570b2  snyk-linux
-a330b76362f95d8cbd88673795f007b2d97602e1ef60273151f619ba3219c5b8  snyk-macos
-a213b276e3f5f3b45fd30166d8d4b5f83700dc4884e90881fd4318763b3fdd6d  snyk-protect.tgz
-10dd32be5d5ba5a669c037900f58cc523d568f62c5167b09cb708957a5e320cf  snyk-win.exe
+6505c380a999d92fb32058c8ad3b00d0f3d38f24b7931c509d5d038f08283e4b  docker-mac-signed-bundle.tar.gz
+e5d33e097cecae5a06cf8823f96d87d1cb19e5ac3f9e7533121dc195df71915f  snyk-alpine
+79f87f12fc866d6ef6221e65449ebc5e5acd02c172908149c4fe52fb1d695399  snyk-fix.tgz
+cd6b42c1576213deb43381fbca47121c1b797342c8f36101ec41d1cc427aae04  snyk-for-docker-desktop-darwin-arm64.tar.gz
+0c9e8cf7e99b2767510edd008cc4a9f3147e207d5e310ffd8317e3e54cf97a64  snyk-for-docker-desktop-darwin-x64.tar.gz
+8ff5c2555fde80b227a3ee53aecf378ef780e2adc20aaa80b14d11ac981b2b28  snyk-linux-arm64
+9f13c7f7ff53984c9556185fb8945c5517b73934ca76538575e1ec998c086911  snyk-linux
+0aad5b3b4f11679cb37ad7f95726ea01cf4cd7ada3bd8a70fca3bc843791f260  snyk-macos
+f36e5c2138452e16c2c242748ec6ec0299144adc05a84a47e2844892181e9c6b  snyk-protect.tgz
+0397c9e6f91e1542faa2b9594dfa4cfda478becbedf501874fa4c19175c1d9b5  snyk-win.exe

package/src/generated/version

@@ -1 +1 @@
-1.1113.0
+1.1115.0

package/src/index.ts

@@ -40,9 +40,10 @@ function run(executable: string): number {
         if (downloadError !== undefined) {
           throw downloadError;
         }
-      } else {
-        process.exit(run(executable));
       }
+
+      // run the executable
+      process.exit(run(executable));
     } catch (error) {
       fallbackToLegacyCLI = true;
       await common.logError(errorContextMessage, error);
@@ -51,7 +52,7 @@ function run(executable: string): number {
     // if --legacy-clli is enabled create a log messaeg
     await common.logError(
       errorContextMessage,
-      Error(legacyCLIflag + 'is set'),
+      Error(legacyCLIflag + ' is set'),
       false,
     );
   }

package/test/acceptance/basic.spec.ts

@@ -11,10 +11,12 @@ describe('Basic acceptance test', () => {
   const cliVersionForTesting = '1.1080.0';
 
   beforeEach(async () => {
+    process.env.SNYK_DISABLE_ANALYTICS = '1';
     await envSetup.prepareEnvironment(cliVersionForTesting);
   });
 
   afterEach(() => {
+    delete process.env.SNYK_DISABLE_ANALYTICS;
     envSetup.cleanupDirectories();
   });
 
@@ -35,7 +37,7 @@ describe('Basic acceptance test', () => {
     const indexScript = path.join(envSetup.outputfolder, 'index.js');
     const bootstrapScript = path.join(envSetup.outputfolder, 'bootstrap.js');
 
-    // run system under test: index
+    // run system under test: bootsrap
     const resultBootstrap = child_process.spawnSync(
       'node ' + bootstrapScript + ' exec',
       { shell: true },
@@ -56,11 +58,120 @@ describe('Basic acceptance test', () => {
     }
 
     expect(resultIndex.status).toEqual(0);
-    expect(resultIndex.output.toString()).toContain(cliVersionForTesting);
+    expect(
+      resultIndex.stdout
+        .toString()
+        .trim()
+        .startsWith(cliVersionForTesting),
+    ).toBeTruthy();
 
     fs.unlinkSync(executable);
   });
 
+  it('Execute a command without bootstrap', () => {
+    const config = common.getCurrentConfiguration();
+    const executable = config
+      .getLocalLocation()
+      .replace(envSetup.inputfolder, envSetup.outputfolder);
+
+    try {
+      fs.unlinkSync(executable);
+    } catch {
+      //
+    }
+
+    expect(fs.existsSync(executable)).toBeFalsy();
+
+    const indexScript = path.join(envSetup.outputfolder, 'index.js');
+
+    // run system under test: index
+    const resultIndex = child_process.spawnSync(
+      'node ' + indexScript + ' --version',
+      { shell: true },
+    );
+
+    if (resultIndex.status != 0) {
+      console.debug(resultIndex.stdout.toString());
+      console.debug(resultIndex.stderr.toString());
+    }
+
+    expect(fs.existsSync(executable)).toBeTruthy();
+    expect(resultIndex.status).toEqual(0);
+    expect(
+      resultIndex.stdout
+        .toString()
+        .trim()
+        .startsWith(cliVersionForTesting),
+    ).toBeTruthy();
+
+    fs.unlinkSync(executable);
+  });
+
+  it('Execute with --legacy-cli', () => {
+    const config = common.getCurrentConfiguration();
+    const executable = config
+      .getLocalLocation()
+      .replace(envSetup.inputfolder, envSetup.outputfolder);
+
+    try {
+      fs.unlinkSync(executable);
+    } catch {
+      //
+    }
+
+    expect(fs.existsSync(executable)).toBeFalsy();
+
+    const indexScript = path.join(envSetup.outputfolder, 'index.js');
+
+    // run system under test: index
+    const resultIndex = child_process.spawnSync(
+      'node ' + indexScript + ' --legacy-cli --version',
+      { shell: true },
+    );
+
+    expect(fs.existsSync(executable)).toBeFalsy();
+    expect(resultIndex.status).not.toEqual(0); // we expect this to fail, since the legacy cli is not available in the test, still we want to see that the logic around is working properly
+    expect(resultIndex.stdout.toString()).toEqual('');
+    expect(resultIndex.stderr.toString()).toContain(
+      'You are currently running a degraded version of the Snyk CLI.',
+    );
+  });
+
+  it('Execute with a failing download', () => {
+    const config = common.getCurrentConfiguration();
+    const executable = config
+      .getLocalLocation()
+      .replace(envSetup.inputfolder, envSetup.outputfolder);
+
+    try {
+      fs.unlinkSync(executable);
+    } catch {
+      //
+    }
+
+    expect(fs.existsSync(executable)).toBeFalsy();
+
+    const indexScript = path.join(envSetup.outputfolder, 'index.js');
+
+    // introduce error state by deleting the generated folder
+    fs.rmdirSync(path.join(envSetup.outputfolder, 'generated'), {
+      recursive: true,
+    });
+
+    // run system under test: index
+    const resultIndex = child_process.spawnSync(
+      'node ' + indexScript + ' --version',
+      { shell: true },
+    );
+
+    expect(fs.existsSync(executable)).toBeFalsy();
+    expect(resultIndex.status).not.toEqual(0); // we expect this to fail, since the legacy cli is not available in the test, still we want to see that the logic around is working properly
+    expect(resultIndex.stdout.toString()).toEqual('');
+    expect(resultIndex.stderr.toString()).toContain(
+      'You are currently running a degraded version of the Snyk CLI.',
+    );
+  });
+
   it('Bootstrap binary fails when proxy is used but not allowed', () => {
     // only run when proxy is set
     if (!process.env.https_proxy) {
@@ -101,5 +212,6 @@ describe('Basic acceptance test', () => {
       .includes(expectedErrorMessage);
 
     expect(expectedError).toBeTruthy();
+    expect(resultBootstrap.status).toEqual(0);
   });
 });

package/test/util/prepareEnvironment.ts

@@ -28,7 +28,7 @@ export class TestEnvironmentSetup {
       this.prepareDirectories();
       this.compileTSCode();
       writeFileSync(versionFile, version);
-      await this.downloadExecutable(version, shasumFile);
+      await this.downloadShaSum(version, shasumFile);
     } catch (error) {
       console.error('Error while preparing environment');
       console.error(error);
@@ -67,7 +67,7 @@ export class TestEnvironmentSetup {
     }
   }
 
-  private async downloadExecutable(version: string, shasumFile: string) {
+  private async downloadShaSum(version: string, shasumFile: string) {
     await common.downloadExecutable(
       'https://static.snyk.io/cli/v' + version + '/sha256sums.txt.asc',
       shasumFile,

package/tsconfig.tsbuildinfo

@@ -967,7 +967,7 @@
         "affectsGlobalScope": false
       },
       "./src/common.ts": {
-        "version": "a33415271537404b706720e5813678d86f0d158cc33848c24e1def7ae1696ff7",
+        "version": "322f2528fa2a773594005fc7362f35b5fb36d769f18a912a9be1c39d9c3b4748",
         "signature": "6fc949ec862a19133c2851e85660525c995a34db2368f9c53eec51cf0c20433f",
         "affectsGlobalScope": false
       },
@@ -977,7 +977,7 @@
         "affectsGlobalScope": false
       },
       "./src/index.ts": {
-        "version": "f55784c3d07cfdaea31461cc734d2b51a345006e1dbca72c4acb632c17bad3b5",
+        "version": "f00b4e34156f79ea3ef3161584ce786e44273fbe459f5a390b07fd8eea1e2bdf",
         "signature": "43e818adf60173644896298637f47b01d5819b17eda46eaa32d0c7d64724d012",
         "affectsGlobalScope": false
       },

package/wrapper_dist/common.js

@@ -196,9 +196,7 @@ function downloadExecutable(downloadUrl, filename, filenameShasum) {
         const options = new URL(downloadUrl);
         const temp = path.join(__dirname, Date.now().toString());
         const fileStream = fs.createWriteStream(temp);
-        fileStream.on('error', (e) => {
-            cleanupAfterError(e);
-        });
+        const shasum = crypto_1.createHash('sha256');
         const cleanupAfterError = (error) => {
             try {
                 fs.unlinkSync(temp);
@@ -208,34 +206,40 @@ function downloadExecutable(downloadUrl, filename, filenameShasum) {
             }
             resolve(error);
         };
+        // shasum events
+        shasum.on('error', cleanupAfterError);
+        // filestream events
+        fileStream.on('error', (e) => {
+            cleanupAfterError(e);
+        });
+        fileStream.on('finish', () => {
+            // compare shasums
+            const actualShasum = shasum.digest('hex');
+            const debugMessage = 'Shasums:\n- actual:   ' +
+                actualShasum +
+                '\n- expected: ' +
+                filenameShasum;
+            if (filenameShasum && actualShasum != filenameShasum) {
+                cleanupAfterError(Error('Shasum comparison failed!\n' + debugMessage));
+            }
+            else {
+                console.error(debugMessage);
+                // finally rename the file and change permissions
+                fs.renameSync(temp, filename);
+                fs.chmodSync(filename, 0o755);
+                console.error('Downloaded successfull! ');
+            }
+            resolve(undefined);
+        });
         console.error("Downloading from '" + downloadUrl + "' to '" + filename + "'");
         const req = https.request(options, (res) => {
-            const shasum = crypto_1.createHash('sha256');
-            shasum.on('error', cleanupAfterError);
+            // response events
             res.on('error', cleanupAfterError);
             res.on('end', () => {
-                // compare shasums
-                const actualShasum = shasum.digest('hex');
-                const debugMessage = 'Shasums:\n- actual:   ' +
-                    actualShasum +
-                    '\n- expected: ' +
-                    filenameShasum;
-                if (filenameShasum && actualShasum != filenameShasum) {
-                    fileStream.close();
-                    shasum.end();
-                    cleanupAfterError(Error('Shasum comparison failed!\n' + debugMessage));
-                }
-                else {
-                    console.error(debugMessage);
-                    // finally rename the file and change permissions
-                    fs.renameSync(temp, filename);
-                    fs.chmodSync(filename, 0o755);
-                    console.error('Downloaded successfull! ');
-                    shasum.end();
-                    fileStream.close();
-                    resolve(undefined);
-                }
+                shasum.end();
+                fileStream.end();
             });
+            // pipe data
             res.pipe(fileStream);
             res.pipe(shasum);
         });
@@ -249,7 +253,10 @@ function downloadExecutable(downloadUrl, filename, filenameShasum) {
                 cleanupAfterError(Error('Download failed! Server Response: ' +
                     incoming.statusCode +
                     ' ' +
-                    incoming.statusMessage));
+                    incoming.statusMessage +
+                    ' (' +
+                    downloadUrl +
+                    ')'));
             }
         });
         req.end();

package/wrapper_dist/common.js.map

@@ -1 +1 @@
-{"version":3,"file":"common.js","sourceRoot":"","sources":["../src/common.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"common.js","sourceRoot":"","sources":["../src/common.ts"],"names":[],"mappings":"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"}

package/wrapper_dist/generated/sha256sums.txt

@@ -1,10 +1,10 @@
-25edd6c8122d4ae543e70011ee7c12a9799c4ed27e95fe11fb6a09d5a3eda7e3  docker-mac-signed-bundle.tar.gz
-2c6e639b79589e5f4df4318de7f75b46fdfb8bcb9f8167e466292ea1ec5927cf  snyk-alpine
-d3e2b45e1e578079170b0d42300ac8bdf35ab894cb612186e78c60c5d85b8ee8  snyk-fix.tgz
-762089b89140f316648fa581702c3d8c7f735b5ab36f19b481dc538262ee250b  snyk-for-docker-desktop-darwin-arm64.tar.gz
-151505e83102f2aef3e3bfb1e8618bfe3b27d13070f22a18e7cfc37bf4b030b3  snyk-for-docker-desktop-darwin-x64.tar.gz
-e4c8f2afb7d4885e6d4da6286092587a3f2c912f4720aeb69e2a316196cc0e7b  snyk-linux-arm64
-9c4ad8cc87b44c48500fddcfa08dae580b13c91f9b700251e5eca3a155c570b2  snyk-linux
-a330b76362f95d8cbd88673795f007b2d97602e1ef60273151f619ba3219c5b8  snyk-macos
-a213b276e3f5f3b45fd30166d8d4b5f83700dc4884e90881fd4318763b3fdd6d  snyk-protect.tgz
-10dd32be5d5ba5a669c037900f58cc523d568f62c5167b09cb708957a5e320cf  snyk-win.exe
+6505c380a999d92fb32058c8ad3b00d0f3d38f24b7931c509d5d038f08283e4b  docker-mac-signed-bundle.tar.gz
+e5d33e097cecae5a06cf8823f96d87d1cb19e5ac3f9e7533121dc195df71915f  snyk-alpine
+79f87f12fc866d6ef6221e65449ebc5e5acd02c172908149c4fe52fb1d695399  snyk-fix.tgz
+cd6b42c1576213deb43381fbca47121c1b797342c8f36101ec41d1cc427aae04  snyk-for-docker-desktop-darwin-arm64.tar.gz
+0c9e8cf7e99b2767510edd008cc4a9f3147e207d5e310ffd8317e3e54cf97a64  snyk-for-docker-desktop-darwin-x64.tar.gz
+8ff5c2555fde80b227a3ee53aecf378ef780e2adc20aaa80b14d11ac981b2b28  snyk-linux-arm64
+9f13c7f7ff53984c9556185fb8945c5517b73934ca76538575e1ec998c086911  snyk-linux
+0aad5b3b4f11679cb37ad7f95726ea01cf4cd7ada3bd8a70fca3bc843791f260  snyk-macos
+f36e5c2138452e16c2c242748ec6ec0299144adc05a84a47e2844892181e9c6b  snyk-protect.tgz
+0397c9e6f91e1542faa2b9594dfa4cfda478becbedf501874fa4c19175c1d9b5  snyk-win.exe

package/wrapper_dist/generated/version

@@ -1 +1 @@
-1.1113.0
+1.1115.0

package/wrapper_dist/index.js

@@ -30,9 +30,8 @@ function run(executable) {
                     throw downloadError;
                 }
             }
-            else {
-                process.exit(run(executable));
-            }
+            // run the executable
+            process.exit(run(executable));
         }
         catch (error) {
             fallbackToLegacyCLI = true;
@@ -41,7 +40,7 @@ function run(executable) {
     }
     else {
         // if --legacy-clli is enabled create a log messaeg
-        await common.logError(errorContextMessage, Error(legacyCLIflag + 'is set'), false);
+        await common.logError(errorContextMessage, Error(legacyCLIflag + ' is set'), false);
     }
     if (fallbackToLegacyCLI) {
         common.formatErrorMessage('legacy-cli');

package/wrapper_dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAEA,qCAA+B;AAC/B,mCAAmC;AACnC,yBAAyB;AACzB,6BAA6B;AAE7B,MAAM,mBAAmB,GAAG,SAAS,CAAC;AACtC,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;AAC7E,MAAM,aAAa,GAAG,cAAc,CAAC;AAErC,SAAS,GAAG,CAAC,UAAkB;IAC7B,IAAI,YAAY,GAAG,MAAM,CAAC,eAAe,CAAC,cAAI,CAAC,CAAC;IAEhD,IAAI,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;QAC9B,YAAY,GAAG,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QACjD,UAAU,GAAG,cAAI,CAAC,CAAC,CAAC,CAAC,CAAC,eAAe;KACtC;IAED,MAAM,QAAQ,GAAG,MAAM,CAAC,UAAU,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;IAC7D,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,CAAC,KAAK,IAAI,EAAE;IACV,IAAI,mBAAmB,GAAG,cAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;IAEvD,IAAI,mBAAmB,KAAK,KAAK,EAAE;QACjC,IAAI;YACF,MAAM,MAAM,GAAG,MAAM,CAAC,uBAAuB,EAAE,CAAC;YAChD,MAAM,UAAU,GAAG,MAAM,CAAC,gBAAgB,EAAE,CAAC;YAE7C,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;gBAC9B,OAAO,CAAC,KAAK,CAAC,+CAA+C,CAAC,CAAC;gBAE/D,MAAM,aAAa,GAAG,MAAM,MAAM,CAAC,kBAAkB,CACnD,MAAM,CAAC,mBAAmB,EAAE,EAC5B,UAAU,EACV,MAAM,CAAC,aAAa,EAAE,CACvB,CAAC;gBACF,IAAI,aAAa,KAAK,SAAS,EAAE;oBAC/B,MAAM,aAAa,CAAC;iBACrB;aACF;iBAAM;gBACL,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC;aAC/B;SACF;QAAC,OAAO,KAAK,EAAE;YACd,mBAAmB,GAAG,IAAI,CAAC;YAC3B,MAAM,MAAM,CAAC,QAAQ,CAAC,mBAAmB,EAAE,KAAK,CAAC,CAAC;SACnD;KACF;SAAM;QACL,mDAAmD;QACnD,MAAM,MAAM,CAAC,QAAQ,CACnB,mBAAmB,EACnB,KAAK,CAAC,aAAa,GAAG,QAAQ,CAAC,EAC/B,KAAK,CACN,CAAC;KACH;IAED,IAAI,mBAAmB,EAAE;QACvB,MAAM,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC;QACxC,MAAM,QAAQ,GAAG,GAAG,CAAC,cAAc,CAAC,CAAC;QACrC,MAAM,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC;QAExC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;KACxB;AACH,CAAC,CAAC,EAAE,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAEA,qCAA+B;AAC/B,mCAAmC;AACnC,yBAAyB;AACzB,6BAA6B;AAE7B,MAAM,mBAAmB,GAAG,SAAS,CAAC;AACtC,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;AAC7E,MAAM,aAAa,GAAG,cAAc,CAAC;AAErC,SAAS,GAAG,CAAC,UAAkB;IAC7B,IAAI,YAAY,GAAG,MAAM,CAAC,eAAe,CAAC,cAAI,CAAC,CAAC;IAEhD,IAAI,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;QAC9B,YAAY,GAAG,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QACjD,UAAU,GAAG,cAAI,CAAC,CAAC,CAAC,CAAC,CAAC,eAAe;KACtC;IAED,MAAM,QAAQ,GAAG,MAAM,CAAC,UAAU,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;IAC7D,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,CAAC,KAAK,IAAI,EAAE;IACV,IAAI,mBAAmB,GAAG,cAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;IAEvD,IAAI,mBAAmB,KAAK,KAAK,EAAE;QACjC,IAAI;YACF,MAAM,MAAM,GAAG,MAAM,CAAC,uBAAuB,EAAE,CAAC;YAChD,MAAM,UAAU,GAAG,MAAM,CAAC,gBAAgB,EAAE,CAAC;YAE7C,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;gBAC9B,OAAO,CAAC,KAAK,CAAC,+CAA+C,CAAC,CAAC;gBAE/D,MAAM,aAAa,GAAG,MAAM,MAAM,CAAC,kBAAkB,CACnD,MAAM,CAAC,mBAAmB,EAAE,EAC5B,UAAU,EACV,MAAM,CAAC,aAAa,EAAE,CACvB,CAAC;gBACF,IAAI,aAAa,KAAK,SAAS,EAAE;oBAC/B,MAAM,aAAa,CAAC;iBACrB;aACF;YAED,qBAAqB;YACrB,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC;SAC/B;QAAC,OAAO,KAAK,EAAE;YACd,mBAAmB,GAAG,IAAI,CAAC;YAC3B,MAAM,MAAM,CAAC,QAAQ,CAAC,mBAAmB,EAAE,KAAK,CAAC,CAAC;SACnD;KACF;SAAM;QACL,mDAAmD;QACnD,MAAM,MAAM,CAAC,QAAQ,CACnB,mBAAmB,EACnB,KAAK,CAAC,aAAa,GAAG,SAAS,CAAC,EAChC,KAAK,CACN,CAAC;KACH;IAED,IAAI,mBAAmB,EAAE;QACvB,MAAM,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC;QACxC,MAAM,QAAQ,GAAG,GAAG,CAAC,cAAc,CAAC,CAAC;QACrC,MAAM,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC;QAExC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;KACxB;AACH,CAAC,CAAC,EAAE,CAAC"}