From 6cb595287719423e26bdce8fea65a6d7be531594 Mon Sep 17 00:00:00 2001 From: Mike Talley Date: Thu, 29 Apr 2021 14:46:34 -0400 Subject: [PATCH 1/5] updated prettier:write command to work in windows --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 39cfe851f..b6d23e203 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "scripts": { "check-deps": "node bin/depcheck.js", "lint": "eslint . && prettier --list-different 'packages/**/*.{js,json}'", - "prettier:write": "prettier --write 'packages/**/*.{js,json}'", + "prettier:write": "prettier --write packages/**/*.{js,json}", "publish-release": "yarn lerna publish --conventional-graduate", "publish-prerelease": "yarn lerna publish prerelease --preid beta --dist-tag next", "test": "jest", From e9c41714849a980ec3a7bce44f6dd0b66315289f Mon Sep 17 00:00:00 2001 From: Mike Talley Date: Thu, 29 Apr 2021 14:49:50 -0400 Subject: [PATCH 2/5] added debug logging --- packages/cli-lib/errorHandlers/apiErrors.js | 1 + packages/cli-lib/fileMapper.js | 2 ++ packages/cli/commands/fetch.js | 1 + 3 files changed, 4 insertions(+) diff --git a/packages/cli-lib/errorHandlers/apiErrors.js b/packages/cli-lib/errorHandlers/apiErrors.js index 5626c50d7..f0e1176c8 100644 --- a/packages/cli-lib/errorHandlers/apiErrors.js +++ b/packages/cli-lib/errorHandlers/apiErrors.js @@ -111,6 +111,7 @@ const ApiMethodPrepositions = { * @param {ApiErrorContext} context */ function logApiStatusCodeError(error, context) { + // console.log('error: ', error) const { statusCode } = error; const { method } = error.options || {}; const isPutOrPost = method === 'PUT' || method === 'POST'; diff --git a/packages/cli-lib/fileMapper.js b/packages/cli-lib/fileMapper.js index bf5861b88..59eb787dc 100644 --- a/packages/cli-lib/fileMapper.js +++ b/packages/cli-lib/fileMapper.js @@ -406,8 +406,10 @@ async function fetchFolderFromApi(input) { if (!isFolder) { throw new Error(`Invalid request for folder: "${src}"`); } + console.log('fetchFolderFromApi: ', input, isFolder); try { const srcPath = isRoot ? '@root' : src; + console.log('srcPath: ', srcPath); const node = isHubspot ? await downloadDefault( accountId, diff --git a/packages/cli/commands/fetch.js b/packages/cli/commands/fetch.js index 0587caf63..ddc9d03a6 100644 --- a/packages/cli/commands/fetch.js +++ b/packages/cli/commands/fetch.js @@ -27,6 +27,7 @@ exports.describe = exports.handler = async options => { const { config: configPath, src, dest } = options; + console.log('src: ', src); setLogLevel(options); logDebugInfo(options); From 4b205f82b6bfa32b818590586a51f7d096b7fe60 Mon Sep 17 00:00:00 2001 From: Mike Talley Date: Thu, 29 Apr 2021 14:56:37 -0400 Subject: [PATCH 3/5] added more logging --- packages/cli-lib/api/fileMapper.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/cli-lib/api/fileMapper.js b/packages/cli-lib/api/fileMapper.js index 182ea3145..d04b57b88 100644 --- a/packages/cli-lib/api/fileMapper.js +++ b/packages/cli-lib/api/fileMapper.js @@ -110,6 +110,7 @@ async function fetchFileStream(accountId, filePath, destination, options = {}) { * @returns {Promise} */ async function download(accountId, filepath, options = {}) { + console.log('download: ', accountId, filepath, options); return http.get(accountId, { uri: `${FILE_MAPPER_API_PATH}/download/${encodeURIComponent(filepath)}`, ...options, From 8b7a47abbfd4d7f335f86399f0889a7acd63cd81 Mon Sep 17 00:00:00 2001 From: Mike Talley Date: Thu, 29 Apr 2021 15:07:11 -0400 Subject: [PATCH 4/5] removed logs --- packages/cli-lib/api/fileMapper.js | 1 - packages/cli-lib/errorHandlers/apiErrors.js | 1 - packages/cli-lib/fileMapper.js | 2 -- packages/cli/commands/fetch.js | 1 - 4 files changed, 5 deletions(-) diff --git a/packages/cli-lib/api/fileMapper.js b/packages/cli-lib/api/fileMapper.js index d04b57b88..182ea3145 100644 --- a/packages/cli-lib/api/fileMapper.js +++ b/packages/cli-lib/api/fileMapper.js @@ -110,7 +110,6 @@ async function fetchFileStream(accountId, filePath, destination, options = {}) { * @returns {Promise} */ async function download(accountId, filepath, options = {}) { - console.log('download: ', accountId, filepath, options); return http.get(accountId, { uri: `${FILE_MAPPER_API_PATH}/download/${encodeURIComponent(filepath)}`, ...options, diff --git a/packages/cli-lib/errorHandlers/apiErrors.js b/packages/cli-lib/errorHandlers/apiErrors.js index f0e1176c8..5626c50d7 100644 --- a/packages/cli-lib/errorHandlers/apiErrors.js +++ b/packages/cli-lib/errorHandlers/apiErrors.js @@ -111,7 +111,6 @@ const ApiMethodPrepositions = { * @param {ApiErrorContext} context */ function logApiStatusCodeError(error, context) { - // console.log('error: ', error) const { statusCode } = error; const { method } = error.options || {}; const isPutOrPost = method === 'PUT' || method === 'POST'; diff --git a/packages/cli-lib/fileMapper.js b/packages/cli-lib/fileMapper.js index 59eb787dc..bf5861b88 100644 --- a/packages/cli-lib/fileMapper.js +++ b/packages/cli-lib/fileMapper.js @@ -406,10 +406,8 @@ async function fetchFolderFromApi(input) { if (!isFolder) { throw new Error(`Invalid request for folder: "${src}"`); } - console.log('fetchFolderFromApi: ', input, isFolder); try { const srcPath = isRoot ? '@root' : src; - console.log('srcPath: ', srcPath); const node = isHubspot ? await downloadDefault( accountId, diff --git a/packages/cli/commands/fetch.js b/packages/cli/commands/fetch.js index ddc9d03a6..0587caf63 100644 --- a/packages/cli/commands/fetch.js +++ b/packages/cli/commands/fetch.js @@ -27,7 +27,6 @@ exports.describe = exports.handler = async options => { const { config: configPath, src, dest } = options; - console.log('src: ', src); setLogLevel(options); logDebugInfo(options); From adbfbaecfe841eb15c165b974535116572ac1ddd Mon Sep 17 00:00:00 2001 From: Mike Talley Date: Thu, 29 Apr 2021 15:09:12 -0400 Subject: [PATCH 5/5] fixed the lint script as well --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b6d23e203..5ad297d77 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ ], "scripts": { "check-deps": "node bin/depcheck.js", - "lint": "eslint . && prettier --list-different 'packages/**/*.{js,json}'", + "lint": "eslint . && prettier --list-different packages/**/*.{js,json}", "prettier:write": "prettier --write packages/**/*.{js,json}", "publish-release": "yarn lerna publish --conventional-graduate", "publish-prerelease": "yarn lerna publish prerelease --preid beta --dist-tag next",