@dreamkit/dev 0.0.10 → 0.0.12

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

@@ -1 +1 @@
-{"version":3,"file":"dev-server.d.ts","sourceRoot":"","sources":["../../../src/adapters/solid-start/dev-server.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,oBAAoB,EACpB,iBAAiB,EAClB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAKzD,OAAO,EAML,QAAQ,EAET,MAAM,sBAAsB,CAAC;AAsB9B,wBAAsB,uBAAuB,CAAC,OAAO,EAAE;IACrD,IAAI,EAAE,MAAM,CAAC;CACd,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAqDhC;AAuCD,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,QAAQ,EAClB,SAAS,GAAE,qBAA0B,qBAqJtC"}
+{"version":3,"file":"dev-server.d.ts","sourceRoot":"","sources":["../../../src/adapters/solid-start/dev-server.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,oBAAoB,EACpB,iBAAiB,EAClB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAKzD,OAAO,EAML,QAAQ,EAET,MAAM,sBAAsB,CAAC;AAsB9B,wBAAsB,uBAAuB,CAAC,OAAO,EAAE;IACrD,IAAI,EAAE,MAAM,CAAC;CACd,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAqDhC;AAuCD,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,QAAQ,EAClB,SAAS,GAAE,qBAA0B,qBAiKtC"}

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

@@ -79,7 +79,7 @@ function addVinxiEntryRoutes(vinxiApp, objectId, objectValue, entryPath) {
                 filePath: entryPath,
             };
             if (!objectValue.$options.path) {
-                console.warn("Missing route path", { id: objectId });
+                console.warn("Missing route path at dreamkit entry", { id: objectId });
                 continue;
             }
             routes._addRoute(vinxiRoute);
@@ -128,7 +128,19 @@ export function createDreamkitDevServer(vinxiApp, inOptions = {}) {
         await server.stop();
     }
     async function onDevStart() {
-        const tryGenerate = createDelayedFunction(() => generate(server), 300);
+        const tryGenerate = createDelayedFunction(async () => {
+            const paths = new Set();
+            server.app.routes.forEach(async (route) => {
+                const path = route.$options.path;
+                if (path) {
+                    if (paths.has(path)) {
+                        console.warn("Duplicated route path", { path });
+                    }
+                    paths.add(path);
+                }
+            });
+            await generate(server);
+        }, 300);
         server.app
             .on("change", (data) => {
             if (isRoute(data.value)) {

package/lib/plugins/dreamkit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dreamkit.d.ts","sourceRoot":"","sources":["../../src/plugins/dreamkit.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAItD,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAE9B,wBAAgB,cAAc,CAAC,SAAS,GAAE,qBAA0B,GAAG,MAAM,CAkD5E"}
+{"version":3,"file":"dreamkit.d.ts","sourceRoot":"","sources":["../../src/plugins/dreamkit.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAItD,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAE9B,wBAAgB,cAAc,CAAC,SAAS,GAAE,qBAA0B,GAAG,MAAM,CAuD5E"}

package/lib/plugins/dreamkit.js

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

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

@@ -1,8 +1,9 @@
 import { ParseResult } from "@babel/parser";
 import * as t from "@babel/types";
 export declare function replaceImportSpec(ast: ParseResult<t.File>, options: {
-    spec: string[];
+    spec?: string[] | Record<string, string>;
     source: string;
-    newSource: string;
+    newSource?: string;
+    onRenameSpec?: (prev: string, next: string) => void;
 }): number;
 //# sourceMappingURL=replace-import-spec.d.ts.map

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":"AACA,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"}
+{"version":3,"file":"replace-import-spec.d.ts","sourceRoot":"","sources":["../../src/transforms/replace-import-spec.ts"],"names":[],"mappings":"AACA,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,CAAC,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACzC,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CACrD,UA6FF"}

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

@@ -2,29 +2,80 @@ import { traverse } from "../utils/babel.js";
 import * as t from "@babel/types";
 export function replaceImportSpec(ast, options) {
     let changes = 0;
-    traverse(ast, {
-        ImportDeclaration(path) {
-            const { node } = path;
-            if (node.source.value === options.source) {
-                node.specifiers = node.specifiers.filter((spec) => {
-                    if (spec.type === "ImportSpecifier" &&
-                        spec.imported.type === "Identifier" &&
-                        options.spec.includes(spec.imported.name)) {
-                        changes++;
-                        ast.program.body.unshift(t.importDeclaration([
-                            t.importSpecifier(t.identifier(spec.imported.name), t.identifier(spec.imported.name)),
-                        ], t.stringLiteral(options.newSource)));
-                        return false;
+    if (Array.isArray(options.spec) && options.newSource) {
+        const specArray = options.spec;
+        traverse(ast, {
+            ImportDeclaration(path) {
+                const { node } = path;
+                if (node.source.value === options.source) {
+                    node.specifiers = node.specifiers.filter((spec) => {
+                        if (spec.type === "ImportSpecifier" &&
+                            spec.imported.type === "Identifier" &&
+                            specArray.includes(spec.imported.name)) {
+                            changes++;
+                            ast.program.body.unshift(t.importDeclaration([
+                                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();
                     }
-                    return true;
-                });
-                if (changes) {
-                    if (!node.specifiers.length)
+                }
+            },
+        });
+    }
+    else if (options.spec) {
+        const specMap = options.spec;
+        traverse(ast, {
+            ImportDeclaration(path) {
+                const { node } = path;
+                if (node.source.value === options.source) {
+                    path.traverse({
+                        ImportSpecifier(spec) {
+                            if (spec.node.imported.type === "Identifier") {
+                                const specName = spec.node.imported.name;
+                                if (specMap[specName]) {
+                                    const newSpecName = specMap[specName];
+                                    const newSpecNameAlias = spec.scope.generateUid(newSpecName);
+                                    options.onRenameSpec?.(specName, newSpecNameAlias);
+                                    changes++;
+                                    spec.scope.rename(specName, newSpecNameAlias);
+                                    spec.node.imported = t.identifier(newSpecName);
+                                    if (options.newSource) {
+                                        spec.remove();
+                                        ast.program.body.unshift(t.importDeclaration([
+                                            t.importSpecifier(t.identifier(newSpecNameAlias), t.identifier(newSpecName)),
+                                        ], t.stringLiteral(options.newSource)));
+                                    }
+                                }
+                            }
+                        },
+                    });
+                    if (changes && !node.specifiers.length)
                         path.remove();
-                    path.scope.crawl();
                 }
-            }
-        },
-    });
+            },
+        });
+    }
+    else if (options.newSource) {
+        traverse(ast, {
+            ImportDeclaration(path) {
+                if (path.node.source.value === options.source) {
+                    changes++;
+                    path.node.source = t.stringLiteral(options.newSource);
+                }
+            },
+        });
+    }
+    if (changes)
+        traverse(ast, {
+            Program(programPath) {
+                programPath.scope.crawl();
+            },
+        });
     return 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":"AASA,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,UAgMpD"}
+{"version":3,"file":"to-solid-route.d.ts","sourceRoot":"","sources":["../../src/transforms/to-solid-route.ts"],"names":[],"mappings":"AASA,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,UAiMpD"}

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

@@ -37,7 +37,8 @@ export function toSolidRoute(ast) {
                     // export default login
                     dec.type === "Identifier") {
                         const bind = programPath.scope.bindings[dec.name];
-                        if (bind.path.node.type === "VariableDeclarator" &&
+                        if (bind &&
+                            bind.path.node.type === "VariableDeclarator" &&
                             bind.path.node.init) {
                             dec = bind.path.node.init;
                             path.remove();

package/lib/transforms/to-solid-server-action.d.ts

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

package/lib/transforms/to-solid-server-action.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"to-solid-server-action.d.ts","sourceRoot":"","sources":["../../src/transforms/to-solid-server-action.ts"],"names":[],"mappings":"AAaA,eAAO,MAAM,mBAAmB,oDAgF9B,CAAC"}

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

@@ -0,0 +1,126 @@
+import { createCallChains, createConst, defineTransform, getFirstChain, parseCallsChain, } from "../utils/ast.js";
+import { traverse } from "../utils/babel.js";
+import { replaceImportSpec } from "./replace-import-spec.js";
+import * as t from "@babel/types";
+export const toSolidServerAction = defineTransform({
+    onlyIf: (code) => code.includes("$api") && code.includes("dreamkit"),
+    run: (ast) => {
+        let apiId;
+        let changes = replaceImportSpec(ast, {
+            spec: { $api: "$serverApi" },
+            source: "dreamkit",
+            newSource: "dreamkit/adapters/solid.js",
+            onRenameSpec(prev, next) {
+                apiId = next;
+            },
+        });
+        if (apiId) {
+            let clientApiLoc = [];
+            traverse(ast, {
+                Program(programPath) {
+                    const binds = programPath.scope.bindings[apiId];
+                    programPath.traverse;
+                    binds.referencePaths.forEach((path) => {
+                        if (path.node.loc)
+                            clientApiLoc.push(path.node.loc);
+                    });
+                    programPath.traverse({
+                        VariableDeclaration(path) {
+                            const [dec] = path.node.declarations;
+                            const init = dec.init;
+                            if (path.parent.type === "Program" &&
+                                dec.id.type === "Identifier" &&
+                                init?.type === "CallExpression") {
+                                const first = getFirstChain(init);
+                                if (clientApiLoc.includes(first?.value.object.loc)) {
+                                    changes++;
+                                    const replaced = createServerAction(programPath, dec.id.name, init, false);
+                                    const index = programPath.node.body.findIndex((node) => node === path.node);
+                                    programPath.node.body.splice(index, 1, ...replaced);
+                                }
+                            }
+                        },
+                        ExportNamedDeclaration(path) {
+                            if (path.node.declaration) {
+                                if (path.node.declaration.type === "VariableDeclaration") {
+                                    const [dec] = path.node.declaration.declarations;
+                                    const init = dec.init;
+                                    if (dec.id.type === "Identifier" &&
+                                        init?.type === "CallExpression") {
+                                        const first = getFirstChain(init);
+                                        if (clientApiLoc.includes(first?.value.object.loc)) {
+                                            changes++;
+                                            const replaced = createServerAction(programPath, dec.id.name, init, true);
+                                            const index = programPath.node.body.findIndex((node) => node === path.node);
+                                            programPath.node.body.splice(index, 1, ...replaced);
+                                        }
+                                    }
+                                }
+                            }
+                        },
+                    });
+                },
+            });
+        }
+        return changes;
+    },
+});
+function createServerAction(program, name, call, exported = false) {
+    const commonApi = program.scope.generateUid(`base_${name}`);
+    const originalFunc = program.scope.generateUid(`original_${name}`);
+    const serverApi = program.scope.generateUid(`server_${name}`);
+    const chain = parseCallsChain(call);
+    const serverMethods = ["self", "create"];
+    return [
+        // const baseFetchData = $api.params({});
+        createConst(commonApi, createCallChains({
+            ...chain,
+            calls: chain.calls.filter(({ name }) => !serverMethods.includes(name)),
+        })),
+        t.variableDeclaration("let", [
+            t.variableDeclarator(t.identifier(name), t.arrowFunctionExpression([t.identifier("params")], t.blockStatement([
+                // const serverApi = $serverApi.clone(baseFetchData.options).self({}).create(() => {})
+                createConst(serverApi, createCallChains({
+                    ...chain,
+                    calls: [
+                        {
+                            name: "clone",
+                            arguments: [
+                                t.memberExpression(t.identifier(commonApi), t.identifier("options")),
+                            ],
+                        },
+                        ...chain.calls.filter(({ name }) => serverMethods.includes(name)),
+                    ],
+                })),
+                // return await serverApi(params);
+                t.returnStatement(t.awaitExpression(t.callExpression(t.identifier(serverApi), [
+                    t.identifier("params"),
+                ]))),
+            ], [t.directive(t.directiveLiteral("use server"))]), true)),
+        ]),
+        // const originalFetchData = fetchData;
+        createConst(originalFunc, t.identifier(name)),
+        // fetchData = baseFetchData.create(originalFetchData);
+        t.expressionStatement(t.assignmentExpression("=", t.identifier(name), createCallChains({
+            rootName: commonApi,
+            calls: [
+                {
+                    name: "clone",
+                    arguments: [
+                        t.objectExpression([
+                            t.objectProperty(t.identifier("context"), t.nullLiteral()),
+                        ]),
+                    ],
+                },
+                {
+                    name: "create",
+                    arguments: [t.identifier(originalFunc)],
+                },
+            ],
+        }))),
+        exported &&
+            t.exportNamedDeclaration(null, [
+                t.exportSpecifier(t.identifier(name), t.identifier(name)),
+            ]),
+    ].filter((v) => !!v);
+}

package/lib/utils/ast.d.ts

@@ -6,7 +6,17 @@ import * as lexer from "es-module-lexer";
 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): import("@babel/generator").GeneratorResult | undefined;
+export declare function tryGenerate(ast: ParseFileResult | undefined, log?: boolean | string): import("@babel/generator").GeneratorResult | undefined;
+export type Chain = {
+    rootName: string;
+    calls: {
+        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 removeChainCalls(input: t.CallExpression, names: string[]): t.CallExpression;
 export declare function getFirstChain(ref: t.Node): {
     identifier: string;
     value: t.MemberExpression;

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,CAAC,GAAG,EAAE,eAAe,GAAG,SAAS,EAAE,GAAG,CAAC,EAAE,OAAO,0DAM1E;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"}
+{"version":3,"file":"ast.d.ts","sourceRoot":"","sources":["../../src/utils/ast.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,KAAK,CAAC,MAAM,cAAc,CAAC;AAClC,OAAO,KAAK,KAAK,MAAM,iBAAiB,CAAC;AAIzC,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,iBAIjD;AAED,MAAM,MAAM,eAAe,GAAG,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;AAElD,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,uBAKrC;AAED,wBAAgB,WAAW,CACzB,GAAG,EAAE,eAAe,GAAG,SAAS,EAChC,GAAG,CAAC,EAAE,OAAO,GAAG,MAAM,0DAavB;AAED,MAAM,MAAM,KAAK,GAAG;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,GAAG,EAAE,CAAA;KAAE,EAAE,CAAC;CAC7C,CAAC;AAEF,wBAAgB,eAAe,CAAC,KAAK,EAAE,CAAC,CAAC,cAAc,GAAG,KAAK,CAwB9D;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,KAAK,mCAS5C;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,CAAC,CAAC,cAAc,EAAE,KAAK,EAAE,MAAM,EAAE,oBAaxE;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,CAAC,CAAC,IAAI;gBAGrB,MAAM;WACX,CAAC,CAAC,gBAAgB;cAgBhC;AAED,wBAAsB,aAAa,CAAC,IAAI,EAAE,MAAM,uJAQ/C;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,eAAe,YAoBrD;AAED,wBAAsB,yBAAyB,CAAC,IAAI,EAAE,MAAM,qBAG3D;AACD,wBAAgB,eAAe,CAAC,CAAC,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAExE;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,UAAU,yBAI5D;AAED,wBAAgB,eAAe,CAC7B,KAAK,EAAE,CAAC,CAAC,UAAU,GAAG,MAAM,EAC5B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,CAAC,CAAC,UAAU,EAAE,oBAiBrB;AAED,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,CAAC,CAAC,UAAU,GAAG,MAAM,EAC5B,MAAM,EAAE,MAAM,EACd,IAAI,GAAE,CAAC,CAAC,UAAU,EAAO,oBAqB1B;AAED,wBAAgB,UAAU,CAAC,CAAC,SAAS,MAAM,EACzC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,EAC5B,UAAU,EAAE,CAAC,EAAE,EACf,MAAM,EAAE,MAAM,GACb;KAAG,CAAC,IAAI,CAAC,GAAG,MAAM;CAAE,CAkBtB"}

package/lib/utils/ast.js

@@ -17,11 +17,65 @@ export function parseFile(code) {
 export function tryGenerate(ast, log) {
     if (ast) {
         const generated = generator(ast);
-        if (log)
-            console.log(generated);
+        if (log) {
+            if (typeof log === "string") {
+                console.log({ id: log, ...generated });
+            }
+            else {
+                console.log(generated);
+            }
+        }
         return generated;
     }
 }
+export function parseCallsChain(input) {
+    let ref = input;
+    let rootName;
+    let calls = [];
+    while (true) {
+        if (ref.callee.type === "MemberExpression") {
+            if (ref.callee.property.type !== "Identifier")
+                throw new Error("Invalid chain");
+            calls.push({
+                name: ref.callee.property.name,
+                arguments: ref.arguments,
+            });
+            if (ref.callee.object.type === "Identifier") {
+                rootName = ref.callee.object.name;
+                break;
+            }
+            else if (ref.callee.object.type === "CallExpression") {
+                ref = ref.callee.object;
+            }
+            else {
+                break;
+            }
+        }
+    }
+    return { rootName, calls: calls.reverse() };
+}
+export function createCallChains(chain) {
+    let ref = t.identifier(chain.rootName);
+    for (const call of chain.calls) {
+        ref = t.callExpression(t.memberExpression(ref, t.identifier(call.name)), call.arguments);
+    }
+    return ref;
+}
+export function removeChainCalls(input, names) {
+    const root = t.cloneNode(input);
+    let ref = root;
+    while (ref.type === "CallExpression") {
+        ref = t.callExpression(ref.callee, ref.arguments);
+        if (ref.callee.type === "MemberExpression") {
+            if (ref.callee.property.type === "Identifier") {
+                if (names.includes(ref.callee.property.name))
+                    continue;
+            }
+            ref = ref.callee.object;
+        }
+    }
+    return root;
+}
 export function getFirstChain(ref) {
     let lastMember;
     while (ref.type === "CallExpression") {
@@ -50,7 +104,10 @@ export async function analyzeModule(path) {
 export function findExportedNames(ast) {
     return ast.program.body
         .map((stm) => {
-        if (stm.type === "ExportNamedDeclaration" && stm.declaration) {
+        if (stm.type === "ExportDefaultDeclaration") {
+            return "default";
+        }
+        else if (stm.type === "ExportNamedDeclaration" && stm.declaration) {
             if (stm.declaration.type === "VariableDeclaration") {
                 const [dec] = stm.declaration.declarations;
                 if (dec.id.type === "Identifier")

package/lib/utils/transform.d.ts

@@ -11,6 +11,7 @@ declare const $transforms: {
     replaceImportSpec: typeof replaceImportSpec;
     toSolidRoute: typeof toSolidRoute;
     toSolidLink: Transform<unknown>;
+    toSolidServerAction: 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.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;AAEzE,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAA0B,eAAe,EAAE,MAAM,UAAU,CAAC;AAEnE,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,+BAuBtE;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"}
+{"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;AAE/D,OAAO,EAA0B,eAAe,EAAE,MAAM,UAAU,CAAC;AAEnE,QAAA,MAAM,WAAW;;;;;;;;CAQhB,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,+BAuBtE;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

@@ -4,6 +4,7 @@ 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 { toSolidServerAction } from "../transforms/to-solid-server-action.js";
 import { tryGenerate, parseFile } from "./ast.js";
 const $transforms = {
     pickExport,
@@ -12,6 +13,7 @@ const $transforms = {
     replaceImportSpec,
     toSolidRoute,
     toSolidLink,
+    toSolidServerAction,
 };
 export function transformCode(code, ...input) {
     let ast;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dreamkit/dev",
-  "version": "0.0.10",
+  "version": "0.0.12",
   "description": "Development tools for DreamKit.",
   "homepage": "https://dreamkit.dev",
   "repository": {
@@ -45,8 +45,8 @@
     "rollup": "^4.26.0",
     "vite-plugin-solid": "^2.10.2",
     "vite-tsconfig-paths": "^5.1.2",
-    "@dreamkit/app": "0.0.4",
-    "@dreamkit/schema": "0.0.3"
+    "@dreamkit/app": "0.0.5",
+    "@dreamkit/schema": "0.0.4"
   },
   "devDependencies": {
     "@types/debug": "^4.1.12",