@kithinji/pod 1.0.39 → 1.0.41

package/dist/index.js

@@ -1724,6 +1724,67 @@ var JSXUtilities = class {
   isComponentTag(tag) {
     return tag ? /^[A-Z]/.test(tag) : false;
   }
+  isSVGTag(tag) {
+    const svgTags = /* @__PURE__ */ new Set([
+      "svg",
+      "circle",
+      "rect",
+      "line",
+      "path",
+      "polygon",
+      "polyline",
+      "ellipse",
+      "text",
+      "tspan",
+      "g",
+      "defs",
+      "use",
+      "symbol",
+      "marker",
+      "clipPath",
+      "mask",
+      "pattern",
+      "linearGradient",
+      "radialGradient",
+      "stop",
+      "animate",
+      "animateTransform",
+      "foreignObject",
+      "image",
+      "textPath",
+      "feBlend",
+      "feColorMatrix",
+      "feComponentTransfer",
+      "feComposite",
+      "feConvolveMatrix",
+      "feDiffuseLighting",
+      "feDisplacementMap",
+      "feDistantLight",
+      "feFlood",
+      "feFuncA",
+      "feFuncB",
+      "feFuncG",
+      "feFuncR",
+      "feGaussianBlur",
+      "feImage",
+      "feMerge",
+      "feMergeNode",
+      "feMorphology",
+      "feOffset",
+      "fePointLight",
+      "feSpecularLighting",
+      "feSpotLight",
+      "feTile",
+      "feTurbulence",
+      "filter",
+      "metadata",
+      "title",
+      "desc",
+      "switch",
+      "view"
+    ]);
+    return svgTags.has(tag);
+  }
 };
 var ObservableManager = class {
   constructor(t, guards) {
@@ -1871,11 +1932,21 @@ var ElementTransformer = class {
   transformDOMElement(jsxElement, tag, scope, context2) {
     const elId = scope.generateUidIdentifier("el");
     const statements = [];
+    const isSVGTag = this.jsxUtils.isSVGTag(tag);
     statements.push(
       this.t.variableDeclaration("var", [
         this.t.variableDeclarator(
           elId,
-          this.t.callExpression(
+          isSVGTag ? this.t.callExpression(
+            this.t.memberExpression(
+              this.t.identifier("document"),
+              this.t.identifier("createElementNS")
+            ),
+            [
+              this.t.stringLiteral("http://www.w3.org/2000/svg"),
+              this.t.stringLiteral(tag)
+            ]
+          ) : this.t.callExpression(
             this.t.memberExpression(
               this.t.identifier("document"),
               this.t.identifier("createElement")
@@ -2732,8 +2803,8 @@ function stringifyType3(typeNode) {
 }
 function generateStubCode(stub) {
   const className = stub.name;
-  const build2 = stub.methods.find((p) => p.name == "build");
-  if (build2 == void 0) {
+  const build3 = stub.methods.find((p) => p.name == "build");
+  if (build3 == void 0) {
     throw new Error("Component has no build function");
   }
   const decoratorsStr = stub.decorators.length > 0 ? stub.decorators.join("\n") + "\n" : "";
@@ -3083,8 +3154,8 @@ function useMyPlugin(options) {
   const clientTransformer = new ClientBuildTransformer();
   return {
     name: "Orca",
-    setup(build2) {
-      build2.onLoad(
+    setup(build3) {
+      build3.onLoad(
         { filter: /\.tsx?$/ },
         async (args) => {
           const source = await fs2.readFile(args.path, "utf8");
@@ -3310,8 +3381,8 @@ import * as fs4 from "fs";
 function stylePlugin(store) {
   return {
     name: "style",
-    setup(build2) {
-      build2.onEnd(() => {
+    setup(build3) {
+      build3.onEnd(() => {
         const styleRules = store.get("style_rules");
         if (!styleRules || styleRules.length === 0) {
           console.log("No style rules generated");
@@ -3383,8 +3454,8 @@ function useCompilePlugin(options) {
   const transformer = new BuildTransformer();
   return {
     name: "Orca",
-    setup(build2) {
-      build2.onLoad(
+    setup(build3) {
+      build3.onLoad(
         { filter: /\.tsx?$/ },
         async (args) => {
           const source = await fs5.readFile(args.path, "utf8");
@@ -3518,6 +3589,12 @@ function createHotReloadTransformer(port) {
 }
 
 // src/dev/server.ts
+var createLogger = (debugMode = false) => ({
+  info: (...args) => console.log("[INFO]", ...args),
+  error: (...args) => console.error("[ERROR]", ...args),
+  warn: (...args) => console.warn("[WARN]", ...args),
+  debug: (...args) => debugMode && console.log("[DEBUG]", ...args)
+});
 var virtualClientFiles = {
   "virtual:navigate": {
     output: "navigate",
@@ -3526,7 +3603,7 @@ export async function navigate(event, url) {
   event.preventDefault();  
   
   try {
-    const { Navigate, getCurrentInjector } = await import("./src/client/client.js");
+    const { Navigate, getCurrentInjector } = await import("/src/client/client.js");
     const injector = getCurrentInjector();
     
     if (injector) {
@@ -3546,8 +3623,8 @@ export async function navigate(event, url) {
 function createVirtualModulePlugin(virtualFiles) {
   return {
     name: "virtual-module",
-    setup(build2) {
-      build2.onResolve({ filter: /^virtual:/ }, (args) => {
+    setup(build3) {
+      build3.onResolve({ filter: /^virtual:/ }, (args) => {
         if (virtualFiles[args.path]) {
           return {
             path: args.path,
@@ -3555,7 +3632,7 @@ function createVirtualModulePlugin(virtualFiles) {
           };
         }
       });
-      build2.onLoad({ filter: /.*/, namespace: "virtual" }, (args) => {
+      build3.onLoad({ filter: /.*/, namespace: "virtual" }, (args) => {
         const virtualFile = virtualFiles[args.path];
         if (virtualFile) {
           return {
@@ -3568,37 +3645,50 @@ function createVirtualModulePlugin(virtualFiles) {
   };
 }
 var HotReloadManager = class {
-  constructor(port = 3001) {
+  constructor(port = 3001, logger) {
     this.wss = null;
     this.clients = /* @__PURE__ */ new Set();
     this.port = port;
+    this.logger = logger;
   }
   start() {
     this.wss = new WebSocketServer({ port: this.port });
     this.wss.on("connection", (ws) => {
       this.clients.add(ws);
+      this.logger.debug(
+        `Client connected. Total clients: ${this.clients.size}`
+      );
       ws.on("close", () => {
         this.clients.delete(ws);
+        this.logger.debug(
+          `Client disconnected. Total clients: ${this.clients.size}`
+        );
       });
       ws.on("error", (error) => {
-        console.error("WebSocket error:", error);
+        this.logger.error("WebSocket error:", error);
         this.clients.delete(ws);
       });
     });
-    console.log(`Hot reload server listening on ws://localhost:${this.port}`);
+    this.logger.info(
+      `Hot reload server listening on ws://localhost:${this.port}`
+    );
   }
   reload() {
     const activeClients = Array.from(this.clients).filter(
       (client) => client.readyState === WebSocket.OPEN
     );
     if (activeClients.length === 0) {
+      this.logger.debug("No active clients to reload");
       return;
     }
+    this.logger.debug(
+      `Sending reload signal to ${activeClients.length} client(s)`
+    );
     activeClients.forEach((client) => {
       try {
         client.send("reload");
       } catch (error) {
-        console.error("Failed to send reload signal:", error);
+        this.logger.error("Failed to send reload signal:", error);
         this.clients.delete(client);
       }
     });
@@ -3607,14 +3697,16 @@ var HotReloadManager = class {
     if (this.wss) {
       this.clients.forEach((client) => client.close());
       this.wss.close();
+      this.logger.debug("Hot reload server closed");
     }
   }
 };
-async function copyAndProcessHtml(hotReloadPort, preprocessorOptions) {
+async function copyAndProcessHtml(hotReloadPort, preprocessorOptions, logger) {
   try {
     await fs7.mkdir("public", { recursive: true });
+    const transformers = hotReloadPort ? [createHotReloadTransformer(hotReloadPort)] : [];
     const preprocessor = new HtmlPreprocessor({
-      transformers: [createHotReloadTransformer(hotReloadPort)],
+      transformers,
       injectScripts: ["./navigate.js"],
       ...preprocessorOptions
     });
@@ -3622,149 +3714,212 @@ async function copyAndProcessHtml(hotReloadPort, preprocessorOptions) {
       "./src/client/index.html",
       "./public/index.html"
     );
+    logger?.debug("HTML processed successfully");
   } catch (error) {
-    console.error("Failed to copy and process index.html:", error);
+    logger?.error("Failed to copy and process index.html:", error);
     throw error;
   }
 }
-async function cleanDirectories() {
+async function cleanDirectories(logger) {
+  logger?.debug("Cleaning build directories...");
   await Promise.all([
     fs7.rm("dist", { recursive: true, force: true }),
     fs7.rm("public", { recursive: true, force: true })
   ]);
 }
-function createRestartServerPlugin(serverProcess, onServerBuildComplete, hotReloadManager) {
+function waitForProcessExit(process2, timeout = 5e3) {
+  return new Promise((resolve3) => {
+    const timer = setTimeout(() => {
+      process2.kill("SIGKILL");
+      resolve3();
+    }, timeout);
+    process2.once("exit", () => {
+      clearTimeout(timer);
+      resolve3();
+    });
+    process2.kill("SIGTERM");
+  });
+}
+function createRestartServerPlugin(serverProcess, onServerReady, hotReloadManager, logger) {
   return {
     name: "restart-server",
-    setup(build2) {
-      build2.onEnd((result) => {
+    setup(build3) {
+      build3.onEnd(async (result) => {
         if (result.errors.length > 0) {
-          console.error(
+          logger.error(
             `Server build failed with ${result.errors.length} error(s)`
           );
           return;
         }
+        logger.info("Server build completed");
         if (serverProcess.current) {
-          serverProcess.current.kill("SIGTERM");
+          logger.debug("Stopping existing server process...");
+          await waitForProcessExit(serverProcess.current);
         }
         serverProcess.current = spawn("node", ["dist/main.js"], {
           stdio: "inherit"
         });
         serverProcess.current.on("error", (err) => {
-          console.error("Server process error:", err);
+          logger.error("Server process error:", err);
+        });
+        serverProcess.current.on("exit", (code) => {
+          if (code !== null && code !== 0) {
+            logger.warn(`Server process exited with code ${code}`);
+          }
         });
         setTimeout(() => {
-          hotReloadManager.reload();
+          onServerReady();
+          if (hotReloadManager) {
+            hotReloadManager.reload();
+          }
         }, 500);
-        onServerBuildComplete();
       });
     }
   };
 }
+async function buildVirtualFiles(config, logger) {
+  logger.debug("Building virtual files...");
+  const virtualEntryPoints = {};
+  Object.entries(virtualClientFiles).forEach(([key, value]) => {
+    virtualEntryPoints[value.output] = key;
+  });
+  await esbuild2.build({
+    entryPoints: virtualEntryPoints,
+    bundle: true,
+    outdir: "public",
+    platform: "browser",
+    format: "iife",
+    globalName: "Orca",
+    sourcemap: config.build?.sourcemap ?? true,
+    minify: config.build?.minify ?? false,
+    plugins: [createVirtualModulePlugin(virtualClientFiles)],
+    write: true
+  });
+  logger.debug("Virtual files built successfully");
+}
+async function buildClient(clientFiles, config, store, isWatch = false, onBuildComplete, logger) {
+  if (clientFiles.size === 0) {
+    logger?.debug("No client files to build");
+    return null;
+  }
+  logger?.debug(`Building ${clientFiles.size} client file(s)...`);
+  const entryPoints = Array.from(clientFiles);
+  const graph = buildGraph(entryPoints);
+  const buildOptions = {
+    entryPoints,
+    bundle: true,
+    outdir: "public",
+    outbase: ".",
+    platform: "browser",
+    format: "esm",
+    sourcemap: config.build?.sourcemap ?? true,
+    splitting: true,
+    minify: config.build?.minify ?? false,
+    plugins: [
+      ...config.plugins?.map((cb) => cb(store)) || [],
+      ...config.client_plugins?.map((cb) => cb(store)) || [],
+      useMyPlugin({
+        graph,
+        isServerBuild: false,
+        onClientFound: () => {
+        }
+      }),
+      {
+        name: "client-build-logger",
+        setup(build3) {
+          build3.onEnd((result) => {
+            if (result.errors.length > 0) {
+              logger?.error(
+                `Client build failed with ${result.errors.length} error(s)`
+              );
+            } else {
+              logger?.info("Client build completed");
+              onBuildComplete?.();
+            }
+          });
+        }
+      }
+    ],
+    write: true
+  };
+  if (isWatch) {
+    const ctx = await esbuild2.context(buildOptions);
+    await ctx.watch();
+    return ctx;
+  } else {
+    await esbuild2.build(buildOptions);
+    return null;
+  }
+}
+async function checkClientFilesExist() {
+  try {
+    await Promise.all([
+      fs7.access("src/client/client.tsx"),
+      fs7.access("src/client/index.html")
+    ]);
+    return true;
+  } catch {
+    return false;
+  }
+}
 async function startDevServer() {
+  const logger = createLogger(process.env.DEBUG === "true");
   const store = Store.getInstance();
   const userConfig = await loadConfig();
   const config = mergeConfig(getDefaultConfig(), userConfig);
   const HOT_RELOAD_PORT = 3001;
-  const hotReloadManager = new HotReloadManager(HOT_RELOAD_PORT);
-  await cleanDirectories();
-  await copyAndProcessHtml(HOT_RELOAD_PORT, config.htmlPreprocessor);
-  hotReloadManager.start();
+  const hasClientFiles = await checkClientFilesExist();
+  if (!hasClientFiles) {
+    logger.warn(
+      "Client files not found (src/client/client.tsx or src/client/index.html missing). Skipping client build."
+    );
+  }
+  const hotReloadManager = hasClientFiles ? new HotReloadManager(HOT_RELOAD_PORT, logger) : null;
+  await cleanDirectories(logger);
+  if (hasClientFiles) {
+    await copyAndProcessHtml(HOT_RELOAD_PORT, config.htmlPreprocessor, logger);
+    hotReloadManager.start();
+  }
   const entryPoints = ["src/main.ts"];
-  const clientFiles = /* @__PURE__ */ new Set(["src/client/client.tsx"]);
+  const clientFiles = hasClientFiles ? /* @__PURE__ */ new Set(["src/client/client.tsx"]) : /* @__PURE__ */ new Set();
   const serverProcessRef = { current: null };
   let clientCtx = null;
-  let virtualCtx = null;
   let isShuttingDown = false;
   let pendingClientFiles = /* @__PURE__ */ new Set();
-  let needsClientRebuild = false;
-  async function buildVirtualFiles() {
-    if (isShuttingDown) return;
-    try {
-      if (virtualCtx) {
-        await virtualCtx.dispose();
-        virtualCtx = null;
-      }
-      const virtualEntryPoints = {};
-      Object.entries(virtualClientFiles).forEach(([key, value]) => {
-        virtualEntryPoints[value.output] = key;
-      });
-      virtualCtx = await esbuild2.context({
-        entryPoints: virtualEntryPoints,
-        bundle: true,
-        outdir: "public",
-        platform: "browser",
-        format: "iife",
-        globalName: "Orca",
-        sourcemap: config.build?.sourcemap ?? true,
-        minify: config.build?.minify ?? false,
-        plugins: [createVirtualModulePlugin(virtualClientFiles)],
-        write: true
-      });
-      await virtualCtx.rebuild();
-    } catch (error) {
-      console.error("Failed to build virtual files:", error);
-      throw error;
-    }
-  }
+  let rebuildTimer = null;
   async function rebuildClient() {
-    if (isShuttingDown) return;
+    if (isShuttingDown || !hasClientFiles) return;
     try {
+      logger.debug("Scheduling client rebuild...");
       if (clientCtx) {
         await clientCtx.dispose();
         clientCtx = null;
       }
-      if (clientFiles.size === 0) return;
-      const entryPoints2 = Array.from(clientFiles);
-      const graph = buildGraph(entryPoints2);
-      clientCtx = await esbuild2.context({
-        entryPoints: entryPoints2,
-        bundle: true,
-        outdir: "public",
-        outbase: ".",
-        platform: "browser",
-        format: "esm",
-        sourcemap: config.build?.sourcemap ?? true,
-        splitting: true,
-        minify: config.build?.minify ?? false,
-        plugins: [
-          ...config.plugins?.map((cb) => cb(store)) || [],
-          ...config.client_plugins?.map((cb) => cb(store)) || [],
-          useMyPlugin({
-            graph,
-            isServerBuild: false,
-            onClientFound: () => {
-            }
-          }),
-          {
-            name: "client-build-logger",
-            setup(build2) {
-              build2.onEnd((result) => {
-                if (result.errors.length > 0) {
-                  console.error(
-                    `Client build failed with ${result.errors.length} error(s)`
-                  );
-                } else {
-                  console.log("Client build completed");
-                  hotReloadManager.reload();
-                }
-              });
-            }
-          }
-        ],
-        write: true
-      });
-      await clientCtx.watch();
+      pendingClientFiles.forEach((file) => clientFiles.add(file));
       pendingClientFiles.clear();
-      needsClientRebuild = false;
+      clientCtx = await buildClient(
+        clientFiles,
+        config,
+        store,
+        true,
+        () => hotReloadManager?.reload(),
+        logger
+      );
     } catch (error) {
-      console.error("Failed to rebuild client:", error);
-      throw error;
+      logger.error("Failed to rebuild client:", error);
+    }
+  }
+  function scheduleClientRebuild() {
+    if (rebuildTimer) {
+      clearTimeout(rebuildTimer);
     }
+    rebuildTimer = setTimeout(() => {
+      rebuildClient();
+    }, 100);
   }
-  async function onServerBuildComplete() {
-    if (needsClientRebuild && pendingClientFiles.size > 0) {
-      await rebuildClient();
+  async function onServerReady() {
+    if (pendingClientFiles.size > 0) {
+      scheduleClientRebuild();
     }
   }
   const serverCtx = await esbuild2.context({
@@ -3784,16 +3939,16 @@ async function startDevServer() {
         onClientFound: async (filePath) => {
           const isNewFile = !clientFiles.has(filePath);
           if (isNewFile) {
-            clientFiles.add(filePath);
+            logger.debug(`New client file discovered: ${filePath}`);
             pendingClientFiles.add(filePath);
-            needsClientRebuild = true;
           }
         }
       }),
       createRestartServerPlugin(
         serverProcessRef,
-        onServerBuildComplete,
-        hotReloadManager
+        onServerReady,
+        hotReloadManager,
+        logger
       )
     ],
     write: true
@@ -3801,29 +3956,99 @@ async function startDevServer() {
   async function shutdown() {
     if (isShuttingDown) return;
     isShuttingDown = true;
-    console.log("\nShutting down dev server...");
+    logger.info("Shutting down dev server...");
     try {
       if (serverProcessRef.current) {
-        serverProcessRef.current.kill("SIGTERM");
-        await new Promise((resolve3) => setTimeout(resolve3, 1e3));
+        logger.debug("Stopping server process...");
+        await waitForProcessExit(serverProcessRef.current);
       }
       await serverCtx.dispose();
       if (clientCtx) await clientCtx.dispose();
-      if (virtualCtx) await virtualCtx.dispose();
-      hotReloadManager.close();
-      console.log("Dev server shut down successfully");
+      if (hotReloadManager) hotReloadManager.close();
+      logger.info("Dev server shut down successfully");
       process.exit(0);
     } catch (error) {
-      console.error("Error during shutdown:", error);
+      logger.error("Error during shutdown:", error);
       process.exit(1);
     }
   }
   process.on("SIGINT", shutdown);
   process.on("SIGTERM", shutdown);
-  console.log("Starting dev server...");
-  await buildVirtualFiles();
+  logger.info("Starting dev server...");
+  if (hasClientFiles) {
+    await buildVirtualFiles(config, logger);
+  }
   await serverCtx.watch();
 }
+async function startBuild() {
+  const logger = createLogger(false);
+  const store = Store.getInstance();
+  logger.info("Starting production build...");
+  try {
+    const userConfig = await loadConfig();
+    const config = mergeConfig(getDefaultConfig(), userConfig);
+    const hasClientFiles = await checkClientFilesExist();
+    if (!hasClientFiles) {
+      logger.warn(
+        "Client files not found (src/client/client.tsx or src/client/index.html missing). Skipping client build."
+      );
+    }
+    await cleanDirectories(logger);
+    if (hasClientFiles) {
+      await copyAndProcessHtml(null, config.htmlPreprocessor, logger);
+      await buildVirtualFiles(config, logger);
+    }
+    const clientFiles = hasClientFiles ? /* @__PURE__ */ new Set(["src/client/client.tsx"]) : /* @__PURE__ */ new Set();
+    const entryPoints = ["src/main.ts"];
+    logger.info("Building server...");
+    await esbuild2.build({
+      entryPoints,
+      bundle: true,
+      outdir: config.build?.outDir || "dist",
+      platform: "node",
+      format: "esm",
+      packages: "external",
+      sourcemap: config.build?.sourcemap ?? false,
+      minify: config.build?.minify ?? true,
+      plugins: [
+        ...config.plugins?.map((cb) => cb(store)) || [],
+        ...config.server_plugins?.map((cb) => cb(store)) || [],
+        useMyPlugin({
+          isServerBuild: true,
+          onClientFound: async (filePath) => {
+            if (hasClientFiles) {
+              clientFiles.add(filePath);
+            }
+          }
+        }),
+        {
+          name: "build-complete-logger",
+          setup(build3) {
+            build3.onEnd((result) => {
+              if (result.errors.length > 0) {
+                logger.error(
+                  `Server build failed with ${result.errors.length} error(s)`
+                );
+              } else {
+                logger.info("Server build completed");
+              }
+            });
+          }
+        }
+      ],
+      write: true
+    });
+    if (hasClientFiles && clientFiles.size > 0) {
+      logger.info(`Building ${clientFiles.size} client file(s)...`);
+      await buildClient(clientFiles, config, store, false, void 0, logger);
+    }
+    logger.info("Production build completed successfully!");
+    logger.info(`Output: dist/${hasClientFiles ? " and public/" : ""}`);
+  } catch (error) {
+    logger.error("Build failed:", error);
+    process.exit(1);
+  }
+}
 
 // src/config/index.ts
 var config_exports = {};
@@ -6544,8 +6769,9 @@ async function compileFiles(entryPoints) {
 }
 
 // src/index.ts
+import { fileURLToPath } from "url";
 var program = new Command();
-program.name("pod").description("Pod cli tool").version("1.0.38");
+program.name("pod").description("Pod cli tool").version("1.0.41");
 program.command("new <name> [type]").description("Start a new Orca Project").action(async (name, type) => {
   const orca = async () => {
     await addNew(name);
@@ -6578,6 +6804,9 @@ program.command("new <name> [type]").description("Start a new Orca Project").act
 program.command("dev").description("Start Pod development server").action(async (opts) => {
   await startDevServer();
 });
+program.command("build").description("Start Pod build").action(async (opts) => {
+  await startBuild();
+});
 program.command("compile <files...>").description("Compile ts files with pod").action(async (files) => {
   await compileFiles(files);
 });
@@ -6609,7 +6838,10 @@ program.command("deploy").description("Deploy to a target environment").argument
     process.exit(1);
   }
 });
-program.parse(process.argv);
+var isMainModule = process.argv[1] === fileURLToPath(import.meta.url);
+if (isMainModule) {
+  program.parse(process.argv);
+}
 export {
   config_exports as config,
   expandMacros,
@@ -6620,8 +6852,10 @@ export {
   macros_exports as macros,
   mergeConfig,
   plugins_exports as plugins,
+  program,
   resetGlobalMacroGraph,
   store_exports as store,
-  stylePlugin
+  stylePlugin,
+  useMyPlugin
 };
 //# sourceMappingURL=index.js.map