contensis-cli 1.3.1-beta.0 → 1.3.1-beta.2

package/dist/providers/SessionCacheProvider.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../src/providers/SessionCacheProvider.ts"],
   "sourcesContent": ["import fs from 'fs';\nimport path from 'path';\nimport clone from 'lodash/cloneDeep';\nimport mergeWith from 'lodash/mergeWith';\nimport unionBy from 'lodash/unionBy';\nimport { appRootDir } from './file-provider';\nimport { isJson, tryParse } from '~/util';\nimport { Logger } from '~/util/logger';\n\nclass SessionCacheProvider {\n  private localFilePath: string;\n  private cache = {} as SessionCache;\n\n  constructor() {\n    this.localFilePath = path.join(appRootDir, 'environments.json');\n    this.cache = {\n      currentTimestamp: new Date().toISOString(),\n      environments: {},\n      history: [],\n    };\n    this.ReadCacheFromDisk();\n  }\n\n  private ReadCacheFromDisk = () => {\n    try {\n      if (fs.existsSync(this.localFilePath)) {\n        const raw = fs.readFileSync(this.localFilePath, 'utf-8');\n        if (isJson(raw)) this.cache = tryParse(raw);\n      } else {\n        this.WriteCacheToDisk();\n      }\n    } catch (ex) {\n      // Problem reading or parsing cache file\n    }\n  };\n\n  private WriteCacheToDisk = () => {\n    try {\n      fs.writeFileSync(this.localFilePath, JSON.stringify(this.cache, null, 2));\n    } catch (ex) {\n      // Problem writing session cache to file\n    }\n  };\n\n  Get = () => clone(this.cache);\n\n  Update = (updateContent: Partial<SessionCache>) => {\n    try {\n      this.cache = mergeWith(this.cache, updateContent, (val, src, key) => {\n        if (\n          key === 'history' &&\n          ((src?.[0] &&\n            typeof src[0] === 'object' &&\n            'createdDate' in src[0]) ||\n            (val?.[0] && typeof val[0] === 'object' && 'createdDate' in val[0]))\n        ) {\n          return unionBy(val, src, 'createdDate');\n        }\n        if (key === 'projects')\n          return Array.isArray(val) ? [...new Set([...val, ...src])] : src;\n\n        if (Array.isArray(val)) return val.concat(src);\n      });\n      this.cache.currentTimestamp = new Date().toISOString();\n      this.WriteCacheToDisk();\n    } catch (ex: any) {\n      // Problem merging cache data for update\n      Logger.error(`Problem updating environments.json`);\n      Logger.error(ex);\n    }\n    return this.Get();\n  };\n\n  UpdateEnv = (\n    updateContent: Partial<EnvironmentCache>,\n    env = this.cache.currentEnvironment,\n    setCurrentEnv = true\n  ) => {\n    try {\n      const environment = this.cache.environments[env || ''];\n\n      this.cache.environments[env || ''] = {\n        ...environment,\n        ...updateContent,\n      };\n      this.Update({\n        currentEnvironment: setCurrentEnv ? env : this.cache.currentEnvironment,\n        environments: this.cache.environments,\n      });\n    } catch (ex: any) {\n      // Problem merging cache data for update\n      Logger.error(\n        `Problem updating environment \"${env}\" in environments.json`\n      );\n      Logger.error(ex);\n    }\n    return this.Get();\n  };\n}\n\nexport default SessionCacheProvider;\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,gBAAe;AACf,kBAAiB;AACjB,uBAAkB;AAClB,uBAAsB;AACtB,qBAAoB;AACpB,2BAA2B;AAC3B,kBAAiC;AACjC,oBAAuB;AAEvB,MAAM,qBAAqB;AAAA,EACjB;AAAA,EACA,QAAQ,CAAC;AAAA,EAEjB,cAAc;AACZ,SAAK,gBAAgB,YAAAA,QAAK,KAAK,iCAAY,mBAAmB;AAC9D,SAAK,QAAQ;AAAA,MACX,kBAAkB,IAAI,KAAK,EAAE,YAAY;AAAA,MACzC,cAAc,CAAC;AAAA,MACf,SAAS,CAAC;AAAA,IACZ;AACA,SAAK,kBAAkB;AAAA,EACzB;AAAA,EAEQ,oBAAoB,MAAM;AAChC,QAAI;AACF,UAAI,UAAAC,QAAG,WAAW,KAAK,aAAa,GAAG;AACrC,cAAM,MAAM,UAAAA,QAAG,aAAa,KAAK,eAAe,OAAO;AACvD,gBAAI,oBAAO,GAAG;AAAG,eAAK,YAAQ,sBAAS,GAAG;AAAA,MAC5C,OAAO;AACL,aAAK,iBAAiB;AAAA,MACxB;AAAA,IACF,SAAS,IAAP;AAAA,IAEF;AAAA,EACF;AAAA,EAEQ,mBAAmB,MAAM;AAC/B,QAAI;AACF,gBAAAA,QAAG,cAAc,KAAK,eAAe,KAAK,UAAU,KAAK,OAAO,MAAM,CAAC,CAAC;AAAA,IAC1E,SAAS,IAAP;AAAA,IAEF;AAAA,EACF;AAAA,EAEA,MAAM,UAAM,iBAAAC,SAAM,KAAK,KAAK;AAAA,EAE5B,SAAS,CAAC,kBAAyC;AACjD,QAAI;AACF,WAAK,YAAQ,iBAAAC,SAAU,KAAK,OAAO,eAAe,CAAC,KAAK,KAAK,QAAQ;AACnE,YACE,QAAQ,eACN,2BAAM,OACN,OAAO,IAAI,OAAO,YAClB,iBAAiB,IAAI,OACpB,2BAAM,OAAM,OAAO,IAAI,OAAO,YAAY,iBAAiB,IAAI,KAClE;AACA,qBAAO,eAAAC,SAAQ,KAAK,KAAK,aAAa;AAAA,QACxC;AACA,YAAI,QAAQ;AACV,iBAAO,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,oBAAI,IAAI,CAAC,GAAG,KAAK,GAAG,GAAG,CAAC,CAAC,IAAI;AAE/D,YAAI,MAAM,QAAQ,GAAG;AAAG,iBAAO,IAAI,OAAO,GAAG;AAAA,MAC/C,CAAC;AACD,WAAK,MAAM,mBAAmB,IAAI,KAAK,EAAE,YAAY;AACrD,WAAK,iBAAiB;AAAA,IACxB,SAAS,IAAP;AAEA,2BAAO,MAAM,oCAAoC;AACjD,2BAAO,MAAM,EAAE;AAAA,IACjB;AACA,WAAO,KAAK,IAAI;AAAA,EAClB;AAAA,EAEA,YAAY,CACV,eACA,MAAM,KAAK,MAAM,oBACjB,gBAAgB,SACb;AACH,QAAI;AACF,YAAM,cAAc,KAAK,MAAM,aAAa,OAAO;AAEnD,WAAK,MAAM,aAAa,OAAO,MAAM;AAAA,QACnC,GAAG;AAAA,QACH,GAAG;AAAA,MACL;AACA,WAAK,OAAO;AAAA,QACV,oBAAoB,gBAAgB,MAAM,KAAK,MAAM;AAAA,QACrD,cAAc,KAAK,MAAM;AAAA,MAC3B,CAAC;AAAA,IACH,SAAS,IAAP;AAEA,2BAAO;AAAA,QACL,iCAAiC;AAAA,MACnC;AACA,2BAAO,MAAM,EAAE;AAAA,IACjB;AACA,WAAO,KAAK,IAAI;AAAA,EAClB;AACF;AAEA,IAAO,+BAAQ;",
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,gBAAe;AACf,kBAAiB;AACjB,uBAAkB;AAClB,uBAAsB;AACtB,qBAAoB;AACpB,2BAA2B;AAC3B,kBAAiC;AACjC,oBAAuB;AAEvB,MAAM,qBAAqB;AAAA,EACjB;AAAA,EACA,QAAQ,CAAC;AAAA,EAEjB,cAAc;AACZ,SAAK,gBAAgB,YAAAA,QAAK,KAAK,iCAAY,mBAAmB;AAC9D,SAAK,QAAQ;AAAA,MACX,mBAAkB,oBAAI,KAAK,GAAE,YAAY;AAAA,MACzC,cAAc,CAAC;AAAA,MACf,SAAS,CAAC;AAAA,IACZ;AACA,SAAK,kBAAkB;AAAA,EACzB;AAAA,EAEQ,oBAAoB,MAAM;AAChC,QAAI;AACF,UAAI,UAAAC,QAAG,WAAW,KAAK,aAAa,GAAG;AACrC,cAAM,MAAM,UAAAA,QAAG,aAAa,KAAK,eAAe,OAAO;AACvD,gBAAI,oBAAO,GAAG,EAAG,MAAK,YAAQ,sBAAS,GAAG;AAAA,MAC5C,OAAO;AACL,aAAK,iBAAiB;AAAA,MACxB;AAAA,IACF,SAAS,IAAI;AAAA,IAEb;AAAA,EACF;AAAA,EAEQ,mBAAmB,MAAM;AAC/B,QAAI;AACF,gBAAAA,QAAG,cAAc,KAAK,eAAe,KAAK,UAAU,KAAK,OAAO,MAAM,CAAC,CAAC;AAAA,IAC1E,SAAS,IAAI;AAAA,IAEb;AAAA,EACF;AAAA,EAEA,MAAM,UAAM,iBAAAC,SAAM,KAAK,KAAK;AAAA,EAE5B,SAAS,CAAC,kBAAyC;AACjD,QAAI;AACF,WAAK,YAAQ,iBAAAC,SAAU,KAAK,OAAO,eAAe,CAAC,KAAK,KAAK,QAAQ;AACnE,YACE,QAAQ,eACN,2BAAM,OACN,OAAO,IAAI,CAAC,MAAM,YAClB,iBAAiB,IAAI,CAAC,MACrB,2BAAM,OAAM,OAAO,IAAI,CAAC,MAAM,YAAY,iBAAiB,IAAI,CAAC,IACnE;AACA,qBAAO,eAAAC,SAAQ,KAAK,KAAK,aAAa;AAAA,QACxC;AACA,YAAI,QAAQ;AACV,iBAAO,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,oBAAI,IAAI,CAAC,GAAG,KAAK,GAAG,GAAG,CAAC,CAAC,IAAI;AAE/D,YAAI,MAAM,QAAQ,GAAG,EAAG,QAAO,IAAI,OAAO,GAAG;AAAA,MAC/C,CAAC;AACD,WAAK,MAAM,oBAAmB,oBAAI,KAAK,GAAE,YAAY;AACrD,WAAK,iBAAiB;AAAA,IACxB,SAAS,IAAS;AAEhB,2BAAO,MAAM,oCAAoC;AACjD,2BAAO,MAAM,EAAE;AAAA,IACjB;AACA,WAAO,KAAK,IAAI;AAAA,EAClB;AAAA,EAEA,YAAY,CACV,eACA,MAAM,KAAK,MAAM,oBACjB,gBAAgB,SACb;AACH,QAAI;AACF,YAAM,cAAc,KAAK,MAAM,aAAa,OAAO,EAAE;AAErD,WAAK,MAAM,aAAa,OAAO,EAAE,IAAI;AAAA,QACnC,GAAG;AAAA,QACH,GAAG;AAAA,MACL;AACA,WAAK,OAAO;AAAA,QACV,oBAAoB,gBAAgB,MAAM,KAAK,MAAM;AAAA,QACrD,cAAc,KAAK,MAAM;AAAA,MAC3B,CAAC;AAAA,IACH,SAAS,IAAS;AAEhB,2BAAO;AAAA,QACL,iCAAiC,GAAG;AAAA,MACtC;AACA,2BAAO,MAAM,EAAE;AAAA,IACjB;AACA,WAAO,KAAK,IAAI;AAAA,EAClB;AACF;AAEA,IAAO,+BAAQ;",
   "names": ["path", "fs", "clone", "mergeWith", "unionBy"]
 }

