contensis-cli 1.5.1-beta.7 → 1.5.1-beta.9

package/dist/services/ContensisCliService.js

@@ -42,7 +42,7 @@ var import_rfdc = __toESM(require("rfdc"));
 var import_migratortron = require("migratortron");
 var import_ContensisAuthService = __toESM(require("./ContensisAuthService"));
 var import_en_GB = require("../localisation/en-GB");
-var import_file_provider = require("../providers/file-provider");
+var import_MixedFileData = require("../mappers/MixedFileData");
 var import_SessionCacheProvider = __toESM(require("../providers/SessionCacheProvider"));
 var import_CredentialProvider = __toESM(require("../providers/CredentialProvider"));
 var import_util = require("../util");
@@ -262,16 +262,13 @@ class ContensisCli {
   };
   ConnectContensisImport = async ({
     commit = false,
+    noSource = false,
     fromFile,
-    importDataType,
-    importData,
-    mixedData
+    importData
   }) => {
     var _a, _b, _c, _d, _e, _f;
-    const source = fromFile || importData || mixedData ? "file" : "contensis";
-    const fileData = importData || (fromFile ? await (0, import_file_provider.readFileAsJSON)(fromFile) || [] : []);
-    if (typeof fileData === "string")
-      throw new Error(`Import file format must be of type JSON`);
+    const source = fromFile || importData || noSource ? "user-input" : "contensis";
+    const mixedData = fromFile ? await new import_MixedFileData.MixedFileData().readFile(fromFile) : importData;
     const { contensisOpts, currentEnv, env, log, messages, sourceAlias } = this;
     const environments = this.cache.environments || {};
     const sourceEnvironment = environments[sourceAlias || ""] || {};
@@ -297,7 +294,7 @@ class ContensisCli {
       );
       const cachedTargetPassword = (_b = targetCredentials == null ? void 0 : targetCredentials.current) == null ? void 0 : _b.password;
       if (cachedSourcePassword && cachedTargetPassword) {
-        if (source === "file" || importDataType === "user-input") {
+        if (source === "user-input") {
           this.contensis = new import_migratortron.ContensisMigrationService(
             {
               concurrency: 2,
@@ -312,7 +309,6 @@ class ContensisCli {
                 targetProjects: [env.currentProject || ""],
                 assetHostname: (_d = this.urls) == null ? void 0 : _d.previewWeb
               },
-              ...importDataType ? { [importDataType]: fileData } : {},
               ...mixedData || {}
             },
             !commit
@@ -891,14 +887,16 @@ class ContensisCli {
   }) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i;
     const { currentEnv, currentProject, log, messages } = this;
+    let importData;
+    if (tags) {
+      importData = new import_MixedFileData.MixedFileData();
+      importData.tags = tags;
+      importData.tagGroups = data || [];
+    }
     const contensis = await this.ConnectContensisImport({
       commit,
       fromFile,
-      importDataType: tags ? "user-input" : "tagGroups",
-      mixedData: {
-        tagGroups: data,
-        tags
-      }
+      importData
     });
     if (contensis) {
       log.line();
@@ -994,10 +992,7 @@ class ContensisCli {
         withDependents
       });
       if (Array.isArray(result)) {
-        let tags = [];
-        const groups = [];
-        if (withDependents) (0, import_util.splitTagsAndGroups)(result, tags, groups);
-        else tags = result;
+        const { tags, tagGroups } = new import_MixedFileData.MixedFileData(result);
         log.success(messages.tags.list(currentEnv, tags.length));
         if (tags)
           await this.HandleFormattingAndOutput(result, () => {
@@ -1005,10 +1000,12 @@ class ContensisCli {
               log.raw("");
               log.object(tag);
             }
-            if (groups.length) {
+            if (tagGroups.length) {
               log.raw("");
-              log.success(messages.taggroups.list(currentEnv, groups.length));
-              for (const group of groups) {
+              log.success(
+                messages.taggroups.list(currentEnv, tagGroups.length)
+              );
+              for (const group of tagGroups) {
                 log.raw("");
                 log.object(group);
               }
@@ -1027,10 +1024,7 @@ class ContensisCli {
         withDependents
       });
       if (Array.isArray(result)) {
-        let tags = [];
-        const groups = [];
-        if (withDependents) (0, import_util.splitTagsAndGroups)(result, tags, groups);
-        else tags = result;
+        const { tags, tagGroups } = new import_MixedFileData.MixedFileData(result);
         log.success(messages.tags.list(currentEnv, tags.length));
         if (!tags.length) log.help(messages.tags.noneExist());
         await this.HandleFormattingAndOutput(result, () => {
@@ -1038,10 +1032,10 @@ class ContensisCli {
             log.raw("");
             log.object(tag);
           }
-          if (groups.length) {
+          if (tagGroups.length) {
             log.raw("");
-            log.success(messages.taggroups.list(currentEnv, groups.length));
-            for (const { version, ...group } of groups) {
+            log.success(messages.taggroups.list(currentEnv, tagGroups.length));
+            for (const { version, ...group } of tagGroups) {
               log.raw("");
               log.object(group);
             }
@@ -1060,23 +1054,20 @@ class ContensisCli {
   }) => {
     var _a, _b, _c, _d, _e, _f, _g, _h;
     const { currentEnv, currentProject, log, messages } = this;
-    const mixedData = { tags: [], tagGroups: [] };
+    let importData;
     if (data) {
-      mixedData.tags = data;
-      mixedData.tagGroups = [...new Set(data.map((t) => t.groupId))].map(
+      importData = new import_MixedFileData.MixedFileData();
+      importData.tags = data;
+      importData.tagGroups = [...new Set(data.map((t) => t.groupId))].map(
         (id) => ({
           id
         })
       );
     }
-    if (fromFile) {
-      const fileData = fromFile ? await (0, import_file_provider.readFileAsJSON)(fromFile) || [] : [];
-      (0, import_util.splitTagsAndGroups)(fileData, mixedData.tags, mixedData.tagGroups);
-    }
     const contensis = await this.ConnectContensisImport({
       commit,
-      importDataType: "tags",
-      mixedData
+      fromFile,
+      importData
     });
     if (contensis) {
       log.line();
@@ -1136,8 +1127,7 @@ class ContensisCli {
     this.contensisOpts.concurrency = 1;
     const contensis = await this.ConnectContensisImport({
       commit,
-      importDataType: "user-input"
-      // 'user-input' import type does not require a source cms
+      noSource: true
     });
     if (contensis) {
       log.line();
@@ -1393,14 +1383,9 @@ class ContensisCli {
     fromFile
   }) => {
     const { currentProject, log, messages } = this;
-    const mixedData = { models: [], tagGroups: [] };
-    if (fromFile) {
-      const fileData = fromFile ? await (0, import_file_provider.readFileAsJSON)(fromFile) || [] : [];
-      (0, import_util.splitTagGroupsInModels)(fileData, mixedData.models, mixedData.tagGroups);
-    }
     const contensis = await this.ConnectContensisImport({
       commit,
-      mixedData: mixedData.models.length ? mixedData : void 0
+      fromFile
     });
     if (contensis) {
       log.line();
@@ -1544,8 +1529,7 @@ Nodes:`));
     const { currentProject, log, messages } = this;
     const contensis = await this.ConnectContensisImport({
       commit,
-      importDataType: "user-input"
-      // 'user-input' import type does not require a source cms
+      noSource: true
     });
     if (contensis) {
       const [err, result] = await contensis.DeleteContentTypes(contentTypeIds);
@@ -1575,17 +1559,15 @@ Nodes:`));
     fromFile
   }, contentTypeIds = []) => {
     const { currentProject, log, messages } = this;
-    let fileData = fromFile ? await (0, import_file_provider.readFileAsJSON)(fromFile) || [] : [];
-    if (typeof fileData === "string")
-      throw new Error(`Import file format must be of type JSON`);
-    if (!Array.isArray(fileData)) fileData = [fileData];
+    let importData;
+    if (fromFile) importData = await new import_MixedFileData.MixedFileData().readFile(fromFile);
     const contensis = await this.ConnectContensisImport({
       commit,
-      importDataType: fromFile ? "user-input" : void 0
+      noSource: !!fromFile
     });
     if (contensis) {
       if (fromFile)
-        for (const contentType of fileData) {
+        for (const contentType of importData.models) {
           contentType.projectId = currentProject;
           delete contentType.uuid;
           const [err, , createStatus] = await contensis.models.targets[currentProject].repo.UpsertContentType(false, contentType);
@@ -1616,17 +1598,14 @@ Nodes:`));
     fromFile
   }, modelIds = []) => {
     const { log } = this;
-    let fileData = fromFile ? await (0, import_file_provider.readFileAsJSON)(fromFile) || [] : [];
-    if (typeof fileData === "string")
-      throw new Error(`Import file format must be of type JSON`);
-    if (!Array.isArray(fileData)) fileData = [fileData];
-    const contensis = await this.ConnectContensisImport({
-      fromFile,
-      importDataType: "models"
-    });
+    let importData;
+    if (fromFile) importData = await new import_MixedFileData.MixedFileData().readFile(fromFile);
+    const contensis = await this.ConnectContensisImport({ fromFile });
     if (contensis) {
       const [err, result] = await (0, import_await_to_js.default)(
-        contensis.models.Diff(fileData.length ? fileData : modelIds)
+        contensis.models.Diff(
+          importData.models.length ? importData.models : modelIds
+        )
       );
       if (err) log.error(err.message, err);
       if (result)
@@ -1693,8 +1672,7 @@ Components:`));
     const { currentProject, log, messages } = this;
     const contensis = await this.ConnectContensisImport({
       commit,
-      importDataType: "user-input"
-      // 'user-input' import type does not require a source cms
+      noSource: true
     });
     if (contensis) {
       const [err, result] = await contensis.DeleteContentTypes(
@@ -1727,17 +1705,15 @@ Components:`));
     fromFile
   }, componentIds = []) => {
     const { currentProject, log, messages } = this;
-    let fileData = fromFile ? await (0, import_file_provider.readFileAsJSON)(fromFile) || [] : [];
-    if (typeof fileData === "string")
-      throw new Error(`Import file format must be of type JSON`);
-    if (!Array.isArray(fileData)) fileData = [fileData];
+    let importData;
+    if (fromFile) importData = await new import_MixedFileData.MixedFileData().readFile(fromFile);
     const contensis = await this.ConnectContensisImport({
       commit,
-      importDataType: fromFile ? "user-input" : void 0
+      noSource: !!fromFile
     });
     if (contensis) {
       if (fromFile)
-        for (const component of fileData) {
+        for (const component of importData.models) {
           component.projectId = currentProject;
           delete component.uuid;
           const [err, , createStatus] = await contensis.models.targets[currentProject].repo.UpsertComponent(false, component);
@@ -1770,8 +1746,7 @@ Components:`));
     this.contensisOpts.concurrency = 1;
     const contensis = await this.ConnectContensisImport({
       commit,
-      importDataType: "user-input"
-      // 'user-input' import type does not require a source cms
+      noSource: true
     });
     if (contensis) {
       if (contensis.isPreview) {
@@ -1836,13 +1811,14 @@ Components:`));
     saveEntries,
     data
   }) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r;
     const { currentEnv, currentProject, log, messages } = this;
+    let importData;
+    if (data) importData = new import_MixedFileData.MixedFileData(data);
     const contensis = await this.ConnectContensisImport({
       commit,
       fromFile,
-      importDataType: "entries",
-      importData: data
+      importData
     });
     if (contensis) {
       log.line();
@@ -1854,12 +1830,14 @@ Components:`));
       const [err, result] = await contensis.MigrateEntries();
       if (err) (0, import_logger.logError)(err);
       else {
-        const { entries, nodes } = contensis.content.targets[currentProject];
+        const { entries, nodes, tags } = contensis.content.targets[currentProject];
         const output = saveEntries ? (
-          // include entries and dependent nodes when saving entries
+          // include entries and dependent nodes (or tags) when saving entries
           [
             ((_a = entries.migrate) == null ? void 0 : _a.map((me) => me.toJSON())) || [],
-            nodes.migrateNodes.map((mn) => mn.node)
+            nodes.migrateNodes.map((mn) => mn.node),
+            tags.migrateTags.map((mt) => mt.toJSON()),
+            tags.migrateGroups.map((mg) => mg.toJSON())
           ].flat()
         ) : result;
         await this.HandleFormattingAndOutput(output, () => {
@@ -1886,7 +1864,8 @@ Components:`));
             currentEnv,
             commit,
             commit ? (((_e = result.migrateResult) == null ? void 0 : _e.created) || 0) + (((_f = result.migrateResult) == null ? void 0 : _f.updated) || 0) : result.entriesToMigrate[currentProject].totalCount,
-            commit ? (((_g = result.nodesResult) == null ? void 0 : _g.created) || 0) + (((_h = result.nodesResult) == null ? void 0 : _h.updated) || 0) : ((_i = result.nodesToMigrate) == null ? void 0 : _i[currentProject].totalCount) || 0
+            commit ? (((_g = result.nodesResult) == null ? void 0 : _g.created) || 0) + (((_h = result.nodesResult) == null ? void 0 : _h.updated) || 0) : ((_i = result.nodesToMigrate) == null ? void 0 : _i[currentProject].totalCount) || 0,
+            commit ? (((_j = result.tagsResult) == null ? void 0 : _j.created) || 0) + (((_k = result.tagsResult) == null ? void 0 : _k.updated) || 0) : ((_l = result.tagsToMigrate) == null ? void 0 : _l[currentProject].totalCount) || 0
           )
         );
         if (!commit) {
@@ -1894,14 +1873,14 @@ Components:`));
           log.help(messages.migrate.commitTip());
         }
       } else {
-        const noChanges = Object.values((_j = result == null ? void 0 : result.entriesToMigrate) == null ? void 0 : _j[currentProject]).every(
+        const noChanges = Object.values((_m = result == null ? void 0 : result.entriesToMigrate) == null ? void 0 : _m[currentProject]).every(
           (status) => typeof status === "number" || (status["no change"] || 0) > 0
         ) && result.entriesToMigrate[currentProject].totalCount === 0;
-        if (noChanges && !err && !((_k = result == null ? void 0 : result.migrateResult) == null ? void 0 : _k.errors) && !((_l = result == null ? void 0 : result.nodesResult) == null ? void 0 : _l.errors)) {
+        if (noChanges && !err && !((_n = result == null ? void 0 : result.migrateResult) == null ? void 0 : _n.errors) && !((_o = result == null ? void 0 : result.nodesResult) == null ? void 0 : _o.errors) && !((_p = result == null ? void 0 : result.tagsResult) == null ? void 0 : _p.errors)) {
           log.help(messages.entries.noChange(currentEnv));
         } else {
           log.error(messages.entries.failedImport(currentEnv), err);
-          if (!((_n = (_m = result == null ? void 0 : result.entriesToMigrate) == null ? void 0 : _m[currentProject]) == null ? void 0 : _n.totalCount))
+          if (!((_r = (_q = result == null ? void 0 : result.entriesToMigrate) == null ? void 0 : _q[currentProject]) == null ? void 0 : _r.totalCount))
             log.help(messages.entries.notFound(currentEnv));
         }
       }
@@ -1920,8 +1899,7 @@ Components:`));
     const { currentEnv, currentProject, log, messages } = this;
     const contensis = await this.ConnectContensisImport({
       commit,
-      fromFile,
-      importDataType: "entries"
+      fromFile
     });
     if (contensis) {
       log.line();
@@ -1978,8 +1956,7 @@ Components:`));
     const { currentEnv, currentProject, log, messages } = this;
     const contensis = await this.ConnectContensisImport({
       commit,
-      fromFile,
-      importDataType: "entries"
+      fromFile
     });
     if (contensis) {
       log.line();
@@ -2056,8 +2033,7 @@ Components:`));
     const { currentEnv, currentProject, log, messages } = this;
     const contensis = await this.ConnectContensisImport({
       commit,
-      fromFile,
-      importDataType: "nodes"
+      fromFile
     });
     if (contensis) {
       log.line();
@@ -2114,8 +2090,7 @@ Components:`));
     const { currentEnv, currentProject, log, messages } = this;
     const contensis = await this.ConnectContensisImport({
       commit,
-      importDataType: "user-input"
-      // 'user-input' import type does not require a source cms
+      noSource: true
     });
     if (contensis) {
       if (contensis.isPreview) {