@squadbase/vite-server 0.1.19-dev.a00d9c3 → 0.1.19-dev.f16bde6

package/build-entry/server-entry.mjs

@@ -0,0 +1,18 @@
+// Server build entry used by `squadbasePlugin` (see vite-plugin.ts).
+//
+// It re-exports the vite-server app as default (so @hono/vite-build's injected
+// `serve({ fetch: app.fetch })` works), and statically imports the project's
+// TypeScript server-logic handlers via the `virtual:squadbase-server-logics`
+// module (generated by the plugin from `server-logic/*.json`). Because the
+// handlers are compiled into THIS bundle, they share the server's module graph
+// — in particular hono's `contextStorage` AsyncLocalStorage — so `getContext()`
+// works. This replaces runtime jiti transpilation.
+//
+// Registration goes through `@squadbase/vite-server/main` (not `/`) because
+// `./main` and `./` are separate bundle entry points with separate module state.
+import app, { registerBundledHandlers } from "@squadbase/vite-server/main";
+import { HANDLERS } from "virtual:squadbase-server-logics";
+
+registerBundledHandlers(HANDLERS);
+
+export default app;

package/dist/index.d.ts

@@ -1,6 +1,13 @@
 import * as hono_types from 'hono/types';
+import * as hono from 'hono';
 import { Hono } from 'hono';
 
