apotheke 0.0.1 → 0.1.1

package/dist/cli.js

@@ -1,14 +1,14 @@
 #!/usr/bin/env node
 
 // cli.ts
-import path3 from "path";
-import fs from "fs";
 import { execFileSync } from "child_process";
+import fs from "fs";
+import path3 from "path";
 import fg from "fast-glob";
 
 // src/config.ts
-import path from "path";
 import { existsSync, readFileSync } from "fs";
+import path from "path";
 function mergeConfigs(parent, child) {
   const mergedGroups = [...parent.groups];
   for (const childGroup of child.groups ?? []) {
@@ -74,65 +74,6 @@ function loadTsConfig(dir) {
   }
 }
 
-// src/parser.ts
-import { parseSync } from "oxc-parser";
-function parseImports(source) {
-  const result = parseSync("file.tsx", source);
-  const comments = result.comments;
-  const nodes = [];
-  for (const node of result.program.body) {
-    if (node.type !== "ImportDeclaration") continue;
-    const specifier = node.source.value;
-    let defaultImport;
-    const namedImports = [];
-    let namespaceImport;
-    for (const s of node.specifiers) {
-      if (s.type === "ImportDefaultSpecifier") {
-        defaultImport = s.local.name;
-      } else if (s.type === "ImportNamespaceSpecifier") {
-        namespaceImport = s.local.name;
-      } else if (s.type === "ImportSpecifier") {
-        const imported = s.imported;
-        const name = imported.type === "Identifier" ? imported.name : imported.value;
-        const localName = s.local.name;
-        const kind = s.importKind === "type" ? "type" : "value";
-        const named = { name, kind };
-        if (localName !== name) named.alias = localName;
-        namedImports.push(named);
-      }
-    }
-    const importKind = node.importKind === "type" ? "type" : "value";
-    const isSideEffect = node.specifiers.length === 0 && importKind === "value";
-    const importNode = {
-      specifier,
-      namedImports,
-      isSideEffect,
-      importKind,
-      start: node.start,
-      end: node.end
-    };
-    if (defaultImport) importNode.defaultImport = defaultImport;
-    if (namespaceImport) importNode.namespaceImport = namespaceImport;
-    const attached = findAttachedComment(source, node.start, comments);
-    if (attached) importNode.attachedComment = attached;
-    nodes.push(importNode);
-  }
-  return nodes;
-}
-function findAttachedComment(source, importStart, comments) {
-  const linesBefore = source.slice(0, importStart).split("\n");
-  const importLine = linesBefore.length - 1;
-  for (const comment of comments) {
-    if (comment.type !== "Line") continue;
-    const commentLines = source.slice(0, comment.end).split("\n");
-    const commentLine = commentLines.length - 1;
-    if (commentLine === importLine - 1) {
-      return `//${comment.value}`;
-    }
-  }
-  return void 0;
-}
-
 // src/deduplicator.ts
 function deduplicateImports(imports) {
   const map = /* @__PURE__ */ new Map();
@@ -161,6 +102,8 @@ function deduplicateImports(imports) {
 
 // src/grouper.ts
 import path2 from "path";
+var SIDE_EFFECTS_GROUP = "SideEffects";
+var OTHERS_GROUP = "Others";
 function groupImports(imports, config, options = {}) {
   const buckets = /* @__PURE__ */ new Map();
   for (const node of imports) {
@@ -169,21 +112,21 @@ function groupImports(imports, config, options = {}) {
     buckets.get(groupName).push(node);
   }
   const result = [];
-  if (buckets.has("SideEffects")) {
-    result.push({ name: "SideEffects", imports: buckets.get("SideEffects") });
+  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) });
     }
   }
-  if (buckets.has("Others")) {
-    result.push({ name: "Others", imports: buckets.get("Others") });
+  if (buckets.has(OTHERS_GROUP)) {
+    result.push({ name: OTHERS_GROUP, imports: buckets.get(OTHERS_GROUP) });
   }
   return result;
 }
 function assignGroup(node, config, options) {
-  if (node.isSideEffect) return "SideEffects";
+  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) {
@@ -191,7 +134,7 @@ function assignGroup(node, config, options) {
       if (canonicalPath && matches(canonicalPath, pattern)) return group.name;
     }
   }
-  return "Others";
+  return OTHERS_GROUP;
 }
 function resolveCanonicalPath(specifier, config, options) {
   if (specifier.startsWith(".") || specifier.startsWith("/")) {
@@ -241,21 +184,63 @@ function globToRegex(pattern) {
   return new RegExp(re + "$");
 }
 
-// src/sorter.ts
-function sortGroup(imports) {
-  return [...imports].sort((a, b) => {
-    if (a.importKind === "type" && b.importKind !== "type") return -1;
-    if (a.importKind !== "type" && b.importKind === "type") return 1;
-    return a.specifier.localeCompare(b.specifier);
-  });
+// src/parser.ts
+import { parseSync } from "oxc-parser";
+function parseImports(source) {
+  const result = parseSync("file.tsx", source);
+  const comments = result.comments;
+  const nodes = [];
+  for (const node of result.program.body) {
+    if (node.type !== "ImportDeclaration") continue;
+    const specifier = node.source.value;
+    let defaultImport;
+    const namedImports = [];
+    let namespaceImport;
+    for (const s of node.specifiers) {
+      if (s.type === "ImportDefaultSpecifier") {
+        defaultImport = s.local.name;
+      } else if (s.type === "ImportNamespaceSpecifier") {
+        namespaceImport = s.local.name;
+      } else if (s.type === "ImportSpecifier") {
+        const imported = s.imported;
+        const name = imported.type === "Identifier" ? imported.name : imported.value;
+        const localName = s.local.name;
+        const kind = s.importKind === "type" ? "type" : "value";
+        const named = { name, kind };
+        if (localName !== name) named.alias = localName;
+        namedImports.push(named);
+      }
+    }
+    const importKind = node.importKind === "type" ? "type" : "value";
+    const isSideEffect = node.specifiers.length === 0 && importKind === "value";
+    const importNode = {
+      specifier,
+      namedImports,
+      isSideEffect,
+      importKind,
+      start: node.start,
+      end: node.end
+    };
+    if (defaultImport) importNode.defaultImport = defaultImport;
+    if (namespaceImport) importNode.namespaceImport = namespaceImport;
+    const attached = findAttachedComment(source, node.start, comments);
+    if (attached) importNode.attachedComment = attached;
+    nodes.push(importNode);
+  }
+  return nodes;
 }
-function sortNamedImports(node) {
-  const sorted = [...node.namedImports].sort((a, b) => {
-    if (a.kind === "type" && b.kind !== "type") return -1;
-    if (a.kind !== "type" && b.kind === "type") return 1;
-    return a.name.localeCompare(b.name);
-  });
-  return { ...node, namedImports: sorted };
+function findAttachedComment(source, importStart, comments) {
+  const linesBefore = source.slice(0, importStart).split("\n");
+  const importLine = linesBefore.length - 1;
+  for (const comment of comments) {
+    if (comment.type !== "Line") continue;
+    const commentLines = source.slice(0, comment.end).split("\n");
+    const commentLine = commentLines.length - 1;
+    if (commentLine === importLine - 1) {
+      return `//${comment.value}`;
+    }
+  }
+  return void 0;
 }
 
 // src/printer.ts
@@ -307,6 +292,23 @@ function buildImportStatement(node, q) {
   return `import ${typePrefix}${parts.join(", ")} from ${q}${node.specifier}${q};`;
 }
 
+// src/sorter.ts
+function sortGroup(imports) {
+  return [...imports].sort((a, b) => {
+    if (a.importKind === "type" && b.importKind !== "type") return -1;
+    if (a.importKind !== "type" && b.importKind === "type") return 1;
+    return a.specifier.localeCompare(b.specifier);
+  });
+}
+function sortNamedImports(node) {
+  const sorted = [...node.namedImports].sort((a, b) => {
+    if (a.kind === "type" && b.kind !== "type") return -1;
+    if (a.kind !== "type" && b.kind === "type") return 1;
+    return a.name.localeCompare(b.name);
+  });
+  return { ...node, namedImports: sorted };
+}
+
 // src/format.ts
 function collectOrphanSegments(source, imports) {
   const orphans = [];
@@ -335,7 +337,9 @@ function formatImports(source, config, options = {}) {
   const deduped = deduplicateImports(clean);
   const sorted = deduped.map(sortNamedImports);
   const grouped = groupImports(sorted, config, options);
-  const sortedGroups = grouped.map((g) => ({ ...g, imports: sortGroup(g.imports) }));
+  const sortedGroups = grouped.map(
+    (g) => g.name === SIDE_EFFECTS_GROUP ? g : { ...g, imports: sortGroup(g.imports) }
+  );
   const q = detectQuoteChar(source);
   const newImportBlock = printGroups(sortedGroups, config, q);
   const firstImport = imports[0];
@@ -497,19 +501,21 @@ async function expandGlobs(patterns) {
 }
 function getSubmoduleDirs(cwd) {
   try {
-    const output = execFileSync("git", ["-C", cwd, "submodule", "foreach", "--recursive", "--quiet", "pwd"], {
-      encoding: "utf-8",
-      stdio: ["ignore", "pipe", "ignore"]
-    });
+    const output = execFileSync(
+      "git",
+      ["-C", cwd, "submodule", "foreach", "--recursive", "--quiet", "pwd"],
+      {
+        encoding: "utf-8",
+        stdio: ["ignore", "pipe", "ignore"]
+      }
+    );
     return output.trim().split("\n").filter(Boolean);
   } catch {
     return [];
   }
 }
 function isUnderSubmodule(filePath, submoduleDirs) {
-  return submoduleDirs.some(
-    (dir) => filePath === dir || filePath.startsWith(dir + path3.sep)
-  );
+  return submoduleDirs.some((dir) => filePath === dir || filePath.startsWith(dir + path3.sep));
 }
 function printDiff(file, original, updated) {
   const origLines = original.split("\n");

package/dist/index.d.ts

@@ -7,7 +7,6 @@ interface ApothekeConfig {
     groups: GroupConfig[];
     aliases?: Record<string, string>;
     baseUrl?: string;
-    normalizeImports?: 'alias' | 'relative' | 'absolute' | false;
     groupSeparator?: boolean;
     groupComments?: boolean;
 }
@@ -24,7 +23,7 @@ declare function formatImports(source: string, config: ApothekeConfig, options?:
  * Prettier plugin usage (.prettierrc):
  *   { "plugins": ["apotheke"] }
  *
- * Requirements: prettier v3+, Bun runtime
+ * Requirements: prettier v3+, Node.js >= 18
  *
  * The plugin runs as a `preprocess` step, so apotheke organises imports
  * first and prettier formats the result — correct order, one pass.
@@ -32,9 +31,11 @@ declare function formatImports(source: string, config: ApothekeConfig, options?:
  * Pre-commit (lint-staged, prettier v2):
  *   { "*.{ts,tsx}": ["apotheke --write", "prettier --write"] }
  */
+declare function isDocumentSnippet(parentParser: unknown): boolean;
 type PrettierParser = {
     preprocess?: (text: string, opts: {
         filepath?: string;
+        parentParser?: string;
     }) => string | Promise<string>;
     parse?: (text: string, options: unknown) => unknown;
     astFormat?: string;
@@ -45,8 +46,8 @@ type PrettierParser = {
 declare const parsers: {
     typescript: PrettierParser;
     babel: PrettierParser;
-    "babel-ts": PrettierParser;
-    "babel-flow": PrettierParser;
+    'babel-ts': PrettierParser;
+    'babel-flow': PrettierParser;
 };
 
-export { type ApothekeConfig, formatImports, parsers };
+export { type ApothekeConfig, formatImports, isDocumentSnippet, parsers };