package/dist/providers/file-provider.js

@@ -18,6 +18,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
@@ -114,28 +118,26 @@ const checkDir = (filePath) => {
 const appPath = (filePath) => import_path.default.isAbsolute(filePath) ? filePath : import_path.default.join(appRootDir, filePath);
 const cwdPath = (filePath) => import_path.default.isAbsolute(filePath) ? filePath : import_path.default.join(process.cwd(), filePath);
 const joinPath = import_path.default.join;
-const addExecutePermission = (filePath) => import_fs.default.chmodSync(filePath, import_fs.default.constants.S_IRWXU);
+const addExecutePermission = (filePath) => (
+  // Fails in windows with `TypeError [ERR_INVALID_ARG_TYPE]: The "mode" argument must be of type number. Received undefined`
+  import_fs.default.chmodSync(filePath, import_fs.default.constants.S_IRWXU)
+);
 const detectFileType = (fromFile) => {
   const fileData = readFile(fromFile);
-  if (!fileData)
-    throw new Error(`Unable to read file at ${fromFile}`);
+  if (!fileData) throw new Error(`Unable to read file at ${fromFile}`);
   try {
-    if (fileData.startsWith("<"))
-      return { contents: fileData, type: "xml" };
+    if (fileData.startsWith("<")) return { contents: fileData, type: "xml" };
     const jsonData = (0, import_util.tryParse)(fileData);
-    if (jsonData)
-      return { contents: jsonData, type: "json" };
+    if (jsonData) return { contents: jsonData, type: "json" };
     const csv = (0, import_csv.detectCsv)(fileData);
-    if (csv)
-      return { contents: fileData, type: "csv" };
+    if (csv) return { contents: fileData, type: "csv" };
   } catch (ex) {
     import_logger.Logger.error(`Problem detecting file type ${fromFile}`, ex);
   }
 };
 const readFileAsJSON = async (fromFile) => {
   const detectedFile = detectFileType(cwdPath(fromFile));
-  if (!detectedFile)
-    return void 0;
+  if (!detectedFile) return void 0;
   try {
     switch (detectedFile.type) {
       case "csv": {

package/dist/providers/file-provider.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../src/providers/file-provider.ts"],
   "sourcesContent": ["import fs from 'fs';\nimport { homedir } from 'os';\nimport path from 'path';\nimport { tryParse } from '~/util';\nimport { csvToJson, detectCsv } from '~/util/csv.formatter';\nimport { unflattenObject } from '~/util/json.formatter';\nimport { Logger } from '~/util/logger';\nimport { xmlToJson } from '~/util/xml.formatter';\n\nconst userHomeDir = homedir();\n\nexport const appRootDir =\n  process.env.CONTAINER_CONTEXT === 'true'\n    ? process.cwd()\n    : path.join(userHomeDir, '.contensis/');\n\nexport const readFile = (filePath: string) => {\n  const directoryPath = appPath(filePath);\n  if (fs.existsSync(directoryPath)) {\n    const file = fs.readFileSync(directoryPath, 'utf8');\n    return file;\n  } else {\n    return undefined;\n  }\n};\n\nexport const readFiles = (directory: string, createDirectory = true) => {\n  const directoryPath = appPath(directory);\n  if (fs.existsSync(directoryPath)) {\n    const files = fs.readdirSync(directoryPath);\n    return files;\n  } else if (createDirectory) {\n    fs.mkdirSync(directoryPath, { recursive: true });\n    return [];\n  } else {\n    throw new Error(`ENOENT: Directory does not exist ${directoryPath}`);\n    // return undefined;\n  }\n};\n\nexport const writeFile = (filePath: string, content: string) => {\n  const directoryPath = appPath(filePath);\n  fs.writeFileSync(directoryPath, content, { encoding: 'utf-8' });\n};\n\nexport const removeFile = (filePath: string) => {\n  const directoryPath = appPath(filePath);\n  if (fs.existsSync(directoryPath)) {\n    fs.rmSync(directoryPath);\n  }\n};\n\nexport const removeDirectory = (filePath: string) => {\n  const directoryPath = appPath(filePath);\n  if (fs.existsSync(directoryPath)) {\n    fs.rmSync(directoryPath, { force: true, recursive: true });\n  }\n};\n\nexport const moveFile = (file: string, fromPath: string, toPath: string) => {\n  const from = path.join(appRootDir, `${fromPath}${file}`);\n  const to = path.join(appRootDir, `${toPath}${file}`);\n  if (fs.existsSync(from)) {\n    checkDir(toPath);\n    // if (!fs.existsSync(toPath)) fs.mkdirSync(toPath, { recursive: true });\n\n    fs.rename(from, to, err => {\n      if (err)\n        console.error(\n          `Could not rename file \"${file}\" from: ${fromPath} to: ${toPath}`,\n          err\n        );\n      console.info(`Renamed file \"${file}\" from: ${fromPath} to: ${toPath}`);\n    });\n  } else {\n    console.error(\n      `Could not rename file \"${file}\" from: ${fromPath} to: ${toPath}\\nFile does not exist!`\n    );\n  }\n};\n\nexport const checkDir = (filePath: string) => {\n  const directoryPath = path.dirname(appPath(filePath));\n  if (!fs.existsSync(directoryPath))\n    fs.mkdirSync(directoryPath, { recursive: true });\n};\n\nexport const appPath = (filePath: string) =>\n  path.isAbsolute(filePath) ? filePath : path.join(appRootDir, filePath);\n\nexport const cwdPath = (filePath: string) =>\n  path.isAbsolute(filePath) ? filePath : path.join(process.cwd(), filePath);\n\nexport const joinPath = path.join;\n\nexport const addExecutePermission = (filePath: string) =>\n  // Fails in windows with `TypeError [ERR_INVALID_ARG_TYPE]: The \"mode\" argument must be of type number. Received undefined`\n  fs.chmodSync(filePath, fs.constants.S_IRWXU);\n\ntype DetectedFileType =\n  | { type: 'json'; contents: any }\n  | { type: 'xml' | 'csv'; contents: string };\n\nconst detectFileType = (fromFile: string): DetectedFileType | undefined => {\n  const fileData = readFile(fromFile);\n  if (!fileData) throw new Error(`Unable to read file at ${fromFile}`);\n  try {\n    // if XML\n    if (fileData.startsWith('<')) return { contents: fileData, type: 'xml' };\n\n    // if JSON\n    const jsonData = tryParse(fileData);\n    if (jsonData) return { contents: jsonData, type: 'json' };\n\n    // if CSV\n    const csv = detectCsv(fileData);\n    if (csv) return { contents: fileData, type: 'csv' };\n  } catch (ex) {\n    Logger.error(`Problem detecting file type ${fromFile}`, ex);\n  }\n};\n\nexport const readFileAsJSON = async <T = any>(\n  fromFile: string\n): Promise<T | undefined> => {\n  const detectedFile = detectFileType(cwdPath(fromFile));\n  if (!detectedFile) return undefined;\n  try {\n    switch (detectedFile.type) {\n      case 'csv': {\n        const flatJson = await csvToJson(detectedFile.contents);\n        const unflattenedJson = flatJson.map(record => unflattenObject(record));\n        return unflattenedJson as T;\n      }\n      case 'xml':\n        return (await xmlToJson(detectedFile.contents)) as T;\n\n      case 'json':\n      default:\n        return detectedFile.contents;\n    }\n  } catch (ex) {\n    Logger.error(`Problem converting file from ${detectedFile.type}`, ex);\n  }\n};\n"],
-  "mappings": "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",
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,gBAAe;AACf,gBAAwB;AACxB,kBAAiB;AACjB,kBAAyB;AACzB,iBAAqC;AACrC,kBAAgC;AAChC,oBAAuB;AACvB,iBAA0B;AAE1B,MAAM,kBAAc,mBAAQ;AAErB,MAAM,aACX,QAAQ,IAAI,sBAAsB,SAC9B,QAAQ,IAAI,IACZ,YAAAA,QAAK,KAAK,aAAa,aAAa;AAEnC,MAAM,WAAW,CAAC,aAAqB;AAC5C,QAAM,gBAAgB,QAAQ,QAAQ;AACtC,MAAI,UAAAC,QAAG,WAAW,aAAa,GAAG;AAChC,UAAM,OAAO,UAAAA,QAAG,aAAa,eAAe,MAAM;AAClD,WAAO;AAAA,EACT,OAAO;AACL,WAAO;AAAA,EACT;AACF;AAEO,MAAM,YAAY,CAAC,WAAmB,kBAAkB,SAAS;AACtE,QAAM,gBAAgB,QAAQ,SAAS;AACvC,MAAI,UAAAA,QAAG,WAAW,aAAa,GAAG;AAChC,UAAM,QAAQ,UAAAA,QAAG,YAAY,aAAa;AAC1C,WAAO;AAAA,EACT,WAAW,iBAAiB;AAC1B,cAAAA,QAAG,UAAU,eAAe,EAAE,WAAW,KAAK,CAAC;AAC/C,WAAO,CAAC;AAAA,EACV,OAAO;AACL,UAAM,IAAI,MAAM,oCAAoC,aAAa,EAAE;AAAA,EAErE;AACF;AAEO,MAAM,YAAY,CAAC,UAAkB,YAAoB;AAC9D,QAAM,gBAAgB,QAAQ,QAAQ;AACtC,YAAAA,QAAG,cAAc,eAAe,SAAS,EAAE,UAAU,QAAQ,CAAC;AAChE;AAEO,MAAM,aAAa,CAAC,aAAqB;AAC9C,QAAM,gBAAgB,QAAQ,QAAQ;AACtC,MAAI,UAAAA,QAAG,WAAW,aAAa,GAAG;AAChC,cAAAA,QAAG,OAAO,aAAa;AAAA,EACzB;AACF;AAEO,MAAM,kBAAkB,CAAC,aAAqB;AACnD,QAAM,gBAAgB,QAAQ,QAAQ;AACtC,MAAI,UAAAA,QAAG,WAAW,aAAa,GAAG;AAChC,cAAAA,QAAG,OAAO,eAAe,EAAE,OAAO,MAAM,WAAW,KAAK,CAAC;AAAA,EAC3D;AACF;AAEO,MAAM,WAAW,CAAC,MAAc,UAAkB,WAAmB;AAC1E,QAAM,OAAO,YAAAD,QAAK,KAAK,YAAY,GAAG,QAAQ,GAAG,IAAI,EAAE;AACvD,QAAM,KAAK,YAAAA,QAAK,KAAK,YAAY,GAAG,MAAM,GAAG,IAAI,EAAE;AACnD,MAAI,UAAAC,QAAG,WAAW,IAAI,GAAG;AACvB,aAAS,MAAM;AAGf,cAAAA,QAAG,OAAO,MAAM,IAAI,SAAO;AACzB,UAAI;AACF,gBAAQ;AAAA,UACN,0BAA0B,IAAI,WAAW,QAAQ,QAAQ,MAAM;AAAA,UAC/D;AAAA,QACF;AACF,cAAQ,KAAK,iBAAiB,IAAI,WAAW,QAAQ,QAAQ,MAAM,EAAE;AAAA,IACvE,CAAC;AAAA,EACH,OAAO;AACL,YAAQ;AAAA,MACN,0BAA0B,IAAI,WAAW,QAAQ,QAAQ,MAAM;AAAA;AAAA,IACjE;AAAA,EACF;AACF;AAEO,MAAM,WAAW,CAAC,aAAqB;AAC5C,QAAM,gBAAgB,YAAAD,QAAK,QAAQ,QAAQ,QAAQ,CAAC;AACpD,MAAI,CAAC,UAAAC,QAAG,WAAW,aAAa;AAC9B,cAAAA,QAAG,UAAU,eAAe,EAAE,WAAW,KAAK,CAAC;AACnD;AAEO,MAAM,UAAU,CAAC,aACtB,YAAAD,QAAK,WAAW,QAAQ,IAAI,WAAW,YAAAA,QAAK,KAAK,YAAY,QAAQ;AAEhE,MAAM,UAAU,CAAC,aACtB,YAAAA,QAAK,WAAW,QAAQ,IAAI,WAAW,YAAAA,QAAK,KAAK,QAAQ,IAAI,GAAG,QAAQ;AAEnE,MAAM,WAAW,YAAAA,QAAK;AAEtB,MAAM,uBAAuB,CAAC;AAAA;AAAA,EAEnC,UAAAC,QAAG,UAAU,UAAU,UAAAA,QAAG,UAAU,OAAO;AAAA;AAM7C,MAAM,iBAAiB,CAAC,aAAmD;AACzE,QAAM,WAAW,SAAS,QAAQ;AAClC,MAAI,CAAC,SAAU,OAAM,IAAI,MAAM,0BAA0B,QAAQ,EAAE;AACnE,MAAI;AAEF,QAAI,SAAS,WAAW,GAAG,EAAG,QAAO,EAAE,UAAU,UAAU,MAAM,MAAM;AAGvE,UAAM,eAAW,sBAAS,QAAQ;AAClC,QAAI,SAAU,QAAO,EAAE,UAAU,UAAU,MAAM,OAAO;AAGxD,UAAM,UAAM,sBAAU,QAAQ;AAC9B,QAAI,IAAK,QAAO,EAAE,UAAU,UAAU,MAAM,MAAM;AAAA,EACpD,SAAS,IAAI;AACX,yBAAO,MAAM,+BAA+B,QAAQ,IAAI,EAAE;AAAA,EAC5D;AACF;AAEO,MAAM,iBAAiB,OAC5B,aAC2B;AAC3B,QAAM,eAAe,eAAe,QAAQ,QAAQ,CAAC;AACrD,MAAI,CAAC,aAAc,QAAO;AAC1B,MAAI;AACF,YAAQ,aAAa,MAAM;AAAA,MACzB,KAAK,OAAO;AACV,cAAM,WAAW,UAAM,sBAAU,aAAa,QAAQ;AACtD,cAAM,kBAAkB,SAAS,IAAI,gBAAU,6BAAgB,MAAM,CAAC;AACtE,eAAO;AAAA,MACT;AAAA,MACA,KAAK;AACH,eAAQ,UAAM,sBAAU,aAAa,QAAQ;AAAA,MAE/C,KAAK;AAAA,MACL;AACE,eAAO,aAAa;AAAA,IACxB;AAAA,EACF,SAAS,IAAI;AACX,yBAAO,MAAM,gCAAgC,aAAa,IAAI,IAAI,EAAE;AAAA,EACtE;AACF;",
   "names": ["path", "fs"]
 }

package/dist/services/ContensisAuthService.js

@@ -80,10 +80,9 @@ class ContensisAuthService {
   };
   BearerToken = async () => this.client.bearerToken || await this.client.ensureBearerToken();
   RefreshToken = async () => !this.client.isRefreshTokenExpired() ? this.client.refreshToken : null;
+  /* PROJECTS */
   ProjectId = () => this.client.clientConfig.projectId;
   RootUrl = () => this.client.clientConfig.rootUrl;
 }
 var ContensisAuthService_default = ContensisAuthService;
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});
 //# sourceMappingURL=ContensisAuthService.js.map

package/dist/services/ContensisAuthService.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../src/services/ContensisAuthService.ts"],
   "sourcesContent": ["import { NodejsClient } from 'contensis-management-api/lib/client';\nimport { ClientGrants, ClientGrantType } from 'contensis-core-api';\n\nclass ContensisAuthService {\n  private client: NodejsClient;\n  private credentials: {\n    clientType: ClientGrantType;\n    clientDetails: ClientGrants;\n  };\n\n  get clientType() {\n    return this.credentials.clientType;\n  }\n  get clientDetails() {\n    return this.credentials.clientDetails;\n  }\n\n  constructor({\n    clientId = '',\n    clientSecret = '',\n    username,\n    password,\n    refreshToken,\n    projectId,\n    rootUrl,\n  }: {\n    clientId?: string;\n    clientSecret?: string;\n    username?: string;\n    password?: string;\n    refreshToken?: string;\n    projectId: string;\n    rootUrl: string;\n  }) {\n    if (clientId && clientSecret)\n      this.credentials = {\n        clientType: 'client_credentials',\n        clientDetails: {\n          clientId,\n          clientSecret,\n        },\n      };\n    else if (username && password)\n      this.credentials = {\n        clientType: 'contensis_classic',\n        clientDetails: {\n          username,\n          password,\n        },\n      };\n    else if (refreshToken)\n      this.credentials = {\n        clientType: 'contensis_classic_refresh_token',\n        clientDetails: {\n          refreshToken,\n        },\n      };\n    else\n      this.credentials = {\n        clientType: 'none',\n        clientDetails: { refreshToken: '' },\n      };\n\n    this.client = NodejsClient.create({\n      ...this.credentials,\n      projectId,\n      rootUrl,\n    });\n  }\n\n  ClassicToken = async (): Promise<string | null | undefined> => {\n    // make sure our token isn't expried.\n    await this.client.ensureBearerToken();\n    return (this.client as any).contensisClassicToken;\n  };\n  BearerToken = async () =>\n    this.client.bearerToken || (await this.client.ensureBearerToken());\n  RefreshToken = async () =>\n    !this.client.isRefreshTokenExpired() ? this.client.refreshToken : null;\n\n  /* PROJECTS */\n  ProjectId = () => this.client.clientConfig.projectId;\n  RootUrl = () => this.client.clientConfig.rootUrl;\n}\n\nexport default ContensisAuthService;\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAA6B;AAG7B,MAAM,qBAAqB;AAAA,EACjB;AAAA,EACA;AAAA,EAKR,IAAI,aAAa;AACf,WAAO,KAAK,YAAY;AAAA,EAC1B;AAAA,EACA,IAAI,gBAAgB;AAClB,WAAO,KAAK,YAAY;AAAA,EAC1B;AAAA,EAEA,YAAY;AAAA,IACV,WAAW;AAAA,IACX,eAAe;AAAA,IACf;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,GAQG;AACD,QAAI,YAAY;AACd,WAAK,cAAc;AAAA,QACjB,YAAY;AAAA,QACZ,eAAe;AAAA,UACb;AAAA,UACA;AAAA,QACF;AAAA,MACF;AAAA,aACO,YAAY;AACnB,WAAK,cAAc;AAAA,QACjB,YAAY;AAAA,QACZ,eAAe;AAAA,UACb;AAAA,UACA;AAAA,QACF;AAAA,MACF;AAAA,aACO;AACP,WAAK,cAAc;AAAA,QACjB,YAAY;AAAA,QACZ,eAAe;AAAA,UACb;AAAA,QACF;AAAA,MACF;AAAA;AAEA,WAAK,cAAc;AAAA,QACjB,YAAY;AAAA,QACZ,eAAe,EAAE,cAAc,GAAG;AAAA,MACpC;AAEF,SAAK,SAAS,2BAAa,OAAO;AAAA,MAChC,GAAG,KAAK;AAAA,MACR;AAAA,MACA;AAAA,IACF,CAAC;AAAA,EACH;AAAA,EAEA,eAAe,YAAgD;AAE7D,UAAM,KAAK,OAAO,kBAAkB;AACpC,WAAQ,KAAK,OAAe;AAAA,EAC9B;AAAA,EACA,cAAc,YACZ,KAAK,OAAO,eAAgB,MAAM,KAAK,OAAO,kBAAkB;AAAA,EAClE,eAAe,YACb,CAAC,KAAK,OAAO,sBAAsB,IAAI,KAAK,OAAO,eAAe;AAAA,EAGpE,YAAY,MAAM,KAAK,OAAO,aAAa;AAAA,EAC3C,UAAU,MAAM,KAAK,OAAO,aAAa;AAC3C;AAEA,IAAO,+BAAQ;",
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAA6B;AAG7B,MAAM,qBAAqB;AAAA,EACjB;AAAA,EACA;AAAA,EAKR,IAAI,aAAa;AACf,WAAO,KAAK,YAAY;AAAA,EAC1B;AAAA,EACA,IAAI,gBAAgB;AAClB,WAAO,KAAK,YAAY;AAAA,EAC1B;AAAA,EAEA,YAAY;AAAA,IACV,WAAW;AAAA,IACX,eAAe;AAAA,IACf;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,GAQG;AACD,QAAI,YAAY;AACd,WAAK,cAAc;AAAA,QACjB,YAAY;AAAA,QACZ,eAAe;AAAA,UACb;AAAA,UACA;AAAA,QACF;AAAA,MACF;AAAA,aACO,YAAY;AACnB,WAAK,cAAc;AAAA,QACjB,YAAY;AAAA,QACZ,eAAe;AAAA,UACb;AAAA,UACA;AAAA,QACF;AAAA,MACF;AAAA,aACO;AACP,WAAK,cAAc;AAAA,QACjB,YAAY;AAAA,QACZ,eAAe;AAAA,UACb;AAAA,QACF;AAAA,MACF;AAAA;AAEA,WAAK,cAAc;AAAA,QACjB,YAAY;AAAA,QACZ,eAAe,EAAE,cAAc,GAAG;AAAA,MACpC;AAEF,SAAK,SAAS,2BAAa,OAAO;AAAA,MAChC,GAAG,KAAK;AAAA,MACR;AAAA,MACA;AAAA,IACF,CAAC;AAAA,EACH;AAAA,EAEA,eAAe,YAAgD;AAE7D,UAAM,KAAK,OAAO,kBAAkB;AACpC,WAAQ,KAAK,OAAe;AAAA,EAC9B;AAAA,EACA,cAAc,YACZ,KAAK,OAAO,eAAgB,MAAM,KAAK,OAAO,kBAAkB;AAAA,EAClE,eAAe,YACb,CAAC,KAAK,OAAO,sBAAsB,IAAI,KAAK,OAAO,eAAe;AAAA;AAAA,EAGpE,YAAY,MAAM,KAAK,OAAO,aAAa;AAAA,EAC3C,UAAU,MAAM,KAAK,OAAO,aAAa;AAC3C;AAEA,IAAO,+BAAQ;",
   "names": []
 }

package/dist/services/ContensisCliService.js

@@ -18,6 +18,10 @@ var __copyProps = (to2, from, except, desc) => {
   return to2;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
@@ -88,9 +92,8 @@ class ContensisCli {
   get env() {
     const currentEnvironment = this.currentEnv;
     const environments = this.cache.environments || {};
-    if (!currentEnvironment)
-      return {};
-    else if (!!environments[currentEnvironment])
+    if (!currentEnvironment) return {};
+    else if (environments[currentEnvironment])
       return environments[currentEnvironment];
     else {
       return {
@@ -121,21 +124,16 @@ class ContensisCli {
     const environments = this.cache.environments || {};
     this.currentEnv = currentEnvironment;
     const env = this.env;
-    if (outputOpts == null ? void 0 : outputOpts.projectId)
-      env.currentProject = outputOpts.projectId;
-    if (outputOpts == null ? void 0 : outputOpts.user)
-      env.lastUserId = outputOpts.user;
-    if (outputOpts == null ? void 0 : outputOpts.password)
-      env.passwordFallback = outputOpts.password;
-    if (outputOpts == null ? void 0 : outputOpts.clientId)
-      env.lastUserId = outputOpts.clientId;
+    if (outputOpts == null ? void 0 : outputOpts.projectId) env.currentProject = outputOpts.projectId;
+    if (outputOpts == null ? void 0 : outputOpts.user) env.lastUserId = outputOpts.user;
+    if (outputOpts == null ? void 0 : outputOpts.password) env.passwordFallback = outputOpts.password;
+    if (outputOpts == null ? void 0 : outputOpts.clientId) env.lastUserId = outputOpts.clientId;
     if (outputOpts == null ? void 0 : outputOpts.sharedSecret)
       if (outputOpts.sharedSecret.startsWith("-"))
         throw new Error(
           `Shared secret option provided a value of ${outputOpts.sharedSecret}`
         );
-      else
-        env.passwordFallback = outputOpts.sharedSecret;
+      else env.passwordFallback = outputOpts.sharedSecret;
     this.currentProject = (env == null ? void 0 : env.currentProject) || "null";
     this.sourceAlias = (outputOpts == null ? void 0 : outputOpts.sourceAlias) || currentEnvironment;
     if (currentEnvironment) {
@@ -144,7 +142,7 @@ class ContensisCli {
     this.command = {
       commandText,
       options: outputOpts,
-      createdDate: new Date().toISOString(),
+      createdDate: (/* @__PURE__ */ new Date()).toISOString(),
       invokedBy: env == null ? void 0 : env.lastUserId
     };
     if (currentEnvironment) {
@@ -230,10 +228,8 @@ class ContensisCli {
           );
         }
       } else {
-        if (!currentEnv)
-          log.help(messages.connect.help());
-        if (!userId)
-          log.help(messages.connect.tip());
+        if (!currentEnv) log.help(messages.connect.help());
+        if (!userId) log.help(messages.connect.tip());
       }
     }
     return this.contensis;
@@ -322,10 +318,8 @@ class ContensisCli {
         }
       }
     } else {
-      if (!currentEnv)
-        log.help(messages.connect.help());
-      if (!targetUserId)
-        log.help(messages.connect.tip());
+      if (!currentEnv) log.help(messages.connect.help());
+      if (!targetUserId) log.help(messages.connect.tip());
     }
     return this.contensis;
   };
@@ -367,7 +361,7 @@ class ContensisCli {
     let inputPassword = password || sharedSecret;
     if (!inputPassword)
       inputPassword = (0, import_util.isSharedSecret)(this.env.passwordFallback) || (0, import_util.isPassword)(this.env.passwordFallback) || "";
-    const { log, messages } = this;
+    const { messages } = this;
     if (userId) {
       const { currentEnv, env } = this;
       if (currentEnv) {
@@ -401,10 +395,8 @@ class ContensisCli {
               env.lastUserId = userId;
               env.passwordFallback = credentials.remarks.secure !== true ? (_d = credentials.current) == null ? void 0 : _d.password : void 0;
               this.session.UpdateEnv(env);
-              if (inputPassword)
-                await credentials.Save(inputPassword);
-              if (sharedSecret)
-                await credentials.Save(sharedSecret);
+              if (inputPassword) await credentials.Save(inputPassword);
+              if (sharedSecret) await credentials.Save(sharedSecret);
               if (!silent) {
                 import_logger.Logger.success(messages.login.success(currentEnv, userId));
                 await this.PrintProjects();
@@ -497,6 +489,7 @@ class ContensisCli {
             try {
               color = import_chalk.default.keyword(project.color);
             } catch (ex) {
+              import_logger.Logger.debug(`${ex}`);
               color = import_chalk.default.white;
             }
             console.log(
@@ -518,7 +511,7 @@ class ContensisCli {
     }
   };
   PrintProject = async (projectId = this.currentProject) => {
-    const { log, messages, session } = this;
+    const { log, messages } = this;
     const contensis = await this.ConnectContensis();
     if (contensis) {
       const [projectsErr, projects] = await (0, import_await_to_js.default)(
@@ -636,7 +629,7 @@ class ContensisCli {
     const { currentEnv, log, messages } = this;
     const contensis = await this.ConnectContensis({ commit: true });
     if (contensis) {
-      const [err, key] = await contensis.apiKeys.RemoveKey(id);
+      const [err] = await contensis.apiKeys.RemoveKey(id);
       if (!err) {
         log.success(messages.keys.removed(currentEnv, id));
         console.log("");
@@ -652,8 +645,7 @@ class ContensisCli {
       const [rolesErr, roles] = await (0, import_await_to_js.default)(contensis.roles.GetRoles());
       if (Array.isArray(roles)) {
         log.success(messages.roles.list(currentEnv));
-        if (!roles.length)
-          log.help(messages.roles.noneExist());
+        if (!roles.length) log.help(messages.roles.noneExist());
         await this.HandleFormattingAndOutput(roles, () => {
           var _a, _b, _c, _d, _e;
           for (const {
@@ -666,8 +658,7 @@ class ContensisCli {
           } of roles) {
             const color = enabled ? (s) => s : log.infoText;
             console.log(color(`  - ${import_chalk.default.bold(name)} ${log.infoText(id)}`));
-            if (description)
-              console.log(log.infoText(`    ${description}`));
+            if (description) console.log(log.infoText(`    ${description}`));
             if (enabled === false)
               console.log(`      ${import_chalk.default.bold.grey("enabled")}: false`);
             if ((_a = assignments.groups) == null ? void 0 : _a.length)
@@ -722,10 +713,8 @@ class ContensisCli {
       if (Array.isArray(roles)) {
         log.success(messages.roles.list(currentEnv));
         const role = (0, import_find.findByIdOrName)(roles, roleNameOrId);
-        if (role)
-          await this.HandleFormattingAndOutput(role, log.object);
-        else
-          log.error(messages.roles.failedGet(currentEnv, roleNameOrId));
+        if (role) await this.HandleFormattingAndOutput(role, log.object);
+        else log.error(messages.roles.failedGet(currentEnv, roleNameOrId));
       }
       if (rolesErr) {
         log.error(messages.roles.noList(currentEnv));
@@ -798,8 +787,7 @@ class ContensisCli {
           const [deleteErr] = await contensis.roles.RemoveRole(existingRole.id);
           if (deleteErr)
             log.error(messages.roles.failedRemove(currentEnv, roleNameOrId));
-          else
-            log.success(messages.roles.removed(currentEnv, roleNameOrId));
+          else log.success(messages.roles.removed(currentEnv, roleNameOrId));
         } else {
           log.error(messages.roles.failedGet(currentEnv, roleNameOrId));
         }
@@ -817,8 +805,7 @@ class ContensisCli {
       const [workflowsErr, workflows] = await contensis.content.sourceRepo.workflows.GetWorkflows();
       if (Array.isArray(workflows)) {
         log.success(messages.workflows.list(currentEnv));
-        if (!workflows.length)
-          log.help(messages.workflows.noneExist());
+        if (!workflows.length) log.help(messages.workflows.noneExist());
         const stringFromLanguageObject = (o) => {
           var _a;
           return (_a = Object.values(o || {})) == null ? void 0 : _a[0];
@@ -1031,25 +1018,20 @@ class ContensisCli {
         console.log(log.warningText(` *** COMMITTING IMPORT *** `));
       }
       const [migrateErr, result] = await contensis.MigrateContentModels();
-      if (migrateErr)
-        (0, import_logger.logError)(migrateErr);
+      if (migrateErr) (0, import_logger.logError)(migrateErr);
       else
         await this.HandleFormattingAndOutput(result, () => {
           if (!result.committed) {
             log.raw(log.boldText(`
 Content types:`));
-            if (!result.contentTypes)
-              log.info(`- None returned
+            if (!result.contentTypes) log.info(`- None returned
 `);
-            else
-              (0, import_console.printModelMigrationAnalysis)(this, result.contentTypes);
+            else (0, import_console.printModelMigrationAnalysis)(this, result.contentTypes);
             log.raw(log.boldText(`
 Components:`));
-            if (!result.components)
-              log.info(`- None returned
+            if (!result.components) log.info(`- None returned
 `);
-            else
-              (0, import_console.printModelMigrationAnalysis)(this, result.components);
+            else (0, import_console.printModelMigrationAnalysis)(this, result.components);
             if (result.defaults && Object.keys(result.defaults).length) {
               log.raw(log.boldText(`
 Defaults:`));
@@ -1156,6 +1138,7 @@ Nodes:`));
     const contensis = await this.ConnectContensisImport({
       commit,
       importDataType: "user-input"
+      // 'user-input' import type does not require a source cms
     });
     if (contensis) {
       const [err, result] = await contensis.DeleteContentTypes(contentTypeIds);
@@ -1187,8 +1170,7 @@ Nodes:`));
     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];
+    if (!Array.isArray(fileData)) fileData = [fileData];
     const contensis = await this.ConnectContensisImport({
       commit,
       importDataType: fromFile ? "user-input" : void 0
@@ -1198,9 +1180,8 @@ Nodes:`));
         for (const contentType of fileData) {
           contentType.projectId = currentProject;
           delete contentType.uuid;
-          const [err, created, createStatus] = await contensis.models.targetRepos[currentProject].repo.UpsertContentType(false, contentType);
-          if (err)
-            log.error(err.message, err);
+          const [err, , createStatus] = await contensis.models.targetRepos[currentProject].repo.UpsertContentType(false, contentType);
+          if (err) log.error(err.message, err);
           if (createStatus) {
             log.success(
               messages.contenttypes.created(
@@ -1229,8 +1210,7 @@ Nodes:`));
     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];
+    if (!Array.isArray(fileData)) fileData = [fileData];
     const contensis = await this.ConnectContensisImport({
       fromFile,
       importDataType: "models"
@@ -1239,8 +1219,7 @@ Nodes:`));
       const [err, result] = await (0, import_await_to_js.default)(
         contensis.models.Diff(fileData.length ? fileData : modelIds)
       );
-      if (err)
-        log.error(err.message, err);
+      if (err) log.error(err.message, err);
       if (result)
         await this.HandleFormattingAndOutput(result, () => {
           var _a;
@@ -1252,18 +1231,14 @@ Nodes:`));
           );
           if (result.committed === false) {
             log.raw(log.boldText(`Content types:`));
-            if (!result.contentTypes)
-              log.info(`- None returned
+            if (!result.contentTypes) log.info(`- None returned
 `);
-            else
-              (0, import_console.printModelMigrationAnalysis)(this, result.contentTypes);
+            else (0, import_console.printModelMigrationAnalysis)(this, result.contentTypes);
             log.raw(log.boldText(`
 Components:`));
-            if (!result.components)
-              log.info(`- None returned
+            if (!result.components) log.info(`- None returned
 `);
-            else
-              (0, import_console.printModelMigrationAnalysis)(this, result.components);
+            else (0, import_console.printModelMigrationAnalysis)(this, result.components);
           }
         });
     }
@@ -1310,6 +1285,7 @@ Components:`));
     const contensis = await this.ConnectContensisImport({
       commit,
       importDataType: "user-input"
+      // 'user-input' import type does not require a source cms
     });
     if (contensis) {
       const [err, result] = await contensis.DeleteContentTypes(
@@ -1344,8 +1320,7 @@ Components:`));
     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];
+    if (!Array.isArray(fileData)) fileData = [fileData];
     const contensis = await this.ConnectContensisImport({
       commit,
       importDataType: fromFile ? "user-input" : void 0
@@ -1355,9 +1330,8 @@ Components:`));
         for (const component of fileData) {
           component.projectId = currentProject;
           delete component.uuid;
-          const [err, created, createStatus] = await contensis.models.targetRepos[currentProject].repo.UpsertComponent(false, component);
-          if (err)
-            log.error(err.message, err);
+          const [err, , createStatus] = await contensis.models.targetRepos[currentProject].repo.UpsertComponent(false, component);
+          if (err) log.error(err.message, err);
           if (createStatus) {
             log.success(
               messages.components.created(
@@ -1385,6 +1359,7 @@ Components:`));
     const contensis = await this.ConnectContensisImport({
       commit,
       importDataType: "user-input"
+      // 'user-input' import type does not require a source cms
     });
     if (contensis) {
       if (contensis.isPreview) {
@@ -1421,17 +1396,22 @@ Components:`));
     if (contensis) {
       log.line();
       const entries = await contensis.GetEntries({ withDependents });
-      await this.HandleFormattingAndOutput(
-        entries,
-        () => {
-          var _a;
-          return (0, import_migratortron.logEntitiesTable)({
-            entries,
+      const nodes = contensis.content.source.nodes.raw;
+      const combinedOutput = [...entries, ...nodes];
+      await this.HandleFormattingAndOutput(combinedOutput, () => {
+        var _a, _b;
+        (0, import_migratortron.logEntitiesTable)({
+          entries,
+          projectId: currentProject,
+          fields: (_a = contensis.payload.query) == null ? void 0 : _a.fields
+        });
+        if (nodes.length)
+          (0, import_migratortron.logEntitiesTable)({
+            nodes,
             projectId: currentProject,
-            fields: (_a = contensis.payload.query) == null ? void 0 : _a.fields
+            fields: (_b = contensis.payload.query) == null ? void 0 : _b.fields
           });
-        }
-      );
+      });
     } else {
       log.warning(messages.models.noList(currentProject));
       log.help(messages.connect.tip());
@@ -1458,11 +1438,16 @@ Components:`));
         console.log(log.warningText(` *** COMMITTING IMPORT *** `));
       }
       const [err, result] = await contensis.MigrateEntries();
-      if (err)
-        (0, import_logger.logError)(err);
+      if (err) (0, import_logger.logError)(err);
       else {
         const { entries, nodes } = contensis.content.targets[currentProject];
-        const output = saveEntries ? (_a = entries.migrate) == null ? void 0 : _a.map((me) => me.toJSON()) : result;
+        const output = saveEntries ? (
+          // include entries and dependent nodes when saving entries
+          [
+            ((_a = entries.migrate) == null ? void 0 : _a.map((me) => me.toJSON())) || [],
+            nodes.migrateNodes.map((mn) => mn.node)
+          ].flat()
+        ) : result;
         await this.HandleFormattingAndOutput(output, () => {
           (0, import_console.printEntriesMigrateResult)(this, result, {
             showAll: logOutput === "all",
@@ -1527,8 +1512,7 @@ Components:`));
       const [err, result] = await (0, import_await_to_js.default)(
         contensis.content.copy.MigrateFieldContent()
       );
-      if (err)
-        (0, import_logger.logError)(err);
+      if (err) (0, import_logger.logError)(err);
       if (result) {
         const output = saveEntries ? (_a = contensis.content.copy.targets[currentProject].entries.migrate) == null ? void 0 : _a.map(
           (me) => me.toJSON()
@@ -1605,8 +1589,7 @@ Components:`));
         console.log(log.warningText(` *** COMMITTING IMPORT *** `));
       }
       const [err, result] = await contensis.MigrateNodes();
-      if (err)
-        log.raw(``);
+      if (err) log.raw(``);
       else
         await this.HandleFormattingAndOutput(result, () => {
           const migrateTree = contensis.nodes.targetRepos[currentProject].nodes.migrateNodesTreeView;
@@ -1624,8 +1607,8 @@ Components:`));
       if (!err && (!((_f = result.errors) == null ? void 0 : _f.length) || this.contensisOpts.ignoreErrors) && (!commit && nodesMigrateCount || commit && (nodesCreated || nodesUpdated || ((_g = result.errors) == null ? void 0 : _g.length)))) {
         let totalCount;
         if (commit) {
-          let created = typeof nodesCreated === "number" ? nodesCreated : 0;
-          let updated = typeof nodesUpdated === "number" ? nodesUpdated : 0;
+          const created = typeof nodesCreated === "number" ? nodesCreated : 0;
+          const updated = typeof nodesUpdated === "number" ? nodesUpdated : 0;
           totalCount = created + updated;
         } else {
           totalCount = typeof nodesMigrateCount === "number" ? nodesMigrateCount : 0;
@@ -1640,8 +1623,7 @@ Components:`));
           log.help(messages.nodes.noChange(currentEnv));
         } else {
           log.error(messages.nodes.failedImport(currentEnv), err);
-          if (!nodesMigrateCount)
-            log.help(messages.nodes.notFound(currentEnv));
+          if (!nodesMigrateCount) log.help(messages.nodes.notFound(currentEnv));
         }
       }
     } else {
@@ -1655,6 +1637,7 @@ Components:`));
     const contensis = await this.ConnectContensisImport({
       commit,
       importDataType: "user-input"
+      // 'user-input' import type does not require a source cms
     });
     if (contensis) {
       if (contensis.isPreview) {
@@ -1703,8 +1686,7 @@ Components:`));
       ) : webhooks;
       if (Array.isArray(filteredResults)) {
         log.success(messages.webhooks.list(currentEnv));
-        if (!(webhooks == null ? void 0 : webhooks.length))
-          log.warning(messages.webhooks.noneExist());
+        if (!(webhooks == null ? void 0 : webhooks.length)) log.warning(messages.webhooks.noneExist());
         else {
           await this.HandleFormattingAndOutput(filteredResults, () => {
             for (const {
@@ -1724,8 +1706,7 @@ Components:`));
                   `  ${import_chalk.default.bold.white`- ${name}`} ${id} [${(version.modified || version.created).toString().substring(0, 10)} ${version.modifiedBy || version.createdBy}]`
                 )
               );
-              if (description)
-                console.log(log.infoText`    ${description}`);
+              if (description) console.log(log.infoText`    ${description}`);
               console.log(`    ${log.infoText`[${method}]`} ${url2}`);
               if (headers && Object.keys(headers).length) {
                 console.log(`    ${log.infoText`headers`}:`);
@@ -1853,9 +1834,7 @@ Components:`));
     console.log((0, import_json.jsonFormatter)(block));
     const contensis = await this.ConnectContensis();
     if (contensis) {
-      const [err, blockVersion] = await contensis.blocks.PushBlockVersion(
-        block
-      );
+      const [err, blockVersion] = await contensis.blocks.PushBlockVersion(block);
       if (!err) {
         log.success(
           messages.blocks.pushed(
@@ -1893,8 +1872,7 @@ Components:`));
       blockVersionNo = `${(_a = blockVersions == null ? void 0 : blockVersions[0]) == null ? void 0 : _a.version.versionNo}`;
       if (!Number.isNaN(blockVersionNo) && Number(blockVersionNo) > 0)
         return [null, blockVersionNo];
-      else
-        throw new Error(`'${blockVersionNo}' is not a valid version number`);
+      else throw new Error(`'${blockVersionNo}' is not a valid version number`);
     } catch (parseVersionEx) {
       log.info(
         `Request for blockId: ${blockId}, branch: ${branch}, version: latest`
@@ -1912,9 +1890,7 @@ Components:`));
     if (contensis) {
       let actionOnBlockVersion = version;
       if (action === "release" && version === "latest") {
-        const [getErr, blockVersion2] = await this.GetLatestBlockVersion(
-          blockId
-        );
+        const [getErr, blockVersion2] = await this.GetLatestBlockVersion(blockId);
         if (getErr) {
           throw new Error(
             `${messages.blocks.noList(
@@ -1997,7 +1973,7 @@ Components:`));
           );
           stopFollowing();
         });
-        let delay = (0, import_timers.promiseDelay)(5 * 1e3, null);
+        const delay = (0, import_timers.promiseDelay)(5 * 1e3, null);
         const stopFollowing = () => {
           following = false;
           delay.cancel();
@@ -2078,6 +2054,7 @@ Components:`));
       }
     }
   };
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   PrintRenderers = async (rendererId) => {
     const { currentEnv, env, log, messages } = this;
     const contensis = await this.ConnectContensis();