@aws-cdk/cloud-assembly-schema 53.23.0 → 53.25.0

package/.jsii

@@ -8,8 +8,8 @@
     "url": "https://aws.amazon.com"
   },
   "bundled": {
-    "jsonschema": "~1.4.1",
-    "semver": "^7.7.4"
+    "jsonschema": "^1.5.0",
+    "semver": "^7.8.0"
   },
   "description": "Schema for the protocol between CDK framework and CDK CLI",
   "docs": {
@@ -6198,6 +6198,6 @@
       "symbolId": "lib/cloud-assembly/context-queries:VpcContextQuery"
     }
   },
-  "version": "53.23.0",
-  "fingerprint": "Q2fiJUIIwvX2vQZDRDA7VID8cdT9msx01BqiHyZaxVs="
+  "version": "53.25.0",
+  "fingerprint": "0RnAFDJ7s83trPcX6H+I4/CCwL3bX6i22L8JN7nr6BM="
 }

package/cli-version.json

@@ -1 +1 @@
-{"version":"2.1122.0"}
+{"version":"2.1123.0"}

package/lib/manifest.js

@@ -258,7 +258,7 @@ class Manifest {
 }
 exports.Manifest = Manifest;
 _a = JSII_RTTI_SYMBOL_1;
-Manifest[_a] = { fqn: "@aws-cdk/cloud-assembly-schema.Manifest", version: "53.23.0" };
+Manifest[_a] = { fqn: "@aws-cdk/cloud-assembly-schema.Manifest", version: "53.25.0" };
 function stripEnumErrors(errors) {
     return errors.filter((e) => typeof e.schema === 'string' || !('enum' in e.schema));
 }

package/node_modules/jsonschema/README.md

