From 461199fc4c52a1bcc588a094492273a6b22f2ac3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Berkefeld?= Date: Sat, 29 Jun 2024 08:09:38 +0200 Subject: [PATCH 1/2] #1390: regression fix: align --metatdata retrieve behavior with legacy behavior --- @types/lib/index.d.ts.map | 2 +- lib/index.js | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/@types/lib/index.d.ts.map b/@types/lib/index.d.ts.map index f805d4297..bf62130dd 100644 --- a/@types/lib/index.d.ts.map +++ b/@types/lib/index.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../lib/index.js"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../lib/index.js"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/lib/index.js b/lib/index.js index 5f67709cc..bc2aca476 100644 --- a/lib/index.js +++ b/lib/index.js @@ -399,7 +399,10 @@ class Mcdev { // Clear output folder structure for selected type retrieveTypesArr.push(type); } - if (!keys) { + const areKeySet = Array.isArray(selectedTypesArr) + ? keys + : Object.values(selectedTypesArr).filter(Boolean).length; + if (!areKeySet) { // dont delete directories if we are just re-retrieving a single file await File.remove(File.normalizePath(removePathArr)); // clean up old folders after types were renamed From 4218c07092988b8ee4b5a797df8632842fdb73d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Berkefeld?= Date: Sat, 29 Jun 2024 08:14:43 +0200 Subject: [PATCH 2/2] #0: clean up --- lib/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/index.js b/lib/index.js index bc2aca476..1c5fcd938 100644 --- a/lib/index.js +++ b/lib/index.js @@ -423,7 +423,7 @@ class Mcdev { if (!retrieveTypesArr.length) { // assume no type was given and config settings are used instead: // Clear output folder structure - File.removeSync(File.normalizePath([properties.directories.retrieve, cred, bu])); + await File.remove(File.normalizePath([properties.directories.retrieve, cred, bu])); // removes subtypes and removes duplicates retrieveTypesArr.push( ...new Set(properties.metaDataTypes.retrieve.map((type) => type.split('-')[0]))