Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git b/bower.json a/bower.json
- old mode 100755
- new mode 100644
- index 57edd21..b5f1421
- --- b/bower.json
- +++ a/bower.json
- @@ -1,29 +1,29 @@
- {
- - "name": "uuid.js",
- - "homepage": "https://github.com/LiosK/UUID.js",
- - "description": "UUID.js - RFC-compliant UUID Generator for JavaScript",
- - "main": "src/uuid.js",
- - "moduleType": [
- - "globals"
- - ],
- - "keywords": [
- - "library",
- - "uuid",
- - "guid",
- - "rfc",
- - "4122",
- - "universally",
- - "globally",
- - "unique",
- - "identifier"
- - ],
- - "authors": [
- - "LiosK <[email protected]>"
- - ],
- - "license": "Apache-2.0",
- - "ignore": [
- - "**/.*",
- - "docs",
- - "test"
- - ]
- + "name": "kepleruuid",
- + "homepage": "https://github.com/benchlab/kepleruuid",
- + "description": "Kepler's RFC-compliant UUID Javascript Librarty for Bench Network's Kepler ID Sets and Network Objects. Design For Use With KeplerJS.",
- + "main": "src/kepler_uuid.js",
- + "moduleType": [
- + "globals"
- + ],
- + "keywords": [
- + "bench-network",
- + "kepler",
- + "keplerjs",
- + "keplerbase",
- + "kepler-uuid",
- + "uuid-generator",
- + "uuid-javascript",
- + "blockchain-id",
- + "decentralized"
- + ],
- + "authors": [
- + "Jared Rice Sr. <[email protected]>"
- + ],
- + "license": "Apache-2.0",
- + "ignore": [
- + "**/.*",
- + "docs",
- + "test"
- + ]
- }
- diff --git b/dist/kepleruuid.core.js a/dist/kepleruuid.core.js
- old mode 100755
- new mode 100644
- index 454cc4a..2f43f7c
- --- b/dist/kepleruuid.core.js
- +++ a/dist/kepleruuid.core.js
- @@ -1,7 +1,22 @@
- -/*
- - Version: v4.0.3
- - Apache License 2.0: Copyright (c) 2010-2017 LiosK
- -*/
- -var UUID;
- -UUID=function(f){function a(){}a.generate=function(){var b=a._getRandomInt,c=a._hexAligner;return c(b(32),8)+"-"+c(b(16),4)+"-"+c(16384|b(12),4)+"-"+c(32768|b(14),4)+"-"+c(b(48),12)};a._getRandomInt=function(b){if(0>b||53<b)return NaN;var c=0|1073741824*Math.random();return 30<b?c+1073741824*(0|Math.random()*(1<<b-30)):c>>>30-b};a._hexAligner=function(b,c){for(var a=b.toString(16),d=c-a.length,e="0";0<d;d>>>=1,e+=e)d&1&&(a=e+a);return a};a.overwrittenUUID=f;"object"===typeof module&&"object"===typeof module.exports&&
- -(module.exports=a);return a}(UUID);
- +var KeplerUUID;
- +KeplerUUID = function (f) {
- + function a() {}
- + a.build = function () {
- + var b = a._getRandomInt,
- + c = a._hexAligner;
- + return c(b(32), 8) + "-" + c(b(16), 4) + "-" + c(16384 | b(12), 4) + "-" + c(32768 | b(14), 4) + "-" + c(b(48), 12)
- + };
- + a._getRandomInt = function (b) {
- + if (0 > b || 53 < b) return NaN;
- + var c = 0 | 1073741824 * Math.random();
- + return 30 < b ? c + 1073741824 * (0 | Math.random() * (1 << b - 30)) : c >>> 30 - b
- + };
- + a._hexAligner = function (b, c) {
- + for (var a = b.toString(16), d = c - a.length, e = "0"; 0 < d; d >>>= 1, e += e) d & 1 && (a = e + a);
- + return a
- + };
- + a.overwrittenUUID = f;
- + "object" === typeof module && "object" === typeof module.exports &&
- + (module.exports = a);
- + return a
- +}(KeplerUUID);
- \ No newline at end of file
- diff --git b/package.json a/package.json
- old mode 100755
- new mode 100644
- index 5e0d3ec..9ae33ea
- --- b/package.json
- +++ a/package.json
- @@ -1,44 +1,58 @@
- {
- - "name": "uuidjs",
- - "version": "4.0.3",
- - "title": "UUID.js",
- - "description": "RFC-compliant UUID Generator for JavaScript",
- - "main": "src/uuid.js",
- - "types": "types/uuidjs/index.d.ts",
- + "name": "kepleruuid",
- +<<<<<<< HEAD
- + "version": "1.0.8",
- +=======
- + "version": "1.0.7",
- +>>>>>>> development/production
- + "title": "KeplerUUID",
- + "description": "Kepler's RFC-compliant UUID Javascript Librarty for Bench Network's Kepler ID Sets and Network Objects. Design For Use With KeplerJS.",
- + "main": "src/kepleruuidjs.js",
- + "types": "types/kepleruuidjs/index.d.ts",
- "directories": {
- "doc": "docs",
- "test": "test"
- },
- - "tonicExampleFilename": "example.js",
- + "tonicExampleFilename": "kepler_test.js",
- "scripts": {
- "test": "qunit test/nodejs.js",
- - "test-ts": "tsc --strict --noEmit types/uuidjs/uuidjs-tests.ts",
- - "jsdoc": "jsdoc -R README.md -d docs src/uuid.js"
- + "test-ts": "tsc --strict --noEmit types/kepleruuid/kepleruuid-tests.ts",
- + "jsdoc": "jsdoc -R README.md -d docs src/kepleruuid.js"
- },
- "repository": {
- "type": "git",
- - "url": "https://github.com/LiosK/UUID.js.git"
- + "url": "https://github.com/benchlab/KeplerUUID.git"
- },
- "keywords": [
- - "library",
- - "uuid",
- - "guid",
- - "rfc",
- - "4122",
- - "universally",
- - "globally",
- - "unique",
- - "identifier"
- + "bench-network",
- + "kepler",
- + "keplerjs",
- + "keplerbase",
- + "kepler-uuid",
- + "uuid-generator",
- + "uuid-javascript",
- + "blockchain-id",
- + "decentralized"
- ],
- - "author": "LiosK <[email protected]>",
- - "license": "Apache-2.0",
- + "author": "Jared Rice Sr. <[email protected]>",
- + "license": "BENCH",
- "bugs": {
- - "url": "https://github.com/LiosK/UUID.js/issues"
- + "url": "https://github.com/benchlab/KeplerUUID/issues"
- },
- - "homepage": "https://github.com/LiosK/UUID.js",
- + "homepage": "https://github.com/benchlab/KeplerUUID",
- "devDependencies": {
- "jsdoc": "^3.5.5",
- + "kepleruuidtest": "latest",
- "qunit": "^2.4.1",
- "typescript": "^2.6.2"
- + },
- + "dependencies": {
- + "bower": "^1.8.4",
- + "global": "^4.3.2",
- +<<<<<<< HEAD
- + "kepleruuidtest": "latest"
- +=======
- + "kepleruuid.js": "latest"
- +>>>>>>> development/production
- }
- }
- diff --git b/src/kepleruuid.core.js a/src/kepleruuid.core.js
- old mode 100755
- new mode 100644
- index a880e90..7a1db47
- --- b/src/kepleruuid.core.js
- +++ a/src/kepleruuid.core.js
- @@ -1,39 +1,39 @@
- /**
- - * UUID.core.js - UUID.js for Minimalists
- + * keplerUUID - Kepler 's RFC-compliant UUID Javascript Library for Bench Network's Kepler ID Sets and Network Objects.
- *
- * @file
- - * @author LiosK
- - * @version v4.0.3
- - * @license Apache License 2.0: Copyright (c) 2010-2017 LiosK
- + * @author BenchX
- + * @version v1.0.0
- + * @license BENCH License 1.0: Copyright (c) 2018 Bench Computer, Inc.
- */
- /**
- * @class
- - * @classdesc {@link UUID} object.
- + * @classdesc {@link keplerUUID} object.
- * @hideconstructor
- */
- -var UUID;
- +var keplerUUID;
- -UUID = (function(overwrittenUUID) {
- +keplerUUID = (function(overwrittenKeplerUUID) {
- "use strict";
- -// Core Component {{{
- +// Kepler Core UUID Builder Component {{{
- /**
- - * Generates a version 4 UUID as a hexadecimal string.
- - * @returns {string} Hexadecimal UUID string.
- + * Creates hexidecimal version of a v4 Kepler UUID and returns as a string.
- + * @returns {string} Hexadecimal Kepler v4 UUID string.
- */
- -UUID.generate = function() {
- - var rand = UUID._getRandomInt, hex = UUID._hexAligner;
- - return hex(rand(32), 8) // time_low
- +keplerUUID.builder = function() {
- + var rand = keplerUUID._getRandomInt, hex = keplerUUID._hexAligner;
- + return hex(rand(32), 8) // Kepler UUID `time_low`
- + "-"
- - + hex(rand(16), 4) // time_mid
- + + hex(rand(16), 4) // Kepler UUID `time_mid`
- + "-"
- - + hex(0x4000 | rand(12), 4) // time_hi_and_version
- + +hex(0x4000 | rand(12), 4) // Kepler UUID `time_hi_and_version`
- + "-"
- - + hex(0x8000 | rand(14), 4) // clock_seq_hi_and_reserved clock_seq_low
- + +hex(0x8000 | rand(14), 4) // Kepler UUID `clock_seq_hi_and_reserved` `clock_seq_low`
- + "-"
- - + hex(rand(48), 12); // node
- + +hex(rand(48), 12); // Kepler UUID `node`
- };
- /**
- @@ -42,7 +42,7 @@ UUID.generate = function() {
- * @param {number} x Unsigned integer ranging from 0 to 53, inclusive.
- * @returns {number} Unsigned x-bit random integer (0 <= f(x) < 2^x).
- */
- -UUID._getRandomInt = function(x) {
- +keplerUUID._getRandomInt = function(x) {
- if (x < 0 || x > 53) { return NaN; }
- var n = 0 | Math.random() * 0x40000000; // 1 << 30
- return x > 30 ? n + (0 | Math.random() * (1 << x - 30)) * 0x40000000 : n >>> 30 - x;
- @@ -55,31 +55,31 @@ UUID._getRandomInt = function(x) {
- * @param {number} length
- * @returns {string}
- */
- -UUID._hexAligner = function(num, length) {
- +keplerUUID._hexAligner = function(num, length) {
- var str = num.toString(16), i = length - str.length, z = "0";
- for (; i > 0; i >>>= 1, z += z) { if (i & 1) { str = z + str; } }
- return str;
- };
- /**
- - * Retains the value of 'UUID' global variable assigned before loading UUID.js.
- + * Retains the value of 'keplerUUID' global variable assigned before loading keplerUUID.js.
- * @since 3.2
- * @type {any}
- */
- -UUID.overwrittenUUID = overwrittenUUID;
- +keplerUUID.overwrittenKeplerUUID = overwrittenKeplerUUID;
- // }}}
- // create local namespace
- -function UUID() {}
- +function keplerUUID() {}
- // for nodejs
- if (typeof module === "object" && typeof module.exports === "object") {
- - module.exports = UUID;
- + module.exports = keplerUUID;
- }
- -return UUID;
- +return keplerUUID;
- -})(UUID);
- +})(keplerUUID);
- // vim: fdm=marker fmr&
- diff --git b/src/kepleruuid.js a/src/kepleruuid.js
- old mode 100755
- new mode 100644
- index 3ba9243..f9dbac3
- --- b/src/kepleruuid.js
- +++ a/src/kepleruuid.js
- @@ -1,30 +1,30 @@
- /**
- - * UUID.js - RFC-compliant UUID Generator for JavaScript
- + * keplerUUID - Kepler 's RFC-compliant UUID Javascript Library for Bench Network's Kepler ID Sets and Network Objects.
- *
- * @file
- - * @author LiosK
- - * @version v4.0.3
- - * @license Apache License 2.0: Copyright (c) 2010-2017 LiosK
- + * @author BenchX
- + * @version v1.0.0
- + * @license BENCH License 1.0: Copyright (c) 2018 Bench Computer, Inc.
- */
- /**
- * @class
- - * @classdesc {@link UUID} object.
- + * @classdesc {@link keplerUUID} object.
- * @hideconstructor
- */
- -var UUID;
- +var keplerUUID;
- -UUID = (function(overwrittenUUID) {
- +keplerUUID = (function(overwrittenKeplerUUID) {
- "use strict";
- -// Core Component {{{
- +// Core Kepler UUID Generator Component {{{
- /**
- - * Generates a version 4 UUID as a hexadecimal string.
- - * @returns {string} Hexadecimal UUID string.
- + * Generates a v4 Kepler UUID as a hexadecimal string.
- + * @returns {string} Hexadecimal keplerUUID string.
- */
- -UUID.generate = function() {
- - var rand = UUID._getRandomInt, hex = UUID._hexAligner;
- +keplerUUID.builder = function() {
- + var rand = keplerUUID._getRandomInt, hex = keplerUUID._hexAligner;
- return hex(rand(32), 8) // time_low
- + "-"
- + hex(rand(16), 4) // time_mid
- @@ -42,7 +42,7 @@ UUID.generate = function() {
- * @param {number} x Unsigned integer ranging from 0 to 53, inclusive.
- * @returns {number} Unsigned x-bit random integer (0 <= f(x) < 2^x).
- */
- -UUID._getRandomInt = function(x) {
- +keplerUUID._getRandomInt = function(x) {
- if (x < 0 || x > 53) { return NaN; }
- var n = 0 | Math.random() * 0x40000000; // 1 << 30
- return x > 30 ? n + (0 | Math.random() * (1 << x - 30)) * 0x40000000 : n >>> 30 - x;
- @@ -55,18 +55,18 @@ UUID._getRandomInt = function(x) {
- * @param {number} length
- * @returns {string}
- */
- -UUID._hexAligner = function(num, length) {
- +keplerUUID._hexAligner = function(num, length) {
- var str = num.toString(16), i = length - str.length, z = "0";
- for (; i > 0; i >>>= 1, z += z) { if (i & 1) { str = z + str; } }
- return str;
- };
- /**
- - * Retains the value of 'UUID' global variable assigned before loading UUID.js.
- + * Retains the value of 'keplerUUID' global variable assigned before loading keplerUUID.js.
- * @since 3.2
- * @type {any}
- */
- -UUID.overwrittenUUID = overwrittenUUID;
- +keplerUUID.overwrittenKeplerUUID = overwrittenKeplerUUID;
- // }}}
- @@ -74,15 +74,15 @@ UUID.overwrittenUUID = overwrittenUUID;
- (function() {
- - var mathPRNG = UUID._getRandomInt;
- + var mathPRNG = keplerUUID._getRandomInt;
- /**
- * Enables Math.random()-based pseudorandom number generator instead of cryptographically safer options.
- * @since v3.5.0
- * @deprecated This method is provided only to work around performance drawbacks of the safer algorithms.
- */
- - UUID.useMathRandom = function() {
- - UUID._getRandomInt = mathPRNG;
- + keplerUUID.useMathRandom = function() {
- + keplerUUID._getRandomInt = mathPRNG;
- };
- var crypto = null, cryptoPRNG = mathPRNG;
- @@ -106,58 +106,58 @@ UUID.overwrittenUUID = overwrittenUUID;
- };
- }
- }
- - UUID._getRandomInt = cryptoPRNG;
- + keplerUUID._getRandomInt = cryptoPRNG;
- })();
- // }}}
- -// UUID Object Component {{{
- +// keplerUUID Object Component {{{
- /**
- - * Names of UUID internal fields.
- + * Names of keplerUUID internal fields.
- * @type {string[]}
- * @constant
- * @since 3.0
- */
- -UUID.FIELD_NAMES = ["timeLow", "timeMid", "timeHiAndVersion",
- +keplerUUID.FIELD_NAMES = ["timeLow", "timeMid", "timeHiAndVersion",
- "clockSeqHiAndReserved", "clockSeqLow", "node"];
- /**
- - * Sizes of UUID internal fields.
- + * Sizes of keplerUUID internal fields.
- * @type {number[]}
- * @constant
- * @since 3.0
- */
- -UUID.FIELD_SIZES = [32, 16, 16, 8, 8, 48];
- +keplerUUID.FIELD_SIZES = [32, 16, 16, 8, 8, 48];
- /**
- - * Creates a version 4 {@link UUID} object.
- - * @returns {UUID} Version 4 {@link UUID} object.
- + * Creates a version 4 {@link keplerUUID} object.
- + * @returns {keplerUUID} Version 4 {@link keplerUUID} object.
- * @since 3.0
- */
- -UUID.genV4 = function() {
- - var rand = UUID._getRandomInt;
- - return new UUID()._init(rand(32), rand(16), // time_low time_mid
- +keplerUUID.genV4 = function() {
- + var rand = keplerUUID._getRandomInt;
- + return new keplerUUID()._init(rand(32), rand(16), // time_low time_mid
- 0x4000 | rand(12), // time_hi_and_version
- 0x80 | rand(6), // clock_seq_hi_and_reserved
- rand(8), rand(48)); // clock_seq_low node
- };
- /**
- - * Converts a hexadecimal UUID string to a {@link UUID} object.
- - * @param {string} strId Hexadecimal UUID string ("xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx").
- - * @returns {UUID} {@link UUID} object or null.
- + * Converts a hexadecimal keplerUUID string to a {@link keplerUUID} object.
- + * @param {string} strId Hexadecimal keplerUUID string ("xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx").
- + * @returns {keplerUUID} {@link keplerUUID} object or null.
- * @since 3.0
- */
- -UUID.parse = function(strId) {
- - var r, p = /^\s*(urn:uuid:|\{)?([0-9a-f]{8})-([0-9a-f]{4})-([0-9a-f]{4})-([0-9a-f]{2})([0-9a-f]{2})-([0-9a-f]{12})(\})?\s*$/i;
- +keplerUUID.parse = function(strId) {
- + var r, p = /^\s*(urn:keplerUUID:|\{)?([0-9a-f]{8})-([0-9a-f]{4})-([0-9a-f]{4})-([0-9a-f]{2})([0-9a-f]{2})-([0-9a-f]{12})(\})?\s*$/i;
- if (r = p.exec(strId)) {
- var l = r[1] || "", t = r[8] || "";
- if (((l + t) === "") ||
- (l === "{" && t === "}") ||
- - (l.toLowerCase() === "urn:uuid:" && t === "")) {
- - return new UUID()._init(parseInt(r[2], 16), parseInt(r[3], 16),
- + (l.toLowerCase() === "urn:keplerUUID:" && t === "")) {
- + return new keplerUUID()._init(parseInt(r[2], 16), parseInt(r[3], 16),
- parseInt(r[4], 16), parseInt(r[5], 16),
- parseInt(r[6], 16), parseInt(r[7], 16));
- }
- @@ -166,35 +166,35 @@ UUID.parse = function(strId) {
- };
- /**
- - * Initializes a {@link UUID} object.
- + * Initializes a {@link keplerUUID} object.
- * @private
- - * @constructs UUID
- + * @constructs keplerUUID
- * @param {number} [timeLow=0] time_low field (octet 0-3, uint32).
- * @param {number} [timeMid=0] time_mid field (octet 4-5, uint16).
- * @param {number} [timeHiAndVersion=0] time_hi_and_version field (octet 6-7, uint16).
- * @param {number} [clockSeqHiAndReserved=0] clock_seq_hi_and_reserved field (octet 8, uint8).
- * @param {number} [clockSeqLow=0] clock_seq_low field (octet 9, uint8).
- * @param {number} [node=0] node field (octet 10-15, uint48).
- - * @returns {UUID} this.
- + * @returns {keplerUUID} this.
- */
- -UUID.prototype._init = function() {
- - var names = UUID.FIELD_NAMES, sizes = UUID.FIELD_SIZES;
- - var bin = UUID._binAligner, hex = UUID._hexAligner;
- +keplerUUID.prototype._init = function() {
- + var names = keplerUUID.FIELD_NAMES, sizes = keplerUUID.FIELD_SIZES;
- + var bin = keplerUUID._binAligner, hex = keplerUUID._hexAligner;
- /**
- - * UUID internal field values as an array of integers.
- + * keplerUUID internal field values as an array of integers.
- * @type {number[]}
- */
- this.intFields = new Array(6);
- /**
- - * UUID internal field values as an array of binary strings.
- + * keplerUUID internal field values as an array of binary strings.
- * @type {string[]}
- */
- this.bitFields = new Array(6);
- /**
- - * UUID internal field values as an array of hexadecimal strings.
- + * keplerUUID internal field values as an array of hexadecimal strings.
- * @type {string[]}
- */
- this.hexFields = new Array(6);
- @@ -207,7 +207,7 @@ UUID.prototype._init = function() {
- }
- /**
- - * UUID version number.
- + * keplerUUID version number.
- * @type {number}
- */
- this.version = (this.intFields.timeHiAndVersion >>> 12) & 0xF;
- @@ -233,10 +233,10 @@ UUID.prototype._init = function() {
- + "-" + this.hexFields[3] + this.hexFields[4] + "-" + this.hexFields[5];
- /**
- - * URN string representation ("urn:uuid:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx").
- + * URN string representation ("urn:keplerUUID:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx").
- * @type {string}
- */
- - this.urn = "urn:uuid:" + this.hexString;
- + this.urn = "urn:keplerUUID:" + this.hexString;
- return this;
- };
- @@ -248,7 +248,7 @@ UUID.prototype._init = function() {
- * @param {number} length
- * @returns {string}
- */
- -UUID._binAligner = function(num, length) {
- +keplerUUID._binAligner = function(num, length) {
- var str = num.toString(2), i = length - str.length, z = "0";
- for (; i > 0; i >>>= 1, z += z) { if (i & 1) { str = z + str; } }
- return str;
- @@ -256,57 +256,57 @@ UUID._binAligner = function(num, length) {
- /**
- * Returns the hexadecimal string representation.
- - * @returns {string} {@link UUID#hexString}.
- + * @returns {string} {@link keplerUUID#hexString}.
- */
- -UUID.prototype.toString = function() { return this.hexString; };
- +keplerUUID.prototype.toString = function() { return this.hexString; };
- /**
- - * Tests if two {@link UUID} objects are equal.
- - * @param {UUID} uuid
- - * @returns {boolean} True if two {@link UUID} objects are equal.
- + * Tests if two {@link keplerUUID} objects are equal.
- + * @param {keplerUUID} keplerUUID
- + * @returns {boolean} True if two {@link keplerUUID} objects are equal.
- */
- -UUID.prototype.equals = function(uuid) {
- - if (!(uuid instanceof UUID)) { return false; }
- +keplerUUID.prototype.equals = function(keplerUUID) {
- + if (!(keplerUUID instanceof keplerUUID)) { return false; }
- for (var i = 0; i < 6; i++) {
- - if (this.intFields[i] !== uuid.intFields[i]) { return false; }
- + if (this.intFields[i] !== keplerUUID.intFields[i]) { return false; }
- }
- return true;
- };
- /**
- - * Nil UUID object.
- - * @type {UUID}
- + * Nil keplerUUID object.
- + * @type {keplerUUID}
- * @constant
- * @since v3.4.0
- */
- -UUID.NIL = new UUID()._init(0, 0, 0, 0, 0, 0);
- +keplerUUID.NIL = new keplerUUID()._init(0, 0, 0, 0, 0, 0);
- // }}}
- -// UUID Version 1 Component {{{
- +// keplerUUID Version 1 Component {{{
- /**
- - * Creates a version 1 {@link UUID} object.
- - * @returns {UUID} Version 1 {@link UUID} object.
- + * Creates a version 1 {@link keplerUUID} object.
- + * @returns {keplerUUID} Version 1 {@link keplerUUID} object.
- * @since 3.0
- */
- -UUID.genV1 = function() {
- - if (UUID._state == null) { UUID.resetState(); }
- - var now = new Date().getTime(), st = UUID._state;
- +keplerUUID.genV1 = function() {
- + if (keplerUUID._state == null) { keplerUUID.resetState(); }
- + var now = new Date().getTime(), st = keplerUUID._state;
- if (now != st.timestamp) {
- if (now < st.timestamp) { st.sequence++; }
- st.timestamp = now;
- - st.tick = UUID._getRandomInt(4);
- - } else if (Math.random() < UUID._tsRatio && st.tick < 9984) {
- + st.tick = keplerUUID._getRandomInt(4);
- + } else if (Math.random() < keplerUUID._tsRatio && st.tick < 9984) {
- // advance the timestamp fraction at a probability
- // to compensate for the low timestamp resolution
- - st.tick += 1 + UUID._getRandomInt(4);
- + st.tick += 1 + keplerUUID._getRandomInt(4);
- } else {
- st.sequence++;
- }
- // format time fields
- - var tf = UUID._getTimeFieldValues(st.timestamp);
- + var tf = keplerUUID._getTimeFieldValues(st.timestamp);
- var tl = tf.low + st.tick;
- var thav = (tf.hi & 0xFFF) | 0x1000; // set version '0001'
- @@ -315,19 +315,19 @@ UUID.genV1 = function() {
- var cshar = (st.sequence >>> 8) | 0x80; // set variant '10'
- var csl = st.sequence & 0xFF;
- - return new UUID()._init(tl, tf.mid, thav, cshar, csl, st.node);
- + return new keplerUUID()._init(tl, tf.mid, thav, cshar, csl, st.node);
- };
- /**
- - * Re-initializes the internal state for version 1 UUID creation.
- + * Re-initializes the internal state for version 1 keplerUUID creation.
- * @since 3.0
- */
- -UUID.resetState = function() {
- - UUID._state = new UUIDState();
- +keplerUUID.resetState = function() {
- + keplerUUID._state = new keplerUUIDState();
- };
- -function UUIDState() {
- - var rand = UUID._getRandomInt;
- +function keplerUUIDState() {
- + var rand = keplerUUID._getRandomInt;
- this.timestamp = 0;
- this.sequence = rand(14);
- this.node = (rand(8) | 1) * 0x10000000000 + rand(40); // set multicast bit '1'
- @@ -339,21 +339,21 @@ function UUIDState() {
- * @private
- * @type {number}
- */
- -UUID._tsRatio = 1 / 4;
- +keplerUUID._tsRatio = 1 / 4;
- /**
- - * Persistent internal state for version 1 UUID creation.
- + * Persistent internal state for version 1 keplerUUID creation.
- * @private
- - * @type {UUIDState}
- + * @type {keplerUUIDState}
- */
- -UUID._state = null;
- +keplerUUID._state = null;
- /**
- * @private
- * @param {Date|number} time ECMAScript Date Object or milliseconds from 1970-01-01.
- * @returns {any}
- */
- -UUID._getTimeFieldValues = function(time) {
- +keplerUUID._getTimeFieldValues = function(time) {
- var ts = time - Date.UTC(1582, 9, 15);
- var hm = ((ts / 0x100000000) * 10000) & 0xFFFFFFF;
- return { low: ((ts & 0xFFFFFFF) * 10000) % 0x100000000,
- @@ -363,15 +363,15 @@ UUID._getTimeFieldValues = function(time) {
- // }}}
- // create local namespace
- -function UUID() {}
- +function keplerUUID() {}
- // for nodejs
- if (typeof module === "object" && typeof module.exports === "object") {
- - module.exports = UUID;
- + module.exports = keplerUUID;
- }
- -return UUID;
- +return keplerUUID;
- -})(UUID);
- +})(keplerUUID);
- // vim: fdm=marker fmr&
- diff --git b/test/kepler_uuid.builder.js a/test/kepler_uuid.builder.js
- old mode 100755
- new mode 100644
- index 2428657..13dd253
- --- b/test/kepler_uuid.builder.js
- +++ a/test/kepler_uuid.builder.js
- @@ -1,8 +1,8 @@
- -QUnit.module("UUID.generate()", function() {
- +QUnit.module("KepkerUUID.generate()", function() {
- "use strict";
- - UUIDTestCommon.testV4AsString(function() {
- - return UUID.generate();
- + KeplerUUIDTestCommon.testV4AsString(function() {
- + return KeplerUUID.generate();
- });
- });
- diff --git b/test/kepler_uuid.genv1.js a/test/kepler_uuid.genv1.js
- old mode 100755
- new mode 100644
- index 83fe522..0931e0f
- --- b/test/kepler_uuid.genv1.js
- +++ a/test/kepler_uuid.genv1.js
- @@ -1,28 +1,28 @@
- -QUnit.module("UUID.genV1() as object", function() {
- +QUnit.module("KeplerUUID.genV1() as object", function() {
- "use strict";
- QUnit.test("basic object tests", function(assert) {
- var n = 16;
- for (var i = 0; i < n; i++) {
- - var uuid = UUID.genV1();
- - assert.equal(uuid.version, 1, "version number field");
- + var KeplerUUID = KeplerUUID.genV1();
- + assert.equal(KeplerUUID.version, 1, "version number field");
- - UUIDTestCommon.testObjectProperties(assert, uuid);
- + KeplerUUIDTestCommon.testObjectProperties(assert, KeplerUUID);
- }
- });
- });
- -QUnit.module("UUID.genV1() as string", function() {
- +QUnit.module("KeplerUUID.genV1() as string", function() {
- "use strict";
- var generator = function() {
- - return UUID.genV1().hexString;
- + return KeplerUUID.genV1().hexString;
- };
- - UUIDTestCommon.testV1AsString(generator);
- + KeplerUUIDTestCommon.testV1AsString(generator);
- QUnit.test("clock sequence tests", function(assert) {
- assert.expect(1024);
- @@ -43,9 +43,9 @@ QUnit.module("UUID.genV1() as string", function() {
- QUnit.test("node identifier consistency tests", function(assert) {
- assert.expect(48);
- - var n = 4096, uuids = [];
- - for (var i = 0; i < n; i++) { uuids[i] = generator(); }
- - var counts = UUIDTestCommon.countEachBitsOne(uuids);
- + var n = 4096, KeplerUUIDs = [];
- + for (var i = 0; i < n; i++) { KeplerUUIDs[i] = generator(); }
- + var counts = KeplerUUIDTestCommon.countEachBitsOne(KeplerUUIDs);
- for (var i = 80; i < 128; i++) {
- var c = counts[i];
- @@ -60,21 +60,21 @@ QUnit.module("UUID.genV1() as string", function() {
- });
- -QUnit.module("UUID.genV1() and UUID.resetState()", function() {
- +QUnit.module("KeplerUUID.genV1() and KeplerUUID.resetState()", function() {
- "use strict";
- var generator = function() {
- - UUID.resetState();
- - return UUID.genV1().hexString;
- + KeplerUUID.resetState();
- + return KeplerUUID.genV1().hexString;
- };
- - UUIDTestCommon.testV1AsString(generator);
- + KeplerUUIDTestCommon.testV1AsString(generator);
- QUnit.test("random bit neutrality tests (often fail by design)", function(assert) {
- assert.expect(64);
- - var n = 4096, uuids = [];
- - for (var i = 0; i < n; i++) { uuids[i] = generator(); }
- - var counts = UUIDTestCommon.countEachBitsOne(uuids);
- + var n = 4096, KeplerUUIDs = [];
- + for (var i = 0; i < n; i++) { KeplerUUIDs[i] = generator(); }
- + var counts = KeplerUUIDTestCommon.countEachBitsOne(KeplerUUIDs);
- // binom dist middle 99.99% range
- var margin = 3.890592 * Math.sqrt(0.5 * 0.5 / n);
- var ubound = 0.5 + margin, lbound = 0.5 - margin;
- diff --git b/test/kepler_uuid.genv4.js a/test/kepler_uuid.genv4.js
- old mode 100755
- new mode 100644
- index e67283d..54eff51
- --- b/test/kepler_uuid.genv4.js
- +++ a/test/kepler_uuid.genv4.js
- @@ -1,24 +1,24 @@
- -QUnit.module("UUID.genV4() as object", function() {
- +QUnit.module("KeplerUUID.genV4() as object", function() {
- "use strict";
- QUnit.test("basic object tests", function(assert) {
- var n = 16;
- for (var i = 0; i < n; i++) {
- - var uuid = UUID.genV4();
- - assert.equal(uuid.version, 4, "version number field");
- + var KeplerUUID = KeplerUUID.genV4();
- + assert.equal(KeplerUUID.version, 4, "version number field");
- - UUIDTestCommon.testObjectProperties(assert, uuid);
- + KeplerUUIDTestCommon.testObjectProperties(assert, KeplerUUID);
- }
- });
- });
- -QUnit.module("UUID.genV4() as string", function() {
- +QUnit.module("KeplerUUID.genV4() as string", function() {
- "use strict";
- - UUIDTestCommon.testV4AsString(function() {
- - return UUID.genV4().hexString;
- + KeplerUUIDTestCommon.testV4AsString(function() {
- + return KeplerUUID.genV4().hexString;
- });
- });
- diff --git b/test/kepler_uuid.nil.js a/test/kepler_uuid.nil.js
- old mode 100755
- new mode 100644
- index be99142..6f513d6
- --- b/test/kepler_uuid.nil.js
- +++ a/test/kepler_uuid.nil.js
- @@ -1,10 +1,10 @@
- -QUnit.module("UUID.NIL", function() {
- +QUnit.module("KeplerUUID.NIL", function() {
- "use strict";
- - QUnit.test("UUID.NIL holds the correct nil UUID object.", function(assert) {
- + QUnit.test("KeplerUUID.NIL holds the correct nil KeplerUUID object.", function(assert) {
- assert.expect(2);
- - assert.strictEqual(UUID.NIL.hexString, "00000000-0000-0000-0000-000000000000", 'UUID.NIL.hexString === "00000000-0000-0000-0000-000000000000"');
- - assert.ok(UUID.NIL.equals(UUID.parse("00000000-0000-0000-0000-000000000000")), 'UUID.NIL.equals(UUID.parse("00000000-0000-0000-0000-000000000000"))');
- + assert.strictEqual(KeplerUUID.NIL.hexString, "00000000-0000-0000-0000-000000000000", 'KeplerUUID.NIL.hexString === "00000000-0000-0000-0000-000000000000"');
- + assert.ok(KeplerUUID.NIL.equals(KeplerUUID.parse("00000000-0000-0000-0000-000000000000")), 'KeplerUUID.NIL.equals(KeplerUUID.parse("00000000-0000-0000-0000-000000000000"))');
- });
- });
- diff --git b/test/kepler_uuid.parse.js a/test/kepler_uuid.parse.js
- old mode 100755
- new mode 100644
- index 8c96e61..3d38bc9
- --- b/test/kepler_uuid.parse.js
- +++ a/test/kepler_uuid.parse.js
- @@ -1,4 +1,4 @@
- -QUnit.module("UUID.parse()", function() {
- +QUnit.module("KeplerUUID.parse()", function() {
- "use strict";
- QUnit.test("pass tests", function(assert) {
- @@ -13,15 +13,15 @@ QUnit.module("UUID.parse()", function() {
- var value = passes[i].canonical = passes[i].value;
- passes.push(
- { canonical: value, value: value.toUpperCase() },
- - { canonical: value, value: "urn:uuid:" + value },
- + { canonical: value, value: "urn:KeplerUUID:" + value },
- { canonical: value, value: "{" + value + "}" },
- { canonical: value, value: "\t " + value + "\n" }
- );
- }
- for (var i = 0, len = passes.length; i < len; i++) {
- - var uuid = UUID.parse(passes[i].value);
- - assert.equal(uuid.hexString, passes[i].canonical, "UUID.parse(\"" + passes[i].value + "\") -> " + uuid.hexString);
- + var KeplerUUID = KeplerUUID.parse(passes[i].value);
- + assert.equal(KeplerUUID.hexString, passes[i].canonical, "KeplerUUID.parse(\"" + passes[i].value + "\") -> " + KeplerUUID.hexString);
- }
- });
- @@ -39,7 +39,7 @@ QUnit.module("UUID.parse()", function() {
- ];
- for (var i = 0, len = fails.length; i < len; i++) {
- - assert.equal(UUID.parse(fails[i]), null, "UUID.parse failed: " + fails[i]);
- + assert.equal(KeplerUUID.parse(fails[i]), null, "KeplerUUID.parse failed: " + fails[i]);
- }
- });
- diff --git b/test/kepler_uuid.useRandomMath.js a/test/kepler_uuid.useRandomMath.js
- old mode 100755
- new mode 100644
- index 7bbcba6..6e50680
- --- b/test/kepler_uuid.useRandomMath.js
- +++ a/test/kepler_uuid.useRandomMath.js
- @@ -1,10 +1,10 @@
- -QUnit.module("UUID.useMathRandom()", function() {
- +QUnit.module("KeplerUUID.useMathRandom()", function() {
- "use strict";
- - UUID.useMathRandom();
- + KeplerUUID.useMathRandom();
- - UUIDTestCommon.testV4AsString(function() {
- - return UUID.generate();
- + KeplerUUIDTestCommon.testV4AsString(function() {
- + return KeplerUUID.generate();
- });
- });
- diff --git b/test/nodejs.js a/test/nodejs.js
- old mode 100755
- new mode 100644
- index 712ce65..fa52d16
- --- b/test/nodejs.js
- +++ a/test/nodejs.js
- @@ -1,9 +1,9 @@
- -global.UUID = require("uuidjs");
- -global.UUIDTestCommon = require("./util/uuid-test-common.js");
- +global.KeplerUUID = require("kepleruuid.js");
- +global.KeplerUUIDTestCommon = require("./util/kepleruuid-test-common.js");
- -require("./uuid.generate.js");
- -require("./uuid.genV4.js");
- -require("./uuid.genV1.js");
- -require("./uuid.parse.js");
- -require("./uuid.nil.js");
- -require("./uuid.useMathRandom.js");
- +require("./kepler_uuid.builder.js");
- +require("./kepler_uuid.genV4.js");
- +require("./kepler_uuid.genV1.js");
- +require("./kepler_uuid.parse.js");
- +require("./kepler_uuid.nil.js");
- +require("./kepler_uuid.useMathRandom.js");
- diff --git b/types/kepleruuid/index.d.ts a/types/kepleruuid/index.d.ts
- old mode 100755
- new mode 100644
- index b6f00e7..1597af8
- --- b/types/kepleruuid/index.d.ts
- +++ a/types/kepleruuid/index.d.ts
- @@ -1,33 +1,33 @@
- -export function generate(): string;
- +export function builder(): string;
- -export function genV4(): UUID;
- -export function genV1(): UUID;
- -export function parse(strId: string): UUID;
- +export function genV4(): KeplerUUID;
- +export function genV1(): KeplerUUID;
- +export function parse(strId: string): KeplerUUID;
- export const FIELD_NAMES: string[];
- export const FIELD_SIZES: number[];
- -export const NIL: UUID;
- +export const NIL: KeplerUUID;
- -interface UUID {
- - intFields: UUIDFields<number>;
- - bitFields: UUIDFields<string>;
- - hexFields: UUIDFields<string>;
- +interface KeplerUUID {
- + intFields: KeplerUUIDFields<number>;
- + bitFields: KeplerUUIDFields<string>;
- + hexFields: KeplerUUIDFields<string>;
- version: number;
- bitString: string;
- hexNoDelim: string;
- hexString: string;
- urn: string;
- toString(): string;
- - equals(uuid: UUID): boolean;
- + equals(uuid: KeplerUUID): boolean;
- }
- export function resetState(): void;
- export function useMathRandom(): void;
- // Hide unnecessary methods
- -export let overwrittenUUID: any;
- +export let overwrittenKeplerUUID: any;
- -interface UUIDFields<T> extends Array<T> {
- +interface KeplerUUIDFields<T> extends Array<T> {
- timeLow: T;
- timeMid: T;
- timeHiAndVersion: T;
- diff --git b/types/kepleruuid/kepleruuid_tests.ts a/types/kepleruuid/kepleruuid_tests.ts
- old mode 100755
- new mode 100644
- index 512364e..4150911
- --- b/types/kepleruuid/kepleruuid_tests.ts
- +++ a/types/kepleruuid/kepleruuid_tests.ts
- @@ -1,21 +1,25 @@
- -import * as UUID from 'uuidjs';
- +<<<<<<< HEAD:types/kepleruuid/kepleruuid_tests.ts
- +import * as KeplerUUID from "kepleruuidtest";
- +=======
- +import * as KeplerUUID from 'kepleruuid.js';
- +>>>>>>> development/production:types/kepleruuid_tests.ts
- const putNum = (x: number) => { console.log(x + ': number') };
- const putStr = (x: string) => { console.log('"' + x + '": string') };
- const putBool = (x: boolean) => { console.log(x + ': boolean') };
- -putStr(UUID.generate());
- -let objV4: UUID.UUID = UUID.genV4();
- -let objV1: UUID.UUID = UUID.genV1();
- -let parsed: UUID.UUID = UUID.parse(objV4.toString());
- +putStr(KeplerUUID.generate());
- +let objV4: KeplerUUID.KeplerUUID = KeplerUUID.genV4();
- +let objV1: KeplerUUID.KeplerUUID = KeplerUUID.genV1();
- +let parsed: KeplerUUID.KeplerUUID = KeplerUUID.parse(objV4.toString());
- -let _FIELD_NAMES: Array<string> = UUID.FIELD_NAMES;
- -let _FIELD_SIZES: Array<number> = UUID.FIELD_SIZES;
- -let _NIL: UUID.UUID = UUID.NIL;
- +let _FIELD_NAMES: Array<string> = KeplerUUID.FIELD_NAMES;
- +let _FIELD_SIZES: Array<number> = KeplerUUID.FIELD_SIZES;
- +let _NIL: KeplerUUID.KeplerUUID = KeplerUUID.NIL;
- -let _intFields: UUID.UUIDFields<number> = objV4.intFields;
- -let _bitFields: UUID.UUIDFields<string> = objV4.bitFields;
- -let _hexFields: UUID.UUIDFields<string> = objV4.hexFields;
- +let _intFields: KeplerUUID.KeplerUUIDFields<number> = objV4.intFields;
- +let _bitFields: KeplerUUID.KeplerUUIDFields<string> = objV4.bitFields;
- +let _hexFields: KeplerUUID.KeplerUUIDFields<string> = objV4.hexFields;
- for (let i: number = 0; i < 6; i++) {
- putNum(_intFields[i]);
- @@ -50,5 +54,5 @@ putStr(objV4.urn);
- putStr(objV4.toString());
- putBool(objV4.equals(objV1));
- -UUID.resetState();
- -UUID.useMathRandom();
- +KeplerUUID.resetState();
- +KeplerUUID.useMathRandom();
Advertisement
Add Comment
Please, Sign In to add comment