file-path-helper 1.4.4 → 2.0.0

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);
+}
+
+export {
+  parseDate,
+  getDates,
+  diffDays,
+};

package/src/file.js

@@ -1,6 +1,6 @@
-const { parse } = require('path');
-const glob = require('glob');
-const { pathExists } = require('fs-extra');
+import { parse } from 'path';
+import { glob } from 'glob';
+import { pathExists } from 'fs-extra';
 
 /**
  * @typedef {'/'|'\\'} Separator Directory Separator
@@ -10,17 +10,12 @@ const { pathExists } = require('fs-extra');
 /**
  * Glob promise.
  *
+ * @deprecated since version 3.0.0. Use `glob` directly instead.
  * @param {string} pattern
  * @param {GlobOptions} options
  * @returns {Promise<string[], Error>}
  */
-function globPromise(pattern, options) {
-  return new Promise((resolve, reject) => {
-    glob(pattern, options, (err, files) => {
-      err === null ? resolve(files) : reject(err);
-    });
-  });
-}
+const globPromise = glob;
 
 /**
  * Replace directory separator.
@@ -160,7 +155,8 @@ function parseSize(size) {
   };
 }
 
-module.exports = {
+export {
+  glob,
   globPromise,
   replaceSeparator,
   trimDir,

package/src/index.js

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

package/src/str.js

@@ -30,7 +30,7 @@ function sanitize(str, replacer = '') {
     .trim();
 }
 
-module.exports = {
+export {
   truncate,
   sanitize,
 };

package/test/utils.test.js

@@ -1,4 +1,4 @@
-const {
+import {
   replaceSeparator,
   trimDir,
   setDir,
@@ -16,7 +16,7 @@ const {
   parseDate,
   diffDays,
   getDates,
-} = require('../src/index');
+} from '../src/index.js';
 
 describe('#replaceSeparator', () => {
   it('can replace back-slash to slash.', () => {
@@ -84,6 +84,7 @@ describe('#getLastNumber', () => {
     expect(getLastNumber('test [21].txt')).toEqual('21');
     expect(getLastNumber('2019_test_{11}.txt')).toEqual('11');
     expect(getLastNumber('2019 test.txt')).toEqual('');
+    expect(getLastNumber('domain.com@filename_1.mp4')).toEqual('1');
   });
 });