Merge pull request #45 from thedumbterminal/table_id_formats

Support more ID formats when generating table IDs

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v4.0.1 (12/02/2021)
+
+* Support more formats for table ID utility.
+
 ## v4.0.0 (24/12/2020)
 
 * Dropped support for node 8.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsonschema-bigquery",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "description": "Convert JSON schema to Google BigQuery schema",
   "main": "src/converter.js",
   "scripts": {

src/utils.js

@@ -3,11 +3,9 @@ const utils = module.exports = {}
 
 // Expected format is "id": "/events/server/ecommerce/v5.1.5/schema.json"
 utils.get_table_id = id => {
-  const idArr = id.split('/')
-  const type = idArr.slice(-4, -3)[0]
-  const name = idArr.slice(-3, -2)[0]
-  const version = idArr.slice(-2, -1)[0]
-  return type + '_' + name + '_' + version.split('.')[0]
+  const idArr = id.split('/').slice(2, -1)
+  const version = idArr.pop()
+  return idArr.join('_') + '_' + version.split('.')[0]
 }
 
 utils.inspector = obj => util.inspect(obj, {

test/unit/utils.js

@@ -0,0 +1,14 @@
+const utils = require('../../src/utils')
+const assert = require('assert')
+
+describe('utils', () => {
+  describe('get_table_id()', () => {
+    it('it supports a short path', () => {
+      assert.equal(utils.get_table_id('/events/one/two/v1.2.3/schema.json'), 'one_two_v1')
+    })
+
+    it('it supports a long path', () => {
+      assert.equal(utils.get_table_id('/events/one/two/three/four/v1.2.3/schema.json'), 'one_two_three_four_v1')
+    })
+  })
+})