contensis-cli 1.1.2-beta.3 → 1.1.2-beta.5

package/dist/util/api-ids.js

@@ -0,0 +1,110 @@
+"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 api_ids_exports = {};
+__export(api_ids_exports, {
+  isApiId: () => isApiId,
+  sanitiseId: () => sanitiseId,
+  sanitiseIds: () => sanitiseIds,
+  toApiId: () => toApiId
+});
+module.exports = __toCommonJS(api_ids_exports);
+const sanitiseId = (id) => id.split(".").map((part) => toApiId(part, "camelCase", true)).join(".");
+const sanitiseIds = (arr) => arr.map(sanitiseId);
+function isApiId(id, mode) {
+  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;
+}
+function toApiId(name, mode, isId) {
+  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) {
+  sentence = (sentence || "").trim();
+  if (!sentence) {
+    return sentence;
+  }
+  sentence = sentence.toLowerCase();
+  return sentence.split(" ").filter((w) => !!w).join("-");
+}
+function toCamelCase(sentence, isId) {
+  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) {
+  return isUpperCase(word) ? word.toLowerCase() : lowerCaseInitialCapitalLettersExceptLast(word);
+}
+function wordToCamelCase(word) {
+  return word.substr(0, 1).toUpperCase() + word.substr(1);
+}
+function lowerCaseInitialCapitalLettersExceptLast(value) {
+  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) {
+  return value === value.toUpperCase();
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  isApiId,
+  sanitiseId,
+  sanitiseIds,
+  toApiId
+});
+//# sourceMappingURL=api-ids.js.map

package/dist/util/api-ids.js.map

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

package/dist/version.js

@@ -21,7 +21,7 @@ __export(version_exports, {
   LIB_VERSION: () => LIB_VERSION
 });
 module.exports = __toCommonJS(version_exports);
-const LIB_VERSION = "1.1.2-beta.3";
+const LIB_VERSION = "1.1.2-beta.5";
 // 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.1.2-beta.3\";\n"],
+  "sourcesContent": ["export const LIB_VERSION = \"1.1.2-beta.5\";\n"],
   "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAO,MAAM,cAAc;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "contensis-cli",
-  "version": "1.1.2-beta.3",
+  "version": "1.1.2-beta.5",
   "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",
@@ -28,7 +28,6 @@
     "app-root-path": "^3.1.0",
     "chalk": "^4.1.2",
     "commander": "^9.4.1",
-    "contensis-management-api": "^2.1.2",
     "csv": "^6.1.0",
     "dayjs": "^1.11.6",
     "diff": "^5.1.0",
@@ -40,7 +39,7 @@
     "jsonpath-mapper": "^1.1.0",
     "keytar": "^7.9.0",
     "lodash": "^4.17.21",
-    "migratortron": "^1.0.0-beta.39",
+    "migratortron": "^1.0.0-beta.40",
     "nanospinner": "^1.1.0",
     "node-fetch": "^2.6.7",
     "parse-git-config": "^3.0.0",

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

@@ -1,4 +1,5 @@
 import { ContensisMigrationService } from 'migratortron';
