@dreamkit/dev 0.0.6 → 0.0.7

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;AAKtB,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AASpD,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,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"}

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

@@ -1,8 +1,8 @@
-import { DreamkitDevInOptions } from "../DreamkitDevServer.js";
+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): void;
+export declare function createDreamkitDevServer(vinxiApp: App, inOptions?: DreamkitPluginOptions): DreamkitDevServer;
 //# sourceMappingURL=solid-start.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"solid-start.d.ts","sourceRoot":"","sources":["../../src/adapters/solid-start.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,oBAAoB,EAErB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAYtD,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAM5B,wBAAsB,uBAAuB,CAAC,OAAO,EAAE;IACrD,IAAI,EAAE,MAAM,CAAC;CACd,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAsDhC;AAED,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,GAAG,EACb,SAAS,GAAE,qBAA0B,QAuItC"}
+{"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;AAM5B,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"}

package/lib/adapters/solid-start.js

@@ -1,6 +1,6 @@
 import { DreamkitDevServer, } from "../DreamkitDevServer.js";
 import { generate } from "../actions/generate.js";
-import { generateIfChanges } from "../utils/ast.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";
@@ -34,7 +34,7 @@ export async function fetchDreamkitDevOptions(options) {
                             newSource: dummyDefineConfigSource,
                         },
                     });
-                    return generateIfChanges(ast);
+                    return tryGenerate(ast);
                 }
             },
         },
@@ -49,6 +49,35 @@ export async function fetchDreamkitDevOptions(options) {
         ...dreamkitPlugin.dreamkitOptions,
     };
 }
