@socketsecurity/cli-with-sentry 1.1.4 → 1.1.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +20 -14
- package/dist/cli.js +517 -351
- package/dist/cli.js.map +1 -1
- package/dist/constants.js +34 -13
- package/dist/constants.js.map +1 -1
- package/dist/flags.js +15 -9
- package/dist/flags.js.map +1 -1
- package/dist/tsconfig.dts.tsbuildinfo +1 -1
- package/dist/types/commands/analytics/cmd-analytics.d.mts.map +1 -1
- package/dist/types/commands/analytics/handle-analytics.d.mts +6 -5
- package/dist/types/commands/analytics/handle-analytics.d.mts.map +1 -1
- package/dist/types/commands/analytics/output-analytics.d.mts +6 -5
- package/dist/types/commands/analytics/output-analytics.d.mts.map +1 -1
- package/dist/types/commands/audit-log/cmd-audit-log.d.mts.map +1 -1
- package/dist/types/commands/fix/cmd-fix.d.mts.map +1 -1
- package/dist/types/commands/fix/coana-fix.d.mts.map +1 -1
- package/dist/types/commands/fix/handle-fix.d.mts +1 -1
- package/dist/types/commands/fix/handle-fix.d.mts.map +1 -1
- package/dist/types/commands/fix/pull-request.d.mts +2 -2
- package/dist/types/commands/fix/pull-request.d.mts.map +1 -1
- package/dist/types/commands/fix/types.d.mts +1 -4
- package/dist/types/commands/fix/types.d.mts.map +1 -1
- package/dist/types/commands/login/cmd-login.d.mts.map +1 -1
- package/dist/types/commands/organization/fetch-organization-list.d.mts +1 -1
- package/dist/types/commands/organization/fetch-organization-list.d.mts.map +1 -1
- package/dist/types/commands/patch/cmd-patch.d.mts.map +1 -1
- package/dist/types/commands/patch/handle-patch.d.mts +3 -9
- package/dist/types/commands/patch/handle-patch.d.mts.map +1 -1
- package/dist/types/commands/patch/output-patch-result.d.mts.map +1 -1
- package/dist/types/commands/repository/cmd-repository-create.d.mts.map +1 -1
- package/dist/types/commands/repository/cmd-repository-del.d.mts.map +1 -1
- package/dist/types/commands/repository/cmd-repository-update.d.mts.map +1 -1
- package/dist/types/commands/repository/cmd-repository-view.d.mts.map +1 -1
- package/dist/types/commands/scan/cmd-scan-create.d.mts.map +1 -1
- package/dist/types/commands/scan/cmd-scan-github.d.mts.map +1 -1
- package/dist/types/commands/scan/cmd-scan-list.d.mts.map +1 -1
- package/dist/types/commands/scan/cmd-scan-reach.d.mts.map +1 -1
- package/dist/types/commands/scan/generate-report.d.mts.map +1 -1
- package/dist/types/commands/scan/output-scan-report.d.mts.map +1 -1
- package/dist/types/commands/scan/perform-reachability-analysis.d.mts.map +1 -1
- package/dist/types/constants.d.mts +21 -7
- package/dist/types/constants.d.mts.map +1 -1
- package/dist/types/flags.d.mts.map +1 -1
- package/dist/types/utils/api.d.mts +8 -7
- package/dist/types/utils/api.d.mts.map +1 -1
- package/dist/types/utils/config.d.mts.map +1 -1
- package/dist/types/utils/git.d.mts +1 -0
- package/dist/types/utils/git.d.mts.map +1 -1
- package/dist/types/utils/meow-with-subcommands.d.mts.map +1 -1
- package/dist/types/utils/purl.d.mts +34 -19
- package/dist/types/utils/purl.d.mts.map +1 -1
- package/dist/types/utils/socket-package-alert.d.mts.map +1 -1
- package/dist/types/utils/spec.d.mts +1 -1
- package/dist/types/utils/spec.d.mts.map +1 -1
- package/dist/utils.js +94 -66
- package/dist/utils.js.map +1 -1
- package/dist/vendor.js +378 -378
- package/external/@socketsecurity/registry/lib/constants/skip-tests-by-ecosystem.js +0 -1
- package/package.json +9 -8
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"purl.d.mts","sourceRoot":"","sources":["../../../src/utils/purl.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAA;
|
|
1
|
+
{"version":3,"file":"purl.d.mts","sourceRoot":"","sources":["../../../src/utils/purl.mts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socket-package-alert.d.mts","sourceRoot":"","sources":["../../../src/utils/socket-package-alert.mts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"socket-package-alert.d.mts","sourceRoot":"","sources":["../../../src/utils/socket-package-alert.mts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { PackageURL } from '@socketregistry/packageurl-js';
|
|
1
|
+
import type { PackageURL } from '@socketregistry/packageurl-js';
|
|
2
2
|
export declare function idToNpmPurl(id: string): string;
|
|
3
3
|
export declare function idToPurl(id: string, type: string): string;
|
|
4
4
|
export declare function resolvePackageVersion(purlObj: PackageURL): string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spec.d.mts","sourceRoot":"","sources":["../../../src/utils/spec.mts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"spec.d.mts","sourceRoot":"","sources":["../../../src/utils/spec.mts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAA;AAE/D,wBAAgB,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAE9C;AAED,wBAAgB,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAEzD;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,UAAU,GAAG,MAAM,CAUjE"}
|
package/dist/utils.js
CHANGED
|
@@ -130,7 +130,10 @@ function getConfigValueOrUndef(key) {
|
|
|
130
130
|
|
|
131
131
|
// Ensure export because dist/utils.js is required in src/constants.mts.
|
|
132
132
|
// eslint-disable-next-line n/exports-style
|
|
133
|
-
exports
|
|
133
|
+
if (typeof exports === 'object' && exports !== null) {
|
|
134
|
+
// eslint-disable-next-line n/exports-style
|
|
135
|
+
exports.getConfigValueOrUndef = getConfigValueOrUndef;
|
|
136
|
+
}
|
|
134
137
|
function getSupportedConfigEntries() {
|
|
135
138
|
return [...supportedConfigEntries];
|
|
136
139
|
}
|
|
@@ -374,14 +377,14 @@ async function getErrorMessageForHttpStatusCode(code) {
|
|
|
374
377
|
}
|
|
375
378
|
async function handleApiCall(value, options) {
|
|
376
379
|
const {
|
|
377
|
-
|
|
380
|
+
description,
|
|
378
381
|
spinner
|
|
379
382
|
} = {
|
|
380
383
|
__proto__: null,
|
|
381
384
|
...options
|
|
382
385
|
};
|
|
383
|
-
if (
|
|
384
|
-
spinner?.start(`Requesting ${
|
|
386
|
+
if (description) {
|
|
387
|
+
spinner?.start(`Requesting ${description} from API...`);
|
|
385
388
|
} else {
|
|
386
389
|
spinner?.start();
|
|
387
390
|
}
|
|
@@ -389,8 +392,8 @@ async function handleApiCall(value, options) {
|
|
|
389
392
|
try {
|
|
390
393
|
sdkResult = await value;
|
|
391
394
|
spinner?.stop();
|
|
392
|
-
if (
|
|
393
|
-
const message = `Received Socket API response (after requesting ${
|
|
395
|
+
if (description) {
|
|
396
|
+
const message = `Received Socket API response (after requesting ${description}).`;
|
|
394
397
|
if (sdkResult.success) {
|
|
395
398
|
logger.logger.success(message);
|
|
396
399
|
} else {
|
|
@@ -404,9 +407,9 @@ async function handleApiCall(value, options) {
|
|
|
404
407
|
message: 'Socket API returned an error',
|
|
405
408
|
cause: vendor.messageWithCauses(e)
|
|
406
409
|
};
|
|
407
|
-
if (
|
|
408
|
-
logger.logger.fail(`An error was thrown while requesting ${
|
|
409
|
-
require$$9.debugFn('error', `caught: ${
|
|
410
|
+
if (description) {
|
|
411
|
+
logger.logger.fail(`An error was thrown while requesting ${description}`);
|
|
412
|
+
require$$9.debugFn('error', `caught: ${description} error`);
|
|
410
413
|
} else {
|
|
411
414
|
require$$9.debugFn('error', `caught: Socket API request error`);
|
|
412
415
|
}
|
|
@@ -419,23 +422,23 @@ async function handleApiCall(value, options) {
|
|
|
419
422
|
|
|
420
423
|
// Note: TS can't narrow down the type of result due to generics.
|
|
421
424
|
if (sdkResult.success === false) {
|
|
422
|
-
|
|
423
|
-
|
|
424
|
-
|
|
425
|
-
|
|
426
|
-
|
|
425
|
+
require$$9.debugFn('error', `fail:${description ? ` ${description}` : ''} bad response`);
|
|
426
|
+
require$$9.debugDir('inspect', {
|
|
427
|
+
sdkResult
|
|
428
|
+
});
|
|
429
|
+
const errCResult = sdkResult;
|
|
430
|
+
const errStr = errCResult.error ? String(errCResult.error).trim() : '';
|
|
431
|
+
const message = errStr || NO_ERROR_MESSAGE;
|
|
432
|
+
const reason = errCResult.cause || NO_ERROR_MESSAGE;
|
|
433
|
+
const cause = reason && message !== reason ? `${message} (reason: ${reason})` : message;
|
|
427
434
|
const socketSdkErrorResult = {
|
|
428
435
|
ok: false,
|
|
429
436
|
message: 'Socket API returned an error',
|
|
430
|
-
cause
|
|
437
|
+
cause,
|
|
431
438
|
data: {
|
|
432
439
|
code: sdkResult.status
|
|
433
440
|
}
|
|
434
441
|
};
|
|
435
|
-
require$$9.debugFn('error', `fail:${desc ? ` ${desc}` : ''} bad response`);
|
|
436
|
-
require$$9.debugDir('inspect', {
|
|
437
|
-
sdkResult
|
|
438
|
-
});
|
|
439
442
|
return socketSdkErrorResult;
|
|
440
443
|
}
|
|
441
444
|
const socketSdkSuccessResult = {
|
|
@@ -445,44 +448,47 @@ async function handleApiCall(value, options) {
|
|
|
445
448
|
return socketSdkSuccessResult;
|
|
446
449
|
}
|
|
447
450
|
async function handleApiCallNoSpinner(value, description) {
|
|
448
|
-
let
|
|
451
|
+
let sdkResult;
|
|
449
452
|
try {
|
|
450
|
-
|
|
453
|
+
sdkResult = await value;
|
|
451
454
|
} catch (e) {
|
|
452
|
-
const message = `${e || NO_ERROR_MESSAGE}`;
|
|
453
|
-
const reason = `${e || NO_ERROR_MESSAGE}`;
|
|
454
455
|
require$$9.debugFn('error', `caught: ${description} error`);
|
|
455
456
|
require$$9.debugDir('inspect', {
|
|
456
457
|
error: e
|
|
457
458
|
});
|
|
459
|
+
const errStr = e ? String(e).trim() : '';
|
|
460
|
+
const cause = errStr || NO_ERROR_MESSAGE;
|
|
458
461
|
return {
|
|
459
462
|
ok: false,
|
|
460
463
|
message: 'Socket API returned an error',
|
|
461
|
-
cause
|
|
464
|
+
cause
|
|
462
465
|
};
|
|
463
466
|
}
|
|
464
467
|
|
|
465
468
|
// Note: TS can't narrow down the type of result due to generics
|
|
466
|
-
if (
|
|
467
|
-
const error = result;
|
|
468
|
-
const message = `${error.error || NO_ERROR_MESSAGE}`;
|
|
469
|
+
if (sdkResult.success === false) {
|
|
469
470
|
require$$9.debugFn('error', `fail: ${description} bad response`);
|
|
470
471
|
require$$9.debugDir('inspect', {
|
|
471
|
-
|
|
472
|
+
sdkResult
|
|
472
473
|
});
|
|
474
|
+
const sdkErrorResult = sdkResult;
|
|
475
|
+
const errStr = sdkErrorResult.error ? String(sdkErrorResult.error).trim() : '';
|
|
476
|
+
const message = errStr || NO_ERROR_MESSAGE;
|
|
477
|
+
const reason = sdkErrorResult.cause || NO_ERROR_MESSAGE;
|
|
478
|
+
const cause = reason && message !== reason ? `${message} (reason: ${reason})` : message;
|
|
473
479
|
return {
|
|
474
480
|
ok: false,
|
|
475
481
|
message: 'Socket API returned an error',
|
|
476
|
-
cause
|
|
482
|
+
cause,
|
|
477
483
|
data: {
|
|
478
|
-
code:
|
|
484
|
+
code: sdkResult.status
|
|
479
485
|
}
|
|
480
486
|
};
|
|
481
487
|
} else {
|
|
482
|
-
const
|
|
488
|
+
const sdkSuccessResult = sdkResult;
|
|
483
489
|
return {
|
|
484
490
|
ok: true,
|
|
485
|
-
data:
|
|
491
|
+
data: sdkSuccessResult.data
|
|
486
492
|
};
|
|
487
493
|
}
|
|
488
494
|
}
|
|
@@ -498,7 +504,7 @@ async function queryApi(path, apiToken) {
|
|
|
498
504
|
}
|
|
499
505
|
});
|
|
500
506
|
}
|
|
501
|
-
async function queryApiSafeText(path,
|
|
507
|
+
async function queryApiSafeText(path, description) {
|
|
502
508
|
const apiToken = getDefaultApiToken();
|
|
503
509
|
if (!apiToken) {
|
|
504
510
|
return {
|
|
@@ -510,18 +516,18 @@ async function queryApiSafeText(path, desc) {
|
|
|
510
516
|
const {
|
|
511
517
|
spinner
|
|
512
518
|
} = constants.default;
|
|
513
|
-
if (
|
|
514
|
-
spinner.start(`Requesting ${
|
|
519
|
+
if (description) {
|
|
520
|
+
spinner.start(`Requesting ${description} from API...`);
|
|
515
521
|
}
|
|
516
522
|
let result;
|
|
517
523
|
try {
|
|
518
524
|
result = await queryApi(path, apiToken);
|
|
519
|
-
if (
|
|
520
|
-
spinner.successAndStop(`Received Socket API response (after requesting ${
|
|
525
|
+
if (description) {
|
|
526
|
+
spinner.successAndStop(`Received Socket API response (after requesting ${description}).`);
|
|
521
527
|
}
|
|
522
528
|
} catch (e) {
|
|
523
|
-
if (
|
|
524
|
-
spinner.failAndStop(`An error was thrown while requesting ${
|
|
529
|
+
if (description) {
|
|
530
|
+
spinner.failAndStop(`An error was thrown while requesting ${description}.`);
|
|
525
531
|
}
|
|
526
532
|
const cause = e?.message;
|
|
527
533
|
require$$9.debugFn('error', 'caught: await queryApi() error');
|
|
@@ -562,8 +568,8 @@ async function queryApiSafeText(path, desc) {
|
|
|
562
568
|
};
|
|
563
569
|
}
|
|
564
570
|
}
|
|
565
|
-
async function queryApiSafeJson(path,
|
|
566
|
-
const result = await queryApiSafeText(path,
|
|
571
|
+
async function queryApiSafeJson(path, description = '') {
|
|
572
|
+
const result = await queryApiSafeText(path, description);
|
|
567
573
|
if (!result.ok) {
|
|
568
574
|
return result;
|
|
569
575
|
}
|
|
@@ -593,34 +599,42 @@ async function sendApiRequest(path, options) {
|
|
|
593
599
|
if (!baseUrl) {
|
|
594
600
|
logger.logger.warn('API endpoint is not set and default was empty. Request is likely to fail.');
|
|
595
601
|
}
|
|
602
|
+
const {
|
|
603
|
+
body,
|
|
604
|
+
description,
|
|
605
|
+
method
|
|
606
|
+
} = {
|
|
607
|
+
__proto__: null,
|
|
608
|
+
...options
|
|
609
|
+
};
|
|
596
610
|
const {
|
|
597
611
|
spinner
|
|
598
612
|
} = constants.default;
|
|
599
|
-
if (
|
|
600
|
-
spinner.start(`Requesting ${
|
|
613
|
+
if (description) {
|
|
614
|
+
spinner.start(`Requesting ${description} from API...`);
|
|
601
615
|
}
|
|
602
616
|
let result;
|
|
603
617
|
try {
|
|
604
618
|
const fetchOptions = {
|
|
605
|
-
method
|
|
619
|
+
method,
|
|
606
620
|
headers: {
|
|
607
621
|
Authorization: `Basic ${btoa(`${apiToken}:`)}`,
|
|
608
622
|
'Content-Type': 'application/json'
|
|
609
623
|
},
|
|
610
|
-
...(
|
|
611
|
-
body: JSON.stringify(
|
|
624
|
+
...(body ? {
|
|
625
|
+
body: JSON.stringify(body)
|
|
612
626
|
} : {})
|
|
613
627
|
};
|
|
614
628
|
result = await fetch(`${baseUrl}${baseUrl.endsWith('/') ? '' : '/'}${path}`, fetchOptions);
|
|
615
|
-
if (
|
|
616
|
-
spinner.successAndStop(`Received Socket API response (after requesting ${
|
|
629
|
+
if (description) {
|
|
630
|
+
spinner.successAndStop(`Received Socket API response (after requesting ${description}).`);
|
|
617
631
|
}
|
|
618
632
|
} catch (e) {
|
|
619
|
-
if (
|
|
620
|
-
spinner.failAndStop(`An error was thrown while requesting ${
|
|
633
|
+
if (description) {
|
|
634
|
+
spinner.failAndStop(`An error was thrown while requesting ${description}.`);
|
|
621
635
|
}
|
|
622
636
|
const cause = e?.message;
|
|
623
|
-
require$$9.debugFn('error', `caught: await fetch() ${
|
|
637
|
+
require$$9.debugFn('error', `caught: await fetch() ${method} error`);
|
|
624
638
|
require$$9.debugDir('inspect', {
|
|
625
639
|
error: e
|
|
626
640
|
});
|
|
@@ -675,14 +689,20 @@ function mdTableStringNumber(title1, title2, obj) {
|
|
|
675
689
|
// | Paragraph | 18 |
|
|
676
690
|
let mw1 = title1.length;
|
|
677
691
|
let mw2 = title2.length;
|
|
678
|
-
for (const
|
|
692
|
+
for (const {
|
|
693
|
+
0: key,
|
|
694
|
+
1: value
|
|
695
|
+
} of Object.entries(obj)) {
|
|
679
696
|
mw1 = Math.max(mw1, key.length);
|
|
680
697
|
mw2 = Math.max(mw2, String(value ?? '').length);
|
|
681
698
|
}
|
|
682
699
|
const lines = [];
|
|
683
700
|
lines.push(`| ${title1.padEnd(mw1, ' ')} | ${title2.padEnd(mw2)} |`);
|
|
684
701
|
lines.push(`| ${'-'.repeat(mw1)} | ${'-'.repeat(mw2)} |`);
|
|
685
|
-
for (const
|
|
702
|
+
for (const {
|
|
703
|
+
0: key,
|
|
704
|
+
1: value
|
|
705
|
+
} of Object.entries(obj)) {
|
|
686
706
|
lines.push(`| ${key.padEnd(mw1, ' ')} | ${String(value ?? '').padStart(mw2, ' ')} |`);
|
|
687
707
|
}
|
|
688
708
|
lines.push(`| ${'-'.repeat(mw1)} | ${'-'.repeat(mw2)} |`);
|
|
@@ -843,12 +863,12 @@ function checkCommandInput(outputKind, ...checks) {
|
|
|
843
863
|
|
|
844
864
|
function getOutputKind(json, markdown) {
|
|
845
865
|
if (json) {
|
|
846
|
-
return constants.
|
|
866
|
+
return constants.OUTPUT_JSON;
|
|
847
867
|
}
|
|
848
868
|
if (markdown) {
|
|
849
|
-
return constants.
|
|
869
|
+
return constants.OUTPUT_MARKDOWN;
|
|
850
870
|
}
|
|
851
|
-
return constants.
|
|
871
|
+
return constants.OUTPUT_TEXT;
|
|
852
872
|
}
|
|
853
873
|
|
|
854
874
|
const require$2 = Module.createRequire(require('node:url').pathToFileURL(__filename).href);
|
|
@@ -1276,7 +1296,8 @@ function meowOrExit({
|
|
|
1276
1296
|
importMeta
|
|
1277
1297
|
});
|
|
1278
1298
|
if (!shouldSuppressBanner(cli.flags)) {
|
|
1279
|
-
|
|
1299
|
+
const orgFlag = String(cli.flags['org'] || '').trim() || undefined;
|
|
1300
|
+
emitBanner(command, orgFlag);
|
|
1280
1301
|
// Add newline in stderr.
|
|
1281
1302
|
// Meow help adds a newline too so we do it here.
|
|
1282
1303
|
logger.logger.error('');
|
|
@@ -1304,15 +1325,15 @@ function meowOrExit({
|
|
|
1304
1325
|
cli.showHelp(0);
|
|
1305
1326
|
}
|
|
1306
1327
|
|
|
1307
|
-
//
|
|
1328
|
+
// Meow doesn't detect 'version' as an unknown flag, so we do the leg work here.
|
|
1308
1329
|
if (!require$$11.hasOwn(config.flags, 'version') && cli.flags['version']) {
|
|
1309
|
-
// Use `console.error` here instead of `logger.error` to match
|
|
1330
|
+
// Use `console.error` here instead of `logger.error` to match Meow behavior.
|
|
1310
1331
|
console.error('Unknown flag\n--version');
|
|
1311
1332
|
// eslint-disable-next-line n/no-process-exit
|
|
1312
1333
|
process.exit(2);
|
|
1313
1334
|
}
|
|
1314
1335
|
|
|
1315
|
-
// Now test for help state. Run
|
|
1336
|
+
// Now test for help state. Run Meow again. If it exits now, it must be due
|
|
1316
1337
|
// to wanting to print the help screen. But it would exit(0) and we want a
|
|
1317
1338
|
// consistent exit(2) for that case (missing input).
|
|
1318
1339
|
// TODO: Move away from meow.
|
|
@@ -1396,7 +1417,7 @@ function msAtHome(isoTimeStamp) {
|
|
|
1396
1417
|
|
|
1397
1418
|
async function fetchOrganization(options) {
|
|
1398
1419
|
const {
|
|
1399
|
-
|
|
1420
|
+
description = 'organization list',
|
|
1400
1421
|
sdk,
|
|
1401
1422
|
sdkOpts
|
|
1402
1423
|
} = {
|
|
@@ -1412,7 +1433,7 @@ async function fetchOrganization(options) {
|
|
|
1412
1433
|
sockSdk = sockSdkCResult.data;
|
|
1413
1434
|
}
|
|
1414
1435
|
const orgsCResult = await handleApiCall(sockSdk.getOrganizations(), {
|
|
1415
|
-
|
|
1436
|
+
description
|
|
1416
1437
|
});
|
|
1417
1438
|
if (!orgsCResult.ok) {
|
|
1418
1439
|
return orgsCResult;
|
|
@@ -2047,7 +2068,7 @@ function getPurlObject(purl, options) {
|
|
|
2047
2068
|
};
|
|
2048
2069
|
const shouldThrow = throws === undefined || !!throws;
|
|
2049
2070
|
try {
|
|
2050
|
-
return typeof purl === 'string' ? vendor.packageurlJsExports.PackageURL.fromString(purl) : purl;
|
|
2071
|
+
return typeof purl === 'string' ? vendor.packageurlJsExports.PackageURL.fromString(normalizePurl(purl)) : purl;
|
|
2051
2072
|
} catch (e) {
|
|
2052
2073
|
if (shouldThrow) {
|
|
2053
2074
|
throw e;
|
|
@@ -2055,6 +2076,9 @@ function getPurlObject(purl, options) {
|
|
|
2055
2076
|
return null;
|
|
2056
2077
|
}
|
|
2057
2078
|
}
|
|
2079
|
+
function normalizePurl(rawPurl) {
|
|
2080
|
+
return rawPurl.startsWith('pkg:') ? rawPurl : `pkg:${rawPurl}`;
|
|
2081
|
+
}
|
|
2058
2082
|
|
|
2059
2083
|
function getPkgFullNameFromPurl(purl) {
|
|
2060
2084
|
const purlObj = getPurlObject(purl);
|
|
@@ -2083,7 +2107,10 @@ function mapToObject(map) {
|
|
|
2083
2107
|
}
|
|
2084
2108
|
|
|
2085
2109
|
function* walkNestedMap(map, keys = []) {
|
|
2086
|
-
for (const
|
|
2110
|
+
for (const {
|
|
2111
|
+
0: key,
|
|
2112
|
+
1: value
|
|
2113
|
+
} of map.entries()) {
|
|
2087
2114
|
if (value instanceof Map) {
|
|
2088
2115
|
yield* walkNestedMap(value, [...keys, key]);
|
|
2089
2116
|
} else {
|
|
@@ -2811,7 +2838,7 @@ async function fetchGhsaDetails(ids) {
|
|
|
2811
2838
|
}
|
|
2812
2839
|
}
|
|
2813
2840
|
} catch (e) {
|
|
2814
|
-
require$$9.debugFn('error', `Failed to fetch GHSA details: ${e?.message ||
|
|
2841
|
+
require$$9.debugFn('error', `Failed to fetch GHSA details: ${e?.message || constants.UNKNOWN_ERROR}`);
|
|
2815
2842
|
}
|
|
2816
2843
|
return results;
|
|
2817
2844
|
}
|
|
@@ -4054,6 +4081,7 @@ exports.mdTableStringNumber = mdTableStringNumber;
|
|
|
4054
4081
|
exports.meowOrExit = meowOrExit;
|
|
4055
4082
|
exports.meowWithSubcommands = meowWithSubcommands;
|
|
4056
4083
|
exports.msAtHome = msAtHome;
|
|
4084
|
+
exports.normalizePurl = normalizePurl;
|
|
4057
4085
|
exports.npa = npa;
|
|
4058
4086
|
exports.queryApiSafeJson = queryApiSafeJson;
|
|
4059
4087
|
exports.queryApiSafeText = queryApiSafeText;
|
|
@@ -4071,5 +4099,5 @@ exports.toFilterConfig = toFilterConfig;
|
|
|
4071
4099
|
exports.updateConfigValue = updateConfigValue;
|
|
4072
4100
|
exports.walkNestedMap = walkNestedMap;
|
|
4073
4101
|
exports.writeSocketJson = writeSocketJson;
|
|
4074
|
-
//# debugId=
|
|
4102
|
+
//# debugId=bb13588e-acd6-4f09-97dc-878030632d5
|
|
4075
4103
|
//# sourceMappingURL=utils.js.map
|