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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,7 +1,9 @@
1
1
  "use strict";
2
+ var __create = Object.create;
2
3
  var __defProp = Object.defineProperty;
3
4
  var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
4
5
  var __getOwnPropNames = Object.getOwnPropertyNames;
6
+ var __getProtoOf = Object.getPrototypeOf;
5
7
  var __hasOwnProp = Object.prototype.hasOwnProperty;
6
8
  var __export = (target, all) => {
7
9
  for (var name in all)
@@ -15,12 +17,17 @@ var __copyProps = (to, from, except, desc) => {
15
17
  }
16
18
  return to;
17
19
  };
20
+ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
21
+ isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
22
+ mod
23
+ ));
18
24
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
19
25
  var DevRequests_to_RequestHanderCliArgs_exports = {};
20
26
  __export(DevRequests_to_RequestHanderCliArgs_exports, {
21
27
  default: () => DevRequests_to_RequestHanderCliArgs_default
22
28
  });
23
29
  module.exports = __toCommonJS(DevRequests_to_RequestHanderCliArgs_exports);
30
+ var import_p_queue = __toESM(require("p-queue"));
24
31
  class RequestHandlerArgs {
25
32
  cli;
26
33
  args;
@@ -35,10 +42,13 @@ class RequestHandlerArgs {
35
42
  };
36
43
  buildSiteConfig = async () => {
37
44
  var _a;
38
- const { currentEnv, currentProject, env, log, messages } = this.cli;
45
+ const { currentEnv, currentProject, env, log, messages, urls } = this.cli;
46
+ const contensis = await this.cli.ConnectContensis();
39
47
  const siteConfig = {
40
48
  alias: currentEnv,
41
49
  projectId: currentProject,
50
+ iisHostname: (urls == null ? void 0 : urls.iisPreviewWeb.split("//")[1]) || "",
51
+ podClusterId: "hq",
42
52
  accessToken: "",
43
53
  clientId: "",
44
54
  sharedSecret: "",
@@ -50,44 +60,47 @@ class RequestHandlerArgs {
50
60
  if (err)
51
61
  log.error(messages.blocks.noList(currentEnv, env.currentProject));
52
62
  const blocks = [];
63
+ const queue = new import_p_queue.default({ concurrency: 4 });
53
64
  for (const block of blocksRaw || []) {
54
- const [err2, versions] = await contensis2.blocks.GetBlockVersions(
55
- block.id,
56
- "default",
57
- "latest"
58
- );
59
- if (err2 || (versions == null ? void 0 : versions.length) === 0)
60
- log.warning(
61
- messages.blocks.noGet(
62
- block.id,
63
- "default",
64
- "latest",
65
- currentEnv,
66
- env.currentProject
67
- )
65
+ queue.add(async () => {
66
+ const [err2, versions] = await contensis2.blocks.GetBlockVersions(
67
+ block.id,
68
+ "default",
69
+ "latest"
68
70
  );
69
- if (versions == null ? void 0 : versions[0]) {
70
- const v = versions[0];
71
- blocks.push({
72
- id: v.id,
73
- baseUri: v.previewUrl,
74
- staticPaths: v.staticPaths,
75
- endpoints: v.endpoints,
76
- versionNo: v.version.versionNo,
77
- branch: v.source.branch
78
- });
79
- }
71
+ if (err2 || (versions == null ? void 0 : versions.length) === 0)
72
+ log.warning(
73
+ messages.blocks.noGet(
74
+ block.id,
75
+ "default",
76
+ "latest",
77
+ currentEnv,
78
+ env.currentProject
79
+ )
80
+ );
81
+ if (versions == null ? void 0 : versions[0]) {
82
+ const v = versions[0];
83
+ blocks.push({
84
+ id: v.id,
85
+ baseUri: v.previewUrl,
86
+ staticPaths: v.staticPaths,
87
+ endpoints: v.endpoints,
88
+ versionNo: v.version.versionNo,
89
+ branch: v.source.branch
90
+ });
91
+ }
92
+ });
80
93
  }
94
+ await queue.onIdle();
81
95
  return blocks;
82
96
  };
83
- const contensis = await this.cli.ConnectContensis();
84
97
  if (contensis) {
85
98
  const [blocks, renderers] = await Promise.all([
86
99
  getBlocks(contensis),
87
100
  contensis.renderers.GetRenderers()
88
101
  ]);
89
102
  siteConfig.blocks = blocks;
90
- siteConfig.renderers = (_a = renderers == null ? void 0 : renderers[1]) == null ? void 0 : _a.map((r) => ({
103
+ siteConfig.renderers = (_a = renderers == null ? void 0 : renderers[1]) == null ? void 0 : _a.filter((r) => blocks.find((b) => b.id === r.id)).map((r) => ({
91
104
  id: r.id,
92
105
  name: r.name,
93
106
  assignedContentTypes: r.assignedContentTypes,
@@ -105,6 +118,10 @@ class RequestHandlerArgs {
105
118
  args.push("--alias", cli.currentEnv);
106
119
  if (!args.find((a) => a === "--project-api-id"))
107
120
  args.push("--project-api-id", cli.currentProject);
121
+ if (!args.find((a) => a === "--iis-hostname"))
122
+ args.push("--iis-hostname", siteConfig.iisHostname);
123
+ if (!args.find((a) => a === "--pod-cluster-id"))
124
+ args.push("--pod-cluster-id", siteConfig.podClusterId);
108
125
  if (!args.find((a) => a === "--blocks-json"))
109
126
  args.push("--blocks-json", JSON.stringify(siteConfig.blocks));
110
127
  if (!args.find((a) => a === "--renderers-json"))
@@ -131,6 +148,7 @@ class RequestHandlerArgs {
131
148
  );
132
149
  if (typeof blockIndex === "number" && !isNaN(blockIndex) && ((_b = this.siteConfig) == null ? void 0 : _b.blocks[blockIndex])) {
133
150
  this.siteConfig.blocks[blockIndex].baseUri = overrideUri;
151
+ this.siteConfig.blocks[blockIndex].staticPaths.push("/*.js");
134
152
  }
135
153
  }
136
154
  };
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/mappers/DevRequests-to-RequestHanderCliArgs.ts"],
4
- "sourcesContent": ["import { ContensisMigrationService } from 'migratortron';\nimport ContensisCli from '~/services/ContensisCliService';\n\ntype EndpointJson = {\n id: string;\n path: string;\n};\n\ntype BlockJson = {\n id: string;\n baseUri: string;\n staticPaths: string[];\n endpoints: EndpointJson[];\n versionNo: number;\n branch: string;\n};\n\ntype RendererJson = {\n id: string;\n name: string;\n rules: RendererRuleJson[];\n assignedContentTypes: string[];\n};\n\ntype RendererRuleJson = {\n return?: {\n blockId?: string;\n endpointId?: string | null;\n version?: string;\n };\n};\ninterface ISiteConfigYaml {\n alias: string;\n projectId: string;\n accessToken: string; // needed?\n clientId: string;\n sharedSecret: string;\n blocks: BlockJson[];\n renderers: RendererJson[];\n}\n\nclass RequestHandlerArgs {\n private cli;\n args?: string[];\n siteConfig?: ISiteConfigYaml;\n\n constructor(cli: ContensisCli) {\n this.cli = cli;\n }\n\n Create = async () => {\n this.siteConfig = await this.buildSiteConfig();\n await this.cli.Login(this.cli.env.lastUserId, { silent: true }); // to hydrate the auth service\n this.args = this.getArgs();\n };\n\n buildSiteConfig = async () => {\n const { currentEnv, currentProject, env, log, messages } = this.cli;\n const siteConfig: ISiteConfigYaml = {\n alias: currentEnv,\n projectId: currentProject,\n accessToken: '',\n clientId: '',\n sharedSecret: '',\n blocks: [],\n renderers: [],\n };\n\n const getBlocks = async (contensis: ContensisMigrationService) => {\n const [err, blocksRaw] = await contensis.blocks.GetBlocks();\n if (err)\n log.error(messages.blocks.noList(currentEnv, env.currentProject));\n\n // const blocksRaw = await cli.PrintBlocks();\n\n const blocks: BlockJson[] = [];\n for (const block of blocksRaw || []) {\n // Retrieve block version\n const [err, versions] = await contensis.blocks.GetBlockVersions(\n block.id,\n 'default',\n 'latest'\n );\n if (err || versions?.length === 0)\n log.warning(\n messages.blocks.noGet(\n block.id,\n 'default',\n 'latest',\n currentEnv,\n env.currentProject\n )\n );\n if (versions?.[0]) {\n const v = versions[0];\n blocks.push({\n id: v.id,\n baseUri: v.previewUrl,\n staticPaths: v.staticPaths,\n endpoints: v.endpoints,\n versionNo: v.version.versionNo,\n branch: v.source.branch,\n });\n }\n }\n return blocks;\n };\n\n const contensis = await this.cli.ConnectContensis();\n if (contensis) {\n const [blocks, renderers] = await Promise.all([\n getBlocks(contensis),\n contensis.renderers.GetRenderers(),\n ]);\n\n siteConfig.blocks = blocks;\n siteConfig.renderers = renderers?.[1]?.map(r => ({\n id: r.id,\n name: r.name,\n assignedContentTypes: r.assignedContentTypes,\n rules: r.rules,\n }));\n }\n return siteConfig;\n };\n\n getArgs = (overrideArgs: string[] = []) => {\n const args = overrideArgs\n ? typeof overrideArgs?.[0] === 'string' &&\n overrideArgs[0].includes(' ', 2)\n ? overrideArgs[0].split(' ')\n : overrideArgs\n : []; // args could be [ '-c .\\\\site_config.yaml' ] or [ '-c', '.\\\\site_config.yaml' ]\n\n const { cli, siteConfig } = this;\n if (siteConfig) {\n // Add required args\n if (!args.find(a => a === '--alias'))\n args.push('--alias', cli.currentEnv);\n if (!args.find(a => a === '--project-api-id'))\n args.push('--project-api-id', cli.currentProject);\n if (!args.find(a => a === '--blocks-json'))\n args.push('--blocks-json', JSON.stringify(siteConfig.blocks));\n if (!args.find(a => a === '--renderers-json'))\n args.push('--renderers-json', JSON.stringify(siteConfig.renderers));\n }\n\n const client = cli.auth?.clientDetails;\n if (client) {\n if (!args.find(a => a === '--client-id') && 'clientId' in client)\n args.push('--client-id', client.clientId);\n if (!args.find(a => a === '--client-secret') && 'clientSecret' in client)\n args.push('--client-secret', client.clientSecret);\n if (!args.find(a => a === '--username') && 'username' in client)\n args.push('--username', client.username);\n if (!args.find(a => a === '--password') && 'password' in client)\n args.push('--password', client.password);\n }\n\n return args;\n };\n\n overrideBlock = (blockId: string, overrideUri: string) => {\n if (blockId && blockId !== 'none') {\n const blockIndex = this.siteConfig?.blocks.findIndex(\n b => b.id.toLowerCase() === blockId.toLowerCase()\n );\n if (\n typeof blockIndex === 'number' &&\n !isNaN(blockIndex) &&\n this.siteConfig?.blocks[blockIndex]\n ) {\n this.siteConfig.blocks[blockIndex].baseUri = overrideUri;\n }\n }\n };\n}\n\nexport default RequestHandlerArgs;\n"],
5
- "mappings": "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",
6
- "names": ["contensis", "err"]
4
+ "sourcesContent": ["import { ContensisMigrationService } from 'migratortron';\nimport PQueue from 'p-queue';\nimport ContensisCli from '~/services/ContensisCliService';\n\ntype EndpointJson = {\n id: string;\n path: string;\n};\n\ntype BlockJson = {\n id: string;\n baseUri: string;\n staticPaths: string[];\n endpoints: EndpointJson[];\n versionNo: number;\n branch: string;\n};\n\ntype RendererJson = {\n id: string;\n name: string;\n rules: RendererRuleJson[];\n assignedContentTypes: string[];\n};\n\ntype RendererRuleJson = {\n return?: {\n blockId?: string;\n endpointId?: string | null;\n version?: string;\n };\n};\ninterface ISiteConfigYaml {\n alias: string;\n projectId: string;\n iisHostname: string;\n podClusterId: string;\n accessToken: string; // needed?\n clientId: string;\n sharedSecret: string;\n blocks: BlockJson[];\n renderers: RendererJson[];\n}\n\nclass RequestHandlerArgs {\n private cli;\n args?: string[];\n siteConfig?: ISiteConfigYaml;\n\n constructor(cli: ContensisCli) {\n this.cli = cli;\n }\n\n Create = async () => {\n this.siteConfig = await this.buildSiteConfig();\n await this.cli.Login(this.cli.env.lastUserId, { silent: true }); // to hydrate the auth service\n this.args = this.getArgs();\n };\n\n buildSiteConfig = async () => {\n const { currentEnv, currentProject, env, log, messages, urls } = this.cli;\n const contensis = await this.cli.ConnectContensis();\n\n const siteConfig: ISiteConfigYaml = {\n alias: currentEnv,\n projectId: currentProject,\n iisHostname: urls?.iisPreviewWeb.split('//')[1] || '',\n podClusterId: 'hq',\n accessToken: '',\n clientId: '',\n sharedSecret: '',\n blocks: [],\n renderers: [],\n };\n\n const getBlocks = async (contensis: ContensisMigrationService) => {\n const [err, blocksRaw] = await contensis.blocks.GetBlocks();\n if (err)\n log.error(messages.blocks.noList(currentEnv, env.currentProject));\n\n // const blocksRaw = await cli.PrintBlocks();\n\n const blocks: BlockJson[] = [];\n const queue = new PQueue({ concurrency: 4 });\n for (const block of blocksRaw || []) {\n queue.add(async () => {\n // Retrieve block version\n const [err, versions] = await contensis.blocks.GetBlockVersions(\n block.id,\n 'default',\n 'latest'\n );\n if (err || versions?.length === 0)\n log.warning(\n messages.blocks.noGet(\n block.id,\n 'default',\n 'latest',\n currentEnv,\n env.currentProject\n )\n );\n if (versions?.[0]) {\n const v = versions[0];\n blocks.push({\n id: v.id,\n baseUri: v.previewUrl,\n staticPaths: v.staticPaths,\n endpoints: v.endpoints,\n versionNo: v.version.versionNo,\n branch: v.source.branch,\n });\n }\n });\n }\n\n await queue.onIdle();\n return blocks;\n };\n\n if (contensis) {\n const [blocks, renderers] = await Promise.all([\n getBlocks(contensis),\n contensis.renderers.GetRenderers(),\n ]);\n\n siteConfig.blocks = blocks;\n siteConfig.renderers = renderers?.[1]\n ?.filter(r => blocks.find(b => b.id === r.id))\n .map(r => ({\n id: r.id,\n name: r.name,\n assignedContentTypes: r.assignedContentTypes,\n rules: r.rules,\n }));\n }\n return siteConfig;\n };\n\n getArgs = (overrideArgs: string[] = []) => {\n const args = overrideArgs\n ? typeof overrideArgs?.[0] === 'string' &&\n overrideArgs[0].includes(' ', 2)\n ? overrideArgs[0].split(' ')\n : overrideArgs\n : []; // args could be [ '-c .\\\\site_config.yaml' ] or [ '-c', '.\\\\site_config.yaml' ]\n\n const { cli, siteConfig } = this;\n if (siteConfig) {\n // Add required args\n if (!args.find(a => a === '--alias'))\n args.push('--alias', cli.currentEnv);\n if (!args.find(a => a === '--project-api-id'))\n args.push('--project-api-id', cli.currentProject);\n if (!args.find(a => a === '--iis-hostname'))\n args.push('--iis-hostname', siteConfig.iisHostname);\n if (!args.find(a => a === '--pod-cluster-id'))\n args.push('--pod-cluster-id', siteConfig.podClusterId);\n if (!args.find(a => a === '--blocks-json'))\n args.push('--blocks-json', JSON.stringify(siteConfig.blocks));\n if (!args.find(a => a === '--renderers-json'))\n args.push('--renderers-json', JSON.stringify(siteConfig.renderers));\n }\n\n const client = cli.auth?.clientDetails;\n if (client) {\n if (!args.find(a => a === '--client-id') && 'clientId' in client)\n args.push('--client-id', client.clientId);\n if (!args.find(a => a === '--client-secret') && 'clientSecret' in client)\n args.push('--client-secret', client.clientSecret);\n if (!args.find(a => a === '--username') && 'username' in client)\n args.push('--username', client.username);\n if (!args.find(a => a === '--password') && 'password' in client)\n args.push('--password', client.password);\n }\n\n return args;\n };\n\n overrideBlock = (blockId: string, overrideUri: string) => {\n if (blockId && blockId !== 'none') {\n const blockIndex = this.siteConfig?.blocks.findIndex(\n b => b.id.toLowerCase() === blockId.toLowerCase()\n );\n if (\n typeof blockIndex === 'number' &&\n !isNaN(blockIndex) &&\n this.siteConfig?.blocks[blockIndex]\n ) {\n this.siteConfig.blocks[blockIndex].baseUri = overrideUri;\n // this.siteConfig.blocks[blockIndex].staticPaths.push(\n // ...['/static/*', '/image-library/*']\n // );\n this.siteConfig.blocks[blockIndex].staticPaths.push('/*.js');\n }\n }\n };\n}\n\nexport default RequestHandlerArgs;\n"],
5
+ "mappings": "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",
6
+ "names": ["contensis", "PQueue", "err"]
7
7
  }
@@ -41,6 +41,7 @@ var import_file_provider = require("../providers/file-provider");
41
41
  var import_SessionCacheProvider = __toESM(require("../providers/SessionCacheProvider"));
42
42
  var import_CredentialProvider = __toESM(require("../providers/CredentialProvider"));
43
43
  var import_util = require("../util");
44
+ var import_api_ids = require("../util/api-ids");
44
45
  var import_console = require("../util/console.printer");
45
46
  var import_csv = require("../util/csv.formatter");
46
47
  var import_json = require("../util/json.formatter");
@@ -100,6 +101,7 @@ class ContensisCli {
100
101
  }
101
102
  }
102
103
  constructor(args, outputOpts, contensisOpts = {}) {
104
+ var _a;
103
105
  const [exe, script, verb = "", noun = "", ...restArgs] = args;
104
106
  this.verb = verb == null ? void 0 : verb.toLowerCase();
105
107
  this.noun = noun == null ? void 0 : noun.toLowerCase();
@@ -107,6 +109,11 @@ class ContensisCli {
107
109
  const commandText = `${this.verb} ${this.noun} ${restArgs ? restArgs.join(" ") : ""}`.trim();
108
110
  this.session = new import_SessionCacheProvider.default();
109
111
  this.contensisOpts = contensisOpts;
112
+ if (Array.isArray((_a = this.contensisOpts.query) == null ? void 0 : _a.fields)) {
113
+ this.contensisOpts.query.fields = (0, import_api_ids.sanitiseIds)(
114
+ this.contensisOpts.query.fields
115
+ );
116
+ }
110
117
  this.format = outputOpts == null ? void 0 : outputOpts.format;
111
118
  this.output = (outputOpts == null ? void 0 : outputOpts.output) && import_path.default.join(process.cwd(), outputOpts.output);
112
119
  const currentEnvironment = (outputOpts == null ? void 0 : outputOpts.alias) || this.currentEnv;