@dreamkit/dev 0.0.4 → 0.0.6

package/lib/DreamkitDevServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DreamkitDevServer.d.ts","sourceRoot":"","sources":["../src/DreamkitDevServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,qBAAqB,EACrB,wBAAwB,EACzB,MAAM,cAAc,CAAC;AAKtB,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD,OAAO,EAAE,GAAG,EAAW,KAAK,EAAU,MAAM,eAAe,CAAC;AAE5D,OAAO,EAAmC,aAAa,EAAE,MAAM,MAAM,CAAC;AAGtE,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE3C,MAAM,MAAM,0BAA0B,GAAG;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,qBAAqB,GACtD,0BAA0B,CAAC;AAC7B,MAAM,MAAM,kBAAkB,GAAG,wBAAwB,GACvD,0BAA0B,CAAC;AAE7B,qBAAa,iBAAiB;IAC5B,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;IAClB,QAAQ,CAAC,KAAK,EAAE,cAAc,CAAC;IAC/B,SAAS,CAAC,aAAa,EAAE,aAAa,GAAG,SAAS,CAAC;IACnD,SAAS,CAAC,OAAO,EAAE,WAAW,GAAG,SAAS,CAAC;IAC3C,QAAQ,CAAC,OAAO,EAAE,kBAAkB,CAAC;gBACzB,SAAS,EAAE,oBAAoB;IA6BrC,KAAK,CAAC,IAAI,EAAE,MAAM;IAKlB,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;IAkCtC,IAAI;CAIX"}
+{"version":3,"file":"DreamkitDevServer.d.ts","sourceRoot":"","sources":["../src/DreamkitDevServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,qBAAqB,EACrB,wBAAwB,EACzB,MAAM,cAAc,CAAC;AAKtB,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AASpD,OAAO,EAAE,GAAG,EAAW,KAAK,EAAU,MAAM,eAAe,CAAC;AAE5D,OAAO,EAAmC,aAAa,EAAE,MAAM,MAAM,CAAC;AAGtE,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE3C,MAAM,MAAM,0BAA0B,GAAG;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,qBAAqB,GACtD,0BAA0B,CAAC;AAC7B,MAAM,MAAM,kBAAkB,GAAG,wBAAwB,GACvD,0BAA0B,CAAC;AAE7B,qBAAa,iBAAiB;IAC5B,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;IAClB,QAAQ,CAAC,KAAK,EAAE,cAAc,CAAC;IAC/B,SAAS,CAAC,aAAa,EAAE,aAAa,GAAG,SAAS,CAAC;IACnD,SAAS,CAAC,OAAO,EAAE,WAAW,GAAG,SAAS,CAAC;IAC3C,QAAQ,CAAC,OAAO,EAAE,kBAAkB,CAAC;gBACzB,SAAS,EAAE,oBAAoB;IA6BrC,KAAK,CAAC,IAAI,EAAE,MAAM;IAMlB,YAAY,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC;IAIzC,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;IAKxC,gBAAgB;IAyBhB,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAIjD,OAAO,CAAC,uBAAuB,UAAO;IAqCtC,IAAI;CAIX"}

package/lib/DreamkitDevServer.js

@@ -1,10 +1,9 @@
 import { dreamkitPluginOptions, } from "./options.js";
-import { generateIfChanges } from "./utils/ast.js";
 import { log } from "./utils/log.js";
-import { resolvePath } from "./utils/path.js";
+import { getExt, resolvePath } from "./utils/path.js";
 import { findFileRoutes } from "./utils/router.js";
 import { VirtualShaking } from "./utils/shaking.js";
-import { createTransformUrl, transformCodeByUrl } from "./utils/transform.js";
+import { createTransformUrl, getUrlTransforms, transformAndGenerate, } from "./utils/transform.js";
 import { App, isRoute, $route } from "@dreamkit/app";
 import { existsSync } from "fs";
 import { createServer, createViteRuntime } from "vite";
@@ -48,7 +47,8 @@ export class DreamkitDevServer {
     async fetch(path) {
         //const mod = $server.moduleGraph.getModuleById(shaking.entry);
         //if (mod) $server.moduleGraph.invalidateModule(mod);
-        return await this.runtime.executeUrl(`${path}?${Date.now()}`);
+        const ext = getExt(path);
+        return await this.runtime.executeUrl(`${path}?${Date.now()}&ext=${ext}`);
     }
     async fetchDefault(path) {
         const result = await this.fetch(path);
@@ -100,8 +100,7 @@ export class DreamkitDevServer {
                     enforce: "pre",
                     load: (id) => this.entry.tryLoad(id),
                     transform(code, id) {
-                        const ast = transformCodeByUrl(id, code);
-                        return generateIfChanges(ast);
+                        return transformAndGenerate(code, { toSolidLink: true }, ...getUrlTransforms(id));
                     },
                     handleHotUpdate: async ({ file, read, modules }) => {
                         return this.entry.tryUpdate(file, read, modules);

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

package/lib/plugins/dreamkit.js

@@ -23,15 +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 = [];
-            if (code.includes("'dreamkit'") || code.includes('"dreamkit"'))
-                transforms.push({
-                    replaceImportSpec: {
-                        source: "dreamkit",
-                        spec: ["Link"],
-                        newSource: "dreamkit/adapters/solid.js",
-                    },
-                });
+            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":"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"}
+{"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,10 +1,10 @@
-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 imports;
+    let deps;
     let routeImportName;
     const routeSpec = "$route";
     const routeSource = "dreamkit";
@@ -36,10 +36,10 @@ export function toSolidRoute(ast) {
                     // export default route.params({}).create(() => {});
                     // [output]
                     // import { $route as _$route } from "dreamkit/adapters/solid.js"
-                    // import * as $deps from "dreamkit/adapters/solid-deps.js"
-                    // const selfRoute = _$route.params({});
+                    // import { useLocation, useRouter, useParams} from "@solidjs/router"
+                    // const selfRoute = _$route.params({}).clone({ deps: ? });
                     // export const route = selfRoute.createRouteDefinition();
-                    // export default delfRoute.clone({deps: $deps}).create(() => {})
+                    // export default delfRoute.create(() => {})
                     if (
                     // route.?.?.?.create()
                     dec.type === "CallExpression" &&
@@ -48,16 +48,18 @@ export function toSolidRoute(ast) {
                         dec.callee.property.type == "Identifier" &&
                         dec.callee.property.name === "create") {
                         changes++;
-                        if (!imports)
-                            imports = addImports(ast, programPath);
+                        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), 
-                        // export default selfRoute.clone({ deps }).create(() => {})
-                        createDefaultExportRoute(selfRoute, imports.deps, dec.arguments[0]));
+                        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(() => {})
+                        t.exportDefaultDeclaration(appendChainCall(t.identifier(selfRoute), "create", dec.arguments)));
                     }
                 },
                 // [input]
@@ -66,8 +68,8 @@ export function toSolidRoute(ast) {
                 // 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');
+                // 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) {
@@ -83,8 +85,8 @@ export function toSolidRoute(ast) {
                             // [output]
                             // const _selfRoute = $route.?;
                             // export const route = _selfRoute.createRouteDefinition();
-                            if (!imports)
-                                imports = addImports(ast, programPath);
+                            if (!deps)
+                                deps = importDeps(programPath);
                             let exportFunction;
                             const selfRoute = programPath.scope.generateUid("selfRoute");
                             const index = ast.program.body.indexOf(path.node);
@@ -103,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, imports.deps, 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,
+                                    ])),
                                 ]
                                 : []));
                         }
