@aws-cdk/integ-runner 2.193.3 → 2.193.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/lib/engines/toolkit-lib.js +2 -1
- package/lib/workers/extract/index.js +846 -787
- package/package.json +6 -6
|
@@ -1647,14 +1647,14 @@ var require_helpers = __commonJS({
|
|
|
1647
1647
|
"../cloud-assembly-schema/node_modules/jsonschema/lib/helpers.js"(exports2, module2) {
|
|
1648
1648
|
"use strict";
|
|
1649
1649
|
var uri = require("url");
|
|
1650
|
-
var ValidationError = exports2.ValidationError = /* @__PURE__ */ __name(function ValidationError2(message2, instance, schema,
|
|
1651
|
-
if (Array.isArray(
|
|
1652
|
-
this.path =
|
|
1653
|
-
this.property =
|
|
1650
|
+
var ValidationError = exports2.ValidationError = /* @__PURE__ */ __name(function ValidationError2(message2, instance, schema, path35, name, argument) {
|
|
1651
|
+
if (Array.isArray(path35)) {
|
|
1652
|
+
this.path = path35;
|
|
1653
|
+
this.property = path35.reduce(function(sum3, item) {
|
|
1654
1654
|
return sum3 + makeSuffix(item);
|
|
1655
1655
|
}, "instance");
|
|
1656
|
-
} else if (
|
|
1657
|
-
this.property =
|
|
1656
|
+
} else if (path35 !== void 0) {
|
|
1657
|
+
this.property = path35;
|
|
1658
1658
|
}
|
|
1659
1659
|
if (message2) {
|
|
1660
1660
|
this.message = message2;
|
|
@@ -1747,16 +1747,16 @@ var require_helpers = __commonJS({
|
|
|
1747
1747
|
name: { value: "SchemaError", enumerable: false }
|
|
1748
1748
|
}
|
|
1749
1749
|
);
|
|
1750
|
-
var SchemaContext = exports2.SchemaContext = /* @__PURE__ */ __name(function SchemaContext2(schema, options,
|
|
1750
|
+
var SchemaContext = exports2.SchemaContext = /* @__PURE__ */ __name(function SchemaContext2(schema, options, path35, base, schemas) {
|
|
1751
1751
|
this.schema = schema;
|
|
1752
1752
|
this.options = options;
|
|
1753
|
-
if (Array.isArray(
|
|
1754
|
-
this.path =
|
|
1755
|
-
this.propertyPath =
|
|
1753
|
+
if (Array.isArray(path35)) {
|
|
1754
|
+
this.path = path35;
|
|
1755
|
+
this.propertyPath = path35.reduce(function(sum3, item) {
|
|
1756
1756
|
return sum3 + makeSuffix(item);
|
|
1757
1757
|
}, "instance");
|
|
1758
1758
|
} else {
|
|
1759
|
-
this.propertyPath =
|
|
1759
|
+
this.propertyPath = path35;
|
|
1760
1760
|
}
|
|
1761
1761
|
this.base = base;
|
|
1762
1762
|
this.schemas = schemas;
|
|
@@ -1765,10 +1765,10 @@ var require_helpers = __commonJS({
|
|
|
1765
1765
|
return uri.resolve(this.base, target);
|
|
1766
1766
|
}, "resolve");
|
|
1767
1767
|
SchemaContext.prototype.makeChild = /* @__PURE__ */ __name(function makeChild(schema, propertyName) {
|
|
1768
|
-
var
|
|
1768
|
+
var path35 = propertyName === void 0 ? this.path : this.path.concat([propertyName]);
|
|
1769
1769
|
var id = schema.$id || schema.id;
|
|
1770
1770
|
var base = uri.resolve(this.base, id || "");
|
|
1771
|
-
var ctx = new SchemaContext(schema, this.options,
|
|
1771
|
+
var ctx = new SchemaContext(schema, this.options, path35, base, Object.create(this.schemas));
|
|
1772
1772
|
if (id && !ctx.schemas[base]) {
|
|
1773
1773
|
ctx.schemas[base] = schema;
|
|
1774
1774
|
}
|
|
@@ -4900,7 +4900,7 @@ var require_semver2 = __commonJS({
|
|
|
4900
4900
|
// ../cloud-assembly-schema/cli-version.json
|
|
4901
4901
|
var require_cli_version = __commonJS({
|
|
4902
4902
|
"../cloud-assembly-schema/cli-version.json"(exports2, module2) {
|
|
4903
|
-
module2.exports = { version: "2.
|
|
4903
|
+
module2.exports = { version: "2.1101.0" };
|
|
4904
4904
|
}
|
|
4905
4905
|
});
|
|
4906
4906
|
|
|
@@ -6284,6 +6284,10 @@ have a unique display name. (Default - no display name)`,
|
|
|
6284
6284
|
description: "Identifier of the resource to look up using `GetResource`.\n\nSpecifying exactIdentifier will return exactly one result, or throw an error\nunless `ignoreErrorOnMissingContext` is set. (Default - Either exactIdentifier or propertyMatch should be specified.)",
|
|
6285
6285
|
type: "string"
|
|
6286
6286
|
},
|
|
6287
|
+
resourceModel: {
|
|
6288
|
+
description: "The resource model to use to select the resources, using `ListResources`..\n\nThis is needed for sub-resources where the parent Arn is required.\n\nSee https://docs.aws.amazon.com/cloudcontrolapi/latest/userguide/resource-operations-list.html#resource-operations-list-containers (Default - no resource Model is provided)",
|
|
6289
|
+
$ref: "#/definitions/Record%3Cstring%2Cunknown%3E"
|
|
6290
|
+
},
|
|
6287
6291
|
propertyMatch: {
|
|
6288
6292
|
description: "Returns any resources matching these properties, using `ListResources`.\n\nBy default, specifying propertyMatch will successfully return 0 or more\nresults. To throw an error if the number of results is unexpected (and\nprevent the query results from being committed to context), specify\n`expectedMatchCount`.\n\n## Notes on property completeness\n\nCloudControl API's `ListResources` may return fewer properties than\n`GetResource` would, depending on the resource implementation.\n\nThe resources that `propertyMatch` matches against will *only ever* be the\nproperties returned by the `ListResources` call. (Default - Either exactIdentifier or propertyMatch should be specified.)",
|
|
6289
6293
|
$ref: "#/definitions/Record%3Cstring%2Cunknown%3E"
|
|
@@ -6884,9 +6888,9 @@ var require_integ_schema = __commonJS({
|
|
|
6884
6888
|
var require_version = __commonJS({
|
|
6885
6889
|
"../cloud-assembly-schema/schema/version.json"(exports2, module2) {
|
|
6886
6890
|
module2.exports = {
|
|
6887
|
-
schemaHash: "
|
|
6891
|
+
schemaHash: "c0092c55280aa03c568e1d591f2034783597e942a400d1d58d7f05a8215f51f4",
|
|
6888
6892
|
$comment: "Do not hold back the version on additions: jsonschema validation of the manifest by the consumer will trigger errors on unexpected fields.",
|
|
6889
|
-
revision:
|
|
6893
|
+
revision: 50
|
|
6890
6894
|
};
|
|
6891
6895
|
}
|
|
6892
6896
|
});
|
|
@@ -7393,10 +7397,10 @@ var require_cloud_artifact = __commonJS({
|
|
|
7393
7397
|
*/
|
|
7394
7398
|
findMetadataByType(type) {
|
|
7395
7399
|
const result2 = new Array();
|
|
7396
|
-
for (const
|
|
7397
|
-
for (const entry of (this.manifest.metadata || {})[
|
|
7400
|
+
for (const path35 of Object.keys(this.manifest.metadata || {})) {
|
|
7401
|
+
for (const entry of (this.manifest.metadata || {})[path35]) {
|
|
7398
7402
|
if (entry.type === type) {
|
|
7399
|
-
result2.push({ path:
|
|
7403
|
+
result2.push({ path: path35, ...entry });
|
|
7400
7404
|
}
|
|
7401
7405
|
}
|
|
7402
7406
|
}
|
|
@@ -7447,7 +7451,7 @@ var require_asset_manifest_artifact = __commonJS({
|
|
|
7447
7451
|
var jsiiDeprecationWarnings = require_warnings_jsii();
|
|
7448
7452
|
var JSII_RTTI_SYMBOL_1 = /* @__PURE__ */ Symbol.for("jsii.rtti");
|
|
7449
7453
|
var fs36 = require("fs");
|
|
7450
|
-
var
|
|
7454
|
+
var path35 = require("path");
|
|
7451
7455
|
var cloud_artifact_1 = require_cloud_artifact();
|
|
7452
7456
|
var error_1 = require_error();
|
|
7453
7457
|
var ASSET_MANIFEST_ARTIFACT_SYM = /* @__PURE__ */ Symbol.for("@aws-cdk/cx-api.AssetManifestArtifact");
|
|
@@ -7505,7 +7509,7 @@ var require_asset_manifest_artifact = __commonJS({
|
|
|
7505
7509
|
if (!properties.file) {
|
|
7506
7510
|
throw new error_1.CloudAssemblyError('Invalid AssetManifestArtifact. Missing "file" property');
|
|
7507
7511
|
}
|
|
7508
|
-
this.file =
|
|
7512
|
+
this.file = path35.resolve(this.assembly.directory, properties.file);
|
|
7509
7513
|
this.requiresBootstrapStackVersion = properties.requiresBootstrapStackVersion;
|
|
7510
7514
|
this.bootstrapStackVersionSsmParameter = properties.bootstrapStackVersionSsmParameter;
|
|
7511
7515
|
}
|
|
@@ -7582,7 +7586,7 @@ var require_cloudformation_artifact = __commonJS({
|
|
|
7582
7586
|
var jsiiDeprecationWarnings = require_warnings_jsii();
|
|
7583
7587
|
var JSII_RTTI_SYMBOL_1 = /* @__PURE__ */ Symbol.for("jsii.rtti");
|
|
7584
7588
|
var fs36 = require("fs");
|
|
7585
|
-
var
|
|
7589
|
+
var path35 = require("path");
|
|
7586
7590
|
var cxschema7 = require_lib2();
|
|
7587
7591
|
var cloud_artifact_1 = require_cloud_artifact();
|
|
7588
7592
|
var environment_1 = require_environment2();
|
|
@@ -7763,7 +7767,7 @@ var require_cloudformation_artifact = __commonJS({
|
|
|
7763
7767
|
* Full path to the template file
|
|
7764
7768
|
*/
|
|
7765
7769
|
get templateFullPath() {
|
|
7766
|
-
return
|
|
7770
|
+
return path35.join(this.assembly.directory, this.templateFile);
|
|
7767
7771
|
}
|
|
7768
7772
|
/**
|
|
7769
7773
|
* The CloudFormation template for this stack.
|
|
@@ -7801,7 +7805,7 @@ var require_nested_cloud_assembly_artifact = __commonJS({
|
|
|
7801
7805
|
exports2.NestedCloudAssemblyArtifact = void 0;
|
|
7802
7806
|
var jsiiDeprecationWarnings = require_warnings_jsii();
|
|
7803
7807
|
var JSII_RTTI_SYMBOL_1 = /* @__PURE__ */ Symbol.for("jsii.rtti");
|
|
7804
|
-
var
|
|
7808
|
+
var path35 = require("path");
|
|
7805
7809
|
var cloud_artifact_1 = require_cloud_artifact();
|
|
7806
7810
|
var NESTED_CLOUD_ASSEMBLY_SYM = /* @__PURE__ */ Symbol.for("@aws-cdk/cx-api.NestedCloudAssemblyArtifact");
|
|
7807
7811
|
var NestedCloudAssemblyArtifact2 = class _NestedCloudAssemblyArtifact extends cloud_artifact_1.CloudArtifact {
|
|
@@ -7855,7 +7859,7 @@ var require_nested_cloud_assembly_artifact = __commonJS({
|
|
|
7855
7859
|
* Full path to the nested assembly directory
|
|
7856
7860
|
*/
|
|
7857
7861
|
get fullPath() {
|
|
7858
|
-
return
|
|
7862
|
+
return path35.join(this.assembly.directory, this.directoryName);
|
|
7859
7863
|
}
|
|
7860
7864
|
};
|
|
7861
7865
|
exports2.NestedCloudAssemblyArtifact = NestedCloudAssemblyArtifact2;
|
|
@@ -7999,7 +8003,7 @@ var require_cloud_assembly = __commonJS({
|
|
|
7999
8003
|
var JSII_RTTI_SYMBOL_1 = /* @__PURE__ */ Symbol.for("jsii.rtti");
|
|
8000
8004
|
var fs36 = require("fs");
|
|
8001
8005
|
var os10 = require("os");
|
|
8002
|
-
var
|
|
8006
|
+
var path35 = require("path");
|
|
8003
8007
|
var cloudformation_artifact_1 = require_cloudformation_artifact();
|
|
8004
8008
|
var nested_cloud_assembly_artifact_1 = require_nested_cloud_assembly_artifact();
|
|
8005
8009
|
var tree_cloud_artifact_1 = require_tree_cloud_artifact();
|
|
@@ -8094,7 +8098,7 @@ var require_cloud_assembly = __commonJS({
|
|
|
8094
8098
|
*/
|
|
8095
8099
|
constructor(directory, loadOptions) {
|
|
8096
8100
|
this.directory = directory;
|
|
8097
|
-
this.manifest = cxschema7.Manifest.loadAssemblyManifest(
|
|
8101
|
+
this.manifest = cxschema7.Manifest.loadAssemblyManifest(path35.join(directory, MANIFEST_FILE), loadOptions);
|
|
8098
8102
|
this.version = this.manifest.version;
|
|
8099
8103
|
this.artifacts = this.renderArtifacts(loadOptions?.topoSort ?? true);
|
|
8100
8104
|
this.runtime = this.manifest.runtime || { libraries: {} };
|
|
@@ -8330,9 +8334,9 @@ var require_cloud_assembly = __commonJS({
|
|
|
8330
8334
|
missing: this.missing.length > 0 ? this.missing : void 0
|
|
8331
8335
|
};
|
|
8332
8336
|
manifest = filterUndefined(manifest);
|
|
8333
|
-
const manifestFilePath =
|
|
8337
|
+
const manifestFilePath = path35.join(this.outdir, MANIFEST_FILE);
|
|
8334
8338
|
cxschema7.Manifest.saveAssemblyManifest(manifest, manifestFilePath);
|
|
8335
|
-
fs36.writeFileSync(
|
|
8339
|
+
fs36.writeFileSync(path35.join(this.outdir, "cdk.out"), JSON.stringify({ version: manifest.version }));
|
|
8336
8340
|
return new CloudAssembly4(this.outdir);
|
|
8337
8341
|
}
|
|
8338
8342
|
/**
|
|
@@ -8340,7 +8344,7 @@ var require_cloud_assembly = __commonJS({
|
|
|
8340
8344
|
*/
|
|
8341
8345
|
createNestedAssembly(artifactId, displayName) {
|
|
8342
8346
|
const directoryName = artifactId;
|
|
8343
|
-
const innerAsmDir =
|
|
8347
|
+
const innerAsmDir = path35.join(this.outdir, directoryName);
|
|
8344
8348
|
this.addArtifact(artifactId, {
|
|
8345
8349
|
type: cxschema7.ArtifactType.NESTED_CLOUD_ASSEMBLY,
|
|
8346
8350
|
properties: {
|
|
@@ -8387,7 +8391,7 @@ var require_cloud_assembly = __commonJS({
|
|
|
8387
8391
|
if (outdir) {
|
|
8388
8392
|
return outdir;
|
|
8389
8393
|
}
|
|
8390
|
-
const tmpDir = fs36.mkdtempSync(
|
|
8394
|
+
const tmpDir = fs36.mkdtempSync(path35.join(fs36.realpathSync(os10.tmpdir()), "cdk.out"));
|
|
8391
8395
|
TEMPORARY_ASSEMBLY_DIRS.push(tmpDir);
|
|
8392
8396
|
return outdir ?? tmpDir;
|
|
8393
8397
|
}
|
|
@@ -10392,14 +10396,14 @@ var require_polyfills = __commonJS({
|
|
|
10392
10396
|
fs36.fstatSync = statFixSync(fs36.fstatSync);
|
|
10393
10397
|
fs36.lstatSync = statFixSync(fs36.lstatSync);
|
|
10394
10398
|
if (fs36.chmod && !fs36.lchmod) {
|
|
10395
|
-
fs36.lchmod = function(
|
|
10399
|
+
fs36.lchmod = function(path35, mode, cb) {
|
|
10396
10400
|
if (cb) process.nextTick(cb);
|
|
10397
10401
|
};
|
|
10398
10402
|
fs36.lchmodSync = function() {
|
|
10399
10403
|
};
|
|
10400
10404
|
}
|
|
10401
10405
|
if (fs36.chown && !fs36.lchown) {
|
|
10402
|
-
fs36.lchown = function(
|
|
10406
|
+
fs36.lchown = function(path35, uid, gid, cb) {
|
|
10403
10407
|
if (cb) process.nextTick(cb);
|
|
10404
10408
|
};
|
|
10405
10409
|
fs36.lchownSync = function() {
|
|
@@ -10468,9 +10472,9 @@ var require_polyfills = __commonJS({
|
|
|
10468
10472
|
};
|
|
10469
10473
|
})(fs36.readSync);
|
|
10470
10474
|
function patchLchmod(fs37) {
|
|
10471
|
-
fs37.lchmod = function(
|
|
10475
|
+
fs37.lchmod = function(path35, mode, callback) {
|
|
10472
10476
|
fs37.open(
|
|
10473
|
-
|
|
10477
|
+
path35,
|
|
10474
10478
|
constants2.O_WRONLY | constants2.O_SYMLINK,
|
|
10475
10479
|
mode,
|
|
10476
10480
|
function(err, fd) {
|
|
@@ -10486,8 +10490,8 @@ var require_polyfills = __commonJS({
|
|
|
10486
10490
|
}
|
|
10487
10491
|
);
|
|
10488
10492
|
};
|
|
10489
|
-
fs37.lchmodSync = function(
|
|
10490
|
-
var fd = fs37.openSync(
|
|
10493
|
+
fs37.lchmodSync = function(path35, mode) {
|
|
10494
|
+
var fd = fs37.openSync(path35, constants2.O_WRONLY | constants2.O_SYMLINK, mode);
|
|
10491
10495
|
var threw = true;
|
|
10492
10496
|
var ret;
|
|
10493
10497
|
try {
|
|
@@ -10509,8 +10513,8 @@ var require_polyfills = __commonJS({
|
|
|
10509
10513
|
__name(patchLchmod, "patchLchmod");
|
|
10510
10514
|
function patchLutimes(fs37) {
|
|
10511
10515
|
if (constants2.hasOwnProperty("O_SYMLINK") && fs37.futimes) {
|
|
10512
|
-
fs37.lutimes = function(
|
|
10513
|
-
fs37.open(
|
|
10516
|
+
fs37.lutimes = function(path35, at, mt, cb) {
|
|
10517
|
+
fs37.open(path35, constants2.O_SYMLINK, function(er, fd) {
|
|
10514
10518
|
if (er) {
|
|
10515
10519
|
if (cb) cb(er);
|
|
10516
10520
|
return;
|
|
@@ -10522,8 +10526,8 @@ var require_polyfills = __commonJS({
|
|
|
10522
10526
|
});
|
|
10523
10527
|
});
|
|
10524
10528
|
};
|
|
10525
|
-
fs37.lutimesSync = function(
|
|
10526
|
-
var fd = fs37.openSync(
|
|
10529
|
+
fs37.lutimesSync = function(path35, at, mt) {
|
|
10530
|
+
var fd = fs37.openSync(path35, constants2.O_SYMLINK);
|
|
10527
10531
|
var ret;
|
|
10528
10532
|
var threw = true;
|
|
10529
10533
|
try {
|
|
@@ -10651,11 +10655,11 @@ var require_legacy_streams = __commonJS({
|
|
|
10651
10655
|
ReadStream,
|
|
10652
10656
|
WriteStream
|
|
10653
10657
|
};
|
|
10654
|
-
function ReadStream(
|
|
10655
|
-
if (!(this instanceof ReadStream)) return new ReadStream(
|
|
10658
|
+
function ReadStream(path35, options) {
|
|
10659
|
+
if (!(this instanceof ReadStream)) return new ReadStream(path35, options);
|
|
10656
10660
|
Stream2.call(this);
|
|
10657
10661
|
var self2 = this;
|
|
10658
|
-
this.path =
|
|
10662
|
+
this.path = path35;
|
|
10659
10663
|
this.fd = null;
|
|
10660
10664
|
this.readable = true;
|
|
10661
10665
|
this.paused = false;
|
|
@@ -10701,10 +10705,10 @@ var require_legacy_streams = __commonJS({
|
|
|
10701
10705
|
});
|
|
10702
10706
|
}
|
|
10703
10707
|
__name(ReadStream, "ReadStream");
|
|
10704
|
-
function WriteStream(
|
|
10705
|
-
if (!(this instanceof WriteStream)) return new WriteStream(
|
|
10708
|
+
function WriteStream(path35, options) {
|
|
10709
|
+
if (!(this instanceof WriteStream)) return new WriteStream(path35, options);
|
|
10706
10710
|
Stream2.call(this);
|
|
10707
|
-
this.path =
|
|
10711
|
+
this.path = path35;
|
|
10708
10712
|
this.fd = null;
|
|
10709
10713
|
this.writable = true;
|
|
10710
10714
|
this.flags = "w";
|
|
@@ -10854,14 +10858,14 @@ var require_graceful_fs = __commonJS({
|
|
|
10854
10858
|
fs37.createWriteStream = createWriteStream2;
|
|
10855
10859
|
var fs$readFile = fs37.readFile;
|
|
10856
10860
|
fs37.readFile = readFile2;
|
|
10857
|
-
function readFile2(
|
|
10861
|
+
function readFile2(path35, options, cb) {
|
|
10858
10862
|
if (typeof options === "function")
|
|
10859
10863
|
cb = options, options = null;
|
|
10860
|
-
return go$readFile(
|
|
10861
|
-
function go$readFile(
|
|
10862
|
-
return fs$readFile(
|
|
10864
|
+
return go$readFile(path35, options, cb);
|
|
10865
|
+
function go$readFile(path36, options2, cb2, startTime) {
|
|
10866
|
+
return fs$readFile(path36, options2, function(err) {
|
|
10863
10867
|
if (err && (err.code === "EMFILE" || err.code === "ENFILE"))
|
|
10864
|
-
enqueue([go$readFile, [
|
|
10868
|
+
enqueue([go$readFile, [path36, options2, cb2], err, startTime || Date.now(), Date.now()]);
|
|
10865
10869
|
else {
|
|
10866
10870
|
if (typeof cb2 === "function")
|
|
10867
10871
|
cb2.apply(this, arguments);
|
|
@@ -10873,14 +10877,14 @@ var require_graceful_fs = __commonJS({
|
|
|
10873
10877
|
__name(readFile2, "readFile");
|
|
10874
10878
|
var fs$writeFile = fs37.writeFile;
|
|
10875
10879
|
fs37.writeFile = writeFile2;
|
|
10876
|
-
function writeFile2(
|
|
10880
|
+
function writeFile2(path35, data2, options, cb) {
|
|
10877
10881
|
if (typeof options === "function")
|
|
10878
10882
|
cb = options, options = null;
|
|
10879
|
-
return go$writeFile(
|
|
10880
|
-
function go$writeFile(
|
|
10881
|
-
return fs$writeFile(
|
|
10883
|
+
return go$writeFile(path35, data2, options, cb);
|
|
10884
|
+
function go$writeFile(path36, data3, options2, cb2, startTime) {
|
|
10885
|
+
return fs$writeFile(path36, data3, options2, function(err) {
|
|
10882
10886
|
if (err && (err.code === "EMFILE" || err.code === "ENFILE"))
|
|
10883
|
-
enqueue([go$writeFile, [
|
|
10887
|
+
enqueue([go$writeFile, [path36, data3, options2, cb2], err, startTime || Date.now(), Date.now()]);
|
|
10884
10888
|
else {
|
|
10885
10889
|
if (typeof cb2 === "function")
|
|
10886
10890
|
cb2.apply(this, arguments);
|
|
@@ -10893,14 +10897,14 @@ var require_graceful_fs = __commonJS({
|
|
|
10893
10897
|
var fs$appendFile = fs37.appendFile;
|
|
10894
10898
|
if (fs$appendFile)
|
|
10895
10899
|
fs37.appendFile = appendFile;
|
|
10896
|
-
function appendFile(
|
|
10900
|
+
function appendFile(path35, data2, options, cb) {
|
|
10897
10901
|
if (typeof options === "function")
|
|
10898
10902
|
cb = options, options = null;
|
|
10899
|
-
return go$appendFile(
|
|
10900
|
-
function go$appendFile(
|
|
10901
|
-
return fs$appendFile(
|
|
10903
|
+
return go$appendFile(path35, data2, options, cb);
|
|
10904
|
+
function go$appendFile(path36, data3, options2, cb2, startTime) {
|
|
10905
|
+
return fs$appendFile(path36, data3, options2, function(err) {
|
|
10902
10906
|
if (err && (err.code === "EMFILE" || err.code === "ENFILE"))
|
|
10903
|
-
enqueue([go$appendFile, [
|
|
10907
|
+
enqueue([go$appendFile, [path36, data3, options2, cb2], err, startTime || Date.now(), Date.now()]);
|
|
10904
10908
|
else {
|
|
10905
10909
|
if (typeof cb2 === "function")
|
|
10906
10910
|
cb2.apply(this, arguments);
|
|
@@ -10935,31 +10939,31 @@ var require_graceful_fs = __commonJS({
|
|
|
10935
10939
|
var fs$readdir = fs37.readdir;
|
|
10936
10940
|
fs37.readdir = readdir3;
|
|
10937
10941
|
var noReaddirOptionVersions = /^v[0-5]\./;
|
|
10938
|
-
function readdir3(
|
|
10942
|
+
function readdir3(path35, options, cb) {
|
|
10939
10943
|
if (typeof options === "function")
|
|
10940
10944
|
cb = options, options = null;
|
|
10941
|
-
var go$readdir = noReaddirOptionVersions.test(process.version) ? /* @__PURE__ */ __name(function go$readdir2(
|
|
10942
|
-
return fs$readdir(
|
|
10943
|
-
|
|
10945
|
+
var go$readdir = noReaddirOptionVersions.test(process.version) ? /* @__PURE__ */ __name(function go$readdir2(path36, options2, cb2, startTime) {
|
|
10946
|
+
return fs$readdir(path36, fs$readdirCallback(
|
|
10947
|
+
path36,
|
|
10944
10948
|
options2,
|
|
10945
10949
|
cb2,
|
|
10946
10950
|
startTime
|
|
10947
10951
|
));
|
|
10948
|
-
}, "go$readdir") : /* @__PURE__ */ __name(function go$readdir2(
|
|
10949
|
-
return fs$readdir(
|
|
10950
|
-
|
|
10952
|
+
}, "go$readdir") : /* @__PURE__ */ __name(function go$readdir2(path36, options2, cb2, startTime) {
|
|
10953
|
+
return fs$readdir(path36, options2, fs$readdirCallback(
|
|
10954
|
+
path36,
|
|
10951
10955
|
options2,
|
|
10952
10956
|
cb2,
|
|
10953
10957
|
startTime
|
|
10954
10958
|
));
|
|
10955
10959
|
}, "go$readdir");
|
|
10956
|
-
return go$readdir(
|
|
10957
|
-
function fs$readdirCallback(
|
|
10960
|
+
return go$readdir(path35, options, cb);
|
|
10961
|
+
function fs$readdirCallback(path36, options2, cb2, startTime) {
|
|
10958
10962
|
return function(err, files) {
|
|
10959
10963
|
if (err && (err.code === "EMFILE" || err.code === "ENFILE"))
|
|
10960
10964
|
enqueue([
|
|
10961
10965
|
go$readdir,
|
|
10962
|
-
[
|
|
10966
|
+
[path36, options2, cb2],
|
|
10963
10967
|
err,
|
|
10964
10968
|
startTime || Date.now(),
|
|
10965
10969
|
Date.now()
|
|
@@ -11032,7 +11036,7 @@ var require_graceful_fs = __commonJS({
|
|
|
11032
11036
|
enumerable: true,
|
|
11033
11037
|
configurable: true
|
|
11034
11038
|
});
|
|
11035
|
-
function ReadStream(
|
|
11039
|
+
function ReadStream(path35, options) {
|
|
11036
11040
|
if (this instanceof ReadStream)
|
|
11037
11041
|
return fs$ReadStream.apply(this, arguments), this;
|
|
11038
11042
|
else
|
|
@@ -11054,7 +11058,7 @@ var require_graceful_fs = __commonJS({
|
|
|
11054
11058
|
});
|
|
11055
11059
|
}
|
|
11056
11060
|
__name(ReadStream$open, "ReadStream$open");
|
|
11057
|
-
function WriteStream(
|
|
11061
|
+
function WriteStream(path35, options) {
|
|
11058
11062
|
if (this instanceof WriteStream)
|
|
11059
11063
|
return fs$WriteStream.apply(this, arguments), this;
|
|
11060
11064
|
else
|
|
@@ -11074,24 +11078,24 @@ var require_graceful_fs = __commonJS({
|
|
|
11074
11078
|
});
|
|
11075
11079
|
}
|
|
11076
11080
|
__name(WriteStream$open, "WriteStream$open");
|
|
11077
|
-
function createReadStream2(
|
|
11078
|
-
return new fs37.ReadStream(
|
|
11081
|
+
function createReadStream2(path35, options) {
|
|
11082
|
+
return new fs37.ReadStream(path35, options);
|
|
11079
11083
|
}
|
|
11080
11084
|
__name(createReadStream2, "createReadStream");
|
|
11081
|
-
function createWriteStream2(
|
|
11082
|
-
return new fs37.WriteStream(
|
|
11085
|
+
function createWriteStream2(path35, options) {
|
|
11086
|
+
return new fs37.WriteStream(path35, options);
|
|
11083
11087
|
}
|
|
11084
11088
|
__name(createWriteStream2, "createWriteStream");
|
|
11085
11089
|
var fs$open = fs37.open;
|
|
11086
11090
|
fs37.open = open;
|
|
11087
|
-
function open(
|
|
11091
|
+
function open(path35, flags, mode, cb) {
|
|
11088
11092
|
if (typeof mode === "function")
|
|
11089
11093
|
cb = mode, mode = null;
|
|
11090
|
-
return go$open(
|
|
11091
|
-
function go$open(
|
|
11092
|
-
return fs$open(
|
|
11094
|
+
return go$open(path35, flags, mode, cb);
|
|
11095
|
+
function go$open(path36, flags2, mode2, cb2, startTime) {
|
|
11096
|
+
return fs$open(path36, flags2, mode2, function(err, fd) {
|
|
11093
11097
|
if (err && (err.code === "EMFILE" || err.code === "ENFILE"))
|
|
11094
|
-
enqueue([go$open, [
|
|
11098
|
+
enqueue([go$open, [path36, flags2, mode2, cb2], err, startTime || Date.now(), Date.now()]);
|
|
11095
11099
|
else {
|
|
11096
11100
|
if (typeof cb2 === "function")
|
|
11097
11101
|
cb2.apply(this, arguments);
|
|
@@ -11278,12 +11282,12 @@ var require_make_dir = __commonJS({
|
|
|
11278
11282
|
"node_modules/fs-extra/lib/mkdirs/make-dir.js"(exports2, module2) {
|
|
11279
11283
|
"use strict";
|
|
11280
11284
|
var fs36 = require_fs();
|
|
11281
|
-
var
|
|
11285
|
+
var path35 = require("path");
|
|
11282
11286
|
var atLeastNode = require_at_least_node();
|
|
11283
11287
|
var useNativeRecursiveOption = atLeastNode("10.12.0");
|
|
11284
11288
|
var checkPath = /* @__PURE__ */ __name((pth) => {
|
|
11285
11289
|
if (process.platform === "win32") {
|
|
11286
|
-
const pathHasInvalidWinCharacters = /[<>:"|?*]/.test(pth.replace(
|
|
11290
|
+
const pathHasInvalidWinCharacters = /[<>:"|?*]/.test(pth.replace(path35.parse(pth).root, ""));
|
|
11287
11291
|
if (pathHasInvalidWinCharacters) {
|
|
11288
11292
|
const error4 = new Error(`Path contains invalid characters: ${pth}`);
|
|
11289
11293
|
error4.code = "EINVAL";
|
|
@@ -11308,7 +11312,7 @@ var require_make_dir = __commonJS({
|
|
|
11308
11312
|
checkPath(input);
|
|
11309
11313
|
options = processOptions(options);
|
|
11310
11314
|
if (useNativeRecursiveOption) {
|
|
11311
|
-
const pth =
|
|
11315
|
+
const pth = path35.resolve(input);
|
|
11312
11316
|
return fs36.mkdir(pth, {
|
|
11313
11317
|
mode: options.mode,
|
|
11314
11318
|
recursive: true
|
|
@@ -11322,13 +11326,13 @@ var require_make_dir = __commonJS({
|
|
|
11322
11326
|
throw error4;
|
|
11323
11327
|
}
|
|
11324
11328
|
if (error4.code === "ENOENT") {
|
|
11325
|
-
if (
|
|
11329
|
+
if (path35.dirname(pth) === pth) {
|
|
11326
11330
|
throw permissionError(pth);
|
|
11327
11331
|
}
|
|
11328
11332
|
if (error4.message.includes("null bytes")) {
|
|
11329
11333
|
throw error4;
|
|
11330
11334
|
}
|
|
11331
|
-
await make(
|
|
11335
|
+
await make(path35.dirname(pth));
|
|
11332
11336
|
return make(pth);
|
|
11333
11337
|
}
|
|
11334
11338
|
try {
|
|
@@ -11341,13 +11345,13 @@ var require_make_dir = __commonJS({
|
|
|
11341
11345
|
}
|
|
11342
11346
|
}
|
|
11343
11347
|
}, "make");
|
|
11344
|
-
return make(
|
|
11348
|
+
return make(path35.resolve(input));
|
|
11345
11349
|
};
|
|
11346
11350
|
module2.exports.makeDirSync = (input, options) => {
|
|
11347
11351
|
checkPath(input);
|
|
11348
11352
|
options = processOptions(options);
|
|
11349
11353
|
if (useNativeRecursiveOption) {
|
|
11350
|
-
const pth =
|
|
11354
|
+
const pth = path35.resolve(input);
|
|
11351
11355
|
return fs36.mkdirSync(pth, {
|
|
11352
11356
|
mode: options.mode,
|
|
11353
11357
|
recursive: true
|
|
@@ -11361,13 +11365,13 @@ var require_make_dir = __commonJS({
|
|
|
11361
11365
|
throw error4;
|
|
11362
11366
|
}
|
|
11363
11367
|
if (error4.code === "ENOENT") {
|
|
11364
|
-
if (
|
|
11368
|
+
if (path35.dirname(pth) === pth) {
|
|
11365
11369
|
throw permissionError(pth);
|
|
11366
11370
|
}
|
|
11367
11371
|
if (error4.message.includes("null bytes")) {
|
|
11368
11372
|
throw error4;
|
|
11369
11373
|
}
|
|
11370
|
-
make(
|
|
11374
|
+
make(path35.dirname(pth));
|
|
11371
11375
|
return make(pth);
|
|
11372
11376
|
}
|
|
11373
11377
|
try {
|
|
@@ -11379,7 +11383,7 @@ var require_make_dir = __commonJS({
|
|
|
11379
11383
|
}
|
|
11380
11384
|
}
|
|
11381
11385
|
}, "make");
|
|
11382
|
-
return make(
|
|
11386
|
+
return make(path35.resolve(input));
|
|
11383
11387
|
};
|
|
11384
11388
|
}
|
|
11385
11389
|
});
|
|
@@ -11408,8 +11412,8 @@ var require_utimes = __commonJS({
|
|
|
11408
11412
|
"node_modules/fs-extra/lib/util/utimes.js"(exports2, module2) {
|
|
11409
11413
|
"use strict";
|
|
11410
11414
|
var fs36 = require_graceful_fs();
|
|
11411
|
-
function utimesMillis(
|
|
11412
|
-
fs36.open(
|
|
11415
|
+
function utimesMillis(path35, atime, mtime, callback) {
|
|
11416
|
+
fs36.open(path35, "r+", (err, fd) => {
|
|
11413
11417
|
if (err) return callback(err);
|
|
11414
11418
|
fs36.futimes(fd, atime, mtime, (futimesErr) => {
|
|
11415
11419
|
fs36.close(fd, (closeErr) => {
|
|
@@ -11419,8 +11423,8 @@ var require_utimes = __commonJS({
|
|
|
11419
11423
|
});
|
|
11420
11424
|
}
|
|
11421
11425
|
__name(utimesMillis, "utimesMillis");
|
|
11422
|
-
function utimesMillisSync(
|
|
11423
|
-
const fd = fs36.openSync(
|
|
11426
|
+
function utimesMillisSync(path35, atime, mtime) {
|
|
11427
|
+
const fd = fs36.openSync(path35, "r+");
|
|
11424
11428
|
fs36.futimesSync(fd, atime, mtime);
|
|
11425
11429
|
return fs36.closeSync(fd);
|
|
11426
11430
|
}
|
|
@@ -11437,7 +11441,7 @@ var require_stat = __commonJS({
|
|
|
11437
11441
|
"node_modules/fs-extra/lib/util/stat.js"(exports2, module2) {
|
|
11438
11442
|
"use strict";
|
|
11439
11443
|
var fs36 = require_fs();
|
|
11440
|
-
var
|
|
11444
|
+
var path35 = require("path");
|
|
11441
11445
|
var util9 = require("util");
|
|
11442
11446
|
var atLeastNode = require_at_least_node();
|
|
11443
11447
|
var nodeSupportsBigInt = atLeastNode("10.5.0");
|
|
@@ -11491,9 +11495,9 @@ var require_stat = __commonJS({
|
|
|
11491
11495
|
}
|
|
11492
11496
|
__name(checkPathsSync, "checkPathsSync");
|
|
11493
11497
|
function checkParentPaths(src, srcStat, dest, funcName, cb) {
|
|
11494
|
-
const srcParent =
|
|
11495
|
-
const destParent =
|
|
11496
|
-
if (destParent === srcParent || destParent ===
|
|
11498
|
+
const srcParent = path35.resolve(path35.dirname(src));
|
|
11499
|
+
const destParent = path35.resolve(path35.dirname(dest));
|
|
11500
|
+
if (destParent === srcParent || destParent === path35.parse(destParent).root) return cb();
|
|
11497
11501
|
const callback = /* @__PURE__ */ __name((err, destStat) => {
|
|
11498
11502
|
if (err) {
|
|
11499
11503
|
if (err.code === "ENOENT") return cb();
|
|
@@ -11509,9 +11513,9 @@ var require_stat = __commonJS({
|
|
|
11509
11513
|
}
|
|
11510
11514
|
__name(checkParentPaths, "checkParentPaths");
|
|
11511
11515
|
function checkParentPathsSync(src, srcStat, dest, funcName) {
|
|
11512
|
-
const srcParent =
|
|
11513
|
-
const destParent =
|
|
11514
|
-
if (destParent === srcParent || destParent ===
|
|
11516
|
+
const srcParent = path35.resolve(path35.dirname(src));
|
|
11517
|
+
const destParent = path35.resolve(path35.dirname(dest));
|
|
11518
|
+
if (destParent === srcParent || destParent === path35.parse(destParent).root) return;
|
|
11515
11519
|
let destStat;
|
|
11516
11520
|
try {
|
|
11517
11521
|
destStat = statSync5(destParent);
|
|
@@ -11538,8 +11542,8 @@ var require_stat = __commonJS({
|
|
|
11538
11542
|
}
|
|
11539
11543
|
__name(areIdentical, "areIdentical");
|
|
11540
11544
|
function isSrcSubdir(src, dest) {
|
|
11541
|
-
const srcArr =
|
|
11542
|
-
const destArr =
|
|
11545
|
+
const srcArr = path35.resolve(src).split(path35.sep).filter((i4) => i4);
|
|
11546
|
+
const destArr = path35.resolve(dest).split(path35.sep).filter((i4) => i4);
|
|
11543
11547
|
return srcArr.reduce((acc, cur, i4) => acc && destArr[i4] === cur, true);
|
|
11544
11548
|
}
|
|
11545
11549
|
__name(isSrcSubdir, "isSrcSubdir");
|
|
@@ -11562,7 +11566,7 @@ var require_copy_sync = __commonJS({
|
|
|
11562
11566
|
"node_modules/fs-extra/lib/copy-sync/copy-sync.js"(exports2, module2) {
|
|
11563
11567
|
"use strict";
|
|
11564
11568
|
var fs36 = require_graceful_fs();
|
|
11565
|
-
var
|
|
11569
|
+
var path35 = require("path");
|
|
11566
11570
|
var mkdirsSync = require_mkdirs().mkdirsSync;
|
|
11567
11571
|
var utimesMillisSync = require_utimes().utimesMillisSync;
|
|
11568
11572
|
var stat3 = require_stat();
|
|
@@ -11585,7 +11589,7 @@ var require_copy_sync = __commonJS({
|
|
|
11585
11589
|
__name(copySync, "copySync");
|
|
11586
11590
|
function handleFilterAndCopy(destStat, src, dest, opts) {
|
|
11587
11591
|
if (opts.filter && !opts.filter(src, dest)) return;
|
|
11588
|
-
const destParent =
|
|
11592
|
+
const destParent = path35.dirname(dest);
|
|
11589
11593
|
if (!fs36.existsSync(destParent)) mkdirsSync(destParent);
|
|
11590
11594
|
return startCopy(destStat, src, dest, opts);
|
|
11591
11595
|
}
|
|
@@ -11664,8 +11668,8 @@ var require_copy_sync = __commonJS({
|
|
|
11664
11668
|
}
|
|
11665
11669
|
__name(copyDir, "copyDir");
|
|
11666
11670
|
function copyDirItem(item, src, dest, opts) {
|
|
11667
|
-
const srcItem =
|
|
11668
|
-
const destItem =
|
|
11671
|
+
const srcItem = path35.join(src, item);
|
|
11672
|
+
const destItem = path35.join(dest, item);
|
|
11669
11673
|
const { destStat } = stat3.checkPathsSync(srcItem, destItem, "copy");
|
|
11670
11674
|
return startCopy(destStat, srcItem, destItem, opts);
|
|
11671
11675
|
}
|
|
@@ -11673,7 +11677,7 @@ var require_copy_sync = __commonJS({
|
|
|
11673
11677
|
function onLink(destStat, src, dest, opts) {
|
|
11674
11678
|
let resolvedSrc = fs36.readlinkSync(src);
|
|
11675
11679
|
if (opts.dereference) {
|
|
11676
|
-
resolvedSrc =
|
|
11680
|
+
resolvedSrc = path35.resolve(process.cwd(), resolvedSrc);
|
|
11677
11681
|
}
|
|
11678
11682
|
if (!destStat) {
|
|
11679
11683
|
return fs36.symlinkSync(resolvedSrc, dest);
|
|
@@ -11686,7 +11690,7 @@ var require_copy_sync = __commonJS({
|
|
|
11686
11690
|
throw err;
|
|
11687
11691
|
}
|
|
11688
11692
|
if (opts.dereference) {
|
|
11689
|
-
resolvedDest =
|
|
11693
|
+
resolvedDest = path35.resolve(process.cwd(), resolvedDest);
|
|
11690
11694
|
}
|
|
11691
11695
|
if (stat3.isSrcSubdir(resolvedSrc, resolvedDest)) {
|
|
11692
11696
|
throw new Error(`Cannot copy '${resolvedSrc}' to a subdirectory of itself, '${resolvedDest}'.`);
|
|
@@ -11723,8 +11727,8 @@ var require_path_exists = __commonJS({
|
|
|
11723
11727
|
"use strict";
|
|
11724
11728
|
var u4 = require_universalify().fromPromise;
|
|
11725
11729
|
var fs36 = require_fs();
|
|
11726
|
-
function pathExists3(
|
|
11727
|
-
return fs36.access(
|
|
11730
|
+
function pathExists3(path35) {
|
|
11731
|
+
return fs36.access(path35).then(() => true).catch(() => false);
|
|
11728
11732
|
}
|
|
11729
11733
|
__name(pathExists3, "pathExists");
|
|
11730
11734
|
module2.exports = {
|
|
@@ -11739,7 +11743,7 @@ var require_copy = __commonJS({
|
|
|
11739
11743
|
"node_modules/fs-extra/lib/copy/copy.js"(exports2, module2) {
|
|
11740
11744
|
"use strict";
|
|
11741
11745
|
var fs36 = require_graceful_fs();
|
|
11742
|
-
var
|
|
11746
|
+
var path35 = require("path");
|
|
11743
11747
|
var mkdirs = require_mkdirs().mkdirs;
|
|
11744
11748
|
var pathExists3 = require_path_exists().pathExists;
|
|
11745
11749
|
var utimesMillis = require_utimes().utimesMillis;
|
|
@@ -11773,7 +11777,7 @@ var require_copy = __commonJS({
|
|
|
11773
11777
|
}
|
|
11774
11778
|
__name(copy, "copy");
|
|
11775
11779
|
function checkParentDir(destStat, src, dest, opts, cb) {
|
|
11776
|
-
const destParent =
|
|
11780
|
+
const destParent = path35.dirname(dest);
|
|
11777
11781
|
pathExists3(destParent, (err, dirExists) => {
|
|
11778
11782
|
if (err) return cb(err);
|
|
11779
11783
|
if (dirExists) return startCopy(destStat, src, dest, opts, cb);
|
|
@@ -11898,8 +11902,8 @@ var require_copy = __commonJS({
|
|
|
11898
11902
|
}
|
|
11899
11903
|
__name(copyDirItems, "copyDirItems");
|
|
11900
11904
|
function copyDirItem(items, item, src, dest, opts, cb) {
|
|
11901
|
-
const srcItem =
|
|
11902
|
-
const destItem =
|
|
11905
|
+
const srcItem = path35.join(src, item);
|
|
11906
|
+
const destItem = path35.join(dest, item);
|
|
11903
11907
|
stat3.checkPaths(srcItem, destItem, "copy", (err, stats) => {
|
|
11904
11908
|
if (err) return cb(err);
|
|
11905
11909
|
const { destStat } = stats;
|
|
@@ -11914,7 +11918,7 @@ var require_copy = __commonJS({
|
|
|
11914
11918
|
fs36.readlink(src, (err, resolvedSrc) => {
|
|
11915
11919
|
if (err) return cb(err);
|
|
11916
11920
|
if (opts.dereference) {
|
|
11917
|
-
resolvedSrc =
|
|
11921
|
+
resolvedSrc = path35.resolve(process.cwd(), resolvedSrc);
|
|
11918
11922
|
}
|
|
11919
11923
|
if (!destStat) {
|
|
11920
11924
|
return fs36.symlink(resolvedSrc, dest, cb);
|
|
@@ -11925,7 +11929,7 @@ var require_copy = __commonJS({
|
|
|
11925
11929
|
return cb(err2);
|
|
11926
11930
|
}
|
|
11927
11931
|
if (opts.dereference) {
|
|
11928
|
-
resolvedDest =
|
|
11932
|
+
resolvedDest = path35.resolve(process.cwd(), resolvedDest);
|
|
11929
11933
|
}
|
|
11930
11934
|
if (stat3.isSrcSubdir(resolvedSrc, resolvedDest)) {
|
|
11931
11935
|
return cb(new Error(`Cannot copy '${resolvedSrc}' to a subdirectory of itself, '${resolvedDest}'.`));
|
|
@@ -11966,7 +11970,7 @@ var require_rimraf = __commonJS({
|
|
|
11966
11970
|
"node_modules/fs-extra/lib/remove/rimraf.js"(exports2, module2) {
|
|
11967
11971
|
"use strict";
|
|
11968
11972
|
var fs36 = require_graceful_fs();
|
|
11969
|
-
var
|
|
11973
|
+
var path35 = require("path");
|
|
11970
11974
|
var assert = require("assert");
|
|
11971
11975
|
var isWindows = process.platform === "win32";
|
|
11972
11976
|
function defaults3(options) {
|
|
@@ -12117,7 +12121,7 @@ var require_rimraf = __commonJS({
|
|
|
12117
12121
|
let errState;
|
|
12118
12122
|
if (n4 === 0) return options.rmdir(p4, cb);
|
|
12119
12123
|
files.forEach((f4) => {
|
|
12120
|
-
rimraf(
|
|
12124
|
+
rimraf(path35.join(p4, f4), options, (er2) => {
|
|
12121
12125
|
if (errState) {
|
|
12122
12126
|
return;
|
|
12123
12127
|
}
|
|
@@ -12185,7 +12189,7 @@ var require_rimraf = __commonJS({
|
|
|
12185
12189
|
function rmkidsSync(p4, options) {
|
|
12186
12190
|
assert(p4);
|
|
12187
12191
|
assert(options);
|
|
12188
|
-
options.readdirSync(p4).forEach((f4) => rimrafSync(
|
|
12192
|
+
options.readdirSync(p4).forEach((f4) => rimrafSync(path35.join(p4, f4), options));
|
|
12189
12193
|
if (isWindows) {
|
|
12190
12194
|
const startTime = Date.now();
|
|
12191
12195
|
do {
|
|
@@ -12225,7 +12229,7 @@ var require_empty = __commonJS({
|
|
|
12225
12229
|
"use strict";
|
|
12226
12230
|
var u4 = require_universalify().fromCallback;
|
|
12227
12231
|
var fs36 = require_graceful_fs();
|
|
12228
|
-
var
|
|
12232
|
+
var path35 = require("path");
|
|
12229
12233
|
var mkdir = require_mkdirs();
|
|
12230
12234
|
var remove = require_remove();
|
|
12231
12235
|
var emptyDir = u4(/* @__PURE__ */ __name(function emptyDir2(dir, callback) {
|
|
@@ -12233,7 +12237,7 @@ var require_empty = __commonJS({
|
|
|
12233
12237
|
};
|
|
12234
12238
|
fs36.readdir(dir, (err, items) => {
|
|
12235
12239
|
if (err) return mkdir.mkdirs(dir, callback);
|
|
12236
|
-
items = items.map((item) =>
|
|
12240
|
+
items = items.map((item) => path35.join(dir, item));
|
|
12237
12241
|
deleteItem();
|
|
12238
12242
|
function deleteItem() {
|
|
12239
12243
|
const item = items.pop();
|
|
@@ -12254,7 +12258,7 @@ var require_empty = __commonJS({
|
|
|
12254
12258
|
return mkdir.mkdirsSync(dir);
|
|
12255
12259
|
}
|
|
12256
12260
|
items.forEach((item) => {
|
|
12257
|
-
item =
|
|
12261
|
+
item = path35.join(dir, item);
|
|
12258
12262
|
remove.removeSync(item);
|
|
12259
12263
|
});
|
|
12260
12264
|
}
|
|
@@ -12273,7 +12277,7 @@ var require_file = __commonJS({
|
|
|
12273
12277
|
"node_modules/fs-extra/lib/ensure/file.js"(exports2, module2) {
|
|
12274
12278
|
"use strict";
|
|
12275
12279
|
var u4 = require_universalify().fromCallback;
|
|
12276
|
-
var
|
|
12280
|
+
var path35 = require("path");
|
|
12277
12281
|
var fs36 = require_graceful_fs();
|
|
12278
12282
|
var mkdir = require_mkdirs();
|
|
12279
12283
|
function createFile(file, callback) {
|
|
@@ -12286,7 +12290,7 @@ var require_file = __commonJS({
|
|
|
12286
12290
|
__name(makeFile, "makeFile");
|
|
12287
12291
|
fs36.stat(file, (err, stats) => {
|
|
12288
12292
|
if (!err && stats.isFile()) return callback();
|
|
12289
|
-
const dir =
|
|
12293
|
+
const dir = path35.dirname(file);
|
|
12290
12294
|
fs36.stat(dir, (err2, stats2) => {
|
|
12291
12295
|
if (err2) {
|
|
12292
12296
|
if (err2.code === "ENOENT") {
|
|
@@ -12314,7 +12318,7 @@ var require_file = __commonJS({
|
|
|
12314
12318
|
} catch {
|
|
12315
12319
|
}
|
|
12316
12320
|
if (stats && stats.isFile()) return;
|
|
12317
|
-
const dir =
|
|
12321
|
+
const dir = path35.dirname(file);
|
|
12318
12322
|
try {
|
|
12319
12323
|
if (!fs36.statSync(dir).isDirectory()) {
|
|
12320
12324
|
fs36.readdirSync(dir);
|
|
@@ -12338,7 +12342,7 @@ var require_link = __commonJS({
|
|
|
12338
12342
|
"node_modules/fs-extra/lib/ensure/link.js"(exports2, module2) {
|
|
12339
12343
|
"use strict";
|
|
12340
12344
|
var u4 = require_universalify().fromCallback;
|
|
12341
|
-
var
|
|
12345
|
+
var path35 = require("path");
|
|
12342
12346
|
var fs36 = require_graceful_fs();
|
|
12343
12347
|
var mkdir = require_mkdirs();
|
|
12344
12348
|
var pathExists3 = require_path_exists().pathExists;
|
|
@@ -12358,7 +12362,7 @@ var require_link = __commonJS({
|
|
|
12358
12362
|
err2.message = err2.message.replace("lstat", "ensureLink");
|
|
12359
12363
|
return callback(err2);
|
|
12360
12364
|
}
|
|
12361
|
-
const dir =
|
|
12365
|
+
const dir = path35.dirname(dstpath);
|
|
12362
12366
|
pathExists3(dir, (err3, dirExists) => {
|
|
12363
12367
|
if (err3) return callback(err3);
|
|
12364
12368
|
if (dirExists) return makeLink(srcpath, dstpath);
|
|
@@ -12380,7 +12384,7 @@ var require_link = __commonJS({
|
|
|
12380
12384
|
err.message = err.message.replace("lstat", "ensureLink");
|
|
12381
12385
|
throw err;
|
|
12382
12386
|
}
|
|
12383
|
-
const dir =
|
|
12387
|
+
const dir = path35.dirname(dstpath);
|
|
12384
12388
|
const dirExists = fs36.existsSync(dir);
|
|
12385
12389
|
if (dirExists) return fs36.linkSync(srcpath, dstpath);
|
|
12386
12390
|
mkdir.mkdirsSync(dir);
|
|
@@ -12398,11 +12402,11 @@ var require_link = __commonJS({
|
|
|
12398
12402
|
var require_symlink_paths = __commonJS({
|
|
12399
12403
|
"node_modules/fs-extra/lib/ensure/symlink-paths.js"(exports2, module2) {
|
|
12400
12404
|
"use strict";
|
|
12401
|
-
var
|
|
12405
|
+
var path35 = require("path");
|
|
12402
12406
|
var fs36 = require_graceful_fs();
|
|
12403
12407
|
var pathExists3 = require_path_exists().pathExists;
|
|
12404
12408
|
function symlinkPaths(srcpath, dstpath, callback) {
|
|
12405
|
-
if (
|
|
12409
|
+
if (path35.isAbsolute(srcpath)) {
|
|
12406
12410
|
return fs36.lstat(srcpath, (err) => {
|
|
12407
12411
|
if (err) {
|
|
12408
12412
|
err.message = err.message.replace("lstat", "ensureSymlink");
|
|
@@ -12414,8 +12418,8 @@ var require_symlink_paths = __commonJS({
|
|
|
12414
12418
|
});
|
|
12415
12419
|
});
|
|
12416
12420
|
} else {
|
|
12417
|
-
const dstdir =
|
|
12418
|
-
const relativeToDst =
|
|
12421
|
+
const dstdir = path35.dirname(dstpath);
|
|
12422
|
+
const relativeToDst = path35.join(dstdir, srcpath);
|
|
12419
12423
|
return pathExists3(relativeToDst, (err, exists) => {
|
|
12420
12424
|
if (err) return callback(err);
|
|
12421
12425
|
if (exists) {
|
|
@@ -12431,7 +12435,7 @@ var require_symlink_paths = __commonJS({
|
|
|
12431
12435
|
}
|
|
12432
12436
|
return callback(null, {
|
|
12433
12437
|
toCwd: srcpath,
|
|
12434
|
-
toDst:
|
|
12438
|
+
toDst: path35.relative(dstdir, srcpath)
|
|
12435
12439
|
});
|
|
12436
12440
|
});
|
|
12437
12441
|
}
|
|
@@ -12441,7 +12445,7 @@ var require_symlink_paths = __commonJS({
|
|
|
12441
12445
|
__name(symlinkPaths, "symlinkPaths");
|
|
12442
12446
|
function symlinkPathsSync(srcpath, dstpath) {
|
|
12443
12447
|
let exists;
|
|
12444
|
-
if (
|
|
12448
|
+
if (path35.isAbsolute(srcpath)) {
|
|
12445
12449
|
exists = fs36.existsSync(srcpath);
|
|
12446
12450
|
if (!exists) throw new Error("absolute srcpath does not exist");
|
|
12447
12451
|
return {
|
|
@@ -12449,8 +12453,8 @@ var require_symlink_paths = __commonJS({
|
|
|
12449
12453
|
toDst: srcpath
|
|
12450
12454
|
};
|
|
12451
12455
|
} else {
|
|
12452
|
-
const dstdir =
|
|
12453
|
-
const relativeToDst =
|
|
12456
|
+
const dstdir = path35.dirname(dstpath);
|
|
12457
|
+
const relativeToDst = path35.join(dstdir, srcpath);
|
|
12454
12458
|
exists = fs36.existsSync(relativeToDst);
|
|
12455
12459
|
if (exists) {
|
|
12456
12460
|
return {
|
|
@@ -12462,7 +12466,7 @@ var require_symlink_paths = __commonJS({
|
|
|
12462
12466
|
if (!exists) throw new Error("relative srcpath does not exist");
|
|
12463
12467
|
return {
|
|
12464
12468
|
toCwd: srcpath,
|
|
12465
|
-
toDst:
|
|
12469
|
+
toDst: path35.relative(dstdir, srcpath)
|
|
12466
12470
|
};
|
|
12467
12471
|
}
|
|
12468
12472
|
}
|
|
@@ -12514,7 +12518,7 @@ var require_symlink = __commonJS({
|
|
|
12514
12518
|
"node_modules/fs-extra/lib/ensure/symlink.js"(exports2, module2) {
|
|
12515
12519
|
"use strict";
|
|
12516
12520
|
var u4 = require_universalify().fromCallback;
|
|
12517
|
-
var
|
|
12521
|
+
var path35 = require("path");
|
|
12518
12522
|
var fs36 = require_graceful_fs();
|
|
12519
12523
|
var _mkdirs = require_mkdirs();
|
|
12520
12524
|
var mkdirs = _mkdirs.mkdirs;
|
|
@@ -12537,7 +12541,7 @@ var require_symlink = __commonJS({
|
|
|
12537
12541
|
srcpath = relative6.toDst;
|
|
12538
12542
|
symlinkType(relative6.toCwd, type, (err3, type2) => {
|
|
12539
12543
|
if (err3) return callback(err3);
|
|
12540
|
-
const dir =
|
|
12544
|
+
const dir = path35.dirname(dstpath);
|
|
12541
12545
|
pathExists3(dir, (err4, dirExists) => {
|
|
12542
12546
|
if (err4) return callback(err4);
|
|
12543
12547
|
if (dirExists) return fs36.symlink(srcpath, dstpath, type2, callback);
|
|
@@ -12557,7 +12561,7 @@ var require_symlink = __commonJS({
|
|
|
12557
12561
|
const relative6 = symlinkPathsSync(srcpath, dstpath);
|
|
12558
12562
|
srcpath = relative6.toDst;
|
|
12559
12563
|
type = symlinkTypeSync(relative6.toCwd, type);
|
|
12560
|
-
const dir =
|
|
12564
|
+
const dir = path35.dirname(dstpath);
|
|
12561
12565
|
const exists = fs36.existsSync(dir);
|
|
12562
12566
|
if (exists) return fs36.symlinkSync(srcpath, dstpath, type);
|
|
12563
12567
|
mkdirsSync(dir);
|
|
@@ -12713,7 +12717,7 @@ var require_output = __commonJS({
|
|
|
12713
12717
|
"use strict";
|
|
12714
12718
|
var u4 = require_universalify().fromCallback;
|
|
12715
12719
|
var fs36 = require_graceful_fs();
|
|
12716
|
-
var
|
|
12720
|
+
var path35 = require("path");
|
|
12717
12721
|
var mkdir = require_mkdirs();
|
|
12718
12722
|
var pathExists3 = require_path_exists().pathExists;
|
|
12719
12723
|
function outputFile(file, data2, encoding, callback) {
|
|
@@ -12721,7 +12725,7 @@ var require_output = __commonJS({
|
|
|
12721
12725
|
callback = encoding;
|
|
12722
12726
|
encoding = "utf8";
|
|
12723
12727
|
}
|
|
12724
|
-
const dir =
|
|
12728
|
+
const dir = path35.dirname(file);
|
|
12725
12729
|
pathExists3(dir, (err, itDoes) => {
|
|
12726
12730
|
if (err) return callback(err);
|
|
12727
12731
|
if (itDoes) return fs36.writeFile(file, data2, encoding, callback);
|
|
@@ -12733,7 +12737,7 @@ var require_output = __commonJS({
|
|
|
12733
12737
|
}
|
|
12734
12738
|
__name(outputFile, "outputFile");
|
|
12735
12739
|
function outputFileSync(file, ...args) {
|
|
12736
|
-
const dir =
|
|
12740
|
+
const dir = path35.dirname(file);
|
|
12737
12741
|
if (fs36.existsSync(dir)) {
|
|
12738
12742
|
return fs36.writeFileSync(file, ...args);
|
|
12739
12743
|
}
|
|
@@ -12801,7 +12805,7 @@ var require_move_sync = __commonJS({
|
|
|
12801
12805
|
"node_modules/fs-extra/lib/move-sync/move-sync.js"(exports2, module2) {
|
|
12802
12806
|
"use strict";
|
|
12803
12807
|
var fs36 = require_graceful_fs();
|
|
12804
|
-
var
|
|
12808
|
+
var path35 = require("path");
|
|
12805
12809
|
var copySync = require_copy_sync2().copySync;
|
|
12806
12810
|
var removeSync2 = require_remove().removeSync;
|
|
12807
12811
|
var mkdirpSync2 = require_mkdirs().mkdirpSync;
|
|
@@ -12811,7 +12815,7 @@ var require_move_sync = __commonJS({
|
|
|
12811
12815
|
const overwrite = opts.overwrite || opts.clobber || false;
|
|
12812
12816
|
const { srcStat } = stat3.checkPathsSync(src, dest, "move");
|
|
12813
12817
|
stat3.checkParentPathsSync(src, srcStat, dest, "move");
|
|
12814
|
-
mkdirpSync2(
|
|
12818
|
+
mkdirpSync2(path35.dirname(dest));
|
|
12815
12819
|
return doRename(src, dest, overwrite);
|
|
12816
12820
|
}
|
|
12817
12821
|
__name(moveSync, "moveSync");
|
|
@@ -12861,7 +12865,7 @@ var require_move = __commonJS({
|
|
|
12861
12865
|
"node_modules/fs-extra/lib/move/move.js"(exports2, module2) {
|
|
12862
12866
|
"use strict";
|
|
12863
12867
|
var fs36 = require_graceful_fs();
|
|
12864
|
-
var
|
|
12868
|
+
var path35 = require("path");
|
|
12865
12869
|
var copy = require_copy2().copy;
|
|
12866
12870
|
var remove = require_remove().remove;
|
|
12867
12871
|
var mkdirp = require_mkdirs().mkdirp;
|
|
@@ -12878,7 +12882,7 @@ var require_move = __commonJS({
|
|
|
12878
12882
|
const { srcStat } = stats;
|
|
12879
12883
|
stat3.checkParentPaths(src, srcStat, dest, "move", (err2) => {
|
|
12880
12884
|
if (err2) return cb(err2);
|
|
12881
|
-
mkdirp(
|
|
12885
|
+
mkdirp(path35.dirname(dest), (err3) => {
|
|
12882
12886
|
if (err3) return cb(err3);
|
|
12883
12887
|
return doRename(src, dest, overwrite, cb);
|
|
12884
12888
|
});
|
|
@@ -13083,8 +13087,8 @@ var init_integ_test_suite = __esm({
|
|
|
13083
13087
|
/**
|
|
13084
13088
|
* Loads integ tests from a snapshot directory
|
|
13085
13089
|
*/
|
|
13086
|
-
static fromPath(
|
|
13087
|
-
const reader = IntegManifestReader.fromPath(
|
|
13090
|
+
static fromPath(path35) {
|
|
13091
|
+
const reader = IntegManifestReader.fromPath(path35);
|
|
13088
13092
|
return new _IntegTestSuite(
|
|
13089
13093
|
reader.tests.enableLookups,
|
|
13090
13094
|
reader.tests.testCases,
|
|
@@ -14828,15 +14832,15 @@ var require_route = __commonJS({
|
|
|
14828
14832
|
}
|
|
14829
14833
|
__name(link, "link");
|
|
14830
14834
|
function wrapConversion(toModel, graph) {
|
|
14831
|
-
const
|
|
14835
|
+
const path35 = [graph[toModel].parent, toModel];
|
|
14832
14836
|
let fn = conversions[graph[toModel].parent][toModel];
|
|
14833
14837
|
let cur = graph[toModel].parent;
|
|
14834
14838
|
while (graph[cur].parent) {
|
|
14835
|
-
|
|
14839
|
+
path35.unshift(graph[cur].parent);
|
|
14836
14840
|
fn = link(conversions[graph[cur].parent][cur], fn);
|
|
14837
14841
|
cur = graph[cur].parent;
|
|
14838
14842
|
}
|
|
14839
|
-
fn.conversion =
|
|
14843
|
+
fn.conversion = path35;
|
|
14840
14844
|
return fn;
|
|
14841
14845
|
}
|
|
14842
14846
|
__name(wrapConversion, "wrapConversion");
|
|
@@ -15524,7 +15528,7 @@ var require_source = __commonJS({
|
|
|
15524
15528
|
var require_constants2 = __commonJS({
|
|
15525
15529
|
"../../../node_modules/picomatch/lib/constants.js"(exports2, module2) {
|
|
15526
15530
|
"use strict";
|
|
15527
|
-
var
|
|
15531
|
+
var path35 = require("path");
|
|
15528
15532
|
var WIN_SLASH = "\\\\/";
|
|
15529
15533
|
var WIN_NO_SLASH = `[^${WIN_SLASH}]`;
|
|
15530
15534
|
var DOT_LITERAL = "\\.";
|
|
@@ -15694,7 +15698,7 @@ var require_constants2 = __commonJS({
|
|
|
15694
15698
|
/* | */
|
|
15695
15699
|
CHAR_ZERO_WIDTH_NOBREAK_SPACE: 65279,
|
|
15696
15700
|
/* \uFEFF */
|
|
15697
|
-
SEP:
|
|
15701
|
+
SEP: path35.sep,
|
|
15698
15702
|
/**
|
|
15699
15703
|
* Create EXTGLOB_CHARS
|
|
15700
15704
|
*/
|
|
@@ -15721,7 +15725,7 @@ var require_constants2 = __commonJS({
|
|
|
15721
15725
|
var require_utils2 = __commonJS({
|
|
15722
15726
|
"../../../node_modules/picomatch/lib/utils.js"(exports2) {
|
|
15723
15727
|
"use strict";
|
|
15724
|
-
var
|
|
15728
|
+
var path35 = require("path");
|
|
15725
15729
|
var win322 = process.platform === "win32";
|
|
15726
15730
|
var {
|
|
15727
15731
|
REGEX_BACKSLASH,
|
|
@@ -15750,7 +15754,7 @@ var require_utils2 = __commonJS({
|
|
|
15750
15754
|
if (options && typeof options.windows === "boolean") {
|
|
15751
15755
|
return options.windows;
|
|
15752
15756
|
}
|
|
15753
|
-
return win322 === true ||
|
|
15757
|
+
return win322 === true || path35.sep === "\\";
|
|
15754
15758
|
};
|
|
15755
15759
|
exports2.escapeLast = (input, char, lastIdx) => {
|
|
15756
15760
|
const idx = input.lastIndexOf(char, lastIdx);
|
|
@@ -16885,7 +16889,7 @@ var require_parse2 = __commonJS({
|
|
|
16885
16889
|
var require_picomatch = __commonJS({
|
|
16886
16890
|
"../../../node_modules/picomatch/lib/picomatch.js"(exports2, module2) {
|
|
16887
16891
|
"use strict";
|
|
16888
|
-
var
|
|
16892
|
+
var path35 = require("path");
|
|
16889
16893
|
var scan = require_scan2();
|
|
16890
16894
|
var parse3 = require_parse2();
|
|
16891
16895
|
var utils = require_utils2();
|
|
@@ -16970,7 +16974,7 @@ var require_picomatch = __commonJS({
|
|
|
16970
16974
|
};
|
|
16971
16975
|
picomatch.matchBase = (input, glob2, options, posix2 = utils.isWindows(options)) => {
|
|
16972
16976
|
const regex = glob2 instanceof RegExp ? glob2 : picomatch.makeRe(glob2, options);
|
|
16973
|
-
return regex.test(
|
|
16977
|
+
return regex.test(path35.basename(input));
|
|
16974
16978
|
};
|
|
16975
16979
|
picomatch.isMatch = (str, patterns, options) => picomatch(patterns, options)(str);
|
|
16976
16980
|
picomatch.parse = (pattern, options) => {
|
|
@@ -17089,8 +17093,8 @@ var require_readdirp = __commonJS({
|
|
|
17089
17093
|
return {
|
|
17090
17094
|
root: ".",
|
|
17091
17095
|
/* eslint-disable no-unused-vars */
|
|
17092
|
-
fileFilter: /* @__PURE__ */ __name((
|
|
17093
|
-
directoryFilter: /* @__PURE__ */ __name((
|
|
17096
|
+
fileFilter: /* @__PURE__ */ __name((path35) => true, "fileFilter"),
|
|
17097
|
+
directoryFilter: /* @__PURE__ */ __name((path35) => true, "directoryFilter"),
|
|
17094
17098
|
/* eslint-enable no-unused-vars */
|
|
17095
17099
|
type: FILE_TYPE,
|
|
17096
17100
|
lstat: false,
|
|
@@ -17110,7 +17114,7 @@ var require_readdirp = __commonJS({
|
|
|
17110
17114
|
this._directoryFilter = normalizeFilter(opts.directoryFilter);
|
|
17111
17115
|
const statMethod = opts.lstat ? lstat2 : stat3;
|
|
17112
17116
|
if (wantBigintFsStats) {
|
|
17113
|
-
this._stat = (
|
|
17117
|
+
this._stat = (path35) => statMethod(path35, { bigint: true });
|
|
17114
17118
|
} else {
|
|
17115
17119
|
this._stat = statMethod;
|
|
17116
17120
|
}
|
|
@@ -17131,9 +17135,9 @@ var require_readdirp = __commonJS({
|
|
|
17131
17135
|
this.reading = true;
|
|
17132
17136
|
try {
|
|
17133
17137
|
while (!this.destroyed && batch > 0) {
|
|
17134
|
-
const { path:
|
|
17138
|
+
const { path: path35, depth, files = [] } = this.parent || {};
|
|
17135
17139
|
if (files.length > 0) {
|
|
17136
|
-
const slice = files.splice(0, batch).map((dirent) => this._formatEntry(dirent,
|
|
17140
|
+
const slice = files.splice(0, batch).map((dirent) => this._formatEntry(dirent, path35));
|
|
17137
17141
|
for (const entry of await Promise.all(slice)) {
|
|
17138
17142
|
if (this.destroyed) return;
|
|
17139
17143
|
const entryType = await this._getEntryType(entry);
|
|
@@ -17168,20 +17172,20 @@ var require_readdirp = __commonJS({
|
|
|
17168
17172
|
this.reading = false;
|
|
17169
17173
|
}
|
|
17170
17174
|
}
|
|
17171
|
-
async _exploreDir(
|
|
17175
|
+
async _exploreDir(path35, depth) {
|
|
17172
17176
|
let files;
|
|
17173
17177
|
try {
|
|
17174
|
-
files = await readdir3(
|
|
17178
|
+
files = await readdir3(path35, this._rdOptions);
|
|
17175
17179
|
} catch (error4) {
|
|
17176
17180
|
this._onError(error4);
|
|
17177
17181
|
}
|
|
17178
|
-
return { files, depth, path:
|
|
17182
|
+
return { files, depth, path: path35 };
|
|
17179
17183
|
}
|
|
17180
|
-
async _formatEntry(dirent,
|
|
17184
|
+
async _formatEntry(dirent, path35) {
|
|
17181
17185
|
let entry;
|
|
17182
17186
|
try {
|
|
17183
17187
|
const basename3 = this._isDirent ? dirent.name : dirent;
|
|
17184
|
-
const fullPath = sysPath.resolve(sysPath.join(
|
|
17188
|
+
const fullPath = sysPath.resolve(sysPath.join(path35, basename3));
|
|
17185
17189
|
entry = { path: sysPath.relative(this._root, fullPath), fullPath, basename: basename3 };
|
|
17186
17190
|
entry[this._statsProp] = this._isDirent ? dirent : await this._stat(fullPath);
|
|
17187
17191
|
} catch (err) {
|
|
@@ -17266,22 +17270,22 @@ var require_readdirp = __commonJS({
|
|
|
17266
17270
|
// ../../../node_modules/normalize-path/index.js
|
|
17267
17271
|
var require_normalize_path = __commonJS({
|
|
17268
17272
|
"../../../node_modules/normalize-path/index.js"(exports2, module2) {
|
|
17269
|
-
module2.exports = function(
|
|
17270
|
-
if (typeof
|
|
17273
|
+
module2.exports = function(path35, stripTrailing) {
|
|
17274
|
+
if (typeof path35 !== "string") {
|
|
17271
17275
|
throw new TypeError("expected path to be a string");
|
|
17272
17276
|
}
|
|
17273
|
-
if (
|
|
17274
|
-
var len =
|
|
17275
|
-
if (len <= 1) return
|
|
17277
|
+
if (path35 === "\\" || path35 === "/") return "/";
|
|
17278
|
+
var len = path35.length;
|
|
17279
|
+
if (len <= 1) return path35;
|
|
17276
17280
|
var prefix = "";
|
|
17277
|
-
if (len > 4 &&
|
|
17278
|
-
var ch =
|
|
17279
|
-
if ((ch === "?" || ch === ".") &&
|
|
17280
|
-
|
|
17281
|
+
if (len > 4 && path35[3] === "\\") {
|
|
17282
|
+
var ch = path35[2];
|
|
17283
|
+
if ((ch === "?" || ch === ".") && path35.slice(0, 2) === "\\\\") {
|
|
17284
|
+
path35 = path35.slice(2);
|
|
17281
17285
|
prefix = "//";
|
|
17282
17286
|
}
|
|
17283
17287
|
}
|
|
17284
|
-
var segs =
|
|
17288
|
+
var segs = path35.split(/[/\\]+/);
|
|
17285
17289
|
if (stripTrailing !== false && segs[segs.length - 1] === "") {
|
|
17286
17290
|
segs.pop();
|
|
17287
17291
|
}
|
|
@@ -17319,17 +17323,17 @@ var require_anymatch = __commonJS({
|
|
|
17319
17323
|
if (!isList && typeof _path !== "string") {
|
|
17320
17324
|
throw new TypeError("anymatch: second argument must be a string: got " + Object.prototype.toString.call(_path));
|
|
17321
17325
|
}
|
|
17322
|
-
const
|
|
17326
|
+
const path35 = normalizePath(_path, false);
|
|
17323
17327
|
for (let index = 0; index < negPatterns.length; index++) {
|
|
17324
17328
|
const nglob = negPatterns[index];
|
|
17325
|
-
if (nglob(
|
|
17329
|
+
if (nglob(path35)) {
|
|
17326
17330
|
return returnIndex ? -1 : false;
|
|
17327
17331
|
}
|
|
17328
17332
|
}
|
|
17329
|
-
const applied = isList && [
|
|
17333
|
+
const applied = isList && [path35].concat(args.slice(1));
|
|
17330
17334
|
for (let index = 0; index < patterns.length; index++) {
|
|
17331
17335
|
const pattern = patterns[index];
|
|
17332
|
-
if (isList ? pattern(...applied) : pattern(
|
|
17336
|
+
if (isList ? pattern(...applied) : pattern(path35)) {
|
|
17333
17337
|
return returnIndex ? index : true;
|
|
17334
17338
|
}
|
|
17335
17339
|
}
|
|
@@ -18910,10 +18914,10 @@ var require_binary_extensions2 = __commonJS({
|
|
|
18910
18914
|
var require_is_binary_path = __commonJS({
|
|
18911
18915
|
"../../../node_modules/is-binary-path/index.js"(exports2, module2) {
|
|
18912
18916
|
"use strict";
|
|
18913
|
-
var
|
|
18917
|
+
var path35 = require("path");
|
|
18914
18918
|
var binaryExtensions = require_binary_extensions2();
|
|
18915
18919
|
var extensions = new Set(binaryExtensions);
|
|
18916
|
-
module2.exports = (filePath) => extensions.has(
|
|
18920
|
+
module2.exports = (filePath) => extensions.has(path35.extname(filePath).slice(1).toLowerCase());
|
|
18917
18921
|
}
|
|
18918
18922
|
});
|
|
18919
18923
|
|
|
@@ -19046,20 +19050,20 @@ var require_nodefs_handler = __commonJS({
|
|
|
19046
19050
|
}, "delFromSet");
|
|
19047
19051
|
var isEmptySet = /* @__PURE__ */ __name((val) => val instanceof Set ? val.size === 0 : !val, "isEmptySet");
|
|
19048
19052
|
var FsWatchInstances = /* @__PURE__ */ new Map();
|
|
19049
|
-
function createFsWatchInstance(
|
|
19053
|
+
function createFsWatchInstance(path35, options, listener, errHandler, emitRaw) {
|
|
19050
19054
|
const handleEvent = /* @__PURE__ */ __name((rawEvent, evPath) => {
|
|
19051
|
-
listener(
|
|
19052
|
-
emitRaw(rawEvent, evPath, { watchedPath:
|
|
19053
|
-
if (evPath &&
|
|
19055
|
+
listener(path35);
|
|
19056
|
+
emitRaw(rawEvent, evPath, { watchedPath: path35 });
|
|
19057
|
+
if (evPath && path35 !== evPath) {
|
|
19054
19058
|
fsWatchBroadcast(
|
|
19055
|
-
sysPath.resolve(
|
|
19059
|
+
sysPath.resolve(path35, evPath),
|
|
19056
19060
|
KEY_LISTENERS,
|
|
19057
|
-
sysPath.join(
|
|
19061
|
+
sysPath.join(path35, evPath)
|
|
19058
19062
|
);
|
|
19059
19063
|
}
|
|
19060
19064
|
}, "handleEvent");
|
|
19061
19065
|
try {
|
|
19062
|
-
return fs36.watch(
|
|
19066
|
+
return fs36.watch(path35, options, handleEvent);
|
|
19063
19067
|
} catch (error4) {
|
|
19064
19068
|
errHandler(error4);
|
|
19065
19069
|
}
|
|
@@ -19072,13 +19076,13 @@ var require_nodefs_handler = __commonJS({
|
|
|
19072
19076
|
listener(val1, val2, val3);
|
|
19073
19077
|
});
|
|
19074
19078
|
}, "fsWatchBroadcast");
|
|
19075
|
-
var setFsWatchListener = /* @__PURE__ */ __name((
|
|
19079
|
+
var setFsWatchListener = /* @__PURE__ */ __name((path35, fullPath, options, handlers) => {
|
|
19076
19080
|
const { listener, errHandler, rawEmitter } = handlers;
|
|
19077
19081
|
let cont = FsWatchInstances.get(fullPath);
|
|
19078
19082
|
let watcher;
|
|
19079
19083
|
if (!options.persistent) {
|
|
19080
19084
|
watcher = createFsWatchInstance(
|
|
19081
|
-
|
|
19085
|
+
path35,
|
|
19082
19086
|
options,
|
|
19083
19087
|
listener,
|
|
19084
19088
|
errHandler,
|
|
@@ -19092,7 +19096,7 @@ var require_nodefs_handler = __commonJS({
|
|
|
19092
19096
|
addAndConvert(cont, KEY_RAW, rawEmitter);
|
|
19093
19097
|
} else {
|
|
19094
19098
|
watcher = createFsWatchInstance(
|
|
19095
|
-
|
|
19099
|
+
path35,
|
|
19096
19100
|
options,
|
|
19097
19101
|
fsWatchBroadcast.bind(null, fullPath, KEY_LISTENERS),
|
|
19098
19102
|
errHandler,
|
|
@@ -19105,7 +19109,7 @@ var require_nodefs_handler = __commonJS({
|
|
|
19105
19109
|
cont.watcherUnusable = true;
|
|
19106
19110
|
if (isWindows && error4.code === "EPERM") {
|
|
19107
19111
|
try {
|
|
19108
|
-
const fd = await open(
|
|
19112
|
+
const fd = await open(path35, "r");
|
|
19109
19113
|
await close(fd);
|
|
19110
19114
|
broadcastErr(error4);
|
|
19111
19115
|
} catch (err) {
|
|
@@ -19136,7 +19140,7 @@ var require_nodefs_handler = __commonJS({
|
|
|
19136
19140
|
};
|
|
19137
19141
|
}, "setFsWatchListener");
|
|
19138
19142
|
var FsWatchFileInstances = /* @__PURE__ */ new Map();
|
|
19139
|
-
var setFsWatchFileListener = /* @__PURE__ */ __name((
|
|
19143
|
+
var setFsWatchFileListener = /* @__PURE__ */ __name((path35, fullPath, options, handlers) => {
|
|
19140
19144
|
const { listener, rawEmitter } = handlers;
|
|
19141
19145
|
let cont = FsWatchFileInstances.get(fullPath);
|
|
19142
19146
|
let listeners = /* @__PURE__ */ new Set();
|
|
@@ -19162,7 +19166,7 @@ var require_nodefs_handler = __commonJS({
|
|
|
19162
19166
|
});
|
|
19163
19167
|
const currmtime = curr.mtimeMs;
|
|
19164
19168
|
if (curr.size !== prev.size || currmtime > prev.mtimeMs || currmtime === 0) {
|
|
19165
|
-
foreach(cont.listeners, (listener2) => listener2(
|
|
19169
|
+
foreach(cont.listeners, (listener2) => listener2(path35, curr));
|
|
19166
19170
|
}
|
|
19167
19171
|
})
|
|
19168
19172
|
};
|
|
@@ -19196,24 +19200,24 @@ var require_nodefs_handler = __commonJS({
|
|
|
19196
19200
|
* @param {Function} listener on fs change
|
|
19197
19201
|
* @returns {Function} closer for the watcher instance
|
|
19198
19202
|
*/
|
|
19199
|
-
_watchWithNodeFs(
|
|
19203
|
+
_watchWithNodeFs(path35, listener) {
|
|
19200
19204
|
const opts = this.fsw.options;
|
|
19201
|
-
const directory = sysPath.dirname(
|
|
19202
|
-
const basename3 = sysPath.basename(
|
|
19205
|
+
const directory = sysPath.dirname(path35);
|
|
19206
|
+
const basename3 = sysPath.basename(path35);
|
|
19203
19207
|
const parent = this.fsw._getWatchedDir(directory);
|
|
19204
19208
|
parent.add(basename3);
|
|
19205
|
-
const absolutePath = sysPath.resolve(
|
|
19209
|
+
const absolutePath = sysPath.resolve(path35);
|
|
19206
19210
|
const options = { persistent: opts.persistent };
|
|
19207
19211
|
if (!listener) listener = EMPTY_FN;
|
|
19208
19212
|
let closer;
|
|
19209
19213
|
if (opts.usePolling) {
|
|
19210
19214
|
options.interval = opts.enableBinaryInterval && isBinaryPath(basename3) ? opts.binaryInterval : opts.interval;
|
|
19211
|
-
closer = setFsWatchFileListener(
|
|
19215
|
+
closer = setFsWatchFileListener(path35, absolutePath, options, {
|
|
19212
19216
|
listener,
|
|
19213
19217
|
rawEmitter: this.fsw._emitRaw
|
|
19214
19218
|
});
|
|
19215
19219
|
} else {
|
|
19216
|
-
closer = setFsWatchListener(
|
|
19220
|
+
closer = setFsWatchListener(path35, absolutePath, options, {
|
|
19217
19221
|
listener,
|
|
19218
19222
|
errHandler: this._boundHandleError,
|
|
19219
19223
|
rawEmitter: this.fsw._emitRaw
|
|
@@ -19237,7 +19241,7 @@ var require_nodefs_handler = __commonJS({
|
|
|
19237
19241
|
const parent = this.fsw._getWatchedDir(dirname8);
|
|
19238
19242
|
let prevStats = stats;
|
|
19239
19243
|
if (parent.has(basename3)) return;
|
|
19240
|
-
const listener = /* @__PURE__ */ __name(async (
|
|
19244
|
+
const listener = /* @__PURE__ */ __name(async (path35, newStats) => {
|
|
19241
19245
|
if (!this.fsw._throttle(THROTTLE_MODE_WATCH, file, 5)) return;
|
|
19242
19246
|
if (!newStats || newStats.mtimeMs === 0) {
|
|
19243
19247
|
try {
|
|
@@ -19249,9 +19253,9 @@ var require_nodefs_handler = __commonJS({
|
|
|
19249
19253
|
this.fsw._emit(EV_CHANGE, file, newStats2);
|
|
19250
19254
|
}
|
|
19251
19255
|
if (isLinux && prevStats.ino !== newStats2.ino) {
|
|
19252
|
-
this.fsw._closeFile(
|
|
19256
|
+
this.fsw._closeFile(path35);
|
|
19253
19257
|
prevStats = newStats2;
|
|
19254
|
-
this.fsw._addPathCloser(
|
|
19258
|
+
this.fsw._addPathCloser(path35, this._watchWithNodeFs(file, listener));
|
|
19255
19259
|
} else {
|
|
19256
19260
|
prevStats = newStats2;
|
|
19257
19261
|
}
|
|
@@ -19282,7 +19286,7 @@ var require_nodefs_handler = __commonJS({
|
|
|
19282
19286
|
* @param {String} item basename of this item
|
|
19283
19287
|
* @returns {Promise<Boolean>} true if no more processing is needed for this entry.
|
|
19284
19288
|
*/
|
|
19285
|
-
async _handleSymlink(entry, directory,
|
|
19289
|
+
async _handleSymlink(entry, directory, path35, item) {
|
|
19286
19290
|
if (this.fsw.closed) {
|
|
19287
19291
|
return;
|
|
19288
19292
|
}
|
|
@@ -19292,7 +19296,7 @@ var require_nodefs_handler = __commonJS({
|
|
|
19292
19296
|
this.fsw._incrReadyCount();
|
|
19293
19297
|
let linkPath;
|
|
19294
19298
|
try {
|
|
19295
|
-
linkPath = await fsrealpath(
|
|
19299
|
+
linkPath = await fsrealpath(path35);
|
|
19296
19300
|
} catch (e4) {
|
|
19297
19301
|
this.fsw._emitReady();
|
|
19298
19302
|
return true;
|
|
@@ -19301,12 +19305,12 @@ var require_nodefs_handler = __commonJS({
|
|
|
19301
19305
|
if (dir.has(item)) {
|
|
19302
19306
|
if (this.fsw._symlinkPaths.get(full) !== linkPath) {
|
|
19303
19307
|
this.fsw._symlinkPaths.set(full, linkPath);
|
|
19304
|
-
this.fsw._emit(EV_CHANGE,
|
|
19308
|
+
this.fsw._emit(EV_CHANGE, path35, entry.stats);
|
|
19305
19309
|
}
|
|
19306
19310
|
} else {
|
|
19307
19311
|
dir.add(item);
|
|
19308
19312
|
this.fsw._symlinkPaths.set(full, linkPath);
|
|
19309
|
-
this.fsw._emit(EV_ADD,
|
|
19313
|
+
this.fsw._emit(EV_ADD, path35, entry.stats);
|
|
19310
19314
|
}
|
|
19311
19315
|
this.fsw._emitReady();
|
|
19312
19316
|
return true;
|
|
@@ -19334,9 +19338,9 @@ var require_nodefs_handler = __commonJS({
|
|
|
19334
19338
|
return;
|
|
19335
19339
|
}
|
|
19336
19340
|
const item = entry.path;
|
|
19337
|
-
let
|
|
19341
|
+
let path35 = sysPath.join(directory, item);
|
|
19338
19342
|
current.add(item);
|
|
19339
|
-
if (entry.stats.isSymbolicLink() && await this._handleSymlink(entry, directory,
|
|
19343
|
+
if (entry.stats.isSymbolicLink() && await this._handleSymlink(entry, directory, path35, item)) {
|
|
19340
19344
|
return;
|
|
19341
19345
|
}
|
|
19342
19346
|
if (this.fsw.closed) {
|
|
@@ -19345,8 +19349,8 @@ var require_nodefs_handler = __commonJS({
|
|
|
19345
19349
|
}
|
|
19346
19350
|
if (item === target || !target && !previous.has(item)) {
|
|
19347
19351
|
this.fsw._incrReadyCount();
|
|
19348
|
-
|
|
19349
|
-
this._addToNodeFs(
|
|
19352
|
+
path35 = sysPath.join(dir, sysPath.relative(dir, path35));
|
|
19353
|
+
this._addToNodeFs(path35, initialAdd, wh, depth + 1);
|
|
19350
19354
|
}
|
|
19351
19355
|
}).on(EV_ERROR, this._boundHandleError);
|
|
19352
19356
|
return new Promise(
|
|
@@ -19416,13 +19420,13 @@ var require_nodefs_handler = __commonJS({
|
|
|
19416
19420
|
* @param {String=} target Child path actually targeted for watch
|
|
19417
19421
|
* @returns {Promise}
|
|
19418
19422
|
*/
|
|
19419
|
-
async _addToNodeFs(
|
|
19423
|
+
async _addToNodeFs(path35, initialAdd, priorWh, depth, target) {
|
|
19420
19424
|
const ready = this.fsw._emitReady;
|
|
19421
|
-
if (this.fsw._isIgnored(
|
|
19425
|
+
if (this.fsw._isIgnored(path35) || this.fsw.closed) {
|
|
19422
19426
|
ready();
|
|
19423
19427
|
return false;
|
|
19424
19428
|
}
|
|
19425
|
-
const wh = this.fsw._getWatchHelpers(
|
|
19429
|
+
const wh = this.fsw._getWatchHelpers(path35, depth);
|
|
19426
19430
|
if (!wh.hasGlob && priorWh) {
|
|
19427
19431
|
wh.hasGlob = priorWh.hasGlob;
|
|
19428
19432
|
wh.globFilter = priorWh.globFilter;
|
|
@@ -19436,11 +19440,11 @@ var require_nodefs_handler = __commonJS({
|
|
|
19436
19440
|
ready();
|
|
19437
19441
|
return false;
|
|
19438
19442
|
}
|
|
19439
|
-
const follow = this.fsw.options.followSymlinks && !
|
|
19443
|
+
const follow = this.fsw.options.followSymlinks && !path35.includes(STAR) && !path35.includes(BRACE_START);
|
|
19440
19444
|
let closer;
|
|
19441
19445
|
if (stats.isDirectory()) {
|
|
19442
|
-
const absPath = sysPath.resolve(
|
|
19443
|
-
const targetPath = follow ? await fsrealpath(
|
|
19446
|
+
const absPath = sysPath.resolve(path35);
|
|
19447
|
+
const targetPath = follow ? await fsrealpath(path35) : path35;
|
|
19444
19448
|
if (this.fsw.closed) return;
|
|
19445
19449
|
closer = await this._handleDir(wh.watchPath, stats, initialAdd, depth, target, wh, targetPath);
|
|
19446
19450
|
if (this.fsw.closed) return;
|
|
@@ -19448,26 +19452,26 @@ var require_nodefs_handler = __commonJS({
|
|
|
19448
19452
|
this.fsw._symlinkPaths.set(absPath, targetPath);
|
|
19449
19453
|
}
|
|
19450
19454
|
} else if (stats.isSymbolicLink()) {
|
|
19451
|
-
const targetPath = follow ? await fsrealpath(
|
|
19455
|
+
const targetPath = follow ? await fsrealpath(path35) : path35;
|
|
19452
19456
|
if (this.fsw.closed) return;
|
|
19453
19457
|
const parent = sysPath.dirname(wh.watchPath);
|
|
19454
19458
|
this.fsw._getWatchedDir(parent).add(wh.watchPath);
|
|
19455
19459
|
this.fsw._emit(EV_ADD, wh.watchPath, stats);
|
|
19456
|
-
closer = await this._handleDir(parent, stats, initialAdd, depth,
|
|
19460
|
+
closer = await this._handleDir(parent, stats, initialAdd, depth, path35, wh, targetPath);
|
|
19457
19461
|
if (this.fsw.closed) return;
|
|
19458
19462
|
if (targetPath !== void 0) {
|
|
19459
|
-
this.fsw._symlinkPaths.set(sysPath.resolve(
|
|
19463
|
+
this.fsw._symlinkPaths.set(sysPath.resolve(path35), targetPath);
|
|
19460
19464
|
}
|
|
19461
19465
|
} else {
|
|
19462
19466
|
closer = this._handleFile(wh.watchPath, stats, initialAdd);
|
|
19463
19467
|
}
|
|
19464
19468
|
ready();
|
|
19465
|
-
this.fsw._addPathCloser(
|
|
19469
|
+
this.fsw._addPathCloser(path35, closer);
|
|
19466
19470
|
return false;
|
|
19467
19471
|
} catch (error4) {
|
|
19468
19472
|
if (this.fsw._handleError(error4)) {
|
|
19469
19473
|
ready();
|
|
19470
|
-
return
|
|
19474
|
+
return path35;
|
|
19471
19475
|
}
|
|
19472
19476
|
}
|
|
19473
19477
|
}
|
|
@@ -19541,18 +19545,18 @@ var require_fsevents_handler = __commonJS({
|
|
|
19541
19545
|
131840,
|
|
19542
19546
|
262912
|
|
19543
19547
|
]);
|
|
19544
|
-
var createFSEventsInstance = /* @__PURE__ */ __name((
|
|
19545
|
-
const stop = fsevents.watch(
|
|
19548
|
+
var createFSEventsInstance = /* @__PURE__ */ __name((path35, callback) => {
|
|
19549
|
+
const stop = fsevents.watch(path35, callback);
|
|
19546
19550
|
return { stop };
|
|
19547
19551
|
}, "createFSEventsInstance");
|
|
19548
|
-
function setFSEventsListener(
|
|
19552
|
+
function setFSEventsListener(path35, realPath, listener, rawEmitter) {
|
|
19549
19553
|
let watchPath = sysPath.extname(realPath) ? sysPath.dirname(realPath) : realPath;
|
|
19550
19554
|
const parentPath = sysPath.dirname(watchPath);
|
|
19551
19555
|
let cont = FSEventsWatchers.get(watchPath);
|
|
19552
19556
|
if (couldConsolidate(parentPath)) {
|
|
19553
19557
|
watchPath = parentPath;
|
|
19554
19558
|
}
|
|
19555
|
-
const resolvedPath2 = sysPath.resolve(
|
|
19559
|
+
const resolvedPath2 = sysPath.resolve(path35);
|
|
19556
19560
|
const hasSymlink = resolvedPath2 !== realPath;
|
|
19557
19561
|
const filteredListener = /* @__PURE__ */ __name((fullPath, flags, info2) => {
|
|
19558
19562
|
if (hasSymlink) fullPath = fullPath.replace(realPath, resolvedPath2);
|
|
@@ -19598,10 +19602,10 @@ var require_fsevents_handler = __commonJS({
|
|
|
19598
19602
|
};
|
|
19599
19603
|
}
|
|
19600
19604
|
__name(setFSEventsListener, "setFSEventsListener");
|
|
19601
|
-
var couldConsolidate = /* @__PURE__ */ __name((
|
|
19605
|
+
var couldConsolidate = /* @__PURE__ */ __name((path35) => {
|
|
19602
19606
|
let count = 0;
|
|
19603
19607
|
for (const watchPath of FSEventsWatchers.keys()) {
|
|
19604
|
-
if (watchPath.indexOf(
|
|
19608
|
+
if (watchPath.indexOf(path35) === 0) {
|
|
19605
19609
|
count++;
|
|
19606
19610
|
if (count >= consolidateThreshhold) {
|
|
19607
19611
|
return true;
|
|
@@ -19611,9 +19615,9 @@ var require_fsevents_handler = __commonJS({
|
|
|
19611
19615
|
return false;
|
|
19612
19616
|
}, "couldConsolidate");
|
|
19613
19617
|
var canUse = /* @__PURE__ */ __name(() => fsevents && FSEventsWatchers.size < 128, "canUse");
|
|
19614
|
-
var calcDepth = /* @__PURE__ */ __name((
|
|
19618
|
+
var calcDepth = /* @__PURE__ */ __name((path35, root) => {
|
|
19615
19619
|
let i4 = 0;
|
|
19616
|
-
while (!
|
|
19620
|
+
while (!path35.indexOf(root) && (path35 = sysPath.dirname(path35)) !== root) i4++;
|
|
19617
19621
|
return i4;
|
|
19618
19622
|
}, "calcDepth");
|
|
19619
19623
|
var sameTypes = /* @__PURE__ */ __name((info2, stats) => info2.type === FSEVENT_TYPE_DIRECTORY && stats.isDirectory() || info2.type === FSEVENT_TYPE_SYMLINK && stats.isSymbolicLink() || info2.type === FSEVENT_TYPE_FILE && stats.isFile(), "sameTypes");
|
|
@@ -19627,41 +19631,41 @@ var require_fsevents_handler = __commonJS({
|
|
|
19627
19631
|
constructor(fsw) {
|
|
19628
19632
|
this.fsw = fsw;
|
|
19629
19633
|
}
|
|
19630
|
-
checkIgnored(
|
|
19634
|
+
checkIgnored(path35, stats) {
|
|
19631
19635
|
const ipaths = this.fsw._ignoredPaths;
|
|
19632
|
-
if (this.fsw._isIgnored(
|
|
19633
|
-
ipaths.add(
|
|
19636
|
+
if (this.fsw._isIgnored(path35, stats)) {
|
|
19637
|
+
ipaths.add(path35);
|
|
19634
19638
|
if (stats && stats.isDirectory()) {
|
|
19635
|
-
ipaths.add(
|
|
19639
|
+
ipaths.add(path35 + ROOT_GLOBSTAR);
|
|
19636
19640
|
}
|
|
19637
19641
|
return true;
|
|
19638
19642
|
}
|
|
19639
|
-
ipaths.delete(
|
|
19640
|
-
ipaths.delete(
|
|
19643
|
+
ipaths.delete(path35);
|
|
19644
|
+
ipaths.delete(path35 + ROOT_GLOBSTAR);
|
|
19641
19645
|
}
|
|
19642
|
-
addOrChange(
|
|
19646
|
+
addOrChange(path35, fullPath, realPath, parent, watchedDir, item, info2, opts) {
|
|
19643
19647
|
const event = watchedDir.has(item) ? EV_CHANGE : EV_ADD;
|
|
19644
|
-
this.handleEvent(event,
|
|
19648
|
+
this.handleEvent(event, path35, fullPath, realPath, parent, watchedDir, item, info2, opts);
|
|
19645
19649
|
}
|
|
19646
|
-
async checkExists(
|
|
19650
|
+
async checkExists(path35, fullPath, realPath, parent, watchedDir, item, info2, opts) {
|
|
19647
19651
|
try {
|
|
19648
|
-
const stats = await stat3(
|
|
19652
|
+
const stats = await stat3(path35);
|
|
19649
19653
|
if (this.fsw.closed) return;
|
|
19650
19654
|
if (sameTypes(info2, stats)) {
|
|
19651
|
-
this.addOrChange(
|
|
19655
|
+
this.addOrChange(path35, fullPath, realPath, parent, watchedDir, item, info2, opts);
|
|
19652
19656
|
} else {
|
|
19653
|
-
this.handleEvent(EV_UNLINK,
|
|
19657
|
+
this.handleEvent(EV_UNLINK, path35, fullPath, realPath, parent, watchedDir, item, info2, opts);
|
|
19654
19658
|
}
|
|
19655
19659
|
} catch (error4) {
|
|
19656
19660
|
if (error4.code === "EACCES") {
|
|
19657
|
-
this.addOrChange(
|
|
19661
|
+
this.addOrChange(path35, fullPath, realPath, parent, watchedDir, item, info2, opts);
|
|
19658
19662
|
} else {
|
|
19659
|
-
this.handleEvent(EV_UNLINK,
|
|
19663
|
+
this.handleEvent(EV_UNLINK, path35, fullPath, realPath, parent, watchedDir, item, info2, opts);
|
|
19660
19664
|
}
|
|
19661
19665
|
}
|
|
19662
19666
|
}
|
|
19663
|
-
handleEvent(event,
|
|
19664
|
-
if (this.fsw.closed || this.checkIgnored(
|
|
19667
|
+
handleEvent(event, path35, fullPath, realPath, parent, watchedDir, item, info2, opts) {
|
|
19668
|
+
if (this.fsw.closed || this.checkIgnored(path35)) return;
|
|
19665
19669
|
if (event === EV_UNLINK) {
|
|
19666
19670
|
const isDirectory = info2.type === FSEVENT_TYPE_DIRECTORY;
|
|
19667
19671
|
if (isDirectory || watchedDir.has(item)) {
|
|
@@ -19669,16 +19673,16 @@ var require_fsevents_handler = __commonJS({
|
|
|
19669
19673
|
}
|
|
19670
19674
|
} else {
|
|
19671
19675
|
if (event === EV_ADD) {
|
|
19672
|
-
if (info2.type === FSEVENT_TYPE_DIRECTORY) this.fsw._getWatchedDir(
|
|
19676
|
+
if (info2.type === FSEVENT_TYPE_DIRECTORY) this.fsw._getWatchedDir(path35);
|
|
19673
19677
|
if (info2.type === FSEVENT_TYPE_SYMLINK && opts.followSymlinks) {
|
|
19674
19678
|
const curDepth = opts.depth === void 0 ? void 0 : calcDepth(fullPath, realPath) + 1;
|
|
19675
|
-
return this._addToFsEvents(
|
|
19679
|
+
return this._addToFsEvents(path35, false, true, curDepth);
|
|
19676
19680
|
}
|
|
19677
19681
|
this.fsw._getWatchedDir(parent).add(item);
|
|
19678
19682
|
}
|
|
19679
19683
|
const eventName = info2.type === FSEVENT_TYPE_DIRECTORY ? event + DIR_SUFFIX : event;
|
|
19680
|
-
this.fsw._emit(eventName,
|
|
19681
|
-
if (eventName === EV_ADD_DIR) this._addToFsEvents(
|
|
19684
|
+
this.fsw._emit(eventName, path35);
|
|
19685
|
+
if (eventName === EV_ADD_DIR) this._addToFsEvents(path35, false, true);
|
|
19682
19686
|
}
|
|
19683
19687
|
}
|
|
19684
19688
|
/**
|
|
@@ -19695,41 +19699,41 @@ var require_fsevents_handler = __commonJS({
|
|
|
19695
19699
|
const watchCallback = /* @__PURE__ */ __name(async (fullPath, flags, info2) => {
|
|
19696
19700
|
if (this.fsw.closed) return;
|
|
19697
19701
|
if (opts.depth !== void 0 && calcDepth(fullPath, realPath) > opts.depth) return;
|
|
19698
|
-
const
|
|
19702
|
+
const path35 = transform(sysPath.join(
|
|
19699
19703
|
watchPath,
|
|
19700
19704
|
sysPath.relative(watchPath, fullPath)
|
|
19701
19705
|
));
|
|
19702
|
-
if (globFilter && !globFilter(
|
|
19703
|
-
const parent = sysPath.dirname(
|
|
19704
|
-
const item = sysPath.basename(
|
|
19706
|
+
if (globFilter && !globFilter(path35)) return;
|
|
19707
|
+
const parent = sysPath.dirname(path35);
|
|
19708
|
+
const item = sysPath.basename(path35);
|
|
19705
19709
|
const watchedDir = this.fsw._getWatchedDir(
|
|
19706
|
-
info2.type === FSEVENT_TYPE_DIRECTORY ?
|
|
19710
|
+
info2.type === FSEVENT_TYPE_DIRECTORY ? path35 : parent
|
|
19707
19711
|
);
|
|
19708
19712
|
if (wrongEventFlags.has(flags) || info2.event === FSEVENT_UNKNOWN) {
|
|
19709
19713
|
if (typeof opts.ignored === FUNCTION_TYPE) {
|
|
19710
19714
|
let stats;
|
|
19711
19715
|
try {
|
|
19712
|
-
stats = await stat3(
|
|
19716
|
+
stats = await stat3(path35);
|
|
19713
19717
|
} catch (error4) {
|
|
19714
19718
|
}
|
|
19715
19719
|
if (this.fsw.closed) return;
|
|
19716
|
-
if (this.checkIgnored(
|
|
19720
|
+
if (this.checkIgnored(path35, stats)) return;
|
|
19717
19721
|
if (sameTypes(info2, stats)) {
|
|
19718
|
-
this.addOrChange(
|
|
19722
|
+
this.addOrChange(path35, fullPath, realPath, parent, watchedDir, item, info2, opts);
|
|
19719
19723
|
} else {
|
|
19720
|
-
this.handleEvent(EV_UNLINK,
|
|
19724
|
+
this.handleEvent(EV_UNLINK, path35, fullPath, realPath, parent, watchedDir, item, info2, opts);
|
|
19721
19725
|
}
|
|
19722
19726
|
} else {
|
|
19723
|
-
this.checkExists(
|
|
19727
|
+
this.checkExists(path35, fullPath, realPath, parent, watchedDir, item, info2, opts);
|
|
19724
19728
|
}
|
|
19725
19729
|
} else {
|
|
19726
19730
|
switch (info2.event) {
|
|
19727
19731
|
case FSEVENT_CREATED:
|
|
19728
19732
|
case FSEVENT_MODIFIED:
|
|
19729
|
-
return this.addOrChange(
|
|
19733
|
+
return this.addOrChange(path35, fullPath, realPath, parent, watchedDir, item, info2, opts);
|
|
19730
19734
|
case FSEVENT_DELETED:
|
|
19731
19735
|
case FSEVENT_MOVED:
|
|
19732
|
-
return this.checkExists(
|
|
19736
|
+
return this.checkExists(path35, fullPath, realPath, parent, watchedDir, item, info2, opts);
|
|
19733
19737
|
}
|
|
19734
19738
|
}
|
|
19735
19739
|
}, "watchCallback");
|
|
@@ -19761,12 +19765,12 @@ var require_fsevents_handler = __commonJS({
|
|
|
19761
19765
|
return this.fsw._emitReady();
|
|
19762
19766
|
}
|
|
19763
19767
|
this.fsw._incrReadyCount();
|
|
19764
|
-
this._addToFsEvents(linkTarget || linkPath, (
|
|
19768
|
+
this._addToFsEvents(linkTarget || linkPath, (path35) => {
|
|
19765
19769
|
let aliasedPath = linkPath;
|
|
19766
19770
|
if (linkTarget && linkTarget !== DOT_SLASH) {
|
|
19767
|
-
aliasedPath =
|
|
19768
|
-
} else if (
|
|
19769
|
-
aliasedPath = sysPath.join(linkPath,
|
|
19771
|
+
aliasedPath = path35.replace(linkTarget, linkPath);
|
|
19772
|
+
} else if (path35 !== DOT_SLASH) {
|
|
19773
|
+
aliasedPath = sysPath.join(linkPath, path35);
|
|
19770
19774
|
}
|
|
19771
19775
|
return transform(aliasedPath);
|
|
19772
19776
|
}, false, curDepth);
|
|
@@ -19793,7 +19797,7 @@ var require_fsevents_handler = __commonJS({
|
|
|
19793
19797
|
this.fsw._emit(isDir ? EV_ADD_DIR : EV_ADD, pp, stats);
|
|
19794
19798
|
}
|
|
19795
19799
|
}
|
|
19796
|
-
initWatch(realPath,
|
|
19800
|
+
initWatch(realPath, path35, wh, processPath) {
|
|
19797
19801
|
if (this.fsw.closed) return;
|
|
19798
19802
|
const closer = this._watchWithFsEvents(
|
|
19799
19803
|
wh.watchPath,
|
|
@@ -19801,7 +19805,7 @@ var require_fsevents_handler = __commonJS({
|
|
|
19801
19805
|
processPath,
|
|
19802
19806
|
wh.globFilter
|
|
19803
19807
|
);
|
|
19804
|
-
this.fsw._addPathCloser(
|
|
19808
|
+
this.fsw._addPathCloser(path35, closer);
|
|
19805
19809
|
}
|
|
19806
19810
|
/**
|
|
19807
19811
|
* Handle added path with fsevents
|
|
@@ -19811,13 +19815,13 @@ var require_fsevents_handler = __commonJS({
|
|
|
19811
19815
|
* @param {Number=} priorDepth Level of subdirectories already traversed.
|
|
19812
19816
|
* @returns {Promise<void>}
|
|
19813
19817
|
*/
|
|
19814
|
-
async _addToFsEvents(
|
|
19818
|
+
async _addToFsEvents(path35, transform, forceAdd, priorDepth) {
|
|
19815
19819
|
if (this.fsw.closed) {
|
|
19816
19820
|
return;
|
|
19817
19821
|
}
|
|
19818
19822
|
const opts = this.fsw.options;
|
|
19819
19823
|
const processPath = typeof transform === FUNCTION_TYPE ? transform : IDENTITY_FN;
|
|
19820
|
-
const wh = this.fsw._getWatchHelpers(
|
|
19824
|
+
const wh = this.fsw._getWatchHelpers(path35);
|
|
19821
19825
|
try {
|
|
19822
19826
|
const stats = await statMethods[wh.statMethod](wh.watchPath);
|
|
19823
19827
|
if (this.fsw.closed) return;
|
|
@@ -19825,7 +19829,7 @@ var require_fsevents_handler = __commonJS({
|
|
|
19825
19829
|
throw null;
|
|
19826
19830
|
}
|
|
19827
19831
|
if (stats.isDirectory()) {
|
|
19828
|
-
if (!wh.globFilter) this.emitAdd(processPath(
|
|
19832
|
+
if (!wh.globFilter) this.emitAdd(processPath(path35), stats, processPath, opts, forceAdd);
|
|
19829
19833
|
if (priorDepth && priorDepth > opts.depth) return;
|
|
19830
19834
|
this.fsw._readdirp(wh.watchPath, {
|
|
19831
19835
|
fileFilter: /* @__PURE__ */ __name((entry) => wh.filterPath(entry), "fileFilter"),
|
|
@@ -19859,14 +19863,14 @@ var require_fsevents_handler = __commonJS({
|
|
|
19859
19863
|
}
|
|
19860
19864
|
if (opts.persistent && forceAdd !== true) {
|
|
19861
19865
|
if (typeof transform === FUNCTION_TYPE) {
|
|
19862
|
-
this.initWatch(void 0,
|
|
19866
|
+
this.initWatch(void 0, path35, wh, processPath);
|
|
19863
19867
|
} else {
|
|
19864
19868
|
let realPath;
|
|
19865
19869
|
try {
|
|
19866
19870
|
realPath = await realpath2(wh.watchPath);
|
|
19867
19871
|
} catch (e4) {
|
|
19868
19872
|
}
|
|
19869
|
-
this.initWatch(realPath,
|
|
19873
|
+
this.initWatch(realPath, path35, wh, processPath);
|
|
19870
19874
|
}
|
|
19871
19875
|
}
|
|
19872
19876
|
}
|
|
@@ -19960,19 +19964,19 @@ var require_chokidar = __commonJS({
|
|
|
19960
19964
|
}
|
|
19961
19965
|
return str;
|
|
19962
19966
|
}, "toUnix");
|
|
19963
|
-
var normalizePathToUnix = /* @__PURE__ */ __name((
|
|
19964
|
-
var normalizeIgnored = /* @__PURE__ */ __name((cwd = EMPTY_STR) => (
|
|
19965
|
-
if (typeof
|
|
19966
|
-
return normalizePathToUnix(sysPath.isAbsolute(
|
|
19967
|
+
var normalizePathToUnix = /* @__PURE__ */ __name((path35) => toUnix(sysPath.normalize(toUnix(path35))), "normalizePathToUnix");
|
|
19968
|
+
var normalizeIgnored = /* @__PURE__ */ __name((cwd = EMPTY_STR) => (path35) => {
|
|
19969
|
+
if (typeof path35 !== STRING_TYPE) return path35;
|
|
19970
|
+
return normalizePathToUnix(sysPath.isAbsolute(path35) ? path35 : sysPath.join(cwd, path35));
|
|
19967
19971
|
}, "normalizeIgnored");
|
|
19968
|
-
var getAbsolutePath = /* @__PURE__ */ __name((
|
|
19969
|
-
if (sysPath.isAbsolute(
|
|
19970
|
-
return
|
|
19972
|
+
var getAbsolutePath = /* @__PURE__ */ __name((path35, cwd) => {
|
|
19973
|
+
if (sysPath.isAbsolute(path35)) {
|
|
19974
|
+
return path35;
|
|
19971
19975
|
}
|
|
19972
|
-
if (
|
|
19973
|
-
return BANG + sysPath.join(cwd,
|
|
19976
|
+
if (path35.startsWith(BANG)) {
|
|
19977
|
+
return BANG + sysPath.join(cwd, path35.slice(1));
|
|
19974
19978
|
}
|
|
19975
|
-
return sysPath.join(cwd,
|
|
19979
|
+
return sysPath.join(cwd, path35);
|
|
19976
19980
|
}, "getAbsolutePath");
|
|
19977
19981
|
var undef = /* @__PURE__ */ __name((opts, key) => opts[key] === void 0, "undef");
|
|
19978
19982
|
var DirEntry = class {
|
|
@@ -20034,16 +20038,16 @@ var require_chokidar = __commonJS({
|
|
|
20034
20038
|
static {
|
|
20035
20039
|
__name(this, "WatchHelper");
|
|
20036
20040
|
}
|
|
20037
|
-
constructor(
|
|
20041
|
+
constructor(path35, watchPath, follow, fsw) {
|
|
20038
20042
|
this.fsw = fsw;
|
|
20039
|
-
this.path =
|
|
20043
|
+
this.path = path35 = path35.replace(REPLACER_RE, EMPTY_STR);
|
|
20040
20044
|
this.watchPath = watchPath;
|
|
20041
20045
|
this.fullWatchPath = sysPath.resolve(watchPath);
|
|
20042
|
-
this.hasGlob = watchPath !==
|
|
20043
|
-
if (
|
|
20046
|
+
this.hasGlob = watchPath !== path35;
|
|
20047
|
+
if (path35 === EMPTY_STR) this.hasGlob = false;
|
|
20044
20048
|
this.globSymlink = this.hasGlob && follow ? void 0 : false;
|
|
20045
|
-
this.globFilter = this.hasGlob ? anymatch(
|
|
20046
|
-
this.dirParts = this.getDirParts(
|
|
20049
|
+
this.globFilter = this.hasGlob ? anymatch(path35, void 0, ANYMATCH_OPTS) : false;
|
|
20050
|
+
this.dirParts = this.getDirParts(path35);
|
|
20047
20051
|
this.dirParts.forEach((parts) => {
|
|
20048
20052
|
if (parts.length > 1) parts.pop();
|
|
20049
20053
|
});
|
|
@@ -20072,12 +20076,12 @@ var require_chokidar = __commonJS({
|
|
|
20072
20076
|
const matchesGlob = this.hasGlob && typeof this.globFilter === FUNCTION_TYPE ? this.globFilter(resolvedPath2) : true;
|
|
20073
20077
|
return matchesGlob && this.fsw._isntIgnored(resolvedPath2, stats) && this.fsw._hasReadPermissions(stats);
|
|
20074
20078
|
}
|
|
20075
|
-
getDirParts(
|
|
20079
|
+
getDirParts(path35) {
|
|
20076
20080
|
if (!this.hasGlob) return [];
|
|
20077
20081
|
const parts = [];
|
|
20078
|
-
const expandedPath =
|
|
20079
|
-
expandedPath.forEach((
|
|
20080
|
-
parts.push(sysPath.relative(this.watchPath,
|
|
20082
|
+
const expandedPath = path35.includes(BRACE_START) ? braces.expand(path35) : [path35];
|
|
20083
|
+
expandedPath.forEach((path36) => {
|
|
20084
|
+
parts.push(sysPath.relative(this.watchPath, path36).split(SLASH_OR_BACK_SLASH_RE));
|
|
20081
20085
|
});
|
|
20082
20086
|
return parts;
|
|
20083
20087
|
}
|
|
@@ -20186,34 +20190,34 @@ var require_chokidar = __commonJS({
|
|
|
20186
20190
|
this.closed = false;
|
|
20187
20191
|
let paths = unifyPaths(paths_);
|
|
20188
20192
|
if (cwd) {
|
|
20189
|
-
paths = paths.map((
|
|
20190
|
-
const absPath = getAbsolutePath(
|
|
20191
|
-
if (disableGlobbing || !isGlob(
|
|
20193
|
+
paths = paths.map((path35) => {
|
|
20194
|
+
const absPath = getAbsolutePath(path35, cwd);
|
|
20195
|
+
if (disableGlobbing || !isGlob(path35)) {
|
|
20192
20196
|
return absPath;
|
|
20193
20197
|
}
|
|
20194
20198
|
return normalizePath(absPath);
|
|
20195
20199
|
});
|
|
20196
20200
|
}
|
|
20197
|
-
paths = paths.filter((
|
|
20198
|
-
if (
|
|
20199
|
-
this._ignoredPaths.add(
|
|
20201
|
+
paths = paths.filter((path35) => {
|
|
20202
|
+
if (path35.startsWith(BANG)) {
|
|
20203
|
+
this._ignoredPaths.add(path35.slice(1));
|
|
20200
20204
|
return false;
|
|
20201
20205
|
}
|
|
20202
|
-
this._ignoredPaths.delete(
|
|
20203
|
-
this._ignoredPaths.delete(
|
|
20206
|
+
this._ignoredPaths.delete(path35);
|
|
20207
|
+
this._ignoredPaths.delete(path35 + SLASH_GLOBSTAR);
|
|
20204
20208
|
this._userIgnored = void 0;
|
|
20205
20209
|
return true;
|
|
20206
20210
|
});
|
|
20207
20211
|
if (this.options.useFsEvents && this._fsEventsHandler) {
|
|
20208
20212
|
if (!this._readyCount) this._readyCount = paths.length;
|
|
20209
20213
|
if (this.options.persistent) this._readyCount += paths.length;
|
|
20210
|
-
paths.forEach((
|
|
20214
|
+
paths.forEach((path35) => this._fsEventsHandler._addToFsEvents(path35));
|
|
20211
20215
|
} else {
|
|
20212
20216
|
if (!this._readyCount) this._readyCount = 0;
|
|
20213
20217
|
this._readyCount += paths.length;
|
|
20214
20218
|
Promise.all(
|
|
20215
|
-
paths.map(async (
|
|
20216
|
-
const res = await this._nodeFsHandler._addToNodeFs(
|
|
20219
|
+
paths.map(async (path35) => {
|
|
20220
|
+
const res = await this._nodeFsHandler._addToNodeFs(path35, !_internal, 0, 0, _origAdd);
|
|
20217
20221
|
if (res) this._emitReady();
|
|
20218
20222
|
return res;
|
|
20219
20223
|
})
|
|
@@ -20235,15 +20239,15 @@ var require_chokidar = __commonJS({
|
|
|
20235
20239
|
if (this.closed) return this;
|
|
20236
20240
|
const paths = unifyPaths(paths_);
|
|
20237
20241
|
const { cwd } = this.options;
|
|
20238
|
-
paths.forEach((
|
|
20239
|
-
if (!sysPath.isAbsolute(
|
|
20240
|
-
if (cwd)
|
|
20241
|
-
|
|
20242
|
+
paths.forEach((path35) => {
|
|
20243
|
+
if (!sysPath.isAbsolute(path35) && !this._closers.has(path35)) {
|
|
20244
|
+
if (cwd) path35 = sysPath.join(cwd, path35);
|
|
20245
|
+
path35 = sysPath.resolve(path35);
|
|
20242
20246
|
}
|
|
20243
|
-
this._closePath(
|
|
20244
|
-
this._ignoredPaths.add(
|
|
20245
|
-
if (this._watched.has(
|
|
20246
|
-
this._ignoredPaths.add(
|
|
20247
|
+
this._closePath(path35);
|
|
20248
|
+
this._ignoredPaths.add(path35);
|
|
20249
|
+
if (this._watched.has(path35)) {
|
|
20250
|
+
this._ignoredPaths.add(path35 + SLASH_GLOBSTAR);
|
|
20247
20251
|
}
|
|
20248
20252
|
this._userIgnored = void 0;
|
|
20249
20253
|
});
|
|
@@ -20301,36 +20305,36 @@ var require_chokidar = __commonJS({
|
|
|
20301
20305
|
* @param {*=} val3
|
|
20302
20306
|
* @returns the error if defined, otherwise the value of the FSWatcher instance's `closed` flag
|
|
20303
20307
|
*/
|
|
20304
|
-
async _emit(event,
|
|
20308
|
+
async _emit(event, path35, val1, val2, val3) {
|
|
20305
20309
|
if (this.closed) return;
|
|
20306
20310
|
const opts = this.options;
|
|
20307
|
-
if (isWindows)
|
|
20308
|
-
if (opts.cwd)
|
|
20309
|
-
const args = [event,
|
|
20311
|
+
if (isWindows) path35 = sysPath.normalize(path35);
|
|
20312
|
+
if (opts.cwd) path35 = sysPath.relative(opts.cwd, path35);
|
|
20313
|
+
const args = [event, path35];
|
|
20310
20314
|
if (val3 !== void 0) args.push(val1, val2, val3);
|
|
20311
20315
|
else if (val2 !== void 0) args.push(val1, val2);
|
|
20312
20316
|
else if (val1 !== void 0) args.push(val1);
|
|
20313
20317
|
const awf = opts.awaitWriteFinish;
|
|
20314
20318
|
let pw;
|
|
20315
|
-
if (awf && (pw = this._pendingWrites.get(
|
|
20319
|
+
if (awf && (pw = this._pendingWrites.get(path35))) {
|
|
20316
20320
|
pw.lastChange = /* @__PURE__ */ new Date();
|
|
20317
20321
|
return this;
|
|
20318
20322
|
}
|
|
20319
20323
|
if (opts.atomic) {
|
|
20320
20324
|
if (event === EV_UNLINK) {
|
|
20321
|
-
this._pendingUnlinks.set(
|
|
20325
|
+
this._pendingUnlinks.set(path35, args);
|
|
20322
20326
|
setTimeout(() => {
|
|
20323
|
-
this._pendingUnlinks.forEach((entry,
|
|
20327
|
+
this._pendingUnlinks.forEach((entry, path36) => {
|
|
20324
20328
|
this.emit(...entry);
|
|
20325
20329
|
this.emit(EV_ALL, ...entry);
|
|
20326
|
-
this._pendingUnlinks.delete(
|
|
20330
|
+
this._pendingUnlinks.delete(path36);
|
|
20327
20331
|
});
|
|
20328
20332
|
}, typeof opts.atomic === "number" ? opts.atomic : 100);
|
|
20329
20333
|
return this;
|
|
20330
20334
|
}
|
|
20331
|
-
if (event === EV_ADD && this._pendingUnlinks.has(
|
|
20335
|
+
if (event === EV_ADD && this._pendingUnlinks.has(path35)) {
|
|
20332
20336
|
event = args[0] = EV_CHANGE;
|
|
20333
|
-
this._pendingUnlinks.delete(
|
|
20337
|
+
this._pendingUnlinks.delete(path35);
|
|
20334
20338
|
}
|
|
20335
20339
|
}
|
|
20336
20340
|
if (awf && (event === EV_ADD || event === EV_CHANGE) && this._readyEmitted) {
|
|
@@ -20348,15 +20352,15 @@ var require_chokidar = __commonJS({
|
|
|
20348
20352
|
this.emitWithAll(event, args);
|
|
20349
20353
|
}
|
|
20350
20354
|
}, "awfEmit");
|
|
20351
|
-
this._awaitWriteFinish(
|
|
20355
|
+
this._awaitWriteFinish(path35, awf.stabilityThreshold, event, awfEmit);
|
|
20352
20356
|
return this;
|
|
20353
20357
|
}
|
|
20354
20358
|
if (event === EV_CHANGE) {
|
|
20355
|
-
const isThrottled = !this._throttle(EV_CHANGE,
|
|
20359
|
+
const isThrottled = !this._throttle(EV_CHANGE, path35, 50);
|
|
20356
20360
|
if (isThrottled) return this;
|
|
20357
20361
|
}
|
|
20358
20362
|
if (opts.alwaysStat && val1 === void 0 && (event === EV_ADD || event === EV_ADD_DIR || event === EV_CHANGE)) {
|
|
20359
|
-
const fullPath = opts.cwd ? sysPath.join(opts.cwd,
|
|
20363
|
+
const fullPath = opts.cwd ? sysPath.join(opts.cwd, path35) : path35;
|
|
20360
20364
|
let stats;
|
|
20361
20365
|
try {
|
|
20362
20366
|
stats = await stat3(fullPath);
|
|
@@ -20387,28 +20391,28 @@ var require_chokidar = __commonJS({
|
|
|
20387
20391
|
* @param {Number} timeout duration of time to suppress duplicate actions
|
|
20388
20392
|
* @returns {Object|false} tracking object or false if action should be suppressed
|
|
20389
20393
|
*/
|
|
20390
|
-
_throttle(actionType,
|
|
20394
|
+
_throttle(actionType, path35, timeout) {
|
|
20391
20395
|
if (!this._throttled.has(actionType)) {
|
|
20392
20396
|
this._throttled.set(actionType, /* @__PURE__ */ new Map());
|
|
20393
20397
|
}
|
|
20394
20398
|
const action = this._throttled.get(actionType);
|
|
20395
|
-
const actionPath = action.get(
|
|
20399
|
+
const actionPath = action.get(path35);
|
|
20396
20400
|
if (actionPath) {
|
|
20397
20401
|
actionPath.count++;
|
|
20398
20402
|
return false;
|
|
20399
20403
|
}
|
|
20400
20404
|
let timeoutObject;
|
|
20401
20405
|
const clear = /* @__PURE__ */ __name(() => {
|
|
20402
|
-
const item = action.get(
|
|
20406
|
+
const item = action.get(path35);
|
|
20403
20407
|
const count = item ? item.count : 0;
|
|
20404
|
-
action.delete(
|
|
20408
|
+
action.delete(path35);
|
|
20405
20409
|
clearTimeout(timeoutObject);
|
|
20406
20410
|
if (item) clearTimeout(item.timeoutObject);
|
|
20407
20411
|
return count;
|
|
20408
20412
|
}, "clear");
|
|
20409
20413
|
timeoutObject = setTimeout(clear, timeout);
|
|
20410
20414
|
const thr = { timeoutObject, clear, count: 0 };
|
|
20411
|
-
action.set(
|
|
20415
|
+
action.set(path35, thr);
|
|
20412
20416
|
return thr;
|
|
20413
20417
|
}
|
|
20414
20418
|
_incrReadyCount() {
|
|
@@ -20422,27 +20426,27 @@ var require_chokidar = __commonJS({
|
|
|
20422
20426
|
* @param {EventName} event
|
|
20423
20427
|
* @param {Function} awfEmit Callback to be called when ready for event to be emitted.
|
|
20424
20428
|
*/
|
|
20425
|
-
_awaitWriteFinish(
|
|
20429
|
+
_awaitWriteFinish(path35, threshold, event, awfEmit) {
|
|
20426
20430
|
let timeoutHandler;
|
|
20427
|
-
let fullPath =
|
|
20428
|
-
if (this.options.cwd && !sysPath.isAbsolute(
|
|
20429
|
-
fullPath = sysPath.join(this.options.cwd,
|
|
20431
|
+
let fullPath = path35;
|
|
20432
|
+
if (this.options.cwd && !sysPath.isAbsolute(path35)) {
|
|
20433
|
+
fullPath = sysPath.join(this.options.cwd, path35);
|
|
20430
20434
|
}
|
|
20431
20435
|
const now = /* @__PURE__ */ new Date();
|
|
20432
20436
|
const awaitWriteFinish = /* @__PURE__ */ __name((prevStat) => {
|
|
20433
20437
|
fs36.stat(fullPath, (err, curStat) => {
|
|
20434
|
-
if (err || !this._pendingWrites.has(
|
|
20438
|
+
if (err || !this._pendingWrites.has(path35)) {
|
|
20435
20439
|
if (err && err.code !== "ENOENT") awfEmit(err);
|
|
20436
20440
|
return;
|
|
20437
20441
|
}
|
|
20438
20442
|
const now2 = Number(/* @__PURE__ */ new Date());
|
|
20439
20443
|
if (prevStat && curStat.size !== prevStat.size) {
|
|
20440
|
-
this._pendingWrites.get(
|
|
20444
|
+
this._pendingWrites.get(path35).lastChange = now2;
|
|
20441
20445
|
}
|
|
20442
|
-
const pw = this._pendingWrites.get(
|
|
20446
|
+
const pw = this._pendingWrites.get(path35);
|
|
20443
20447
|
const df = now2 - pw.lastChange;
|
|
20444
20448
|
if (df >= threshold) {
|
|
20445
|
-
this._pendingWrites.delete(
|
|
20449
|
+
this._pendingWrites.delete(path35);
|
|
20446
20450
|
awfEmit(void 0, curStat);
|
|
20447
20451
|
} else {
|
|
20448
20452
|
timeoutHandler = setTimeout(
|
|
@@ -20453,11 +20457,11 @@ var require_chokidar = __commonJS({
|
|
|
20453
20457
|
}
|
|
20454
20458
|
});
|
|
20455
20459
|
}, "awaitWriteFinish");
|
|
20456
|
-
if (!this._pendingWrites.has(
|
|
20457
|
-
this._pendingWrites.set(
|
|
20460
|
+
if (!this._pendingWrites.has(path35)) {
|
|
20461
|
+
this._pendingWrites.set(path35, {
|
|
20458
20462
|
lastChange: now,
|
|
20459
20463
|
cancelWait: /* @__PURE__ */ __name(() => {
|
|
20460
|
-
this._pendingWrites.delete(
|
|
20464
|
+
this._pendingWrites.delete(path35);
|
|
20461
20465
|
clearTimeout(timeoutHandler);
|
|
20462
20466
|
return event;
|
|
20463
20467
|
}, "cancelWait")
|
|
@@ -20477,20 +20481,20 @@ var require_chokidar = __commonJS({
|
|
|
20477
20481
|
* @param {fs.Stats=} stats result of fs.stat
|
|
20478
20482
|
* @returns {Boolean}
|
|
20479
20483
|
*/
|
|
20480
|
-
_isIgnored(
|
|
20481
|
-
if (this.options.atomic && DOT_RE.test(
|
|
20484
|
+
_isIgnored(path35, stats) {
|
|
20485
|
+
if (this.options.atomic && DOT_RE.test(path35)) return true;
|
|
20482
20486
|
if (!this._userIgnored) {
|
|
20483
20487
|
const { cwd } = this.options;
|
|
20484
20488
|
const ign = this.options.ignored;
|
|
20485
20489
|
const ignored = ign && ign.map(normalizeIgnored(cwd));
|
|
20486
|
-
const paths = arrify(ignored).filter((
|
|
20490
|
+
const paths = arrify(ignored).filter((path36) => typeof path36 === STRING_TYPE && !isGlob(path36)).map((path36) => path36 + SLASH_GLOBSTAR);
|
|
20487
20491
|
const list2 = this._getGlobIgnored().map(normalizeIgnored(cwd)).concat(ignored, paths);
|
|
20488
20492
|
this._userIgnored = anymatch(list2, void 0, ANYMATCH_OPTS);
|
|
20489
20493
|
}
|
|
20490
|
-
return this._userIgnored([
|
|
20494
|
+
return this._userIgnored([path35, stats]);
|
|
20491
20495
|
}
|
|
20492
|
-
_isntIgnored(
|
|
20493
|
-
return !this._isIgnored(
|
|
20496
|
+
_isntIgnored(path35, stat4) {
|
|
20497
|
+
return !this._isIgnored(path35, stat4);
|
|
20494
20498
|
}
|
|
20495
20499
|
/**
|
|
20496
20500
|
* Provides a set of common helpers and properties relating to symlink and glob handling.
|
|
@@ -20498,10 +20502,10 @@ var require_chokidar = __commonJS({
|
|
|
20498
20502
|
* @param {Number=} depth at any depth > 0, this isn't a glob
|
|
20499
20503
|
* @returns {WatchHelper} object containing helpers for this path
|
|
20500
20504
|
*/
|
|
20501
|
-
_getWatchHelpers(
|
|
20502
|
-
const watchPath = depth || this.options.disableGlobbing || !isGlob(
|
|
20505
|
+
_getWatchHelpers(path35, depth) {
|
|
20506
|
+
const watchPath = depth || this.options.disableGlobbing || !isGlob(path35) ? path35 : globParent(path35);
|
|
20503
20507
|
const follow = this.options.followSymlinks;
|
|
20504
|
-
return new WatchHelper(
|
|
20508
|
+
return new WatchHelper(path35, watchPath, follow, this);
|
|
20505
20509
|
}
|
|
20506
20510
|
// Directory helpers
|
|
20507
20511
|
// -----------------
|
|
@@ -20540,66 +20544,66 @@ var require_chokidar = __commonJS({
|
|
|
20540
20544
|
* @returns {void}
|
|
20541
20545
|
*/
|
|
20542
20546
|
_remove(directory, item, isDirectory) {
|
|
20543
|
-
const
|
|
20544
|
-
const fullPath = sysPath.resolve(
|
|
20545
|
-
isDirectory = isDirectory != null ? isDirectory : this._watched.has(
|
|
20546
|
-
if (!this._throttle("remove",
|
|
20547
|
+
const path35 = sysPath.join(directory, item);
|
|
20548
|
+
const fullPath = sysPath.resolve(path35);
|
|
20549
|
+
isDirectory = isDirectory != null ? isDirectory : this._watched.has(path35) || this._watched.has(fullPath);
|
|
20550
|
+
if (!this._throttle("remove", path35, 100)) return;
|
|
20547
20551
|
if (!isDirectory && !this.options.useFsEvents && this._watched.size === 1) {
|
|
20548
20552
|
this.add(directory, item, true);
|
|
20549
20553
|
}
|
|
20550
|
-
const wp = this._getWatchedDir(
|
|
20554
|
+
const wp = this._getWatchedDir(path35);
|
|
20551
20555
|
const nestedDirectoryChildren = wp.getChildren();
|
|
20552
|
-
nestedDirectoryChildren.forEach((nested) => this._remove(
|
|
20556
|
+
nestedDirectoryChildren.forEach((nested) => this._remove(path35, nested));
|
|
20553
20557
|
const parent = this._getWatchedDir(directory);
|
|
20554
20558
|
const wasTracked = parent.has(item);
|
|
20555
20559
|
parent.remove(item);
|
|
20556
20560
|
if (this._symlinkPaths.has(fullPath)) {
|
|
20557
20561
|
this._symlinkPaths.delete(fullPath);
|
|
20558
20562
|
}
|
|
20559
|
-
let relPath =
|
|
20560
|
-
if (this.options.cwd) relPath = sysPath.relative(this.options.cwd,
|
|
20563
|
+
let relPath = path35;
|
|
20564
|
+
if (this.options.cwd) relPath = sysPath.relative(this.options.cwd, path35);
|
|
20561
20565
|
if (this.options.awaitWriteFinish && this._pendingWrites.has(relPath)) {
|
|
20562
20566
|
const event = this._pendingWrites.get(relPath).cancelWait();
|
|
20563
20567
|
if (event === EV_ADD) return;
|
|
20564
20568
|
}
|
|
20565
|
-
this._watched.delete(
|
|
20569
|
+
this._watched.delete(path35);
|
|
20566
20570
|
this._watched.delete(fullPath);
|
|
20567
20571
|
const eventName = isDirectory ? EV_UNLINK_DIR : EV_UNLINK;
|
|
20568
|
-
if (wasTracked && !this._isIgnored(
|
|
20572
|
+
if (wasTracked && !this._isIgnored(path35)) this._emit(eventName, path35);
|
|
20569
20573
|
if (!this.options.useFsEvents) {
|
|
20570
|
-
this._closePath(
|
|
20574
|
+
this._closePath(path35);
|
|
20571
20575
|
}
|
|
20572
20576
|
}
|
|
20573
20577
|
/**
|
|
20574
20578
|
* Closes all watchers for a path
|
|
20575
20579
|
* @param {Path} path
|
|
20576
20580
|
*/
|
|
20577
|
-
_closePath(
|
|
20578
|
-
this._closeFile(
|
|
20579
|
-
const dir = sysPath.dirname(
|
|
20580
|
-
this._getWatchedDir(dir).remove(sysPath.basename(
|
|
20581
|
+
_closePath(path35) {
|
|
20582
|
+
this._closeFile(path35);
|
|
20583
|
+
const dir = sysPath.dirname(path35);
|
|
20584
|
+
this._getWatchedDir(dir).remove(sysPath.basename(path35));
|
|
20581
20585
|
}
|
|
20582
20586
|
/**
|
|
20583
20587
|
* Closes only file-specific watchers
|
|
20584
20588
|
* @param {Path} path
|
|
20585
20589
|
*/
|
|
20586
|
-
_closeFile(
|
|
20587
|
-
const closers = this._closers.get(
|
|
20590
|
+
_closeFile(path35) {
|
|
20591
|
+
const closers = this._closers.get(path35);
|
|
20588
20592
|
if (!closers) return;
|
|
20589
20593
|
closers.forEach((closer) => closer());
|
|
20590
|
-
this._closers.delete(
|
|
20594
|
+
this._closers.delete(path35);
|
|
20591
20595
|
}
|
|
20592
20596
|
/**
|
|
20593
20597
|
*
|
|
20594
20598
|
* @param {Path} path
|
|
20595
20599
|
* @param {Function} closer
|
|
20596
20600
|
*/
|
|
20597
|
-
_addPathCloser(
|
|
20601
|
+
_addPathCloser(path35, closer) {
|
|
20598
20602
|
if (!closer) return;
|
|
20599
|
-
let list2 = this._closers.get(
|
|
20603
|
+
let list2 = this._closers.get(path35);
|
|
20600
20604
|
if (!list2) {
|
|
20601
20605
|
list2 = [];
|
|
20602
|
-
this._closers.set(
|
|
20606
|
+
this._closers.set(path35, list2);
|
|
20603
20607
|
}
|
|
20604
20608
|
list2.push(closer);
|
|
20605
20609
|
}
|
|
@@ -20737,12 +20741,12 @@ var require_make_dir2 = __commonJS({
|
|
|
20737
20741
|
"../toolkit-lib/node_modules/fs-extra/lib/mkdirs/make-dir.js"(exports2, module2) {
|
|
20738
20742
|
"use strict";
|
|
20739
20743
|
var fs36 = require_fs2();
|
|
20740
|
-
var
|
|
20744
|
+
var path35 = require("path");
|
|
20741
20745
|
var atLeastNode = require_at_least_node();
|
|
20742
20746
|
var useNativeRecursiveOption = atLeastNode("10.12.0");
|
|
20743
20747
|
var checkPath = /* @__PURE__ */ __name((pth) => {
|
|
20744
20748
|
if (process.platform === "win32") {
|
|
20745
|
-
const pathHasInvalidWinCharacters = /[<>:"|?*]/.test(pth.replace(
|
|
20749
|
+
const pathHasInvalidWinCharacters = /[<>:"|?*]/.test(pth.replace(path35.parse(pth).root, ""));
|
|
20746
20750
|
if (pathHasInvalidWinCharacters) {
|
|
20747
20751
|
const error4 = new Error(`Path contains invalid characters: ${pth}`);
|
|
20748
20752
|
error4.code = "EINVAL";
|
|
@@ -20767,7 +20771,7 @@ var require_make_dir2 = __commonJS({
|
|
|
20767
20771
|
checkPath(input);
|
|
20768
20772
|
options = processOptions(options);
|
|
20769
20773
|
if (useNativeRecursiveOption) {
|
|
20770
|
-
const pth =
|
|
20774
|
+
const pth = path35.resolve(input);
|
|
20771
20775
|
return fs36.mkdir(pth, {
|
|
20772
20776
|
mode: options.mode,
|
|
20773
20777
|
recursive: true
|
|
@@ -20781,13 +20785,13 @@ var require_make_dir2 = __commonJS({
|
|
|
20781
20785
|
throw error4;
|
|
20782
20786
|
}
|
|
20783
20787
|
if (error4.code === "ENOENT") {
|
|
20784
|
-
if (
|
|
20788
|
+
if (path35.dirname(pth) === pth) {
|
|
20785
20789
|
throw permissionError(pth);
|
|
20786
20790
|
}
|
|
20787
20791
|
if (error4.message.includes("null bytes")) {
|
|
20788
20792
|
throw error4;
|
|
20789
20793
|
}
|
|
20790
|
-
await make(
|
|
20794
|
+
await make(path35.dirname(pth));
|
|
20791
20795
|
return make(pth);
|
|
20792
20796
|
}
|
|
20793
20797
|
try {
|
|
@@ -20800,13 +20804,13 @@ var require_make_dir2 = __commonJS({
|
|
|
20800
20804
|
}
|
|
20801
20805
|
}
|
|
20802
20806
|
}, "make");
|
|
20803
|
-
return make(
|
|
20807
|
+
return make(path35.resolve(input));
|
|
20804
20808
|
};
|
|
20805
20809
|
module2.exports.makeDirSync = (input, options) => {
|
|
20806
20810
|
checkPath(input);
|
|
20807
20811
|
options = processOptions(options);
|
|
20808
20812
|
if (useNativeRecursiveOption) {
|
|
20809
|
-
const pth =
|
|
20813
|
+
const pth = path35.resolve(input);
|
|
20810
20814
|
return fs36.mkdirSync(pth, {
|
|
20811
20815
|
mode: options.mode,
|
|
20812
20816
|
recursive: true
|
|
@@ -20820,13 +20824,13 @@ var require_make_dir2 = __commonJS({
|
|
|
20820
20824
|
throw error4;
|
|
20821
20825
|
}
|
|
20822
20826
|
if (error4.code === "ENOENT") {
|
|
20823
|
-
if (
|
|
20827
|
+
if (path35.dirname(pth) === pth) {
|
|
20824
20828
|
throw permissionError(pth);
|
|
20825
20829
|
}
|
|
20826
20830
|
if (error4.message.includes("null bytes")) {
|
|
20827
20831
|
throw error4;
|
|
20828
20832
|
}
|
|
20829
|
-
make(
|
|
20833
|
+
make(path35.dirname(pth));
|
|
20830
20834
|
return make(pth);
|
|
20831
20835
|
}
|
|
20832
20836
|
try {
|
|
@@ -20838,7 +20842,7 @@ var require_make_dir2 = __commonJS({
|
|
|
20838
20842
|
}
|
|
20839
20843
|
}
|
|
20840
20844
|
}, "make");
|
|
20841
|
-
return make(
|
|
20845
|
+
return make(path35.resolve(input));
|
|
20842
20846
|
};
|
|
20843
20847
|
}
|
|
20844
20848
|
});
|
|
@@ -20867,8 +20871,8 @@ var require_utimes2 = __commonJS({
|
|
|
20867
20871
|
"../toolkit-lib/node_modules/fs-extra/lib/util/utimes.js"(exports2, module2) {
|
|
20868
20872
|
"use strict";
|
|
20869
20873
|
var fs36 = require_graceful_fs();
|
|
20870
|
-
function utimesMillis(
|
|
20871
|
-
fs36.open(
|
|
20874
|
+
function utimesMillis(path35, atime, mtime, callback) {
|
|
20875
|
+
fs36.open(path35, "r+", (err, fd) => {
|
|
20872
20876
|
if (err) return callback(err);
|
|
20873
20877
|
fs36.futimes(fd, atime, mtime, (futimesErr) => {
|
|
20874
20878
|
fs36.close(fd, (closeErr) => {
|
|
@@ -20878,8 +20882,8 @@ var require_utimes2 = __commonJS({
|
|
|
20878
20882
|
});
|
|
20879
20883
|
}
|
|
20880
20884
|
__name(utimesMillis, "utimesMillis");
|
|
20881
|
-
function utimesMillisSync(
|
|
20882
|
-
const fd = fs36.openSync(
|
|
20885
|
+
function utimesMillisSync(path35, atime, mtime) {
|
|
20886
|
+
const fd = fs36.openSync(path35, "r+");
|
|
20883
20887
|
fs36.futimesSync(fd, atime, mtime);
|
|
20884
20888
|
return fs36.closeSync(fd);
|
|
20885
20889
|
}
|
|
@@ -20896,7 +20900,7 @@ var require_stat2 = __commonJS({
|
|
|
20896
20900
|
"../toolkit-lib/node_modules/fs-extra/lib/util/stat.js"(exports2, module2) {
|
|
20897
20901
|
"use strict";
|
|
20898
20902
|
var fs36 = require_fs2();
|
|
20899
|
-
var
|
|
20903
|
+
var path35 = require("path");
|
|
20900
20904
|
var util9 = require("util");
|
|
20901
20905
|
var atLeastNode = require_at_least_node();
|
|
20902
20906
|
var nodeSupportsBigInt = atLeastNode("10.5.0");
|
|
@@ -20950,9 +20954,9 @@ var require_stat2 = __commonJS({
|
|
|
20950
20954
|
}
|
|
20951
20955
|
__name(checkPathsSync, "checkPathsSync");
|
|
20952
20956
|
function checkParentPaths(src, srcStat, dest, funcName, cb) {
|
|
20953
|
-
const srcParent =
|
|
20954
|
-
const destParent =
|
|
20955
|
-
if (destParent === srcParent || destParent ===
|
|
20957
|
+
const srcParent = path35.resolve(path35.dirname(src));
|
|
20958
|
+
const destParent = path35.resolve(path35.dirname(dest));
|
|
20959
|
+
if (destParent === srcParent || destParent === path35.parse(destParent).root) return cb();
|
|
20956
20960
|
const callback = /* @__PURE__ */ __name((err, destStat) => {
|
|
20957
20961
|
if (err) {
|
|
20958
20962
|
if (err.code === "ENOENT") return cb();
|
|
@@ -20968,9 +20972,9 @@ var require_stat2 = __commonJS({
|
|
|
20968
20972
|
}
|
|
20969
20973
|
__name(checkParentPaths, "checkParentPaths");
|
|
20970
20974
|
function checkParentPathsSync(src, srcStat, dest, funcName) {
|
|
20971
|
-
const srcParent =
|
|
20972
|
-
const destParent =
|
|
20973
|
-
if (destParent === srcParent || destParent ===
|
|
20975
|
+
const srcParent = path35.resolve(path35.dirname(src));
|
|
20976
|
+
const destParent = path35.resolve(path35.dirname(dest));
|
|
20977
|
+
if (destParent === srcParent || destParent === path35.parse(destParent).root) return;
|
|
20974
20978
|
let destStat;
|
|
20975
20979
|
try {
|
|
20976
20980
|
destStat = statSync5(destParent);
|
|
@@ -20997,8 +21001,8 @@ var require_stat2 = __commonJS({
|
|
|
20997
21001
|
}
|
|
20998
21002
|
__name(areIdentical, "areIdentical");
|
|
20999
21003
|
function isSrcSubdir(src, dest) {
|
|
21000
|
-
const srcArr =
|
|
21001
|
-
const destArr =
|
|
21004
|
+
const srcArr = path35.resolve(src).split(path35.sep).filter((i4) => i4);
|
|
21005
|
+
const destArr = path35.resolve(dest).split(path35.sep).filter((i4) => i4);
|
|
21002
21006
|
return srcArr.reduce((acc, cur, i4) => acc && destArr[i4] === cur, true);
|
|
21003
21007
|
}
|
|
21004
21008
|
__name(isSrcSubdir, "isSrcSubdir");
|
|
@@ -21021,7 +21025,7 @@ var require_copy_sync3 = __commonJS({
|
|
|
21021
21025
|
"../toolkit-lib/node_modules/fs-extra/lib/copy-sync/copy-sync.js"(exports2, module2) {
|
|
21022
21026
|
"use strict";
|
|
21023
21027
|
var fs36 = require_graceful_fs();
|
|
21024
|
-
var
|
|
21028
|
+
var path35 = require("path");
|
|
21025
21029
|
var mkdirsSync = require_mkdirs2().mkdirsSync;
|
|
21026
21030
|
var utimesMillisSync = require_utimes2().utimesMillisSync;
|
|
21027
21031
|
var stat3 = require_stat2();
|
|
@@ -21044,7 +21048,7 @@ var require_copy_sync3 = __commonJS({
|
|
|
21044
21048
|
__name(copySync, "copySync");
|
|
21045
21049
|
function handleFilterAndCopy(destStat, src, dest, opts) {
|
|
21046
21050
|
if (opts.filter && !opts.filter(src, dest)) return;
|
|
21047
|
-
const destParent =
|
|
21051
|
+
const destParent = path35.dirname(dest);
|
|
21048
21052
|
if (!fs36.existsSync(destParent)) mkdirsSync(destParent);
|
|
21049
21053
|
return startCopy(destStat, src, dest, opts);
|
|
21050
21054
|
}
|
|
@@ -21123,8 +21127,8 @@ var require_copy_sync3 = __commonJS({
|
|
|
21123
21127
|
}
|
|
21124
21128
|
__name(copyDir, "copyDir");
|
|
21125
21129
|
function copyDirItem(item, src, dest, opts) {
|
|
21126
|
-
const srcItem =
|
|
21127
|
-
const destItem =
|
|
21130
|
+
const srcItem = path35.join(src, item);
|
|
21131
|
+
const destItem = path35.join(dest, item);
|
|
21128
21132
|
const { destStat } = stat3.checkPathsSync(srcItem, destItem, "copy");
|
|
21129
21133
|
return startCopy(destStat, srcItem, destItem, opts);
|
|
21130
21134
|
}
|
|
@@ -21132,7 +21136,7 @@ var require_copy_sync3 = __commonJS({
|
|
|
21132
21136
|
function onLink(destStat, src, dest, opts) {
|
|
21133
21137
|
let resolvedSrc = fs36.readlinkSync(src);
|
|
21134
21138
|
if (opts.dereference) {
|
|
21135
|
-
resolvedSrc =
|
|
21139
|
+
resolvedSrc = path35.resolve(process.cwd(), resolvedSrc);
|
|
21136
21140
|
}
|
|
21137
21141
|
if (!destStat) {
|
|
21138
21142
|
return fs36.symlinkSync(resolvedSrc, dest);
|
|
@@ -21145,7 +21149,7 @@ var require_copy_sync3 = __commonJS({
|
|
|
21145
21149
|
throw err;
|
|
21146
21150
|
}
|
|
21147
21151
|
if (opts.dereference) {
|
|
21148
|
-
resolvedDest =
|
|
21152
|
+
resolvedDest = path35.resolve(process.cwd(), resolvedDest);
|
|
21149
21153
|
}
|
|
21150
21154
|
if (stat3.isSrcSubdir(resolvedSrc, resolvedDest)) {
|
|
21151
21155
|
throw new Error(`Cannot copy '${resolvedSrc}' to a subdirectory of itself, '${resolvedDest}'.`);
|
|
@@ -21182,8 +21186,8 @@ var require_path_exists2 = __commonJS({
|
|
|
21182
21186
|
"use strict";
|
|
21183
21187
|
var u4 = require_universalify().fromPromise;
|
|
21184
21188
|
var fs36 = require_fs2();
|
|
21185
|
-
function pathExists3(
|
|
21186
|
-
return fs36.access(
|
|
21189
|
+
function pathExists3(path35) {
|
|
21190
|
+
return fs36.access(path35).then(() => true).catch(() => false);
|
|
21187
21191
|
}
|
|
21188
21192
|
__name(pathExists3, "pathExists");
|
|
21189
21193
|
module2.exports = {
|
|
@@ -21198,7 +21202,7 @@ var require_copy3 = __commonJS({
|
|
|
21198
21202
|
"../toolkit-lib/node_modules/fs-extra/lib/copy/copy.js"(exports2, module2) {
|
|
21199
21203
|
"use strict";
|
|
21200
21204
|
var fs36 = require_graceful_fs();
|
|
21201
|
-
var
|
|
21205
|
+
var path35 = require("path");
|
|
21202
21206
|
var mkdirs = require_mkdirs2().mkdirs;
|
|
21203
21207
|
var pathExists3 = require_path_exists2().pathExists;
|
|
21204
21208
|
var utimesMillis = require_utimes2().utimesMillis;
|
|
@@ -21232,7 +21236,7 @@ var require_copy3 = __commonJS({
|
|
|
21232
21236
|
}
|
|
21233
21237
|
__name(copy, "copy");
|
|
21234
21238
|
function checkParentDir(destStat, src, dest, opts, cb) {
|
|
21235
|
-
const destParent =
|
|
21239
|
+
const destParent = path35.dirname(dest);
|
|
21236
21240
|
pathExists3(destParent, (err, dirExists) => {
|
|
21237
21241
|
if (err) return cb(err);
|
|
21238
21242
|
if (dirExists) return startCopy(destStat, src, dest, opts, cb);
|
|
@@ -21357,8 +21361,8 @@ var require_copy3 = __commonJS({
|
|
|
21357
21361
|
}
|
|
21358
21362
|
__name(copyDirItems, "copyDirItems");
|
|
21359
21363
|
function copyDirItem(items, item, src, dest, opts, cb) {
|
|
21360
|
-
const srcItem =
|
|
21361
|
-
const destItem =
|
|
21364
|
+
const srcItem = path35.join(src, item);
|
|
21365
|
+
const destItem = path35.join(dest, item);
|
|
21362
21366
|
stat3.checkPaths(srcItem, destItem, "copy", (err, stats) => {
|
|
21363
21367
|
if (err) return cb(err);
|
|
21364
21368
|
const { destStat } = stats;
|
|
@@ -21373,7 +21377,7 @@ var require_copy3 = __commonJS({
|
|
|
21373
21377
|
fs36.readlink(src, (err, resolvedSrc) => {
|
|
21374
21378
|
if (err) return cb(err);
|
|
21375
21379
|
if (opts.dereference) {
|
|
21376
|
-
resolvedSrc =
|
|
21380
|
+
resolvedSrc = path35.resolve(process.cwd(), resolvedSrc);
|
|
21377
21381
|
}
|
|
21378
21382
|
if (!destStat) {
|
|
21379
21383
|
return fs36.symlink(resolvedSrc, dest, cb);
|
|
@@ -21384,7 +21388,7 @@ var require_copy3 = __commonJS({
|
|
|
21384
21388
|
return cb(err2);
|
|
21385
21389
|
}
|
|
21386
21390
|
if (opts.dereference) {
|
|
21387
|
-
resolvedDest =
|
|
21391
|
+
resolvedDest = path35.resolve(process.cwd(), resolvedDest);
|
|
21388
21392
|
}
|
|
21389
21393
|
if (stat3.isSrcSubdir(resolvedSrc, resolvedDest)) {
|
|
21390
21394
|
return cb(new Error(`Cannot copy '${resolvedSrc}' to a subdirectory of itself, '${resolvedDest}'.`));
|
|
@@ -21425,7 +21429,7 @@ var require_rimraf2 = __commonJS({
|
|
|
21425
21429
|
"../toolkit-lib/node_modules/fs-extra/lib/remove/rimraf.js"(exports2, module2) {
|
|
21426
21430
|
"use strict";
|
|
21427
21431
|
var fs36 = require_graceful_fs();
|
|
21428
|
-
var
|
|
21432
|
+
var path35 = require("path");
|
|
21429
21433
|
var assert = require("assert");
|
|
21430
21434
|
var isWindows = process.platform === "win32";
|
|
21431
21435
|
function defaults3(options) {
|
|
@@ -21576,7 +21580,7 @@ var require_rimraf2 = __commonJS({
|
|
|
21576
21580
|
let errState;
|
|
21577
21581
|
if (n4 === 0) return options.rmdir(p4, cb);
|
|
21578
21582
|
files.forEach((f4) => {
|
|
21579
|
-
rimraf(
|
|
21583
|
+
rimraf(path35.join(p4, f4), options, (er2) => {
|
|
21580
21584
|
if (errState) {
|
|
21581
21585
|
return;
|
|
21582
21586
|
}
|
|
@@ -21644,7 +21648,7 @@ var require_rimraf2 = __commonJS({
|
|
|
21644
21648
|
function rmkidsSync(p4, options) {
|
|
21645
21649
|
assert(p4);
|
|
21646
21650
|
assert(options);
|
|
21647
|
-
options.readdirSync(p4).forEach((f4) => rimrafSync(
|
|
21651
|
+
options.readdirSync(p4).forEach((f4) => rimrafSync(path35.join(p4, f4), options));
|
|
21648
21652
|
if (isWindows) {
|
|
21649
21653
|
const startTime = Date.now();
|
|
21650
21654
|
do {
|
|
@@ -21684,7 +21688,7 @@ var require_empty2 = __commonJS({
|
|
|
21684
21688
|
"use strict";
|
|
21685
21689
|
var u4 = require_universalify().fromCallback;
|
|
21686
21690
|
var fs36 = require_graceful_fs();
|
|
21687
|
-
var
|
|
21691
|
+
var path35 = require("path");
|
|
21688
21692
|
var mkdir = require_mkdirs2();
|
|
21689
21693
|
var remove = require_remove2();
|
|
21690
21694
|
var emptyDir = u4(/* @__PURE__ */ __name(function emptyDir2(dir, callback) {
|
|
@@ -21692,7 +21696,7 @@ var require_empty2 = __commonJS({
|
|
|
21692
21696
|
};
|
|
21693
21697
|
fs36.readdir(dir, (err, items) => {
|
|
21694
21698
|
if (err) return mkdir.mkdirs(dir, callback);
|
|
21695
|
-
items = items.map((item) =>
|
|
21699
|
+
items = items.map((item) => path35.join(dir, item));
|
|
21696
21700
|
deleteItem();
|
|
21697
21701
|
function deleteItem() {
|
|
21698
21702
|
const item = items.pop();
|
|
@@ -21713,7 +21717,7 @@ var require_empty2 = __commonJS({
|
|
|
21713
21717
|
return mkdir.mkdirsSync(dir);
|
|
21714
21718
|
}
|
|
21715
21719
|
items.forEach((item) => {
|
|
21716
|
-
item =
|
|
21720
|
+
item = path35.join(dir, item);
|
|
21717
21721
|
remove.removeSync(item);
|
|
21718
21722
|
});
|
|
21719
21723
|
}
|
|
@@ -21732,7 +21736,7 @@ var require_file2 = __commonJS({
|
|
|
21732
21736
|
"../toolkit-lib/node_modules/fs-extra/lib/ensure/file.js"(exports2, module2) {
|
|
21733
21737
|
"use strict";
|
|
21734
21738
|
var u4 = require_universalify().fromCallback;
|
|
21735
|
-
var
|
|
21739
|
+
var path35 = require("path");
|
|
21736
21740
|
var fs36 = require_graceful_fs();
|
|
21737
21741
|
var mkdir = require_mkdirs2();
|
|
21738
21742
|
function createFile(file, callback) {
|
|
@@ -21745,7 +21749,7 @@ var require_file2 = __commonJS({
|
|
|
21745
21749
|
__name(makeFile, "makeFile");
|
|
21746
21750
|
fs36.stat(file, (err, stats) => {
|
|
21747
21751
|
if (!err && stats.isFile()) return callback();
|
|
21748
|
-
const dir =
|
|
21752
|
+
const dir = path35.dirname(file);
|
|
21749
21753
|
fs36.stat(dir, (err2, stats2) => {
|
|
21750
21754
|
if (err2) {
|
|
21751
21755
|
if (err2.code === "ENOENT") {
|
|
@@ -21773,7 +21777,7 @@ var require_file2 = __commonJS({
|
|
|
21773
21777
|
} catch {
|
|
21774
21778
|
}
|
|
21775
21779
|
if (stats && stats.isFile()) return;
|
|
21776
|
-
const dir =
|
|
21780
|
+
const dir = path35.dirname(file);
|
|
21777
21781
|
try {
|
|
21778
21782
|
if (!fs36.statSync(dir).isDirectory()) {
|
|
21779
21783
|
fs36.readdirSync(dir);
|
|
@@ -21797,7 +21801,7 @@ var require_link2 = __commonJS({
|
|
|
21797
21801
|
"../toolkit-lib/node_modules/fs-extra/lib/ensure/link.js"(exports2, module2) {
|
|
21798
21802
|
"use strict";
|
|
21799
21803
|
var u4 = require_universalify().fromCallback;
|
|
21800
|
-
var
|
|
21804
|
+
var path35 = require("path");
|
|
21801
21805
|
var fs36 = require_graceful_fs();
|
|
21802
21806
|
var mkdir = require_mkdirs2();
|
|
21803
21807
|
var pathExists3 = require_path_exists2().pathExists;
|
|
@@ -21817,7 +21821,7 @@ var require_link2 = __commonJS({
|
|
|
21817
21821
|
err2.message = err2.message.replace("lstat", "ensureLink");
|
|
21818
21822
|
return callback(err2);
|
|
21819
21823
|
}
|
|
21820
|
-
const dir =
|
|
21824
|
+
const dir = path35.dirname(dstpath);
|
|
21821
21825
|
pathExists3(dir, (err3, dirExists) => {
|
|
21822
21826
|
if (err3) return callback(err3);
|
|
21823
21827
|
if (dirExists) return makeLink(srcpath, dstpath);
|
|
@@ -21839,7 +21843,7 @@ var require_link2 = __commonJS({
|
|
|
21839
21843
|
err.message = err.message.replace("lstat", "ensureLink");
|
|
21840
21844
|
throw err;
|
|
21841
21845
|
}
|
|
21842
|
-
const dir =
|
|
21846
|
+
const dir = path35.dirname(dstpath);
|
|
21843
21847
|
const dirExists = fs36.existsSync(dir);
|
|
21844
21848
|
if (dirExists) return fs36.linkSync(srcpath, dstpath);
|
|
21845
21849
|
mkdir.mkdirsSync(dir);
|
|
@@ -21857,11 +21861,11 @@ var require_link2 = __commonJS({
|
|
|
21857
21861
|
var require_symlink_paths2 = __commonJS({
|
|
21858
21862
|
"../toolkit-lib/node_modules/fs-extra/lib/ensure/symlink-paths.js"(exports2, module2) {
|
|
21859
21863
|
"use strict";
|
|
21860
|
-
var
|
|
21864
|
+
var path35 = require("path");
|
|
21861
21865
|
var fs36 = require_graceful_fs();
|
|
21862
21866
|
var pathExists3 = require_path_exists2().pathExists;
|
|
21863
21867
|
function symlinkPaths(srcpath, dstpath, callback) {
|
|
21864
|
-
if (
|
|
21868
|
+
if (path35.isAbsolute(srcpath)) {
|
|
21865
21869
|
return fs36.lstat(srcpath, (err) => {
|
|
21866
21870
|
if (err) {
|
|
21867
21871
|
err.message = err.message.replace("lstat", "ensureSymlink");
|
|
@@ -21873,8 +21877,8 @@ var require_symlink_paths2 = __commonJS({
|
|
|
21873
21877
|
});
|
|
21874
21878
|
});
|
|
21875
21879
|
} else {
|
|
21876
|
-
const dstdir =
|
|
21877
|
-
const relativeToDst =
|
|
21880
|
+
const dstdir = path35.dirname(dstpath);
|
|
21881
|
+
const relativeToDst = path35.join(dstdir, srcpath);
|
|
21878
21882
|
return pathExists3(relativeToDst, (err, exists) => {
|
|
21879
21883
|
if (err) return callback(err);
|
|
21880
21884
|
if (exists) {
|
|
@@ -21890,7 +21894,7 @@ var require_symlink_paths2 = __commonJS({
|
|
|
21890
21894
|
}
|
|
21891
21895
|
return callback(null, {
|
|
21892
21896
|
toCwd: srcpath,
|
|
21893
|
-
toDst:
|
|
21897
|
+
toDst: path35.relative(dstdir, srcpath)
|
|
21894
21898
|
});
|
|
21895
21899
|
});
|
|
21896
21900
|
}
|
|
@@ -21900,7 +21904,7 @@ var require_symlink_paths2 = __commonJS({
|
|
|
21900
21904
|
__name(symlinkPaths, "symlinkPaths");
|
|
21901
21905
|
function symlinkPathsSync(srcpath, dstpath) {
|
|
21902
21906
|
let exists;
|
|
21903
|
-
if (
|
|
21907
|
+
if (path35.isAbsolute(srcpath)) {
|
|
21904
21908
|
exists = fs36.existsSync(srcpath);
|
|
21905
21909
|
if (!exists) throw new Error("absolute srcpath does not exist");
|
|
21906
21910
|
return {
|
|
@@ -21908,8 +21912,8 @@ var require_symlink_paths2 = __commonJS({
|
|
|
21908
21912
|
toDst: srcpath
|
|
21909
21913
|
};
|
|
21910
21914
|
} else {
|
|
21911
|
-
const dstdir =
|
|
21912
|
-
const relativeToDst =
|
|
21915
|
+
const dstdir = path35.dirname(dstpath);
|
|
21916
|
+
const relativeToDst = path35.join(dstdir, srcpath);
|
|
21913
21917
|
exists = fs36.existsSync(relativeToDst);
|
|
21914
21918
|
if (exists) {
|
|
21915
21919
|
return {
|
|
@@ -21921,7 +21925,7 @@ var require_symlink_paths2 = __commonJS({
|
|
|
21921
21925
|
if (!exists) throw new Error("relative srcpath does not exist");
|
|
21922
21926
|
return {
|
|
21923
21927
|
toCwd: srcpath,
|
|
21924
|
-
toDst:
|
|
21928
|
+
toDst: path35.relative(dstdir, srcpath)
|
|
21925
21929
|
};
|
|
21926
21930
|
}
|
|
21927
21931
|
}
|
|
@@ -21973,7 +21977,7 @@ var require_symlink2 = __commonJS({
|
|
|
21973
21977
|
"../toolkit-lib/node_modules/fs-extra/lib/ensure/symlink.js"(exports2, module2) {
|
|
21974
21978
|
"use strict";
|
|
21975
21979
|
var u4 = require_universalify().fromCallback;
|
|
21976
|
-
var
|
|
21980
|
+
var path35 = require("path");
|
|
21977
21981
|
var fs36 = require_graceful_fs();
|
|
21978
21982
|
var _mkdirs = require_mkdirs2();
|
|
21979
21983
|
var mkdirs = _mkdirs.mkdirs;
|
|
@@ -21996,7 +22000,7 @@ var require_symlink2 = __commonJS({
|
|
|
21996
22000
|
srcpath = relative6.toDst;
|
|
21997
22001
|
symlinkType(relative6.toCwd, type, (err3, type2) => {
|
|
21998
22002
|
if (err3) return callback(err3);
|
|
21999
|
-
const dir =
|
|
22003
|
+
const dir = path35.dirname(dstpath);
|
|
22000
22004
|
pathExists3(dir, (err4, dirExists) => {
|
|
22001
22005
|
if (err4) return callback(err4);
|
|
22002
22006
|
if (dirExists) return fs36.symlink(srcpath, dstpath, type2, callback);
|
|
@@ -22016,7 +22020,7 @@ var require_symlink2 = __commonJS({
|
|
|
22016
22020
|
const relative6 = symlinkPathsSync(srcpath, dstpath);
|
|
22017
22021
|
srcpath = relative6.toDst;
|
|
22018
22022
|
type = symlinkTypeSync(relative6.toCwd, type);
|
|
22019
|
-
const dir =
|
|
22023
|
+
const dir = path35.dirname(dstpath);
|
|
22020
22024
|
const exists = fs36.existsSync(dir);
|
|
22021
22025
|
if (exists) return fs36.symlinkSync(srcpath, dstpath, type);
|
|
22022
22026
|
mkdirsSync(dir);
|
|
@@ -22078,7 +22082,7 @@ var require_output2 = __commonJS({
|
|
|
22078
22082
|
"use strict";
|
|
22079
22083
|
var u4 = require_universalify().fromCallback;
|
|
22080
22084
|
var fs36 = require_graceful_fs();
|
|
22081
|
-
var
|
|
22085
|
+
var path35 = require("path");
|
|
22082
22086
|
var mkdir = require_mkdirs2();
|
|
22083
22087
|
var pathExists3 = require_path_exists2().pathExists;
|
|
22084
22088
|
function outputFile(file, data2, encoding, callback) {
|
|
@@ -22086,7 +22090,7 @@ var require_output2 = __commonJS({
|
|
|
22086
22090
|
callback = encoding;
|
|
22087
22091
|
encoding = "utf8";
|
|
22088
22092
|
}
|
|
22089
|
-
const dir =
|
|
22093
|
+
const dir = path35.dirname(file);
|
|
22090
22094
|
pathExists3(dir, (err, itDoes) => {
|
|
22091
22095
|
if (err) return callback(err);
|
|
22092
22096
|
if (itDoes) return fs36.writeFile(file, data2, encoding, callback);
|
|
@@ -22098,7 +22102,7 @@ var require_output2 = __commonJS({
|
|
|
22098
22102
|
}
|
|
22099
22103
|
__name(outputFile, "outputFile");
|
|
22100
22104
|
function outputFileSync(file, ...args) {
|
|
22101
|
-
const dir =
|
|
22105
|
+
const dir = path35.dirname(file);
|
|
22102
22106
|
if (fs36.existsSync(dir)) {
|
|
22103
22107
|
return fs36.writeFileSync(file, ...args);
|
|
22104
22108
|
}
|
|
@@ -22166,7 +22170,7 @@ var require_move_sync3 = __commonJS({
|
|
|
22166
22170
|
"../toolkit-lib/node_modules/fs-extra/lib/move-sync/move-sync.js"(exports2, module2) {
|
|
22167
22171
|
"use strict";
|
|
22168
22172
|
var fs36 = require_graceful_fs();
|
|
22169
|
-
var
|
|
22173
|
+
var path35 = require("path");
|
|
22170
22174
|
var copySync = require_copy_sync4().copySync;
|
|
22171
22175
|
var removeSync2 = require_remove2().removeSync;
|
|
22172
22176
|
var mkdirpSync2 = require_mkdirs2().mkdirpSync;
|
|
@@ -22176,7 +22180,7 @@ var require_move_sync3 = __commonJS({
|
|
|
22176
22180
|
const overwrite = opts.overwrite || opts.clobber || false;
|
|
22177
22181
|
const { srcStat } = stat3.checkPathsSync(src, dest, "move");
|
|
22178
22182
|
stat3.checkParentPathsSync(src, srcStat, dest, "move");
|
|
22179
|
-
mkdirpSync2(
|
|
22183
|
+
mkdirpSync2(path35.dirname(dest));
|
|
22180
22184
|
return doRename(src, dest, overwrite);
|
|
22181
22185
|
}
|
|
22182
22186
|
__name(moveSync, "moveSync");
|
|
@@ -22226,7 +22230,7 @@ var require_move3 = __commonJS({
|
|
|
22226
22230
|
"../toolkit-lib/node_modules/fs-extra/lib/move/move.js"(exports2, module2) {
|
|
22227
22231
|
"use strict";
|
|
22228
22232
|
var fs36 = require_graceful_fs();
|
|
22229
|
-
var
|
|
22233
|
+
var path35 = require("path");
|
|
22230
22234
|
var copy = require_copy4().copy;
|
|
22231
22235
|
var remove = require_remove2().remove;
|
|
22232
22236
|
var mkdirp = require_mkdirs2().mkdirp;
|
|
@@ -22243,7 +22247,7 @@ var require_move3 = __commonJS({
|
|
|
22243
22247
|
const { srcStat } = stats;
|
|
22244
22248
|
stat3.checkParentPaths(src, srcStat, dest, "move", (err2) => {
|
|
22245
22249
|
if (err2) return cb(err2);
|
|
22246
|
-
mkdirp(
|
|
22250
|
+
mkdirp(path35.dirname(dest), (err3) => {
|
|
22247
22251
|
if (err3) return cb(err3);
|
|
22248
22252
|
return doRename(src, dest, overwrite, cb);
|
|
22249
22253
|
});
|
|
@@ -26785,12 +26789,12 @@ var init_esm7 = __esm({
|
|
|
26785
26789
|
/**
|
|
26786
26790
|
* Get the Path object referenced by the string path, resolved from this Path
|
|
26787
26791
|
*/
|
|
26788
|
-
resolve(
|
|
26789
|
-
if (!
|
|
26792
|
+
resolve(path35) {
|
|
26793
|
+
if (!path35) {
|
|
26790
26794
|
return this;
|
|
26791
26795
|
}
|
|
26792
|
-
const rootPath = this.getRootString(
|
|
26793
|
-
const dir =
|
|
26796
|
+
const rootPath = this.getRootString(path35);
|
|
26797
|
+
const dir = path35.substring(rootPath.length);
|
|
26794
26798
|
const dirParts = dir.split(this.splitSep);
|
|
26795
26799
|
const result2 = rootPath ? this.getRoot(rootPath).#resolveParts(dirParts) : this.#resolveParts(dirParts);
|
|
26796
26800
|
return result2;
|
|
@@ -27545,8 +27549,8 @@ var init_esm7 = __esm({
|
|
|
27545
27549
|
/**
|
|
27546
27550
|
* @internal
|
|
27547
27551
|
*/
|
|
27548
|
-
getRootString(
|
|
27549
|
-
return import_node_path.win32.parse(
|
|
27552
|
+
getRootString(path35) {
|
|
27553
|
+
return import_node_path.win32.parse(path35).root;
|
|
27550
27554
|
}
|
|
27551
27555
|
/**
|
|
27552
27556
|
* @internal
|
|
@@ -27595,8 +27599,8 @@ var init_esm7 = __esm({
|
|
|
27595
27599
|
/**
|
|
27596
27600
|
* @internal
|
|
27597
27601
|
*/
|
|
27598
|
-
getRootString(
|
|
27599
|
-
return
|
|
27602
|
+
getRootString(path35) {
|
|
27603
|
+
return path35.startsWith("/") ? "/" : "";
|
|
27600
27604
|
}
|
|
27601
27605
|
/**
|
|
27602
27606
|
* @internal
|
|
@@ -27688,11 +27692,11 @@ var init_esm7 = __esm({
|
|
|
27688
27692
|
/**
|
|
27689
27693
|
* Get the depth of a provided path, string, or the cwd
|
|
27690
27694
|
*/
|
|
27691
|
-
depth(
|
|
27692
|
-
if (typeof
|
|
27693
|
-
|
|
27695
|
+
depth(path35 = this.cwd) {
|
|
27696
|
+
if (typeof path35 === "string") {
|
|
27697
|
+
path35 = this.cwd.resolve(path35);
|
|
27694
27698
|
}
|
|
27695
|
-
return
|
|
27699
|
+
return path35.depth();
|
|
27696
27700
|
}
|
|
27697
27701
|
/**
|
|
27698
27702
|
* Return the cache of child entries. Exposed so subclasses can create
|
|
@@ -28179,9 +28183,9 @@ var init_esm7 = __esm({
|
|
|
28179
28183
|
process2();
|
|
28180
28184
|
return results;
|
|
28181
28185
|
}
|
|
28182
|
-
chdir(
|
|
28186
|
+
chdir(path35 = this.cwd) {
|
|
28183
28187
|
const oldCwd = this.cwd;
|
|
28184
|
-
this.cwd = typeof
|
|
28188
|
+
this.cwd = typeof path35 === "string" ? this.cwd.resolve(path35) : path35;
|
|
28185
28189
|
this.cwd[setAsCwd](oldCwd);
|
|
28186
28190
|
}
|
|
28187
28191
|
};
|
|
@@ -28577,8 +28581,8 @@ var init_processor = __esm({
|
|
|
28577
28581
|
}
|
|
28578
28582
|
// match, absolute, ifdir
|
|
28579
28583
|
entries() {
|
|
28580
|
-
return [...this.store.entries()].map(([
|
|
28581
|
-
|
|
28584
|
+
return [...this.store.entries()].map(([path35, n4]) => [
|
|
28585
|
+
path35,
|
|
28582
28586
|
!!(n4 & 2),
|
|
28583
28587
|
!!(n4 & 1)
|
|
28584
28588
|
]);
|
|
@@ -28800,9 +28804,9 @@ var init_walker = __esm({
|
|
|
28800
28804
|
signal;
|
|
28801
28805
|
maxDepth;
|
|
28802
28806
|
includeChildMatches;
|
|
28803
|
-
constructor(patterns,
|
|
28807
|
+
constructor(patterns, path35, opts) {
|
|
28804
28808
|
this.patterns = patterns;
|
|
28805
|
-
this.path =
|
|
28809
|
+
this.path = path35;
|
|
28806
28810
|
this.opts = opts;
|
|
28807
28811
|
this.#sep = !opts.posix && opts.platform === "win32" ? "\\" : "/";
|
|
28808
28812
|
this.includeChildMatches = opts.includeChildMatches !== false;
|
|
@@ -28821,11 +28825,11 @@ var init_walker = __esm({
|
|
|
28821
28825
|
});
|
|
28822
28826
|
}
|
|
28823
28827
|
}
|
|
28824
|
-
#ignored(
|
|
28825
|
-
return this.seen.has(
|
|
28828
|
+
#ignored(path35) {
|
|
28829
|
+
return this.seen.has(path35) || !!this.#ignore?.ignored?.(path35);
|
|
28826
28830
|
}
|
|
28827
|
-
#childrenIgnored(
|
|
28828
|
-
return !!this.#ignore?.childrenIgnored?.(
|
|
28831
|
+
#childrenIgnored(path35) {
|
|
28832
|
+
return !!this.#ignore?.childrenIgnored?.(path35);
|
|
28829
28833
|
}
|
|
28830
28834
|
// backpressure mechanism
|
|
28831
28835
|
pause() {
|
|
@@ -29043,8 +29047,8 @@ var init_walker = __esm({
|
|
|
29043
29047
|
__name(this, "GlobWalker");
|
|
29044
29048
|
}
|
|
29045
29049
|
matches = /* @__PURE__ */ new Set();
|
|
29046
|
-
constructor(patterns,
|
|
29047
|
-
super(patterns,
|
|
29050
|
+
constructor(patterns, path35, opts) {
|
|
29051
|
+
super(patterns, path35, opts);
|
|
29048
29052
|
}
|
|
29049
29053
|
matchEmit(e4) {
|
|
29050
29054
|
this.matches.add(e4);
|
|
@@ -29084,8 +29088,8 @@ var init_walker = __esm({
|
|
|
29084
29088
|
__name(this, "GlobStream");
|
|
29085
29089
|
}
|
|
29086
29090
|
results;
|
|
29087
|
-
constructor(patterns,
|
|
29088
|
-
super(patterns,
|
|
29091
|
+
constructor(patterns, path35, opts) {
|
|
29092
|
+
super(patterns, path35, opts);
|
|
29089
29093
|
this.results = new Minipass({
|
|
29090
29094
|
signal: this.signal,
|
|
29091
29095
|
objectMode: true
|
|
@@ -29838,8 +29842,8 @@ var require_minimatch = __commonJS({
|
|
|
29838
29842
|
return new Minimatch3(pattern, options).match(p4);
|
|
29839
29843
|
};
|
|
29840
29844
|
module2.exports = minimatch3;
|
|
29841
|
-
var
|
|
29842
|
-
minimatch3.sep =
|
|
29845
|
+
var path35 = require_path();
|
|
29846
|
+
minimatch3.sep = path35.sep;
|
|
29843
29847
|
var GLOBSTAR3 = /* @__PURE__ */ Symbol("globstar **");
|
|
29844
29848
|
minimatch3.GLOBSTAR = GLOBSTAR3;
|
|
29845
29849
|
var expand3 = require_brace_expansion();
|
|
@@ -30354,8 +30358,8 @@ var require_minimatch = __commonJS({
|
|
|
30354
30358
|
if (this.empty) return f4 === "";
|
|
30355
30359
|
if (f4 === "/" && partial) return true;
|
|
30356
30360
|
const options = this.options;
|
|
30357
|
-
if (
|
|
30358
|
-
f4 = f4.split(
|
|
30361
|
+
if (path35.sep !== "/") {
|
|
30362
|
+
f4 = f4.split(path35.sep).join("/");
|
|
30359
30363
|
}
|
|
30360
30364
|
f4 = f4.split(slashSplit);
|
|
30361
30365
|
this.debug(this.pattern, "split", f4);
|
|
@@ -30455,8 +30459,8 @@ var require_readdir_glob = __commonJS({
|
|
|
30455
30459
|
});
|
|
30456
30460
|
}
|
|
30457
30461
|
__name(stat3, "stat");
|
|
30458
|
-
async function* exploreWalkAsync(dir,
|
|
30459
|
-
let files = await readdir3(
|
|
30462
|
+
async function* exploreWalkAsync(dir, path35, followSymlinks, useStat, shouldSkip, strict) {
|
|
30463
|
+
let files = await readdir3(path35 + dir, strict);
|
|
30460
30464
|
for (const file of files) {
|
|
30461
30465
|
let name = file.name;
|
|
30462
30466
|
if (name === void 0) {
|
|
@@ -30465,7 +30469,7 @@ var require_readdir_glob = __commonJS({
|
|
|
30465
30469
|
}
|
|
30466
30470
|
const filename = dir + "/" + name;
|
|
30467
30471
|
const relative6 = filename.slice(1);
|
|
30468
|
-
const absolute =
|
|
30472
|
+
const absolute = path35 + "/" + relative6;
|
|
30469
30473
|
let stats = null;
|
|
30470
30474
|
if (useStat || followSymlinks) {
|
|
30471
30475
|
stats = await stat3(absolute, followSymlinks);
|
|
@@ -30479,7 +30483,7 @@ var require_readdir_glob = __commonJS({
|
|
|
30479
30483
|
if (stats.isDirectory()) {
|
|
30480
30484
|
if (!shouldSkip(relative6)) {
|
|
30481
30485
|
yield { relative: relative6, absolute, stats };
|
|
30482
|
-
yield* exploreWalkAsync(filename,
|
|
30486
|
+
yield* exploreWalkAsync(filename, path35, followSymlinks, useStat, shouldSkip, false);
|
|
30483
30487
|
}
|
|
30484
30488
|
} else {
|
|
30485
30489
|
yield { relative: relative6, absolute, stats };
|
|
@@ -30487,8 +30491,8 @@ var require_readdir_glob = __commonJS({
|
|
|
30487
30491
|
}
|
|
30488
30492
|
}
|
|
30489
30493
|
__name(exploreWalkAsync, "exploreWalkAsync");
|
|
30490
|
-
async function* explore(
|
|
30491
|
-
yield* exploreWalkAsync("",
|
|
30494
|
+
async function* explore(path35, followSymlinks, useStat, shouldSkip) {
|
|
30495
|
+
yield* exploreWalkAsync("", path35, followSymlinks, useStat, shouldSkip, true);
|
|
30492
30496
|
}
|
|
30493
30497
|
__name(explore, "explore");
|
|
30494
30498
|
function readOptions(options) {
|
|
@@ -32949,7 +32953,7 @@ var require_BufferList = __commonJS({
|
|
|
32949
32953
|
this.head = this.tail = null;
|
|
32950
32954
|
this.length = 0;
|
|
32951
32955
|
}, "clear");
|
|
32952
|
-
BufferList.prototype.join = /* @__PURE__ */ __name(function
|
|
32956
|
+
BufferList.prototype.join = /* @__PURE__ */ __name(function join28(s4) {
|
|
32953
32957
|
if (this.length === 0) return "";
|
|
32954
32958
|
var p4 = this.head;
|
|
32955
32959
|
var ret = "" + p4.data;
|
|
@@ -43802,11 +43806,11 @@ var require_commonjs = __commonJS({
|
|
|
43802
43806
|
return (f4) => f4.length === len && f4 !== "." && f4 !== "..";
|
|
43803
43807
|
}, "qmarksTestNoExtDot");
|
|
43804
43808
|
var defaultPlatform5 = typeof process === "object" && process ? typeof process.env === "object" && process.env && process.env.__MINIMATCH_TESTING_PLATFORM__ || process.platform : "posix";
|
|
43805
|
-
var
|
|
43809
|
+
var path35 = {
|
|
43806
43810
|
win32: { sep: "\\" },
|
|
43807
43811
|
posix: { sep: "/" }
|
|
43808
43812
|
};
|
|
43809
|
-
exports2.sep = defaultPlatform5 === "win32" ?
|
|
43813
|
+
exports2.sep = defaultPlatform5 === "win32" ? path35.win32.sep : path35.posix.sep;
|
|
43810
43814
|
exports2.minimatch.sep = exports2.sep;
|
|
43811
43815
|
exports2.GLOBSTAR = /* @__PURE__ */ Symbol("globstar **");
|
|
43812
43816
|
exports2.minimatch.GLOBSTAR = exports2.GLOBSTAR;
|
|
@@ -47095,12 +47099,12 @@ var require_commonjs4 = __commonJS({
|
|
|
47095
47099
|
/**
|
|
47096
47100
|
* Get the Path object referenced by the string path, resolved from this Path
|
|
47097
47101
|
*/
|
|
47098
|
-
resolve(
|
|
47099
|
-
if (!
|
|
47102
|
+
resolve(path35) {
|
|
47103
|
+
if (!path35) {
|
|
47100
47104
|
return this;
|
|
47101
47105
|
}
|
|
47102
|
-
const rootPath = this.getRootString(
|
|
47103
|
-
const dir =
|
|
47106
|
+
const rootPath = this.getRootString(path35);
|
|
47107
|
+
const dir = path35.substring(rootPath.length);
|
|
47104
47108
|
const dirParts = dir.split(this.splitSep);
|
|
47105
47109
|
const result2 = rootPath ? this.getRoot(rootPath).#resolveParts(dirParts) : this.#resolveParts(dirParts);
|
|
47106
47110
|
return result2;
|
|
@@ -47856,8 +47860,8 @@ var require_commonjs4 = __commonJS({
|
|
|
47856
47860
|
/**
|
|
47857
47861
|
* @internal
|
|
47858
47862
|
*/
|
|
47859
|
-
getRootString(
|
|
47860
|
-
return node_path_1.win32.parse(
|
|
47863
|
+
getRootString(path35) {
|
|
47864
|
+
return node_path_1.win32.parse(path35).root;
|
|
47861
47865
|
}
|
|
47862
47866
|
/**
|
|
47863
47867
|
* @internal
|
|
@@ -47907,8 +47911,8 @@ var require_commonjs4 = __commonJS({
|
|
|
47907
47911
|
/**
|
|
47908
47912
|
* @internal
|
|
47909
47913
|
*/
|
|
47910
|
-
getRootString(
|
|
47911
|
-
return
|
|
47914
|
+
getRootString(path35) {
|
|
47915
|
+
return path35.startsWith("/") ? "/" : "";
|
|
47912
47916
|
}
|
|
47913
47917
|
/**
|
|
47914
47918
|
* @internal
|
|
@@ -48001,11 +48005,11 @@ var require_commonjs4 = __commonJS({
|
|
|
48001
48005
|
/**
|
|
48002
48006
|
* Get the depth of a provided path, string, or the cwd
|
|
48003
48007
|
*/
|
|
48004
|
-
depth(
|
|
48005
|
-
if (typeof
|
|
48006
|
-
|
|
48008
|
+
depth(path35 = this.cwd) {
|
|
48009
|
+
if (typeof path35 === "string") {
|
|
48010
|
+
path35 = this.cwd.resolve(path35);
|
|
48007
48011
|
}
|
|
48008
|
-
return
|
|
48012
|
+
return path35.depth();
|
|
48009
48013
|
}
|
|
48010
48014
|
/**
|
|
48011
48015
|
* Return the cache of child entries. Exposed so subclasses can create
|
|
@@ -48492,9 +48496,9 @@ var require_commonjs4 = __commonJS({
|
|
|
48492
48496
|
process2();
|
|
48493
48497
|
return results;
|
|
48494
48498
|
}
|
|
48495
|
-
chdir(
|
|
48499
|
+
chdir(path35 = this.cwd) {
|
|
48496
48500
|
const oldCwd = this.cwd;
|
|
48497
|
-
this.cwd = typeof
|
|
48501
|
+
this.cwd = typeof path35 === "string" ? this.cwd.resolve(path35) : path35;
|
|
48498
48502
|
this.cwd[setAsCwd2](oldCwd);
|
|
48499
48503
|
}
|
|
48500
48504
|
};
|
|
@@ -48903,8 +48907,8 @@ var require_processor = __commonJS({
|
|
|
48903
48907
|
}
|
|
48904
48908
|
// match, absolute, ifdir
|
|
48905
48909
|
entries() {
|
|
48906
|
-
return [...this.store.entries()].map(([
|
|
48907
|
-
|
|
48910
|
+
return [...this.store.entries()].map(([path35, n4]) => [
|
|
48911
|
+
path35,
|
|
48908
48912
|
!!(n4 & 2),
|
|
48909
48913
|
!!(n4 & 1)
|
|
48910
48914
|
]);
|
|
@@ -49131,9 +49135,9 @@ var require_walker = __commonJS({
|
|
|
49131
49135
|
signal;
|
|
49132
49136
|
maxDepth;
|
|
49133
49137
|
includeChildMatches;
|
|
49134
|
-
constructor(patterns,
|
|
49138
|
+
constructor(patterns, path35, opts) {
|
|
49135
49139
|
this.patterns = patterns;
|
|
49136
|
-
this.path =
|
|
49140
|
+
this.path = path35;
|
|
49137
49141
|
this.opts = opts;
|
|
49138
49142
|
this.#sep = !opts.posix && opts.platform === "win32" ? "\\" : "/";
|
|
49139
49143
|
this.includeChildMatches = opts.includeChildMatches !== false;
|
|
@@ -49152,11 +49156,11 @@ var require_walker = __commonJS({
|
|
|
49152
49156
|
});
|
|
49153
49157
|
}
|
|
49154
49158
|
}
|
|
49155
|
-
#ignored(
|
|
49156
|
-
return this.seen.has(
|
|
49159
|
+
#ignored(path35) {
|
|
49160
|
+
return this.seen.has(path35) || !!this.#ignore?.ignored?.(path35);
|
|
49157
49161
|
}
|
|
49158
|
-
#childrenIgnored(
|
|
49159
|
-
return !!this.#ignore?.childrenIgnored?.(
|
|
49162
|
+
#childrenIgnored(path35) {
|
|
49163
|
+
return !!this.#ignore?.childrenIgnored?.(path35);
|
|
49160
49164
|
}
|
|
49161
49165
|
// backpressure mechanism
|
|
49162
49166
|
pause() {
|
|
@@ -49375,8 +49379,8 @@ var require_walker = __commonJS({
|
|
|
49375
49379
|
__name(this, "GlobWalker");
|
|
49376
49380
|
}
|
|
49377
49381
|
matches = /* @__PURE__ */ new Set();
|
|
49378
|
-
constructor(patterns,
|
|
49379
|
-
super(patterns,
|
|
49382
|
+
constructor(patterns, path35, opts) {
|
|
49383
|
+
super(patterns, path35, opts);
|
|
49380
49384
|
}
|
|
49381
49385
|
matchEmit(e4) {
|
|
49382
49386
|
this.matches.add(e4);
|
|
@@ -49417,8 +49421,8 @@ var require_walker = __commonJS({
|
|
|
49417
49421
|
__name(this, "GlobStream");
|
|
49418
49422
|
}
|
|
49419
49423
|
results;
|
|
49420
|
-
constructor(patterns,
|
|
49421
|
-
super(patterns,
|
|
49424
|
+
constructor(patterns, path35, opts) {
|
|
49425
|
+
super(patterns, path35, opts);
|
|
49422
49426
|
this.results = new minipass_1.Minipass({
|
|
49423
49427
|
signal: this.signal,
|
|
49424
49428
|
objectMode: true
|
|
@@ -49783,7 +49787,7 @@ var require_commonjs5 = __commonJS({
|
|
|
49783
49787
|
var require_file3 = __commonJS({
|
|
49784
49788
|
"../../../node_modules/archiver-utils/file.js"(exports2, module2) {
|
|
49785
49789
|
var fs36 = require_graceful_fs();
|
|
49786
|
-
var
|
|
49790
|
+
var path35 = require("path");
|
|
49787
49791
|
var flatten4 = require_flatten();
|
|
49788
49792
|
var difference2 = require_difference();
|
|
49789
49793
|
var union = require_union();
|
|
@@ -49808,7 +49812,7 @@ var require_file3 = __commonJS({
|
|
|
49808
49812
|
return result2;
|
|
49809
49813
|
}, "processPatterns");
|
|
49810
49814
|
file.exists = function() {
|
|
49811
|
-
var filepath =
|
|
49815
|
+
var filepath = path35.join.apply(path35, arguments);
|
|
49812
49816
|
return fs36.existsSync(filepath);
|
|
49813
49817
|
};
|
|
49814
49818
|
file.expand = function(...args) {
|
|
@@ -49822,7 +49826,7 @@ var require_file3 = __commonJS({
|
|
|
49822
49826
|
});
|
|
49823
49827
|
if (options.filter) {
|
|
49824
49828
|
matches = matches.filter(function(filepath) {
|
|
49825
|
-
filepath =
|
|
49829
|
+
filepath = path35.join(options.cwd || "", filepath);
|
|
49826
49830
|
try {
|
|
49827
49831
|
if (typeof options.filter === "function") {
|
|
49828
49832
|
return options.filter(filepath);
|
|
@@ -49839,7 +49843,7 @@ var require_file3 = __commonJS({
|
|
|
49839
49843
|
file.expandMapping = function(patterns, destBase, options) {
|
|
49840
49844
|
options = Object.assign({
|
|
49841
49845
|
rename: /* @__PURE__ */ __name(function(destBase2, destPath) {
|
|
49842
|
-
return
|
|
49846
|
+
return path35.join(destBase2 || "", destPath);
|
|
49843
49847
|
}, "rename")
|
|
49844
49848
|
}, options);
|
|
49845
49849
|
var files = [];
|
|
@@ -49847,14 +49851,14 @@ var require_file3 = __commonJS({
|
|
|
49847
49851
|
file.expand(options, patterns).forEach(function(src) {
|
|
49848
49852
|
var destPath = src;
|
|
49849
49853
|
if (options.flatten) {
|
|
49850
|
-
destPath =
|
|
49854
|
+
destPath = path35.basename(destPath);
|
|
49851
49855
|
}
|
|
49852
49856
|
if (options.ext) {
|
|
49853
49857
|
destPath = destPath.replace(/(\.[^\/]*)?$/, options.ext);
|
|
49854
49858
|
}
|
|
49855
49859
|
var dest = options.rename(destBase, destPath, options);
|
|
49856
49860
|
if (options.cwd) {
|
|
49857
|
-
src =
|
|
49861
|
+
src = path35.join(options.cwd, src);
|
|
49858
49862
|
}
|
|
49859
49863
|
dest = dest.replace(pathSeparatorRe, "/");
|
|
49860
49864
|
src = src.replace(pathSeparatorRe, "/");
|
|
@@ -49936,7 +49940,7 @@ var require_file3 = __commonJS({
|
|
|
49936
49940
|
var require_archiver_utils = __commonJS({
|
|
49937
49941
|
"../../../node_modules/archiver-utils/index.js"(exports2, module2) {
|
|
49938
49942
|
var fs36 = require_graceful_fs();
|
|
49939
|
-
var
|
|
49943
|
+
var path35 = require("path");
|
|
49940
49944
|
var isStream2 = require_is_stream();
|
|
49941
49945
|
var lazystream = require_lazystream();
|
|
49942
49946
|
var normalizePath = require_normalize_path();
|
|
@@ -50024,11 +50028,11 @@ var require_archiver_utils = __commonJS({
|
|
|
50024
50028
|
if (!file) {
|
|
50025
50029
|
return callback(null, results);
|
|
50026
50030
|
}
|
|
50027
|
-
filepath =
|
|
50031
|
+
filepath = path35.join(dirpath, file);
|
|
50028
50032
|
fs36.stat(filepath, function(err2, stats) {
|
|
50029
50033
|
results.push({
|
|
50030
50034
|
path: filepath,
|
|
50031
|
-
relative:
|
|
50035
|
+
relative: path35.relative(base, filepath).replace(/\\/g, "/"),
|
|
50032
50036
|
stats
|
|
50033
50037
|
});
|
|
50034
50038
|
if (stats && stats.isDirectory()) {
|
|
@@ -55758,7 +55762,7 @@ var require_core = __commonJS({
|
|
|
55758
55762
|
var fs36 = require("fs");
|
|
55759
55763
|
var glob2 = require_readdir_glob();
|
|
55760
55764
|
var async = require_async();
|
|
55761
|
-
var
|
|
55765
|
+
var path35 = require("path");
|
|
55762
55766
|
var util9 = require_archiver_utils();
|
|
55763
55767
|
var inherits = require("util").inherits;
|
|
55764
55768
|
var ArchiverError = require_error2();
|
|
@@ -56034,9 +56038,9 @@ var require_core = __commonJS({
|
|
|
56034
56038
|
task.source = Buffer.concat([]);
|
|
56035
56039
|
} else if (stats.isSymbolicLink() && this._moduleSupports("symlink")) {
|
|
56036
56040
|
var linkPath = fs36.readlinkSync(task.filepath);
|
|
56037
|
-
var dirName =
|
|
56041
|
+
var dirName = path35.dirname(task.filepath);
|
|
56038
56042
|
task.data.type = "symlink";
|
|
56039
|
-
task.data.linkname =
|
|
56043
|
+
task.data.linkname = path35.relative(dirName, path35.resolve(dirName, linkPath));
|
|
56040
56044
|
task.data.sourceType = "buffer";
|
|
56041
56045
|
task.source = Buffer.concat([]);
|
|
56042
56046
|
} else {
|
|
@@ -71912,13 +71916,13 @@ function getResultObj(jsonObject, identifier, propertiesToReturn) {
|
|
|
71912
71916
|
Object.assign(propsObj, { ["Identifier"]: identifier });
|
|
71913
71917
|
return propsObj;
|
|
71914
71918
|
}
|
|
71915
|
-
function findJsonValue(jsonObject,
|
|
71916
|
-
const paths =
|
|
71919
|
+
function findJsonValue(jsonObject, path35) {
|
|
71920
|
+
const paths = path35.split(".");
|
|
71917
71921
|
let obj = jsonObject;
|
|
71918
71922
|
paths.forEach((p4) => {
|
|
71919
71923
|
obj = obj[p4];
|
|
71920
71924
|
if (obj === void 0) {
|
|
71921
|
-
throw new TypeError(`Cannot read field ${
|
|
71925
|
+
throw new TypeError(`Cannot read field ${path35}. ${p4} is not found.`);
|
|
71922
71926
|
}
|
|
71923
71927
|
});
|
|
71924
71928
|
return obj;
|
|
@@ -72029,21 +72033,21 @@ function makeObject(pairs) {
|
|
|
72029
72033
|
}
|
|
72030
72034
|
return ret;
|
|
72031
72035
|
}
|
|
72032
|
-
function deepGet(x4,
|
|
72033
|
-
|
|
72034
|
-
while (
|
|
72035
|
-
const key =
|
|
72036
|
+
function deepGet(x4, path35) {
|
|
72037
|
+
path35 = path35.slice();
|
|
72038
|
+
while (path35.length > 0 && isObject(x4)) {
|
|
72039
|
+
const key = path35.shift();
|
|
72036
72040
|
x4 = x4[key];
|
|
72037
72041
|
}
|
|
72038
|
-
return
|
|
72042
|
+
return path35.length === 0 ? x4 : void 0;
|
|
72039
72043
|
}
|
|
72040
|
-
function deepSet(x4,
|
|
72041
|
-
|
|
72042
|
-
if (
|
|
72044
|
+
function deepSet(x4, path35, value) {
|
|
72045
|
+
path35 = path35.slice();
|
|
72046
|
+
if (path35.length === 0) {
|
|
72043
72047
|
throw new ToolkitError("Path may not be empty");
|
|
72044
72048
|
}
|
|
72045
|
-
while (
|
|
72046
|
-
const key =
|
|
72049
|
+
while (path35.length > 1 && isObject(x4)) {
|
|
72050
|
+
const key = path35.shift();
|
|
72047
72051
|
if (isPrototypePollutingKey(key)) {
|
|
72048
72052
|
continue;
|
|
72049
72053
|
}
|
|
@@ -72055,7 +72059,7 @@ function deepSet(x4, path34, value) {
|
|
|
72055
72059
|
if (!isObject(x4)) {
|
|
72056
72060
|
throw new ToolkitError(`Expected an object, got '${x4}'`);
|
|
72057
72061
|
}
|
|
72058
|
-
const finalKey =
|
|
72062
|
+
const finalKey = path35[0];
|
|
72059
72063
|
if (isPrototypePollutingKey(finalKey)) {
|
|
72060
72064
|
return;
|
|
72061
72065
|
}
|
|
@@ -74468,10 +74472,10 @@ ${indent}${str}`;
|
|
|
74468
74472
|
return String(this.value);
|
|
74469
74473
|
}
|
|
74470
74474
|
};
|
|
74471
|
-
function collectionFromPath(schema,
|
|
74475
|
+
function collectionFromPath(schema, path35, value) {
|
|
74472
74476
|
let v5 = value;
|
|
74473
|
-
for (let i4 =
|
|
74474
|
-
const k4 =
|
|
74477
|
+
for (let i4 = path35.length - 1; i4 >= 0; --i4) {
|
|
74478
|
+
const k4 = path35[i4];
|
|
74475
74479
|
if (Number.isInteger(k4) && k4 >= 0) {
|
|
74476
74480
|
const a4 = [];
|
|
74477
74481
|
a4[k4] = v5;
|
|
@@ -74490,7 +74494,7 @@ ${indent}${str}`;
|
|
|
74490
74494
|
return schema.createNode(v5, false);
|
|
74491
74495
|
}
|
|
74492
74496
|
__name(collectionFromPath, "collectionFromPath");
|
|
74493
|
-
var isEmptyPath = /* @__PURE__ */ __name((
|
|
74497
|
+
var isEmptyPath = /* @__PURE__ */ __name((path35) => path35 == null || typeof path35 === "object" && path35[Symbol.iterator]().next().done, "isEmptyPath");
|
|
74494
74498
|
var Collection2 = class _Collection extends Node2 {
|
|
74495
74499
|
static {
|
|
74496
74500
|
__name(this, "Collection");
|
|
@@ -74500,10 +74504,10 @@ ${indent}${str}`;
|
|
|
74500
74504
|
PlainValue._defineProperty(this, "items", []);
|
|
74501
74505
|
this.schema = schema;
|
|
74502
74506
|
}
|
|
74503
|
-
addIn(
|
|
74504
|
-
if (isEmptyPath(
|
|
74507
|
+
addIn(path35, value) {
|
|
74508
|
+
if (isEmptyPath(path35)) this.add(value);
|
|
74505
74509
|
else {
|
|
74506
|
-
const [key, ...rest] =
|
|
74510
|
+
const [key, ...rest] = path35;
|
|
74507
74511
|
const node = this.get(key, true);
|
|
74508
74512
|
if (node instanceof _Collection) node.addIn(rest, value);
|
|
74509
74513
|
else if (node === void 0 && this.schema) this.set(key, collectionFromPath(this.schema, rest, value));
|
|
@@ -76601,8 +76605,8 @@ ${pair.comment}` : item.comment;
|
|
|
76601
76605
|
__name(warn2, "warn");
|
|
76602
76606
|
function warnFileDeprecation(filename) {
|
|
76603
76607
|
if (shouldWarn2(true)) {
|
|
76604
|
-
const
|
|
76605
|
-
warn2(`The endpoint 'yaml/${
|
|
76608
|
+
const path35 = filename.replace(/.*yaml[/\\]/i, "").replace(/\.js$/, "").replace(/\\/g, "/");
|
|
76609
|
+
warn2(`The endpoint 'yaml/${path35}' will be removed in a future release.`, "DeprecationWarning");
|
|
76606
76610
|
}
|
|
76607
76611
|
}
|
|
76608
76612
|
__name(warnFileDeprecation, "warnFileDeprecation");
|
|
@@ -77541,22 +77545,22 @@ ${cbNode.commentBefore}` : cb;
|
|
|
77541
77545
|
assertCollection(this.contents);
|
|
77542
77546
|
return this.contents.add(value);
|
|
77543
77547
|
}
|
|
77544
|
-
addIn(
|
|
77548
|
+
addIn(path35, value) {
|
|
77545
77549
|
assertCollection(this.contents);
|
|
77546
|
-
this.contents.addIn(
|
|
77550
|
+
this.contents.addIn(path35, value);
|
|
77547
77551
|
}
|
|
77548
77552
|
delete(key) {
|
|
77549
77553
|
assertCollection(this.contents);
|
|
77550
77554
|
return this.contents.delete(key);
|
|
77551
77555
|
}
|
|
77552
|
-
deleteIn(
|
|
77553
|
-
if (resolveSeq.isEmptyPath(
|
|
77556
|
+
deleteIn(path35) {
|
|
77557
|
+
if (resolveSeq.isEmptyPath(path35)) {
|
|
77554
77558
|
if (this.contents == null) return false;
|
|
77555
77559
|
this.contents = null;
|
|
77556
77560
|
return true;
|
|
77557
77561
|
}
|
|
77558
77562
|
assertCollection(this.contents);
|
|
77559
|
-
return this.contents.deleteIn(
|
|
77563
|
+
return this.contents.deleteIn(path35);
|
|
77560
77564
|
}
|
|
77561
77565
|
getDefaults() {
|
|
77562
77566
|
return _Document.defaults[this.version] || _Document.defaults[this.options.version] || {};
|
|
@@ -77564,26 +77568,26 @@ ${cbNode.commentBefore}` : cb;
|
|
|
77564
77568
|
get(key, keepScalar) {
|
|
77565
77569
|
return this.contents instanceof resolveSeq.Collection ? this.contents.get(key, keepScalar) : void 0;
|
|
77566
77570
|
}
|
|
77567
|
-
getIn(
|
|
77568
|
-
if (resolveSeq.isEmptyPath(
|
|
77569
|
-
return this.contents instanceof resolveSeq.Collection ? this.contents.getIn(
|
|
77571
|
+
getIn(path35, keepScalar) {
|
|
77572
|
+
if (resolveSeq.isEmptyPath(path35)) return !keepScalar && this.contents instanceof resolveSeq.Scalar ? this.contents.value : this.contents;
|
|
77573
|
+
return this.contents instanceof resolveSeq.Collection ? this.contents.getIn(path35, keepScalar) : void 0;
|
|
77570
77574
|
}
|
|
77571
77575
|
has(key) {
|
|
77572
77576
|
return this.contents instanceof resolveSeq.Collection ? this.contents.has(key) : false;
|
|
77573
77577
|
}
|
|
77574
|
-
hasIn(
|
|
77575
|
-
if (resolveSeq.isEmptyPath(
|
|
77576
|
-
return this.contents instanceof resolveSeq.Collection ? this.contents.hasIn(
|
|
77578
|
+
hasIn(path35) {
|
|
77579
|
+
if (resolveSeq.isEmptyPath(path35)) return this.contents !== void 0;
|
|
77580
|
+
return this.contents instanceof resolveSeq.Collection ? this.contents.hasIn(path35) : false;
|
|
77577
77581
|
}
|
|
77578
77582
|
set(key, value) {
|
|
77579
77583
|
assertCollection(this.contents);
|
|
77580
77584
|
this.contents.set(key, value);
|
|
77581
77585
|
}
|
|
77582
|
-
setIn(
|
|
77583
|
-
if (resolveSeq.isEmptyPath(
|
|
77586
|
+
setIn(path35, value) {
|
|
77587
|
+
if (resolveSeq.isEmptyPath(path35)) this.contents = value;
|
|
77584
77588
|
else {
|
|
77585
77589
|
assertCollection(this.contents);
|
|
77586
|
-
this.contents.setIn(
|
|
77590
|
+
this.contents.setIn(path35, value);
|
|
77587
77591
|
}
|
|
77588
77592
|
}
|
|
77589
77593
|
setSchema(id, customTags) {
|
|
@@ -82434,9 +82438,9 @@ var init_createPaginator = __esm({
|
|
|
82434
82438
|
return await client.send(command, ...args);
|
|
82435
82439
|
}, "makePagedClientRequest");
|
|
82436
82440
|
__name(createPaginator, "createPaginator");
|
|
82437
|
-
get = /* @__PURE__ */ __name((fromObject,
|
|
82441
|
+
get = /* @__PURE__ */ __name((fromObject, path35) => {
|
|
82438
82442
|
let cursor2 = fromObject;
|
|
82439
|
-
const pathComponents =
|
|
82443
|
+
const pathComponents = path35.split(".");
|
|
82440
82444
|
for (const step of pathComponents) {
|
|
82441
82445
|
if (!cursor2 || typeof cursor2 !== "object") {
|
|
82442
82446
|
return void 0;
|
|
@@ -83425,12 +83429,12 @@ or increase socketAcquisitionWarningTimeout=(millis) in the NodeHttpHandler conf
|
|
|
83425
83429
|
const password = request3.password ?? "";
|
|
83426
83430
|
auth = `${username}:${password}`;
|
|
83427
83431
|
}
|
|
83428
|
-
let
|
|
83432
|
+
let path35 = request3.path;
|
|
83429
83433
|
if (queryString) {
|
|
83430
|
-
|
|
83434
|
+
path35 += `?${queryString}`;
|
|
83431
83435
|
}
|
|
83432
83436
|
if (request3.fragment) {
|
|
83433
|
-
|
|
83437
|
+
path35 += `#${request3.fragment}`;
|
|
83434
83438
|
}
|
|
83435
83439
|
let hostname = request3.hostname ?? "";
|
|
83436
83440
|
if (hostname[0] === "[" && hostname.endsWith("]")) {
|
|
@@ -83442,7 +83446,7 @@ or increase socketAcquisitionWarningTimeout=(millis) in the NodeHttpHandler conf
|
|
|
83442
83446
|
headers: request3.headers,
|
|
83443
83447
|
host: hostname,
|
|
83444
83448
|
method: request3.method,
|
|
83445
|
-
path:
|
|
83449
|
+
path: path35,
|
|
83446
83450
|
port: request3.port,
|
|
83447
83451
|
agent,
|
|
83448
83452
|
auth
|
|
@@ -83706,16 +83710,16 @@ or increase socketAcquisitionWarningTimeout=(millis) in the NodeHttpHandler conf
|
|
|
83706
83710
|
reject(err);
|
|
83707
83711
|
}, "rejectWithDestroy");
|
|
83708
83712
|
const queryString = querystringBuilder.buildQueryString(query || {});
|
|
83709
|
-
let
|
|
83713
|
+
let path35 = request3.path;
|
|
83710
83714
|
if (queryString) {
|
|
83711
|
-
|
|
83715
|
+
path35 += `?${queryString}`;
|
|
83712
83716
|
}
|
|
83713
83717
|
if (request3.fragment) {
|
|
83714
|
-
|
|
83718
|
+
path35 += `#${request3.fragment}`;
|
|
83715
83719
|
}
|
|
83716
83720
|
const req = session.request({
|
|
83717
83721
|
...request3.headers,
|
|
83718
|
-
[http2.constants.HTTP2_HEADER_PATH]:
|
|
83722
|
+
[http2.constants.HTTP2_HEADER_PATH]: path35,
|
|
83719
83723
|
[http2.constants.HTTP2_HEADER_METHOD]: method
|
|
83720
83724
|
});
|
|
83721
83725
|
session.ref();
|
|
@@ -83913,13 +83917,13 @@ var require_dist_cjs15 = __commonJS({
|
|
|
83913
83917
|
abortError.name = "AbortError";
|
|
83914
83918
|
return Promise.reject(abortError);
|
|
83915
83919
|
}
|
|
83916
|
-
let
|
|
83920
|
+
let path35 = request3.path;
|
|
83917
83921
|
const queryString = querystringBuilder.buildQueryString(request3.query || {});
|
|
83918
83922
|
if (queryString) {
|
|
83919
|
-
|
|
83923
|
+
path35 += `?${queryString}`;
|
|
83920
83924
|
}
|
|
83921
83925
|
if (request3.fragment) {
|
|
83922
|
-
|
|
83926
|
+
path35 += `#${request3.fragment}`;
|
|
83923
83927
|
}
|
|
83924
83928
|
let auth = "";
|
|
83925
83929
|
if (request3.username != null || request3.password != null) {
|
|
@@ -83928,7 +83932,7 @@ var require_dist_cjs15 = __commonJS({
|
|
|
83928
83932
|
auth = `${username}:${password}@`;
|
|
83929
83933
|
}
|
|
83930
83934
|
const { port, method } = request3;
|
|
83931
|
-
const url = `${request3.protocol}//${auth}${request3.hostname}${port ? `:${port}` : ""}${
|
|
83935
|
+
const url = `${request3.protocol}//${auth}${request3.hostname}${port ? `:${port}` : ""}${path35}`;
|
|
83932
83936
|
const body = method === "GET" || method === "HEAD" ? void 0 : request3.body;
|
|
83933
83937
|
const requestOptions = {
|
|
83934
83938
|
body,
|
|
@@ -86052,13 +86056,13 @@ function __disposeResources(env) {
|
|
|
86052
86056
|
__name(next, "next");
|
|
86053
86057
|
return next();
|
|
86054
86058
|
}
|
|
86055
|
-
function __rewriteRelativeImportExtension(
|
|
86056
|
-
if (typeof
|
|
86057
|
-
return
|
|
86059
|
+
function __rewriteRelativeImportExtension(path35, preserveJsx) {
|
|
86060
|
+
if (typeof path35 === "string" && /^\.\.?\//.test(path35)) {
|
|
86061
|
+
return path35.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function(m4, tsx, d4, ext3, cm) {
|
|
86058
86062
|
return tsx ? preserveJsx ? ".jsx" : ".js" : d4 && (!ext3 || !cm) ? m4 : d4 + ext3 + "." + cm.toLowerCase() + "js";
|
|
86059
86063
|
});
|
|
86060
86064
|
}
|
|
86061
|
-
return
|
|
86065
|
+
return path35;
|
|
86062
86066
|
}
|
|
86063
86067
|
var extendStatics, __assign, __createBinding, __setModuleDefault, ownKeys, _SuppressedError, tslib_es6_default;
|
|
86064
86068
|
var init_tslib_es6 = __esm({
|
|
@@ -86979,11 +86983,11 @@ var init_HttpBindingProtocol = __esm({
|
|
|
86979
86983
|
const opTraits = translateTraits(operationSchema.traits);
|
|
86980
86984
|
if (opTraits.http) {
|
|
86981
86985
|
request3.method = opTraits.http[0];
|
|
86982
|
-
const [
|
|
86986
|
+
const [path35, search] = opTraits.http[1].split("?");
|
|
86983
86987
|
if (request3.path == "/") {
|
|
86984
|
-
request3.path =
|
|
86988
|
+
request3.path = path35;
|
|
86985
86989
|
} else {
|
|
86986
|
-
request3.path +=
|
|
86990
|
+
request3.path += path35;
|
|
86987
86991
|
}
|
|
86988
86992
|
const traitSearchParams = new URLSearchParams(search ?? "");
|
|
86989
86993
|
Object.assign(query, Object.fromEntries(traitSearchParams));
|
|
@@ -87368,8 +87372,8 @@ var init_requestBuilder = __esm({
|
|
|
87368
87372
|
return this;
|
|
87369
87373
|
}
|
|
87370
87374
|
p(memberName, labelValueProvider, uriLabel, isGreedyLabel) {
|
|
87371
|
-
this.resolvePathStack.push((
|
|
87372
|
-
this.path = resolvedPath(
|
|
87375
|
+
this.resolvePathStack.push((path35) => {
|
|
87376
|
+
this.path = resolvedPath(path35, this.input, memberName, labelValueProvider, uriLabel, isGreedyLabel);
|
|
87373
87377
|
});
|
|
87374
87378
|
return this;
|
|
87375
87379
|
}
|
|
@@ -88052,18 +88056,18 @@ var require_dist_cjs19 = __commonJS({
|
|
|
88052
88056
|
}
|
|
88053
88057
|
};
|
|
88054
88058
|
var booleanEquals = /* @__PURE__ */ __name((value1, value2) => value1 === value2, "booleanEquals");
|
|
88055
|
-
var getAttrPathList = /* @__PURE__ */ __name((
|
|
88056
|
-
const parts =
|
|
88059
|
+
var getAttrPathList = /* @__PURE__ */ __name((path35) => {
|
|
88060
|
+
const parts = path35.split(".");
|
|
88057
88061
|
const pathList = [];
|
|
88058
88062
|
for (const part of parts) {
|
|
88059
88063
|
const squareBracketIndex = part.indexOf("[");
|
|
88060
88064
|
if (squareBracketIndex !== -1) {
|
|
88061
88065
|
if (part.indexOf("]") !== part.length - 1) {
|
|
88062
|
-
throw new EndpointError(`Path: '${
|
|
88066
|
+
throw new EndpointError(`Path: '${path35}' does not end with ']'`);
|
|
88063
88067
|
}
|
|
88064
88068
|
const arrayIndex = part.slice(squareBracketIndex + 1, -1);
|
|
88065
88069
|
if (Number.isNaN(parseInt(arrayIndex))) {
|
|
88066
|
-
throw new EndpointError(`Invalid array index: '${arrayIndex}' in path: '${
|
|
88070
|
+
throw new EndpointError(`Invalid array index: '${arrayIndex}' in path: '${path35}'`);
|
|
88067
88071
|
}
|
|
88068
88072
|
if (squareBracketIndex !== 0) {
|
|
88069
88073
|
pathList.push(part.slice(0, squareBracketIndex));
|
|
@@ -88075,9 +88079,9 @@ var require_dist_cjs19 = __commonJS({
|
|
|
88075
88079
|
}
|
|
88076
88080
|
return pathList;
|
|
88077
88081
|
}, "getAttrPathList");
|
|
88078
|
-
var getAttr = /* @__PURE__ */ __name((value,
|
|
88082
|
+
var getAttr = /* @__PURE__ */ __name((value, path35) => getAttrPathList(path35).reduce((acc, index) => {
|
|
88079
88083
|
if (typeof acc !== "object") {
|
|
88080
|
-
throw new EndpointError(`Index '${index}' in '${
|
|
88084
|
+
throw new EndpointError(`Index '${index}' in '${path35}' not found in '${JSON.stringify(value)}'`);
|
|
88081
88085
|
} else if (Array.isArray(acc)) {
|
|
88082
88086
|
return acc[parseInt(index)];
|
|
88083
88087
|
}
|
|
@@ -88096,8 +88100,8 @@ var require_dist_cjs19 = __commonJS({
|
|
|
88096
88100
|
return value;
|
|
88097
88101
|
}
|
|
88098
88102
|
if (typeof value === "object" && "hostname" in value) {
|
|
88099
|
-
const { hostname: hostname2, port, protocol: protocol2 = "", path:
|
|
88100
|
-
const url = new URL(`${protocol2}//${hostname2}${port ? `:${port}` : ""}${
|
|
88103
|
+
const { hostname: hostname2, port, protocol: protocol2 = "", path: path35 = "", query = {} } = value;
|
|
88104
|
+
const url = new URL(`${protocol2}//${hostname2}${port ? `:${port}` : ""}${path35}`);
|
|
88101
88105
|
url.search = Object.entries(query).map(([k4, v5]) => `${k4}=${v5}`).join("&");
|
|
88102
88106
|
return url;
|
|
88103
88107
|
}
|
|
@@ -89641,10 +89645,10 @@ ${longDate}
|
|
|
89641
89645
|
${credentialScope}
|
|
89642
89646
|
${utilHexEncoding.toHex(hashedRequest)}`;
|
|
89643
89647
|
}
|
|
89644
|
-
getCanonicalPath({ path:
|
|
89648
|
+
getCanonicalPath({ path: path35 }) {
|
|
89645
89649
|
if (this.uriEscapePath) {
|
|
89646
89650
|
const normalizedPathSegments = [];
|
|
89647
|
-
for (const pathSegment of
|
|
89651
|
+
for (const pathSegment of path35.split("/")) {
|
|
89648
89652
|
if (pathSegment?.length === 0)
|
|
89649
89653
|
continue;
|
|
89650
89654
|
if (pathSegment === ".")
|
|
@@ -89655,11 +89659,11 @@ ${utilHexEncoding.toHex(hashedRequest)}`;
|
|
|
89655
89659
|
normalizedPathSegments.push(pathSegment);
|
|
89656
89660
|
}
|
|
89657
89661
|
}
|
|
89658
|
-
const normalizedPath = `${
|
|
89662
|
+
const normalizedPath = `${path35?.startsWith("/") ? "/" : ""}${normalizedPathSegments.join("/")}${normalizedPathSegments.length > 0 && path35?.endsWith("/") ? "/" : ""}`;
|
|
89659
89663
|
const doubleEncoded = utilUriEscape.escapeUri(normalizedPath);
|
|
89660
89664
|
return doubleEncoded.replace(/%2F/g, "/");
|
|
89661
89665
|
}
|
|
89662
|
-
return
|
|
89666
|
+
return path35;
|
|
89663
89667
|
}
|
|
89664
89668
|
validateResolvedCredentials(credentials) {
|
|
89665
89669
|
if (typeof credentials !== "object" || typeof credentials.accessKeyId !== "string" || typeof credentials.secretAccessKey !== "string") {
|
|
@@ -90967,11 +90971,11 @@ var init_SmithyRpcV2CborProtocol = __esm({
|
|
|
90967
90971
|
}
|
|
90968
90972
|
}
|
|
90969
90973
|
const { service, operation: operation2 } = (0, import_util_middleware5.getSmithyContext)(context);
|
|
90970
|
-
const
|
|
90974
|
+
const path35 = `/service/${service}/operation/${operation2}`;
|
|
90971
90975
|
if (request3.path.endsWith("/")) {
|
|
90972
|
-
request3.path +=
|
|
90976
|
+
request3.path += path35.slice(1);
|
|
90973
90977
|
} else {
|
|
90974
|
-
request3.path +=
|
|
90978
|
+
request3.path += path35;
|
|
90975
90979
|
}
|
|
90976
90980
|
return request3;
|
|
90977
90981
|
}
|
|
@@ -95449,14 +95453,14 @@ var require_readFile = __commonJS({
|
|
|
95449
95453
|
var promises_1 = require("node:fs/promises");
|
|
95450
95454
|
exports2.filePromises = {};
|
|
95451
95455
|
exports2.fileIntercept = {};
|
|
95452
|
-
var readFile2 = /* @__PURE__ */ __name((
|
|
95453
|
-
if (exports2.fileIntercept[
|
|
95454
|
-
return exports2.fileIntercept[
|
|
95456
|
+
var readFile2 = /* @__PURE__ */ __name((path35, options) => {
|
|
95457
|
+
if (exports2.fileIntercept[path35] !== void 0) {
|
|
95458
|
+
return exports2.fileIntercept[path35];
|
|
95455
95459
|
}
|
|
95456
|
-
if (!exports2.filePromises[
|
|
95457
|
-
exports2.filePromises[
|
|
95460
|
+
if (!exports2.filePromises[path35] || options?.ignoreCache) {
|
|
95461
|
+
exports2.filePromises[path35] = (0, promises_1.readFile)(path35, "utf8");
|
|
95458
95462
|
}
|
|
95459
|
-
return exports2.filePromises[
|
|
95463
|
+
return exports2.filePromises[path35];
|
|
95460
95464
|
}, "readFile");
|
|
95461
95465
|
exports2.readFile = readFile2;
|
|
95462
95466
|
}
|
|
@@ -95469,7 +95473,7 @@ var require_dist_cjs32 = __commonJS({
|
|
|
95469
95473
|
var getHomeDir = require_getHomeDir();
|
|
95470
95474
|
var getSSOTokenFilepath = require_getSSOTokenFilepath();
|
|
95471
95475
|
var getSSOTokenFromFile = require_getSSOTokenFromFile();
|
|
95472
|
-
var
|
|
95476
|
+
var path35 = require("path");
|
|
95473
95477
|
var types4 = require_dist_cjs();
|
|
95474
95478
|
var readFile2 = require_readFile();
|
|
95475
95479
|
var ENV_PROFILE = "AWS_PROFILE";
|
|
@@ -95491,9 +95495,9 @@ var require_dist_cjs32 = __commonJS({
|
|
|
95491
95495
|
...data2.default && { default: data2.default }
|
|
95492
95496
|
}), "getConfigData");
|
|
95493
95497
|
var ENV_CONFIG_PATH = "AWS_CONFIG_FILE";
|
|
95494
|
-
var getConfigFilepath = /* @__PURE__ */ __name(() => process.env[ENV_CONFIG_PATH] ||
|
|
95498
|
+
var getConfigFilepath = /* @__PURE__ */ __name(() => process.env[ENV_CONFIG_PATH] || path35.join(getHomeDir.getHomeDir(), ".aws", "config"), "getConfigFilepath");
|
|
95495
95499
|
var ENV_CREDENTIALS_PATH = "AWS_SHARED_CREDENTIALS_FILE";
|
|
95496
|
-
var getCredentialsFilepath = /* @__PURE__ */ __name(() => process.env[ENV_CREDENTIALS_PATH] ||
|
|
95500
|
+
var getCredentialsFilepath = /* @__PURE__ */ __name(() => process.env[ENV_CREDENTIALS_PATH] || path35.join(getHomeDir.getHomeDir(), ".aws", "credentials"), "getCredentialsFilepath");
|
|
95497
95501
|
var prefixKeyRegex = /^([\w-]+)\s(["'])?([\w-@\+\.%:/]+)\2$/;
|
|
95498
95502
|
var profileNameBlockList = ["__proto__", "profile __proto__"];
|
|
95499
95503
|
var parseIni = /* @__PURE__ */ __name((iniData) => {
|
|
@@ -95548,11 +95552,11 @@ var require_dist_cjs32 = __commonJS({
|
|
|
95548
95552
|
const relativeHomeDirPrefix = "~/";
|
|
95549
95553
|
let resolvedFilepath = filepath;
|
|
95550
95554
|
if (filepath.startsWith(relativeHomeDirPrefix)) {
|
|
95551
|
-
resolvedFilepath =
|
|
95555
|
+
resolvedFilepath = path35.join(homeDir, filepath.slice(2));
|
|
95552
95556
|
}
|
|
95553
95557
|
let resolvedConfigFilepath = configFilepath;
|
|
95554
95558
|
if (configFilepath.startsWith(relativeHomeDirPrefix)) {
|
|
95555
|
-
resolvedConfigFilepath =
|
|
95559
|
+
resolvedConfigFilepath = path35.join(homeDir, configFilepath.slice(2));
|
|
95556
95560
|
}
|
|
95557
95561
|
const parsedFiles = await Promise.all([
|
|
95558
95562
|
readFile2.readFile(resolvedConfigFilepath, {
|
|
@@ -95591,8 +95595,8 @@ var require_dist_cjs32 = __commonJS({
|
|
|
95591
95595
|
getFileRecord() {
|
|
95592
95596
|
return readFile2.fileIntercept;
|
|
95593
95597
|
},
|
|
95594
|
-
interceptFile(
|
|
95595
|
-
readFile2.fileIntercept[
|
|
95598
|
+
interceptFile(path36, contents) {
|
|
95599
|
+
readFile2.fileIntercept[path36] = Promise.resolve(contents);
|
|
95596
95600
|
},
|
|
95597
95601
|
getTokenRecord() {
|
|
95598
95602
|
return getSSOTokenFromFile.tokenIntercept;
|
|
@@ -95831,8 +95835,8 @@ var require_dist_cjs34 = __commonJS({
|
|
|
95831
95835
|
return endpoint.url.href;
|
|
95832
95836
|
}
|
|
95833
95837
|
if ("hostname" in endpoint) {
|
|
95834
|
-
const { protocol, hostname, port, path:
|
|
95835
|
-
return `${protocol}//${hostname}${port ? ":" + port : ""}${
|
|
95838
|
+
const { protocol, hostname, port, path: path35 } = endpoint;
|
|
95839
|
+
return `${protocol}//${hostname}${port ? ":" + port : ""}${path35}`;
|
|
95836
95840
|
}
|
|
95837
95841
|
}
|
|
95838
95842
|
return endpoint;
|
|
@@ -125630,15 +125634,15 @@ var require_dist_cjs67 = __commonJS({
|
|
|
125630
125634
|
var querystringBuilder = require_dist_cjs13();
|
|
125631
125635
|
function formatUrl(request3) {
|
|
125632
125636
|
const { port, query } = request3;
|
|
125633
|
-
let { protocol, path:
|
|
125637
|
+
let { protocol, path: path35, hostname } = request3;
|
|
125634
125638
|
if (protocol && protocol.slice(-1) !== ":") {
|
|
125635
125639
|
protocol += ":";
|
|
125636
125640
|
}
|
|
125637
125641
|
if (port) {
|
|
125638
125642
|
hostname += `:${port}`;
|
|
125639
125643
|
}
|
|
125640
|
-
if (
|
|
125641
|
-
|
|
125644
|
+
if (path35 && path35.charAt(0) !== "/") {
|
|
125645
|
+
path35 = `/${path35}`;
|
|
125642
125646
|
}
|
|
125643
125647
|
let queryString = query ? querystringBuilder.buildQueryString(query) : "";
|
|
125644
125648
|
if (queryString && queryString[0] !== "?") {
|
|
@@ -125654,7 +125658,7 @@ var require_dist_cjs67 = __commonJS({
|
|
|
125654
125658
|
if (request3.fragment) {
|
|
125655
125659
|
fragment = `#${request3.fragment}`;
|
|
125656
125660
|
}
|
|
125657
|
-
return `${protocol}//${auth}${hostname}${
|
|
125661
|
+
return `${protocol}//${auth}${hostname}${path35}${queryString}${fragment}`;
|
|
125658
125662
|
}
|
|
125659
125663
|
__name(formatUrl, "formatUrl");
|
|
125660
125664
|
exports2.formatUrl = formatUrl;
|
|
@@ -255213,7 +255217,7 @@ var require_dist_cjs98 = __commonJS({
|
|
|
255213
255217
|
})();
|
|
255214
255218
|
this.disableFetchToken = options?.disableFetchToken || false;
|
|
255215
255219
|
}
|
|
255216
|
-
async request(
|
|
255220
|
+
async request(path35, options) {
|
|
255217
255221
|
const { endpoint, ec2MetadataV1Disabled, httpOptions } = await this.config;
|
|
255218
255222
|
const handler = new nodeHttpHandler.NodeHttpHandler({
|
|
255219
255223
|
requestTimeout: httpOptions?.timeout,
|
|
@@ -255238,7 +255242,7 @@ var require_dist_cjs98 = __commonJS({
|
|
|
255238
255242
|
method: options.method || "GET",
|
|
255239
255243
|
headers,
|
|
255240
255244
|
hostname: endpointUrl.hostname,
|
|
255241
|
-
path: endpointUrl.pathname +
|
|
255245
|
+
path: endpointUrl.pathname + path35,
|
|
255242
255246
|
protocol: endpointUrl.protocol,
|
|
255243
255247
|
port: endpointUrl.port ? parseInt(endpointUrl.port) : void 0
|
|
255244
255248
|
});
|
|
@@ -256391,7 +256395,7 @@ var init_cc_api_provider = __esm({
|
|
|
256391
256395
|
if (args.exactIdentifier) {
|
|
256392
256396
|
resources = await this.getResource(cloudControl, args.typeName, args.exactIdentifier);
|
|
256393
256397
|
} else if (args.propertyMatch) {
|
|
256394
|
-
resources = await this.listResources(cloudControl, args.typeName, args.propertyMatch, args.expectedMatchCount);
|
|
256398
|
+
resources = await this.listResources(cloudControl, args.typeName, args.propertyMatch, args.expectedMatchCount, args.resourceModel);
|
|
256395
256399
|
} else {
|
|
256396
256400
|
throw new ContextProviderError(`Provider protocol error: neither exactIdentifier nor propertyMatch is specified in ${JSON.stringify(args)}.`);
|
|
256397
256401
|
}
|
|
@@ -256437,13 +256441,15 @@ var init_cc_api_provider = __esm({
|
|
|
256437
256441
|
*
|
|
256438
256442
|
* Does not currently paginate through more than one result page.
|
|
256439
256443
|
*/
|
|
256440
|
-
async listResources(cc, typeName, propertyMatch, expectedMatchCount) {
|
|
256444
|
+
async listResources(cc, typeName, propertyMatch, expectedMatchCount, resourceModel) {
|
|
256441
256445
|
try {
|
|
256442
256446
|
const found = [];
|
|
256443
256447
|
let nextToken = void 0;
|
|
256448
|
+
const resourceModelJSON = resourceModel ? JSON.stringify(resourceModel) : void 0;
|
|
256444
256449
|
do {
|
|
256445
256450
|
const result2 = await cc.listResources({
|
|
256446
256451
|
TypeName: typeName,
|
|
256452
|
+
ResourceModel: resourceModelJSON,
|
|
256447
256453
|
MaxResults: 100,
|
|
256448
256454
|
...nextToken ? { NextToken: nextToken } : {}
|
|
256449
256455
|
});
|
|
@@ -256918,7 +256924,7 @@ var init_ssm_parameters = __esm({
|
|
|
256918
256924
|
return response.Parameter.Value;
|
|
256919
256925
|
}
|
|
256920
256926
|
/**
|
|
256921
|
-
* Gets the value of an SSM Parameter, while not
|
|
256927
|
+
* Gets the value of an SSM Parameter, while not thrown if the parameter does not exist.
|
|
256922
256928
|
* @param account - the account in which the SSM Parameter is expected to be.
|
|
256923
256929
|
* @param region - the region in which the SSM Parameter is expected to be.
|
|
256924
256930
|
* @param parameterName - the name of the SSM Parameter
|
|
@@ -257316,22 +257322,22 @@ var init_settings = __esm({
|
|
|
257316
257322
|
get empty() {
|
|
257317
257323
|
return Object.keys(this.settings).length === 0;
|
|
257318
257324
|
}
|
|
257319
|
-
get(
|
|
257320
|
-
return deepClone(deepGet(this.settings,
|
|
257325
|
+
get(path35) {
|
|
257326
|
+
return deepClone(deepGet(this.settings, path35));
|
|
257321
257327
|
}
|
|
257322
|
-
set(
|
|
257328
|
+
set(path35, value) {
|
|
257323
257329
|
if (this.readOnly) {
|
|
257324
|
-
throw new ToolkitError(`Can't set ${
|
|
257330
|
+
throw new ToolkitError(`Can't set ${path35}: settings object is readonly`);
|
|
257325
257331
|
}
|
|
257326
|
-
if (
|
|
257332
|
+
if (path35.length === 0) {
|
|
257327
257333
|
this.settings = value;
|
|
257328
257334
|
} else {
|
|
257329
|
-
deepSet(this.settings,
|
|
257335
|
+
deepSet(this.settings, path35, value);
|
|
257330
257336
|
}
|
|
257331
257337
|
return this;
|
|
257332
257338
|
}
|
|
257333
|
-
unset(
|
|
257334
|
-
this.set(
|
|
257339
|
+
unset(path35) {
|
|
257340
|
+
this.set(path35, void 0);
|
|
257335
257341
|
}
|
|
257336
257342
|
};
|
|
257337
257343
|
__name(expandHomeDir, "expandHomeDir");
|
|
@@ -258818,11 +258824,11 @@ var require_Mime = __commonJS({
|
|
|
258818
258824
|
}
|
|
258819
258825
|
}
|
|
258820
258826
|
};
|
|
258821
|
-
Mime.prototype.getType = function(
|
|
258822
|
-
|
|
258823
|
-
let last =
|
|
258827
|
+
Mime.prototype.getType = function(path35) {
|
|
258828
|
+
path35 = String(path35);
|
|
258829
|
+
let last = path35.replace(/^.*[/\\]/, "").toLowerCase();
|
|
258824
258830
|
let ext3 = last.replace(/^.*\./, "").toLowerCase();
|
|
258825
|
-
let hasPath = last.length <
|
|
258831
|
+
let hasPath = last.length < path35.length;
|
|
258826
258832
|
let hasDot = ext3.length < last.length - 1;
|
|
258827
258833
|
return (hasDot || !hasPath) && this._types[ext3] || null;
|
|
258828
258834
|
};
|
|
@@ -259964,26 +259970,26 @@ function resourceMetadata(stack, logicalId) {
|
|
|
259964
259970
|
if (!metadata) {
|
|
259965
259971
|
return void 0;
|
|
259966
259972
|
}
|
|
259967
|
-
for (const
|
|
259968
|
-
const entry = metadata[
|
|
259973
|
+
for (const path35 of Object.keys(metadata)) {
|
|
259974
|
+
const entry = metadata[path35].filter((e4) => e4.type === import_cloud_assembly_schema5.ArtifactMetadataEntryType.LOGICAL_ID).find((e4) => e4.data === logicalId);
|
|
259969
259975
|
if (entry) {
|
|
259970
259976
|
return {
|
|
259971
259977
|
entry,
|
|
259972
|
-
constructPath: simplifyConstructPath(
|
|
259978
|
+
constructPath: simplifyConstructPath(path35, stack.stackName)
|
|
259973
259979
|
};
|
|
259974
259980
|
}
|
|
259975
259981
|
}
|
|
259976
259982
|
return void 0;
|
|
259977
259983
|
}
|
|
259978
|
-
function simplifyConstructPath(
|
|
259979
|
-
|
|
259980
|
-
|
|
259984
|
+
function simplifyConstructPath(path35, stackName) {
|
|
259985
|
+
path35 = path35.replace(/\/Resource$/, "");
|
|
259986
|
+
path35 = path35.replace(/^\//, "");
|
|
259981
259987
|
if (stackName) {
|
|
259982
|
-
if (
|
|
259983
|
-
|
|
259988
|
+
if (path35.startsWith(stackName + "/")) {
|
|
259989
|
+
path35 = path35.slice(stackName.length + 1);
|
|
259984
259990
|
}
|
|
259985
259991
|
}
|
|
259986
|
-
return
|
|
259992
|
+
return path35;
|
|
259987
259993
|
}
|
|
259988
259994
|
var import_cloud_assembly_schema5;
|
|
259989
259995
|
var init_resource_metadata = __esm({
|
|
@@ -261898,7 +261904,14 @@ var init_environment_resources = __esm({
|
|
|
261898
261904
|
}
|
|
261899
261905
|
const ssm = this.sdk.ssm();
|
|
261900
261906
|
try {
|
|
261901
|
-
const result2 = await ssm.getParameter({
|
|
261907
|
+
const result2 = await ssm.getParameter({
|
|
261908
|
+
Name: parameterName,
|
|
261909
|
+
// A custom template might use a SecureString for this, so we request the decrypted parameter.
|
|
261910
|
+
// The flag is safe to set, since it will be ignored for unencrypted parameters.
|
|
261911
|
+
// It is still up to user to ensure that all roles have sufficient permissions,
|
|
261912
|
+
// however when using AWS Managed Keys, SSM is granted decryption permissions by default.
|
|
261913
|
+
WithDecryption: true
|
|
261914
|
+
});
|
|
261902
261915
|
const asNumber = parseInt(`${result2.Parameter?.Value}`, 10);
|
|
261903
261916
|
if (isNaN(asNumber)) {
|
|
261904
261917
|
throw new ToolkitError(`SSM parameter ${parameterName} not a number: ${result2.Parameter?.Value}`);
|
|
@@ -264919,14 +264932,16 @@ var init_private5 = __esm({
|
|
|
264919
264932
|
});
|
|
264920
264933
|
|
|
264921
264934
|
// ../toolkit-lib/lib/actions/bootstrap/index.ts
|
|
264922
|
-
var BootstrapEnvironments, BootstrapStackParameters, BootstrapSource;
|
|
264935
|
+
var path22, BootstrapEnvironments, BootstrapStackParameters, BootstrapSource, BootstrapTemplate;
|
|
264923
264936
|
var init_bootstrap = __esm({
|
|
264924
264937
|
"../toolkit-lib/lib/actions/bootstrap/index.ts"() {
|
|
264925
264938
|
"use strict";
|
|
264939
|
+
path22 = __toESM(require("path"));
|
|
264926
264940
|
init_private5();
|
|
264927
264941
|
init_private3();
|
|
264928
264942
|
init_private();
|
|
264929
264943
|
init_private4();
|
|
264944
|
+
init_util();
|
|
264930
264945
|
BootstrapEnvironments = class _BootstrapEnvironments {
|
|
264931
264946
|
constructor(envProvider) {
|
|
264932
264947
|
this.envProvider = envProvider;
|
|
@@ -265024,6 +265039,48 @@ var init_bootstrap = __esm({
|
|
|
265024
265039
|
};
|
|
265025
265040
|
}
|
|
265026
265041
|
};
|
|
265042
|
+
BootstrapTemplate = class _BootstrapTemplate {
|
|
265043
|
+
constructor(template) {
|
|
265044
|
+
this.template = template;
|
|
265045
|
+
}
|
|
265046
|
+
static {
|
|
265047
|
+
__name(this, "BootstrapTemplate");
|
|
265048
|
+
}
|
|
265049
|
+
/**
|
|
265050
|
+
* Load a bootstrap template from a source
|
|
265051
|
+
*
|
|
265052
|
+
* @param source - The bootstrap template source configuration
|
|
265053
|
+
* @returns A BootstrapTemplate instance
|
|
265054
|
+
*/
|
|
265055
|
+
static async fromSource(source = { source: "default" }) {
|
|
265056
|
+
let template;
|
|
265057
|
+
switch (source.source) {
|
|
265058
|
+
case "custom":
|
|
265059
|
+
template = await loadStructuredFile(source.templateFile);
|
|
265060
|
+
break;
|
|
265061
|
+
case "default":
|
|
265062
|
+
template = await loadStructuredFile(path22.join(bundledPackageRootDir(__dirname), "lib", "api", "bootstrap", "bootstrap-template.yaml"));
|
|
265063
|
+
break;
|
|
265064
|
+
}
|
|
265065
|
+
return new _BootstrapTemplate(template);
|
|
265066
|
+
}
|
|
265067
|
+
/**
|
|
265068
|
+
* Serialize the template as YAML
|
|
265069
|
+
*
|
|
265070
|
+
* @returns The template as a YAML string
|
|
265071
|
+
*/
|
|
265072
|
+
asYAML() {
|
|
265073
|
+
return serializeStructure(this.template, false);
|
|
265074
|
+
}
|
|
265075
|
+
/**
|
|
265076
|
+
* Serialize the template as JSON
|
|
265077
|
+
*
|
|
265078
|
+
* @returns The template as a JSON string
|
|
265079
|
+
*/
|
|
265080
|
+
asJSON() {
|
|
265081
|
+
return serializeStructure(this.template, true);
|
|
265082
|
+
}
|
|
265083
|
+
};
|
|
265027
265084
|
}
|
|
265028
265085
|
});
|
|
265029
265086
|
|
|
@@ -265157,14 +265214,14 @@ var init_diff = __esm({
|
|
|
265157
265214
|
/**
|
|
265158
265215
|
* Use a local template file to compute the diff.
|
|
265159
265216
|
*/
|
|
265160
|
-
static LocalFile(
|
|
265217
|
+
static LocalFile(path35) {
|
|
265161
265218
|
return new class extends _DiffMethod {
|
|
265162
265219
|
options;
|
|
265163
265220
|
constructor(opts) {
|
|
265164
265221
|
super("local-file", opts);
|
|
265165
265222
|
this.options = opts;
|
|
265166
265223
|
}
|
|
265167
|
-
}({ path:
|
|
265224
|
+
}({ path: path35 });
|
|
265168
265225
|
}
|
|
265169
265226
|
};
|
|
265170
265227
|
}
|
|
@@ -273072,11 +273129,11 @@ var require_base = __commonJS({
|
|
|
273072
273129
|
}, "diff"),
|
|
273073
273130
|
/*istanbul ignore start*/
|
|
273074
273131
|
/*istanbul ignore end*/
|
|
273075
|
-
addToPath: /* @__PURE__ */ __name(function addToPath(
|
|
273076
|
-
var last =
|
|
273132
|
+
addToPath: /* @__PURE__ */ __name(function addToPath(path35, added, removed, oldPosInc, options) {
|
|
273133
|
+
var last = path35.lastComponent;
|
|
273077
273134
|
if (last && !options.oneChangePerToken && last.added === added && last.removed === removed) {
|
|
273078
273135
|
return {
|
|
273079
|
-
oldPos:
|
|
273136
|
+
oldPos: path35.oldPos + oldPosInc,
|
|
273080
273137
|
lastComponent: {
|
|
273081
273138
|
count: last.count + 1,
|
|
273082
273139
|
added,
|
|
@@ -273086,7 +273143,7 @@ var require_base = __commonJS({
|
|
|
273086
273143
|
};
|
|
273087
273144
|
} else {
|
|
273088
273145
|
return {
|
|
273089
|
-
oldPos:
|
|
273146
|
+
oldPos: path35.oldPos + oldPosInc,
|
|
273090
273147
|
lastComponent: {
|
|
273091
273148
|
count: 1,
|
|
273092
273149
|
added,
|
|
@@ -273156,7 +273213,7 @@ var require_base = __commonJS({
|
|
|
273156
273213
|
}, "tokenize"),
|
|
273157
273214
|
/*istanbul ignore start*/
|
|
273158
273215
|
/*istanbul ignore end*/
|
|
273159
|
-
join: /* @__PURE__ */ __name(function
|
|
273216
|
+
join: /* @__PURE__ */ __name(function join28(chars) {
|
|
273160
273217
|
return chars.join("");
|
|
273161
273218
|
}, "join"),
|
|
273162
273219
|
/*istanbul ignore start*/
|
|
@@ -275851,11 +275908,11 @@ function _diffStrings(oldStr, newStr, context) {
|
|
|
275851
275908
|
}
|
|
275852
275909
|
__name(_findIndent, "_findIndent");
|
|
275853
275910
|
}
|
|
275854
|
-
var
|
|
275911
|
+
var import_util40, chalk10, PATH_METADATA_KEY, structuredPatch, ADDITION, CONTEXT, UPDATE, REMOVAL, IMPORT, Formatter;
|
|
275855
275912
|
var init_format = __esm({
|
|
275856
275913
|
"../cloudformation-diff/lib/format.ts"() {
|
|
275857
275914
|
"use strict";
|
|
275858
|
-
|
|
275915
|
+
import_util40 = require("util");
|
|
275859
275916
|
chalk10 = __toESM(require_source());
|
|
275860
275917
|
init_util4();
|
|
275861
275918
|
init_diff_template();
|
|
@@ -275883,10 +275940,10 @@ var init_format = __esm({
|
|
|
275883
275940
|
__name(this, "Formatter");
|
|
275884
275941
|
}
|
|
275885
275942
|
print(fmt, ...args) {
|
|
275886
|
-
this.stream.write(chalk10.reset((0,
|
|
275943
|
+
this.stream.write(chalk10.reset((0, import_util40.format)(fmt, ...args)) + "\n");
|
|
275887
275944
|
}
|
|
275888
275945
|
warning(fmt, ...args) {
|
|
275889
|
-
this.stream.write(chalk10.yellow((0,
|
|
275946
|
+
this.stream.write(chalk10.yellow((0, import_util40.format)(fmt, ...args)) + "\n");
|
|
275890
275947
|
}
|
|
275891
275948
|
formatSection(title, entryType, collection, formatter = this.formatDifference.bind(this)) {
|
|
275892
275949
|
if (collection.differenceCount === 0) {
|
|
@@ -276120,8 +276177,8 @@ var init_format = __esm({
|
|
|
276120
276177
|
return logicalId;
|
|
276121
276178
|
}
|
|
276122
276179
|
normalizedLogicalIdPath(logicalId) {
|
|
276123
|
-
const
|
|
276124
|
-
return
|
|
276180
|
+
const path35 = this.logicalToPathMap[logicalId];
|
|
276181
|
+
return path35 ? normalizePath(path35) : void 0;
|
|
276125
276182
|
function normalizePath(p4) {
|
|
276126
276183
|
if (p4.startsWith("/")) {
|
|
276127
276184
|
p4 = p4.slice(1);
|
|
@@ -276523,7 +276580,7 @@ async function prepareAsset(ioHelper, asset, assetManifest, envResources, toolki
|
|
|
276523
276580
|
}
|
|
276524
276581
|
}
|
|
276525
276582
|
async function prepareFileAsset(ioHelper, asset, assetManifest, toolkitInfo, packaging) {
|
|
276526
|
-
const extension = packaging === cxschema4.FileAssetPackaging.ZIP_DIRECTORY ? ".zip" :
|
|
276583
|
+
const extension = packaging === cxschema4.FileAssetPackaging.ZIP_DIRECTORY ? ".zip" : path23.extname(asset.path);
|
|
276527
276584
|
const baseName = `${asset.sourceHash}${extension}`;
|
|
276528
276585
|
const s3Prefix = asset.id === asset.sourceHash ? "assets/" : `assets/${asset.id}/`;
|
|
276529
276586
|
const key = `${s3Prefix}${baseName}`;
|
|
@@ -276567,11 +276624,11 @@ async function prepareDockerImageAsset(asset, assetManifest, envResources) {
|
|
|
276567
276624
|
}
|
|
276568
276625
|
return { [asset.imageNameParameter]: `${repositoryUri2}:${imageTag}` };
|
|
276569
276626
|
}
|
|
276570
|
-
var
|
|
276627
|
+
var path23, cxschema4, cxapi5, chalk12;
|
|
276571
276628
|
var init_assets2 = __esm({
|
|
276572
276629
|
"../toolkit-lib/lib/api/deployments/assets.ts"() {
|
|
276573
276630
|
"use strict";
|
|
276574
|
-
|
|
276631
|
+
path23 = __toESM(require("path"));
|
|
276575
276632
|
cxschema4 = __toESM(require_lib2());
|
|
276576
276633
|
cxapi5 = __toESM(require_lib3());
|
|
276577
276634
|
chalk12 = __toESM(require_source());
|
|
@@ -278146,7 +278203,7 @@ async function applyHotswapOperation(sdk, ioSpan, hotswapOperation) {
|
|
|
278146
278203
|
sdk.appendCustomUserAgent(customUserAgent);
|
|
278147
278204
|
const resourceText = /* @__PURE__ */ __name((r4) => r4.description ?? `${r4.resourceType} '${r4.physicalName ?? r4.logicalId}'`, "resourceText");
|
|
278148
278205
|
await ioSpan.notify(IO.CDK_TOOLKIT_I5402.msg(
|
|
278149
|
-
hotswapOperation.change.resources.map((r4) => (0,
|
|
278206
|
+
hotswapOperation.change.resources.map((r4) => (0, import_util46.format)(` ${ICON} %s`, chalk13.bold(resourceText(r4)))).join("\n"),
|
|
278150
278207
|
hotswapOperation.change
|
|
278151
278208
|
));
|
|
278152
278209
|
try {
|
|
@@ -278161,7 +278218,7 @@ async function applyHotswapOperation(sdk, ioSpan, hotswapOperation) {
|
|
|
278161
278218
|
throw e4;
|
|
278162
278219
|
}
|
|
278163
278220
|
await ioSpan.notify(IO.CDK_TOOLKIT_I5403.msg(
|
|
278164
|
-
hotswapOperation.change.resources.map((r4) => (0,
|
|
278221
|
+
hotswapOperation.change.resources.map((r4) => (0, import_util46.format)(` ${ICON} %s %s`, chalk13.bold(resourceText(r4)), chalk13.green("hotswapped!"))).join("\n"),
|
|
278165
278222
|
hotswapOperation.change
|
|
278166
278223
|
));
|
|
278167
278224
|
sdk.removeCustomUserAgent(customUserAgent);
|
|
@@ -278190,9 +278247,9 @@ async function logRejectedChanges(ioSpan, rejectedChanges, hotswapMode) {
|
|
|
278190
278247
|
}
|
|
278191
278248
|
const messages = [""];
|
|
278192
278249
|
if (hotswapMode === "hotswap-only") {
|
|
278193
|
-
messages.push((0,
|
|
278250
|
+
messages.push((0, import_util46.format)("%s %s", chalk13.red("\u26A0\uFE0F"), chalk13.red("The following non-hotswappable changes were found. To reconcile these using CloudFormation, specify --hotswap-fallback")));
|
|
278194
278251
|
} else {
|
|
278195
|
-
messages.push((0,
|
|
278252
|
+
messages.push((0, import_util46.format)("%s %s", chalk13.red("\u26A0\uFE0F"), chalk13.red("The following non-hotswappable changes were found:")));
|
|
278196
278253
|
}
|
|
278197
278254
|
for (const { change } of rejectedChanges) {
|
|
278198
278255
|
messages.push(" " + nonHotswappableChangeMessage(change));
|
|
@@ -278205,7 +278262,7 @@ function nonHotswappableChangeMessage(change) {
|
|
|
278205
278262
|
const reason = change.description ?? change.reason;
|
|
278206
278263
|
switch (subject.type) {
|
|
278207
278264
|
case "Output":
|
|
278208
|
-
return (0,
|
|
278265
|
+
return (0, import_util46.format)(
|
|
278209
278266
|
"output: %s, reason: %s",
|
|
278210
278267
|
chalk13.bold(subject.logicalId),
|
|
278211
278268
|
chalk13.red(reason)
|
|
@@ -278216,7 +278273,7 @@ function nonHotswappableChangeMessage(change) {
|
|
|
278216
278273
|
}
|
|
278217
278274
|
function nonHotswappableResourceMessage(subject, reason) {
|
|
278218
278275
|
if (subject.rejectedProperties?.length) {
|
|
278219
|
-
return (0,
|
|
278276
|
+
return (0, import_util46.format)(
|
|
278220
278277
|
"resource: %s, type: %s, rejected changes: %s, reason: %s",
|
|
278221
278278
|
chalk13.bold(subject.logicalId),
|
|
278222
278279
|
chalk13.bold(subject.resourceType),
|
|
@@ -278224,18 +278281,18 @@ function nonHotswappableResourceMessage(subject, reason) {
|
|
|
278224
278281
|
chalk13.red(reason)
|
|
278225
278282
|
);
|
|
278226
278283
|
}
|
|
278227
|
-
return (0,
|
|
278284
|
+
return (0, import_util46.format)(
|
|
278228
278285
|
"resource: %s, type: %s, reason: %s",
|
|
278229
278286
|
chalk13.bold(subject.logicalId),
|
|
278230
278287
|
chalk13.bold(subject.resourceType),
|
|
278231
278288
|
chalk13.red(reason)
|
|
278232
278289
|
);
|
|
278233
278290
|
}
|
|
278234
|
-
var
|
|
278291
|
+
var import_util46, cfn_diff, chalk13, pLimit2, RESOURCE_DETECTORS;
|
|
278235
278292
|
var init_hotswap_deployments = __esm({
|
|
278236
278293
|
"../toolkit-lib/lib/api/hotswap/hotswap-deployments.ts"() {
|
|
278237
278294
|
"use strict";
|
|
278238
|
-
|
|
278295
|
+
import_util46 = require("util");
|
|
278239
278296
|
cfn_diff = __toESM(require_lib12());
|
|
278240
278297
|
chalk13 = __toESM(require_source());
|
|
278241
278298
|
init_payloads();
|
|
@@ -278398,7 +278455,7 @@ async function deployStack(options, ioHelper) {
|
|
|
278398
278455
|
await ioHelper.defaults.debug(`${deployName}: skipping deployment (use --force to override)`);
|
|
278399
278456
|
if (deploymentMethod?.method === "hotswap") {
|
|
278400
278457
|
await ioHelper.defaults.info(
|
|
278401
|
-
(0,
|
|
278458
|
+
(0, import_util48.format)(
|
|
278402
278459
|
`
|
|
278403
278460
|
${ICON} %s
|
|
278404
278461
|
`,
|
|
@@ -278449,7 +278506,7 @@ async function deployStack(options, ioHelper) {
|
|
|
278449
278506
|
if (hotswapDeploymentResult) {
|
|
278450
278507
|
return hotswapDeploymentResult;
|
|
278451
278508
|
}
|
|
278452
|
-
await ioHelper.defaults.info((0,
|
|
278509
|
+
await ioHelper.defaults.info((0, import_util48.format)(
|
|
278453
278510
|
"Could not perform a hotswap deployment, as the stack %s contains non-Asset changes",
|
|
278454
278511
|
stackArtifact.displayName
|
|
278455
278512
|
));
|
|
@@ -278457,7 +278514,7 @@ async function deployStack(options, ioHelper) {
|
|
|
278457
278514
|
if (!(e4 instanceof CfnEvaluationException)) {
|
|
278458
278515
|
throw e4;
|
|
278459
278516
|
}
|
|
278460
|
-
await ioHelper.defaults.info((0,
|
|
278517
|
+
await ioHelper.defaults.info((0, import_util48.format)(
|
|
278461
278518
|
"Could not perform a hotswap deployment, because the CloudFormation template could not be resolved: %s",
|
|
278462
278519
|
formatErrorMessage(e4)
|
|
278463
278520
|
));
|
|
@@ -278584,11 +278641,11 @@ function hasReplacement(cs) {
|
|
|
278584
278641
|
return a4 === "ReplaceAndDelete" || a4 === "ReplaceAndRetain" || a4 === "ReplaceAndSnapshot";
|
|
278585
278642
|
});
|
|
278586
278643
|
}
|
|
278587
|
-
var
|
|
278644
|
+
var import_util48, chalk14, FullCloudFormationDeployment;
|
|
278588
278645
|
var init_deploy_stack = __esm({
|
|
278589
278646
|
"../toolkit-lib/lib/api/deployments/deploy-stack.ts"() {
|
|
278590
278647
|
"use strict";
|
|
278591
|
-
|
|
278648
|
+
import_util48 = require("util");
|
|
278592
278649
|
chalk14 = __toESM(require_source());
|
|
278593
278650
|
init_esm();
|
|
278594
278651
|
init_asset_manifest_builder();
|
|
@@ -278647,9 +278704,9 @@ var init_deploy_stack = __esm({
|
|
|
278647
278704
|
const changeSetDescription = await this.createChangeSet(changeSetName, execute, importExistingResources);
|
|
278648
278705
|
await this.updateTerminationProtection();
|
|
278649
278706
|
if (changeSetHasNoChanges(changeSetDescription)) {
|
|
278650
|
-
await this.ioHelper.defaults.debug((0,
|
|
278707
|
+
await this.ioHelper.defaults.debug((0, import_util48.format)("No changes are to be performed on %s.", this.stackName));
|
|
278651
278708
|
if (execute) {
|
|
278652
|
-
await this.ioHelper.defaults.debug((0,
|
|
278709
|
+
await this.ioHelper.defaults.debug((0, import_util48.format)("Deleting empty change set %s", changeSetDescription.ChangeSetId));
|
|
278653
278710
|
await this.cfn.deleteChangeSet({
|
|
278654
278711
|
StackName: this.stackName,
|
|
278655
278712
|
ChangeSetName: changeSetName
|
|
@@ -278674,7 +278731,7 @@ var init_deploy_stack = __esm({
|
|
|
278674
278731
|
};
|
|
278675
278732
|
}
|
|
278676
278733
|
if (!execute) {
|
|
278677
|
-
await this.ioHelper.defaults.info((0,
|
|
278734
|
+
await this.ioHelper.defaults.info((0, import_util48.format)(
|
|
278678
278735
|
"Changeset %s created and waiting in review for manual execution (--no-execute)",
|
|
278679
278736
|
changeSetDescription.ChangeSetId
|
|
278680
278737
|
));
|
|
@@ -278702,7 +278759,7 @@ var init_deploy_stack = __esm({
|
|
|
278702
278759
|
async createChangeSet(changeSetName, willExecute, importExistingResources) {
|
|
278703
278760
|
await this.cleanupOldChangeset(changeSetName);
|
|
278704
278761
|
await this.ioHelper.defaults.debug(`Attempting to create ChangeSet with name ${changeSetName} to ${this.verb} stack ${this.stackName}`);
|
|
278705
|
-
await this.ioHelper.defaults.info((0,
|
|
278762
|
+
await this.ioHelper.defaults.info((0, import_util48.format)("%s: creating CloudFormation changeset...", chalk14.bold(this.stackName)));
|
|
278706
278763
|
const changeSet = await this.cfn.createChangeSet({
|
|
278707
278764
|
StackName: this.stackName,
|
|
278708
278765
|
ChangeSetName: changeSetName,
|
|
@@ -278713,7 +278770,7 @@ var init_deploy_stack = __esm({
|
|
|
278713
278770
|
ImportExistingResources: importExistingResources,
|
|
278714
278771
|
...this.commonPrepareOptions()
|
|
278715
278772
|
});
|
|
278716
|
-
await this.ioHelper.defaults.debug((0,
|
|
278773
|
+
await this.ioHelper.defaults.debug((0, import_util48.format)("Initiated creation of changeset: %s; waiting for it to finish creating...", changeSet.Id));
|
|
278717
278774
|
const environmentResourcesRegistry = new EnvironmentResourcesRegistry();
|
|
278718
278775
|
const envResources = environmentResourcesRegistry.for(this.options.resolvedEnvironment, this.options.sdk, this.ioHelper);
|
|
278719
278776
|
const validationReporter = new EarlyValidationReporter(this.options.sdk, envResources);
|
|
@@ -278723,7 +278780,7 @@ var init_deploy_stack = __esm({
|
|
|
278723
278780
|
});
|
|
278724
278781
|
}
|
|
278725
278782
|
async executeChangeSet(changeSet) {
|
|
278726
|
-
await this.ioHelper.defaults.debug((0,
|
|
278783
|
+
await this.ioHelper.defaults.debug((0, import_util48.format)("Initiating execution of changeset %s on stack %s", changeSet.ChangeSetId, this.stackName));
|
|
278727
278784
|
await this.cfn.executeChangeSet({
|
|
278728
278785
|
StackName: this.stackName,
|
|
278729
278786
|
ChangeSetName: changeSet.ChangeSetName,
|
|
@@ -278731,7 +278788,7 @@ var init_deploy_stack = __esm({
|
|
|
278731
278788
|
...this.commonExecuteOptions()
|
|
278732
278789
|
});
|
|
278733
278790
|
await this.ioHelper.defaults.debug(
|
|
278734
|
-
(0,
|
|
278791
|
+
(0, import_util48.format)(
|
|
278735
278792
|
"Execution of changeset %s on stack %s has started; waiting for the update to complete...",
|
|
278736
278793
|
changeSet.ChangeSetId,
|
|
278737
278794
|
this.stackName
|
|
@@ -278753,7 +278810,7 @@ var init_deploy_stack = __esm({
|
|
|
278753
278810
|
const terminationProtection = this.stackArtifact.terminationProtection ?? false;
|
|
278754
278811
|
if (!!this.cloudFormationStack.terminationProtection !== terminationProtection) {
|
|
278755
278812
|
await this.ioHelper.defaults.debug(
|
|
278756
|
-
(0,
|
|
278813
|
+
(0, import_util48.format)(
|
|
278757
278814
|
"Updating termination protection from %s to %s for stack %s",
|
|
278758
278815
|
this.cloudFormationStack.terminationProtection,
|
|
278759
278816
|
terminationProtection,
|
|
@@ -278764,11 +278821,11 @@ var init_deploy_stack = __esm({
|
|
|
278764
278821
|
StackName: this.stackName,
|
|
278765
278822
|
EnableTerminationProtection: terminationProtection
|
|
278766
278823
|
});
|
|
278767
|
-
await this.ioHelper.defaults.debug((0,
|
|
278824
|
+
await this.ioHelper.defaults.debug((0, import_util48.format)("Termination protection updated to %s for stack %s", terminationProtection, this.stackName));
|
|
278768
278825
|
}
|
|
278769
278826
|
}
|
|
278770
278827
|
async directDeployment() {
|
|
278771
|
-
await this.ioHelper.defaults.info((0,
|
|
278828
|
+
await this.ioHelper.defaults.info((0, import_util48.format)("%s: %s stack...", chalk14.bold(this.stackName), this.update ? "updating" : "creating"));
|
|
278772
278829
|
const startTime = /* @__PURE__ */ new Date();
|
|
278773
278830
|
if (this.update) {
|
|
278774
278831
|
await this.updateTerminationProtection();
|
|
@@ -278781,7 +278838,7 @@ var init_deploy_stack = __esm({
|
|
|
278781
278838
|
});
|
|
278782
278839
|
} catch (err) {
|
|
278783
278840
|
if (err.message === "No updates are to be performed.") {
|
|
278784
|
-
await this.ioHelper.defaults.debug((0,
|
|
278841
|
+
await this.ioHelper.defaults.debug((0, import_util48.format)("No updates are to be performed for stack %s", this.stackName));
|
|
278785
278842
|
return {
|
|
278786
278843
|
type: "did-deploy-stack",
|
|
278787
278844
|
noOp: true,
|
|
@@ -278826,7 +278883,7 @@ var init_deploy_stack = __esm({
|
|
|
278826
278883
|
} finally {
|
|
278827
278884
|
await monitor.stop();
|
|
278828
278885
|
}
|
|
278829
|
-
await this.ioHelper.defaults.debug((0,
|
|
278886
|
+
await this.ioHelper.defaults.debug((0, import_util48.format)("Stack %s has completed updating", this.stackName));
|
|
278830
278887
|
return {
|
|
278831
278888
|
type: "did-deploy-stack",
|
|
278832
278889
|
noOp: false,
|
|
@@ -279283,11 +279340,11 @@ function removeNonImportResources(stack) {
|
|
|
279283
279340
|
delete template.Outputs;
|
|
279284
279341
|
return template;
|
|
279285
279342
|
}
|
|
279286
|
-
var
|
|
279343
|
+
var import_util51, cfnDiff, chalk16, fs23, ResourceImporter;
|
|
279287
279344
|
var init_importer = __esm({
|
|
279288
279345
|
"../toolkit-lib/lib/api/resource-import/importer.ts"() {
|
|
279289
279346
|
"use strict";
|
|
279290
|
-
|
|
279347
|
+
import_util51 = require("util");
|
|
279291
279348
|
cfnDiff = __toESM(require_lib12());
|
|
279292
279349
|
chalk16 = __toESM(require_source());
|
|
279293
279350
|
fs23 = __toESM(require_lib6());
|
|
@@ -279333,12 +279390,12 @@ var init_importer = __esm({
|
|
|
279333
279390
|
const descr = this.describeResource(resource.logicalId);
|
|
279334
279391
|
const idProps = contents[resource.logicalId];
|
|
279335
279392
|
if (idProps) {
|
|
279336
|
-
await this.ioHelper.defaults.info((0,
|
|
279393
|
+
await this.ioHelper.defaults.info((0, import_util51.format)("%s: importing using %s", chalk16.blue(descr), chalk16.blue(fmtdict(idProps))));
|
|
279337
279394
|
ret.importResources.push(resource);
|
|
279338
279395
|
ret.resourceMap[resource.logicalId] = idProps;
|
|
279339
279396
|
delete contents[resource.logicalId];
|
|
279340
279397
|
} else {
|
|
279341
|
-
await this.ioHelper.defaults.info((0,
|
|
279398
|
+
await this.ioHelper.defaults.info((0, import_util51.format)("%s: skipping", chalk16.blue(descr)));
|
|
279342
279399
|
}
|
|
279343
279400
|
}
|
|
279344
279401
|
const unknown = Object.keys(contents);
|
|
@@ -279382,9 +279439,9 @@ var init_importer = __esm({
|
|
|
279382
279439
|
});
|
|
279383
279440
|
assertIsSuccessfulDeployStackResult(result2);
|
|
279384
279441
|
const message2 = result2.noOp ? " \u2705 %s (no changes)" : " \u2705 %s";
|
|
279385
|
-
await this.ioHelper.defaults.info("\n" + chalk16.green((0,
|
|
279442
|
+
await this.ioHelper.defaults.info("\n" + chalk16.green((0, import_util51.format)(message2, this.stack.displayName)));
|
|
279386
279443
|
} catch (e4) {
|
|
279387
|
-
await this.ioHelper.notify(IO.CDK_TOOLKIT_E3900.msg((0,
|
|
279444
|
+
await this.ioHelper.notify(IO.CDK_TOOLKIT_E3900.msg((0, import_util51.format)("\n \u274C %s failed: %s", chalk16.bold(this.stack.displayName), e4), { error: e4 }));
|
|
279388
279445
|
throw e4;
|
|
279389
279446
|
}
|
|
279390
279447
|
}
|
|
@@ -279511,7 +279568,7 @@ var init_importer = __esm({
|
|
|
279511
279568
|
for (const idProp of idProps) {
|
|
279512
279569
|
const defaultValue = resourceProps[idProp] ?? "";
|
|
279513
279570
|
const response = await this.ioHelper.requestResponse(IO.CDK_TOOLKIT_I3110.req(
|
|
279514
|
-
(0,
|
|
279571
|
+
(0, import_util51.format)(promptPattern, chalk16.blue(idProp)),
|
|
279515
279572
|
{
|
|
279516
279573
|
resource: {
|
|
279517
279574
|
name: resourceName,
|
|
@@ -280710,12 +280767,12 @@ function bootstrapVersionFromTemplate(template) {
|
|
|
280710
280767
|
function bootstrapVariantFromTemplate(template) {
|
|
280711
280768
|
return template.Parameters?.[BOOTSTRAP_VARIANT_PARAMETER]?.Default ?? DEFAULT_BOOTSTRAP_VARIANT;
|
|
280712
280769
|
}
|
|
280713
|
-
var os8,
|
|
280770
|
+
var os8, path24, import_cloud_assembly_schema7, import_cx_api11, fs26, BootstrapStack;
|
|
280714
280771
|
var init_deploy_bootstrap = __esm({
|
|
280715
280772
|
"../toolkit-lib/lib/api/bootstrap/deploy-bootstrap.ts"() {
|
|
280716
280773
|
"use strict";
|
|
280717
280774
|
os8 = __toESM(require("os"));
|
|
280718
|
-
|
|
280775
|
+
path24 = __toESM(require("path"));
|
|
280719
280776
|
import_cloud_assembly_schema7 = __toESM(require_lib2());
|
|
280720
280777
|
import_cx_api11 = __toESM(require_lib3());
|
|
280721
280778
|
fs26 = __toESM(require_lib6());
|
|
@@ -280786,10 +280843,10 @@ var init_deploy_bootstrap = __esm({
|
|
|
280786
280843
|
return abortResponse;
|
|
280787
280844
|
}
|
|
280788
280845
|
}
|
|
280789
|
-
const outdir = await fs26.mkdtemp(
|
|
280846
|
+
const outdir = await fs26.mkdtemp(path24.join(os8.tmpdir(), "cdk-bootstrap"));
|
|
280790
280847
|
const builder = new import_cx_api11.CloudAssemblyBuilder(outdir);
|
|
280791
280848
|
const templateFile = `${this.toolkitStackName}.template.json`;
|
|
280792
|
-
await fs26.writeJson(
|
|
280849
|
+
await fs26.writeJson(path24.join(builder.outdir, templateFile), template, {
|
|
280793
280850
|
spaces: 2
|
|
280794
280851
|
});
|
|
280795
280852
|
builder.addArtifact(this.toolkitStackName, {
|
|
@@ -280920,11 +280977,11 @@ function splitCfnArray(xs) {
|
|
|
280920
280977
|
function intersection(xs, ys) {
|
|
280921
280978
|
return new Set(Array.from(xs).filter((x4) => ys.has(x4)));
|
|
280922
280979
|
}
|
|
280923
|
-
var
|
|
280980
|
+
var path25, Bootstrapper, USE_AWS_MANAGED_KEY, CREATE_NEW_KEY, CDK_BOOTSTRAP_PERMISSIONS_BOUNDARY;
|
|
280924
280981
|
var init_bootstrap_environment = __esm({
|
|
280925
280982
|
"../toolkit-lib/lib/api/bootstrap/bootstrap-environment.ts"() {
|
|
280926
280983
|
"use strict";
|
|
280927
|
-
|
|
280984
|
+
path25 = __toESM(require("path"));
|
|
280928
280985
|
init_deploy_bootstrap();
|
|
280929
280986
|
init_legacy_template();
|
|
280930
280987
|
init_toolkit_error();
|
|
@@ -281192,7 +281249,7 @@ var init_bootstrap_environment = __esm({
|
|
|
281192
281249
|
case "custom":
|
|
281193
281250
|
return loadStructuredFile(this.source.templateFile);
|
|
281194
281251
|
case "default":
|
|
281195
|
-
return loadStructuredFile(
|
|
281252
|
+
return loadStructuredFile(path25.join(bundledPackageRootDir(__dirname), "lib", "api", "bootstrap", "bootstrap-template.yaml"));
|
|
281196
281253
|
case "legacy":
|
|
281197
281254
|
return legacyBootstrapTemplate(legacyParams);
|
|
281198
281255
|
}
|
|
@@ -281291,22 +281348,22 @@ async function settingsFromFile(filename) {
|
|
|
281291
281348
|
throw e4;
|
|
281292
281349
|
}
|
|
281293
281350
|
}
|
|
281294
|
-
var import_fs5, os9,
|
|
281351
|
+
var import_fs5, os9, path26, CdkAppMultiContext, FileContext, MemoryContext;
|
|
281295
281352
|
var init_context_store = __esm({
|
|
281296
281353
|
"../toolkit-lib/lib/api/cloud-assembly/context-store.ts"() {
|
|
281297
281354
|
"use strict";
|
|
281298
281355
|
import_fs5 = require("fs");
|
|
281299
281356
|
os9 = __toESM(require("os"));
|
|
281300
|
-
|
|
281357
|
+
path26 = __toESM(require("path"));
|
|
281301
281358
|
init_toolkit_error();
|
|
281302
281359
|
init_context();
|
|
281303
281360
|
init_settings();
|
|
281304
281361
|
CdkAppMultiContext = class {
|
|
281305
281362
|
constructor(appDirectory, commandlineContext) {
|
|
281306
281363
|
this.commandlineContext = commandlineContext;
|
|
281307
|
-
this.configContextFile =
|
|
281308
|
-
this.projectContextFile =
|
|
281309
|
-
this.userConfigFile =
|
|
281364
|
+
this.configContextFile = path26.join(appDirectory, "cdk.json");
|
|
281365
|
+
this.projectContextFile = path26.join(appDirectory, "cdk.context.json");
|
|
281366
|
+
this.userConfigFile = path26.join(os9.homedir() ?? "/tmp", ".cdk.json");
|
|
281310
281367
|
}
|
|
281311
281368
|
static {
|
|
281312
281369
|
__name(this, "CdkAppMultiContext");
|
|
@@ -281449,12 +281506,12 @@ var init_readable_assembly = __esm({
|
|
|
281449
281506
|
});
|
|
281450
281507
|
|
|
281451
281508
|
// ../toolkit-lib/lib/api/cloud-assembly/source-builder.ts
|
|
281452
|
-
var
|
|
281509
|
+
var path27, import_util56, cxapi6, fs29, CloudAssemblySourceBuilder;
|
|
281453
281510
|
var init_source_builder = __esm({
|
|
281454
281511
|
"../toolkit-lib/lib/api/cloud-assembly/source-builder.ts"() {
|
|
281455
281512
|
"use strict";
|
|
281456
|
-
|
|
281457
|
-
|
|
281513
|
+
path27 = __toESM(require("path"));
|
|
281514
|
+
import_util56 = require("util");
|
|
281458
281515
|
cxapi6 = __toESM(require_lib3());
|
|
281459
281516
|
fs29 = __toESM(require_lib6());
|
|
281460
281517
|
init_context_store();
|
|
@@ -281505,7 +281562,7 @@ var init_source_builder = __esm({
|
|
|
281505
281562
|
contextStore,
|
|
281506
281563
|
lookups: props.lookups
|
|
281507
281564
|
};
|
|
281508
|
-
const outdir = props.outdir ?
|
|
281565
|
+
const outdir = props.outdir ? path27.resolve(props.outdir) : void 0;
|
|
281509
281566
|
return new ContextAwareCloudAssemblySource(
|
|
281510
281567
|
{
|
|
281511
281568
|
produce: /* @__PURE__ */ __name(async () => {
|
|
@@ -281520,7 +281577,7 @@ var init_source_builder = __esm({
|
|
|
281520
281577
|
...await contextStore.read(),
|
|
281521
281578
|
...synthParams.context
|
|
281522
281579
|
};
|
|
281523
|
-
await services.ioHelper.defaults.debug((0,
|
|
281580
|
+
await services.ioHelper.defaults.debug((0, import_util56.format)("context:", fullContext));
|
|
281524
281581
|
const env = noUndefined2({
|
|
281525
281582
|
// Versioning, outdir, default account and region
|
|
281526
281583
|
...await execution.defaultEnvVars(),
|
|
@@ -281629,7 +281686,7 @@ var init_source_builder = __esm({
|
|
|
281629
281686
|
async fromCdkApp(app, props = {}) {
|
|
281630
281687
|
const services = await this.sourceBuilderServices();
|
|
281631
281688
|
const workingDirectory = props.workingDirectory ?? process.cwd();
|
|
281632
|
-
const outdir = props.outdir ?
|
|
281689
|
+
const outdir = props.outdir ? path27.resolve(props.outdir) : path27.resolve(workingDirectory, "cdk.out");
|
|
281633
281690
|
const contextStore = props.contextStore ?? new CdkAppMultiContext(workingDirectory);
|
|
281634
281691
|
const contextAssemblyProps = {
|
|
281635
281692
|
services,
|
|
@@ -281656,7 +281713,7 @@ var init_source_builder = __esm({
|
|
|
281656
281713
|
...await contextStore.read(),
|
|
281657
281714
|
...synthParams.context
|
|
281658
281715
|
};
|
|
281659
|
-
await services.ioHelper.defaults.debug((0,
|
|
281716
|
+
await services.ioHelper.defaults.debug((0, import_util56.format)("context:", fullContext));
|
|
281660
281717
|
const env = noUndefined2({
|
|
281661
281718
|
// Need to start with full env of `writeContextToEnv` will not be able to do the size
|
|
281662
281719
|
// calculation correctly.
|
|
@@ -281747,9 +281804,9 @@ function buildLogicalToPathMap(stack) {
|
|
|
281747
281804
|
function logicalIdMapFromTemplate(template) {
|
|
281748
281805
|
const ret = {};
|
|
281749
281806
|
for (const [logicalId, resource] of Object.entries(template.Resources ?? {})) {
|
|
281750
|
-
const
|
|
281751
|
-
if (
|
|
281752
|
-
ret[logicalId] =
|
|
281807
|
+
const path35 = resource?.Metadata?.["aws:cdk:path"];
|
|
281808
|
+
if (path35) {
|
|
281809
|
+
ret[logicalId] = path35;
|
|
281753
281810
|
}
|
|
281754
281811
|
}
|
|
281755
281812
|
return ret;
|
|
@@ -282118,9 +282175,9 @@ ${actualDrifts.length} resource${actualDrifts.length === 1 ? "" : "s"} ${actualD
|
|
|
282118
282175
|
return { unchanged, unchecked, modified, deleted };
|
|
282119
282176
|
}
|
|
282120
282177
|
formatLogicalId(logicalToPathMap, logicalId) {
|
|
282121
|
-
const
|
|
282122
|
-
if (!
|
|
282123
|
-
let normalizedPath =
|
|
282178
|
+
const path35 = logicalToPathMap[logicalId];
|
|
282179
|
+
if (!path35) return logicalId;
|
|
282180
|
+
let normalizedPath = path35;
|
|
282124
282181
|
if (normalizedPath.startsWith("/")) {
|
|
282125
282182
|
normalizedPath = normalizedPath.slice(1);
|
|
282126
282183
|
}
|
|
@@ -282907,17 +282964,17 @@ var init_work_graph = __esm({
|
|
|
282907
282964
|
}
|
|
282908
282965
|
}
|
|
282909
282966
|
return void 0;
|
|
282910
|
-
function recurse(nodeId,
|
|
282967
|
+
function recurse(nodeId, path35) {
|
|
282911
282968
|
if (seen.has(nodeId)) {
|
|
282912
282969
|
return void 0;
|
|
282913
282970
|
}
|
|
282914
282971
|
try {
|
|
282915
282972
|
for (const dep of self2.nodes[nodeId].dependencies ?? []) {
|
|
282916
|
-
const index =
|
|
282973
|
+
const index = path35.indexOf(dep);
|
|
282917
282974
|
if (index > -1) {
|
|
282918
|
-
return [...
|
|
282975
|
+
return [...path35.slice(index), dep];
|
|
282919
282976
|
}
|
|
282920
|
-
const cycle = recurse(dep, [...
|
|
282977
|
+
const cycle = recurse(dep, [...path35, dep]);
|
|
282921
282978
|
if (cycle) {
|
|
282922
282979
|
return cycle;
|
|
282923
282980
|
}
|
|
@@ -283155,12 +283212,12 @@ var init_promises = __esm({
|
|
|
283155
283212
|
});
|
|
283156
283213
|
|
|
283157
283214
|
// ../toolkit-lib/lib/toolkit/toolkit.ts
|
|
283158
|
-
var import_dispose_polyfill5,
|
|
283215
|
+
var import_dispose_polyfill5, path28, import_cloud_assembly_schema8, cxapi8, chalk21, chokidar, fs30, Toolkit;
|
|
283159
283216
|
var init_toolkit = __esm({
|
|
283160
283217
|
"../toolkit-lib/lib/toolkit/toolkit.ts"() {
|
|
283161
283218
|
"use strict";
|
|
283162
283219
|
import_dispose_polyfill5 = __toESM(require_dispose_polyfill());
|
|
283163
|
-
|
|
283220
|
+
path28 = __toESM(require("node:path"));
|
|
283164
283221
|
import_cloud_assembly_schema8 = __toESM(require_lib2());
|
|
283165
283222
|
cxapi8 = __toESM(require_lib3());
|
|
283166
283223
|
chalk21 = __toESM(require_source());
|
|
@@ -283335,7 +283392,7 @@ var init_toolkit = __esm({
|
|
|
283335
283392
|
const autoValidateStacks = options.validateStacks ? [assembly.selectStacksForValidation()] : [];
|
|
283336
283393
|
await this.validateStacksMetadata(stacks.concat(...autoValidateStacks), synthSpan.asHelper);
|
|
283337
283394
|
await synthSpan.end();
|
|
283338
|
-
const message2 = `Successfully synthesized to ${chalk21.blue(
|
|
283395
|
+
const message2 = `Successfully synthesized to ${chalk21.blue(path28.resolve(stacks.assembly.directory))}`;
|
|
283339
283396
|
const assemblyData = {
|
|
283340
283397
|
assemblyDirectory: stacks.assembly.directory,
|
|
283341
283398
|
stacksCount: stacks.stackCount,
|
|
@@ -283810,8 +283867,8 @@ ${deployResult.stackArn}`));
|
|
|
283810
283867
|
watchIncludes.push("**");
|
|
283811
283868
|
}
|
|
283812
283869
|
const watchExcludes = options.exclude ?? [...WATCH_EXCLUDE_DEFAULTS];
|
|
283813
|
-
const relativeOutDir =
|
|
283814
|
-
if (Boolean(relativeOutDir && !relativeOutDir.startsWith(".." +
|
|
283870
|
+
const relativeOutDir = path28.relative(rootDir, assembly.directory);
|
|
283871
|
+
if (Boolean(relativeOutDir && !relativeOutDir.startsWith(".." + path28.sep) && !path28.isAbsolute(relativeOutDir))) {
|
|
283815
283872
|
watchExcludes.push(`${relativeOutDir}/**`);
|
|
283816
283873
|
}
|
|
283817
283874
|
watchExcludes.push(".*", "**/.*");
|
|
@@ -284341,6 +284398,7 @@ __export(actions_exports, {
|
|
|
284341
284398
|
BootstrapEnvironments: () => BootstrapEnvironments,
|
|
284342
284399
|
BootstrapSource: () => BootstrapSource,
|
|
284343
284400
|
BootstrapStackParameters: () => BootstrapStackParameters,
|
|
284401
|
+
BootstrapTemplate: () => BootstrapTemplate,
|
|
284344
284402
|
DiffMethod: () => DiffMethod,
|
|
284345
284403
|
StackParameters: () => StackParameters
|
|
284346
284404
|
});
|
|
@@ -284443,11 +284501,11 @@ var require_lib13 = __commonJS({
|
|
|
284443
284501
|
});
|
|
284444
284502
|
|
|
284445
284503
|
// lib/engines/toolkit-lib.ts
|
|
284446
|
-
var
|
|
284504
|
+
var path29, import_cx_api12, import_toolkit_lib, chalk22, fs31, ToolkitLibRunnerEngine, IntegRunnerIoHost, NoopIoHost;
|
|
284447
284505
|
var init_toolkit_lib = __esm({
|
|
284448
284506
|
"lib/engines/toolkit-lib.ts"() {
|
|
284449
284507
|
"use strict";
|
|
284450
|
-
|
|
284508
|
+
path29 = __toESM(require("node:path"));
|
|
284451
284509
|
import_cx_api12 = __toESM(require_lib3());
|
|
284452
284510
|
import_toolkit_lib = __toESM(require_lib13());
|
|
284453
284511
|
chalk22 = __toESM(require_source());
|
|
@@ -284500,7 +284558,7 @@ var init_toolkit_lib = __esm({
|
|
|
284500
284558
|
async synthFast(options) {
|
|
284501
284559
|
const cx = await this.toolkit.fromCdkApp(options.execCmd.join(" "), {
|
|
284502
284560
|
workingDirectory: this.options.workingDirectory,
|
|
284503
|
-
outdir: options.output ?
|
|
284561
|
+
outdir: options.output ? path29.join(this.options.workingDirectory, options.output) : void 0,
|
|
284504
284562
|
contextStore: new import_toolkit_lib.MemoryContext(options.context),
|
|
284505
284563
|
lookups: false,
|
|
284506
284564
|
resolveDefaultEnvironment: false,
|
|
@@ -284547,7 +284605,8 @@ var init_toolkit_lib = __esm({
|
|
|
284547
284605
|
roleArn: options.roleArn,
|
|
284548
284606
|
traceLogs: options.traceLogs,
|
|
284549
284607
|
stacks: this.stackSelector(options),
|
|
284550
|
-
deploymentMethod: this.deploymentMethod(options)
|
|
284608
|
+
deploymentMethod: this.deploymentMethod(options),
|
|
284609
|
+
outputsFile: options.outputsFile ? path29.join(this.options.workingDirectory, options.outputsFile) : void 0
|
|
284551
284610
|
});
|
|
284552
284611
|
}
|
|
284553
284612
|
/**
|
|
@@ -284593,13 +284652,13 @@ var init_toolkit_lib = __esm({
|
|
|
284593
284652
|
if (!options.app) {
|
|
284594
284653
|
throw new Error("No app provided");
|
|
284595
284654
|
}
|
|
284596
|
-
const potentialCxPath =
|
|
284655
|
+
const potentialCxPath = path29.join(this.options.workingDirectory, options.app);
|
|
284597
284656
|
if (fs31.pathExistsSync(potentialCxPath) && fs31.statSync(potentialCxPath).isDirectory()) {
|
|
284598
284657
|
return this.toolkit.fromAssemblyDirectory(potentialCxPath);
|
|
284599
284658
|
}
|
|
284600
284659
|
let outdir;
|
|
284601
284660
|
if (options.output) {
|
|
284602
|
-
outdir =
|
|
284661
|
+
outdir = path29.join(this.options.workingDirectory, options.output);
|
|
284603
284662
|
}
|
|
284604
284663
|
return this.toolkit.fromCdkApp(options.app, {
|
|
284605
284664
|
workingDirectory: this.options.workingDirectory,
|
|
@@ -284786,11 +284845,11 @@ var init_logger = __esm({
|
|
|
284786
284845
|
});
|
|
284787
284846
|
|
|
284788
284847
|
// lib/runner/private/cloud-assembly.ts
|
|
284789
|
-
var
|
|
284848
|
+
var path30, import_cdk_assets_lib6, import_cloud_assembly_schema9, fs32, AssemblyManifestReader;
|
|
284790
284849
|
var init_cloud_assembly3 = __esm({
|
|
284791
284850
|
"lib/runner/private/cloud-assembly.ts"() {
|
|
284792
284851
|
"use strict";
|
|
284793
|
-
|
|
284852
|
+
path30 = __toESM(require("path"));
|
|
284794
284853
|
import_cdk_assets_lib6 = __toESM(require_lib8());
|
|
284795
284854
|
import_cloud_assembly_schema9 = __toESM(require_lib2());
|
|
284796
284855
|
fs32 = __toESM(require_lib4());
|
|
@@ -284812,7 +284871,7 @@ var init_cloud_assembly3 = __esm({
|
|
|
284812
284871
|
static fromFile(fileName) {
|
|
284813
284872
|
try {
|
|
284814
284873
|
const obj = import_cloud_assembly_schema9.Manifest.loadAssemblyManifest(fileName);
|
|
284815
|
-
return new _AssemblyManifestReader(
|
|
284874
|
+
return new _AssemblyManifestReader(path30.dirname(fileName), obj, fileName);
|
|
284816
284875
|
} catch (e4) {
|
|
284817
284876
|
throw new Error(`Cannot read integ manifest '${fileName}': ${e4.message}`);
|
|
284818
284877
|
}
|
|
@@ -284830,7 +284889,7 @@ var init_cloud_assembly3 = __esm({
|
|
|
284830
284889
|
throw new Error(`Cannot read integ manifest at '${filePath}': ${e4.message}`);
|
|
284831
284890
|
}
|
|
284832
284891
|
if (st.isDirectory()) {
|
|
284833
|
-
return _AssemblyManifestReader.fromFile(
|
|
284892
|
+
return _AssemblyManifestReader.fromFile(path30.join(filePath, _AssemblyManifestReader.DEFAULT_FILENAME));
|
|
284834
284893
|
}
|
|
284835
284894
|
return _AssemblyManifestReader.fromFile(filePath);
|
|
284836
284895
|
}
|
|
@@ -284845,7 +284904,7 @@ var init_cloud_assembly3 = __esm({
|
|
|
284845
284904
|
continue;
|
|
284846
284905
|
}
|
|
284847
284906
|
const props = artifact.properties;
|
|
284848
|
-
const template = fs32.readJSONSync(
|
|
284907
|
+
const template = fs32.readJSONSync(path30.resolve(this.directory, props.templateFile));
|
|
284849
284908
|
stacks[artifactId] = template;
|
|
284850
284909
|
}
|
|
284851
284910
|
return stacks;
|
|
@@ -284860,7 +284919,7 @@ var init_cloud_assembly3 = __esm({
|
|
|
284860
284919
|
);
|
|
284861
284920
|
const nestedStacks = Object.fromEntries(nestedTemplates.map((templateFile) => [
|
|
284862
284921
|
templateFile.split(".", 1)[0],
|
|
284863
|
-
fs32.readJSONSync(
|
|
284922
|
+
fs32.readJSONSync(path30.resolve(this.directory, templateFile))
|
|
284864
284923
|
]));
|
|
284865
284924
|
return nestedStacks;
|
|
284866
284925
|
}
|
|
@@ -284915,7 +284974,7 @@ var init_cloud_assembly3 = __esm({
|
|
|
284915
284974
|
getAssetManifestsForStack(stackId) {
|
|
284916
284975
|
return Object.values(this.manifest.artifacts ?? {}).filter((artifact) => artifact.type === import_cloud_assembly_schema9.ArtifactType.ASSET_MANIFEST && artifact.properties?.file === `${stackId}.assets.json`).map((artifact) => {
|
|
284917
284976
|
const fileName = artifact.properties.file;
|
|
284918
|
-
return import_cdk_assets_lib6.AssetManifest.fromFile(
|
|
284977
|
+
return import_cdk_assets_lib6.AssetManifest.fromFile(path30.join(this.directory, fileName));
|
|
284919
284978
|
});
|
|
284920
284979
|
}
|
|
284921
284980
|
/**
|
|
@@ -284941,7 +285000,7 @@ var init_cloud_assembly3 = __esm({
|
|
|
284941
285000
|
assetsFromAssetManifest(artifact) {
|
|
284942
285001
|
const assets = [];
|
|
284943
285002
|
const fileName = artifact.properties.file;
|
|
284944
|
-
const assetManifest = import_cdk_assets_lib6.AssetManifest.fromFile(
|
|
285003
|
+
const assetManifest = import_cdk_assets_lib6.AssetManifest.fromFile(path30.join(this.directory, fileName));
|
|
284945
285004
|
assetManifest.entries.forEach((entry) => {
|
|
284946
285005
|
if (entry.type === "file") {
|
|
284947
285006
|
const source = entry.source;
|
|
@@ -285024,11 +285083,11 @@ var init_cloud_assembly3 = __esm({
|
|
|
285024
285083
|
function currentlyRecommendedAwsCdkLibFlags() {
|
|
285025
285084
|
return recommended_feature_flags_exports;
|
|
285026
285085
|
}
|
|
285027
|
-
var
|
|
285086
|
+
var path31, import_cx_api13, fs33, DESTRUCTIVE_CHANGES, IntegRunner, DEFAULT_SYNTH_OPTIONS;
|
|
285028
285087
|
var init_runner_base = __esm({
|
|
285029
285088
|
"lib/runner/runner-base.ts"() {
|
|
285030
285089
|
"use strict";
|
|
285031
|
-
|
|
285090
|
+
path31 = __toESM(require("path"));
|
|
285032
285091
|
import_cx_api13 = __toESM(require_lib3());
|
|
285033
285092
|
fs33 = __toESM(require_lib4());
|
|
285034
285093
|
init_integ_test_suite();
|
|
@@ -285053,13 +285112,13 @@ var init_runner_base = __esm({
|
|
|
285053
285112
|
this.directory = this.test.directory;
|
|
285054
285113
|
this.testName = this.test.testName;
|
|
285055
285114
|
this.snapshotDir = this.test.snapshotDir;
|
|
285056
|
-
this.cdkContextPath =
|
|
285115
|
+
this.cdkContextPath = path31.join(this.directory, "cdk.context.json");
|
|
285057
285116
|
this.profile = options.profile;
|
|
285058
285117
|
this.showOutput = options.showOutput ?? false;
|
|
285059
285118
|
this.cdk = options.cdk ?? makeEngine(options);
|
|
285060
285119
|
this.cdkOutDir = options.integOutDir ?? this.test.temporaryOutputDir;
|
|
285061
285120
|
const testRunCommand = this.test.appCommand;
|
|
285062
|
-
this.cdkApp = testRunCommand.replace("{filePath}",
|
|
285121
|
+
this.cdkApp = testRunCommand.replace("{filePath}", path31.relative(this.directory, this.test.fileName));
|
|
285063
285122
|
}
|
|
285064
285123
|
static {
|
|
285065
285124
|
__name(this, "IntegRunner");
|
|
@@ -285088,7 +285147,7 @@ var init_runner_base = __esm({
|
|
|
285088
285147
|
// use the "expected" context. This is only run in order to read the manifest
|
|
285089
285148
|
context: this.getContext((await this.expectedTestSuite())?.synthContext),
|
|
285090
285149
|
env: DEFAULT_SYNTH_OPTIONS.env,
|
|
285091
|
-
output:
|
|
285150
|
+
output: path31.relative(this.directory, this.cdkOutDir)
|
|
285092
285151
|
});
|
|
285093
285152
|
const manifest = await this.loadManifest(this.cdkOutDir);
|
|
285094
285153
|
this.cleanup();
|
|
@@ -285150,7 +285209,7 @@ var init_runner_base = __esm({
|
|
|
285150
285209
|
all: true,
|
|
285151
285210
|
app: this.cdkApp,
|
|
285152
285211
|
profile: this.profile,
|
|
285153
|
-
output:
|
|
285212
|
+
output: path31.relative(this.directory, this.cdkOutDir)
|
|
285154
285213
|
}
|
|
285155
285214
|
});
|
|
285156
285215
|
this.legacyContext = LegacyIntegTestSuite.getPragmaContext(this.test.fileName);
|
|
@@ -285198,7 +285257,7 @@ var init_runner_base = __esm({
|
|
|
285198
285257
|
return manifest.getAssetLocationsForStack(stack) ?? [];
|
|
285199
285258
|
}));
|
|
285200
285259
|
assets.forEach((asset) => {
|
|
285201
|
-
const fileName =
|
|
285260
|
+
const fileName = path31.join(this.snapshotDir, asset);
|
|
285202
285261
|
if (fs33.existsSync(fileName)) {
|
|
285203
285262
|
if (fs33.lstatSync(fileName).isDirectory()) {
|
|
285204
285263
|
fs33.removeSync(fileName);
|
|
@@ -285216,7 +285275,7 @@ var init_runner_base = __esm({
|
|
|
285216
285275
|
removeAssetsCacheFromSnapshot() {
|
|
285217
285276
|
const files = fs33.readdirSync(this.snapshotDir);
|
|
285218
285277
|
files.forEach((file) => {
|
|
285219
|
-
const fileName =
|
|
285278
|
+
const fileName = path31.join(this.snapshotDir, file);
|
|
285220
285279
|
if (fs33.lstatSync(fileName).isDirectory() && file === ".cache") {
|
|
285221
285280
|
fs33.emptyDirSync(fileName);
|
|
285222
285281
|
fs33.rmdirSync(fileName);
|
|
@@ -285242,7 +285301,7 @@ var init_runner_base = __esm({
|
|
|
285242
285301
|
execCmd: this.cdkApp.split(" "),
|
|
285243
285302
|
context: this.getContext(actualTestSuite.enableLookups ? DEFAULT_SYNTH_OPTIONS.context : {}),
|
|
285244
285303
|
env: DEFAULT_SYNTH_OPTIONS.env,
|
|
285245
|
-
output:
|
|
285304
|
+
output: path31.relative(this.directory, this.snapshotDir)
|
|
285246
285305
|
});
|
|
285247
285306
|
await this.cleanupSnapshot();
|
|
285248
285307
|
}
|
|
@@ -285334,7 +285393,7 @@ var init_runner_base = __esm({
|
|
|
285334
285393
|
|
|
285335
285394
|
// lib/workers/common.ts
|
|
285336
285395
|
function formatAssertionResults(results) {
|
|
285337
|
-
return Object.entries(results).map(([id, result2]) => (0,
|
|
285396
|
+
return Object.entries(results).map(([id, result2]) => (0, import_util63.format)("%s%s", id, result2.status === "success" ? ` - ${result2.status}` : `
|
|
285338
285397
|
${result2.message}`)).join("\n ");
|
|
285339
285398
|
}
|
|
285340
285399
|
function formatError(error4) {
|
|
@@ -285346,11 +285405,11 @@ ${chalk24.gray("Cause: " + formatError(error4.cause))}`;
|
|
|
285346
285405
|
}
|
|
285347
285406
|
return `${name}: ${message2}`;
|
|
285348
285407
|
}
|
|
285349
|
-
var
|
|
285408
|
+
var import_util63, chalk24;
|
|
285350
285409
|
var init_common4 = __esm({
|
|
285351
285410
|
"lib/workers/common.ts"() {
|
|
285352
285411
|
"use strict";
|
|
285353
|
-
|
|
285412
|
+
import_util63 = require("util");
|
|
285354
285413
|
chalk24 = __toESM(require_source());
|
|
285355
285414
|
init_logger();
|
|
285356
285415
|
__name(formatAssertionResults, "formatAssertionResults");
|
|
@@ -285359,11 +285418,11 @@ var init_common4 = __esm({
|
|
|
285359
285418
|
});
|
|
285360
285419
|
|
|
285361
285420
|
// lib/runner/integ-test-runner.ts
|
|
285362
|
-
var
|
|
285421
|
+
var path32, import_cdk_cli_wrapper2, import_cloud_assembly_schema10, chokidar2, fs34, workerpool, IntegTestRunner;
|
|
285363
285422
|
var init_integ_test_runner = __esm({
|
|
285364
285423
|
"lib/runner/integ-test-runner.ts"() {
|
|
285365
285424
|
"use strict";
|
|
285366
|
-
|
|
285425
|
+
path32 = __toESM(require("path"));
|
|
285367
285426
|
import_cdk_cli_wrapper2 = __toESM(require_lib5());
|
|
285368
285427
|
import_cloud_assembly_schema10 = __toESM(require_lib2());
|
|
285369
285428
|
chokidar2 = __toESM(require_chokidar());
|
|
@@ -285410,7 +285469,7 @@ https://github.com/aws/aws-cdk/tree/main/packages/%40aws-cdk/integ-tests-alpha`
|
|
|
285410
285469
|
* all branches and we then search for one that starts with `HEAD branch: `
|
|
285411
285470
|
*/
|
|
285412
285471
|
checkoutSnapshot() {
|
|
285413
|
-
const gitCwd =
|
|
285472
|
+
const gitCwd = path32.dirname(this.snapshotDir);
|
|
285414
285473
|
const git = ["git", "-C", gitCwd];
|
|
285415
285474
|
let baseBranch = void 0;
|
|
285416
285475
|
try {
|
|
@@ -285430,7 +285489,7 @@ https://github.com/aws/aws-cdk/tree/main/packages/%40aws-cdk/integ-tests-alpha`
|
|
|
285430
285489
|
warning("error: %s", formatError(e4));
|
|
285431
285490
|
}
|
|
285432
285491
|
if (baseBranch) {
|
|
285433
|
-
const relativeSnapshotDir =
|
|
285492
|
+
const relativeSnapshotDir = path32.relative(gitCwd, this.snapshotDir);
|
|
285434
285493
|
const checkoutCommand = [...git, "checkout", [...git, "merge-base", "HEAD", baseBranch], "--", relativeSnapshotDir];
|
|
285435
285494
|
try {
|
|
285436
285495
|
execWithSubShell(checkoutCommand);
|
|
@@ -285533,7 +285592,7 @@ https://github.com/aws/aws-cdk/tree/main/packages/%40aws-cdk/integ-tests-alpha`
|
|
|
285533
285592
|
all: true,
|
|
285534
285593
|
force: true,
|
|
285535
285594
|
app: this.cdkApp,
|
|
285536
|
-
output:
|
|
285595
|
+
output: path32.relative(this.directory, this.cdkOutDir),
|
|
285537
285596
|
...actualTestCase.cdkCommandOptions?.destroy?.args,
|
|
285538
285597
|
context: this.getContext(actualTestCase.cdkCommandOptions?.destroy?.args?.context),
|
|
285539
285598
|
verbose: enableForVerbosityLevel(3),
|
|
@@ -285554,7 +285613,7 @@ https://github.com/aws/aws-cdk/tree/main/packages/%40aws-cdk/integ-tests-alpha`
|
|
|
285554
285613
|
if (actualTestCase.hooks?.preDestroy) {
|
|
285555
285614
|
actualTestCase.hooks.preDestroy.forEach((cmd) => {
|
|
285556
285615
|
exec(chunks(cmd), {
|
|
285557
|
-
cwd:
|
|
285616
|
+
cwd: path32.dirname(this.snapshotDir)
|
|
285558
285617
|
});
|
|
285559
285618
|
});
|
|
285560
285619
|
}
|
|
@@ -285564,7 +285623,7 @@ https://github.com/aws/aws-cdk/tree/main/packages/%40aws-cdk/integ-tests-alpha`
|
|
|
285564
285623
|
if (actualTestCase.hooks?.postDestroy) {
|
|
285565
285624
|
actualTestCase.hooks.postDestroy.forEach((cmd) => {
|
|
285566
285625
|
exec(chunks(cmd), {
|
|
285567
|
-
cwd:
|
|
285626
|
+
cwd: path32.dirname(this.snapshotDir)
|
|
285568
285627
|
});
|
|
285569
285628
|
});
|
|
285570
285629
|
}
|
|
@@ -285582,7 +285641,7 @@ https://github.com/aws/aws-cdk/tree/main/packages/%40aws-cdk/integ-tests-alpha`
|
|
|
285582
285641
|
if (actualTestCase.hooks?.preDeploy) {
|
|
285583
285642
|
actualTestCase.hooks.preDeploy.forEach((cmd) => {
|
|
285584
285643
|
exec(chunks(cmd), {
|
|
285585
|
-
cwd:
|
|
285644
|
+
cwd: path32.dirname(this.snapshotDir)
|
|
285586
285645
|
});
|
|
285587
285646
|
});
|
|
285588
285647
|
}
|
|
@@ -285593,8 +285652,8 @@ https://github.com/aws/aws-cdk/tree/main/packages/%40aws-cdk/integ-tests-alpha`
|
|
|
285593
285652
|
...actualTestCase.stacks,
|
|
285594
285653
|
...actualTestCase.assertionStack ? [actualTestCase.assertionStack] : []
|
|
285595
285654
|
],
|
|
285596
|
-
output:
|
|
285597
|
-
outputsFile:
|
|
285655
|
+
output: path32.relative(this.directory, this.cdkOutDir),
|
|
285656
|
+
outputsFile: path32.relative(this.directory, path32.join(this.cdkOutDir, "assertion-results.json")),
|
|
285598
285657
|
...actualTestCase?.cdkCommandOptions?.deploy?.args,
|
|
285599
285658
|
context: {
|
|
285600
285659
|
...this.getContext(actualTestCase?.cdkCommandOptions?.deploy?.args?.context)
|
|
@@ -285631,7 +285690,7 @@ https://github.com/aws/aws-cdk/tree/main/packages/%40aws-cdk/integ-tests-alpha`
|
|
|
285631
285690
|
]
|
|
285632
285691
|
});
|
|
285633
285692
|
}
|
|
285634
|
-
const assertionResults =
|
|
285693
|
+
const assertionResults = path32.join(this.cdkOutDir, "assertion-results.json");
|
|
285635
285694
|
const watcher = chokidar2.watch([this.cdkOutDir], {
|
|
285636
285695
|
cwd: this.directory
|
|
285637
285696
|
});
|
|
@@ -285641,7 +285700,7 @@ https://github.com/aws/aws-cdk/tree/main/packages/%40aws-cdk/integ-tests-alpha`
|
|
|
285641
285700
|
if (actualTestCase.hooks?.postDeploy) {
|
|
285642
285701
|
actualTestCase.hooks.postDeploy.forEach((cmd) => {
|
|
285643
285702
|
exec(chunks(cmd), {
|
|
285644
|
-
cwd:
|
|
285703
|
+
cwd: path32.dirname(this.snapshotDir)
|
|
285645
285704
|
});
|
|
285646
285705
|
});
|
|
285647
285706
|
}
|
|
@@ -285709,7 +285768,7 @@ https://github.com/aws/aws-cdk/tree/main/packages/%40aws-cdk/integ-tests-alpha`
|
|
|
285709
285768
|
if (actualTestCase.hooks?.preDeploy) {
|
|
285710
285769
|
actualTestCase.hooks.preDeploy.forEach((cmd) => {
|
|
285711
285770
|
exec(chunks(cmd), {
|
|
285712
|
-
cwd:
|
|
285771
|
+
cwd: path32.dirname(this.snapshotDir)
|
|
285713
285772
|
});
|
|
285714
285773
|
});
|
|
285715
285774
|
}
|
|
@@ -285722,7 +285781,7 @@ https://github.com/aws/aws-cdk/tree/main/packages/%40aws-cdk/integ-tests-alpha`
|
|
|
285722
285781
|
stacks: expectedTestCase.stacks,
|
|
285723
285782
|
...expectedTestCase?.cdkCommandOptions?.deploy?.args,
|
|
285724
285783
|
context: this.getContext(expectedTestCase?.cdkCommandOptions?.deploy?.args?.context),
|
|
285725
|
-
app:
|
|
285784
|
+
app: path32.relative(this.directory, this.snapshotDir),
|
|
285726
285785
|
lookups: expectedTestSuite?.enableLookups
|
|
285727
285786
|
});
|
|
285728
285787
|
}
|
|
@@ -285732,7 +285791,7 @@ https://github.com/aws/aws-cdk/tree/main/packages/%40aws-cdk/integ-tests-alpha`
|
|
|
285732
285791
|
stacks: [
|
|
285733
285792
|
...actualTestCase.stacks
|
|
285734
285793
|
],
|
|
285735
|
-
output:
|
|
285794
|
+
output: path32.relative(this.directory, this.cdkOutDir),
|
|
285736
285795
|
...actualTestCase?.cdkCommandOptions?.deploy?.args,
|
|
285737
285796
|
context: this.getContext(actualTestCase?.cdkCommandOptions?.deploy?.args?.context),
|
|
285738
285797
|
app: this.cdkApp
|
|
@@ -285745,9 +285804,9 @@ https://github.com/aws/aws-cdk/tree/main/packages/%40aws-cdk/integ-tests-alpha`
|
|
|
285745
285804
|
actualTestCase.assertionStack
|
|
285746
285805
|
],
|
|
285747
285806
|
rollback: false,
|
|
285748
|
-
output:
|
|
285807
|
+
output: path32.relative(this.directory, this.cdkOutDir),
|
|
285749
285808
|
...actualTestCase?.cdkCommandOptions?.deploy?.args,
|
|
285750
|
-
outputsFile:
|
|
285809
|
+
outputsFile: path32.relative(this.directory, path32.join(this.cdkOutDir, "assertion-results.json")),
|
|
285751
285810
|
context: this.getContext(actualTestCase?.cdkCommandOptions?.deploy?.args?.context),
|
|
285752
285811
|
app: this.cdkApp
|
|
285753
285812
|
});
|
|
@@ -285755,13 +285814,13 @@ https://github.com/aws/aws-cdk/tree/main/packages/%40aws-cdk/integ-tests-alpha`
|
|
|
285755
285814
|
if (actualTestCase.hooks?.postDeploy) {
|
|
285756
285815
|
actualTestCase.hooks.postDeploy.forEach((cmd) => {
|
|
285757
285816
|
exec(chunks(cmd), {
|
|
285758
|
-
cwd:
|
|
285817
|
+
cwd: path32.dirname(this.snapshotDir)
|
|
285759
285818
|
});
|
|
285760
285819
|
});
|
|
285761
285820
|
}
|
|
285762
285821
|
if (actualTestCase.assertionStack && actualTestCase.assertionStackName) {
|
|
285763
285822
|
return this.processAssertionResults(
|
|
285764
|
-
|
|
285823
|
+
path32.join(this.cdkOutDir, "assertion-results.json"),
|
|
285765
285824
|
actualTestCase.assertionStackName,
|
|
285766
285825
|
actualTestCase.assertionStack
|
|
285767
285826
|
);
|
|
@@ -285825,11 +285884,11 @@ https://github.com/aws/aws-cdk/tree/main/packages/%40aws-cdk/integ-tests-alpha`
|
|
|
285825
285884
|
});
|
|
285826
285885
|
|
|
285827
285886
|
// lib/runner/snapshot-test-runner.ts
|
|
285828
|
-
var
|
|
285887
|
+
var path33, import_stream2, import_string_decoder, import_cloudformation_diff4, IntegSnapshotRunner, StringWritable;
|
|
285829
285888
|
var init_snapshot_test_runner = __esm({
|
|
285830
285889
|
"lib/runner/snapshot-test-runner.ts"() {
|
|
285831
285890
|
"use strict";
|
|
285832
|
-
|
|
285891
|
+
path33 = __toESM(require("path"));
|
|
285833
285892
|
import_stream2 = require("stream");
|
|
285834
285893
|
import_string_decoder = require("string_decoder");
|
|
285835
285894
|
import_cloudformation_diff4 = __toESM(require_lib12());
|
|
@@ -285863,7 +285922,7 @@ var init_snapshot_test_runner = __esm({
|
|
|
285863
285922
|
execCmd: this.cdkApp.split(" "),
|
|
285864
285923
|
context: this.getContext(actualTestSuite.enableLookups ? DEFAULT_SYNTH_OPTIONS.context : {}),
|
|
285865
285924
|
env,
|
|
285866
|
-
output:
|
|
285925
|
+
output: path33.relative(this.directory, this.cdkOutDir)
|
|
285867
285926
|
});
|
|
285868
285927
|
const actualSnapshotAssembly = this.getSnapshotAssembly(this.cdkOutDir, actualTestSuite.stacks);
|
|
285869
285928
|
const diagnostics = await this.diffAssembly(expectedSnapshotAssembly, actualSnapshotAssembly);
|
|
@@ -285871,8 +285930,8 @@ var init_snapshot_test_runner = __esm({
|
|
|
285871
285930
|
const additionalMessages = [];
|
|
285872
285931
|
if (options.retain) {
|
|
285873
285932
|
additionalMessages.push(
|
|
285874
|
-
`(Failure retained) Expected: ${
|
|
285875
|
-
` Actual: ${
|
|
285933
|
+
`(Failure retained) Expected: ${path33.relative(process.cwd(), this.snapshotDir)}`,
|
|
285934
|
+
` Actual: ${path33.relative(process.cwd(), this.cdkOutDir)}`
|
|
285876
285935
|
), doClean = false;
|
|
285877
285936
|
}
|
|
285878
285937
|
if (options.verbose) {
|
|
@@ -286125,11 +286184,11 @@ var init_snapshot_test_runner = __esm({
|
|
|
286125
286184
|
});
|
|
286126
286185
|
|
|
286127
286186
|
// lib/runner/integration-tests.ts
|
|
286128
|
-
var
|
|
286187
|
+
var path34, fs35, CDK_OUTDIR_PREFIX, IntegTest;
|
|
286129
286188
|
var init_integration_tests = __esm({
|
|
286130
286189
|
"lib/runner/integration-tests.ts"() {
|
|
286131
286190
|
"use strict";
|
|
286132
|
-
|
|
286191
|
+
path34 = __toESM(require("path"));
|
|
286133
286192
|
fs35 = __toESM(require_lib4());
|
|
286134
286193
|
CDK_OUTDIR_PREFIX = "cdk-integ.out";
|
|
286135
286194
|
IntegTest = class {
|
|
@@ -286137,14 +286196,14 @@ var init_integration_tests = __esm({
|
|
|
286137
286196
|
this.info = info2;
|
|
286138
286197
|
this.appCommand = info2.appCommand ?? "node {filePath}";
|
|
286139
286198
|
this.directory = process.cwd();
|
|
286140
|
-
this.absoluteFileName =
|
|
286141
|
-
this.fileName =
|
|
286142
|
-
this.discoveryRelativeFileName =
|
|
286143
|
-
const parsed =
|
|
286144
|
-
this.testName =
|
|
286199
|
+
this.absoluteFileName = path34.resolve(info2.fileName);
|
|
286200
|
+
this.fileName = path34.relative(this.directory, info2.fileName);
|
|
286201
|
+
this.discoveryRelativeFileName = path34.relative(info2.discoveryRoot, info2.fileName);
|
|
286202
|
+
const parsed = path34.parse(this.fileName);
|
|
286203
|
+
this.testName = path34.join(path34.relative(this.info.discoveryRoot, parsed.dir), parsed.name);
|
|
286145
286204
|
this.normalizedTestName = parsed.name;
|
|
286146
|
-
this.snapshotDir =
|
|
286147
|
-
this.temporaryOutputDir =
|
|
286205
|
+
this.snapshotDir = path34.join(parsed.dir, `${parsed.base}.snapshot`);
|
|
286206
|
+
this.temporaryOutputDir = path34.join(parsed.dir, `${CDK_OUTDIR_PREFIX}.${parsed.base}.snapshot`);
|
|
286148
286207
|
}
|
|
286149
286208
|
static {
|
|
286150
286209
|
__name(this, "IntegTest");
|