apotheke 0.1.1 → 0.1.2

package/dist/cli.js

@@ -102,8 +102,12 @@ function deduplicateImports(imports) {
 
 // src/grouper.ts
 import path2 from "path";
-var SIDE_EFFECTS_GROUP = "SideEffects";
+
+// src/types.ts
 var OTHERS_GROUP = "Others";
+var SIDE_EFFECTS_BLOCK = "SideEffects";
+
+// src/grouper.ts
 function groupImports(imports, config, options = {}) {
   const buckets = /* @__PURE__ */ new Map();
   for (const node of imports) {
@@ -112,9 +116,6 @@ function groupImports(imports, config, options = {}) {
     buckets.get(groupName).push(node);
   }
   const result = [];
-  if (buckets.has(SIDE_EFFECTS_GROUP)) {
-    result.push({ name: SIDE_EFFECTS_GROUP, imports: buckets.get(SIDE_EFFECTS_GROUP) });
-  }
   for (const group of config.groups) {
     if (buckets.has(group.name)) {
       result.push({ name: group.name, imports: buckets.get(group.name) });
@@ -126,7 +127,6 @@ function groupImports(imports, config, options = {}) {
   return result;
 }
 function assignGroup(node, config, options) {
-  if (node.isSideEffect) return SIDE_EFFECTS_GROUP;
   const canonicalPath = resolveCanonicalPath(node.specifier, config, options);
   for (const group of config.groups) {
     for (const pattern of group.match) {
@@ -257,9 +257,10 @@ function printGroups(groups, config, q = "'") {
   const parts = [];
   for (const group of groups) {
     const importLines = [];
+    const headed = useComments && group.name !== SIDE_EFFECTS_BLOCK;
     for (let i = 0; i < group.imports.length; i++) {
       const node = group.imports[i];
-      if (i === 0 && useComments) {
+      if (i === 0 && headed) {
         importLines.push(`// ${group.name}
 ${buildImportStatement(node, q)}`);
         continue;
@@ -329,6 +330,35 @@ function collectOrphanSegments(source, imports) {
   }
   return orphans;
 }
+function buildBlocks(imports, config, options) {
+  const blocks = [];
+  let values = [];
+  let sideEffects = [];
+  function flushValues() {
+    if (values.length === 0) return;
+    for (const group of groupImports(values, config, options)) {
+      blocks.push({ ...group, imports: sortGroup(group.imports) });
+    }
+    values = [];
+  }
+  function flushSideEffects() {
+    if (sideEffects.length === 0) return;
+    blocks.push({ name: SIDE_EFFECTS_BLOCK, imports: sideEffects });
+    sideEffects = [];
+  }
+  for (const node of imports) {
+    if (node.isSideEffect) {
+      flushValues();
+      sideEffects.push(node);
+    } else {
+      flushSideEffects();
+      values.push(node);
+    }
+  }
+  flushSideEffects();
+  flushValues();
+  return blocks;
+}
 function formatImports(source, config, options = {}) {
   const imports = parseImports(source);
   if (imports.length === 0) return source;
@@ -336,12 +366,9 @@ function formatImports(source, config, options = {}) {
   const clean = imports.map((n) => ({ ...n, attachedComment: void 0 }));
   const deduped = deduplicateImports(clean);
   const sorted = deduped.map(sortNamedImports);
-  const grouped = groupImports(sorted, config, options);
-  const sortedGroups = grouped.map(
-    (g) => g.name === SIDE_EFFECTS_GROUP ? g : { ...g, imports: sortGroup(g.imports) }
-  );
+  const blocks = buildBlocks(sorted, config, options);
   const q = detectQuoteChar(source);
-  const newImportBlock = printGroups(sortedGroups, config, q);
+  const newImportBlock = printGroups(blocks, config, q);
   const firstImport = imports[0];
   const lastImport = imports[imports.length - 1];
   let regionStart = firstImport.start;

package/dist/index.js

@@ -99,8 +99,12 @@ function deduplicateImports(imports) {
 
 // src/grouper.ts
 import path2 from "path";
-var SIDE_EFFECTS_GROUP = "SideEffects";
+
+// src/types.ts
 var OTHERS_GROUP = "Others";
+var SIDE_EFFECTS_BLOCK = "SideEffects";
+
+// src/grouper.ts
 function groupImports(imports, config, options = {}) {
   const buckets = /* @__PURE__ */ new Map();
   for (const node of imports) {
@@ -109,9 +113,6 @@ function groupImports(imports, config, options = {}) {
     buckets.get(groupName).push(node);
   }
   const result = [];
-  if (buckets.has(SIDE_EFFECTS_GROUP)) {
-    result.push({ name: SIDE_EFFECTS_GROUP, imports: buckets.get(SIDE_EFFECTS_GROUP) });
-  }
   for (const group of config.groups) {
     if (buckets.has(group.name)) {
       result.push({ name: group.name, imports: buckets.get(group.name) });
@@ -123,7 +124,6 @@ function groupImports(imports, config, options = {}) {
   return result;
 }
 function assignGroup(node, config, options) {
-  if (node.isSideEffect) return SIDE_EFFECTS_GROUP;
   const canonicalPath = resolveCanonicalPath(node.specifier, config, options);
   for (const group of config.groups) {
     for (const pattern of group.match) {
@@ -254,9 +254,10 @@ function printGroups(groups, config, q = "'") {
   const parts = [];
   for (const group of groups) {
     const importLines = [];
+    const headed = useComments && group.name !== SIDE_EFFECTS_BLOCK;
     for (let i = 0; i < group.imports.length; i++) {
       const node = group.imports[i];
-      if (i === 0 && useComments) {
+      if (i === 0 && headed) {
         importLines.push(`// ${group.name}
 ${buildImportStatement(node, q)}`);
         continue;
@@ -326,6 +327,35 @@ function collectOrphanSegments(source, imports) {
   }
   return orphans;
 }
+function buildBlocks(imports, config, options) {
+  const blocks = [];
+  let values = [];
+  let sideEffects = [];
+  function flushValues() {
+    if (values.length === 0) return;
+    for (const group of groupImports(values, config, options)) {
+      blocks.push({ ...group, imports: sortGroup(group.imports) });
+    }
+    values = [];
+  }
+  function flushSideEffects() {
+    if (sideEffects.length === 0) return;
+    blocks.push({ name: SIDE_EFFECTS_BLOCK, imports: sideEffects });
+    sideEffects = [];
+  }
+  for (const node of imports) {
+    if (node.isSideEffect) {
+      flushValues();
+      sideEffects.push(node);
+    } else {
+      flushSideEffects();
+      values.push(node);
+    }
+  }
+  flushSideEffects();
+  flushValues();
+  return blocks;
+}
 function formatImports(source, config, options = {}) {
   const imports = parseImports(source);
   if (imports.length === 0) return source;
@@ -333,12 +363,9 @@ function formatImports(source, config, options = {}) {
   const clean = imports.map((n) => ({ ...n, attachedComment: void 0 }));
   const deduped = deduplicateImports(clean);
   const sorted = deduped.map(sortNamedImports);
-  const grouped = groupImports(sorted, config, options);
-  const sortedGroups = grouped.map(
-    (g) => g.name === SIDE_EFFECTS_GROUP ? g : { ...g, imports: sortGroup(g.imports) }
-  );
+  const blocks = buildBlocks(sorted, config, options);
   const q = detectQuoteChar(source);
-  const newImportBlock = printGroups(sortedGroups, config, q);
+  const newImportBlock = printGroups(blocks, config, q);
   const firstImport = imports[0];
   const lastImport = imports[imports.length - 1];
   let regionStart = firstImport.start;

package/package.json

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