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

package/src/services/ContensisCliService.ts

@@ -28,17 +28,17 @@ import {
 import ContensisAuthService from './ContensisAuthService';
 
 import { LogMessages } from '~/localisation/en-GB';
+import { MixedFileData } from '~/mappers/MixedFileData';
 import {
   CliUrls,
   OutputFormat,
   OutputOptionsConstructorArg,
 } from '~/models/CliService';
 
-import { readFileAsJSON } from '~/providers/file-provider';
 import SessionCacheProvider from '../providers/SessionCacheProvider';
 import CredentialProvider from '~/providers/CredentialProvider';
 
-import { splitTagGroupsInModels, splitTagsAndGroups, url } from '~/util';
+import { url } from '~/util';
 import { sanitiseIds } from '~/util/api-ids';
 import {
   isPassword,
@@ -67,16 +67,6 @@ import { promiseDelay } from '~/util/timers';
 import { GetTagsArgs } from 'migratortron/dist/services/TagsMigrationService';
 import { GetTagGroupsArgs } from 'migratortron/dist/services/TagGroupsMigrationService';
 
-type ImportDataType =
-  | 'entries'
-  | 'contentTypes'
-  | 'components'
-  | 'models'
-  | 'nodes'
-  | 'tagGroups'
-  | 'tags'
-  | 'user-input';
-
 let insecurePasswordWarningShown = false;
 
 class ContensisCli {
@@ -344,27 +334,21 @@ class ContensisCli {
 
   ConnectContensisImport = async ({
     commit = false,
+    noSource = false,
     fromFile,
-    importDataType,
     importData,
-    mixedData,
   }: {
     commit?: boolean;
+    noSource?: boolean;
     fromFile?: string;
-    importDataType?: ImportDataType;
-    importData?: any[];
-    mixedData?: {
-      [K in ImportDataType]?: any[];
-    };
+    importData?: MixedFileData;
   }) => {
-    const source: 'contensis' | 'file' =
-      fromFile || importData || mixedData ? 'file' : 'contensis';
-
-    const fileData =
-      importData || (fromFile ? (await readFileAsJSON(fromFile)) || [] : []);
+    const source: 'contensis' | 'user-input' =
+      fromFile || importData || noSource ? 'user-input' : 'contensis';
 
-    if (typeof fileData === 'string')
-      throw new Error(`Import file format must be of type JSON`);
+    const mixedData = fromFile
+      ? await new MixedFileData().readFile(fromFile)
+      : importData;
 
     const { contensisOpts, currentEnv, env, log, messages, sourceAlias } = this;
     const environments = this.cache.environments || {};
@@ -405,7 +389,7 @@ class ContensisCli {
       const cachedTargetPassword = targetCredentials?.current?.password;
 
       if (cachedSourcePassword && cachedTargetPassword) {
-        if (source === 'file' || importDataType === 'user-input') {
+        if (source === 'user-input') {
           this.contensis = new ContensisMigrationService(
             {
               concurrency: 2,
@@ -420,7 +404,6 @@ class ContensisCli {
                 targetProjects: [env.currentProject || ''],
                 assetHostname: this.urls?.previewWeb,
               },
-              ...(importDataType ? { [importDataType]: fileData } : {}),
               ...(mixedData || {}),
             },
             !commit
@@ -1175,14 +1158,17 @@ class ContensisCli {
   }) => {
     const { currentEnv, currentProject, log, messages } = this;
 
+    let importData;
+    if (tags) {
+      importData = new MixedFileData();
+      importData.tags = tags;
+      importData.tagGroups = data || [];
+    }
+
     const contensis = await this.ConnectContensisImport({
       commit,
       fromFile,
-      importDataType: tags ? 'user-input' : 'tagGroups',
-      mixedData: {
-        tagGroups: data,
-        tags: tags,
-      },
+      importData,
     });
 
     if (contensis) {
@@ -1304,10 +1290,7 @@ class ContensisCli {
       });
 
       if (Array.isArray(result)) {
-        let tags: ICreateTag[] = [];
-        const groups: ICreateTagGroup[] = [];
-        if (withDependents) splitTagsAndGroups(result, tags, groups);
-        else tags = result;
+        const { tags, tagGroups } = new MixedFileData(result);
 
         log.success(messages.tags.list(currentEnv, tags.length));
 
@@ -1318,11 +1301,13 @@ class ContensisCli {
               log.raw('');
               log.object(tag);
             }
-            if (groups.length) {
+            if (tagGroups.length) {
               log.raw('');
-              log.success(messages.taggroups.list(currentEnv, groups.length));
+              log.success(
+                messages.taggroups.list(currentEnv, tagGroups.length)
+              );
 
-              for (const group of groups) {
+              for (const group of tagGroups) {
                 log.raw('');
                 log.object(group);
               }
@@ -1346,25 +1331,22 @@ class ContensisCli {
       });
 
       if (Array.isArray(result)) {
-        let tags: Tag[] = [];
-        const groups: TagGroup[] = [];
-        if (withDependents) splitTagsAndGroups(result, tags, groups);
-        else tags = result;
+        const { tags, tagGroups } = new MixedFileData(result);
         log.success(messages.tags.list(currentEnv, tags.length));
 
         if (!tags.length) log.help(messages.tags.noneExist());
 
         await this.HandleFormattingAndOutput(result, () => {
           // print the tags to console
-          for (const { version, ...tag } of tags) {
+          for (const { version, ...tag } of tags as Tag[]) {
             log.raw('');
             log.object(tag);
           }
-          if (groups.length) {
+          if (tagGroups.length) {
             log.raw('');
-            log.success(messages.taggroups.list(currentEnv, groups.length));
+            log.success(messages.taggroups.list(currentEnv, tagGroups.length));
 
-            for (const { version, ...group } of groups) {
+            for (const { version, ...group } of tagGroups as TagGroup[]) {
               log.raw('');
               log.object(group);
             }
@@ -1391,30 +1373,23 @@ class ContensisCli {
   }) => {
     const { currentEnv, currentProject, log, messages } = this;
 
-    const mixedData: {
-      tags: ICreateTag[];
-      tagGroups: ICreateTagGroup[];
-    } = { tags: [], tagGroups: [] };
+    let importData;
 
     if (data) {
-      mixedData.tags = data;
-      mixedData.tagGroups = [...new Set(data.map(t => t.groupId))].map(
+      importData = new MixedFileData();
+      importData.tags = data;
+      importData.tagGroups = [...new Set(data.map(t => t.groupId))].map(
         id =>
           ({
             id,
           }) as ICreateTagGroup
       );
     }
-    if (fromFile) {
-      // File may contain mix of tags and tag groups, separate those here
-      const fileData = fromFile ? (await readFileAsJSON(fromFile)) || [] : [];
-      splitTagsAndGroups(fileData, mixedData.tags, mixedData.tagGroups);
-    }
 
     const contensis = await this.ConnectContensisImport({
       commit,
-      importDataType: 'tags',
-      mixedData,
+      fromFile,
+      importData,
     });
 
     if (contensis) {
@@ -1492,7 +1467,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();
@@ -1839,25 +1814,9 @@ class ContensisCli {
   }) => {
     const { currentProject, log, messages } = this;
 
-    const mixedData: {
-      models: (ContentType | Component)[];
-      tagGroups: ICreateTagGroup[];
-    } = { models: [], tagGroups: [] };
-
-    if (fromFile) {
-      // File may contain mix of content types, components and tag groups, separate those here
-      const fileData = fromFile ? (await readFileAsJSON(fromFile)) || [] : [];
-      splitTagGroupsInModels(fileData, mixedData.models, mixedData.tagGroups);
-    }
-    // const fileData = fromFile
-    //   ? (await readFileAsJSON<(ContentType | Component | TagGroup)[]>(fromFile)) || []
-    //   : [];
-    // if (typeof fileData === 'string')
-    //   throw new Error(`Import file format must be of type JSON`);
-
     const contensis = await this.ConnectContensisImport({
       commit,
-      mixedData: mixedData.models.length ? mixedData : undefined,
+      fromFile,
     });
 
     if (contensis) {
@@ -2013,7 +1972,7 @@ class ContensisCli {
     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);
@@ -2053,23 +2012,18 @@ class ContensisCli {
   ) => {
     const { currentProject, log, messages } = this;
 
-    let fileData = fromFile
-      ? (await readFileAsJSON<ContentType[]>(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 MixedFileData().readFile(fromFile);
 
     const contensis = await this.ConnectContensisImport({
       commit,
-      importDataType: fromFile ? 'user-input' : undefined,
+      noSource: !!fromFile,
     });
 
     if (contensis) {
       if (fromFile)
         // Pass each content type to the target repo
-        for (const contentType of fileData) {
+        for (const contentType of importData.models) {
           // Fix invalid data
           contentType.projectId = currentProject;
           delete contentType.uuid;
@@ -2112,22 +2066,16 @@ class ContensisCli {
   ) => {
     const { log } = this;
 
-    let fileData = fromFile
-      ? (await readFileAsJSON<ContentType[]>(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 MixedFileData().readFile(fromFile);
 
-    const contensis = await this.ConnectContensisImport({
-      fromFile,
-      importDataType: 'models',
-    });
+    const contensis = await this.ConnectContensisImport({ fromFile });
 
     if (contensis) {
       const [err, result] = (await to(
-        contensis.models.Diff(fileData.length ? fileData : modelIds)
+        contensis.models.Diff(
+          importData.models.length ? importData.models : modelIds
+        )
       )) as [Error | null, ContentTypesResult | undefined];
 
       if (err) log.error(err.message, err);
@@ -2201,10 +2149,12 @@ class ContensisCli {
 
   RemoveComponents = async (componentIds: string[], commit = false) => {
     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(
         undefined,
@@ -2247,23 +2197,18 @@ class ContensisCli {
   ) => {
     const { currentProject, log, messages } = this;
 
-    let fileData = fromFile
-      ? (await readFileAsJSON<Component[]>(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 MixedFileData().readFile(fromFile);
 
     const contensis = await this.ConnectContensisImport({
       commit,
-      importDataType: fromFile ? 'user-input' : undefined,
+      noSource: !!fromFile,
     });
 
     if (contensis) {
       // Pass each component to the target repo
       if (fromFile)
-        for (const component of fileData) {
+        for (const component of importData.models) {
           // Fix invalid data
           component.projectId = currentProject;
           delete component.uuid;
@@ -2302,7 +2247,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) {
@@ -2392,11 +2337,13 @@ class ContensisCli {
   }) => {
     const { currentEnv, currentProject, log, messages } = this;
 
+    let importData;
+    if (data) importData = new MixedFileData(data);
+
     const contensis = await this.ConnectContensisImport({
       commit,
       fromFile,
-      importDataType: 'entries',
-      importData: data,
+      importData,
     });
 
     if (contensis) {
@@ -2411,13 +2358,16 @@ class ContensisCli {
 
       if (err) 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
             [
               entries.migrate?.map(me => me.toJSON()) || [],
               nodes.migrateNodes.map(mn => mn.node),
+              tags.migrateTags.map(mt => mt.toJSON()),
+              tags.migrateGroups.map(mg => mg.toJSON()),
             ].flat()
           : result;
         await this.HandleFormattingAndOutput(output, () => {
@@ -2461,7 +2411,12 @@ class ContensisCli {
               ? (result.nodesResult?.created || 0) +
                   (result.nodesResult?.updated || 0)
               : (result.nodesToMigrate?.[currentProject]
-                  .totalCount as number) || 0
+                  .totalCount as number) || 0,
+            commit
+              ? (result.tagsResult?.created || 0) +
+                  (result.tagsResult?.updated || 0)
+              : (result.tagsToMigrate?.[currentProject].totalCount as number) ||
+                  0
           )
         );
         if (!commit) {
@@ -2479,7 +2434,8 @@ class ContensisCli {
           noChanges &&
           !err &&
           !result?.migrateResult?.errors &&
-          !result?.nodesResult?.errors
+          !result?.nodesResult?.errors &&
+          !result?.tagsResult?.errors
         ) {
           log.help(messages.entries.noChange(currentEnv));
         } else {
@@ -2510,7 +2466,6 @@ class ContensisCli {
     const contensis = await this.ConnectContensisImport({
       commit,
       fromFile,
-      importDataType: 'entries',
     });
 
     if (contensis) {
@@ -2591,7 +2546,6 @@ class ContensisCli {
     const contensis = await this.ConnectContensisImport({
       commit,
       fromFile,
-      importDataType: 'entries',
     });
 
     if (contensis) {
@@ -2698,7 +2652,6 @@ class ContensisCli {
     const contensis = await this.ConnectContensisImport({
       commit,
       fromFile,
-      importDataType: 'nodes',
     });
 
     if (contensis) {
@@ -2773,7 +2726,7 @@ class ContensisCli {
     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) {

package/src/util/console.printer.ts

@@ -140,14 +140,14 @@ export const printEntriesMigrateResult = (
       string,
       any,
     ][]) {
+      const projectStatus = Object.entries(
+        Object.entries(entryStatus[currentProject])[0]
+      )[1][1] as any;
       if (
         showAll ||
         (showChanged &&
-          (
-            Object.entries(
-              Object.entries(entryStatus[currentProject])[0]
-            )[1][1] as any
-          ).status !== 'no change')
+          projectStatus.status !== 'no change' &&
+          projectStatus.status !== 'ignore')
       ) {
         console.log(
           log.infoText(
@@ -215,7 +215,8 @@ export const printEntriesMigrateResult = (
       const existingPercent = ((existingCount / count) * 100).toFixed(0);
       const noChangeOrTotalEntriesCount =
         typeof migrateStatusAndCount !== 'number'
-          ? migrateStatusAndCount?.['no change'] || 0
+          ? (migrateStatusAndCount?.['no change'] || 0) +
+            (migrateStatusAndCount?.['ignore'] || 0)
           : migrateStatusAndCount;
 
       const changedPercentage = (
@@ -434,7 +435,7 @@ export const printModelMigrationAnalysis = (
             )}`;
           if (projectDetails.error)
             errorOutput += `      ${log.highlightText(
-              `error::`
+              `error:`
             )} ${log.errorText(projectDetails.error)}`;
         }
       }

package/src/util/index.ts

@@ -41,29 +41,3 @@ export const Logging = async (language = 'en-GB') => {
     Log: Logger,
   };
 };
-
-export const splitTagsAndGroups = (
-  tagsAndGroups: unknown[] = [],
-  tags: ICreateTag[] = [],
-  groups: ICreateTagGroup[] = []
-) => {
-  for (const item of tagsAndGroups) {
-    if (isObject(item) && 'id' in item) {
-      if ('name' in item) groups.push(item as ICreateTagGroup);
-      else tags.push(item as ICreateTag);
-    }
-  }
-};
-
-export const splitTagGroupsInModels = (
-  mixedData: unknown[] = [],
-  models: (ContentType | Component)[] = [],
-  groups: ICreateTagGroup[] = []
-) => {
-  for (const item of mixedData) {
-    if (isObject(item) && 'id' in item) {
-      if (!('dataFormat' in item)) groups.push(item as ICreateTagGroup);
-      else models.push(item as ContentType | Component);
-    }
-  }
-};

package/src/version.ts

@@ -1 +1 @@
-export const LIB_VERSION = "1.5.1-beta.7";
+export const LIB_VERSION = "1.5.1-beta.9";