Merge pull request #34 from iLib-js/convertToJest

Convert to jest
iLib-js · Feb 1, 2024 · f357dca · f357dca
2 parents 5e546e5 + d9506a7
commit f357dca
Show file tree

Hide file tree

Showing 168 changed files with 12,341 additions and 12,149 deletions.
diff --git a/.babelrc b/.babelrc
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -26,11 +26,11 @@ workflows:
   test-all-node-versions:
     jobs:
       - test:
-          docker_image: circleci/node:12-browsers
+          docker_image: cimg/node:14.21-browsers
       - test:
-          docker_image: circleci/node:13-browsers
+          docker_image: cimg/node:16.20-browsers
       - test:
-          docker_image: circleci/node:14-browsers
+          docker_image: cimg/node:18.9-browsers
       - test:
-          docker_image: circleci/node:16-browsers
+          docker_image: cimg/node:20.9-browsers
       - test
diff --git a/README.md b/README.md
@@ -155,7 +155,7 @@ CalendarFactoryAsync({locale: 'ja-JP'}).then(function(cal) {
 
 ## License
 
-Copyright © 2019-2023, JEDLSoft
+Copyright © 2019-2024, JEDLSoft
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/package.json b/package.json
@@ -48,18 +48,23 @@
         "type": "git",
         "url": "[email protected]:iLib-js/ilib-es6.git"
     },
+    "engines": {
+        "node": ">= 14.0.0"
+    },
     "scripts": {
         "build": "npm run build:prod",
         "dist": "npm pack",
-        "test": "LANG=en_US.UTF8 node test/testSuite.js",
-        "debug": "node --inspect-brk test/testSuite.js",
+        "test": "npm run test:cli",
+        "test:cli": "LANG=en_US.UTF8 node --experimental-vm-modules node_modules/.bin/jest --testEnvironment node",
+        "test:watch": "LANG=en_US.UTF8 node --experimental-vm-modules node_modules/.bin/jest --testEnvironment node --watch",
+        "debug": "npm run build:dev ; node --experimental-vm-modules --inspect-brk node_modules/.bin/jest --testEnvironment node -i",
         "clean": "git clean -f -d * ; rm -rf lib"
     },
     "dependencies": {
         "ilib": "14.19.0"
     },
     "devDependencies": {
-        "assertextras": "^1.1.0",
-        "nodeunit": "^0.11.3"
+        "jest": "^29.7.0",
+        "npm-run-all": "^4.1.5"
     }
 }
diff --git a/src/Address.js b/src/Address.js
@@ -2,7 +2,7 @@
  * Address.js - ES6 wrappers around an ilib class
  *
  * @license
