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

package/dist/mappers/MixedFileData.js

@@ -0,0 +1,83 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __typeError = (msg) => {
+  throw TypeError(msg);
+};
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __accessCheck = (obj, member, msg) => member.has(obj) || __typeError("Cannot " + msg);
+var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
+var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
+var MixedFileData_exports = {};
+__export(MixedFileData_exports, {
+  MixedFileData: () => MixedFileData
+});
+module.exports = __toCommonJS(MixedFileData_exports);
+var import_file_provider = require("../providers/file-provider");
+var _isProject, _isContentType, _isComponent, _isForm, _isAsset, _isEntry, _isNode, _isTag, _isTagGroup;
+class MixedFileData {
+  constructor(fileData) {
+    __publicField(this, "models", []);
+    __publicField(this, "entries", []);
+    __publicField(this, "nodes", []);
+    __publicField(this, "tagGroups", []);
+    __publicField(this, "tags", []);
+    __publicField(this, "init", (fileData) => {
+      for (const item of fileData) {
+        if (__privateGet(this, _isContentType).call(this, item) || __privateGet(this, _isComponent).call(this, item) || __privateGet(this, _isForm).call(this, item))
+          this.models.push(item);
+        if (__privateGet(this, _isEntry).call(this, item) || __privateGet(this, _isAsset).call(this, item)) this.entries.push(item);
+        if (__privateGet(this, _isNode).call(this, item)) this.nodes.push(item);
+        if (__privateGet(this, _isTagGroup).call(this, item)) this.tagGroups.push(item);
+        if (__privateGet(this, _isTag).call(this, item)) this.tags.push(item);
+      }
+    });
+    __privateAdd(this, _isProject, (item) => "id" in item && "name" in item && "primaryLanguage" in item);
+    __privateAdd(this, _isContentType, (item) => "dataFormat" in item && item.dataFormat === "entry");
+    __privateAdd(this, _isComponent, (item) => "dataFormat" in item && item.dataFormat === "component");
+    __privateAdd(this, _isForm, (item) => "dataFormat" in item && item.dataFormat === "form");
+    __privateAdd(this, _isAsset, (item) => "sys" in item && "contentTypeId" in item.sys && "dataFormat" in item.sys && item.sys.dataFormat === "asset");
+    __privateAdd(this, _isEntry, (item) => "sys" in item && "contentTypeId" in item.sys && "dataFormat" in item.sys && item.sys.dataFormat === "entry");
+    __privateAdd(this, _isNode, (item) => ("slug" in item || "path" in item) && "displayName" in item);
+    __privateAdd(this, _isTag, (item) => "id" in item && "groupId" in item && "label" in item);
+    __privateAdd(this, _isTagGroup, (item) => "id" in item && "name" in item && "tagCount" in item);
+    if (Array.isArray(fileData)) this.init(fileData);
+  }
+  async readFile(filePath) {
+    const fileData = await (0, import_file_provider.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 = new WeakMap();
+_isContentType = new WeakMap();
+_isComponent = new WeakMap();
+_isForm = new WeakMap();
+_isAsset = new WeakMap();
+_isEntry = new WeakMap();
+_isNode = new WeakMap();
+_isTag = new WeakMap();
+_isTagGroup = new WeakMap();
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  MixedFileData
+});
+//# sourceMappingURL=MixedFileData.js.map

package/dist/mappers/MixedFileData.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../src/mappers/MixedFileData.ts"],
+  "sourcesContent": ["import { Component, ContentType, Project } from 'contensis-core-api';\nimport {\n  Entry,\n  ICreateNode,\n  ICreateTag,\n  ICreateTagGroup,\n  Tag,\n  TagGroup,\n} from 'contensis-management-api';\nimport { MigrateRequest } from 'migratortron';\nimport { readFileAsJSON } from '~/providers/file-provider';\n\nexport class MixedFileData\n  implements\n    Pick<MigrateRequest, 'models' | 'entries' | 'nodes' | 'tagGroups' | 'tags'>\n{\n  models: (ContentType | Component)[] = [];\n  entries: Entry[] = [];\n  nodes: ICreateNode[] = [];\n  tagGroups: (TagGroup | ICreateTagGroup)[] = [];\n  tags: (Tag | ICreateTag)[] = [];\n\n  constructor(fileData?: any[]) {\n    if (Array.isArray(fileData)) this.init(fileData);\n  }\n  init = (fileData: any[]) => {\n    for (const item of fileData) {\n      if (\n        this.#isContentType(item) ||\n        this.#isComponent(item) ||\n        this.#isForm(item)\n      )\n        this.models.push(item);\n      if (this.#isEntry(item) || this.#isAsset(item)) this.entries.push(item);\n      if (this.#isNode(item)) this.nodes.push(item);\n      if (this.#isTagGroup(item)) this.tagGroups.push(item);\n      if (this.#isTag(item)) this.tags.push(item);\n    }\n  };\n  async readFile(filePath: string): Promise<any> {\n    const fileData = await readFileAsJSON(filePath);\n    if (typeof fileData === 'string')\n      throw new Error(`Import file format must be of type JSON`);\n    if (Array.isArray(fileData)) this.init(fileData);\n    return this;\n  }\n\n  #isProject = (item: any): item is Project =>\n    'id' in item && 'name' in item && 'primaryLanguage' in item;\n\n  #isContentType = (item: any): item is ContentType =>\n    'dataFormat' in item && item.dataFormat === 'entry';\n\n  #isComponent = (item: any): item is Component =>\n    'dataFormat' in item && item.dataFormat === 'component';\n\n  #isForm = (item: any): item is ContentType =>\n    'dataFormat' in item && item.dataFormat === 'form';\n\n  #isAsset = (item: any): item is Entry =>\n    'sys' in item &&\n    'contentTypeId' in item.sys &&\n    'dataFormat' in item.sys &&\n    item.sys.dataFormat === 'asset';\n\n  #isEntry = (item: any): item is Entry =>\n    'sys' in item &&\n    'contentTypeId' in item.sys &&\n    'dataFormat' in item.sys &&\n    item.sys.dataFormat === 'entry';\n\n  #isNode = (item: any): item is ICreateNode =>\n    ('slug' in item || 'path' in item) && 'displayName' in item;\n\n  #isTag = (item: any): item is ICreateTag =>\n    'id' in item && 'groupId' in item && 'label' in item;\n\n  #isTagGroup = (item: any): item is ICreateTagGroup =>\n    'id' in item && 'name' in item && 'tagCount' in item;\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAUA,2BAA+B;AAV/B;AAYO,MAAM,cAGb;AAAA,EAOE,YAAY,UAAkB;AAN9B,kCAAsC,CAAC;AACvC,mCAAmB,CAAC;AACpB,iCAAuB,CAAC;AACxB,qCAA4C,CAAC;AAC7C,gCAA6B,CAAC;AAK9B,gCAAO,CAAC,aAAoB;AAC1B,iBAAW,QAAQ,UAAU;AAC3B,YACE,mBAAK,gBAAL,WAAoB,SACpB,mBAAK,cAAL,WAAkB,SAClB,mBAAK,SAAL,WAAa;AAEb,eAAK,OAAO,KAAK,IAAI;AACvB,YAAI,mBAAK,UAAL,WAAc,SAAS,mBAAK,UAAL,WAAc,MAAO,MAAK,QAAQ,KAAK,IAAI;AACtE,YAAI,mBAAK,SAAL,WAAa,MAAO,MAAK,MAAM,KAAK,IAAI;AAC5C,YAAI,mBAAK,aAAL,WAAiB,MAAO,MAAK,UAAU,KAAK,IAAI;AACpD,YAAI,mBAAK,QAAL,WAAY,MAAO,MAAK,KAAK,KAAK,IAAI;AAAA,MAC5C;AAAA,IACF;AASA,mCAAa,CAAC,SACZ,QAAQ,QAAQ,UAAU,QAAQ,qBAAqB;AAEzD,uCAAiB,CAAC,SAChB,gBAAgB,QAAQ,KAAK,eAAe;AAE9C,qCAAe,CAAC,SACd,gBAAgB,QAAQ,KAAK,eAAe;AAE9C,gCAAU,CAAC,SACT,gBAAgB,QAAQ,KAAK,eAAe;AAE9C,iCAAW,CAAC,SACV,SAAS,QACT,mBAAmB,KAAK,OACxB,gBAAgB,KAAK,OACrB,KAAK,IAAI,eAAe;AAE1B,iCAAW,CAAC,SACV,SAAS,QACT,mBAAmB,KAAK,OACxB,gBAAgB,KAAK,OACrB,KAAK,IAAI,eAAe;AAE1B,gCAAU,CAAC,UACR,UAAU,QAAQ,UAAU,SAAS,iBAAiB;AAEzD,+BAAS,CAAC,SACR,QAAQ,QAAQ,aAAa,QAAQ,WAAW;AAElD,oCAAc,CAAC,SACb,QAAQ,QAAQ,UAAU,QAAQ,cAAc;AAvDhD,QAAI,MAAM,QAAQ,QAAQ,EAAG,MAAK,KAAK,QAAQ;AAAA,EACjD;AAAA,EAeA,MAAM,SAAS,UAAgC;AAC7C,UAAM,WAAW,UAAM,qCAAe,QAAQ;AAC9C,QAAI,OAAO,aAAa;AACtB,YAAM,IAAI,MAAM,yCAAyC;AAC3D,QAAI,MAAM,QAAQ,QAAQ,EAAG,MAAK,KAAK,QAAQ;AAC/C,WAAO;AAAA,EACT;AAkCF;AAhCE;AAGA;AAGA;AAGA;AAGA;AAMA;AAMA;AAGA;AAGA;",
+  "names": []
+}

package/dist/services/ContensisCliService.js

@@ -42,7 +42,7 @@ 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");
-var import_file_provider = require("../providers/file-provider");
+var import_MixedFileData = require("../mappers/MixedFileData");
 var import_SessionCacheProvider = __toESM(require("../providers/SessionCacheProvider"));
 var import_CredentialProvider = __toESM(require("../providers/CredentialProvider"));
 var import_util = require("../util");
@@ -262,16 +262,13 @@ class ContensisCli {
   };
   ConnectContensisImport = async ({
     commit = false,
+    noSource = false,
     fromFile,
-    importDataType,
-    importData,
-    mixedData
+    importData
   }) => {
     var _a, _b, _c, _d, _e, _f;
-    const source = fromFile || importData || mixedData ? "file" : "contensis";
-    const fileData = importData || (fromFile ? await (0, import_file_provider.readFileAsJSON)(fromFile) || [] : []);
-    if (typeof fileData === "string")
-      throw new Error(`Import file format must be of type JSON`);
+    const source = fromFile || importData || noSource ? "user-input" : "contensis";
+    const mixedData = fromFile ? await new import_MixedFileData.MixedFileData().readFile(fromFile) : importData;
     const { contensisOpts, currentEnv, env, log, messages, sourceAlias } = this;
     const environments = this.cache.environments || {};
     const sourceEnvironment = environments[sourceAlias || ""] || {};
@@ -297,7 +294,7 @@ class ContensisCli {
       );
       const cachedTargetPassword = (_b = targetCredentials == null ? void 0 : targetCredentials.current) == null ? void 0 : _b.password;
       if (cachedSourcePassword && cachedTargetPassword) {
-        if (source === "file" || importDataType === "user-input") {
+        if (source === "user-input") {
           this.contensis = new import_migratortron.ContensisMigrationService(
             {
               concurrency: 2,
@@ -312,7 +309,6 @@ class ContensisCli {
                 targetProjects: [env.currentProject || ""],
                 assetHostname: (_d = this.urls) == null ? void 0 : _d.previewWeb
               },
-              ...importDataType ? { [importDataType]: fileData } : {},
               ...mixedData || {}
             },
             !commit
@@ -891,14 +887,16 @@ class ContensisCli {
   }) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i;
     const { currentEnv, currentProject, log, messages } = this;
+    let importData;
+    if (tags) {
+      importData = new import_MixedFileData.MixedFileData();
+      importData.tags = tags;
+      importData.tagGroups = data || [];
+    }
     const contensis = await this.ConnectContensisImport({
       commit,
       fromFile,
-      importDataType: tags ? "user-input" : "tagGroups",
-      mixedData: {
-        tagGroups: data,
-        tags
-      }
+      importData
     });
     if (contensis) {
       log.line();
@@ -994,10 +992,7 @@ class ContensisCli {
         withDependents
       });
       if (Array.isArray(result)) {
-        let tags = [];
-        const groups = [];
-        if (withDependents) (0, import_util.splitTagsAndGroups)(result, tags, groups);
-        else tags = result;
+        const { tags, tagGroups } = new import_MixedFileData.MixedFileData(result);
         log.success(messages.tags.list(currentEnv, tags.length));
         if (tags)
           await this.HandleFormattingAndOutput(result, () => {
@@ -1005,10 +1000,12 @@ class ContensisCli {
               log.raw("");
               log.object(tag);
             }
-            if (groups.length) {
+            if (tagGroups.length) {
               log.raw("");
-              log.success(messages.taggroups.list(currentEnv, groups.length));
-              for (const group of groups) {
+              log.success(
+                messages.taggroups.list(currentEnv, tagGroups.length)
+              );
+              for (const group of tagGroups) {
                 log.raw("");
                 log.object(group);
               }
@@ -1027,10 +1024,7 @@ class ContensisCli {
         withDependents
       });
       if (Array.isArray(result)) {
-        let tags = [];
-        const groups = [];
-        if (withDependents) (0, import_util.splitTagsAndGroups)(result, tags, groups);
-        else tags = result;
+        const { tags, tagGroups } = new import_MixedFileData.MixedFileData(result);
         log.success(messages.tags.list(currentEnv, tags.length));
         if (!tags.length) log.help(messages.tags.noneExist());
         await this.HandleFormattingAndOutput(result, () => {
@@ -1038,10 +1032,10 @@ class ContensisCli {
             log.raw("");
             log.object(tag);
           }
-          if (groups.length) {
+          if (tagGroups.length) {
             log.raw("");
-            log.success(messages.taggroups.list(currentEnv, groups.length));
-            for (const { version, ...group } of groups) {
+            log.success(messages.taggroups.list(currentEnv, tagGroups.length));
+            for (const { version, ...group } of tagGroups) {
               log.raw("");
               log.object(group);
             }
@@ -1060,23 +1054,20 @@ class ContensisCli {
   }) => {
     var _a, _b, _c, _d, _e, _f, _g, _h;
     const { currentEnv, currentProject, log, messages } = this;
-    const mixedData = { tags: [], tagGroups: [] };
+    let importData;
     if (data) {
-      mixedData.tags = data;
-      mixedData.tagGroups = [...new Set(data.map((t) => t.groupId))].map(
+      importData = new import_MixedFileData.MixedFileData();
+      importData.tags = data;
+      importData.tagGroups = [...new Set(data.map((t) => t.groupId))].map(
         (id) => ({
           id
         })
       );
     }
-    if (fromFile) {
-      const fileData = fromFile ? await (0, import_file_provider.readFileAsJSON)(fromFile) || [] : [];
-      (0, import_util.splitTagsAndGroups)(fileData, mixedData.tags, mixedData.tagGroups);
-    }
     const contensis = await this.ConnectContensisImport({
       commit,
-      importDataType: "tags",
-      mixedData
+      fromFile,
+      importData
     });
     if (contensis) {
       log.line();
@@ -1136,8 +1127,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();
@@ -1393,14 +1383,9 @@ class ContensisCli {
     fromFile
   }) => {
     const { currentProject, log, messages } = this;
-    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,
-      mixedData: mixedData.models.length ? mixedData : void 0
+      fromFile
     });
     if (contensis) {
       log.line();
@@ -1544,8 +1529,7 @@ Nodes:`));
     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);
@@ -1575,17 +1559,15 @@ Nodes:`));
     fromFile
   }, contentTypeIds = []) => {
     const { currentProject, log, messages } = this;
-    let fileData = fromFile ? await (0, import_file_provider.readFileAsJSON)(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 import_MixedFileData.MixedFileData().readFile(fromFile);
     const contensis = await this.ConnectContensisImport({
       commit,
-      importDataType: fromFile ? "user-input" : void 0
+      noSource: !!fromFile
     });
     if (contensis) {
       if (fromFile)
-        for (const contentType of fileData) {
+        for (const contentType of importData.models) {
           contentType.projectId = currentProject;
           delete contentType.uuid;
           const [err, , createStatus] = await contensis.models.targets[currentProject].repo.UpsertContentType(false, contentType);
@@ -1616,17 +1598,14 @@ Nodes:`));
     fromFile
   }, modelIds = []) => {
     const { log } = this;
-    let fileData = fromFile ? await (0, import_file_provider.readFileAsJSON)(fromFile) || [] : [];
-    if (typeof fileData === "string")
-      throw new Error(`Import file format must be of type JSON`);
-    if (!Array.isArray(fileData)) fileData = [fileData];
-    const contensis = await this.ConnectContensisImport({
-      fromFile,
-      importDataType: "models"
-    });
+    let importData;
+    if (fromFile) importData = await new import_MixedFileData.MixedFileData().readFile(fromFile);
+    const contensis = await this.ConnectContensisImport({ fromFile });
     if (contensis) {
       const [err, result] = await (0, import_await_to_js.default)(
-        contensis.models.Diff(fileData.length ? fileData : modelIds)
+        contensis.models.Diff(
+          importData.models.length ? importData.models : modelIds
+        )
       );
       if (err) log.error(err.message, err);
       if (result)
@@ -1693,8 +1672,7 @@ Components:`));
     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(
@@ -1727,17 +1705,15 @@ Components:`));
     fromFile
   }, componentIds = []) => {
     const { currentProject, log, messages } = this;
-    let fileData = fromFile ? await (0, import_file_provider.readFileAsJSON)(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 import_MixedFileData.MixedFileData().readFile(fromFile);
     const contensis = await this.ConnectContensisImport({
       commit,
-      importDataType: fromFile ? "user-input" : void 0
+      noSource: !!fromFile
     });
     if (contensis) {
       if (fromFile)
-        for (const component of fileData) {
+        for (const component of importData.models) {
           component.projectId = currentProject;
           delete component.uuid;
           const [err, , createStatus] = await contensis.models.targets[currentProject].repo.UpsertComponent(false, component);
@@ -1770,8 +1746,7 @@ Components:`));
     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) {
       if (contensis.isPreview) {
@@ -1838,11 +1813,12 @@ Components:`));
   }) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
     const { currentEnv, currentProject, log, messages } = this;
+    let importData;
+    if (data) importData = new import_MixedFileData.MixedFileData(data);
     const contensis = await this.ConnectContensisImport({
       commit,
       fromFile,
-      importDataType: "entries",
-      importData: data
+      importData
     });
     if (contensis) {
       log.line();
@@ -1920,8 +1896,7 @@ Components:`));
     const { currentEnv, currentProject, log, messages } = this;
     const contensis = await this.ConnectContensisImport({
       commit,
-      fromFile,
-      importDataType: "entries"
+      fromFile
     });
     if (contensis) {
       log.line();
@@ -1978,8 +1953,7 @@ Components:`));
     const { currentEnv, currentProject, log, messages } = this;
     const contensis = await this.ConnectContensisImport({
       commit,
-      fromFile,
-      importDataType: "entries"
+      fromFile
     });
     if (contensis) {
       log.line();
@@ -2056,8 +2030,7 @@ Components:`));
     const { currentEnv, currentProject, log, messages } = this;
     const contensis = await this.ConnectContensisImport({
       commit,
-      fromFile,
-      importDataType: "nodes"
+      fromFile
     });
     if (contensis) {
       log.line();
@@ -2114,8 +2087,7 @@ Components:`));
     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) {
       if (contensis.isPreview) {