Merge pull request #491 from Accenture/bugfix/490-builddefinition-does-not-rename-extracted-sql-ssjs-files

#490 builddefinition does not rename extracted sql ssjs files

Author: JoernBerkefeld

.vscode/settings.json

@@ -31,7 +31,7 @@
         "editor.defaultFormatter": "esbenp.prettier-vscode"
     },
     "[markdown]": {
-        "editor.defaultFormatter": "yzhang.markdown-all-in-one"
+        "editor.defaultFormatter": "esbenp.prettier-vscode"
     },
     "[typescript]": {
         "editor.defaultFormatter": "esbenp.prettier-vscode"

lib/metadataTypes/Query.js

@@ -260,17 +260,20 @@ class Query extends MetadataType {
         const targetDirArr = Array.isArray(targetDir) ? targetDir : [targetDir];
         const nestedFilePaths = [];
 
+        // keep old name if creating templates, otherwise use new name
+        const fileName = mode === 'definition' ? metadata[this.definition.keyField] : templateName;
+
         for (const targetDir of targetDirArr) {
             File.writeToFile(
                 [targetDir, this.definition.type],
-                templateName + '.' + this.definition.type + '-meta',
+                fileName + '.' + this.definition.type + '-meta',
                 'sql',
                 code
             );
             nestedFilePaths.push([
                 targetDir,
                 this.definition.type,
-                templateName + '.' + this.definition.type + '-meta.sql',
+                fileName + '.' + this.definition.type + '-meta.sql',
             ]);
         }
         return nestedFilePaths;

lib/metadataTypes/Script.js

@@ -234,17 +234,20 @@ class Script extends MetadataType {
         const targetDirArr = Array.isArray(targetDir) ? targetDir : [targetDir];
         const nestedFilePaths = [];
 
+        // keep old name if creating templates, otherwise use new name
+        const fileName = mode === 'definition' ? metadata[this.definition.keyField] : templateName;
+
         for (const targetDir of targetDirArr) {
             File.writeToFile(
                 [targetDir, this.definition.type],
-                templateName + '.' + this.definition.type + '-meta',
+                fileName + '.' + this.definition.type + '-meta',
                 'ssjs',
                 code
             );
             nestedFilePaths.push([
                 targetDir,
                 this.definition.type,
-                templateName + '.' + this.definition.type + '-meta.ssjs',
+                fileName + '.' + this.definition.type + '-meta.ssjs',
             ]);
         }
         return nestedFilePaths;