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

package/dist/services/ContensisCliService.js

@@ -121,7 +121,7 @@ class ContensisCli {
       );
     }
     this.format = outputOpts == null ? void 0 : outputOpts.format;
-    this.output = (outputOpts == null ? void 0 : outputOpts.output) && import_path.default.join(process.cwd(), outputOpts.output);
+    this.output = (outputOpts == null ? void 0 : outputOpts.output) ? import_path.default.isAbsolute(outputOpts.output) ? outputOpts.output : import_path.default.join(process.cwd(), outputOpts.output) : void 0;
     const currentEnvironment = (outputOpts == null ? void 0 : outputOpts.alias) || this.currentEnv;
     const environments = this.cache.environments || {};
     this.currentEnv = currentEnvironment;
@@ -1058,7 +1058,7 @@ class ContensisCli {
     data,
     save
   }) => {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     const { currentEnv, currentProject, log, messages } = this;
     const mixedData = { tags: [], tagGroups: [] };
     if (data) {
@@ -1112,13 +1112,18 @@ class ContensisCli {
           log.help(messages.migrate.commitTip());
         }
       } else {
-        log.error(
-          messages.tags.failedCreate(
-            currentEnv,
-            (data == null ? void 0 : data.length) === 1 ? data == null ? void 0 : data[0].label["en-GB"] : void 0
-          ),
-          err
-        );
+        const noChanges = ((_g = (_f = result == null ? void 0 : result.tagsToMigrate) == null ? void 0 : _f[currentProject]) == null ? void 0 : _g["no change"]) && result.tagsToMigrate[currentProject].totalCount === 0 && result.groupsToMigrate[currentProject].totalCount === 0;
+        if (noChanges && !err && !((_h = result.errors) == null ? void 0 : _h.length)) {
+          log.help(messages.tags.noChange(currentEnv));
+        } else {
+          log.error(
+            messages.tags.failedCreate(
+              currentEnv,
+              (data == null ? void 0 : data.length) === 1 ? data == null ? void 0 : data[0].label["en-GB"] : void 0
+            ),
+            err
+          );
+        }
       }
     } else {
       log.warning(messages.models.noList(currentProject));
@@ -1288,6 +1293,7 @@ class ContensisCli {
       const models = await contensis.models.contentModels();
       const contentTypes = await contensis.models.contentTypes();
       const components = await contensis.models.components();
+      const tagGroups = await contensis.models.tagGroups();
       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;
@@ -1310,12 +1316,23 @@ class ContensisCli {
             }).flat()
           )
         );
