@did-pay/util 1.12.37 → 1.12.39

package/es/constant.js

@@ -0,0 +1,13 @@
+const ORDER_STATUS = Object.freeze({
+  preCreation: 0,
+  created: 10
+});
+const DURATION_UNIT_SYMBOL = Object.freeze({
+  d: "d",
+  M: "M",
+  Y: "Y"
+});
+export {
+  DURATION_UNIT_SYMBOL,
+  ORDER_STATUS
+};

package/es/expiration.js

@@ -0,0 +1,14 @@
+import moment from "moment";
+const calExpirationTime = (duration, currentTime) => {
+  const now = moment(currentTime);
+  let result = now.add(duration.value, duration.unit);
+  if (result.format("HH:mm:ss") !== "00:00:00") {
+    result = result.add(1, "d");
+  }
+  return moment(result.format("YYYY-MM-DD 00:00:00")).toISOString();
+};
+const getExpirationDateDisplay = (expirationDate) => moment(expirationDate).subtract(1, "second").toISOString();
+export {
+  calExpirationTime,
+  getExpirationDateDisplay
+};

package/es/nft.js

@@ -0,0 +1,25 @@
+import last from "lodash/last";
+import get from "lodash/get";
+import moment from "moment";
+const getNftExpirationDate = (asset) => last(get(asset, "data.value.expirationDate", []));
+const isNFTExpired = (asset) => {
+  const expirationDate = getNftExpirationDate(asset);
+  return isDateExpired(expirationDate);
+};
+const isDateExpired = (expirationDate) => !!expirationDate && new Date(expirationDate).getTime() <= Date.now();
+const canRenewExpiredNFT = (expirationDate, retainDays) => {
+  const isExpired = isDateExpired(expirationDate);
+  if (!isExpired) {
+    return false;
+  }
+  if (!retainDays || retainDays <= 0) {
+    return false;
+  }
+  return moment(expirationDate).add(retainDays, "days").isAfter(moment());
+};
+export {
+  canRenewExpiredNFT,
+  getNftExpirationDate,
+  isDateExpired,
+  isNFTExpired
+};

package/es/price.js

@@ -0,0 +1,24 @@
+import { BN, fromUnitToToken, fromTokenToUnit } from "@ocap/util";
+import { DURATION_UNIT_SYMBOL } from "./constant";
+const DAYS_OF_MONTH = 30;
+const DAYS_OF_YEAR = 365;
+const UNIT_MAP = {
+  [DURATION_UNIT_SYMBOL.d]: 1,
+  [DURATION_UNIT_SYMBOL.M]: DAYS_OF_MONTH,
+  [DURATION_UNIT_SYMBOL.Y]: DAYS_OF_YEAR
+};
+const getPrice = (unitPrice, unit) => {
+  const days = UNIT_MAP[unit];
+  const unitPriceBN = new BN(fromTokenToUnit(unitPrice));
+  const unitBN = new BN(days);
+  return unitPriceBN.mul(unitBN);
+};
+const calculatePrice = (duration, unitPrice) => {
+  const priceBN = getPrice(unitPrice, duration.unit);
+  const durationBN = new BN(duration.value);
+  const total = priceBN.mul(durationBN).toString();
+  return Number(fromUnitToToken(total).toString());
+};
+export {
+  calculatePrice
+};

package/lib/constant.js

@@ -1,12 +1,13 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const ORDER_STATUS = Object.freeze({
   preCreation: 0,
-  created: 10,
+  created: 10
 });
-
 const DURATION_UNIT_SYMBOL = Object.freeze({
-  d: 'd',
-  M: 'M',
-  Y: 'Y',
+  d: "d",
+  M: "M",
+  Y: "Y"
 });
-
-module.exports = { ORDER_STATUS, DURATION_UNIT_SYMBOL };
+exports.DURATION_UNIT_SYMBOL = DURATION_UNIT_SYMBOL;
+exports.ORDER_STATUS = ORDER_STATUS;

package/lib/expiration.js

