@bedrock/validation 6.0.1 → 7.0.0

package/.github/workflows/main.yml

@@ -8,7 +8,7 @@ jobs:
     timeout-minutes: 10
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [18.x]
     steps:
     - uses: actions/checkout@v2
     - name: Use Node.js ${{ matrix.node-version }}
@@ -24,7 +24,7 @@ jobs:
     timeout-minutes: 10
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [14.x, 16.x, 18.x]
     steps:
     - uses: actions/checkout@v2
     - name: Use Node.js ${{ matrix.node-version }}
@@ -45,7 +45,7 @@ jobs:
     timeout-minutes: 10
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [18.x]
     steps:
     - uses: actions/checkout@v2
     - name: Use Node.js ${{ matrix.node-version }}

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # bedrock-validation ChangeLog
 
+## 7.0.0 - 2022-04-28
+
+### Changed
+- **BREAKING**: Update peer deps:
+  - `@bedrock/core@6`.
+
 ## 6.0.1 - 2022-04-01
 
 ### Fixed

package/lib/config.js

@@ -2,8 +2,8 @@
  * Copyright (c) 2012-2022 Digital Bazaar, Inc. All rights reserved.
  */
 import {config} from '@bedrock/core';
-import {fileURLToPath} from 'url';
-import path from 'path';
+import {fileURLToPath} from 'node:url';
+import path from 'node:path';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 

package/lib/helpers.js

@@ -0,0 +1,40 @@
+/*!
+ * Copyright (c) 2012-2022 Digital Bazaar, Inc. All rights reserved.
+ */
+
+/**
+ * Merges the contents of one or more objects into the first object.
+ *
+ * Arguments:
+ * `deep` (optional), true to do a deep-merge
+ * `target` the target object to merge properties into
+ * `objects` N objects to merge into the target.
+ *
+ * @returns {object} - The extended object.
+ */
+export function extend() {
+  let deep = false;
+  let i = 0;
+  if(arguments.length > 0 && typeof arguments[0] === 'boolean') {
+    deep = arguments[0];
+    ++i;
+  }
+  const target = arguments[i] || {};
+  i++;
+  for(; i < arguments.length; ++i) {
+    const obj = arguments[i] || {};
+    Object.keys(obj).forEach(function(name) {
+      const value = obj[name];
+      if(deep && _isObject(value) && !Array.isArray(value)) {
+        target[name] = extend(true, target[name], value);
+      } else {
+        target[name] = value;
+      }
+    });
+  }
+  return target;
+}
+
+function _isObject(x) {
+  return x && typeof x === 'object';
+}

package/lib/index.js

@@ -4,9 +4,9 @@
 import * as bedrock from '@bedrock/core';
 import Ajv from 'ajv';
 import {Cache} from './Cache.js';
-import {promises as fs} from 'fs';
+import {promises as fs} from 'node:fs';
 import {logger} from './logger.js';
-import PATH from 'path';
+import PATH from 'node:path';
 
 const ajv = new Ajv({cache: new Cache(), serialize: false, verbose: true});
 const {util: {BedrockError}} = bedrock;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bedrock/validation",
-  "version": "6.0.1",
+  "version": "7.0.0",
   "type": "module",
   "description": "Bedrock validation",
   "main": "./lib/index.js",
