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

package/dist/util/index.js

@@ -29,15 +29,12 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var util_exports = {};
 __export(util_exports, {
   Logging: () => Logging,
-  splitTagGroupsInModels: () => splitTagGroupsInModels,
-  splitTagsAndGroups: () => splitTagsAndGroups,
   url: () => url
 });
 module.exports = __toCommonJS(util_exports);
 var import_mergeWith = __toESM(require("lodash/mergeWith"));
 var import_logger = require("./logger");
 var import_en_GB = require("../localisation/en-GB.js");
-var import_lodash = require("lodash");
 const url = (alias, project) => {
   const projectAndAlias = project && project.toLowerCase() !== "website" ? `${project.toLowerCase()}-${alias}` : alias;
   return {
@@ -63,27 +60,9 @@ const Logging = async (language = "en-GB") => {
     Log: import_logger.Logger
   };
 };
-const splitTagsAndGroups = (tagsAndGroups = [], tags = [], groups = []) => {
-  for (const item of tagsAndGroups) {
-    if ((0, import_lodash.isObject)(item) && "id" in item) {
-      if ("name" in item) groups.push(item);
-      else tags.push(item);
-    }
-  }
-};
-const splitTagGroupsInModels = (mixedData = [], models = [], groups = []) => {
-  for (const item of mixedData) {
-    if ((0, import_lodash.isObject)(item) && "id" in item) {
-      if (!("dataFormat" in item)) groups.push(item);
-      else models.push(item);
-    }
-  }
-};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Logging,
-  splitTagGroupsInModels,
-  splitTagsAndGroups,
   url
 });
 //# sourceMappingURL=index.js.map

