contensis-cli 1.1.2-beta.0 → 1.1.2-beta.10

package/src/services/ContensisDevService.ts

@@ -1,27 +1,25 @@
 import ansiEscapes from 'ansi-escapes';
 import to from 'await-to-js';
-import { spawn } from 'child_process';
 import inquirer from 'inquirer';
 import { createSpinner } from 'nanospinner';
-import path from 'path';
 
 import { Role } from 'contensis-management-api/lib/models';
 import { MigrateRequest } from 'migratortron';
 
 import ContensisRole from './ContensisRoleService';
+import { createRequestHandler } from '~/factories/RequestHandlerFactory';
 import { OutputOptionsConstructorArg } from '~/models/CliService';
 import { EnvContentsToAdd } from '~/models/DevService';
-import { mapSiteConfigYaml } from '~/mappers/DevRequests-to-RequestHanderSiteConfigYaml';
 import { mapCIWorkflowContent } from '~/mappers/DevInit-to-CIWorkflow';
+import RequestHandlerArgs from '~/mappers/DevRequests-to-RequestHanderCliArgs';
 import { deployKeyRole } from '~/mappers/DevInit-to-RolePermissions';
-import { appRootDir, readFile, writeFile } from '~/providers/file-provider';
+import { readFile, writeFile } from '~/providers/file-provider';
 import { diffFileContent } from '~/util/diff';
 import { mergeDotEnvFileContents } from '~/util/dotenv';
 import { findByIdOrName } from '~/util/find';
 import { GitHelper } from '~/util/git';
 import { jsonFormatter } from '~/util/json.formatter';
 import { winSlash } from '~/util/os';
-import { stringifyYaml } from '~/util/yaml';
 import { mergeContentsToAddWithGitignore } from '~/util/gitignore';
 
 class ContensisDev extends ContensisRole {
@@ -413,90 +411,57 @@ class ContensisDev extends ContensisRole {
     }
   };
 
