@sanity/runtime-cli 4.3.2 → 4.3.4

package/dist/commands/functions/env/remove.js

@@ -2,9 +2,9 @@ import { Args, Command } from '@oclif/core';
 import Spinner from 'yocto-spinner';
 import { readBlueprintOnDisk } from '../../../actions/blueprints/blueprint.js';
 import { remove } from '../../../actions/functions/env/remove.js';
-import config from '../../../config.js';
 import { red } from '../../../utils/display/colors.js';
 import { findFunctionByName } from '../../../utils/find-function.js';
+import { validTokenOrErrorMessage } from '../../../utils/validated-token.js';
 export default class Remove extends Command {
     static args = {
         name: Args.string({ description: 'The name of the Sanity Function', required: true }),
@@ -13,17 +13,20 @@ export default class Remove extends Command {
     static description = 'Remove an environment variable for a Sanity function';
     static examples = ['<%= config.bin %> <%= command.id %> MyFunction API_URL'];
     async run() {
+        const { token, error: tokenErr } = await validTokenOrErrorMessage();
+        if (tokenErr)
+            this.error(tokenErr.message);
         const { args } = await this.parse(Remove);
         const spinner = Spinner({
             text: `Removing "${args.key}" environment variable in "${args.name}"`,
         }).start();
-        const { deployedStack } = await readBlueprintOnDisk({ getStack: true, token: config.token });
+        const { deployedStack } = await readBlueprintOnDisk({ getStack: true, token });
         if (!deployedStack)
             this.error('Stack not found'); // returns
         const { projectId } = deployedStack;
         const { externalId } = findFunctionByName(deployedStack, args.name);
         const result = await remove(externalId, args.key, {
-            token: config.token,
+            token,
             projectId,
         });
         if (result.ok) {

package/dist/commands/functions/invoke.js

@@ -2,9 +2,9 @@ import { Args, Command, Flags } from '@oclif/core';
 import Spinner from 'yocto-spinner';
 import { readBlueprintOnDisk } from '../../actions/blueprints/blueprint.js';
 import { invoke } from '../../actions/functions/invoke.js';
-import config from '../../config.js';
 import { red } from '../../utils/display/colors.js';
 import { findFunctionByName } from '../../utils/find-function.js';
+import { validTokenOrErrorMessage } from '../../utils/validated-token.js';
 export default class Invoke extends Command {
     static args = {
         name: Args.string({ description: 'The name of the Sanity Function', required: true }),
@@ -23,14 +23,17 @@ export default class Invoke extends Command {
         }),
     };
     async run() {
+        const { token, error: tokenErr } = await validTokenOrErrorMessage();
+        if (tokenErr)
+            this.error(tokenErr.message);
         const { args, flags } = await this.parse(Invoke);
         const spinner = Spinner({ text: `Invoking function "${args.name}"` }).start();
-        const { deployedStack } = await readBlueprintOnDisk({ getStack: true, token: config.token });
+        const { deployedStack } = await readBlueprintOnDisk({ getStack: true, token });
         if (!deployedStack)
             this.error('Stack not found'); // returns
         const { projectId } = deployedStack;
         const { externalId } = findFunctionByName(deployedStack, args.name);
-        const result = await invoke(externalId, { data: flags.data, file: flags.file }, { token: config.token, projectId });
+        const result = await invoke(externalId, { data: flags.data, file: flags.file }, { token, projectId });
         if (result.ok) {
             spinner.success(`Invocation of ${args.name} succeeded`);
             if (result.json?.data?.type === 'Buffer') {

package/dist/commands/functions/logs.d.ts

@@ -18,8 +18,13 @@ export default class Logs extends Command {
         delete: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         force: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
+    sanityToken: string | undefined;
     run(): Promise<void>;
     runDeleteLogs(name: string, options: RunDeleteOptions): Promise<void>;
     runGetLogs(name: string, options: RunGetOptions): Promise<void>;
+    getProjectAndExternalId(name: string): Promise<{
+        projectId?: string;
+        externalId?: string;
+    }>;
 }
 export {};

package/dist/commands/functions/logs.js

@@ -3,10 +3,10 @@ import inquirer from 'inquirer';
 import Spinner from 'yocto-spinner';
 import { readBlueprintOnDisk } from '../../actions/blueprints/blueprint.js';
 import { deleteLogs as deleteLogsAction, logs as logsAction } from '../../actions/functions/logs.js';
-import config from '../../config.js';
 import { formatTitle } from '../../utils/display/blueprints-formatting.js';
 import { blue, bold, green, red, yellow } from '../../utils/display/colors.js';
 import { findFunctionByName } from '../../utils/find-function.js';
+import { validTokenOrErrorMessage } from '../../utils/validated-token.js';
 function logLevel(level) {
     if (level === 'ERROR') {
         return red(level);
@@ -16,16 +16,6 @@ function logLevel(level) {
     }
     return green(level);
 }
-// TODO extract to a shared module
-async function getProjectAndExternalId(name) {
-    const { deployedStack } = await readBlueprintOnDisk({ getStack: true, token: config.token });
-    if (!deployedStack) {
-        return {};
-    }
-    const { projectId } = deployedStack;
-    const { externalId } = findFunctionByName(deployedStack, name);
-    return { projectId, externalId };
-}
 export default class Logs extends Command {
     static args = {
         name: Args.string({ description: 'The name of the Sanity Function', required: true }),
@@ -62,7 +52,12 @@ export default class Logs extends Command {
             required: false,
         }),
     };
+    sanityToken;
     async run() {
+        const { token, error: tokenErr } = await validTokenOrErrorMessage();
+        if (tokenErr)
+            this.error(tokenErr.message);
+        this.sanityToken = token;
         const { args, flags } = await this.parse(Logs);
         if (flags.delete === true) {
             await this.runDeleteLogs(args.name, flags);
@@ -82,13 +77,14 @@ export default class Logs extends Command {
             if (!certain)
                 return;
         }
-        const { projectId, externalId } = await getProjectAndExternalId(name);
+        const { projectId, externalId } = await this.getProjectAndExternalId(name);
         if (!projectId || !externalId) {
             this.error('Stack not found');
-            return;
         }
+        if (!this.sanityToken)
+            this.error('Unable to delete logs. Missing API token.');
         const spinner = Spinner({ text: `Deleting logs for function ${yellow(name)}` }).start();
-        const { ok, error } = await deleteLogsAction(externalId, { token: config.token, projectId });
+        const { ok, error } = await deleteLogsAction(externalId, { token: this.sanityToken, projectId });
         if (!ok) {
             spinner.error(`${red('Failed')} to retrieve logs`);
             this.log(`Error: ${error || 'Unknown error'}`);
@@ -98,12 +94,13 @@ export default class Logs extends Command {
     }
     async runGetLogs(name, options) {
         const spinner = Spinner({ text: `Finding logs for function "${name}"` }).start();
-        const { projectId, externalId } = await getProjectAndExternalId(name);
+        const { projectId, externalId } = await this.getProjectAndExternalId(name);
         if (!projectId || !externalId) {
             this.error('Stack not found');
-            return;
         }
-        const { ok, error, logs, total } = await logsAction(externalId, { limit: options.limit }, { token: config.token, projectId });
+        if (!this.sanityToken)
+            this.error('Unable to retrieve logs. Missing API token.');
+        const { ok, error, logs, total } = await logsAction(externalId, { limit: options.limit }, { token: this.sanityToken, projectId });
         if (!ok) {
             spinner.error(`${red('Failed')} to retrieve logs`);
             this.log(`Error: ${error || 'Unknown error'}`);
@@ -131,4 +128,15 @@ export default class Logs extends Command {
             this.log(JSON.stringify(filteredLogs, null, 2));
         }
     }
+    async getProjectAndExternalId(name) {
+        if (!this.sanityToken)
+            this.error('Missing API token.');
+        const { deployedStack } = await readBlueprintOnDisk({ getStack: true, token: this.sanityToken });
+        if (!deployedStack) {
+            return {};
+        }
+        const { projectId } = deployedStack;
+        const { externalId } = findFunctionByName(deployedStack, name);
+        return { projectId, externalId };
+    }
 }

package/dist/config.d.ts

@@ -1,9 +1,6 @@
 declare const _default: {
-    token: string;
-    apiUrl: URL;
-    server: {
-        functions: URL;
-        blueprints: URL;
-    };
+    isTest: boolean;
+    apiUrl: string;
+    token: string | null;
 };
 export default _default;

package/dist/config.js

@@ -1,33 +1,45 @@
 import { env } from 'node:process';
 import getToken from './utils/get-token.js';
-const nodeEnv = env.SANITY_INTERNAL_ENV ?? 'production';
+const nodeEnv = env.NODE_ENV?.toLowerCase() ?? 'production';
 const isTest = nodeEnv === 'test';
-const isDev = nodeEnv === 'development';
-const useProd = nodeEnv === 'production';
-const isPublishing = env?.PUBLISHING === 'true';
+const sanityEnv = env.SANITY_INTERNAL_ENV?.toLowerCase() ?? 'production';
+const sanityProd = sanityEnv === 'production';
+const isPublishing = env?.PUBLISHING?.toLowerCase() === 'true';
 const apiUrls = {
     production: 'https://api.sanity.io/',
     staging: 'https://api.sanity.work/',
+    default: 'http://api.sanity/',
 };
-const apiUrl = new URL(apiUrls[nodeEnv] ?? apiUrls.production);
-const functionsUrls = {
-    production: apiUrl.toString(),
-    staging: apiUrl.toString(),
-    default: 'http://localhost:4567',
-};
-const blueprintsUrls = {
-    production: apiUrl.toString(),
-    staging: apiUrl.toString(),
-    default: 'http://blueprints/',
-};
-const functionsUrl = new URL(functionsUrls[nodeEnv] ?? functionsUrls.default);
-const blueprintsUrl = new URL(blueprintsUrls[nodeEnv] ?? blueprintsUrls.default);
-const token = isDev || isTest || isPublishing ? 'token' : getToken({ prod: useProd });
+const apiUrl = apiUrls[sanityEnv] ?? apiUrls.default;
+let _token = undefined;
+function loadToken() {
+    let token = null;
+    if (isTest || isPublishing) {
+        token = 'token';
+    }
+    else {
+        try {
+            token = getToken({ prod: sanityProd });
+        }
+        catch (error) {
+            if (error instanceof Error && 'code' in error && error.code === 'ENOENT') {
+                // do nothing, validateToken and commands handle missing config file
+            }
+            else {
+                // rethrow other errors like JSON.parse failure
+                throw error;
+            }
+        }
+    }
+    return token;
+}
 export default {
-    token,
+    isTest,
     apiUrl,
-    server: {
-        functions: functionsUrl,
-        blueprints: blueprintsUrl,
+    get token() {
+        return _token === undefined ? loadToken() : _token;
+    },
+    set token(value) {
+        _token = value;
     },
 };