package/dist/util/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/util/index.ts"],
-  "sourcesContent": ["import { ContentType, Component } from 'contensis-core-api';\nimport { ICreateTag, ICreateTagGroup } from 'contensis-management-api';\nimport mergeWith from 'lodash/mergeWith';\nimport { Logger } from './logger';\nimport { LogMessages as enGB } from '../localisation/en-GB.js';\nimport { isObject } from 'lodash';\n\nexport const url = (alias: string, project: string) => {\n  const projectAndAlias =\n    project && project.toLowerCase() !== 'website'\n      ? `${project.toLowerCase()}-${alias}`\n      : alias;\n  return {\n    api: `https://api-${alias}.cloud.contensis.com`,\n    cms: `https://cms-${alias}.cloud.contensis.com`,\n    liveWeb: `https://live-${projectAndAlias}.cloud.contensis.com`,\n    previewWeb: `https://preview-${projectAndAlias}.cloud.contensis.com`,\n    iisWeb: `https://iis-live-${projectAndAlias}.cloud.contensis.com`,\n    iisPreviewWeb: `https://iis-preview-${projectAndAlias}.cloud.contensis.com`,\n  };\n};\n\nexport const Logging = async (language = 'en-GB') => {\n  const defaultMessages = enGB;\n  // const { LogMessages: defaultMessages } = await import(\n  //   `../localisation/en-GB.js`\n  // );\n  const localisedMessages = defaultMessages;\n\n  if (language === 'en-GB') {\n    // Using a variable import e.g. `import(`../localisation/${language}.js`);`\n    // does not play well with packaged executables\n    // So we have to hard code the import for each language individually\n  }\n  return {\n    messages: mergeWith(\n      localisedMessages,\n      defaultMessages,\n      (v, s) => v || s\n    ) as typeof defaultMessages,\n    Log: Logger,\n  };\n};\n\nexport const splitTagsAndGroups = (\n  tagsAndGroups: unknown[] = [],\n  tags: ICreateTag[] = [],\n  groups: ICreateTagGroup[] = []\n) => {\n  for (const item of tagsAndGroups) {\n    if (isObject(item) && 'id' in item) {\n      if ('name' in item) groups.push(item as ICreateTagGroup);\n      else tags.push(item as ICreateTag);\n    }\n  }\n};\n\nexport const splitTagGroupsInModels = (\n  mixedData: unknown[] = [],\n  models: (ContentType | Component)[] = [],\n  groups: ICreateTagGroup[] = []\n) => {\n  for (const item of mixedData) {\n    if (isObject(item) && 'id' in item) {\n      if (!('dataFormat' in item)) groups.push(item as ICreateTagGroup);\n      else models.push(item as ContentType | Component);\n    }\n  }\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,uBAAsB;AACtB,oBAAuB;AACvB,mBAAoC;AACpC,oBAAyB;AAElB,MAAM,MAAM,CAAC,OAAe,YAAoB;AACrD,QAAM,kBACJ,WAAW,QAAQ,YAAY,MAAM,YACjC,GAAG,QAAQ,YAAY,CAAC,IAAI,KAAK,KACjC;AACN,SAAO;AAAA,IACL,KAAK,eAAe,KAAK;AAAA,IACzB,KAAK,eAAe,KAAK;AAAA,IACzB,SAAS,gBAAgB,eAAe;AAAA,IACxC,YAAY,mBAAmB,eAAe;AAAA,IAC9C,QAAQ,oBAAoB,eAAe;AAAA,IAC3C,eAAe,uBAAuB,eAAe;AAAA,EACvD;AACF;AAEO,MAAM,UAAU,OAAO,WAAW,YAAY;AACnD,QAAM,kBAAkB,aAAAA;AAIxB,QAAM,oBAAoB;AAE1B,MAAI,aAAa,SAAS;AAAA,EAI1B;AACA,SAAO;AAAA,IACL,cAAU,iBAAAC;AAAA,MACR;AAAA,MACA;AAAA,MACA,CAAC,GAAG,MAAM,KAAK;AAAA,IACjB;AAAA,IACA,KAAK;AAAA,EACP;AACF;AAEO,MAAM,qBAAqB,CAChC,gBAA2B,CAAC,GAC5B,OAAqB,CAAC,GACtB,SAA4B,CAAC,MAC1B;AACH,aAAW,QAAQ,eAAe;AAChC,YAAI,wBAAS,IAAI,KAAK,QAAQ,MAAM;AAClC,UAAI,UAAU,KAAM,QAAO,KAAK,IAAuB;AAAA,UAClD,MAAK,KAAK,IAAkB;AAAA,IACnC;AAAA,EACF;AACF;AAEO,MAAM,yBAAyB,CACpC,YAAuB,CAAC,GACxB,SAAsC,CAAC,GACvC,SAA4B,CAAC,MAC1B;AACH,aAAW,QAAQ,WAAW;AAC5B,YAAI,wBAAS,IAAI,KAAK,QAAQ,MAAM;AAClC,UAAI,EAAE,gBAAgB,MAAO,QAAO,KAAK,IAAuB;AAAA,UAC3D,QAAO,KAAK,IAA+B;AAAA,IAClD;AAAA,EACF;AACF;",
+  "sourcesContent": ["import { ContentType, Component } from 'contensis-core-api';\nimport { ICreateTag, ICreateTagGroup } from 'contensis-management-api';\nimport mergeWith from 'lodash/mergeWith';\nimport { Logger } from './logger';\nimport { LogMessages as enGB } from '../localisation/en-GB.js';\nimport { isObject } from 'lodash';\n\nexport const url = (alias: string, project: string) => {\n  const projectAndAlias =\n    project && project.toLowerCase() !== 'website'\n      ? `${project.toLowerCase()}-${alias}`\n      : alias;\n  return {\n    api: `https://api-${alias}.cloud.contensis.com`,\n    cms: `https://cms-${alias}.cloud.contensis.com`,\n    liveWeb: `https://live-${projectAndAlias}.cloud.contensis.com`,\n    previewWeb: `https://preview-${projectAndAlias}.cloud.contensis.com`,\n    iisWeb: `https://iis-live-${projectAndAlias}.cloud.contensis.com`,\n    iisPreviewWeb: `https://iis-preview-${projectAndAlias}.cloud.contensis.com`,\n  };\n};\n\nexport const Logging = async (language = 'en-GB') => {\n  const defaultMessages = enGB;\n  // const { LogMessages: defaultMessages } = await import(\n  //   `../localisation/en-GB.js`\n  // );\n  const localisedMessages = defaultMessages;\n\n  if (language === 'en-GB') {\n    // Using a variable import e.g. `import(`../localisation/${language}.js`);`\n    // does not play well with packaged executables\n    // So we have to hard code the import for each language individually\n  }\n  return {\n    messages: mergeWith(\n      localisedMessages,\n      defaultMessages,\n      (v, s) => v || s\n    ) as typeof defaultMessages,\n    Log: Logger,\n  };\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,uBAAsB;AACtB,oBAAuB;AACvB,mBAAoC;AAG7B,MAAM,MAAM,CAAC,OAAe,YAAoB;AACrD,QAAM,kBACJ,WAAW,QAAQ,YAAY,MAAM,YACjC,GAAG,QAAQ,YAAY,CAAC,IAAI,KAAK,KACjC;AACN,SAAO;AAAA,IACL,KAAK,eAAe,KAAK;AAAA,IACzB,KAAK,eAAe,KAAK;AAAA,IACzB,SAAS,gBAAgB,eAAe;AAAA,IACxC,YAAY,mBAAmB,eAAe;AAAA,IAC9C,QAAQ,oBAAoB,eAAe;AAAA,IAC3C,eAAe,uBAAuB,eAAe;AAAA,EACvD;AACF;AAEO,MAAM,UAAU,OAAO,WAAW,YAAY;AACnD,QAAM,kBAAkB,aAAAA;AAIxB,QAAM,oBAAoB;AAE1B,MAAI,aAAa,SAAS;AAAA,EAI1B;AACA,SAAO;AAAA,IACL,cAAU,iBAAAC;AAAA,MACR;AAAA,MACA;AAAA,MACA,CAAC,GAAG,MAAM,KAAK;AAAA,IACjB;AAAA,IACA,KAAK;AAAA,EACP;AACF;",
   "names": ["enGB", "mergeWith"]
 }

package/dist/version.js

@@ -21,7 +21,7 @@ __export(version_exports, {
   LIB_VERSION: () => LIB_VERSION
 });
 module.exports = __toCommonJS(version_exports);
-const LIB_VERSION = "1.5.1-beta.7";
+const LIB_VERSION = "1.5.1-beta.8";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   LIB_VERSION

package/dist/version.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/version.ts"],
-  "sourcesContent": ["export const LIB_VERSION = \"1.5.1-beta.7\";\n"],
+  "sourcesContent": ["export const LIB_VERSION = \"1.5.1-beta.8\";\n"],
   "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAO,MAAM,cAAc;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "contensis-cli",
-  "version": "1.5.1-beta.7",
+  "version": "1.5.1-beta.8",
   "description": "A fully featured Contensis command line interface with a shell UI provides simple and intuitive ways to manage or profile your content in any NodeJS terminal.",
   "repository": "https://github.com/contensis/cli",
   "homepage": "https://github.com/contensis/cli/tree/main/packages/contensis-cli#readme",

package/src/mappers/MixedFileData.ts

@@ -0,0 +1,80 @@
+import { Component, ContentType, Project } from 'contensis-core-api';
+import {
+  Entry,
+  ICreateNode,
+  ICreateTag,
+  ICreateTagGroup,
+  Tag,
+  TagGroup,
+} from 'contensis-management-api';
+import { MigrateRequest } from 'migratortron';
+import { readFileAsJSON } from '~/providers/file-provider';
+
+export class MixedFileData
+  implements
+    Pick<MigrateRequest, 'models' | 'entries' | 'nodes' | 'tagGroups' | 'tags'>
+{
+  models: (ContentType | Component)[] = [];
+  entries: Entry[] = [];
+  nodes: ICreateNode[] = [];
+  tagGroups: (TagGroup | ICreateTagGroup)[] = [];
+  tags: (Tag | ICreateTag)[] = [];
+
+  constructor(fileData?: any[]) {
+    if (Array.isArray(fileData)) this.init(fileData);
+  }
+  init = (fileData: any[]) => {
+    for (const item of fileData) {
+      if (
+        this.#isContentType(item) ||
+        this.#isComponent(item) ||
+        this.#isForm(item)
+      )
+        this.models.push(item);
+      if (this.#isEntry(item) || this.#isAsset(item)) this.entries.push(item);
+      if (this.#isNode(item)) this.nodes.push(item);
+      if (this.#isTagGroup(item)) this.tagGroups.push(item);
+      if (this.#isTag(item)) this.tags.push(item);
+    }
+  };
+  async readFile(filePath: string): Promise<any> {
+    const fileData = await readFileAsJSON(filePath);
+    if (typeof fileData === 'string')
+      throw new Error(`Import file format must be of type JSON`);
+    if (Array.isArray(fileData)) this.init(fileData);
+    return this;
+  }
+
+  #isProject = (item: any): item is Project =>
+    'id' in item && 'name' in item && 'primaryLanguage' in item;
+
+  #isContentType = (item: any): item is ContentType =>
+    'dataFormat' in item && item.dataFormat === 'entry';
+
+  #isComponent = (item: any): item is Component =>
+    'dataFormat' in item && item.dataFormat === 'component';
+
+  #isForm = (item: any): item is ContentType =>
+    'dataFormat' in item && item.dataFormat === 'form';
+
+  #isAsset = (item: any): item is Entry =>
+    'sys' in item &&
+    'contentTypeId' in item.sys &&
+    'dataFormat' in item.sys &&
+    item.sys.dataFormat === 'asset';
+
+  #isEntry = (item: any): item is Entry =>
+    'sys' in item &&
+    'contentTypeId' in item.sys &&
+    'dataFormat' in item.sys &&
+    item.sys.dataFormat === 'entry';
+
+  #isNode = (item: any): item is ICreateNode =>
+    ('slug' in item || 'path' in item) && 'displayName' in item;
+
+  #isTag = (item: any): item is ICreateTag =>
+    'id' in item && 'groupId' in item && 'label' in item;
+
+  #isTagGroup = (item: any): item is ICreateTagGroup =>
+    'id' in item && 'name' in item && 'tagCount' in item;
+}

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) {
@@ -2510,7 +2457,6 @@ class ContensisCli {
     const contensis = await this.ConnectContensisImport({
       commit,
       fromFile,
-      importDataType: 'entries',
     });
 
     if (contensis) {
@@ -2591,7 +2537,6 @@ class ContensisCli {
     const contensis = await this.ConnectContensisImport({
       commit,
       fromFile,
-      importDataType: 'entries',
     });
 
     if (contensis) {
@@ -2698,7 +2643,6 @@ class ContensisCli {
     const contensis = await this.ConnectContensisImport({
       commit,
       fromFile,
-      importDataType: 'nodes',
     });
 
     if (contensis) {
@@ -2773,7 +2717,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/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.8";