-  ExecRequestHandler = async (blockIds: string[], overrideArgs?: string[]) => {
-    // if no request handler exe
-    // download it.
-
-    // if update arg, redownload it
-
-    const { log } = this;
-    // const getPrefixOld = log.getPrefix;
-    const exeHome = path.join(appRootDir, 'reqhan');
-    const exe = 'Zengenti.Contensis.RequestHandler.LocalDevelopment';
-    const exePath = path.join(exeHome, exe);
-    const siteConfigPath = path.join(appRootDir, 'site_config.yaml');
-
-    const siteConfig = await mapSiteConfigYaml(this);
-    writeFile('site_config.yaml', stringifyYaml(siteConfig));
-
-    const args = overrideArgs
-      ? typeof overrideArgs?.[0] === 'string' &&
-        overrideArgs[0].includes(' ', 2)
-        ? overrideArgs[0].split(' ')
-        : overrideArgs
-      : []; // args could be [ '-c .\\site_config.yaml' ] or [ '-c', '.\\site_config.yaml' ]
-
-    // Add required args
-    if (!args.find(a => a === '-c')) args.push('-c', siteConfigPath);
-
-    // const child = execFile(exePath, args);
-
-    const child = spawn(exePath, args, { stdio: 'inherit' });
-
-    // log.raw('');
-    log.info(`Launching request handler...`);
-    if (overrideArgs?.length)
-      this.log.warning(
-        `Spawning process with supplied args: ${JSON.stringify(
-          child.spawnargs,
-          null,
-          2
-        )}`
-      );
-
-    let isRunning = false;
-
-    // Log child output through event listeners
-    child?.stdout?.on('data', data => {
-      isRunning = true;
-      log.raw(data);
-    });
-
-    child?.stderr?.on('data', data => {
-      log.error(data);
-    });
-
-    child.on('spawn', () => {
-      isRunning = true;
-      log.help(
-        `You may see a firewall popup requesting network access, it is safe to approve`
-      );
-      // log.getPrefix = () => Logger.infoText(`[rqh]`);
-    });
-
-    child.on('exit', code => {
-      isRunning = false;
-
-      log[code === 0 ? 'success' : 'warning'](
-        `Request handler exited with code ${code}\n`
-      );
-    });
-
-    child.on('error', error => {
-      isRunning = false;
-      log.error(`Could not launch request handler due to error \n${error}`);
-    });
+  ExecRequestHandler = async (
+    blockId: string[],
+    overrideArgs: string[] = [],
+    version?: string
+  ) => {
+    const { debug, log, messages } = this;
+
+    const spinner = !debug
+      ? createSpinner(messages.devrequests.launch())
+      : log.info(messages.devrequests.launch());
+
+    // Ensure request handler is available to use
+    const requestHandler = await createRequestHandler(version);
+
+    // Generate args for request handler using CLI methods
+    const args = new RequestHandlerArgs(this);
+    spinner?.start();
+    await args.Create();
+    spinner?.success();
+
+    // Prompt block id and dev uri to run locally (if not supplied)
+    const blockIdChoices = args.siteConfig?.blocks.map(block => block.id) || [];
+    blockIdChoices.push('none');
+    const defaultDeveloperUri = 'http://localhost:3000';
+
+    const { overrideBlockId, overrideUri } = blockId.length
+      ? {
+          overrideBlockId: blockId[0],
+          overrideUri: blockId?.[1] || defaultDeveloperUri,
+        }
+      : await inquirer.prompt([
+          {
+            type: 'list',
+            prefix: '🧱',
+            message: messages.devrequests.overrideBlock(),
+            name: 'overrideBlockId',
+            choices: blockIdChoices,
+          },
+          {
+            type: 'input',
+            prefix: '🔗',
+            message: messages.devrequests.overrideUri(),
+            name: 'overrideUri',
+            default: defaultDeveloperUri,
+          },
+        ]);
 
-    await new Promise(resolve => setTimeout(resolve, 2000));
+    args.overrideBlock(overrideBlockId, overrideUri);
 
-    // keep the method running until we can return
-    while (true === true) {
-      if (!isRunning) {
-        // log.getPrefix = getPrefixOld; // restore logger state
-        return;
-      }
-      await new Promise(resolve => setTimeout(resolve, 1000));
-    }
+    // Launch request handler
+    await requestHandler(args.getArgs(overrideArgs));
   };
 }
 export const devCommand = (

package/src/shell.ts

@@ -135,6 +135,7 @@ class ContensisShell {
       availableCommands.push('login', 'list projects', 'set project');
     if (userId)
       availableCommands.push(
+        'copy field',
         'create key',
         'create project',
         'create role',
@@ -306,4 +307,4 @@ process.stdin.on('data', key => {
   }
 });
 
-// // process.env.http_proxy = 'http://127.0.0.1:8888';
+// process.env.http_proxy = 'http://127.0.0.1:8888';

package/src/util/api-ids.ts

@@ -0,0 +1,111 @@
+export const sanitiseId = (id: string) =>
+  id
+    .split('.')
+    .map(part => toApiId(part, 'camelCase', true))
+    .join('.');
+
+export const sanitiseIds = (arr: string[]) => arr.map(sanitiseId);
+
+// borrowed from packages\contensis\components\app\src\utils.ts
+
+export function isApiId(id: string, mode: 'camelCase' | 'snake-case'): boolean {
+  if (!id) {
+    return false;
+  }
+  const validChars = mode === 'camelCase' ? /[^a-zA-Z0-9]/g : /[^a-z0-9-]/g;
+  if (id !== id.replace(validChars, '')) {
+    return false;
+  }
+  if (!id.substr(0, 1).replace(/[^a-z]/g, '')) {
+    return false;
+  }
+  return true;
+}
+
+export function toApiId(
+  name: string,
+  mode: 'camelCase' | 'snake-case',
+  isId: boolean
+) {
+  if (!name) {
+    return name;
+  }
+  const validChars =
+    mode === 'camelCase' ? /[^a-zA-Z0-9 ]/g : /[^a-zA-Z0-9 -]/g;
+  let id = name.replace(validChars, '');
+  id = id.replace(/-/g, ' ');
+  id = id.trim();
+
+  const noStart = '0123456789 '.split('');
+  id = id
+    .split('')
+    .reduce(
+      (prev, char) => (prev || !noStart.includes(char) ? prev + char : prev),
+      ''
+    );
+  return mode === 'camelCase' ? toCamelCase(id, isId) : toSnakeCase(id);
+}
+
+function toSnakeCase(sentence: string): string {
+  sentence = (sentence || '').trim();
+  if (!sentence) {
+    return sentence;
+  }
+  sentence = sentence.toLowerCase();
+  return sentence
+    .split(' ')
+    .filter(w => !!w)
+    .join('-');
+}
+
+function toCamelCase(sentence: string, isId: boolean): string {
+  sentence = (sentence || '').trim();
+  if (!sentence) {
+    return sentence;
+  }
+  if (sentence.length < 2) {
+    return sentence.toLowerCase();
+  }
+  const words = sentence.split(' ');
+  if (isId && words.length === 1) {
+    return words[0].substr(0, 1).toLowerCase() + words[0].substr(1);
+  }
+  const result = words
+    .filter(w => !!w)
+    .map((w, index) =>
+      index === 0 ? firstWordToCamelCase(w) : wordToCamelCase(w)
+    )
+    .join('');
+
+  return result
+    .split('.')
+    .map((w, index) => (index === 0 ? w : wordToCamelCase(w)))
+    .join('.');
+}
+
+function firstWordToCamelCase(word: string) {
+  return isUpperCase(word)
+    ? word.toLowerCase()
+    : lowerCaseInitialCapitalLettersExceptLast(word);
+}
+
+function wordToCamelCase(word: string) {
+  return word.substr(0, 1).toUpperCase() + word.substr(1);
+}
+
+function lowerCaseInitialCapitalLettersExceptLast(value: string): string {
+  return value.split('').reduce((prev, char, index) => {
+    if (index === 0) {
+      char = char.toLowerCase();
+    } else if (isUpperCase(char)) {
+      if (index + 1 < value.length && isUpperCase(value.charAt(index + 1))) {
+        char = char.toLowerCase();
+      }
+    }
+    return prev + char;
+  }, '');
+}
+
+function isUpperCase(value: string): boolean {
+  return value === value.toUpperCase();
+}

package/src/util/console.printer.ts

@@ -4,6 +4,7 @@ import { deconstructApiError } from './error';
 import { Logger, addNewLines } from './logger';
 import {
   BlockVersion,
+  CopyFieldResult,
   EntriesResult,
   MigrateModelsResult,
   MigrateNodesTree,
@@ -116,7 +117,7 @@ export const printBlockVersion = (
 
 export const printEntriesMigrateResult = (
   { log, messages, currentProject }: ContensisCli,
-  migrateResult: EntriesResult,
+  migrateResult: EntriesResult | CopyFieldResult,
   {
     action = 'import',
     showDiff = false,

package/src/util/debug.ts

@@ -0,0 +1 @@
+export const isDebug = () => ['true', '1'].includes(process.env.debug || '');

package/src/util/fetch.ts

@@ -0,0 +1,74 @@
+import { DoRetry, FetchInit, fetchWithDefaults } from 'enterprise-fetch';
+import { Logger } from './logger';
+
+const retryPolicy = {
+  retries: 2,
+  minTimeout: 400,
+  factor: 2,
+};
+
+const applyTimeout = (s: number) =>
+  process.env.NODE_ENV === 'test' ? 2 * 1000 : s * 1000;
+
+export const doRetry = ({ silent = false } = {}) => {
+  const fn: DoRetry = async (
+    attempt: number,
+    res: Response | AppError,
+    { url, options } = { url: '', options: {} }
+  ) => {
+    // Get the retry policy from options or fetchDefaults
+    const { retry = retryPolicy } = options || ({} as any);
+    let shouldRetry = false;
+
+    // Retry request on any network error, or 4xx or 5xx status codes
+    if (
+      !res.status ||
+      (res.status >= 400 && ![400, 404, 409, 422, 500].includes(res.status))
+    )
+      if (
+        !('message' in res) ||
+        ('message' in res &&
+          !(res.message as string).includes('Nock: No match'))
+      )
+        shouldRetry = true;
+
+    if (attempt <= retry.retries) {
+      // If a res has a status it is a HTTP error
+      // With no status it could be a fetch error or app error
+      const errorMessage = !res.status
+        ? `${('name' in res && res.name) || ('type' in res && res.type)}: ${
+            'message' in res && res.message
+          }`
+        : `${res.status}: ${res.statusText}`;
+
+      if (!silent)
+        Logger.warning(
+          `[fetch] ${
+            shouldRetry
+              ? `attempt ${attempt}/${retry.retries}`
+              : 'non-retriable'
+          } ${errorMessage} ${url || ''}`
+        );
+    } else {
+      shouldRetry = false;
+    }
+    return await Promise.resolve(shouldRetry);
+  };
+  return fn;
+};
+
+const fetchDefaults = {
+  // The timeout to apply to requests that do not supply a timeout option
+  timeout: applyTimeout(60),
+  // Retry policy for all fetch requests
+  retry: retryPolicy,
+  // Do retry function to examine failures and apply custom retry logic
+  // return true to retry the fetch call
+  doRetry: doRetry(),
+} as FetchInit;
+
+export const enhancedFetch = fetchWithDefaults(fetchDefaults);
+// export const assetFetch = fetchWithDefaults({
+//   ...fetchDefaults,
+//   timeout: applyTimeout(1200),
+// });

package/src/util/index.ts

@@ -16,7 +16,7 @@ export const tryParse = (str: any) => {
   }
 };
 
-export const isJson = (str: string) =>
+export const isJson = (str?: string) =>
   typeof str === 'object' || !!tryParse(str);
 
 export const tryStringify = (obj: any) => {

package/src/util/logger.ts

@@ -57,7 +57,6 @@ export class Logger {
     else console.log(message);
   };
   static warning: LogMethod = content => {
-    // if (process.env.DEBUG === 'true') {
     const message = `${Logger.getPrefix()} ${Logger.warningText(
       `${Logger.isUserTerminal ? '⚠️ ' : '[WARN]'} ${content}`
     )}\n`;

package/src/version.ts

@@ -1 +1 @@
-export const LIB_VERSION = "1.1.2-beta.0";
+export const LIB_VERSION = "1.1.2-beta.10";

package/dist/mappers/DevRequests-to-RequestHanderSiteConfigYaml.js

@@ -1,56 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-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 DevRequests_to_RequestHanderSiteConfigYaml_exports = {};
-__export(DevRequests_to_RequestHanderSiteConfigYaml_exports, {
-  mapSiteConfigYaml: () => mapSiteConfigYaml
-});
-module.exports = __toCommonJS(DevRequests_to_RequestHanderSiteConfigYaml_exports);
-const mapSiteConfigYaml = async (cli) => {
-  var _a, _b;
-  const credentials = await cli.GetCredentials(cli.env.lastUserId);
-  const blocks = [];
-  const blocksRaw = await cli.PrintBlocks();
-  for (const block of blocksRaw || []) {
-    const versions = await cli.PrintBlockVersions(
-      block.id,
-      "default",
-      "latest"
-    );
-    if (versions == null ? void 0 : versions[0]) {
-      blocks.push({
-        id: versions[0].id,
-        baseUri: versions[0].previewUrl
-      });
-    }
-  }
-  const siteConfig = {
-    alias: cli.currentEnv,
-    projectId: cli.currentProject,
-    accessToken: "",
-    clientId: ((_a = credentials == null ? void 0 : credentials.current) == null ? void 0 : _a.account) || "",
-    sharedSecret: ((_b = credentials == null ? void 0 : credentials.current) == null ? void 0 : _b.password) || "",
-    blocks
-  };
-  return siteConfig;
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  mapSiteConfigYaml
-});
-//# sourceMappingURL=DevRequests-to-RequestHanderSiteConfigYaml.js.map

package/dist/mappers/DevRequests-to-RequestHanderSiteConfigYaml.js.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../src/mappers/DevRequests-to-RequestHanderSiteConfigYaml.ts"],
-  "sourcesContent": ["import ContensisCli from '~/services/ContensisCliService';\n\ninterface ISiteConfigYaml {\n  alias: string;\n  projectId: string;\n  accessToken: string;\n  clientId: string;\n  sharedSecret: string;\n  blocks: {\n    id: string;\n    baseUri: string;\n  }[];\n}\n\nexport const mapSiteConfigYaml = async (cli: ContensisCli) => {\n  const credentials = await cli.GetCredentials(cli.env.lastUserId);\n\n  const blocks = [];\n  const blocksRaw = await cli.PrintBlocks();\n\n  for (const block of blocksRaw || []) {\n    const versions = await cli.PrintBlockVersions(\n      block.id,\n      'default',\n      'latest'\n    );\n    if (versions?.[0]) {\n      blocks.push({\n        id: versions[0].id,\n        baseUri: versions[0].previewUrl,\n      });\n    }\n  }\n\n  const siteConfig: ISiteConfigYaml = {\n    alias: cli.currentEnv,\n    projectId: cli.currentProject,\n    accessToken: '',\n    clientId: credentials?.current?.account || '',\n    sharedSecret: credentials?.current?.password || '',\n    blocks,\n  };\n  return siteConfig;\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAcO,MAAM,oBAAoB,OAAO,QAAsB;AAd9D;AAeE,QAAM,cAAc,MAAM,IAAI,eAAe,IAAI,IAAI,UAAU;AAE/D,QAAM,SAAS,CAAC;AAChB,QAAM,YAAY,MAAM,IAAI,YAAY;AAExC,aAAW,SAAS,aAAa,CAAC,GAAG;AACnC,UAAM,WAAW,MAAM,IAAI;AAAA,MACzB,MAAM;AAAA,MACN;AAAA,MACA;AAAA,IACF;AACA,QAAI,qCAAW,IAAI;AACjB,aAAO,KAAK;AAAA,QACV,IAAI,SAAS,GAAG;AAAA,QAChB,SAAS,SAAS,GAAG;AAAA,MACvB,CAAC;AAAA,IACH;AAAA,EACF;AAEA,QAAM,aAA8B;AAAA,IAClC,OAAO,IAAI;AAAA,IACX,WAAW,IAAI;AAAA,IACf,aAAa;AAAA,IACb,YAAU,gDAAa,YAAb,mBAAsB,YAAW;AAAA,IAC3C,gBAAc,gDAAa,YAAb,mBAAsB,aAAY;AAAA,IAChD;AAAA,EACF;AACA,SAAO;AACT;",
-  "names": []
-}

package/src/mappers/DevRequests-to-RequestHanderSiteConfigYaml.ts

@@ -1,44 +0,0 @@
-import ContensisCli from '~/services/ContensisCliService';
-
-interface ISiteConfigYaml {
-  alias: string;
-  projectId: string;
-  accessToken: string;
-  clientId: string;
-  sharedSecret: string;
-  blocks: {
-    id: string;
-    baseUri: string;
-  }[];
-}
-
-export const mapSiteConfigYaml = async (cli: ContensisCli) => {
-  const credentials = await cli.GetCredentials(cli.env.lastUserId);
-
-  const blocks = [];
-  const blocksRaw = await cli.PrintBlocks();
-
-  for (const block of blocksRaw || []) {
-    const versions = await cli.PrintBlockVersions(
-      block.id,
-      'default',
-      'latest'
-    );
-    if (versions?.[0]) {
-      blocks.push({
-        id: versions[0].id,
-        baseUri: versions[0].previewUrl,
-      });
-    }
-  }
-
-  const siteConfig: ISiteConfigYaml = {
-    alias: cli.currentEnv,
-    projectId: cli.currentProject,
-    accessToken: '',
-    clientId: credentials?.current?.account || '',
-    sharedSecret: credentials?.current?.password || '',
-    blocks,
-  };
-  return siteConfig;
-};