+function addVinxiEntryRoutes(vinxiApp, objectId, objectValue, entryPath) {
+    for (const config of vinxiApp.config.routers) {
+        if (config.name === "ssr" || config.name === "client") {
+            const routes = config.internals.routes;
+            const vinxiRoute = {
+                _dreamkitEntryId: objectId,
+                page: true,
+                $component: {
+                    src: `${entryPath}?dk-pick-entry=${objectId}&pick=default&`,
+                    pick: ["default", "$css"],
+                },
+                $$route: {
+                    src: `${entryPath}?dk-pick-entry=${objectId}&pick=route&`,
+                    pick: ["route"],
+                },
+                path: objectValue.$options.path ?? "",
+                filePath: entryPath,
+            };
+            if (!objectValue.$options.path) {
+                console.warn("Missing route path", { id: objectId });
+                continue;
+            }
+            routes._addRoute(vinxiRoute);
+            routes.dispatchEvent(new CustomEvent("reload", {
+                detail: { route: vinxiRoute, dreamkitRoute: true },
+            }));
+        }
+    }
+}
 export function createDreamkitDevServer(vinxiApp, inOptions = {}) {
     const ssrRouter = vinxiApp.config.routers.find((config) => config.name === "ssr").internals.routes;
     const server = new DreamkitDevServer({
@@ -58,6 +87,11 @@ export function createDreamkitDevServer(vinxiApp, inOptions = {}) {
     });
     async function onBuildStart() {
         await server.prepare(false);
+        for (const route of server.app.routes) {
+            const id = server.app.getObjectId(route);
+            if (isEntryRoute(id, route))
+                addVinxiEntryRoutes(vinxiApp, id, route, server.entry.path);
+        }
         for (const router of vinxiApp.config.routers) {
             if (router.name === "ssr" || router.name === "client") {
                 const internalRouter = router.internals.routes;
@@ -77,6 +111,31 @@ export function createDreamkitDevServer(vinxiApp, inOptions = {}) {
         await server.stop();
     }
     async function onDevStart() {
+        const tryGenerate = createDelayedFunction(() => generate(server), 300);
+        server.app
+            .on("change", (data) => {
+            if (isRoute(data.value)) {
+                tryGenerate();
+            }
+        })
+            .on("add", async ({ id, value }) => {
+            if (isEntryRoute(id, value)) {
+                addVinxiEntryRoutes(vinxiApp, id, value, server.entry.path);
+            }
+        })
+            .on("remove", ({ id, value }) => {
+            if (isEntryRoute(id, value)) {
+                for (const config of vinxiApp.config.routers) {
+                    if (config.name === "ssr" || config.name === "client") {
+                        const routes = config.internals.routes;
+                        routes.routes = routes.routes.filter((r) => r._dreamkitEntryId !== id);
+                        routes.dispatchEvent(new CustomEvent("reload", {
+                            detail: { dreamkitRoute: true },
+                        }));
+                    }
+                }
+            }
+        });
         await server.prepare(true);
         for (const router of vinxiApp.config.routers) {
             const internalRouter = router.internals.routes;
@@ -113,61 +172,11 @@ export function createDreamkitDevServer(vinxiApp, inOptions = {}) {
                 });
             }
         }
-        const tryGenerate = createDelayedFunction(() => generate(server), 300);
-        server.app
-            .on("change", (data) => {
-            if (isRoute(data.value)) {
-                tryGenerate();
-            }
-        })
-            .on("add", async ({ id, value }) => {
-            if (isEntryRoute(id, value)) {
-                for (const config of vinxiApp.config.routers) {
-                    if (config.name === "ssr" || config.name === "client") {
-                        const routes = config.internals.routes;
-                        const vinxiRoute = {
-                            _dreamkitEntryId: id,
-                            page: true,
-                            $component: {
-                                src: `${server.entry.path}?dk-pick-entry=${id}&pick=default&`,
-                                pick: ["default", "$css"],
-                            },
-                            $$route: {
-                                src: `${server.entry.path}?dk-pick-entry=${id}&pick=route&`,
-                                pick: ["route"],
-                            },
-                            path: value.$options.path ?? "",
-                            filePath: server.entry.path,
-                        };
-                        if (!value.$options.path) {
-                            console.warn("Missing route path", { id });
-                            continue;
-                        }
-                        routes._addRoute(vinxiRoute);
-                        routes.dispatchEvent(new CustomEvent("reload", {
-                            detail: { route: vinxiRoute, dreamkitRoute: true },
-                        }));
-                    }
-                }
-            }
-        })
-            .on("remove", ({ id, value }) => {
-            if (isEntryRoute(id, value)) {
-                for (const config of vinxiApp.config.routers) {
-                    if (config.name === "ssr" || config.name === "client") {
-                        const routes = config.internals.routes;
-                        routes.routes = routes.routes.filter((r) => r._id !== id);
-                        routes.dispatchEvent(new CustomEvent("reload", {
-                            detail: { dreamkitRoute: true },
-                        }));
-                    }
-                }
-            }
-        });
     }
     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);
     vinxiApp.hooks.hook("app:build:nitro:end", onBuildEnd);
     vinxiApp.hooks.hook("app:dev:start", onDevStart);
+    return server;
 }

package/lib/options.js

@@ -2,7 +2,7 @@ export const dreamkitPluginOptions = {
     metaFormat: "global",
     metaRouting: true,
     entry: "./src/dreamkit.tsx",
-    metaGlobalOutput: "./src/dreamkit.d.ts",
+    metaGlobalOutput: "./src/dreamkit-global.d.ts",
     metaLocalOutput: "./src/dreamkit-local.ts",
     metaLocalExports: true,
 };

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

@@ -1 +1 @@
-{"version":3,"file":"dreamkit.d.ts","sourceRoot":"","sources":["../../src/plugins/dreamkit.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAItD,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAE9B,wBAAgB,cAAc,CAAC,SAAS,GAAE,qBAA0B,GAAG,MAAM,CA+C5E"}
+{"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"}

package/lib/plugins/dreamkit.js

@@ -1,10 +1,13 @@
 import { createDreamkitDevServer } from "../adapters/solid-start.js";
-import { generateIfChanges } from "../utils/ast.js";
+import { tryGenerate } from "../utils/ast.js";
 import { transformCode } from "../utils/transform.js";
 import { onVinxiApp } from "../utils/vinxi.js";
 export function dreamkitPlugin(inOptions = {}) {
     let isSolidStart = false;
-    const cleanup = onVinxiApp((app) => createDreamkitDevServer(app, inOptions));
+    let server;
+    const cleanup = onVinxiApp((app) => {
+        server = createDreamkitDevServer(app, inOptions);
+    });
     return {
         name: "dreamkit",
         enforce: "pre",
@@ -41,7 +44,7 @@ export function dreamkitPlugin(inOptions = {}) {
                 });
             }
             const ast = transformCode(code, ...transforms);
-            const result = generateIfChanges(ast);
+            const result = tryGenerate(ast);
             return result;
         },
     };

