umt 1.0.12 → 1.0.14

package/.github/workflows/test.yml

@@ -0,0 +1,23 @@
+# アクション名
+name: Test
+
+# タイミングを指定
+on:
+    pull_request:
+        branches: [main]
+
+jobs:
+    build:
+        name: build
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v1
+            - name: yarn install
+              run: yarn install
+            - name: Run Test
+              run: yarn test
+            - name: Upload test coverage artifact
+              uses: actions/upload-artifact@v1
+              with:
+                  name: coverage
+                  path: coverage_dir

package/jest.config.js

@@ -0,0 +1,13 @@
+/** @type {import('ts-jest').JestConfigWithTsJest} */
+module.exports = {
+    preset: 'ts-jest',
+    testEnvironment: 'node',
+    roots: ['<rootDir>/tests'],
+    collectCoverage: true,
+    collectCoverageFrom: [
+        '<rootDir>/tests/**/*.ts',
+        '!**/node_modules/**',
+    ],
+    coverageDirectory: 'coverage_dir',
+    coverageReporters: ['html'],
+};

package/make_test.py

@@ -0,0 +1,24 @@
+import os
+import pathlib
+paths = ["Array", "Math", "Simple"]
+for path in paths:
+    path = f"src/{path}"
+    files = os.listdir(path)
+    files_file = [f for f in files if os.path.isfile(os.path.join(path, f))]
+    for file in files_file:
+        if(file == "index.ts" or file == ".DS_Store" or file in "random"):
+            continue
+        path = pathlib.Path(path)
+        p_dir = path.name
+        p_dir = f"tests/{p_dir}/"
+        file = pathlib.Path(file).stem
+        if not os.path.exists(p_dir):
+            os.makedirs(p_dir)
+        if os.path.isfile(p_dir + file + ".test.ts"):
+            continue
+        pathlib.Path(p_dir + file + ".test.ts").touch()
+        with open(p_dir + file + ".test.ts", "w") as f:
+            f.write(
+                """import { %s } from "../../module/%s/%s";
+test('{%s}', () => {});
+""" % (file, path.name, file, file))

package/module/Array/arraysJoin.js

