@cedgetec-utils/astro-components 1.6.0 → 1.8.0

package/package.json

@@ -1,28 +1,31 @@
 {
   "name": "@cedgetec-utils/astro-components",
-  "version": "1.6.0",
+  "version": "1.8.0",
+  "keywords": [
+    "astro-component"
+  ],
+  "files": [
+    "src",
+    "index.ts"
+  ],
   "type": "module",
   "exports": {
     ".": "./src/components/index.ts",
     "./libs": "./src/libs/index.ts"
   },
-  "files": [
-    "src",
-    "index.ts"
-  ],
-  "keywords": [
-    "astro-component"
-  ],
-  "scripts": {},
+  "scripts": {
+    "lint": "oxlint",
+    "format": "oxfmt"
+  },
   "dependencies": {
-    "astro": "^5.17.1"
+    "astro": "^6.0.2"
   },
   "devDependencies": {
-    "oxfmt": "^0.28.0",
-    "oxlint": "^1.43.0",
+    "oxfmt": "^0.38.0",
+    "oxlint": "^1.53.0",
     "typescript": "^5.9.3"
   },
   "peerDependencies": {
-    "astro": "^5.17.1"
+    "astro": "^6.0.2"
   }
 }

package/src/components/index.ts

@@ -1,7 +1,7 @@
 // Do not write code directly here, instead use the `src` folder!
 // Then, use this file to export everything you want your user to access.
 
-export { default as DirectusImage } from "./DirectusImage.astro";
-export type { DirectusImageData } from "./DirectusImage.astro";
-export { default as Head } from "./Head.astro";
-export { default as Matomo } from "./Matomo.astro";
+export { default as DirectusImage } from "./DirectusImage.astro"
+export type { DirectusImageData } from "./DirectusImage.astro"
+export { default as Head } from "./Head.astro"
+export { default as Matomo } from "./Matomo.astro"

package/src/libs/directus.ts

@@ -1,4 +1,4 @@
-import type { ZodObject, ZodRawShape, ZodSchema } from "astro/zod"
+import type { ZodObject, ZodRawShape, ZodType } from "astro/zod"
 import { defineCollection } from "astro:content"
 import { z } from "astro/zod"
 
@@ -32,20 +32,20 @@ async function fetchWithRetry(
   }
 }
 
-function getZodSchemaPaths(schema: ZodSchema, prefix = ""): string[] {
+function getZodSchemaPaths(schema: ZodType, prefix = ""): string[] {
   const paths: string[] = []
 
-  // Unwrap optional, nullable, and effects (transforms, refinements, etc.)
-  let unwrapped = schema
+  // Unwrap optional, nullable, and pipe/transform
+  let unwrapped: ZodType = schema
   while (
     unwrapped instanceof z.ZodOptional ||
     unwrapped instanceof z.ZodNullable ||
-    unwrapped instanceof z.ZodEffects
+    unwrapped instanceof z.ZodPipe
   ) {
-    if (unwrapped instanceof z.ZodEffects) {
-      unwrapped = unwrapped._def.schema
+    if (unwrapped instanceof z.ZodPipe) {
+      unwrapped = unwrapped.def.in as ZodType
     } else {
-      unwrapped = unwrapped._def.innerType
+      unwrapped = unwrapped.def.innerType as ZodType
     }
   }
 
@@ -67,14 +67,14 @@ function getZodSchemaPaths(schema: ZodSchema, prefix = ""): string[] {
     }
   } // Handle ZodArray
   else if (unwrapped instanceof z.ZodArray) {
-    const elementSchema = unwrapped._def.type
+    const elementSchema = unwrapped.def.element as ZodType
     // 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>[]
+    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)
@@ -85,7 +85,7 @@ function getZodSchemaPaths(schema: ZodSchema, prefix = ""): string[] {
       let discriminatorValue: string | undefined
       const discriminatorSchema = shape[discriminator]
       if (discriminatorSchema instanceof z.ZodLiteral) {
-        discriminatorValue = discriminatorSchema._def.value as string
+        discriminatorValue = discriminatorSchema.def.values[0] as string
       }
 
       // Process other fields in this variant