@dreamkit/dev 0.0.9 → 0.0.11

package/lib/DreamkitDevServer.d.ts

@@ -10,18 +10,22 @@ export type DreamkitDevExternalOptions = {
 export type DreamkitDevInOptions = DreamkitPluginOptions & DreamkitDevExternalOptions;
 export type DreamkitDevOptions = OutDreamkitPluginOptions & DreamkitDevExternalOptions;
 export declare class DreamkitDevServer {
+    static instanceKey: string;
     readonly app: App;
     readonly entry: VirtualShaking;
     protected runtimeServer: ViteDevServer | undefined;
     protected runtime: ViteRuntime | undefined;
     readonly options: DreamkitDevOptions;
     constructor(inOptions: DreamkitDevInOptions);
+    static instance(): DreamkitDevServer;
+    static saveInstance(instance: DreamkitDevServer): void;
     fetch(path: string): Promise<any>;
     fetchDefault<T>(path: string): Promise<T>;
     fetchRoute(path: string): Promise<Route>;
     findRouteObjects(): Promise<Record<string, any>>;
     fetchEntryObjects(): Promise<Record<string, any>>;
     prepare(includeRouteFileObjects?: boolean): Promise<void>;
+    start(): Promise<void>;
     stop(): Promise<void>;
 }
 //# sourceMappingURL=DreamkitDevServer.d.ts.map

package/lib/DreamkitDevServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DreamkitDevServer.d.ts","sourceRoot":"","sources":["../src/DreamkitDevServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,qBAAqB,EACrB,wBAAwB,EACzB,MAAM,cAAc,CAAC;AAItB,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAMpD,OAAO,EAAE,GAAG,EAAW,KAAK,EAAU,MAAM,eAAe,CAAC;AAE5D,OAAO,EAAmC,aAAa,EAAE,MAAM,MAAM,CAAC;AAGtE,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE3C,MAAM,MAAM,0BAA0B,GAAG;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,qBAAqB,GACtD,0BAA0B,CAAC;AAC7B,MAAM,MAAM,kBAAkB,GAAG,wBAAwB,GACvD,0BAA0B,CAAC;AAE7B,qBAAa,iBAAiB;IAC5B,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;IAClB,QAAQ,CAAC,KAAK,EAAE,cAAc,CAAC;IAC/B,SAAS,CAAC,aAAa,EAAE,aAAa,GAAG,SAAS,CAAC;IACnD,SAAS,CAAC,OAAO,EAAE,WAAW,GAAG,SAAS,CAAC;IAC3C,QAAQ,CAAC,OAAO,EAAE,kBAAkB,CAAC;gBACzB,SAAS,EAAE,oBAAoB;IA6BrC,KAAK,CAAC,IAAI,EAAE,MAAM;IAMlB,YAAY,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC;IAIzC,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;IAKxC,gBAAgB;IAyBhB,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAIjD,OAAO,CAAC,uBAAuB,UAAO;IAqCtC,IAAI;CAIX"}
+{"version":3,"file":"DreamkitDevServer.d.ts","sourceRoot":"","sources":["../src/DreamkitDevServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,qBAAqB,EACrB,wBAAwB,EACzB,MAAM,cAAc,CAAC;AAItB,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAMpD,OAAO,EAAE,GAAG,EAAW,KAAK,EAAU,MAAM,eAAe,CAAC;AAE5D,OAAO,EAAmC,aAAa,EAAE,MAAM,MAAM,CAAC;AAGtE,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE3C,MAAM,MAAM,0BAA0B,GAAG;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,qBAAqB,GACtD,0BAA0B,CAAC;AAC7B,MAAM,MAAM,kBAAkB,GAAG,wBAAwB,GACvD,0BAA0B,CAAC;AAE7B,qBAAa,iBAAiB;IAC5B,MAAM,CAAC,WAAW,SAAmB;IACrC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;IAClB,QAAQ,CAAC,KAAK,EAAE,cAAc,CAAC;IAC/B,SAAS,CAAC,aAAa,EAAE,aAAa,GAAG,SAAS,CAAC;IACnD,SAAS,CAAC,OAAO,EAAE,WAAW,GAAG,SAAS,CAAC;IAC3C,QAAQ,CAAC,OAAO,EAAE,kBAAkB,CAAC;gBACzB,SAAS,EAAE,oBAAoB;IA6B3C,MAAM,CAAC,QAAQ,IAAI,iBAAiB;IAKpC,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAE,iBAAiB;IAGzC,KAAK,CAAC,IAAI,EAAE,MAAM;IAMlB,YAAY,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC;IAIzC,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;IAKxC,gBAAgB;IAyBhB,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAIjD,OAAO,CAAC,uBAAuB,UAAO;IAoCtC,KAAK;IAIL,IAAI;CAKX"}

package/lib/DreamkitDevServer.js

@@ -10,6 +10,7 @@ import { createServer, createViteRuntime } from "vite";
 import solidPlugin from "vite-plugin-solid";
 import tsconfigPlugin from "vite-tsconfig-paths";
 export class DreamkitDevServer {
+    static instanceKey = "dk:dev-server";
     app;
     entry;
     runtimeServer;
@@ -44,6 +45,15 @@ export class DreamkitDevServer {
             },
         });
     }
+    static instance() {
+        const value = globalThis[DreamkitDevServer.instanceKey];
+        if (!value)
+            throw new Error("DreamkitDevServer instance not found");
+        return value;
+    }
+    static saveInstance(instance) {
+        globalThis[DreamkitDevServer.instanceKey] = instance;
+    }
     async fetch(path) {
         //const mod = $server.moduleGraph.getModuleById(shaking.entry);
         //if (mod) $server.moduleGraph.invalidateModule(mod);
@@ -119,7 +129,12 @@ export class DreamkitDevServer {
         };
         await this.app.add(objects);
     }
