@engine9-io/input-tools 1.3.9 → 1.4.1

package/file/S3.js

@@ -192,7 +192,7 @@ Worker.prototype.listAll = async function ({ directory }) {
       ContinuationToken,
       // Delimiter: '/',
     });
-    debug(`Sending command with ContinuationToken ${ContinuationToken}`);
+    debug(`Sending List command with prefix ${Prefix} with ContinuationToken ${ContinuationToken}`);
     // eslint-disable-next-line no-await-in-loop
     const result = await s3Client.send(command);
     const newFiles = (result.Contents?.map((d) => `s3://${Bucket}/${d.Key}`) || []);

package/index.js

@@ -58,6 +58,73 @@ function getStringArray(s, nonZeroLength) {
   return a;
 }
 
+function isValidDate(d) {
+  // we WANT to use isNaN, not the Number.isNaN -- we're checking the date type
+  // eslint-disable-next-line no-restricted-globals
+  return d instanceof Date && !isNaN(d);
+}
+
+function relativeDate(s, _initialDate) {
+  let initialDate = _initialDate;
+  if (!s || s === 'none') return null;
+  if (typeof s.getMonth === 'function') return s;
+  // We actually want a double equals here to test strings as well
+  // eslint-disable-next-line eqeqeq
+  if (parseInt(s, 10) == s) {
+    const r = new Date(parseInt(s, 10));
+    if (!isValidDate(r)) throw new Error(`Invalid integer date:${s}`);
+    return r;
+  }
+
+  if (initialDate) {
+    initialDate = new Date(initialDate);
+  } else {
+    initialDate = new Date();
+  }
+
+  let r = s.match(/^([+-]{1})([0-9]+)([YyMwdhms]{1})([.a-z]*)$/);
+
+  if (r) {
+    let period = null;
+    switch (r[3]) {
+      case 'Y':
+      case 'y': period = 'years'; break;
+
+      case 'M': period = 'months'; break;
+      case 'w': period = 'weeks'; break;
+      case 'd': period = 'days'; break;
+      case 'h': period = 'hours'; break;
+      case 'm': period = 'minutes'; break;
+      case 's': period = 'seconds'; break;
+      default: period = 'minutes'; break;
+    }
+
+    let d = dayjs(initialDate);
+
+    if (r[1] === '+') {
+      d = d.add(parseInt(r[2], 10), period);
+    } else {
+      d = d.subtract(parseInt(r[2], 10), period);
+    }
+    if (!isValidDate(d.toDate())) throw new Error(`Invalid date configuration:${r}`);
+    if (r[4]) {
+      const opts = r[4].split('.').filter(Boolean);
+      if (opts[0] === 'start') d = d.startOf(opts[1] || 'day');
+      else if (opts[0] === 'end') d = d.endOf(opts[1] || 'day');
+      else throw new Error(`Invalid relative date,unknown options:${r[4]}`);
+    }
+
+    return d.toDate();
+  }
+  if (s === 'now') {
+    r = dayjs(new Date()).toDate();
+    return r;
+  }
+  r = dayjs(new Date(s)).toDate();
+  if (!isValidDate(r)) throw new Error(`Invalid Date: ${s}`);
+  return r;
+}
+
 /*
   When comparing two objects, some may come from a file (thus strings), and some from
   a database or elsewhere (not strings), so for deduping make sure to make them all strings
@@ -322,6 +389,8 @@ module.exports = {
   list,
   downloadFile,
   extract,
+  ForEachEntry,
+  FileUtilities,
   getBatchTransform,
   getDebatchTransform,
   getManifest,
@@ -337,13 +406,13 @@ module.exports = {
   getUUIDTimestamp,
   getEntryTypeId,
   handlebars,
+  isValidDate,
+  makeStrings,
+  relativeDate,
+  streamPacket,
+  TIMELINE_ENTRY_TYPES,
   uuidIsValid,
   uuidv4,
   uuidv5,
   uuidv7,
-  makeStrings,
-  ForEachEntry,
-  FileUtilities,
-  streamPacket,
-  TIMELINE_ENTRY_TYPES,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@engine9-io/input-tools",
-  "version": "1.3.9",
+  "version": "1.4.1",
   "description": "Tools for dealing with Engine9 inputs",
   "main": "index.js",
   "scripts": {