Merge pull request #946 from Accenture/bugfix/945-queries-not-correct…

…ly-formatted-when-other-types-were-retrieved-first Bugfix/945 queries not correctly formatted when other types were retrieved first
Accenture · May 30, 2023 · e098cb2 · e098cb2
2 parents bea555f + 575554d
commit e098cb2
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 9 deletions.
diff --git a/lib/metadataTypes/Asset.js b/lib/metadataTypes/Asset.js
@@ -26,7 +26,9 @@ class Asset extends MetadataType {
  static async retrieve(retrieveDir, _, subTypeArr, key) {
  const items = [];
  subTypeArr ||= this._getSubTypes();
- await File.initPrettier();
+ if (retrieveDir) {
+ await File.initPrettier();
+ }
  // loop through subtypes and return results of each subType for caching (saving is handled per subtype)
  for (const subType of subTypeArr) {
  // each subtype contains multiple different specific types (images contains jpg and png for example)

diff --git a/lib/util/file.js b/lib/util/file.js
@@ -517,9 +517,10 @@ const File = {
  * @param {string} [filetype='html'] filetype ie. JSON or SSJS
  * @returns {Promise.<boolean>} success of config load
  */
- async initPrettier(filetype) {
- if (FileFs.prettierConfig === null) {
- filetype ||= 'html';
+ async initPrettier(filetype = 'html') {
+ if (FileFs.prettierConfig === null || FileFs.prettierConfigFileType !== filetype) {
+ // run this if no config was yet found or if the filetype previously used to initialize it differs (because it results in a potentially different config!)
+ FileFs.prettierConfigFileType = filetype;
  try {
  // pass in project dir with fake index.html to avoid "no parser" error
  // by using process.cwd we are limiting ourselves to a config in the project root
@@ -547,5 +548,6 @@ const File = {
 };
 const FileFs = { ...fs, ...File };
 FileFs.prettierConfig = null;
+FileFs.prettierConfigFileType = null;
 
 module.exports = FileFs;
diff --git a/test/resources/9999999/query/build-expected.sql b/test/resources/9999999/query/build-expected.sql
@@ -1,5 +1,5 @@
 SELECT
- SubscriberKey as testField
+ SubscriberKey AS testField
 FROM
  _Subscribers
 WHERE

diff --git a/test/resources/9999999/query/get-expected.sql b/test/resources/9999999/query/get-expected.sql
@@ -1,5 +1,5 @@
 SELECT
- SubscriberKey as testField
+ SubscriberKey AS testField
 FROM
  _Subscribers
 WHERE

diff --git a/test/resources/9999999/query/patch-expected.sql b/test/resources/9999999/query/patch-expected.sql
@@ -1,5 +1,5 @@
 SELECT
- SubscriberKey as testField
+ SubscriberKey AS testField
 FROM
  _Subscribers
 WHERE

diff --git a/test/resources/9999999/query/post-expected.sql b/test/resources/9999999/query/post-expected.sql
@@ -1,4 +1,4 @@
 SELECT
- SubscriberKey as testField
+ SubscriberKey AS testField
 FROM
  _Subscribers
diff --git a/test/resources/9999999/query/template-expected.sql b/test/resources/9999999/query/template-expected.sql
@@ -1,5 +1,5 @@
 SELECT
- SubscriberKey as testField
+ SubscriberKey AS testField
 FROM
  _Subscribers
 WHERE