@kenkaiiii/gg-pixel 4.3.92 → 4.3.94

package/dist/index.js

@@ -353,7 +353,7 @@ function loadBetterSqlite3() {
     return typeof mod === "function" ? mod : mod.default;
   } catch (err) {
     throw new Error(
-      `@kenkaiiii/gg-pixel: \`kind: "local"\` requires the optional peer dependency \`better-sqlite3\`. Install it with \`npm install better-sqlite3\` (or your package manager's equivalent). Underlying error: ${err.message}`,
+      `@kenkaiiii/gg-pixel: \`kind: "local"\` requires \`better-sqlite3\` to be installed. Install it with \`npm install better-sqlite3\` (or your package manager's equivalent). Underlying error: ${err.message}`,
       { cause: err }
     );
   }
@@ -569,7 +569,9 @@ async function safeText(r) {
 }
 function detectPackageManager(projectRoot) {
   if (existsSync2(join2(projectRoot, "pnpm-lock.yaml"))) return "pnpm";
-  if (existsSync2(join2(projectRoot, "bun.lockb"))) return "bun";
+  if (existsSync2(join2(projectRoot, "bun.lock")) || existsSync2(join2(projectRoot, "bun.lockb"))) {
+    return "bun";
+  }
   if (existsSync2(join2(projectRoot, "yarn.lock"))) return "yarn";
   return "npm";
 }
@@ -881,6 +883,113 @@ function injectNextClientComponent(layoutPath, clientInitPath) {
   let spec = relative(fromDir, clientInitPath).split(sep).join("/");
   if (!spec.startsWith(".")) spec = "./" + spec;
   spec = spec.replace(/\.tsx$/, "");
+  const astResult = injectClientComponentViaAst(layoutPath, content, spec);
+  if (astResult) return astResult;
+  return injectClientComponentViaRegex(layoutPath, content, spec);
+}
+function injectClientComponentViaAst(layoutPath, content, importSpec) {
+  let recast;
+  let bp;
+  let bt;
+  try {
+    recast = nodeRequire("recast");
+    bp = nodeRequire("@babel/parser");
+    bt = nodeRequire("@babel/types");
+  } catch {
+    return null;
+  }
+  let ast;
+  try {
+    ast = recast.parse(content, {
+      parser: {
+        parse: (src) => bp.parse(src, {
+          sourceType: "module",
+          plugins: ["jsx", "typescript"],
+          allowImportExportEverywhere: true,
+          tokens: true
+        })
+      }
+    });
+  } catch {
+    return null;
+  }
+  const program = ast.program;
+  if (!program || !Array.isArray(program.body)) return null;
+  const bodyEl = findFirstJsxElementByName(ast, "body");
+  if (!bodyEl) return null;
+  const newComponent = bt.jsxElement(
+    bt.jsxOpeningElement(bt.jsxIdentifier("GGPixelClient"), [], true),
+    null,
+    [],
+    true
+  );
+  const leadingText = bt.jsxText("\n        ");
+  const trailingText = bt.jsxText("\n        ");
+  bodyEl.children = [leadingText, newComponent, trailingText, ...bodyEl.children];
+  const importDecl = bt.importDeclaration(
+    [bt.importDefaultSpecifier(bt.identifier("GGPixelClient"))],
+    bt.stringLiteral(importSpec)
+  );
+  const body = program.body;
+  let insertAt = 0;
+  for (let i = 0; i < body.length; i++) {
+    if (body[i]?.type === "ImportDeclaration") insertAt = i + 1;
+  }
+  body.splice(insertAt, 0, importDecl);
+  let out;
+  try {
+    out = recast.print(ast).code;
+  } catch {
+    return null;
+  }
+  writeFileSync(layoutPath, out, "utf8");
+  return { kind: "injected", entryPath: layoutPath };
+}
+function findFirstJsxElementByName(ast, name) {
+  let found = null;
+  const seen = /* @__PURE__ */ new WeakSet();
+  const MAX_DEPTH = 500;
+  const SKIP_KEYS = /* @__PURE__ */ new Set([
+    "loc",
+    "tokens",
+    "original",
+    "comments",
+    "leadingComments",
+    "trailingComments",
+    "innerComments",
+    "range",
+    "start",
+    "end"
+  ]);
+  function walk(node, depth) {
+    if (found || !node || typeof node !== "object") return;
+    if (depth > MAX_DEPTH) return;
+    if (seen.has(node)) return;
+    seen.add(node);
+    if (Array.isArray(node)) {
+      for (const c of node) walk(c, depth + 1);
+      return;
+    }
+    const n = node;
+    if (n.type === "JSXElement") {
+      const opening = n.openingElement;
+      if (opening?.type === "JSXOpeningElement" && opening.name) {
+        const namedNode = opening.name;
+        if (namedNode.type === "JSXIdentifier" && namedNode.name === name) {
+          found = n;
+          return;
+        }
+      }
+    }
+    for (const key of Object.keys(n)) {
+      if (SKIP_KEYS.has(key)) continue;
+      walk(n[key], depth + 1);
+    }
+  }
+  walk(ast, 0);
+  return found;
+}
+function injectClientComponentViaRegex(layoutPath, content, spec) {
   const importLine = `import GGPixelClient from ${JSON.stringify(spec)};`;
   const lines = content.split("\n");
   let insertImportAt = 0;