@sanity/cli-core 0.0.2-alpha.0 → 0.0.2-alpha.2

package/dist/loaders/studio/studioWorkerLoader.worker.js

@@ -1,15 +1,13 @@
-import { resolve } from 'node:path';
-import { pathToFileURL } from 'node:url';
 import { isMainThread } from 'node:worker_threads';
-import { moduleResolve } from 'import-meta-resolve';
 import { createServer, loadEnv, mergeConfig } from 'vite';
 import { ViteNodeRunner } from 'vite-node/client';
 import { ViteNodeServer } from 'vite-node/server';
 import { installSourcemapsSupport } from 'vite-node/source-map';
 import { getCliConfig } from '../../config/cli/getCliConfig.js';
+import { getStudioEnvironmentVariables } from '../../util/environment/getStudioEnvironmentVariables.js';
+import { setupBrowserStubs } from '../../util/environment/setupBrowserStubs.js';
 import { isRecord } from '../../util/isRecord.js';
 import { isNotFoundError } from '../../util/NotFoundError.js';
-import * as stubs from './stubs.js';
 if (isMainThread) {
     throw new Error('Should be child of thread, not the main thread');
 }
@@ -21,34 +19,18 @@ const workerScriptPath = process.env.STUDIO_WORKER_TASK_FILE;
 if (!workerScriptPath) {
     throw new Error('Missing `STUDIO_WORKER_TASK_FILE` environment variable');
 }
