@pittica/google-business-intelligence-helpers 1.6.2 → 1.7.0

package/dist/contents/storage.js

@@ -59,11 +59,24 @@ exports.mapStorageResponse = (response, schemas = "") => {
  * @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 = async (storage, bucket, filename, folder = "") => await getFiles(storage, bucket, folder ? `${folder}/${filename}` : filename).then(response => {
+exports.getSafeFilename = (storage, bucket, filename, folder = "") => getFiles(storage, bucket, folder ? `${folder}/${filename}` : filename).then(response => {
   const file = response.flat(3).filter(({
     name
   }) => typeof name !== "undefined").map(({
     name
-  }) => name).slice(-1).pop();
+  }) => 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.
+ *
+ * @param {Bucket} bucket Bucket.
+ * @param {string} filename File name.
+ * @param {string} folder Google Storage folder path.
+ * @returns {object} A safe name of a file in the given folder in the given bucket.
+ */
+exports.getSafeFilenameFromBucket = ({
+  storage,
+  name
+}, filename, folder = "") => this.getSafeFilename(storage, name, filename, folder);

package/dist/index.js

@@ -23,7 +23,8 @@ const {
 } = require("./contents/sql");
 const {
   mapStorageResponse,
-  getSafeFilename
+  getSafeFilename,
+  getSafeFilenameFromBucket
 } = require("./contents/storage");
 const {
   getTemporaryTableName,
@@ -58,6 +59,7 @@ exports.hasSchema = hasSchema;
 exports.getSqlFilePath = getSqlFilePath;
 exports.mapStorageResponse = mapStorageResponse;
 exports.getSafeFilename = getSafeFilename;
+exports.getSafeFilenameFromBucket = getSafeFilenameFromBucket;
 exports.getTemporaryTableName = getTemporaryTableName;
 exports.getTemporaryTableSuffix = getTemporaryTableSuffix;
 exports.partsToDate = partsToDate;

package/dist/naming/file.js

@@ -36,7 +36,12 @@ exports.getFilenameVersion = name => {
  * @returns {number} The given file data.
  */
 exports.incrementFilenameVersion = filedata => {
-  filedata.version = typeof filedata.version !== "undefined" ? filedata.version + 1 : 1;
+  if (typeof filedata.version !== "undefined") {
+    filedata.version = filedata.version + 1;
+    filedata.fullname = filedata.fullname.replace(/_\d+$/gs, "_" + filedata.version);
+  } else {
+    filedata.version = 1;
+  }
   return filedata;
 };
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pittica/google-business-intelligence-helpers",
   "private": false,
-  "version": "1.6.2",
+  "version": "1.7.0",
   "description": "Helpers for business intelligence for Google Cloud.",
   "main": "dist/index.js",
   "scripts": {