umt 1.1.4 → 1.2.0

package/module/Date/now.d.ts

@@ -1,6 +1,7 @@
+import { hoursTypeInt } from "../types/clockType";
 /**
  * タイムゾーンに関係なく、UTCを基準に指定した時差を加えた現在時刻を取得します。
- * @param {number} [timeDifference=9] UTCからの時差を指定します。デフォルトは日本時間です。
+ * @param {hoursTypeInt} [timeDifference=9] UTCからの時差を指定します。デフォルトは日本時間です。
  * @returns {Date} 現在時刻
  */
-export declare const now: (timeDifference?: number) => Date;
+export declare const now: (timeDifference?: hoursTypeInt) => Date;

package/module/Date/now.js

@@ -1,12 +1,9 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.now = void 0;
 /**
  * タイムゾーンに関係なく、UTCを基準に指定した時差を加えた現在時刻を取得します。
- * @param {number} [timeDifference=9] UTCからの時差を指定します。デフォルトは日本時間です。
+ * @param {hoursTypeInt} [timeDifference=9] UTCからの時差を指定します。デフォルトは日本時間です。
  * @returns {Date} 現在時刻
  */
-const now = (timeDifference = 9) => {
+export const now = (timeDifference = 9) => {
     return new Date(Date.now() + timeDifference * 60 * 60 * 1000);
 };
-exports.now = now;
+//# sourceMappingURL=now.js.map

package/module/Date/now.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"now.js","sourceRoot":"","sources":["../../src/Date/now.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC,iBAA+B,CAAC,EAAQ,EAAE;IAC5D,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,cAAc,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;AAChE,CAAC,CAAC"}

package/module/Math/addition.js

@@ -1,17 +1,14 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.addition = void 0;
-const getDecimalLength_1 = require("./getDecimalLength");
-const max_1 = require("./max");
-const multiplication_1 = require("./multiplication");
+import { getDecimalLength } from "./getDecimalLength";
+import { max } from "./max";
+import { multiplication } from "./multiplication";
 /**
  * 誤差のない足し算
  * @param  {number} x
  * @param  {number} y
  * @returns number
  */
-const addition = (x, y) => {
-    const z = Math.pow(10, (0, max_1.max)((0, getDecimalLength_1.getDecimalLength)(x), (0, getDecimalLength_1.getDecimalLength)(y)));
-    return ((0, multiplication_1.multiplication)(x, z) + (0, multiplication_1.multiplication)(y, z)) / z;
+export const addition = (x, y) => {
+    const z = Math.pow(10, max(getDecimalLength(x), getDecimalLength(y)));
+    return (multiplication(x, z) + multiplication(y, z)) / z;
 };
-exports.addition = addition;
+//# sourceMappingURL=addition.js.map

package/module/Math/addition.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"addition.js","sourceRoot":"","sources":["../../src/Math/addition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAC5B,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD;;;;;GAKG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,CAAS,EAAE,CAAS,EAAE,EAAE;IAC/C,MAAM,CAAC,GAAG,SAAA,EAAE,EAAI,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAA,CAAC;IAC9D,OAAO,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AAC3D,CAAC,CAAC"}

package/module/Math/average.js

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

package/module/Math/average.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"average.js","sourceRoot":"","sources":["../../src/Math/average.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC;;;;GAIG;AACH,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,OAAiB,EAAU,EAAE;IACnD,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;QACxB,OAAO,CAAC,CAAC;KACV;IAED,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACxD,MAAM,GAAG,GAAG,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IAC1C,OAAO,GAAG,CAAC;AACb,CAAC,CAAC"}

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

@@ -0,0 +1,10 @@
+/**
+ * 電卓
+ * ()や符号に対応
+ * 一文字までの方程式に対応
+ * @param  {string} x
+ * @param  {object} exchange 為替
+ */
+export declare const calculator: <T extends {
+    [key: string]: string | number;
+}>(x: string, exchange?: T | undefined) => string;

package/module/Math/calculator/calculator.js

@@ -0,0 +1,20 @@
+import { calculatorCore } from "./core";
+import { literalExpression } from "./literalExpression";
+/**
+ * 電卓
+ * ()や符号に対応
+ * 一文字までの方程式に対応
+ * @param  {string} x
+ * @param  {object} exchange 為替
+ */
+export const calculator = (x, exchange) => {
+    let copyX = x;
+    copyX = copyX.replace(/\s+/g, ""); // Remove spaces
+    if (copyX.indexOf("=") !== -1) {
+        return literalExpression(copyX); // If the expression contains an equal sign, then it is a literal expression
+    }
+    else {
+        return calculatorCore(copyX, exchange);
+    }
+};
+//# sourceMappingURL=calculator.js.map

package/module/Math/calculator/calculator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"calculator.js","sourceRoot":"","sources":["../../../src/Math/calculator/calculator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAExD;;;;;;GAMG;AAEH,MAAM,CAAC,MAAM,UAAU,GAAG,CACxB,CAAS,EACT,QAAY,EACZ,EAAE;IACF,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,gBAAgB;IACnD,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE;QAC7B,OAAO,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,4EAA4E;KAC9G;SAAM;QACL,OAAO,cAAc,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;KACxC;AACH,CAAC,CAAC"}

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

@@ -3,4 +3,6 @@
  * @param {object} exchange - current exchange rate
  * @return {Function} - calculator
  */
-export declare const calculatorInitialization: <T extends object>(exchange: T) => (x: string) => string;
+export declare const calculatorInitialization: <T extends {
+    [key: string]: string | number;
+}>(exchange: T) => (x: string) => string;

package/module/Math/calculator/calculatorInitialization.js

@@ -1,17 +1,14 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculatorInitialization = void 0;
-const _1 = require(".");
+import { calculator } from "./calculator";
 /**
  * Initializes the calculator.
  * @param {object} exchange - current exchange rate
  * @return {Function} - calculator
  */
-const calculatorInitialization = (exchange) => {
+export const calculatorInitialization = (exchange) => {
     /**
      * @param {string} x - amount of money
      * @return {string} - converted amount of money
      */
-    return (x) => (0, _1.calculator)(x, exchange);
+    return (x) => calculator(x, exchange);
 };
-exports.calculatorInitialization = calculatorInitialization;
+//# sourceMappingURL=calculatorInitialization.js.map

package/module/Math/calculator/calculatorInitialization.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"calculatorInitialization.js","sourceRoot":"","sources":["../../../src/Math/calculator/calculatorInitialization.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C;;;;GAIG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAGtC,QAAW,EACc,EAAE;IAC3B;;;OAGG;IACH,OAAO,CAAC,CAAS,EAAU,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;AACxD,CAAC,CAAC"}

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

@@ -0,0 +1,10 @@
+/**
+ * 文字列内の通貨記号を利用して通貨を換算する。
+ *
+ * @param inputString - 換算する通貨額を含む文字列
+ * @param conversionRates - 通貨記号と換算レートのオブジェクト
+ * @returns 換算後の通貨額を文字列で返す。換算できない場合は元の文字列を返す。
+ */
+export declare const convertCurrency: <T extends {
+    [key: string]: string | number;
+}>(inputString: string, conversionRates?: T | undefined) => string;

package/module/Math/calculator/convertCurrency.js

@@ -0,0 +1,29 @@
+import { isNumber } from "../isNumber";
+import { multiplication } from "../multiplication";
+/**
+ * 文字列内の通貨記号を利用して通貨を換算する。
+ *
+ * @param inputString - 換算する通貨額を含む文字列
+ * @param conversionRates - 通貨記号と換算レートのオブジェクト
+ * @returns 換算後の通貨額を文字列で返す。換算できない場合は元の文字列を返す。
+ */
+export const convertCurrency = (inputString, conversionRates) => {
+    if (!conversionRates) {
+        return inputString;
+    }
+    for (const currencySymbol in conversionRates) {
+        if (inputString.startsWith(currencySymbol)) {
+            const amountString = inputString.slice(currencySymbol.length);
+            const rate = conversionRates[currencySymbol];
+            if (isNumber(rate)) {
+                const amount = Number(amountString);
+                const convertedAmount = multiplication(amount, Number(rate));
+                return Number.isNaN(convertedAmount)
+                    ? inputString
+                    : String(convertedAmount);
+            }
+        }
+    }
+    return inputString;
+};
+//# sourceMappingURL=convertCurrency.js.map

package/module/Math/calculator/convertCurrency.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"convertCurrency.js","sourceRoot":"","sources":["../../../src/Math/calculator/convertCurrency.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAK7B,WAAmB,EACnB,eAAmB,EACnB,EAAE;IACF,IAAI,CAAC,eAAe,EAAE;QACpB,OAAO,WAAW,CAAC;KACpB;IAED,KAAK,MAAM,cAAc,IAAI,eAAe,EAAE;QAC5C,IAAI,WAAW,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE;YAC1C,MAAM,YAAY,GAAG,WAAW,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;YAC9D,MAAM,IAAI,GAAG,eAAe,CAAC,cAAc,CAAC,CAAC;YAE7C,IAAI,QAAQ,CAAC,IAAI,CAAC,EAAE;gBAClB,MAAM,MAAM,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;gBACpC,MAAM,eAAe,GAAG,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;gBAC7D,OAAO,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC;oBAClC,CAAC,CAAC,WAAW;oBACb,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;aAC7B;SACF;KACF;IACD,OAAO,WAAW,CAAC;AACrB,CAAC,CAAC"}

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

@@ -1,7 +1,3 @@
-/**
- * 電卓
- * ()や符号に対応
- * xなどの文字は未対応
- * @param  {string} x 計算式
- */
-export declare const calculatorCore: <T extends object>(x: string, ex?: T | undefined) => string;
+export declare const calculatorCore: <T extends {
+    [key: string]: string | number;
+}>(expression: string, currencyExchange?: T | undefined) => string;

package/module/Math/calculator/core.js

@@ -1,89 +1,129 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculatorCore = void 0;
-const addition_1 = require("../../Math/addition");
-const division_1 = require("../../Math/division");
-const multiplication_1 = require("../../Math/multiplication");
-const subtract_1 = require("../../Math/subtract");
-const exchange_1 = require("./exchange");
-/**
- * 電卓
- * ()や符号に対応
- * xなどの文字は未対応
- * @param  {string} x 計算式
- */
-const calculatorCore = (x, ex) => {
-    let copyX = x;
-    //符号反転
-    copyX = copyX.replace(/--/g, "+");
-    copyX = copyX.replace(/\+\+/g, "+");
-    copyX = copyX.replace(/\+-/g, "+0-");
-    copyX = copyX.replace(/\-\+/g, "+0-");
-    //円計算
+import { addition } from "../../Math/addition";
+import { division } from "../../Math/division";
+import { multiplication } from "../../Math/multiplication";
+import { subtract } from "../../Math/subtract";
+import { isNumber } from "../isNumber";
+import { convertCurrency } from "./convertCurrency";
+export const calculatorCore = (expression, currencyExchange) => {
+    let sanitizedExpression = expression;
+    // 符号の処理
+    sanitizedExpression = sanitizeSigns(sanitizedExpression);
+    // 主要な計算ループ
     while (true) {
-        if (ex) {
-            for (const i in ex) {
-                if (copyX.indexOf(i) !== -1) {
-                    const $ = copyX.match(new RegExp(`\\${i}([0-9]+)`));
-                    if ($) {
-                        copyX = copyX.replace($[0], (0, exchange_1.exchange)($[0], ex));
-                    }
-                }
-            }
+        // 通貨計算
+        if (currencyExchange) {
+            sanitizedExpression = applyCurrencyExchange(sanitizedExpression, currencyExchange);
         }
-        //括弧の処理
-        if (copyX.indexOf("(") !== -1 || copyX.indexOf(")") !== -1) {
-            //括弧の中身をぬく
-            const y = copyX.match(/\(\d+\.?(\d+)?(\*|\/|\+|\-)\d+\.?(\d+)?\)/);
-            if (y) {
-                //括弧の中身を計算
-                copyX = copyX.replace(y[0], (0, exports.calculatorCore)(y[0].replace(/\(|\)/g, "")));
+        // 括弧の処理
+        if (containsParentheses(sanitizedExpression)) {
+            const temporary = resolveParentheses(sanitizedExpression);
+            if (temporary === NaN.toString()) {
+                return sanitizedExpression;
             }
-            else {
-                copyX = copyX.replace(`(${copyX.slice(copyX.indexOf("(") + 1, copyX.indexOf(")"))})`, (0, exports.calculatorCore)(copyX.slice(copyX.indexOf("(") + 1, copyX.indexOf(")"))));
+            sanitizedExpression = temporary;
+        }
+        // 乗算、べき乗の処理
+        else if (containsMulExp(sanitizedExpression)) {
+            const temporary = resolveMulExp(sanitizedExpression);
+            if (temporary === NaN.toString()) {
+                return sanitizedExpression;
             }
+            sanitizedExpression = temporary;
         }
-        else if (copyX.indexOf("^") !== -1 ||
-            copyX.indexOf("*") !== -1 ||
-            copyX.indexOf("/") !== -1) {
-            //掛け算と割り算の処理
-            const y = [
-                copyX.match(/\d+\.?(\d+)?(\*|\/|\^)\d+\.?(\d+)?/),
-                [""],
-            ];
-            if (y[0]) {
-                y[1] = y[0][0].split(/(\d+\.\d+)|(\d+)/g).filter((n) => {
-                    return typeof n !== "undefined" && n !== "";
-                });
-                copyX = copyX.replace(y[0][0], `${y[1][1] === "^"
-                    ? Math.pow(+y[1][0], +y[1][2])
-                    : y[1][1] === "*"
-                        ? (0, multiplication_1.multiplication)(+y[1][0], +y[1][2])
-                        : y[1][1] === "/"
-                            ? (0, division_1.division)(+y[1][0], +y[1][2])
-                            : "0"}`);
+        // 除算の処理
+        else if (containsDiv(sanitizedExpression)) {
+            const temporary = resolveDiv(sanitizedExpression);
+            if (temporary === NaN.toString()) {
+                return sanitizedExpression;
             }
+            sanitizedExpression = temporary;
         }
-        else if (copyX.indexOf("+") !== -1 || copyX.indexOf("-") !== -1) {
-            //加算と減算の処理
-            const y = [
-                copyX.match(/\d+\.?(\d+)?(\+|\-)\d+\.?(\d+)?/),
-                [""],
-            ];
-            if (y[0]) {
-                y[1] = y[0][0].split(/(\d+\.\d+)|(\d+)/g).filter((n) => {
-                    return typeof n !== "undefined" && n !== "";
-                });
-                copyX = copyX.replace(y[0][0], `${y[1][1] === "+"
-                    ? (0, addition_1.addition)(Number(y[1][0]), Number(y[1][2]))
-                    : y[1][1] === "-"
-                        ? (0, subtract_1.subtract)(Number(y[1][0]), Number(y[1][2]))
-                        : "0"}`);
+        // 加算と減算の処理
+        else if (containsAddSub(sanitizedExpression) &&
+            !isNumber(sanitizedExpression)) {
+            const temporary = resolveAddSub(sanitizedExpression);
+            if (temporary === NaN.toString()) {
+                return sanitizedExpression;
             }
+            sanitizedExpression = temporary;
         }
+        // もう計算するものがなければ結果を返す
         else {
-            return copyX;
+            return sanitizedExpression;
+        }
+    }
+};
+const sanitizeSigns = (expr) => {
+    return expr
+        .replaceAll("--", "+")
+        .replaceAll("++", "+")
+        .replaceAll("+-", "+0-")
+        .replaceAll("-+", "+0-");
+};
+const applyCurrencyExchange = (expr, rates) => {
+    let returnExpr = expr;
+    // 通貨の交換ロジック
+    for (const index in rates) {
+        if (returnExpr.includes(index)) {
+            const $ = returnExpr.match(new RegExp(`\\${index}([0-9]+)`));
+            if ($) {
+                returnExpr = returnExpr.replace($[0], convertCurrency($[0], rates));
+            }
         }
     }
+    return returnExpr;
+};
+const containsParentheses = (expr) => {
+    return expr.includes("(") || expr.includes(")");
+};
+const resolveParentheses = (expr) => {
+    // 括弧内の計算ロジック
+    const match = expr.match(/\(\d+\.?(\d+)?([*+/-])\d+\.?(\d+)?\)/);
+    if (match) {
+        return expr.replace(match[0], calculatorCore(match[0].replaceAll(/\(|\)/g, "")));
+    }
+    return NaN.toString();
+};
+const containsMulExp = (expr) => {
+    return expr.includes("^") || expr.includes("*");
+};
+const containsDiv = (expr) => {
+    return expr.includes("/");
+};
+const resolveMulExp = (expr) => {
+    // 乗算、べき乗の計算ロジック
+    const match = expr.match(/(.*?)(\d+\.?(\d+)?([*^])\d+\.?(\d+)?$)/);
+    if (match) {
+        const operands = match[2].split(/([*/^])/);
+        const result = operands[1] === "^"
+            ? Math.pow(Number(operands[0]), Number(operands[2]))
+            : multiplication(Number(operands[0]), Number(operands[2]));
+        return `${match[1]}${result}`;
+    }
+    return NaN.toString();
+};
+const resolveDiv = (expr) => {
+    // 除算の計算ロジック
+    const match = expr.match(/\d+\.?(\d+)?(\/)\d+\.?(\d+)?/);
+    if (match) {
+        const operands = match[0].split(/(\/)/);
+        const result = division(Number(operands[0]), Number(operands[2]));
+        return expr.replace(match[0], String(result));
+    }
+    return NaN.toString();
+};
+const containsAddSub = (expr) => {
+    return expr.includes("+") || expr.includes("-");
+};
+const resolveAddSub = (expr) => {
+    // 加算、減算の計算ロジック
+    const match = expr.match(/(-?\d+)\.?(\d+)?(\+|-)(-?\d+)\.?(\d+)?/);
+    if (match) {
+        const result = match[3] === "+"
+            ? addition(Number(match[1]), Number(match[4]))
+            : subtract(Number(match[1]), Number(match[4]));
+        return expr.replace(match[0], String(result));
+    }
+    return NaN.toString();
 };
-exports.calculatorCore = calculatorCore;
+//# sourceMappingURL=core.js.map

package/module/Math/calculator/core.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"core.js","sourceRoot":"","sources":["../../../src/Math/calculator/core.ts"],"names":[],"mappings":"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"}

package/module/Math/calculator/exchange.js

@@ -11,7 +11,7 @@ const exchange = (n, props) => {
             if (n.indexOf(i) !== -1) {
                 if ((0, isNumber_1.isNumber)(props[i])) {
                     const x = (0, multiplication_1.multiplication)(Number(n.slice(i.length)), Number(props[i]));
-                    if (isNaN(x)) {
+                    if (Number.isNaN(x)) {
                         return n;
                     }
                     else {
@@ -30,3 +30,4 @@ const exchange = (n, props) => {
     }
 };
 exports.exchange = exchange;
+//# sourceMappingURL=exchange.js.map

package/module/Math/calculator/exchange.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"exchange.js","sourceRoot":"","sources":["../../../src/Math/calculator/exchange.ts"],"names":[],"mappings":";;;AAAA,0CAAuC;AACvC,sDAAmD;AACnD,qGAAqG;AACrG,kCAAkC;AAC3B,MAAM,QAAQ,GAAG,CAAmB,CAAS,EAAE,KAAS,EAAE,EAAE;IACjE,IAAI,KAAK,EAAE;QACT,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE;YACrB,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE;gBACvB,IAAI,IAAA,mBAAQ,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE;oBACtB,MAAM,CAAC,GAAG,IAAA,+BAAc,EAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;oBACtE,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;wBACnB,OAAO,CAAC,CAAC;qBACV;yBAAM;wBACL,OAAO,MAAM,CACX,IAAA,+BAAc,EAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAC5D,CAAC;qBACH;iBACF;aACF;iBAAM;gBACL,OAAO,CAAC,CAAC;aACV;SACF;QACD,OAAO,CAAC,CAAC;KACV;SAAM;QACL,OAAO,CAAC,CAAC;KACV;AACH,CAAC,CAAC;AAtBW,QAAA,QAAQ,YAsBnB"}

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

@@ -1,8 +1,5 @@
-/**
- * 電卓
- * ()や符号に対応
- * 一文字までの方程式に対応
- * @param  {string} x
- * @param  {object} exchange 為替
- */
-export declare const calculator: <T extends object>(x: string, exchange?: T | undefined) => string;
+export * from "./calculator";
+export * from "./calculatorInitialization";
+export * from "./convertCurrency";
+export * from "./core";
+export * from "./literalExpression";

package/module/Math/calculator/index.js

@@ -1,23 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculator = void 0;
-const core_1 = require("./core");
-const literalExpression_1 = require("./literalExpression");
-/**
- * 電卓
- * ()や符号に対応
- * 一文字までの方程式に対応
- * @param  {string} x
- * @param  {object} exchange 為替
- */
-const calculator = (x, exchange) => {
-    let copyX = x;
-    copyX = copyX.replace(/\s+/g, ""); // Remove spaces
-    if (copyX.indexOf("=") !== -1) {
-        return (0, literalExpression_1.literalExpression)(copyX); // If the expression contains an equal sign, then it is a literal expression
-    }
-    else {
-        return (0, core_1.calculatorCore)(copyX, exchange);
-    }
-};
-exports.calculator = calculator;
+import { calculator } from "./calculator";
+import { calculatorInitialization } from "./calculatorInitialization";
+import { convertCurrency } from "./convertCurrency";
+import { calculatorCore } from "./core";
+import { literalExpression } from "./literalExpression";
+export { calculator, calculatorInitialization, calculatorCore, convertCurrency, literalExpression, };
+//# sourceMappingURL=index.js.map

package/module/Math/calculator/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Math/calculator/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAExD,OAAO,EACL,UAAU,EACV,wBAAwB,EACxB,cAAc,EACd,eAAe,EACf,iBAAiB,GAClB,CAAC"}

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

@@ -1,5 +1,6 @@
 /**
- * 方程式計算
- * @param  {string} x
+ * 文字式の方程式を計算する
+ * @param x 方程式の文字列
+ * @returns 計算結果
  */
 export declare const literalExpression: (x: string) => string;

package/module/Math/calculator/literalExpression.js

@@ -1,55 +1,58 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.literalExpression = void 0;
-const division_1 = require("../division");
-const gcd_1 = require("../gcd");
-const core_1 = require("./core");
+import { division } from "../division";
+import { gcd } from "../gcd";
+import { calculatorCore } from "./core";
 /**
- * 方程式計算
- * @param  {string} x
+ * 文字式の方程式を計算する
+ * @param x 方程式の文字列
+ * @returns 計算結果
  */
-const literalExpression = (x) => {
-    const cache = [[], ""];
-    for (const i of x.split("=")) {
-        if (/[a-zA-Z]+/.test(i) === false) {
-            cache[1] = i;
+export const literalExpression = (x) => {
+    // 方程式の数値と変数部分を格納
+    let numericalPart = "";
+    let variablePart = [];
+    // 等号で分割し、数値と変数部分を識別
+    for (const part of x.split("=")) {
+        if (/[A-Za-z]+/.test(part)) {
+            variablePart = part
+                .split(/(\d+[A-Za-z]+)|([^A-Za-z]+)/)
+                .filter((n) => n && n !== undefined);
         }
         else {
-            cache[0] = i
-                .split(/([0-9]+[a-zA-Z]+)|([^a-zA-Z]+)/)
-                .filter((n) => n !== "" && typeof n !== "undefined");
+            numericalPart = part;
         }
     }
-    if (cache[0][1]) {
-        cache[0][1] = (0, core_1.calculatorCore)(cache[0][1]);
-        if (cache[0][1].indexOf("+") !== -1) {
-            cache[0][1] = cache[0][1].replace(/\+/g, "plus");
-        }
-        if (cache[0][1].indexOf("-") !== -1) {
-            cache[0][1] = cache[0][1].replace(/\-/g, "minus");
-        }
-        if (cache[0][1].indexOf("plus") !== 1) {
-            cache[0][1] = cache[0][1].replace(/plus/g, "-");
-        }
-        if (cache[0][1].indexOf("minus") !== 1) {
-            cache[0][1] = cache[0][1].replace(/minus/g, "+");
-        }
+    // 変数部分の計算
+    if (variablePart[1]) {
+        variablePart[1] = calculatorCore(variablePart[1])
+            .replaceAll("+", "plus")
+            .replaceAll("-", "minus")
+            .replaceAll("plus", "-")
+            .replaceAll("minus", "+");
     }
-    cache[1] = cache[0][1]
-        ? (0, core_1.calculatorCore)(`${cache[1]}${cache[0][1]}`)
-        : (0, core_1.calculatorCore)(cache[1]);
-    cache[0] = cache[0][0]
-        .split(/([0-9]+)|([a-zA-Z]+)/)
-        .filter((n) => n !== "" && typeof n !== "undefined");
-    if (isNaN(Number(cache[0][0]))) {
-        return cache[1];
+    // 数値部分の計算
+    numericalPart = variablePart[1]
+        ? calculatorCore(`${numericalPart}${variablePart[1]}`)
+        : calculatorCore(numericalPart);
+    // 変数部分を再分割
+    variablePart = variablePart[0]
+        .split(/(\d+)|([A-Za-z]+)/)
+        .filter((n) => n && n !== undefined);
+    // 数値がない場合は計算結果を返す
+    if (Number.isNaN(Number(variablePart[0]))) {
+        return numericalPart;
     }
-    else {
-        const cacheGcd = (0, gcd_1.gcd)(Number(cache[0][0]), Number(cache[1]));
-        if (cacheGcd !== 1) {
-            return `${(0, division_1.division)(Number(cache[1]), cacheGcd)}/${(0, division_1.division)(Number(cache[0][0]), cacheGcd)}`;
+    // 最大公約数で簡約
+    const commonGcd = gcd(Number(variablePart[0]), Number(numericalPart));
+    console.log("====================================");
+    console.log(commonGcd, variablePart[0], numericalPart);
+    console.log("====================================");
+    if (commonGcd !== 1) {
+        numericalPart = `${division(Number(numericalPart), commonGcd)}/${division(Number(variablePart[0]), commonGcd)}`;
+        if (/(-?)\d+\/1/.test(numericalPart)) {
+            return numericalPart.replace(/\/1/, "");
         }
-        return cache[0][0] === "1" ? `${cache[1]}/${cache[0][0]}` : cache[1];
+        return numericalPart;
     }
+    return numericalPart;
 };
-exports.literalExpression = literalExpression;
+//# sourceMappingURL=literalExpression.js.map