@dreamkit/dev 0.0.13 → 0.0.14-next.1

package/lib/DreamkitDevServer.d.ts

@@ -1,6 +1,7 @@
 import { DreamkitPluginOptions, OutDreamkitPluginOptions } from "./options.js";
 import { VirtualShaking } from "./utils/shaking.js";
 import { App, Route } from "@dreamkit/app";
+import { FSWatcher } from "chokidar";
 import { ViteDevServer } from "vite";
 import { ViteRuntime } from "vite/runtime";
 export type DreamkitDevExternalOptions = {
@@ -15,6 +16,7 @@ export declare class DreamkitDevServer {
     readonly entry: VirtualShaking;
     protected runtimeServer: ViteDevServer | undefined;
     protected runtime: ViteRuntime | undefined;
+    protected settingsFileWatcher: FSWatcher | undefined;
     readonly options: DreamkitDevOptions;
     constructor(inOptions: DreamkitDevInOptions);
     static instance(): DreamkitDevServer;

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,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"}
+{"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,EAA2B,MAAM,eAAe,CAAC;AAM7E,OAAO,EAAE,SAAS,EAAS,MAAM,UAAU,CAAC;AAE5C,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,SAAS,CAAC,mBAAmB,EAAE,SAAS,GAAG,SAAS,CAAC;IACrD,QAAQ,CAAC,OAAO,EAAE,kBAAkB,CAAC;gBACzB,SAAS,EAAE,oBAAoB;IA+B3C,MAAM,CAAC,QAAQ,IAAI,iBAAiB;IAKpC,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAE,iBAAiB;IAGzC,KAAK,CAAC,IAAI,EAAE,MAAM;IAWlB,YAAY,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC;IAIzC,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;IAIxC,gBAAgB;IAyBhB,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAIjD,OAAO,CAAC,uBAAuB,UAAO;IAiDtC,KAAK;IAGL,IAAI;CAMX"}

package/lib/DreamkitDevServer.js

@@ -4,7 +4,10 @@ import { getExt, resolvePath } from "./utils/path.js";
 import { findFileRoutes } from "./utils/router.js";
 import { VirtualShaking } from "./utils/shaking.js";
 import { createTransformUrl, getUrlTransforms, transformAndGenerate, } from "./utils/transform.js";
-import { App, isRoute, $route } from "@dreamkit/app";
+import { App, isRoute, $route, SettingsHandler } from "@dreamkit/app";
+import { is } from "@dreamkit/kind";
+import { NodeSettingsHandler, NodeSettingsHandlerOptions, } from "@dreamkit/node-app";
+import { watch } from "chokidar";
 import { existsSync } from "fs";
 import { createServer, createViteRuntime } from "vite";
 import solidPlugin from "vite-plugin-solid";
@@ -15,6 +18,7 @@ export class DreamkitDevServer {
     entry;
     runtimeServer;
     runtime;
+    settingsFileWatcher;
     options;
     constructor(inOptions) {
         this.app = new App();
@@ -24,8 +28,10 @@ export class DreamkitDevServer {
         });
         const vars = { defaults: options.root, root: options.root };
         options.entry = resolvePath(options.entry, vars);
+        options.settingsPath = resolvePath(options.settingsPath, vars);
         options.metaGlobalOutput = resolvePath(options.metaGlobalOutput, vars);
         options.metaLocalOutput = resolvePath(options.metaLocalOutput, vars);
+        options.preEntries = options.preEntries?.map((v) => resolvePath(v, vars));
         this.entry = new VirtualShaking({
             entry: options.entry,
             onChange: async (changes) => {
@@ -57,17 +63,22 @@ export class DreamkitDevServer {
     async fetch(path) {
         //const mod = $server.moduleGraph.getModuleById(shaking.entry);
         //if (mod) $server.moduleGraph.invalidateModule(mod);
-        const ext = getExt(path);
-        return await this.runtime.executeUrl(`${path}?${Date.now()}&ext=${ext}`);
+        try {
+            const ext = getExt(path);
+            return await this.runtime.executeUrl(`${path}?${Date.now()}&ext=${ext}`);
+        }
+        catch (error) {
+            console.error(error);
+            return undefined;
+        }
     }
     async fetchDefault(path) {
         const result = await this.fetch(path);
-        return result.default;
+        return result?.default;
     }
     async fetchRoute(path) {
         const url = createTransformUrl(path, { toSolidRoute: true });
-        const result = await this.fetch(url);
-        return result.default;
+        return await this.fetchDefault(url);
     }
     async findRouteObjects() {
         const files = await findFileRoutes(this.options.routeDir);
@@ -123,11 +134,25 @@ export class DreamkitDevServer {
             hmr: { logger: false },
         });
         this.entry.init();
-        const objects = {
+        for (const path of this.options.preEntries || [])
+            await this.app.add(await this.fetch(path));
+        await this.app.add({
             ...(await this.fetchEntryObjects()),
             ...(includeRouteFileObjects && (await this.findRouteObjects())),
-        };
-        await this.app.add(objects);
+        });
+        if (is(this.app.settingsHandler, NodeSettingsHandler)) {
+            this.app.context.register(NodeSettingsHandlerOptions, {
+                value: new NodeSettingsHandlerOptions({
+                    path: this.options.settingsPath,
+                }),
+            });
+            this.settingsFileWatcher = watch(this.options.settingsPath, {
+                ignoreInitial: false,
+            }).on("all", async () => {
+                log("settings file changed");
+                await this.app.context.resolve(SettingsHandler).load();
+            });
+        }
     }
     async start() {
         await this.app.start();
@@ -135,6 +160,7 @@ export class DreamkitDevServer {
     async stop() {
         if (this.app.started)
             await this.app.stop();
+        await this.settingsFileWatcher?.close();
         await this.runtimeServer?.close();
         await this.runtime?.destroy();
     }

package/lib/actions/generate-meta.d.ts

@@ -0,0 +1,6 @@
+import { DreamkitDevServer } from "../DreamkitDevServer.js";
+export declare function generateMeta(server: DreamkitDevServer): Promise<{
+    path: string;
+    changed: boolean;
+}>;
+//# sourceMappingURL=generate-meta.d.ts.map

package/lib/actions/generate-meta.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"generate-meta.d.ts","sourceRoot":"","sources":["../../src/actions/generate-meta.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAY5D,wBAAsB,YAAY,CAAC,MAAM,EAAE,iBAAiB;;;GAwD3D"}

package/lib/actions/generate-meta.js

@@ -0,0 +1,62 @@
+import { writeFileIfDifferent } from "../utils/fs.js";
+import { createInterface, createModuleDeclaration, createType, } from "../utils/typescript.js";
+import { mkdir } from "fs/promises";
+import { dirname } from "path";
+export async function generateMeta(server) {
+    const options = server.options;
+    const output = options.metaFormat === "global"
+        ? options.metaGlobalOutput
+        : options.metaLocalOutput;
+    const routeDef = [...server.app.routes]
+        .map((route) => ({
+        path: route.$options.path ?? "",
+        params: route.$options.params,
+    }))
+        .sort((a, b) => a.path.localeCompare(b.path));
+    const typeRoutes = await generateDefinition(routeDef);
+    let contents;
+    if (options.metaFormat === "global") {
+        const declarations = {
+            ["dreamkit/presets/global.override.js"]: createInterface("Routing", typeRoutes, 1),
+        };
+        contents =
+            Object.entries(declarations)
+                .map(([source, body]) => `// prettier-ignore\n` + createModuleDeclaration(source, [body]))
+                .join("\n\n") + "\n";
+    }
+    else {
+        contents = [
+            `// prettier-ignore`,
+            `import { defineRoutePath } from "dreamkit/presets/common.js";`,
+            `import { defineLink } from "dreamkit/presets/solid.js";`,
+            "",
+            ...(options.metaLocalExports
+                ? [
+                    'export * from "dreamkit/presets/common.js";',
+                    'export * from "dreamkit/presets/solid.js";',
+                ]
+                : []),
+            createInterface("Routing", typeRoutes, 0),
+            "export const routePath = defineRoutePath<Routing>();",
+            "export const Link = defineLink<Routing>();",
+        ].join("\n");
+    }
+    await mkdir(dirname(output), { recursive: true });
+    const changed = await writeFileIfDifferent(output, contents);
+    return {
+        path: output,
+        changed,
+    };
+}
+async function generateDefinition(routes) {
+    const result = {};
+    for (const route of routes) {
+        if (route.path.includes("*404"))
+            continue;
+        const params = route.params;
+        result[route.path] = Object.keys(params?.options.props || {}).length
+            ? createType(params)
+            : "never";
+    }
+    return result;
+}

package/lib/actions/generate-settings.d.ts

@@ -0,0 +1,4 @@
+import { DreamkitDevServer } from "../DreamkitDevServer.js";
+import { SettingsHandlerSaveResult } from "@dreamkit/app";
+export declare function generateSettings(server: DreamkitDevServer): Promise<SettingsHandlerSaveResult>;
+//# sourceMappingURL=generate-settings.d.ts.map

package/lib/actions/generate-settings.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"generate-settings.d.ts","sourceRoot":"","sources":["../../src/actions/generate-settings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAO,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAG/D,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,iBAAiB,GACxB,OAAO,CAAC,yBAAyB,CAAC,CAWpC"}

package/lib/actions/generate-settings.js

@@ -0,0 +1,12 @@
+import { App } from "@dreamkit/app";
+import { NodeSettingsHandlerOptions } from "@dreamkit/node-app";
+export async function generateSettings(server) {
+    const $app = new App();
+    $app.context.register(NodeSettingsHandlerOptions, {
+        value: new NodeSettingsHandlerOptions({
+            path: server.options.settingsPath,
+        }),
+    });
+    await $app.add([...server.app.settings, server.app.settingsHandler].filter(Boolean));
+    return (await $app["registerAllSettings"]()) || {};
+}

package/lib/actions/generate.d.ts

@@ -1,6 +1,6 @@
 import { DreamkitDevServer } from "../DreamkitDevServer.js";
-export declare function generate(server: DreamkitDevServer): Promise<{
-    output: string;
+export declare function generate(server: DreamkitDevServer): Promise<Record<string, {
+    path: string;
     changed: boolean;
-}>;
+}>>;
 //# sourceMappingURL=generate.d.ts.map

package/lib/actions/generate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../src/actions/generate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAY5D,wBAAsB,QAAQ,CAAC,MAAM,EAAE,iBAAiB;;;GAwDvD"}
+{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../src/actions/generate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAI5D,wBAAsB,QAAQ,CAC5B,MAAM,EAAE,iBAAiB,GACxB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAAC,CAS7D"}

package/lib/actions/generate.js

@@ -1,62 +1,12 @@
-import { writeFileIfDifferent } from "../utils/fs.js";
-import { createInterface, createModuleDeclaration, createType, } from "../utils/typescript.js";
-import { mkdir } from "fs/promises";
-import { dirname } from "path";
+import { generateMeta } from "./generate-meta.js";
+import { generateSettings } from "./generate-settings.js";
 export async function generate(server) {
-    const options = server.options;
-    const output = options.metaFormat === "global"
-        ? options.metaGlobalOutput
-        : options.metaLocalOutput;
-    const routeDef = [...server.app.routes]
-        .map((route) => ({
-        path: route.$options.path ?? "",
-        params: route.$options.params,
-    }))
-        .sort((a, b) => a.path.localeCompare(b.path));
-    const typeRoutes = await generateDefinition(routeDef);
-    let contents;
-    if (options.metaFormat === "global") {
-        const declarations = {
-            ["dreamkit/presets/global.override.js"]: createInterface("Routing", typeRoutes, 1),
-        };
-        contents =
-            Object.entries(declarations)
-                .map(([source, body]) => `// prettier-ignore\n` + createModuleDeclaration(source, [body]))
-                .join("\n\n") + "\n";
-    }
-    else {
-        contents = [
-            `// prettier-ignore`,
-            `import { defineRoutePath } from "dreamkit/presets/common.js";`,
-            `import { defineLink } from "dreamkit/presets/solid.js";`,
-            "",
-            ...(options.metaLocalExports
-                ? [
-                    'export * from "dreamkit/presets/common.js";',
-                    'export * from "dreamkit/presets/solid.js";',
-                ]
-                : []),
-            createInterface("Routing", typeRoutes, 0),
-            "export const routePath = defineRoutePath<Routing>();",
-            "export const Link = defineLink<Routing>();",
-        ].join("\n");
-    }
-    await mkdir(dirname(output), { recursive: true });
-    const changed = await writeFileIfDifferent(output, contents);
+    const [meta, settings] = await Promise.all([
+        generateMeta(server),
+        generateSettings(server),
+    ]);
     return {
-        output,
-        changed,
+        meta,
+        ...settings,
     };
 }
-async function generateDefinition(routes) {
-    const result = {};
-    for (const route of routes) {
-        if (route.path.includes("*404"))
-            continue;
-        const params = route.params;
-        result[route.path] = Object.keys(params?.options.props || {}).length
-            ? createType(params)
-            : "never";
-    }
-    return result;
-}

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

@@ -1 +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"}
+{"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;AAGpC,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAMzD,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,qBAuLtC"}

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

@@ -1,11 +1,13 @@
 import { DreamkitDevServer, } from "../../DreamkitDevServer.js";
-import { generate } from "../../actions/generate.js";
+import { generateMeta } from "../../actions/generate-meta.js";
+import { generateSettings } from "../../actions/generate-settings.js";
 import { tryGenerate } from "../../utils/ast.js";
+import { log } from "../../utils/log.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 { isRoute, $route, App, isSettings } from "@dreamkit/app";
 import { existsSync } from "fs";
 import { join, normalize, relative, resolve } from "path";
 import { fileURLToPath } from "url";
@@ -128,7 +130,8 @@ export function createDreamkitDevServer(vinxiApp, inOptions = {}) {
         await server.stop();
     }
     async function onDevStart() {
-        const tryGenerate = createDelayedFunction(async () => {
+        const tryGenerateMeta = createDelayedFunction(async () => {
+            log("generating meta");
             const paths = new Set();
             server.app.routes.forEach(async (route) => {
                 const path = route.$options.path;
@@ -139,12 +142,20 @@ export function createDreamkitDevServer(vinxiApp, inOptions = {}) {
                     paths.add(path);
                 }
             });
-            await generate(server);
+            await generateMeta(server);
+        }, 300);
+        const tryGenerateSettings = createDelayedFunction(async () => {
+            log("generating settings");
+            await generateSettings(server);
         }, 300);
         server.app
             .on("change", (data) => {
+            log("change detected", { action: data.action, id: data.id });
             if (isRoute(data.value)) {
-                tryGenerate();
+                tryGenerateMeta();
+            }
+            else if (isSettings(data.value)) {
+                tryGenerateSettings();
             }
         })
             .on("add", async ({ id, value }) => {
@@ -179,7 +190,7 @@ export function createDreamkitDevServer(vinxiApp, inOptions = {}) {
                     if (router.name === "ssr" && server.app.objects.has(id))
                         await server.app.remove([id]);
                     if (action === "add" || action === "update") {
-                        const routeObject = await server.fetchDefault(vinxiRoute.filePath);
+                        const routeObject = await server.fetchRoute(vinxiRoute.filePath);
                         if (isRoute(routeObject))
                             vinxiRoute.$$route = {
                                 pick: ["route"],
@@ -199,11 +210,13 @@ export function createDreamkitDevServer(vinxiApp, inOptions = {}) {
                 });
             }
         }
+        await server.start();
     }
     const ssrRouter = vinxiApp.getRouter("ssr");
     ssrRouter.middleware = selfPath("middleware.js", true);
     if (isVinxiBuild()) {
         const dreamkitEntryId = "dk:entry";
+        const dreamkitPreEntriesId = "dk:pre-entries";
         const dreamkitEntry = join(server.options.root, "src/dreamkit.tsx").replaceAll("\\", "/");
         const existsDreamkitEntry = existsSync(dreamkitEntry);
         addVinxiPlugin(vinxiApp, selfPath("prod-server.js"));
@@ -213,10 +226,17 @@ export function createDreamkitDevServer(vinxiApp, inOptions = {}) {
                 if (id === dreamkitEntryId) {
                     return existsDreamkitEntry ? dreamkitEntry : `\0${dreamkitEntryId}`;
                 }
+                else if (id === dreamkitPreEntriesId) {
+                    return `\0${dreamkitPreEntriesId}`;
+                }
             },
             load(id) {
                 if (!existsDreamkitEntry && id === `\0${dreamkitEntryId}`)
                     return { code: "export {}" };
+                if (id === `\0${dreamkitPreEntriesId}`) {
+                    const exports = server.options.preEntries?.map((entry, index) => `export * as entry_${index} from ${JSON.stringify(entry)};`);
+                    return { code: [...exports, `export {};`].join("\n") };
+                }
             },
         });
     }

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

@@ -1 +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"}
+{"version":3,"file":"prod-server.d.ts","sourceRoot":"","sources":["../../../src/adapters/solid-start/prod-server.ts"],"names":[],"mappings":"AAMA,yBAA+B,MAAM,EAAE,GAAG,iBAKzC"}

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

@@ -1,9 +1,12 @@
 import { App } from "@dreamkit/app";
 // @ts-ignore
 import * as objects from "dk:entry";
+// @ts-ignore
+import * as preEntries from "dk:pre-entries";
 export default async function (_nitro) {
-    const app = new App();
-    App.saveInstance(app);
+    const app = App.createGlobalInstance();
+    for (const id in preEntries)
+        await app.add(preEntries[id]);
     await app.add(objects);
     await app.start();
 }

package/lib/bin.js

@@ -24,11 +24,11 @@ program
     try {
         await server.prepare();
         const result = await generate(server);
-        const outputPath = relative(process.cwd(), result.output).replaceAll("\\", "/");
-        console.info([
-            `Generated: ${outputPath}`,
-            !result.changed ? " (no changes)" : "",
-        ].join(""));
+        const rel = (path) => relative(process.cwd(), path).replaceAll("\\", "/");
+        for (const key in result) {
+            const { changed, path } = result[key];
+            console.info([`Generated: ${rel(path)}`, !changed ? " (no changes)" : ""].join(""));
+        }
     }
     finally {
         await server.stop();

package/lib/options.d.ts

@@ -1,18 +1,22 @@
 export type DreamkitPluginOptions = {
     entry?: string;
+    preEntries?: string[];
     metaFormat?: "global" | "local";
     metaRouting?: boolean;
     metaGlobalOutput?: string;
     metaLocalExports?: boolean;
     metaLocalOutput?: string;
+    settingsPath?: string;
 };
 export declare const dreamkitPluginOptions: {
     metaFormat: "global";
     metaRouting: true;
     entry: string;
+    preEntries: string[];
     metaGlobalOutput: string;
     metaLocalOutput: string;
     metaLocalExports: true;
+    settingsPath: string;
 };
 export type OutDreamkitPluginOptions = Required<Pick<DreamkitPluginOptions, keyof typeof dreamkitPluginOptions>> & Omit<DreamkitPluginOptions, keyof typeof dreamkitPluginOptions>;
 //# sourceMappingURL=options.d.ts.map

package/lib/options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../src/options.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,qBAAqB,GAAG;IAClC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC;IAChC,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,eAAO,MAAM,qBAAqB;;;;;;;CAOD,CAAC;AAElC,MAAM,MAAM,wBAAwB,GAAG,QAAQ,CAC7C,IAAI,CAAC,qBAAqB,EAAE,MAAM,OAAO,qBAAqB,CAAC,CAChE,GACC,IAAI,CAAC,qBAAqB,EAAE,MAAM,OAAO,qBAAqB,CAAC,CAAC"}
+{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../src/options.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,qBAAqB,GAAG;IAClC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,UAAU,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC;IAChC,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,eAAO,MAAM,qBAAqB;;;;;;;;;CASD,CAAC;AAElC,MAAM,MAAM,wBAAwB,GAAG,QAAQ,CAC7C,IAAI,CAAC,qBAAqB,EAAE,MAAM,OAAO,qBAAqB,CAAC,CAChE,GACC,IAAI,CAAC,qBAAqB,EAAE,MAAM,OAAO,qBAAqB,CAAC,CAAC"}

package/lib/options.js

@@ -2,7 +2,9 @@ export const dreamkitPluginOptions = {
     metaFormat: "global",
     metaRouting: true,
     entry: "./src/dreamkit.tsx",
+    preEntries: ["dreamkit/adapters/solid-entry.js"],
     metaGlobalOutput: "./src/dreamkit-global.d.ts",
     metaLocalOutput: "./src/dreamkit-local.ts",
     metaLocalExports: true,
+    settingsPath: "./settings.json",
 };

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,CAuD5E"}
+{"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,CAqD5E"}

package/lib/plugins/dreamkit.js

@@ -1,14 +1,11 @@
 import { createDreamkitDevServer } from "../adapters/solid-start/dev-server.js";
 import { tryGenerate } from "../utils/ast.js";
 import { transformCode } from "../utils/transform.js";
-import { isVinxiBuild, onVinxiApp } from "../utils/vinxi.js";
+import { onVinxiApp } from "../utils/vinxi.js";
 export function dreamkitPlugin(inOptions = {}) {
     let isSolidStart = false;
-    let server;
     const cleanup = onVinxiApp(async (app) => {
-        server = createDreamkitDevServer(app, inOptions);
-        if (!isVinxiBuild())
-            await server.start();
+        createDreamkitDevServer(app, inOptions);
     });
     return {
         name: "dreamkit",

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

@@ -8,7 +8,7 @@ export function toSolidRoute(ast) {
     let routeImportName;
     const routeSpec = "$route";
     const routeSource = "dreamkit";
-    const routeNewSource = "dreamkit/adapters/solid.js";
+    const routeNewSource = "dreamkit/adapters/solid-start/import.js";
     replaceImportSpec(ast, {
         newSource: routeNewSource,
         source: routeSource,
@@ -20,7 +20,7 @@ export function toSolidRoute(ast) {
                 ImportDeclaration(importPath) {
                     importPath.traverse({
                         ImportSpecifier(path) {
-                            // import { route as ? } from "dreamkit/adapters/solid.js";
+                            // import { route as ? } from "dreamkit/adapters/solid-start/import.js";
                             const isRouteImport = path.node.imported.type === "Identifier" &&
                                 path.node.imported.name === routeSpec &&
                                 importPath.node.source.value === routeNewSource;
@@ -48,7 +48,7 @@ export function toSolidRoute(ast) {
                     // import { $route } from "dreamkit";
                     // export default route.params({}).create(() => {});
                     // [output]
-                    // import { $route as _$route } from "dreamkit/adapters/solid.js"
+                    // import { $route as _$route } from "dreamkit/adapters/solid-start/import.js"
                     // import { useLocation, useRouter, useParams} from "@solidjs/router"
                     // const selfRoute = _$route.params({}).clone({ deps: ? });
                     // export const route = selfRoute.createRouteDefinition();
@@ -80,7 +80,7 @@ export function toSolidRoute(ast) {
                 // export const route = $route.params({}).path('/path');
                 // export default function Users() { useRoute(route); }
                 // [output]
-                // import { $route as _$route } from "dreamkit/adapters/solid.js"
+                // import { $route as _$route } from "dreamkit/adapters/solid-start/import.js"
                 // import { useLocation, useRouter, useParams } from "@solidjs/router"
                 // const selfRoute = _$route.params({}).path('/path').clone({ deps: ? });
                 // export const route = selfRoute.createRouteDefinition();

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

@@ -1,4 +1,4 @@
-import { createCallChains, createConst, defineTransform, getFirstChain, parseCallsChain, } from "../utils/ast.js";
+import { addImports, 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";
@@ -9,7 +9,7 @@ export const toSolidServerAction = defineTransform({
         let changes = replaceImportSpec(ast, {
             spec: { $api: "$serverApi" },
             source: "dreamkit",
-            newSource: "dreamkit/adapters/solid.js",
+            newSource: "dreamkit/adapters/solid-start/import.js",
             onRenameSpec(prev, next) {
                 apiId = next;
             },
@@ -71,6 +71,27 @@ function createServerAction(program, name, call, exported = false) {
     const serverApi = program.scope.generateUid(`server_${name}`);
     const chain = parseCallsChain(call);
     const serverMethods = ["self", "create"];
+    const cache = chain.calls.find((call) => call.name === "cache");
+    let cacheImport = cache
+        ? addImports(program, ["query"], "@solidjs/router")
+        : undefined;
+    const serverCallback = 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);
     return [
         // const baseFetchData = $api.params({});
         createConst(commonApi, createCallChains({
@@ -78,25 +99,12 @@ function createServerAction(program, name, call, exported = false) {
             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)),
+            t.variableDeclarator(t.identifier(name), cacheImport
+                ? t.callExpression(t.identifier(cacheImport.query), [
+                    serverCallback,
+                    ...(cache?.arguments.length ? [cache.arguments[0]] : []),
+                ])
+                : serverCallback),
         ]),
         // const originalFetchData = fetchData;
         createConst(originalFunc, t.identifier(name)),

package/lib/utils/ast.d.ts

@@ -28,7 +28,9 @@ export declare function defineTransform<T>(transform: Transform<T>): Transform<T
 export declare function createConst(name: string, value: t.Expression): t.VariableDeclaration;
 export declare function appendChainCall(input: t.Expression | string, method: string, args: t.Expression[]): t.CallExpression;
 export declare function prependChainCall(input: t.Expression | string, method: string, args?: t.Expression[]): t.CallExpression;
-export declare function addImports<T extends string>(program: NodePath<t.Program>, specifiers: T[], source: string): {
+export declare function addImports<T extends string>(program: NodePath<t.Program> & {
+    __imports?: Record<string, Record<string, string>>;
+}, specifiers: T[], source: string): {
     [K in T]: string;
 };
 //# sourceMappingURL=ast.d.ts.map

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,CACzB,GAAG,EAAE,eAAe,GAAG,SAAS,EAChC,GAAG,CAAC,EAAE,OAAO,GAAG,MAAM,0DAavB;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,YAoBrD;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,CACzB,GAAG,EAAE,eAAe,GAAG,SAAS,EAChC,GAAG,CAAC,EAAE,OAAO,GAAG,MAAM,0DAavB;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,YAoBrD;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,GAAG;IAC7B,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;CACpD,EACD,UAAU,EAAE,CAAC,EAAE,EACf,MAAM,EAAE,MAAM,GACb;KAAG,CAAC,IAAI,CAAC,GAAG,MAAM;CAAE,CAwBtB"}

package/lib/utils/ast.js

@@ -167,10 +167,17 @@ export function prependChainCall(input, method, args = []) {
     }
 }
 export function addImports(program, specifiers, source) {
+    const cacheKey = [...[...specifiers].sort(), source].join("|");
+    if (!program.__imports)
+        program.__imports = {};
+    if (program.__imports?.[cacheKey])
+        return program.__imports?.[cacheKey];
     const id = specifiers.map((name) => program.scope.generateUid(name));
     program.node.body.unshift(t.importDeclaration(specifiers.map((spec, index) => t.importSpecifier(t.identifier(id[index]), t.identifier(spec))), t.stringLiteral(source)));
-    return specifiers.reduce((result, name, index) => {
+    const result = specifiers.reduce((result, name, index) => {
         result[name] = id[index];
         return result;
     }, {});
+    program.__imports[cacheKey] = result;
+    return result;
 }

package/lib/utils/path.d.ts

@@ -1,3 +1,4 @@
+export declare function isRelative(input: string): boolean;
 export declare function resolvePath(inPath: string, vars: Record<string, string> & {
     defaults: string;
 }): string;

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

@@ -1 +1 @@
-{"version":3,"file":"path.d.ts","sourceRoot":"","sources":["../../src/utils/path.ts"],"names":[],"mappings":"AAEA,wBAAgB,WAAW,CACzB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAA;CAAE,UAKpD;AAED,wBAAgB,MAAM,CAAC,IAAI,EAAE,MAAM,sBAIlC;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,UAS3D"}
+{"version":3,"file":"path.d.ts","sourceRoot":"","sources":["../../src/utils/path.ts"],"names":[],"mappings":"AAEA,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,WAEvC;AAED,wBAAgB,WAAW,CACzB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAA;CAAE,UAKpD;AAED,wBAAgB,MAAM,CAAC,IAAI,EAAE,MAAM,sBAIlC;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,UAS3D"}

package/lib/utils/path.js

@@ -1,9 +1,12 @@
-import { basename, dirname, isAbsolute, join } from "path";
+import { basename, dirname, join } from "path";
+export function isRelative(input) {
+    return input.startsWith("./");
+}
 export function resolvePath(inPath, vars) {
     let path = inPath;
     for (const name in vars)
         path = path.replace(`{${name}}`, vars[name]);
-    return isAbsolute(path) ? path : join(vars.defaults, path);
+    return isRelative(path) ? join(vars.defaults, path) : path;
 }
 export function getExt(path) {
     const name = basename(path);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dreamkit/dev",
-  "version": "0.0.13",
+  "version": "0.0.14-next.1",
   "description": "Development tools for DreamKit.",
   "homepage": "https://dreamkit.dev",
   "repository": {
@@ -37,6 +37,7 @@
     "@babel/types": "^7.26.0",
     "@types/babel__generator": "^7.6.8",
     "@types/babel__traverse": "^7.20.6",
+    "chokidar": "^4.0.1",
     "commander": "^12.1.0",
     "debug": "^4.3.7",
     "es-module-lexer": "^1.5.4",
@@ -45,8 +46,11 @@
     "rollup": "^4.26.0",
     "vite-plugin-solid": "^2.10.2",
     "vite-tsconfig-paths": "^5.1.2",
-    "@dreamkit/app": "0.0.6",
-    "@dreamkit/schema": "0.0.4"
+    "@dreamkit/app": "0.0.7-next.1",
+    "@dreamkit/kind": "0.0.2",
+    "@dreamkit/node-app": "0.0.2-next.0",
+    "@dreamkit/schema": "0.0.5-next.0",
+    "@dreamkit/utils": "0.0.5-next.0"
   },
   "devDependencies": {
     "@types/debug": "^4.1.12",

package/lib/utils/object.d.ts

@@ -1,4 +0,0 @@
-export type Obj = Record<string, any>;
-export declare function isPlainObject(value: unknown): value is Record<string, unknown>;
-export declare function merge(object: Obj, patch: Obj): Obj;
-//# sourceMappingURL=object.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"object.d.ts","sourceRoot":"","sources":["../../src/utils/object.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAEtC,wBAAgB,aAAa,CAC3B,KAAK,EAAE,OAAO,GACb,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAMlC;AAED,wBAAgB,KAAK,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,GAAG,GAAG,CAYlD"}

package/lib/utils/object.js

@@ -1,20 +0,0 @@
-export function isPlainObject(value) {
-    return (!!value &&
-        !!(value = Object.getPrototypeOf(value)) &&
-        !Object.getPrototypeOf(value));
-}
-export function merge(object, patch) {
-    for (const key in patch) {
-        const value = patch[key];
-        if (isPlainObject(object[key]) && isPlainObject(value)) {
-            merge(object[key], value);
-        }
-        else if (value === undefined) {
-            delete object[key];
-        }
-        else {
-            object[key] = value;
-        }
-    }
-    return object;
-}