@dreamkit/dev 0.0.2 → 0.0.4

package/lib/actions/generate.js

@@ -27,7 +27,8 @@ export async function generate(server) {
     else {
         contents = [
             `// prettier-ignore`,
-            `import { BaseRequestUrl, defineLink, defineRoutePath } from "dreamkit/presets/custom-global.js";`,
+            `import { defineRoutePath } from "dreamkit/presets/common.js";`,
+            `import { defineLink } from "dreamkit/presets/solid.js";`,
             "",
             ...(options.metaLocalExports
                 ? [
@@ -38,7 +39,6 @@ export async function generate(server) {
             createInterface("Routing", typeRoutes, 0),
             "export const routePath = defineRoutePath<Routing>();",
             "export const Link = defineLink<Routing>();",
-            "export class RequestUrl extends BaseRequestUrl<Routing> {}",
         ].join("\n");
     }
     await mkdir(dirname(output), { recursive: true });

package/lib/adapters/solid-start.js

@@ -30,7 +30,7 @@ export async function fetchDreamkitDevOptions(options) {
                     const ast = transformCode(code, {
                         replaceImportSpec: {
                             source: "@solidjs/start/config",
-                            spec: "defineConfig",
+                            spec: ["defineConfig"],
                             newSource: dummyDefineConfigSource,
                         },
                     });

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":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAKtD,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAE9B,wBAAgB,cAAc,CAAC,SAAS,GAAE,qBAA0B,GAAG,MAAM,CAwD5E"}

package/lib/plugins/dreamkit.js

@@ -24,6 +24,14 @@ export function dreamkitPlugin(inOptions = {}) {
             const dreamkitPickEntry = searchParams.get("dk-pick-entry");
             const picks = searchParams.getAll("pick");
             const transforms = [];
+            if (code.includes("'dreamkit'") || code.includes('"dreamkit"'))
+                transforms.push({
+                    replaceImportSpec: {
+                        source: "dreamkit",
+                        spec: ["Link"],
+                        newSource: "dreamkit/adapters/solid.js",
+                    },
+                });
             if (dreamkitPickEntry) {
                 transforms.push({
                     pickExport: [dreamkitPickEntry],

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

package/lib/transforms/pick-export.js

@@ -47,6 +47,11 @@ export function pickExport(ast, names) {
                 }
             }
         }
+        else if (stm.type === "ExportDefaultDeclaration" &&
+            !names.includes("default")) {
+            changes++;
+            return;
+        }
         return stm;
     })
         .filter((v) => v !== undefined);

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

@@ -1,7 +1,7 @@
 import { ParseResult } from "@babel/parser";
 import * as t from "@babel/types";
 export declare function replaceImportSpec(ast: ParseResult<t.File>, options: {
-    spec: string;
+    spec: string[];
     source: string;
     newSource: string;
 }): number;

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,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACnB,UAiCF"}
+{"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"}

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

@@ -10,15 +10,20 @@ export function replaceImportSpec(ast, options) {
                 node.specifiers = node.specifiers.filter((spec) => {
                     if (spec.type === "ImportSpecifier" &&
                         spec.imported.type === "Identifier" &&
-                        spec.imported.name === options.spec) {
+                        options.spec.includes(spec.imported.name)) {
                         changes++;
                         ast.program.body.unshift(t.importDeclaration([
-                            t.importSpecifier(t.identifier(options.spec), t.identifier(options.spec)),
+                            t.importSpecifier(t.identifier(spec.imported.name), t.identifier(spec.imported.name)),
                         ], t.stringLiteral(options.newSource)));
                         return false;
                     }
                     return true;
                 });
+                if (changes) {
+                    if (!node.specifiers.length)
+                        path.remove();
+                    path.scope.crawl();
+                }
             }
         },
     });

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":"AAEA,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,UAmJpD"}
+{"version":3,"file":"to-solid-route.d.ts","sourceRoot":"","sources":["../../src/transforms/to-solid-route.ts"],"names":[],"mappings":"AAGA,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,UA0JpD"}

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

@@ -1,44 +1,45 @@
 import { addFileChanges, getFirstChain } from "../utils/ast.js";
 import { traverse } from "../utils/babel.js";
+import { replaceImportSpec } from "./replace-import-spec.js";
 import * as t from "@babel/types";
 export function toSolidRoute(ast) {
     let changes = 0;
     let imports;
     let routeImportName;
-    // reserved by solid-start
-    const reservedExportNames = ["route"];
-    const dkRouteImportSpec = "$route";
+    const routeSpec = "$route";
+    const routeSource = "dreamkit";
+    const routeNewSource = "dreamkit/adapters/solid.js";
+    replaceImportSpec(ast, {
+        newSource: routeNewSource,
+        source: routeSource,
+        spec: [routeSpec],
+    });
     traverse(ast, {
         Program(programPath) {
             traverse(programPath.node, {
                 ImportDeclaration(importPath) {
                     importPath.traverse({
                         ImportSpecifier(path) {
-                            // import { route as ? } from "dreamkit";
+                            // import { route as ? } from "dreamkit/adapters/solid.js";
                             const isRouteImport = path.node.imported.type === "Identifier" &&
-                                path.node.imported.name === dkRouteImportSpec &&
-                                importPath.node.source.value === "dreamkit";
+                                path.node.imported.name === routeSpec &&
+                                importPath.node.source.value === routeNewSource;
                             if (isRouteImport)
                                 routeImportName = path.node.local.name;
-                            if (reservedExportNames.includes(path.node.local.name)) {
-                                // import { route } from "?";
-                                // import { route as _route } from "?";
-                                const newName = programPath.scope.generateUid(path.node.local.name);
-                                if (isRouteImport)
-                                    routeImportName = newName;
-                                path.scope.rename(path.node.local.name, newName);
-                            }
                         },
                     });
                 },
                 ExportDefaultDeclaration(path) {
                     const dec = path.node.declaration;
                     // [input]
+                    // import { $route } from "dreamkit";
                     // export default route.params({}).create(() => {});
                     // [output]
-                    // const selfRoute = route.params({});
-                    // export const route = createSolidRouteConfig(selfRoute);
-                    // export default = createSolidRoute(selfRoute.create(() => {}), { useLocation, useParams })
+                    // import { $route as _$route } from "dreamkit/adapters/solid.js"
+                    // import * as $deps from "dreamkit/adapters/solid-deps.js"
+                    // const selfRoute = _$route.params({});
+                    // export const route = selfRoute.createRouteDefinition();
+                    // export default delfRoute.clone({deps: $deps}).create(() => {})
                     if (
                     // route.?.?.?.create()
                     dec.type === "CallExpression" &&
@@ -52,43 +53,64 @@ export function toSolidRoute(ast) {
                         const selfRoute = programPath.scope.generateUid("selfRoute");
                         ast.program.body.splice(ast.program.body.indexOf(path.node), 1, 
                         // const selfRoute = route.?.?.?
-                        t.variableDeclaration("const", [
-                            t.variableDeclarator(t.identifier(selfRoute), dec.callee.object),
-                        ]), 
-                        // export const route = createSolidRouteConfig(selfRoute)
-                        t.exportNamedDeclaration(t.variableDeclaration("const", [
-                            t.variableDeclarator(t.identifier("route"), t.callExpression(t.identifier(imports.createSolidRouteConfig), [t.identifier(selfRoute)])),
-                        ])), 
-                        // export default createSolidRoute(selfRoute.create(() => {}), { useLocation, useParams });
-                        t.exportDefaultDeclaration(t.callExpression(t.identifier(imports.createSolidRoute), [
-                            t.callExpression(t.memberExpression(t.identifier(selfRoute), t.identifier("create")), dec.arguments),
-                            //t.identifier(selfRoute),
-                            t.objectExpression([
-                                t.objectProperty(t.identifier("useLocation"), t.identifier(imports.useLocation)),
-                                t.objectProperty(t.identifier("useParams"), t.identifier(imports.useParams)),
-                            ]),
-                        ])));
+                        createSelfRoute(selfRoute, dec.callee.object), 
+                        // export const route = selfRoute.createRouteDefinition();
+                        createExportRouteDefinition(selfRoute), 
+                        // export default selfRoute.clone({ deps }).create(() => {})
+                        createDefaultExportRoute(selfRoute, imports.deps, dec.arguments[0]));
                     }
-                    else if (
-                    // export default myRoute
-                    dec.type === "Identifier") {
-                        changes++;
-                        if (!imports)
-                            imports = addImports(ast, programPath);
-                        const selfRoute = dec.name;
-                        ast.program.body.splice(ast.program.body.indexOf(path.node), 1, 
-                        // export const route = createSolidRouteConfig(selfRoute)
-                        t.exportNamedDeclaration(t.variableDeclaration("const", [
-                            t.variableDeclarator(t.identifier("route"), t.callExpression(t.identifier(imports.createSolidRouteConfig), [t.identifier(selfRoute)])),
-                        ])), 
-                        // export default createSolidRoute(selfRoute, { useLocation, useParams });
-                        t.exportDefaultDeclaration(t.callExpression(t.identifier(imports.createSolidRoute), [
-                            t.identifier(selfRoute),
-                            t.objectExpression([
-                                t.objectProperty(t.identifier("useLocation"), t.identifier(imports.useLocation)),
-                                t.objectProperty(t.identifier("useParams"), t.identifier(imports.useParams)),
-                            ]),
-                        ])));
+                },
+                // [input]
+                // import { $route } from "dreamkit";
+                // export const route = $route.params({}).path('/path');
+                // export default function Users() { useRoute(route); }
+                // [output]
+                // import { $route as _$route } from "dreamkit/adapters/solid.js"
+                // import * as $deps from "dreamkit/adapters/solid-deps.js"
+                // const selfRoute = _$route.params({}).path('/path');
+                // export const route = selfRoute.createRouteDefinition();
+                // export default selfRoute.create(function Users() { useRoute(selfRoute); });
+                ExportNamedDeclaration(path) {
+                    const node = path.node;
+                    if (node.declaration?.type === "VariableDeclaration") {
+                        const [dec] = node.declaration.declarations;
+                        if (dec.id.type === "Identifier" &&
+                            dec.id.name === "route" &&
+                            dec.init &&
+                            getFirstChain(dec.init)?.identifier === routeImportName) {
+                            // [input]
+                            // export const route = $route.?;
+                            // [output]
+                            // const _selfRoute = $route.?;
+                            // export const route = _selfRoute.createRouteDefinition();
+                            if (!imports)
+                                imports = addImports(ast, programPath);
+                            let exportFunction;
+                            const selfRoute = programPath.scope.generateUid("selfRoute");
+                            const index = ast.program.body.indexOf(path.node);
+                            // [input]
+                            // export const route = ?;
+                            // [output]
+                            // const _route = ?;
+                            path.replaceWith(dec);
+                            path.scope.rename(dec.id.name, selfRoute);
+                            ast.program.body = ast.program.body.filter((dec) => {
+                                if (dec.type === "ExportDefaultDeclaration" &&
+                                    (dec.declaration.type === "FunctionDeclaration" ||
+                                        dec.declaration.type === "ArrowFunctionExpression")) {
+                                    exportFunction = dec.declaration;
+                                    return false;
+                                }
+                                return true;
+                            });
+                            ast.program.body.splice(index, 1, createSelfRoute(selfRoute, dec.init), createExportRouteDefinition(selfRoute), ...(exportFunction
+                                ? [
+                                    createDefaultExportRoute(selfRoute, imports.deps, exportFunction.type === "FunctionDeclaration"
+                                        ? t.functionExpression(exportFunction.id, exportFunction.params, exportFunction.body)
+                                        : exportFunction),
+                                ]
+                                : []));
+                        }
                     }
                 },
             });
@@ -96,22 +118,27 @@ export function toSolidRoute(ast) {
     });
     return addFileChanges(ast, changes);
 }
+function createSelfRoute(name, route) {
+    return t.variableDeclaration("const", [
+        t.variableDeclarator(t.identifier(name), route),
+    ]);
+}
+function createExportRouteDefinition(name) {
+    return t.exportNamedDeclaration(t.variableDeclaration("const", [
+        t.variableDeclarator(t.identifier("route"), t.callExpression(t.memberExpression(t.identifier(name), t.identifier("createRouteDefinition")), [])),
+    ]));
+}
+function createDefaultExportRoute(name, depsImportName, component) {
+    return t.exportDefaultDeclaration(t.callExpression(t.memberExpression(t.callExpression(t.memberExpression(t.identifier(name), t.identifier("clone")), [
+        t.objectExpression([
+            t.objectProperty(t.identifier("deps"), t.identifier(depsImportName)),
+        ]),
+    ]), t.identifier("create")), [component]));
+}
 function addImports(ast, program) {
-    const useLocation = program.scope.generateUid("useLocation");
-    const useParams = program.scope.generateUid("useParams");
-    const createSolidRoute = program.scope.generateUid("createSolidRoute");
-    const createSolidRouteConfig = program.scope.generateUid("createSolidRouteConfig");
-    ast.program.body.unshift(t.importDeclaration([
-        t.importSpecifier(t.identifier(useLocation), t.identifier("useLocation")),
-        t.importSpecifier(t.identifier(useParams), t.identifier("useParams")),
-    ], t.stringLiteral("@solidjs/router")), t.importDeclaration([
-        t.importSpecifier(t.identifier(createSolidRoute), t.identifier("createSolidRoute")),
-        t.importSpecifier(t.identifier(createSolidRouteConfig), t.identifier("createSolidRouteConfig")),
-    ], t.stringLiteral("dreamkit/adapters/solid.js")));
+    const deps = program.scope.generateUid("deps");
+    ast.program.body.unshift(t.importDeclaration([t.importNamespaceSpecifier(t.identifier(deps))], t.stringLiteral("dreamkit/adapters/solid-deps.js")));
     return {
-        useLocation,
-        useParams,
-        createSolidRoute,
-        createSolidRouteConfig,
+        deps,
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dreamkit/dev",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "description": "Development tools for DreamKit.",
   "homepage": "https://dreamkit.dev",
   "repository": {
@@ -44,8 +44,8 @@
     "glob": "^11.0.0",
     "vite-plugin-solid": "^2.10.2",
     "vite-tsconfig-paths": "^5.1.0",
-    "@dreamkit/app": "0.0.1",
-    "@dreamkit/schema": "0.0.1"
+    "@dreamkit/app": "0.0.2",
+    "@dreamkit/schema": "0.0.2"
   },
   "devDependencies": {
     "@types/debug": "^4.1.12",