@@ -24,10 +24,11 @@
   },
   "homepage": "https://github.com/digitalbazaar/bedrock-validation",
   "dependencies": {
-    "ajv": "^6.12.0"
+    "ajv": "^6.12.0",
+    "klona": "^2.0.5"
   },
   "peerDependencies": {
-    "@bedrock/core": "^5.0.0"
+    "@bedrock/core": "^6.0.0"
   },
   "directories": {
     "lib": "./lib"

package/schemas/comment.js

@@ -1,7 +1,8 @@
 /*!
  * Copyright (c) 2012-2022 Digital Bazaar, Inc. All rights reserved.
  */
-import * as bedrock from '@bedrock/core';
+import {extend as _extend} from '../lib/helpers.js';
+import {klona} from 'klona';
 
 const schema = {
   title: 'Comment',
@@ -18,7 +19,7 @@ const schema = {
 
 export default function(extend) {
   if(extend) {
-    return bedrock.util.extend(true, bedrock.util.clone(schema), extend);
+    return _extend(true, klona(schema), extend);
   }
   return schema;
 }

package/schemas/credential.js

@@ -1,9 +1,10 @@
 /*!
  * Copyright (c) 2012-2022 Digital Bazaar, Inc. All rights reserved.
  */
-import * as bedrock from '@bedrock/core';
+import {extend as _extend} from '../lib/helpers.js';
 import identifier from './identifier.js';
 import jsonldContext from './jsonldContext.js';
+import {klona} from 'klona';
 import w3cDateTime from './w3cDateTime.js';
 
 // TODO: Improve this schema
@@ -31,7 +32,7 @@ const schema = {
 
 export default function(extend) {
   if(extend) {
-    return bedrock.util.extend(true, bedrock.util.clone(schema), extend);
+    return _extend(true, klona(schema), extend);
   }
   return schema;
 }

package/schemas/description.js

@@ -1,7 +1,8 @@
 /*!
  * Copyright (c) 2012-2022 Digital Bazaar, Inc. All rights reserved.
  */
-import * as bedrock from '@bedrock/core';
+import {extend as _extend} from '../lib/helpers.js';
+import {klona} from 'klona';
 
 const schema = {
   title: 'Description',
@@ -18,7 +19,7 @@ const schema = {
 
 export default function(extend) {
   if(extend) {
-    return bedrock.util.extend(true, bedrock.util.clone(schema), extend);
+    return _extend(true, klona(schema), extend);
   }
   return schema;
 }

package/schemas/email.js

@@ -1,7 +1,8 @@
 /*!
  * Copyright (c) 2012-2022 Digital Bazaar, Inc. All rights reserved.
  */
-import * as bedrock from '@bedrock/core';
+import {extend as _extend} from '../lib/helpers.js';
+import {klona} from 'klona';
 
 // RFC 1034 - All labels have a max length of 63 octets.
 // https://tools.ietf.org/html/rfc1034#section-3.1
@@ -28,7 +29,7 @@ export default function(extend, options) {
     }
   }
   if(extend) {
-    return bedrock.util.extend(true, bedrock.util.clone(schema), extend);
+    return _extend(true, klona(schema), extend);
   }
   return schema;
 }

package/schemas/identifier.js

@@ -1,7 +1,8 @@
 /*!
  * Copyright (c) 2012-2022 Digital Bazaar, Inc. All rights reserved.
  */
-import * as bedrock from '@bedrock/core';
+import {extend as _extend} from '../lib/helpers.js';
+import {klona} from 'klona';
 
 const schema = {
   title: 'ID',
@@ -16,7 +17,7 @@ const schema = {
 
 export default function(extend) {
   if(extend) {
-    return bedrock.util.extend(true, bedrock.util.clone(schema), extend);
+    return _extend(true, klona(schema), extend);
   }
   return schema;
 }

package/schemas/jsonPatch.js

@@ -1,7 +1,8 @@
 /*!
  * Copyright (c) 2019-2022 Digital Bazaar, Inc. All rights reserved.
  */
-import * as bedrock from '@bedrock/core';
+import {extend as _extend} from '../lib/helpers.js';
+import {klona} from 'klona';
 
 const schema = {
   title: 'JSON Patch',
@@ -32,7 +33,7 @@ const schema = {
 
 export default function(extend) {
   if(extend) {
-    return bedrock.util.extend(true, bedrock.util.clone(schema), extend);
+    return _extend(true, klona(schema), extend);
   }
   return schema;
 }

package/schemas/jsonldContext.js

@@ -1,7 +1,8 @@
 /*!
  * Copyright (c) 2012-2022 Digital Bazaar, Inc. All rights reserved.
  */
-import * as bedrock from '@bedrock/core';
+import {extend as _extend} from '../lib/helpers.js';
+import {klona} from 'klona';
 
 export default function(context, extend) {
   const schema = {
@@ -48,7 +49,7 @@ export default function(context, extend) {
     }
   }
   if(extend) {
-    return bedrock.util.extend(true, bedrock.util.clone(schema), extend);
+    return _extend(true, klona(schema), extend);
   }
   return schema;
 }

package/schemas/label.js

@@ -1,7 +1,8 @@
 /*!
  * Copyright (c) 2012-2022 Digital Bazaar, Inc. All rights reserved.
  */
-import * as bedrock from '@bedrock/core';
+import {extend as _extend} from '../lib/helpers.js';
+import {klona} from 'klona';
 
 const schema = {
   title: 'Label',
@@ -19,7 +20,7 @@ const schema = {
 
 export default function(extend) {
   if(extend) {
-    return bedrock.util.extend(true, bedrock.util.clone(schema), extend);
+    return _extend(true, klona(schema), extend);
   }
   return schema;
 }

package/schemas/linkedDataSignature.js

@@ -1,8 +1,9 @@
 /*!
  * Copyright (c) 2012-2022 Digital Bazaar, Inc. All rights reserved.
  */
-import * as bedrock from '@bedrock/core';
+import {extend as _extend} from '../lib/helpers.js';
 import identifier from './identifier.js';
+import {klona} from 'klona';
 import w3cDateTime from './w3cDateTime.js';
 
 const signature = {
@@ -40,7 +41,7 @@ const schema = {
 
 export default function(extend) {
   if(extend) {
-    return bedrock.util.extend(true, bedrock.util.clone(schema), extend);
+    return _extend(true, klona(schema), extend);
   }
   return schema;
 }

package/schemas/nonce.js

@@ -1,7 +1,8 @@
 /*!
  * Copyright (c) 2012-2022 Digital Bazaar, Inc. All rights reserved.
  */
-import * as bedrock from '@bedrock/core';
+import {extend as _extend} from '../lib/helpers.js';
+import {klona} from 'klona';
 
 const schema = {
   title: 'Nonce',
@@ -19,7 +20,7 @@ const schema = {
 
 export default function(extend) {
   if(extend) {
-    return bedrock.util.extend(true, bedrock.util.clone(schema), extend);
+    return _extend(true, klona(schema), extend);
   }
   return schema;
 }

package/schemas/personName.js

@@ -1,7 +1,8 @@
 /*!
  * Copyright (c) 2012-2022 Digital Bazaar, Inc. All rights reserved.
  */
-import * as bedrock from '@bedrock/core';
+import {extend as _extend} from '../lib/helpers.js';
+import {klona} from 'klona';
 
 const schema = {
   title: 'Person Name',
@@ -19,7 +20,7 @@ const schema = {
 
 export default function(extend) {
   if(extend) {
-    return bedrock.util.extend(true, bedrock.util.clone(schema), extend);
+    return _extend(true, klona(schema), extend);
   }
   return schema;
 }

package/schemas/privateKeyPem.js

@@ -1,7 +1,8 @@
 /*!
  * Copyright (c) 2012-2022 Digital Bazaar, Inc. All rights reserved.
  */
-import * as bedrock from '@bedrock/core';
+import {extend as _extend} from '../lib/helpers.js';
+import {klona} from 'klona';
 
 const schema = {
   title: 'Private Key PEM',
@@ -17,7 +18,7 @@ const schema = {
 
 export default function(extend) {
   if(extend) {
-    return bedrock.util.extend(true, bedrock.util.clone(schema), extend);
+    return _extend(true, klona(schema), extend);
   }
   return schema;
 }

package/schemas/publicKeyPem.js

@@ -1,7 +1,8 @@
 /*!
  * Copyright (c) 2012-2022 Digital Bazaar, Inc. All rights reserved.
  */
-import * as bedrock from '@bedrock/core';
+import {extend as _extend} from '../lib/helpers.js';
+import {klona} from 'klona';
 
 const schema = {
   title: 'Public Key PEM',
@@ -17,7 +18,7 @@ const schema = {
 
 export default function(extend) {
   if(extend) {
-    return bedrock.util.extend(true, bedrock.util.clone(schema), extend);
+    return _extend(true, klona(schema), extend);
   }
   return schema;
 }

package/schemas/sequencedPatch.js

@@ -1,8 +1,9 @@
 /*!
  * Copyright (c) 2019-2022 Digital Bazaar, Inc. All rights reserved.
  */
-import * as bedrock from '@bedrock/core';
+import {extend as _extend} from '../lib/helpers.js';
 import jsonPatch from './jsonPatch.js';
+import {klona} from 'klona';
 
 const schema = {
   required: ['patch', 'sequence', 'target'],
@@ -25,7 +26,7 @@ const schema = {
 
 export default function(extend) {
   if(extend) {
-    return bedrock.util.extend(true, bedrock.util.clone(schema), extend);
+    return _extend(true, klona(schema), extend);
   }
   return schema;
 }

package/schemas/slug.js

@@ -1,7 +1,8 @@
 /*!
  * Copyright (c) 2012-2022 Digital Bazaar, Inc. All rights reserved.
  */
-import * as bedrock from '@bedrock/core';
+import {extend as _extend} from '../lib/helpers.js';
+import {klona} from 'klona';
 
 const schema = {
   title: 'Slug',
@@ -21,7 +22,7 @@ const schema = {
 
 export default function(extend) {
   if(extend) {
-    return bedrock.util.extend(true, bedrock.util.clone(schema), extend);
+    return _extend(true, klona(schema), extend);
   }
   return schema;
 }

package/schemas/title.js

@@ -1,7 +1,8 @@
 /*!
  * Copyright (c) 2012-2022 Digital Bazaar, Inc. All rights reserved.
  */
-import * as bedrock from '@bedrock/core';
+import {extend as _extend} from '../lib/helpers.js';
+import {klona} from 'klona';
 
 const schema = {
   title: 'Title',
@@ -19,7 +20,7 @@ const schema = {
 
 export default function(extend) {
   if(extend) {
-    return bedrock.util.extend(true, bedrock.util.clone(schema), extend);
+    return _extend(true, klona(schema), extend);
   }
   return schema;
 }

package/schemas/url.js

@@ -1,7 +1,8 @@
 /*!
  * Copyright (c) 2012-2022 Digital Bazaar, Inc. All rights reserved.
  */
-import * as bedrock from '@bedrock/core';
+import {extend as _extend} from '../lib/helpers.js';
+import {klona} from 'klona';
 
 const schema = {
   title: 'URL',
@@ -16,7 +17,7 @@ const schema = {
 
 export default function(extend) {
   if(extend) {
-    return bedrock.util.extend(true, bedrock.util.clone(schema), extend);
+    return _extend(true, klona(schema), extend);
   }
   return schema;
 }

package/schemas/w3cDateTime.js

@@ -1,7 +1,8 @@
 /*!
  * Copyright (c) 2012-2022 Digital Bazaar, Inc. All rights reserved.
  */
-import * as bedrock from '@bedrock/core';
+import {extend as _extend} from '../lib/helpers.js';
+import {klona} from 'klona';
 
 const schema = {
   title: 'W3C Date/Time',
@@ -18,7 +19,7 @@ const schema = {
 
 export default function(extend) {
   if(extend) {
-    return bedrock.util.extend(true, bedrock.util.clone(schema), extend);
+    return _extend(true, klona(schema), extend);
   }
   return schema;
 }

package/test/package.json

@@ -10,8 +10,8 @@
     "coverage-report": "c8 report"
   },
   "dependencies": {
-    "@bedrock/core": "^5.0.0",
-    "@bedrock/test": "^7.0.0",
+    "@bedrock/core": "^6.0.0",
+    "@bedrock/test": "^8.0.0",
     "@bedrock/validation": "file:..",
     "c8": "^7.11.0",
     "cross-env": "^7.0.3"

package/test/test.config.js

@@ -2,8 +2,8 @@
  * Copyright (c) 2017-2022 Digital Bazaar, Inc. All rights reserved.
  */
 import {config} from '@bedrock/core';
-import {fileURLToPath} from 'url';
-import path from 'path';
+import {fileURLToPath} from 'node:url';
+import path from 'node:path';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));