@steerprotocol/app-loader 2.0.0 → 2.1.1

package/lib/Candle.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateCandles = exports.decodeCandle = exports.encodeCandle = exports.Candle = void 0;
-const timestring_1 = __importDefault(require("timestring"));
+const timestring_1 = __importDefault(require("./timestring"));
 class Candle {
     constructor(timestamp, high, low, open, close, volume) {
         this.timestamp = timestamp;

package/lib/esm/Candle.js

@@ -1,4 +1,4 @@
-import timestring from 'timestring';
+import timestring from './timestring';
 export class Candle {
     timestamp;
     high;

package/lib/esm/index.js

@@ -1,7 +1,7 @@
 import { ethers } from 'ethers';
 import { Candle, generateCandles } from './Candle';
 import { RawTradeData } from './RawTradeData';
-let isNode = process || null;
+const isNode = typeof window === 'undefined' && typeof process !== 'undefined';
 let fetchImpl = null;
 let fsImpl = null;
 let ccxt = null;

package/lib/esm/timestring.d.ts

@@ -0,0 +1,9 @@
+interface TimestringOptions {
+    hoursPerDay?: number;
+    daysPerWeek?: number;
+    weeksPerMonth?: number;
+    monthsPerYear?: number;
+    daysPerYear?: number;
+}
+export default function parseTimestring(value: string | number, returnUnit?: string, opts?: TimestringOptions): number;
+export {};

package/lib/esm/timestring.js

@@ -0,0 +1,83 @@
+const DEFAULT_OPTS = {
+    hoursPerDay: 24,
+    daysPerWeek: 7,
+    weeksPerMonth: 4,
+    monthsPerYear: 12,
+    daysPerYear: 365.25,
+};
+const UNIT_MAP = {
+    ms: ['ms', 'milli', 'millisecond', 'milliseconds'],
+    s: ['s', 'sec', 'secs', 'second', 'seconds'],
+    m: ['m', 'min', 'mins', 'minute', 'minutes'],
+    h: ['h', 'hr', 'hrs', 'hour', 'hours'],
+    d: ['d', 'day', 'days'],
+    w: ['w', 'week', 'weeks'],
+    mth: ['mon', 'mth', 'mths', 'month', 'months'],
+    y: ['y', 'yr', 'yrs', 'year', 'years'],
+};
+export default function parseTimestring(value, returnUnit, opts) {
+    const options = Object.assign({}, DEFAULT_OPTS, opts || {});
+    let strValue;
+    if (typeof value === 'number') {
+        strValue = parseInt(value.toString()) + 'ms';
+    }
+    else if (value.match(/^[-+]?[0-9.]+$/g)) {
+        strValue = parseInt(value) + 'ms';
+    }
+    else {
+        strValue = value;
+    }
+    let totalSeconds = 0;
+    const unitValues = getUnitValues(options);
+    const groups = strValue
+        .toLowerCase()
+        .replace(/[^.\w+-]+/g, '')
+        .match(/[-+]?[0-9.]+[a-z]+/g);
+    if (groups === null) {
+        throw new Error(`The value [${strValue}] could not be parsed by timestring`);
+    }
+    groups.forEach((group) => {
+        const valMatch = group.match(/[0-9.]+/g);
+        const unitMatch = group.match(/[a-z]+/g);
+        if (valMatch && unitMatch) {
+            const val = parseFloat(valMatch[0]);
+            const unit = unitMatch[0];
+            totalSeconds += getSeconds(val, unit, unitValues);
+        }
+    });
+    if (returnUnit) {
+        return convert(totalSeconds, returnUnit, unitValues);
+    }
+    return totalSeconds;
+}
+function getUnitValues(opts) {
+    const unitValues = {
+        ms: 0.001,
+        s: 1,
+        m: 60,
+        h: 3600,
+        d: 0,
+        w: 0,
+        mth: 0,
+        y: 0,
+    };
+    unitValues.d = opts.hoursPerDay * unitValues.h;
+    unitValues.w = opts.daysPerWeek * unitValues.d;
+    unitValues.mth = (opts.daysPerYear / opts.monthsPerYear) * unitValues.d;
+    unitValues.y = opts.daysPerYear * unitValues.d;
+    return unitValues;
+}
+function getUnitKey(unit) {
+    for (const key of Object.keys(UNIT_MAP)) {
+        if (UNIT_MAP[key].indexOf(unit) > -1) {
+            return key;
+        }
+    }
+    throw new Error(`The unit [${unit}] is not supported by timestring`);
+}
+function getSeconds(value, unit, unitValues) {
+    return value * unitValues[getUnitKey(unit)];
+}
+function convert(value, unit, unitValues) {
+    return value / unitValues[getUnitKey(unit)];
+}

package/lib/index.js

@@ -38,7 +38,7 @@ const Candle_1 = require("./Candle");
 Object.defineProperty(exports, "Candle", { enumerable: true, get: function () { return Candle_1.Candle; } });
 const RawTradeData_1 = require("./RawTradeData");
 Object.defineProperty(exports, "RawTradeData", { enumerable: true, get: function () { return RawTradeData_1.RawTradeData; } });
-let isNode = process || null;
+const isNode = typeof window === 'undefined' && typeof process !== 'undefined';
 let fetchImpl = null;
 let fsImpl = null;
 let ccxt = null;

package/lib/timestring.d.ts

@@ -0,0 +1,9 @@
+interface TimestringOptions {
+    hoursPerDay?: number;
+    daysPerWeek?: number;
+    weeksPerMonth?: number;
+    monthsPerYear?: number;
+    daysPerYear?: number;
+}
+export default function parseTimestring(value: string | number, returnUnit?: string, opts?: TimestringOptions): number;
+export {};

package/lib/timestring.js

@@ -0,0 +1,86 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const DEFAULT_OPTS = {
+    hoursPerDay: 24,
+    daysPerWeek: 7,
+    weeksPerMonth: 4,
+    monthsPerYear: 12,
+    daysPerYear: 365.25,
+};
+const UNIT_MAP = {
+    ms: ['ms', 'milli', 'millisecond', 'milliseconds'],
+    s: ['s', 'sec', 'secs', 'second', 'seconds'],
+    m: ['m', 'min', 'mins', 'minute', 'minutes'],
+    h: ['h', 'hr', 'hrs', 'hour', 'hours'],
+    d: ['d', 'day', 'days'],
+    w: ['w', 'week', 'weeks'],
+    mth: ['mon', 'mth', 'mths', 'month', 'months'],
+    y: ['y', 'yr', 'yrs', 'year', 'years'],
+};
+function parseTimestring(value, returnUnit, opts) {
+    const options = Object.assign({}, DEFAULT_OPTS, opts || {});
+    let strValue;
+    if (typeof value === 'number') {
+        strValue = parseInt(value.toString()) + 'ms';
+    }
+    else if (value.match(/^[-+]?[0-9.]+$/g)) {
+        strValue = parseInt(value) + 'ms';
+    }
+    else {
+        strValue = value;
+    }
+    let totalSeconds = 0;
+    const unitValues = getUnitValues(options);
+    const groups = strValue
+        .toLowerCase()
+        .replace(/[^.\w+-]+/g, '')
+        .match(/[-+]?[0-9.]+[a-z]+/g);
+    if (groups === null) {
+        throw new Error(`The value [${strValue}] could not be parsed by timestring`);
+    }
+    groups.forEach((group) => {
+        const valMatch = group.match(/[0-9.]+/g);
+        const unitMatch = group.match(/[a-z]+/g);
+        if (valMatch && unitMatch) {
+            const val = parseFloat(valMatch[0]);
+            const unit = unitMatch[0];
+            totalSeconds += getSeconds(val, unit, unitValues);
+        }
+    });
+    if (returnUnit) {
+        return convert(totalSeconds, returnUnit, unitValues);
+    }
+    return totalSeconds;
+}
+exports.default = parseTimestring;
+function getUnitValues(opts) {
+    const unitValues = {
+        ms: 0.001,
+        s: 1,
+        m: 60,
+        h: 3600,
+        d: 0,
+        w: 0,
+        mth: 0,
+        y: 0,
+    };
+    unitValues.d = opts.hoursPerDay * unitValues.h;
+    unitValues.w = opts.daysPerWeek * unitValues.d;
+    unitValues.mth = (opts.daysPerYear / opts.monthsPerYear) * unitValues.d;
+    unitValues.y = opts.daysPerYear * unitValues.d;
+    return unitValues;
+}
+function getUnitKey(unit) {
+    for (const key of Object.keys(UNIT_MAP)) {
+        if (UNIT_MAP[key].indexOf(unit) > -1) {
+            return key;
+        }
+    }
+    throw new Error(`The unit [${unit}] is not supported by timestring`);
+}
+function getSeconds(value, unit, unitValues) {
+    return value * unitValues[getUnitKey(unit)];
+}
+function convert(value, unit, unitValues) {
+    return value / unitValues[getUnitKey(unit)];
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steerprotocol/app-loader",
-  "version": "2.0.0",
+  "version": "2.1.1",
   "description": "App Loader for Steer Protocol",
   "main": "lib/index.js",
   "module": "lib/esm/index.js",
@@ -56,7 +56,6 @@
     "@semantic-release/npm": "^13.1.3",
     "@semantic-release/release-notes-generator": "^14.1.0",
     "@types/jest": "29.5.6",
-    "@types/timestring": "^6.0.4",
     "@typescript-eslint/eslint-plugin": "6.8.0",
     "@typescript-eslint/parser": "6.8.0",
     "eslint": "8.51.0",
@@ -73,7 +72,6 @@
   "dependencies": {
     "ccxt": "^4.1.19",
     "ethers": "^6.12.1",
-    "timestring": "^7.0.0",
     "undici": "^5.26.4"
   }
 }