apotheke 0.1.2 → 0.1.4

package/dist/cli.js

@@ -224,7 +224,7 @@ function parseImports(source) {
     if (defaultImport) importNode.defaultImport = defaultImport;
     if (namespaceImport) importNode.namespaceImport = namespaceImport;
     const attached = findAttachedComment(source, node.start, comments);
-    if (attached) importNode.attachedComment = attached;
+    if (attached !== void 0) importNode.attachedCommentStart = attached;
     nodes.push(importNode);
   }
   return nodes;
@@ -234,10 +234,11 @@ 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) {
-      return `//${comment.value}`;
+      return comment.start;
     }
   }
   return void 0;
@@ -317,15 +318,9 @@ function collectOrphanSegments(source, imports) {
     const gapStart = imports[i].end;
     const gapEnd = imports[i + 1].start;
     if (gapEnd <= gapStart) continue;
-    let gap = source.slice(gapStart, gapEnd);
-    const nextComment = imports[i + 1].attachedComment;
-    if (nextComment) {
-      const commentText = nextComment.startsWith("//") ? nextComment.slice(2) : nextComment;
-      const commentPattern = `// ${commentText.trim()}`;
-      const idx = gap.lastIndexOf(commentPattern);
-      if (idx !== -1) gap = gap.slice(0, idx);
-    }
-    const trimmed = gap.trim();
+    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);
   }
   return orphans;
@@ -363,7 +358,7 @@ function formatImports(source, config, options = {}) {
   const imports = parseImports(source);
   if (imports.length === 0) return source;
   const orphans = collectOrphanSegments(source, imports);
-  const clean = imports.map((n) => ({ ...n, attachedComment: void 0 }));
+  const clean = imports.map((n) => ({ ...n, attachedCommentStart: void 0 }));
   const deduped = deduplicateImports(clean);
   const sorted = deduped.map(sortNamedImports);
   const blocks = buildBlocks(sorted, config, options);
@@ -372,10 +367,8 @@ function formatImports(source, config, options = {}) {
   const firstImport = imports[0];
   const lastImport = imports[imports.length - 1];
   let regionStart = firstImport.start;
-  if (firstImport.attachedComment) {
-    const before2 = source.slice(0, firstImport.start);
-    const commentLineStart = before2.lastIndexOf("\n", before2.length - 2) + 1;
-    regionStart = commentLineStart;
+  if (firstImport.attachedCommentStart !== void 0) {
+    regionStart = source.lastIndexOf("\n", firstImport.attachedCommentStart) + 1;
   }
   let regionEnd = lastImport.end;
   if (source[regionEnd] === "\n") regionEnd++;

package/dist/index.js

@@ -221,7 +221,7 @@ function parseImports(source) {
     if (defaultImport) importNode.defaultImport = defaultImport;
     if (namespaceImport) importNode.namespaceImport = namespaceImport;
     const attached = findAttachedComment(source, node.start, comments);
-    if (attached) importNode.attachedComment = attached;
+    if (attached !== void 0) importNode.attachedCommentStart = attached;
     nodes.push(importNode);
   }
   return nodes;
@@ -231,10 +231,11 @@ 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) {
-      return `//${comment.value}`;
+      return comment.start;
     }
   }
   return void 0;
@@ -314,15 +315,9 @@ function collectOrphanSegments(source, imports) {
     const gapStart = imports[i].end;
     const gapEnd = imports[i + 1].start;
     if (gapEnd <= gapStart) continue;
-    let gap = source.slice(gapStart, gapEnd);
-    const nextComment = imports[i + 1].attachedComment;
-    if (nextComment) {
-      const commentText = nextComment.startsWith("//") ? nextComment.slice(2) : nextComment;
-      const commentPattern = `// ${commentText.trim()}`;
-      const idx = gap.lastIndexOf(commentPattern);
-      if (idx !== -1) gap = gap.slice(0, idx);
-    }
-    const trimmed = gap.trim();
+    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);
   }
   return orphans;
@@ -360,7 +355,7 @@ function formatImports(source, config, options = {}) {
   const imports = parseImports(source);
   if (imports.length === 0) return source;
   const orphans = collectOrphanSegments(source, imports);
-  const clean = imports.map((n) => ({ ...n, attachedComment: void 0 }));
+  const clean = imports.map((n) => ({ ...n, attachedCommentStart: void 0 }));
   const deduped = deduplicateImports(clean);
   const sorted = deduped.map(sortNamedImports);
   const blocks = buildBlocks(sorted, config, options);
@@ -369,10 +364,8 @@ function formatImports(source, config, options = {}) {
   const firstImport = imports[0];
   const lastImport = imports[imports.length - 1];
   let regionStart = firstImport.start;
-  if (firstImport.attachedComment) {
-    const before2 = source.slice(0, firstImport.start);
-    const commentLineStart = before2.lastIndexOf("\n", before2.length - 2) + 1;
-    regionStart = commentLineStart;
+  if (firstImport.attachedCommentStart !== void 0) {
+    regionStart = source.lastIndexOf("\n", firstImport.attachedCommentStart) + 1;
   }
   let regionEnd = lastImport.end;
   if (source[regionEnd] === "\n") regionEnd++;

package/package.json

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