@gesslar/toolkit 5.3.0 → 5.4.0

package/package.json

@@ -5,7 +5,7 @@
     "name": "gesslar",
     "url": "https://gesslar.dev"
   },
-  "version": "5.3.0",
+  "version": "5.4.0",
   "license": "0BSD",
   "homepage": "https://github.com/gesslar/toolkit#readme",
   "repository": {
@@ -77,17 +77,17 @@
   },
   "dependencies": {
     "@gesslar/colours": "^1.0.0",
-    "ajv": "^8.18.0",
+    "ajv": "^8.20.0",
     "json5": "^2.2.3",
     "supports-color": "^10.2.2",
-    "yaml": "^2.8.3"
+    "yaml": "^2.9.0"
   },
   "devDependencies": {
     "@gesslar/uglier": "^2.4.1",
     "@rollup/plugin-node-resolve": "^16.0.3",
-    "eslint": "^10.2.0",
+    "eslint": "^10.3.0",
     "happy-dom": "^20.9.0",
-    "rollup": "^4.60.1",
+    "rollup": "^4.60.3",
     "typescript": "^6.0.3"
   }
 }

package/src/browser/lib/Util.js

@@ -166,25 +166,37 @@ export default class Util {
       Valid.type(supplied, "String", {allowEmpty: false})
       Valid.type(target, "String", {allowEmpty: false})
 
-      const suppliedSemver = supplied.split(".").filter(Boolean).map(Number).filter(e => !isNaN(e))
-      const targetSemver = target.split(".").filter(Boolean).map(Number).filter(e => !isNaN(e))
+      const {major: sMajor, minor: sMinor, patch: sPatch} =
+        this.semver.basic.exec(supplied)?.groups ?? {}
+      const {major: tMajor, minor: tMinor, patch: tPatch} =
+        this.semver.basic.exec(target)?.groups ?? {}
 
-      Valid.assert(suppliedSemver.length === 3, "Invalid format for supplied semver.")
-      Valid.assert(targetSemver.length === 3, "Invalid format for target semver.")
+      Valid.assert(Boolean(sMajor && sMinor && sPatch), "Invalid format for supplied semver.")
+      Valid.assert(Boolean(tMajor && tMinor && tPatch), "Invalid format for target semver.")
 
-      if(suppliedSemver[0] < targetSemver[0])
+      const isMajor = Number(sMajor)
+      const itMajor = Number(tMajor)
+      if(isMajor < itMajor)
         return false
 
-      if(suppliedSemver[0] === targetSemver[0]) {
-        if(suppliedSemver[1] < targetSemver[1])
+      if(isMajor === itMajor) {
+        const isMinor = Number(sMinor)
+        const itMinor = Number(tMinor)
+        if(isMinor < itMinor)
           return false
 
-        if(suppliedSemver[1] === targetSemver[1])
-          if(suppliedSemver[2] < targetSemver[2])
+        if(isMinor === itMinor) {
+          const isPatch = Number(sPatch)
+          const itPatch = Number(tPatch)
+          if(isPatch < itPatch)
             return false
+        }
       }
 
       return true
-    }
+    },
+
+    basic: /^(?<major>0|(?:[1-9]\d*))\.(?<minor>0|(?:[1-9]\d*))\.(?<patch>0|(?:[1-9]\d*))$/,
+    enhanced: /^(?<major>0|(?:[1-9]\d*))\.(?<minor>0|(?:[1-9]\d*))\.(?<patch>0|(?:[1-9]\d*))(?:-(?<prerelease>(?:0|(?:[1-9A-Za-z-][0-9A-Za-z-]*))(?:\.(?:0|(?:[1-9A-Za-z-][0-9A-Za-z-]*)))*))?(?:\+(?<build>(?:0|(?:[1-9A-Za-z-][0-9A-Za-z-]*))(?:\.(?:0|(?:[1-9A-Za-z-][0-9A-Za-z-]*)))*))?$/
   }
 }

package/types/browser/lib/Util.d.ts

@@ -60,6 +60,8 @@ export default class Util {
     static regexify(input: any, trim?: boolean, flags?: any[]): RegExp;
     static semver: {
         meetsOrExceeds: (supplied: any, target: any) => boolean;
+        basic: RegExp;
+        enhanced: RegExp;
     };
 }
 //# sourceMappingURL=Util.d.ts.map

