@gradial/aci 0.1.29 → 0.1.30

package/dist/assets/index.d.ts

@@ -1,3 +1,3 @@
-export { type Image, type ImageFallback, type ImageSource, type ImageAttrs, ImageSchema, imageAttrs, primaryImageSource, } from '../types/image.js';
+export { type Image, type ImageSource, type ImageAttrs, ImageSchema, imageAttrs, primaryImageSource, } from '../types/image.js';
 export { type Video, type VideoSource, VideoSchema, VideoSourceSchema, } from '../types/video.js';
 export { type Asset, AssetSchema, isImage, isVideo, isAsset, } from '../types/media.js';

package/dist/index.d.ts

@@ -5,7 +5,7 @@ export type { Registry, RegistryEntry, AnyComponent } from './registry.js';
 export { blockRef, blockRefArray } from './types/block-ref.js';
 export type { BlockRef, BlockRefEntry, BlockRefMeta, BlockRefUnion } from './types/block-ref.js';
 export type { ComponentContract, ComponentContractID, ComponentContractValidator, ComponentRegistry, ComponentValidationContext, ComponentValidationIssue, InferComponentProps, } from './types/component.js';
-export { ImageSchema, imageAttrs, primaryImageSource, type Image, type ImageFallback, type ImageSource, type ImageAttrs, type ImageSlotContract, type SlotOutput, } from './types/image.js';
+export { ImageSchema, imageAttrs, primaryImageSource, type Image, type ImageSource, type ImageAttrs, type ImageSlotContract, type SlotOutput, } from './types/image.js';
 export { LinkSchema, type Link, type LinkTarget, type LinkResolverContext, resolveLink, resolveHref, assertSafeHref, normalizeLinkRel, } from './types/link.js';
 export { HeadingSchema, InlineContentSchema, RichTextValueSchema, type Heading, type InlineContent, type RichTextValue, } from './types/rich-text.js';
 export type { Config, RouteConfig, ExternalDependency, DAMConfig, } from './types/config.js';

package/dist/react/index.js

@@ -12,10 +12,9 @@ export function Image({ image, value, ...attrs }) {
         assetId: '',
         versionId: '',
         alt: '',
-        fallback: { src: '', width: 0, height: 0 },
         sources: [],
     };
