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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -12,6 +12,9 @@
12
12
  // See the License for the specific language governing permissions and
13
13
  // limitations under the License.
14
14
 
15
+ const {
16
+ getFiles
17
+ } = require("@pittica/google-cloud-storage-helpers");
15
18
  const {
16
19
  getSchemaKeys
17
20
  } = require("./schema");
@@ -42,4 +45,22 @@ exports.mapStorageResponse = (response, schemas = "") => {
42
45
  }
43
46
  });
44
47
  return Object.values(files).flat(1).map(file => splitName(file));
45
- };
48
+ };
49
+
50
+ /**
51
+ * Ritrieves a safe name of a file in the given folder in the given bucket.
52
+ *
53
+ * @param {Storage} storage Google Cloud Storage object.
54
+ * @param {string} bucket Bucket name.
55
+ * @param {string} filename File name.
56
+ * @param {string} folder Google Storage folder path.
57
+ * @returns {object} A safe name of a file in the given folder in the given bucket.
58
+ */
59
+ exports.getSafeFilename = async (storage, bucket, filename, folder = "") => await getFiles(storage, bucket, folder ? `${folder}/${filename}` : filename).then(response => {
60
+ const file = response.flat(3).filter(({
61
+ name
62
+ }) => typeof name !== "undefined").map(({
63
+ name
64
+ }) => name).slice(-1).pop();
65
+ return splitName(typeof file !== "undefined" && file ? file : filename);
66
+ });
package/dist/index.js CHANGED
@@ -22,7 +22,8 @@ const {
22
22
  getSqlFilePath
23
23
  } = require("./contents/sql");
24
24
  const {
25
- mapStorageResponse
25
+ mapStorageResponse,
26
+ getSafeFilename
26
27
  } = require("./contents/storage");
27
28
  const {
28
29
  getTemporaryTableName,
@@ -56,6 +57,7 @@ exports.getSchemaKeys = getSchemaKeys;
56
57
  exports.hasSchema = hasSchema;
57
58
  exports.getSqlFilePath = getSqlFilePath;
58
59
  exports.mapStorageResponse = mapStorageResponse;
60
+ exports.getSafeFilename = getSafeFilename;
59
61
  exports.getTemporaryTableName = getTemporaryTableName;
60
62
  exports.getTemporaryTableSuffix = getTemporaryTableSuffix;
61
63
  exports.partsToDate = partsToDate;
@@ -26,24 +26,35 @@ const {
26
26
  * @returns {object} An object containing the splitted name.
27
27
  */
28
28
  exports.splitName = name => {
29
- const split = name.split(/^(\d{4})\-(\d{2})\-(\d{2})\-(([\w_-]+)(?:\_[0-9]+)|([\w_-]+))(?:\.(\w+))$/gis);
30
- if (split.length >= 8) {
31
- return {
32
- date: partsToDate(split),
33
- name: typeof split[5] !== "undefined" ? split[5] : split[6],
34
- fullname: typeof split[4] !== "undefined" ? split[4] : name,
35
- extension: split[7],
36
- match: true,
37
- version: typeof split[4] !== "undefined" ? getFilenameVersion(split[4]) : 0
38
- };
29
+ if (name) {
30
+ const split = name.split(/^(\d{4})\-(\d{2})\-(\d{2})\-(([\w_-]+)(?:\_[0-9]+)|([\w_-]+))(?:\.(\w+))$/gis);
31
+ if (split.length >= 8) {
32
+ return {
33
+ date: partsToDate(split),
34
+ name: typeof split[5] !== "undefined" ? split[5] : split[6],
35
+ fullname: typeof split[4] !== "undefined" ? split[4] : name,
36
+ extension: split[7],
37
+ match: true,
38
+ version: typeof split[4] !== "undefined" ? getFilenameVersion(split[4]) : 0
39
+ };
40
+ } else {
41
+ return {
42
+ date: new Date(),
43
+ name,
44
+ fullname: name,
45
+ extension: /[.]/.exec(name) ? /[^.]+$/.exec(name) : undefined,
46
+ match: false,
47
+ version: getFilenameVersion(name)
48
+ };
49
+ }
39
50
  } else {
40
51
  return {
41
52
  date: new Date(),
42
- name,
43
- fullname: name,
44
- extension: /[.]/.exec(name) ? /[^.]+$/.exec(name) : undefined,
53
+ name: null,
54
+ fullname: null,
55
+ extension: undefined,
45
56
  match: false,
46
- version: getFilenameVersion(name)
57
+ version: 0
47
58
  };
48
59
  }
49
60
  };
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@pittica/google-business-intelligence-helpers",
3
3
  "private": false,
4
- "version": "1.5.2",
4
+ "version": "1.6.1",
5
5
  "description": "Helpers for business intelligence for Google Cloud.",
6
6
  "main": "dist/index.js",
7
7
  "scripts": {