package/types/browser/lib/Util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Util.d.ts","sourceRoot":"","sources":["../../../src/browser/lib/Util.js"],"names":[],"mappings":"AAGA;;;GAGG;AACH;IACE;;;;;OAKG;IACH,wBAHW,MAAM,GACJ,MAAM,CAYlB;IAED;;;;;;OAMG;IACH,YAJa,CAAC,MACH,MAAM,OAAO,CAAC,CAAC,CAAC,GACd,OAAO,CAAC;QAAC,MAAM,EAAE,CAAC,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAC,CAAC,CAQ9C;IAED;;;;;;;OAOG;IACH,4BAJW,MAAM,GAAC,MAAM,UACb,MAAM,GACJ,MAAM,CAWlB;IAED;;;;;;;OAOG;IACH,6BAJW,MAAM,GAAC,MAAM,UACb,MAAM,GACJ,MAAM,CAalB;IAED;;;;;;OAMG;IACH,8BAJW,MAAM,KACN,MAAM,GACJ,MAAM,CAsBlB;IAED;;;;;;;;OAQG;IACH,+BALW,MAAM,iBACN,KAAK,CAAC,MAAM,CAAC,cACb,MAAM,GACJ,MAAM,CAwBlB;IAED,mEAkBC;IAED;;MAyBC;CACF"}
+{"version":3,"file":"Util.d.ts","sourceRoot":"","sources":["../../../src/browser/lib/Util.js"],"names":[],"mappings":"AAGA;;;GAGG;AACH;IACE;;;;;OAKG;IACH,wBAHW,MAAM,GACJ,MAAM,CAYlB;IAED;;;;;;OAMG;IACH,YAJa,CAAC,MACH,MAAM,OAAO,CAAC,CAAC,CAAC,GACd,OAAO,CAAC;QAAC,MAAM,EAAE,CAAC,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAC,CAAC,CAQ9C;IAED;;;;;;;OAOG;IACH,4BAJW,MAAM,GAAC,MAAM,UACb,MAAM,GACJ,MAAM,CAWlB;IAED;;;;;;;OAOG;IACH,6BAJW,MAAM,GAAC,MAAM,UACb,MAAM,GACJ,MAAM,CAalB;IAED;;;;;;OAMG;IACH,8BAJW,MAAM,KACN,MAAM,GACJ,MAAM,CAsBlB;IAED;;;;;;;;OAQG;IACH,+BALW,MAAM,iBACN,KAAK,CAAC,MAAM,CAAC,cACb,MAAM,GACJ,MAAM,CAwBlB;IAED,mEAkBC;IAED;;;;MAqCC;CACF"}

package/vendor/toolkit.esm.js

