amos-apptool 1.1.0 → 1.2.1

package/esm/index.js

@@ -72,4 +72,4 @@ export * from "./math/calendarUtils";
 
 export { default as encodeUrl } from "./url/encodeUrl";
 
-export { default as restfulUrl } from "./url/restfulUrl";
+export * from "./url/restfulUrl";

package/esm/math/calendarUtils.js

@@ -23,8 +23,8 @@ const DateHelper = {
     const n = new Date(Number(e), parseInt(t) - 1, Number(a));
     let D = n.getDay();
     const o = n.getDate();
-    let g = 6 - D;
-    return 0 !== r && (D = 0 === D ? 7 : D, g = 7 - D), Math.ceil((o + g) / 7);
+    let y = 6 - D;
+    return 0 !== r && (D = 0 === D ? 7 : D, y = 7 - D), Math.ceil((o + y) / 7);
   },
   getYearWeek(e, t, a, r = 0) {
     const n = new Date(Number(e), parseInt(t) - 1, Number(a)), D = new Date(Number(e), 0, 1), o = Math.round((n.valueOf() - D.valueOf()) / 864e5);
@@ -38,8 +38,8 @@ const DateHelper = {
       return [ DateHelper.date2Str(new Date(t)), DateHelper.date2Str(new Date(a)) ];
     }
     o = 0 === o ? 7 : o;
-    const g = 864e5, l = D - (o - 1) * g, y = D + (7 - o) * g;
-    return [ DateHelper.date2Str(new Date(l)), DateHelper.date2Str(new Date(y)) ];
+    const y = 864e5, g = D - (o - 1) * y, s = D + (7 - o) * y;
+    return [ DateHelper.date2Str(new Date(g)), DateHelper.date2Str(new Date(s)) ];
   },
   formatResultDate(e) {
     const t = [ ...e.split("-") ];
@@ -69,13 +69,13 @@ const DateHelper = {
   n <= 0 && (n = 12, D += 1);
   let o = DateHelper.getMonthPreDay(+t, +a);
   o -= r, "prev" === e && o >= 7 && (o -= 7);
-  const g = DateHelper.getMonthDays(`${D}`, `${n}`);
-  return Array.from(Array(g), (t, a) => ({
+  const y = DateHelper.getMonthDays(`${D}`, `${n}`);
+  return Array.from(Array(y), (t, a) => ({
     day: a + 1,
     type: e,
     year: D,
     month: n
-  })).slice(g - o);
+  })).slice(y - o);
 }, convertDateToDay = e => e ? {
   year: e.getFullYear(),
   month: e.getMonth() + 1,
@@ -103,7 +103,19 @@ const DateHelper = {
 }, getCurrentWeekDays = (e, t) => {
   const a = new Date(e.year, e.month - 1, e.date), r = (a.getDay() + 7 - t) % 7;
   return [ convertDateToDay(new Date(a.getTime() - 864e5 * r)), convertDateToDay(new Date(a.getTime() + 864e5 * (6 - r))) ];
-}, CalendarUtils = {
+};
+
+function checkIsToday(e) {
+  if ("object" != typeof e) return !1;
+  const {type: t, year: a, month: r, date: n} = e || {};
+  if ("current" === t) {
+    const e = new Date, t = convertDateToDay(e);
+    return a === t.year && r === t.month && n === t.date;
+  }
+  return !1;
+}
+
+const CalendarUtils = {
   DateHelper: DateHelper,
   getCurrMonthData: getCurrMonthData,
   getDaysStatus: getDaysStatus,
@@ -112,7 +124,8 @@ const DateHelper = {
   convertDayToDate: convertDayToDate,
   getPrevMonthDays: getPrevMonthDays,
   getCurrentMonthDays: getCurrentMonthDays,
-  getCurrentWeekDays: getCurrentWeekDays
+  getCurrentWeekDays: getCurrentWeekDays,
+  checkIsToday: checkIsToday
 };
 
 export { CalendarUtils };

package/esm/url/restfulUrl.js

@@ -1,7 +1,40 @@
 import utils from "./../utils";
 
+import parseText from "./../parseText";
+
+import _trim from "./../_trim";
+
 const _regex = /\{\s*([^\|\}]+?)\s*(?:\|([^\}]*))?\s*\}/g;
 
-export default function restfulUrl(e, r, t) {
-  return t || (t = _regex), e.replace ? e.replace(t, (e, t) => utils.isUndefined(r[t]) ? e : r[t]) : e;
-}
+export function restfulUrl(t, r, e) {
+  return e || (e = _regex), t.replace ? t.replace(e, (t, e) => utils.isUndefined(r[e]) ? t : r[e]) : t;
+}
+
+const defaultRE = /\{((?:.|\n)+?)\}/g;
+
+export function formatUrl(t, r = {}, e) {
+  return e || (e = defaultRE), parseText(t, r, e);
+}
+
+export function changeParam(t, r) {
+  if (!t || utils.isEmpty(r)) return t;
+  let e = t;
+  return Object.keys(r).forEach(function(t) {
+    let i = r[t];
+    utils.isUndefined(i) ? i = "" : utils.isArray(i) || utils.isObject(i) && (i = JSON.stringify(i)), 
+    e = function(t, r, e) {
+      const i = r + "=([^&]*)", n = r + "=" + e;
+      if (t.match(i)) {
+        const e = new RegExp(`(${r}=)([^&]*)`, "gi");
+        return t.replace(e, n);
+      }
+      return t.match("[?]") ? t + "&" + n : t + "?" + n;
+    }(e, t, i);
+  }), e;
+}
+
+export const completePrefix = (t = "", r = "") => {
+  if (!t || "" === t) return r;
+  return t.endsWith("/") && (t = t.substring(0, t.length - 1)), t = _trim(t), r.startsWith("/") && (r = r.substring(1)), 
+  [ t, r = (r = _trim(r)).replace(/\/\/+/g, "/") ].join("/");
+};