@kithinji/pod 1.0.11 → 1.0.13

package/dist/types/dev/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../src/dev/server.ts"],"names":[],"mappings":"AAyDA,wBAAsB,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC,CAoIpD"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../src/dev/server.ts"],"names":[],"mappings":"AAyDA,wBAAsB,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC,CAqIpD"}

package/dist/types/plugins/analyzers/graph.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graph.d.ts","sourceRoot":"","sources":["../../../../src/plugins/analyzers/graph.ts"],"names":[],"mappings":"AAKA,KAAK,UAAU,GACX,OAAO,GACP,UAAU,GACV,UAAU,GACV,WAAW,GACX,MAAM,GACN,MAAM,GACN,WAAW,GACX,SAAS,CAAC;AAEd,UAAU,UAAU;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,UAAU,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,UAAU,UAAU;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,OAAO,EAAE,UAAU,EAAE,CAAC;CACvB;AAED,MAAM,WAAW,QAAQ;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,OAAO,CAAC;IACf,SAAS,EAAE,QAAQ,GAAG,aAAa,GAAG,IAAI,CAAC;IAC3C,OAAO,EAAE,UAAU,EAAE,CAAC;IACtB,OAAO,EAAE,UAAU,EAAE,CAAC;CACvB;AAED,MAAM,WAAW,eAAe;IAC9B,CAAC,QAAQ,EAAE,MAAM,GAAG,QAAQ,CAAC;CAC9B;AAyJD,wBAAgB,UAAU,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,eAAe,CAmGjE"}
+{"version":3,"file":"graph.d.ts","sourceRoot":"","sources":["../../../../src/plugins/analyzers/graph.ts"],"names":[],"mappings":"AAMA,KAAK,UAAU,GACX,OAAO,GACP,UAAU,GACV,UAAU,GACV,WAAW,GACX,MAAM,GACN,MAAM,GACN,WAAW,GACX,SAAS,CAAC;AAEd,UAAU,UAAU;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,UAAU,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,UAAU,UAAU;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,OAAO,EAAE,UAAU,EAAE,CAAC;CACvB;AAED,MAAM,WAAW,QAAQ;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,OAAO,CAAC;IACf,SAAS,EAAE,QAAQ,GAAG,aAAa,GAAG,IAAI,CAAC;IAC3C,OAAO,EAAE,UAAU,EAAE,CAAC;IACtB,OAAO,EAAE,UAAU,EAAE,CAAC;CACvB;AAED,MAAM,WAAW,eAAe;IAC9B,CAAC,QAAQ,EAAE,MAAM,GAAG,QAAQ,CAAC;CAC9B;AAiKD,wBAAgB,UAAU,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,eAAe,CA8EjE"}

package/dist/types/plugins/generators/tsx_server_stub.d.ts

@@ -1,2 +1,4 @@
+import type { Decorator } from "@swc/core";
 export declare function generateServerStub(filePath: string, code: string): string;
+export declare function stringifyDecorator(decorator: Decorator): string;
 //# sourceMappingURL=tsx_server_stub.d.ts.map

