@pittica/google-business-intelligence-helpers 1.15.2 → 1.15.4

package/dist/contents/backup.js

@@ -35,13 +35,13 @@ const {
  * @param {string} dateFormat Date format string.
  * @returns {boolean} A value indicating whehter the job has been done.
  */
-exports.backup = async (id, bucket, projectId, dateFormat = "YYYY-MM-DD") => {
+exports.backup = async (id, bucket, projectId = null, dateFormat = "YYYY-MM-DD") => {
   const dataset = await getDataset(id, {
     projectId
   });
   const [tables] = await dataset.getTables();
   const date = format(new Date(), dateFormat);
-  return await exports.extract(bucket, date, tables, 0, dataset.metadata.location);
+  return await exports.extract(bucket, date, tables, 0, dataset.metadata.location, projectId);
 };
 
 /**
@@ -52,12 +52,13 @@ exports.backup = async (id, bucket, projectId, dateFormat = "YYYY-MM-DD") => {
  * @param {Array} tables An array of BigQuery tables.
  * @param {number} index Array index.
  * @param {string} location Location of the BigQuery dataset.
+ * @param {string} projectId Google Cloud project ID.
  * @returns {boolean} A value indicating whehter the job has been done.
  */
-exports.extract = async (bucket, date, tables, index = 0, location = "us-central1") => {
+exports.extract = async (bucket, date, tables, index = 0, location = "us-central1", projectId = null) => {
   if (index < tables.length) {
     const table = tables[index];
-    return await table.extract(getBucket(bucket).file(`${date}/${table.id}-*.json`), {
+    return await table.extract(getBucket(bucket, projectId).file(`${date}/${table.id}-*.json`), {
       location,
       format: "json",
       gzip: false
@@ -65,7 +66,7 @@ exports.extract = async (bucket, date, tables, index = 0, location = "us-central
       if (jobDone(response)) {
         const [job] = response;
         log.success(`Job backup "${job.id}" for table "${table.id}" done.`);
-        return await exports.extract(bucket, date, tables, index + 1, location);
+        return await exports.extract(bucket, date, tables, index + 1, location, projectId);
       } else {
         return false;
       }

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.
@@ -120,12 +128,13 @@ exports.getSafeFilenameFromBucket = ({
  * @param {string} output Path to save files.
  * @param {string} bucket Bucket name.
  * @param {string} dateFormat Date format string.
+ * @param {string} projectId Optional project ID.
  */
-exports.implode = async (date, output, bucket, dateFormat = "YYYY-MM-DD") => {
+exports.implode = async (date, output, bucket, dateFormat = "YYYY-MM-DD", projectId = null) => {
   const folder = format(parse(date, dateFormat), dateFormat);
   const destination = path.join(output, ".tmp");
   const temporary = path.join(destination, folder);
-  await downloadFolder(folder, bucket, destination).then(() => log.info(`Downloaded "gs://${bucket}/${folder}" to "${destination}".`)).catch(log.error);
+  await downloadFolder(folder, bucket, destination, projectId).then(() => log.info(`Downloaded "gs://${bucket}/${folder}" to "${destination}".`)).catch(log.error);
   const files = groupJson(fs.readdirSync(temporary));
   Object.keys(files).forEach(table => {
     const json = [];
@@ -155,10 +164,11 @@ exports.implode = async (date, output, bucket, dateFormat = "YYYY-MM-DD") => {
  *
  * @param {string} bucket Bucket name.
  * @param {number} days Number of days to keep.
+ * @param {string} projectId Optional project ID.
  * @returns {boolean} A value indicating whehter the job has been done.
  */
-exports.erase = async (bucket, days = process.env.BACKUP_KEEP_DAYS || 3) => {
-  const b = getBucket(bucket);
+exports.erase = async (bucket, days = process.env.BACKUP_KEEP_DAYS || 3, projectId = null) => {
+  const b = getBucket(bucket, projectId);
   const [files] = await b.getFiles();
   const result = {};
   files.forEach(({

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/dist/scripts/backup.js

@@ -41,7 +41,7 @@ exports.scriptBackup = backup;
  * @param {string} dateFormat Date format string.
  * @returns {boolean} A value indicating whehter the job has been done.
  */
-exports.scriptBackupErase = async (id, bucket, projectId, days, dateFormat = "YYYY-MM-DD") => await backup(id, bucket, projectId, dateFormat).then(async () => await erase(bucket, days));
+exports.scriptBackupErase = async (id, bucket, projectId, days, dateFormat = "YYYY-MM-DD") => await backup(id, bucket, projectId, dateFormat).then(async () => await erase(bucket, days, projectId));
 
 /**
  * Rollback data using backup.

package/dist/scripts/comparison.js

@@ -28,14 +28,15 @@ const {
  *
  * @param {string} bucket Bucket name.
  * @param {string} date Date to compare against.
+ * @param {string} projectId Google Cloud project ID.
  * @returns {Array} Array of files that are in the file but not in the bucket.
  */
-exports.scriptComparison = async (bucket, date = null) => {
+exports.scriptComparison = async (bucket, date = null, projectId = null) => {
   if (bucket) {
     const day = date ? stringToDateUTC(date) : new Date();
     const filename = mergeFilename(day, "filelist", "txt");
-    const content = await txtContentToArray(filename, bucket);
-    const files = await listFiles(bucket);
+    const content = await txtContentToArray(filename, bucket, projectId);
+    const files = await listFiles(bucket, null, projectId);
     return content.filter(file => !files.includes(file));
   }
 };

package/dist/scripts/storage.js

@@ -24,6 +24,7 @@ const {
  * @param {string} output Path to save files.
  * @param {string} bucket Bucket name.
  * @param {string} dateFormat Date format string.
+ * @param {string} projectId Optional project ID.
  */
 exports.scriptImplode = implode;
 
@@ -32,6 +33,7 @@ exports.scriptImplode = implode;
  *
  * @param {string} bucket Bucket name.
  * @param {number} days Number of days to keep.
+ * @param {string} projectId Optional project ID.
  * @returns {boolean} A value indicating whehter the job has been done.
  */
 exports.scriptErase = erase;

package/dist/scripts/unlistened.js

@@ -29,11 +29,11 @@ const {
  *
  * @param {string} bucket Bucket name.
  * @param {string} folder Path of the local folder to scan for schemas.
- * @returns {void}
+ * @param {string} projectId Optional project ID.
  */
-exports.scriptUnlistened = async (bucket, folder) => {
+exports.scriptUnlistened = async (bucket, folder, projectId = null) => {
   if (bucket) {
-    const storage = getStorage();
+    const storage = getStorage(projectId);
     const [files] = await getFiles(storage, bucket);
     if (files) {
       files.forEach(async file => {

package/package.json

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