- * Copyright © 2018, 2022 JEDLSoft
+ * Copyright © 2018, 2022, 2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@ export default class Address {
     }
 
     static create(address, options = {}) {
-        return promisifyFunction(function(opts = {}) {
+        return promisifyFunction((opts = {}) => {
             const { address } = opts;
             return new ilibAddress(address, opts);
         }, Object.assign({}, options, {

diff --git a/src/AddressFmt.js b/src/AddressFmt.js
@@ -2,7 +2,7 @@
  * AddressFmt.js - ES6 wrappers around an ilib class
  *
  * @license
- * Copyright © 2018, 2022 JEDLSoft
+ * Copyright © 2018, 2022, 2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,12 +26,12 @@ function wrapGetFormatInfo(formatter) {
     if (!formatter) return;
 
     const oldGetFormatInfo = ilibAddressFmt.prototype.getFormatInfo.bind(formatter);
-    formatter.getFormatInfo = function(locale, sync, callback) {
+    formatter.getFormatInfo = (locale, sync, callback) => {
         if (typeof(sync) === "undefined" || sync) {
             return oldGetFormatInfo(locale, sync, callback);
         }
 
-        return promisifyFunction(function(options = {}) {
+        return promisifyFunction((options = {}) => {
             const {locale, onLoad} = options;
             return oldGetFormatInfo(locale, false, onLoad);
         }, {
@@ -50,7 +50,7 @@ export default class AddressFmt {
     }
 
     static create(options = {}) {
-        return new Promise(function(resolve, reject) {
+        return new Promise((resolve, reject) => {
             let tempOptions = Object.assign({}, options, {
                 sync: false,
                 onLoad: af => resolve(wrapGetFormatInfo(af))

diff --git a/src/CType.js b/src/CType.js
@@ -2,7 +2,7 @@
  * CType.js - ES6 wrappers around an ilib class
  *
  * @license
- * Copyright © 2018, 2022 JEDLSoft
+ * Copyright © 2018, 2022, 2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,12 +26,12 @@ function CType(ch) {
     return ilibCType(ch);
 };
 
-CType._init = function (sync, loadParams, onLoad) {
+CType._init = (sync, loadParams, onLoad) => {
     if (typeof(sync) === "undefined" || sync) {
         return ilibCType._init(sync, loadParams, onLoad);
     }
 
-    return promisifyFunction(function(options = {}) {
+    return promisifyFunction((options = {}) => {
         const { sync, loadParams, onLoad } = options;
         return ilibCType._init(sync, loadParams, onLoad);
     }, {
@@ -41,12 +41,12 @@ CType._init = function (sync, loadParams, onLoad) {
     });
 };
 
-CType._load = function (name, sync, loadParams, onLoad) {
+CType._load = (name, sync, loadParams, onLoad) => {
     if (typeof(sync) === "undefined" || sync) {
         return ilibCType._load(name, sync, loadParams, onLoad);
     }
 
-    return promisifyFunction(function(options = {}) {
+    return promisifyFunction((options = {}) => {
         const { name, sync, loadParams, onLoad } = options;
         return ilibCType._init(name, sync, loadParams, onLoad);
     }, {

diff --git a/src/CalendarFactory.js b/src/CalendarFactory.js
@@ -2,7 +2,7 @@
  * CalendarFactory.js - ES6 wrappers around an ilib class
  *
  * @license
- * Copyright © 2018, 2022 JEDLSoft
+ * Copyright © 2018, 2022, 2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@ import { promisifyFunction } from './promisify.js';
 import {default as CalendarFactory } from 'ilib/lib/CalendarFactory.js';
 
 export function CalendarFactoryAsync(options = {}) {
-    var opts = Object.assign({}, options, {sync: false});
+    const opts = Object.assign({}, options, {sync: false});
     return promisifyFunction(CalendarFactory, opts);
 };
 

diff --git a/src/CharmapFactory.js b/src/CharmapFactory.js
@@ -2,7 +2,7 @@
  * CharmapFactory.js - ES6 wrappers around an ilib class
  *
  * @license
- * Copyright © 2018, 2022 JEDLSoft
+ * Copyright © 2018, 2022, 2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@ import { promisifyFunction } from './promisify.js';
 import { default as CharmapFactory } from 'ilib/lib/CharmapFactory.js';
 
 export function CharmapFactoryAsync(options = {}) {
-    var opts = Object.assign({}, options);
+    const opts = Object.assign({}, options);
     opts.sync = false;
     return promisifyFunction(CharmapFactory, opts);
 };

diff --git a/src/DateFactory.js b/src/DateFactory.js
@@ -2,7 +2,7 @@
  * DateFactory.js - ES6 wrappers around an ilib class
  *
  * @license
- * Copyright © 2018, 2022 JEDLSoft
+ * Copyright © 2018, 2022, 2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@ import { promisifyFunction } from './promisify.js';
 import { default as DateFactory } from 'ilib/lib/DateFactory.js';
 
 export function DateFactoryAsync(options = {}) {
-    var opts = Object.assign({}, options, {sync: false});
+    const opts = Object.assign({}, options, {sync: false});
     return promisifyFunction(DateFactory, opts);
 };
 

diff --git a/src/GlyphString.js b/src/GlyphString.js
@@ -2,7 +2,7 @@
  * GlyphString.js - ES6 wrappers around an ilib class
  *
  * @license
- * Copyright © 2018, 2022 JEDLSoft
+ * Copyright © 2018, 2022, 2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@ export default class GlyphString {
     }
 
     static create(str, options = {}) {
-        return promisifyFunction(function(opts = {}) {
+        return promisifyFunction((opts = {}) => {
             const { str } = opts;
             return new ilibGlyphString(str, opts);
         }, Object.assign({}, options, {

diff --git a/src/INumber.js b/src/INumber.js
@@ -2,7 +2,7 @@
  * INumber.js - ES6 wrappers around an ilib class
  *
  * @license
- * Copyright © 2018, 2022 JEDLSoft
+ * Copyright © 2018, 2022, 2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@ export default class INumber {
     }
 
     static create(str, options = {}) {
-        return promisifyFunction(function(opts = {}) {
+        return promisifyFunction((opts = {}) => {
             const { str } = opts;
             return new ilibINumber(str, opts);
         }, Object.assign({}, options, {

diff --git a/src/IString.js b/src/IString.js
@@ -2,7 +2,7 @@
  * IString.js - ES6 wrappers around an ilib class
  *
  * @license
- * Copyright © 2018, 2022 JEDLSoft
+ * Copyright © 2018, 2022, 2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,19 +26,19 @@ function wrapSetLocale(str) {
     if (!str) return;
 
     const oldSetLocale = ilibIString.prototype.setLocale.bind(str);
-    str.setLocale = function(locale, sync, loadParams, onLoad) {
+    str.setLocale = (locale, sync, loadParams, onLoad) => {
         if (typeof(sync) === "undefined" || sync) {
             return oldSetLocale(locale, sync, loadParams, onLoad);
         }
 
-        return promisifyFunction(function(opts = {}) {
+        return promisifyFunction((opts = {}) => {
             const { locale, sync, loadParams, onLoad } = opts;
             return oldSetLocale(locale, sync, loadParams, onLoad);
         }, {
-            locale: locale,
+            locale,
             sync: false,
-            loadParams: loadParams,
-            onLoad: onLoad
+            loadParams,
+            onLoad
         });
     };
 
@@ -50,19 +50,19 @@ export default class IString {
         return wrapSetLocale(new ilibIString(str));
     }
 
-    static loadPlurals(sync, locale, loadParams, callback) {
+    static loadPlurals(sync, locale, loadParams, onLoad) {
         if (typeof(sync) === "undefined" || sync) {
             return ilibIString.loadPlurals(sync, locale, loadParams, onLoad);
         }
 
-        return promisifyFunction(function(options = {}) {
+        return promisifyFunction((options = {}) => {
             const {locale, loadParams, onLoad} = options;
             return ilibIString.loadPlurals(false, locale, loadParams, onLoad);
         }, {
-            loadParams: loadParams,
-            locale: locale,
+            loadParams,
+            locale,
             sync: false,
-            onLoad: callback
+            onLoad
         });
     }
 

diff --git a/src/LocaleInfo.js b/src/LocaleInfo.js
@@ -2,7 +2,7 @@
  * LocaleInfo.js - ES6 wrappers around an ilib class
  *
  * @license
- * Copyright © 2018, 2022 JEDLSoft
+ * Copyright © 2018, 2022, 2024 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@ export default class LocaleInfo {
     }
 
     static create(locale, options = {}) {
-        return promisifyFunction(function(opts = {}) {
+        return promisifyFunction((opts = {}) => {
             const { locale } = opts;
             return new ilibLocaleInfo(locale, opts);
         }, Object.assign({}, options, {

diff --git a/src/Name.js b/src/Name.js
@@ -28,7 +28,7 @@ export default class Name {
     }
 
     static create(name, options = {}) {
-        return promisifyFunction(function(opts = {}) {
+        return promisifyFunction((opts = {}) => {
             const { name } = opts;
             return new ilibName(name, opts);
         }, Object.assign({}, options, {

diff --git a/src/NormString.js b/src/NormString.js
@@ -28,7 +28,7 @@ export default class NormString {
     }
 
     static create(str, options = {}) {
-        return promisifyFunction(function(opts = {}) {
+        return promisifyFunction((opts = {}) => {
             const { str } = opts;
             return new ilibNormString(str, opts);
         }, Object.assign({}, options, {

diff --git a/src/PhoneFmt.js b/src/PhoneFmt.js
@@ -26,13 +26,13 @@ function wrapFormat(phoneFmt) {
     if (!phoneFmt) return;
 
     const oldFormat = ilibPhoneFmt.prototype.format.bind(phoneFmt);
-    phoneFmt.format = function(number, options = {}) {
+    phoneFmt.format = (number, options = {}) => {
         const { sync } = options;
         if (typeof(sync) === "undefined" || sync) {
             return oldFormat(number, options);
         }
 
-        return promisifyFunction(function(opts = {}) {
+        return promisifyFunction((opts = {}) => {
             const { number } = opts;
             return oldFormat(number, opts);
         }, Object.assign({}, options, {
@@ -49,7 +49,7 @@ export default class PhoneFmt {
     }
 
     static create(options = {}) {
-        return promisifyFunction(function(options = {}) {
+        return promisifyFunction((options = {}) => {
             return wrapFormat(new ilibPhoneFmt(options));
         }, options);
     }

diff --git a/src/PhoneNumber.js b/src/PhoneNumber.js
@@ -26,13 +26,13 @@ function wrapNormalize(phoneNumber) {
     if (!phoneNumber) return;
 
     const oldNormalize = ilibPhoneNumber.prototype.normalize.bind(phoneNumber);
-    phoneNumber.normalize = function(options = {}) {
+    phoneNumber.normalize = (options = {}) => {
         const { sync } = options;
         if (typeof(sync) === "undefined" || sync) {
             return oldNormalize(options);
         }
 
-        return promisifyFunction(function(opts = {}) {
+        return promisifyFunction((opts = {}) => {
             return oldNormalize(opts);
         }, options);
     };
@@ -46,11 +46,22 @@ export default class PhoneNumber {
     }
 
     static create(phoneNumber, options = {}) {
-        return promisifyFunction(function(opts = {}) {
+        return promisifyFunction((opts = {}) => {
             const { phoneNumber } = opts;
             return wrapNormalize(new ilibPhoneNumber(phoneNumber, opts));
         }, Object.assign({}, options, {
             phoneNumber: phoneNumber
         }));
     }
+
+    static parseImsi(imsi, options = {}) {
+        const { sync } = options;
+        if (typeof(sync) === "undefined" || sync) {
+            return ilibPhoneNumber.parseImsi(imsi, options);
+        }
+
+        return promisifyFunction((opts = {}) => {
+            return ilibPhoneNumber.parseImsi(imsi, opts);
+        }, options);
+    }
 };