@@ -1,20 +1,14 @@
-const moment = require('moment');
-
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const moment = require("moment");
 const calExpirationTime = (duration, currentTime) => {
   const now = moment(currentTime);
   let result = now.add(duration.value, duration.unit);
-
-  // 如果续期后过期时间不是当前的 24 点，则加一天, 最后会取加 1 天后的 0 点
-  if (result.format('HH:mm:ss') !== '00:00:00') {
-    result = result.add(1, 'd');
+  if (result.format("HH:mm:ss") !== "00:00:00") {
+    result = result.add(1, "d");
   }
-
-  return moment(result.format('YYYY-MM-DD 00:00:00')).toISOString();
-};
-
-const getExpirationDateDisplay = (expirationDate) => moment(expirationDate).subtract(1, 'second').toISOString();
-
-module.exports = {
-  calExpirationTime,
-  getExpirationDateDisplay,
+  return moment(result.format("YYYY-MM-DD 00:00:00")).toISOString();
 };
+const getExpirationDateDisplay = (expirationDate) => moment(expirationDate).subtract(1, "second").toISOString();
+exports.calExpirationTime = calExpirationTime;
+exports.getExpirationDateDisplay = getExpirationDateDisplay;

package/lib/nft.js

@@ -1,27 +1,25 @@
-const last = require('lodash/last');
-const get = require('lodash/get');
-const moment = require('moment');
-
-const getNftExpirationDate = (asset) => last(get(asset, 'data.value.expirationDate', []));
-
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const last = require("lodash/last");
+const get = require("lodash/get");
+const moment = require("moment");
+const getNftExpirationDate = (asset) => last(get(asset, "data.value.expirationDate", []));
 const isNFTExpired = (asset) => {
   const expirationDate = getNftExpirationDate(asset);
   return isDateExpired(expirationDate);
 };
-
 const isDateExpired = (expirationDate) => !!expirationDate && new Date(expirationDate).getTime() <= Date.now();
-
 const canRenewExpiredNFT = (expirationDate, retainDays) => {
   const isExpired = isDateExpired(expirationDate);
   if (!isExpired) {
     return false;
   }
-
   if (!retainDays || retainDays <= 0) {
     return false;
   }
-
-  return moment(expirationDate).add(retainDays, 'days').isAfter(moment());
+  return moment(expirationDate).add(retainDays, "days").isAfter(moment());
 };
-
-module.exports = { isNFTExpired, getNftExpirationDate, isDateExpired, canRenewExpiredNFT };
+exports.canRenewExpiredNFT = canRenewExpiredNFT;
+exports.getNftExpirationDate = getNftExpirationDate;
+exports.isDateExpired = isDateExpired;
+exports.isNFTExpired = isNFTExpired;

package/lib/price.js

@@ -1,35 +1,24 @@
-const { BN, fromUnitToToken, fromTokenToUnit } = require('@ocap/util');
-const { DURATION_UNIT_SYMBOL } = require('./constant');
-
-const DAYS_OF_MONTH = 30; // 30 days per month
-const DAYS_OF_YEAR = 365; // 12 month per year
-
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const util = require("@ocap/util");
+const constant = require("./constant");
+const DAYS_OF_MONTH = 30;
+const DAYS_OF_YEAR = 365;
 const UNIT_MAP = {
-  [DURATION_UNIT_SYMBOL.d]: 1,
-  [DURATION_UNIT_SYMBOL.M]: DAYS_OF_MONTH,
-  [DURATION_UNIT_SYMBOL.Y]: DAYS_OF_YEAR,
+  [constant.DURATION_UNIT_SYMBOL.d]: 1,
+  [constant.DURATION_UNIT_SYMBOL.M]: DAYS_OF_MONTH,
+  [constant.DURATION_UNIT_SYMBOL.Y]: DAYS_OF_YEAR
 };
-
-/*
- *
- * @param {Number} unitPrice
- * @param {(d|M|y)} unit
- */
 const getPrice = (unitPrice, unit) => {
   const days = UNIT_MAP[unit];
-
-  const unitPriceBN = new BN(fromTokenToUnit(unitPrice));
-  const unitBN = new BN(days);
-
+  const unitPriceBN = new util.BN(util.fromTokenToUnit(unitPrice));
+  const unitBN = new util.BN(days);
   return unitPriceBN.mul(unitBN);
 };
-
 const calculatePrice = (duration, unitPrice) => {
   const priceBN = getPrice(unitPrice, duration.unit);
-  const durationBN = new BN(duration.value);
+  const durationBN = new util.BN(duration.value);
   const total = priceBN.mul(durationBN).toString();
-
-  return Number(fromUnitToToken(total).toString());
+  return Number(util.fromUnitToToken(total).toString());
 };
-
-module.exports = { calculatePrice };
+exports.calculatePrice = calculatePrice;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@did-pay/util",
-  "version": "1.12.37",
+  "version": "1.12.39",
   "description": "Common library",
   "keywords": [
     "util"
@@ -11,6 +11,7 @@
   "main": "lib/util.js",
   "files": [
     "lib",
+    "es",
     "LICENSE",
     "package.json",
     "README.md"
@@ -23,7 +24,9 @@
     "url": "git+https://github.com/blocklet/payment-kit.git"
   },
   "scripts": {
-    "lint": "eslint lib",
+    "build": "vite build",
+    "watch": "vite build --watch",
+    "lint": "eslint src",
     "lint:fix": "npm run lint -- --fix",
     "test": "node jest.js --runInBand",
     "coverage": "npm run test -- --coverage"
@@ -32,9 +35,13 @@
     "url": "https://github.com/blocklet/payment-kit/issues"
   },
   "dependencies": {
-    "@ocap/util": "^1.18.87",
+    "@ocap/util": "^1.18.89",
     "lodash": "^4.17.21",
     "moment": "^2.29.4"
   },
-  "gitHead": "4c299838afd228c832b3693d4c334620d24d464d"
+  "devDependencies": {
+    "vite": "^4.4.7",
+    "vite-plugin-build": "^0.10.0"
+  },
+  "gitHead": "b05121ee1ef573547265f2fd25bf89727dda6424"
 }