Fixed error in last release

Author: christian-hackyourshack

.changeset/funny-walls-drive.md

@@ -0,0 +1,5 @@
+---
+'astro-m2dx-image': patch
+---
+
+Fixed error in last release

package.json

@@ -31,8 +31,8 @@
     "@changesets/changelog-github": "^0.4.7",
     "@changesets/cli": "^2.25.2",
     "eslint-config-base": "workspace:*",
-    "pnpm": "^7.16.1",
-    "prettier": "^2.7.1",
+    "pnpm": "^7.17.0",
+    "prettier": "^2.8.0",
     "prettier-plugin-astro": "^0.7.0",
     "rimraf": "^3.0.2",
     "turbo": "^1.6.3"

packages/astro-m2dx-image/lib/Image.astro

@@ -1,26 +1,18 @@
 ---
 import { Image } from '@astrojs/image/components';
-import type { ImageMetadata, ImageProps } from './types';
-import {
-  getAspectRatio,
-  getFallbackAspectRatio,
-  getFallbackWidth,
-  getHeight,
-  getSrc,
-  getWidth,
-  parseAspectRatio,
-  resolveSrc,
-} from './utils';
+import { parseAspectRatio } from '.';
+import { getAspectRatio, getFallbackAspectRatio, getFallbackWidth, resolveSrc } from './internal';
+import type { CallbackProps, ImageProps } from './types';
 
 export interface Props extends ImageProps {}
 
-const props = Astro.props as Props;
-await resolveSrc(props);
+const props = Astro.props as CallbackProps;
+props.src = await resolveSrc(props.src);
 
-props.width ??= getWidth(props);
-props.height ??= getHeight(props);
+props.width ??= props.src.width;
+props.height ??= props.src.height;
 if (!props.width || !props.height) {
-  const src = getSrc(props.src as string | ImageMetadata);
+  const src = props.src.src;
   const alt = props.alt;
   const aspectRatio =
     parseAspectRatio(getAspectRatio(props)) ?? //

packages/astro-m2dx-image/lib/index.ts

@@ -1,4 +1,16 @@
-export { parseAspectRatio } from '@astrojs/image/dist/loaders';
+import type { AspectRatio } from './types';
 export { default as Image } from './Image.astro';
 export { default as Picture } from './Picture.astro';
 export * from './types';
+
+export function parseAspectRatio(aspectRatio?: AspectRatio): number | undefined {
+  if (!aspectRatio) {
+    return undefined;
+  }
+  if (typeof aspectRatio === 'number') {
+    return aspectRatio;
+  } else {
+    const [width, height] = aspectRatio.split(':');
+    return parseInt(width) / parseInt(height);
+  }
+}