@kenkaiiii/gg-pixel 4.3.86 → 4.3.87

package/dist/index.cjs

@@ -535,10 +535,13 @@ function findMappingByPath(projectsJsonPath, projectRoot) {
   } catch {
     return null;
   }
+  let fallback = null;
   for (const [id, entry] of Object.entries(map)) {
-    if (entry.path === projectRoot) return { id, ...entry };
+    if (entry.path !== projectRoot) continue;
+    if (entry.secret) return { id, ...entry };
+    if (!fallback) fallback = { id, ...entry };
   }
-  return null;
+  return fallback;
 }
 function readEnvKey(envPath, key) {
   if (!(0, import_node_fs3.existsSync)(envPath)) return null;
@@ -821,8 +824,9 @@ function wireNextjs({ projectRoot, projectKey, ingestUrl }) {
 }
 function writeNextInstrumentation(path, ingestUrl, projectKey) {
   const existing = (0, import_node_fs3.existsSync)(path) ? (0, import_node_fs3.readFileSync)(path, "utf8") : "";
+  const cleaned = stripLegacyPixelContent(existing);
   const block = nextInstrumentationBlock(ingestUrl, projectKey);
-  const next = upsertPixelBlock(existing, block);
+  const next = upsertPixelBlock(cleaned, block);
   if (next !== existing) (0, import_node_fs3.writeFileSync)(path, next, "utf8");
 }
 function nextInstrumentationBlock(ingestUrl, projectKey) {
@@ -1352,9 +1356,64 @@ function upsertPixelBlock(existing, block) {
 }
 function upsertPixelBlockInFile(filePath, block) {
   const existing = (0, import_node_fs3.existsSync)(filePath) ? (0, import_node_fs3.readFileSync)(filePath, "utf8") : "";
-  const next = upsertPixelBlock(existing, block);
+  const cleaned = stripLegacyPixelContent(existing);
+  const next = upsertPixelBlock(cleaned, block);
   if (next !== existing) (0, import_node_fs3.writeFileSync)(filePath, next, "utf8");
 }
+function stripLegacyPixelContent(content) {
+  if (!content.includes("@kenkaiiii/gg-pixel")) return content;
+  const beginIdx = content.indexOf(PIXEL_MARK_BEGIN);
+  const endIdx = beginIdx === -1 ? -1 : content.indexOf(PIXEL_MARK_END, beginIdx);
+  const insideMarkers = (start, end) => beginIdx !== -1 && endIdx !== -1 && start >= beginIdx && end <= endIdx + PIXEL_MARK_END.length;
+  const ranges = [];
+  const registerRe = /(?:^|\n)((?:[ \t]*\/\/[^\n]*\n)*)[ \t]*export\s+async\s+function\s+register\s*\(\s*\)\s*\{/g;
+  let m;
+  while ((m = registerRe.exec(content)) !== null) {
+    const blockStart = m.index + (content[m.index] === "\n" ? 1 : 0);
+    const openBraceIdx = m.index + m[0].length - 1;
+    let depth = 1;
+    let i = openBraceIdx + 1;
+    while (i < content.length && depth > 0) {
+      const ch = content[i];
+      if (ch === "{") depth++;
+      else if (ch === "}") depth--;
+      i++;
+    }
+    if (depth !== 0) continue;
+    const blockEnd = i;
+    const blockText = content.slice(blockStart, blockEnd);
+    if (!blockText.includes("@kenkaiiii/gg-pixel")) continue;
+    if (insideMarkers(blockStart, blockEnd)) continue;
+    const trailingNL = content[blockEnd] === "\n" ? 1 : 0;
+    ranges.push({ start: blockStart, end: blockEnd + trailingNL });
+  }
+  const importRe = /(?:^|\n)((?:[ \t]*\/\/[^\n]*\n)*)[ \t]*import\s*\{\s*initPixel[^}]*\}\s*from\s*"@kenkaiiii\/gg-pixel(?:\/[\w-]+)?"\s*;?\s*\n/g;
+  while ((m = importRe.exec(content)) !== null) {
+    const blockStart = m.index + (content[m.index] === "\n" ? 1 : 0);
+    const callIdx = content.indexOf("initPixel(", importRe.lastIndex);
+    if (callIdx === -1 || callIdx - importRe.lastIndex > 2048) continue;
+    const openParen = content.indexOf("(", callIdx);
+    let depth = 1;
+    let i = openParen + 1;
+    while (i < content.length && depth > 0) {
+      const ch = content[i];
+      if (ch === "(" || ch === "{") depth++;
+      else if (ch === ")" || ch === "}") depth--;
+      i++;
+    }
+    if (depth !== 0) continue;
+    while (i < content.length && (content[i] === ";" || content[i] === " ")) i++;
+    const trailingNL = content[i] === "\n" ? 1 : 0;
+    const blockEnd = i + trailingNL;
+    if (insideMarkers(blockStart, blockEnd)) continue;
+    ranges.push({ start: blockStart, end: blockEnd });
+  }
+  if (ranges.length === 0) return content;
+  ranges.sort((a, b) => b.start - a.start);
+  let out = content;
+  for (const r of ranges) out = out.slice(0, r.start) + out.slice(r.end);
+  return out.replace(/\n{3,}/g, "\n\n");
+}
 function injectImport(entryPath, initFilePath) {
   let content;
   try {