apotheke 0.1.3 → 0.1.5

package/dist/cli.js

@@ -234,6 +234,7 @@ function findAttachedComment(source, importStart, comments) {
   const importLine = linesBefore.length - 1;
   for (const comment of comments) {
     if (comment.type !== "Line") continue;
+    if (comment.value.startsWith("/")) continue;
     const commentLines = source.slice(0, comment.end).split("\n");
     const commentLine = commentLines.length - 1;
     if (commentLine === importLine - 1) {
@@ -311,7 +312,29 @@ function sortNamedImports(node) {
 }
 
 // src/format.ts
-function collectOrphanSegments(source, imports) {
+function printedHeaders(config) {
+  return /* @__PURE__ */ new Set([...config.groups.map((group) => `// ${group.name}`), `// ${OTHERS_GROUP}`]);
+}
+function isStrandedHeaders(segment, headers) {
+  const lines = segment.split("\n").filter((line) => line.trim() !== "");
+  return lines.length > 0 && lines.every((line) => headers.has(line.trim()));
+}
+function strandedHeaderStart(source, importStart, headers) {
+  let start;
+  let lineEnd = source.lastIndexOf("\n", importStart - 1);
+  while (lineEnd > -1) {
+    const lineStart = source.lastIndexOf("\n", lineEnd - 1) + 1;
+    const line = source.slice(lineStart, lineEnd).trim();
+    if (line !== "") {
+      if (!headers.has(line)) break;
+      start = lineStart;
+    }
+    if (lineStart === 0) break;
+    lineEnd = lineStart - 1;
+  }
+  return start;
+}
+function collectOrphanSegments(source, imports, headers) {
   const orphans = [];
   for (let i = 0; i < imports.length - 1; i++) {
     const gapStart = imports[i].end;
@@ -320,7 +343,7 @@ function collectOrphanSegments(source, imports) {
     const commentStart = imports[i + 1].attachedCommentStart;
     const cut = commentStart !== void 0 && commentStart >= gapStart && commentStart < gapEnd ? commentStart : gapEnd;
     const trimmed = source.slice(gapStart, cut).trim();
-    if (trimmed) orphans.push(trimmed);
+    if (trimmed && !isStrandedHeaders(trimmed, headers)) orphans.push(trimmed);
   }
   return orphans;
 }
@@ -356,7 +379,8 @@ function buildBlocks(imports, config, options) {
 function formatImports(source, config, options = {}) {
   const imports = parseImports(source);
   if (imports.length === 0) return source;
-  const orphans = collectOrphanSegments(source, imports);
+  const headers = printedHeaders(config);
+  const orphans = collectOrphanSegments(source, imports, headers);
   const clean = imports.map((n) => ({ ...n, attachedCommentStart: void 0 }));
   const deduped = deduplicateImports(clean);
   const sorted = deduped.map(sortNamedImports);
@@ -368,6 +392,8 @@ function formatImports(source, config, options = {}) {
   let regionStart = firstImport.start;
   if (firstImport.attachedCommentStart !== void 0) {
     regionStart = source.lastIndexOf("\n", firstImport.attachedCommentStart) + 1;
+  } else {
+    regionStart = strandedHeaderStart(source, firstImport.start, headers) ?? regionStart;
   }
   let regionEnd = lastImport.end;
   if (source[regionEnd] === "\n") regionEnd++;

package/dist/index.js

@@ -231,6 +231,7 @@ function findAttachedComment(source, importStart, comments) {
   const importLine = linesBefore.length - 1;
   for (const comment of comments) {
     if (comment.type !== "Line") continue;
+    if (comment.value.startsWith("/")) continue;
     const commentLines = source.slice(0, comment.end).split("\n");
     const commentLine = commentLines.length - 1;
     if (commentLine === importLine - 1) {
@@ -308,7 +309,29 @@ function sortNamedImports(node) {
 }
 
 // src/format.ts
-function collectOrphanSegments(source, imports) {
+function printedHeaders(config) {
+  return /* @__PURE__ */ new Set([...config.groups.map((group) => `// ${group.name}`), `// ${OTHERS_GROUP}`]);
+}
+function isStrandedHeaders(segment, headers) {
+  const lines = segment.split("\n").filter((line) => line.trim() !== "");
+  return lines.length > 0 && lines.every((line) => headers.has(line.trim()));
+}
+function strandedHeaderStart(source, importStart, headers) {
+  let start;
+  let lineEnd = source.lastIndexOf("\n", importStart - 1);
+  while (lineEnd > -1) {
+    const lineStart = source.lastIndexOf("\n", lineEnd - 1) + 1;
+    const line = source.slice(lineStart, lineEnd).trim();
+    if (line !== "") {
+      if (!headers.has(line)) break;
+      start = lineStart;
+    }
+    if (lineStart === 0) break;
+    lineEnd = lineStart - 1;
+  }
+  return start;
+}
+function collectOrphanSegments(source, imports, headers) {
   const orphans = [];
   for (let i = 0; i < imports.length - 1; i++) {
     const gapStart = imports[i].end;
@@ -317,7 +340,7 @@ function collectOrphanSegments(source, imports) {
     const commentStart = imports[i + 1].attachedCommentStart;
     const cut = commentStart !== void 0 && commentStart >= gapStart && commentStart < gapEnd ? commentStart : gapEnd;
     const trimmed = source.slice(gapStart, cut).trim();
-    if (trimmed) orphans.push(trimmed);
+    if (trimmed && !isStrandedHeaders(trimmed, headers)) orphans.push(trimmed);
   }
   return orphans;
 }
@@ -353,7 +376,8 @@ function buildBlocks(imports, config, options) {
 function formatImports(source, config, options = {}) {
   const imports = parseImports(source);
   if (imports.length === 0) return source;
-  const orphans = collectOrphanSegments(source, imports);
+  const headers = printedHeaders(config);
+  const orphans = collectOrphanSegments(source, imports, headers);
   const clean = imports.map((n) => ({ ...n, attachedCommentStart: void 0 }));
   const deduped = deduplicateImports(clean);
   const sorted = deduped.map(sortNamedImports);
@@ -365,6 +389,8 @@ function formatImports(source, config, options = {}) {
   let regionStart = firstImport.start;
   if (firstImport.attachedCommentStart !== void 0) {
     regionStart = source.lastIndexOf("\n", firstImport.attachedCommentStart) + 1;
+  } else {
+    regionStart = strandedHeaderStart(source, firstImport.start, headers) ?? regionStart;
   }
   let regionEnd = lastImport.end;
   if (source[regionEnd] === "\n") regionEnd++;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "apotheke",
-    "version": "0.1.3",
+    "version": "0.1.5",
     "description": "Prettier for imports — deterministic import organization as a Prettier plugin or CLI",
     "type": "module",
     "license": "MIT",