+    async start() {
+        await this.app.start();
+    }
     async stop() {
+        if (this.app.started)
+            await this.app.stop();
         await this.runtimeServer?.close();
         await this.runtime?.destroy();
     }

package/lib/adapters/solid-start/dev-server.d.ts

@@ -0,0 +1,8 @@
+import { DreamkitDevInOptions, DreamkitDevServer } from "../../DreamkitDevServer.js";
+import { DreamkitPluginOptions } from "../../options.js";
+import { VinxiApp } from "../../utils/vinxi.js";
+export declare function fetchDreamkitDevOptions(options: {
+    root: string;
+}): Promise<DreamkitDevInOptions>;
+export declare function createDreamkitDevServer(vinxiApp: VinxiApp, inOptions?: DreamkitPluginOptions): DreamkitDevServer;
+//# sourceMappingURL=dev-server.d.ts.map

package/lib/adapters/solid-start/dev-server.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"dev-server.d.ts","sourceRoot":"","sources":["../../../src/adapters/solid-start/dev-server.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,oBAAoB,EACpB,iBAAiB,EAClB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAKzD,OAAO,EAML,QAAQ,EAET,MAAM,sBAAsB,CAAC;AAsB9B,wBAAsB,uBAAuB,CAAC,OAAO,EAAE;IACrD,IAAI,EAAE,MAAM,CAAC;CACd,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAqDhC;AAuCD,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,QAAQ,EAClB,SAAS,GAAE,qBAA0B,qBAiKtC"}

package/lib/adapters/{solid-start.js → solid-start/dev-server.js}