package/lib/transforms/delete-dead-code.d.ts

@@ -2,5 +2,5 @@ import { ParseFileResult } from "../utils/ast.js";
 /**
  * @link https://github.com/pcattori/babel-dead-code-elimination
  */
-export declare function deleteDeadCode(ast: ParseFileResult): void;
+export declare function deleteDeadCode(ast: ParseFileResult): number;
 //# sourceMappingURL=delete-dead-code.d.ts.map

package/lib/transforms/delete-dead-code.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"delete-dead-code.d.ts","sourceRoot":"","sources":["../../src/transforms/delete-dead-code.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAKlD;;GAEG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,eAAe,QA6DlD"}
+{"version":3,"file":"delete-dead-code.d.ts","sourceRoot":"","sources":["../../src/transforms/delete-dead-code.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAKlD;;GAEG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,eAAe,UA+DlD"}

package/lib/transforms/delete-dead-code.js

@@ -61,6 +61,7 @@ export function deleteDeadCode(ast) {
             },
         });
     } while (removals > 0);
+    return removals;
 }
 function isReferenced(ident) {
     let binding = ident.scope.getBinding(ident.node.name);

package/lib/transforms/export-default.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"export-default.d.ts","sourceRoot":"","sources":["../../src/transforms/export-default.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,KAAK,CAAC,MAAM,cAAc,CAAC;AAElC,wBAAgB,aAAa,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,UAWnE"}
+{"version":3,"file":"export-default.d.ts","sourceRoot":"","sources":["../../src/transforms/export-default.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,KAAK,CAAC,MAAM,cAAc,CAAC;AAElC,wBAAgB,aAAa,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,UAWnE"}

package/lib/transforms/export-default.js

@@ -1,4 +1,3 @@
-import { addFileChanges } from "../utils/ast.js";
 import * as t from "@babel/types";
 export function exportDefault(ast, name) {
     let changes = 0;
@@ -6,5 +5,5 @@ export function exportDefault(ast, name) {
         ast.program.body.push(t.exportDefaultDeclaration(t.identifier(name)));
         changes++;
     }
-    return addFileChanges(ast, changes);
+    return changes;
 }

package/lib/transforms/fix-use-data.d.ts

@@ -1,3 +1,3 @@
 import { ParseFileResult } from "../utils/ast.js";
-export declare function fixUseData(ast: ParseFileResult): number;
+export declare function fixUseData(ast: ParseFileResult): 1 | 0;
 //# sourceMappingURL=fix-use-data.d.ts.map

package/lib/transforms/fix-use-data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fix-use-data.d.ts","sourceRoot":"","sources":["../../src/transforms/fix-use-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAIlE,wBAAgB,UAAU,CAAC,GAAG,EAAE,eAAe,UA+C9C"}
+{"version":3,"file":"fix-use-data.d.ts","sourceRoot":"","sources":["../../src/transforms/fix-use-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAIlD,wBAAgB,UAAU,CAAC,GAAG,EAAE,eAAe,SA+C9C"}

package/lib/transforms/fix-use-data.js

@@ -1,4 +1,3 @@
-import { addFileChanges } from "../utils/ast.js";
 import { traverse } from "../utils/babel.js";
 export function fixUseData(ast) {
     let routeId;
@@ -45,5 +44,5 @@ export function fixUseData(ast) {
             }
         },
     });
-    return addFileChanges(ast, transformed ? 1 : 0);
+    return transformed ? 1 : 0;
 }

