@remkoj/optimizely-graph-cli 1.0.4 → 2.0.0-pre1

package/bin/index.js

@@ -18,7 +18,7 @@ import createAdminApi, { isApiError } from '@remkoj/optimizely-graph-client/admi
 import chalk from 'chalk';
 import figures from 'figures';
 import Table from 'cli-table3';
-import { createHmacFetch } from '@remkoj/optimizely-graph-client/client';
+import ChannelRepository from '@remkoj/optimizely-graph-client/channels';
 import fs from 'node:fs';
 
 function processEnvFile(suffix = "") {
@@ -58,7 +58,7 @@ function createCliApp(scriptName, version, epilogue) {
         .option('verbose', { description: "Enable query logging", boolean: true, type: 'boolean', demandOption: false, default: config.query_log })
         .demandCommand(1, 1)
         .showHelpOnFail(true)
-        .epilogue(epilogue ?? `Copyright Remko Jantzen - 2023-${(new Date(Date.now())).getFullYear()}`)
+        .epilogue(`Copyright Remko Jantzen - 2023-${(new Date(Date.now())).getFullYear()}`)
         .help();
 }
 function getArgsConfig(args) {
@@ -289,69 +289,54 @@ const createSiteConfigModule = {
         const cgConfig = getArgsConfig(args);
         if (!cgConfig.app_key || !cgConfig.secret)
             throw new Error("Make sure both the Optimizely Graph App Key & Secret have been defined");
-        const cgFetch = createHmacFetch(cgConfig.app_key, cgConfig.secret);
         const siteHost = getFrontendURL(cgConfig).host;
         const targetFile = args.file_path ?? DEFAULT_CONFIG_FILE;
         process.stdout.write(`${chalk.yellow(chalk.bold(figures.arrowRight))} Generating configuration file for website with domain: ${chalk.yellow(siteHost)}\n`);
-        let response = await cgFetch(new URL('/content/v2', cgConfig.gateway), { method: "POST", body: JSON.stringify(siteQuery(siteHost)) });
-        if (!response.ok) {
+        const channelRepo = new ChannelRepository(cgConfig);
+        let channel = null;
+        try {
+            channel = await channelRepo.getByDomain(siteHost, false);
+        }
+        catch (e) {
+            if (args.verbose ?? false) {
+                process.stderr.write(chalk.redBright(chalk.bold(figures.cross) + " " + (new String(e))) + "\n");
+            }
             process.stdout.write(chalk.redBright(chalk.bold(figures.cross) + " Failed loading website data"));
             process.exitCode = 1;
             return;
         }
-        let responseBody = await response.json();
-        if ((responseBody.data?.SiteDefinition?.items?.length ?? 0) < 1) {
-            process.stdout.write(`${chalk.red(chalk.bold(figures.bullet))} Domain not found, falling back to match-all domain: ${chalk.yellow("*")}\n`);
-            response = await cgFetch(new URL('/content/v2', cgConfig.gateway), { method: "POST", body: JSON.stringify(siteQuery("*")) });
-            if (!response.ok) {
+        if (!channel) {
+            try {
+                process.stdout.write(`${chalk.red(chalk.bold(figures.bullet))} Domain not found, falling back to match-all domain: ${chalk.yellow("*")}\n`);
+                channel = await channelRepo.getByDomain(siteHost, true);
+            }
+            catch (e) {
+                if (args.verbose ?? false) {
+                    process.stderr.write(chalk.redBright(chalk.bold(figures.cross) + " " + (new String(e))) + "\n");
+                }
                 process.stdout.write(chalk.redBright(chalk.bold(figures.cross) + " Failed loading website data"));
                 process.exitCode = 1;
                 return;
             }
-            responseBody = await response.json();
         }
-        if ((responseBody.data?.SiteDefinition?.items?.length ?? 0) < 1) {
+        if (!channel || channel == null) {
             process.stdout.write(chalk.redBright(`${chalk.bold(figures.cross)} No website defintion found for host ${siteHost}`) + "\n");
             process.exitCode = 1;
             return;
         }
-        if ((responseBody.data?.SiteDefinition?.items?.length ?? 0) > 1) {
-            process.stdout.write(chalk.redBright(`${chalk.bold(figures.cross)} Multiple website defintion found for host ${siteHost}, please correct your CMS configuration`) + "\n");
-            process.exitCode = 1;
-            return;
-        }
         process.stdout.write(`${chalk.yellow(chalk.bold(figures.arrowRight))} Loaded website data, generating TypeScript code.\n`);
-        const siteDefinition = responseBody.data.SiteDefinition.items[0];
-        siteDefinition.domains = (siteDefinition.domains ?? []).map((d) => {
-            const def = {
-                name: d.name,
-                isPrimary: d.type == "Primary",
-                isEdit: d.type == "Edit"
-            };
-            if (d.forLocale?.code)
-                def.forLocale = d.forLocale?.code;
-            return def;
-        });
-        siteDefinition.locales = (siteDefinition.locales ?? []).map((c) => {
-            const loc = {
-                code: c.code,
-                slug: c.slug?.toLowerCase(),
-                graphLocale: c.code.replace("-", "_"),
-                isDefault: c.isDefault == true
-            };
-            return loc;
-        });
+        const [siteDefinition, cms_url] = channel.asDataObject();
         const code = [
             '/**',
             ' * This file has been automatically generated, do not update manually',
             ' *',
-            ' * Use yarn frontend-cli site-config to re-generate this file',
+            ' * Use yarn opti-graph config:create [file_path] to re-generate this file',
             ' */',
             'import { ChannelDefinition, type ChannelDefinitionData } from "@remkoj/optimizely-graph-client"',
             '',
             `const generated_data : ChannelDefinitionData = ${JSON.stringify(siteDefinition)};`,
             '',
-            `export const SiteConfig = new ChannelDefinition(generated_data, "${cgConfig.dxp_url}")`,
+            `export const SiteConfig = new ChannelDefinition(generated_data, "${cms_url}")`,
             'export default SiteConfig'
         ];
         const filePath = path__default.join(process.cwd(), targetFile);
@@ -366,43 +351,6 @@ const createSiteConfigModule = {
     aliases: [],
     describe: "Generate a static site configuration file",
 };
-function siteQuery(site_url) {
-    return {
-        query: `query GetSiteConfig($domain: String!) {
-            SiteDefinition (
-                where: {
-                    _or: [
-                        { Hosts: { Name: { eq: $domain }} }
-                    ]  
-                }
-            ) {
-              items {
-                    id: Id
-                    name: Name,
-                    domains: Hosts {
-                        name: Name
-                        type: Type
-                        forLocale: Language {
-                            code: Name
-                        }
-                    }
-                    locales:Languages {
-                        code:Name
-                        slug:UrlSegment
-                        isDefault:IsMasterLanguage
-                    }
-                    content: ContentRoots {
-                        startPage: StartPage {
-                            id:Id,
-                            guidValue:GuidValue
-                        }
-                    }
-                }
-            }
-        }`,
-        variables: JSON.stringify({ domain: site_url })
-    };
-}
 
 const GraphSourceListCommand = {
     command: ['source:list', 'sl'],

package/package.json

@@ -3,7 +3,7 @@
   "repository": "https://github.com/remkoj/optimizely-dxp-clients.git",
   "author": "Remko Jantzen <693172+remkoj@users.noreply.github.com>",
   "homepage": "https://github.com/remkoj/optimizely-dxp-clients",
-  "version": "1.0.4",
+  "version": "2.0.0-pre1",
   "license": "Apache-2.0",
   "packageManager": "yarn@4.1.1",
   "type": "module",
@@ -27,19 +27,19 @@
     "bundle": "yarn rollup --config rollup.config.js"
   },
   "devDependencies": {
-    "@remkoj/optimizely-graph-client": "1.0.4",
+    "@remkoj/optimizely-graph-client": "2.0.0-pre1",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/pluginutils": "^5.1.0",
     "@types/crypto-js": "^4.2.2",
     "@types/glob": "^8.1.0",
-    "@types/node": "^20.12.6",
+    "@types/node": "^20.12.7",
     "@types/source-map-support": "^0.5.10",
     "@types/yargs": "^17.0.32",
-    "rollup": "^4.14.1",
+    "rollup": "^4.16.2",
     "source-map-support": "^0.5.21",
     "tslib": "^2.6.2",
-    "typescript": "^5.4.4"
+    "typescript": "^5.4.5"
   },
   "dependencies": {
     "chalk": "^5.3.0",
@@ -50,6 +50,7 @@
     "yargs": "^17.7.2"
   },
   "peerDependencies": {
-    "@remkoj/optimizely-graph-client": "1.0.4"
-  }
+    "@remkoj/optimizely-graph-client": "2.0.0-pre1"
+  },
+  "stableVersion": "1.0.4"
 }