@bedrock/validation 7.1.0 → 7.2.0

package/.github/workflows/main.yml

@@ -8,11 +8,11 @@ jobs:
     timeout-minutes: 10
     strategy:
       matrix:
-        node-version: [18.x]
+        node-version: [24.x]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v6
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v6
       with:
         node-version: ${{ matrix.node-version }}
     - run: npm install
@@ -24,11 +24,11 @@ jobs:
     timeout-minutes: 10
     strategy:
       matrix:
-        node-version: [14.x, 16.x, 18.x]
+        node-version: [22.x, 24.x, 26.x]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v6
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v6
       with:
         node-version: ${{ matrix.node-version }}
     - run: |
@@ -45,11 +45,11 @@ jobs:
     timeout-minutes: 10
     strategy:
       matrix:
-        node-version: [18.x]
+        node-version: [24.x]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v6
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v6
       with:
         node-version: ${{ matrix.node-version }}
     - run: |
@@ -61,7 +61,8 @@ jobs:
         cd test
         npm run coverage-ci
     - name: Upload coverage to Codecov
-      uses: codecov/codecov-action@v2
+      uses: codecov/codecov-action@v6
       with:
-        file: ./test/coverage/lcov.info
+        files: ./test/coverage/lcov.info
         fail_ci_if_error: true
+        token: ${{ secrets.CODECOV_TOKEN }}

package/CHANGELOG.md

@@ -1,11 +1,37 @@
 # bedrock-validation ChangeLog
 
+## 7.2.0 - 2026-06-04
+
+### Changed
+- Update dependencies:
+  - `ajv@8`
+  - remove `klona` dependency.
+
+## 7.1.1 - 2024-11-14
+
+### Changed
+- Test and support Node.js 18, 20, 22.
+- Update dependencies:
+  - `ajv@6.12.6`
+  - `klona@2.0.6`
+- Update dev dependencies.
+- Fix lint issues.
+
+### Fixed
+- Errors now use the spelling `occurred` vs the typo `occured`.
+  - **NOTE**: This typo is known to be present in many tests of error message
+    and will require similar typo fixes.
+
 ## 7.1.0 - 2022-10-16
 
 ### Added
 - Added a validator for `VerifiablePresentation`
 - Added a validator for `VerifiableCredential`.
 
+### Changed
+- The `credential` and `presentation` schemas are now deprecated and
+  will be removed in a future major release.
+
 ## 7.0.0 - 2022-04-28
 
 ### Changed

package/README.md