@@ -80,6 +80,8 @@ var p = {
 v.addSchema(addressSchema, '/SimpleAddress');
 console.log(v.validate(p, schema));
 ```
+Returned ValidatorResult object, will show this example is NOT valid since: `"votes": "lots"` is not an integer.
+
 ### Example for Array schema
 
 ```json
@@ -268,6 +270,34 @@ function importNextSchema(){
 }
 importNextSchema();
 ```
+### Disallowing unknown attributes
+
+Sometimes you may want to disallow unknown attributes passed in the body of the request, in order to disallow those unknown attributes before the validation of the body, you need to set additionalProperties to false.
+
+```javascript
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "Accounting Resource - Add Item",
+  "type": "object",
+  "additionalProperties": false,
+  "properties": {
+      "itemNumber": {
+          "type":"string"
+      },
+      "title": {
+          "type":"string"
+      },
+      "description": {
+          "type":"string"
+      }
+  },
+  "required": [
+      "itemNumber",
+      "title",
+      "description"
+  ]
+}
+```
 
 ### Default base URI
 

package/node_modules/jsonschema/lib/helpers.js

@@ -1,7 +1,5 @@
 'use strict';
 
-var uri = require('url');
-
 var ValidationError = exports.ValidationError = function ValidationError (message, instance, schema, path, name, argument) {
   if(Array.isArray(path)){
     this.path = path;
@@ -84,7 +82,7 @@ Object.defineProperty(ValidatorResult.prototype, "valid", { get: function() {
 
 module.exports.ValidatorResultError = ValidatorResultError;
 function ValidatorResultError(result) {
-  if(Error.captureStackTrace){
+  if(typeof Error.captureStackTrace === 'function'){
     Error.captureStackTrace(this, ValidatorResultError);
   }
   this.instance = result.instance;
@@ -105,7 +103,9 @@ var SchemaError = exports.SchemaError = function SchemaError (msg, schema) {
   this.message = msg;
   this.schema = schema;
   Error.call(this, msg);
-  Error.captureStackTrace(this, SchemaError);
+  if(typeof Error.captureStackTrace === 'function'){
+    Error.captureStackTrace(this, SchemaError);
+  }
 };
 SchemaError.prototype = Object.create(Error.prototype,
   {
@@ -129,13 +129,13 @@ var SchemaContext = exports.SchemaContext = function SchemaContext (schema, opti
 };
 
 SchemaContext.prototype.resolve = function resolve (target) {
-  return uri.resolve(this.base, target);
+  return (() => resolveUrl(this.base,target))();
 };
 
 SchemaContext.prototype.makeChild = function makeChild(schema, propertyName){
   var path = (propertyName===undefined) ? this.path : this.path.concat([propertyName]);
   var id = schema.$id || schema.id;
-  var base = uri.resolve(this.base, id||'');
+  let base = (() => resolveUrl(this.base,id||''))();
   var ctx = new SchemaContext(schema, this.options, path, base, Object.create(this.schemas));
   if(id && !ctx.schemas[base]){
     ctx.schemas[base] = schema;
@@ -388,3 +388,19 @@ exports.isSchema = function isSchema(val){
   return (typeof val === 'object' && val) || (typeof val === 'boolean');
 };
 
+/**
+ * Resolve target URL from a base and relative URL.
+ * Similar to Node's URL Lib's legacy resolve function.
+ * Code from example in deprecation note in said library.
+ * @param string
+ * @param string
+ * @returns {string}
+ */
+var resolveUrl = exports.resolveUrl = function resolveUrl(from, to) {
+  const resolvedUrl = new URL(to, new URL(from, 'resolve://'));
+  if (resolvedUrl.protocol === 'resolve:') {
+    const { pathname, search, hash } = resolvedUrl;
+    return pathname + search + hash;
+  }
+  return resolvedUrl.toString();
+}

package/node_modules/jsonschema/lib/index.d.ts

@@ -27,6 +27,13 @@ export declare class ValidatorResult {
     toString(): string;
 }
 
+export declare class ValidatorResultError extends Error {
+  instance: any;
+  schema: Schema;
+  options: Options;
+  errors: ValidationError;
+}
+
 export declare class ValidationError {
     constructor(message?: string, instance?: any, schema?: Schema, propertyPath?: any, name?: string, argument?: any);
     path: (string|number)[];
@@ -65,12 +72,14 @@ export interface Schema {
     pattern?: string | RegExp
     additionalItems?: boolean | Schema
     items?: Schema | Schema[]
+    contains?: Schema
     maxItems?: number
     minItems?: number
     uniqueItems?: boolean
     maxProperties?: number
     minProperties?: number
     required?: string[] | boolean
+    propertyNames?: boolean | Schema
     additionalProperties?: boolean | Schema
     definitions?: {
         [name: string]: Schema
@@ -95,6 +104,8 @@ export interface Schema {
     if?: Schema
     then?: Schema
     else?: Schema
+    default?: any
+    examples?: any[]
 }
 
 export interface Options {

package/node_modules/jsonschema/lib/scan.js

@@ -1,6 +1,5 @@
 "use strict";
 
-var urilib = require('url');
 var helpers = require('./helpers');
 
 module.exports.SchemaScanResult = SchemaScanResult;
@@ -20,12 +19,13 @@ module.exports.scan = function scan(base, schema){
     if(!schema || typeof schema!='object') return;
     // Mark all referenced schemas so we can tell later which schemas are referred to, but never defined
     if(schema.$ref){
-      var resolvedUri = urilib.resolve(baseuri, schema.$ref);
+      let resolvedUri = helpers.resolveUrl(baseuri,schema.$ref);
       ref[resolvedUri] = ref[resolvedUri] ? ref[resolvedUri]+1 : 0;
       return;
     }
     var id = schema.$id || schema.id;
-    var ourBase = id ? urilib.resolve(baseuri, id) : baseuri;
+    let resolvedBase = helpers.resolveUrl(baseuri,id);
+    var ourBase = id ? resolvedBase : baseuri;
     if (ourBase) {
       // If there's no fragment, append an empty one
       if(ourBase.indexOf('#')<0) ourBase += '#';

package/node_modules/jsonschema/lib/validator.js

@@ -1,7 +1,5 @@
 'use strict';
 
-var urilib = require('url');
-
 var attribute = require('./attribute');
 var helpers = require('./helpers');
 var scanSchema = require('./scan').scan;
@@ -115,7 +113,7 @@ Validator.prototype.validate = function validate (instance, schema, options, ctx
   // This section indexes subschemas in the provided schema, so they don't need to be added with Validator#addSchema
   // This will work so long as the function at uri.resolve() will resolve a relative URI to a relative URI
   var id = schema.$id || schema.id;
-  var base = urilib.resolve(options.base||anonymousBase, id||'');
+  let base = helpers.resolveUrl(options.base,id||'');
   if(!ctx){
     ctx = new SchemaContext(schema, options, [], base, Object.create(this.schemas));
     if (!ctx.schemas[base]) {
@@ -262,8 +260,8 @@ Validator.prototype.resolve = function resolve (schema, switchSchema, ctx) {
     return {subschema: ctx.schemas[switchSchema], switchSchema: switchSchema};
   }
   // Else try walking the property pointer
-  var parsed = urilib.parse(switchSchema);
-  var fragment = parsed && parsed.hash;
+  let parsed = new URL(switchSchema,'thismessage::/');
+  let fragment = parsed.hash;
   var document = fragment && fragment.length && switchSchema.substr(0, switchSchema.length - fragment.length);
   if (!document || !ctx.schemas[document]) {
     throw new SchemaError("no such schema <" + switchSchema + ">", schema);

package/node_modules/jsonschema/package.json

@@ -1,7 +1,7 @@
 {
   "author": "Tom de Grunt <tom@degrunt.nl>",
   "name": "jsonschema",
-  "version": "1.4.1",
+  "version": "1.5.0",
   "license": "MIT",
   "dependencies": {},
   "contributors": [
@@ -39,4 +39,4 @@
     "stryker": "stryker run",
     "test": "./node_modules/.bin/mocha -R spec"
   }
-}
+}

package/node_modules/semver/README.md

@@ -56,6 +56,7 @@ const semverCompareLoose = require('semver/functions/compare-loose')
 const semverCompareBuild = require('semver/functions/compare-build')
 const semverSort = require('semver/functions/sort')
 const semverRsort = require('semver/functions/rsort')
+const semverTruncate = require('semver/functions/truncate')
 
 // low-level comparators between versions
 const semverGt = require('semver/functions/gt')
@@ -399,12 +400,19 @@ nr         ::= '0' | ['1'-'9'] ( ['0'-'9'] ) *
 tilde      ::= '~' partial
 caret      ::= '^' partial
 qualifier  ::= ( '-' pre )? ( '+' build )?
-pre        ::= parts
-build      ::= parts
-parts      ::= part ( '.' part ) *
-part       ::= nr | [-0-9A-Za-z]+
+pre        ::= prepart ( '.' prepart ) *
+prepart    ::= nr | alphanumid
+build      ::= buildid ( '.' buildid ) *
+alphanumid ::= ( ['0'-'9'] ) * [-A-Za-z] [-0-9A-Za-z] *
+buildid    ::= [-0-9A-Za-z]+
 ```
 
