@pittica/google-business-intelligence-helpers 1.5.2 → 1.6.0

package/dist/contents/storage.js

@@ -12,6 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+const {
+  getFiles
+} = require("@pittica/google-cloud-storage-helpers");
 const {
   getSchemaKeys
 } = require("./schema");
@@ -42,4 +45,22 @@ exports.mapStorageResponse = (response, schemas = "") => {
     }
   });
   return Object.values(files).flat(1).map(file => splitName(file));
-};
+};
+
+/**
+ * Ritrieves a safe name of a file in the given folder in the given bucket.
+ *
+ * @param {Storage} storage Google Cloud Storage object.
+ * @param {string} bucket Bucket name.
+ * @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.getSafeFilename = async (storage, bucket, filename, folder = "") => await 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();
+  return splitName(typeof file !== "undefined" && file ? file : filename);
+});

package/dist/naming/split.js

@@ -26,24 +26,35 @@ const {
  * @returns {object} An object containing the splitted name.
  */
 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),
-      name: typeof split[5] !== "undefined" ? split[5] : split[6],
-      fullname: typeof split[4] !== "undefined" ? split[4] : name,
-      extension: split[7],
-      match: true,
-      version: typeof split[4] !== "undefined" ? getFilenameVersion(split[4]) : 0
-    };
+  if (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),
+        name: typeof split[5] !== "undefined" ? split[5] : split[6],
+        fullname: typeof split[4] !== "undefined" ? split[4] : name,
+        extension: split[7],
+        match: true,
+        version: typeof split[4] !== "undefined" ? getFilenameVersion(split[4]) : 0
+      };
+    } else {
+      return {
+        date: new Date(),
+        name,
+        fullname: name,
+        extension: /[.]/.exec(name) ? /[^.]+$/.exec(name) : undefined,
+        match: false,
+        version: getFilenameVersion(name)
+      };
+    }
   } else {
     return {
       date: new Date(),
-      name,
-      fullname: name,
-      extension: /[.]/.exec(name) ? /[^.]+$/.exec(name) : undefined,
+      name: null,
+      fullname: null,
+      extension: undefined,
       match: false,
-      version: getFilenameVersion(name)
+      version: 0
     };
   }
 };

package/package.json

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