npm - @cedgetec-utils/astro-components - Versions diffs - 1.1.0 → 1.3.0 - Mend

@cedgetec-utils/astro-components 1.1.0 → 1.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@cedgetec-utils/astro-components",
-  "version": "1.1.0",
+  "version": "1.3.0",
   "type": "module",
   "exports": {
     ".": "./index.ts"
@@ -13,10 +13,15 @@
     "astro-component"
   ],
   "scripts": {},
+  "dependencies": {
+    "astro": "^5.17.1"
+  },
   "devDependencies": {
-    "astro": "^5.15.3"
+    "oxfmt": "^0.28.0",
+    "oxlint": "^1.43.0",
+    "typescript": "^5.9.3"
   },
   "peerDependencies": {
-    "astro": "^5.0.0"
+    "astro": "^5.17.1"
   }
-}
+}

package/src/Head.astro CHANGED Viewed

@@ -47,22 +47,22 @@ const openGraphImage = props.image
 <head>
   <meta charset="UTF-8" />
-  <meta name="viewport" content="width=device-width" />
-  <!-- Icons -->
+  <title>{title}</title>
   <link rel="icon" href={iconDark.src} />
   <link rel="icon" href={iconLight.src} media="(prefers-color-scheme:dark)" />
   <link rel="icon" href={iconDark.src} media="(prefers-color-scheme:light)" />
   <meta name="generator" content={Astro.generator} />
   <meta name="view-transition" content="same-origin" />
-  <!-- Title etc. -->
-  <title>{title}</title>
+  <meta name="viewport" content="width=device-width" />
   {props.description && <meta name="description" content={props.description} />}
   {
     props.keywords && (
       <meta name="keywords" content={props.keywords.join(",")} />
     )
   }
-  <!-- Open Graph -->
   <meta property="og:title" content={ogTitle} />
   {
     props.description && (

package/src/directus.ts ADDED Viewed

@@ -0,0 +1,184 @@
+import type { ZodObject, ZodRawShape, ZodSchema } from "astro/zod"
+import { defineCollection } from "astro:content"
+import { z } from "astro/zod"
+async function fetchWithRetry(
+  url: string,
+  options: RequestInit = {},
+  retries = 10,
+  delay = 200,
+): Promise<Response> {
+  try {
+    const controller = new AbortController()
+    const timeout = setTimeout(() => controller.abort(), 10_000)
+    const res = await fetch(url, {
+      ...options,
+      signal: controller.signal,
+    })
+    clearTimeout(timeout)
+    if (!res.ok) {
+      throw new Error(`HTTP ${res.status}`)
+    }
+    return res
+  } catch (err) {
+    if (retries <= 0) throw err
+    console.warn(`Fetch failed, retrying (${retries})…`)
+    await new Promise((r) => setTimeout(r, delay))
+    return fetchWithRetry(url, options, retries - 1, delay * 1.5)
+  }
+}
+function getZodSchemaPaths(schema: ZodSchema, prefix = ""): string[] {
+  const paths: string[] = []
+  // Unwrap optional, nullable, and effects (transforms, refinements, etc.)
+  let unwrapped = schema
+  while (
+    unwrapped instanceof z.ZodOptional ||
+    unwrapped instanceof z.ZodNullable ||
+    unwrapped instanceof z.ZodEffects
+  ) {
+    if (unwrapped instanceof z.ZodEffects) {
+      unwrapped = unwrapped._def.schema
+    } else {
+      unwrapped = unwrapped._def.innerType
+    }
+  }
+  // Handle ZodObject
+  if (unwrapped instanceof z.ZodObject) {
+    const shape = unwrapped.shape
+    for (const key in shape) {
+      const fieldPath = prefix ? `${prefix}.${key}` : key
+      const fieldSchema = shape[key]
+      // Recursively get paths for nested schemas
+      const nestedPaths = getZodSchemaPaths(fieldSchema, fieldPath)
+      if (nestedPaths.length > 0) {
+        paths.push(...nestedPaths)
+      } else {
+        paths.push(fieldPath)
+      }
+    }
+  } // Handle ZodArray
+  else if (unwrapped instanceof z.ZodArray) {
+    const elementSchema = unwrapped._def.type
+    // Get paths from the array element schema without adding array indices
+    const nestedPaths = getZodSchemaPaths(elementSchema, prefix)
+    paths.push(...nestedPaths)
+  } // Handle ZodDiscriminatedUnion (for Directus M2A relationships)
+  else if (unwrapped instanceof z.ZodDiscriminatedUnion) {
+    const discriminator = unwrapped._def.discriminator as string
+    const options = unwrapped._def.options as z.ZodObject<any>[]
+    // Always include the discriminator field
+    paths.push(prefix ? `${prefix}.${discriminator}` : discriminator)
+    for (const option of options) {
+      const shape = option.shape
+      // Get the literal value of the discriminator (e.g., "pages_content_heading")
+      let discriminatorValue: string | undefined
+      const discriminatorSchema = shape[discriminator]
+      if (discriminatorSchema instanceof z.ZodLiteral) {
+        discriminatorValue = discriminatorSchema._def.value as string
+      }
+      // Process other fields in this variant
+      for (const key in shape) {
+        if (key === discriminator) continue
+        const fieldPath = prefix ? `${prefix}.${key}` : key
+        const fieldSchema = shape[key]
+        // For M2A "item" fields, use Directus collection-specific syntax
+        if (key === "item" && discriminatorValue) {
+          const itemPaths = getZodSchemaPaths(fieldSchema, "")
+          for (const itemPath of itemPaths) {
+            // Use syntax: item:collection_name.field
+            paths.push(`${fieldPath}:${discriminatorValue}.${itemPath}`)
+          }
+        } else {
+          const nestedPaths = getZodSchemaPaths(fieldSchema, fieldPath)
+          paths.push(...nestedPaths)
+        }
+      }
+    }
+  } // Base case: primitive types
+  else {
+    if (prefix) {
+      paths.push(prefix)
+    }
+  }
+  return paths
+}
+export class Directus {
+  #apiDomain: string
+  constructor(apiDomain: string) {
+    this.#apiDomain = apiDomain
+  }
+  async #query(collection: string, fields?: string[]) {
+    const response = await fetchWithRetry(
+      `https://${this.#apiDomain}/items/${collection}${
+        fields && `?fields=${fields.join(",")}`
+      }`,
+    )
+    const data = await response.json()
+    return data.data
+  }
+  collection<T extends ZodRawShape>(name: string, schema: ZodObject<T>) {
+    const schemaWithId = schema.extend({ id: z.coerce.string() })
+    return defineCollection({
+      schema: schemaWithId,
+      loader: async () => {
+        const result = await this.#query(name, getZodSchemaPaths(schemaWithId))
+        if (Array.isArray(result)) {
+          return result
+        }
+        return [result]
+      },
+    })
+  }
+  imageSchema() {
+    return z
+      .object({
+        id: z.string(),
+        type: z.string(),
+        title: z.string(),
+        modified_on: z.string(),
+        width: z.number().nullish(),
+        height: z.number().nullish(),
+      })
+      .transform((image) => ({
+        ...image,
+        url: `https://${this.#apiDomain}/assets/${image.id}`,
+      }))
+  }
+  fileSchema() {
+    return z
+      .object({
+        id: z.string(),
+        type: z.string(),
+        title: z.string(),
+        modified_on: z.string(),
+      })
+      .transform((file) => ({
+        ...file,
+        url: `https://${this.#apiDomain}/assets/${file.id}`,
+      }))
+  }
+}