+Note: Prerelease identifiers (`pre`) use `nr` for numeric parts, which
+disallows leading zeros (e.g., `1.2.3-00` is invalid). Build metadata
+identifiers (`build`) allow any alphanumeric string including leading
+zeros (e.g., `1.2.3+00` is valid). This matches the
+[SemVer 2.0.0 specification](https://semver.org/#spec-item-9).
+
 ## Functions
 
 All methods and classes take a final `options` object argument.  All
@@ -449,6 +457,12 @@ strings that they parse.
   or comparators intersect.
 * `parse(v)`: Attempt to parse a string as a semantic version, returning either
   a `SemVer` object or `null`.
+* `truncate(v, releaseType)`: Return the version with components _lower_
+  than `releaseType` dropped off, e.g.:
+  * `major` removes build & prerelease info and sets minor & patch to 0.
+  * `minor` removes build & prerelease info, and sets patch to 0
+  * `patch` removes build & prerelease info
+  * All prerelease types remove build info only
 
 ### Comparison
 
@@ -650,6 +664,7 @@ The following modules are available:
 * `require('semver/functions/rsort')`
 * `require('semver/functions/satisfies')`
 * `require('semver/functions/sort')`
+* `require('semver/functions/truncate')`
 * `require('semver/functions/valid')`
 * `require('semver/ranges/gtr')`
 * `require('semver/ranges/intersects')`

package/node_modules/semver/bin/semver.js

@@ -46,6 +46,7 @@ const main = () => {
       a = a.slice(0, indexOfEqualSign)
       argv.unshift(value)
     }
+
     switch (a) {
       case '-rv': case '-rev': case '--rev': case '--reverse':
         reverse = true
@@ -60,15 +61,10 @@ const main = () => {
         versions.push(argv.shift())
         break
       case '-i': case '--inc': case '--increment':
-        switch (argv[0]) {
-          case 'major': case 'minor': case 'patch': case 'prerelease':
-          case 'premajor': case 'preminor': case 'prepatch':
-          case 'release':
-            inc = argv.shift()
-            break
-          default:
-            inc = 'patch'
-            break
+        if (semver.RELEASE_TYPES.includes(argv[0]) || (argv[0] === 'release')) {
+          inc = { value: argv.shift(), maybeErrantValue: null, option: a }
+        } else {
+          inc = { value: 'patch', maybeErrantValue: argv[0], option: a }
         }
         break
       case '--preid':
@@ -102,6 +98,14 @@ const main = () => {
 
   options = parseOptions({ loose, includePrerelease, rtl })
 
+  if (
+    inc &&
+    versions.includes(inc.maybeErrantValue) &&
+    !semver.valid(inc.maybeErrantValue, options)
+  ) {
+    console.warn(`Invalid value for ${inc.option}; defaulting to 'patch'. This may become a failure in future major versions.`)
+  }
+
   versions = versions.map((v) => {
     return coerce ? (semver.coerce(v, options) || { version: v }).version : v
   }).filter((v) => {
@@ -125,7 +129,7 @@ const main = () => {
   versions
     .sort((a, b) => semver[reverse ? 'rcompare' : 'compare'](a, b, options))
     .map(v => semver.clean(v, options))
-    .map(v => inc ? semver.inc(v, inc, options, identifier, identifierBase) : v)
+    .map(v => inc ? semver.inc(v, inc.value, options, identifier, identifierBase) : v)
     .forEach(v => console.log(v))
 }
 

package/node_modules/semver/functions/truncate.js

@@ -0,0 +1,48 @@
+'use strict'
+
+const parse = require('./parse')
+const constants = require('../internal/constants')
+const SemVer = require('../classes/semver')
+
+const truncate = (version, truncation, options) => {
+  if (!constants.RELEASE_TYPES.includes(truncation)) {
+    return null
+  }
+
+  const clonedVersion = cloneInputVersion(version, options)
+  return clonedVersion && doTruncation(clonedVersion, truncation)
+}
+
+const cloneInputVersion = (version, options) => {
+  const versionStringToParse = (
+    version instanceof SemVer ? version.version : version
+  )
+
+  return parse(versionStringToParse, options)
+}
+
+const doTruncation = (version, truncation) => {
+  if (isPrerelease(truncation)) {
+    return version.version
+  }
+
+  version.prerelease = []
+
+  switch (truncation) {
+    case 'major':
+      version.minor = 0
+      version.patch = 0
+      break
+    case 'minor':
+      version.patch = 0
+      break
+  }
+
+  return version.format()
+}
+
+const isPrerelease = (type) => {
+  return type.startsWith('pre')
+}
+
+module.exports = truncate

package/node_modules/semver/index.js

@@ -28,6 +28,7 @@ const gte = require('./functions/gte')
 const lte = require('./functions/lte')
 const cmp = require('./functions/cmp')
 const coerce = require('./functions/coerce')
+const truncate = require('./functions/truncate')
 const Comparator = require('./classes/comparator')
 const Range = require('./classes/range')
 const satisfies = require('./functions/satisfies')
@@ -66,6 +67,7 @@ module.exports = {
   lte,
   cmp,
   coerce,
+  truncate,
   Comparator,
   Range,
   satisfies,

package/node_modules/semver/internal/re.js

@@ -136,7 +136,7 @@ createToken('LOOSE', `^${src[t.LOOSEPLAIN]}$`)
 createToken('GTLT', '((?:<|>)?=?)')
 
 // Something like "2.*" or "1.2.x".
-// Note that "x.x" is a valid xRange identifer, meaning "any version"
+// Note that "x.x" is a valid xRange identifier, meaning "any version"
 // Only the first item is strictly required.
 createToken('XRANGEIDENTIFIERLOOSE', `${src[t.NUMERICIDENTIFIERLOOSE]}|x|X|\\*`)
 createToken('XRANGEIDENTIFIER', `${src[t.NUMERICIDENTIFIER]}|x|X|\\*`)

package/node_modules/semver/package.json

@@ -1,6 +1,6 @@
 {
   "name": "semver",
-  "version": "7.7.4",
+  "version": "7.8.0",
   "description": "The semantic version parser used by npm.",
   "main": "index.js",
   "scripts": {
@@ -15,7 +15,7 @@
   },
   "devDependencies": {
     "@npmcli/eslint-config": "^6.0.0",
-    "@npmcli/template-oss": "4.29.0",
+    "@npmcli/template-oss": "5.0.0",
     "benchmark": "^2.1.4",
     "tap": "^16.0.0"
   },
@@ -52,7 +52,7 @@
   "author": "GitHub Inc.",
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "4.29.0",
+    "version": "5.0.0",
     "engines": ">=10",
     "distPaths": [
       "classes/",

package/node_modules/semver/range.bnf

@@ -10,7 +10,8 @@ nr         ::= '0' | [1-9] ( [0-9] ) *
 tilde      ::= '~' partial
 caret      ::= '^' partial
 qualifier  ::= ( '-' pre )? ( '+' build )?
-pre        ::= parts
-build      ::= parts
-parts      ::= part ( '.' part ) *
-part       ::= nr | [-0-9A-Za-z]+
+pre        ::= prepart ( '.' prepart ) *
+prepart    ::= nr | alphanumid
+build      ::= buildid ( '.' buildid ) *
+alphanumid ::= ( [0-9] ) * [A-Za-z-] [-0-9A-Za-z] *
+buildid    ::= [-0-9A-Za-z]+

package/package.json

@@ -39,7 +39,7 @@
     "organization": true
   },
   "devDependencies": {
-    "@cdklabs/eslint-plugin": "^2.0.4",
+    "@cdklabs/eslint-plugin": "^2.0.5",
     "@stylistic/eslint-plugin": "^3",
     "@types/jest": "^29.5.14",
     "@types/node": "^20",
@@ -58,22 +58,22 @@
     "jest": "^29.7.0",
     "jest-junit": "^16",
     "jsii": "5.9",
-    "jsii-diff": "^1.129.0",
-    "jsii-pacmak": "^1.129.0",
+    "jsii-diff": "^1.130.0",
+    "jsii-pacmak": "^1.130.0",
     "jsii-rosetta": "5.9",
     "license-checker": "^25.0.1",
     "mock-fs": "^5.5.0",
-    "nx": "^22.7.1",
+    "nx": "^22.7.2",
     "prettier": "^2.8",
-    "projen": "^0.99.57",
+    "projen": "^0.99.61",
     "ts-jest": "^29.4.9",
-    "tsx": "^4.21.0",
+    "tsx": "^4.22.0",
     "typescript": "5.9",
     "typescript-json-schema": "^0.67.2"
   },
   "dependencies": {
-    "jsonschema": "~1.4.1",
-    "semver": "^7.7.4"
+    "jsonschema": "^1.5.0",
+    "semver": "^7.8.0"
   },
   "bundledDependencies": [
     "jsonschema",
@@ -99,7 +99,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "53.23.0",
+  "version": "53.25.0",
   "packageManager": "yarn@4.13.0",
   "types": "lib/index.d.ts",
   "stability": "stable",