contensis-cli 1.2.2-beta.1 → 1.2.2-beta.10

package/dist/services/ContensisCliService.js

@@ -34,6 +34,7 @@ var import_fs = __toESM(require("fs"));
 var import_inquirer = __toESM(require("inquirer"));
 var import_node_fetch = __toESM(require("node-fetch"));
 var import_path = __toESM(require("path"));
+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");
@@ -920,7 +921,7 @@ class ContensisCli {
       }
     }
   };
-  PrintContentModels = async (modelIds = [], printRequiredBy) => {
+  PrintContentModels = async (modelIds = [], opts) => {
     const { currentProject, log, messages } = this;
     const contensis = await this.ConnectContensis();
     if (contensis) {
@@ -930,55 +931,62 @@ class ContensisCli {
       const returnModels = (modelIds == null ? void 0 : modelIds.length) ? models == null ? void 0 : models.filter(
         (m) => modelIds.some((id) => id.toLowerCase() === m.id.toLowerCase())
       ) : void 0;
-      const contentTypeIds = Array.from(
-        /* @__PURE__ */ new Set([
-          ...(returnModels || models || []).map((m) => m.id),
-          ...(returnModels || models || []).map((m) => {
-            var _a, _b;
-            return ((_b = (_a = m.dependencies) == null ? void 0 : _a.contentTypes) == null ? void 0 : _b.map((c) => c[0])) || [];
-          }).flat()
-        ])
-      );
-      const componentIds = Array.from(
-        new Set(
-          (returnModels || models || []).map((m) => {
-            var _a, _b;
-            return ((_b = (_a = m.dependencies) == null ? void 0 : _a.components) == null ? void 0 : _b.map((c) => c[0])) || [];
-          }).flat()
-        )
-      );
-      const contentModelBackup = [
-        ...contentTypes.filter(
-          (c) => contentTypeIds.map((i) => i.toLowerCase()).includes(c.id.toLowerCase())
-        ),
-        ...components.filter(
-          (c) => componentIds.map((i) => i.toLowerCase()).includes(c.id.toLowerCase())
-        )
-      ];
+      const exportResources = [];
+      if (opts.export) {
+        const contentTypeIds = Array.from(
+          /* @__PURE__ */ new Set([
+            ...(returnModels || models || []).map((m) => m.id),
+            ...(returnModels || models || []).map((m) => {
+              var _a, _b;
+              return ((_b = (_a = m.dependencies) == null ? void 0 : _a.contentTypes) == null ? void 0 : _b.map((c) => c[0])) || [];
+            }).flat()
+          ])
+        );
+        const componentIds = Array.from(
+          new Set(
+            (returnModels || models || []).map((m) => {
+              var _a, _b;
+              return ((_b = (_a = m.dependencies) == null ? void 0 : _a.components) == null ? void 0 : _b.map((c) => c[0])) || [];
+            }).flat()
+          )
+        );
+        exportResources.push(
+          ...contentTypes.filter(
+            (c) => contentTypeIds.map((i) => i.toLowerCase()).includes(c.id.toLowerCase())
+          ),
+          ...components.filter(
+            (c) => componentIds.map((i) => i.toLowerCase()).includes(c.id.toLowerCase())
+          )
+        );
+      }
       if (Array.isArray(returnModels)) {
         log.success(messages.models.list(currentProject));
-        await this.HandleFormattingAndOutput(contentModelBackup, () => {
-          var _a, _b;
-          for (const model of returnModels) {
-            if (!printRequiredBy) {
-              delete model.dependencyOf;
-              if ((_a = model.dependencies) == null ? void 0 : _a.contentTypes)
-                model.dependencies.contentTypes.forEach((id) => id[1] = []);
-              if ((_b = model.dependencies) == null ? void 0 : _b.components)
-                model.dependencies.components.forEach((id) => id[1] = []);
+        await this.HandleFormattingAndOutput(
+          opts.export ? exportResources : returnModels,
+          () => {
+            var _a, _b;
+            for (const model of returnModels) {
+              const draft = (0, import_rfdc.default)()(model);
+              if (!opts.printRequiredBy) {
+                delete draft.dependencyOf;
+                if ((_a = draft.dependencies) == null ? void 0 : _a.contentTypes)
+                  draft.dependencies.contentTypes.forEach((id) => id.pop());
+                if ((_b = draft.dependencies) == null ? void 0 : _b.components)
+                  draft.dependencies.components.forEach((id) => id.pop());
+              }
+              log.raw("");
+              log.object(draft);
             }
             log.raw("");
-            log.object(model);
           }
-          log.raw("");
-        });
+        );
       } else {
         log.success(
           messages.models.get(currentProject, (models == null ? void 0 : models.length.toString()) || "0")
         );
         log.raw("");
         if (models == null ? void 0 : models.length) {
-          await this.HandleFormattingAndOutput(contentModelBackup, () => {
+          await this.HandleFormattingAndOutput(exportResources, () => {
             var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
             for (const model of models) {
               const components2 = ((_a = model.components) == null ? void 0 : _a.length) || 0;
@@ -1389,7 +1397,7 @@ Components:`));
     logOutput,
     saveEntries
   }) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
     const { currentEnv, currentProject, log, messages } = this;
     const contensis = await this.ConnectContensisImport({
       commit,
@@ -1407,23 +1415,33 @@ Components:`));
       if (err)
         (0, import_logger.logError)(err);
       else {
-        const output = saveEntries ? (_a = contensis.content.targets[currentProject].migrateEntries) == null ? void 0 : _a.map(
-          (me) => me.finalEntry
-        ) : result;
+        const { migrateEntries, nodes } = contensis.content.targets[currentProject];
+        const output = saveEntries ? migrateEntries == null ? void 0 : migrateEntries.map((me) => me.finalEntry) : result;
         await this.HandleFormattingAndOutput(output, () => {
           (0, import_console.printEntriesMigrateResult)(this, result, {
             showAll: logOutput === "all",
             showDiff: logOutput === "all" || logOutput === "changes",
             showChanged: logOutput === "changes"
           });
+          if (["all", "changes"].includes(logOutput))
+            (0, import_console.printNodeTreeOutput)(
+              this,
+              {
+                ...nodes.rootAncestor,
+                status: "no change",
+                children: nodes.migrateNodes
+              },
+              logOutput
+            );
         });
       }
-      if (!err && !((_b = result.errors) == null ? void 0 : _b.length) && (!commit && result.entriesToMigrate[currentProject].totalCount || commit && (((_c = result.migrateResult) == null ? void 0 : _c.created) || ((_d = result.migrateResult) == null ? void 0 : _d.updated)))) {
+      if (!err && !((_a = result.errors) == null ? void 0 : _a.length) && (!commit && result.entriesToMigrate[currentProject].totalCount || commit && (((_b = result.migrateResult) == null ? void 0 : _b.created) || ((_c = result.migrateResult) == null ? void 0 : _c.updated)))) {
         log.success(
           messages.entries.imported(
             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 ? (((_d = result.migrateResult) == null ? void 0 : _d.created) || 0) + (((_e = result.migrateResult) == null ? void 0 : _e.updated) || 0) : result.entriesToMigrate[currentProject].totalCount,
+            commit ? (((_f = result.nodesResult) == null ? void 0 : _f.created) || 0) + (((_g = result.nodesResult) == null ? void 0 : _g.updated) || 0) : ((_h = result.nodesToMigrate) == null ? void 0 : _h[currentProject].totalCount) || 0
           )
         );
         if (!commit) {
@@ -1432,7 +1450,7 @@ Components:`));
         }
       } else {
         log.error(messages.entries.failedImport(currentEnv), err);
-        if (!((_h = (_g = result == null ? void 0 : result.entriesToMigrate) == null ? void 0 : _g[currentProject]) == null ? void 0 : _h.totalCount))
+        if (!((_j = (_i = result == null ? void 0 : result.entriesToMigrate) == null ? void 0 : _i[currentProject]) == null ? void 0 : _j.totalCount))
           log.help(messages.entries.notFound(currentEnv));
       }
     } else {
@@ -1541,11 +1559,11 @@ Components:`));
         console.log(log.warningText(` *** COMMITTING IMPORT *** `));
       }
       const [err, result] = await contensis.MigrateNodes();
-      const migrateTree = contensis.nodes.targetRepos[currentProject].nodes.migrateNodesTreeView;
       if (err)
         log.raw(``);
       else
         await this.HandleFormattingAndOutput(result, () => {
+          const migrateTree = contensis.nodes.targetRepos[currentProject].nodes.migrateNodesTreeView;
           (0, import_console.printNodeTreeOutput)(this, migrateTree, logOutput, logLimit);
           (0, import_console.printNodesMigrateResult)(this, result, {
             showAll: logOutput === "all",