ilib-localematcher 1.3.0 → 1.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "ilib-localematcher",
-    "version": "1.3.0",
+    "version": "1.3.1",
     "main": "./lib/LocaleMatcher.js",
     "module": "./src/LocaleMatcher.js",
     "exports": {
@@ -61,26 +61,28 @@
         "build:pkg": "echo '{\"type\": \"commonjs\"}' > lib/package.json",
         "build:data": "node scripts/genlikelyloc.js",
         "dist": "npm-run-all build:data doc doc:html build:prod build:pkg; npm pack",
-        "test": "npm run test:cli",
-        "test:cli": "LANG=en_US.UTF8 npm run build:dev ; bash test/testSuite.sh",
-        "test:web": "npm run build:test ; open-cli ./test/testSuite.html ; open-cli ./test/testSuite.html -- firefox",
-        "test:all": "npm-run-all build:data test:cli test:web",
-        "debug": "LANG=en_US.UTF8 npm-run-all build:data build:dev ; node --inspect-brk test/testSuite.js",
+        "test": "npm run test:all",
+        "test:cli": "LANG=en_US.UTF8 npm run build:dev ; node --experimental-vm-modules node_modules/.bin/jest --testEnvironment node",
+        "test:web": "LANG=en_US.UTF8 node --experimental-vm-modules node_modules/.bin/karma start --reporters dots --single-run",
+        "test:watch": "LANG=en_US.UTF8 node --experimental-vm-modules node_modules/.bin/jest --testEnvironment node --watch",
+        "test:all": "npm-run-all test:cli test:web",
+        "debug": "npm run build:dev ; node --experimental-vm-modules --inspect-brk node_modules/.bin/jest --testEnvironment node -i",
+        "debug:web": "LANG=en_US.UTF8 node --experimental-vm-modules node_modules/.bin/karma start --reporters dots",
         "clean": "git clean -f -d src test; rm -rf lib/*",
         "doc": "mkdir -p docs ; jsdoc2md -c jsdoc.json --separators --source src/* -m table > docs/ilibLocaleMatcher.md",
         "doc:html": "jsdoc -c jsdoc.json"
     },
     "devDependencies": {
-        "@babel/core": "^7.23.3",
-        "@babel/preset-env": "^7.23.3",
+        "@babel/core": "^7.23.5",
+        "@babel/preset-env": "^7.23.5",
         "@babel/register": "^7.22.15",
-        "@babel/runtime": "^7.23.4",
-        "assertextras": "^1.1.0",
-        "babel-loader": "^9.1.3",
+        "@babel/runtime": "^7.23.5",
+        "babel-loader": "^8.3.0",
         "babel-plugin-add-module-exports": "^1.0.4",
         "babel-plugin-module-resolver": "^5.0.0",
         "cldr-core": "^44.0.1",
         "docdash": "^2.0.2",
+        "expect": "^29.7.0",
         "grunt": "^1.6.1",
         "grunt-babel": "^8.0.0",
         "grunt-cli": "^1.4.3",
@@ -88,12 +90,17 @@
         "grunt-contrib-jshint": "^3.2.0",
         "grunt-contrib-nodeunit": "^5.0.0",
         "grunt-contrib-uglify": "^5.2.2",
+        "jest": "^26.6.3",
+        "jest-mock": "^29.7.0",
         "jsdoc": "^4.0.2",
         "jsdoc-to-markdown": "^8.0.0",
+        "karma": "^6.4.2",
+        "karma-assert": "^1.0.1",
+        "karma-chrome-launcher": "^3.2.0",
+        "karma-jasmine": "^5.1.0",
+        "karma-webpack": "^5.0.0",
         "load-grunt-tasks": "^5.1.0",
-        "nodeunit": "^0.11.3",
         "npm-run-all": "^4.1.5",
-        "open-cli": "^7.2.0",
         "webpack": "^5.89.0",
         "webpack-cli": "^5.1.4"
     },

package/src/LocaleMatcher.js

@@ -294,8 +294,8 @@ class LocaleMatcher {
             } else {
                 // check for containment
                 const containers = matchdata.territoryContainmentReverse[this.locale.region] || [];
-                // end at 1 because 0 is "001" which is "the whole world" -- which is not useful
-                for (i = containers.length-1; i > 0; i--) {
+                // end at length-1 because the end is "001" which is "the whole world" -- which is not useful
+                for (i = 0; i < containers.length-1; i++) {
                     const container = matchdata.territoryContainment[containers[i]];
                     if (container && container.indexOf(other.region) > -1) {
                         // same area only accounts for 20% of the region score
@@ -379,9 +379,7 @@ class LocaleMatcher {
         const thisRegions = this._getRegionContainment(thisRegion);
         const otherRegions = this._getRegionContainment(otherRegion);
 
-        // region containment arrays are arranged from largest to smallest, so start
-        // at the end of the array
-        for (let i = thisRegions.length-1; i > 0; i--) {
+        for (let i = 0; i < thisRegions.length; i++) {
             if (otherRegions.indexOf(thisRegions[i]) > -1) {
                 return thisRegions[i];
             }