package/lib/transforms/no-export.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"no-export.d.ts","sourceRoot":"","sources":["../../src/transforms/no-export.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,KAAK,CAAC,MAAM,cAAc,CAAC;AAElC,wBAAgB,QAAQ,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,UAuBjE"}
+{"version":3,"file":"no-export.d.ts","sourceRoot":"","sources":["../../src/transforms/no-export.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,KAAK,CAAC,MAAM,cAAc,CAAC;AAElC,wBAAgB,QAAQ,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,UAuBjE"}

package/lib/transforms/no-export.js

@@ -1,4 +1,3 @@
-import { addFileChanges } from "../utils/ast.js";
 import * as t from "@babel/types";
 export function noExport(ast, names) {
     let changes = 0;
@@ -15,5 +14,5 @@ export function noExport(ast, names) {
             }
         }
     }
-    return addFileChanges(ast, changes);
+    return changes;
 }

package/lib/transforms/pick-export.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pick-export.d.ts","sourceRoot":"","sources":["../../src/transforms/pick-export.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,KAAK,CAAC,MAAM,cAAc,CAAC;AAElC,wBAAgB,UAAU,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,UA4EnE"}
+{"version":3,"file":"pick-export.d.ts","sourceRoot":"","sources":["../../src/transforms/pick-export.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,KAAK,CAAC,MAAM,cAAc,CAAC;AAElC,wBAAgB,UAAU,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,UA0EnE"}

package/lib/transforms/pick-export.js

@@ -1,4 +1,3 @@
-import { addFileChanges } from "../utils/ast.js";
 import { deleteDeadCode } from "./delete-dead-code.js";
 import * as t from "@babel/types";
 export function pickExport(ast, names) {
@@ -55,6 +54,5 @@ export function pickExport(ast, names) {
         return stm;
     })
         .filter((v) => v !== undefined);
-    deleteDeadCode(ast);
-    return addFileChanges(ast, changes);
+    return changes + deleteDeadCode(ast);
 }

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":"AAEA,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,EAAE,MAAM,EAAE,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACnB,UAqCF"}

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

@@ -1,4 +1,3 @@
-import { addFileChanges } from "../utils/ast.js";
 import { traverse } from "../utils/babel.js";
 import * as t from "@babel/types";
 export function replaceImportSpec(ast, options) {
@@ -27,5 +26,5 @@ export function replaceImportSpec(ast, options) {
             }
         },
     });
-    return addFileChanges(ast, changes);
+    return changes;
 }

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

@@ -1,4 +1,4 @@
-import { addFileChanges, addImports, defineTransform } from "../utils/ast.js";
+import { addImports, defineTransform } from "../utils/ast.js";
 import { traverse } from "../utils/babel.js";
 import * as t from "@babel/types";
 export const toSolidLink = defineTransform({
@@ -33,6 +33,6 @@ export const toSolidLink = defineTransform({
                 });
             },
         });
-        return addFileChanges(ast, changes);
+        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":"AAUA,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,UA8KpD"}
+{"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"}

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

@@ -1,4 +1,4 @@
-import { addFileChanges, addImports, appendChainCall, createConst, getFirstChain, prependChainCall, } from "../utils/ast.js";
+import { addImports, appendChainCall, createConst, getFirstChain, prependChainCall, } from "../utils/ast.js";
 import { traverse } from "../utils/babel.js";
 import { replaceImportSpec } from "./replace-import-spec.js";
 import * as t from "@babel/types";
@@ -30,7 +30,19 @@ export function toSolidRoute(ast) {
                     });
                 },
                 ExportDefaultDeclaration(path) {
-                    const dec = path.node.declaration;
+                    let dec = path.node.declaration;
+                    if (
+                    // import { $route } from "dreamkit";
+                    // const login = $route.create(() => {})
+                    // export default login
+                    dec.type === "Identifier") {
+                        const bind = programPath.scope.bindings[dec.name];
+                        if (bind.path.node.type === "VariableDeclarator" &&
+                            bind.path.node.init) {
+                            dec = bind.path.node.init;
+                            path.remove();
+                        }
+                    }
                     // [input]
                     // import { $route } from "dreamkit";
                     // export default route.params({}).create(() => {});
@@ -80,6 +92,7 @@ export function toSolidRoute(ast) {
                             dec.id.name === "route" &&
                             dec.init &&
                             getFirstChain(dec.init)?.identifier === routeImportName) {
+                            changes++;
                             // [input]
                             // export const route = $route.?;
                             // [output]
@@ -120,7 +133,7 @@ export function toSolidRoute(ast) {
             });
         },
     });