@@ -7,7 +7,13 @@ exports.arraysJoin = void 0;
  * @param  {any[]} ...arrays
  */
 const arraysJoin = (array, ...arrays) => {
+    if (!array || !Array.isArray(array)) {
+        throw new Error('Invalid array');
+    }
     for (const i of arrays) {
+        if (!i || !Array.isArray(i)) {
+            throw new Error('Invalid array');
+        }
         array.push(...i);
     }
     return [...new Set(array)];

package/module/Array/getArraysCommon.js

@@ -7,19 +7,23 @@ exports.getArraysCommon = void 0;
  * @param  {any[]} ...arrays
  */
 const getArraysCommon = (array, ...arrays) => {
-    const result = [];
-    for (const i of array) {
-        let flag = true;
-        for (const j of arrays) {
-            if (!j.includes(i)) {
-                flag = false;
-                break;
-            }
-        }
-        if (flag) {
-            result.push(i);
-        }
-    }
+    const result = [array, ...arrays].reduce((prev, current) => {
+        return prev.filter((item) => current.includes(item));
+    });
     return result;
+    // const result: any[] = [];
+    // for (const i of array) {
+    //     let flag = true;
+    //     for (const j of arrays) {
+    //         if (!j.includes(i)) {
+    //             flag = false;
+    //             break;
+    //         }
+    //     }
+    //     if (flag) {
+    //         result.push(i);
+    //     }
+    // }
+    // return result;
 };
 exports.getArraysCommon = getArraysCommon;

package/module/Array/getArraysDiff.js

@@ -7,19 +7,11 @@ exports.getArraysDiff = void 0;
  * @param  {any[]} ...arrays
  */
 const getArraysDiff = (array, ...arrays) => {
-    const result = [];
-    for (const i of array) {
-        let flag = true;
-        for (const j of arrays) {
-            if (j.includes(i)) {
-                flag = false;
-                break;
-            }
-        }
-        if (flag) {
-            result.push(i);
-        }
-    }
+    const result = array
+        .concat(...arrays)
+        .filter((val, _index, arr) => {
+        return arr.indexOf(val) === arr.lastIndexOf(val);
+    });
     return result;
 };
 exports.getArraysDiff = getArraysDiff;

package/module/Array/index.js

@@ -10,7 +10,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _UMTArrayClass_LocalarraysJoin, _UMTArrayClass_LocalgetArraysCommon, _UMTArrayClass_LocalgetArraysDiff, _UMTArrayClass_LocalquickSort, _UMTArrayClass_Localsum;
+var _UMTArrayClass_Local_arraysJoin, _UMTArrayClass_Local_getArraysCommon, _UMTArrayClass_Local_getArraysDiff, _UMTArrayClass_Local_quickSort, _UMTArrayClass_Local_sum;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UMT_Array = exports.UMTArrayClass = exports.sum = exports.quickSort = exports.getArraysDiff = exports.getArraysCommon = exports.arraysJoin = void 0;
 const arraysJoin_1 = require("./arraysJoin");
@@ -25,33 +25,33 @@ const sum_1 = require("./sum");
 Object.defineProperty(exports, "sum", { enumerable: true, get: function () { return sum_1.sum; } });
 class UMTArrayClass {
     constructor() {
-        _UMTArrayClass_LocalarraysJoin.set(this, void 0);
-        _UMTArrayClass_LocalgetArraysCommon.set(this, void 0);
-        _UMTArrayClass_LocalgetArraysDiff.set(this, void 0);
-        _UMTArrayClass_LocalquickSort.set(this, void 0);
-        _UMTArrayClass_Localsum.set(this, void 0);
-        __classPrivateFieldSet(this, _UMTArrayClass_LocalarraysJoin, arraysJoin_1.arraysJoin, "f");
-        __classPrivateFieldSet(this, _UMTArrayClass_LocalgetArraysCommon, getArraysCommon_1.getArraysCommon, "f");
-        __classPrivateFieldSet(this, _UMTArrayClass_LocalgetArraysDiff, getArraysDiff_1.getArraysDiff, "f");
-        __classPrivateFieldSet(this, _UMTArrayClass_LocalquickSort, quickSort_1.quickSort, "f");
-        __classPrivateFieldSet(this, _UMTArrayClass_Localsum, sum_1.sum, "f");
+        _UMTArrayClass_Local_arraysJoin.set(this, void 0);
+        _UMTArrayClass_Local_getArraysCommon.set(this, void 0);
+        _UMTArrayClass_Local_getArraysDiff.set(this, void 0);
+        _UMTArrayClass_Local_quickSort.set(this, void 0);
+        _UMTArrayClass_Local_sum.set(this, void 0);
+        __classPrivateFieldSet(this, _UMTArrayClass_Local_arraysJoin, arraysJoin_1.arraysJoin, "f");
+        __classPrivateFieldSet(this, _UMTArrayClass_Local_getArraysCommon, getArraysCommon_1.getArraysCommon, "f");
+        __classPrivateFieldSet(this, _UMTArrayClass_Local_getArraysDiff, getArraysDiff_1.getArraysDiff, "f");
+        __classPrivateFieldSet(this, _UMTArrayClass_Local_quickSort, quickSort_1.quickSort, "f");
+        __classPrivateFieldSet(this, _UMTArrayClass_Local_sum, sum_1.sum, "f");
     }
     get arraysJoin() {
-        return __classPrivateFieldGet(this, _UMTArrayClass_LocalarraysJoin, "f");
+        return __classPrivateFieldGet(this, _UMTArrayClass_Local_arraysJoin, "f");
     }
     get getArraysCommon() {
-        return __classPrivateFieldGet(this, _UMTArrayClass_LocalgetArraysCommon, "f");
+        return __classPrivateFieldGet(this, _UMTArrayClass_Local_getArraysCommon, "f");
     }
     get getArraysDiff() {
-        return __classPrivateFieldGet(this, _UMTArrayClass_LocalgetArraysDiff, "f");
+        return __classPrivateFieldGet(this, _UMTArrayClass_Local_getArraysDiff, "f");
     }
     get quickSort() {
-        return __classPrivateFieldGet(this, _UMTArrayClass_LocalquickSort, "f");
+        return __classPrivateFieldGet(this, _UMTArrayClass_Local_quickSort, "f");
     }
     get sum() {
-        return __classPrivateFieldGet(this, _UMTArrayClass_Localsum, "f");
+        return __classPrivateFieldGet(this, _UMTArrayClass_Local_sum, "f");
     }
 }
 exports.UMTArrayClass = UMTArrayClass;
-_UMTArrayClass_LocalarraysJoin = new WeakMap(), _UMTArrayClass_LocalgetArraysCommon = new WeakMap(), _UMTArrayClass_LocalgetArraysDiff = new WeakMap(), _UMTArrayClass_LocalquickSort = new WeakMap(), _UMTArrayClass_Localsum = new WeakMap();
+_UMTArrayClass_Local_arraysJoin = new WeakMap(), _UMTArrayClass_Local_getArraysCommon = new WeakMap(), _UMTArrayClass_Local_getArraysDiff = new WeakMap(), _UMTArrayClass_Local_quickSort = new WeakMap(), _UMTArrayClass_Local_sum = new WeakMap();
 exports.UMT_Array = new UMTArrayClass();

package/module/Date/index.js

@@ -10,20 +10,20 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _UMTDateClass_Localnow;
+var _UMTDateClass_Local_now;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UMT_Date = exports.UMTDateClass = exports.now = void 0;
 const now_1 = require("./now");
 Object.defineProperty(exports, "now", { enumerable: true, get: function () { return now_1.now; } });
 class UMTDateClass {
     constructor() {
-        _UMTDateClass_Localnow.set(this, void 0);
-        __classPrivateFieldSet(this, _UMTDateClass_Localnow, now_1.now, "f");
+        _UMTDateClass_Local_now.set(this, void 0);
+        __classPrivateFieldSet(this, _UMTDateClass_Local_now, now_1.now, "f");
     }
     get now() {
-        return __classPrivateFieldGet(this, _UMTDateClass_Localnow, "f");
+        return __classPrivateFieldGet(this, _UMTDateClass_Local_now, "f");
     }
 }
 exports.UMTDateClass = UMTDateClass;
-_UMTDateClass_Localnow = new WeakMap();
+_UMTDateClass_Local_now = new WeakMap();
 exports.UMT_Date = new UMTDateClass();

package/module/Math/average.js

@@ -1,14 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.average = void 0;
+const addition_1 = require("./addition");
+const division_1 = require("./division");
 /**
  * 平均値
  * @param  {number[]} numbers
  * @returns number
  */
 const average = (numbers) => {
-    const sum = numbers.reduce((a, b) => a + b, 0);
-    const avg = sum / numbers.length;
+    const sum = numbers.reduce((a, b) => (0, addition_1.addition)(a, b), 0);
+    const avg = (0, division_1.division)(sum, numbers.length);
     return avg;
 };
 exports.average = average;

package/module/Math/calculator/calculatorInitialization.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Initializes the calculator.
+ * @param {object} exchange - current exchange rate
+ * @return {Function} - calculator
+ */
+export declare const calculatorInitialization: <T extends object>(exchange: T) => (x: string) => string;

package/module/Math/calculator/calculatorInitialization.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.calculatorInitialization = void 0;
+const core_1 = require("./core");
+/**
+ * Initializes the calculator.
+ * @param {object} exchange - current exchange rate
+ * @return {Function} - calculator
+ */
+const calculatorInitialization = (exchange) => {
+    /**
+     * @param {string} x - amount of money
+     * @return {string} - converted amount of money
+     */
+    return (x) => (0, core_1.calculatorCore)(x, exchange);
+};
+exports.calculatorInitialization = calculatorInitialization;

package/module/Math/calculator/exchange.js

@@ -3,21 +3,33 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.exchange = void 0;
 const isNumber_1 = require("../isNumber");
 const multiplication_1 = require("../multiplication");
+// The function accepts two parameters, the first is n, a string, and the second is props, an object.
+// props is an optional parameter.
 const exchange = (n, props) => {
+    // If the props parameter exists, then the following code will be executed.
     if (props) {
+        // Loop through the object props.
         for (const i in props) {
+            // If the first character of the string n is equal to the key of the current object item,
+            // then the following code will be executed.
             if (n[0] == i) {
+                // If the value of the current object item is a number, then the following code will be executed.
                 if ((0, isNumber_1.isNumber)(props[i])) {
+                    // Return the result of the multiplication of the number n after the first character and the value of the current object item.
                     return String((0, multiplication_1.multiplication)(Number(n.slice(1)), Number(props[i])));
                 }
             }
             else {
+                // If the first character of the string n is not equal to the key of the current object item,
+                // then return the original string n.
                 return n;
             }
         }
+        // If the string n does not have a corresponding key in the object props, then return the original string n.
         return n;
     }
     else {
+        // If the props parameter does not exist, then return the original string n.
         return n;
     }
 };

package/module/Math/calculator/index.d.ts

@@ -3,6 +3,6 @@
  * ()や符号に対応
  * 一文字までの方程式に対応
  * @param  {string} x
- * @param  {object} ex 為替
+ * @param  {object} exchange 為替
  */
-export declare const calculator: <T extends object>(x: string, ex?: T | undefined) => string;
+export declare const calculator: <T extends object>(x: string, exchange?: T | undefined) => string;

package/module/Math/calculator/index.js

@@ -8,15 +8,15 @@ const literalExpression_1 = require("./literalExpression");
  * ()や符号に対応
  * 一文字までの方程式に対応
  * @param  {string} x
- * @param  {object} ex 為替
+ * @param  {object} exchange 為替
  */
-const calculator = (x, ex) => {
-    x = x.replace(/\s+/g, '');
+const calculator = (x, exchange) => {
+    x = x.replace(/\s+/g, ''); // Remove spaces
     if (x.indexOf('=') != -1) {
-        return (0, literalExpression_1.literalExpression)(x);
+        return (0, literalExpression_1.literalExpression)(x); // If the expression contains an equal sign, then it is a literal expression
     }
     else {
-        return (0, core_1.calculatorCore)(x, ex);
+        return (0, core_1.calculatorCore)(x, exchange);
     }
 };
 exports.calculator = calculator;

package/module/Math/index.d.ts

@@ -1,6 +1,7 @@
 import { addition } from './addition';
 import { average } from './average';
 import { calculator } from './calculator';
+import { calculatorInitialization } from './calculator/calculatorInitialization';
 import { degToRad } from './degToRad';
 import { deviationValue } from './deviationValue';
 import { division } from './division';
@@ -27,7 +28,7 @@ import { radToDeg } from './radToDeg';
 import { random } from './random';
 import { reduce } from './reduce';
 import { repeatedTrial } from './repeatedTrial';
-import { roundOf } from './roundOff';
+import { roundOf } from './roundOf';
 import { softmax } from './softmax';
 import { standardDeviation } from './standardDeviation';
 import { subtract } from './subtract';
@@ -35,13 +36,14 @@ import { toBinary } from './toBinary';
 import { toCelsius } from './toCelsius';
 import { toKelvin } from './toKelvin';
 import { valueSwap } from './valueSwap';
-export { addition, average, calculator, degToRad, deviationValue, division, factorial, factorize, gcd, getDecimalLength, isDouble, isNumber, isPrimeNumber, lcm, mathConverter, mathSeparator, max, min, multiples, multiplication, nCr, nHr, nPr, primeFactorization, quotient, radToDeg, random, reduce, repeatedTrial, roundOf, softmax, standardDeviation, subtract, toBinary, toCelsius, toKelvin, valueSwap, };
+export { addition, average, calculator, calculatorInitialization, degToRad, deviationValue, division, factorial, factorize, gcd, getDecimalLength, isDouble, isNumber, isPrimeNumber, lcm, mathConverter, mathSeparator, max, min, multiples, multiplication, nCr, nHr, nPr, primeFactorization, quotient, radToDeg, random, reduce, repeatedTrial, roundOf, softmax, standardDeviation, subtract, toBinary, toCelsius, toKelvin, valueSwap, };
 export declare class UMTMathClass {
     #private;
     constructor();
     get addition(): (x: number, y: number) => number;
     get average(): (numbers: number[]) => number;
-    get calculator(): <T extends object>(x: string, ex?: T | undefined) => string;
+    get calculator(): <T extends object>(x: string, exchange?: T | undefined) => string;
+    get calculatorInitialization(): <T extends object>(exchange: T) => (x: string) => string;
     get degToRad(): (x: number) => number;
     get deviationValue(): (value: number, averageValue: number, standardDeviationValue: number) => number;
     get division(): import("./division").DIVISION;
@@ -89,6 +91,6 @@ export declare class UMTMathClass {
     get toBinary(): import("./toBinary").TOBINARY;
     get toCelsius(): (kelvin: number) => number;
     get toKelvin(): (celsius: number) => number;
-    get valueSwap(): (x: number, y: number) => number[];
+    get valueSwap(): (x: number, y: number) => [number, number];
 }
 export declare const UMT_Math: UMTMathClass;