npm - sfdx-easy-sources - Versions diffs - 0.7.4 → 0.7.6 - Mend

sfdx-easy-sources 0.7.4 → 0.7.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (42) hide show

package/lib/commands/easysources/objecttranslations/arealigned.js CHANGED Viewed

@@ -16,9 +16,8 @@ const fs = require('fs-extra');
 const path_1 = require("path");
 const filesUtils_1 = require("../../../utils/filesUtils");
 const localSettings_1 = require("../../../utils/localSettings");
-const utils_1 = require("../../../utils/utils");
 const os_1 = require("os");
-const flatArrayUtils_1 = require("../../../utils/flatArrayUtils");
+const merge_1 = require("./merge");
 const utils_objtransl_1 = require("../../../utils/utils_objtransl");
 const settings = (0, localSettings_1.loadSettings)();
 // Initialize Messages with the current plugin directory
@@ -127,44 +126,8 @@ class AreAligned extends command_1.SfdxCommand {
                     isWarning: true
                 };
             }
-            // Reconstruct XML from CSV
-            const inputXML = (0, path_1.join)(objectCsvDir, objectName) + constants_1.XML_PART_EXTENSION;
-            if (!fs.existsSync(inputXML)) {
-                return {
-                    itemName: objectName,
-                    isAligned: false,
-                    differences: [`Base XML part not found: ${inputXML}`],
-                    isWarning: true
-                };
-            }
-            const reconstructedXml = (await (0, filesUtils_1.readXmlFromFile)(inputXML)) ?? {};
-            // Read and merge CSV data (excluding fieldTranslations which are handled separately)
-            for (const sectionName in constants_objecttranslations_1.OBJTRANSL_ITEMS) {
-                if (sectionName === constants_objecttranslations_1.OBJTRANSL_CFIELDTRANSL_ROOT)
-                    continue; // Skip fieldTranslations, handled separately
-                const csvFilePath = (0, path_1.join)(objectCsvDir, (0, filesUtils_1.calcCsvFilename)(objectName, sectionName));
-                if (fs.existsSync(csvFilePath)) {
-                    var jsonArray = await (0, filesUtils_1.readCsvToJsonArrayWithNulls)(csvFilePath);
-                    if (this.flags.sort === 'true') {
-                        jsonArray = (0, utils_1.sortByKey)(jsonArray);
-                    }
-                    // Remove _tagid for comparison
-                    for (var i in jsonArray) {
-                        delete jsonArray[i]['_tagid'];
-                    }
-                    if (jsonArray.length == 0) {
-                        delete reconstructedXml[constants_objecttranslations_1.OBJTRANSL_ROOT_TAG][sectionName];
-                        continue;
-                    }
-                    // Pre-process for empty optional tags
-                    (0, utils_objtransl_1.removeEmpyOptionalTags)(jsonArray, sectionName);
-                    // Pre-process for layout flatToArray
-                    if (sectionName === constants_objecttranslations_1.OBJTRANSL_LAYOUT_ROOT) {
-                        jsonArray = (0, flatArrayUtils_1.flatToArray)(jsonArray);
-                    }
-                    reconstructedXml[constants_objecttranslations_1.OBJTRANSL_ROOT_TAG][sectionName] = jsonArray;
-                }
-            }
+            // Reconstruct XML from CSV using shared merge logic
+            const reconstructedXml = await (0, merge_1.mergeObjectTranslationFromCsv)(objectName, objectCsvDir, this.flags);
             // Compare main object translation structures
             const originalData = originalXml[constants_objecttranslations_1.OBJTRANSL_ROOT_TAG] || {};
             const reconstructedData = reconstructedXml[constants_objecttranslations_1.OBJTRANSL_ROOT_TAG] || {};