@@ -29,7 +29,7 @@ bedrock.events.on('bedrock-express.configure.routes', function(app) {
   app.post('/bar',
     // validate the query using the 'postBarQueryValidator'
     // validate the response body using the 'postBarValidator'
-    validate({query: postBarQueryValidator, body: postBarValidator}),
+    validate({querySchema: postBarQueryValidator, bodySchema: postBarValidator}),
     function(req, res) {
       // do something
     });
@@ -51,7 +51,7 @@ For more documentation on configuration, see [config.js](./lib/config.js).
 
 ## API
 
-### createValidateMiddleware({query: schema, body: schema})
+### createValidateMiddleware({querySchema: schema, bodySchema: schema})
 
 This method may be called with either `query` or `body` defined.
 

package/eslint.config.js

@@ -0,0 +1,23 @@
+/*!
+ * Copyright 2022 - 2026 Digital Bazaar, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import config from '@digitalbazaar/eslint-config/node-recommended';
+
+export default [
+  ...config
+];

package/lib/index.js

@@ -1,14 +1,14 @@
 /*!
- * Copyright (c) 2012-2022 Digital Bazaar, Inc. All rights reserved.
+ * Copyright (c) 2012-2026 Digital Bazaar, Inc.
  */
 import * as bedrock from '@bedrock/core';
 import Ajv from 'ajv';
-import {Cache} from './Cache.js';
 import {promises as fs} from 'node:fs';
 import {logger} from './logger.js';
 import PATH from 'node:path';
 
-const ajv = new Ajv({cache: new Cache(), serialize: false, verbose: true});
+// strict=false for backwards compatibility with ajv v6
+const ajv = new Ajv({strict: false, verbose: true});
 const {util: {BedrockError}} = bedrock;
 
 // load config defaults
@@ -203,9 +203,10 @@ function _createError({schema, instance}) {
     const details = {
       instance,
       params: error.params,
-      path: error.dataPath,
+      instancePath: error.instancePath,
+      path: _jsonPointerToJsPath(error.instancePath),
       public: true,
-      schemaPath: error.schemaPath,
+      schemaPath: error.schemaPath
     };
     let title;
     if(Array.isArray(error.schema)) {
@@ -214,7 +215,7 @@ function _createError({schema, instance}) {
     title = title || error.parentSchema.title || '',
     details.schema = {
       description: error.parentSchema.description || '',
-      title,
+      title
     };
     // include custom errors or use default
     // FIXME: enable if ajv supports this parentSchema.errors property
@@ -241,10 +242,34 @@ function _createError({schema, instance}) {
   }
 
   const msg = schema.title ?
-    'A validation error occured in the \'' + schema.title + '\' validator.' :
-    'A validation error occured in an unnamed validator.';
+    'A validation error occurred in the \'' + schema.title + '\' validator.' :
+    'A validation error occurred in an unnamed validator.';
   const error = new BedrockError(
     msg, 'ValidationError', {public: true, errors, httpStatusCode: 400});
 
   return error;
 }
+
+function _jsonPointerToJsPath(pointer) {
+  let path = '';
+  const [, ...segments] = pointer.split('/');
+  for(const segment of segments) {
+    // decode JSON pointer escape chars
+    const decoded = segment.replace(/~1/g, '/').replace(/~0/g, '~');
+
+    // handle integer index
+    if(/^\d+$/.test(decoded)) {
+      path += `[${decoded}]`;
+      continue;
+    }
+
+    // use dot notation for valid keys and bracket notation otherwise
+    if(/^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(decoded)) {
+      path += `.${decoded}`;
+    } else {
+      path += `["${decoded}"]`;
+    }
+  }
+
+  return path;
+}

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@bedrock/validation",
-  "version": "7.1.0",
+  "version": "7.2.0",
   "type": "module",
   "description": "Bedrock validation",
   "main": "./lib/index.js",
   "scripts": {
-    "lint": "eslint ."
+    "lint": "eslint"
   },
   "repository": {
     "type": "git",
@@ -24,19 +24,16 @@
   },
   "homepage": "https://github.com/digitalbazaar/bedrock-validation",
   "dependencies": {
-    "ajv": "^6.12.0",
-    "klona": "^2.0.5"
+    "ajv": "^8.20.0"
   },
   "peerDependencies": {
-    "@bedrock/core": "^6.0.0"
+    "@bedrock/core": "^6.2.0"
   },
   "directories": {
     "lib": "./lib"
   },
   "devDependencies": {
-    "eslint": "^7.32.0",
-    "eslint-config-digitalbazaar": "^2.8.0",
-    "eslint-plugin-jsdoc": "^37.9.7",
-    "jsdoc-to-markdown": "^7.1.1"
+    "@digitalbazaar/eslint-config": "^8.0.1",
+    "eslint": "^9.39.4"
   }
 }

package/schemas/comment.js

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

package/schemas/credential.js

@@ -1,10 +1,9 @@
 /*!
- * Copyright (c) 2012-2022 Digital Bazaar, Inc. All rights reserved.
+ * Copyright (c) 2012-2026 Digital Bazaar, Inc.
  */
 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
@@ -24,7 +23,7 @@ const schema = {
       required: ['id'],
       properties: {
         id: identifier()
-      },
+      }
     }
   },
   required: ['issuer', 'issued', 'claim']
@@ -32,7 +31,7 @@ const schema = {
 
 export default function(extend) {
   if(extend) {
-    return _extend(true, klona(schema), extend);
+    return _extend(true, structuredClone(schema), extend);
   }
   return schema;
 }

package/schemas/description.js

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

package/schemas/email.js

@@ -1,8 +1,7 @@
 /*!
- * Copyright (c) 2012-2022 Digital Bazaar, Inc. All rights reserved.
+ * Copyright (c) 2012-2026 Digital Bazaar, Inc.
  */
 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
@@ -10,8 +9,8 @@ const schema = {
   title: 'Email',
   description: 'An email address.',
   type: 'string',
-  // eslint-disable-next-line max-len
-  pattern: '^[-a-z0-9~!$%^&*_=+}{\\\'?]+(\\.[-a-z0-9~!$%^&*_=+}{\\\'?]+)*@(((([a-z0-9]{1}[a-z0-9\\-]{0,63}[a-z0-9]{1})|[a-z])\\.)+[a-z]{2,63})$',
+  // eslint-disable-next-line @stylistic/max-len
+  pattern: `^[-a-z0-9~!$%^&*_=+}{'?]+(\\.[-a-z0-9~!$%^&*_=+}{'?]+)*@(((([a-z0-9]{1}[a-z0-9\\-]{0,63}[a-z0-9]{1})|[a-z])\\.)+[a-z]{2,63})$`,
   minLength: 1,
   maxLength: 100,
   errors: {
@@ -24,12 +23,12 @@ export default function(extend, options) {
   if(options && options.lowerCaseOnly) {
     extend = extend || {};
     if(!('pattern' in extend)) {
-      // eslint-disable-next-line max-len
-      extend.pattern = '^[-a-z0-9~!$%^&*_=+}{\\\'?]+(\\.[-a-z0-9~!$%^&*_=+}{\\\'?]+)*@(((([a-z0-9]{1}[a-z0-9\\-]{0,63}[a-z0-9]{1})|[a-z])\\.)+[a-z]{2,63})$';
+      // eslint-disable-next-line @stylistic/max-len
+      extend.pattern = `^[-a-z0-9~!$%^&*_=+}{'?]+(\\.[-a-z0-9~!$%^&*_=+}{'?]+)*@(((([a-z0-9]{1}[a-z0-9\\-]{0,63}[a-z0-9]{1})|[a-z])\\.)+[a-z]{2,63})$`;
     }
   }
   if(extend) {
-    return _extend(true, klona(schema), extend);
+    return _extend(true, structuredClone(schema), extend);
   }
   return schema;
 }

package/schemas/helpers/idOrObjectWithId.js

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

package/schemas/identifier.js

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

package/schemas/jsonPatch.js

@@ -1,8 +1,7 @@
 /*!
- * Copyright (c) 2019-2022 Digital Bazaar, Inc. All rights reserved.
+ * Copyright (c) 2019-2026 Digital Bazaar, Inc.
  */
 import {extend as _extend} from '../lib/helpers.js';
-import {klona} from 'klona';
 
 const schema = {
   title: 'JSON Patch',
@@ -18,10 +17,10 @@ const schema = {
         enum: ['add', 'copy', 'move', 'remove', 'replace', 'test']
       },
       from: {
-        type: 'string',
+        type: 'string'
       },
       path: {
-        type: 'string',
+        type: 'string'
       },
       value: {
         //type: ['number', 'string', 'boolean', 'object', 'array'],
@@ -33,7 +32,7 @@ const schema = {
 
 export default function(extend) {
   if(extend) {
-    return _extend(true, klona(schema), extend);
+    return _extend(true, structuredClone(schema), extend);
   }
   return schema;
 }

package/schemas/jsonldContext.js

@@ -1,8 +1,7 @@
 /*!
- * Copyright (c) 2012-2022 Digital Bazaar, Inc. All rights reserved.
+ * Copyright (c) 2012-2026 Digital Bazaar, Inc.
  */
 import {extend as _extend} from '../lib/helpers.js';
-import {klona} from 'klona';
 
 export default function(context, extend) {
   const schema = {
@@ -17,7 +16,7 @@ export default function(context, extend) {
       type: 'object'
       // FIXME: improve context object validator
     }, {
-      type: 'array',
+      type: 'array'
       // items added below if context param truthy
     }];
     if(context) {
@@ -49,7 +48,7 @@ export default function(context, extend) {
     }
   }
   if(extend) {
-    return _extend(true, klona(schema), extend);
+    return _extend(true, structuredClone(schema), extend);
   }
   return schema;
 }

package/schemas/label.js

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

package/schemas/linkedDataSignature.js

@@ -1,9 +1,8 @@
 /*!
- * Copyright (c) 2012-2022 Digital Bazaar, Inc. All rights reserved.
+ * Copyright (c) 2012-2026 Digital Bazaar, Inc.
  */
 import {extend as _extend} from '../lib/helpers.js';
 import identifier from './identifier.js';
-import {klona} from 'klona';
 import w3cDateTime from './w3cDateTime.js';
 
 const signature = {
@@ -24,7 +23,7 @@ const signature = {
       description: 'The Base64 encoding of the result of the signature ' +
         'algorithm.',
       type: 'string'
-    },
+    }
   },
   // NOTE: id is not required
   required: ['type', 'creator', 'created', 'signatureValue']
@@ -35,13 +34,13 @@ const schema = {
   anyOf: [{
     type: 'array',
     items: signature,
-    minItems: 1,
+    minItems: 1
   }, signature]
 };
 
 export default function(extend) {
   if(extend) {
-    return _extend(true, klona(schema), extend);
+    return _extend(true, structuredClone(schema), extend);
   }
   return schema;
 }

package/schemas/linkedDataSignature2018.js

@@ -1,5 +1,5 @@
 /*!
- * Copyright (c) 2012-2022 Digital Bazaar, Inc. All rights reserved.
+ * Copyright (c) 2012-2026 Digital Bazaar, Inc.
  */
 import identifier from './identifier.js';
 import w3cDateTime from './w3cDateTime.js';
@@ -25,8 +25,8 @@ const baseSignature = {
         'algorithm.',
       type: 'string'
     },
-    verificationMethod: identifier(),
-  },
+    verificationMethod: identifier()
+  }
 };
 
 const signature = {
@@ -35,10 +35,10 @@ const signature = {
       // only one of `creator` or `verificationMethod`
       anyOf: [{
         required: ['creator'],
-        not: {required: ['verificationMethod']},
+        not: {required: ['verificationMethod']}
       }, {
         required: ['verificationMethod'],
-        not: {required: ['creator']},
+        not: {required: ['creator']}
       }]
     }
   ]
@@ -49,7 +49,7 @@ const schema = {
   oneOf: [{
     type: 'array',
     items: signature,
-    minItems: 1,
+    minItems: 1
   }, signature]
 };
 

package/schemas/linkedDataSignature2020.js

@@ -1,5 +1,5 @@
 /*!
- * Copyright (c) 2021-2022 Digital Bazaar, Inc. All rights reserved.
+ * Copyright (c) 2021-2026 Digital Bazaar, Inc.
  */
 import identifier from './identifier.js';
 import w3cDateTime from './w3cDateTime.js';
@@ -24,8 +24,8 @@ const signature = {
         'the signature algorithm.',
       type: 'string'
     },
-    verificationMethod: identifier(),
-  },
+    verificationMethod: identifier()
+  }
 };
 
 const schema = {
@@ -33,7 +33,7 @@ const schema = {
   oneOf: [{
     type: 'array',
     items: signature,
-    minItems: 1,
+    minItems: 1
   }, signature]
 };
 

package/schemas/nonce.js

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

package/schemas/personName.js

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

package/schemas/privateKeyPem.js

@@ -1,14 +1,13 @@
 /*!
- * Copyright (c) 2012-2022 Digital Bazaar, Inc. All rights reserved.
+ * Copyright (c) 2012-2026 Digital Bazaar, Inc.
  */
 import {extend as _extend} from '../lib/helpers.js';
-import {klona} from 'klona';
 
 const schema = {
   title: 'Private Key PEM',
   description: 'A cryptographic Private Key in PEM format.',
   type: 'string',
-  // eslint-disable-next-line max-len
+  // eslint-disable-next-line @stylistic/max-len
   pattern: '^\\s*-----BEGIN RSA PRIVATE KEY-----[a-zA-Z0-9/+=\\s]*-----END RSA PRIVATE KEY-----\\s*$',
   errors: {
     invalid: 'The private key is not formatted correctly.',
@@ -18,7 +17,7 @@ const schema = {
 
 export default function(extend) {
   if(extend) {
-    return _extend(true, klona(schema), extend);
+    return _extend(true, structuredClone(schema), extend);
   }
   return schema;
 }

package/schemas/proof.js

@@ -1,8 +1,7 @@
 /*!
- * Copyright (c) 2012-2022 Digital Bazaar, Inc. All rights reserved.
+ * Copyright (c) 2012-2026 Digital Bazaar, Inc.
  */
 import {extend as _extend} from '../lib/helpers.js';
-import {klona} from 'klona';
 
 // schema for a proof on a VerifiableCredential or Presentation
 const schema = {
@@ -15,7 +14,7 @@ const schema = {
 
 export default function(extend) {
   if(extend) {
-    return _extend(true, klona(schema), extend);
+    return _extend(true, structuredClone(schema), extend);
   }
   return schema;
 }

package/schemas/publicKeyPem.js

@@ -1,14 +1,13 @@
 /*!
- * Copyright (c) 2012-2022 Digital Bazaar, Inc. All rights reserved.
+ * Copyright (c) 2012-2026 Digital Bazaar, Inc.
  */
 import {extend as _extend} from '../lib/helpers.js';
-import {klona} from 'klona';
 
 const schema = {
   title: 'Public Key PEM',
   description: 'A cryptographic Public Key in PEM format.',
   type: 'string',
-  // eslint-disable-next-line max-len
+  // eslint-disable-next-line @stylistic/max-len
   pattern: '^\\s*-----BEGIN (RSA\\s)?PUBLIC KEY-----[a-zA-Z0-9/+=\\s]*-----END (RSA\\s)?PUBLIC KEY-----\\s*$',
   errors: {
     invalid: 'The public key is not formatted correctly.',
@@ -18,7 +17,7 @@ const schema = {
 
 export default function(extend) {
   if(extend) {
-    return _extend(true, klona(schema), extend);
+    return _extend(true, structuredClone(schema), extend);
   }
   return schema;
 }

package/schemas/sequencedPatch.js

@@ -1,9 +1,8 @@
 /*!
- * Copyright (c) 2019-2022 Digital Bazaar, Inc. All rights reserved.
+ * Copyright (c) 2019-2026 Digital Bazaar, Inc.
  */
 import {extend as _extend} from '../lib/helpers.js';
 import jsonPatch from './jsonPatch.js';
-import {klona} from 'klona';
 
 const schema = {
   required: ['patch', 'sequence', 'target'],
@@ -11,7 +10,7 @@ const schema = {
   type: 'object',
   properties: {
     target: {
-      type: 'string',
+      type: 'string'
     },
     // FIXME: also support `frame` property later
     patch: jsonPatch(),
@@ -26,7 +25,7 @@ const schema = {
 
 export default function(extend) {
   if(extend) {
-    return _extend(true, klona(schema), extend);
+    return _extend(true, structuredClone(schema), extend);
   }
   return schema;
 }

package/schemas/slug.js

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

package/schemas/title.js

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

package/schemas/url.js

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

package/schemas/verifiableCredential.js

@@ -1,10 +1,9 @@
 /*!
- * Copyright (c) 2012-2022 Digital Bazaar, Inc. All rights reserved.
+ * Copyright (c) 2012-2026 Digital Bazaar, Inc.
  */
 import {extend as _extend} from '../lib/helpers.js';
-import proof from './proof.js';
 import idOrObjectWithId from './helpers/idOrObjectWithId.js';
-import {klona} from 'klona';
+import proof from './proof.js';
 import w3cDateTime from './w3cDateTime.js';
 
 // https://www.w3.org/TR/vc-data-model/
@@ -42,7 +41,7 @@ const schema = {
       minItems: 1,
       // this first type must be VerifiableCredential
       items: [
-        {type: 'string', const: 'VerifiableCredential'},
+        {type: 'string', const: 'VerifiableCredential'}
       ],
       // additional types must be strings
       additionalItems: {
@@ -61,7 +60,7 @@ const schema = {
 
 export default function(extend) {
   if(extend) {
-    return _extend(true, klona(schema), extend);
+    return _extend(true, structuredClone(schema), extend);
   }
   return schema;
 }

package/schemas/verifiablePresentation.js

@@ -1,11 +1,10 @@
 /*!
- * Copyright (c) 2012-2022 Digital Bazaar, Inc. All rights reserved.
+ * Copyright (c) 2012-2026 Digital Bazaar, Inc.
  */
-import verifiableCredential from './verifiableCredential.js';
 import {extend as _extend} from '../lib/helpers.js';
-import proof from './proof.js';
 import idOrObjectWithId from './helpers/idOrObjectWithId.js';
-import {klona} from 'klona';
+import proof from './proof.js';
+import verifiableCredential from './verifiableCredential.js';
 
 const schema = {
   title: 'Verifiable Presentation',
@@ -31,7 +30,7 @@ const schema = {
       minItems: 1,
       // this first type must be VerifiablePresentation
       items: [
-        {type: 'string', const: 'VerifiablePresentation'},
+        {type: 'string', const: 'VerifiablePresentation'}
       ],
       // additional types must be strings
       additionalItems: {
@@ -52,7 +51,7 @@ const schema = {
 
 export default function(extend) {
   if(extend) {
-    return _extend(true, klona(schema), extend);
+    return _extend(true, structuredClone(schema), extend);
   }
   return schema;
 }

package/schemas/w3cDateTime.js

@@ -1,17 +1,16 @@
 /*!
- * Copyright (c) 2012-2022 Digital Bazaar, Inc. All rights reserved.
+ * Copyright (c) 2012-2026 Digital Bazaar, Inc.
  */
 import {extend as _extend} from '../lib/helpers.js';
-import {klona} from 'klona';
 
 const schema = {
   title: 'W3C Date/Time',
   description: 'A W3C-formatted date and time combination.',
   type: 'string',
-  // eslint-disable-next-line max-len
+  // eslint-disable-next-line @stylistic/max-len
   pattern: '^[1-9][0-9]{3}-(0[1-9]|1[0-2])-([0-2][0-9]|3[0-1])T([0-1][0-9]|2[0-3]):([0-5][0-9]):(([0-5][0-9])|60)(\\.[0-9]+)?(Z|((\\+|-)([0-1][0-9]|2[0-3]):([0-5][0-9])))?$',
   errors: {
-    // eslint-disable-next-line max-len
+    // eslint-disable-next-line @stylistic/max-len
     invalid: 'The date/time must be of the W3C date/time format "YYYY-MM-DD( |T)HH:MM:SS.s(Z|(+|-)TZOFFSET)".',
     missing: 'Please enter a date/time.'
   }
@@ -19,7 +18,7 @@ const schema = {
 
 export default function(extend) {
   if(extend) {
-    return _extend(true, klona(schema), extend);
+    return _extend(true, structuredClone(schema), extend);
   }
   return schema;
 }

package/test/mocha/001-schemas.js

@@ -1,5 +1,5 @@
 /*!
- * Copyright (c) 2012-2022 Digital Bazaar, Inc. All rights reserved.
+ * Copyright (c) 2012-2026 Digital Bazaar, Inc.
  */
 import * as validation from '@bedrock/validation';
 import {mock} from './mock.data.js';
@@ -822,7 +822,7 @@ describe('bedrock-validation', function() {
         type: 'LinkedDataSignature2015',
         created: '2016-01-01T01:00:00Z',
         creator: 'urn:5dd6a7e2-4c32-4a21-60b3-2385e5b6bcd4/keys/1',
-        // eslint-disable-next-line max-len
+        // eslint-disable-next-line @stylistic/max-len
         signatureValue: 'Lc6l7gxEPV1lKTj4KADaER52CiMBpvsHg7eZZJXzRK3U8N/eUYxITlenu3svj4KPrdnaBfMXGo3U/vAVaQNF5Er0g/SXC2KpUmRN4uyMYgQ5NwWklS2JqjJ/0Y3hio4GOgdMDiqrlZJvfQdtRaJjKoskc7F3bZtDVsX6Sr95erfOeobHOIMcbNIC0a96oYOaQlOeOC45BqQaUaczYKPayGEeQN2lfD+qR6b1MR4xtWNrx5pzzPpAPkjj3I91wiVQER43s/nq5XZKkDk8V8eD7xEURoDUcu3rA1qHLfrpRHJGCErXNc784O4R4Oqm5zQlkyB1mWJxnz3qSqzgqVG0sQ=='
       };
       const result = validateInstance({instance: signature, schema});
@@ -834,7 +834,7 @@ describe('bedrock-validation', function() {
         type: 'LinkedDataSignature2016',
         created: '2016-01-01T01:00:00Z',
         creator: 'urn:5dd6a7e2-4c32-4a21-60b3-2385e5b6bcd4/keys/1',
-        // eslint-disable-next-line max-len
+        // eslint-disable-next-line @stylistic/max-len
         signatureValue: 'Lc6l7gxEPV1lKTj4KADaER52CiMBpvsHg7eZZJXzRK3U8N/eUYxITlenu3svj4KPrdnaBfMXGo3U/vAVaQNF5Er0g/SXC2KpUmRN4uyMYgQ5NwWklS2JqjJ/0Y3hio4GOgdMDiqrlZJvfQdtRaJjKoskc7F3bZtDVsX6Sr95erfOeobHOIMcbNIC0a96oYOaQlOeOC45BqQaUaczYKPayGEeQN2lfD+qR6b1MR4xtWNrx5pzzPpAPkjj3I91wiVQER43s/nq5XZKkDk8V8eD7xEURoDUcu3rA1qHLfrpRHJGCErXNc784O4R4Oqm5zQlkyB1mWJxnz3qSqzgqVG0sQ=='
       };
       const result = validateInstance({instance: signature, schema});
@@ -846,7 +846,7 @@ describe('bedrock-validation', function() {
         type: 'LinkedDataSignature2015',
         created: '2016-01-01T01:00:00Z',
         creator: 'urn:5dd6a7e2-4c32-4a21-60b3-2385e5b6bcd4/keys/1',
-        // eslint-disable-next-line max-len
+        // eslint-disable-next-line @stylistic/max-len
         signatureValue: 'Lc6l7gxEPV1lKTj4KADaER52CiMBpvsHg7eZZJXzRK3U8N/eUYxITlenu3svj4KPrdnaBfMXGo3U/vAVaQNF5Er0g/SXC2KpUmRN4uyMYgQ5NwWklS2JqjJ/0Y3hio4GOgdMDiqrlZJvfQdtRaJjKoskc7F3bZtDVsX6Sr95erfOeobHOIMcbNIC0a96oYOaQlOeOC45BqQaUaczYKPayGEeQN2lfD+qR6b1MR4xtWNrx5pzzPpAPkjj3I91wiVQER43s/nq5XZKkDk8V8eD7xEURoDUcu3rA1qHLfrpRHJGCErXNc784O4R4Oqm5zQlkyB1mWJxnz3qSqzgqVG0sQ=='
       };
       const extend = {name: 'test'};
@@ -861,7 +861,7 @@ describe('bedrock-validation', function() {
         type: 'GraphSignature2012',
         created: '2016-01-01T01:00:00Z',
         creator: 'urn:5dd6a7e2-4c32-4a21-60b3-2385e5b6bcd4/keys/1',
-        // eslint-disable-next-line max-len
+        // eslint-disable-next-line @stylistic/max-len
         signatureValue: 'Lc6l7gxEPV1lKTj4KADaER52CiMBpvsHg7eZZJXzRK3U8N/eUYxITlenu3svj4KPrdnaBfMXGo3U/vAVaQNF5Er0g/SXC2KpUmRN4uyMYgQ5NwWklS2JqjJ/0Y3hio4GOgdMDiqrlZJvfQdtRaJjKoskc7F3bZtDVsX6Sr95erfOeobHOIMcbNIC0a96oYOaQlOeOC45BqQaUaczYKPayGEeQN2lfD+qR6b1MR4xtWNrx5pzzPpAPkjj3I91wiVQER43s/nq5XZKkDk8V8eD7xEURoDUcu3rA1qHLfrpRHJGCErXNc784O4R4Oqm5zQlkyB1mWJxnz3qSqzgqVG0sQ=='
       };
       const result = validateInstance({instance: signature, schema});
@@ -872,38 +872,38 @@ describe('bedrock-validation', function() {
       const signature = {
         created: '2016-01-01T01:00:00Z',
         creator: 'urn:5dd6a7e2-4c32-4a21-60b3-2385e5b6bcd4/keys/1',
-        // eslint-disable-next-line max-len
+        // eslint-disable-next-line @stylistic/max-len
         signatureValue: 'Lc6l7gxEPV1lKTj4KADaER52CiMBpvsHg7eZZJXzRK3U8N/eUYxITlenu3svj4KPrdnaBfMXGo3U/vAVaQNF5Er0g/SXC2KpUmRN4uyMYgQ5NwWklS2JqjJ/0Y3hio4GOgdMDiqrlZJvfQdtRaJjKoskc7F3bZtDVsX6Sr95erfOeobHOIMcbNIC0a96oYOaQlOeOC45BqQaUaczYKPayGEeQN2lfD+qR6b1MR4xtWNrx5pzzPpAPkjj3I91wiVQER43s/nq5XZKkDk8V8eD7xEURoDUcu3rA1qHLfrpRHJGCErXNc784O4R4Oqm5zQlkyB1mWJxnz3qSqzgqVG0sQ=='
       };
       const result = validateInstance({instance: signature, schema});
       result.valid.should.be.false;
     });
 
-    // eslint-disable-next-line max-len
+    // eslint-disable-next-line @stylistic/max-len
     it('should NOT validate a LinkedDataSignature2015 signature w/missing created', function() {
       const signature = {
         type: 'LinkedDataSignature2015',
         creator: 'urn:5dd6a7e2-4c32-4a21-60b3-2385e5b6bcd4/keys/1',
-        // eslint-disable-next-line max-len
+        // eslint-disable-next-line @stylistic/max-len
         signatureValue: 'Lc6l7gxEPV1lKTj4KADaER52CiMBpvsHg7eZZJXzRK3U8N/eUYxITlenu3svj4KPrdnaBfMXGo3U/vAVaQNF5Er0g/SXC2KpUmRN4uyMYgQ5NwWklS2JqjJ/0Y3hio4GOgdMDiqrlZJvfQdtRaJjKoskc7F3bZtDVsX6Sr95erfOeobHOIMcbNIC0a96oYOaQlOeOC45BqQaUaczYKPayGEeQN2lfD+qR6b1MR4xtWNrx5pzzPpAPkjj3I91wiVQER43s/nq5XZKkDk8V8eD7xEURoDUcu3rA1qHLfrpRHJGCErXNc784O4R4Oqm5zQlkyB1mWJxnz3qSqzgqVG0sQ=='
       };
       const result = validateInstance({instance: signature, schema});
       result.valid.should.be.false;
     });
 
-    // eslint-disable-next-line max-len
+    // eslint-disable-next-line @stylistic/max-len
     it('should NOT validate a LinkedDataSignature2015 signature w/missing creator', function() {
       const signature = {
         type: 'LinkedDataSignature2015',
         created: '2016-01-01T01:00:00Z',
-        // eslint-disable-next-line max-len
+        // eslint-disable-next-line @stylistic/max-len
         signatureValue: 'Lc6l7gxEPV1lKTj4KADaER52CiMBpvsHg7eZZJXzRK3U8N/eUYxITlenu3svj4KPrdnaBfMXGo3U/vAVaQNF5Er0g/SXC2KpUmRN4uyMYgQ5NwWklS2JqjJ/0Y3hio4GOgdMDiqrlZJvfQdtRaJjKoskc7F3bZtDVsX6Sr95erfOeobHOIMcbNIC0a96oYOaQlOeOC45BqQaUaczYKPayGEeQN2lfD+qR6b1MR4xtWNrx5pzzPpAPkjj3I91wiVQER43s/nq5XZKkDk8V8eD7xEURoDUcu3rA1qHLfrpRHJGCErXNc784O4R4Oqm5zQlkyB1mWJxnz3qSqzgqVG0sQ=='
       };
       const result = validateInstance({instance: signature, schema});
       result.valid.should.be.false;
     });
 
-    // eslint-disable-next-line max-len
+    // eslint-disable-next-line @stylistic/max-len
     it('should NOT validate a LinkedDataSignature2015 signature w/missing signature', function() {
       const signature = {
         type: 'LinkedDataSignature2015',
@@ -973,7 +973,6 @@ describe('bedrock-validation', function() {
       result.valid.should.be.false;
     });
 
-    // eslint-disable-next-line max-len
     it('should NOT validate a signature w/missing proofValue', function() {
       const signature = {
         type: 'Ed25519Signature2020',
@@ -1098,7 +1097,7 @@ describe('bedrock-validation', function() {
       result.valid.should.be.true;
     });
 
-    // eslint-disable-next-line max-len
+    // eslint-disable-next-line @stylistic/max-len
     it('should NOT validate a sequenced JSON patch without a sequence', function() {
       const doc = {
         target: 'some-identifier',
@@ -1110,7 +1109,7 @@ describe('bedrock-validation', function() {
       result.valid.should.be.false;
     });
 
-    // eslint-disable-next-line max-len
+    // eslint-disable-next-line @stylistic/max-len
     it('should NOT validate a sequenced JSON patch without a target', function() {
       const doc = {
         patch: [
@@ -1122,7 +1121,7 @@ describe('bedrock-validation', function() {
       result.valid.should.be.false;
     });
 
-    // eslint-disable-next-line max-len
+    // eslint-disable-next-line @stylistic/max-len
     it('should NOT validate a sequenced JSON patch with a negative sequence', function() {
       const doc = {
         target: 'some-identifier',

package/.eslintrc.cjs

@@ -1,12 +0,0 @@
-module.exports = {
-  root: true,
-  parserOptions: {
-    // this is required for dynamic import()
-    ecmaVersion: 2020
-  },
-  env: {
-    node: true
-  },
-  extends: ['digitalbazaar', 'digitalbazaar/jsdoc'],
-  ignorePatterns: ['node_modules/']
-};

package/lib/Cache.js

@@ -1,24 +0,0 @@
-/*!
- * Copyright (c) 2012-2022 Digital Bazaar, Inc. All rights reserved.
- */
-export class Cache {
-  constructor() {
-    this._cache = new Map();
-  }
-
-  put(key, value) {
-    this._cache.set(key, value);
-  }
-
-  get(key) {
-    return this._cache.get(key);
-  }
-
-  del(key) {
-    this._cache.delete(key);
-  }
-
-  clear() {
-    this._cache.clear();
-  }
-}

package/test/mocha/.eslintrc

@@ -1,9 +0,0 @@
-{
-  "env": {
-    "mocha": true
-  },
-  "globals": {
-    "assertNoError": true,
-    "should": true
-  }
-}