+/**
+ * Called once at startup by the build-generated server entry with the map of
+ * bundled TypeScript handlers. See `vite-plugin.ts`.
+ */
+declare function registerBundledHandlers(handlers: Record<string, (c: hono.Context) => Promise<unknown>>): void;
+
 interface ConnectionEntry {
     connector: {
         slug: string;
@@ -283,4 +290,4 @@ declare const storage: {
 
 declare const app: Hono<hono_types.BlankEnv, hono_types.BlankSchema, "/">;
 
-export { type AirtableClient, type AirtableRecord, type ConnectionEntry, type ConnectionFetchOptions, type ConnectionsMap, type DbtClient, type GoogleAnalyticsClient, type KintoneClient, type PresignedGetResult, PresignedHttpsTransport, type PresignedPutResult, type QueryFn, type GetResult as StorageGetResult, type StorageListItem, type ListOptions as StorageListOptions, type StorageListResult, type StorageMetadata, type PutOptions as StoragePutOptions, type StorageTransport, StorageUploadsClient, type StorageUsageDelta, type WixStoreClient, connection, createAirtableClient, createDbtClient, createGoogleAnalyticsClient, createKintoneClient, createWixStoreClient, app as default, getQuery, loadConnections, storage };
+export { type AirtableClient, type AirtableRecord, type ConnectionEntry, type ConnectionFetchOptions, type ConnectionsMap, type DbtClient, type GoogleAnalyticsClient, type KintoneClient, type PresignedGetResult, PresignedHttpsTransport, type PresignedPutResult, type QueryFn, type GetResult as StorageGetResult, type StorageListItem, type ListOptions as StorageListOptions, type StorageListResult, type StorageMetadata, type PutOptions as StoragePutOptions, type StorageTransport, StorageUploadsClient, type StorageUsageDelta, type WixStoreClient, connection, createAirtableClient, createDbtClient, createGoogleAnalyticsClient, createKintoneClient, createWixStoreClient, app as default, getQuery, loadConnections, registerBundledHandlers, storage };

package/dist/index.js

@@ -47707,31 +47707,29 @@ function validateHandlerPath(dirPath, handlerPath) {
   }
   return absolute;
 }
-var jitiInstance = null;
-var jitiModuleCache = /* @__PURE__ */ new Map();
-async function loadTsHandlerWithJiti(absolutePath) {
-  const cached = jitiModuleCache.get(absolutePath);
-  if (cached) return cached;
-  if (!jitiInstance) {
-    const { createJiti } = await import("jiti");
-    jitiInstance = createJiti(import.meta.url, { fsCache: false });
-  }
-  const mod = await jitiInstance.import(absolutePath);
-  jitiModuleCache.set(absolutePath, mod);
-  return mod;
-}
-async function loadTypeScriptHandler(absolutePath) {
-  let mod;
+var bundledHandlers = {};
+function registerBundledHandlers(handlers) {
+  bundledHandlers = handlers;
+}
+async function loadTypeScriptHandler(slug, absolutePath) {
   if (viteServer) {
     const module = viteServer.moduleGraph.getModuleById(absolutePath);
     if (module) viteServer.moduleGraph.invalidateModule(module);
-    mod = await viteServer.ssrLoadModule(absolutePath);
-  } else {
-    mod = await loadTsHandlerWithJiti(absolutePath);
+    const mod = await viteServer.ssrLoadModule(absolutePath);
+    const handler2 = mod.default;
+    if (typeof handler2 !== "function") {
+      throw new Error(`Handler must export a default function: ${absolutePath}`);
+    }
+    return handler2;
+  }
+  if (!(slug in bundledHandlers)) {
+    throw new Error(
+      `Bundled handler not found for server logic: ${slug} (not compiled into the build)`
+    );
   }
-  const handler = mod.default;
+  const handler = bundledHandlers[slug];
   if (typeof handler !== "function") {
-    throw new Error(`Handler must export a default function: ${absolutePath}`);
+    throw new Error(`Server logic '${slug}' must export a default function`);
   }
   return handler;
 }
@@ -48028,7 +48026,7 @@ app.get("/:slug", async (c) => {
   }
   try {
     if (ds._isTypescript && ds._tsHandlerPath) {
-      const handler = await loadTypeScriptHandler(ds._tsHandlerPath);
+      const handler = await loadTypeScriptHandler(slug, ds._tsHandlerPath);
       const result = await handler(c);
       return result;
     } else {
@@ -48056,7 +48054,7 @@ app.post("/:slug", async (c) => {
     const ttl = cacheConfig?.ttl ?? 0;
     if (ttl <= 0) {
       if (ds._isTypescript && ds._tsHandlerPath) {
-        const handler = await loadTypeScriptHandler(ds._tsHandlerPath);
+        const handler = await loadTypeScriptHandler(slug, ds._tsHandlerPath);
         const result = await handler(c);
         return result;
       } else {
@@ -48080,7 +48078,7 @@ app.post("/:slug", async (c) => {
         void (async () => {
           try {
             if (ds._isTypescript && ds._tsHandlerPath) {
-              const tsHandler = await loadTypeScriptHandler(ds._tsHandlerPath);
+              const tsHandler = await loadTypeScriptHandler(slug, ds._tsHandlerPath);
               const freshResponse = await tsHandler(c);
               const outcome = await cacheTypescriptResponse(freshResponse);
               if (outcome.cacheable) {
@@ -48104,7 +48102,7 @@ app.post("/:slug", async (c) => {
       }
     }
     if (ds._isTypescript && ds._tsHandlerPath) {
-      const handler = await loadTypeScriptHandler(ds._tsHandlerPath);
+      const handler = await loadTypeScriptHandler(slug, ds._tsHandlerPath);
       const response = await handler(c);
       const outcome = await cacheTypescriptResponse(response);
       if (outcome.cacheable) {
@@ -48568,5 +48566,6 @@ export {
   src_default as default,
   getQuery,
   loadConnections,
+  registerBundledHandlers,
   storage
 };

package/dist/main.d.ts

@@ -1,4 +1,5 @@
 import app from './index.js';
+export { registerBundledHandlers } from './index.js';
 import 'hono/types';
 import 'hono';
 

package/dist/main.js

@@ -47440,31 +47440,29 @@ function validateHandlerPath(dirPath, handlerPath) {
   }
   return absolute;
 }
-var jitiInstance = null;
-var jitiModuleCache = /* @__PURE__ */ new Map();
-async function loadTsHandlerWithJiti(absolutePath) {
-  const cached = jitiModuleCache.get(absolutePath);
-  if (cached) return cached;
-  if (!jitiInstance) {
-    const { createJiti } = await import("jiti");
-    jitiInstance = createJiti(import.meta.url, { fsCache: false });
-  }
-  const mod = await jitiInstance.import(absolutePath);
-  jitiModuleCache.set(absolutePath, mod);
-  return mod;
-}
-async function loadTypeScriptHandler(absolutePath) {
-  let mod;
+var bundledHandlers = {};
+function registerBundledHandlers(handlers) {
+  bundledHandlers = handlers;
+}
+async function loadTypeScriptHandler(slug, absolutePath) {
   if (viteServer) {
     const module = viteServer.moduleGraph.getModuleById(absolutePath);
     if (module) viteServer.moduleGraph.invalidateModule(module);
-    mod = await viteServer.ssrLoadModule(absolutePath);
-  } else {
-    mod = await loadTsHandlerWithJiti(absolutePath);
+    const mod = await viteServer.ssrLoadModule(absolutePath);
+    const handler2 = mod.default;
+    if (typeof handler2 !== "function") {
+      throw new Error(`Handler must export a default function: ${absolutePath}`);
+    }
+    return handler2;
+  }
+  if (!(slug in bundledHandlers)) {
+    throw new Error(
+      `Bundled handler not found for server logic: ${slug} (not compiled into the build)`
+    );
   }
-  const handler = mod.default;
+  const handler = bundledHandlers[slug];
   if (typeof handler !== "function") {
-    throw new Error(`Handler must export a default function: ${absolutePath}`);
+    throw new Error(`Server logic '${slug}' must export a default function`);
   }
   return handler;
 }
@@ -47761,7 +47759,7 @@ app.get("/:slug", async (c) => {
   }
   try {
     if (ds._isTypescript && ds._tsHandlerPath) {
-      const handler = await loadTypeScriptHandler(ds._tsHandlerPath);
+      const handler = await loadTypeScriptHandler(slug, ds._tsHandlerPath);
       const result = await handler(c);
       return result;
     } else {
@@ -47789,7 +47787,7 @@ app.post("/:slug", async (c) => {
     const ttl = cacheConfig?.ttl ?? 0;
     if (ttl <= 0) {
       if (ds._isTypescript && ds._tsHandlerPath) {
-        const handler = await loadTypeScriptHandler(ds._tsHandlerPath);
+        const handler = await loadTypeScriptHandler(slug, ds._tsHandlerPath);
         const result = await handler(c);
         return result;
       } else {
@@ -47813,7 +47811,7 @@ app.post("/:slug", async (c) => {
         void (async () => {
           try {
             if (ds._isTypescript && ds._tsHandlerPath) {
-              const tsHandler = await loadTypeScriptHandler(ds._tsHandlerPath);
+              const tsHandler = await loadTypeScriptHandler(slug, ds._tsHandlerPath);
               const freshResponse = await tsHandler(c);
               const outcome = await cacheTypescriptResponse(freshResponse);
               if (outcome.cacheable) {
@@ -47837,7 +47835,7 @@ app.post("/:slug", async (c) => {
       }
     }
     if (ds._isTypescript && ds._tsHandlerPath) {
-      const handler = await loadTypeScriptHandler(ds._tsHandlerPath);
+      const handler = await loadTypeScriptHandler(slug, ds._tsHandlerPath);
       const response = await handler(c);
       const outcome = await cacheTypescriptResponse(response);
       if (outcome.cacheable) {
@@ -48242,5 +48240,6 @@ src_default.get("*", (c) => {
 });
 var main_default = src_default;
 export {
-  main_default as default
+  main_default as default,
+  registerBundledHandlers
 };

package/dist/vite-plugin.d.ts

@@ -1,7 +1,6 @@
 import { Plugin } from 'vite';
 
 interface SquadbasePluginOptions {
-    buildEntry?: string;
     devEntry?: string;
     external?: string[];
     exclude?: RegExp[];

package/dist/vite-plugin.js

@@ -622,6 +622,7 @@ import devServer from "@hono/vite-dev-server";
 import nodeAdapter from "@hono/vite-dev-server/node";
 import { fileURLToPath } from "url";
 import path3 from "path";
+import fs from "fs";
 
 // src/registry.ts
 import { readdir, readFile as readFile2, mkdir } from "fs/promises";
@@ -47421,6 +47422,23 @@ var viteServer = null;
 function setViteServer(server) {
   viteServer = server;
 }
+function validateHandlerPath(dirPath, handlerPath) {
+  const normalizedDir = path2.resolve(dirPath);
+  const dirBase = path2.basename(normalizedDir);
+  let normalized = handlerPath.replace(/^\.?[/\\]/, "");
+  const prefix = dirBase + "/";
+  if (normalized.startsWith(prefix)) {
+    normalized = normalized.slice(prefix.length);
+  }
+  const absolute = path2.resolve(dirPath, normalized);
+  if (!absolute.startsWith(normalizedDir + path2.sep)) {
+    throw new Error(`Handler path escapes server-logic directory: ${handlerPath}`);
+  }
+  if (!absolute.endsWith(".ts")) {
+    throw new Error(`Handler must be a .ts file: ${handlerPath}`);
+  }
+  return absolute;
+}
 var defaultServerLogicDir = path2.join(process.cwd(), "server-logic");
 
 // src/vite-plugin.ts
@@ -47435,20 +47453,17 @@ var DEFAULT_EXCLUDE = [
   /^\/node_modules\/.*/,
   /^(?!\/api)/
 ];
-function resolveEntry(entry) {
-  if (entry.startsWith(".") || entry.startsWith("/")) return entry;
-  try {
-    const resolvedUrl = import.meta.resolve(entry);
-    const absolutePath = fileURLToPath(resolvedUrl);
-    const relativePath = path3.relative(process.cwd(), absolutePath).replace(/\\/g, "/");
-    return "./" + relativePath;
-  } catch {
-    return entry;
-  }
+var SERVER_LOGICS_VIRTUAL = "virtual:squadbase-server-logics";
+var SERVER_LOGICS_RESOLVED = "\0" + SERVER_LOGICS_VIRTUAL;
+function resolveServerBuildEntry() {
+  const absolute = fileURLToPath(new URL("../build-entry/server-entry.mjs", import.meta.url));
+  return "./" + path3.relative(process.cwd(), absolute).replace(/\\/g, "/");
+}
+function resolveServerLogicDir() {
+  return process.env.SERVER_LOGIC_DIR || process.env.DATA_SOURCE_DIR || path3.resolve(process.cwd(), "server-logic");
 }
 function squadbasePlugin(options = {}) {
   const {
-    buildEntry = "@squadbase/vite-server/main",
     devEntry = "@squadbase/vite-server",
     external = [
       "pg",
@@ -47460,16 +47475,68 @@ function squadbasePlugin(options = {}) {
       "@aws-sdk/client-cost-explorer",
       "@aws-sdk/client-redshift-data",
       "@google-analytics/data",
-      "@kintone/rest-api-client",
-      // jiti はランタイムで server-logic/*.ts をトランスパイルするため、
-      // @hono/vite-build がサーバービルドにバンドルしないよう external にする。
-      "jiti"
+      "@kintone/rest-api-client"
     ],
     exclude = DEFAULT_EXCLUDE
   } = options;
   const isServerBuild = (_, { command, mode }) => command === "build" && mode !== "client";
+  const serverLogicBarrelPlugin = {
+    name: "squadbase-server-logic-barrel",
+    apply: isServerBuild,
+    resolveId(id) {
+      if (id === SERVER_LOGICS_VIRTUAL) return SERVER_LOGICS_RESOLVED;
+      return null;
+    },
+    load(id) {
+      if (id !== SERVER_LOGICS_RESOLVED) return null;
+      const dir = resolveServerLogicDir();
+      let jsonFiles = [];
+      try {
+        jsonFiles = fs.readdirSync(dir).filter((f) => f.endsWith(".json"));
+      } catch {
+      }
+      let imports = "";
+      let entries = "";
+      jsonFiles.forEach((file, i) => {
+        const slug = file.replace(/\.json$/, "");
+        let raw;
+        try {
+          raw = JSON.parse(fs.readFileSync(path3.join(dir, file), "utf-8"));
+        } catch {
+          console.warn(`[squadbase] skipping ${file}: invalid JSON`);
+          return;
+        }
+        const parsed = anyJsonServerLogicSchema.safeParse(raw);
+        if (!parsed.success) return;
+        const def = parsed.data;
+        if (def.type !== "typescript") return;
+        let handlerAbs;
+        try {
+          handlerAbs = validateHandlerPath(dir, def.handlerPath);
+        } catch (e) {
+          console.warn(
+            `[squadbase] skipping server logic '${slug}': ${e.message}`
+          );
+          return;
+        }
+        if (!fs.existsSync(handlerAbs)) {
+          console.warn(
+            `[squadbase] skipping server logic '${slug}': handler file not found (${def.handlerPath})`
+          );
+          return;
+        }
+        imports += `import h${i} from ${JSON.stringify(handlerAbs)};
+`;
+        entries += `  ${JSON.stringify(slug)}: h${i},
+`;
+      });
+      return `${imports}export const HANDLERS = {
+${entries}};
+`;
+    }
+  };
   const rawBuildPlugin = buildPlugin({
-    entry: resolveEntry(buildEntry),
+    entry: resolveServerBuildEntry(),
     outputDir: "./dist/server",
     output: "index.js",
     external
@@ -47492,7 +47559,7 @@ function squadbasePlugin(options = {}) {
       setViteServer(server);
     }
   };
-  return [...buildPlugins, ...devPlugins, viteServerInjectionPlugin];
+  return [serverLogicBarrelPlugin, ...buildPlugins, ...devPlugins, viteServerInjectionPlugin];
 }
 export {
   squadbasePlugin

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@squadbase/vite-server",
-  "version": "0.1.19-dev.a00d9c3",
+  "version": "0.1.19-dev.f16bde6",
   "type": "module",
   "exports": {
     ".": {
@@ -325,7 +325,8 @@
     }
   },
   "files": [
-    "dist"
+    "dist",
+    "build-entry"
   ],
   "publishConfig": {
     "access": "public",
@@ -355,7 +356,6 @@
     "@kintone/rest-api-client": "^5.5.0",
     "google-auth-library": "^9.15.1",
     "hono": "^4.12.25",
-    "jiti": "^2.7.0",
     "mongodb": "^7.1.1",
     "mssql": "^11.0.1",
     "mysql2": "^3.11.0",