-const mockStubs = stubs;
-const mockedGlobalThis = globalThis;
-for(const key in stubs){
-    if (!(key in mockedGlobalThis)) {
-        mockedGlobalThis[key] = mockStubs[key];
-    }
-}
-// Doesn't have to be correct, just need the root path to be
-const fakeConfigUrl = pathToFileURL(resolve(rootPath, 'sanity.config.mjs'));
-// We'll load `getStudioEnvironmentVariables` from the `sanity/cli` module installed
-// relative to where the studio is located, instead of resolving from where this CLI is
-// running in, in order to ensure we're using the same version as the studio would.
-const sanityCliUrl = await moduleResolve('sanity/cli', fakeConfigUrl);
-const { getStudioEnvironmentVariables } = await import(sanityCliUrl.href);
-if (typeof getStudioEnvironmentVariables !== 'function') {
-    throw new TypeError('Expected `getStudioEnvironmentVariables` from `sanity/cli` to be a function');
-}
+await setupBrowserStubs();
+const studioEnvVars = await getStudioEnvironmentVariables(rootPath);
 const defaultViteConfig = {
     build: {
         target: 'node'
     },
     configFile: false,
-    define: {
-        ...getStudioEnvironmentVariables({
-            jsonEncode: true,
-            prefix: 'process.env.'
-        })
-    },
+    // Inject environment variables as compile-time constants for Vite
+    define: Object.fromEntries(Object.entries(studioEnvVars).map(([key, value])=>[
+            `process.env.${key}`,
+            JSON.stringify(value)
+        ])),
     logLevel: 'error',
     optimizeDeps: {
         disabled: true

package/dist/loaders/studio/studioWorkerLoader.worker.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/loaders/studio/studioWorkerLoader.worker.ts"],"sourcesContent":["import {resolve} from 'node:path'\nimport {pathToFileURL} from 'node:url'\nimport {isMainThread} from 'node:worker_threads'\n\nimport {moduleResolve} from 'import-meta-resolve'\nimport {createServer, type InlineConfig, loadEnv, mergeConfig} from 'vite'\nimport {ViteNodeRunner} from 'vite-node/client'\nimport {ViteNodeServer} from 'vite-node/server'\nimport {installSourcemapsSupport} from 'vite-node/source-map'\n\nimport {getCliConfig} from '../../config/cli/getCliConfig.js'\nimport {type CliConfig} from '../../config/cli/types.js'\nimport {isRecord} from '../../util/isRecord.js'\nimport {isNotFoundError} from '../../util/NotFoundError.js'\nimport * as stubs from './stubs.js'\n\nif (isMainThread) {\n  throw new Error('Should be child of thread, not the main thread')\n}\n\nconst rootPath = process.env.STUDIO_WORKER_STUDIO_ROOT_PATH\nif (!rootPath) {\n  throw new Error('Missing `STUDIO_WORKER_STUDIO_ROOT_PATH` environment variable')\n}\n\nconst workerScriptPath = process.env.STUDIO_WORKER_TASK_FILE\nif (!workerScriptPath) {\n  throw new Error('Missing `STUDIO_WORKER_TASK_FILE` environment variable')\n}\n\nconst mockStubs = stubs as Record<string, unknown>\nconst mockedGlobalThis: Record<string, unknown> = globalThis\nfor (const key in stubs) {\n  if (!(key in mockedGlobalThis)) {\n    mockedGlobalThis[key] = mockStubs[key]\n  }\n}\n\n// Doesn't have to be correct, just need the root path to be\nconst fakeConfigUrl = pathToFileURL(resolve(rootPath, 'sanity.config.mjs'))\n\n// We'll load `getStudioEnvironmentVariables` from the `sanity/cli` module installed\n// relative to where the studio is located, instead of resolving from where this CLI is\n// running in, in order to ensure we're using the same version as the studio would.\nconst sanityCliUrl = await moduleResolve('sanity/cli', fakeConfigUrl)\nconst {getStudioEnvironmentVariables} = await import(sanityCliUrl.href)\nif (typeof getStudioEnvironmentVariables !== 'function') {\n  throw new TypeError('Expected `getStudioEnvironmentVariables` from `sanity/cli` to be a function')\n}\n\nconst defaultViteConfig: InlineConfig = {\n  build: {target: 'node'},\n  configFile: false, // @todo Should use `vite` prop from `sanity.cli.ts` (if any)\n  define: {\n    ...getStudioEnvironmentVariables({jsonEncode: true, prefix: 'process.env.'}),\n  },\n  logLevel: 'error',\n  optimizeDeps: {disabled: true}, // @todo is this necessary? cant remember why was added\n  root: rootPath,\n  server: {\n    hmr: false,\n    watch: null,\n  },\n}\n\n// Allow the CLI config (`sanity.cli.(js|ts)`) to define a `vite` property which can\n// extend/modify the default vite configuration for the studio.\nlet cliConfig: CliConfig | undefined\ntry {\n  cliConfig = await getCliConfig(rootPath)\n} catch (err) {\n  if (!isNotFoundError(err)) {\n    console.warn('[warn] Failed to load CLI config:', err)\n  }\n}\n\nlet viteConfig = defaultViteConfig\nif (typeof cliConfig?.vite === 'function') {\n  viteConfig = (await cliConfig.vite(viteConfig, {\n    command: 'build',\n    isSsrBuild: true,\n    mode: 'production',\n  })) as InlineConfig\n} else if (isRecord(cliConfig?.vite)) {\n  viteConfig = mergeConfig(viteConfig, cliConfig.vite)\n}\n\n// Vite will build the files we give it - targetting Node.js instead of the browser.\n// We include the inject plugin in order to provide the stubs for the undefined global APIs.\nconst server = await createServer(viteConfig)\n\n// Bit of a hack, but seems necessary based on the `node-vite` binary implementation\nawait server.pluginContainer.buildStart({})\n\n// Load environment variables from `.env` files in the same way as Vite does.\n// Note that Sanity also provides environment variables through `process.env.*` for compat reasons,\n// and so we need to do the same here.\n// @todo is this in line with sanity?\nconst env = loadEnv(server.config.mode, server.config.envDir, '')\nfor (const key in env) {\n  process.env[key] ??= env[key]\n}\n\n// Now we're providing the glue that ensures node-specific loading and execution works.\nconst node = new ViteNodeServer(server)\n\n// Should make it easier to debug any crashes in the imported code…\ninstallSourcemapsSupport({\n  getSourceMap: (source) => node.getSourceMap(source),\n})\n\nconst runner = new ViteNodeRunner({\n  base: server.config.base,\n  async fetchModule(id) {\n    return node.fetchModule(id)\n  },\n  resolveId(id, importer) {\n    return node.resolveId(id, importer)\n  },\n  root: server.config.root,\n})\n\n// Copied from `vite-node` - it appears that this applies the `define` config from\n// vite, but it also takes a surprisingly long time to execute. Not clear at this\n// point why this is, so we should investigate whether it's necessary or not.\nawait runner.executeId('/@vite/env')\n\nawait runner.executeId(workerScriptPath)\n"],"names":["resolve","pathToFileURL","isMainThread","moduleResolve","createServer","loadEnv","mergeConfig","ViteNodeRunner","ViteNodeServer","installSourcemapsSupport","getCliConfig","isRecord","isNotFoundError","stubs","Error","rootPath","process","env","STUDIO_WORKER_STUDIO_ROOT_PATH","workerScriptPath","STUDIO_WORKER_TASK_FILE","mockStubs","mockedGlobalThis","globalThis","key","fakeConfigUrl","sanityCliUrl","getStudioEnvironmentVariables","href","TypeError","defaultViteConfig","build","target","configFile","define","jsonEncode","prefix","logLevel","optimizeDeps","disabled","root","server","hmr","watch","cliConfig","err","console","warn","viteConfig","vite","command","isSsrBuild","mode","pluginContainer","buildStart","config","envDir","node","getSourceMap","source","runner","base","fetchModule","id","resolveId","importer","executeId"],"mappings":"AAAA,SAAQA,OAAO,QAAO,YAAW;AACjC,SAAQC,aAAa,QAAO,WAAU;AACtC,SAAQC,YAAY,QAAO,sBAAqB;AAEhD,SAAQC,aAAa,QAAO,sBAAqB;AACjD,SAAQC,YAAY,EAAqBC,OAAO,EAAEC,WAAW,QAAO,OAAM;AAC1E,SAAQC,cAAc,QAAO,mBAAkB;AAC/C,SAAQC,cAAc,QAAO,mBAAkB;AAC/C,SAAQC,wBAAwB,QAAO,uBAAsB;AAE7D,SAAQC,YAAY,QAAO,mCAAkC;AAE7D,SAAQC,QAAQ,QAAO,yBAAwB;AAC/C,SAAQC,eAAe,QAAO,8BAA6B;AAC3D,YAAYC,WAAW,aAAY;AAEnC,IAAIX,cAAc;IAChB,MAAM,IAAIY,MAAM;AAClB;AAEA,MAAMC,WAAWC,QAAQC,GAAG,CAACC,8BAA8B;AAC3D,IAAI,CAACH,UAAU;IACb,MAAM,IAAID,MAAM;AAClB;AAEA,MAAMK,mBAAmBH,QAAQC,GAAG,CAACG,uBAAuB;AAC5D,IAAI,CAACD,kBAAkB;IACrB,MAAM,IAAIL,MAAM;AAClB;AAEA,MAAMO,YAAYR;AAClB,MAAMS,mBAA4CC;AAClD,IAAK,MAAMC,OAAOX,MAAO;IACvB,IAAI,CAAEW,CAAAA,OAAOF,gBAAe,GAAI;QAC9BA,gBAAgB,CAACE,IAAI,GAAGH,SAAS,CAACG,IAAI;IACxC;AACF;AAEA,4DAA4D;AAC5D,MAAMC,gBAAgBxB,cAAcD,QAAQe,UAAU;AAEtD,oFAAoF;AACpF,uFAAuF;AACvF,mFAAmF;AACnF,MAAMW,eAAe,MAAMvB,cAAc,cAAcsB;AACvD,MAAM,EAACE,6BAA6B,EAAC,GAAG,MAAM,MAAM,CAACD,aAAaE,IAAI;AACtE,IAAI,OAAOD,kCAAkC,YAAY;IACvD,MAAM,IAAIE,UAAU;AACtB;AAEA,MAAMC,oBAAkC;IACtCC,OAAO;QAACC,QAAQ;IAAM;IACtBC,YAAY;IACZC,QAAQ;QACN,GAAGP,8BAA8B;YAACQ,YAAY;YAAMC,QAAQ;QAAc,EAAE;IAC9E;IACAC,UAAU;IACVC,cAAc;QAACC,UAAU;IAAI;IAC7BC,MAAMzB;IACN0B,QAAQ;QACNC,KAAK;QACLC,OAAO;IACT;AACF;AAEA,oFAAoF;AACpF,+DAA+D;AAC/D,IAAIC;AACJ,IAAI;IACFA,YAAY,MAAMlC,aAAaK;AACjC,EAAE,OAAO8B,KAAK;IACZ,IAAI,CAACjC,gBAAgBiC,MAAM;QACzBC,QAAQC,IAAI,CAAC,qCAAqCF;IACpD;AACF;AAEA,IAAIG,aAAalB;AACjB,IAAI,OAAOc,WAAWK,SAAS,YAAY;IACzCD,aAAc,MAAMJ,UAAUK,IAAI,CAACD,YAAY;QAC7CE,SAAS;QACTC,YAAY;QACZC,MAAM;IACR;AACF,OAAO,IAAIzC,SAASiC,WAAWK,OAAO;IACpCD,aAAa1C,YAAY0C,YAAYJ,UAAUK,IAAI;AACrD;AAEA,oFAAoF;AACpF,4FAA4F;AAC5F,MAAMR,SAAS,MAAMrC,aAAa4C;AAElC,oFAAoF;AACpF,MAAMP,OAAOY,eAAe,CAACC,UAAU,CAAC,CAAC;AAEzC,6EAA6E;AAC7E,mGAAmG;AACnG,sCAAsC;AACtC,qCAAqC;AACrC,MAAMrC,MAAMZ,QAAQoC,OAAOc,MAAM,CAACH,IAAI,EAAEX,OAAOc,MAAM,CAACC,MAAM,EAAE;AAC9D,IAAK,MAAMhC,OAAOP,IAAK;IACrBD,QAAQC,GAAG,CAACO,IAAI,KAAKP,GAAG,CAACO,IAAI;AAC/B;AAEA,uFAAuF;AACvF,MAAMiC,OAAO,IAAIjD,eAAeiC;AAEhC,mEAAmE;AACnEhC,yBAAyB;IACvBiD,cAAc,CAACC,SAAWF,KAAKC,YAAY,CAACC;AAC9C;AAEA,MAAMC,SAAS,IAAIrD,eAAe;IAChCsD,MAAMpB,OAAOc,MAAM,CAACM,IAAI;IACxB,MAAMC,aAAYC,EAAE;QAClB,OAAON,KAAKK,WAAW,CAACC;IAC1B;IACAC,WAAUD,EAAE,EAAEE,QAAQ;QACpB,OAAOR,KAAKO,SAAS,CAACD,IAAIE;IAC5B;IACAzB,MAAMC,OAAOc,MAAM,CAACf,IAAI;AAC1B;AAEA,kFAAkF;AAClF,iFAAiF;AACjF,6EAA6E;AAC7E,MAAMoB,OAAOM,SAAS,CAAC;AAEvB,MAAMN,OAAOM,SAAS,CAAC/C"}
+{"version":3,"sources":["../../../src/loaders/studio/studioWorkerLoader.worker.ts"],"sourcesContent":["import {isMainThread} from 'node:worker_threads'\n\nimport {createServer, type InlineConfig, loadEnv, mergeConfig} from 'vite'\nimport {ViteNodeRunner} from 'vite-node/client'\nimport {ViteNodeServer} from 'vite-node/server'\nimport {installSourcemapsSupport} from 'vite-node/source-map'\n\nimport {getCliConfig} from '../../config/cli/getCliConfig.js'\nimport {type CliConfig} from '../../config/cli/types/cliConfig.js'\nimport {getStudioEnvironmentVariables} from '../../util/environment/getStudioEnvironmentVariables.js'\nimport {setupBrowserStubs} from '../../util/environment/setupBrowserStubs.js'\nimport {isRecord} from '../../util/isRecord.js'\nimport {isNotFoundError} from '../../util/NotFoundError.js'\n\nif (isMainThread) {\n  throw new Error('Should be child of thread, not the main thread')\n}\n\nconst rootPath = process.env.STUDIO_WORKER_STUDIO_ROOT_PATH\nif (!rootPath) {\n  throw new Error('Missing `STUDIO_WORKER_STUDIO_ROOT_PATH` environment variable')\n}\n\nconst workerScriptPath = process.env.STUDIO_WORKER_TASK_FILE\nif (!workerScriptPath) {\n  throw new Error('Missing `STUDIO_WORKER_TASK_FILE` environment variable')\n}\n\nawait setupBrowserStubs()\n\nconst studioEnvVars = await getStudioEnvironmentVariables(rootPath)\n\nconst defaultViteConfig: InlineConfig = {\n  build: {target: 'node'},\n  configFile: false, // @todo Should use `vite` prop from `sanity.cli.ts` (if any)\n  // Inject environment variables as compile-time constants for Vite\n  define: Object.fromEntries(\n    Object.entries(studioEnvVars).map(([key, value]) => [\n      `process.env.${key}`,\n      JSON.stringify(value),\n    ]),\n  ),\n  logLevel: 'error',\n  optimizeDeps: {disabled: true}, // @todo is this necessary? cant remember why was added\n  root: rootPath,\n  server: {\n    hmr: false,\n    watch: null,\n  },\n}\n\n// Allow the CLI config (`sanity.cli.(js|ts)`) to define a `vite` property which can\n// extend/modify the default vite configuration for the studio.\nlet cliConfig: CliConfig | undefined\ntry {\n  cliConfig = await getCliConfig(rootPath)\n} catch (err) {\n  if (!isNotFoundError(err)) {\n    console.warn('[warn] Failed to load CLI config:', err)\n  }\n}\n\nlet viteConfig = defaultViteConfig\nif (typeof cliConfig?.vite === 'function') {\n  viteConfig = (await cliConfig.vite(viteConfig, {\n    command: 'build',\n    isSsrBuild: true,\n    mode: 'production',\n  })) as InlineConfig\n} else if (isRecord(cliConfig?.vite)) {\n  viteConfig = mergeConfig(viteConfig, cliConfig.vite)\n}\n\n// Vite will build the files we give it - targetting Node.js instead of the browser.\n// We include the inject plugin in order to provide the stubs for the undefined global APIs.\nconst server = await createServer(viteConfig)\n\n// Bit of a hack, but seems necessary based on the `node-vite` binary implementation\nawait server.pluginContainer.buildStart({})\n\n// Load environment variables from `.env` files in the same way as Vite does.\n// Note that Sanity also provides environment variables through `process.env.*` for compat reasons,\n// and so we need to do the same here.\n// @todo is this in line with sanity?\nconst env = loadEnv(server.config.mode, server.config.envDir, '')\nfor (const key in env) {\n  process.env[key] ??= env[key]\n}\n\n// Now we're providing the glue that ensures node-specific loading and execution works.\nconst node = new ViteNodeServer(server)\n\n// Should make it easier to debug any crashes in the imported code…\ninstallSourcemapsSupport({\n  getSourceMap: (source) => node.getSourceMap(source),\n})\n\nconst runner = new ViteNodeRunner({\n  base: server.config.base,\n  async fetchModule(id) {\n    return node.fetchModule(id)\n  },\n  resolveId(id, importer) {\n    return node.resolveId(id, importer)\n  },\n  root: server.config.root,\n})\n\n// Copied from `vite-node` - it appears that this applies the `define` config from\n// vite, but it also takes a surprisingly long time to execute. Not clear at this\n// point why this is, so we should investigate whether it's necessary or not.\nawait runner.executeId('/@vite/env')\n\nawait runner.executeId(workerScriptPath)\n"],"names":["isMainThread","createServer","loadEnv","mergeConfig","ViteNodeRunner","ViteNodeServer","installSourcemapsSupport","getCliConfig","getStudioEnvironmentVariables","setupBrowserStubs","isRecord","isNotFoundError","Error","rootPath","process","env","STUDIO_WORKER_STUDIO_ROOT_PATH","workerScriptPath","STUDIO_WORKER_TASK_FILE","studioEnvVars","defaultViteConfig","build","target","configFile","define","Object","fromEntries","entries","map","key","value","JSON","stringify","logLevel","optimizeDeps","disabled","root","server","hmr","watch","cliConfig","err","console","warn","viteConfig","vite","command","isSsrBuild","mode","pluginContainer","buildStart","config","envDir","node","getSourceMap","source","runner","base","fetchModule","id","resolveId","importer","executeId"],"mappings":"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"}

package/dist/services/apiClient.d.ts

@@ -1,8 +1,8 @@
-import { type SanityClient } from '@sanity/client';
+import { type ClientConfig, type SanityClient } from '@sanity/client';
 /**
  * @internal
  */
-export interface GlobalCliClientOptions {
+export interface GlobalCliClientOptions extends ClientConfig {
     /**
      * The API version to use for this client.
      */
@@ -20,14 +20,28 @@ export interface GlobalCliClientOptions {
  * @param options - The options to use for the client.
  * @returns Promise that resolves to a configured Sanity API client.
  */
-export declare function getGlobalCliClient({ apiVersion, requireUser, }: GlobalCliClientOptions): Promise<SanityClient>;
+export declare function getGlobalCliClient({ requireUser, ...config }: GlobalCliClientOptions): Promise<SanityClient>;
 /**
  * @internal
  */
-export interface ProjectCliClientOptions {
+export interface ProjectCliClientOptions extends ClientConfig {
+    /**
+     * The API version to use for this client.
+     */
     apiVersion: string;
+    /**
+     * The project ID to use for this client.
+     */
     projectId: string;
+    /**
+     * The dataset to use for this client.
+     */
     dataset?: string;
+    /**
+     * Whether to require a user to be authenticated to use this client.
+     * Default: `false`.
+     * Throws an error if `true` and user is not authenticated.
+     */
     requireUser?: boolean;
 }
 /**
@@ -36,4 +50,4 @@ export interface ProjectCliClientOptions {
  * @param options - The options to use for the client.
  * @returns Promise that resolves to a configured Sanity API client.
  */
-export declare function getProjectCliClient({ apiVersion, dataset, projectId, requireUser, }: ProjectCliClientOptions): Promise<SanityClient>;
+export declare function getProjectCliClient({ requireUser, ...config }: ProjectCliClientOptions): Promise<SanityClient>;

package/dist/services/apiClient.js

@@ -12,25 +12,28 @@ const CLI_REQUEST_TAG_PREFIX = 'sanity.cli';
  *
  * @param options - The options to use for the client.
  * @returns Promise that resolves to a configured Sanity API client.
- */ export async function getGlobalCliClient({ apiVersion, requireUser }) {
+ */ export async function getGlobalCliClient({ requireUser, ...config }) {
     const requester = defaultRequester.clone();
     requester.use(authErrors());
     const sanityEnv = process.env.SANITY_INTERNAL_ENV || 'production';
-    const token = await getCliToken();
     const apiHost = apiHosts[sanityEnv];
-    if (requireUser && !token) {
-        throw new Error('You must login first - run "sanity login"');
+    let token;
+    if (requireUser) {
+        token = await getCliToken();
+        if (!token) {
+            throw new Error('You must login first - run "sanity login"');
+        }
     }
     return createClient({
         ...apiHost ? {
             apiHost
         } : {},
-        apiVersion,
         requester,
         requestTagPrefix: CLI_REQUEST_TAG_PREFIX,
         token,
         useCdn: false,
-        useProjectHostname: false
+        useProjectHostname: false,
+        ...config
     });
 }
 /**
@@ -38,27 +41,28 @@ const CLI_REQUEST_TAG_PREFIX = 'sanity.cli';
  *
  * @param options - The options to use for the client.
  * @returns Promise that resolves to a configured Sanity API client.
- */ export async function getProjectCliClient({ apiVersion, dataset, projectId, requireUser }) {
+ */ export async function getProjectCliClient({ requireUser, ...config }) {
     const requester = defaultRequester.clone();
     requester.use(authErrors());
     const sanityEnv = process.env.SANITY_INTERNAL_ENV || 'production';
-    const token = await getCliToken();
     const apiHost = apiHosts[sanityEnv];
-    if (requireUser && !token) {
-        throw new Error('You must login first - run "sanity login"');
+    let token;
+    if (requireUser) {
+        token = await getCliToken();
+        if (!token) {
+            throw new Error('You must login first - run "sanity login"');
+        }
     }
     return createClient({
         ...apiHost ? {
             apiHost
         } : {},
-        apiVersion,
-        dataset,
-        projectId,
         requester,
         requestTagPrefix: CLI_REQUEST_TAG_PREFIX,
         token,
         useCdn: false,
-        useProjectHostname: true
+        useProjectHostname: true,
+        ...config
     });
 }
 /**

package/dist/services/apiClient.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/services/apiClient.ts"],"sourcesContent":["import {ux} from '@oclif/core'\nimport {\n  type ClientError,\n  createClient,\n  requester as defaultRequester,\n  type SanityClient,\n  type ServerError,\n} from '@sanity/client'\n\nimport {generateHelpUrl} from '../util/generateHelpUrl.js'\nimport {isHttpError} from '../util/isHttpError.js'\nimport {getCliToken} from './getCliToken.js'\n\nconst apiHosts: Record<string, string | undefined> = {\n  staging: 'https://api.sanity.work',\n}\n\nconst CLI_REQUEST_TAG_PREFIX = 'sanity.cli'\n\n/**\n * @internal\n */\nexport interface GlobalCliClientOptions {\n  /**\n   * The API version to use for this client.\n   */\n  apiVersion: string\n\n  /**\n   * Whether to require a user to be authenticated to use this client.\n   * Default: `false`.\n   * Throws an error if `true` and user is not authenticated.\n   */\n  requireUser?: boolean\n}\n\n/**\n * Create a \"global\" (unscoped) Sanity API client.\n *\n * @param options - The options to use for the client.\n * @returns Promise that resolves to a configured Sanity API client.\n */\nexport async function getGlobalCliClient({\n  apiVersion,\n  requireUser,\n}: GlobalCliClientOptions): Promise<SanityClient> {\n  const requester = defaultRequester.clone()\n  requester.use(authErrors())\n\n  const sanityEnv = process.env.SANITY_INTERNAL_ENV || 'production'\n\n  const token = await getCliToken()\n  const apiHost = apiHosts[sanityEnv]\n\n  if (requireUser && !token) {\n    throw new Error('You must login first - run \"sanity login\"')\n  }\n\n  return createClient({\n    ...(apiHost ? {apiHost} : {}),\n    apiVersion,\n    requester,\n    requestTagPrefix: CLI_REQUEST_TAG_PREFIX,\n    token,\n    useCdn: false,\n    useProjectHostname: false,\n  })\n}\n\n/**\n * @internal\n */\nexport interface ProjectCliClientOptions {\n  apiVersion: string\n  projectId: string\n\n  dataset?: string\n\n  requireUser?: boolean\n}\n\n/**\n * Create a \"global\" (unscoped) Sanity API client.\n *\n * @param options - The options to use for the client.\n * @returns Promise that resolves to a configured Sanity API client.\n */\nexport async function getProjectCliClient({\n  apiVersion,\n  dataset,\n  projectId,\n  requireUser,\n}: ProjectCliClientOptions): Promise<SanityClient> {\n  const requester = defaultRequester.clone()\n  requester.use(authErrors())\n\n  const sanityEnv = process.env.SANITY_INTERNAL_ENV || 'production'\n\n  const token = await getCliToken()\n  const apiHost = apiHosts[sanityEnv]\n\n  if (requireUser && !token) {\n    throw new Error('You must login first - run \"sanity login\"')\n  }\n\n  return createClient({\n    ...(apiHost ? {apiHost} : {}),\n    apiVersion,\n    dataset,\n    projectId,\n    requester,\n    requestTagPrefix: CLI_REQUEST_TAG_PREFIX,\n    token,\n    useCdn: false,\n    useProjectHostname: true,\n  })\n}\n\n/**\n * `get-it` middleware that checks for 401 authentication errors and extends the error with more\n * helpful guidance on what to do next.\n *\n * @returns get-it middleware with `onError` handler\n * @internal\n */\nfunction authErrors() {\n  return {\n    onError: (err: Error | null) => {\n      if (!err || !isReqResError(err)) {\n        return err\n      }\n\n      const statusCode = isHttpError(err) && err.response.body.statusCode\n      if (statusCode === 401) {\n        err.message = `${err.message}. You may need to login again with ${ux.colorize('cyan', 'sanity login')}.\\nFor more information, see ${generateHelpUrl('cli-errors')}.`\n      }\n\n      return err\n    },\n  }\n}\n\nfunction isReqResError(err: Error): err is ClientError | ServerError {\n  return Object.prototype.hasOwnProperty.call(err, 'response')\n}\n"],"names":["ux","createClient","requester","defaultRequester","generateHelpUrl","isHttpError","getCliToken","apiHosts","staging","CLI_REQUEST_TAG_PREFIX","getGlobalCliClient","apiVersion","requireUser","clone","use","authErrors","sanityEnv","process","env","SANITY_INTERNAL_ENV","token","apiHost","Error","requestTagPrefix","useCdn","useProjectHostname","getProjectCliClient","dataset","projectId","onError","err","isReqResError","statusCode","response","body","message","colorize","Object","prototype","hasOwnProperty","call"],"mappings":"AAAA,SAAQA,EAAE,QAAO,cAAa;AAC9B,SAEEC,YAAY,EACZC,aAAaC,gBAAgB,QAGxB,iBAAgB;AAEvB,SAAQC,eAAe,QAAO,6BAA4B;AAC1D,SAAQC,WAAW,QAAO,yBAAwB;AAClD,SAAQC,WAAW,QAAO,mBAAkB;AAE5C,MAAMC,WAA+C;IACnDC,SAAS;AACX;AAEA,MAAMC,yBAAyB;AAmB/B;;;;;CAKC,GACD,OAAO,eAAeC,mBAAmB,EACvCC,UAAU,EACVC,WAAW,EACY;IACvB,MAAMV,YAAYC,iBAAiBU,KAAK;IACxCX,UAAUY,GAAG,CAACC;IAEd,MAAMC,YAAYC,QAAQC,GAAG,CAACC,mBAAmB,IAAI;IAErD,MAAMC,QAAQ,MAAMd;IACpB,MAAMe,UAAUd,QAAQ,CAACS,UAAU;IAEnC,IAAIJ,eAAe,CAACQ,OAAO;QACzB,MAAM,IAAIE,MAAM;IAClB;IAEA,OAAOrB,aAAa;QAClB,GAAIoB,UAAU;YAACA;QAAO,IAAI,CAAC,CAAC;QAC5BV;QACAT;QACAqB,kBAAkBd;QAClBW;QACAI,QAAQ;QACRC,oBAAoB;IACtB;AACF;AAcA;;;;;CAKC,GACD,OAAO,eAAeC,oBAAoB,EACxCf,UAAU,EACVgB,OAAO,EACPC,SAAS,EACThB,WAAW,EACa;IACxB,MAAMV,YAAYC,iBAAiBU,KAAK;IACxCX,UAAUY,GAAG,CAACC;IAEd,MAAMC,YAAYC,QAAQC,GAAG,CAACC,mBAAmB,IAAI;IAErD,MAAMC,QAAQ,MAAMd;IACpB,MAAMe,UAAUd,QAAQ,CAACS,UAAU;IAEnC,IAAIJ,eAAe,CAACQ,OAAO;QACzB,MAAM,IAAIE,MAAM;IAClB;IAEA,OAAOrB,aAAa;QAClB,GAAIoB,UAAU;YAACA;QAAO,IAAI,CAAC,CAAC;QAC5BV;QACAgB;QACAC;QACA1B;QACAqB,kBAAkBd;QAClBW;QACAI,QAAQ;QACRC,oBAAoB;IACtB;AACF;AAEA;;;;;;CAMC,GACD,SAASV;IACP,OAAO;QACLc,SAAS,CAACC;YACR,IAAI,CAACA,OAAO,CAACC,cAAcD,MAAM;gBAC/B,OAAOA;YACT;YAEA,MAAME,aAAa3B,YAAYyB,QAAQA,IAAIG,QAAQ,CAACC,IAAI,CAACF,UAAU;YACnE,IAAIA,eAAe,KAAK;gBACtBF,IAAIK,OAAO,GAAG,GAAGL,IAAIK,OAAO,CAAC,mCAAmC,EAAEnC,GAAGoC,QAAQ,CAAC,QAAQ,gBAAgB,6BAA6B,EAAEhC,gBAAgB,cAAc,CAAC,CAAC;YACvK;YAEA,OAAO0B;QACT;IACF;AACF;AAEA,SAASC,cAAcD,GAAU;IAC/B,OAAOO,OAAOC,SAAS,CAACC,cAAc,CAACC,IAAI,CAACV,KAAK;AACnD"}
+{"version":3,"sources":["../../src/services/apiClient.ts"],"sourcesContent":["import {ux} from '@oclif/core'\nimport {\n  type ClientConfig,\n  type ClientError,\n  createClient,\n  requester as defaultRequester,\n  type SanityClient,\n  type ServerError,\n} from '@sanity/client'\n\nimport {generateHelpUrl} from '../util/generateHelpUrl.js'\nimport {isHttpError} from '../util/isHttpError.js'\nimport {getCliToken} from './getCliToken.js'\n\nconst apiHosts: Record<string, string | undefined> = {\n  staging: 'https://api.sanity.work',\n}\n\nconst CLI_REQUEST_TAG_PREFIX = 'sanity.cli'\n\n/**\n * @internal\n */\nexport interface GlobalCliClientOptions extends ClientConfig {\n  /**\n   * The API version to use for this client.\n   */\n  apiVersion: string\n\n  /**\n   * Whether to require a user to be authenticated to use this client.\n   * Default: `false`.\n   * Throws an error if `true` and user is not authenticated.\n   */\n  requireUser?: boolean\n}\n\n/**\n * Create a \"global\" (unscoped) Sanity API client.\n *\n * @param options - The options to use for the client.\n * @returns Promise that resolves to a configured Sanity API client.\n */\nexport async function getGlobalCliClient({\n  requireUser,\n  ...config\n}: GlobalCliClientOptions): Promise<SanityClient> {\n  const requester = defaultRequester.clone()\n  requester.use(authErrors())\n\n  const sanityEnv = process.env.SANITY_INTERNAL_ENV || 'production'\n\n  const apiHost = apiHosts[sanityEnv]\n\n  let token: string | undefined\n  if (requireUser) {\n    token = await getCliToken()\n    if (!token) {\n      throw new Error('You must login first - run \"sanity login\"')\n    }\n  }\n\n  return createClient({\n    ...(apiHost ? {apiHost} : {}),\n    requester,\n    requestTagPrefix: CLI_REQUEST_TAG_PREFIX,\n    token,\n    useCdn: false,\n    useProjectHostname: false,\n    ...config,\n  })\n}\n\n/**\n * @internal\n */\nexport interface ProjectCliClientOptions extends ClientConfig {\n  /**\n   * The API version to use for this client.\n   */\n  apiVersion: string\n\n  /**\n   * The project ID to use for this client.\n   */\n  projectId: string\n\n  /**\n   * The dataset to use for this client.\n   */\n  dataset?: string\n\n  /**\n   * Whether to require a user to be authenticated to use this client.\n   * Default: `false`.\n   * Throws an error if `true` and user is not authenticated.\n   */\n  requireUser?: boolean\n}\n\n/**\n * Create a \"global\" (unscoped) Sanity API client.\n *\n * @param options - The options to use for the client.\n * @returns Promise that resolves to a configured Sanity API client.\n */\nexport async function getProjectCliClient({\n  requireUser,\n  ...config\n}: ProjectCliClientOptions): Promise<SanityClient> {\n  const requester = defaultRequester.clone()\n  requester.use(authErrors())\n\n  const sanityEnv = process.env.SANITY_INTERNAL_ENV || 'production'\n\n  const apiHost = apiHosts[sanityEnv]\n\n  let token: string | undefined\n  if (requireUser) {\n    token = await getCliToken()\n    if (!token) {\n      throw new Error('You must login first - run \"sanity login\"')\n    }\n  }\n\n  return createClient({\n    ...(apiHost ? {apiHost} : {}),\n    requester,\n    requestTagPrefix: CLI_REQUEST_TAG_PREFIX,\n    token,\n    useCdn: false,\n    useProjectHostname: true,\n    ...config,\n  })\n}\n\n/**\n * `get-it` middleware that checks for 401 authentication errors and extends the error with more\n * helpful guidance on what to do next.\n *\n * @returns get-it middleware with `onError` handler\n * @internal\n */\nfunction authErrors() {\n  return {\n    onError: (err: Error | null) => {\n      if (!err || !isReqResError(err)) {\n        return err\n      }\n\n      const statusCode = isHttpError(err) && err.response.body.statusCode\n      if (statusCode === 401) {\n        err.message = `${err.message}. You may need to login again with ${ux.colorize('cyan', 'sanity login')}.\\nFor more information, see ${generateHelpUrl('cli-errors')}.`\n      }\n\n      return err\n    },\n  }\n}\n\nfunction isReqResError(err: Error): err is ClientError | ServerError {\n  return Object.prototype.hasOwnProperty.call(err, 'response')\n}\n"],"names":["ux","createClient","requester","defaultRequester","generateHelpUrl","isHttpError","getCliToken","apiHosts","staging","CLI_REQUEST_TAG_PREFIX","getGlobalCliClient","requireUser","config","clone","use","authErrors","sanityEnv","process","env","SANITY_INTERNAL_ENV","apiHost","token","Error","requestTagPrefix","useCdn","useProjectHostname","getProjectCliClient","onError","err","isReqResError","statusCode","response","body","message","colorize","Object","prototype","hasOwnProperty","call"],"mappings":"AAAA,SAAQA,EAAE,QAAO,cAAa;AAC9B,SAGEC,YAAY,EACZC,aAAaC,gBAAgB,QAGxB,iBAAgB;AAEvB,SAAQC,eAAe,QAAO,6BAA4B;AAC1D,SAAQC,WAAW,QAAO,yBAAwB;AAClD,SAAQC,WAAW,QAAO,mBAAkB;AAE5C,MAAMC,WAA+C;IACnDC,SAAS;AACX;AAEA,MAAMC,yBAAyB;AAmB/B;;;;;CAKC,GACD,OAAO,eAAeC,mBAAmB,EACvCC,WAAW,EACX,GAAGC,QACoB;IACvB,MAAMV,YAAYC,iBAAiBU,KAAK;IACxCX,UAAUY,GAAG,CAACC;IAEd,MAAMC,YAAYC,QAAQC,GAAG,CAACC,mBAAmB,IAAI;IAErD,MAAMC,UAAUb,QAAQ,CAACS,UAAU;IAEnC,IAAIK;IACJ,IAAIV,aAAa;QACfU,QAAQ,MAAMf;QACd,IAAI,CAACe,OAAO;YACV,MAAM,IAAIC,MAAM;QAClB;IACF;IAEA,OAAOrB,aAAa;QAClB,GAAImB,UAAU;YAACA;QAAO,IAAI,CAAC,CAAC;QAC5BlB;QACAqB,kBAAkBd;QAClBY;QACAG,QAAQ;QACRC,oBAAoB;QACpB,GAAGb,MAAM;IACX;AACF;AA6BA;;;;;CAKC,GACD,OAAO,eAAec,oBAAoB,EACxCf,WAAW,EACX,GAAGC,QACqB;IACxB,MAAMV,YAAYC,iBAAiBU,KAAK;IACxCX,UAAUY,GAAG,CAACC;IAEd,MAAMC,YAAYC,QAAQC,GAAG,CAACC,mBAAmB,IAAI;IAErD,MAAMC,UAAUb,QAAQ,CAACS,UAAU;IAEnC,IAAIK;IACJ,IAAIV,aAAa;QACfU,QAAQ,MAAMf;QACd,IAAI,CAACe,OAAO;YACV,MAAM,IAAIC,MAAM;QAClB;IACF;IAEA,OAAOrB,aAAa;QAClB,GAAImB,UAAU;YAACA;QAAO,IAAI,CAAC,CAAC;QAC5BlB;QACAqB,kBAAkBd;QAClBY;QACAG,QAAQ;QACRC,oBAAoB;QACpB,GAAGb,MAAM;IACX;AACF;AAEA;;;;;;CAMC,GACD,SAASG;IACP,OAAO;QACLY,SAAS,CAACC;YACR,IAAI,CAACA,OAAO,CAACC,cAAcD,MAAM;gBAC/B,OAAOA;YACT;YAEA,MAAME,aAAazB,YAAYuB,QAAQA,IAAIG,QAAQ,CAACC,IAAI,CAACF,UAAU;YACnE,IAAIA,eAAe,KAAK;gBACtBF,IAAIK,OAAO,GAAG,GAAGL,IAAIK,OAAO,CAAC,mCAAmC,EAAEjC,GAAGkC,QAAQ,CAAC,QAAQ,gBAAgB,6BAA6B,EAAE9B,gBAAgB,cAAc,CAAC,CAAC;YACvK;YAEA,OAAOwB;QACT;IACF;AACF;AAEA,SAASC,cAAcD,GAAU;IAC/B,OAAOO,OAAOC,SAAS,CAACC,cAAc,CAACC,IAAI,CAACV,KAAK;AACnD"}

package/dist/util/__tests__/createExpiringConfig.test.js

@@ -304,6 +304,97 @@ describe('createExpiringConfig', ()=>{
         expect(onFetch).toHaveBeenCalledOnce();
         expect(onCacheHit).toHaveBeenCalledOnce();
     });
+    test('throws when cached value fails validateValue', async ()=>{
+        const invalidCached = 123;
+        const ttl = 10_000;
+        const validateValue = vi.fn((v)=>typeof v === 'string');
+        const config = createExpiringConfig({
+            fetchValue,
+            key: 'test-key',
+            onCacheHit,
+            onFetch,
+            onRevalidate,
+            store: mockStore,
+            ttl,
+            // @ts-expect-error vitest mocks don't jive with assertions
+            validateValue
+        });
+        // Cached entry that is not expired but invalid per validateValue
+        vi.mocked(mockStore.get).mockReturnValue({
+            updatedAt: Date.now(),
+            value: invalidCached
+        });
+        await expect(config.get()).rejects.toThrow('Stored value is invalid');
+        expect(validateValue).toHaveBeenCalledOnce();
+        expect(onCacheHit).not.toHaveBeenCalled();
+        expect(onFetch).not.toHaveBeenCalled();
+        expect(onRevalidate).not.toHaveBeenCalled();
+        expect(mockStore.set).not.toHaveBeenCalled();
+    });
+    test('throws when fetched value fails validateValue (cache miss)', async ()=>{
+        const validateValue = vi.fn((v)=>typeof v === 'string');
+        const config = createExpiringConfig({
+            fetchValue: fetchValue.mockResolvedValue(42),
+            key: 'test-key',
+            onFetch,
+            store: mockStore,
+            ttl: 5000,
+            // @ts-expect-error vitest mocks don't jive with assertions
+            validateValue
+        });
+        // Empty cache
+        vi.mocked(mockStore.get).mockReturnValue(undefined);
+        await expect(config.get()).rejects.toThrow('Fetched value is invalid');
+        expect(onFetch).toHaveBeenCalledOnce();
+        expect(validateValue).toHaveBeenCalledOnce();
+        expect(mockStore.set).not.toHaveBeenCalled();
+    });
+    test('returns cached value when validateValue accepts it', async ()=>{
+        const cachedValue = 'ok';
+        const validateValue = vi.fn((v)=>typeof v === 'string');
+        const config = createExpiringConfig({
+            fetchValue,
+            key: 'test-key',
+            onCacheHit,
+            store: mockStore,
+            ttl: 5000,
+            // @ts-expect-error vitest mocks don't jive with assertions
+            validateValue
+        });
+        vi.mocked(mockStore.get).mockReturnValue({
+            updatedAt: Date.now(),
+            value: cachedValue
+        });
+        const result = await config.get();
+        expect(result).toBe(cachedValue);
+        expect(validateValue).toHaveBeenCalledOnce();
+        expect(onCacheHit).toHaveBeenCalledOnce();
+        expect(fetchValue).not.toHaveBeenCalled();
+    });
+    test('revalidation path validates fetched value and throws if invalid', async ()=>{
+        const validateValue = vi.fn((v)=>typeof v === 'string');
+        const config = createExpiringConfig({
+            fetchValue: fetchValue.mockResolvedValue(99),
+            key: 'test-key',
+            onFetch,
+            onRevalidate,
+            store: mockStore,
+            ttl: 1,
+            // @ts-expect-error vitest mocks don't jive with assertions
+            validateValue
+        });
+        // Cached value that has expired but is otherwise valid in shape and passes validate
+        vi.mocked(mockStore.get).mockReturnValue({
+            updatedAt: Date.now() - 10,
+            value: 'stale'
+        });
+        await expect(config.get()).rejects.toThrow('Fetched value is invalid');
+        expect(onRevalidate).toHaveBeenCalledOnce();
+        expect(onFetch).toHaveBeenCalledOnce();
+        // validateValue called for stored value and fetched value
+        expect(validateValue).toHaveBeenCalledTimes(2);
+        expect(mockStore.set).not.toHaveBeenCalled();
+    });
 });
 
 //# sourceMappingURL=createExpiringConfig.test.js.map

package/dist/util/__tests__/createExpiringConfig.test.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/util/__tests__/createExpiringConfig.test.ts"],"sourcesContent":["import type ConfigStore from 'configstore'\n\nimport {beforeEach, describe, expect, test, vi} from 'vitest'\n\nimport {createExpiringConfig} from '../createExpiringConfig.js'\n\ndescribe('createExpiringConfig', () => {\n  let mockStore: ConfigStore\n  let fetchValue: ReturnType<typeof vi.fn>\n  let onCacheHit: ReturnType<typeof vi.fn>\n  let onFetch: ReturnType<typeof vi.fn>\n  let onRevalidate: ReturnType<typeof vi.fn>\n\n  beforeEach(() => {\n    // Mock ConfigStore\n    mockStore = {\n      delete: vi.fn(),\n      get: vi.fn(),\n      set: vi.fn(),\n    } as unknown as ConfigStore\n\n    // Reset all mocks\n    fetchValue = vi.fn()\n    onCacheHit = vi.fn()\n    onFetch = vi.fn()\n    onRevalidate = vi.fn()\n  })\n\n  test('returns fetched value when cache is empty', async () => {\n    const testValue = 'test-value'\n    const config = createExpiringConfig({\n      fetchValue: fetchValue.mockResolvedValue(testValue),\n      key: 'test-key',\n      onCacheHit,\n      onFetch,\n      onRevalidate,\n      store: mockStore,\n      ttl: 5000,\n    })\n\n    // Mock empty cache\n    vi.mocked(mockStore.get).mockReturnValue(undefined)\n\n    const result = await config.get()\n\n    expect(result).toBe(testValue)\n    expect(fetchValue).toHaveBeenCalledOnce()\n    expect(onFetch).toHaveBeenCalledOnce()\n    expect(onCacheHit).not.toHaveBeenCalled()\n    expect(onRevalidate).not.toHaveBeenCalled()\n    expect(mockStore.set).toHaveBeenCalledWith('test-key', {\n      updatedAt: expect.any(Number),\n      value: testValue,\n    })\n  })\n\n  test('returns cached value when it has not expired', async () => {\n    const cachedValue = 'cached-value'\n    const ttl = 5000\n    const updatedAt = Date.now() - 1000 // 1 second ago (not expired)\n\n    const config = createExpiringConfig({\n      fetchValue,\n      key: 'test-key',\n      onCacheHit,\n      onFetch,\n      onRevalidate,\n      store: mockStore,\n      ttl,\n    })\n\n    // Mock cached value that hasn't expired\n    vi.mocked(mockStore.get).mockReturnValue({\n      updatedAt,\n      value: cachedValue,\n    })\n\n    const result = await config.get()\n\n    expect(result).toBe(cachedValue)\n    expect(fetchValue).not.toHaveBeenCalled()\n    expect(onCacheHit).toHaveBeenCalledOnce()\n    expect(onFetch).not.toHaveBeenCalled()\n    expect(onRevalidate).not.toHaveBeenCalled()\n    expect(mockStore.set).not.toHaveBeenCalled()\n  })\n\n  test('fetches new value when cached value has expired', async () => {\n    const newValue = 'new-value'\n    const ttl = 1000\n    const updatedAt = Date.now() - 2000 // 2 seconds ago (expired)\n\n    const config = createExpiringConfig({\n      fetchValue: fetchValue.mockResolvedValue(newValue),\n      key: 'test-key',\n      onCacheHit,\n      onFetch,\n      onRevalidate,\n      store: mockStore,\n      ttl,\n    })\n\n    // Mock expired cached value\n    vi.mocked(mockStore.get).mockReturnValue({\n      updatedAt,\n      value: 'old-value',\n    })\n\n    const result = await config.get()\n\n    expect(result).toBe(newValue)\n    expect(fetchValue).toHaveBeenCalledOnce()\n    expect(onRevalidate).toHaveBeenCalledOnce()\n    expect(onFetch).toHaveBeenCalledOnce()\n    expect(onCacheHit).not.toHaveBeenCalled()\n    expect(mockStore.set).toHaveBeenCalledWith('test-key', {\n      updatedAt: expect.any(Number),\n      value: newValue,\n    })\n  })\n\n  test('deletes cached value from store', () => {\n    const config = createExpiringConfig({\n      fetchValue,\n      key: 'test-key',\n      store: mockStore,\n      ttl: 5000,\n    })\n\n    config.delete()\n\n    expect(mockStore.delete).toHaveBeenCalledWith('test-key')\n  })\n\n  test('handles concurrent get() calls correctly', async () => {\n    const testValue = 'test-value'\n    let resolvePromise: (value: string) => void\n    const delayedFetch = new Promise<string>((resolve) => {\n      resolvePromise = resolve\n    })\n\n    const config = createExpiringConfig({\n      fetchValue: fetchValue.mockReturnValue(delayedFetch),\n      key: 'test-key',\n      onFetch,\n      store: mockStore,\n      ttl: 5000,\n    })\n\n    // Mock empty cache\n    vi.mocked(mockStore.get).mockReturnValue(undefined)\n\n    // Start multiple concurrent get() calls\n    const promise1 = config.get()\n    const promise2 = config.get()\n    const promise3 = config.get()\n\n    // Resolve the fetch\n    resolvePromise!(testValue)\n\n    const [result1, result2, result3] = await Promise.all([promise1, promise2, promise3])\n\n    expect(result1).toBe(testValue)\n    expect(result2).toBe(testValue)\n    expect(result3).toBe(testValue)\n    expect(fetchValue).toHaveBeenCalledOnce() // Only one fetch should happen\n    expect(onFetch).toHaveBeenCalledOnce()\n  })\n\n  test('handles synchronous fetchValue function', async () => {\n    const testValue = 'sync-value'\n    const syncFetchValue = vi.fn().mockReturnValue(testValue)\n\n    const config = createExpiringConfig({\n      fetchValue: syncFetchValue,\n      key: 'test-key',\n      store: mockStore,\n      ttl: 5000,\n    })\n\n    // Mock empty cache\n    vi.mocked(mockStore.get).mockReturnValue(undefined)\n\n    const result = await config.get()\n\n    expect(result).toBe(testValue)\n    expect(syncFetchValue).toHaveBeenCalledOnce()\n  })\n\n  test('handles fetchValue throwing an error', async () => {\n    const error = new Error('Fetch failed')\n    const config = createExpiringConfig({\n      fetchValue: fetchValue.mockRejectedValue(error),\n      key: 'test-key',\n      store: mockStore,\n      ttl: 5000,\n    })\n\n    // Mock empty cache\n    vi.mocked(mockStore.get).mockReturnValue(undefined)\n\n    await expect(config.get()).rejects.toThrow('Fetch failed')\n    expect(fetchValue).toHaveBeenCalledOnce()\n    expect(mockStore.set).not.toHaveBeenCalled()\n  })\n\n  test('handles different data types as cached values', async () => {\n    const objectValue = {key: 'value', number: 42}\n    const config = createExpiringConfig({\n      fetchValue: fetchValue.mockResolvedValue(objectValue),\n      key: 'test-key',\n      store: mockStore,\n      ttl: 5000,\n    })\n\n    // Mock empty cache\n    vi.mocked(mockStore.get).mockReturnValue(undefined)\n\n    const result = await config.get()\n\n    expect(result).toEqual(objectValue)\n    expect(mockStore.set).toHaveBeenCalledWith('test-key', {\n      updatedAt: expect.any(Number),\n      value: objectValue,\n    })\n  })\n\n  test('works with TTL of 0 (immediate expiration)', async () => {\n    const testValue = 'test-value'\n    const config = createExpiringConfig({\n      fetchValue: fetchValue.mockResolvedValue(testValue),\n      key: 'test-key',\n      onRevalidate,\n      store: mockStore,\n      ttl: 0,\n    })\n\n    // Mock cached value that would be immediately expired\n    // Use a timestamp from 1ms ago to ensure it's > ttl (0)\n    vi.mocked(mockStore.get).mockReturnValue({\n      updatedAt: Date.now() - 1,\n      value: 'old-value',\n    })\n\n    const result = await config.get()\n\n    expect(result).toBe(testValue)\n    expect(fetchValue).toHaveBeenCalledOnce()\n    expect(onRevalidate).toHaveBeenCalledOnce()\n  })\n\n  test('works without optional callback functions', async () => {\n    const testValue = 'test-value'\n    const config = createExpiringConfig({\n      fetchValue: fetchValue.mockResolvedValue(testValue),\n      key: 'test-key',\n      store: mockStore,\n      ttl: 5000,\n    })\n\n    // Mock empty cache\n    vi.mocked(mockStore.get).mockReturnValue(undefined)\n\n    const result = await config.get()\n\n    expect(result).toBe(testValue)\n    expect(fetchValue).toHaveBeenCalledOnce()\n  })\n\n  test('handles cached value without updatedAt timestamp', async () => {\n    const newValue = 'new-value'\n    const config = createExpiringConfig({\n      fetchValue: fetchValue.mockResolvedValue(newValue),\n      key: 'test-key',\n      onFetch,\n      store: mockStore,\n      ttl: 5000,\n    })\n\n    // Mock cached value without updatedAt (invalid cache entry)\n    vi.mocked(mockStore.get).mockReturnValue({\n      value: 'old-value',\n      // updatedAt is missing\n    })\n\n    const result = await config.get()\n\n    expect(result).toBe(newValue)\n    expect(fetchValue).toHaveBeenCalledOnce()\n    expect(onFetch).toHaveBeenCalledOnce()\n  })\n\n  test('handles cached value without value property', async () => {\n    const newValue = 'new-value'\n    const config = createExpiringConfig({\n      fetchValue: fetchValue.mockResolvedValue(newValue),\n      key: 'test-key',\n      onFetch,\n      store: mockStore,\n      ttl: 5000,\n    })\n\n    // Mock cached entry without value property\n    vi.mocked(mockStore.get).mockReturnValue({\n      updatedAt: Date.now(),\n      // value is missing\n    })\n\n    const result = await config.get()\n\n    expect(result).toBe(newValue)\n    expect(fetchValue).toHaveBeenCalledOnce()\n    expect(onFetch).toHaveBeenCalledOnce()\n  })\n\n  test('stores timestamp correctly when caching new values', async () => {\n    const testValue = 'test-value'\n\n    const config = createExpiringConfig({\n      fetchValue: fetchValue.mockResolvedValue(testValue),\n      key: 'test-key',\n      store: mockStore,\n      ttl: 5000,\n    })\n\n    // Mock empty cache\n    vi.mocked(mockStore.get).mockReturnValue(undefined)\n\n    await config.get()\n\n    expect(mockStore.set).toHaveBeenCalledWith('test-key', {\n      updatedAt: expect.any(Number),\n      value: testValue,\n    })\n  })\n\n  test('subsequent requests after cache is populated use cached value', async () => {\n    const testValue = 'test-value'\n    const config = createExpiringConfig({\n      fetchValue: fetchValue.mockResolvedValue(testValue),\n      key: 'test-key',\n      onCacheHit,\n      onFetch,\n      store: mockStore,\n      ttl: 5000,\n    })\n\n    // Mock empty cache for first request\n    vi.mocked(mockStore.get).mockReturnValueOnce(undefined)\n\n    // First request should fetch\n    const result1 = await config.get()\n\n    // Mock cache populated for subsequent request\n    vi.mocked(mockStore.get).mockReturnValueOnce({\n      updatedAt: Date.now(),\n      value: testValue,\n    })\n\n    // Second request should hit cache\n    const result2 = await config.get()\n\n    expect(result1).toBe(testValue)\n    expect(result2).toBe(testValue)\n    expect(fetchValue).toHaveBeenCalledOnce()\n    expect(onFetch).toHaveBeenCalledOnce()\n    expect(onCacheHit).toHaveBeenCalledOnce()\n  })\n})\n"],"names":["beforeEach","describe","expect","test","vi","createExpiringConfig","mockStore","fetchValue","onCacheHit","onFetch","onRevalidate","delete","fn","get","set","testValue","config","mockResolvedValue","key","store","ttl","mocked","mockReturnValue","undefined","result","toBe","toHaveBeenCalledOnce","not","toHaveBeenCalled","toHaveBeenCalledWith","updatedAt","any","Number","value","cachedValue","Date","now","newValue","resolvePromise","delayedFetch","Promise","resolve","promise1","promise2","promise3","result1","result2","result3","all","syncFetchValue","error","Error","mockRejectedValue","rejects","toThrow","objectValue","number","toEqual","mockReturnValueOnce"],"mappings":"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"}
+{"version":3,"sources":["../../../src/util/__tests__/createExpiringConfig.test.ts"],"sourcesContent":["import type ConfigStore from 'configstore'\n\nimport {beforeEach, describe, expect, test, vi} from 'vitest'\n\nimport {createExpiringConfig} from '../createExpiringConfig.js'\n\ndescribe('createExpiringConfig', () => {\n  let mockStore: ConfigStore\n  let fetchValue: ReturnType<typeof vi.fn>\n  let onCacheHit: ReturnType<typeof vi.fn>\n  let onFetch: ReturnType<typeof vi.fn>\n  let onRevalidate: ReturnType<typeof vi.fn>\n\n  beforeEach(() => {\n    // Mock ConfigStore\n    mockStore = {\n      delete: vi.fn(),\n      get: vi.fn(),\n      set: vi.fn(),\n    } as unknown as ConfigStore\n\n    // Reset all mocks\n    fetchValue = vi.fn()\n    onCacheHit = vi.fn()\n    onFetch = vi.fn()\n    onRevalidate = vi.fn()\n  })\n\n  test('returns fetched value when cache is empty', async () => {\n    const testValue = 'test-value'\n    const config = createExpiringConfig({\n      fetchValue: fetchValue.mockResolvedValue(testValue),\n      key: 'test-key',\n      onCacheHit,\n      onFetch,\n      onRevalidate,\n      store: mockStore,\n      ttl: 5000,\n    })\n\n    // Mock empty cache\n    vi.mocked(mockStore.get).mockReturnValue(undefined)\n\n    const result = await config.get()\n\n    expect(result).toBe(testValue)\n    expect(fetchValue).toHaveBeenCalledOnce()\n    expect(onFetch).toHaveBeenCalledOnce()\n    expect(onCacheHit).not.toHaveBeenCalled()\n    expect(onRevalidate).not.toHaveBeenCalled()\n    expect(mockStore.set).toHaveBeenCalledWith('test-key', {\n      updatedAt: expect.any(Number),\n      value: testValue,\n    })\n  })\n\n  test('returns cached value when it has not expired', async () => {\n    const cachedValue = 'cached-value'\n    const ttl = 5000\n    const updatedAt = Date.now() - 1000 // 1 second ago (not expired)\n\n    const config = createExpiringConfig({\n      fetchValue,\n      key: 'test-key',\n      onCacheHit,\n      onFetch,\n      onRevalidate,\n      store: mockStore,\n      ttl,\n    })\n\n    // Mock cached value that hasn't expired\n    vi.mocked(mockStore.get).mockReturnValue({\n      updatedAt,\n      value: cachedValue,\n    })\n\n    const result = await config.get()\n\n    expect(result).toBe(cachedValue)\n    expect(fetchValue).not.toHaveBeenCalled()\n    expect(onCacheHit).toHaveBeenCalledOnce()\n    expect(onFetch).not.toHaveBeenCalled()\n    expect(onRevalidate).not.toHaveBeenCalled()\n    expect(mockStore.set).not.toHaveBeenCalled()\n  })\n\n  test('fetches new value when cached value has expired', async () => {\n    const newValue = 'new-value'\n    const ttl = 1000\n    const updatedAt = Date.now() - 2000 // 2 seconds ago (expired)\n\n    const config = createExpiringConfig({\n      fetchValue: fetchValue.mockResolvedValue(newValue),\n      key: 'test-key',\n      onCacheHit,\n      onFetch,\n      onRevalidate,\n      store: mockStore,\n      ttl,\n    })\n\n    // Mock expired cached value\n    vi.mocked(mockStore.get).mockReturnValue({\n      updatedAt,\n      value: 'old-value',\n    })\n\n    const result = await config.get()\n\n    expect(result).toBe(newValue)\n    expect(fetchValue).toHaveBeenCalledOnce()\n    expect(onRevalidate).toHaveBeenCalledOnce()\n    expect(onFetch).toHaveBeenCalledOnce()\n    expect(onCacheHit).not.toHaveBeenCalled()\n    expect(mockStore.set).toHaveBeenCalledWith('test-key', {\n      updatedAt: expect.any(Number),\n      value: newValue,\n    })\n  })\n\n  test('deletes cached value from store', () => {\n    const config = createExpiringConfig({\n      fetchValue,\n      key: 'test-key',\n      store: mockStore,\n      ttl: 5000,\n    })\n\n    config.delete()\n\n    expect(mockStore.delete).toHaveBeenCalledWith('test-key')\n  })\n\n  test('handles concurrent get() calls correctly', async () => {\n    const testValue = 'test-value'\n    let resolvePromise: (value: string) => void\n    const delayedFetch = new Promise<string>((resolve) => {\n      resolvePromise = resolve\n    })\n\n    const config = createExpiringConfig({\n      fetchValue: fetchValue.mockReturnValue(delayedFetch),\n      key: 'test-key',\n      onFetch,\n      store: mockStore,\n      ttl: 5000,\n    })\n\n    // Mock empty cache\n    vi.mocked(mockStore.get).mockReturnValue(undefined)\n\n    // Start multiple concurrent get() calls\n    const promise1 = config.get()\n    const promise2 = config.get()\n    const promise3 = config.get()\n\n    // Resolve the fetch\n    resolvePromise!(testValue)\n\n    const [result1, result2, result3] = await Promise.all([promise1, promise2, promise3])\n\n    expect(result1).toBe(testValue)\n    expect(result2).toBe(testValue)\n    expect(result3).toBe(testValue)\n    expect(fetchValue).toHaveBeenCalledOnce() // Only one fetch should happen\n    expect(onFetch).toHaveBeenCalledOnce()\n  })\n\n  test('handles synchronous fetchValue function', async () => {\n    const testValue = 'sync-value'\n    const syncFetchValue = vi.fn().mockReturnValue(testValue)\n\n    const config = createExpiringConfig({\n      fetchValue: syncFetchValue,\n      key: 'test-key',\n      store: mockStore,\n      ttl: 5000,\n    })\n\n    // Mock empty cache\n    vi.mocked(mockStore.get).mockReturnValue(undefined)\n\n    const result = await config.get()\n\n    expect(result).toBe(testValue)\n    expect(syncFetchValue).toHaveBeenCalledOnce()\n  })\n\n  test('handles fetchValue throwing an error', async () => {\n    const error = new Error('Fetch failed')\n    const config = createExpiringConfig({\n      fetchValue: fetchValue.mockRejectedValue(error),\n      key: 'test-key',\n      store: mockStore,\n      ttl: 5000,\n    })\n\n    // Mock empty cache\n    vi.mocked(mockStore.get).mockReturnValue(undefined)\n\n    await expect(config.get()).rejects.toThrow('Fetch failed')\n    expect(fetchValue).toHaveBeenCalledOnce()\n    expect(mockStore.set).not.toHaveBeenCalled()\n  })\n\n  test('handles different data types as cached values', async () => {\n    const objectValue = {key: 'value', number: 42}\n    const config = createExpiringConfig({\n      fetchValue: fetchValue.mockResolvedValue(objectValue),\n      key: 'test-key',\n      store: mockStore,\n      ttl: 5000,\n    })\n\n    // Mock empty cache\n    vi.mocked(mockStore.get).mockReturnValue(undefined)\n\n    const result = await config.get()\n\n    expect(result).toEqual(objectValue)\n    expect(mockStore.set).toHaveBeenCalledWith('test-key', {\n      updatedAt: expect.any(Number),\n      value: objectValue,\n    })\n  })\n\n  test('works with TTL of 0 (immediate expiration)', async () => {\n    const testValue = 'test-value'\n    const config = createExpiringConfig({\n      fetchValue: fetchValue.mockResolvedValue(testValue),\n      key: 'test-key',\n      onRevalidate,\n      store: mockStore,\n      ttl: 0,\n    })\n\n    // Mock cached value that would be immediately expired\n    // Use a timestamp from 1ms ago to ensure it's > ttl (0)\n    vi.mocked(mockStore.get).mockReturnValue({\n      updatedAt: Date.now() - 1,\n      value: 'old-value',\n    })\n\n    const result = await config.get()\n\n    expect(result).toBe(testValue)\n    expect(fetchValue).toHaveBeenCalledOnce()\n    expect(onRevalidate).toHaveBeenCalledOnce()\n  })\n\n  test('works without optional callback functions', async () => {\n    const testValue = 'test-value'\n    const config = createExpiringConfig({\n      fetchValue: fetchValue.mockResolvedValue(testValue),\n      key: 'test-key',\n      store: mockStore,\n      ttl: 5000,\n    })\n\n    // Mock empty cache\n    vi.mocked(mockStore.get).mockReturnValue(undefined)\n\n    const result = await config.get()\n\n    expect(result).toBe(testValue)\n    expect(fetchValue).toHaveBeenCalledOnce()\n  })\n\n  test('handles cached value without updatedAt timestamp', async () => {\n    const newValue = 'new-value'\n    const config = createExpiringConfig({\n      fetchValue: fetchValue.mockResolvedValue(newValue),\n      key: 'test-key',\n      onFetch,\n      store: mockStore,\n      ttl: 5000,\n    })\n\n    // Mock cached value without updatedAt (invalid cache entry)\n    vi.mocked(mockStore.get).mockReturnValue({\n      value: 'old-value',\n      // updatedAt is missing\n    })\n\n    const result = await config.get()\n\n    expect(result).toBe(newValue)\n    expect(fetchValue).toHaveBeenCalledOnce()\n    expect(onFetch).toHaveBeenCalledOnce()\n  })\n\n  test('handles cached value without value property', async () => {\n    const newValue = 'new-value'\n    const config = createExpiringConfig({\n      fetchValue: fetchValue.mockResolvedValue(newValue),\n      key: 'test-key',\n      onFetch,\n      store: mockStore,\n      ttl: 5000,\n    })\n\n    // Mock cached entry without value property\n    vi.mocked(mockStore.get).mockReturnValue({\n      updatedAt: Date.now(),\n      // value is missing\n    })\n\n    const result = await config.get()\n\n    expect(result).toBe(newValue)\n    expect(fetchValue).toHaveBeenCalledOnce()\n    expect(onFetch).toHaveBeenCalledOnce()\n  })\n\n  test('stores timestamp correctly when caching new values', async () => {\n    const testValue = 'test-value'\n\n    const config = createExpiringConfig({\n      fetchValue: fetchValue.mockResolvedValue(testValue),\n      key: 'test-key',\n      store: mockStore,\n      ttl: 5000,\n    })\n\n    // Mock empty cache\n    vi.mocked(mockStore.get).mockReturnValue(undefined)\n\n    await config.get()\n\n    expect(mockStore.set).toHaveBeenCalledWith('test-key', {\n      updatedAt: expect.any(Number),\n      value: testValue,\n    })\n  })\n\n  test('subsequent requests after cache is populated use cached value', async () => {\n    const testValue = 'test-value'\n    const config = createExpiringConfig({\n      fetchValue: fetchValue.mockResolvedValue(testValue),\n      key: 'test-key',\n      onCacheHit,\n      onFetch,\n      store: mockStore,\n      ttl: 5000,\n    })\n\n    // Mock empty cache for first request\n    vi.mocked(mockStore.get).mockReturnValueOnce(undefined)\n\n    // First request should fetch\n    const result1 = await config.get()\n\n    // Mock cache populated for subsequent request\n    vi.mocked(mockStore.get).mockReturnValueOnce({\n      updatedAt: Date.now(),\n      value: testValue,\n    })\n\n    // Second request should hit cache\n    const result2 = await config.get()\n\n    expect(result1).toBe(testValue)\n    expect(result2).toBe(testValue)\n    expect(fetchValue).toHaveBeenCalledOnce()\n    expect(onFetch).toHaveBeenCalledOnce()\n    expect(onCacheHit).toHaveBeenCalledOnce()\n  })\n\n  test('throws when cached value fails validateValue', async () => {\n    const invalidCached = 123\n    const ttl = 10_000\n\n    const validateValue = vi.fn((v: unknown): v is string => typeof v === 'string')\n\n    const config = createExpiringConfig<string>({\n      fetchValue,\n      key: 'test-key',\n      onCacheHit,\n      onFetch,\n      onRevalidate,\n      store: mockStore,\n      ttl,\n      // @ts-expect-error vitest mocks don't jive with assertions\n      validateValue,\n    })\n\n    // Cached entry that is not expired but invalid per validateValue\n    vi.mocked(mockStore.get).mockReturnValue({\n      updatedAt: Date.now(),\n      value: invalidCached,\n    })\n\n    await expect(config.get()).rejects.toThrow('Stored value is invalid')\n    expect(validateValue).toHaveBeenCalledOnce()\n    expect(onCacheHit).not.toHaveBeenCalled()\n    expect(onFetch).not.toHaveBeenCalled()\n    expect(onRevalidate).not.toHaveBeenCalled()\n    expect(mockStore.set).not.toHaveBeenCalled()\n  })\n\n  test('throws when fetched value fails validateValue (cache miss)', async () => {\n    const validateValue = vi.fn((v: unknown): v is string => typeof v === 'string')\n    const config = createExpiringConfig<string>({\n      fetchValue: fetchValue.mockResolvedValue(42 as unknown as string),\n      key: 'test-key',\n      onFetch,\n      store: mockStore,\n      ttl: 5000,\n      // @ts-expect-error vitest mocks don't jive with assertions\n      validateValue,\n    })\n\n    // Empty cache\n    vi.mocked(mockStore.get).mockReturnValue(undefined)\n\n    await expect(config.get()).rejects.toThrow('Fetched value is invalid')\n    expect(onFetch).toHaveBeenCalledOnce()\n    expect(validateValue).toHaveBeenCalledOnce()\n    expect(mockStore.set).not.toHaveBeenCalled()\n  })\n\n  test('returns cached value when validateValue accepts it', async () => {\n    const cachedValue = 'ok'\n    const validateValue = vi.fn((v: unknown): v is string => typeof v === 'string')\n    const config = createExpiringConfig<string>({\n      fetchValue,\n      key: 'test-key',\n      onCacheHit,\n      store: mockStore,\n      ttl: 5000,\n      // @ts-expect-error vitest mocks don't jive with assertions\n      validateValue,\n    })\n\n    vi.mocked(mockStore.get).mockReturnValue({\n      updatedAt: Date.now(),\n      value: cachedValue,\n    })\n\n    const result = await config.get()\n\n    expect(result).toBe(cachedValue)\n    expect(validateValue).toHaveBeenCalledOnce()\n    expect(onCacheHit).toHaveBeenCalledOnce()\n    expect(fetchValue).not.toHaveBeenCalled()\n  })\n\n  test('revalidation path validates fetched value and throws if invalid', async () => {\n    const validateValue = vi.fn((v: unknown): v is string => typeof v === 'string')\n    const config = createExpiringConfig<string>({\n      fetchValue: fetchValue.mockResolvedValue(99 as unknown as string),\n      key: 'test-key',\n      onFetch,\n      onRevalidate,\n      store: mockStore,\n      ttl: 1, // ensure expiration\n      // @ts-expect-error vitest mocks don't jive with assertions\n      validateValue,\n    })\n\n    // Cached value that has expired but is otherwise valid in shape and passes validate\n    vi.mocked(mockStore.get).mockReturnValue({\n      updatedAt: Date.now() - 10,\n      value: 'stale',\n    })\n\n    await expect(config.get()).rejects.toThrow('Fetched value is invalid')\n    expect(onRevalidate).toHaveBeenCalledOnce()\n    expect(onFetch).toHaveBeenCalledOnce()\n    // validateValue called for stored value and fetched value\n    expect(validateValue).toHaveBeenCalledTimes(2)\n    expect(mockStore.set).not.toHaveBeenCalled()\n  })\n})\n"],"names":["beforeEach","describe","expect","test","vi","createExpiringConfig","mockStore","fetchValue","onCacheHit","onFetch","onRevalidate","delete","fn","get","set","testValue","config","mockResolvedValue","key","store","ttl","mocked","mockReturnValue","undefined","result","toBe","toHaveBeenCalledOnce","not","toHaveBeenCalled","toHaveBeenCalledWith","updatedAt","any","Number","value","cachedValue","Date","now","newValue","resolvePromise","delayedFetch","Promise","resolve","promise1","promise2","promise3","result1","result2","result3","all","syncFetchValue","error","Error","mockRejectedValue","rejects","toThrow","objectValue","number","toEqual","mockReturnValueOnce","invalidCached","validateValue","v","toHaveBeenCalledTimes"],"mappings":"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"}

package/dist/util/createExpiringConfig.d.ts

@@ -14,6 +14,11 @@ export interface ExpiringConfigOptions<Type> {
     onFetch?: () => void;
     /** Subscribe to revalidate event */
     onRevalidate?: () => void;
+    /**
+     * Assert the fetched value is valid, or throw if invalid.
+     * If none is provided, it will always accept the fetched value.
+     */
+    validateValue?: (value: unknown) => value is Type;
 }
 export interface ExpiringConfigApi<Type> {
     /**
@@ -29,4 +34,4 @@ export interface ExpiringConfigApi<Type> {
 /**
  * Create a config in the provided config store that expires after the provided TTL.
  */
-export declare function createExpiringConfig<Type>({ fetchValue, key, onCacheHit, onFetch, onRevalidate, store, ttl, }: ExpiringConfigOptions<Type>): ExpiringConfigApi<Type>;
+export declare function createExpiringConfig<Type>({ fetchValue, key, onCacheHit, onFetch, onRevalidate, store, ttl, validateValue, }: ExpiringConfigOptions<Type>): ExpiringConfigApi<Type>;

package/dist/util/createExpiringConfig.js

@@ -1,14 +1,18 @@
 /**
  * Create a config in the provided config store that expires after the provided TTL.
- */ export function createExpiringConfig({ fetchValue, key, onCacheHit = ()=>null, onFetch = ()=>null, onRevalidate = ()=>null, store, ttl }) {
+ */ export function createExpiringConfig({ fetchValue, key, onCacheHit = ()=>null, onFetch = ()=>null, onRevalidate = ()=>null, store, ttl, validateValue = (value)=>true }) {
     let currentFetch = null;
     return {
         delete () {
             store.delete(key);
         },
         async get () {
-            const { updatedAt, value } = store.get(key) ?? {};
-            if (value && updatedAt) {
+            const stored = store.get(key);
+            if (isExpiringValue(stored)) {
+                const { updatedAt, value } = stored;
+                if (!validateValue(value)) {
+                    throw new Error('Stored value is invalid');
+                }
                 const hasExpired = Date.now() - updatedAt > ttl;
                 if (!hasExpired) {
                     onCacheHit();
@@ -22,6 +26,9 @@
             onFetch();
             currentFetch = Promise.resolve(fetchValue());
             const nextValue = await currentFetch;
+            if (!validateValue(nextValue)) {
+                throw new Error('Fetched value is invalid');
+            }
             currentFetch = null;
             store.set(key, {
                 updatedAt: Date.now(),
@@ -31,5 +38,23 @@
         }
     };
 }
+/**
+ * Checks if the given stored value is valid (does not check if expired, only verified shape)
+ *
+ * @param stored - The stored value to check
+ * @returns True if the stored value is valid
+ * @internal
+ */ function isExpiringValue(stored) {
+    if (typeof stored !== 'object' || stored === null || Array.isArray(stored)) {
+        return false;
+    }
+    if (!('updatedAt' in stored) || typeof stored.updatedAt !== 'number') {
+        return false;
+    }
+    if (!('value' in stored)) {
+        return false;
+    }
+    return true;
+}
 
 //# sourceMappingURL=createExpiringConfig.js.map

package/dist/util/createExpiringConfig.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/util/createExpiringConfig.ts"],"sourcesContent":["import type ConfigStore from 'configstore'\n\nexport interface ExpiringConfigOptions<Type> {\n  /** Fetch value */\n  fetchValue: () => Promise<Type> | Type\n  /** Config key */\n  key: string\n  /** Config store */\n  store: ConfigStore\n  /** TTL (milliseconds) */\n  ttl: number\n\n  /** Subscribe to cache hit event */\n  onCacheHit?: () => void\n  /** Subscribe to fetch event */\n  onFetch?: () => void\n  /** Subscribe to revalidate event */\n  onRevalidate?: () => void\n}\n\nexport interface ExpiringConfigApi<Type> {\n  /**\n   * Delete the cached value.\n   */\n  delete: () => void\n  /**\n   * Attempt to get the cached value. If there is no cached value, or the cached value has expired,\n   * fetch, cache, and return the value.\n   */\n  get: () => Promise<Type>\n}\n\n/**\n * Create a config in the provided config store that expires after the provided TTL.\n */\nexport function createExpiringConfig<Type>({\n  fetchValue,\n  key,\n  onCacheHit = () => null,\n  onFetch = () => null,\n  onRevalidate = () => null,\n  store,\n  ttl,\n}: ExpiringConfigOptions<Type>): ExpiringConfigApi<Type> {\n  let currentFetch: Promise<Type> | null = null\n  return {\n    delete() {\n      store.delete(key)\n    },\n    async get() {\n      const {updatedAt, value} = store.get(key) ?? {}\n\n      if (value && updatedAt) {\n        const hasExpired = Date.now() - updatedAt > ttl\n\n        if (!hasExpired) {\n          onCacheHit()\n          return value\n        }\n\n        onRevalidate()\n      }\n\n      if (currentFetch) {\n        return currentFetch\n      }\n      onFetch()\n\n      currentFetch = Promise.resolve(fetchValue())\n      const nextValue = await currentFetch\n      currentFetch = null\n\n      store.set(key, {\n        updatedAt: Date.now(),\n        value: nextValue,\n      })\n\n      return nextValue\n    },\n  }\n}\n"],"names":["createExpiringConfig","fetchValue","key","onCacheHit","onFetch","onRevalidate","store","ttl","currentFetch","delete","get","updatedAt","value","hasExpired","Date","now","Promise","resolve","nextValue","set"],"mappings":"AAgCA;;CAEC,GACD,OAAO,SAASA,qBAA2B,EACzCC,UAAU,EACVC,GAAG,EACHC,aAAa,IAAM,IAAI,EACvBC,UAAU,IAAM,IAAI,EACpBC,eAAe,IAAM,IAAI,EACzBC,KAAK,EACLC,GAAG,EACyB;IAC5B,IAAIC,eAAqC;IACzC,OAAO;QACLC;YACEH,MAAMG,MAAM,CAACP;QACf;QACA,MAAMQ;YACJ,MAAM,EAACC,SAAS,EAAEC,KAAK,EAAC,GAAGN,MAAMI,GAAG,CAACR,QAAQ,CAAC;YAE9C,IAAIU,SAASD,WAAW;gBACtB,MAAME,aAAaC,KAAKC,GAAG,KAAKJ,YAAYJ;gBAE5C,IAAI,CAACM,YAAY;oBACfV;oBACA,OAAOS;gBACT;gBAEAP;YACF;YAEA,IAAIG,cAAc;gBAChB,OAAOA;YACT;YACAJ;YAEAI,eAAeQ,QAAQC,OAAO,CAAChB;YAC/B,MAAMiB,YAAY,MAAMV;YACxBA,eAAe;YAEfF,MAAMa,GAAG,CAACjB,KAAK;gBACbS,WAAWG,KAAKC,GAAG;gBACnBH,OAAOM;YACT;YAEA,OAAOA;QACT;IACF;AACF"}
+{"version":3,"sources":["../../src/util/createExpiringConfig.ts"],"sourcesContent":["import type ConfigStore from 'configstore'\n\ninterface ExpiringConfigValue {\n  updatedAt: number\n  value: unknown\n}\n\nexport interface ExpiringConfigOptions<Type> {\n  /** Fetch value */\n  fetchValue: () => Promise<Type> | Type\n  /** Config key */\n  key: string\n  /** Config store */\n  store: ConfigStore\n  /** TTL (milliseconds) */\n  ttl: number\n\n  /** Subscribe to cache hit event */\n  onCacheHit?: () => void\n  /** Subscribe to fetch event */\n  onFetch?: () => void\n  /** Subscribe to revalidate event */\n  onRevalidate?: () => void\n\n  /**\n   * Assert the fetched value is valid, or throw if invalid.\n   * If none is provided, it will always accept the fetched value.\n   */\n  validateValue?: (value: unknown) => value is Type\n}\n\nexport interface ExpiringConfigApi<Type> {\n  /**\n   * Delete the cached value.\n   */\n  delete: () => void\n  /**\n   * Attempt to get the cached value. If there is no cached value, or the cached value has expired,\n   * fetch, cache, and return the value.\n   */\n  get: () => Promise<Type>\n}\n\n/**\n * Create a config in the provided config store that expires after the provided TTL.\n */\nexport function createExpiringConfig<Type>({\n  fetchValue,\n  key,\n  onCacheHit = () => null,\n  onFetch = () => null,\n  onRevalidate = () => null,\n  store,\n  ttl,\n  validateValue = (value: unknown): value is Type => true,\n}: ExpiringConfigOptions<Type>): ExpiringConfigApi<Type> {\n  let currentFetch: Promise<Type> | null = null\n  return {\n    delete() {\n      store.delete(key)\n    },\n    async get(): Promise<Type> {\n      const stored = store.get(key)\n\n      if (isExpiringValue(stored)) {\n        const {updatedAt, value} = stored\n        if (!validateValue(value)) {\n          throw new Error('Stored value is invalid')\n        }\n\n        const hasExpired = Date.now() - updatedAt > ttl\n\n        if (!hasExpired) {\n          onCacheHit()\n          return value\n        }\n\n        onRevalidate()\n      }\n\n      if (currentFetch) {\n        return currentFetch\n      }\n      onFetch()\n\n      currentFetch = Promise.resolve(fetchValue())\n      const nextValue = await currentFetch\n      if (!validateValue(nextValue)) {\n        throw new Error('Fetched value is invalid')\n      }\n\n      currentFetch = null\n\n      store.set(key, {\n        updatedAt: Date.now(),\n        value: nextValue,\n      })\n\n      return nextValue\n    },\n  }\n}\n\n/**\n * Checks if the given stored value is valid (does not check if expired, only verified shape)\n *\n * @param stored - The stored value to check\n * @returns True if the stored value is valid\n * @internal\n */\nfunction isExpiringValue(stored: unknown): stored is ExpiringConfigValue {\n  if (typeof stored !== 'object' || stored === null || Array.isArray(stored)) {\n    return false\n  }\n\n  if (!('updatedAt' in stored) || typeof stored.updatedAt !== 'number') {\n    return false\n  }\n\n  if (!('value' in stored)) {\n    return false\n  }\n\n  return true\n}\n"],"names":["createExpiringConfig","fetchValue","key","onCacheHit","onFetch","onRevalidate","store","ttl","validateValue","value","currentFetch","delete","get","stored","isExpiringValue","updatedAt","Error","hasExpired","Date","now","Promise","resolve","nextValue","set","Array","isArray"],"mappings":"AA2CA;;CAEC,GACD,OAAO,SAASA,qBAA2B,EACzCC,UAAU,EACVC,GAAG,EACHC,aAAa,IAAM,IAAI,EACvBC,UAAU,IAAM,IAAI,EACpBC,eAAe,IAAM,IAAI,EACzBC,KAAK,EACLC,GAAG,EACHC,gBAAgB,CAACC,QAAkC,IAAI,EAC3B;IAC5B,IAAIC,eAAqC;IACzC,OAAO;QACLC;YACEL,MAAMK,MAAM,CAACT;QACf;QACA,MAAMU;YACJ,MAAMC,SAASP,MAAMM,GAAG,CAACV;YAEzB,IAAIY,gBAAgBD,SAAS;gBAC3B,MAAM,EAACE,SAAS,EAAEN,KAAK,EAAC,GAAGI;gBAC3B,IAAI,CAACL,cAAcC,QAAQ;oBACzB,MAAM,IAAIO,MAAM;gBAClB;gBAEA,MAAMC,aAAaC,KAAKC,GAAG,KAAKJ,YAAYR;gBAE5C,IAAI,CAACU,YAAY;oBACfd;oBACA,OAAOM;gBACT;gBAEAJ;YACF;YAEA,IAAIK,cAAc;gBAChB,OAAOA;YACT;YACAN;YAEAM,eAAeU,QAAQC,OAAO,CAACpB;YAC/B,MAAMqB,YAAY,MAAMZ;YACxB,IAAI,CAACF,cAAcc,YAAY;gBAC7B,MAAM,IAAIN,MAAM;YAClB;YAEAN,eAAe;YAEfJ,MAAMiB,GAAG,CAACrB,KAAK;gBACba,WAAWG,KAAKC,GAAG;gBACnBV,OAAOa;YACT;YAEA,OAAOA;QACT;IACF;AACF;AAEA;;;;;;CAMC,GACD,SAASR,gBAAgBD,MAAe;IACtC,IAAI,OAAOA,WAAW,YAAYA,WAAW,QAAQW,MAAMC,OAAO,CAACZ,SAAS;QAC1E,OAAO;IACT;IAEA,IAAI,CAAE,CAAA,eAAeA,MAAK,KAAM,OAAOA,OAAOE,SAAS,KAAK,UAAU;QACpE,OAAO;IACT;IAEA,IAAI,CAAE,CAAA,WAAWF,MAAK,GAAI;QACxB,OAAO;IACT;IAEA,OAAO;AACT"}

package/dist/util/environment/getStudioEnvironmentVariables.d.ts

@@ -0,0 +1,12 @@
+/**
+ * Loads the `getStudioEnvironmentVariables` function from the studio's
+ * installed `sanity` package and returns the environment variables.
+ *
+ * This is used to ensure we're using the same version of environment variable
+ * logic as the studio itself.
+ *
+ * @param rootPath - The root path of the Sanity Studio project
+ * @returns Object containing studio environment variables
+ * @internal
+ */
+export declare function getStudioEnvironmentVariables(rootPath: string): Promise<Record<string, string>>;

package/dist/util/environment/getStudioEnvironmentVariables.js

@@ -0,0 +1,33 @@
+import { resolve } from 'node:path';
+import { pathToFileURL } from 'node:url';
+import { moduleResolve } from 'import-meta-resolve';
+/**
+ * Loads the `getStudioEnvironmentVariables` function from the studio's
+ * installed `sanity` package and returns the environment variables.
+ *
+ * This is used to ensure we're using the same version of environment variable
+ * logic as the studio itself.
+ *
+ * @param rootPath - The root path of the Sanity Studio project
+ * @returns Object containing studio environment variables
+ * @internal
+ */ export async function getStudioEnvironmentVariables(rootPath) {
+    // Create a fake config URL - doesn't have to be correct, just need the root path
+    const fakeConfigUrl = pathToFileURL(resolve(rootPath, 'sanity.config.mjs'));
+    // Load `getStudioEnvironmentVariables` from the `sanity/cli` module installed
+    // relative to where the studio is located, instead of resolving from where this CLI is
+    // running, in order to ensure we're using the same version as the studio would.
+    const sanityCliUrl = moduleResolve('sanity/cli', fakeConfigUrl);
+    try {
+        const { getStudioEnvironmentVariables: getEnvVars } = await import(sanityCliUrl.href);
+        if (typeof getEnvVars !== 'function') {
+            throw new TypeError('Expected `getStudioEnvironmentVariables` from `sanity/cli` to be a function');
+        }
+        return getEnvVars(rootPath);
+    } catch (err) {
+        const message = err instanceof Error ? err.message : String(err);
+        throw new Error(`Failed to import getStudioEnvironmentVariables from sanity/cli module: ${message}`);
+    }
+}
+
+//# sourceMappingURL=getStudioEnvironmentVariables.js.map

package/dist/util/environment/getStudioEnvironmentVariables.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/util/environment/getStudioEnvironmentVariables.ts"],"sourcesContent":["import {resolve} from 'node:path'\nimport {pathToFileURL} from 'node:url'\n\nimport {moduleResolve} from 'import-meta-resolve'\n\n/**\n * Loads the `getStudioEnvironmentVariables` function from the studio's\n * installed `sanity` package and returns the environment variables.\n *\n * This is used to ensure we're using the same version of environment variable\n * logic as the studio itself.\n *\n * @param rootPath - The root path of the Sanity Studio project\n * @returns Object containing studio environment variables\n * @internal\n */\nexport async function getStudioEnvironmentVariables(\n  rootPath: string,\n): Promise<Record<string, string>> {\n  // Create a fake config URL - doesn't have to be correct, just need the root path\n  const fakeConfigUrl = pathToFileURL(resolve(rootPath, 'sanity.config.mjs'))\n\n  // Load `getStudioEnvironmentVariables` from the `sanity/cli` module installed\n  // relative to where the studio is located, instead of resolving from where this CLI is\n  // running, in order to ensure we're using the same version as the studio would.\n  const sanityCliUrl = moduleResolve('sanity/cli', fakeConfigUrl)\n  try {\n    const {getStudioEnvironmentVariables: getEnvVars} = await import(sanityCliUrl.href)\n    if (typeof getEnvVars !== 'function') {\n      throw new TypeError(\n        'Expected `getStudioEnvironmentVariables` from `sanity/cli` to be a function',\n      )\n    }\n    return getEnvVars(rootPath)\n  } catch (err) {\n    const message = err instanceof Error ? err.message : String(err)\n    throw new Error(\n      `Failed to import getStudioEnvironmentVariables from sanity/cli module: ${message}`,\n    )\n  }\n}\n"],"names":["resolve","pathToFileURL","moduleResolve","getStudioEnvironmentVariables","rootPath","fakeConfigUrl","sanityCliUrl","getEnvVars","href","TypeError","err","message","Error","String"],"mappings":"AAAA,SAAQA,OAAO,QAAO,YAAW;AACjC,SAAQC,aAAa,QAAO,WAAU;AAEtC,SAAQC,aAAa,QAAO,sBAAqB;AAEjD;;;;;;;;;;CAUC,GACD,OAAO,eAAeC,8BACpBC,QAAgB;IAEhB,iFAAiF;IACjF,MAAMC,gBAAgBJ,cAAcD,QAAQI,UAAU;IAEtD,8EAA8E;IAC9E,uFAAuF;IACvF,gFAAgF;IAChF,MAAME,eAAeJ,cAAc,cAAcG;IACjD,IAAI;QACF,MAAM,EAACF,+BAA+BI,UAAU,EAAC,GAAG,MAAM,MAAM,CAACD,aAAaE,IAAI;QAClF,IAAI,OAAOD,eAAe,YAAY;YACpC,MAAM,IAAIE,UACR;QAEJ;QACA,OAAOF,WAAWH;IACpB,EAAE,OAAOM,KAAK;QACZ,MAAMC,UAAUD,eAAeE,QAAQF,IAAIC,OAAO,GAAGE,OAAOH;QAC5D,MAAM,IAAIE,MACR,CAAC,uEAAuE,EAAED,SAAS;IAEvF;AACF"}