-    if (!resolved.fallback.src) {
+    if (!resolved.sources[0]?.src) {
         return createElement('img', {
             src: '',
             alt: resolved.alt,

package/dist/types/image.d.ts

@@ -1,17 +1,13 @@
 import { z } from 'zod';
-export interface ImageFallback {
-    /** Derivative URL for the base <img>. */
+export interface ImageSource {
+    /** Primary derivative URL for this rendition candidate. */
     src: string;
     /** Intrinsic width in pixels (0 when the format carries none, e.g. SVG). */
-    width: number;
+    width?: number;
     /** Intrinsic height in pixels (0 when the format carries none). */
-    height: number;
-    /** MIME type hint, e.g. image/webp. */
-    type?: string;
-}
-export interface ImageSource {
-    /** srcset value — a single URL or a width-descriptor candidate list. */
-    srcset: string;
+    height?: number;
+    /** Optional width-descriptor rendition candidates. */
+    srcset?: string;
     /** sizes attribute from the slot contract. */
     sizes?: string;
     /** Media query scoping this source (art direction). */
@@ -28,8 +24,6 @@ export interface Image {
     versionId: string;
     /** Accessible description of the image content. */
     alt: string;
-    /** Base <img> rendition. */
-    fallback: ImageFallback;
     /** <source> candidates produced for the asset slot. */
     sources: ImageSource[];
 }
@@ -43,14 +37,11 @@ export interface SlotOutput {
     widths: number[];
     media?: string;
 }
-export declare const ImageFallbackSchema: z.ZodObject<{
-    src: z.ZodString;
-    width: z.ZodNumber;
-    height: z.ZodNumber;
-    type: z.ZodOptional<z.ZodString>;
-}, z.core.$strip>;
 export declare const ImageSourceSchema: z.ZodObject<{
-    srcset: z.ZodString;
+    src: z.ZodString;
+    srcset: z.ZodOptional<z.ZodString>;
+    width: z.ZodOptional<z.ZodNumber>;
+    height: z.ZodOptional<z.ZodNumber>;
     sizes: z.ZodOptional<z.ZodString>;
     media: z.ZodOptional<z.ZodString>;
     type: z.ZodString;
@@ -60,14 +51,11 @@ export declare const ImageSchema: z.ZodObject<{
     assetId: z.ZodString;
     versionId: z.ZodString;
     alt: z.ZodString;
-    fallback: z.ZodObject<{
-        src: z.ZodString;
-        width: z.ZodNumber;
-        height: z.ZodNumber;
-        type: z.ZodOptional<z.ZodString>;
-    }, z.core.$strip>;
     sources: z.ZodArray<z.ZodObject<{
-        srcset: z.ZodString;
+        src: z.ZodString;
+        srcset: z.ZodOptional<z.ZodString>;
+        width: z.ZodOptional<z.ZodNumber>;
+        height: z.ZodOptional<z.ZodNumber>;
         sizes: z.ZodOptional<z.ZodString>;
         media: z.ZodOptional<z.ZodString>;
         type: z.ZodString;
@@ -75,9 +63,9 @@ export declare const ImageSchema: z.ZodObject<{
 }, z.core.$strip>;
 export type ImageAttrs = Record<string, unknown>;
 /**
- * The primary rendition of an image — its fallback (base <img>) entry.
+ * The primary rendition of an image — its first source entry.
  */
-export declare function primaryImageSource(image: Image): ImageFallback;
+export declare function primaryImageSource(image: Image): ImageSource;
 /**
  * Computes the full set of <img> attributes for an Image.
  *

package/dist/types/image.js

@@ -2,14 +2,11 @@ import { z } from 'zod';
 // ---------------------------------------------------------------------------
 // Zod schema
 // ---------------------------------------------------------------------------
-export const ImageFallbackSchema = z.object({
-    src: z.string().min(1),
-    width: z.number().int().nonnegative(),
-    height: z.number().int().nonnegative(),
-    type: z.string().min(1).optional(),
-});
 export const ImageSourceSchema = z.object({
-    srcset: z.string().min(1),
+    src: z.string().min(1),
+    srcset: z.string().min(1).optional(),
+    width: z.number().int().nonnegative().optional(),
+    height: z.number().int().nonnegative().optional(),
     sizes: z.string().min(1).optional(),
     media: z.string().min(1).optional(),
     type: z.string().min(1),
@@ -19,14 +16,13 @@ export const ImageSchema = z.object({
     assetId: z.string().min(1),
     versionId: z.string().min(1),
     alt: z.string(),
-    fallback: ImageFallbackSchema,
     sources: z.array(ImageSourceSchema).min(1),
 });
 /**
- * The primary rendition of an image — its fallback (base <img>) entry.
+ * The primary rendition of an image — its first source entry.
  */
 export function primaryImageSource(image) {
-    return image.fallback;
+    return image.sources[0];
 }
 /**
  * Computes the full set of <img> attributes for an Image.
@@ -38,12 +34,13 @@ export function primaryImageSource(image) {
  * first unscoped source only.
  */
 export function imageAttrs(image, overrides = {}) {
-    const unscoped = image.sources.find((s) => !s.media);
+    const primary = image.sources[0];
+    const unscoped = image.sources.find((s) => !s.media) ?? primary;
     return {
-        src: image.fallback.src,
+        src: primary.src,
         alt: image.alt,
-        width: image.fallback.width > 0 ? image.fallback.width : undefined,
-        height: image.fallback.height > 0 ? image.fallback.height : undefined,
+        width: primary.width && primary.width > 0 ? primary.width : undefined,
+        height: primary.height && primary.height > 0 ? primary.height : undefined,
         srcSet: unscoped?.srcset || undefined,
         sizes: unscoped?.sizes || undefined,
         loading: 'lazy',

package/dist/types/media.d.ts

@@ -9,14 +9,11 @@ export declare const AssetSchema: z.ZodUnion<readonly [z.ZodObject<{
     assetId: z.ZodString;
     versionId: z.ZodString;
     alt: z.ZodString;
-    fallback: z.ZodObject<{
-        src: z.ZodString;
-        width: z.ZodNumber;
-        height: z.ZodNumber;
-        type: z.ZodOptional<z.ZodString>;
-    }, z.core.$strip>;
     sources: z.ZodArray<z.ZodObject<{
-        srcset: z.ZodString;
+        src: z.ZodString;
+        srcset: z.ZodOptional<z.ZodString>;
+        width: z.ZodOptional<z.ZodNumber>;
+        height: z.ZodOptional<z.ZodNumber>;
         sizes: z.ZodOptional<z.ZodString>;
         media: z.ZodOptional<z.ZodString>;
         type: z.ZodString;
@@ -35,14 +32,11 @@ export declare const AssetSchema: z.ZodUnion<readonly [z.ZodObject<{
         assetId: z.ZodString;
         versionId: z.ZodString;
         alt: z.ZodString;
-        fallback: z.ZodObject<{
-            src: z.ZodString;
-            width: z.ZodNumber;
-            height: z.ZodNumber;
-            type: z.ZodOptional<z.ZodString>;
-        }, z.core.$strip>;
         sources: z.ZodArray<z.ZodObject<{
-            srcset: z.ZodString;
+            src: z.ZodString;
+            srcset: z.ZodOptional<z.ZodString>;
+            width: z.ZodOptional<z.ZodNumber>;
+            height: z.ZodOptional<z.ZodNumber>;
             sizes: z.ZodOptional<z.ZodString>;
             media: z.ZodOptional<z.ZodString>;
             type: z.ZodString;

package/dist/types/video.d.ts

@@ -52,14 +52,11 @@ export declare const VideoSchema: z.ZodObject<{
         assetId: z.ZodString;
         versionId: z.ZodString;
         alt: z.ZodString;
-        fallback: z.ZodObject<{
-            src: z.ZodString;
-            width: z.ZodNumber;
-            height: z.ZodNumber;
-            type: z.ZodOptional<z.ZodString>;
-        }, z.core.$strip>;
         sources: z.ZodArray<z.ZodObject<{
-            srcset: z.ZodString;
+            src: z.ZodString;
+            srcset: z.ZodOptional<z.ZodString>;
+            width: z.ZodOptional<z.ZodNumber>;
+            height: z.ZodOptional<z.ZodNumber>;
             sizes: z.ZodOptional<z.ZodString>;
             media: z.ZodOptional<z.ZodString>;
             type: z.ZodString;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gradial/aci",
-  "version": "0.1.29",
+  "version": "0.1.30",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -85,13 +85,6 @@
       "default": "./dist/astro/index.js"
     }
   },
-  "scripts": {
-    "build": "node -e \"require('node:fs').rmSync('dist', { recursive: true, force: true })\" && tsc -p tsconfig.json",
-    "build:cli": "cd ../.. && ./scripts/build-cli.sh",
-    "generate-starters": "cd ../.. && tsx scripts/generate-starters.ts",
-    "compile-registry": "tsx src/cli/compile-registry.mjs",
-    "prepack": "npm run generate-starters && npm run build && npm run build:cli"
-  },
   "dependencies": {
     "markdown-it": "^14.1.0",
     "sanitize-html": "^2.13.1",
@@ -127,5 +120,11 @@
     "tsx": "^4.20.0",
     "typescript": "^5.9.3",
     "zod": "^4.0.0"
+  },
+  "scripts": {
+    "build": "node -e \"require('node:fs').rmSync('dist', { recursive: true, force: true })\" && tsc -p tsconfig.json",
+    "build:cli": "cd ../.. && ./scripts/build-cli.sh",
+    "generate-starters": "cd ../.. && tsx scripts/generate-starters.ts",
+    "compile-registry": "tsx src/cli/compile-registry.mjs"
   }
-}
+}

package/src/types/image.ts

@@ -1,27 +1,21 @@
 import { z } from 'zod';
 
 // ---------------------------------------------------------------------------
-// Image fallback + source variants
+// Image source variants
 //
-// The fallback is the base <img> rendition (largest derivative); each source
-// entry is one <source> element candidate with a ready-made srcset scoped by
-// the optional media/sizes of the slot output that produced it.
+// Each source provides a primary src and may include a ready-made srcset
+// scoped by the optional media/sizes of the slot output that produced it.
 // ---------------------------------------------------------------------------
 
-export interface ImageFallback {
-  /** Derivative URL for the base <img>. */
+export interface ImageSource {
+  /** Primary derivative URL for this rendition candidate. */
   src: string;
   /** Intrinsic width in pixels (0 when the format carries none, e.g. SVG). */
-  width: number;
+  width?: number;
   /** Intrinsic height in pixels (0 when the format carries none). */
-  height: number;
-  /** MIME type hint, e.g. image/webp. */
-  type?: string;
-}
-
-export interface ImageSource {
-  /** srcset value — a single URL or a width-descriptor candidate list. */
-  srcset: string;
+  height?: number;
+  /** Optional width-descriptor rendition candidates. */
+  srcset?: string;
   /** sizes attribute from the slot contract. */
   sizes?: string;
   /** Media query scoping this source (art direction). */
@@ -47,8 +41,6 @@ export interface Image {
   versionId: string;
   /** Accessible description of the image content. */
   alt: string;
-  /** Base <img> rendition. */
-  fallback: ImageFallback;
   /** <source> candidates produced for the asset slot. */
   sources: ImageSource[];
 }
@@ -73,15 +65,11 @@ export interface SlotOutput {
 // Zod schema
 // ---------------------------------------------------------------------------
 
-export const ImageFallbackSchema = z.object({
-  src: z.string().min(1),
-  width: z.number().int().nonnegative(),
-  height: z.number().int().nonnegative(),
-  type: z.string().min(1).optional(),
-});
-
 export const ImageSourceSchema = z.object({
-  srcset: z.string().min(1),
+  src: z.string().min(1),
+  srcset: z.string().min(1).optional(),
+  width: z.number().int().nonnegative().optional(),
+  height: z.number().int().nonnegative().optional(),
   sizes: z.string().min(1).optional(),
   media: z.string().min(1).optional(),
   type: z.string().min(1),
@@ -92,7 +80,6 @@ export const ImageSchema = z.object({
   assetId: z.string().min(1),
   versionId: z.string().min(1),
   alt: z.string(),
-  fallback: ImageFallbackSchema,
   sources: z.array(ImageSourceSchema).min(1),
 });
 
@@ -103,10 +90,10 @@ export const ImageSchema = z.object({
 export type ImageAttrs = Record<string, unknown>;
 
 /**
- * The primary rendition of an image — its fallback (base <img>) entry.
+ * The primary rendition of an image — its first source entry.
  */
-export function primaryImageSource(image: Image): ImageFallback {
-  return image.fallback;
+export function primaryImageSource(image: Image): ImageSource {
+  return image.sources[0];
 }
 
 /**
@@ -119,13 +106,14 @@ export function primaryImageSource(image: Image): ImageFallback {
  * first unscoped source only.
  */
 export function imageAttrs(image: Image, overrides: ImageAttrs = {}): ImageAttrs {
-  const unscoped = image.sources.find((s) => !s.media);
+  const primary = image.sources[0];
+  const unscoped = image.sources.find((s) => !s.media) ?? primary;
 
   return {
-    src: image.fallback.src,
+    src: primary.src,
     alt: image.alt,
-    width: image.fallback.width > 0 ? image.fallback.width : undefined,
-    height: image.fallback.height > 0 ? image.fallback.height : undefined,
+    width: primary.width && primary.width > 0 ? primary.width : undefined,
+    height: primary.height && primary.height > 0 ? primary.height : undefined,
     srcSet: unscoped?.srcset || undefined,
     sizes: unscoped?.sizes || undefined,
     loading: 'lazy',

package/templates/astro/template/src/fixtures/sections.ts

@@ -27,9 +27,8 @@ export const sectionStoryFixtures: SectionStoryFixture[] = [
           assetId: 'fixture_seattle',
           versionId: 'v0001',
           alt: 'Seattle skyline at dusk',
-          fallback: { src: '/assets/seattle.avif', width: 1920, height: 1280, type: 'image/avif' },
           sources: [
-            { srcset: '/assets/seattle.avif', sizes: '100vw', type: 'image/avif' }
+            { src: '/assets/seattle.avif', width: 1920, height: 1280, sizes: '100vw', type: 'image/avif' }
           ]
         }
       }