contensis-cli 1.5.1-beta.6 → 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.6";
+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.6\";\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.6",
+  "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",
@@ -39,7 +39,7 @@
     "inquirer-command-prompt": "^0.1.0",
     "keytar": "^7.9.0",
     "lodash": "^4.17.21",
-    "migratortron": "^1.0.0-beta.77",
+    "migratortron": "^1.0.0-beta.78",
     "nanospinner": "^1.2.0",
     "node-fetch": "^2.6.7",
     "parse-git-config": "^3.0.0",

package/src/commands/get.ts

@@ -315,9 +315,16 @@ Example call:
         'get entries with the search phrase, use quotes for multiple words'
       )
       .addOption(contentTypes)
-      .option(
-        '-d --dependents',
-        'find and return any dependencies of all found entries'
+      .addOption(
+        new Option(
+          '-d --dependents [depth]',
+          'find and return any dependencies of all found entries (optionally limit the number of dependency levels)'
+        ).argParser(value => {
+          // If value is undefined, treat as boolean true
+          if (value === undefined) return true;
+          const num = Number(value);
+          return isNaN(num) ? true : num;
+        })
       )
   )
     .addOption(

package/src/commands/globalOptions.ts

@@ -52,6 +52,12 @@ export const mapContensisOpts = (opts: any = {}): MigrateRequest => ({
   concurrency: opts.concurrency ? Number(opts.concurrency) : undefined,
   noPublish: !opts.publish, // arg is inverted automatically from `--no-publish` to `publish: false`
   outputLogs: opts.logLevel,
+  stopLevel:
+    typeof opts.stopLevel === 'number'
+      ? Number(opts.stopLevel)
+      : typeof opts.dependents === 'number'
+        ? Number(opts.dependents)
+        : undefined,
 });
 
 /* Output options */
@@ -195,6 +201,11 @@ export const noPublish = new Option(
   "don't publish created or updated entries"
 );
 
+export const stopLevel = new Option(
+  '-d --stop-level <stopLevel>',
+  'the level at which to stop resolving dependent entries (may result in incomplete entries)'
+).argParser(parseInt);
+
 export const addConnectOptions = (program: Command) =>
   program.addOption(alias.hideHelp()).addOption(project.hideHelp());
 

package/src/commands/import.ts

@@ -13,6 +13,7 @@ import {
   noPublish,
   outputDetail,
   saveEntries,
+  stopLevel,
   versionStatus,
   zenql,
 } from './globalOptions';
@@ -39,6 +40,7 @@ export const makeImportCommand = () => {
       '-preserve --preserve-guids',
       'import any default entries or nodes using the same id as the source'
     )
+    .addOption(ignoreErrors)
     .addHelpText(
       'after',
       `
@@ -131,6 +133,7 @@ Example call:
     .addOption(assetTypes)
     .addOption(latest)
     .addOption(versionStatus)
+    .addOption(stopLevel)
     .addOption(commit)
     .option(
       '-preserve --preserve-guids',
@@ -275,7 +278,7 @@ Example call:
       > import tags --from-file myImportData.json --preserve-guids
     `
     )
-    .action(async (opts) => {
+    .action(async opts => {
       await cliCommand(
         ['import', 'tags'],
         opts,

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;
+}