@aws-cdk/cloud-assembly-schema 39.1.38 → 39.1.39

package/.jsii

@@ -8,7 +8,7 @@
     "url": "https://aws.amazon.com"
   },
   "bundled": {
-    "jsonschema": "^1.4.1",
+    "jsonschema": "^1.5.0",
     "semver": "^7.6.3"
   },
   "description": "Cloud Assembly Schema",
@@ -5511,6 +5511,6 @@
       "symbolId": "lib/cloud-assembly/context-queries:VpcContextQuery"
     }
   },
-  "version": "39.1.38",
-  "fingerprint": "zx/hMM2/aPZdnNiUIyG5A3eOFR8nJDwpTg0NYmemgkM="
+  "version": "39.1.39",
+  "fingerprint": "1EGrfgAm+uyb/RyQdI/wfTO2vJkSbh2RfjcoyfWwk1Y="
 }

package/lib/manifest.js

@@ -249,7 +249,7 @@ class Manifest {
 }
 exports.Manifest = Manifest;
 _a = JSII_RTTI_SYMBOL_1;
-Manifest[_a] = { fqn: "@aws-cdk/cloud-assembly-schema.Manifest", version: "39.1.38" };
+Manifest[_a] = { fqn: "@aws-cdk/cloud-assembly-schema.Manifest", version: "39.1.39" };
 function mapValues(xs, fn) {
     if (!xs) {
         return undefined;

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/package.json

@@ -66,7 +66,7 @@
     "typescript-json-schema": "^0.65.1"
   },
   "dependencies": {
-    "jsonschema": "^1.4.1",
+    "jsonschema": "^1.5.0",
     "semver": "^7.6.3"
   },
   "bundledDependencies": [
@@ -80,7 +80,7 @@
   "main": "lib/index.js",
   "license": "Apache-2.0",
   "homepage": "https://github.com/cdklabs/cloud-assembly-schema",
-  "version": "39.1.38",
+  "version": "39.1.39",
   "types": "lib/index.d.ts",
   "stability": "stable",
   "jsii": {