@coana-tech/cli 14.12.195 → 14.12.197
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/cli.mjs +97 -82
- package/package.json +1 -1
- package/repos/coana-tech/goana/bin/goana-darwin-amd64.gz +0 -0
- package/repos/coana-tech/goana/bin/goana-darwin-arm64.gz +0 -0
- package/repos/coana-tech/goana/bin/goana-linux-amd64.gz +0 -0
- package/repos/coana-tech/goana/bin/goana-linux-arm64.gz +0 -0
- package/repos/coana-tech/javap-service/javap-service.jar +0 -0
package/cli.mjs
CHANGED
|
@@ -14563,8 +14563,8 @@ var require_follow_redirects = __commonJS({
|
|
|
14563
14563
|
}
|
|
14564
14564
|
return parsed;
|
|
14565
14565
|
}
|
|
14566
|
-
function resolveUrl(
|
|
14567
|
-
return useNativeURL ? new URL3(
|
|
14566
|
+
function resolveUrl(relative23, base) {
|
|
14567
|
+
return useNativeURL ? new URL3(relative23, base) : parseUrl(url2.resolve(base, relative23));
|
|
14568
14568
|
}
|
|
14569
14569
|
function validateUrl(input) {
|
|
14570
14570
|
if (/^\[/.test(input.hostname) && !/^\[[:0-9a-f]+\]$/i.test(input.hostname)) {
|
|
@@ -69980,16 +69980,16 @@ var require_lockfile = __commonJS({
|
|
|
69980
69980
|
if (process.platform === "win32") {
|
|
69981
69981
|
yield fsSymlink(src, dest, "junction");
|
|
69982
69982
|
} else {
|
|
69983
|
-
let
|
|
69983
|
+
let relative23;
|
|
69984
69984
|
try {
|
|
69985
|
-
|
|
69985
|
+
relative23 = (_path2 || _load_path()).default.relative((_fs || _load_fs()).default.realpathSync((_path2 || _load_path()).default.dirname(dest)), (_fs || _load_fs()).default.realpathSync(src));
|
|
69986
69986
|
} catch (err) {
|
|
69987
69987
|
if (err.code !== "ENOENT") {
|
|
69988
69988
|
throw err;
|
|
69989
69989
|
}
|
|
69990
|
-
|
|
69990
|
+
relative23 = (_path2 || _load_path()).default.relative((_path2 || _load_path()).default.dirname(dest), src);
|
|
69991
69991
|
}
|
|
69992
|
-
yield fsSymlink(
|
|
69992
|
+
yield fsSymlink(relative23 || ".", dest);
|
|
69993
69993
|
}
|
|
69994
69994
|
});
|
|
69995
69995
|
return function symlink2(_x24, _x25) {
|
|
@@ -70016,17 +70016,17 @@ var require_lockfile = __commonJS({
|
|
|
70016
70016
|
_ref28 = _i14.value;
|
|
70017
70017
|
}
|
|
70018
70018
|
const name2 = _ref28;
|
|
70019
|
-
const
|
|
70019
|
+
const relative23 = relativeDir ? (_path2 || _load_path()).default.join(relativeDir, name2) : name2;
|
|
70020
70020
|
const loc = (_path2 || _load_path()).default.join(dir, name2);
|
|
70021
70021
|
const stat6 = yield lstat3(loc);
|
|
70022
70022
|
files.push({
|
|
70023
|
-
relative:
|
|
70023
|
+
relative: relative23,
|
|
70024
70024
|
basename: name2,
|
|
70025
70025
|
absolute: loc,
|
|
70026
70026
|
mtime: +stat6.mtime
|
|
70027
70027
|
});
|
|
70028
70028
|
if (stat6.isDirectory()) {
|
|
70029
|
-
files = files.concat(yield walk(loc,
|
|
70029
|
+
files = files.concat(yield walk(loc, relative23, ignoreBasenames));
|
|
70030
70030
|
}
|
|
70031
70031
|
}
|
|
70032
70032
|
return files;
|
|
@@ -217639,7 +217639,7 @@ var import_picomatch3 = __toESM(require_picomatch2(), 1);
|
|
|
217639
217639
|
import { resolve as resolve16 } from "node:path";
|
|
217640
217640
|
|
|
217641
217641
|
// ../fixing-management/src/fixing-management/maven/handlers/pom-upgrade-handler.ts
|
|
217642
|
-
import { dirname as dirname9, resolve as resolve12 } from "node:path";
|
|
217642
|
+
import { dirname as dirname9, relative as relative4, resolve as resolve12 } from "node:path";
|
|
217643
217643
|
import assert6 from "node:assert";
|
|
217644
217644
|
|
|
217645
217645
|
// ../fixing-management/src/fixing-management/utils/socket-upgrade-helper.ts
|
|
@@ -217744,7 +217744,10 @@ var PomUpgradeHandler = class {
|
|
|
217744
217744
|
await applyPatches("MAVEN", this.rootDir, patches, ctxt);
|
|
217745
217745
|
const recomputedArtifacts = patches.length ? await Spinner.instance().wrap(
|
|
217746
217746
|
"Computing remaining upgrades",
|
|
217747
|
-
async () => await computeSocketFactArtifacts(
|
|
217747
|
+
async () => await computeSocketFactArtifacts(
|
|
217748
|
+
this.rootDir,
|
|
217749
|
+
Array.from(this.validFiles).map((f6) => relative4(this.rootDir, f6))
|
|
217750
|
+
)
|
|
217748
217751
|
) : ctxt.artifacts;
|
|
217749
217752
|
if (!recomputedArtifacts) {
|
|
217750
217753
|
ctxt.statusUpdater?.({
|
|
@@ -219001,7 +219004,7 @@ ${indent(1, indentationSize)}`)}
|
|
|
219001
219004
|
import { existsSync as existsSync15 } from "fs";
|
|
219002
219005
|
import { readFile as readFile20 } from "fs/promises";
|
|
219003
219006
|
import assert10 from "node:assert";
|
|
219004
|
-
import { dirname as dirname14, join as join14, relative as
|
|
219007
|
+
import { dirname as dirname14, join as join14, relative as relative10, resolve as resolve24 } from "path";
|
|
219005
219008
|
|
|
219006
219009
|
// ../utils/src/npm-utils.ts
|
|
219007
219010
|
import { access as access2, constants as constants2 } from "fs/promises";
|
|
@@ -223664,10 +223667,10 @@ var Ignore = class {
|
|
|
223664
223667
|
ignored(p3) {
|
|
223665
223668
|
const fullpath = p3.fullpath();
|
|
223666
223669
|
const fullpaths = `${fullpath}/`;
|
|
223667
|
-
const
|
|
223668
|
-
const relatives = `${
|
|
223670
|
+
const relative23 = p3.relative() || ".";
|
|
223671
|
+
const relatives = `${relative23}/`;
|
|
223669
223672
|
for (const m4 of this.relative) {
|
|
223670
|
-
if (m4.match(
|
|
223673
|
+
if (m4.match(relative23) || m4.match(relatives))
|
|
223671
223674
|
return true;
|
|
223672
223675
|
}
|
|
223673
223676
|
for (const m4 of this.absolute) {
|
|
@@ -223678,9 +223681,9 @@ var Ignore = class {
|
|
|
223678
223681
|
}
|
|
223679
223682
|
childrenIgnored(p3) {
|
|
223680
223683
|
const fullpath = p3.fullpath() + "/";
|
|
223681
|
-
const
|
|
223684
|
+
const relative23 = (p3.relative() || ".") + "/";
|
|
223682
223685
|
for (const m4 of this.relativeChildren) {
|
|
223683
|
-
if (m4.match(
|
|
223686
|
+
if (m4.match(relative23))
|
|
223684
223687
|
return true;
|
|
223685
223688
|
}
|
|
223686
223689
|
for (const m4 of this.absoluteChildren) {
|
|
@@ -225159,7 +225162,7 @@ async function runCommandResolveStdOut4(cmd, dir, options) {
|
|
|
225159
225162
|
}
|
|
225160
225163
|
|
|
225161
225164
|
// ../utils/dist/package-utils.js
|
|
225162
|
-
import { parse as parse5, join as join11, resolve as resolve17, normalize as normalize2, dirname as dirname12, basename as basename5, relative as
|
|
225165
|
+
import { parse as parse5, join as join11, resolve as resolve17, normalize as normalize2, dirname as dirname12, basename as basename5, relative as relative5 } from "path";
|
|
225163
225166
|
import { existsSync as existsSync11, readFileSync as readFileSync2, readdirSync as readdirSync2, statSync as statSync3, writeFileSync } from "fs";
|
|
225164
225167
|
function getPackageJsonObject(workspaceRoot) {
|
|
225165
225168
|
const packageJSONContent = getPackageJsonContent(workspaceRoot);
|
|
@@ -225296,7 +225299,7 @@ async function getYarnType(projectDir) {
|
|
|
225296
225299
|
|
|
225297
225300
|
// ../fixing-management/src/fixing-management/npm/npm-fixing-manager.ts
|
|
225298
225301
|
import { readFile as readFile17, writeFile as writeFile6 } from "fs/promises";
|
|
225299
|
-
import { relative as
|
|
225302
|
+
import { relative as relative6, resolve as resolve20 } from "path";
|
|
225300
225303
|
|
|
225301
225304
|
// ../fixing-management/src/fixing-management/npm/npm-ecosystem-fixing-manager.ts
|
|
225302
225305
|
var NpmEcosystemFixingManager = class {
|
|
@@ -225389,14 +225392,14 @@ var NpmFixingManager = class extends NpmEcosystemFixingManager {
|
|
|
225389
225392
|
throw result.error;
|
|
225390
225393
|
}
|
|
225391
225394
|
logger.info(
|
|
225392
|
-
`Run 'npm install' in '${
|
|
225395
|
+
`Run 'npm install' in '${relative6(this.rootDir, this.subprojectPath) || "."}' to install the updated dependencies`
|
|
225393
225396
|
);
|
|
225394
225397
|
}
|
|
225395
225398
|
};
|
|
225396
225399
|
|
|
225397
225400
|
// ../fixing-management/src/fixing-management/npm/pnpm-fixing-manager.ts
|
|
225398
225401
|
import { readFile as readFile18, writeFile as writeFile7 } from "fs/promises";
|
|
225399
|
-
import { relative as
|
|
225402
|
+
import { relative as relative7, resolve as resolve21 } from "path";
|
|
225400
225403
|
var import_yaml = __toESM(require_dist10(), 1);
|
|
225401
225404
|
var import_lockfile_file2 = __toESM(require_lib25(), 1);
|
|
225402
225405
|
import { existsSync as existsSync13 } from "fs";
|
|
@@ -225537,7 +225540,7 @@ var PnpmFixingManager = class extends NpmEcosystemFixingManager {
|
|
|
225537
225540
|
throw result.error;
|
|
225538
225541
|
}
|
|
225539
225542
|
logger.info(
|
|
225540
|
-
`Run 'pnpm install' in '${
|
|
225543
|
+
`Run 'pnpm install' in '${relative7(this.rootDir, this.subprojectPath) || "."}' to install the updated dependencies`
|
|
225541
225544
|
);
|
|
225542
225545
|
}
|
|
225543
225546
|
};
|
|
@@ -225585,10 +225588,10 @@ function updateCatalog(update3, map2) {
|
|
|
225585
225588
|
|
|
225586
225589
|
// ../fixing-management/src/fixing-management/npm/yarn-fixing-manager.ts
|
|
225587
225590
|
import { readFile as readFile19, writeFile as writeFile8 } from "fs/promises";
|
|
225588
|
-
import { relative as
|
|
225591
|
+
import { relative as relative9, resolve as resolve23 } from "path";
|
|
225589
225592
|
|
|
225590
225593
|
// ../utils/src/package-utils.ts
|
|
225591
|
-
import { parse as parse7, join as join13, resolve as resolve22, normalize as normalize3, dirname as dirname13, basename as basename6, relative as
|
|
225594
|
+
import { parse as parse7, join as join13, resolve as resolve22, normalize as normalize3, dirname as dirname13, basename as basename6, relative as relative8 } from "path";
|
|
225592
225595
|
import { existsSync as existsSync14, readFileSync as readFileSync3, readdirSync as readdirSync3, statSync as statSync4, writeFileSync as writeFileSync2 } from "fs";
|
|
225593
225596
|
function setFieldInPackageJson(workspaceRoot, field, value2) {
|
|
225594
225597
|
const packageJSONContentObj = getPackageJsonObject2(workspaceRoot);
|
|
@@ -225798,7 +225801,7 @@ var YarnFixingManager = class extends NpmEcosystemFixingManager {
|
|
|
225798
225801
|
throw result.error;
|
|
225799
225802
|
}
|
|
225800
225803
|
logger.info(
|
|
225801
|
-
`Run 'yarn install' in '${
|
|
225804
|
+
`Run 'yarn install' in '${relative9(this.rootDir, this.subprojectPath) || "."}' to install the updated dependencies`
|
|
225802
225805
|
);
|
|
225803
225806
|
} else {
|
|
225804
225807
|
const cmd = cmdt`yarn install --ignore-scripts --noninteractive`;
|
|
@@ -225894,7 +225897,7 @@ var NpmSocketUpgradeManager = class {
|
|
|
225894
225897
|
if (!subprojectToUpgrade.has(subprojectDir)) {
|
|
225895
225898
|
subprojectToUpgrade.set(subprojectDir, /* @__PURE__ */ new Map());
|
|
225896
225899
|
}
|
|
225897
|
-
const workspacePath =
|
|
225900
|
+
const workspacePath = relative10(subprojectDir, packageJsonDir) || ".";
|
|
225898
225901
|
if (!subprojectToUpgrade.get(subprojectDir)?.has(workspacePath)) {
|
|
225899
225902
|
subprojectToUpgrade.get(subprojectDir)?.set(workspacePath, []);
|
|
225900
225903
|
}
|
|
@@ -226379,12 +226382,12 @@ var CargoFixingManager = class {
|
|
|
226379
226382
|
|
|
226380
226383
|
// ../fixing-management/src/fixing-management/nuget/nuget-socket-upgrade-manager.ts
|
|
226381
226384
|
var import_picomatch4 = __toESM(require_picomatch2(), 1);
|
|
226382
|
-
import { dirname as dirname16, relative as
|
|
226385
|
+
import { dirname as dirname16, relative as relative12, resolve as resolve26 } from "node:path";
|
|
226383
226386
|
|
|
226384
226387
|
// ../utils/src/nuget-project-utils.ts
|
|
226385
226388
|
var import_parse_xml3 = __toESM(require_dist(), 1);
|
|
226386
226389
|
import { readFile as readFile22 } from "node:fs/promises";
|
|
226387
|
-
import { dirname as dirname15, join as join17, relative as
|
|
226390
|
+
import { dirname as dirname15, join as join17, relative as relative11, resolve as resolve25, basename as basename8, extname } from "node:path";
|
|
226388
226391
|
import { existsSync as existsSync16 } from "node:fs";
|
|
226389
226392
|
|
|
226390
226393
|
// ../utils/dist/version-comparison/version-satisfies.js
|
|
@@ -227969,7 +227972,7 @@ async function loadNuGetProjectOrTarget(rootDir, projectFile, mainProject, visit
|
|
|
227969
227972
|
});
|
|
227970
227973
|
currentProject.sourceFiles.push(...files);
|
|
227971
227974
|
} catch (err) {
|
|
227972
|
-
logger.debug(`Failed to glob default pattern for ${
|
|
227975
|
+
logger.debug(`Failed to glob default pattern for ${relative11(rootDir, validatedProjectPath)}: ${err}`);
|
|
227973
227976
|
}
|
|
227974
227977
|
}
|
|
227975
227978
|
mainProject ??= currentProject;
|
|
@@ -228232,11 +228235,11 @@ async function handleCompileItem(project, child) {
|
|
|
228232
228235
|
} catch (err) {
|
|
228233
228236
|
if (evaluatedExclude) {
|
|
228234
228237
|
logger.debug(
|
|
228235
|
-
`Failed to glob Compile Include ${includePatterns}, Exclude ${excludePatterns} in ${
|
|
228238
|
+
`Failed to glob Compile Include ${includePatterns}, Exclude ${excludePatterns} in ${relative11(project.rootDir, project.validatedProjectPath)}: ${err}`
|
|
228236
228239
|
);
|
|
228237
228240
|
} else {
|
|
228238
228241
|
logger.debug(
|
|
228239
|
-
`Failed to glob Compile Include ${includePatterns} in ${
|
|
228242
|
+
`Failed to glob Compile Include ${includePatterns} in ${relative11(project.rootDir, project.validatedProjectPath)}: ${err}`
|
|
228240
228243
|
);
|
|
228241
228244
|
}
|
|
228242
228245
|
}
|
|
@@ -228256,7 +228259,7 @@ async function handleCompileItem(project, child) {
|
|
|
228256
228259
|
project.sourceFiles = project.sourceFiles.filter((f6) => !removeSet.has(f6));
|
|
228257
228260
|
} catch (err) {
|
|
228258
228261
|
logger.debug(
|
|
228259
|
-
`Failed to glob Compile Remove pattern ${evaluatedRemove} in ${
|
|
228262
|
+
`Failed to glob Compile Remove pattern ${evaluatedRemove} in ${relative11(project.rootDir, project.validatedProjectPath)}: ${err}`
|
|
228260
228263
|
);
|
|
228261
228264
|
}
|
|
228262
228265
|
}
|
|
@@ -228266,7 +228269,7 @@ function handlePropertyGroupElement(project, propertyGroup) {
|
|
|
228266
228269
|
const condition = createAttributeMap(propertyGroup, project.sourceText).get("Condition");
|
|
228267
228270
|
if (condition) {
|
|
228268
228271
|
logger.debug(
|
|
228269
|
-
`Skipping conditional property group ${propertyGroup.name} (${propertyGroup.start}, ${propertyGroup.end}) with condition ${condition.text} in file ${
|
|
228272
|
+
`Skipping conditional property group ${propertyGroup.name} (${propertyGroup.start}, ${propertyGroup.end}) with condition ${condition.text} in file ${relative11(project.rootDir, project.validatedProjectPath)}`
|
|
228270
228273
|
);
|
|
228271
228274
|
return;
|
|
228272
228275
|
}
|
|
@@ -228276,7 +228279,7 @@ function handlePropertyGroupElement(project, propertyGroup) {
|
|
|
228276
228279
|
const condition2 = createAttributeMap(propertyElement, project.sourceText).get("Condition");
|
|
228277
228280
|
if (condition2) {
|
|
228278
228281
|
logger.debug(
|
|
228279
|
-
`Skipping conditional property ${propertyElement.name} (${propertyElement.start}, ${propertyElement.end}) with condition ${condition2.text} in file ${
|
|
228282
|
+
`Skipping conditional property ${propertyElement.name} (${propertyElement.start}, ${propertyElement.end}) with condition ${condition2.text} in file ${relative11(project.rootDir, project.validatedProjectPath)}`
|
|
228280
228283
|
);
|
|
228281
228284
|
continue;
|
|
228282
228285
|
}
|
|
@@ -228346,7 +228349,7 @@ function evaluate3(expression, project) {
|
|
|
228346
228349
|
function evaluateWithContext(value2, depth) {
|
|
228347
228350
|
if (depth > 50) {
|
|
228348
228351
|
logger.warn(
|
|
228349
|
-
`Recursion limit hit while evaluating expression ${expression} in project ${
|
|
228352
|
+
`Recursion limit hit while evaluating expression ${expression} in project ${relative11(project.rootDir, project.validatedProjectPath)}`
|
|
228350
228353
|
);
|
|
228351
228354
|
isFullyEvaluated = false;
|
|
228352
228355
|
return value2;
|
|
@@ -228357,7 +228360,7 @@ function evaluate3(expression, project) {
|
|
|
228357
228360
|
return evaluateWithContext(property.text, depth + 1);
|
|
228358
228361
|
} else {
|
|
228359
228362
|
logger.debug(
|
|
228360
|
-
`Unknown property ${propertyName} for project ${
|
|
228363
|
+
`Unknown property ${propertyName} for project ${relative11(project.rootDir, project.validatedProjectPath)}`
|
|
228361
228364
|
);
|
|
228362
228365
|
isFullyEvaluated = false;
|
|
228363
228366
|
return "";
|
|
@@ -228454,7 +228457,7 @@ var NuGetSocketUpgradeManager = class {
|
|
|
228454
228457
|
"Computing remaining upgrades",
|
|
228455
228458
|
async () => computeSocketFactArtifacts(
|
|
228456
228459
|
this.rootDir,
|
|
228457
|
-
Array.from(caseInsensitiveManifestFileMap.values()).map((p3) =>
|
|
228460
|
+
Array.from(caseInsensitiveManifestFileMap.values()).map((p3) => relative12(this.rootDir, p3))
|
|
228458
228461
|
)
|
|
228459
228462
|
) : ctxt.artifacts;
|
|
228460
228463
|
if (!recomputedArtifacts) {
|
|
@@ -228834,7 +228837,7 @@ var NuGetSocketUpgradeManager = class {
|
|
|
228834
228837
|
};
|
|
228835
228838
|
|
|
228836
228839
|
// ../fixing-management/src/fixing-management/rust/cargo-socket-upgrade-manager.ts
|
|
228837
|
-
import { dirname as dirname18, relative as
|
|
228840
|
+
import { dirname as dirname18, relative as relative13, resolve as resolve28 } from "node:path";
|
|
228838
228841
|
var import_picomatch6 = __toESM(require_picomatch2(), 1);
|
|
228839
228842
|
var import_semver4 = __toESM(require_semver2(), 1);
|
|
228840
228843
|
import assert12 from "node:assert";
|
|
@@ -228986,14 +228989,14 @@ var CargoSocketUpgradeManager = class {
|
|
|
228986
228989
|
await writeFile10(path9, content);
|
|
228987
228990
|
ctxt.statusUpdater?.({
|
|
228988
228991
|
status: "success",
|
|
228989
|
-
file:
|
|
228992
|
+
file: relative13(this.rootDir, path9),
|
|
228990
228993
|
message: "File restored",
|
|
228991
228994
|
artifacts: i3(artifacts)
|
|
228992
228995
|
});
|
|
228993
228996
|
} catch (e) {
|
|
228994
228997
|
ctxt.statusUpdater?.({
|
|
228995
228998
|
status: "error",
|
|
228996
|
-
file:
|
|
228999
|
+
file: relative13(this.rootDir, path9),
|
|
228997
229000
|
message: "Could not restore file",
|
|
228998
229001
|
artifacts: i3(artifacts)
|
|
228999
229002
|
});
|
|
@@ -230390,14 +230393,14 @@ function satisfiestVersionSpecs(version4, versionSpec) {
|
|
|
230390
230393
|
}
|
|
230391
230394
|
|
|
230392
230395
|
// ../fixing-management/src/fixing-management/rubygems/rubygems-socket-upgrade-manager.ts
|
|
230393
|
-
import { dirname as dirname22, relative as
|
|
230396
|
+
import { dirname as dirname22, relative as relative15, resolve as resolve33 } from "node:path";
|
|
230394
230397
|
var import_picomatch9 = __toESM(require_picomatch2(), 1);
|
|
230395
230398
|
import assert14 from "node:assert";
|
|
230396
230399
|
|
|
230397
230400
|
// ../fixing-management/src/fixing-management/rubygems/gemfile-utils.ts
|
|
230398
230401
|
var import_good_enough_parser4 = __toESM(require_cjs(), 1);
|
|
230399
230402
|
init_ruby_lang();
|
|
230400
|
-
import { resolve as resolve32, dirname as dirname21, relative as
|
|
230403
|
+
import { resolve as resolve32, dirname as dirname21, relative as relative14 } from "node:path";
|
|
230401
230404
|
import { existsSync as existsSync18, readFileSync as readFileSync4, readdirSync as readdirSync4 } from "node:fs";
|
|
230402
230405
|
init_gemspec_utils();
|
|
230403
230406
|
var booleanQuery2 = import_good_enough_parser4.query.alt(
|
|
@@ -230506,13 +230509,13 @@ var evalGemfileQuery = import_good_enough_parser4.query.sym("eval_gemfile").join
|
|
|
230506
230509
|
ctx.exprEndOffset = void 0;
|
|
230507
230510
|
if (ctx.depth > 50) {
|
|
230508
230511
|
logger.warn(
|
|
230509
|
-
`Recursion limit hit while evaluating gemfile: ${
|
|
230512
|
+
`Recursion limit hit while evaluating gemfile: ${relative14(ctx.gemfile.rootDir, resolve32(ctx.gemfile.rootDir, ctx.gemfile.file))}`
|
|
230510
230513
|
);
|
|
230511
230514
|
return ctx;
|
|
230512
230515
|
}
|
|
230513
230516
|
if (pathEvaluated === void 0) return ctx;
|
|
230514
230517
|
const rootDir = ctx.gemfile.rootDir;
|
|
230515
|
-
const file =
|
|
230518
|
+
const file = relative14(rootDir, resolve32(rootDir, dirname21(ctx.gemfile.file), pathEvaluated));
|
|
230516
230519
|
if (!existsSync18(resolve32(rootDir, file))) return ctx;
|
|
230517
230520
|
const sourceText = readFileSync4(resolve32(rootDir, file), "utf-8");
|
|
230518
230521
|
const parser2 = import_good_enough_parser4.lang.createLang(lang3);
|
|
@@ -230565,7 +230568,7 @@ var gemspecQuery = import_good_enough_parser4.query.sym("gemspec").opt(
|
|
|
230565
230568
|
).handler((ctx) => {
|
|
230566
230569
|
if (ctx.depth > 50) {
|
|
230567
230570
|
logger.warn(
|
|
230568
|
-
`Recursion limit hit while evaluating gemspec: ${
|
|
230571
|
+
`Recursion limit hit while evaluating gemspec: ${relative14(ctx.gemfile.rootDir, resolve32(ctx.gemfile.rootDir, ctx.gemfile.file))}`
|
|
230569
230572
|
);
|
|
230570
230573
|
ctx.currentGem = void 0;
|
|
230571
230574
|
return ctx;
|
|
@@ -230604,7 +230607,7 @@ var gemspecQuery = import_good_enough_parser4.query.sym("gemspec").opt(
|
|
|
230604
230607
|
if (gemspecFiles.length === 0) return ctx;
|
|
230605
230608
|
const gemspecFile = gemspecFiles[0];
|
|
230606
230609
|
const gemspecFullPath = resolve32(searchDir, gemspecFile);
|
|
230607
|
-
const gemspecRelativePath =
|
|
230610
|
+
const gemspecRelativePath = relative14(rootDir, gemspecFullPath);
|
|
230608
230611
|
try {
|
|
230609
230612
|
const sourceText = readFileSync4(gemspecFullPath, "utf-8");
|
|
230610
230613
|
const gemspec = parseGemspec(rootDir, gemspecRelativePath, sourceText);
|
|
@@ -230980,7 +230983,7 @@ var RubygemsSocketUpgradeManager = class {
|
|
|
230980
230983
|
});
|
|
230981
230984
|
continue;
|
|
230982
230985
|
}
|
|
230983
|
-
const gemfileName =
|
|
230986
|
+
const gemfileName = relative15(this.rootDir, resolve33(this.rootDir, dirname22(mf.file), "Gemfile"));
|
|
230984
230987
|
gemfileToLockfile.set(gemfileName, mf.file);
|
|
230985
230988
|
if (pathGems.length > 0) {
|
|
230986
230989
|
const { gemspecPatches, gemfilePatches } = await this.handleGemspecDependency(
|
|
@@ -231059,14 +231062,14 @@ var RubygemsSocketUpgradeManager = class {
|
|
|
231059
231062
|
await writeFile11(path9, content);
|
|
231060
231063
|
ctxt.statusUpdater?.({
|
|
231061
231064
|
status: "success",
|
|
231062
|
-
file:
|
|
231065
|
+
file: relative15(this.rootDir, path9),
|
|
231063
231066
|
message: "File restored",
|
|
231064
231067
|
artifacts: i3(artifacts)
|
|
231065
231068
|
});
|
|
231066
231069
|
} catch (e) {
|
|
231067
231070
|
ctxt.statusUpdater?.({
|
|
231068
231071
|
status: "error",
|
|
231069
|
-
file:
|
|
231072
|
+
file: relative15(this.rootDir, path9),
|
|
231070
231073
|
message: "Could not restore file",
|
|
231071
231074
|
artifacts: i3(artifacts)
|
|
231072
231075
|
});
|
|
@@ -231331,7 +231334,7 @@ var import_lodash7 = __toESM(require_lodash(), 1);
|
|
|
231331
231334
|
var import_micromatch2 = __toESM(require_micromatch(), 1);
|
|
231332
231335
|
import { existsSync as existsSync19 } from "fs";
|
|
231333
231336
|
import { access as access4, cp as cp3, readdir as readdir4, stat as stat4 } from "fs/promises";
|
|
231334
|
-
import { basename as basename9, join as join20, relative as
|
|
231337
|
+
import { basename as basename9, join as join20, relative as relative16, resolve as resolve34 } from "path";
|
|
231335
231338
|
var { uniq: uniq2 } = import_lodash7.default;
|
|
231336
231339
|
var { isMatch: isMatch2 } = import_micromatch2.default;
|
|
231337
231340
|
function* parents2(dir) {
|
|
@@ -231904,12 +231907,12 @@ import { rmSync } from "fs";
|
|
|
231904
231907
|
import { mkdir as mkdir5, readFile as readFile32, writeFile as writeFile12 } from "fs/promises";
|
|
231905
231908
|
import assert15 from "node:assert";
|
|
231906
231909
|
import { platform as platform8 } from "os";
|
|
231907
|
-
import { join as join27, posix as posix2, relative as
|
|
231910
|
+
import { join as join27, posix as posix2, relative as relative18, sep as sep3 } from "path";
|
|
231908
231911
|
|
|
231909
231912
|
// ../utils/src/tmp-file.ts
|
|
231910
231913
|
import { rm, mkdtemp, cp as cp4, lstat as lstat2 } from "fs/promises";
|
|
231911
231914
|
import { tmpdir as tmpdir4 } from "os";
|
|
231912
|
-
import { join as join25, relative as
|
|
231915
|
+
import { join as join25, relative as relative17, sep as sep2, extname as extname2 } from "path";
|
|
231913
231916
|
async function createTmpDirectory(prefix) {
|
|
231914
231917
|
try {
|
|
231915
231918
|
const tmpDir = await mkdtemp(join25(tmpdir4(), prefix));
|
|
@@ -231946,7 +231949,7 @@ async function copyForNpmAnalysis(srcDir, prefix) {
|
|
|
231946
231949
|
verbatimSymlinks: true,
|
|
231947
231950
|
// Preserve symlinks as symlinks instead of dereferencing them
|
|
231948
231951
|
filter: async (src) => {
|
|
231949
|
-
const relativePath =
|
|
231952
|
+
const relativePath = relative17(srcDir, src);
|
|
231950
231953
|
if (relativePath === "") return true;
|
|
231951
231954
|
const pathSegments = relativePath.split(sep2);
|
|
231952
231955
|
if (pathSegments.some((segment) => EXCLUDED_DIRECTORIES.has(segment))) {
|
|
@@ -232327,7 +232330,7 @@ var OtherModulesCommunicator = class {
|
|
|
232327
232330
|
}
|
|
232328
232331
|
if (cmd === "getWorkspacePathsMultipleSubprojects")
|
|
232329
232332
|
return `${_cmdStr()}: (${packageManagerName}) ${abbreviateList(subprojects, 10)}`;
|
|
232330
|
-
return `${_cmdStr()}: (${packageManagerName}) ${
|
|
232333
|
+
return `${_cmdStr()}: (${packageManagerName}) ${relative18(this.rootWorkingDir, subprojectPath) || "."}`;
|
|
232331
232334
|
}
|
|
232332
232335
|
getSpinnerTextForReachabilityAnalyzerCommand(cmd, ecosystem, subprojectPath, workspacePath) {
|
|
232333
232336
|
function _cmdStr() {
|
|
@@ -232340,10 +232343,10 @@ var OtherModulesCommunicator = class {
|
|
|
232340
232343
|
return "Running reachability analysis on package registry package";
|
|
232341
232344
|
}
|
|
232342
232345
|
}
|
|
232343
|
-
return `${_cmdStr()}: (${ecosystem}) ${
|
|
232346
|
+
return `${_cmdStr()}: (${ecosystem}) ${relative18(this.rootWorkingDir, join27(subprojectPath, workspacePath)) || "."}`;
|
|
232344
232347
|
}
|
|
232345
232348
|
getProjectPath(subprojectPath) {
|
|
232346
|
-
return this.options.runWithoutDocker ? subprojectPath : posix2.resolve("/project",
|
|
232349
|
+
return this.options.runWithoutDocker ? subprojectPath : posix2.resolve("/project", relative18(this.rootWorkingDir, subprojectPath).replaceAll(sep3, posix2.sep));
|
|
232347
232350
|
}
|
|
232348
232351
|
// options shared between package-management and reachability-analyzers
|
|
232349
232352
|
commonOptions = once7(
|
|
@@ -232496,7 +232499,7 @@ var OtherModulesCommunicator = class {
|
|
|
232496
232499
|
"getWorkspacePathsMultipleSubprojects",
|
|
232497
232500
|
packageManagerName,
|
|
232498
232501
|
this.rootWorkingDir,
|
|
232499
|
-
subprojectPaths.map((subprojectPath) =>
|
|
232502
|
+
subprojectPaths.map((subprojectPath) => relative18(this.rootWorkingDir, subprojectPath) || ".")
|
|
232500
232503
|
);
|
|
232501
232504
|
}
|
|
232502
232505
|
async getProvidedArgsForSubproject(subprojectPath, providedOptions) {
|
|
@@ -233846,16 +233849,16 @@ function getVulnerabilitiesFromReport(report) {
|
|
|
233846
233849
|
var import_packageurl_js = __toESM(require_packageurl_js(), 1);
|
|
233847
233850
|
|
|
233848
233851
|
// dist/cli-upgrade-purl.js
|
|
233849
|
-
import { join as join30, relative as
|
|
233852
|
+
import { join as join30, relative as relative21, resolve as resolve40 } from "node:path";
|
|
233850
233853
|
var import_picomatch10 = __toESM(require_picomatch2(), 1);
|
|
233851
233854
|
|
|
233852
233855
|
// ../project-management/src/project-management/project-manager.ts
|
|
233853
|
-
import { relative as
|
|
233856
|
+
import { relative as relative20, resolve as resolve39 } from "path";
|
|
233854
233857
|
|
|
233855
233858
|
// ../project-management/src/project-management/ecosystem-management/ecosystem-manager.ts
|
|
233856
233859
|
var import_micromatch3 = __toESM(require_micromatch2(), 1);
|
|
233857
233860
|
import { readdir as readdir6 } from "fs/promises";
|
|
233858
|
-
import { join as join29, relative as
|
|
233861
|
+
import { join as join29, relative as relative19, resolve as resolve38 } from "path";
|
|
233859
233862
|
|
|
233860
233863
|
// ../project-management/src/project-management/ecosystem-management/ecosystem-specs.ts
|
|
233861
233864
|
import { existsSync as existsSync23 } from "fs";
|
|
@@ -233993,7 +233996,7 @@ var EcosystemManager = class _EcosystemManager {
|
|
|
233993
233996
|
const resolvedProjectDir = resolve38(mainProjectDir, relativeProjectDir);
|
|
233994
233997
|
if (config3.includeDirs.length > 0)
|
|
233995
233998
|
workspacePaths = workspacePaths.filter(
|
|
233996
|
-
(workspacePath) => isMatch3(
|
|
233999
|
+
(workspacePath) => isMatch3(relative19(mainProjectDir, join29(resolvedProjectDir, workspacePath)), config3.includeDirs)
|
|
233997
234000
|
);
|
|
233998
234001
|
workspacePaths.filter((workspacePath) => workspacePath !== ".").forEach((workspacePath) => projectDirsAlreadyCovered.push(resolve38(resolvedProjectDir, workspacePath)));
|
|
233999
234002
|
if (workspacePaths.length > 0)
|
|
@@ -234034,7 +234037,7 @@ var EcosystemManager = class _EcosystemManager {
|
|
|
234034
234037
|
return typeof packageManagerNameProvider === "function" ? await packageManagerNameProvider(projectDir) : packageManagerNameProvider;
|
|
234035
234038
|
} catch (e) {
|
|
234036
234039
|
if (e instanceof InvalidProjectFileError) {
|
|
234037
|
-
const projectDirRelative =
|
|
234040
|
+
const projectDirRelative = relative19(mainProjectDir, projectDir) || ".";
|
|
234038
234041
|
logger.error(
|
|
234039
234042
|
`Invalid ${e.fileName} file in ${projectDirRelative}. If the project is intentionally invalid, and you want Coana to skip it in the scan, then add "--exclude-dirs ${projectDirRelative}" to the Coana command.`
|
|
234040
234043
|
);
|
|
@@ -234126,7 +234129,7 @@ function shouldIgnoreDir(dir) {
|
|
|
234126
234129
|
return dirsToIgnore.includes(dir);
|
|
234127
234130
|
}
|
|
234128
234131
|
function shouldIgnoreDueToExcludeDirsOrChangedFiles({ mainProjectDir, excludeDirs, changedFiles }, fullPath) {
|
|
234129
|
-
const relativeToProjectDir =
|
|
234132
|
+
const relativeToProjectDir = relative19(mainProjectDir, fullPath) || ".";
|
|
234130
234133
|
return !!(isMatch3(relativeToProjectDir, excludeDirs) || changedFiles && !changedFiles.some((changedFile) => changedFile.startsWith(relativeToProjectDir)));
|
|
234131
234134
|
}
|
|
234132
234135
|
|
|
@@ -234174,7 +234177,7 @@ var ProjectManager = class _ProjectManager {
|
|
|
234174
234177
|
if (subprojects.length === 0) return void 0;
|
|
234175
234178
|
return ` ${ecosystem}:
|
|
234176
234179
|
${subprojects.map(
|
|
234177
|
-
({ subprojectPath, workspacePaths }) => ` ${
|
|
234180
|
+
({ subprojectPath, workspacePaths }) => ` ${relative20(this.projectDir, subprojectPath) || ". (Root)"}${workspacePaths.length > 1 || workspacePaths[0] !== "." ? ` (${workspacePaths.length} ${ecosystem === "MAVEN" ? "modules" : "workspaces"})` : ""}`
|
|
234178
234181
|
).join("\n")}`;
|
|
234179
234182
|
}).filter((line) => line).join("\n");
|
|
234180
234183
|
const detailsString = Object.entries(this.ecosystemToEcosystemManager).map(([ecosystem, manager]) => {
|
|
@@ -234182,7 +234185,7 @@ ${subprojects.map(
|
|
|
234182
234185
|
if (subprojects.length === 0) return void 0;
|
|
234183
234186
|
const subprojectsString = subprojects.map(({ subprojectPath, workspacePaths, packageManagerName }) => {
|
|
234184
234187
|
if (workspacePaths.length === 1 && workspacePaths[0] === ".") return void 0;
|
|
234185
|
-
return ` ${
|
|
234188
|
+
return ` ${relative20(this.projectDir, subprojectPath) || ". (Root)"}
|
|
234186
234189
|
${workspacePaths.map((ws) => ` ${ws === "." ? ". (Root)" : ws} - ${packageManagerName}`).join("\n")}`;
|
|
234187
234190
|
}).filter((line) => line).join("\n");
|
|
234188
234191
|
if (!subprojectsString) return void 0;
|
|
@@ -234328,6 +234331,7 @@ function getNpmChecks(command, manifestFileNames) {
|
|
|
234328
234331
|
const checks = [];
|
|
234329
234332
|
const nexe = isNexeMode();
|
|
234330
234333
|
if (command === "run") {
|
|
234334
|
+
checks.push(Promise.resolve(checkNodeVersion(20)));
|
|
234331
234335
|
if (!nexe) {
|
|
234332
234336
|
checks.push(checkTool("npm", "NPM", "Required for NPM dependency management. Install from https://nodejs.org"));
|
|
234333
234337
|
}
|
|
@@ -234376,6 +234380,17 @@ async function checkEitherTool(command1, command2, ecosystem, toolLabel, message
|
|
|
234376
234380
|
return null;
|
|
234377
234381
|
}
|
|
234378
234382
|
var JAVA_HOME_ENV_VARS = ["JAVA_HOME", "JAVA8_HOME", "JAVA11_HOME", "JAVA17_HOME", "JAVA21_HOME"];
|
|
234383
|
+
function checkNodeVersion(minimumMajor) {
|
|
234384
|
+
const currentMajor = parseInt(process.versions.node.split(".")[0], 10);
|
|
234385
|
+
if (isNaN(currentMajor) || currentMajor < minimumMajor) {
|
|
234386
|
+
return {
|
|
234387
|
+
ecosystem: "NPM",
|
|
234388
|
+
tool: "node",
|
|
234389
|
+
message: `Requires Node.js version ${minimumMajor} or higher (current: ${process.versions.node}). Install from https://nodejs.org`
|
|
234390
|
+
};
|
|
234391
|
+
}
|
|
234392
|
+
return null;
|
|
234393
|
+
}
|
|
234379
234394
|
async function checkJavaAvailable() {
|
|
234380
234395
|
if (await isCommandAvailable("java"))
|
|
234381
234396
|
return null;
|
|
@@ -234463,7 +234478,7 @@ ${Array.from(upgrades).map(([idx, upgradeVersion]) => ` ${prettyPrintPurlUpgrade
|
|
|
234463
234478
|
warn: "\u26A0\uFE0F",
|
|
234464
234479
|
error: "\u274C"
|
|
234465
234480
|
};
|
|
234466
|
-
logger.info(`${statusIcons[update3.status]} ${update3.message} \u2500 ${
|
|
234481
|
+
logger.info(`${statusIcons[update3.status]} ${update3.message} \u2500 ${relative21(rootDir, resolve40(rootDir, update3.file))}`);
|
|
234467
234482
|
update3.artifacts.forEach((idx, i7) => {
|
|
234468
234483
|
logger.info(`${" ".repeat(3)}${i7 === update3.artifacts.length - 1 ? "\u2514\u2500" : "\u251C\u2500"} ${prettyPrintSocketFactArtifactUpgrade(artifacts[idx], upgrades2.get(idx))}`);
|
|
234469
234484
|
});
|
|
@@ -234531,7 +234546,7 @@ ${total}/${total} workspaces were upgraded successfully.`));
|
|
|
234531
234546
|
const subprojectPromiseQueue = new PromiseQueue(Number(options.concurrency));
|
|
234532
234547
|
supportedSubprojects.forEach((subproject) => {
|
|
234533
234548
|
subprojectPromiseQueue.enqueueTask(async () => {
|
|
234534
|
-
const workspacePathsMatchingGlob = subproject.workspacePaths.filter((wsPath) => wsFilter(
|
|
234549
|
+
const workspacePathsMatchingGlob = subproject.workspacePaths.filter((wsPath) => wsFilter(relative21(rootDir, resolve40(rootDir, subproject.subprojectPath, wsPath)) || "."));
|
|
234535
234550
|
if (workspacePathsMatchingGlob.length === 0)
|
|
234536
234551
|
return;
|
|
234537
234552
|
const filterDescription = options.include !== void 0 || options.exclude !== void 0 ? `matching filters ${options.include ? `include: [${options.include.join(", ")}]` : ""}${options.include && options.exclude ? " " : ""}${options.exclude ? `exclude: [${options.exclude.join(", ")}]` : ""}` : "";
|
|
@@ -234573,7 +234588,7 @@ ${workspacePathsMatchingGlob.map((wsPath) => ` ${wsPath}`).join("\n")}`);
|
|
|
234573
234588
|
logger.info(`No dependencies matching upgrade specs found for subproject ${subproject.subprojectPath}`);
|
|
234574
234589
|
return;
|
|
234575
234590
|
}
|
|
234576
|
-
await applySecurityFixes(subproject.packageManagerName, rootDir,
|
|
234591
|
+
await applySecurityFixes(subproject.packageManagerName, rootDir, relative21(rootDir, subproject.subprojectPath) || ".", otherModulesCommunicator, workspaceToFixes, fixingData, signalFixApplied);
|
|
234577
234592
|
});
|
|
234578
234593
|
});
|
|
234579
234594
|
await subprojectPromiseQueue.onIdle();
|
|
@@ -234800,7 +234815,7 @@ import { existsSync as existsSync28, writeFileSync as writeFileSync3 } from "fs"
|
|
|
234800
234815
|
import { mkdir as mkdir6, writeFile as writeFile15 } from "fs/promises";
|
|
234801
234816
|
var import_lodash15 = __toESM(require_lodash(), 1);
|
|
234802
234817
|
import os2 from "os";
|
|
234803
|
-
import { join as join34, relative as
|
|
234818
|
+
import { join as join34, relative as relative22, resolve as resolve42 } from "path";
|
|
234804
234819
|
|
|
234805
234820
|
// ../utils/src/dashboard-api/shared-api.ts
|
|
234806
234821
|
var DashboardAPI = class {
|
|
@@ -238407,10 +238422,10 @@ function compareDocumentPosition(nodeA, nodeB) {
|
|
|
238407
238422
|
function uniqueSort(nodes) {
|
|
238408
238423
|
nodes = nodes.filter((node, i7, arr) => !arr.includes(node, i7 + 1));
|
|
238409
238424
|
nodes.sort((a4, b) => {
|
|
238410
|
-
const
|
|
238411
|
-
if (
|
|
238425
|
+
const relative23 = compareDocumentPosition(a4, b);
|
|
238426
|
+
if (relative23 & DocumentPosition.PRECEDING) {
|
|
238412
238427
|
return -1;
|
|
238413
|
-
} else if (
|
|
238428
|
+
} else if (relative23 & DocumentPosition.FOLLOWING) {
|
|
238414
238429
|
return 1;
|
|
238415
238430
|
}
|
|
238416
238431
|
return 0;
|
|
@@ -251640,7 +251655,7 @@ async function onlineScan(dependencyTree, apiKey, timeout) {
|
|
|
251640
251655
|
}
|
|
251641
251656
|
|
|
251642
251657
|
// dist/version.js
|
|
251643
|
-
var version3 = "14.12.
|
|
251658
|
+
var version3 = "14.12.197";
|
|
251644
251659
|
|
|
251645
251660
|
// dist/cli-core.js
|
|
251646
251661
|
var { mapValues, omit, partition, pickBy: pickBy2 } = import_lodash15.default;
|
|
@@ -252000,7 +252015,7 @@ var CliCore = class {
|
|
|
252000
252015
|
}
|
|
252001
252016
|
await this.dashboardAPI.registerSubprojects([...reachabilitySupport, ...traditionalScaSupport, ...noSupport].map((sp) => ({
|
|
252002
252017
|
...sp,
|
|
252003
|
-
subprojectPath:
|
|
252018
|
+
subprojectPath: relative22(this.rootWorkingDirectory, sp.subprojectPath) || "."
|
|
252004
252019
|
})), this.reportId, this.apiKey);
|
|
252005
252020
|
for (const unsupported of noSupport)
|
|
252006
252021
|
logger.warn(unsupported.unsupportedMsg);
|
|
@@ -252029,7 +252044,7 @@ var CliCore = class {
|
|
|
252029
252044
|
await this.spinner.succeed();
|
|
252030
252045
|
} catch (error) {
|
|
252031
252046
|
if (this.options.ignoreFailingWorkspaces) {
|
|
252032
|
-
const relativeSubprojectPath =
|
|
252047
|
+
const relativeSubprojectPath = relative22(this.rootWorkingDirectory, subprojectAndWsPath.subprojectPath) || ".";
|
|
252033
252048
|
this.failedSubprojects.push({
|
|
252034
252049
|
subproject: relativeSubprojectPath,
|
|
252035
252050
|
error: error.message || "Unknown error"
|
|
@@ -252088,7 +252103,7 @@ Subproject: ${subproject}`);
|
|
|
252088
252103
|
}
|
|
252089
252104
|
async updateSpinnerTextOnNewSubproject(subprojectAndWsPath, numberSubprojects, index2) {
|
|
252090
252105
|
this.spinner.start();
|
|
252091
|
-
const relativeSubprojectPath =
|
|
252106
|
+
const relativeSubprojectPath = relative22(this.rootWorkingDirectory, subprojectAndWsPath.subprojectPath) || ".";
|
|
252092
252107
|
await this.spinner.setText(numberSubprojects > 1 ? `Processing subproject ${relativeSubprojectPath} (${index2 + 1}/${numberSubprojects})${+this.options.concurrency > 1 ? `. May process up to ${+this.options.concurrency - 1} other workspaces in parallel` : ""}` : `Processing ${relativeSubprojectPath}`);
|
|
252093
252108
|
}
|
|
252094
252109
|
async initialize() {
|
|
@@ -252171,7 +252186,7 @@ Subproject: ${subproject}`);
|
|
|
252171
252186
|
return workspaceToAugmentedVulnerabilities[workspacePath] !== void 0;
|
|
252172
252187
|
}).map((workspacePath) => {
|
|
252173
252188
|
return {
|
|
252174
|
-
subprojectPath:
|
|
252189
|
+
subprojectPath: relative22(this.rootWorkingDirectory, subprojectPath) || ".",
|
|
252175
252190
|
workspacePath,
|
|
252176
252191
|
directDependencies: projectInfo[workspacePath].dataForAnalysis.directDependenciesMap ?? {},
|
|
252177
252192
|
vulnerabilities: workspaceToAugmentedVulnerabilities[workspacePath],
|
|
@@ -252404,7 +252419,7 @@ Subproject: ${subproject}`);
|
|
|
252404
252419
|
async sendProgress(type, isStartEvent, subprojectPath, workspacePath) {
|
|
252405
252420
|
await this.dashboardAPI.registerCLIProgress({
|
|
252406
252421
|
type,
|
|
252407
|
-
...subprojectPath ? { subprojectPath:
|
|
252422
|
+
...subprojectPath ? { subprojectPath: relative22(this.rootWorkingDirectory, subprojectPath) || "." } : {},
|
|
252408
252423
|
...workspacePath ? { workspacePath } : {}
|
|
252409
252424
|
}, isStartEvent, this.reportId, this.apiKey);
|
|
252410
252425
|
}
|
|
@@ -252461,7 +252476,7 @@ Subproject: ${subproject}`);
|
|
|
252461
252476
|
dependencyTree: workspaceToPlainDependencyTree[workspacePath],
|
|
252462
252477
|
ecosystem: workspaceToPlainDependencyTree[workspacePath].ecosystem ?? "NPM",
|
|
252463
252478
|
workspacePath,
|
|
252464
|
-
subprojectPath:
|
|
252479
|
+
subprojectPath: relative22(rootWorkingDirectory, subprojectPath) || "."
|
|
252465
252480
|
}));
|
|
252466
252481
|
if (this.options.socketMode) {
|
|
252467
252482
|
this.reportDependencyTrees = workspacePaths.map((workspacePath) => ({
|
|
@@ -252469,7 +252484,7 @@ Subproject: ${subproject}`);
|
|
|
252469
252484
|
dependencyTree: projectInfo[workspacePath].dataForAnalysis.data.dependencyTree,
|
|
252470
252485
|
ecosystem: projectInfo[workspacePath].dataForAnalysis.data.dependencyTree.ecosystem ?? "NPM",
|
|
252471
252486
|
workspacePath,
|
|
252472
|
-
subprojectPath:
|
|
252487
|
+
subprojectPath: relative22(rootWorkingDirectory, subprojectPath) || "."
|
|
252473
252488
|
}));
|
|
252474
252489
|
}
|
|
252475
252490
|
if (this.shareWithDashboard)
|
|
@@ -252485,7 +252500,7 @@ Subproject: ${subproject}`);
|
|
|
252485
252500
|
} catch (e) {
|
|
252486
252501
|
logger.error(`Scanning for vulnerabilities failed for subproject ${subprojectPath} in workspace ${workspacePath}`);
|
|
252487
252502
|
if (this.options.ignoreFailingWorkspaces) {
|
|
252488
|
-
const relativeSubprojectPath =
|
|
252503
|
+
const relativeSubprojectPath = relative22(this.rootWorkingDirectory, subprojectPath) || ".";
|
|
252489
252504
|
this.failedWorkspaces.push({
|
|
252490
252505
|
subproject: relativeSubprojectPath,
|
|
252491
252506
|
workspace: workspacePath,
|
|
@@ -252504,7 +252519,7 @@ Subproject: ${subproject}`);
|
|
|
252504
252519
|
}
|
|
252505
252520
|
};
|
|
252506
252521
|
function getRelativeSubprojectPath(subprojectPath, projectDir) {
|
|
252507
|
-
return
|
|
252522
|
+
return relative22(projectDir, subprojectPath) || ".";
|
|
252508
252523
|
}
|
|
252509
252524
|
function getDependencyType(vulnChainDetails, codeAwareScanResults, directDependencies, reachability) {
|
|
252510
252525
|
if (reachability === "UNREACHABLE" || reachability === "UNKNOWN") {
|
package/package.json
CHANGED
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|