package/dist/types/plugins/generators/tsx_server_stub.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tsx_server_stub.d.ts","sourceRoot":"","sources":["../../../../src/plugins/generators/tsx_server_stub.ts"],"names":[],"mappings":"AAoBA,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CA2EzE"}
+{"version":3,"file":"tsx_server_stub.d.ts","sourceRoot":"","sources":["../../../../src/plugins/generators/tsx_server_stub.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAGV,SAAS,EAEV,MAAM,WAAW,CAAC;AAanB,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CA2EzE;AAwDD,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,SAAS,GAAG,MAAM,CAiB/D"}

package/dist/types/plugins/my.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"my.d.ts","sourceRoot":"","sources":["../../../src/plugins/my.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAA4B,MAAM,SAAS,CAAC;AAMhE,OAAO,EAAE,eAAe,EAAY,MAAM,mBAAmB,CAAC;AAO9D,UAAU,cAAc;IACtB,aAAa,EAAE,OAAO,CAAC;IACvB,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB,aAAa,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CACvC;AA6ND,wBAAgB,WAAW,CAAC,OAAO,EAAE,cAAc,GAAG,MAAM,CAmC3D"}
+{"version":3,"file":"my.d.ts","sourceRoot":"","sources":["../../../src/plugins/my.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAA4B,MAAM,SAAS,CAAC;AAMhE,OAAO,EAAE,eAAe,EAAY,MAAM,mBAAmB,CAAC;AAQ9D,UAAU,cAAc;IACtB,aAAa,EAAE,OAAO,CAAC;IACvB,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB,aAAa,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CACvC;AAoOD,wBAAgB,WAAW,CAAC,OAAO,EAAE,cAAc,GAAG,MAAM,CAmC3D"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kithinji/pod",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "description": "",
   "bin": {
     "pod": "./dist/main.js"

package/src/dev/server.ts

@@ -84,6 +84,7 @@ export async function startDevServer(): Promise<void> {
       if (clientFiles.size === 0) return;
 
       const entryPoints = Array.from(clientFiles);
+
       const graph = buildGraph(entryPoints);
 
       clientCtx = await esbuild.context({

package/src/main.ts

@@ -28,7 +28,7 @@ import { dockerize } from "./docker";
 
 const program = new Command();
 
-program.name("pod").description("Pod cli tool").version("1.0.11");
+program.name("pod").description("Pod cli tool").version("1.0.13");
 
 program
   .command("new <name>")

package/src/plugins/analyzers/graph.ts

@@ -2,6 +2,7 @@ import { parseSync } from "@swc/core";
 import * as fs from "fs";
 import * as path from "path";
 import type { Module, Decorator } from "@swc/core";
+import { Store } from "@/store";
 
 type SymbolKind =
   | "class"
@@ -39,9 +40,7 @@ export interface DependencyGraph {
 }
 
 function resolveFilePath(fromFile: string, importPath: string): string | null {
-  if (!importPath.startsWith(".")) {
-    return null;
-  }
+  if (!importPath.startsWith(".")) return null;
 
   const dir = path.dirname(fromFile);
   const basePath = path.resolve(dir, importPath);
@@ -49,37 +48,31 @@ function resolveFilePath(fromFile: string, importPath: string): string | null {
   const extensions = ["", ".ts", ".tsx", ".js", ".jsx"];
   for (const ext of extensions) {
     const fullPath = basePath + ext;
-    if (fs.existsSync(fullPath) && fs.statSync(fullPath).isFile()) {
+    if (fs.existsSync(fullPath) && fs.statSync(fullPath).isFile())
       return fullPath;
-    }
   }
 
   const indexFiles = ["/index.ts", "/index.tsx", "/index.js", "/index.jsx"];
   for (const indexFile of indexFiles) {
     const fullPath = basePath + indexFile;
-    if (fs.existsSync(fullPath)) {
+    if (fs.existsSync(fullPath) && fs.statSync(fullPath).isFile())
       return fullPath;
-    }
   }
 
   return null;
 }
 
 function extractDecorators(decorators?: Decorator[]): string[] {
-  if (!decorators || decorators.length === 0) return [];
-
+  if (!decorators) return [];
   return decorators
-    .map((decorator) => {
-      if (decorator.expression.type === "CallExpression") {
-        if (decorator.expression.callee.type === "Identifier") {
-          return decorator.expression.callee.value;
-        }
-      } else if (decorator.expression.type === "Identifier") {
-        return decorator.expression.value;
-      }
+    .map((d) => {
+      const exp = d.expression;
+      if (exp.type === "CallExpression" && exp.callee.type === "Identifier")
+        return exp.callee.value;
+      if (exp.type === "Identifier") return exp.value;
       return "unknown";
     })
-    .filter((name) => name !== "unknown");
+    .filter((n) => n !== "unknown");
 }
 
 function extractDirective(ast: Module): "public" | "interactive" | null {
@@ -88,21 +81,34 @@ function extractDirective(ast: Module): "public" | "interactive" | null {
       item.type === "ExpressionStatement" &&
       item.expression.type === "StringLiteral"
     ) {
-      const value = item.expression.value;
-      if (value === "use public") return "public";
-      if (value === "use interactive") return "interactive";
-    }
-    if (
-      item.type !== "ExpressionStatement" ||
-      item.expression.type !== "StringLiteral"
-    ) {
+      const val = item.expression.value;
+      if (val === "use public") return "public";
+      if (val === "use interactive") return "interactive";
+    } else {
       break;
     }
   }
   return null;
 }
 
-function extractExports(ast: Module): SymbolInfo[] {
+function extractImports(
+  ast: Module
+): Array<{ path: string; specifiers: any[] }> {
+  const imports: Array<{ path: string; specifiers: any[] }> = [];
+  for (const item of ast.body) {
+    if (item.type === "ImportDeclaration") {
+      imports.push({ path: item.source.value, specifiers: item.specifiers });
+    }
+  }
+  return imports;
+}
+
+function extractExports(
+  ast: Module,
+  currentFile: string,
+  graph: DependencyGraph,
+  processFile: (fp: string) => void
+): SymbolInfo[] {
   const exports: SymbolInfo[] = [];
 
   for (const item of ast.body) {
@@ -133,10 +139,31 @@ function extractExports(ast: Module): SymbolInfo[] {
       }
     }
 
-    if (item.type === "ExportNamedDeclaration") {
-      for (const spec of item.specifiers) {
-        if (spec.type === "ExportSpecifier") {
-          exports.push({ name: spec.orig.value, kind: "unknown" });
+    if (item.type === "ExportNamedDeclaration" && item.source) {
+      const resolved = resolveFilePath(currentFile, item.source.value);
+      if (resolved) {
+        processFile(resolved);
+        const sourceExports = graph[resolved]?.exports || [];
+        for (const spec of item.specifiers) {
+          if (spec.type === "ExportSpecifier") {
+            const exp = sourceExports.find((e) => e.name === spec.orig.value);
+            exports.push({
+              name: spec.exported?.value || spec.orig.value,
+              kind: exp?.kind || "unknown",
+              decorators: exp?.decorators,
+            });
+          }
+        }
+      }
+    }
+
+    if (item.type === "ExportAllDeclaration") {
+      const resolved = resolveFilePath(currentFile, item.source.value);
+      if (resolved) {
+        processFile(resolved);
+        const sourceExports = graph[resolved]?.exports || [];
+        for (const exp of sourceExports) {
+          exports.push({ ...exp });
         }
       }
     }
@@ -159,8 +186,7 @@ function extractExports(ast: Module): SymbolInfo[] {
         name: "default",
         kind,
         isDefault: true,
-        decorators:
-          decorators && decorators.length > 0 ? decorators : undefined,
+        decorators: decorators?.length ? decorators : undefined,
       });
     }
 
@@ -172,36 +198,13 @@ function extractExports(ast: Module): SymbolInfo[] {
   return exports;
 }
 
-function extractImports(
-  ast: Module
-): Array<{ path: string; specifiers: any[] }> {
-  const imports: Array<{ path: string; specifiers: any[] }> = [];
-
-  for (const item of ast.body) {
-    if (item.type === "ImportDeclaration") {
-      imports.push({
-        path: item.source.value,
-        specifiers: item.specifiers,
-      });
-    }
-  }
-
-  return imports;
-}
-
 export function buildGraph(entryPoints: string[]): DependencyGraph {
   const graph: DependencyGraph = {};
   const visited = new Set<string>();
 
   function processFile(filePath: string): void {
-    const allowed =
-      filePath.endsWith(".ts") ||
-      filePath.endsWith(".tsx") ||
-      filePath.endsWith(".js") ||
-      filePath.endsWith(".jsx");
-
-    if (!allowed) return;
-
+    const allowedExt = [".ts", ".tsx", ".js", ".jsx"];
+    if (!allowedExt.includes(path.extname(filePath))) return;
     if (visited.has(filePath)) return;
     visited.add(filePath);
 
@@ -210,9 +213,11 @@ export function buildGraph(entryPoints: string[]): DependencyGraph {
       return;
     }
 
-    const isTsx = filePath.endsWith(".tsx") || filePath.endsWith(".jsx");
+    const isTsx = [".tsx", ".jsx"].includes(path.extname(filePath));
+    const store = Store.getInstance();
+    const newCode = store.get<string>(filePath);
+    const content = newCode ? newCode[0] : fs.readFileSync(filePath, "utf-8");
 
-    const content = fs.readFileSync(filePath, "utf-8");
     const ast = parseSync(content, {
       syntax: "typescript",
       tsx: isTsx,
@@ -220,72 +225,55 @@ export function buildGraph(entryPoints: string[]): DependencyGraph {
     });
 
     const directive = extractDirective(ast);
-    const exports = extractExports(ast);
     const rawImports = extractImports(ast);
+    const exports = extractExports(ast, filePath, graph, processFile);
 
     for (const { path: importPath } of rawImports) {
       const resolved = resolveFilePath(filePath, importPath);
-      if (resolved) {
-        processFile(resolved);
-      }
+      if (resolved) processFile(resolved);
     }
 
-    const imports: ImportInfo[] = [];
-    for (const { path: importPath, specifiers } of rawImports) {
-      const resolvedPath = resolveFilePath(filePath, importPath);
-      const sourceExports =
-        resolvedPath && graph[resolvedPath] ? graph[resolvedPath].exports : [];
-      const symbols: SymbolInfo[] = [];
-
-      for (const spec of specifiers) {
-        if (spec.type === "ImportDefaultSpecifier") {
-          const defaultExport = sourceExports.find((e) => e.isDefault);
-          symbols.push({
-            name: spec.local.value,
-            kind: defaultExport?.kind || "unknown",
-            decorators: defaultExport?.decorators,
-            isDefault: true,
-          });
-        } else if (spec.type === "ImportNamespaceSpecifier") {
-          symbols.push({
-            name: spec.local.value,
-            kind: "namespace",
-          });
-        } else if (spec.type === "ImportSpecifier") {
-          const importedName = spec.imported
-            ? spec.imported.value
-            : spec.local.value;
-          const exportedSymbol = sourceExports.find(
-            (e) => e.name === importedName
-          );
-          symbols.push({
-            name: importedName,
-            kind: exportedSymbol?.kind || "unknown",
-            decorators: exportedSymbol?.decorators,
-          });
+    const imports: ImportInfo[] = rawImports.map(
+      ({ path: importPath, specifiers }) => {
+        const resolvedPath = resolveFilePath(filePath, importPath);
+        const sourceExports =
+          resolvedPath && graph[resolvedPath]
+            ? graph[resolvedPath].exports
+            : [];
+        const symbols: SymbolInfo[] = [];
+
+        for (const spec of specifiers) {
+          if (spec.type === "ImportDefaultSpecifier") {
+            const def = sourceExports.find((e) => e.isDefault);
+            symbols.push({
+              name: spec.local.value,
+              kind: def?.kind || "unknown",
+              decorators: def?.decorators,
+              isDefault: true,
+            });
+          } else if (spec.type === "ImportNamespaceSpecifier") {
+            symbols.push({ name: spec.local.value, kind: "namespace" });
+          } else if (spec.type === "ImportSpecifier") {
+            const importedName = spec.imported
+              ? spec.imported.value
+              : spec.local.value;
+            const exp = sourceExports.find((e) => e.name === importedName);
+            symbols.push({
+              name: importedName,
+              kind: exp?.kind || "unknown",
+              decorators: exp?.decorators,
+            });
+          }
         }
-      }
 
-      imports.push({
-        sourcePath: importPath,
-        resolvedPath,
-        symbols,
-      });
-    }
+        return { sourcePath: importPath, resolvedPath, symbols };
+      }
+    );
 
-    graph[filePath] = {
-      filePath,
-      isTsx,
-      directive,
-      imports,
-      exports,
-    };
+    graph[filePath] = { filePath, isTsx, directive, imports, exports };
   }
 
-  for (const entry of entryPoints) {
-    const resolved = path.resolve(entry);
-    processFile(resolved);
-  }
+  for (const entry of entryPoints) processFile(path.resolve(entry));
 
   return graph;
 }

package/src/plugins/generators/tsx_server_stub.ts

@@ -12,6 +12,7 @@ interface ClassStub {
   name: string;
   propsType: string;
   decorators: string[];
+  constructorParams: string[]; // added for constructor arguments
 }
 
 interface ImportMap {
@@ -119,6 +120,7 @@ function extractClassStub(classDecl: ClassDeclaration): ClassStub | null {
 
   let propsType = "{}";
   const decorators: string[] = [];
+  const constructorParams: string[] = [];
 
   if (classDecl.decorators) {
     for (const dec of classDecl.decorators) {
@@ -132,6 +134,11 @@ function extractClassStub(classDecl: ClassDeclaration): ClassStub | null {
       if (member.key.type === "Identifier" && member.key.value === "props") {
         propsType = extractPropsType(member);
       }
+    } else if (member.type === "Constructor") {
+      for (const param of member.params) {
+        const paramStr = stringifyParam(param);
+        if (paramStr) constructorParams.push(paramStr);
+      }
     }
   }
 
@@ -139,18 +146,27 @@ function extractClassStub(classDecl: ClassDeclaration): ClassStub | null {
     name: className,
     propsType,
     decorators,
+    constructorParams,
   };
 }
 
-function stringifyDecorator(decorator: Decorator): string {
-  const expr = decorator.expression;
-  if (expr.type === "CallExpression" && expr.callee.type === "Identifier") {
-    return `@${expr.callee.value}()`;
-  }
-  if (expr.type === "Identifier") {
-    return `@${expr.value}`;
-  }
-  return "";
+export function stringifyDecorator(decorator: Decorator): string {
+  const exprCode = printSync({
+    type: "Module",
+    span: { start: 0, end: 0, ctxt: 0 },
+    body: [
+      {
+        type: "ExpressionStatement",
+        expression: decorator.expression,
+        span: { start: 0, end: 0, ctxt: 0 },
+      },
+    ],
+    interpreter: "",
+  }).code;
+
+  const cleanCode = exprCode.replace(/^#!.*\n/, "").trim();
+
+  return `@${cleanCode.replace(/;$/, "")}`;
 }
 
 function extractPropsType(member: any): string {
@@ -269,10 +285,14 @@ function generateClassCode(
   const decoratorsStr =
     stub.decorators.length > 0 ? stub.decorators.join("\n") + "\n" : "";
 
+  const constructorStr = stub.constructorParams.length
+    ? `constructor(${stub.constructorParams.join(", ")}) {}`
+    : "constructor() {}";
+
   return `
 ${decoratorsStr}export class ${stub.name} {
   props!: ${stub.propsType};
-  constructor() {}
+  ${constructorStr}
   build() {
     const inputProps = { ...this.props };
     return {

package/src/plugins/my.ts

@@ -10,6 +10,7 @@ import { generateServerStub } from "./generators/tsx_server_stub";
 import { j2d } from "./transformers/j2d";
 import { generateServerComponent } from "./generators/generate_server_component";
 import { generateRscStub } from "./generators/generate_rsc";
+import { Store } from "@/store";
 
 interface MyPluginParams {
   isServerBuild: boolean;
@@ -123,6 +124,7 @@ class ServerBuildTransformer {
     path: string
   ): Promise<OnLoadResult> {
     const stubSource = generateServerStub(path, source);
+
     return swcTransform(stubSource, path);
   }
 
@@ -139,7 +141,13 @@ class ServerBuildTransformer {
     if (isTsx) {
       if (isInteractiveFile) {
         onClientFound(path);
-        return this.transformInteractiveTsxStub(source, path);
+        const clientCode = await this.transformInteractiveTsxStub(source, path);
+
+        const store = Store.getInstance();
+
+        store.set(path, clientCode.contents);
+
+        return clientCode;
       }
       return this.transformServerTsx(source, path);
     }
@@ -260,10 +268,10 @@ export function useMyPlugin(options: MyPluginParams): Plugin {
           }
 
           const node = options.graph[args.path];
+
           if (!node) {
-            throw new Error(
-              `File node not found in dependency graph: ${args.path}`
-            );
+            console.log(`File node not found in depend graph: ${args.path}`);
+            throw new Error("900");
           }
 
           return clientTransformer.process(node, metadata);