@@ -1,4 +1,4 @@
-// @gesslar/toolkit v5.3.0 - ES module bundle
+// @gesslar/toolkit v5.4.0 - ES module bundle
 /**
  * @file Tantrum.js
  *
@@ -559,26 +559,38 @@ class Util {
       Valid.type(supplied, "String", {allowEmpty: false});
       Valid.type(target, "String", {allowEmpty: false});
 
-      const suppliedSemver = supplied.split(".").filter(Boolean).map(Number).filter(e => !isNaN(e));
-      const targetSemver = target.split(".").filter(Boolean).map(Number).filter(e => !isNaN(e));
+      const {major: sMajor, minor: sMinor, patch: sPatch} =
+        this.semver.basic.exec(supplied)?.groups ?? {};
+      const {major: tMajor, minor: tMinor, patch: tPatch} =
+        this.semver.basic.exec(target)?.groups ?? {};
 
-      Valid.assert(suppliedSemver.length === 3, "Invalid format for supplied semver.");
-      Valid.assert(targetSemver.length === 3, "Invalid format for target semver.");
+      Valid.assert(Boolean(sMajor && sMinor && sPatch), "Invalid format for supplied semver.");
+      Valid.assert(Boolean(tMajor && tMinor && tPatch), "Invalid format for target semver.");
 
-      if(suppliedSemver[0] < targetSemver[0])
+      const isMajor = Number(sMajor);
+      const itMajor = Number(tMajor);
+      if(isMajor < itMajor)
         return false
 
-      if(suppliedSemver[0] === targetSemver[0]) {
-        if(suppliedSemver[1] < targetSemver[1])
+      if(isMajor === itMajor) {
+        const isMinor = Number(sMinor);
+        const itMinor = Number(tMinor);
+        if(isMinor < itMinor)
           return false
 
-        if(suppliedSemver[1] === targetSemver[1])
-          if(suppliedSemver[2] < targetSemver[2])
+        if(isMinor === itMinor) {
+          const isPatch = Number(sPatch);
+          const itPatch = Number(tPatch);
+          if(isPatch < itPatch)
             return false
+        }
       }
 
       return true
-    }
+    },
+
+    basic: /^(?<major>0|(?:[1-9]\d*))\.(?<minor>0|(?:[1-9]\d*))\.(?<patch>0|(?:[1-9]\d*))$/,
+    enhanced: /^(?<major>0|(?:[1-9]\d*))\.(?<minor>0|(?:[1-9]\d*))\.(?<patch>0|(?:[1-9]\d*))(?:-(?<prerelease>(?:0|(?:[1-9A-Za-z-][0-9A-Za-z-]*))(?:\.(?:0|(?:[1-9A-Za-z-][0-9A-Za-z-]*)))*))?(?:\+(?<build>(?:0|(?:[1-9A-Za-z-][0-9A-Za-z-]*))(?:\.(?:0|(?:[1-9A-Za-z-][0-9A-Za-z-]*)))*))?$/
   }
 }
 

package/vendor/toolkit.umd.js

@@ -1,4 +1,4 @@
-// @gesslar/toolkit v5.3.0 - UMD bundle
+// @gesslar/toolkit v5.4.0 - UMD bundle
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
   typeof define === 'function' && define.amd ? define(['exports'], factory) :
@@ -565,26 +565,38 @@
         Valid.type(supplied, "String", {allowEmpty: false});
         Valid.type(target, "String", {allowEmpty: false});
 
-        const suppliedSemver = supplied.split(".").filter(Boolean).map(Number).filter(e => !isNaN(e));
-        const targetSemver = target.split(".").filter(Boolean).map(Number).filter(e => !isNaN(e));
+        const {major: sMajor, minor: sMinor, patch: sPatch} =
+          this.semver.basic.exec(supplied)?.groups ?? {};
+        const {major: tMajor, minor: tMinor, patch: tPatch} =
+          this.semver.basic.exec(target)?.groups ?? {};
 
-        Valid.assert(suppliedSemver.length === 3, "Invalid format for supplied semver.");
-        Valid.assert(targetSemver.length === 3, "Invalid format for target semver.");
+        Valid.assert(Boolean(sMajor && sMinor && sPatch), "Invalid format for supplied semver.");
+        Valid.assert(Boolean(tMajor && tMinor && tPatch), "Invalid format for target semver.");
 
-        if(suppliedSemver[0] < targetSemver[0])
+        const isMajor = Number(sMajor);
+        const itMajor = Number(tMajor);
+        if(isMajor < itMajor)
           return false
 
-        if(suppliedSemver[0] === targetSemver[0]) {
-          if(suppliedSemver[1] < targetSemver[1])
+        if(isMajor === itMajor) {
+          const isMinor = Number(sMinor);
+          const itMinor = Number(tMinor);
+          if(isMinor < itMinor)
             return false
 
-          if(suppliedSemver[1] === targetSemver[1])
-            if(suppliedSemver[2] < targetSemver[2])
+          if(isMinor === itMinor) {
+            const isPatch = Number(sPatch);
+            const itPatch = Number(tPatch);
+            if(isPatch < itPatch)
               return false
+          }
         }
 
         return true
-      }
+      },
+
+      basic: /^(?<major>0|(?:[1-9]\d*))\.(?<minor>0|(?:[1-9]\d*))\.(?<patch>0|(?:[1-9]\d*))$/,
+      enhanced: /^(?<major>0|(?:[1-9]\d*))\.(?<minor>0|(?:[1-9]\d*))\.(?<patch>0|(?:[1-9]\d*))(?:-(?<prerelease>(?:0|(?:[1-9A-Za-z-][0-9A-Za-z-]*))(?:\.(?:0|(?:[1-9A-Za-z-][0-9A-Za-z-]*)))*))?(?:\+(?<build>(?:0|(?:[1-9A-Za-z-][0-9A-Za-z-]*))(?:\.(?:0|(?:[1-9A-Za-z-][0-9A-Za-z-]*)))*))?$/
     }
   }