cdk-assets 4.2.1 → 4.2.2

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.
Files changed (3) hide show
  1. package/bin/cdk-assets.js +25 -11
  2. package/bin/docker-credential-cdk-assets.js +25 -11
  3. package/package.json +4 -4
package/bin/cdk-assets.js CHANGED
@@ -4216,7 +4216,7 @@ var require_semver2 = __commonJS({
4216
4216
  // ../@aws-cdk/cloud-assembly-schema/cli-version.json
4217
4217
  var require_cli_version = __commonJS({
4218
4218
  "../@aws-cdk/cloud-assembly-schema/cli-version.json"(exports2, module2) {
4219
- module2.exports = { version: "2.1029.3" };
4219
+ module2.exports = { version: "2.1033.0" };
4220
4220
  }
4221
4221
  });
4222
4222
 
@@ -10085,8 +10085,11 @@ var init_brace_expressions = __esm({
10085
10085
  var unescape2;
10086
10086
  var init_unescape = __esm({
10087
10087
  "../../node_modules/glob/node_modules/minimatch/dist/esm/unescape.js"() {
10088
- unescape2 = /* @__PURE__ */ __name((s3, { windowsPathsNoEscape = false } = {}) => {
10089
- return windowsPathsNoEscape ? s3.replace(/\[([^\/\\])\]/g, "$1") : s3.replace(/((?!\\).|^)\[([^\/\\])\]/g, "$1$2").replace(/\\([^\/])/g, "$1");
10088
+ unescape2 = /* @__PURE__ */ __name((s3, { windowsPathsNoEscape = false, magicalBraces = true } = {}) => {
10089
+ if (magicalBraces) {
10090
+ return windowsPathsNoEscape ? s3.replace(/\[([^\/\\])\]/g, "$1") : s3.replace(/((?!\\).|^)\[([^\/\\])\]/g, "$1$2").replace(/\\([^\/])/g, "$1");
10091
+ }
10092
+ return windowsPathsNoEscape ? s3.replace(/\[([^\/\\{}])\]/g, "$1") : s3.replace(/((?!\\).|^)\[([^\/\\{}])\]/g, "$1$2").replace(/\\([^\/{}])/g, "$1");
10090
10093
  }, "unescape");
10091
10094
  }
10092
10095
  });
@@ -10450,7 +10453,7 @@ var init_ast = __esm({
10450
10453
  if (this.#root === this)
10451
10454
  this.#fillNegs();
10452
10455
  if (!this.type) {
10453
- const noEmpty = this.isStart() && this.isEnd();
10456
+ const noEmpty = this.isStart() && this.isEnd() && !this.#parts.some((s3) => typeof s3 !== "string");
10454
10457
  const src = this.#parts.map((p3) => {
10455
10458
  const [re, _3, hasMagic2, uflag] = typeof p3 === "string" ? _AST.#parseGlob(p3, this.#hasMagic, noEmpty) : p3.toRegExpSource(allowDot);
10456
10459
  this.#hasMagic = this.#hasMagic || hasMagic2;
@@ -10560,10 +10563,7 @@ var init_ast = __esm({
10560
10563
  }
10561
10564
  }
10562
10565
  if (c3 === "*") {
10563
- if (noEmpty && glob2 === "*")
10564
- re += starNoEmpty;
10565
- else
10566
- re += star;
10566
+ re += noEmpty && glob2 === "*" ? starNoEmpty : star;
10567
10567
  hasMagic2 = true;
10568
10568
  continue;
10569
10569
  }
@@ -10584,7 +10584,10 @@ var init_ast = __esm({
10584
10584
  var escape;
10585
10585
  var init_escape = __esm({
10586
10586
  "../../node_modules/glob/node_modules/minimatch/dist/esm/escape.js"() {
10587
- escape = /* @__PURE__ */ __name((s3, { windowsPathsNoEscape = false } = {}) => {
10587
+ escape = /* @__PURE__ */ __name((s3, { windowsPathsNoEscape = false, magicalBraces = false } = {}) => {
10588
+ if (magicalBraces) {
10589
+ return windowsPathsNoEscape ? s3.replace(/[?*()[\]{}]/g, "[$&]") : s3.replace(/[?*()[\]\\{}]/g, "\\$&");
10590
+ }
10588
10591
  return windowsPathsNoEscape ? s3.replace(/[?*()[\]]/g, "[$&]") : s3.replace(/[?*()[\]\\]/g, "\\$&");
10589
10592
  }, "escape");
10590
10593
  }
@@ -11247,16 +11250,27 @@ var init_esm3 = __esm({
11247
11250
  pp[i3] = twoStar;
11248
11251
  }
11249
11252
  } else if (next === void 0) {
11250
- pp[i3 - 1] = prev + "(?:\\/|" + twoStar + ")?";
11253
+ pp[i3 - 1] = prev + "(?:\\/|\\/" + twoStar + ")?";
11251
11254
  } else if (next !== GLOBSTAR) {
11252
11255
  pp[i3 - 1] = prev + "(?:\\/|\\/" + twoStar + "\\/)" + next;
11253
11256
  pp[i3 + 1] = GLOBSTAR;
11254
11257
  }
11255
11258
  });
11256
- return pp.filter((p3) => p3 !== GLOBSTAR).join("/");
11259
+ const filtered = pp.filter((p3) => p3 !== GLOBSTAR);
11260
+ if (this.partial && filtered.length >= 1) {
11261
+ const prefixes = [];
11262
+ for (let i3 = 1; i3 <= filtered.length; i3++) {
11263
+ prefixes.push(filtered.slice(0, i3).join("/"));
11264
+ }
11265
+ return "(?:" + prefixes.join("|") + ")";
11266
+ }
11267
+ return filtered.join("/");
11257
11268
  }).join("|");
11258
11269
  const [open, close] = set.length > 1 ? ["(?:", ")"] : ["", ""];
11259
11270
  re = "^" + open + re + close + "$";
11271
+ if (this.partial) {
11272
+ re = "^(?:\\/|" + open + re.slice(1, -1) + close + ")$";
11273
+ }
11260
11274
  if (this.negate)
11261
11275
  re = "^(?!" + re + ").+$";
11262
11276
  try {
package/bin/docker-credential-cdk-assets.js CHANGED
@@ -4263,7 +4263,7 @@ var require_semver2 = __commonJS({
4263
4263
  // ../@aws-cdk/cloud-assembly-schema/cli-version.json
4264
4264
  var require_cli_version = __commonJS({
4265
4265
  "../@aws-cdk/cloud-assembly-schema/cli-version.json"(exports2, module2) {
4266
- module2.exports = { version: "2.1029.3" };
4266
+ module2.exports = { version: "2.1033.0" };
4267
4267
  }
4268
4268
  });
4269
4269
 
@@ -10132,8 +10132,11 @@ var init_brace_expressions = __esm({
10132
10132
  var unescape2;
10133
10133
  var init_unescape = __esm({
10134
10134
  "../../node_modules/glob/node_modules/minimatch/dist/esm/unescape.js"() {
10135
- unescape2 = /* @__PURE__ */ __name((s3, { windowsPathsNoEscape = false } = {}) => {
10136
- return windowsPathsNoEscape ? s3.replace(/\[([^\/\\])\]/g, "$1") : s3.replace(/((?!\\).|^)\[([^\/\\])\]/g, "$1$2").replace(/\\([^\/])/g, "$1");
10135
+ unescape2 = /* @__PURE__ */ __name((s3, { windowsPathsNoEscape = false, magicalBraces = true } = {}) => {
10136
+ if (magicalBraces) {
10137
+ return windowsPathsNoEscape ? s3.replace(/\[([^\/\\])\]/g, "$1") : s3.replace(/((?!\\).|^)\[([^\/\\])\]/g, "$1$2").replace(/\\([^\/])/g, "$1");
10138
+ }
10139
+ return windowsPathsNoEscape ? s3.replace(/\[([^\/\\{}])\]/g, "$1") : s3.replace(/((?!\\).|^)\[([^\/\\{}])\]/g, "$1$2").replace(/\\([^\/{}])/g, "$1");
10137
10140
  }, "unescape");
10138
10141
  }
10139
10142
  });
@@ -10497,7 +10500,7 @@ var init_ast = __esm({
10497
10500
  if (this.#root === this)
10498
10501
  this.#fillNegs();
10499
10502
  if (!this.type) {
10500
- const noEmpty = this.isStart() && this.isEnd();
10503
+ const noEmpty = this.isStart() && this.isEnd() && !this.#parts.some((s3) => typeof s3 !== "string");
10501
10504
  const src = this.#parts.map((p3) => {
10502
10505
  const [re, _3, hasMagic2, uflag] = typeof p3 === "string" ? _AST.#parseGlob(p3, this.#hasMagic, noEmpty) : p3.toRegExpSource(allowDot);
10503
10506
  this.#hasMagic = this.#hasMagic || hasMagic2;
@@ -10607,10 +10610,7 @@ var init_ast = __esm({
10607
10610
  }
10608
10611
  }
10609
10612
  if (c3 === "*") {
10610
- if (noEmpty && glob2 === "*")
10611
- re += starNoEmpty;
10612
- else
10613
- re += star;
10613
+ re += noEmpty && glob2 === "*" ? starNoEmpty : star;
10614
10614
  hasMagic2 = true;
10615
10615
  continue;
10616
10616
  }
@@ -10631,7 +10631,10 @@ var init_ast = __esm({
10631
10631
  var escape;
10632
10632
  var init_escape = __esm({
10633
10633
  "../../node_modules/glob/node_modules/minimatch/dist/esm/escape.js"() {
10634
- escape = /* @__PURE__ */ __name((s3, { windowsPathsNoEscape = false } = {}) => {
10634
+ escape = /* @__PURE__ */ __name((s3, { windowsPathsNoEscape = false, magicalBraces = false } = {}) => {
10635
+ if (magicalBraces) {
10636
+ return windowsPathsNoEscape ? s3.replace(/[?*()[\]{}]/g, "[$&]") : s3.replace(/[?*()[\]\\{}]/g, "\\$&");
10637
+ }
10635
10638
  return windowsPathsNoEscape ? s3.replace(/[?*()[\]]/g, "[$&]") : s3.replace(/[?*()[\]\\]/g, "\\$&");
10636
10639
  }, "escape");
10637
10640
  }
@@ -11294,16 +11297,27 @@ var init_esm3 = __esm({
11294
11297
  pp[i3] = twoStar;
11295
11298
  }
11296
11299
  } else if (next === void 0) {
11297
- pp[i3 - 1] = prev + "(?:\\/|" + twoStar + ")?";
11300
+ pp[i3 - 1] = prev + "(?:\\/|\\/" + twoStar + ")?";
11298
11301
  } else if (next !== GLOBSTAR) {
11299
11302
  pp[i3 - 1] = prev + "(?:\\/|\\/" + twoStar + "\\/)" + next;
11300
11303
  pp[i3 + 1] = GLOBSTAR;
11301
11304
  }
11302
11305
  });
11303
- return pp.filter((p3) => p3 !== GLOBSTAR).join("/");
11306
+ const filtered = pp.filter((p3) => p3 !== GLOBSTAR);
11307
+ if (this.partial && filtered.length >= 1) {
11308
+ const prefixes = [];
11309
+ for (let i3 = 1; i3 <= filtered.length; i3++) {
11310
+ prefixes.push(filtered.slice(0, i3).join("/"));
11311
+ }
11312
+ return "(?:" + prefixes.join("|") + ")";
11313
+ }
11314
+ return filtered.join("/");
11304
11315
  }).join("|");
11305
11316
  const [open, close] = set.length > 1 ? ["(?:", ")"] : ["", ""];
11306
11317
  re = "^" + open + re + close + "$";
11318
+ if (this.partial) {
11319
+ re = "^(?:\\/|" + open + re.slice(1, -1) + close + ")$";
11320
+ }
11307
11321
  if (this.negate)
11308
11322
  re = "^(?!" + re + ").+$";
11309
11323
  try {
package/package.json CHANGED
@@ -35,7 +35,7 @@
35
35
  "organization": true
36
36
  },
37
37
  "devDependencies": {
38
- "@aws-cdk/cloud-assembly-schema": "48.11.0",
38
+ "@aws-cdk/cloud-assembly-schema": "48.20.0",
39
39
  "@aws-sdk/client-s3": "^3.893.0",
40
40
  "@cdklabs/eslint-plugin": "^1.3.5",
41
41
  "@stylistic/eslint-plugin": "^3",
@@ -60,8 +60,8 @@
60
60
  "node-backpack": "^1.1.7",
61
61
  "prettier": "^2.8",
62
62
  "ts-jest": "^29.4.4",
63
- "typescript": "5.8",
64
- "@aws-cdk/cdk-assets-lib": "^1.0.4",
63
+ "typescript": "5.9",
64
+ "@aws-cdk/cdk-assets-lib": "^1.0.5",
65
65
  "yargs": "^17.7.2"
66
66
  },
67
67
  "dependencies": {},
@@ -78,7 +78,7 @@
78
78
  "publishConfig": {
79
79
  "access": "public"
80
80
  },
81
- "version": "4.2.1",
81
+ "version": "4.2.2",
82
82
  "types": "lib/index.d.ts",
83
83
  "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \"npx projen\"."
84
84
  }