@@ -216,43 +179,36 @@ class AreAligned extends command_1.SfdxCommand {
             // Get all existing fieldTranslation XML files
             const objectXmlDir = (0, path_1.join)(xmlDir, objectName);
             const fieldTranslationFiles = (0, utils_objtransl_1.getFieldTranslationFiles)(objectXmlDir);
-            // Read CSV for fieldTranslations
-            const csvFilePath = (0, path_1.join)(csvDir, (0, filesUtils_1.calcCsvFilename)(objectName, constants_objecttranslations_1.OBJTRANSL_CFIELDTRANSL_ROOT));
-            if (fs.existsSync(csvFilePath)) {
-                const jsonArray = await (0, filesUtils_1.readCsvToJsonArrayWithNulls)(csvFilePath);
-                const fieldXmlArray = (0, utils_objtransl_1.transformFieldCSVtoXMLs)(jsonArray);
-                // Compare counts
-                if (fieldTranslationFiles.length !== fieldXmlArray.length) {
-                    differences.push(`fieldTranslations: File count mismatch (XML: ${fieldTranslationFiles.length}, CSV: ${fieldXmlArray.length})`);
-                }
-                // Validate each field translation
-                for (const fieldEntry of fieldXmlArray) {
-                    const expectedFileName = fieldEntry.name + constants_objecttranslations_1.OBJTRANSL_FIELDTRANSL_EXTENSION;
-                    const expectedFilePath = (0, path_1.join)(objectXmlDir, expectedFileName);
-                    if (!fs.existsSync(expectedFilePath)) {
-                        differences.push(`fieldTranslations: Missing XML file for ${fieldEntry.name}`);
-                        continue;
-                    }
-                    // Compare content
-                    const originalXml = await (0, filesUtils_1.readXmlFromFile)(expectedFilePath);
-                    const reconstructedXml = { [constants_objecttranslations_1.OBJTRANSL_CFIELDTRANSL_ROOT_TAG]: fieldEntry };
-                    const originalStr = JSON.stringify(originalXml);
-                    const reconstructedStr = JSON.stringify(reconstructedXml);
-                    if (originalStr !== reconstructedStr) {
-                        differences.push(`fieldTranslations: Content mismatch for ${fieldEntry.name}`);
-                    }
+            // Use shared logic to get field translations from CSV
+            const fieldXmlArray = await (0, merge_1.getFieldTranslationsFromCsv)(objectName, csvDir);
+            // Compare counts
+            if (fieldTranslationFiles.length !== fieldXmlArray.length) {
+                differences.push(`fieldTranslations: File count mismatch (XML: ${fieldTranslationFiles.length}, CSV: ${fieldXmlArray.length})`);
+            }
+            // Validate each field translation
+            for (const fieldEntry of fieldXmlArray) {
+                const expectedFileName = fieldEntry.name + constants_objecttranslations_1.OBJTRANSL_FIELDTRANSL_EXTENSION;
+                const expectedFilePath = (0, path_1.join)(objectXmlDir, expectedFileName);
+                if (!fs.existsSync(expectedFilePath)) {
+                    differences.push(`fieldTranslations: Missing XML file for ${fieldEntry.name}`);
+                    continue;
                 }
-                // Check for XML files not represented in CSV
-                for (const xmlFile of fieldTranslationFiles) {
-                    const fieldName = xmlFile.replace(constants_objecttranslations_1.OBJTRANSL_FIELDTRANSL_EXTENSION, '');
-                    const foundInCsv = fieldXmlArray.some(entry => entry.name === fieldName);
-                    if (!foundInCsv) {
-                        differences.push(`fieldTranslations: XML file ${xmlFile} not represented in CSV`);
-                    }
+                // Compare content
+                const originalXml = await (0, filesUtils_1.readXmlFromFile)(expectedFilePath);
+                const reconstructedXml = { [constants_objecttranslations_1.OBJTRANSL_CFIELDTRANSL_ROOT_TAG]: fieldEntry };
+                const originalStr = JSON.stringify(originalXml);
+                const reconstructedStr = JSON.stringify(reconstructedXml);
+                if (originalStr !== reconstructedStr) {
+                    differences.push(`fieldTranslations: Content mismatch for ${fieldEntry.name}`);
                 }
             }
-            else if (fieldTranslationFiles.length > 0) {
-                differences.push(`fieldTranslations: CSV file missing but ${fieldTranslationFiles.length} XML files exist`);
+            // Check for XML files not represented in CSV
+            for (const xmlFile of fieldTranslationFiles) {
+                const fieldName = xmlFile.replace(constants_objecttranslations_1.OBJTRANSL_FIELDTRANSL_EXTENSION, '');
+                const foundInCsv = fieldXmlArray.some(entry => entry.name === fieldName);
+                if (!foundInCsv) {
+                    differences.push(`fieldTranslations: XML file ${xmlFile} not represented in CSV`);
+                }
             }
         }
         catch (error) {
@@ -340,41 +296,8 @@ class AreAligned extends command_1.SfdxCommand {
                     isWarning: true
                 };
             }
-            // Reconstruct XML from CSV following the same logic as merge
-            const inputXML = (0, path_1.join)(objectCsvDir, objectName) + constants_1.XML_PART_EXTENSION;
-            if (!fs.existsSync(inputXML)) {
-                return {
-                    itemName: objectName,
-                    isAligned: false,
-                    differences: [`Base XML part not found: ${inputXML}`],
-                    isWarning: true
-                };
-            }
-            const mergedXml = (await (0, filesUtils_1.readXmlFromFile)(inputXML)) ?? {};
-            // Process CSV files
-            for (const sectionName in constants_objecttranslations_1.OBJTRANSL_ITEMS) {
-                if (sectionName === constants_objecttranslations_1.OBJTRANSL_CFIELDTRANSL_ROOT)
-                    continue; // Skip fieldTranslations
-                const csvFilePath = (0, path_1.join)(objectCsvDir, (0, filesUtils_1.calcCsvFilename)(objectName, sectionName));
-                if (fs.existsSync(csvFilePath)) {
-                    var jsonArray = await (0, filesUtils_1.readCsvToJsonArrayWithNulls)(csvFilePath);
-                    if (this.flags.sort === 'true') {
-                        jsonArray = (0, utils_1.sortByKey)(jsonArray);
-                    }
-                    for (var i in jsonArray) {
-                        delete jsonArray[i]['_tagid'];
-                    }
-                    if (jsonArray.length == 0) {
-                        delete mergedXml[constants_objecttranslations_1.OBJTRANSL_ROOT_TAG][sectionName];
-                        continue;
-                    }
-                    (0, utils_objtransl_1.removeEmpyOptionalTags)(jsonArray, sectionName);
-                    if (sectionName === constants_objecttranslations_1.OBJTRANSL_LAYOUT_ROOT) {
-                        jsonArray = (0, flatArrayUtils_1.flatToArray)(jsonArray);
-                    }
-                    mergedXml[constants_objecttranslations_1.OBJTRANSL_ROOT_TAG][sectionName] = jsonArray;
-                }
-            }
+            // Reconstruct XML from CSV using shared merge logic
+            const mergedXml = await (0, merge_1.mergeObjectTranslationFromCsv)(objectName, objectCsvDir, this.flags);
             // Write reconstructed XML to temp file
             const tempDir = (0, os_1.tmpdir)();
             const tempFile = (0, path_1.join)(tempDir, `temp_${objectName}_${Date.now()}.xml`);
@@ -415,37 +338,35 @@ class AreAligned extends command_1.SfdxCommand {
         try {
             const objectXmlDir = (0, path_1.join)(xmlDir, objectName);
             const fieldTranslationFiles = (0, utils_objtransl_1.getFieldTranslationFiles)(objectXmlDir);
-            const csvFilePath = (0, path_1.join)(csvDir, (0, filesUtils_1.calcCsvFilename)(objectName, constants_objecttranslations_1.OBJTRANSL_CFIELDTRANSL_ROOT));
-            if (fs.existsSync(csvFilePath)) {
-                const jsonArray = await (0, filesUtils_1.readCsvToJsonArrayWithNulls)(csvFilePath);
-                const fieldXmlArray = (0, utils_objtransl_1.transformFieldCSVtoXMLs)(jsonArray);
-                // For each expected field translation file, reconstruct and compare
-                for (const fieldEntry of fieldXmlArray) {
-                    const expectedFilePath = (0, path_1.join)(objectXmlDir, fieldEntry.name + constants_objecttranslations_1.OBJTRANSL_FIELDTRANSL_EXTENSION);
-                    if (fs.existsSync(expectedFilePath)) {
-                        const originalString = await (0, filesUtils_1.readStringFromFile)(expectedFilePath);
-                        // Create temp file for reconstructed content
-                        const tempDir = (0, os_1.tmpdir)();
-                        const tempFile = (0, path_1.join)(tempDir, `temp_field_${fieldEntry.name}_${Date.now()}.xml`);
-                        await (0, filesUtils_1.writeXmlToFile)(tempFile, { [constants_objecttranslations_1.OBJTRANSL_CFIELDTRANSL_ROOT_TAG]: fieldEntry });
-                        const reconstructedString = await (0, filesUtils_1.readStringFromFile)(tempFile);
-                        // Clean up
-                        try {
-                            fs.unlinkSync(tempFile);
-                        }
-                        catch (error) {
-                            // Ignore cleanup errors
-                        }
-                        if (originalString.trim() !== reconstructedString.trim()) {
-                            differences.push(`fieldTranslations: Content differs for ${fieldEntry.name}`);
-                        }
+            // Use shared logic to get field translations from CSV
+            const fieldXmlArray = await (0, merge_1.getFieldTranslationsFromCsv)(objectName, csvDir);
+            // For each expected field translation file, reconstruct and compare
+            for (const fieldEntry of fieldXmlArray) {
+                const expectedFilePath = (0, path_1.join)(objectXmlDir, fieldEntry.name + constants_objecttranslations_1.OBJTRANSL_FIELDTRANSL_EXTENSION);
+                if (fs.existsSync(expectedFilePath)) {
+                    const originalString = await (0, filesUtils_1.readStringFromFile)(expectedFilePath);
+                    // Create temp file for reconstructed content
+                    const tempDir = (0, os_1.tmpdir)();
+                    const tempFile = (0, path_1.join)(tempDir, `temp_field_${fieldEntry.name}_${Date.now()}.xml`);
+                    await (0, filesUtils_1.writeXmlToFile)(tempFile, { [constants_objecttranslations_1.OBJTRANSL_CFIELDTRANSL_ROOT_TAG]: fieldEntry });
+                    const reconstructedString = await (0, filesUtils_1.readStringFromFile)(tempFile);
+                    // Clean up
+                    try {
+                        fs.unlinkSync(tempFile);
                     }
-                    else {
-                        differences.push(`fieldTranslations: Missing XML file for ${fieldEntry.name}`);
+                    catch (error) {
+                        // Ignore cleanup errors
                     }
+                    if (originalString.trim() !== reconstructedString.trim()) {
+                        differences.push(`fieldTranslations: Content differs for ${fieldEntry.name}`);
+                    }
+                }
+                else {
+                    differences.push(`fieldTranslations: Missing XML file for ${fieldEntry.name}`);
                 }
             }
-            else if (fieldTranslationFiles.length > 0) {
+            // Check if there are field translation files but no CSV
+            if (fieldXmlArray.length === 0 && fieldTranslationFiles.length > 0) {
                 differences.push(`fieldTranslations: CSV file missing but ${fieldTranslationFiles.length} XML files exist`);
             }
         }

package/lib/commands/easysources/objecttranslations/arealigned.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"arealigned.js","sourceRoot":"","sources":["../../../../src/commands/easysources/objecttranslations/arealigned.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"arealigned.js","sourceRoot":"","sources":["../../../../src/commands/easysources/objecttranslations/arealigned.ts"],"names":[],"mappings":"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"}

package/lib/commands/easysources/objecttranslations/merge.d.ts CHANGED Viewed

@@ -14,4 +14,20 @@ export default class Merge extends SfdxCommand {
     };
     run(): Promise<AnyJson>;
 }
+/**
+ * Core merge logic for object translations that creates merged XML from CSV files in memory
+ * Handles main object translation (excluding fieldTranslations which are handled separately)
+ * @param objectName - name of the object translation to merge
+ * @param csvDirPath - path to the CSV directory
+ * @param flags - command flags including sort option
+ * @returns merged XML object
+ */
+export declare function mergeObjectTranslationFromCsv(objectName: string, csvDirPath: string, flags: any): Promise<any>;
+/**
+ * Processes field translations CSV and returns array of field XML objects
+ * @param objectName - name of the object translation
+ * @param csvDirPath - path to the CSV directory containing field translations CSV
+ * @returns array of field XML objects ready for writing to individual files
+ */
+export declare function getFieldTranslationsFromCsv(objectName: string, csvDirPath: string): Promise<any[]>;
 export declare function deleteFieldTranslationsXmls(baseInputDir: any, objTrName: any): void;

package/lib/commands/easysources/objecttranslations/merge.js CHANGED Viewed

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deleteFieldTranslationsXmls = void 0;
+exports.deleteFieldTranslationsXmls = exports.getFieldTranslationsFromCsv = exports.mergeObjectTranslationFromCsv = void 0;
 /*
  * Copyright (c) 2020, salesforce.com, inc.
  * All rights reserved.
@@ -51,44 +51,17 @@ class Merge extends command_1.SfdxCommand {
                 continue;
             }
             console.log('Merging: ' + obj);
-            const mergedXml = (await (0, filesUtils_1.readXmlFromFile)(inputXML)) ?? {};
+            // Use the exported merge function
+            const mergedXml = await mergeObjectTranslationFromCsv(obj, (0, path_1.join)(baseInputDir, obj, 'csv'), this.flags);
             const outputDir = (0, path_1.join)(baseOutputDir, obj);
-            for (const tag_section in constants_objecttranslations_1.OBJTRANSL_ITEMS) {
-                if (tag_section === constants_objecttranslations_1.OBJTRANSL_CFIELDTRANSL_ROOT)
-                    continue;
-                const csvFilePath = (0, path_1.join)(baseInputDir, obj, 'csv', (0, filesUtils_1.calcCsvFilename)(obj, tag_section));
-                if (fs.existsSync(csvFilePath)) {
-                    var jsonArray = await (0, filesUtils_1.readCsvToJsonArrayWithNulls)(csvFilePath);
-                    if (this.flags.sort === 'true') {
-                        jsonArray = (0, utils_1.sortByKey)(jsonArray);
-                    }
-                    for (var i in jsonArray) {
-                        delete jsonArray[i]['_tagid'];
-                    }
-                    if (jsonArray.length == 0) {
-                        delete mergedXml[constants_objecttranslations_1.OBJTRANSL_ROOT_TAG][tag_section];
-                        continue;
-                    }
-                    // pre-process for empty optional tags
-                    (0, utils_objtransl_1.removeEmpyOptionalTags)(jsonArray, tag_section);
-                    // pre-process for layout flatToArray
-                    if (tag_section === constants_objecttranslations_1.OBJTRANSL_LAYOUT_ROOT) {
-                        jsonArray = (0, flatArrayUtils_1.flatToArray)(jsonArray);
-                        // jsonArray = transformLayoutCSVtoXML(jsonArray);
-                    }
-                    mergedXml[constants_objecttranslations_1.OBJTRANSL_ROOT_TAG][tag_section] = jsonArray;
-                }
-            }
             const outputFile = (0, path_1.join)(outputDir, obj + constants_objecttranslations_1.OBJTRANSL_EXTENSION);
             if (!fs.existsSync(outputDir)) {
                 fs.mkdirSync(outputDir);
             }
             await (0, filesUtils_1.writeXmlToFile)(outputFile, mergedXml);
-            // only for ObjectTranslations, recreate all the fieldTranslation xml files
-            const csvFilePath = (0, path_1.join)(baseInputDir, obj, 'csv', (0, filesUtils_1.calcCsvFilename)(obj, constants_objecttranslations_1.OBJTRANSL_CFIELDTRANSL_ROOT));
-            if (fs.existsSync(csvFilePath)) {
-                var jsonArray = await (0, filesUtils_1.readCsvToJsonArrayWithNulls)(csvFilePath);
-                const fieldXmlArray = (0, utils_objtransl_1.transformFieldCSVtoXMLs)(jsonArray);
+            // Handle fieldTranslations using the exported function
+            const fieldXmlArray = await getFieldTranslationsFromCsv(obj, (0, path_1.join)(baseInputDir, obj, 'csv'));
+            if (fieldXmlArray.length > 0) {
                 deleteFieldTranslationsXmls(baseOutputDir, obj);
                 for (const entry of fieldXmlArray) {
                     await (0, filesUtils_1.writeXmlToFile)((0, path_1.join)(baseOutputDir, obj, entry.name + constants_objecttranslations_1.OBJTRANSL_FIELDTRANSL_EXTENSION), { [constants_objecttranslations_1.OBJTRANSL_CFIELDTRANSL_ROOT_TAG]: entry });
@@ -125,6 +98,69 @@ Merge.flagsConfig = {
         default: 'true',
     }),
 };
+/**
+ * Core merge logic for object translations that creates merged XML from CSV files in memory
+ * Handles main object translation (excluding fieldTranslations which are handled separately)
+ * @param objectName - name of the object translation to merge
+ * @param csvDirPath - path to the CSV directory
+ * @param flags - command flags including sort option
+ * @returns merged XML object
+ */
+async function mergeObjectTranslationFromCsv(objectName, csvDirPath, flags) {
+    const inputXML = (0, path_1.join)(csvDirPath, objectName) + constants_1.XML_PART_EXTENSION;
+    if (!fs.existsSync(inputXML)) {
+        throw new Error(`${inputXML} not found`);
+    }
+    const mergedXml = (await (0, filesUtils_1.readXmlFromFile)(inputXML)) ?? {};
+    // Process each section except fieldTranslations (handled separately)
+    for (const tag_section in constants_objecttranslations_1.OBJTRANSL_ITEMS) {
+        if (tag_section === constants_objecttranslations_1.OBJTRANSL_CFIELDTRANSL_ROOT)
+            continue; // Skip fieldTranslations
+        const csvFilePath = (0, path_1.join)(csvDirPath, (0, filesUtils_1.calcCsvFilename)(objectName, tag_section));
+        if (fs.existsSync(csvFilePath)) {
+            var jsonArray = await (0, filesUtils_1.readCsvToJsonArrayWithNulls)(csvFilePath);
+            if (flags.sort === 'true' || flags.sort === true || flags.sort === undefined) {
+                jsonArray = (0, utils_1.sortByKey)(jsonArray);
+            }
+            // Remove _tagid for merging
+            for (var i in jsonArray) {
+                delete jsonArray[i]['_tagid'];
+            }
+            if (jsonArray.length == 0) {
+                delete mergedXml[constants_objecttranslations_1.OBJTRANSL_ROOT_TAG][tag_section];
+                continue;
+            }
+            // Pre-process for empty optional tags
+            (0, utils_objtransl_1.removeEmpyOptionalTags)(jsonArray, tag_section);
+            // Pre-process for layout flatToArray
+            if (tag_section === constants_objecttranslations_1.OBJTRANSL_LAYOUT_ROOT) {
+                jsonArray = (0, flatArrayUtils_1.flatToArray)(jsonArray);
+            }
+            mergedXml[constants_objecttranslations_1.OBJTRANSL_ROOT_TAG][tag_section] = jsonArray;
+        }
+        else {
+            // Remove section if CSV doesn't exist
+            delete mergedXml[constants_objecttranslations_1.OBJTRANSL_ROOT_TAG][tag_section];
+        }
+    }
+    return mergedXml;
+}
+exports.mergeObjectTranslationFromCsv = mergeObjectTranslationFromCsv;
+/**
+ * Processes field translations CSV and returns array of field XML objects
+ * @param objectName - name of the object translation
+ * @param csvDirPath - path to the CSV directory containing field translations CSV
+ * @returns array of field XML objects ready for writing to individual files
+ */
+async function getFieldTranslationsFromCsv(objectName, csvDirPath) {
+    const csvFilePath = (0, path_1.join)(csvDirPath, (0, filesUtils_1.calcCsvFilename)(objectName, constants_objecttranslations_1.OBJTRANSL_CFIELDTRANSL_ROOT));
+    if (!fs.existsSync(csvFilePath)) {
+        return [];
+    }
+    const jsonArray = await (0, filesUtils_1.readCsvToJsonArrayWithNulls)(csvFilePath);
+    return (0, utils_objtransl_1.transformFieldCSVtoXMLs)(jsonArray);
+}
+exports.getFieldTranslationsFromCsv = getFieldTranslationsFromCsv;
 function deleteFieldTranslationsXmls(baseInputDir, objTrName) {
     var fieldTrFiles = (0, utils_objtransl_1.getFieldTranslationFiles)((0, path_1.join)(baseInputDir, objTrName));
     for (const fieldTrFile of fieldTrFiles) {

package/lib/commands/easysources/objecttranslations/merge.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"merge.js","sourceRoot":"","sources":["../../../../src/commands/easysources/objecttranslations/merge.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,yBAAyB;AACzB,iDAAyD;AACzD,2CAA4C;AAE5C,4DAAqD;AACrD,kEAAgH;AAChH,wGAA0Q;AAC1Q,gEAA4D;AAC5D,+BAA4B;AAC5B,0DAA+I;AAC/I,gDAAiD;AACjD,oEAA2H;AAC3H,kEAA4D;AAE5D,MAAM,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AAG/B,MAAM,QAAQ,GAAG,IAAA,4BAAY,GAAE,CAAC;AAGhC,wDAAwD;AACxD,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAE5C,iGAAiG;AACjG,mFAAmF;AACnF,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,mBAAmB,EAAE,iBAAiB,CAAC,CAAC;AAE/E,MAAqB,KAAM,SAAQ,qBAAW;IA6BnC,KAAK,CAAC,GAAG;QACZ,qBAAW,CAAC,WAAW,EAAE,CAAC,KAAK,EAAE,CAAC;QAElC,MAAM,YAAY,GAAG,IAAA,WAAI,EAAC,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,sBAAsB,CAAC,IAAI,8BAAkB,CAAC,EAAE,gDAAiB,CAAW,CAAC;QACzI,MAAM,aAAa,GAAG,IAAA,WAAI,EAAC,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,qBAAqB,CAAC,IAAI,8BAAkB,CAAC,EAAE,gDAAiB,CAAW,CAAC;QACzI,MAAM,WAAW,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAW,CAAC;QAEjD,IAAA,gCAAmB,EAAC,YAAY,CAAC,CAAC;QAElC,IAAI,UAAU,GAAG,EAAE,CAAC;QACpB,IAAI,WAAW,EAAE;YACb,UAAU,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SACvC;aAAM;YACH,UAAU,GAAG,EAAE,CAAC,WAAW,CAAC,YAAY,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC;iBAC7D,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;iBAClC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;SAC9B;QAED,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE;YAC1B,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAA,WAAI,EAAC,YAAY,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;gBAAE,SAAS;YAC7D,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,YAAY,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,CAAC,GAAG,8BAAkB,CAAC;YAE1E,IAAG,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAC;gBACxB,OAAO,CAAC,GAAG,CAAC,YAAY,GAAG,GAAG,GAAE,SAAS,GAAG,QAAQ,GAAG,kBAAkB,CAAC,CAAC;gBAC3E,SAAS;aACZ;YAED,OAAO,CAAC,GAAG,CAAC,WAAW,GAAG,GAAG,CAAC,CAAC;~~YAG~~/B,MAAM,SAAS,GAAG,~~CAAC,~~MAAM,~~IAAA~~,~~4BAAe,EAAC,QAAQ,~~CAAC,~~CAAC,IAAI,EAAE,CAAC;YAC1D,MAAM,SAAS,~~GAAG,~~IAAA,WAAI,EAAC,aAAa,~~EAAE,~~GAAG,CAAC,CAAC;YAE3C,KAAK,MAAM,WAAW,IAAI,8CAAe,EAAE;gBACvC,IAAG,WAAW,KAAK,0DAA2B;oBAAE,SAAS;gBACzD,MAAM,WAAW,GAAG,~~IAAA,WAAI,EAAC,YAAY,EAAE,GAAG,EAAE,KAAK,~~EAAE,IAAA,4BAAe,EAAC,GAAG,EAAE,WAAW,~~CAAC,~~CAAC,CAAC;gBACtF,IAAI,~~EAAE,~~CAAC,UAAU,CAAC,WAAW,CAAC,EAAE;oBAC5B,~~IAAI,~~SAAS,GAAG,MAAM,IAAA,wCAA2B,EAAC,WAAW,~~CAAC,~~CAAA;oBAE9D,IAAI,IAAI,CAAC,~~KAAK,CAAC,~~IAAI,KAAK,MAAM,EAAE;wBAC5B,SAAS,GAAG,IAAA,iBAAS,EAAC,SAAS,~~CAAC~~,CAAC~~;~~qBACpC;oBAED~~,~~KAAK,IAAI,CAAC,IAAI,SAAS,EAAE;wBACrB,OAAO,SAAS,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAA;qBAChC;oBAED,IAAG,SAAS,CAAC,~~MAAM,~~IAAI,CAAC,EAAC;wBACrB,OAAO,~~SAAS,~~CAAC~~,~~iDAAkB,CAAC,CAAC,WAAW,CAAC,CAAC;wBAClD,SAAS;qBACZ;oBAED,sCAAsC;oBACtC,~~IAAA,~~wCAAsB~~,EAAC,~~SAAS~~,EAAE,~~WAAW,CAAC,CAAC;oBAE/C,qCAAqC;oBACrC,IAAG,WAAW,KAAK,oDAAqB,EAAC;wBACrC,SAAS,~~GAAG,~~IAAA,4BAAW,EAAC,SAAS,~~CAAC,CAAC;~~wBACnC~~,~~kDAAkD;qBACrD;oBAED,SAAS,CAAC,iDAAkB,CAAC,CAAC,WAAW,CAAC,GAAG,SAAS,CAAC;iBAC1D;aAEJ;YACD,~~MAAM,UAAU,GAAG,IAAA,WAAI,EAAC,SAAS,EAAE,GAAG,GAAG,kDAAmB,CAAC,CAAC;~~YAC9D~~,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;gBAC3B,EAAE,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;aAC3B;YACD,MAAM,IAAA,2BAAc,EAAC,UAAU,EAAE,SAAS,CAAC,CAAC;~~YAG5C~~,~~2EAA2E~~;~~YAC3E~~,MAAM,~~WAAW~~,GAAG,~~IAAA~~,~~WAAI~~,~~EAAC~~,~~YAAY,EAAE,~~GAAG,EAAE,~~KAAK,EAAE,~~IAAA,~~4BAAe~~,EAAC,~~GAAG~~,EAAE,~~0DAA2B~~,~~CAAC~~,~~CAAC~~,CAAC~~;YACtG~~,~~IAAI,EAAE,~~CAAC,~~UAAU,~~CAAC~~,WAAW,CAAC,EAAE~~;~~gBAC5B~~,IAAI,~~SAAS~~,~~GAAG,MAAM,IAAA,wCAA2B,EAAC,WAAW,~~CAAC,~~CAAC;gBAE/D,~~MAAM,~~aAAa,~~GAAG,~~IAAA,yCAAuB,EAAC,SAAS,~~CAAC,~~CAAC~~;~~gBAEzD~~,2BAA2B,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC;gBAEhD,~~KAAI~~,MAAM,KAAK,IAAI,aAAa,~~EAAC~~;~~oBAC5B~~,MAAM,IAAA,2BAAc,EAAC,IAAA,WAAI,EAAC,aAAa,EAAE,GAAG,EAAE,KAAK,CAAC,IAAI,GAAG,8DAA+B,CAAC,~~EAC3F~~,~~EAAC~~,CAAC,8DAA+B,CAAC,EAAE,KAAK,~~EAAC~~,~~CACzC~~,CAAC;~~iBAEN~~;aACJ;SAEJ;QAED,qBAAW,CAAC,WAAW,EAAE,CAAC,GAAG,EAAE,CAAC;QAEhC,IAAI,YAAY,GAAG,IAAI,CAAA;QACvB,OAAO,EAAE,YAAY,EAAE,CAAC;IAE5B,CAAC;;~~AA7HL~~,~~wBA8HC~~;~~AA7HiB~~,iBAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC;AAExD,cAAQ,GAAG,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;AAEzD,UAAI,GAAG,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;AAEvB,iBAAW,GAAG;IAC3B,uCAAuC;IACvC,QAAQ,EAAE,eAAK,CAAC,MAAM,CAAC;QACnB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,sBAAsB,EAAE,CAAC,8BAAkB,CAAC,CAAC;KACjF,CAAC;IACF,QAAQ,EAAE,eAAK,CAAC,MAAM,CAAC;QACnB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,sBAAsB,EAAE,CAAC,8BAAkB,CAAC,CAAC;KACjF,CAAC;IACF,KAAK,EAAE,eAAK,CAAC,MAAM,CAAC;QAChB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,sBAAsB,CAAC;KAC3D,CAAC;IACF,IAAI,EAAE,eAAK,CAAC,IAAI,CAAC;QACb,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,qBAAqB,EAAE,CAAC,MAAM,CAAC,CAAC;QACjE,OAAO,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC;QAC1B,OAAO,EAAE,MAAM;KAClB,CAAC;CACL,CAAC;~~AAqGN~~,SAAgB,2BAA2B,CAAC,YAAY,EAAE,SAAS;IAC/D,IAAI,YAAY,GAAG,IAAA,0CAAwB,EAAC,IAAA,WAAI,EAAC,YAAY,EAAE,SAAS,CAAC,CAAC,CAAC;IAE3E,KAAI,MAAM,WAAW,IAAI,YAAY,EAAC;QAClC,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,YAAY,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QAC5D,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE;YAChB,KAAK,EAAE,IAAI;SACd,CAAC,CAAC;KACN;AAEL,CAAC;AAVD,kEAUC"}
1	+ {"version":3,"file":"merge.js","sourceRoot":"","sources":["../../../../src/commands/easysources/objecttranslations/merge.ts"],"names":[],"mappings":"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"}

package/lib/commands/easysources/objecttranslations/split.js CHANGED Viewed

@@ -51,6 +51,10 @@ class Split extends command_1.SfdxCommand {
             const xmlFileContent = (await (0, filesUtils_1.readXmlFromFile)(inputFile)) ?? {};
             const objTranslProperties = xmlFileContent[constants_objecttranslations_1.OBJTRANSL_ROOT_TAG] ?? {};
             const outputDir = (0, path_1.join)(baseOutputDir, objTrName, 'csv');
+            // Delete outputDir if it exists to ensure a clean split
+            if (fs.existsSync(outputDir)) {
+                fs.removeSync(outputDir);
+            }
             for (const tag_section in constants_objecttranslations_1.OBJTRANSL_ITEMS) {
                 var myjson = objTranslProperties[tag_section];
                 // skip when tag is not found in the xml

package/lib/commands/easysources/objecttranslations/split.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"split.js","sourceRoot":"","sources":["../../../../src/commands/easysources/objecttranslations/split.ts"],"names":[],"mappings":"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~~AApIL~~,~~wBAqIC~~;~~AApIiB~~,iBAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC;AAExD,cAAQ,GAAG,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;AAGtD,iBAAW,GAAG;IAC3B,uCAAuC;IACvC,QAAQ,EAAE,eAAK,CAAC,MAAM,CAAC;QACnB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,sBAAsB,EAAE,CAAC,8BAAkB,CAAC,CAAC;KACjF,CAAC;IACF,QAAQ,EAAE,eAAK,CAAC,MAAM,CAAC;QACnB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,sBAAsB,EAAE,CAAC,8BAAkB,CAAC,CAAC;KACjF,CAAC;IACF,KAAK,EAAE,eAAK,CAAC,MAAM,CAAC;QAChB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,sBAAsB,CAAC;KAC3D,CAAC;IACF,IAAI,EAAE,eAAK,CAAC,IAAI,CAAC;QACb,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,qBAAqB,EAAE,CAAC,MAAM,CAAC,CAAC;QACjE,OAAO,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC;QAC1B,OAAO,EAAE,MAAM;KAClB,CAAC;CACL,CAAC"}
1	+ {"version":3,"file":"split.js","sourceRoot":"","sources":["../../../../src/commands/easysources/objecttranslations/split.ts"],"names":[],"mappings":"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"}

package/lib/commands/easysources/objecttranslations/upsert.js CHANGED Viewed

@@ -18,6 +18,7 @@ const path_1 = require("path");
 const localSettings_1 = require("../../../utils/localSettings");
 const constants_objecttranslations_1 = require("../../../utils/constants/constants_objecttranslations");
 const utils_objtransl_1 = require("../../../utils/utils_objtransl");
+const utils_2 = require("../../../utils/commands/utils");
 const fs = require('fs-extra');
 const settings = (0, localSettings_1.loadSettings)();
 // Initialize Messages with the current plugin directory
@@ -50,9 +51,21 @@ class Upsert extends command_1.SfdxCommand {
                 continue;
             }
             console.log('Upserting: ' + objTrName);
+            const outputDir = (0, path_1.join)(baseOutputDir, objTrName, 'csv');
+            const inputFilePart = (0, path_1.join)(baseOutputDir, objTrName, 'csv', objTrName + constants_1.XML_PART_EXTENSION);
+            // If outputDir or inputFilePart doesn't exist, run split command instead
+            if (!fs.existsSync(outputDir) || !fs.existsSync(inputFilePart)) {
+                console.log('⚠️ Output csv directory or -part.xml file not found. Running split command for: ' + objTrName);
+                // Create flags for split command with just the current object
+                const splitFlags = {
+                    ...this.flags,
+                    input: objTrName
+                };
+                await (0, utils_2.executeCommand)(splitFlags, 'split', 'objecttranslations');
+                continue;
+            }
             const xmlFileContent = (await (0, filesUtils_1.readXmlFromFile)(inputFile)) ?? {};
             const objTranslProperties = xmlFileContent[constants_objecttranslations_1.OBJTRANSL_ROOT_TAG] ?? {};
-            const outputDir = (0, path_1.join)(baseOutputDir, objTrName, 'csv');
             for (const tag_section in constants_objecttranslations_1.OBJTRANSL_ITEMS) {
                 var myjson = objTranslProperties[tag_section];
                 // skip when tag is not found in the xml
@@ -105,7 +118,6 @@ class Upsert extends command_1.SfdxCommand {
                 if (tag_section !== constants_objecttranslations_1.OBJTRANSL_CFIELDTRANSL_ROOT)
                     xmlFileContent[constants_objecttranslations_1.OBJTRANSL_ROOT_TAG][tag_section] = null;
             }
-            const inputFilePart = (0, path_1.join)(baseOutputDir, objTrName, 'csv', objTrName + constants_1.XML_PART_EXTENSION);
             if (fs.existsSync(inputFilePart)) {
                 const xmlFileContentPart = (await (0, filesUtils_1.readXmlFromFile)(inputFilePart)) ?? {};
                 const objTranslPropertiesPart = xmlFileContentPart[constants_objecttranslations_1.OBJTRANSL_ROOT_TAG] ?? {};

package/lib/commands/easysources/objecttranslations/upsert.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"upsert.js","sourceRoot":"","sources":["../../../../src/commands/easysources/objecttranslations/upsert.ts"],"names":[],"mappings":";;AAAA;;;;;GAKG;AACH,yBAAyB;AACzB,iDAAyD;AACzD,2CAA4C;AAE5C,0DAA4K;AAC5K,gDAA+D;AAC/D,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,MAAM,EAAE,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AAC/D,kEAAgH;AAChH,4DAAqD;AACrD,+BAA4B;AAC5B,gEAA4D;AAC5D,wGAAyO;AACzO,oEAA2H;AAC3H,MAAM,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AAE/B,MAAM,QAAQ,GAAG,IAAA,4BAAY,GAAE,CAAC;AAEhC,wDAAwD;AACxD,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAE5C,iGAAiG;AACjG,mFAAmF;AACnF,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,mBAAmB,EAAE,kBAAkB,CAAC,CAAC;AAEhF,MAAqB,MAAO,SAAQ,qBAAW;IA8BpC,KAAK,CAAC,GAAG;QACZ,qBAAW,CAAC,WAAW,EAAE,CAAC,KAAK,EAAE,CAAC;QAElC,MAAM,YAAY,GAAG,IAAA,WAAI,EAAC,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,qBAAqB,CAAC,IAAI,8BAAkB,CAAC,EAAE,gDAAiB,CAAW,CAAC;QACxI,MAAM,aAAa,GAAG,IAAA,WAAI,EAAC,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,sBAAsB,CAAC,IAAI,8BAAkB,CAAC,EAAE,gDAAiB,CAAW,CAAC;QAC1I,MAAM,WAAW,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAW,CAAC;QAEjD,IAAA,gCAAmB,EAAC,YAAY,CAAC,CAAC;QAElC,IAAI,WAAW,GAAG,EAAE,CAAC;QACrB,IAAI,WAAW,EAAE;YACb,WAAW,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SACxC;aAAM;YACH,WAAW,GAAG,EAAE,CAAC,WAAW,CAAC,YAAY,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC;iBAC9D,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;iBAClC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;SAC9B;QAED,KAAK,MAAM,SAAS,IAAI,WAAW,EAAE;YACjC,0EAA0E;YAC1E,MAAM,YAAY,GAAG,SAAS,CAAC,QAAQ,CAAC,kDAAmB,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,GAAG,kDAAmB,CAAC;YAC3G,MAAM,SAAS,GAAG,IAAA,WAAI,EAAC,YAAY,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC;YAE9D,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;gBAC3B,OAAO,CAAC,GAAG,CAAC,YAAY,GAAG,SAAS,GAAE,SAAS,GAAG,SAAS,GAAG,kBAAkB,CAAC,CAAC;gBAClF,SAAS;aACZ;YAED,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,SAAS,CAAC,CAAC;~~YAGvC~~,MAAM,~~cAAc~~,GAAG,CAAC,MAAM,IAAA,~~4BAAe~~,EAAC,SAAS,CAAC,CAAC,IAAI,EAAE,CAAC;~~YAChE~~,~~MAAM~~,~~mBAAmB~~,GAAG,~~cAAc,~~CAAC,~~iDAAkB~~,CAAC,IAAI,EAAE,CAAC;~~YAErE~~,MAAM,SAAS,GAAG,IAAA,~~WAAI~~,EAAC,~~aAAa~~,~~EAAE~~,~~SAAS~~,EAAE,~~KAAK~~,CAAC,CAAC;~~YAIxD~~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~~YACD~~,~~MAAM,aAAa,GAAG,IAAA,WAAI,EAAC,aAAa,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,GAAG,8BAAkB,CAAC,CAAC;YAE5F,~~IAAI,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE;gBAC9B,MAAM,kBAAkB,GAAG,CAAC,MAAM,IAAA,4BAAe,EAAC,aAAa,CAAC,CAAC,IAAI,EAAE,CAAC;gBACxE,MAAM,uBAAuB,GAAG,kBAAkB,CAAC,iDAAkB,CAAC,IAAI,EAAE,CAAC;gBAE7E,KAAK,IAAI,CAAC,IAAI,mBAAmB,EAAE;oBAC/B,uBAAuB,CAAC,CAAC,CAAC,GAAG,mBAAmB,CAAC,CAAC,CAAC,CAAC;iBACvD;gBAED,IAAA,2BAAc,EAAC,aAAa,EAAE,kBAAkB,CAAC,CAAC;aACrD;iBAAM;gBACH,IAAI,EAAE,CAAC,UAAU,CAAC,IAAA,WAAI,EAAC,YAAY,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC,EAAE;oBACzD,IAAA,2BAAc,EAAC,aAAa,EAAE,mBAAmB,CAAC,CAAC;iBACtD;aACJ;SAEJ;QACD,qBAAW,CAAC,WAAW,EAAE,CAAC,GAAG,EAAE,CAAC;QAEhC,IAAI,YAAY,GAAG,IAAI,CAAA;QACvB,OAAO,EAAE,YAAY,EAAE,CAAC;IAC5B,CAAC;;~~AAhKL~~,~~yBAiKC~~;~~AAhKiB~~,kBAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC;AAExD,eAAQ,GAAG,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;AAEzD,WAAI,GAAG,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;AAEvB,kBAAW,GAAG;IAC3B,uCAAuC;IACvC,QAAQ,EAAE,eAAK,CAAC,MAAM,CAAC;QACnB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,sBAAsB,EAAE,CAAC,8BAAkB,CAAC,CAAC;KACjF,CAAC;IACF,QAAQ,EAAE,eAAK,CAAC,MAAM,CAAC;QACnB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,sBAAsB,EAAE,CAAC,8BAAkB,CAAC,CAAC;KACjF,CAAC;IACF,KAAK,EAAE,eAAK,CAAC,MAAM,CAAC;QAChB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,sBAAsB,CAAC;KAC3D,CAAC;IACF,IAAI,EAAE,eAAK,CAAC,IAAI,CAAC;QACb,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,qBAAqB,EAAE,CAAC,MAAM,CAAC,CAAC;QACjE,OAAO,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC;QAC1B,OAAO,EAAE,MAAM;KAClB,CAAC;CACL,CAAC"}
1	+ {"version":3,"file":"upsert.js","sourceRoot":"","sources":["../../../../src/commands/easysources/objecttranslations/upsert.ts"],"names":[],"mappings":"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"}

package/lib/commands/easysources/permissionsets/upsert.d.ts CHANGED Viewed

@@ -10,6 +10,8 @@ export default class Upsert extends SfdxCommand {
         "sf-xml": flags.Discriminated<flags.String>;
         "es-csv": flags.Discriminated<flags.String>;
         input: flags.Discriminated<flags.String>;
+        type: flags.Discriminated<flags.String>;
+        tagid: flags.Discriminated<flags.String>;
         sort: flags.Discriminated<flags.Enum<string>>;
     };
     run(): Promise<AnyJson>;