@dreamkit/dev 0.0.5 → 0.0.6

package/lib/DreamkitDevServer.js

@@ -100,7 +100,7 @@ export class DreamkitDevServer {
                     enforce: "pre",
                     load: (id) => this.entry.tryLoad(id),
                     transform(code, id) {
-                        return transformAndGenerate(code, { toSolidImport: true }, ...getUrlTransforms(id));
+                        return transformAndGenerate(code, { toSolidLink: true }, ...getUrlTransforms(id));
                     },
                     handleHotUpdate: async ({ file, read, modules }) => {
                         return this.entry.tryUpdate(file, read, modules);

package/lib/plugins/dreamkit.js

@@ -23,7 +23,7 @@ export function dreamkitPlugin(inOptions = {}) {
             const searchParams = new URLSearchParams(searchString);
             const dreamkitPickEntry = searchParams.get("dk-pick-entry");
             const picks = searchParams.getAll("pick");
-            const transforms = [{ toSolidImport: true }];
+            const transforms = [{ toSolidLink: true }];
             if (dreamkitPickEntry) {
                 transforms.push({
                     pickExport: [dreamkitPickEntry],

package/lib/transforms/to-solid-link.d.ts

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

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

@@ -0,0 +1 @@
+{"version":3,"file":"to-solid-link.d.ts","sourceRoot":"","sources":["../../src/transforms/to-solid-link.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,WAAW,oDAkDtB,CAAC"}

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

@@ -0,0 +1,38 @@
+import { addFileChanges, addImports, defineTransform } from "../utils/ast.js";
+import { traverse } from "../utils/babel.js";
+import * as t from "@babel/types";
+export const toSolidLink = defineTransform({
+    onlyIf: (code) => code.includes("Link"),
+    run: (ast) => {
+        let changes = 0;
+        const addRouterImports = (programPath) => addImports(programPath, ["A"], "@solidjs/router");
+        let routeImports;
+        let linkSpec;
+        traverse(ast, {
+            Program(programPath) {
+                programPath.traverse({
+                    ImportDeclaration(path) {
+                        for (const spec of path.node.specifiers) {
+                            if (path.node.source.value === "dreamkit" &&
+                                spec.type === "ImportSpecifier" &&
+                                spec.imported.type === "Identifier" &&
+                                spec.imported.name === "Link") {
+                                linkSpec = spec.local.name;
+                            }
+                        }
+                    },
+                    JSXOpeningElement(path) {
+                        if (path.node.name.type === "JSXIdentifier" &&
+                            path.node.name.name === linkSpec) {
+                            if (!routeImports)
+                                routeImports = addImports(programPath, ["A"], "@solidjs/router");
+                            changes++;
+                            path.node.attributes.push(t.jsxAttribute(t.jsxIdentifier("component"), t.jsxExpressionContainer(t.identifier(routeImports.A))));
+                        }
+                    },
+                });
+            },
+        });
+        return addFileChanges(ast, 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":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,KAAK,CAAC,MAAM,cAAc,CAAC;AAElC,wBAAgB,YAAY,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,UA2IpD"}
+{"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"}

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

@@ -1,21 +1,29 @@
-import { addFileChanges, getFirstChain } from "../utils/ast.js";
+import { addFileChanges, 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";
 export function toSolidRoute(ast) {
     let changes = 0;
+    let deps;
     let routeImportName;
     const routeSpec = "$route";
-    const routeSource = "dreamkit/solid";
+    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/solid";
+                            // import { route as ? } from "dreamkit/adapters/solid.js";
                             const isRouteImport = path.node.imported.type === "Identifier" &&
                                 path.node.imported.name === routeSpec &&
-                                importPath.node.source.value === routeSource;
+                                importPath.node.source.value === routeNewSource;
                             if (isRouteImport)
                                 routeImportName = path.node.local.name;
                         },
@@ -27,8 +35,9 @@ export function toSolidRoute(ast) {
                     // import { $route } from "dreamkit";
                     // export default route.params({}).create(() => {});
                     // [output]
-                    // import { $route as _$route } from "dreamkit/solid"
-                    // const selfRoute = _$route.params({});
+                    // import { $route as _$route } from "dreamkit/adapters/solid.js"
+                    // import { useLocation, useRouter, useParams} from "@solidjs/router"
+                    // const selfRoute = _$route.params({}).clone({ deps: ? });
                     // export const route = selfRoute.createRouteDefinition();
                     // export default delfRoute.create(() => {})
                     if (
@@ -39,14 +48,18 @@ export function toSolidRoute(ast) {
                         dec.callee.property.type == "Identifier" &&
                         dec.callee.property.name === "create") {
                         changes++;
+                        if (!deps)
+                            deps = importDeps(programPath);
                         const selfRoute = programPath.scope.generateUid("selfRoute");
                         ast.program.body.splice(ast.program.body.indexOf(path.node), 1, 
                         // const selfRoute = route.?.?.?
-                        createSelfRoute(selfRoute, dec.callee.object), 
-                        // export const route = selfRoute.createRouteDefinition();
-                        createExportRouteDefinition(selfRoute), 
+                        createConst(selfRoute, prependChainCall(dec.callee.object, "clone", [
+                            createDepsObject(deps),
+                        ])), 
+                        // export const route = selfRoute.createRouteDefinition()
+                        t.exportNamedDeclaration(createConst("route", appendChainCall(selfRoute, "createRouteDefinition", []))), 
                         // export default selfRoute.create(() => {})
-                        createDefaultExportRoute(selfRoute, dec.arguments[0]));
+                        t.exportDefaultDeclaration(appendChainCall(t.identifier(selfRoute), "create", dec.arguments)));
                     }
                 },
                 // [input]
@@ -54,8 +67,9 @@ export function toSolidRoute(ast) {
                 // export const route = $route.params({}).path('/path');
                 // export default function Users() { useRoute(route); }
                 // [output]
-                // import { $route as _$route } from "dreamkit/solid"
-                // const selfRoute = _$route.params({}).path('/path');
+                // import { $route as _$route } from "dreamkit/adapters/solid.js"
+                // import { useLocation, useRouter, useParams } from "@solidjs/router"
+                // const selfRoute = _$route.params({}).path('/path').clone({ deps: ? });
                 // export const route = selfRoute.createRouteDefinition();
                 // export default selfRoute.create(function Users() { useRoute(selfRoute); });
                 ExportNamedDeclaration(path) {
@@ -71,6 +85,8 @@ export function toSolidRoute(ast) {
                             // [output]
                             // const _selfRoute = $route.?;
                             // export const route = _selfRoute.createRouteDefinition();
+                            if (!deps)
+                                deps = importDeps(programPath);
                             let exportFunction;
                             const selfRoute = programPath.scope.generateUid("selfRoute");
                             const index = ast.program.body.indexOf(path.node);
@@ -89,11 +105,13 @@ export function toSolidRoute(ast) {
                                 }
                                 return true;
                             });
-                            ast.program.body.splice(index, 1, createSelfRoute(selfRoute, dec.init), createExportRouteDefinition(selfRoute), ...(exportFunction
+                            ast.program.body.splice(index, 1, createConst(selfRoute, prependChainCall(dec.init, "clone", [createDepsObject(deps)])), t.exportNamedDeclaration(createConst("route", appendChainCall(selfRoute, "createRouteDefinition", []))), ...(exportFunction
                                 ? [
-                                    createDefaultExportRoute(selfRoute, exportFunction.type === "FunctionDeclaration"
-                                        ? t.functionExpression(exportFunction.id, exportFunction.params, exportFunction.body)
-                                        : exportFunction),
+                                    t.exportDefaultDeclaration(appendChainCall(selfRoute, "create", [
+                                        exportFunction.type === "FunctionDeclaration"
+                                            ? t.functionExpression(exportFunction.id, exportFunction.params, exportFunction.body)
+                                            : exportFunction,
+                                    ])),
                                 ]
                                 : []));
                         }
@@ -104,16 +122,11 @@ export function toSolidRoute(ast) {
     });
     return addFileChanges(ast, changes);
 }
-function createSelfRoute(name, route) {
-    return t.variableDeclaration("const", [
-        t.variableDeclarator(t.identifier(name), route),
+function createDepsObject(deps) {
+    return t.objectExpression([
+        t.objectProperty(t.identifier("deps"), t.objectExpression(Object.entries(deps).map(([key, value]) => t.objectProperty(t.identifier(key), t.identifier(value))))),
     ]);
 }
-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, component) {
-    return t.exportDefaultDeclaration(t.callExpression(t.memberExpression(t.identifier(name), t.identifier("create")), [component]));
+function importDeps(program) {
+    return addImports(program, ["useLocation", "useNavigate", "useParams"], "@solidjs/router");
 }

package/lib/utils/ast.d.ts

@@ -1,5 +1,6 @@
 import type { Transform } from "./transform.js";
 import { ParseResult } from "@babel/parser";
+import { NodePath } from "@babel/traverse";
 import * as t from "@babel/types";
 import * as lexer from "es-module-lexer";
 export declare function parseCode(input: string | string[]): t.Statement[];
@@ -16,4 +17,10 @@ export declare function analyzeModule(path: string): Promise<readonly [imports:
 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 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): {
+    [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,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"}
+{"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"}

package/lib/utils/ast.js

@@ -1,4 +1,5 @@
 import { generator, parser } from "./babel.js";
+import * as t from "@babel/types";
 import * as lexer from "es-module-lexer";
 import { transform } from "esbuild";
 import { readFile } from "fs/promises";
@@ -79,3 +80,47 @@ export async function findExportedNamesFromFile(path) {
 export function defineTransform(transform) {
     return transform;
 }
+export function createConst(name, value) {
+    return t.variableDeclaration("const", [
+        t.variableDeclarator(t.identifier(name), value),
+    ]);
+}
+export function appendChainCall(input, method, args) {
+    if (typeof input === "string")
+        input = t.identifier(input);
+    if (input.type === "Identifier") {
+        return t.callExpression(t.memberExpression(input, t.identifier(method)), args);
+    }
+    else if (input.type === "CallExpression") {
+        return t.callExpression(t.memberExpression(input, t.identifier(method)), args);
+    }
+    else {
+        throw new Error("Unsupported route type");
+    }
+}
+export function prependChainCall(input, method, args = []) {
+    if (typeof input === "string")
+        input = t.identifier(input);
+    if (input.type === "Identifier") {
+        return t.callExpression(t.memberExpression(input, t.identifier(method)), args);
+    }
+    else if (input.type === "CallExpression") {
+        const cloned = t.cloneNode(input);
+        const firstChain = getFirstChain(cloned);
+        if (!firstChain)
+            throw new Error("Unsupported route type");
+        firstChain.value.object = t.callExpression(t.memberExpression(firstChain.value.object, t.identifier(method)), args);
+        return cloned;
+    }
+    else {
+        throw new Error("Unsupported route type");
+    }
+}
+export function addImports(program, specifiers, source) {
+    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) => {
+        result[name] = id[index];
+        return result;
+    }, {});
+}

package/lib/utils/transform.d.ts

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

package/lib/utils/transform.js

@@ -2,7 +2,7 @@ import { exportDefault } from "../transforms/export-default.js";
 import { noExport } from "../transforms/no-export.js";
 import { pickExport } from "../transforms/pick-export.js";
 import { replaceImportSpec } from "../transforms/replace-import-spec.js";
-import { toSolidImport } from "../transforms/to-solid-import.js";
+import { toSolidLink } from "../transforms/to-solid-link.js";
 import { toSolidRoute } from "../transforms/to-solid-route.js";
 import { generateIfChanges, parseFile } from "./ast.js";
 const $transforms = {
@@ -11,7 +11,7 @@ const $transforms = {
     noExport,
     replaceImportSpec,
     toSolidRoute,
-    toSolidImport,
+    toSolidLink,
 };
 export function transformCode(code, ...input) {
     let ast;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dreamkit/dev",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "Development tools for DreamKit.",
   "homepage": "https://dreamkit.dev",
   "repository": {

package/lib/transforms/to-solid-import.d.ts

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

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

@@ -1 +0,0 @@
-{"version":3,"file":"to-solid-import.d.ts","sourceRoot":"","sources":["../../src/transforms/to-solid-import.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,aAAa,oDAgBxB,CAAC"}

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

@@ -1,18 +0,0 @@
-import { defineTransform } from "../utils/ast.js";
-import { replaceImportSpec } from "./replace-import-spec.js";
-export const toSolidImport = defineTransform({
-    onlyIf: (code) => code.includes("'dreamkit'") || code.includes('"dreamkit"'),
-    run: (ast) => replaceImportSpec(ast, {
-        source: "dreamkit",
-        newSource: "dreamkit/solid",
-        spec: [
-            "Link",
-            "Input",
-            "createAction",
-            "useRoute",
-            "defineLink",
-            "LinkComponent",
-            "$route",
-        ],
-    }),
-});