+        const tagGroupIds = Array.from(
+          new Set(
+            (returnModels || models || []).map((m) => {
+              var _a, _b;
+              return ((_b = (_a = m.dependencies) == null ? void 0 : _a.tagGroups) == null ? void 0 : _b.map((g) => g[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())
+          ),
+          ...tagGroups.filter(
+            (g) => tagGroupIds.map((i) => i.toLowerCase()).includes(g.id.toLowerCase())
           )
         );
       }
@@ -1349,17 +1366,18 @@ class ContensisCli {
           await this.HandleFormattingAndOutput(
             opts.export ? exportResources : models,
             () => {
-              var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
+              var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o;
               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;
+                const tagGroups2 = ((_c = model.tagGroups) == null ? void 0 : _c.length) || 0;
+                const defaults = (((_d = model.defaults) == null ? void 0 : _d.length) || 0) + (((_e = model.nodes) == null ? void 0 : _e.length) || 0);
+                const dependencies = (((_g = (_f = model.dependencies) == null ? void 0 : _f.components) == null ? void 0 : _g.length) || 0) + (((_i = (_h = model.dependencies) == null ? void 0 : _h.contentTypes) == null ? void 0 : _i.length) || 0) + (((_k = (_j = model.dependencies) == null ? void 0 : _j.tagGroups) == null ? void 0 : _k.length) || 0);
+                const dependencyOf = (((_m = (_l = model.dependencyOf) == null ? void 0 : _l.components) == null ? void 0 : _m.length) || 0) + (((_o = (_n = model.dependencyOf) == null ? void 0 : _n.contentTypes) == null ? void 0 : _o.length) || 0);
+                const hasAny = components2 + contentTypes2 + tagGroups2 + 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}` : ""} }`
+                    `{ ${components2 ? `components: ${components2}, ` : ""}${contentTypes2 ? `contentTypes: ${contentTypes2}, ` : ""}${tagGroups2 ? `tagGroups: ${tagGroups2}, ` : ""}${defaults ? `defaults: ${defaults}, ` : ""}${dependencies ? `references: ${dependencies}, ` : ""}${dependencyOf ? `required by: ${dependencyOf}` : ""} }`
                   ) : ""}`
                 );
               }
@@ -1375,13 +1393,14 @@ class ContensisCli {
     fromFile
   }) => {
     const { currentProject, log, messages } = this;
-    const fileData = fromFile ? await (0, import_file_provider.readFileAsJSON)(fromFile) || [] : [];
-    if (typeof fileData === "string")
-      throw new Error(`Import file format must be of type JSON`);
+    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,
-      fromFile,
-      importDataType: "models"
+      mixedData: mixedData.models.length ? mixedData : void 0
     });
     if (contensis) {
       log.line();
@@ -1405,6 +1424,11 @@ Components:`));
             if (!result.components) log.info(`- None returned
 `);
             else (0, import_console.printModelMigrationAnalysis)(this, result.components);
+            if (result.tagGroups && Object.keys(result.tagGroups).length) {
+              log.raw(log.boldText(`
+Tag Groups:`));
+              (0, import_console.printModelMigrationAnalysis)(this, result.tagGroups);
+            }
             if (result.defaults && Object.keys(result.defaults).length) {
               log.raw(log.boldText(`
 Defaults:`));
@@ -1438,6 +1462,16 @@ Components:`));
                 modelsResult[currentProject].components
               );
             }
+            if (Object.values(modelsResult[currentProject].tagGroups || {}).some(
+              (r) => r.length > 0
+            )) {
+              log.raw(log.boldText(`
+Tag Groups:`));
+              (0, import_console.printModelMigrationResult)(
+                this,
+                modelsResult[currentProject].tagGroups
+              );
+            }
             if (Object.values(modelsResult[currentProject].defaults || {}).some(
               (r) => r.length > 0
             )) {
@@ -1532,6 +1566,7 @@ Nodes:`));
           )
         );
         await this.HandleFormattingAndOutput(result, log.object);
+        if (!commit) log.help(messages.migrate.commitTip());
       }
     }
   };
@@ -1574,6 +1609,7 @@ Nodes:`));
         );
         await this.HandleFormattingAndOutput(result, log.object);
       }
+      if (!commit) log.help(messages.migrate.commitTip());
     }
   };
   DiffModels = async ({
@@ -1682,6 +1718,7 @@ Components:`));
           )
         );
         await this.HandleFormattingAndOutput(result, log.object);
+        if (!commit) log.help(messages.migrate.commitTip());
       }
     }
   };
@@ -1724,6 +1761,7 @@ Components:`));
         );
         await this.HandleFormattingAndOutput(result, log.object);
       }
+      if (!commit) log.help(messages.migrate.commitTip());
     }
   };
   RemoveEntries = async (commit = false) => {
@@ -1798,7 +1836,7 @@ Components:`));
     saveEntries,
     data
   }) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
     const { currentEnv, currentProject, log, messages } = this;
     const contensis = await this.ConnectContensisImport({
       commit,
@@ -1856,9 +1894,16 @@ Components:`));
           log.help(messages.migrate.commitTip());
         }
       } else {
-        log.error(messages.entries.failedImport(currentEnv), err);
-        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));
+        const noChanges = Object.values((_j = result == null ? void 0 : result.entriesToMigrate) == null ? void 0 : _j[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)) {
+          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))
+            log.help(messages.entries.notFound(currentEnv));
+        }
       }
     } else {
       log.warning(messages.models.noList(currentProject));