@@ -1,12 +1,14 @@
-import { DreamkitDevServer, } from "../DreamkitDevServer.js";
-import { generate } from "../actions/generate.js";
-import { tryGenerate } from "../utils/ast.js";
-import { execute } from "../utils/runtime.js";
-import { createDelayedFunction } from "../utils/timeout.js";
-import { transformCode } from "../utils/transform.js";
-import { onChangeVinxiRoutes, } from "../utils/vinxi.js";
-import { isRoute, $route } from "@dreamkit/app";
-import { join, resolve } from "path";
+import { DreamkitDevServer, } from "../../DreamkitDevServer.js";
+import { generate } from "../../actions/generate.js";
+import { tryGenerate } from "../../utils/ast.js";
+import { execute } from "../../utils/runtime.js";
+import { createDelayedFunction } from "../../utils/timeout.js";
+import { transformCode } from "../../utils/transform.js";
+import { addVinxiPlugin, addVinxiRollupPlugin, isVinxiBuild, onChangeVinxiRoutes, } from "../../utils/vinxi.js";
+import { isRoute, $route, App } from "@dreamkit/app";
+import { existsSync } from "fs";
+import { join, normalize, relative, resolve } from "path";
+import { fileURLToPath } from "url";
 const isEntryRoute = (id, value) => !id.startsWith("/") && isRoute(value);
 // StackBlitz Polyfill
 class $CustomEvent extends Event {
@@ -77,7 +79,7 @@ function addVinxiEntryRoutes(vinxiApp, objectId, objectValue, entryPath) {
                 filePath: entryPath,
             };
             if (!objectValue.$options.path) {
-                console.warn("Missing route path", { id: objectId });
+                console.warn("Missing route path at dreamkit entry", { id: objectId });
                 continue;
             }
             routes._addRoute(vinxiRoute);
@@ -88,12 +90,18 @@ function addVinxiEntryRoutes(vinxiApp, objectId, objectValue, entryPath) {
     }
 }
 export function createDreamkitDevServer(vinxiApp, inOptions = {}) {
-    const ssrRouter = vinxiApp.config.routers.find((config) => config.name === "ssr").internals.routes;
+    const ssrFileRouter = vinxiApp.config.routers.find((config) => config.name === "ssr").internals.routes;
     const server = new DreamkitDevServer({
         root: resolve(vinxiApp.config.root ?? "."),
-        routeDir: ssrRouter.config.dir,
+        routeDir: ssrFileRouter.config.dir,
         ...inOptions,
     });
+    DreamkitDevServer.saveInstance(server);
+    App.saveInstance(server.app);
+    const selfPath = (file, rel) => {
+        const path = fileURLToPath(new URL(`./${file}`, import.meta.url));
+        return normalize(rel ? relative(server.options.root, path) : path);
+    };
     async function onBuildStart() {
         await server.prepare(false);
         for (const route of server.app.routes) {
@@ -120,7 +128,19 @@ export function createDreamkitDevServer(vinxiApp, inOptions = {}) {
         await server.stop();
     }
     async function onDevStart() {
-        const tryGenerate = createDelayedFunction(() => generate(server), 300);
+        const tryGenerate = createDelayedFunction(async () => {
+            const paths = new Set();
+            server.app.routes.forEach(async (route) => {
+                const path = route.$options.path;
+                if (path) {
+                    if (paths.has(path)) {
+                        console.warn("Duplicated route path", { path });
+                    }
+                    paths.add(path);
+                }
+            });
+            await generate(server);
+        }, 300);
         server.app
             .on("change", (data) => {
             if (isRoute(data.value)) {
@@ -180,6 +200,26 @@ export function createDreamkitDevServer(vinxiApp, inOptions = {}) {
             }
         }
     }
+    const ssrRouter = vinxiApp.getRouter("ssr");
+    ssrRouter.middleware = selfPath("middleware.js", true);
+    if (isVinxiBuild()) {
+        const dreamkitEntryId = "dk:entry";
+        const dreamkitEntry = join(server.options.root, "src/dreamkit.tsx").replaceAll("\\", "/");
+        const existsDreamkitEntry = existsSync(dreamkitEntry);
+        addVinxiPlugin(vinxiApp, selfPath("prod-server.js"));
+        addVinxiRollupPlugin(vinxiApp, {
+            name: "dk:entry",
+            resolveId(id) {
+                if (id === dreamkitEntryId) {
+                    return existsDreamkitEntry ? dreamkitEntry : `\0${dreamkitEntryId}`;
+                }
+            },
+            load(id) {
+                if (!existsDreamkitEntry && id === `\0${dreamkitEntryId}`)
+                    return { code: "export {}" };
+            },
+        });
+    }
     vinxiApp.hooks.hook("app:build:router:start", onBuildStart);
     vinxiApp.hooks.hook("app:build:router:vite:end", onBuildEnd);
     vinxiApp.hooks.hook("app:build:nitro:start", onBuildStart);

package/lib/adapters/solid-start/middleware.d.ts

@@ -0,0 +1,6 @@
+import { type HTTPEvent } from "vinxi/http";
+declare const _default: {
+    onRequest: ((event: HTTPEvent) => Promise<void>)[];
+};
+export default _default;
+//# sourceMappingURL=middleware.d.ts.map

package/lib/adapters/solid-start/middleware.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../../../src/adapters/solid-start/middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,SAAS,EAAkC,MAAM,YAAY,CAAC;;wBAI1D,SAAS;;AAF3B,wBASE"}

package/lib/adapters/solid-start/middleware.js

@@ -0,0 +1,13 @@
+import { App } from "@dreamkit/app";
+import { getWebRequest, sendWebResponse } from "vinxi/http";
+export default {
+    onRequest: [
+        async (event) => {
+            const app = App.instance();
+            const request = getWebRequest(event);
+            const response = await app.request(request);
+            if (response)
+                await sendWebResponse(event, response);
+        },
+    ],
+};

package/lib/adapters/solid-start/prod-server.d.ts

@@ -0,0 +1,2 @@
+export default function (_nitro: any): Promise<void>;
+//# sourceMappingURL=prod-server.d.ts.map

package/lib/adapters/solid-start/prod-server.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"prod-server.d.ts","sourceRoot":"","sources":["../../../src/adapters/solid-start/prod-server.ts"],"names":[],"mappings":"AAIA,yBAA+B,MAAM,EAAE,GAAG,iBAKzC"}

package/lib/adapters/solid-start/prod-server.js

@@ -0,0 +1,9 @@
+import { App } from "@dreamkit/app";
+// @ts-ignore
+import * as objects from "dk:entry";
+export default async function (_nitro) {
+    const app = new App();
+    App.saveInstance(app);
+    await app.add(objects);
+    await app.start();
+}

package/lib/bin.js

@@ -1,6 +1,6 @@
 import { DreamkitDevServer } from "./DreamkitDevServer.js";
 import { generate } from "./actions/generate.js";
-import { fetchDreamkitDevOptions } from "./adapters/solid-start.js";
+import { fetchDreamkitDevOptions } from "./adapters/solid-start/dev-server.js";
 import { createCommand } from "commander";
 import { relative, resolve } from "path";
 const program = createCommand();

package/lib/plugins/dreamkit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dreamkit.d.ts","sourceRoot":"","sources":["../../src/plugins/dreamkit.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAItD,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAE9B,wBAAgB,cAAc,CAAC,SAAS,GAAE,qBAA0B,GAAG,MAAM,CAiD5E"}
+{"version":3,"file":"dreamkit.d.ts","sourceRoot":"","sources":["../../src/plugins/dreamkit.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAItD,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAE9B,wBAAgB,cAAc,CAAC,SAAS,GAAE,qBAA0B,GAAG,MAAM,CAuD5E"}

package/lib/plugins/dreamkit.js

@@ -1,12 +1,14 @@
-import { createDreamkitDevServer } from "../adapters/solid-start.js";
+import { createDreamkitDevServer } from "../adapters/solid-start/dev-server.js";
 import { tryGenerate } from "../utils/ast.js";
 import { transformCode } from "../utils/transform.js";
-import { onVinxiApp } from "../utils/vinxi.js";
+import { isVinxiBuild, onVinxiApp } from "../utils/vinxi.js";
 export function dreamkitPlugin(inOptions = {}) {
     let isSolidStart = false;
     let server;
-    const cleanup = onVinxiApp((app) => {
+    const cleanup = onVinxiApp(async (app) => {
         server = createDreamkitDevServer(app, inOptions);
+        if (!isVinxiBuild())
+            await server.start();
     });
     return {
         name: "dreamkit",
@@ -26,7 +28,12 @@ export function dreamkitPlugin(inOptions = {}) {
             const searchParams = new URLSearchParams(searchString);
             const dreamkitPickEntry = searchParams.get("dk-pick-entry");
             const picks = searchParams.getAll("pick");
-            const transforms = [{ toSolidLink: true }];
+            const transforms = [
+                {
+                    toSolidLink: true,
+                    toSolidServerAction: true,
+                },
+            ];
             if (dreamkitPickEntry) {
                 transforms.push({
                     pickExport: [dreamkitPickEntry],

package/lib/transforms/replace-import-spec.d.ts

@@ -1,8 +1,9 @@
 import { ParseResult } from "@babel/parser";
 import * as t from "@babel/types";
 export declare function replaceImportSpec(ast: ParseResult<t.File>, options: {
-    spec: string[];
+    spec?: string[] | Record<string, string>;
     source: string;
-    newSource: string;
+    newSource?: string;
+    onRenameSpec?: (prev: string, next: string) => void;
 }): number;
 //# sourceMappingURL=replace-import-spec.d.ts.map

package/lib/transforms/replace-import-spec.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"replace-import-spec.d.ts","sourceRoot":"","sources":["../../src/transforms/replace-import-spec.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,KAAK,CAAC,MAAM,cAAc,CAAC;AAElC,wBAAgB,iBAAiB,CAC/B,GAAG,EAAE,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,EACxB,OAAO,EAAE;IACP,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACnB,UAqCF"}
+{"version":3,"file":"replace-import-spec.d.ts","sourceRoot":"","sources":["../../src/transforms/replace-import-spec.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,KAAK,CAAC,MAAM,cAAc,CAAC;AAElC,wBAAgB,iBAAiB,CAC/B,GAAG,EAAE,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,EACxB,OAAO,EAAE;IACP,IAAI,CAAC,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACzC,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CACrD,UA6FF"}

package/lib/transforms/replace-import-spec.js

@@ -2,29 +2,80 @@ import { traverse } from "../utils/babel.js";
 import * as t from "@babel/types";
 export function replaceImportSpec(ast, options) {
     let changes = 0;
-    traverse(ast, {
-        ImportDeclaration(path) {
-            const { node } = path;
-            if (node.source.value === options.source) {
-                node.specifiers = node.specifiers.filter((spec) => {
-                    if (spec.type === "ImportSpecifier" &&
-                        spec.imported.type === "Identifier" &&
-                        options.spec.includes(spec.imported.name)) {
-                        changes++;
-                        ast.program.body.unshift(t.importDeclaration([
-                            t.importSpecifier(t.identifier(spec.imported.name), t.identifier(spec.imported.name)),
-                        ], t.stringLiteral(options.newSource)));
-                        return false;
+    if (Array.isArray(options.spec) && options.newSource) {
+        const specArray = options.spec;
+        traverse(ast, {
+            ImportDeclaration(path) {
+                const { node } = path;
+                if (node.source.value === options.source) {
+                    node.specifiers = node.specifiers.filter((spec) => {
+                        if (spec.type === "ImportSpecifier" &&
+                            spec.imported.type === "Identifier" &&
+                            specArray.includes(spec.imported.name)) {
+                            changes++;
+                            ast.program.body.unshift(t.importDeclaration([
+                                t.importSpecifier(t.identifier(spec.imported.name), t.identifier(spec.imported.name)),
+                            ], t.stringLiteral(options.newSource)));
+                            return false;
+                        }
+                        return true;
+                    });
+                    if (changes) {
+                        if (!node.specifiers.length)
+                            path.remove();
                     }
-                    return true;
-                });
-                if (changes) {
-                    if (!node.specifiers.length)
+                }
+            },
+        });
+    }
+    else if (options.spec) {
+        const specMap = options.spec;
+        traverse(ast, {
+            ImportDeclaration(path) {
+                const { node } = path;
+                if (node.source.value === options.source) {
+                    path.traverse({
+                        ImportSpecifier(spec) {
+                            if (spec.node.imported.type === "Identifier") {
+                                const specName = spec.node.imported.name;
+                                if (specMap[specName]) {
+                                    const newSpecName = specMap[specName];
+                                    const newSpecNameAlias = spec.scope.generateUid(newSpecName);
+                                    options.onRenameSpec?.(specName, newSpecNameAlias);
+                                    changes++;
+                                    spec.scope.rename(specName, newSpecNameAlias);
+                                    spec.node.imported = t.identifier(newSpecName);
+                                    if (options.newSource) {
+                                        spec.remove();
+                                        ast.program.body.unshift(t.importDeclaration([
+                                            t.importSpecifier(t.identifier(newSpecNameAlias), t.identifier(newSpecName)),
+                                        ], t.stringLiteral(options.newSource)));
+                                    }
+                                }
+                            }
+                        },
+                    });
+                    if (changes && !node.specifiers.length)
                         path.remove();
-                    path.scope.crawl();
                 }
-            }
-        },
-    });
+            },
+        });
+    }
+    else if (options.newSource) {
+        traverse(ast, {
+            ImportDeclaration(path) {
+                if (path.node.source.value === options.source) {
+                    changes++;
+                    path.node.source = t.stringLiteral(options.newSource);
+                }
+            },
+        });
+    }
+    if (changes)
+        traverse(ast, {
+            Program(programPath) {
+                programPath.scope.crawl();
+            },
+        });
     return changes;
 }

package/lib/transforms/to-solid-route.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"to-solid-route.d.ts","sourceRoot":"","sources":["../../src/transforms/to-solid-route.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,KAAK,CAAC,MAAM,cAAc,CAAC;AAElC,wBAAgB,YAAY,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,UAgMpD"}
+{"version":3,"file":"to-solid-route.d.ts","sourceRoot":"","sources":["../../src/transforms/to-solid-route.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,KAAK,CAAC,MAAM,cAAc,CAAC;AAElC,wBAAgB,YAAY,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,UAiMpD"}

package/lib/transforms/to-solid-route.js

@@ -37,7 +37,8 @@ export function toSolidRoute(ast) {
                     // export default login
                     dec.type === "Identifier") {
                         const bind = programPath.scope.bindings[dec.name];
-                        if (bind.path.node.type === "VariableDeclarator" &&
+                        if (bind &&
+                            bind.path.node.type === "VariableDeclarator" &&
                             bind.path.node.init) {
                             dec = bind.path.node.init;
                             path.remove();

package/lib/transforms/to-solid-server-action.d.ts

@@ -0,0 +1,2 @@
+export declare const toSolidServerAction: import("../utils/transform.js").Transform<unknown>;
+//# sourceMappingURL=to-solid-server-action.d.ts.map

package/lib/transforms/to-solid-server-action.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"to-solid-server-action.d.ts","sourceRoot":"","sources":["../../src/transforms/to-solid-server-action.ts"],"names":[],"mappings":"AAaA,eAAO,MAAM,mBAAmB,oDAwD9B,CAAC"}

package/lib/transforms/to-solid-server-action.js

@@ -0,0 +1,111 @@
+import { createCallChains, createConst, defineTransform, getFirstChain, parseCallsChain, } from "../utils/ast.js";
+import { traverse } from "../utils/babel.js";
+import { replaceImportSpec } from "./replace-import-spec.js";
+import * as t from "@babel/types";
+export const toSolidServerAction = defineTransform({
+    onlyIf: (code) => code.includes("$api") && code.includes("dreamkit"),
+    run: (ast) => {
+        let apiId;
+        let changes = replaceImportSpec(ast, {
+            spec: { $api: "$serverApi" },
+            source: "dreamkit",
+            newSource: "dreamkit/adapters/solid.js",
+            onRenameSpec(prev, next) {
+                apiId = next;
+            },
+        });
+        if (apiId) {
+            let clientApiLoc = [];
+            traverse(ast, {
+                Program(programPath) {
+                    const binds = programPath.scope.bindings[apiId];
+                    programPath.traverse;
+                    binds.referencePaths.forEach((path) => {
+                        if (path.node.loc)
+                            clientApiLoc.push(path.node.loc);
+                    });
+                    programPath.traverse({
+                        ExportNamedDeclaration(path) {
+                            if (path.node.declaration) {
+                                if (path.node.declaration.type === "VariableDeclaration") {
+                                    const [dec] = path.node.declaration.declarations;
+                                    const init = dec.init;
+                                    if (dec.id.type === "Identifier" &&
+                                        init?.type === "CallExpression") {
+                                        const first = getFirstChain(init);
+                                        if (clientApiLoc.includes(first?.value.object.loc)) {
+                                            changes++;
+                                            const replaced = createServerAction(programPath, dec.id.name, init, true);
+                                            const index = programPath.node.body.findIndex((node) => node === path.node);
+                                            programPath.node.body.splice(index, 1, ...replaced);
+                                        }
+                                    }
+                                }
+                            }
+                        },
+                    });
+                },
+            });
+        }
+        return changes;
+    },
+});
+function createServerAction(program, name, call, exported = false) {
+    const commonApi = program.scope.generateUid(`base_${name}`);
+    const originalFunc = program.scope.generateUid(`original_${name}`);
+    const serverApi = program.scope.generateUid(`server_${name}`);
+    const chain = parseCallsChain(call);
+    const serverMethods = ["self", "create"];
+    return [
+        // const baseFetchData = $api.params({});
+        createConst(commonApi, createCallChains({
+            ...chain,
+            calls: chain.calls.filter(({ name }) => !serverMethods.includes(name)),
+        })),
+        t.variableDeclaration("let", [
+            t.variableDeclarator(t.identifier(name), t.arrowFunctionExpression([t.identifier("params")], t.blockStatement([
+                // const serverApi = $serverApi.clone(baseFetchData.options).self({}).create(() => {})
+                createConst(serverApi, createCallChains({
+                    ...chain,
+                    calls: [
+                        {
+                            name: "clone",
+                            arguments: [
+                                t.memberExpression(t.identifier(commonApi), t.identifier("options")),
+                            ],
+                        },
+                        ...chain.calls.filter(({ name }) => serverMethods.includes(name)),
+                    ],
+                })),
+                // return await serverApi(params);
+                t.returnStatement(t.awaitExpression(t.callExpression(t.identifier(serverApi), [
+                    t.identifier("params"),
+                ]))),
+            ], [t.directive(t.directiveLiteral("use server"))]), true)),
+        ]),
+        // const originalFetchData = fetchData;
+        createConst(originalFunc, t.identifier(name)),
+        // fetchData = baseFetchData.create(originalFetchData);
+        t.expressionStatement(t.assignmentExpression("=", t.identifier(name), createCallChains({
+            rootName: commonApi,
+            calls: [
+                {
+                    name: "clone",
+                    arguments: [
+                        t.objectExpression([
+                            t.objectProperty(t.identifier("context"), t.nullLiteral()),
+                        ]),
+                    ],
+                },
+                {
+                    name: "create",
+                    arguments: [t.identifier(originalFunc)],
+                },
+            ],
+        }))),
+        exported &&
+            t.exportNamedDeclaration(null, [
+                t.exportSpecifier(t.identifier(name), t.identifier(name)),
+            ]),
+    ].filter((v) => !!v);
+}

package/lib/utils/ast.d.ts

@@ -7,6 +7,16 @@ export declare function parseCode(input: string | string[]): t.Statement[];
 export type ParseFileResult = ParseResult<t.File>;
 export declare function parseFile(code: string): ParseResult<t.File>;
 export declare function tryGenerate(ast: ParseFileResult | undefined, log?: boolean): import("@babel/generator").GeneratorResult | undefined;
+export type Chain = {
+    rootName: string;
+    calls: {
+        name: string;
+        arguments: any[];
+    }[];
+};
+export declare function parseCallsChain(input: t.CallExpression): Chain;
+export declare function createCallChains(chain: Chain): t.CallExpression | t.Identifier;
+export declare function removeChainCalls(input: t.CallExpression, names: string[]): t.CallExpression;
 export declare function getFirstChain(ref: t.Node): {
     identifier: string;
     value: t.MemberExpression;

package/lib/utils/ast.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ast.d.ts","sourceRoot":"","sources":["../../src/utils/ast.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,KAAK,CAAC,MAAM,cAAc,CAAC;AAClC,OAAO,KAAK,KAAK,MAAM,iBAAiB,CAAC;AAIzC,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,iBAIjD;AAED,MAAM,MAAM,eAAe,GAAG,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;AAElD,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,uBAKrC;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,eAAe,GAAG,SAAS,EAAE,GAAG,CAAC,EAAE,OAAO,0DAM1E;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,CAAC,CAAC,IAAI;gBAGrB,MAAM;WACX,CAAC,CAAC,gBAAgB;cAgBhC;AAED,wBAAsB,aAAa,CAAC,IAAI,EAAE,MAAM,uJAQ/C;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,eAAe,YAkBrD;AAED,wBAAsB,yBAAyB,CAAC,IAAI,EAAE,MAAM,qBAG3D;AACD,wBAAgB,eAAe,CAAC,CAAC,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAExE;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,UAAU,yBAI5D;AAED,wBAAgB,eAAe,CAC7B,KAAK,EAAE,CAAC,CAAC,UAAU,GAAG,MAAM,EAC5B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,CAAC,CAAC,UAAU,EAAE,oBAiBrB;AAED,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,CAAC,CAAC,UAAU,GAAG,MAAM,EAC5B,MAAM,EAAE,MAAM,EACd,IAAI,GAAE,CAAC,CAAC,UAAU,EAAO,oBAqB1B;AAED,wBAAgB,UAAU,CAAC,CAAC,SAAS,MAAM,EACzC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,EAC5B,UAAU,EAAE,CAAC,EAAE,EACf,MAAM,EAAE,MAAM,GACb;KAAG,CAAC,IAAI,CAAC,GAAG,MAAM;CAAE,CAkBtB"}
+{"version":3,"file":"ast.d.ts","sourceRoot":"","sources":["../../src/utils/ast.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,KAAK,CAAC,MAAM,cAAc,CAAC;AAClC,OAAO,KAAK,KAAK,MAAM,iBAAiB,CAAC;AAIzC,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,iBAIjD;AAED,MAAM,MAAM,eAAe,GAAG,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;AAElD,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,uBAKrC;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,eAAe,GAAG,SAAS,EAAE,GAAG,CAAC,EAAE,OAAO,0DAM1E;AAED,MAAM,MAAM,KAAK,GAAG;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,GAAG,EAAE,CAAA;KAAE,EAAE,CAAC;CAC7C,CAAC;AAEF,wBAAgB,eAAe,CAAC,KAAK,EAAE,CAAC,CAAC,cAAc,GAAG,KAAK,CAwB9D;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,KAAK,mCAS5C;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,CAAC,CAAC,cAAc,EAAE,KAAK,EAAE,MAAM,EAAE,oBAaxE;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,CAAC,CAAC,IAAI;gBAGrB,MAAM;WACX,CAAC,CAAC,gBAAgB;cAgBhC;AAED,wBAAsB,aAAa,CAAC,IAAI,EAAE,MAAM,uJAQ/C;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,eAAe,YAkBrD;AAED,wBAAsB,yBAAyB,CAAC,IAAI,EAAE,MAAM,qBAG3D;AACD,wBAAgB,eAAe,CAAC,CAAC,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAExE;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,UAAU,yBAI5D;AAED,wBAAgB,eAAe,CAC7B,KAAK,EAAE,CAAC,CAAC,UAAU,GAAG,MAAM,EAC5B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,CAAC,CAAC,UAAU,EAAE,oBAiBrB;AAED,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,CAAC,CAAC,UAAU,GAAG,MAAM,EAC5B,MAAM,EAAE,MAAM,EACd,IAAI,GAAE,CAAC,CAAC,UAAU,EAAO,oBAqB1B;AAED,wBAAgB,UAAU,CAAC,CAAC,SAAS,MAAM,EACzC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,EAC5B,UAAU,EAAE,CAAC,EAAE,EACf,MAAM,EAAE,MAAM,GACb;KAAG,CAAC,IAAI,CAAC,GAAG,MAAM;CAAE,CAkBtB"}

package/lib/utils/ast.js

@@ -22,6 +22,54 @@ export function tryGenerate(ast, log) {
         return generated;
     }
 }
+export function parseCallsChain(input) {
+    let ref = input;
+    let rootName;
+    let calls = [];
+    while (true) {
+        if (ref.callee.type === "MemberExpression") {
+            if (ref.callee.property.type !== "Identifier")
+                throw new Error("Invalid chain");
+            calls.push({
+                name: ref.callee.property.name,
+                arguments: ref.arguments,
+            });
+            if (ref.callee.object.type === "Identifier") {
+                rootName = ref.callee.object.name;
+                break;
+            }
+            else if (ref.callee.object.type === "CallExpression") {
+                ref = ref.callee.object;
+            }
+            else {
+                break;
+            }
+        }
+    }
+    return { rootName, calls: calls.reverse() };
+}
+export function createCallChains(chain) {
+    let ref = t.identifier(chain.rootName);
+    for (const call of chain.calls) {
+        ref = t.callExpression(t.memberExpression(ref, t.identifier(call.name)), call.arguments);
+    }
+    return ref;
+}
+export function removeChainCalls(input, names) {
+    const root = t.cloneNode(input);
+    let ref = root;
+    while (ref.type === "CallExpression") {
+        ref = t.callExpression(ref.callee, ref.arguments);
+        if (ref.callee.type === "MemberExpression") {
+            if (ref.callee.property.type === "Identifier") {
+                if (names.includes(ref.callee.property.name))
+                    continue;
+            }
+            ref = ref.callee.object;
+        }
+    }
+    return root;
+}
 export function getFirstChain(ref) {
     let lastMember;
     while (ref.type === "CallExpression") {

package/lib/utils/transform.d.ts

@@ -11,6 +11,7 @@ declare const $transforms: {
     replaceImportSpec: typeof replaceImportSpec;
     toSolidRoute: typeof toSolidRoute;
     toSolidLink: Transform<unknown>;
+    toSolidServerAction: Transform<unknown>;
 };
 export type TransformObject = {
     [K in keyof typeof $transforms]?: TrueIfUndefined<Parameters<(typeof $transforms)[K] extends Transform<any> ? (typeof $transforms)[K]["run"] : (typeof $transforms)[K] extends TransformRun<any> ? (typeof $transforms)[K] : never>[1]>;

package/lib/utils/transform.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transform.d.ts","sourceRoot":"","sources":["../../src/utils/transform.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AAEzE,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAA0B,eAAe,EAAE,MAAM,UAAU,CAAC;AAEnE,QAAA,MAAM,WAAW;;;;;;;CAOhB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;KAC3B,CAAC,IAAI,MAAM,OAAO,WAAW,CAAC,CAAC,EAAE,eAAe,CAC/C,UAAU,CACR,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,SAAS,CAAC,GAAG,CAAC,GAC1C,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAC9B,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,YAAY,CAAC,GAAG,CAAC,GAC/C,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,GACvB,KAAK,CACZ,CAAC,CAAC,CAAC,CACL;CACF,CAAC;AAEF,MAAM,MAAM,YAAY,CAAC,CAAC,GAAG,GAAG,IAAI,CAClC,GAAG,EAAE,eAAe,EACpB,OAAO,EAAE,CAAC,KACP,MAAM,CAAC;AAEZ,MAAM,MAAM,SAAS,CAAC,CAAC,GAAG,GAAG,IAAI;IAC/B,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,KAAK,OAAO,CAAC;IAC/C,GAAG,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC;CACtB,CAAC;AAEF,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,eAAe,EAAE,+BAuBtE;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,MAAM,EACZ,GAAG,KAAK,EAAE,eAAe,EAAE;;;EAI5B;AAED,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,+BAG1D;AAED,KAAK,eAAe,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC;AAE7D,wBAAgB,kBAAkB,CAChC,EAAE,EAAE,MAAM,EACV,GAAG,UAAU,EAAE,eAAe,EAAE,UAQjC;AAED,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,MAAM,GAAG,eAAe,EAAE,CAK9D"}
+{"version":3,"file":"transform.d.ts","sourceRoot":"","sources":["../../src/utils/transform.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AAEzE,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D,OAAO,EAA0B,eAAe,EAAE,MAAM,UAAU,CAAC;AAEnE,QAAA,MAAM,WAAW;;;;;;;;CAQhB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;KAC3B,CAAC,IAAI,MAAM,OAAO,WAAW,CAAC,CAAC,EAAE,eAAe,CAC/C,UAAU,CACR,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,SAAS,CAAC,GAAG,CAAC,GAC1C,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAC9B,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,YAAY,CAAC,GAAG,CAAC,GAC/C,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,GACvB,KAAK,CACZ,CAAC,CAAC,CAAC,CACL;CACF,CAAC;AAEF,MAAM,MAAM,YAAY,CAAC,CAAC,GAAG,GAAG,IAAI,CAClC,GAAG,EAAE,eAAe,EACpB,OAAO,EAAE,CAAC,KACP,MAAM,CAAC;AAEZ,MAAM,MAAM,SAAS,CAAC,CAAC,GAAG,GAAG,IAAI;IAC/B,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,KAAK,OAAO,CAAC;IAC/C,GAAG,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC;CACtB,CAAC;AAEF,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,eAAe,EAAE,+BAuBtE;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,MAAM,EACZ,GAAG,KAAK,EAAE,eAAe,EAAE;;;EAI5B;AAED,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,+BAG1D;AAED,KAAK,eAAe,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC;AAE7D,wBAAgB,kBAAkB,CAChC,EAAE,EAAE,MAAM,EACV,GAAG,UAAU,EAAE,eAAe,EAAE,UAQjC;AAED,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,MAAM,GAAG,eAAe,EAAE,CAK9D"}

package/lib/utils/transform.js

@@ -4,6 +4,7 @@ import { pickExport } from "../transforms/pick-export.js";
 import { replaceImportSpec } from "../transforms/replace-import-spec.js";
 import { toSolidLink } from "../transforms/to-solid-link.js";
 import { toSolidRoute } from "../transforms/to-solid-route.js";
+import { toSolidServerAction } from "../transforms/to-solid-server-action.js";
 import { tryGenerate, parseFile } from "./ast.js";
 const $transforms = {
     pickExport,
@@ -12,6 +13,7 @@ const $transforms = {
     replaceImportSpec,
     toSolidRoute,
     toSolidLink,
+    toSolidServerAction,
 };
 export function transformCode(code, ...input) {
     let ast;

package/lib/utils/vinxi.d.ts

@@ -1,5 +1,17 @@
-import type { Internals } from "vinxi";
-import type { App } from "vinxi";
+import type { InputOptionsWithPlugins, Plugin } from "rollup";
+import type { App, Internals } from "vinxi";
+import type { Router } from "vinxi/http";
+export type VinxiApp = Omit<App, "getRouter"> & {
+    config: {
+        server?: App["config"]["server"] & {
+            plugins?: string[];
+            rollupConfig?: InputOptionsWithPlugins;
+        };
+    };
+    getRouter(name: string): Router & {
+        middleware?: string;
+    };
+};
 export type VinxiRoute = {
     _dreamkitEntryId?: string;
     page: boolean;
@@ -21,6 +33,9 @@ export type BaseFileSystemRouter = Omit<Internals["routes"] & {}, "getRoutes"> &
     buildRoutes(): Promise<VinxiRoute[]>;
     buildRoutesPromise: Promise<any> | undefined;
 };
-export declare function onVinxiApp(cb: (app: App) => void): () => void;
+export declare function isVinxiBuild(): boolean;
+export declare function onVinxiApp(cb: (app: VinxiApp) => void): () => void;
+export declare function addVinxiPlugin(vinxiApp: VinxiApp, path: string): void;
+export declare function addVinxiRollupPlugin(vinxiApp: VinxiApp, plugin: Plugin): void;
 export declare function onChangeVinxiRoutes(router: BaseFileSystemRouter, cb: (action: "add" | "update" | "remove", route: VinxiRoute) => any): () => void;
 //# sourceMappingURL=vinxi.d.ts.map

package/lib/utils/vinxi.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vinxi.d.ts","sourceRoot":"","sources":["../../src/utils/vinxi.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAEjC,MAAM,MAAM,UAAU,GAAG;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,IAAI,EAAE,OAAO,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE;QACV,GAAG,EAAE,MAAM,CAAC;QACZ,IAAI,EAAE,MAAM,EAAE,CAAC;KAChB,CAAC;IACF,OAAO,CAAC,EAAE;QACR,GAAG,EAAE,MAAM,CAAC;QACZ,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;QAChB,OAAO,CAAC,EAAE,GAAG,CAAC;QACd,MAAM,CAAC,EAAE,GAAG,CAAC;KACd,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,IAAI,CACrC,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,EACxB,WAAW,CACZ,GAAG;IACF,SAAS,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;IACnC,WAAW,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;IACrC,kBAAkB,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;CAC9C,CAAC;AAEF,wBAAgB,UAAU,CAAC,EAAE,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,cAiBhD;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,oBAAoB,EAC5B,EAAE,EAAE,CAAC,MAAM,EAAE,KAAK,GAAG,QAAQ,GAAG,QAAQ,EAAE,KAAK,EAAE,UAAU,KAAK,GAAG,cAmCpE"}
+{"version":3,"file":"vinxi.d.ts","sourceRoot":"","sources":["../../src/utils/vinxi.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9D,OAAO,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAC5C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAEzC,MAAM,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,WAAW,CAAC,GAAG;IAC9C,MAAM,EAAE;QACN,MAAM,CAAC,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,GAAG;YACjC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;YACnB,YAAY,CAAC,EAAE,uBAAuB,CAAC;SACxC,CAAC;KACH,CAAC;IACF,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG;QAChC,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,IAAI,EAAE,OAAO,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE;QACV,GAAG,EAAE,MAAM,CAAC;QACZ,IAAI,EAAE,MAAM,EAAE,CAAC;KAChB,CAAC;IACF,OAAO,CAAC,EAAE;QACR,GAAG,EAAE,MAAM,CAAC;QACZ,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;QAChB,OAAO,CAAC,EAAE,GAAG,CAAC;QACd,MAAM,CAAC,EAAE,GAAG,CAAC;KACd,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,IAAI,CACrC,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,EACxB,WAAW,CACZ,GAAG;IACF,SAAS,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;IACnC,WAAW,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;IACrC,kBAAkB,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;CAC9C,CAAC;AAEF,wBAAgB,YAAY,YAE3B;AAED,wBAAgB,UAAU,CAAC,EAAE,EAAE,CAAC,GAAG,EAAE,QAAQ,KAAK,IAAI,cAiBrD;AAED,wBAAgB,cAAc,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,QAG9D;AAED,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,QAMtE;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,oBAAoB,EAC5B,EAAE,EAAE,CAAC,MAAM,EAAE,KAAK,GAAG,QAAQ,GAAG,QAAQ,EAAE,KAAK,EAAE,UAAU,KAAK,GAAG,cAmCpE"}

package/lib/utils/vinxi.js

@@ -1,4 +1,7 @@
 import { normalize } from "path";
+export function isVinxiBuild() {
+    return process.argv.slice(2).includes("build");
+}
 export function onVinxiApp(cb) {
     Object.defineProperty(globalThis, "app", {
         configurable: true,
@@ -17,6 +20,18 @@ export function onVinxiApp(cb) {
         });
     };
 }
+export function addVinxiPlugin(vinxiApp, path) {
+    if (!vinxiApp.config.server.plugins)
+        vinxiApp.config.server.plugins = [];
+    vinxiApp.config.server.plugins.push(path);
+}
+export function addVinxiRollupPlugin(vinxiApp, plugin) {
+    if (!vinxiApp.config.server.rollupConfig)
+        vinxiApp.config.server.rollupConfig = { plugins: [] };
+    if (!vinxiApp.config.server.rollupConfig.plugins)
+        vinxiApp.config.server.rollupConfig.plugins = [];
+    vinxiApp.config.server.rollupConfig.plugins.push(plugin);
+}
 export function onChangeVinxiRoutes(router, cb) {
     const addRoute = router._addRoute.bind(router);
     const removeRoute = router.removeRoute.bind(router);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dreamkit/dev",
-  "version": "0.0.9",
+  "version": "0.0.11",
   "description": "Development tools for DreamKit.",
   "homepage": "https://dreamkit.dev",
   "repository": {
@@ -42,10 +42,11 @@
     "es-module-lexer": "^1.5.4",
     "esbuild": "^0.24.0",
     "glob": "^11.0.0",
+    "rollup": "^4.26.0",
     "vite-plugin-solid": "^2.10.2",
     "vite-tsconfig-paths": "^5.1.2",
-    "@dreamkit/app": "0.0.3",
-    "@dreamkit/schema": "0.0.2"
+    "@dreamkit/app": "0.0.5",
+    "@dreamkit/schema": "0.0.4"
   },
   "devDependencies": {
     "@types/debug": "^4.1.12",

package/lib/adapters/solid-start.d.ts

@@ -1,8 +0,0 @@
-import { DreamkitDevInOptions, DreamkitDevServer } from "../DreamkitDevServer.js";
-import { DreamkitPluginOptions } from "../options.js";
-import { App } from "vinxi";
-export declare function fetchDreamkitDevOptions(options: {
-    root: string;
-}): Promise<DreamkitDevInOptions>;
-export declare function createDreamkitDevServer(vinxiApp: App, inOptions?: DreamkitPluginOptions): DreamkitDevServer;
-//# sourceMappingURL=solid-start.d.ts.map

package/lib/adapters/solid-start.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"solid-start.d.ts","sourceRoot":"","sources":["../../src/adapters/solid-start.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,oBAAoB,EACpB,iBAAiB,EAClB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAYtD,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAkB5B,wBAAsB,uBAAuB,CAAC,OAAO,EAAE;IACrD,IAAI,EAAE,MAAM,CAAC;CACd,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAqDhC;AAsCD,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,GAAG,EACb,SAAS,GAAE,qBAA0B,qBAoHtC"}