contensis-cli 1.2.2-beta.8 → 1.3.0

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,70 +931,81 @@ 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.requiredBy) {
+                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, () => {
-            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;
-              const contentTypes2 = ((_b = model.contentTypes) == null ? void 0 : _b.length) || 0;
-              const dependencies = (((_d = (_c = model.dependencies) == null ? void 0 : _c.components) == null ? void 0 : _d.length) || 0) + (((_f = (_e = model.dependencies) == null ? void 0 : _e.contentTypes) == null ? void 0 : _f.length) || 0);
-              const dependencyOf = (((_h = (_g = model.dependencyOf) == null ? void 0 : _g.components) == null ? void 0 : _h.length) || 0) + (((_j = (_i = model.dependencyOf) == null ? void 0 : _i.contentTypes) == null ? void 0 : _j.length) || 0);
-              const hasAny = components2 + contentTypes2 + dependencies + dependencyOf;
-              log.raw(
-                `  - ${log.highlightText(log.boldText(model.id))} ${hasAny ? log.infoText(
-                  `{ ${components2 ? `components: ${components2}, ` : ""}${contentTypes2 ? `contentTypes: ${contentTypes2}, ` : ""}${dependencies ? `references: ${dependencies}, ` : ""}${dependencyOf ? `required by: ${dependencyOf}` : ""} }`
-                ) : ""}`
-              );
+          await this.HandleFormattingAndOutput(
+            opts.export ? exportResources : models,
+            () => {
+              var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
+              for (const model of models) {
+                const components2 = ((_a = model.components) == null ? void 0 : _a.length) || 0;
+                const contentTypes2 = ((_b = model.contentTypes) == null ? void 0 : _b.length) || 0;
+                const defaults = (((_c = model.defaults) == null ? void 0 : _c.length) || 0) + (((_d = model.nodes) == null ? void 0 : _d.length) || 0);
+                const dependencies = (((_f = (_e = model.dependencies) == null ? void 0 : _e.components) == null ? void 0 : _f.length) || 0) + (((_h = (_g = model.dependencies) == null ? void 0 : _g.contentTypes) == null ? void 0 : _h.length) || 0);
+                const dependencyOf = (((_j = (_i = model.dependencyOf) == null ? void 0 : _i.components) == null ? void 0 : _j.length) || 0) + (((_l = (_k = model.dependencyOf) == null ? void 0 : _k.contentTypes) == null ? void 0 : _l.length) || 0);
+                const hasAny = components2 + contentTypes2 + dependencies + dependencyOf;
+                log.raw(
+                  `  - ${log.highlightText(log.boldText(model.id))} ${hasAny ? log.infoText(
+                    `{ ${components2 ? `components: ${components2}, ` : ""}${contentTypes2 ? `contentTypes: ${contentTypes2}, ` : ""}${defaults ? `defaults: ${defaults}, ` : ""}${dependencies ? `references: ${dependencies}, ` : ""}${dependencyOf ? `required by: ${dependencyOf}` : ""} }`
+                  ) : ""}`
+                );
+              }
+              log.raw("");
             }
-            log.raw("");
-          });
+          );
         }
       }
     }
