@gnosticdev/hono-actions 2.0.10 → 2.1.0

package/dist/index.d.ts

@@ -2,32 +2,9 @@ import * as astro from 'astro';
 import { z } from 'astro/zod';
 
 declare const optionsSchema: z.ZodOptional<z.ZodObject<{
-    /**
-     * The base path for the API routes
-     *
-     * @default '/api'
-     */
     basePath: z.ZodOptional<z.ZodString>;
-    /**
-     * The path to the actions file. If not provided, the integration will automatically discover the actions file by searching for one of the following patterns:
-     * - `src/server/actions.ts`
-     * - `src/hono/actions.ts`
-     * - `src/hono/index.ts`
-     * - `src/hono.ts`
-     * - `src/hono-actions.ts`
-     *
-     * **NOTE** `src/actions.ts` is reserved for Astro Actions and will be ignored.
-     *
-     * @default 'src/server/actions.ts'
-     */
     actionsPath: z.ZodOptional<z.ZodString>;
-}, "strip", z.ZodTypeAny, {
-    basePath?: string | undefined;
-    actionsPath?: string | undefined;
-}, {
-    basePath?: string | undefined;
-    actionsPath?: string | undefined;
-}>>;
+}, z.core.$strip>>;
 type IntegrationOptions = z.output<typeof optionsSchema>;
 /**
  * Astro integration for Hono Actions

package/dist/index.js

@@ -3,6 +3,7 @@ import { z } from 'astro/zod';
 import fs from 'node:fs/promises';
 import path from 'node:path';
 import { glob } from 'tinyglobby';
+import { createRequire } from 'node:module';
 
 // src/integration.ts
 
@@ -45,9 +46,32 @@ showRoutes(app)
 console.log('---------------------------')
 ${exportedApp}`;
 }
-var generateAstroHandler = (adapter) => {
+var generateAstroHandler = (adapter, astroMajorVersion = 5) => {
   switch (adapter) {
     case "@astrojs/cloudflare":
+      if (astroMajorVersion >= 6) {
+        return `
+/// <reference types="./types.d.ts" />
+// Generated by Hono Actions Integration
+// adapter: ${adapter}
+import { env } from 'cloudflare:workers'
+import type { APIContext, APIRoute } from 'astro'
+import router from './router.js'
+
+const handler: APIRoute<APIContext> = async (ctx) => {
+    return router.fetch(
+        ctx.request,
+        {
+            ...env,
+            ASTRO_LOCALS: ctx.locals,
+        },
+        ctx.locals.cfContext,
+    )
+}
+
+export { handler as ALL }
+`;
+      }
       return `
 /// <reference types="./types.d.ts" />
 // Generated by Hono Actions Integration
@@ -58,7 +82,10 @@ import router from './router.js'
 const handler: APIRoute<APIContext> = async (ctx) => {
     return router.fetch(
         ctx.request,
-        ctx.locals.runtime.env, // required for cloudflare adapter
+        {
+            ...ctx.locals.runtime.env,
+            ASTRO_LOCALS: ctx.locals,
+        },
         ctx.locals.runtime.ctx, // required for cloudflare adapter
     )
 }
@@ -132,7 +159,7 @@ export function createHonoClient<T extends HonoRouter = HonoRouter>(basePath: st
     return hc<T>(basePath, fetchOptions)
 }
 `;
-var generateIntegrationTypes = (adapter) => {
+var generateIntegrationTypes = (adapter, astroMajorVersion = 5) => {
   let actionTypes = `
     // Generated by Hono Actions Integration
     declare module '@gnosticdev/hono-actions/actions' {
@@ -180,24 +207,51 @@ declare module '@gnosticdev/hono-actions/actions' {
 }
 export {}
 `;
-      clientTypes += `
+      if (astroMajorVersion < 6) {
+        clientTypes += `
 type Runtime = import('@astrojs/cloudflare').Runtime<Env>
 
 declare namespace App {
     interface Locals extends Runtime {}
 }
 `;
+      }
       break;
   }
   return { actionTypes, clientTypes };
 };
-
-// src/lib/utils.ts
 var reservedRoutes = ["_astro", "_actions", "_server_islands"];
-var SUPPORTED_ADAPTERS = ["@astrojs/cloudflare", "@astrojs/node", "@astrojs/netlify", "@astrojs/vercel"];
+var SUPPORTED_ADAPTERS = [
+  "@astrojs/cloudflare",
+  "@astrojs/node",
+  "@astrojs/netlify",
+  "@astrojs/vercel"
+];
 function isSupportedAdapter(adapter) {
   return SUPPORTED_ADAPTERS.includes(adapter);
 }
+function parseAstroMajorVersion(version) {
+  const majorVersion = Number.parseInt(version, 10);
+  if (Number.isNaN(majorVersion)) {
+    if (process.env.PACKAGE_VERSION) {
+      return Number.parseInt(process.env.PACKAGE_VERSION, 10);
+    } else {
+      throw new Error(`Invalid Astro version: ${version}`);
+    }
+  }
+  return majorVersion;
+}
+function getInstalledAstroVersion() {
+  const require2 = createRequire(import.meta.url);
+  const astroPackage = require2("astro/package.json");
+  if (!astroPackage.version) {
+    throw new Error("Could not determine installed Astro version");
+  }
+  return astroPackage.version;
+}
+function getInstalledAstroMajorVersion() {
+  return parseAstroMajorVersion(getInstalledAstroVersion());
+}
 
 // src/integration.ts
 var optionsSchema = z.object({
@@ -242,18 +296,27 @@ var integration_default = defineIntegration({
     }
     const { resolve } = createResolver(import.meta.url);
     const IS_DEBUG = process.env.__DEBUG__ === "true";
+    const astroMajorVersion = getInstalledAstroMajorVersion();
     return {
       name,
       hooks: {
         "astro:config:setup": async (params) => {
           const { logger, injectRoute, createCodegenDir, config } = params;
+          logger.info(
+            `using astro major version: ${astroMajorVersion}`
+          );
           const root = config.root.pathname;
-          const absPatterns = ACTION_PATTERNS.map((p) => path.join(root, p));
+          const absPatterns = ACTION_PATTERNS.map(
+            (p) => path.join(root, p)
+          );
           const files = await glob(absPatterns, {
             expandDirectories: false,
             absolute: true
           });
           if (IS_DEBUG) {
+            logger.info(
+              `DEBUG: Detected Astro major version: ${astroMajorVersion}`
+            );
             logger.info(`DEBUG: Found actions: ${files.join("\n")}`);
           }
           const actionsPath = options.actionsPath ?? files[0];
@@ -270,7 +333,10 @@ ${ACTION_PATTERNS.map((p) => ` - ${p}`).join("\n")}`
             `Found actions: ${path.relative(root, resolvedActionsPath)}`
           );
           const codeGenDir = createCodegenDir();
-          const routerPathAbs = path.join(codeGenDir.pathname, "router.ts");
+          const routerPathAbs = path.join(
+            codeGenDir.pathname,
+            "router.ts"
+          );
           const relFromGenToActions = path.relative(codeGenDir.pathname, resolvedActionsPath).split(path.sep).join("/");
           const adapter = params.config.adapter?.name;
           if (!adapter) {
@@ -292,10 +358,23 @@ ${ACTION_PATTERNS.map((p) => ` - ${p}`).join("\n")}`
             adapter
           });
           await fs.writeFile(routerPathAbs, routerContent, "utf-8");
-          const astroHandlerPathAbs = path.join(codeGenDir.pathname, "api.ts");
-          const astroHandlerContent = generateAstroHandler(adapter);
-          await fs.writeFile(astroHandlerPathAbs, astroHandlerContent, "utf-8");
-          const clientPathAbs = path.join(codeGenDir.pathname, "client.ts");
+          const astroHandlerPathAbs = path.join(
+            codeGenDir.pathname,
+            "api.ts"
+          );
+          const astroHandlerContent = generateAstroHandler(
+            adapter,
+            astroMajorVersion
+          );
+          await fs.writeFile(
+            astroHandlerPathAbs,
+            astroHandlerContent,
+            "utf-8"
+          );
+          const clientPathAbs = path.join(
+            codeGenDir.pathname,
+            "client.ts"
+          );
           if (!config.site) {
             logger.warn(
               "No site url found in astro config, add one if you want to use the hono client with SSR"
@@ -316,9 +395,15 @@ ${ACTION_PATTERNS.map((p) => ` - ${p}`).join("\n")}`
             entrypoint: astroHandlerPathAbs,
             prerender: false
           });
-          logger.info(`\u2705 Hono Actions route mounted at ${basePath}/[...slug]`);
+          logger.info(
+            `\u2705 Hono Actions route mounted at ${basePath}/[...slug]`
+          );
         },
-        "astro:config:done": async ({ injectTypes, config, logger }) => {
+        "astro:config:done": async ({
+          injectTypes,
+          config,
+          logger
+        }) => {
           const adapter = config.adapter?.name;
           if (!adapter) {
             logger.warn("No adapter found...");
@@ -330,7 +415,7 @@ ${ACTION_PATTERNS.map((p) => ` - ${p}`).join("\n")}`
             );
             return;
           }
-          const { actionTypes, clientTypes } = generateIntegrationTypes(adapter);
+          const { actionTypes, clientTypes } = generateIntegrationTypes(adapter, astroMajorVersion);
           injectTypes({
             filename: "actions.d.ts",
             content: actionTypes

package/package.json

@@ -5,8 +5,8 @@
   },
   "dependencies": {
     "@hono/standard-validator": "^0.2.0",
-    "@hono/zod-validator": "^0.2.2",
-    "astro-integration-kit": "^0.19.0",
+    "@hono/zod-validator": "^0.7.6",
+    "astro-integration-kit": "^0.20.0",
     "tinyglobby": "^0.2.15"
   },
   "description": "Define server actions with built-in validation, error handling, and a pre-built hono client for calling the routes.",
@@ -48,7 +48,7 @@
   "main": "./dist/index.js",
   "name": "@gnosticdev/hono-actions",
   "peerDependencies": {
-    "astro": "^5.13.0",
+    "astro": "^5.13.0 || ^6.0.0",
     "hono": "^4.10.6"
   },
   "publishConfig": {
@@ -61,5 +61,5 @@
   },
   "type": "module",
   "types": "./dist/index.d.ts",
-  "version": "2.0.10"
+  "version": "2.1.0"
 }