@nxtedition/lib 21.5.11 → 21.6.1

package/package.json

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

package/sequence.js

@@ -23,9 +23,25 @@ export class Sequence {
   #value
   #parts = []
   #identity
+  #count
 
   // TODO (perf): Optimize
-  static compare(a, b) {
+  /**
+   *
+   * @param {string|Sequence|null|undefined} a
+   * @param {string|Sequence|null|undefined} b
+   * @param {boolean} [strict=true]
+   * @returns
+   */
+  static compare(a, b, strict) {
+    if (a && typeof a === 'string') {
+      a = Sequence.tryParse(a)
+    }
+
+    if (a && typeof b === 'string') {
+      b = Sequence.tryParse(b)
+    }
+
     if (!a && !b) {
       return 0
     }
@@ -38,15 +54,7 @@ export class Sequence {
       return -1
     }
 
-    if (typeof a === 'string') {
-      a = new Sequence(a)
-    }
-
-    if (typeof b === 'string') {
-      b = new Sequence(b)
-    }
-
-    return a.compare(b)
+    return a.compare(b, strict)
   }
 
   /**
@@ -72,6 +80,7 @@ export class Sequence {
         this.#value = '0'
       } else if (Array.isArray(value)) {
         this.#identity = identity
+        this.#count = 0
         for (const part of value) {
           if (typeof part === 'string') {
             const [sequenceStr, id] = part.split(ID_SEP)
@@ -79,15 +88,18 @@ export class Sequence {
             assert(Number.isFinite(sequence) && sequence >= 0)
             this.#parts.push(id, sequence)
             this.#identity = null
+            this.#count += part
           } else if (typeof part === 'number') {
             assert(Number.isFinite(part) && part >= 0)
             assert(Number.isFinite(identity))
             this.#parts.push('', part)
+            this.#count += 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
+            this.#count += part.sequence
           } else {
             assert(false, part)
           }
@@ -103,8 +115,10 @@ export class Sequence {
           assert(Number.isFinite(sequence) && sequence >= 0)
           this.#parts.push(id, sequence)
         }
+        this.#count = count
         this.#value = value
       } else if (value instanceof Sequence) {
+        this.#count = value.#count
         this.#value = value.#value
         this.#parts = value.#parts.slice()
         this.#identity = value.#identity
@@ -145,6 +159,17 @@ export class Sequence {
     return this.#identity
   }
 
+  get count() {
+    if (this.#count == null) {
+      let count = 0
+      for (let n = 0; n < this.#parts.length; n += 2) {
+        count += this.#parts[n + 1]
+      }
+      this.#count = count
+    }
+    return this.#count
+  }
+
   get length() {
     return this.#parts.length / 2
   }
@@ -160,6 +185,7 @@ export class Sequence {
     if (this.#parts[index * 2 + 1] !== sequence) {
       this.#parts[index * 2 + 1] = sequence
       this.#value = undefined
+      this.#count = undefined
     }
   }