@@ -1023,7 +1035,7 @@ class ContensisCli {
         (0, import_logger.logError)(migrateErr);
       else
         await this.HandleFormattingAndOutput(result, () => {
-          if (!commit) {
+          if (!result.committed) {
             log.raw(log.boldText(`
 Content types:`));
             if (!result.contentTypes)
@@ -1038,20 +1050,59 @@ Components:`));
 `);
             else
               (0, import_console.printModelMigrationAnalysis)(this, result.components);
+            if (Object.keys(result.defaults).length) {
+              log.raw(log.boldText(`
+Defaults:`));
+              (0, import_console.printModelMigrationAnalysis)(this, result.defaults);
+            }
+            if (Object.keys(result.nodes).length) {
+              log.raw(log.boldText(`
+Nodes:`));
+              (0, import_console.printModelMigrationAnalysis)(this, result.nodes);
+            }
+            if (result.errors) {
+              log.raw(log.boldText(`
+Errors:`));
+              log.object(result.errors);
+            }
           } else {
-            const migrateResult = result;
+            const { modelsResult = {} } = result;
             log.raw(log.boldText(`
 Content types:`));
             (0, import_console.printModelMigrationResult)(
               this,
-              migrateResult[currentProject].contentTypes
+              modelsResult[currentProject].contentTypes
             );
-            log.raw(log.boldText(`
+            if (Object.values(modelsResult[currentProject].components).some(
+              (r) => r.length > 0
+            )) {
+              log.raw(log.boldText(`
 Components:`));
-            (0, import_console.printModelMigrationResult)(
-              this,
-              migrateResult[currentProject].components
-            );
+              (0, import_console.printModelMigrationResult)(
+                this,
+                modelsResult[currentProject].components
+              );
+            }
+            if (Object.values(modelsResult[currentProject].defaults).some(
+              (r) => r.length > 0
+            )) {
+              log.raw(log.boldText(`
+Defaults:`));
+              (0, import_console.printModelMigrationResult)(
+                this,
+                modelsResult[currentProject].defaults
+              );
+            }
+            if (Object.values(modelsResult[currentProject].nodes).some(
+              (r) => r.length > 0
+            )) {
+              log.raw(log.boldText(`
+Nodes:`));
+              (0, import_console.printModelMigrationResult)(
+                this,
+                modelsResult[currentProject].nodes
+              );
+            }
           }
         });
     } else {
@@ -1199,18 +1250,21 @@ Components:`));
             )}
 `
           );
-          log.raw(log.boldText(`Content types:`));
-          if (!result.contentTypes)
-            log.info(`- None returned
+          if (result.committed === false) {
+            log.raw(log.boldText(`Content types:`));
+            if (!result.contentTypes)
+              log.info(`- None returned
 `);
-          else
-            (0, import_console.printModelMigrationAnalysis)(this, result.contentTypes);
-          log.raw(log.boldText(`Components:`));
-          if (!result.components)
-            log.info(`- None returned
+            else
+              (0, import_console.printModelMigrationAnalysis)(this, result.contentTypes);
+            log.raw(log.boldText(`
+Components:`));
+            if (!result.components)
+              log.info(`- None returned
 `);
-          else
-            (0, import_console.printModelMigrationAnalysis)(this, result.components);
+            else
+              (0, import_console.printModelMigrationAnalysis)(this, result.components);
+          }
         });
     }
   };
@@ -1361,7 +1415,7 @@ Components:`));
   };
   GetEntries = async ({
     withDependents = false
-  }) => {
+  } = {}) => {
     const { currentProject, log, messages } = this;
     const contensis = await this.ConnectContensis();
     if (contensis) {
@@ -1389,7 +1443,7 @@ Components:`));
     logOutput,
     saveEntries
   }) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
     const { currentEnv, currentProject, log, messages } = this;
     const contensis = await this.ConnectContensisImport({
       commit,
@@ -1407,8 +1461,8 @@ Components:`));
       if (err)
         (0, import_logger.logError)(err);
       else {
-        const { migrateEntries, nodes } = contensis.content.targets[currentProject];
-        const output = saveEntries ? migrateEntries == null ? void 0 : migrateEntries.map((me) => me.finalEntry) : result;
+        const { entries, nodes } = contensis.content.targets[currentProject];
+        const output = saveEntries ? (_a = entries.migrate) == null ? void 0 : _a.map((me) => me.toJSON()) : result;
         await this.HandleFormattingAndOutput(output, () => {
           (0, import_console.printEntriesMigrateResult)(this, result, {
             showAll: logOutput === "all",
@@ -1427,13 +1481,13 @@ Components:`));
             );
         });
       }
-      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)))) {
+      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)))) {
         log.success(
           messages.entries.imported(
             currentEnv,
             commit,
-            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
+            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
           )
         );
         if (!commit) {
@@ -1442,7 +1496,7 @@ Components:`));
         }
       } else {
         log.error(messages.entries.failedImport(currentEnv), err);
-        if (!((_j = (_i = result == null ? void 0 : result.entriesToMigrate) == null ? void 0 : _i[currentProject]) == null ? void 0 : _j.totalCount))
+        if (!((_k = (_j = result == null ? void 0 : result.entriesToMigrate) == null ? void 0 : _j[currentProject]) == null ? void 0 : _k.totalCount))
           log.help(messages.entries.notFound(currentEnv));
       }
     } else {
@@ -1476,8 +1530,8 @@ Components:`));
       if (err)
         (0, import_logger.logError)(err);
       if (result) {
-        const output = saveEntries ? (_a = contensis.content.copy.targets[currentProject].migrateEntries) == null ? void 0 : _a.map(
-          (me) => me.finalEntry
+        const output = saveEntries ? (_a = contensis.content.copy.targets[currentProject].entries.migrate) == null ? void 0 : _a.map(
+          (me) => me.toJSON()
         ) : result;
         await this.HandleFormattingAndOutput(output, () => {
           (0, import_console.printEntriesMigrateResult)(this, result, {