@shopify/cli-kit 3.3.3 → 3.6.0

package/CHANGELOG.md

@@ -1,5 +1,36 @@
 # @shopify/cli-kit
 
+## 3.6.0
+
+### Patch Changes
+
+- 073e514c: Validation that port used for receiving autentication token from browser is not already in use
+- d9351df4: Use a custom list of safe nouns and adjectives to generate default names for apps and extensions
+
+## 3.5.0
+
+### Patch Changes
+
+- dabc4bab: Refactor rejection tests to follow recommended implementation by Vitest
+
+## 3.4.0
+
+### Minor Changes
+
+- 0da6c7e8: • Run CLI2 commands from passed-in directory, defaulting to current working directory
+  • Fill in flags for theme check
+  • Add --path to theme check
+  • Add --verbose to theme check
+
+### Patch Changes
+
+- 08366831: Better logging:
+  • include Prompt and List input/output
+  • distinguish commands via UUID and log lines for command start/finish
+  • use a command line flag to specify log stream to view (cli, create-app, create-hydrogen)
+- feae2499: Fix support for using a private template repo when git credentials are not setup
+- 19ab3f99: Report 5xx reponses coming from the Partners' API as aborts
+
 ## 3.3.3
 
 ### Patch Changes

package/dist/analytics.d.ts

