poops 1.9.4 → 1.9.5

package/README.md

@@ -216,8 +216,8 @@ You can freely remove the properties that you don't need. For example, if you do
 
 Scripts are bundled with [esbuild](https://esbuild.github.io/). Supports `.js`, `.ts`, `.jsx`, and `.tsx` files out of the box — including React and other JSX frameworks. You can specify multiple scripts to bundle. Each script has the following properties:
 
-- `in` - the input path, can be a file path, an array of file paths, or a glob pattern (e.g. `"src/js/*.js"`). Globs must use `/` separators (even on Windows)
-- `out` - the output path, can be a directory or a file path. With multiple inputs it must be a directory — entry points from different directories nest their output under the common ancestor (esbuild's `outbase`)
+- `in` - the input path, can be a file path, an array of file paths, or a glob pattern (e.g. `"src/js/*.js"`, `"src/elements/*/index.{js,mjs,cjs,jsx,ts,tsx}"`). Globs must use `/` separators (even on Windows)
+- `out` - the output path, can be a directory or a file path. With multiple inputs it must be a directory — entry points from different directories nest their output under the common ancestor (esbuild's `outbase`). A **glob-matched** `index.*` is named after its directory instead, placed relative to the glob's static prefix: `"src/elements/*/index.js"` gives `<out>/accordion.js`, while `"src/*/accordion/index.js"` keeps the differing segment as `<out>/blocks/accordion.js`. A literal `in: "src/index.js"` keeps its own basename
 - `options` - the options for the bundler. You can apply most of the esbuild options that are not in conflict with Poops. See [esbuild's options](https://esbuild.github.io/api/#build-api) for more info.
 
 **Options:**
@@ -350,8 +350,8 @@ Poops does not need `react` or `react-dom` as its own dependency — they are re
 
 Styles are bundled with [Dart Sass](https://sass-lang.com/dart-sass). You can specify multiple styles to bundle. Each style has the following properties:
 
-- `in` - the input path, can be a file path, an array of file paths, or a glob pattern (e.g. `"src/scss/*.scss"`). Globs must use `/` separators (even on Windows) and skip Sass partials (`_*.scss`). Each matched file is compiled separately
-- `out` - the output path, can be a directory or a file path. With multiple inputs it must be a directory — each input compiles to `<out>/<basename>.css`, so inputs sharing a basename (e.g. `a/main.scss` and `b/main.scss`) will overwrite each other
+- `in` - the input path, can be a file path, an array of file paths, or a glob pattern (e.g. `"src/scss/*.scss"`, `"src/elements/*/index.{scss,sass,css}"`). Globs must use `/` separators (even on Windows) and skip Sass partials (`_*.scss`). Each matched file is compiled separately
+- `out` - the output path, can be a directory or a file path. With multiple inputs it must be a directory — each input compiles to `<out>/<basename>.css`, so inputs sharing a basename (e.g. `a/main.scss` and `b/main.scss`) will overwrite each other. A **glob-matched** `index.*` is named after its directory instead, placed relative to the glob's static prefix: `"src/elements/*/index.scss"` gives `<out>/accordion.css`, while `"src/*/accordion/index.scss"` keeps the differing segment as `<out>/blocks/accordion.css`. A literal `in: "src/scss/index.scss"` keeps its own basename
 - `options` - the options for the bundler.
 
 **Options:**

package/lib/copy.js

@@ -34,7 +34,7 @@ export default class Copy {
 
       for (const inEntry of inEntries) {
         const hasGlobMagic = typeof hasMagic === 'function'
-          ? hasMagic(inEntry)
+          ? hasMagic(inEntry, { magicalBraces: true })
           : ['*', '?', '[', ']', '{', '}', '(', ')', '!'].some((ch) => inEntry.includes(ch))
         let matches = []
         try {

package/lib/scripts.js

@@ -5,6 +5,9 @@ import {
   pathExists,
   mkPath,
   pathForFile,
+  isIndexEntry,
+  globBase,
+  indexEntryOut,
   fillBannerTemplate,
   buildTime,
   fileSize
@@ -29,14 +32,21 @@ export default class Scripts {
       const entryPoints = []
       let missing = false
       for (const entry of configured) {
-        if (hasMagic(entry)) {
+        if (hasMagic(entry, { magicalBraces: true })) {
           // Globs must use `/` even on Windows; sort for deterministic build order
           const matches = globSync(entry, { posix: true }).sort()
           if (!matches.length) {
             log({ tag: 'script', error: true, text: 'Entry does not exist:', link: entry })
             missing = true
           }
-          entryPoints.push(...matches)
+          // A glob-matched `index.js` is named after its directory, relative to
+          // the glob's static prefix — otherwise every component collides on
+          // `index.js` or nests a level deep under esbuild's outbase. Literal
+          // entries keep their basename — see `isIndexEntry`.
+          const base = globBase(entry)
+          entryPoints.push(...matches.map(match => (
+            isIndexEntry(match) ? { in: match, out: indexEntryOut(match, base) } : match
+          )))
         } else if (!pathExists(entry)) {
           log({ tag: 'script', error: true, text: 'Entry does not exist:', link: entry })
           missing = true
@@ -78,6 +88,9 @@ export default class Scripts {
         log({ tag: 'error', text: 'Cannot output multiple script files to a single file. Please specify an output directory path instead.' })
         process.exit(1)
       }
+      // An explicit `outfile` names the output itself, so drop any `{ in, out }`
+      // wrapper the glob resolver added — esbuild rejects the pair.
+      opts.entryPoints = infilePath.map(entry => entry.in || entry)
       opts.outfile = outfilePath
     }
 

package/lib/styles.js

@@ -5,6 +5,9 @@ import {
   mkPath,
   pathForFile,
   buildStyleOutputFilePath,
+  isIndexEntry,
+  globBase,
+  indexEntryOut,
   fillBannerTemplate,
   buildTime,
   fileSize
@@ -30,9 +33,10 @@ export default class Styles {
       // `in` may be an array of entry points and/or globs — same resolution as scripts
       const configured = Array.isArray(styleEntry.in) ? styleEntry.in : [styleEntry.in]
       const entryPoints = []
+      const indexEntries = new Map()
       let missing = false
       for (const entry of configured) {
-        if (hasMagic(entry)) {
+        if (hasMagic(entry, { magicalBraces: true })) {
           // Globs must use `/` even on Windows; sort for deterministic build order.
           // Skip sass partials (_*.scss) — they are imports, not entry points.
           const matches = globSync(entry, { posix: true }).filter(match => !path.basename(match).startsWith('_')).sort()
@@ -40,6 +44,13 @@ export default class Styles {
             log({ tag: 'style', error: true, text: 'Entry does not exist:', link: entry })
             missing = true
           }
+          // A glob-matched `index.scss` is named after its directory, relative
+          // to the glob's static prefix — otherwise every component collides on
+          // `index.css`. Literal entries keep their basename — see `isIndexEntry`.
+          const base = globBase(entry)
+          for (const match of matches) {
+            if (isIndexEntry(match)) indexEntries.set(match, indexEntryOut(match, base))
+          }
           entryPoints.push(...matches)
         } else if (!pathExists(entry)) {
           log({ tag: 'style', error: true, text: 'Entry does not exist:', link: entry })
@@ -54,7 +65,11 @@ export default class Styles {
         process.exit(1)
       }
       for (const entryPoint of entryPoints) {
-        await this.compileEntry(entryPoint, styleEntry.out, styleEntry.options)
+        // Resolve the index rename here, where `out` is still known to be a dir
+        const out = indexEntries.has(entryPoint) && !pathForFile(styleEntry.out)
+          ? path.join(styleEntry.out, `${indexEntries.get(entryPoint)}.css`)
+          : styleEntry.out
+        await this.compileEntry(entryPoint, out, styleEntry.options)
       }
     }
   }

package/lib/utils/helpers.js

@@ -34,10 +34,38 @@ export function insertMinSuffix(filePath) {
   return path.join(path.dirname(filePath), `${name}.min${ext}`)
 }
 
+// `index` is a directory entry point — name the output after the directory, so
+// `src/elements/accordion/index.scss` outputs `accordion.css`. Only applied to
+// glob matches: a literal `in: 'src/index.js'` keeps its own basename, since
+// renaming it to `src.js` would silently move an explicitly named output.
+export function isIndexEntry(inputPath) {
+  const { dir, name } = path.parse(inputPath)
+  return name === 'index' && !!dir && dir !== '.' && dir !== '..'
+}
+
+// The static prefix of a glob — everything before its first magic segment.
+// `src/elements/*/index.ts` → `src/elements`, `src/*/accordion/index.ts` → `src`.
+// Derived from the pattern alone, so it doesn't shift with what happened to match.
+export function globBase(pattern) {
+  const parts = toPosix(pattern).split('/')
+  const magicAt = parts.findIndex(part => hasMagic(part, { magicalBraces: true }))
+  return parts.slice(0, magicAt === -1 ? -1 : magicAt).join('/')
+}
+
+// Extension-less output path for a glob-matched `index.*`: the directory name,
+// keeping whatever nesting the glob's static prefix doesn't already account for.
+// A glob spanning several groups (`src/*/accordion/index.ts`) therefore stays
+// apart as `blocks/accordion` and `elements/accordion` instead of colliding.
+export function indexEntryOut(inputPath, base) {
+  const dir = path.posix.dirname(toPosix(inputPath))
+  const rel = base ? path.posix.relative(base, dir) : dir
+  return rel || path.posix.basename(dir)
+}
+
 export function buildStyleOutputFilePath(inputPath, outputPath) {
   if (pathForFile(outputPath)) return outputPath
   const { name } = path.parse(inputPath)
-  return path.join(path.join(outputPath, `${name}.css`))
+  return path.join(outputPath, `${name}.css`)
 }
 
 export function fillBannerTemplate(template, packagesPath) {
@@ -185,7 +213,7 @@ export function pathContainsPathSegment(filePath, segment) {
   // Watcher paths arrive with native separators, config segments with `/`
   filePath = toPosix(filePath)
   segment = stripDirNavSegments(segment)
-  if (hasMagic(segment)) {
+  if (hasMagic(segment, { magicalBraces: true })) {
     segment = convertGlobToRegex(segment)
     if (!segment) return false
     return segment.test(filePath)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "poops",
   "description": "Straightforward, no-bullshit bundler for the web.",
-  "version": "1.9.4",
+  "version": "1.9.5",
   "license": "MIT",
   "type": "module",
   "main": "poops.js",