+import PQueue from 'p-queue';
 import ContensisCli from '~/services/ContensisCliService';
 
 type EndpointJson = {
@@ -32,6 +33,8 @@ type RendererRuleJson = {
 interface ISiteConfigYaml {
   alias: string;
   projectId: string;
+  iisHostname: string;
+  podClusterId: string;
   accessToken: string; // needed?
   clientId: string;
   sharedSecret: string;
@@ -55,10 +58,14 @@ class RequestHandlerArgs {
   };
 
   buildSiteConfig = async () => {
-    const { currentEnv, currentProject, env, log, messages } = this.cli;
+    const { currentEnv, currentProject, env, log, messages, urls } = this.cli;
+    const contensis = await this.cli.ConnectContensis();
+
     const siteConfig: ISiteConfigYaml = {
       alias: currentEnv,
       projectId: currentProject,
+      iisHostname: urls?.iisPreviewWeb.split('//')[1] || '',
+      podClusterId: 'hq',
       accessToken: '',
       clientId: '',
       sharedSecret: '',
@@ -74,39 +81,43 @@ class RequestHandlerArgs {
       // const blocksRaw = await cli.PrintBlocks();
 
       const blocks: BlockJson[] = [];
+      const queue = new PQueue({ concurrency: 4 });
       for (const block of blocksRaw || []) {
-        // Retrieve block version
-        const [err, versions] = await contensis.blocks.GetBlockVersions(
-          block.id,
-          'default',
-          'latest'
-        );
-        if (err || versions?.length === 0)
-          log.warning(
-            messages.blocks.noGet(
-              block.id,
-              'default',
-              'latest',
-              currentEnv,
-              env.currentProject
-            )
+        queue.add(async () => {
+          // Retrieve block version
+          const [err, versions] = await contensis.blocks.GetBlockVersions(
+            block.id,
+            'default',
+            'latest'
           );
-        if (versions?.[0]) {
-          const v = versions[0];
-          blocks.push({
-            id: v.id,
-            baseUri: v.previewUrl,
-            staticPaths: v.staticPaths,
-            endpoints: v.endpoints,
-            versionNo: v.version.versionNo,
-            branch: v.source.branch,
-          });
-        }
+          if (err || versions?.length === 0)
+            log.warning(
+              messages.blocks.noGet(
+                block.id,
+                'default',
+                'latest',
+                currentEnv,
+                env.currentProject
+              )
+            );
+          if (versions?.[0]) {
+            const v = versions[0];
+            blocks.push({
+              id: v.id,
+              baseUri: v.previewUrl,
+              staticPaths: v.staticPaths,
+              endpoints: v.endpoints,
+              versionNo: v.version.versionNo,
+              branch: v.source.branch,
+            });
+          }
+        });
       }
+
+      await queue.onIdle();
       return blocks;
     };
 
-    const contensis = await this.cli.ConnectContensis();
     if (contensis) {
       const [blocks, renderers] = await Promise.all([
         getBlocks(contensis),
@@ -114,12 +125,14 @@ class RequestHandlerArgs {
       ]);
 
       siteConfig.blocks = blocks;
-      siteConfig.renderers = renderers?.[1]?.map(r => ({
-        id: r.id,
-        name: r.name,
-        assignedContentTypes: r.assignedContentTypes,
-        rules: r.rules,
-      }));
+      siteConfig.renderers = renderers?.[1]
+        ?.filter(r => blocks.find(b => b.id === r.id))
+        .map(r => ({
+          id: r.id,
+          name: r.name,
+          assignedContentTypes: r.assignedContentTypes,
+          rules: r.rules,
+        }));
     }
     return siteConfig;
   };
@@ -139,6 +152,10 @@ class RequestHandlerArgs {
         args.push('--alias', cli.currentEnv);
       if (!args.find(a => a === '--project-api-id'))
         args.push('--project-api-id', cli.currentProject);
+      if (!args.find(a => a === '--iis-hostname'))
+        args.push('--iis-hostname', siteConfig.iisHostname);
+      if (!args.find(a => a === '--pod-cluster-id'))
+        args.push('--pod-cluster-id', siteConfig.podClusterId);
       if (!args.find(a => a === '--blocks-json'))
         args.push('--blocks-json', JSON.stringify(siteConfig.blocks));
       if (!args.find(a => a === '--renderers-json'))
@@ -171,6 +188,10 @@ class RequestHandlerArgs {
         this.siteConfig?.blocks[blockIndex]
       ) {
         this.siteConfig.blocks[blockIndex].baseUri = overrideUri;
+        // this.siteConfig.blocks[blockIndex].staticPaths.push(
+        //   ...['/static/*', '/image-library/*']
+        // );
+        this.siteConfig.blocks[blockIndex].staticPaths.push('/*.js');
       }
     }
   };

package/src/services/ContensisCliService.ts

@@ -36,6 +36,7 @@ import {
   tryStringify,
   url,
 } from '~/util';
+import { sanitiseIds } from '~/util/api-ids';
 import {
   printBlockVersion,
   printEntriesMigrateResult,
@@ -142,6 +143,14 @@ class ContensisCli {
     this.session = new SessionCacheProvider();
 
     this.contensisOpts = contensisOpts;
+
+    // Explicitly sanitise supplied fields to api-friendly ids
+    if (Array.isArray(this.contensisOpts.query?.fields)) {
+      this.contensisOpts.query.fields = sanitiseIds(
+        this.contensisOpts.query.fields
+      );
+    }
+
     this.format = outputOpts?.format;
     this.output =
       outputOpts?.output && path.join(process.cwd(), outputOpts.output);

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/version.ts

@@ -1 +1 @@
-export const LIB_VERSION = "1.1.2-beta.3";
+export const LIB_VERSION = "1.1.2-beta.5";