-    return addFileChanges(ast, changes);
+    return changes;
 }
 function createDepsObject(deps) {
     return t.objectExpression([

package/lib/utils/ast.d.ts

@@ -6,9 +6,7 @@ import * as lexer from "es-module-lexer";
 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 addFileChanges(ast: ParseFileResult, value: number): number;
-export declare function getFileChanges(ast: ParseFileResult): number;
-export declare function generateIfChanges(ast: ParseFileResult | undefined, log?: boolean): import("@babel/generator").GeneratorResult | undefined;
+export declare function tryGenerate(ast: ParseFileResult | undefined, log?: boolean): import("@babel/generator").GeneratorResult | undefined;
 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,cAAc,CAAC,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,UAGjE;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,eAAe,UAElD;AAED,wBAAgB,iBAAiB,CAC/B,GAAG,EAAE,eAAe,GAAG,SAAS,EAChC,GAAG,CAAC,EAAE,OAAO,0DAOd;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,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

@@ -14,15 +14,8 @@ export function parseFile(code) {
         plugins: ["typescript", "jsx"],
     });
 }
-export function addFileChanges(ast, value) {
-    ast["__changes"] = (ast["__changes"] || 0) + value;
-    return value;
-}
-export function getFileChanges(ast) {
-    return Number(ast["__changes"]) || 0;
-}
-export function generateIfChanges(ast, log) {
-    if (ast && getFileChanges(ast)) {
+export function tryGenerate(ast, log) {
+    if (ast) {
         const generated = generator(ast);
         if (log)
             console.log(generated);

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,EAAgC,eAAe,EAAE,MAAM,UAAU,CAAC;AAEzE,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,+BAsBtE;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;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"}

package/lib/utils/transform.js

@@ -4,7 +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 { generateIfChanges, parseFile } from "./ast.js";
+import { tryGenerate, parseFile } from "./ast.js";
 const $transforms = {
     pickExport,
     exportDefault,
@@ -15,6 +15,7 @@ const $transforms = {
 };
 export function transformCode(code, ...input) {
     let ast;
+    let changes = 0;
     for (const item of input) {
         for (let [name, options] of Object.entries(item)) {
             if (name in $transforms) {
@@ -30,15 +31,15 @@ export function transformCode(code, ...input) {
                     run = $transform;
                 }
                 ast = ast || parseFile(code);
-                run(ast, options);
+                changes += run(ast, options) || 0;
             }
         }
     }
-    return ast;
+    return changes ? ast : undefined;
 }
 export function transformAndGenerate(code, ...input) {
     const ast = transformCode(code, ...input);
-    return generateIfChanges(ast) || { code: undefined, map: undefined };
+    return tryGenerate(ast) || { code: undefined, map: undefined };
 }
 export function transformCodeByUrl(id, code) {
     const transforms = getUrlTransforms(id);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dreamkit/dev",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "Development tools for DreamKit.",
   "homepage": "https://dreamkit.dev",
   "repository": {
@@ -43,15 +43,15 @@
     "esbuild": "^0.24.0",
     "glob": "^11.0.0",
     "vite-plugin-solid": "^2.10.2",
-    "vite-tsconfig-paths": "^5.1.0",
-    "@dreamkit/app": "0.0.2",
+    "vite-tsconfig-paths": "^5.1.2",
+    "@dreamkit/app": "0.0.3",
     "@dreamkit/schema": "0.0.2"
   },
   "devDependencies": {
     "@types/debug": "^4.1.12",
     "@types/node": "^22.9.0",
     "vinxi": "^0.4.3",
-    "vite": "^5.4.10",
+    "vite": "^5.4.11",
     "@dreamkit/tsconfig": "0.0.1"
   },
   "peerDependencies": {