@@ -118,27 +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, 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 deps = program.scope.generateUid("deps");
-    ast.program.body.unshift(t.importDeclaration([t.importNamespaceSpecifier(t.identifier(deps))], t.stringLiteral("dreamkit/adapters/solid-deps.js")));
-    return {
-        deps,
-    };
+function importDeps(program) {
+    return addImports(program, ["useLocation", "useNavigate", "useParams"], "@solidjs/router");
 }

package/lib/utils/ast.d.ts

@@ -1,4 +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[];
@@ -14,4 +16,11 @@ export declare function getFirstChain(ref: t.Node): {
 export declare function analyzeModule(path: string): Promise<readonly [imports: readonly lexer.ImportSpecifier[], exports: readonly lexer.ExportSpecifier[], facade: boolean, hasModuleSyntax: boolean]>;
 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,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"}
+{"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";
@@ -76,3 +77,50 @@ export async function findExportedNamesFromFile(path) {
     const [, exports] = await analyzeModule(path);
     return exports.map((item) => item.n);
 }
+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

@@ -8,18 +8,26 @@ declare const $transforms: {
     pickExport: typeof pickExport;
     exportDefault: typeof exportDefault;
     noExport: typeof noExport;
-    toSolidRoute: typeof toSolidRoute;
     replaceImportSpec: typeof replaceImportSpec;
+    toSolidRoute: typeof toSolidRoute;
+    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]>;
+};
+export type TransformRun<T = any> = (ast: ParseFileResult, options: T) => number;
+export type Transform<T = any> = {
+    onlyIf?: (code: string, options: T) => boolean;
+    run: TransformRun<T>;
 };
-export type Transform = {
-    [K in keyof typeof $transforms]?: TrueIfUndefined<Parameters<(typeof $transforms)[K]>[1]>;
+export declare function transformCode(code: string, ...input: TransformObject[]): ParseFileResult | undefined;
+export declare function transformAndGenerate(code: string, ...input: TransformObject[]): import("@babel/generator").GeneratorResult | {
+    code: undefined;
+    map: undefined;
 };
-export declare function transformCode(code: string, ...input: Transform[]): ParseFileResult | undefined;
 export declare function transformCodeByUrl(id: string, code: string): ParseFileResult | undefined;
 type TrueIfUndefined<T> = [undefined] extends [T] ? true : T;
-export declare function createTransformUrl(id: string, ...transforms: {
-    [K in keyof typeof $transforms]?: TrueIfUndefined<Parameters<(typeof $transforms)[K]>[1]>;
-}[]): string;
-export declare function getUrlTransforms(id: string): Transform[];
+export declare function createTransformUrl(id: string, ...transforms: TransformObject[]): string;
+export declare function getUrlTransforms(id: string): TransformObject[];
 export {};
 //# sourceMappingURL=transform.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"transform.d.ts","sourceRoot":"","sources":["../../src/utils/transform.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAa,eAAe,EAAE,MAAM,UAAU,CAAC;AAEtD,QAAA,MAAM,WAAW;;;;;;CAMhB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;KACrB,CAAC,IAAI,MAAM,OAAO,WAAW,CAAC,CAAC,EAAE,eAAe,CAC/C,UAAU,CAAC,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACvC;CACF,CAAC;AAEF,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,SAAS,EAAE,+BAWhE;AAED,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,+BAG1D;AAED,KAAK,eAAe,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC;AAE7D,wBAAgB,kBAAkB,CAChC,EAAE,EAAE,MAAM,EACV,GAAG,UAAU,EAAE;KACZ,CAAC,IAAI,MAAM,OAAO,WAAW,CAAC,CAAC,EAAE,eAAe,CAC/C,UAAU,CAAC,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACvC;CACF,EAAE,UAQJ;AAED,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,MAAM,GAAG,SAAS,EAAE,CAKxD"}
+{"version":3,"file":"transform.d.ts","sourceRoot":"","sources":["../../src/utils/transform.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AAEzE,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAgC,eAAe,EAAE,MAAM,UAAU,CAAC;AAEzE,QAAA,MAAM,WAAW;;;;;;;CAOhB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;KAC3B,CAAC,IAAI,MAAM,OAAO,WAAW,CAAC,CAAC,EAAE,eAAe,CAC/C,UAAU,CACR,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,SAAS,CAAC,GAAG,CAAC,GAC1C,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAC9B,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,YAAY,CAAC,GAAG,CAAC,GAC/C,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,GACvB,KAAK,CACZ,CAAC,CAAC,CAAC,CACL;CACF,CAAC;AAEF,MAAM,MAAM,YAAY,CAAC,CAAC,GAAG,GAAG,IAAI,CAClC,GAAG,EAAE,eAAe,EACpB,OAAO,EAAE,CAAC,KACP,MAAM,CAAC;AAEZ,MAAM,MAAM,SAAS,CAAC,CAAC,GAAG,GAAG,IAAI;IAC/B,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,KAAK,OAAO,CAAC;IAC/C,GAAG,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC;CACtB,CAAC;AAEF,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,eAAe,EAAE,+BAsBtE;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,MAAM,EACZ,GAAG,KAAK,EAAE,eAAe,EAAE;;;EAI5B;AAED,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,+BAG1D;AAED,KAAK,eAAe,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC;AAE7D,wBAAgB,kBAAkB,CAChC,EAAE,EAAE,MAAM,EACV,GAAG,UAAU,EAAE,eAAe,EAAE,UAQjC;AAED,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,MAAM,GAAG,eAAe,EAAE,CAK9D"}

package/lib/utils/transform.js

@@ -2,27 +2,44 @@ 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 { toSolidLink } from "../transforms/to-solid-link.js";
 import { toSolidRoute } from "../transforms/to-solid-route.js";
-import { parseFile } from "./ast.js";
+import { generateIfChanges, parseFile } from "./ast.js";
 const $transforms = {
     pickExport,
     exportDefault,
     noExport,
-    toSolidRoute,
     replaceImportSpec,
+    toSolidRoute,
+    toSolidLink,
 };
 export function transformCode(code, ...input) {
     let ast;
     for (const item of input) {
-        for (let [name, value] of Object.entries(item)) {
+        for (let [name, options] of Object.entries(item)) {
             if (name in $transforms) {
+                const $transform = $transforms[name];
+                let run;
+                if ("run" in $transform) {
+                    if (ast === undefined && $transform.onlyIf)
+                        if (!$transform.onlyIf(code, options))
+                            continue;
+                    run = $transform.run;
+                }
+                else {
+                    run = $transform;
+                }
                 ast = ast || parseFile(code);
-                $transforms[name](ast, value);
+                run(ast, options);
             }
         }
     }
     return ast;
 }
+export function transformAndGenerate(code, ...input) {
+    const ast = transformCode(code, ...input);
+    return generateIfChanges(ast) || { code: undefined, map: undefined };
+}
 export function transformCodeByUrl(id, code) {
     const transforms = getUrlTransforms(id);
     return transformCode(code, ...transforms);

package/package.json

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