@nxtedition/lib 21.4.2 → 21.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "21.4.2",
+  "version": "21.5.1",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",

package/sequence.js

@@ -54,16 +54,25 @@ export class Sequence {
       if (!value) {
         this.#value = '0'
       } else if (Array.isArray(value)) {
+        this.#identity = identity
         for (const part of value) {
           if (typeof part === 'string') {
             const [sequenceStr, id] = part.split(ID_SEP)
             const sequence = parseInt(sequenceStr)
             assert(Number.isFinite(sequence) && sequence >= 0)
             this.#parts.push(id, sequence)
-          } else {
+            this.#identity = null
+          } else if (typeof part === 'number') {
+            assert(Number.isFinite(part) && part >= 0)
+            assert(Number.isFinite(identity))
+            this.#parts.push('', part)
+          } else if (part != null) {
             assert(Number.isFinite(part.sequence) && part.sequence >= 0)
             assert(typeof part.id === 'string' && part.id.length > 0)
             this.#parts.push(part.id, part.sequence)
+            this.#identity = null
+          } else {
+            assert(false, part)
           }
         }
       } else if (typeof value === 'string') {
@@ -77,6 +86,10 @@ export class Sequence {
           this.#parts.push(id, sequence)
         }
         this.#value = value
+      } else if (value instanceof Sequence) {
+        this.#value = value.#value
+        this.#parts = value.#parts.slice()
+        this.#identity = value.#identity
       } else {
         assert(false)
       }
@@ -100,11 +113,15 @@ export class Sequence {
 
   get identity() {
     if (this.#identity == null) {
-      let str
-      for (let n = 0; n < this.#parts.length; n += 2) {
-        str += this.#parts[n]
+      if (this.#parts.length === 0) {
+        this.#identity = 0
+      } else {
+        let str
+        for (let n = 0; n < this.#parts.length; n += 2) {
+          str += this.#parts[n]
+        }
+        this.#identity = cyrb53(str, this.#parts.length)
       }
-      this.#identity = cyrb53(str, this.#parts.length)
     }
 
     return this.#identity
@@ -128,16 +145,25 @@ export class Sequence {
     }
   }
 
-  compare(other) {
+  compare(other, strict) {
+    if (strict === undefined) {
+      strict = true
+    }
+
     assert(other instanceof Sequence)
+    assert(typeof strict === 'boolean')
+
+    if (strict && other.identity && this.identity) {
+      assert.strictEqual(other.identity, this.identity)
+    }
 
     if (this.#parts.length !== other.#parts.length) {
       return this.#parts.length - other.#parts.length
     }
 
-    for (let n = 0; n < this.#parts.length; n++) {
-      if (this.#parts[n] !== other.#parts[n]) {
-        return this.#parts[n] < other.#parts[n] ? -1 : 1
+    for (let n = 0; n < this.#parts.length; n += 2) {
+      if (this.#parts[n + 1] !== other.#parts[n + 1]) {
+        return this.#parts[n + 1] < other.#parts[n + 1] ? -1 : 1
       }
     }