file-path-helper 1.4.2 → 1.4.5

package/src/date.js

@@ -1,77 +1,77 @@
-/**
- * Parsing the value to date. it's useful handling 'date'(not hours and minutes) purpose.
- *
- * @typedef ParsedDate
- * @property {Date} date
- * @property {number} year
- * @property {number} month
- * @property {number} day
- * @property {function(): string} toDateString e.g. '2019-12-25'
- *
- * @param {string|number|Date} value
- * @returns {ParsedDate}
- */
-function parseDate(value) {
-  const date = new Date(value);
-  const twoDigit = x => x.toString().padStart(2, 0);
-  return {
-    date,
-    year: date.getFullYear(),
-    month: date.getMonth() + 1,
-    day: date.getDate(),
-    toDateString: function () {
-      return `${this.year}-${twoDigit(this.month)}-${twoDigit(this.day)}`;
-    },
-  };
-}
-
-/**
- * Get array of date strings
- *
- * @param {string} value date string. e.g. '2020-01-01~2020-01-03'
- * @returns {string[]} e.g. ['2020-01-01', '2020-01-02', '2020-01-03']
- */
-function getDates(value) {
-  /** @type {function(string[]): Date[]} */
-  const sortedDates = dates => dates.map(d => new Date(d)).sort((a, b) => a - b);
-  /** @type {function(Date, number): Date} */
-  const addDays = (d, days) => {
-    const r = new Date(d);
-    r.setDate(r.getDate() + days);
-    return r;
-  }
-
-  if (/~/.test(value)) {
-    const [from, until] = sortedDates(value.split('~'));
-    const dates = [];
-    for (let i = 0; i <= diffDays(from, until); i++) {
-      dates.push(parseDate(addDays(from, i)).toDateString());
-    }
-    return dates;
-  } else {
-    return [value];
-  }
-}
-
-/**
- * difference between two dates.
- * @see https://stackoverflow.com/questions/3224834/get-difference-between-2-dates-in-javascript
- *
- * @param {string|number|Date} a
- * @param {string|number|Date} b
- * @returns {number}
- */
-function diffDays(a, b) {
-  const msPerDay = 1000 * 60 * 60 * 24;
-  const [utc1, utc2] = [a, b].map(x => {
-    const d = new Date(x);
-    return Date.UTC(d.getFullYear(), d.getMonth(), d.getDate());
-  });
-  return Math.floor((utc2 - utc1) / msPerDay);
-}
-
-module.exports = {
-  parseDate,
-  getDates,
-  diffDays,
-};
+/**
+ * Parsing the value to date. it's useful handling 'date'(not hours and minutes) purpose.
+ *
+ * @typedef ParsedDate
+ * @property {Date} date
+ * @property {number} year
+ * @property {number} month
+ * @property {number} day
+ * @property {function(): string} toDateString e.g. '2019-12-25'
+ *
+ * @param {string|number|Date} value
+ * @returns {ParsedDate}
+ */
+function parseDate(value) {
+  const date = new Date(value);
+  const twoDigit = x => x.toString().padStart(2, 0);
+  return {
+    date,
+    year: date.getFullYear(),
+    month: date.getMonth() + 1,
+    day: date.getDate(),
+    toDateString: function () {
+      return `${this.year}-${twoDigit(this.month)}-${twoDigit(this.day)}`;
+    },
+  };
+}
+
+/**
+ * Get array of date strings
+ *
+ * @param {string} value date string. e.g. '2020-01-01~2020-01-03'
+ * @returns {string[]} e.g. ['2020-01-01', '2020-01-02', '2020-01-03']
+ */
+function getDates(value) {
+  /** @type {function(string[]): Date[]} */
+  const sortedDates = dates => dates.map(d => new Date(d)).sort((a, b) => a - b);
+  /** @type {function(Date, number): Date} */
+  const addDays = (d, days) => {
+    const r = new Date(d);
+    r.setDate(r.getDate() + days);
+    return r;
+  }
+
+  if (/~/.test(value)) {
+    const [from, until] = sortedDates(value.split('~'));
+    const dates = [];
+    for (let i = 0; i <= diffDays(from, until); i++) {
+      dates.push(parseDate(addDays(from, i)).toDateString());
+    }
+    return dates;
+  } else {
+    return [value];
+  }
+}
+
+/**
+ * difference between two dates.
+ * @see https://stackoverflow.com/questions/3224834/get-difference-between-2-dates-in-javascript
+ *
+ * @param {string|number|Date} a
+ * @param {string|number|Date} b
+ * @returns {number}
+ */
+function diffDays(a, b) {
+  const msPerDay = 1000 * 60 * 60 * 24;
+  const [utc1, utc2] = [a, b].map(x => {
+    const d = new Date(x);
+    return Date.UTC(d.getFullYear(), d.getMonth(), d.getDate());
+  });
+  return Math.floor((utc2 - utc1) / msPerDay);
+}
+
+module.exports = {
+  parseDate,
+  getDates,
+  diffDays,
+};

package/src/index.js

@@ -1,11 +1,11 @@
-const arrUtils = require('./arr');
-const dateUtils = require('./date');
-const fileUtils = require('./file');
-const strUtils = require('./str');
-
-module.exports = Object.assign({},
-  arrUtils,
-  dateUtils,
-  fileUtils,
-  strUtils,
-);
+const arrUtils = require('./arr');
+const dateUtils = require('./date');
+const fileUtils = require('./file');
+const strUtils = require('./str');
+
+module.exports = Object.assign({},
+  arrUtils,
+  dateUtils,
+  fileUtils,
+  strUtils,
+);

package/src/str.js

@@ -9,19 +9,22 @@
 function truncate(str, length = 40, ellipsis = '…') {
   return str.length < length
     ? str
-    : str.substr(0, length - ellipsis.length) + ellipsis;
+    : str.substring(0, length - ellipsis.length) + ellipsis;
 }
 
 /**
  * Sanitize string for safe filename.
  * @see https://github.com/parshap/node-sanitize-filename#readme
+ * @see https://en.wikipedia.org/wiki/C0_and_C1_control_codes
  *
  * @param {string} str
  * @param {string} replacer default: `''`
  * @returns {string}
  */
 function sanitize(str, replacer = '') {
-  return str.replace(/(https|http)/g, '') // remove 'http'
+  // eslint-disable-next-line no-control-regex
+  return str.replace(/[\x00-\x1f\x80-\x9f]/g, replacer) // control codes
+    .replace(/(https|http)/g, '') // remove 'http'
     .replace(/\t|[ ]{2,}/g, ' ')          // two spaces or tab -> one space
     .replace(/[/:?<>\\*|"]/g, replacer)   // sanitize
     .trim();

package/test/utils.test.js

@@ -224,6 +224,7 @@ describe('#sanitize', () => {
     expect(sanitize(' he*llo?', ' ')).toBe('he llo');
     expect(sanitize(' he*llo/_<wo:rld')).toBe('hello_world');
     expect(sanitize('https://github.com/')).toBe('github.com');
+    expect(sanitize('string\btest', ' ')).toBe('string test');
   });
 });
 
@@ -231,6 +232,7 @@ describe('#truncate', () => {
   it('truncate string', () => {
     expect(truncate('1234567890', 6)).toBe('12345…');
     expect(truncate('1234567890', 8, '...')).toBe('12345...');
+    expect(truncate('a가나다라bcd', 3, '')).toBe('a가나');
   });
 });