@socketsecurity/cli-with-sentry 1.0.0 → 1.0.1
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/dist/cli.js +539 -862
- package/dist/cli.js.map +1 -1
- package/dist/constants.js +4 -4
- package/dist/constants.js.map +1 -1
- package/dist/shadow-npm-inject.js +1 -61
- package/dist/shadow-npm-inject.js.map +1 -1
- package/dist/types/cli.d.mts +1 -0
- package/dist/types/commands/fix/agent-fix.d.mts +36 -0
- package/dist/types/commands/fix/agent-fix.d.mts.map +1 -0
- package/dist/types/commands/fix/cmd-fix.d.mts.map +1 -1
- package/dist/types/commands/fix/get-actual-tree.d.mts +3 -0
- package/dist/types/commands/fix/get-actual-tree.d.mts.map +1 -0
- package/dist/types/commands/fix/handle-fix.d.mts +11 -1
- package/dist/types/commands/fix/handle-fix.d.mts.map +1 -1
- package/dist/types/commands/fix/npm-fix.d.mts +2 -10
- package/dist/types/commands/fix/npm-fix.d.mts.map +1 -1
- package/dist/types/commands/fix/pnpm-fix.d.mts +2 -10
- package/dist/types/commands/fix/pnpm-fix.d.mts.map +1 -1
- package/dist/types/commands/manifest/convert_gradle_to_maven.d.mts.map +1 -1
- package/dist/types/commands/optimize/get-overrides-by-agent.d.mts +35 -2
- package/dist/types/commands/optimize/get-overrides-by-agent.d.mts.map +1 -1
- package/dist/types/commands/repository/output-list-repos.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/handle-create-github-scan.d.mts.map +1 -1
- package/dist/types/commands/scan/output-scan-github.d.mts +3 -0
- package/dist/types/commands/scan/output-scan-github.d.mts.map +1 -0
- package/dist/types/commands/scan/suggest-org-slug.d.mts.map +1 -1
- package/dist/types/commands/scan/suggest-to-persist-orgslug.d.mts +2 -0
- package/dist/types/commands/scan/suggest-to-persist-orgslug.d.mts.map +1 -0
- package/dist/types/utils/config.d.mts +2 -1
- package/dist/types/utils/config.d.mts.map +1 -1
- package/dist/types/utils/determine-org-slug.d.mts.map +1 -1
- package/dist/types/utils/lockfile.d.mts +2 -0
- package/dist/types/utils/lockfile.d.mts.map +1 -0
- package/dist/types/utils/meow-with-subcommands.d.mts +1 -1
- package/dist/types/utils/meow-with-subcommands.d.mts.map +1 -1
- package/dist/types/utils/package-environment.d.mts +11 -11
- package/dist/types/utils/package-environment.d.mts.map +1 -1
- package/dist/types/utils/pnpm.d.mts +1 -1
- package/dist/types/utils/pnpm.d.mts.map +1 -1
- package/dist/types/utils/semver.d.mts.map +1 -1
- package/dist/utils.js +114 -29
- package/dist/utils.js.map +1 -1
- package/dist/vendor.js +7129 -7118
- package/external/@coana-tech/cli/cli.mjs +14035 -3820
- package/external/@socketsecurity/registry/external/@npmcli/package-json/index.js +7 -7
- package/external/@socketsecurity/registry/external/@socketregistry/packageurl-js.js +12 -8
- package/external/@socketsecurity/registry/external/cacache.js +6 -6
- package/external/@socketsecurity/registry/external/libnpmpack.js +47 -45
- package/external/@socketsecurity/registry/external/make-fetch-happen.js +37 -36
- package/external/@socketsecurity/registry/external/pacote.js +45 -44
- package/external/blessed-contrib/lib/widget/charts/bar.js +6 -3
- package/external/blessed-contrib/lib/widget/charts/line.js +6 -3
- package/package.json +28 -28
- package/dist/types/commands/fix/run-fix.d.mts +0 -12
- package/dist/types/commands/fix/run-fix.d.mts.map +0 -1
|
@@ -1,6 +1,39 @@
|
|
|
1
|
-
import type { Overrides } from './types.mts';
|
|
1
|
+
import type { NpmOverrides, Overrides, PnpmOrYarnOverrides } from './types.mts';
|
|
2
2
|
import type { Agent, EnvDetails } from '../../utils/package-environment.mts';
|
|
3
|
-
|
|
3
|
+
import type { PackageJson } from '@socketsecurity/registry/lib/packages';
|
|
4
|
+
export declare function getOverridesDataBun(pkgEnvDetails: EnvDetails, pkgJson?: Readonly<PackageJson>): {
|
|
5
|
+
type: "yarn/berry";
|
|
6
|
+
overrides: PnpmOrYarnOverrides;
|
|
7
|
+
};
|
|
8
|
+
// npm overrides documentation:
|
|
9
|
+
// https://docs.npmjs.com/cli/v10/configuring-npm/package-json#overrides
|
|
10
|
+
export declare function getOverridesDataNpm(pkgEnvDetails: EnvDetails, pkgJson?: Readonly<PackageJson>): {
|
|
11
|
+
type: "npm";
|
|
12
|
+
overrides: NpmOverrides;
|
|
13
|
+
};
|
|
14
|
+
// pnpm overrides documentation:
|
|
15
|
+
// https://pnpm.io/package_json#pnpmoverrides
|
|
16
|
+
export declare function getOverridesDataPnpm(pkgEnvDetails: EnvDetails, pkgJson?: Readonly<PackageJson>): {
|
|
17
|
+
type: "pnpm";
|
|
18
|
+
overrides: PnpmOrYarnOverrides;
|
|
19
|
+
};
|
|
20
|
+
export declare function getOverridesDataVlt(pkgEnvDetails: EnvDetails, pkgJson?: Readonly<PackageJson>): {
|
|
21
|
+
type: "vlt";
|
|
22
|
+
overrides: NpmOverrides;
|
|
23
|
+
};
|
|
24
|
+
// Yarn resolutions documentation:
|
|
25
|
+
// https://yarnpkg.com/configuration/manifest#resolutions
|
|
26
|
+
export declare function getOverridesDataYarn(pkgEnvDetails: EnvDetails, pkgJson?: Readonly<PackageJson>): {
|
|
27
|
+
type: "yarn/berry";
|
|
28
|
+
overrides: PnpmOrYarnOverrides;
|
|
29
|
+
};
|
|
30
|
+
// Yarn resolutions documentation:
|
|
31
|
+
// https://classic.yarnpkg.com/en/docs/selective-version-resolutions
|
|
32
|
+
export declare function getOverridesDataYarnClassic(pkgEnvDetails: EnvDetails, pkgJson?: Readonly<PackageJson>): {
|
|
33
|
+
type: "yarn/classic";
|
|
34
|
+
overrides: PnpmOrYarnOverrides;
|
|
35
|
+
};
|
|
36
|
+
export type GetOverrides = (pkgEnvDetails: EnvDetails, pkgJson?: PackageJson | undefined) => GetOverridesResult;
|
|
4
37
|
export type GetOverridesResult = {
|
|
5
38
|
type: Agent;
|
|
6
39
|
overrides: Overrides;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-overrides-by-agent.d.mts","sourceRoot":"","sources":["../../../../src/commands/optimize/get-overrides-by-agent.mts"],"names":[],"mappings":"AAEA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"get-overrides-by-agent.d.mts","sourceRoot":"","sources":["../../../../src/commands/optimize/get-overrides-by-agent.mts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAA;AAC/E,OAAO,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAA;AAC5E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAA;AAaxE,wBAAgB,mBAAmB,CACjC,aAAa,EAAE,UAAU,EACzB,OAAO,wBAAwC;;;EAIhD;AAED,+BAA+B;AAC/B,wEAAwE;AACxE,wBAAgB,mBAAmB,CACjC,aAAa,EAAE,UAAU,EACzB,OAAO,wBAAwC;;;EAIhD;AAED,gCAAgC;AAChC,6CAA6C;AAC7C,wBAAgB,oBAAoB,CAClC,aAAa,EAAE,UAAU,EACzB,OAAO,wBAAwC;;;EAKhD;AAED,wBAAgB,mBAAmB,CACjC,aAAa,EAAE,UAAU,EACzB,OAAO,wBAAwC;;;EAIhD;AAED,kCAAkC;AAClC,yDAAyD;AACzD,wBAAgB,oBAAoB,CAClC,aAAa,EAAE,UAAU,EACzB,OAAO,wBAAwC;;;EAIhD;AAED,kCAAkC;AAClC,oEAAoE;AACpE,wBAAgB,2BAA2B,CACzC,aAAa,EAAE,UAAU,EACzB,OAAO,wBAAwC;;;EAIhD;AAED,MAAM,MAAM,YAAY,GAAG,CACzB,aAAa,EAAE,UAAU,EACzB,OAAO,CAAC,EAAE,WAAW,GAAG,SAAS,KAC9B,kBAAkB,CAAA;AAEvB,MAAM,MAAM,kBAAkB,GAAG;IAAE,IAAI,EAAE,KAAK,CAAC;IAAC,SAAS,EAAE,SAAS,CAAA;CAAE,CAAA;AAEtE,eAAO,MAAM,oBAAoB,mFAOS,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"output-list-repos.d.mts","sourceRoot":"","sources":["../../../../src/commands/repository/output-list-repos.mts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC1D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAA;AAE9D,wBAAsB,eAAe,CACnC,MAAM,EAAE,OAAO,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,CAAC,MAAM,CAAC,CAAC,EAC9D,UAAU,EAAE,UAAU,EACtB,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,GAAG,IAAI,EACvB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,KAAK,GAAG,MAAM,GACxB,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"output-list-repos.d.mts","sourceRoot":"","sources":["../../../../src/commands/repository/output-list-repos.mts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC1D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAA;AAE9D,wBAAsB,eAAe,CACnC,MAAM,EAAE,OAAO,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,CAAC,MAAM,CAAC,CAAC,EAC9D,UAAU,EAAE,UAAU,EACtB,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,GAAG,IAAI,EACvB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,KAAK,GAAG,MAAM,GACxB,OAAO,CAAC,IAAI,CAAC,CA2Df"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cmd-scan-create.d.mts","sourceRoot":"","sources":["../../../../src/commands/scan/cmd-scan-create.mts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cmd-scan-create.d.mts","sourceRoot":"","sources":["../../../../src/commands/scan/cmd-scan-create.mts"],"names":[],"mappings":"AAoKA,eAAO,MAAM,aAAa;;;;CAIzB,CAAA;AAED,iBAAe,GAAG,CAChB,IAAI,EAAE,MAAM,EAAE,GAAG,SAAS,MAAM,EAAE,EAClC,UAAU,EAAE,UAAU,EACtB,EAAE,UAAU,EAAE,EAAE;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,GACrC,OAAO,CAAC,IAAI,CAAC,CAmPf"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cmd-scan-github.d.mts","sourceRoot":"","sources":["../../../../src/commands/scan/cmd-scan-github.mts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cmd-scan-github.d.mts","sourceRoot":"","sources":["../../../../src/commands/scan/cmd-scan-github.mts"],"names":[],"mappings":"AA8FA,eAAO,MAAM,aAAa;;;;CAIzB,CAAA;AAED,iBAAe,GAAG,CAChB,IAAI,EAAE,MAAM,EAAE,GAAG,SAAS,MAAM,EAAE,EAClC,UAAU,EAAE,UAAU,EACtB,EAAE,UAAU,EAAE,EAAE;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,GACrC,OAAO,CAAC,IAAI,CAAC,CAwJf"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handle-create-github-scan.d.mts","sourceRoot":"","sources":["../../../../src/commands/scan/handle-create-github-scan.mts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"handle-create-github-scan.d.mts","sourceRoot":"","sources":["../../../../src/commands/scan/handle-create-github-scan.mts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAEjD,wBAAsB,sBAAsB,CAAC,EAC3C,GAAG,EACH,YAAY,EACZ,WAAW,EACX,WAAW,EACX,SAAS,EACT,OAAO,EACP,UAAU,EACV,KAAK,EACN,EAAE;IACD,GAAG,EAAE,OAAO,CAAA;IACZ,YAAY,EAAE,MAAM,CAAA;IACpB,WAAW,EAAE,MAAM,CAAA;IACnB,WAAW,EAAE,OAAO,CAAA;IACpB,OAAO,EAAE,MAAM,CAAA;IACf,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,UAAU,CAAA;IACtB,KAAK,EAAE,MAAM,CAAA;CACd,iBAaA"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"output-scan-github.d.mts","sourceRoot":"","sources":["../../../../src/commands/scan/output-scan-github.mts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAE1D,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,EACxB,UAAU,EAAE,UAAU,iBAcvB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"suggest-org-slug.d.mts","sourceRoot":"","sources":["../../../../src/commands/scan/suggest-org-slug.mts"],"names":[],"mappings":"AAMA,wBAAsB,cAAc,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"suggest-org-slug.d.mts","sourceRoot":"","sources":["../../../../src/commands/scan/suggest-org-slug.mts"],"names":[],"mappings":"AAMA,wBAAsB,cAAc,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CA8C7D"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"suggest-to-persist-orgslug.d.mts","sourceRoot":"","sources":["../../../../src/commands/scan/suggest-to-persist-orgslug.mts"],"names":[],"mappings":"AAKA,wBAAsB,uBAAuB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAgD5E"}
|
|
@@ -10,6 +10,7 @@ export interface LocalConfig {
|
|
|
10
10
|
apiToken?: string | null | undefined;
|
|
11
11
|
defaultOrg?: string;
|
|
12
12
|
enforcedOrgs?: string[] | readonly string[] | null | undefined;
|
|
13
|
+
skipAskToPersistDefaultOrg?: boolean;
|
|
13
14
|
org?: string; // convenience alias for defaultOrg
|
|
14
15
|
}
|
|
15
16
|
export declare const sensitiveConfigKeys: Set<keyof LocalConfig>;
|
|
@@ -25,5 +26,5 @@ export declare function getConfigValueOrUndef<Key extends keyof LocalConfig>(key
|
|
|
25
26
|
export declare function isReadOnlyConfig(): boolean;
|
|
26
27
|
export declare function overrideCachedConfig(jsonConfig: unknown): CResult<undefined>;
|
|
27
28
|
export declare function overrideConfigApiToken(apiToken: unknown): void;
|
|
28
|
-
export declare function updateConfigValue<Key extends keyof LocalConfig>(
|
|
29
|
+
export declare function updateConfigValue<Key extends keyof LocalConfig>(configKey: keyof LocalConfig, value: LocalConfig[Key]): CResult<undefined | string>;
|
|
29
30
|
//# sourceMappingURL=config.d.mts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.mts","sourceRoot":"","sources":["../../../src/utils/config.mts"],"names":[],"mappings":"AAGA,OAAO,MAAM,MAAM,wBAAwB,CAAA;AAO3C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAE3C,MAAM,WAAW,WAAW;IAC1B,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;IACtC,4EAA4E;IAC5E,4EAA4E;IAC5E,0DAA0D;IAC1D,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;IAClC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;IACpC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;IACpC,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,YAAY,CAAC,EAAE,MAAM,EAAE,GAAG,SAAS,MAAM,EAAE,GAAG,IAAI,GAAG,SAAS,CAAA;IAC9D,GAAG,CAAC,EAAE,MAAM,CAAA,CAAC,mCAAmC;CACjD;AAED,eAAO,MAAM,mBAAmB,EAAE,GAAG,CAAC,MAAM,WAAW,CAAyB,CAAA;AAEhF,eAAO,MAAM,mBAAmB,EAAE,GAAG,CAAC,MAAM,WAAW,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"config.d.mts","sourceRoot":"","sources":["../../../src/utils/config.mts"],"names":[],"mappings":"AAGA,OAAO,MAAM,MAAM,wBAAwB,CAAA;AAO3C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAE3C,MAAM,WAAW,WAAW;IAC1B,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;IACtC,4EAA4E;IAC5E,4EAA4E;IAC5E,0DAA0D;IAC1D,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;IAClC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;IACpC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;IACpC,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,YAAY,CAAC,EAAE,MAAM,EAAE,GAAG,SAAS,MAAM,EAAE,GAAG,IAAI,GAAG,SAAS,CAAA;IAC9D,0BAA0B,CAAC,EAAE,OAAO,CAAA;IACpC,GAAG,CAAC,EAAE,MAAM,CAAA,CAAC,mCAAmC;CACjD;AAED,eAAO,MAAM,mBAAmB,EAAE,GAAG,CAAC,MAAM,WAAW,CAAyB,CAAA;AAEhF,eAAO,MAAM,mBAAmB,EAAE,GAAG,CAAC,MAAM,WAAW,EAAE,MAAM,CAiB7D,CAAA;AAoDF,wBAAgB,iBAAiB,CAAC,GAAG,SAAgB;;;SAuBpD;AAED,wBAAgB,cAAc,CAAC,GAAG,SAAS,MAAM,WAAW,EAC1D,GAAG,EAAE,GAAG,GACP,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAO3B;AAED,6DAA6D;AAC7D,qEAAqE;AACrE,wBAAgB,qBAAqB,CAAC,GAAG,SAAS,MAAM,WAAW,EACjE,GAAG,EAAE,GAAG,GACP,WAAW,CAAC,GAAG,CAAC,GAAG,SAAS,CAO9B;AAED,wBAAgB,gBAAgB,YAE/B;AAMD,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CA4C5E;AAED,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,OAAO,QASvD;AAGD,wBAAgB,iBAAiB,CAAC,GAAG,SAAS,MAAM,WAAW,EAC7D,SAAS,EAAE,MAAM,WAAW,EAC5B,KAAK,EAAE,WAAW,CAAC,GAAG,CAAC,GACtB,OAAO,CAAC,SAAS,GAAG,MAAM,CAAC,CAmD7B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"determine-org-slug.d.mts","sourceRoot":"","sources":["../../../src/utils/determine-org-slug.mts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"determine-org-slug.d.mts","sourceRoot":"","sources":["../../../src/utils/determine-org-slug.mts"],"names":[],"mappings":"AAMA,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,OAAO,EACpB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC,CAwDvC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"lockfile.d.mts","sourceRoot":"","sources":["../../../src/utils/lockfile.mts"],"names":[],"mappings":"AAIA,wBAAsB,YAAY,CAChC,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAExB"}
|
|
@@ -45,6 +45,6 @@ argv, config, importMeta, parentName }: {
|
|
|
45
45
|
parentName: string;
|
|
46
46
|
importMeta: ImportMeta;
|
|
47
47
|
}): Result<MeowFlags>;
|
|
48
|
-
export declare function emitBanner(name: string): void;
|
|
48
|
+
export declare function emitBanner(name: string, orgFlag: string | undefined): void;
|
|
49
49
|
export {};
|
|
50
50
|
//# sourceMappingURL=meow-with-subcommands.d.mts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"meow-with-subcommands.d.mts","sourceRoot":"","sources":["../../../src/utils/meow-with-subcommands.mts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAC7C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAE3C,UAAU,QAAQ;IAChB,WAAW,EAAE,MAAM,CAAA;IACnB,IAAI,EAAE,SAAS,MAAM,EAAE,CAAA;IACvB,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;CAC7B;AAED,KAAK,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;AAE1C,KAAK,gBAAgB,GAAG,CACtB,IAAI,EAAE,MAAM,EAAE,GAAG,SAAS,MAAM,EAAE,EAClC,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,KAC5B,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAA;AAEzB,MAAM,WAAW,aAAa;IAC5B,WAAW,EAAE,MAAM,CAAA;IACnB,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IAC5B,GAAG,EAAE,gBAAgB,CAAA;CACtB;AAED,4EAA4E;AAC5E,2EAA2E;AAC3E,qEAAqE;AACrE,MAAM,WAAW,gBAAgB;IAC/B,WAAW,EAAE,MAAM,CAAA,CAAC,gCAAgC;IACpD,WAAW,EAAE,MAAM,CAAA;IACnB,MAAM,EAAE,OAAO,CAAA;IACf,KAAK,EAAE,SAAS,CAAA,CAAC,gCAAgC;IACjD,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,KAAK,MAAM,CAAA;CAC5D;AAED,UAAU,WAAY,SAAQ,OAAO,CAAC,GAAG,CAAC;IACxC,OAAO,CAAC,EAAE,UAAU,GAAG,SAAS,CAAA;IAChC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAA;IACvB,IAAI,EAAE,MAAM,CAAA;IACZ,4DAA4D;IAC5D,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB;AAMD,wBAAgB,kBAAkB,IAAI,MAAM,CAE3C;AAED,wBAAsB,mBAAmB,CACvC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,EAC1C,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"meow-with-subcommands.d.mts","sourceRoot":"","sources":["../../../src/utils/meow-with-subcommands.mts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAC7C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAE3C,UAAU,QAAQ;IAChB,WAAW,EAAE,MAAM,CAAA;IACnB,IAAI,EAAE,SAAS,MAAM,EAAE,CAAA;IACvB,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;CAC7B;AAED,KAAK,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;AAE1C,KAAK,gBAAgB,GAAG,CACtB,IAAI,EAAE,MAAM,EAAE,GAAG,SAAS,MAAM,EAAE,EAClC,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,KAC5B,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAA;AAEzB,MAAM,WAAW,aAAa;IAC5B,WAAW,EAAE,MAAM,CAAA;IACnB,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IAC5B,GAAG,EAAE,gBAAgB,CAAA;CACtB;AAED,4EAA4E;AAC5E,2EAA2E;AAC3E,qEAAqE;AACrE,MAAM,WAAW,gBAAgB;IAC/B,WAAW,EAAE,MAAM,CAAA,CAAC,gCAAgC;IACpD,WAAW,EAAE,MAAM,CAAA;IACnB,MAAM,EAAE,OAAO,CAAA;IACf,KAAK,EAAE,SAAS,CAAA,CAAC,gCAAgC;IACjD,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,KAAK,MAAM,CAAA;CAC5D;AAED,UAAU,WAAY,SAAQ,OAAO,CAAC,GAAG,CAAC;IACxC,OAAO,CAAC,EAAE,UAAU,GAAG,SAAS,CAAA;IAChC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAA;IACvB,IAAI,EAAE,MAAM,CAAA;IACZ,4DAA4D;IAC5D,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB;AAMD,wBAAgB,kBAAkB,IAAI,MAAM,CAE3C;AAED,wBAAsB,mBAAmB,CACvC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,EAC1C,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC,IAAI,CAAC,CAsVf;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC;AACzB,2EAA2E;AAC3E,IAAI,EACJ,MAAM,EACN,UAAU,EACV,UAAU,EACX,EAAE;IACD,iBAAiB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IACvC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAA;IACvB,MAAM,EAAE,gBAAgB,CAAA;IACxB,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,UAAU,CAAA;CACvB,GAAG,MAAM,CAAC,SAAS,CAAC,CA4DpB;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,SAAS,QAUnE"}
|
|
@@ -5,7 +5,7 @@ import type { EditablePackageJson } from '@socketsecurity/registry/lib/packages'
|
|
|
5
5
|
import type { SemVer } from 'semver';
|
|
6
6
|
export declare const AGENTS: readonly ["bun", "npm", "pnpm", "yarn/berry", "yarn/classic", "vlt"];
|
|
7
7
|
export type Agent = (typeof AGENTS)[number];
|
|
8
|
-
type EnvBase = {
|
|
8
|
+
export type EnvBase = {
|
|
9
9
|
agent: Agent;
|
|
10
10
|
agentExecPath: string;
|
|
11
11
|
agentSupported: boolean;
|
|
@@ -34,6 +34,15 @@ export type EnvDetails = Readonly<Remap<EnvBase & {
|
|
|
34
34
|
lockSrc: string;
|
|
35
35
|
pkgPath: string;
|
|
36
36
|
}>>;
|
|
37
|
+
export type DetectAndValidateOptions = {
|
|
38
|
+
cmdName?: string | undefined;
|
|
39
|
+
logger?: Logger | undefined;
|
|
40
|
+
prod?: boolean | undefined;
|
|
41
|
+
};
|
|
42
|
+
export type DetectOptions = {
|
|
43
|
+
cwd?: string | undefined;
|
|
44
|
+
onUnknown?: (pkgManager: string | undefined) => void;
|
|
45
|
+
};
|
|
37
46
|
export type PartialEnvDetails = Readonly<Remap<EnvBase & {
|
|
38
47
|
agentVersion: SemVer | undefined;
|
|
39
48
|
editablePkgJson: EditablePackageJson | undefined;
|
|
@@ -42,16 +51,7 @@ export type PartialEnvDetails = Readonly<Remap<EnvBase & {
|
|
|
42
51
|
lockSrc: string | undefined;
|
|
43
52
|
pkgPath: string | undefined;
|
|
44
53
|
}>>;
|
|
45
|
-
export type
|
|
46
|
-
cwd?: string | undefined;
|
|
47
|
-
onUnknown?: (pkgManager: string | undefined) => void;
|
|
48
|
-
};
|
|
49
|
-
export type DetectAndValidateOptions = {
|
|
50
|
-
cmdName?: string | undefined;
|
|
51
|
-
logger?: Logger | undefined;
|
|
52
|
-
prod?: boolean | undefined;
|
|
53
|
-
};
|
|
54
|
+
export type ReadLockFile = ((lockPath: string) => Promise<string | undefined>) | ((lockPath: string, agentExecPath: string) => Promise<string | undefined>) | ((lockPath: string, agentExecPath: string, cwd: string) => Promise<string | undefined>);
|
|
54
55
|
export declare function detectPackageEnvironment({ cwd, onUnknown }?: DetectOptions): Promise<EnvDetails | PartialEnvDetails>;
|
|
55
56
|
export declare function detectAndValidatePackageEnvironment(cwd: string, options?: DetectAndValidateOptions | undefined): Promise<CResult<EnvDetails>>;
|
|
56
|
-
export {};
|
|
57
57
|
//# sourceMappingURL=package-environment.d.mts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-environment.d.mts","sourceRoot":"","sources":["../../../src/utils/package-environment.mts"],"names":[],"mappings":"AASA,OAAO,EAAE,MAAM,EAAE,MAAM,qCAAqC,CAAA;AAU5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAC3C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sCAAsC,CAAA;AACjE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAA;AAChF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAiBpC,eAAO,MAAM,MAAM,sEAA2D,CAAA;AAW9E,MAAM,MAAM,KAAK,GAAG,CAAC,OAAO,MAAM,CAAC,CAAC,MAAM,CAAC,CAAA;AAE3C,
|
|
1
|
+
{"version":3,"file":"package-environment.d.mts","sourceRoot":"","sources":["../../../src/utils/package-environment.mts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { LockfileObject } from '@pnpm/lockfile.fs';
|
|
2
2
|
import type { SemVer } from 'semver';
|
|
3
|
-
export declare function
|
|
3
|
+
export declare function extractOverridesFromPnpmLockSrc(lockfileContent: any): string;
|
|
4
4
|
export declare function extractPurlsFromPnpmLockfile(lockfile: LockfileObject): Promise<string[]>;
|
|
5
5
|
export declare function isPnpmDepPath(maybeDepPath: string): boolean;
|
|
6
6
|
export declare function parsePnpmLockfile(lockfileContent: unknown): LockfileObject | null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pnpm.d.mts","sourceRoot":"","sources":["../../../src/utils/pnpm.mts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,cAAc,EAAmB,MAAM,mBAAmB,CAAA;AACxE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAEpC,wBAAgB,
|
|
1
|
+
{"version":3,"file":"pnpm.d.mts","sourceRoot":"","sources":["../../../src/utils/pnpm.mts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,cAAc,EAAmB,MAAM,mBAAmB,CAAA;AACxE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAEpC,wBAAgB,+BAA+B,CAAC,eAAe,EAAE,GAAG,GAAG,MAAM,CAI5E;AAED,wBAAsB,4BAA4B,CAChD,QAAQ,EAAE,cAAc,GACvB,OAAO,CAAC,MAAM,EAAE,CAAC,CA8BnB;AAED,wBAAgB,aAAa,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAE3D;AAED,wBAAgB,iBAAiB,CAC/B,eAAe,EAAE,OAAO,GACvB,cAAc,GAAG,IAAI,CAQvB;AAED,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAKxE;AAED,wBAAsB,gBAAgB,CACpC,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAExB;AAED,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEpE;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAI3D"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"semver.d.mts","sourceRoot":"","sources":["../../../src/utils/semver.mts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAEpC,eAAO,MAAM,WAAW,
|
|
1
|
+
{"version":3,"file":"semver.d.mts","sourceRoot":"","sources":["../../../src/utils/semver.mts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAEpC,eAAO,MAAM,WAAW,UASvB,CAAA;AAED,MAAM,MAAM,UAAU,GAClB,OAAO,GACP,IAAI,GACJ,KAAK,GACL,IAAI,GACJ,KAAK,GACL,KAAK,GACL,UAAU,GACV,OAAO,CAAA;AAEX,YAAY,EAAE,MAAM,EAAE,CAAA;AAEtB,wBAAgB,UAAU,CACxB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,KAAK,GAAE,UAAuB,GAC7B,MAAM,CAoCR;AAED,wBAAgB,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAMxD;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAK3D"}
|
package/dist/utils.js
CHANGED
|
@@ -279,7 +279,7 @@ function safeReadFileSync(filepath, options) {
|
|
|
279
279
|
}
|
|
280
280
|
|
|
281
281
|
const sensitiveConfigKeys = new Set(['apiToken']);
|
|
282
|
-
const supportedConfigKeys = new Map([['apiBaseUrl', 'Base URL of the API endpoint'], ['apiProxy', 'A proxy through which to access the API'], ['apiToken', 'The API token required to access most API endpoints'], ['defaultOrg', 'The default org slug to use; usually the org your API token has access to. When set, all orgSlug arguments are implied to be this value.'], ['enforcedOrgs', 'Orgs in this list have their security policies enforced on this machine'], ['org', 'Alias for defaultOrg']]);
|
|
282
|
+
const supportedConfigKeys = new Map([['apiBaseUrl', 'Base URL of the API endpoint'], ['apiProxy', 'A proxy through which to access the API'], ['apiToken', 'The API token required to access most API endpoints'], ['defaultOrg', 'The default org slug to use; usually the org your API token has access to. When set, all orgSlug arguments are implied to be this value.'], ['enforcedOrgs', 'Orgs in this list have their security policies enforced on this machine'], ['skipAskToPersistDefaultOrg', 'This flag prevents the CLI from asking you to persist the org slug when you selected one interactively'], ['org', 'Alias for defaultOrg']]);
|
|
283
283
|
function getConfigValues() {
|
|
284
284
|
if (_cachedConfig === undefined) {
|
|
285
285
|
// Order: env var > --config flag > file
|
|
@@ -435,17 +435,31 @@ function overrideConfigApiToken(apiToken) {
|
|
|
435
435
|
_readOnlyConfig = true;
|
|
436
436
|
}
|
|
437
437
|
let _pendingSave = false;
|
|
438
|
-
function updateConfigValue(
|
|
438
|
+
function updateConfigValue(configKey, value) {
|
|
439
439
|
const localConfig = getConfigValues();
|
|
440
|
-
const keyResult = normalizeConfigKey(
|
|
440
|
+
const keyResult = normalizeConfigKey(configKey);
|
|
441
441
|
if (!keyResult.ok) {
|
|
442
442
|
return keyResult;
|
|
443
443
|
}
|
|
444
|
-
|
|
444
|
+
const key = keyResult.data;
|
|
445
|
+
let wasDeleted = value === undefined; // implicitly when serializing
|
|
446
|
+
if (key === 'skipAskToPersistDefaultOrg') {
|
|
447
|
+
if (value === 'true' || value === 'false') {
|
|
448
|
+
localConfig['skipAskToPersistDefaultOrg'] = value === 'true';
|
|
449
|
+
} else {
|
|
450
|
+
delete localConfig['skipAskToPersistDefaultOrg'];
|
|
451
|
+
wasDeleted = true;
|
|
452
|
+
}
|
|
453
|
+
} else {
|
|
454
|
+
if (value === 'undefined' || value === 'true' || value === 'false') {
|
|
455
|
+
logger.logger.warn(`Note: The value is set to "${value}", as a string (!). Use \`socket config unset\` to reset a key.`);
|
|
456
|
+
}
|
|
457
|
+
localConfig[key] = value;
|
|
458
|
+
}
|
|
445
459
|
if (_readOnlyConfig) {
|
|
446
460
|
return {
|
|
447
461
|
ok: true,
|
|
448
|
-
message: `Config key '${
|
|
462
|
+
message: `Config key '${key}' was ${wasDeleted ? 'deleted' : `updated`}`,
|
|
449
463
|
data: 'Change applied but not persisted; current config is overridden through env var or flag'
|
|
450
464
|
};
|
|
451
465
|
}
|
|
@@ -464,7 +478,7 @@ function updateConfigValue(key, value) {
|
|
|
464
478
|
}
|
|
465
479
|
return {
|
|
466
480
|
ok: true,
|
|
467
|
-
message: `Config key '${
|
|
481
|
+
message: `Config key '${key}' was ${wasDeleted ? 'deleted' : `updated`}`,
|
|
468
482
|
data: undefined
|
|
469
483
|
};
|
|
470
484
|
}
|
|
@@ -1153,6 +1167,7 @@ async function meowWithSubcommands(subcommands, options) {
|
|
|
1153
1167
|
// Plus, if we allow this then meow() can just exit here.
|
|
1154
1168
|
autoHelp: false
|
|
1155
1169
|
});
|
|
1170
|
+
const orgFlag = String(cli1.flags['org'] || '') || undefined;
|
|
1156
1171
|
|
|
1157
1172
|
// Hard override the config if instructed to do so.
|
|
1158
1173
|
// The env var overrides the --flag, which overrides the persisted config
|
|
@@ -1182,7 +1197,8 @@ async function meowWithSubcommands(subcommands, options) {
|
|
|
1182
1197
|
}
|
|
1183
1198
|
}
|
|
1184
1199
|
if (configOverrideResult?.ok === false) {
|
|
1185
|
-
emitBanner(name);
|
|
1200
|
+
emitBanner(name, orgFlag);
|
|
1201
|
+
logger.logger.error(''); // spacing in stderr
|
|
1186
1202
|
logger.logger.fail(configOverrideResult.message);
|
|
1187
1203
|
process.exitCode = 2;
|
|
1188
1204
|
return;
|
|
@@ -1283,8 +1299,7 @@ async function meowWithSubcommands(subcommands, options) {
|
|
|
1283
1299
|
const cli2 = vendor.meow(`
|
|
1284
1300
|
Usage
|
|
1285
1301
|
$ ${name} <command>
|
|
1286
|
-
|
|
1287
|
-
${isRootCommand ? '' : ' Commands'}
|
|
1302
|
+
${isRootCommand ? '' : '\n Commands'}
|
|
1288
1303
|
${formatCommandsForHelp(isRootCommand)}
|
|
1289
1304
|
|
|
1290
1305
|
${isRootCommand ? ' Options' : ' Options'}${isRootCommand ? ' (Note: all CLI commands have these flags even when not displayed in their help)\n' : ''}
|
|
@@ -1310,7 +1325,8 @@ ${isRootCommand ? ` $ ${name} scan create --json` : ''}${isRootCommand ? `\
|
|
|
1310
1325
|
|
|
1311
1326
|
// ...else we provide basic instructions and help.
|
|
1312
1327
|
if (!cli2.flags['nobanner']) {
|
|
1313
|
-
emitBanner(name);
|
|
1328
|
+
emitBanner(name, orgFlag);
|
|
1329
|
+
// meow will add newline so don't add stderr spacing here
|
|
1314
1330
|
}
|
|
1315
1331
|
if (!cli2.flags['help'] && cli2.flags['dryRun']) {
|
|
1316
1332
|
process.exitCode = 0;
|
|
@@ -1349,7 +1365,9 @@ function meowOrExit({
|
|
|
1349
1365
|
autoHelp: false // meow will exit(0) before printing the banner
|
|
1350
1366
|
});
|
|
1351
1367
|
if (!cli.flags['nobanner']) {
|
|
1352
|
-
emitBanner(command);
|
|
1368
|
+
emitBanner(command, String(cli.flags['org'] || '') || undefined);
|
|
1369
|
+
// Add spacing in stderr. meow.help adds a newline too so we do it here
|
|
1370
|
+
logger.logger.error('');
|
|
1353
1371
|
}
|
|
1354
1372
|
|
|
1355
1373
|
// As per https://github.com/sindresorhus/meow/issues/178
|
|
@@ -1390,7 +1408,7 @@ function meowOrExit({
|
|
|
1390
1408
|
process.exitCode = 0;
|
|
1391
1409
|
return cli;
|
|
1392
1410
|
}
|
|
1393
|
-
function emitBanner(name) {
|
|
1411
|
+
function emitBanner(name, orgFlag) {
|
|
1394
1412
|
// Print a banner at the top of each command.
|
|
1395
1413
|
// This helps with brand recognition and marketing.
|
|
1396
1414
|
// It also helps with debugging since it contains version and command details.
|
|
@@ -1399,9 +1417,9 @@ function emitBanner(name) {
|
|
|
1399
1417
|
// and pipe the result to other tools. By emitting the banner over stderr
|
|
1400
1418
|
// you can do something like `socket scan view xyz | jq | process`.
|
|
1401
1419
|
// The spinner also emits over stderr for example.
|
|
1402
|
-
logger.logger.error(getAsciiHeader(name));
|
|
1420
|
+
logger.logger.error(getAsciiHeader(name, orgFlag));
|
|
1403
1421
|
}
|
|
1404
|
-
function getAsciiHeader(command) {
|
|
1422
|
+
function getAsciiHeader(command, orgFlag) {
|
|
1405
1423
|
// Note: In tests we return <redacted> because otherwise snapshots will fail.
|
|
1406
1424
|
const {
|
|
1407
1425
|
REDACTED
|
|
@@ -1414,13 +1432,19 @@ function getAsciiHeader(command) {
|
|
|
1414
1432
|
const nodeVersion = redacting ? REDACTED : process.version;
|
|
1415
1433
|
const defaultOrg = getConfigValueOrUndef('defaultOrg');
|
|
1416
1434
|
const readOnlyConfig = isReadOnlyConfig() ? '*' : '.';
|
|
1417
|
-
const shownToken = redacting ? REDACTED : getVisibleTokenPrefix() || '
|
|
1435
|
+
const shownToken = redacting ? REDACTED : getVisibleTokenPrefix() || '(not set)';
|
|
1418
1436
|
const relCwd = redacting ? REDACTED : path$1.normalizePath(tildify(process.cwd()));
|
|
1437
|
+
// Note: we must redact org when creating snapshots because dev machine probably
|
|
1438
|
+
// has a default org set but CI won't. Showing --org is fine either way.
|
|
1439
|
+
const orgPart = orgFlag ? `--org: ${orgFlag}` : redacting ? 'org: <redacted>' : defaultOrg ? `default org: ${defaultOrg}` : '(org not set)';
|
|
1440
|
+
// Note: We could draw these with ascii box art instead but I worry about
|
|
1441
|
+
// portability and paste-ability. "simple" ascii chars just work.
|
|
1419
1442
|
const body = `
|
|
1420
1443
|
_____ _ _ /---------------
|
|
1421
1444
|
| __|___ ___| |_ ___| |_ | Socket.dev CLI ver ${cliVersion}
|
|
1422
|
-
|__ | ${readOnlyConfig} | _| '_| -_| _| | Node: ${nodeVersion}, API token
|
|
1423
|
-
|_____|___|___|_,_|___|_|.dev | Command: \`${command}\`, cwd: ${relCwd}
|
|
1445
|
+
|__ | ${readOnlyConfig} | _| '_| -_| _| | Node: ${nodeVersion}, API token: ${shownToken}, ${orgPart}
|
|
1446
|
+
|_____|___|___|_,_|___|_|.dev | Command: \`${command}\`, cwd: ${relCwd}
|
|
1447
|
+
`.trim();
|
|
1424
1448
|
return ` ${body}`; // Note: logger will auto-append a newline
|
|
1425
1449
|
}
|
|
1426
1450
|
|
|
@@ -1472,6 +1496,9 @@ async function suggestOrgSlug() {
|
|
|
1472
1496
|
description: 'Do not use any of these organizations (will end in a no-op)'
|
|
1473
1497
|
}]
|
|
1474
1498
|
});
|
|
1499
|
+
if (proceed === undefined) {
|
|
1500
|
+
return undefined;
|
|
1501
|
+
}
|
|
1475
1502
|
if (proceed) {
|
|
1476
1503
|
return proceed;
|
|
1477
1504
|
}
|
|
@@ -1480,19 +1507,76 @@ async function suggestOrgSlug() {
|
|
|
1480
1507
|
}
|
|
1481
1508
|
}
|
|
1482
1509
|
|
|
1510
|
+
async function suggestToPersistOrgSlug(orgSlug) {
|
|
1511
|
+
const skipAsk = getConfigValue('skipAskToPersistDefaultOrg');
|
|
1512
|
+
if (!skipAsk.ok || skipAsk.data) {
|
|
1513
|
+
// Don't ask to store it when disabled before, or when reading config fails.
|
|
1514
|
+
return;
|
|
1515
|
+
}
|
|
1516
|
+
const result = await prompts.select({
|
|
1517
|
+
message: `Would you like to use this org (${orgSlug}) as the default org for future calls?`,
|
|
1518
|
+
choices: [{
|
|
1519
|
+
name: 'Yes',
|
|
1520
|
+
value: 'yes',
|
|
1521
|
+
description: 'Stores it in your config'
|
|
1522
|
+
}, {
|
|
1523
|
+
name: 'No',
|
|
1524
|
+
value: 'no',
|
|
1525
|
+
description: 'Do not persist this org as default org'
|
|
1526
|
+
}, {
|
|
1527
|
+
name: "No and don't ask again",
|
|
1528
|
+
value: 'sush',
|
|
1529
|
+
description: 'Do not store as default org and do not ask again to persist it'
|
|
1530
|
+
}]
|
|
1531
|
+
});
|
|
1532
|
+
if (result === 'yes') {
|
|
1533
|
+
const updateResult = updateConfigValue('defaultOrg', orgSlug);
|
|
1534
|
+
if (updateResult.ok) {
|
|
1535
|
+
logger.logger.success('Updated default org config to:', orgSlug);
|
|
1536
|
+
} else {
|
|
1537
|
+
logger.logger.fail('(Non blocking) Failed to update default org in config:', updateResult.cause);
|
|
1538
|
+
}
|
|
1539
|
+
} else if (result === 'sush') {
|
|
1540
|
+
const updateResult = updateConfigValue('skipAskToPersistDefaultOrg', true);
|
|
1541
|
+
if (updateResult.ok) {
|
|
1542
|
+
logger.logger.info('Default org not changed. Will not ask to persist again.');
|
|
1543
|
+
} else {
|
|
1544
|
+
logger.logger.fail(`(Non blocking) Failed to store preference; will ask to persist again next time. Reason: ${updateResult.cause}`);
|
|
1545
|
+
}
|
|
1546
|
+
}
|
|
1547
|
+
}
|
|
1548
|
+
|
|
1483
1549
|
async function determineOrgSlug(orgFlag, interactive, dryRun) {
|
|
1484
1550
|
const defaultOrgSlug = getConfigValueOrUndef('defaultOrg');
|
|
1485
1551
|
let orgSlug = String(orgFlag || defaultOrgSlug || '');
|
|
1486
1552
|
if (!orgSlug) {
|
|
1553
|
+
if (!interactive) {
|
|
1554
|
+
logger.logger.warn('Note: This command requires an org slug because the remote API endpoint does.');
|
|
1555
|
+
logger.logger.warn('');
|
|
1556
|
+
logger.logger.warn('It seems no default org was setup and the `--org` flag was not used.');
|
|
1557
|
+
logger.logger.warn("Additionally, `--no-interactive` was set so we can't ask for it.");
|
|
1558
|
+
logger.logger.warn('Since v1.0.0 the org _argument_ for all commands was dropped in favor of an');
|
|
1559
|
+
logger.logger.warn('implicit default org setting, which will be setup when you run `socket login`.');
|
|
1560
|
+
logger.logger.warn('');
|
|
1561
|
+
logger.logger.warn('Note: When running in CI, you probably want to set the `--org` flag.');
|
|
1562
|
+
logger.logger.warn('');
|
|
1563
|
+
logger.logger.warn('For details, see: https://docs.socket.dev/docs/v1-migration-guide');
|
|
1564
|
+
logger.logger.warn('');
|
|
1565
|
+
logger.logger.warn('This command will exit now because the org slug is required to proceed.');
|
|
1566
|
+
return ['', undefined];
|
|
1567
|
+
}
|
|
1568
|
+
|
|
1487
1569
|
// ask from server
|
|
1488
|
-
logger.logger.warn('
|
|
1489
|
-
logger.logger.info('Note: you can
|
|
1570
|
+
logger.logger.warn('Unable to determine the target org. Trying to auto-discover it now...');
|
|
1571
|
+
logger.logger.info('Note: you can run `socket login` to set a default org. You can also override it with the --org flag.');
|
|
1572
|
+
logger.logger.error(''); // spacing in stderr
|
|
1490
1573
|
if (dryRun) {
|
|
1491
1574
|
logger.logger.fail('Skipping auto-discovery of org in dry-run mode');
|
|
1492
|
-
} else if (!interactive) {
|
|
1493
|
-
logger.logger.fail('Skipping auto-discovery of org when interactive = false');
|
|
1494
1575
|
} else {
|
|
1495
1576
|
orgSlug = (await suggestOrgSlug()) || '';
|
|
1577
|
+
if (orgSlug) {
|
|
1578
|
+
await suggestToPersistOrgSlug(orgSlug);
|
|
1579
|
+
}
|
|
1496
1580
|
}
|
|
1497
1581
|
}
|
|
1498
1582
|
return [orgSlug, defaultOrgSlug];
|
|
@@ -1906,7 +1990,7 @@ class ColorOrMarkdown {
|
|
|
1906
1990
|
}
|
|
1907
1991
|
}
|
|
1908
1992
|
|
|
1909
|
-
const RangeStyles = ['caret', 'gt', 'lt', 'pin', 'preserve', 'tilde'];
|
|
1993
|
+
const RangeStyles = ['caret', 'gt', 'gte', 'lt', 'lte', 'pin', 'preserve', 'tilde'];
|
|
1910
1994
|
function applyRange(refRange, version, style = 'preserve') {
|
|
1911
1995
|
switch (style) {
|
|
1912
1996
|
case 'caret':
|
|
@@ -2400,7 +2484,7 @@ function idToPurl(id, type) {
|
|
|
2400
2484
|
return `pkg:${type}/${id}`;
|
|
2401
2485
|
}
|
|
2402
2486
|
|
|
2403
|
-
function
|
|
2487
|
+
function extractOverridesFromPnpmLockSrc(lockfileContent) {
|
|
2404
2488
|
return typeof lockfileContent === 'string' ? /^overrides:(\r?\n {2}.+)+(?:\r?\n)*/m.exec(lockfileContent)?.[0] ?? '' : '';
|
|
2405
2489
|
}
|
|
2406
2490
|
async function extractPurlsFromPnpmLockfile(lockfile) {
|
|
@@ -2450,9 +2534,6 @@ function parsePnpmLockfileVersion(version) {
|
|
|
2450
2534
|
} catch {}
|
|
2451
2535
|
return null;
|
|
2452
2536
|
}
|
|
2453
|
-
async function readPnpmLockfile(lockfilePath) {
|
|
2454
|
-
return fs.existsSync(lockfilePath) ? await readFileUtf8(lockfilePath) : null;
|
|
2455
|
-
}
|
|
2456
2537
|
function stripLeadingPnpmDepPathSlash(depPath) {
|
|
2457
2538
|
return isPnpmDepPath(depPath) ? depPath.slice(1) : depPath;
|
|
2458
2539
|
}
|
|
@@ -2560,6 +2641,10 @@ function npa(...args) {
|
|
|
2560
2641
|
return null;
|
|
2561
2642
|
}
|
|
2562
2643
|
|
|
2644
|
+
async function readLockfile(lockfilePath) {
|
|
2645
|
+
return fs.existsSync(lockfilePath) ? await readFileUtf8(lockfilePath) : null;
|
|
2646
|
+
}
|
|
2647
|
+
|
|
2563
2648
|
const helpFlags = new Set(['--help', '-h']);
|
|
2564
2649
|
function cmdFlagsToString(args) {
|
|
2565
2650
|
const result = [];
|
|
@@ -3115,7 +3200,7 @@ exports.commonFlags = commonFlags;
|
|
|
3115
3200
|
exports.createEnum = createEnum;
|
|
3116
3201
|
exports.detectAndValidatePackageEnvironment = detectAndValidatePackageEnvironment;
|
|
3117
3202
|
exports.determineOrgSlug = determineOrgSlug;
|
|
3118
|
-
exports.
|
|
3203
|
+
exports.extractOverridesFromPnpmLockSrc = extractOverridesFromPnpmLockSrc;
|
|
3119
3204
|
exports.failMsgWithBadge = failMsgWithBadge;
|
|
3120
3205
|
exports.getAlertsMapFromPnpmLockfile = getAlertsMapFromPnpmLockfile;
|
|
3121
3206
|
exports.getAlertsMapFromPurls = getAlertsMapFromPurls;
|
|
@@ -3160,8 +3245,8 @@ exports.parsePnpmLockfile = parsePnpmLockfile;
|
|
|
3160
3245
|
exports.parsePnpmLockfileVersion = parsePnpmLockfileVersion;
|
|
3161
3246
|
exports.queryApiSafeJson = queryApiSafeJson;
|
|
3162
3247
|
exports.queryApiSafeText = queryApiSafeText;
|
|
3248
|
+
exports.readLockfile = readLockfile;
|
|
3163
3249
|
exports.readOrDefaultSocketJson = readOrDefaultSocketJson;
|
|
3164
|
-
exports.readPnpmLockfile = readPnpmLockfile;
|
|
3165
3250
|
exports.readSocketJson = readSocketJson;
|
|
3166
3251
|
exports.removeNodeModules = removeNodeModules;
|
|
3167
3252
|
exports.runAgentInstall = runAgentInstall;
|
|
@@ -3175,5 +3260,5 @@ exports.tildify = tildify;
|
|
|
3175
3260
|
exports.updateConfigValue = updateConfigValue;
|
|
3176
3261
|
exports.walkNestedMap = walkNestedMap;
|
|
3177
3262
|
exports.writeSocketJson = writeSocketJson;
|
|
3178
|
-
//# debugId=
|
|
3263
|
+
//# debugId=ba9b8f1a-3ce9-4a1c-9132-b806f964514a
|
|
3179
3264
|
//# sourceMappingURL=utils.js.map
|