@dreamkit/dev 0.0.14-next.5 → 0.0.14-next.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;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"}
+{"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;IA0BhB,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

@@ -31,7 +31,7 @@ export class DreamkitDevServer {
         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));
+        options.presets = options.presets?.map((v) => resolvePath(v, vars));
         this.entry = new VirtualShaking({
             entry: options.entry,
             onChange: async (changes) => {
@@ -94,6 +94,7 @@ export class DreamkitDevServer {
                             ? $route
                             : $route["clone"]({
                                 ...value.$options,
+                                filePath: item.filePath.replaceAll("\\", "/"),
                                 path: item.path,
                             }).create(value.$options.component);
                     }
@@ -134,7 +135,7 @@ export class DreamkitDevServer {
             hmr: { logger: false },
         });
         this.entry.init();
-        for (const path of this.options.preEntries || [])
+        for (const path of this.options.presets || [])
             await this.app.add(await this.fetch(path));
         await this.app.add({
             ...(await this.fetchEntryObjects()),

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

@@ -0,0 +1,9 @@
+import { DreamkitDevServer } from "../DreamkitDevServer.js";
+export declare function generateCode(server: DreamkitDevServer, input?: {
+    filePath: string;
+    read?: () => string | Promise<string>;
+}): Promise<Record<string, {
+    path: string;
+    changed: boolean;
+}>>;
+//# sourceMappingURL=generate-code.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"generate-code.d.ts","sourceRoot":"","sources":["../../src/actions/generate-code.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAY5D,wBAAsB,YAAY,CAChC,MAAM,EAAE,iBAAiB,EACzB,KAAK,CAAC,EAAE;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;CAAE;UAE9B,MAAM;aAAW,OAAO;IA2C9D"}

package/lib/actions/generate-code.js

@@ -0,0 +1,78 @@
+import { getImportLocations, getExports, parseCallsChain, parseFile, } from "../utils/ast.js";
+import { writeFileIfDifferent } from "../utils/fs.js";
+import { replaceText } from "../utils/string.js";
+import { extractPathParams } from "@dreamkit/app/utils/routing.js";
+import { readFile } from "fs/promises";
+export async function generateCode(server, input) {
+    const result = {};
+    for (const route of server.app.routes) {
+        const filePath = route.$options.filePath;
+        if (input && filePath !== input.filePath)
+            continue;
+        if (!filePath || !route.$options.path)
+            continue;
+        const pathParams = extractPathParams(route.$options.path).map((param) => param.name);
+        if (!pathParams.length)
+            continue;
+        const code = input?.read
+            ? await input.read()
+            : (await readFile(filePath)).toString();
+        let action;
+        try {
+            action = getTransformAction(code);
+        }
+        catch (_) {
+            continue;
+        }
+        let next;
+        if (action) {
+            const newParamNames = pathParams.map((name) => JSON.stringify(name));
+            if (action.type === "replace") {
+                if (!checkChanges(code, action.start, action.end, pathParams))
+                    next = replaceText(code, action.start, action.end, `(${newParamNames.join(", ")})`);
+            }
+            else if (action.type === "add") {
+                next = replaceText(code, action.start, action.start, `.pathParams(${newParamNames})`);
+            }
+        }
+        if (next && (await writeFileIfDifferent(filePath, next, code))) {
+            result[filePath] = { path: filePath, changed: true };
+        }
+    }
+    return result;
+}
+function checkChanges(code, start, end, newPathParams) {
+    const currentArgs = code.slice(start, end);
+    const json = `[${currentArgs.slice(1, -1)}]`;
+    let currentParamNames = [];
+    try {
+        currentParamNames = JSON.parse(json).sort();
+    }
+    catch (_) { }
+    return (currentParamNames.sort().join(",") === [...newPathParams].sort().join(","));
+}
+function getTransformAction(code) {
+    const ast = parseFile(code);
+    const ref = getImportLocations(ast, "dreamkit", ["$route"]);
+    for (const item of getExports(ast)) {
+        if (item.dec.type === "CallExpression") {
+            const chain = parseCallsChain(item.dec);
+            if (ref.$route.includes(chain.root.loc)) {
+                const pathParams = chain.calls.find((call) => call.name === "pathParams");
+                if (!pathParams) {
+                    return {
+                        type: "add",
+                        start: chain.root.end,
+                    };
+                }
+                else {
+                    return {
+                        type: "replace",
+                        start: pathParams.property.end,
+                        end: pathParams.node.end,
+                    };
+                }
+            }
+        }
+    }
+}

package/lib/actions/generate-meta.js

@@ -17,7 +17,7 @@ export async function generateMeta(server) {
     let contents;
     if (options.metaFormat === "global") {
         const declarations = {
-            ["dreamkit/presets/global.override.js"]: createInterface("Routing", typeRoutes, 1),
+            ["dreamkit/scopes/global.override.js"]: createInterface("Routing", typeRoutes, 1),
         };
         contents =
             Object.entries(declarations)
@@ -27,13 +27,13 @@ export async function generateMeta(server) {
     else {
         contents = [
             `// prettier-ignore`,
-            `import { defineRoutePath } from "dreamkit/presets/common.js";`,
-            `import { defineLink } from "dreamkit/presets/solid.js";`,
+            `import { defineRoutePath } from "dreamkit/scopes/common.js";`,
+            `import { defineLink } from "dreamkit/scopes/solid.js";`,
             "",
             ...(options.metaLocalExports
                 ? [
-                    'export * from "dreamkit/presets/common.js";',
-                    'export * from "dreamkit/presets/solid.js";',
+                    'export * from "dreamkit/scopes/common.js";',
+                    'export * from "dreamkit/scopes/solid.js";',
                 ]
                 : []),
             createInterface("Routing", typeRoutes, 0),

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;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"}
+{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../src/actions/generate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAK5D,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,CAY7D"}

package/lib/actions/generate.js

@@ -1,12 +1,16 @@
+import { generateCode } from "./generate-code.js";
 import { generateMeta } from "./generate-meta.js";
 import { generateSettings } from "./generate-settings.js";
 export async function generate(server) {
-    const [meta, settings] = await Promise.all([
+    const [meta, settings, code] = await Promise.all([
         generateMeta(server),
         generateSettings(server),
+        generateCode(server),
     ]);
+    await generateCode(server);
     return {
         meta,
         ...settings,
+        ...code,
     };
 }

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;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"}
+{"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;AAIpC,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,qBA4LtC"}

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

@@ -1,4 +1,5 @@
 import { DreamkitDevServer, } from "../../DreamkitDevServer.js";
+import { generateCode } from "../../actions/generate-code.js";
 import { generateMeta } from "../../actions/generate-meta.js";
 import { generateSettings } from "../../actions/generate-settings.js";
 import { tryGenerate } from "../../utils/ast.js";
@@ -149,10 +150,15 @@ export function createDreamkitDevServer(vinxiApp, inOptions = {}) {
             await generateSettings(server);
         }, 300);
         server.app
-            .on("change", (data) => {
+            .on("change", async (data) => {
             log("change detected", { action: data.action, id: data.id });
             if (isRoute(data.value)) {
                 tryGenerateMeta();
+                if (data.action === "add" && data.value.$options.filePath) {
+                    await generateCode(server, {
+                        filePath: data.value.$options.filePath,
+                    });
+                }
             }
             else if (isSettings(data.value)) {
                 tryGenerateSettings();
@@ -177,6 +183,7 @@ export function createDreamkitDevServer(vinxiApp, inOptions = {}) {
             }
         });
         await server.prepare(true);
+        await generateCode(server);
         for (const router of vinxiApp.config.routers) {
             const internalRouter = router.internals.routes;
             if (internalRouter) {
@@ -216,7 +223,7 @@ export function createDreamkitDevServer(vinxiApp, inOptions = {}) {
     ssrRouter.middleware = selfPath("middleware.js", true);
     if (isVinxiBuild()) {
         const dreamkitEntryId = "dk:entry";
-        const dreamkitPreEntriesId = "dk:pre-entries";
+        const dreamkitPresetsId = "dk:presets";
         const dreamkitEntry = join(server.options.root, "src/dreamkit.tsx").replaceAll("\\", "/");
         const existsDreamkitEntry = existsSync(dreamkitEntry);
         addVinxiPlugin(vinxiApp, selfPath("prod-server.js"));
@@ -226,15 +233,15 @@ export function createDreamkitDevServer(vinxiApp, inOptions = {}) {
                 if (id === dreamkitEntryId) {
                     return existsDreamkitEntry ? dreamkitEntry : `\0${dreamkitEntryId}`;
                 }
-                else if (id === dreamkitPreEntriesId) {
-                    return `\0${dreamkitPreEntriesId}`;
+                else if (id === dreamkitPresetsId) {
+                    return `\0${dreamkitPresetsId}`;
                 }
             },
             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)};`);
+                if (id === `\0${dreamkitPresetsId}`) {
+                    const exports = server.options.presets?.map((entry, index) => `export * as entry_${index} from ${JSON.stringify(entry)};`);
                     return { code: [...exports, `export {};`].join("\n") };
                 }
             },

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

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

package/lib/options.d.ts

@@ -1,6 +1,6 @@
 export type DreamkitPluginOptions = {
     entry?: string;
-    preEntries?: string[];
+    presets?: string[];
     metaFormat?: "global" | "local";
     metaRouting?: boolean;
     metaGlobalOutput?: string;
@@ -12,7 +12,7 @@ export declare const dreamkitPluginOptions: {
     metaFormat: "global";
     metaRouting: true;
     entry: string;
-    preEntries: string[];
+    presets: string[];
     metaGlobalOutput: string;
     metaLocalOutput: string;
     metaLocalExports: true;

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,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"}
+{"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,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,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,7 @@ export const dreamkitPluginOptions = {
     metaFormat: "global",
     metaRouting: true,
     entry: "./src/dreamkit.tsx",
-    preEntries: ["dreamkit/adapters/solid-start/entry.js"],
+    presets: ["dreamkit/presets/solid-start.js"],
     metaGlobalOutput: "./src/dreamkit-global.d.ts",
     metaLocalOutput: "./src/dreamkit-local.ts",
     metaLocalExports: true,

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-start/import.js";
+    const routeNewSource = "dreamkit/scopes/solid-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-start/import.js";
+                            // import { route as ? } from "dreamkit/scopes/solid-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-start/import.js"
+                    // import { $route as _$route } from "dreamkit/scopes/solid-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-start/import.js"
+                // import { $route as _$route } from "dreamkit/scopes/solid-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

@@ -9,7 +9,7 @@ export const toSolidServerAction = defineTransform({
         let changes = replaceImportSpec(ast, {
             spec: { $api: "$serverApi" },
             source: "dreamkit",
-            newSource: "dreamkit/adapters/solid-start/import.js",
+            newSource: "dreamkit/scopes/solid-import.js",
             onRenameSpec(prev, next) {
                 apiId = next;
             },

package/lib/utils/ast.d.ts

@@ -7,15 +7,25 @@ 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 | string): import("@babel/generator").GeneratorResult | undefined;
+export type InputChain = {
+    rootName: string;
+    calls: {
+        name: string;
+        arguments: any[];
+    }[];
+};
 export type Chain = {
     rootName: string;
+    root: t.Identifier;
     calls: {
+        node: t.CallExpression;
+        property: t.Identifier;
         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 createCallChains(chain: InputChain): t.CallExpression | t.Identifier;
 export declare function removeChainCalls(input: t.CallExpression, names: string[]): t.CallExpression;
 export declare function getFirstChain(ref: t.Node): {
     identifier: string;
@@ -26,6 +36,20 @@ export declare function findExportedNames(ast: ParseFileResult): string[];
 export declare function findExportedNamesFromFile(path: string): Promise<string[]>;
 export declare function defineTransform<T>(transform: Transform<T>): Transform<T>;
 export declare function createConst(name: string, value: t.Expression): t.VariableDeclaration;
+export declare function getExports(ast: ParseFileResult): {
+    name: string;
+    dec: t.Node;
+}[];
+export declare function getImportSpecs(ast: ParseFileResult): {
+    source: string;
+    spec: {
+        imported: string;
+        local: string;
+    }[];
+}[];
+export declare function getImportLocations<T extends string>(ast: ParseFileResult, source: string, specifiers: T[]): {
+    [K in T]: t.SourceLocation[];
+};
 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> & {

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,YA6BrD;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"}
+{"version":3,"file":"ast.d.ts","sourceRoot":"","sources":["../../src/utils/ast.ts"],"names":[],"mappings":"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"}

package/lib/utils/ast.js

@@ -1,4 +1,4 @@
-import { generator, parser } from "./babel.js";
+import { generator, parser, traverse } from "./babel.js";
 import * as t from "@babel/types";
 import * as lexer from "es-module-lexer";
 import { transform } from "esbuild";
@@ -31,16 +31,20 @@ export function tryGenerate(ast, log) {
 export function parseCallsChain(input) {
     let ref = input;
     let rootName;
+    let root;
     let calls = [];
     while (true) {
         if (ref.callee.type === "MemberExpression") {
             if (ref.callee.property.type !== "Identifier")
                 throw new Error("Invalid chain");
             calls.push({
+                node: ref,
                 name: ref.callee.property.name,
+                property: ref.callee.property,
                 arguments: ref.arguments,
             });
             if (ref.callee.object.type === "Identifier") {
+                root = ref.callee.object;
                 rootName = ref.callee.object.name;
                 break;
             }
@@ -52,7 +56,7 @@ export function parseCallsChain(input) {
             }
         }
     }
-    return { rootName, calls: calls.reverse() };
+    return { root, rootName, calls: calls.reverse() };
 }
 export function createCallChains(chain) {
     let ref = t.identifier(chain.rootName);
@@ -142,6 +146,69 @@ export function createConst(name, value) {
         t.variableDeclarator(t.identifier(name), value),
     ]);
 }
+export function getExports(ast) {
+    const result = [];
+    traverse(ast, {
+        ExportDefaultDeclaration(path) {
+            let dec = path.node.declaration;
+            result.push({ name: "default", dec });
+        },
+        ExportNamedDeclaration(path) {
+            if (path.node.declaration?.type === "VariableDeclaration") {
+                const [dec] = path.node.declaration.declarations;
+                const { init } = dec;
+                if (dec.id.type === "Identifier" && init) {
+                    result.push({ name: dec.id.name, dec: init });
+                }
+            }
+        },
+    });
+    return result;
+}
+export function getImportSpecs(ast) {
+    const imports = [];
+    traverse(ast, {
+        ImportDeclaration(path) {
+            imports.push({
+                source: path.node.source.value,
+                spec: path.node.specifiers
+                    .map((spec) => {
+                    if (spec.type === "ImportSpecifier" &&
+                        spec.imported.type === "Identifier") {
+                        return { imported: spec.imported.name, local: spec.local.name };
+                    }
+                })
+                    .filter((v) => !!v),
+            });
+        },
+    });
+    return imports;
+}
+export function getImportLocations(ast, source, specifiers) {
+    const imports = getImportSpecs(ast).filter((item) => item.source === source);
+    const locations = {};
+    traverse(ast, {
+        Program(programPath) {
+            for (const name of specifiers) {
+                locations[name] = [];
+                let bindingName;
+                for (const item of imports) {
+                    const spec = item.spec.find((spec) => spec.imported === name);
+                    if (spec)
+                        bindingName = spec.local;
+                }
+                if (!bindingName)
+                    continue;
+                const binds = programPath.scope.bindings[bindingName];
+                for (const path of binds.referencePaths) {
+                    if (path.node.loc)
+                        locations[name].push(path.node.loc);
+                }
+            }
+        },
+    });
+    return locations;
+}
 export function appendChainCall(input, method, args) {
     if (typeof input === "string")
         input = t.identifier(input);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dreamkit/dev",
-  "version": "0.0.14-next.5",
+  "version": "0.0.14-next.7",
   "description": "Development tools for DreamKit.",
   "homepage": "https://dreamkit.dev",
   "repository": {
@@ -46,10 +46,10 @@
     "rollup": "^4.26.0",
     "vite-plugin-solid": "^2.10.2",
     "vite-tsconfig-paths": "^5.1.2",
-    "@dreamkit/app": "0.0.7-next.4",
+    "@dreamkit/app": "0.0.7-next.6",
     "@dreamkit/kind": "0.0.2",
-    "@dreamkit/node-app": "0.0.2-next.3",
-    "@dreamkit/schema": "0.0.5-next.2",
+    "@dreamkit/node-app": "0.0.2-next.5",
+    "@dreamkit/schema": "0.0.5-next.3",
     "@dreamkit/utils": "0.0.5-next.0"
   },
   "devDependencies": {