Skip to content

Commit 681e1da

Browse files
ctavanctavan
authoredJul 27, 2020
fix: add missing exports and tests for new APIs (#495)
The new APIs were still missing from some environment-specific tests. We should definitely consider consolidating these environment-specific test cases somehow, this currently requires way too much manual work and it's too easy to miss certain places that need an update.
·
v11.1.0v8.3.0
1 parent 8780344 commit 681e1da

File tree

9 files changed

+103
-11
lines changed

9 files changed

+103
-11
lines changed
 

‎examples/browser-esmodules/example.js

+19-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
import {
2+
NIL as NIL_UUID,
3+
parse as uuidParse,
4+
stringify as uuidStringify,
25
v1 as uuidv1,
3-
v4 as uuidv4,
46
v3 as uuidv3,
7+
v4 as uuidv4,
58
v5 as uuidv5,
9+
validate as uuidValidate,
10+
version as uuidVersion,
611
} from './node_modules/uuid/dist/esm-browser/index.js';
712
import * as uuid from './node_modules/uuid/dist/esm-browser/index.js';
813

@@ -36,6 +41,13 @@ console.log('uuidv5() URL', uuidv5('http://example.com/hello', uuidv5.URL));
3641
// const MY_NAMESPACE = '1b671a64-40d5-491e-99b0-da01ff1f3341';
3742
console.log('uuidv5() MY_NAMESPACE', uuidv5('Hello, World!', MY_NAMESPACE));
3843

44+
// Utility functions
45+
console.log('NIL_UUID', NIL_UUID);
46+
console.log('uuidParse()', uuidParse(MY_NAMESPACE));
47+
console.log('uuidStringify()', uuidStringify(uuidParse(MY_NAMESPACE)));
48+
console.log('uuidValidate()', uuidValidate(MY_NAMESPACE));
49+
console.log('uuidVersion()', uuidVersion(MY_NAMESPACE));
50+
3951
console.log('Same with default export');
4052

4153
console.log('uuid.v1()', uuid.v1());
@@ -46,3 +58,9 @@ console.log('uuid.v3() MY_NAMESPACE', uuid.v3('Hello, World!', MY_NAMESPACE));
4658
console.log('uuid.v5() DNS', uuid.v5('hello.example.com', uuid.v5.DNS));
4759
console.log('uuid.v5() URL', uuid.v5('http://example.com/hello', uuid.v5.URL));
4860
console.log('uuid.v5() MY_NAMESPACE', uuid.v5('Hello, World!', MY_NAMESPACE));
61+
62+
console.log('uuid.NIL', uuid.NIL);
63+
console.log('uuid.parse()', uuid.parse(MY_NAMESPACE));
64+
console.log('uuid.stringify()', uuid.stringify(uuid.parse(MY_NAMESPACE)));
65+
console.log('uuid.validate()', uuid.validate(MY_NAMESPACE));
66+
console.log('uuid.version()', uuid.version(MY_NAMESPACE));

‎examples/browser-rollup/example-all.js

+3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import {
2+
NIL as NIL_UUID,
23
parse as uuidParse,
34
stringify as uuidStringify,
45
v1 as uuidv1,
@@ -46,6 +47,7 @@ testpage(function (addTest, done) {
4647
addTest('uuidv5() MY_NAMESPACE', uuidv5('Hello, World!', MY_NAMESPACE));
4748

4849
// Utility functions
50+
addTest('NIL_UUID', NIL_UUID);
4951
addTest('uuidParse()', uuidParse(MY_NAMESPACE));
5052
addTest('uuidStringify()', uuidStringify(uuidParse(MY_NAMESPACE)));
5153
addTest('uuidValidate()', uuidValidate(MY_NAMESPACE));
@@ -62,6 +64,7 @@ testpage(function (addTest, done) {
6264
addTest('uuid.v5() URL', uuid.v5('http://example.com/hello', uuid.v5.URL));
6365
addTest('uuid.v5() MY_NAMESPACE', uuid.v5('Hello, World!', MY_NAMESPACE));
6466

67+
addTest('uuid.NIL', uuid.NIL);
6568
addTest('uuid.parse()', uuid.parse(MY_NAMESPACE));
6669
addTest('uuid.stringify()', uuid.stringify(uuid.parse(MY_NAMESPACE)));
6770
addTest('uuid.validate()', uuid.validate(MY_NAMESPACE));

‎examples/browser-umd/example.html

+5
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
<title>UUID UMD example</title>
33
<p>Please open the Developer Console to view output</p>
44
<script src="./node_modules/uuid/dist/umd/uuid.min.js"></script>
5+
<script src="./node_modules/uuid/dist/umd/uuidNIL.min.js"></script>
6+
<script src="./node_modules/uuid/dist/umd/uuidParse.min.js"></script>
7+
<script src="./node_modules/uuid/dist/umd/uuidStringify.min.js"></script>
8+
<script src="./node_modules/uuid/dist/umd/uuidValidate.min.js"></script>
9+
<script src="./node_modules/uuid/dist/umd/uuidVersion.min.js"></script>
510
<script src="./node_modules/uuid/dist/umd/uuidv1.min.js"></script>
611
<script src="./node_modules/uuid/dist/umd/uuidv3.min.js"></script>
712
<script src="./node_modules/uuid/dist/umd/uuidv4.min.js"></script>

‎examples/browser-umd/example.js

+14-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* global uuid:false, uuidv1:false, uuidv3:false, uuidv4:false, uuidv5:false */
1+
/* global uuid:false, uuidv1:false, uuidv3:false, uuidv4:false, uuidv5:false, uuidNIL:false, uuidParse:false, uuidStringify:false, uuidValidate:false, uuidVersion:false */
22
console.log('uuidv1()', uuidv1());
33

44
console.log('uuidv4()', uuidv4());
@@ -29,6 +29,13 @@ console.log('uuidv5() URL', uuidv5('http://example.com/hello', uuidv5.URL));
2929
// const MY_NAMESPACE = '1b671a64-40d5-491e-99b0-da01ff1f3341';
3030
console.log('uuidv5() MY_NAMESPACE', uuidv5('Hello, World!', MY_NAMESPACE));
3131

32+
// Utility functions
33+
console.log('NIL_UUID', uuidNIL);
34+
console.log('uuidParse()', uuidParse(MY_NAMESPACE));
35+
console.log('uuidStringify()', uuidStringify(uuidParse(MY_NAMESPACE)));
36+
console.log('uuidValidate()', uuidValidate(MY_NAMESPACE));
37+
console.log('uuidVersion()', uuidVersion(MY_NAMESPACE));
38+
3239
console.log('Same with default export');
3340

3441
console.log('uuid.v1()', uuid.v1());
@@ -39,3 +46,9 @@ console.log('uuid.v3() MY_NAMESPACE', uuid.v3('Hello, World!', MY_NAMESPACE));
3946
console.log('uuid.v5() DNS', uuid.v5('hello.example.com', uuid.v5.DNS));
4047
console.log('uuid.v5() URL', uuid.v5('http://example.com/hello', uuid.v5.URL));
4148
console.log('uuid.v5() MY_NAMESPACE', uuid.v5('Hello, World!', MY_NAMESPACE));
49+
50+
console.log('uuid.NIL', uuid.NIL);
51+
console.log('uuid.parse()', uuid.parse(MY_NAMESPACE));
52+
console.log('uuid.stringify()', uuid.stringify(uuid.parse(MY_NAMESPACE)));
53+
console.log('uuid.validate()', uuid.validate(MY_NAMESPACE));
54+
console.log('uuid.version()', uuid.version(MY_NAMESPACE));

‎examples/browser-webpack/example-all.js

+3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import {
2+
NIL as NIL_UUID,
23
parse as uuidParse,
34
stringify as uuidStringify,
45
v1 as uuidv1,
@@ -46,6 +47,7 @@ testpage(function (addTest, done) {
4647
addTest('uuidv5() MY_NAMESPACE', uuidv5('Hello, World!', MY_NAMESPACE));
4748

4849
// Utility functions
50+
addTest('NIL_UUID', NIL_UUID);
4951
addTest('uuidParse()', uuidParse(MY_NAMESPACE));
5052
addTest('uuidStringify()', uuidStringify(uuidParse(MY_NAMESPACE)));
5153
addTest('uuidValidate()', uuidValidate(MY_NAMESPACE));
@@ -62,6 +64,7 @@ testpage(function (addTest, done) {
6264
addTest('uuid.v5() URL', uuid.v5('http://example.com/hello', uuid.v5.URL));
6365
addTest('uuid.v5() MY_NAMESPACE', uuid.v5('Hello, World!', MY_NAMESPACE));
6466

67+
addTest('uuid.NIL', uuid.NIL);
6568
addTest('uuid.parse()', uuid.parse(MY_NAMESPACE));
6669
addTest('uuid.stringify()', uuid.stringify(uuid.parse(MY_NAMESPACE)));
6770
addTest('uuid.validate()', uuid.validate(MY_NAMESPACE));

‎examples/node-commonjs/example.js

+27-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,21 @@
1-
const { v1: uuidv1 } = require('uuid');
1+
const {
2+
NIL: NIL_UUID,
3+
parse: uuidParse,
4+
stringify: uuidStringify,
5+
v1: uuidv1,
6+
v3: uuidv3,
7+
v4: uuidv4,
8+
v5: uuidv5,
9+
validate: uuidValidate,
10+
version: uuidVersion,
11+
} = require('uuid');
12+
const uuid = require('uuid');
13+
const pkg = require('uuid/package.json');
14+
215
console.log('uuidv1()', uuidv1());
316

4-
const { v4: uuidv4 } = require('uuid');
517
console.log('uuidv4()', uuidv4());
618

7-
const { v3: uuidv3 } = require('uuid');
8-
919
// ... using predefined DNS namespace (for domain names)
1020
console.log('uuidv3() DNS', uuidv3('hello.example.com', uuidv3.DNS));
1121

@@ -19,8 +29,6 @@ console.log('uuidv3() URL', uuidv3('http://example.com/hello', uuidv3.URL));
1929
const MY_NAMESPACE = '55238d15-c926-4598-b49d-cf4e913ba13c';
2030
console.log('uuidv3() MY_NAMESPACE', uuidv3('Hello, World!', MY_NAMESPACE));
2131

22-
const { v5: uuidv5 } = require('uuid');
23-
2432
// ... using predefined DNS namespace (for domain names)
2533
console.log('uuidv5() DNS', uuidv5('hello.example.com', uuidv5.DNS));
2634

@@ -34,9 +42,15 @@ console.log('uuidv5() URL', uuidv5('http://example.com/hello', uuidv5.URL));
3442
// const MY_NAMESPACE = '1b671a64-40d5-491e-99b0-da01ff1f3341';
3543
console.log('uuidv5() MY_NAMESPACE', uuidv5('Hello, World!', MY_NAMESPACE));
3644

45+
// Utility functions
46+
console.log('NIL_UUID', NIL_UUID);
47+
console.log('uuidParse()', uuidParse(MY_NAMESPACE));
48+
console.log('uuidStringify()', uuidStringify(uuidParse(MY_NAMESPACE)));
49+
console.log('uuidValidate()', uuidValidate(MY_NAMESPACE));
50+
console.log('uuidVersion()', uuidVersion(MY_NAMESPACE));
51+
3752
console.log('Same with default export');
3853

39-
const uuid = require('uuid');
4054
console.log('uuid.v1()', uuid.v1());
4155
console.log('uuid.v4()', uuid.v4());
4256
console.log('uuid.v3() DNS', uuid.v3('hello.example.com', uuid.v3.DNS));
@@ -46,6 +60,11 @@ console.log('uuid.v5() DNS', uuid.v5('hello.example.com', uuid.v5.DNS));
4660
console.log('uuid.v5() URL', uuid.v5('http://example.com/hello', uuid.v5.URL));
4761
console.log('uuid.v5() MY_NAMESPACE', uuid.v5('Hello, World!', MY_NAMESPACE));
4862

63+
console.log('uuid.NIL', uuid.NIL);
64+
console.log('uuid.parse()', uuid.parse(MY_NAMESPACE));
65+
console.log('uuid.stringify()', uuid.stringify(uuid.parse(MY_NAMESPACE)));
66+
console.log('uuid.validate()', uuid.validate(MY_NAMESPACE));
67+
console.log('uuid.version()', uuid.version(MY_NAMESPACE));
68+
4969
// Some tools like react-native need to introspect the package.json file
50-
const pkg = require('uuid/package.json');
5170
console.log('pkg.name', pkg.name);

‎examples/node-esmodules/example.mjs

+24-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
1-
import { v1 as uuidv1, v4 as uuidv4, v3 as uuidv3, v5 as uuidv5 } from 'uuid';
1+
import {
2+
NIL as NIL_UUID,
3+
parse as uuidParse,
4+
stringify as uuidStringify,
5+
v1 as uuidv1,
6+
v3 as uuidv3,
7+
v4 as uuidv4,
8+
v5 as uuidv5,
9+
validate as uuidValidate,
10+
version as uuidVersion,
11+
} from 'uuid';
212
import * as uuid from 'uuid';
313
import pkg from 'uuid/package.json';
414

@@ -32,6 +42,13 @@ console.log('uuidv5() URL', uuidv5('http://example.com/hello', uuidv5.URL));
3242
// const MY_NAMESPACE = '1b671a64-40d5-491e-99b0-da01ff1f3341';
3343
console.log('uuidv5() MY_NAMESPACE', uuidv5('Hello, World!', MY_NAMESPACE));
3444

45+
// Utility functions
46+
console.log('NIL_UUID', NIL_UUID);
47+
console.log('uuidParse()', uuidParse(MY_NAMESPACE));
48+
console.log('uuidStringify()', uuidStringify(uuidParse(MY_NAMESPACE)));
49+
console.log('uuidValidate()', uuidValidate(MY_NAMESPACE));
50+
console.log('uuidVersion()', uuidVersion(MY_NAMESPACE));
51+
3552
console.log('Same with default export');
3653

3754
console.log('uuid.v1()', uuid.v1());
@@ -43,5 +60,11 @@ console.log('uuid.v5() DNS', uuid.v5('hello.example.com', uuid.v5.DNS));
4360
console.log('uuid.v5() URL', uuid.v5('http://example.com/hello', uuid.v5.URL));
4461
console.log('uuid.v5() MY_NAMESPACE', uuid.v5('Hello, World!', MY_NAMESPACE));
4562

63+
console.log('uuid.NIL', uuid.NIL);
64+
console.log('uuid.parse()', uuid.parse(MY_NAMESPACE));
65+
console.log('uuid.stringify()', uuid.stringify(uuid.parse(MY_NAMESPACE)));
66+
console.log('uuid.validate()', uuid.validate(MY_NAMESPACE));
67+
console.log('uuid.version()', uuid.version(MY_NAMESPACE));
68+
4669
// Some tools like react-native need to introspect the package.json file
4770
console.log('pkg.name', pkg.name);

‎test/browser/browser.spec.js

+3
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ const v5dns = (result) => expect(result).toBe('fdda765f-fc57-5604-a269-52a7df816
1616
const v5url = (result) => expect(result).toBe('3bbcee75-cecc-5b56-8031-b6641c1ed1f1');
1717
const v5custom = (result) => expect(result).toBe('c49c5142-4d9a-5940-a926-612ede0ec632');
1818

19+
const nil = (result) => expect(result).toBe('00000000-0000-0000-0000-000000000000');
1920
const parse = (result) =>
2021
expect(result).toEqual('85,35,141,21,201,38,69,152,180,157,207,78,145,59,161,60');
2122
const stringify = (result) => expect(result).toBe('55238d15-c926-4598-b49d-cf4e913ba13c');
@@ -32,6 +33,7 @@ const expectations = {
3233
'uuidv5() URL': v5url,
3334
'uuidv5() MY_NAMESPACE': v5custom,
3435

36+
NIL_UUID: nil,
3537
'uuidParse()': parse,
3638
'uuidStringify()': stringify,
3739
'uuidValidate()': validate,
@@ -46,6 +48,7 @@ const expectations = {
4648
'uuid.v5() URL': v5url,
4749
'uuid.v5() MY_NAMESPACE': v5custom,
4850

51+
'uuid.NIL': nil,
4952
'uuid.parse()': parse,
5053
'uuid.stringify()': stringify,
5154
'uuid.validate()': validate,

‎wrapper.mjs

+5
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,8 @@ export const v1 = uuid.v1;
33
export const v3 = uuid.v3;
44
export const v4 = uuid.v4;
55
export const v5 = uuid.v5;
6+
export const NIL = uuid.NIL;
7+
export const version = uuid.version;
8+
export const validate = uuid.validate;
9+
export const stringify = uuid.stringify;
10+
export const parse = uuid.parse;

0 commit comments

Comments
 (0)
Please sign in to comment.