@@ -1,13 +1,19 @@
-interface startOptions {
+import { Interfaces } from '@oclif/core';
+interface StartOptions {
     command: string;
     args: string[];
     currentTime?: number;
 }
-export declare const start: ({ command, args, currentTime }: startOptions) => void;
+export declare const start: ({ command, args, currentTime }: StartOptions) => void;
 interface ReportEventOptions {
+    config: Interfaces.Config;
     errorMessage?: string;
 }
-export declare const reportEvent: (options?: ReportEventOptions) => Promise<void>;
-export declare type ProjectType = 'node' | 'php' | 'ruby' | undefined;
-export declare function getProjectType(directory: string): Promise<ProjectType>;
+/**
+ * Report an analytics event, sending it off to Monorail -- Shopify's internal analytics service.
+ *
+ * The payload for an event includes both generic data, and data gathered from installed plug-ins.
+ *
+ */
+export declare function reportEvent(options: ReportEventOptions): Promise<void>;
 export {};

package/dist/analytics.js

@@ -1,38 +1,42 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 import * as environment from './environment.js';
-import { fetch } from './http.js';
 import { platformAndArch } from './os.js';
-import { exists as fileExists } from './file.js';
-import { join as joinPath, resolve } from './path.js';
+import { resolve } from './path.js';
 import { version as rubyVersion } from './node/ruby.js';
-import { debug, content, token } from './output.js';
+import { content, debug, token } from './output.js';
 import constants from './constants.js';
-import { cliKitStore } from './store.js';
-const url = 'https://monorail-edge.shopifysvc.com/v1/produce';
-let startTime;
-let startCommand;
-let startArgs;
+import * as metadata from './metadata.js';
+import { publishEvent } from './monorail.js';
+import { fanoutHooks } from './plugins.js';
 export const start = ({ command, args, currentTime = new Date().getTime() }) => {
-    startCommand = command;
-    startArgs = args;
-    startTime = currentTime;
+    metadata.addSensitive({
+        commandStartOptions: {
+            startTime: currentTime,
+            startCommand: command,
+            startArgs: args,
+        },
+    });
 };
-export const reportEvent = async (options = {}) => {
-    if (environment.local.analyticsDisabled())
-        return;
-    if (startCommand === undefined)
-        return;
+/**
+ * Report an analytics event, sending it off to Monorail -- Shopify's internal analytics service.
+ *
+ * The payload for an event includes both generic data, and data gathered from installed plug-ins.
+ *
+ */
+export async function reportEvent(options) {
     try {
-        const currentTime = new Date().getTime();
-        const payload = await buildPayload(options.errorMessage, currentTime);
-        const body = JSON.stringify(payload);
-        const headers = buildHeaders(currentTime);
-        const response = await fetch(url, { method: 'POST', body, headers });
-        if (response.status === 200) {
-            debug(content `Analytics event sent: ${token.json(payload)}`);
+        const payload = await buildPayload(options);
+        if (payload === undefined) {
+            // Nothing to log
+            return;
         }
-        else {
-            debug(`Failed to report usage analytics: ${response.statusText}`);
+        if (environment.local.analyticsDisabled()) {
+            debug(content `Skipping command analytics, payload: ${token.json(payload)}`);
+            return;
+        }
+        const response = await publishEvent('app_cli3_command/1.0', payload.public, payload.sensitive);
+        if (response.type === 'error') {
+            debug(response.message);
         }
         // eslint-disable-next-line no-catch-all/no-catch-all
     }
@@ -43,69 +47,55 @@ export const reportEvent = async (options = {}) => {
         }
         debug(message);
     }
-};
-const totalTime = (currentTime) => {
-    if (startTime === undefined)
-        return undefined;
-    return currentTime - startTime;
-};
-const buildHeaders = (currentTime) => {
-    return {
-        'Content-Type': 'application/json; charset=utf-8',
-        'X-Monorail-Edge-Event-Created-At-Ms': currentTime.toString(),
-        'X-Monorail-Edge-Event-Sent-At-Ms': currentTime.toString(),
-    };
-};
-const buildPayload = async (errorMessage, currentTime) => {
+}
+const buildPayload = async ({ config, errorMessage }) => {
+    const { commandStartOptions, ...sensitiveMetadata } = metadata.getAllSensitive();
+    if (commandStartOptions === undefined) {
+        debug('Unable to log analytics event - no information on executed command');
+        return;
+    }
+    const { startCommand, startArgs, startTime } = commandStartOptions;
+    const currentTime = new Date().getTime();
     let directory = process.cwd();
     const pathFlagIndex = startArgs.indexOf('--path');
     if (pathFlagIndex >= 0) {
         directory = resolve(startArgs[pathFlagIndex + 1]);
     }
-    const appInfo = cliKitStore().getAppInfo(directory);
     const { platform, arch } = platformAndArch();
-    const rawPartnerId = appInfo?.orgId;
-    let partnerIdAsInt;
-    if (rawPartnerId !== undefined) {
-        partnerIdAsInt = parseInt(rawPartnerId, 10);
-        if (isNaN(partnerIdAsInt)) {
-            partnerIdAsInt = undefined;
-        }
-    }
+    const { '@shopify/app': appPublic, ...otherPluginsPublic } = await fanoutHooks(config, 'public_command_metadata', {});
+    const { partner_id, project_type, api_key, ...otherShopifyAppPublic } = appPublic ?? {};
+    const sensitivePluginData = await fanoutHooks(config, 'sensitive_command_metadata', {});
+    const appSpecific = {
+        partner_id,
+        api_key,
+        project_type,
+    };
     return {
-        schema_id: 'app_cli3_command/1.0',
-        payload: {
-            project_type: await getProjectType(joinPath(directory, 'web')),
+        public: {
             command: startCommand,
-            args: startArgs.join(' '),
             time_start: startTime,
             time_end: currentTime,
-            total_time: totalTime(currentTime),
+            total_time: currentTime - startTime,
             success: errorMessage === undefined,
-            error_message: errorMessage,
             uname: `${platform} ${arch}`,
             cli_version: await constants.versions.cliKit(),
             ruby_version: (await rubyVersion()) || '',
             node_version: process.version.replace('v', ''),
             is_employee: await environment.local.isShopify(),
-            api_key: appInfo?.appId,
-            partner_id: partnerIdAsInt,
+            ...appSpecific,
+        },
+        sensitive: {
+            args: startArgs.join(' '),
+            error_message: errorMessage,
+            metadata: JSON.stringify({
+                ...sensitiveMetadata,
+                extraPublic: {
+                    '@shopify/app': otherShopifyAppPublic,
+                    ...otherPluginsPublic,
+                },
+                extraSensitive: sensitivePluginData,
+            }),
         },
     };
 };
-export async function getProjectType(directory) {
-    const nodeConfigFile = joinPath(directory, 'package.json');
-    const rubyConfigFile = joinPath(directory, 'Gemfile');
-    const phpConfigFile = joinPath(directory, 'composer.json');
-    if (await fileExists(nodeConfigFile)) {
-        return 'node';
-    }
-    else if (await fileExists(rubyConfigFile)) {
-        return 'ruby';
-    }
-    else if (await fileExists(phpConfigFile)) {
-        return 'php';
-    }
-    return undefined;
-}
 //# sourceMappingURL=analytics.js.map

package/dist/analytics.js.map

@@ -1 +1 @@
-{"version":3,"file":"analytics.js","sourceRoot":"","sources":["../src/analytics.ts"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable @typescript-eslint/naming-convention */\nimport * as environment from './environment.js'\nimport {fetch} from './http.js'\nimport {platformAndArch} from './os.js'\nimport {exists as fileExists} from './file.js'\nimport {join as joinPath, resolve} from './path.js'\nimport {version as rubyVersion} from './node/ruby.js'\nimport {debug, content, token} from './output.js'\nimport constants from './constants.js'\nimport {cliKitStore} from './store.js'\n\nconst url = 'https://monorail-edge.shopifysvc.com/v1/produce'\nlet startTime: number | undefined\nlet startCommand: string\nlet startArgs: string[]\n\ninterface startOptions {\n  command: string\n  args: string[]\n  currentTime?: number\n}\n\nexport const start = ({command, args, currentTime = new Date().getTime()}: startOptions) => {\n  startCommand = command\n  startArgs = args\n  startTime = currentTime\n}\n\ninterface ReportEventOptions {\n  errorMessage?: string\n}\n\nexport const reportEvent = async (options: ReportEventOptions = {}) => {\n  if (environment.local.analyticsDisabled()) return\n  if (startCommand === undefined) return\n\n  try {\n    const currentTime = new Date().getTime()\n    const payload = await buildPayload(options.errorMessage, currentTime)\n    const body = JSON.stringify(payload)\n    const headers = buildHeaders(currentTime)\n\n    const response = await fetch(url, {method: 'POST', body, headers})\n    if (response.status === 200) {\n      debug(content`Analytics event sent: ${token.json(payload)}`)\n    } else {\n      debug(`Failed to report usage analytics: ${response.statusText}`)\n    }\n    // eslint-disable-next-line no-catch-all/no-catch-all\n  } catch (error) {\n    let message = 'Failed to report usage analytics'\n    if (error instanceof Error) {\n      message = message.concat(`: ${error.message}`)\n    }\n    debug(message)\n  }\n}\n\nconst totalTime = (currentTime: number): number | undefined => {\n  if (startTime === undefined) return undefined\n  return currentTime - startTime\n}\n\nconst buildHeaders = (currentTime: number) => {\n  return {\n    'Content-Type': 'application/json; charset=utf-8',\n    'X-Monorail-Edge-Event-Created-At-Ms': currentTime.toString(),\n    'X-Monorail-Edge-Event-Sent-At-Ms': currentTime.toString(),\n  }\n}\n\nconst buildPayload = async (errorMessage: string | undefined, currentTime: number) => {\n  let directory = process.cwd()\n  const pathFlagIndex = startArgs.indexOf('--path')\n  if (pathFlagIndex >= 0) {\n    directory = resolve(startArgs[pathFlagIndex + 1])\n  }\n  const appInfo = cliKitStore().getAppInfo(directory)\n  const {platform, arch} = platformAndArch()\n\n  const rawPartnerId = appInfo?.orgId\n  let partnerIdAsInt: number | undefined\n  if (rawPartnerId !== undefined) {\n    partnerIdAsInt = parseInt(rawPartnerId, 10)\n    if (isNaN(partnerIdAsInt)) {\n      partnerIdAsInt = undefined\n    }\n  }\n\n  return {\n    schema_id: 'app_cli3_command/1.0',\n    payload: {\n      project_type: await getProjectType(joinPath(directory, 'web')),\n      command: startCommand,\n      args: startArgs.join(' '),\n      time_start: startTime,\n      time_end: currentTime,\n      total_time: totalTime(currentTime),\n      success: errorMessage === undefined,\n      error_message: errorMessage,\n      uname: `${platform} ${arch}`,\n      cli_version: await constants.versions.cliKit(),\n      ruby_version: (await rubyVersion()) || '',\n      node_version: process.version.replace('v', ''),\n      is_employee: await environment.local.isShopify(),\n      api_key: appInfo?.appId,\n      partner_id: partnerIdAsInt,\n    },\n  }\n}\n\nexport type ProjectType = 'node' | 'php' | 'ruby' | undefined\n\nexport async function getProjectType(directory: string): Promise<ProjectType> {\n  const nodeConfigFile = joinPath(directory, 'package.json')\n  const rubyConfigFile = joinPath(directory, 'Gemfile')\n  const phpConfigFile = joinPath(directory, 'composer.json')\n\n  if (await fileExists(nodeConfigFile)) {\n    return 'node'\n  } else if (await fileExists(rubyConfigFile)) {\n    return 'ruby'\n  } else if (await fileExists(phpConfigFile)) {\n    return 'php'\n  }\n  return undefined\n}\n"]}
+{"version":3,"file":"analytics.js","sourceRoot":"","sources":["../src/analytics.ts"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable @typescript-eslint/naming-convention */\nimport * as environment from './environment.js'\nimport {platformAndArch} from './os.js'\nimport {resolve} from './path.js'\nimport {version as rubyVersion} from './node/ruby.js'\nimport {content, debug, token} from './output.js'\nimport constants from './constants.js'\nimport * as metadata from './metadata.js'\nimport {publishEvent} from './monorail.js'\nimport {fanoutHooks} from './plugins.js'\nimport {Interfaces} from '@oclif/core'\n\ninterface StartOptions {\n  command: string\n  args: string[]\n  currentTime?: number\n}\n\nexport const start = ({command, args, currentTime = new Date().getTime()}: StartOptions) => {\n  metadata.addSensitive({\n    commandStartOptions: {\n      startTime: currentTime,\n      startCommand: command,\n      startArgs: args,\n    },\n  })\n}\n\ninterface ReportEventOptions {\n  config: Interfaces.Config\n  errorMessage?: string\n}\n\n/**\n * Report an analytics event, sending it off to Monorail -- Shopify's internal analytics service.\n *\n * The payload for an event includes both generic data, and data gathered from installed plug-ins.\n *\n */\nexport async function reportEvent(options: ReportEventOptions) {\n  try {\n    const payload = await buildPayload(options)\n    if (payload === undefined) {\n      // Nothing to log\n      return\n    }\n    if (environment.local.analyticsDisabled()) {\n      debug(content`Skipping command analytics, payload: ${token.json(payload)}`)\n      return\n    }\n    const response = await publishEvent('app_cli3_command/1.0', payload.public, payload.sensitive)\n    if (response.type === 'error') {\n      debug(response.message)\n    }\n    // eslint-disable-next-line no-catch-all/no-catch-all\n  } catch (error) {\n    let message = 'Failed to report usage analytics'\n    if (error instanceof Error) {\n      message = message.concat(`: ${error.message}`)\n    }\n    debug(message)\n  }\n}\n\nconst buildPayload = async ({config, errorMessage}: ReportEventOptions) => {\n  const {commandStartOptions, ...sensitiveMetadata} = metadata.getAllSensitive()\n  if (commandStartOptions === undefined) {\n    debug('Unable to log analytics event - no information on executed command')\n    return\n  }\n  const {startCommand, startArgs, startTime} = commandStartOptions\n  const currentTime = new Date().getTime()\n\n  let directory = process.cwd()\n  const pathFlagIndex = startArgs.indexOf('--path')\n  if (pathFlagIndex >= 0) {\n    directory = resolve(startArgs[pathFlagIndex + 1])\n  }\n\n  const {platform, arch} = platformAndArch()\n\n  const {'@shopify/app': appPublic, ...otherPluginsPublic} = await fanoutHooks(config, 'public_command_metadata', {})\n  const {partner_id, project_type, api_key, ...otherShopifyAppPublic} = appPublic ?? {}\n\n  const sensitivePluginData = await fanoutHooks(config, 'sensitive_command_metadata', {})\n\n  const appSpecific = {\n    partner_id,\n    api_key,\n    project_type,\n  }\n\n  return {\n    public: {\n      command: startCommand,\n      time_start: startTime,\n      time_end: currentTime,\n      total_time: currentTime - startTime,\n      success: errorMessage === undefined,\n      uname: `${platform} ${arch}`,\n      cli_version: await constants.versions.cliKit(),\n      ruby_version: (await rubyVersion()) || '',\n      node_version: process.version.replace('v', ''),\n      is_employee: await environment.local.isShopify(),\n      ...appSpecific,\n    },\n    sensitive: {\n      args: startArgs.join(' '),\n      error_message: errorMessage,\n      metadata: JSON.stringify({\n        ...sensitiveMetadata,\n        extraPublic: {\n          '@shopify/app': otherShopifyAppPublic,\n          ...otherPluginsPublic,\n        },\n        extraSensitive: sensitivePluginData,\n      }),\n    },\n  }\n}\n"]}

package/dist/api/admin.js

@@ -1,7 +1,8 @@
-import { buildHeaders, sanitizedHeadersOutput } from './common.js';
+import { buildHeaders, debugLogRequest, handlingErrors } from './common.js';
 import { debug, content, token as outputToken } from '../output.js';
 import { Bug, Abort } from '../error.js';
-import { request as graphqlRequest, gql, ClientError } from 'graphql-request';
+import { graphqlClient } from '../http/graphql.js';
+import { gql } from 'graphql-request';
 const UnauthorizedAccessError = (store) => {
     const adminLink = outputToken.link(`URL`, `https://${store}/admin`);
     const storeName = store.replace('.myshopify.com', '');
@@ -13,48 +14,33 @@ const UnknownError = () => {
     return new Bug(`Unknown error connecting to your store`);
 };
 export async function request(query, session, variables) {
-    const version = await fetchApiVersion(session);
-    const url = adminUrl(session.storeFqdn, version);
-    const headers = await buildHeaders(session.token);
-    debug(`
-Sending Admin GraphQL request:
-${query}
-
-With variables:
-${variables ? JSON.stringify(variables, null, 2) : ''}
-
-And headers:
-${sanitizedHeadersOutput(headers)}
-`);
-    try {
-        const response = await graphqlRequest(url, query, variables, headers);
+    const api = 'Admin';
+    return handlingErrors(api, async () => {
+        const version = await fetchApiVersion(session);
+        const url = adminUrl(session.storeFqdn, version);
+        const headers = await buildHeaders(session.token);
+        const client = await graphqlClient({
+            headers,
+            url,
+            service: 'shopify',
+        });
+        debugLogRequest(api, query, variables, headers);
+        const response = await client.request(query, variables);
         return response;
-    }
-    catch (error) {
-        if (error instanceof ClientError) {
-            const errorMessage = content `
-The Admin GraphQL API responded unsuccessfully with the HTTP status ${`${error.response.status}`} and errors:
-
-${outputToken.json(error.response.errors)}
-      `;
-            const abortError = new Abort(errorMessage.value);
-            abortError.stack = error.stack;
-            throw abortError;
-        }
-        else {
-            throw error;
-        }
-    }
+    });
 }
 async function fetchApiVersion(session) {
     const url = adminUrl(session.storeFqdn, 'unstable');
     const query = apiVersionQuery();
     const headers = await buildHeaders(session.token);
+    const client = await graphqlClient({ url, headers, service: 'shopify' });
     debug(`
 Sending Admin GraphQL request to URL ${url} with query:
 ${query}
   `);
-    const data = await graphqlRequest(url, query, {}, headers).catch((err) => {
+    const data = await client
+        .request(query, {})
+        .catch((err) => {
         throw err.response.status === 403 ? UnauthorizedAccessError(session.storeFqdn) : UnknownError();
     });
     return data.publicApiVersions

package/dist/api/admin.js.map

@@ -1 +1 @@
-{"version":3,"file":"admin.js","sourceRoot":"","sources":["../../src/api/admin.ts"],"names":[],"mappings":"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","sourcesContent":["import {buildHeaders, sanitizedHeadersOutput} from './common.js'\nimport {AdminSession} from '../session.js'\nimport {debug, content, token as outputToken} from '../output.js'\nimport {Bug, Abort} from '../error.js'\nimport {request as graphqlRequest, gql, RequestDocument, Variables, ClientError} from 'graphql-request'\n\nconst UnauthorizedAccessError = (store: string) => {\n  const adminLink = outputToken.link(`URL`, `https://${store}/admin`)\n  const storeName = store.replace('.myshopify.com', '')\n  return new Abort(\n    content`Looks like you need access to this dev store (${outputToken.link(storeName, `https://${store}`)})`,\n    content`• Log in to the store directly from this ${adminLink}. If you're the store owner, then that direct log in should solve your access issue.\n• If you're not the owner, create a dev store staff account for yourself. Then log in directly from the link above.\n    `,\n  )\n}\n\nconst UnknownError = () => {\n  return new Bug(`Unknown error connecting to your store`)\n}\n\nexport async function request<T>(query: RequestDocument, session: AdminSession, variables?: Variables): Promise<T> {\n  const version = await fetchApiVersion(session)\n  const url = adminUrl(session.storeFqdn, version)\n  const headers = await buildHeaders(session.token)\n  debug(`\nSending Admin GraphQL request:\n${query}\n\nWith variables:\n${variables ? JSON.stringify(variables, null, 2) : ''}\n\nAnd headers:\n${sanitizedHeadersOutput(headers)}\n`)\n  try {\n    const response = await graphqlRequest<T>(url, query, variables, headers)\n    return response\n  } catch (error) {\n    if (error instanceof ClientError) {\n      const errorMessage = content`\nThe Admin GraphQL API responded unsuccessfully with the HTTP status ${`${error.response.status}`} and errors:\n\n${outputToken.json(error.response.errors)}\n      `\n      const abortError = new Abort(errorMessage.value)\n      abortError.stack = error.stack\n      throw abortError\n    } else {\n      throw error\n    }\n  }\n}\n\nasync function fetchApiVersion(session: AdminSession): Promise<string> {\n  const url = adminUrl(session.storeFqdn, 'unstable')\n  const query = apiVersionQuery()\n  const headers = await buildHeaders(session.token)\n\n  debug(`\nSending Admin GraphQL request to URL ${url} with query:\n${query}\n  `)\n  const data = await graphqlRequest<{\n    publicApiVersions: {handle: string; supported: boolean}[]\n  }>(url, query, {}, headers).catch((err) => {\n    throw err.response.status === 403 ? UnauthorizedAccessError(session.storeFqdn) : UnknownError()\n  })\n\n  return data.publicApiVersions\n    .filter((item) => item.supported)\n    .map((item) => item.handle)\n    .sort()\n    .reverse()[0]\n}\n\nfunction adminUrl(store: string, version: string | undefined): string {\n  const realVersion = version || 'unstable'\n  return `https://${store}/admin/api/${realVersion}/graphql.json`\n}\n\nfunction apiVersionQuery(): string {\n  return gql`\n    query {\n      publicApiVersions {\n        handle\n        supported\n      }\n    }\n  `\n}\n"]}
+{"version":3,"file":"admin.js","sourceRoot":"","sources":["../../src/api/admin.ts"],"names":[],"mappings":"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","sourcesContent":["import {buildHeaders, debugLogRequest, handlingErrors} from './common.js'\nimport {AdminSession} from '../session.js'\nimport {debug, content, token as outputToken} from '../output.js'\nimport {Bug, Abort} from '../error.js'\nimport {graphqlClient} from '../http/graphql.js'\nimport {gql, RequestDocument, Variables} from 'graphql-request'\n\nconst UnauthorizedAccessError = (store: string) => {\n  const adminLink = outputToken.link(`URL`, `https://${store}/admin`)\n  const storeName = store.replace('.myshopify.com', '')\n  return new Abort(\n    content`Looks like you need access to this dev store (${outputToken.link(storeName, `https://${store}`)})`,\n    content`• Log in to the store directly from this ${adminLink}. If you're the store owner, then that direct log in should solve your access issue.\n• If you're not the owner, create a dev store staff account for yourself. Then log in directly from the link above.\n    `,\n  )\n}\n\nconst UnknownError = () => {\n  return new Bug(`Unknown error connecting to your store`)\n}\n\nexport async function request<T>(query: RequestDocument, session: AdminSession, variables?: Variables): Promise<T> {\n  const api = 'Admin'\n  return handlingErrors(api, async () => {\n    const version = await fetchApiVersion(session)\n    const url = adminUrl(session.storeFqdn, version)\n    const headers = await buildHeaders(session.token)\n    const client = await graphqlClient({\n      headers,\n      url,\n      service: 'shopify',\n    })\n    debugLogRequest(api, query, variables, headers)\n    const response = await client.request<T>(query, variables)\n    return response\n  })\n}\n\nasync function fetchApiVersion(session: AdminSession): Promise<string> {\n  const url = adminUrl(session.storeFqdn, 'unstable')\n  const query = apiVersionQuery()\n  const headers = await buildHeaders(session.token)\n  const client = await graphqlClient({url, headers, service: 'shopify'})\n  debug(`\nSending Admin GraphQL request to URL ${url} with query:\n${query}\n  `)\n  const data = await client\n    .request<{\n      publicApiVersions: {handle: string; supported: boolean}[]\n    }>(query, {})\n    .catch((err) => {\n      throw err.response.status === 403 ? UnauthorizedAccessError(session.storeFqdn) : UnknownError()\n    })\n\n  return data.publicApiVersions\n    .filter((item) => item.supported)\n    .map((item) => item.handle)\n    .sort()\n    .reverse()[0]\n}\n\nfunction adminUrl(store: string, version: string | undefined): string {\n  const realVersion = version || 'unstable'\n  return `https://${store}/admin/api/${realVersion}/graphql.json`\n}\n\nfunction apiVersionQuery(): string {\n  return gql`\n    query {\n      publicApiVersions {\n        handle\n        supported\n      }\n    }\n  `\n}\n"]}

package/dist/api/common.d.ts

@@ -1,11 +1,21 @@
+import { ExtendableError } from '../error.js';
+import { RequestDocument, Variables } from 'graphql-request';
+export declare class RequestClientError extends ExtendableError {
+    statusCode: number;
+    constructor(message: string, statusCode: number);
+}
 export declare function buildHeaders(token: string): Promise<{
     [key: string]: string;
 }>;
 /**
- * Remvoes the sensitive data from the headers and outputs them as a string.
+ * Removes the sensitive data from the headers and outputs them as a string.
  * @param headers {{[key: string]: string}} HTTP headers.
  * @returns {string} A sanitized version of the headers as a string.
  */
 export declare function sanitizedHeadersOutput(headers: {
     [key: string]: string;
 }): string;
+export declare function debugLogRequest<T>(api: string, query: RequestDocument, variables?: Variables, headers?: {
+    [key: string]: string;
+}): Promise<void>;
+export declare function handlingErrors<T>(api: string, action: () => Promise<T>): Promise<T>;

package/dist/api/common.js

@@ -1,11 +1,18 @@
-import { isShopify } from '../environment/local.js';
+import { firstPartyDev } from '../environment/local.js';
 import constants from '../constants.js';
+import { stringifyMessage, content, token as outputToken, token, debug } from '../output.js';
+import { Abort, ExtendableError } from '../error.js';
+import { ClientError } from 'graphql-request';
 import { randomUUID } from 'crypto';
+export class RequestClientError extends ExtendableError {
+    constructor(message, statusCode) {
+        super(message);
+        this.statusCode = statusCode;
+    }
+}
 export async function buildHeaders(token) {
     const userAgent = `Shopify CLI; v=${await constants.versions.cliKit()}`;
-    const isEmployee = await isShopify();
     const headers = {
-        /* eslint-disable @typescript-eslint/naming-convention */
         'User-Agent': userAgent,
         // 'Sec-CH-UA': secCHUA, This header requires the Git sha.
         'Sec-CH-UA-PLATFORM': process.platform,
@@ -13,13 +20,12 @@ export async function buildHeaders(token) {
         authorization: `Bearer ${token}`,
         'X-Shopify-Access-Token': `Bearer ${token}`,
         'Content-Type': 'application/json',
-        // ...(isEmployee && {'X-Shopify-Cli-Employee': '1'}),
-        /* eslint-enable @typescript-eslint/naming-convention */
+        ...(firstPartyDev() && { 'X-Shopify-Cli-Employee': '1' }),
     };
     return headers;
 }
 /**
- * Remvoes the sensitive data from the headers and outputs them as a string.
+ * Removes the sensitive data from the headers and outputs them as a string.
  * @param headers {{[key: string]: string}} HTTP headers.
  * @returns {string} A sanitized version of the headers as a string.
  */
@@ -37,4 +43,42 @@ export function sanitizedHeadersOutput(headers) {
     })
         .join('\n');
 }
+export async function debugLogRequest(api, query, variables, headers = {}) {
+    debug(`
+Sending ${token.raw(api)} GraphQL request:
+${query}
+
+With variables:
+${variables ? JSON.stringify(variables, null, 2) : ''}
+
+And headers:
+${sanitizedHeadersOutput(headers)}
+`);
+}
+export async function handlingErrors(api, action) {
+    try {
+        return await action();
+    }
+    catch (error) {
+        if (error instanceof ClientError) {
+            const errorMessage = stringifyMessage(content `
+  The ${token.raw(api)} GraphQL API responded unsuccessfully with the HTTP status ${`${error.response.status}`} and errors:
+
+  ${outputToken.json(error.response.errors)}
+      `);
+            let mappedError;
+            if (error.response.status < 500) {
+                mappedError = new RequestClientError(errorMessage, error.response.status);
+            }
+            else {
+                mappedError = new Abort(errorMessage);
+            }
+            mappedError.stack = error.stack;
+            throw mappedError;
+        }
+        else {
+            throw error;
+        }
+    }
+}
 //# sourceMappingURL=common.js.map

package/dist/api/common.js.map

@@ -1 +1 @@
-{"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/api/common.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,yBAAyB,CAAA;AACjD,OAAO,SAAS,MAAM,iBAAiB,CAAA;AACvC,OAAO,EAAC,UAAU,EAAC,MAAM,QAAQ,CAAA;AAEjC,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,KAAa;IAC9C,MAAM,SAAS,GAAG,kBAAkB,MAAM,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAA;IACvE,MAAM,UAAU,GAAG,MAAM,SAAS,EAAE,CAAA;IAEpC,MAAM,OAAO,GAAG;QACd,yDAAyD;QACzD,YAAY,EAAE,SAAS;QACvB,0DAA0D;QAC1D,oBAAoB,EAAE,OAAO,CAAC,QAAQ;QACtC,cAAc,EAAE,UAAU,EAAE;QAC5B,aAAa,EAAE,UAAU,KAAK,EAAE;QAChC,wBAAwB,EAAE,UAAU,KAAK,EAAE;QAC3C,cAAc,EAAE,kBAAkB;QAClC,sDAAsD;QACtD,wDAAwD;KACzD,CAAA;IAED,OAAO,OAAO,CAAA;AAChB,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,sBAAsB,CAAC,OAAgC;IACrE,MAAM,SAAS,GAA4B,EAAE,CAAA;IAC7C,MAAM,QAAQ,GAAG,CAAC,OAAO,EAAE,eAAe,CAAC,CAAA;IAC3C,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;QACtC,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,MAAM,CAAC,iBAAiB,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,KAAK,SAAS,EAAE;YAC1F,SAAS,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;SACpC;IACH,CAAC,CAAC,CAAA;IACF,OAAO,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC;SAC1B,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QACd,OAAO,MAAM,MAAM,KAAK,SAAS,CAAC,MAAM,CAAC,EAAE,CAAA;IAC7C,CAAC,CAAC;SACD,IAAI,CAAC,IAAI,CAAC,CAAA;AACf,CAAC","sourcesContent":["import {isShopify} from '../environment/local.js'\nimport constants from '../constants.js'\nimport {randomUUID} from 'crypto'\n\nexport async function buildHeaders(token: string): Promise<{[key: string]: string}> {\n  const userAgent = `Shopify CLI; v=${await constants.versions.cliKit()}`\n  const isEmployee = await isShopify()\n\n  const headers = {\n    /* eslint-disable @typescript-eslint/naming-convention */\n    'User-Agent': userAgent,\n    // 'Sec-CH-UA': secCHUA, This header requires the Git sha.\n    'Sec-CH-UA-PLATFORM': process.platform,\n    'X-Request-Id': randomUUID(),\n    authorization: `Bearer ${token}`,\n    'X-Shopify-Access-Token': `Bearer ${token}`,\n    'Content-Type': 'application/json',\n    // ...(isEmployee && {'X-Shopify-Cli-Employee': '1'}),\n    /* eslint-enable @typescript-eslint/naming-convention */\n  }\n\n  return headers\n}\n\n/**\n * Remvoes the sensitive data from the headers and outputs them as a string.\n * @param headers {{[key: string]: string}} HTTP headers.\n * @returns {string} A sanitized version of the headers as a string.\n */\nexport function sanitizedHeadersOutput(headers: {[key: string]: string}): string {\n  const sanitized: {[key: string]: string} = {}\n  const keywords = ['token', 'authorization']\n  Object.keys(headers).forEach((header) => {\n    if (keywords.find((keyword) => header.toLocaleLowerCase().includes(keyword)) === undefined) {\n      sanitized[header] = headers[header]\n    }\n  })\n  return Object.keys(sanitized)\n    .map((header) => {\n      return ` - ${header}: ${sanitized[header]}`\n    })\n    .join('\\n')\n}\n"]}
+{"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/api/common.ts"],"names":[],"mappings":"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","sourcesContent":["import {firstPartyDev} from '../environment/local.js'\nimport constants from '../constants.js'\nimport {stringifyMessage, content, token as outputToken, token, debug} from '../output.js'\nimport {Abort, ExtendableError} from '../error.js'\nimport {ClientError, RequestDocument, Variables} from 'graphql-request'\nimport {randomUUID} from 'crypto'\n\nexport class RequestClientError extends ExtendableError {\n  statusCode: number\n  public constructor(message: string, statusCode: number) {\n    super(message)\n    this.statusCode = statusCode\n  }\n}\n\nexport async function buildHeaders(token: string): Promise<{[key: string]: string}> {\n  const userAgent = `Shopify CLI; v=${await constants.versions.cliKit()}`\n\n  const headers = {\n    'User-Agent': userAgent,\n    // 'Sec-CH-UA': secCHUA, This header requires the Git sha.\n    'Sec-CH-UA-PLATFORM': process.platform,\n    'X-Request-Id': randomUUID(),\n    authorization: `Bearer ${token}`,\n    'X-Shopify-Access-Token': `Bearer ${token}`,\n    'Content-Type': 'application/json',\n    ...(firstPartyDev() && {'X-Shopify-Cli-Employee': '1'}),\n  }\n\n  return headers\n}\n\n/**\n * Removes the sensitive data from the headers and outputs them as a string.\n * @param headers {{[key: string]: string}} HTTP headers.\n * @returns {string} A sanitized version of the headers as a string.\n */\nexport function sanitizedHeadersOutput(headers: {[key: string]: string}): string {\n  const sanitized: {[key: string]: string} = {}\n  const keywords = ['token', 'authorization']\n  Object.keys(headers).forEach((header) => {\n    if (keywords.find((keyword) => header.toLocaleLowerCase().includes(keyword)) === undefined) {\n      sanitized[header] = headers[header]\n    }\n  })\n  return Object.keys(sanitized)\n    .map((header) => {\n      return ` - ${header}: ${sanitized[header]}`\n    })\n    .join('\\n')\n}\n\nexport async function debugLogRequest<T>(\n  api: string,\n  query: RequestDocument,\n  variables?: Variables,\n  headers: {[key: string]: string} = {},\n) {\n  debug(`\nSending ${token.raw(api)} GraphQL request:\n${query}\n\nWith variables:\n${variables ? JSON.stringify(variables, null, 2) : ''}\n\nAnd headers:\n${sanitizedHeadersOutput(headers)}\n`)\n}\n\nexport async function handlingErrors<T>(api: string, action: () => Promise<T>): Promise<T> {\n  try {\n    return await action()\n  } catch (error) {\n    if (error instanceof ClientError) {\n      const errorMessage = stringifyMessage(content`\n  The ${token.raw(\n    api,\n  )} GraphQL API responded unsuccessfully with the HTTP status ${`${error.response.status}`} and errors:\n\n  ${outputToken.json(error.response.errors)}\n      `)\n      let mappedError: Error\n      if (error.response.status < 500) {\n        mappedError = new RequestClientError(errorMessage, error.response.status)\n      } else {\n        mappedError = new Abort(errorMessage)\n      }\n      mappedError.stack = error.stack\n      throw mappedError\n    } else {\n      throw error\n    }\n  }\n}\n"]}

package/dist/api/identity.js

@@ -1,17 +1,16 @@
 import { identity } from '../environment/fqdn.js';
 import { debug } from '../output.js';
-import { fetch } from '../http.js';
+import { shopifyFetch } from '../http.js';
 export async function validateIdentityToken(token) {
     try {
         const instrospectionURL = await getInstrospectionEndpoint();
         const options = {
             method: 'POST',
-            // eslint-disable-next-line @typescript-eslint/naming-convention
             headers: { Authorization: `Bearer ${token}`, 'Content-Type': 'application/json' },
             body: JSON.stringify({ token }),
         };
         debug(`Sending Identity Introspection request to URL: ${instrospectionURL}`);
-        const response = await fetch(instrospectionURL, options);
+        const response = await shopifyFetch('shopify', instrospectionURL, options);
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const json = await response.json();
         debug(`The identity token is valid: ${json.valid}`);
@@ -24,7 +23,7 @@ export async function validateIdentityToken(token) {
     }
 }
 async function getInstrospectionEndpoint() {
-    const response = await fetch(`https://${await identity()}/.well-known/openid-configuration.json`);
+    const response = await shopifyFetch('identity', `https://${await identity()}/.well-known/openid-configuration.json`);
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const json = await response.json();
     return json.introspection_endpoint;

package/dist/api/identity.js.map

@@ -1 +1 @@
-{"version":3,"file":"identity.js","sourceRoot":"","sources":["../../src/api/identity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,wBAAwB,CAAA;AAC/C,OAAO,EAAC,KAAK,EAAC,MAAM,cAAc,CAAA;AAClC,OAAO,EAAC,KAAK,EAAC,MAAM,YAAY,CAAA;AAEhC,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,KAAa;IACvD,IAAI;QACF,MAAM,iBAAiB,GAAG,MAAM,yBAAyB,EAAE,CAAA;QAC3D,MAAM,OAAO,GAAG;YACd,MAAM,EAAE,MAAM;YACd,gEAAgE;YAChE,OAAO,EAAE,EAAC,aAAa,EAAE,UAAU,KAAK,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAC;YAC/E,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAC,KAAK,EAAC,CAAC;SAC9B,CAAA;QACD,KAAK,CAAC,kDAAkD,iBAAiB,EAAE,CAAC,CAAA;QAE5E,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAA;QACxD,8DAA8D;QAC9D,MAAM,IAAI,GAAQ,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;QAEvC,KAAK,CAAC,gCAAgC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAA;QACnD,OAAO,IAAI,CAAC,KAAK,CAAA;QACjB,qDAAqD;KACtD;IAAC,OAAO,KAAK,EAAE;QACd,KAAK,CAAC,kCAAkC,KAAK,EAAE,CAAC,CAAA;QAChD,OAAO,KAAK,CAAA;KACb;AACH,CAAC;AAED,KAAK,UAAU,yBAAyB;IACtC,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,WAAW,MAAM,QAAQ,EAAE,wCAAwC,CAAC,CAAA;IACjG,8DAA8D;IAC9D,MAAM,IAAI,GAAQ,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;IACvC,OAAO,IAAI,CAAC,sBAAsB,CAAA;AACpC,CAAC","sourcesContent":["import {identity} from '../environment/fqdn.js'\nimport {debug} from '../output.js'\nimport {fetch} from '../http.js'\n\nexport async function validateIdentityToken(token: string) {\n  try {\n    const instrospectionURL = await getInstrospectionEndpoint()\n    const options = {\n      method: 'POST',\n      // eslint-disable-next-line @typescript-eslint/naming-convention\n      headers: {Authorization: `Bearer ${token}`, 'Content-Type': 'application/json'},\n      body: JSON.stringify({token}),\n    }\n    debug(`Sending Identity Introspection request to URL: ${instrospectionURL}`)\n\n    const response = await fetch(instrospectionURL, options)\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    const json: any = await response.json()\n\n    debug(`The identity token is valid: ${json.valid}`)\n    return json.valid\n    // eslint-disable-next-line no-catch-all/no-catch-all\n  } catch (error) {\n    debug(`The identity token is invalid: ${error}`)\n    return false\n  }\n}\n\nasync function getInstrospectionEndpoint(): Promise<string> {\n  const response = await fetch(`https://${await identity()}/.well-known/openid-configuration.json`)\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  const json: any = await response.json()\n  return json.introspection_endpoint\n}\n"]}
+{"version":3,"file":"identity.js","sourceRoot":"","sources":["../../src/api/identity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,wBAAwB,CAAA;AAC/C,OAAO,EAAC,KAAK,EAAC,MAAM,cAAc,CAAA;AAClC,OAAO,EAAC,YAAY,EAAC,MAAM,YAAY,CAAA;AAEvC,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,KAAa;IACvD,IAAI;QACF,MAAM,iBAAiB,GAAG,MAAM,yBAAyB,EAAE,CAAA;QAC3D,MAAM,OAAO,GAAG;YACd,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,EAAC,aAAa,EAAE,UAAU,KAAK,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAC;YAC/E,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAC,KAAK,EAAC,CAAC;SAC9B,CAAA;QACD,KAAK,CAAC,kDAAkD,iBAAiB,EAAE,CAAC,CAAA;QAE5E,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,SAAS,EAAE,iBAAiB,EAAE,OAAO,CAAC,CAAA;QAC1E,8DAA8D;QAC9D,MAAM,IAAI,GAAQ,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;QAEvC,KAAK,CAAC,gCAAgC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAA;QACnD,OAAO,IAAI,CAAC,KAAK,CAAA;QACjB,qDAAqD;KACtD;IAAC,OAAO,KAAK,EAAE;QACd,KAAK,CAAC,kCAAkC,KAAK,EAAE,CAAC,CAAA;QAChD,OAAO,KAAK,CAAA;KACb;AACH,CAAC;AAED,KAAK,UAAU,yBAAyB;IACtC,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,UAAU,EAAE,WAAW,MAAM,QAAQ,EAAE,wCAAwC,CAAC,CAAA;IACpH,8DAA8D;IAC9D,MAAM,IAAI,GAAQ,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;IACvC,OAAO,IAAI,CAAC,sBAAsB,CAAA;AACpC,CAAC","sourcesContent":["import {identity} from '../environment/fqdn.js'\nimport {debug} from '../output.js'\nimport {shopifyFetch} from '../http.js'\n\nexport async function validateIdentityToken(token: string) {\n  try {\n    const instrospectionURL = await getInstrospectionEndpoint()\n    const options = {\n      method: 'POST',\n      headers: {Authorization: `Bearer ${token}`, 'Content-Type': 'application/json'},\n      body: JSON.stringify({token}),\n    }\n    debug(`Sending Identity Introspection request to URL: ${instrospectionURL}`)\n\n    const response = await shopifyFetch('shopify', instrospectionURL, options)\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    const json: any = await response.json()\n\n    debug(`The identity token is valid: ${json.valid}`)\n    return json.valid\n    // eslint-disable-next-line no-catch-all/no-catch-all\n  } catch (error) {\n    debug(`The identity token is invalid: ${error}`)\n    return false\n  }\n}\n\nasync function getInstrospectionEndpoint(): Promise<string> {\n  const response = await shopifyFetch('identity', `https://${await identity()}/.well-known/openid-configuration.json`)\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  const json: any = await response.json()\n  return json.introspection_endpoint\n}\n"]}

package/dist/api/partners.d.ts

@@ -1,9 +1,4 @@
-import { ExtendableError } from '../error.js';
 import { Variables, RequestDocument } from 'graphql-request';
-export declare class RequestClientError extends ExtendableError {
-    statusCode: number;
-    constructor(message: string, statusCode: number);
-}
 export declare function request<T>(query: RequestDocument, token: string, variables?: Variables): Promise<T>;
 /**
  * Check if the given token is revoked and no longer valid to interact with the Partners API.