adding type definitions for the integration's use of globalThis

packages/integrations/image/src/endpoints/dev.ts

@@ -3,7 +3,11 @@ import { lookup } from 'mrmime';
 import { loadImage } from '../utils.js';
 
 export const get: APIRoute = async ({ request }) => {
- const loader = (globalThis as any)['@astrojs/image'].ssrLoader;
+ const loader = globalThis.astroImage.ssrLoader;
+
+ if (!loader) {
+ throw new Error('@astrojs/image: loader not found!');
+ }
 
  try {
  const url = new URL(request.url);

packages/integrations/image/src/get-image.ts

@@ -105,29 +105,33 @@ export async function getImage(
  loader: ImageService,
  transform: GetImageTransform
 ): Promise<ImageAttributes> {
- (globalThis as any)['@astrojs/image'].loader = loader;
+ globalThis.astroImage.loader = loader;
 
  const resolved = await resolveTransform(transform);
 
  const attributes = await loader.getImageAttributes(resolved);
 
- const isDev = (globalThis as any)['@astrojs/image'].command === 'dev';
+ const isDev = globalThis.astroImage.command === 'dev';
  const isLocalImage = !isRemoteImage(resolved.src);
 
- const _loader = isDev && isLocalImage ? (globalThis as any)['@astrojs/image'].ssrLoader : loader;
+ const _loader = isDev && isLocalImage ? globalThis.astroImage.ssrLoader : loader;
+
+ if (!_loader) {
+ throw new Error('@astrojs/image: loader not found!');
+ }
 
  // For SSR services, build URLs for the injected route
  if (isSSRService(_loader)) {
  const { searchParams } = _loader.serializeTransform(resolved);
 
  // cache all images rendered to HTML
- if (globalThis && (globalThis as any)['@astrojs/image'].addStaticImage) {
- (globalThis as any)['@astrojs/image'].addStaticImage(resolved);
+ if (globalThis && globalThis.astroImage.addStaticImage) {
+ globalThis.astroImage.addStaticImage(resolved);
  }
 
  const src =
- globalThis && (globalThis as any)['@astrojs/image'].filenameFormat
- ? (globalThis as any)['@astrojs/image'].filenameFormat(resolved, searchParams)
+ globalThis && globalThis.astroImage.filenameFormat
+ ? globalThis.astroImage.filenameFormat(resolved, searchParams)
  : `${ROUTE_PATTERN}?${searchParams.toString()}`;
 
  return {

packages/integrations/image/src/index.ts

@@ -17,7 +17,7 @@ export * from './get-image.js';
 export * from './get-picture.js';
 
 const createIntegration = (options: IntegrationOptions = {}): AstroIntegration => {
- (globalThis as any)['@astrojs/image'] = {
+ globalThis.astroImage = {
  ssrLoader: sharp
  };
 
@@ -48,7 +48,7 @@ const createIntegration = (options: IntegrationOptions = {}): AstroIntegration =
  hooks: {
  'astro:config:setup': ({ command, config, injectRoute, updateConfig }) => {
  _config = config;
- (globalThis as any)['@astrojs/image'].command = command;
+ globalThis.astroImage.command = command;
 
  // Always treat `astro dev` as SSR mode, even without an adapter
  const mode = command === 'dev' || config.adapter ? 'ssr' : 'ssg';
@@ -57,12 +57,12 @@ const createIntegration = (options: IntegrationOptions = {}): AstroIntegration =
 
  // Used to cache all images rendered to HTML
  // Added to globalThis to share the same map in Node and Vite
- (globalThis as any)['@astrojs/image'].addStaticImage = (transform: TransformOptions) => {
+ globalThis.astroImage.addStaticImage = (transform: TransformOptions) => {
  staticImages.set(propsToFilename(transform), transform);
  };
 
  // TODO: Add support for custom, user-provided filename format functions
- (globalThis as any)['@astrojs/image'].filenameFormat = (
+ globalThis.astroImage.filenameFormat = (
  transform: TransformOptions,
  searchParams: URLSearchParams
  ) => {
@@ -89,7 +89,12 @@ const createIntegration = (options: IntegrationOptions = {}): AstroIntegration =
  },
  'astro:build:done': async ({ dir }) => {
  for await (const [filename, transform] of staticImages) {
- const loader = (globalThis as any)['@astrojs/image'].loader;
+ const loader = globalThis.astroImage.loader;
+
+ if (!loader || !('transform' in loader)) {
+ // this should never be hit, how was a staticImage added without an SSR service?
+ return;
+ }
 
  let inputBuffer: Buffer | undefined = undefined;
  let outputFile: string;

packages/integrations/image/src/types.ts

@@ -2,6 +2,18 @@
 export type { Image, Picture } from '../components/index.js';
 export * from './index.js';
 
+interface ImageIntegration {
+ loader?: ImageService;
+ ssrLoader?: SSRImageService;
+ command?: 'dev' | 'build';
+ addStaticImage?: (transform: TransformOptions) => void;
+ filenameFormat?: (transform: TransformOptions, searchParams: URLSearchParams) => string;
+}
+
+declare global {
+ var astroImage: ImageIntegration;
+}
+
 export type InputFormat =
  | 'heic'
  | 'heif'