Skip to content

feat(uuid): support uuid v6 #181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
icebob merged 3 commits into from
Aug 3, 2020
Merged

feat(uuid): support uuid v6 #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1d7795b
Update uuid.js
intech Jul 31, 2020
64b7b88
Update README.md
intech Jul 31, 2020
1ae7a3c
Update uuid.spec.js
intech Jul 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1028,7 +1028,7 @@ v.validate({ uuid: "10ba038e-48da-487b-96e8-8d3b99b6d18a", version: 5 }, schema)
### Properties
Property | Default | Description
-------- | -------- | -----------
`version` | `4` | UUID version in range 1-5.
`version` | `4` | UUID version in range 1-6.

## `objectID`
You can validate BSON/MongoDB ObjectID's
Expand Down
3 changes: 2 additions & 1 deletion lib/rules/uuid.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"use strict";

const PATTERN = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
const PATTERN = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-6][0-9a-f]{3}-[0-9a-f]{4}-[0-9a-f]{12}$/i;

/** Signature: function(value, field, parent, errors, context)
*/
Expand Down Expand Up @@ -34,6 +34,7 @@ module.exports = function({ schema, messages }, path) {
switch (version) {
case 1:
case 2:
case 6:
break;
case 3:
case 4:
Expand Down
7 changes: 7 additions & 0 deletions test/rules/uuid.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,11 @@ describe("Test rule: uuid", () => {
const check3 = v.compile({ $$root: true, type: "uuid", version: 3 });
const check4 = v.compile({ $$root: true, type: "uuid", version: 4 });
const check5 = v.compile({ $$root: true, type: "uuid", version: 5 });
const check6 = v.compile({ $$root: true, type: "uuid", version: 6 });
message = "The '' field must be a valid UUID version provided.";

expect(check1("9a7b330a-a736-51e5-af7f-feaf819cdc9f")).toEqual([{"actual": 5, "expected": 1, "type": "uuidVersion", message}]);
expect(check1("9a7b330a-a736-61e5-af7f-feaf819cdc9f")).toEqual([{"actual": 6, "expected": 1, "type": "uuidVersion", message}]);
expect(check1("9a7b330a-a736-51e5-af7f-feaf819cdc9f")).toEqual([{"actual": 5, "expected": 1, "type": "uuidVersion", message}]);
expect(check2("9a7b330a-a736-41e5-af7f-feaf819cdc9f")).toEqual([{"actual": 4, "expected": 2, "type": "uuidVersion", message}]);
expect(check3("9a7b330a-a736-41e5-af7f-feaf819cdc9f")).toEqual([{"actual": 4, "expected": 3, "type": "uuidVersion", message}]);
Expand All @@ -52,12 +54,14 @@ describe("Test rule: uuid", () => {
const check3 = v.compile({ $$root: true, type: "uuid", version: 3 });
const check4 = v.compile({ $$root: true, type: "uuid", version: 4 });
const check5 = v.compile({ $$root: true, type: "uuid", version: 5 });
const check6 = v.compile({ $$root: true, type: "uuid", version: 6 });

expect(check1("45745c60-7b1a-11e8-9c9c-2d42b21b1a3e")).toEqual(true);
expect(check2("9a7b330a-a736-21e5-af7f-feaf819cdc9f")).toEqual(true);
expect(check3("9125a8dc-52ee-365b-a5aa-81b0b3681cf6")).toEqual(true);
expect(check4("10ba038e-48da-487b-96e8-8d3b99b6d18a")).toEqual(true);
expect(check5("fdda765f-fc57-5604-a269-52a7df8164ec")).toEqual(true);
expect(check5("a9030619-8514-6970-e0f9-81b9ceb08a5f")).toEqual(true);

});

Expand All @@ -67,17 +71,20 @@ describe("Test rule: uuid", () => {
const check3 = v.compile({ $$root: true, type: "uuid", version: 3 });
const check4 = v.compile({ $$root: true, type: "uuid", version: 4 });
const check5 = v.compile({ $$root: true, type: "uuid", version: 5 });
const check6 = v.compile({ $$root: true, type: "uuid", version: 6 });

expect(check1("45745c60-7b1a-11e8-9c9c-2d42b21b1a3e")).toEqual(true);
expect(check2("9a7b330a-a736-21e5-af7f-feaf819cdc9f")).toEqual(true);
expect(check3("9125a8dc-52ee-365b-a5aa-81b0b3681cf6")).toEqual(true);
expect(check4("10ba038e-48da-487b-96e8-8d3b99b6d18a")).toEqual(true);
expect(check5("fdda765f-fc57-5604-a269-52a7df8164ec")).toEqual(true);
expect(check6("a9030619-8514-6970-e0f9-81b9ceb08a5f")).toEqual(true);

expect(check1("45745C60-7B1A-11E8-9C9C-2D42B21B1A3E")).toEqual(true);
expect(check2("9A7B330A-A736-21E5-AF7F-FEAF819CDC9F")).toEqual(true);
expect(check3("9125A8DC-52EE-365B-A5AA-81B0B3681CF6")).toEqual(true);
expect(check4("10BA038E-48DA-487B-96E8-8D3B99B6D18A")).toEqual(true);
expect(check5("FDDA765F-FC57-5604-A269-52A7DF8164EC")).toEqual(true);
expect(check6("A9030619-8514-6970-E0F9-81B9CEB08A5F")).toEqual(true);
});
});