@pittica/google-business-intelligence-helpers 1.15.3 → 1.16.0

package/dist/contents/storage.js

@@ -93,12 +93,20 @@ exports.extractStorageResponse = (response, schemas = "", dateFormat = "YYYY-MM-
  * @param {string} folder Google Storage folder path.
  * @returns {object} A safe name of a file in the given folder in the given bucket.
  */
-exports.getSafeFilename = (storage, bucket, filename, folder = "") => getFiles(storage, bucket, folder ? `${folder}/${filename}` : filename).then(response => {
-  const file = response.flat(3).filter(value => value && typeof value.name !== "undefined").map(({
-    name
-  }) => folder ? name.replace(new RegExp(`^${folder}\/`, "gs"), "") : name).slice(-1).pop();
-  return typeof file !== "undefined" && file ? incrementFilenameVersion(splitName(file)) : splitName(filename);
-});
+exports.getSafeFilename = (storage, bucket, filename, folder = "") => {
+  const {
+    name,
+    ext
+  } = path.parse(filename);
+  const regex = new RegExp(`${name}(_\\d+)?\\${ext}$`, "gs");
+  return getFiles(storage, bucket, folder ? `${folder}/${name}` : name).then(response => {
+    const [files] = response;
+    const file = files.flat(3).filter(value => value && typeof value.name !== "undefined" && regex.test(value.name)).map(({
+      name
+    }) => folder ? name.replace(new RegExp(`^${folder}\/`, "gs"), "") : name).slice(-1).pop();
+    return typeof file !== "undefined" && file ? incrementFilenameVersion(splitName(file)) : splitName(filename);
+  });
+};
 
 /**
  * Ritrieves a safe name of a file in the given folder in the given bucket.

package/dist/index.js

@@ -58,7 +58,8 @@ const {
   getJsonStorageName,
   createFilename,
   mergeFilename,
-  mergeFiledata
+  mergeFiledata,
+  isFiledataMatch
 } = require("./naming/file");
 const {
   splitName,
@@ -114,6 +115,7 @@ exports.getJsonStorageName = getJsonStorageName;
 exports.createFilename = createFilename;
 exports.mergeFilename = mergeFilename;
 exports.mergeFiledata = mergeFiledata;
+exports.isFiledataMatch = isFiledataMatch;
 exports.splitName = splitName;
 exports.splitIdByKeys = splitIdByKeys;
 exports.scripts = {

package/dist/naming/file.js

@@ -58,9 +58,10 @@ exports.getJsonStorageName = (date, file) => `${format(date, "YYYY-MM-DD")}/${fo
  * Generates a filename from the givend data.
  *
  * @param {object} filedata File data.
+ * @param {string} format Date format.
  * @returns {string} A filename from the givend data.
  */
-exports.createFilename = filedata => `${format(filedata.date, "YYYY-MM-DD")}-${filedata.fullname}.${filedata.extension}`;
+exports.createFilename = (filedata, format = "YYYY-MM-DD") => `${format(filedata.date, format)}-${filedata.fullname}.${filedata.extension}`;
 
 /**
  * Merges the given filename parts.
@@ -69,9 +70,10 @@ exports.createFilename = filedata => `${format(filedata.date, "YYYY-MM-DD")}-${f
  * @param {string} name File or function name.
  * @param {string} extension File extension.
  * @param {int} version File version.
+ * @param {string} format Date format.
  * @returns {string} The merged given filename parts.
  */
-exports.mergeFilename = (date, name, extension, version = 0) => `${format(date, "YYYY-MM-DD")}-${name}${version ? `_${version}` : ""}.${extension.toLowerCase()}`;
+exports.mergeFilename = (date, name, extension, version = 0, format = "YYYY-MM-DD") => `${format(date, format)}-${name}${version ? `_${version}` : ""}.${extension.toLowerCase()}`;
 
 /**
  * Merges the given filename data.
@@ -85,4 +87,13 @@ exports.mergeFiledata = ({
   name,
   extension,
   version
-}, increment = false) => exports.mergeFilename(date, name, extension, increment ? typeof version !== "undefined" ? version + 1 : 1 : version);
+}, increment = false) => exports.mergeFilename(date, name, extension, increment ? typeof version !== "undefined" ? version + 1 : 1 : version);
+
+/**
+ * Checks if two file data objects have matching filenames.
+ *
+ * @param {object} first First object compare.
+ * @param {object} second Second object compare.
+ * @returns {boolean} True if the filenames match, false otherwise.
+ */
+exports.isFiledataMatch = (first, second) => exports.mergeFilename(first) === exports.mergeFilename(second);

package/dist/naming/split.js

@@ -16,7 +16,7 @@ const {
   getFilenameVersion
 } = require("./file");
 const {
-  partsToDate
+  partsToDateUTC
 } = require("./date");
 
 /**
@@ -30,7 +30,7 @@ exports.splitName = name => {
     const split = name.split(/^(\d{4})\-(\d{2})\-(\d{2})\-(([\w_-]+)(?:\_[0-9]+)|([\w_-]+))(?:\.(\w+))$/gis);
     if (split.length >= 8) {
       return {
-        date: partsToDate(split),
+        date: partsToDateUTC(split),
         name: typeof split[5] !== "undefined" ? split[5] : split[6],
         fullname: typeof split[4] !== "undefined" ? split[4] : name,
         extension: split[7],

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pittica/google-business-intelligence-helpers",
   "private": false,
-  "version": "1.15.3",
+  "version": "1.16.0",
   "description": "Helpers for business intelligence for Google Cloud.",
   "main": "dist/index.js",
   "scripts": {
@@ -37,15 +37,15 @@
   },
   "dependencies": {
     "@pittica/google-bigquery-helpers": "^1.7.0",
-    "@pittica/google-cloud-storage-helpers": "^1.6.0",
+    "@pittica/google-cloud-storage-helpers": "^1.7.1",
     "@pittica/logger-helpers": "^1.2.2",
-    "date-and-time": "^4.7.0"
+    "date-and-time": "^4.7.1"
   },
   "devDependencies": {
-    "@babel/cli": "^8.0.6",
+    "@babel/cli": "^8.1.0",
     "mkdirp": "^3.0.1",
-    "prettier": "^3.9.10",
-    "rimraf": "^6.1.3",
+    "prettier": "^3.10.0",
+    "rimraf": "^6.1.4",
     "run-func": "^3.0.0"
   }
 }