Skip to content

Commit 5ae7287

Browse files
committed
remove .parse and .unparse API
1 parent 3b3c93d commit 5ae7287

4 files changed

Lines changed: 10 additions & 67 deletions

File tree

HISTORY.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# UNRELEASED
22

3+
* remove .parse and .unparse
4+
35
# 2.0.0
46

57
* Removed uuid.BufferClass

README.md

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -119,35 +119,6 @@ uuid.v4(null, buffer, 0);
119119
uuid.v4(null, buffer, 16);
120120
```
121121

122-
### uuid.parse(id[, buffer[, offset]])
123-
### uuid.unparse(buffer[, offset])
124-
125-
Parse and unparse UUIDs
126-
127-
* `id` - (String) UUID(-like) string
128-
* `buffer` - (Array | Buffer) Array or buffer where UUID bytes are to be written. Default: A new Array or Buffer is used
129-
* `offset` - (Number) Starting index in `buffer` at which to begin writing. Default: 0
130-
131-
Example parsing and unparsing a UUID string
132-
133-
```javascript
134-
const bytes = uuid.parse('797ff043-11eb-11e1-80d6-510998755d10'); // -> <Buffer 79 7f f0 43 11 eb 11 e1 80 d6 51 09 98 75 5d 10>
135-
const string = uuid.unparse(bytes); // -> '797ff043-11eb-11e1-80d6-510998755d10'
136-
```
137-
138-
### uuid.noConflict()
139-
140-
(Browsers only) Set `uuid` property back to it's previous value.
141-
142-
Returns the uuid object.
143-
144-
Example:
145-
146-
```javascript
147-
const myUuid = uuid.noConflict();
148-
myUuid.v1(); // -> '6c84fb90-12c4-11e1-840d-7b25c5ee775a'
149-
```
150-
151122
## Testing
152123

153124
```

test/test.js

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,3 @@ test('ids spanning 1ms boundary are 100ns apart', function() {
9494
var dt = parseInt(after, 16) - parseInt(before, 16);
9595
assert(dt === 1, 'Ids spanning 1ms boundary are 100ns apart');
9696
});
97-
98-
test('parse/unparse', function() {
99-
var id = '00112233445566778899aabbccddeeff';
100-
assert(uuid.unparse(uuid.parse(id.substr(0,10))) ==
101-
'00112233-4400-0000-0000-000000000000', 'Short parse');
102-
assert(uuid.unparse(uuid.parse('(this is the uuid -> ' + id + id)) ==
103-
'00112233-4455-6677-8899-aabbccddeeff', 'Dirty parse');
104-
});
105-

uuid.js

Lines changed: 8 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -6,33 +6,14 @@ var _rng = require('./lib/rng');
66
// Maps for number <-> hex string conversion
77
var _byteToHex = [];
88
var _hexToByte = {};
9-
for (var i = 0; i < 256; i++) {
9+
for (var i = 0; i < 256; ++i) {
1010
_byteToHex[i] = (i + 0x100).toString(16).substr(1);
1111
_hexToByte[_byteToHex[i]] = i;
1212
}
1313

14-
// **`parse()` - Parse a UUID into it's component bytes**
15-
function parse(s, buf, offset) {
16-
var i = (buf && offset) || 0, ii = 0;
17-
18-
buf = buf || [];
19-
s.toLowerCase().replace(/[0-9a-f]{2}/g, function(oct) {
20-
if (ii < 16) { // Don't overflow!
21-
buf[i + ii++] = _hexToByte[oct];
22-
}
23-
});
24-
25-
// Zero out remaining bytes if string was short
26-
while (ii < 16) {
27-
buf[i + ii++] = 0;
28-
}
29-
30-
return buf;
31-
}
32-
33-
// **`unparse()` - Convert UUID byte array (ala parse()) into a string**
34-
function unparse(buf, offset) {
35-
var i = offset || 0, bth = _byteToHex;
14+
function buff_to_string(buf, offset) {
15+
var i = offset || 0;
16+
var bth = _byteToHex;
3617
return bth[buf[i++]] + bth[buf[i++]] +
3718
bth[buf[i++]] + bth[buf[i++]] + '-' +
3819
bth[buf[i++]] + bth[buf[i++]] + '-' +
@@ -132,11 +113,11 @@ function v1(options, buf, offset) {
132113

133114
// `node`
134115
var node = options.node || _nodeId;
135-
for (var n = 0; n < 6; n++) {
116+
for (var n = 0; n < 6; ++n) {
136117
b[i + n] = node[n];
137118
}
138119

139-
return buf ? buf : unparse(b);
120+
return buf ? buf : buff_to_string(b);
140121
}
141122

142123
// **`v4()` - Generate random UUID**
@@ -160,19 +141,17 @@ function v4(options, buf, offset) {
160141

161142
// Copy bytes to buffer, if provided
162143
if (buf) {
163-
for (var ii = 0; ii < 16; ii++) {
144+
for (var ii = 0; ii < 16; ++ii) {
164145
buf[i + ii] = rnds[ii];
165146
}
166147
}
167148

168-
return buf || unparse(rnds);
149+
return buf || buff_to_string(rnds);
169150
}
170151

171152
// Export public API
172153
var uuid = v4;
173154
uuid.v1 = v1;
174155
uuid.v4 = v4;
175-
uuid.parse = parse;
176-
uuid.unparse = unparse;
177156

178157
module.exports = uuid;

0 commit comments

Comments
 (0)