trackparse 0.3.2 → 0.4.0

package/README.md

@@ -11,7 +11,7 @@ Parse music track names into structured metadata: artists, featured artists, rem
 
 This is the JavaScript/TypeScript reference implementation of the
 [trackparse spec](https://github.com/4matic/trackparse/blob/main/spec/SPEC.md). It passes all
-12,965 shared fixtures. Zero dependencies, ESM and CommonJS, TypeScript types included, never
+13,124 shared fixtures. Zero dependencies, ESM and CommonJS, TypeScript types included, never
 throws.
 
 The principle is **extract, don't delete**: everything recognised lands in a field (artists with
@@ -29,6 +29,8 @@ Node 18 or later. No Node-specific APIs are used, so it also runs in browsers an
 
 ## Quick start
 
+**Docs:** [Getting started](https://4matic.github.io/trackparse/start/getting-started/)
+
 ```js
 import { parse } from "trackparse";
 // const { parse } = require("trackparse");
@@ -51,12 +53,16 @@ track.mode;                        // 'youtube' (auto-detected from the junk gro
 
 ## API
 
+**Docs:** [parse and ParsedTrack](https://4matic.github.io/trackparse/reference/parse/) · [Other functions](https://4matic.github.io/trackparse/reference/functions/)
+
 ### `parse(input, options?) → ParsedTrack`
 
 Parses one track string. Every key of the result is always present.
 
 ### `parseArtists(input, options?) → Artist[]`
 
+**Docs:** [parseArtists](https://4matic.github.io/trackparse/reference/functions/#parseartistsinput-options)
+
 Splits an artist string (no title) into credits.
 
 ```js
@@ -71,6 +77,8 @@ parseArtists("Sub Focus, Wilkinson & Dimension feat. Kojo");
 
 ### `format(track, options?) → string`
 
+**Docs:** [format](https://4matic.github.io/trackparse/reference/functions/#formattrack-options) · [Formatting](https://4matic.github.io/trackparse/guides/formatting/)
+
 Renders a `ParsedTrack` back to `Artists - Title (versions) (prod. ...)`.
 
 ```js
@@ -92,6 +100,8 @@ format(t, { feat: "omit", versions: "none" });      // 'Wilkinson - Afterglow'
 
 ### `normalize(input) → string`
 
+**Docs:** [normalize](https://4matic.github.io/trackparse/reference/functions/#normalizeinput)
+
 The Unicode cleanup applied before parsing: NFC, zero-width spaces, BOM and soft hyphens removed, fullwidth
 brackets, smart quotes and dash variants mapped to ASCII, whitespace collapsed. Idempotent.
 
@@ -102,6 +112,8 @@ normalize("  Artist​ — Title （Remix）  “Quoted”  ");
 
 ### `allArtists(track) → Artist[]`
 
+**Docs:** [allArtists](https://4matic.github.io/trackparse/reference/functions/#allartiststrack)
+
 Track credits plus every version's remixers, deduplicated.
 
 ```js
@@ -112,6 +124,8 @@ allArtists(parse("Camo & Krooked - Kallisto (Noisia Remix)", { knownArtists: ["C
 
 ### `createParser(options) → { parse, parseArtists }`
 
+**Docs:** [createParser](https://4matic.github.io/trackparse/reference/functions/#createparseroptions)
+
 Compiles options, including extra vocabulary, once. Per-call options are merged over the base.
 
 ```js
@@ -133,6 +147,8 @@ The spec version this build implements, e.g. `"0.3.0"`. Always equal to the pack
 
 ## Options
 
+**Docs:** [Options](https://4matic.github.io/trackparse/reference/options/)
+
 | Option | Default | Effect |
 |---|---|---|
 | `mode` | `"auto"` | `"clean"` (tags, store metadata), `"youtube"` (video titles), `"filename"`, `"tracklist"` (one line of a tracklist), or `"auto"` to detect. |
@@ -207,9 +223,11 @@ The full field reference, a gallery of examples and the comparison with other li
 
 ## Tracklists
 
+**Docs:** [Tracklists](https://4matic.github.io/trackparse/guides/tracklists/) · [Editing tracklists](https://4matic.github.io/trackparse/guides/editing-tracklists/)
+
 `trackparse/tracklist` parses a whole tracklist: one entry per line with its kind, start time and
 a full `ParsedTrack`, plus checks with line numbers. Joining `raw + eol` over the entries gives the
-input back byte for byte, whatever the line endings. It's a separate entry point (about 7.6 KiB
+input back byte for byte, whatever the line endings. It's a separate entry point (about 8.3 KiB
 gzipped), so you only pay for it if you import it.
 
 ```js
@@ -271,6 +289,13 @@ Warning codes: `time-missing`, `time-out-of-order` (with a one- or two-digit `su
 exactly one fix fits), `time-duplicate`, `no-start-at-zero`, `time-after-audio-end` (pass
 `audioSeconds`), `invalid-time`, `position-gap`, `position-duplicate`, `line-unparsed`.
 
+Lists pasted with list bullets or Markdown emphasis (`* 14:21 Artist - Title`,
+`**[**14:21**] Artist - Title**`) read like plain lines; the decoration stays in `raw` and `parts`.
+A line whose track text (after any time) starts with `w/` is `layered`: a track played over the
+previous one
+([Markdown](https://4matic.github.io/trackparse/guides/tracklists/#markdown),
+[layered tracks](https://4matic.github.io/trackparse/guides/tracklists/#layered-tracks)).
+
 Options: `mode` (default `"tracklist"`), `knownArtists`, `splitAnd`, `keywords`, `audioSeconds`,
 `markerWords`. Every type is exported (`import type { Tracklist, Edit } from
 "trackparse/tracklist"`).
@@ -288,6 +313,8 @@ Field tables and the full list of rules: the [tracklists guide](https://4matic.g
 
 ## Limitations
 
+**Docs:** [Limitations and roadmap](https://4matic.github.io/trackparse/project/roadmap/)
+
 One track string per `parse()` call; tracklists go through `trackparse/tracklist`, which reads
 start times only (no durations, trailing times or ranges). No label/catalog, key or BPM fields, and
 no built-in artist database: pass `knownArtists` for names that contain a joiner.

package/dist/{chunk-L4WNGZ5H.js → chunk-OY536C3I.js}

@@ -1,5 +1,5 @@
 // src/data.generated.ts
-var SPEC_VERSION = "0.3.2";
+var SPEC_VERSION = "0.4.0";
 var descriptorsData = {
   "descriptors": [
     "radio",
@@ -327,6 +327,11 @@ var junkData = {
     "recordings"
   ]
 };
+var layeredWordsData = {
+  "words": [
+    "w/"
+  ]
+};
 var markerWordsData = {
   "words": [
     "intro",
@@ -2311,4 +2316,4 @@ function parseArtists(input, options) {
   return defaultParser.parseArtists(input, options);
 }
 
-export { PhraseTable, SPEC_VERSION, asciiLower, createListParser, createParser, dedupKey, digitRun, getDefaultTables, headerWordsData, inVocab, isDigit, isWhitespace, markerWordsData, normalize, parse, parseArtists, renderVersion, splitWords, stringList, wordMatches };
+export { PhraseTable, SPEC_VERSION, asciiLower, createListParser, createParser, dedupKey, digitRun, getDefaultTables, headerWordsData, inVocab, isDigit, isWhitespace, layeredWordsData, markerWordsData, normalize, parse, parseArtists, renderVersion, splitWords, stringList, wordMatches };

package/dist/index.cjs

@@ -1,7 +1,7 @@
 'use strict';
 
 // src/data.generated.ts
-var SPEC_VERSION = "0.3.2";
+var SPEC_VERSION = "0.4.0";
 var descriptorsData = {
   "descriptors": [
     "radio",

package/dist/index.d.cts

@@ -1,7 +1,7 @@
 import { P as ParsedTrack, A as Artist, F as FormatOptions, a as ParseOptions } from './types-DqJSn18b.cjs';
 export { b as ArtistRole, c as ArtistSource, d as Flags, J as Junk, e as JunkKind, K as KeywordOptions, M as Mode, f as ModeOption, g as Position, T as Timestamp, V as Version, h as VersionDelimiter, i as VersionType, W as Warning } from './types-DqJSn18b.cjs';
 
-declare const SPEC_VERSION = "0.3.2";
+declare const SPEC_VERSION = "0.4.0";
 
 declare function format(track: ParsedTrack, options?: FormatOptions): string;
 /** All credited names: track artists plus every version's remixers, deduped by R0.4 key. */

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import { P as ParsedTrack, A as Artist, F as FormatOptions, a as ParseOptions } from './types-DqJSn18b.js';
 export { b as ArtistRole, c as ArtistSource, d as Flags, J as Junk, e as JunkKind, K as KeywordOptions, M as Mode, f as ModeOption, g as Position, T as Timestamp, V as Version, h as VersionDelimiter, i as VersionType, W as Warning } from './types-DqJSn18b.js';
 
-declare const SPEC_VERSION = "0.3.2";
+declare const SPEC_VERSION = "0.4.0";
 
 declare function format(track: ParsedTrack, options?: FormatOptions): string;
 /** All credited names: track artists plus every version's remixers, deduped by R0.4 key. */

package/dist/index.js

@@ -1,5 +1,5 @@
-import { getDefaultTables, renderVersion, dedupKey, wordMatches } from './chunk-L4WNGZ5H.js';
-export { SPEC_VERSION, createParser, normalize, parse, parseArtists } from './chunk-L4WNGZ5H.js';
+import { getDefaultTables, renderVersion, dedupKey, wordMatches } from './chunk-OY536C3I.js';
+export { SPEC_VERSION, createParser, normalize, parse, parseArtists } from './chunk-OY536C3I.js';
 
 // src/format.ts
 function resolve(o) {

package/dist/tracklist.cjs

@@ -240,6 +240,45 @@ function twoDigitsUpTo59(s, at) {
   return n <= 59 ? n : null;
 }
 
+// src/tracklist/emphasis.ts
+function runLength(s, at) {
+  const ch = s[at];
+  let j = at;
+  if (ch === "*" || ch === "_") while (s[j] === ch) j++;
+  return j - at;
+}
+function emphasisRun(s, at) {
+  const n = runLength(s, at);
+  return n <= 2 ? n : 0;
+}
+var isOuter = (ch) => ch === void 0 || isWhitespace(ch) || "[]()*_".includes(ch);
+var isInner = (ch) => ch !== void 0 && !isWhitespace(ch);
+function withoutMarkers(raw, from, open) {
+  const marked = [];
+  const stacks = { "*": [], "**": [], _: [], __: [] };
+  for (let i = from; i < raw.length; ) {
+    const len = runLength(raw, i) || 1;
+    const own = stacks[raw.slice(i, i + len)];
+    const before = raw[i - 1];
+    const after = raw[i + len];
+    const at = own && isInner(before) && isOuter(after) ? own.pop() : void 0;
+    if (at !== void 0) {
+      for (let m = 0; m < len; m++) marked[at + m] = marked[i + m] = true;
+      for (const st of Object.values(stacks)) while ((st[st.length - 1] ?? -1) > at) st.pop();
+    } else if (own && isOuter(before) && isInner(after)) own.push(i);
+    i += len;
+  }
+  let end = raw.length;
+  while (end > from && isWhitespace(raw[end - 1])) end--;
+  let start = end;
+  while (start > from && raw[start - 1] === open) start--;
+  if (open && end - start <= 2 && start > from && raw[start - 1] !== open && isInner(raw[start - 1]))
+    for (let m = start; m < end && !marked[m]; m++) marked[m] = true;
+  let out = "";
+  for (let i = from; i < raw.length; i++) if (!marked[i]) out += raw[i];
+  return out;
+}
+
 // src/tracklist/times.ts
 function isGapSeparator(ch) {
   return ch === "-" || ch === "\u2013" || ch === "\u2014" || ch === "|" || ch === "." || ch === ":";
@@ -261,9 +300,11 @@ function untimed(raw, invalid) {
     parts: { lead, time: "", gap: "", rest: raw.slice(lead.length) },
     time: null,
     style: null,
-    invalid
+    invalid,
+    text: withoutMarkers(raw, lead.length)
   };
 }
+var closingRun = (raw, at, open) => open && raw[at] === open ? at + emphasisRun(raw, at) : at;
 function secondsOf(whole, frac) {
   return frac.length === 0 ? whole : Number(`${whole}.${frac}`);
 }
@@ -296,8 +337,22 @@ function shapeSeconds(parts) {
 }
 function scanTime(raw) {
   let i = skipWhitespace(raw, 0);
+  if (isBullet(raw[i]) && isWhitespace(raw[i + 1])) i = skipWhitespace(raw, i + 1);
+  let outerOpen;
+  let n = emphasisRun(raw, i);
+  if (n && (raw[i + n] === "[" || raw[i + n] === "(" || isDigit(raw[i + n]))) {
+    outerOpen = raw[i];
+    i += n;
+  }
   const closer = raw[i] === "[" ? "]" : raw[i] === "(" ? ")" : null;
-  if (closer) i++;
+  let innerOpen;
+  if (closer) {
+    n = emphasisRun(raw, ++i);
+    if (n && isDigit(raw[i + n])) {
+      innerOpen = raw[i];
+      i += n;
+    }
+  }
   const leadEnd = i;
   const shape = shapeAt(raw, i);
   if (!shape) return untimed(raw, false);
@@ -308,19 +363,30 @@ function scanTime(raw) {
   let frac = "";
   const sep = raw[j];
   if (sep === "." || sep === ",") {
-    const n = digitRun(raw, j + 1);
-    if (n >= 1 && n <= 3) {
+    const n2 = digitRun(raw, j + 1);
+    if (n2 >= 1 && n2 <= 3) {
       fracSep = sep;
-      frac = raw.slice(j + 1, j + 1 + n);
-      j += 1 + n;
+      frac = raw.slice(j + 1, j + 1 + n2);
+      j += 1 + n2;
     }
   }
   const timeEnd = j;
+  const followsTime = (at) => at >= raw.length || isWhitespace(raw[at]) || isGapSeparator(raw[at]);
+  let open;
   if (closer) {
+    let k = closingRun(raw, j, innerOpen);
+    if (k === j) open = innerOpen;
+    j = k;
     if (raw[j] !== closer) return untimed(raw, false);
     j++;
-  } else if (j < raw.length && !isWhitespace(raw[j]) && !isGapSeparator(raw[j])) {
-    return untimed(raw, false);
+    k = closingRun(raw, j, outerOpen);
+    if (k > j && followsTime(k)) j = k;
+    else open = outerOpen ?? open;
+  } else {
+    const k = closingRun(raw, j, outerOpen);
+    if (k === j) open = outerOpen;
+    j = k;
+    if (!followsTime(j)) return untimed(raw, false);
   }
   j = skipWhitespace(raw, j);
   if (isGapSeparator(raw[j])) j = skipWhitespace(raw, j + 1);
@@ -348,7 +414,8 @@ function scanTime(raw) {
       fracSep,
       fracDigits: frac.length
     },
-    invalid: false
+    invalid: false,
+    text: withoutMarkers(raw, j, open)
   };
 }
 var pad = (n, width) => String(n).padStart(width, "0");
@@ -642,7 +709,7 @@ function applyEdits(text, edits, options) {
 }
 
 // src/data.generated.ts
-var SPEC_VERSION = "0.3.2";
+var SPEC_VERSION = "0.4.0";
 var descriptorsData = {
   "descriptors": [
     "radio",
@@ -970,6 +1037,11 @@ var junkData = {
     "recordings"
   ]
 };
+var layeredWordsData = {
+  "words": [
+    "w/"
+  ]
+};
 var markerWordsData = {
   "words": [
     "intro",
@@ -2745,6 +2817,7 @@ createParser();
 
 // src/tracklist/kinds.ts
 var headerWords = new Set(headerWordsData.words);
+var layeredWords = new Set(layeredWordsData.words);
 var defaultMarkers = null;
 function markerTable(extra) {
   const more = stringList(extra);
@@ -2775,6 +2848,15 @@ function markerWords(text) {
   flush();
   return out;
 }
+function layeredPrefix(text) {
+  let i = 0;
+  while (i < text.length && isWhitespace(text[i])) i++;
+  let j = i;
+  while (j < text.length && !isWhitespace(text[j])) j++;
+  if (j === i || j === text.length || !inVocab(text.slice(i, j), layeredWords)) return 0;
+  while (j < text.length && isWhitespace(text[j])) j++;
+  return j < text.length ? j : 0;
+}
 function isBlank(raw) {
   for (let i = 0; i < raw.length; i++) if (!isWhitespace(raw[i])) return false;
   return true;
@@ -2998,7 +3080,8 @@ function tracklistWarnings(input) {
     if (e.time) timed.push(i);
   });
   entries.forEach((e, i) => {
-    if (e.kind === "track" && e.time === null && timed.length > 0) add(i, "time-missing");
+    if (e.kind === "track" && e.time === null && !e.layered && timed.length > 0)
+      add(i, "time-missing");
     if (invalid[i]) add(i, "invalid-time");
     if (unparsed[i]) add(i, "line-unparsed");
   });
@@ -3039,9 +3122,12 @@ function parseTracklist(text, options) {
   const rows = lines.map((line) => {
     const scan2 = scanTime(line.raw);
     const blank = isBlank(line.raw);
+    const layered = blank ? 0 : layeredPrefix(scan2.text);
     const row = {
       line,
       scan: scan2,
+      text: scan2.text.slice(layered),
+      layered: layered > 0,
       blank,
       candidate: false,
       dash: false,
@@ -3052,11 +3138,11 @@ function parseTracklist(text, options) {
       marker: false
     };
     if (blank) return row;
-    const probe2 = lp.probe(scan2.parts.rest);
+    const probe2 = lp.probe(row.text);
     row.probe = probe2;
     row.dash = probe2.spacedDash;
     row.candidate = scan2.time !== null || row.dash;
-    row.bare = bareCandidate(scan2.parts.rest, probe2.position);
+    row.bare = row.layered ? null : bareCandidate(row.text, probe2.position);
     return row;
   });
   let candidates2 = 0;
@@ -3069,13 +3155,13 @@ function parseTracklist(text, options) {
   const listContext = candidates2 > 0 && 2 * dashes >= candidates2;
   const confirmed = confirmPositions(
     rows.map((r) => r.bare),
-    rows.map((r) => r.candidate)
+    rows.map((r) => r.candidate && !r.layered)
   );
   rows.forEach((r, i) => {
     if (r.blank || !r.probe) return;
     const bare = confirmed[i] ? r.bare : null;
     const probe2 = bare ? lp.probe(bare.stripped) : r.probe;
-    r.marker = hasMarkerWord(bare ? bare.stripped : r.scan.parts.rest, markers);
+    r.marker = hasMarkerWord(bare ? bare.stripped : r.text, markers);
     const track = probe2.finish(listContext && r.scan.time !== null && !r.marker);
     if (bare) track.position = { raw: bare.raw, number: bare.number };
     r.track = track;
@@ -3091,7 +3177,8 @@ function parseTracklist(text, options) {
       raw: r.line.raw,
       parts: r.scan.parts,
       time: r.scan.time,
-      track: keep ? r.track : null
+      track: keep ? r.track : null,
+      layered: r.layered
     };
   });
   const warnings = tracklistWarnings({
@@ -3107,9 +3194,8 @@ function kindOf(r) {
   if (r.blank || !r.track) return "blank";
   const marker = !r.separated && r.marker;
   if (r.scan.time) return marker ? "marker" : "track";
-  const rest = r.scan.parts.rest;
-  if (isLink(rest)) return "link";
-  if (isHeader(rest)) return "header";
+  if (isLink(r.text)) return "link";
+  if (isHeader(r.text)) return "header";
   if (marker) return "marker";
   return r.separated ? "track" : "note";
 }

package/dist/tracklist.d.cts

@@ -25,6 +25,8 @@ interface TracklistEntry {
     parts: EntryParts;
     time: TracklistTime | null;
     track: ParsedTrack | null;
+    /** R13.13: the line starts with `w/`: played over the previous track. */
+    layered: boolean;
 }
 type TracklistWarningCode = "time-missing" | "time-out-of-order" | "time-duplicate" | "no-start-at-zero" | "time-after-audio-end" | "invalid-time" | "position-gap" | "position-duplicate" | "line-unparsed";
 interface TracklistWarning {

package/dist/tracklist.d.ts

@@ -25,6 +25,8 @@ interface TracklistEntry {
     parts: EntryParts;
     time: TracklistTime | null;
     track: ParsedTrack | null;
+    /** R13.13: the line starts with `w/`: played over the previous track. */
+    layered: boolean;
 }
 type TracklistWarningCode = "time-missing" | "time-out-of-order" | "time-duplicate" | "no-start-at-zero" | "time-after-audio-end" | "invalid-time" | "position-gap" | "position-duplicate" | "line-unparsed";
 interface TracklistWarning {

package/dist/tracklist.js

@@ -1,4 +1,4 @@
-import { headerWordsData, createListParser, SPEC_VERSION, stringList, PhraseTable, markerWordsData, digitRun, isWhitespace, asciiLower, splitWords, inVocab, isDigit } from './chunk-L4WNGZ5H.js';
+import { headerWordsData, layeredWordsData, createListParser, SPEC_VERSION, stringList, PhraseTable, markerWordsData, isWhitespace, isDigit, digitRun, inVocab, asciiLower, splitWords } from './chunk-OY536C3I.js';
 
 // src/tracklist/split.ts
 function splitLines(text) {
@@ -35,6 +35,45 @@ function hasLineBreak(s) {
   return false;
 }
 
+// src/tracklist/emphasis.ts
+function runLength(s, at) {
+  const ch = s[at];
+  let j = at;
+  if (ch === "*" || ch === "_") while (s[j] === ch) j++;
+  return j - at;
+}
+function emphasisRun(s, at) {
+  const n = runLength(s, at);
+  return n <= 2 ? n : 0;
+}
+var isOuter = (ch) => ch === void 0 || isWhitespace(ch) || "[]()*_".includes(ch);
+var isInner = (ch) => ch !== void 0 && !isWhitespace(ch);
+function withoutMarkers(raw, from, open) {
+  const marked = [];
+  const stacks = { "*": [], "**": [], _: [], __: [] };
+  for (let i = from; i < raw.length; ) {
+    const len = runLength(raw, i) || 1;
+    const own = stacks[raw.slice(i, i + len)];
+    const before = raw[i - 1];
+    const after = raw[i + len];
+    const at = own && isInner(before) && isOuter(after) ? own.pop() : void 0;
+    if (at !== void 0) {
+      for (let m = 0; m < len; m++) marked[at + m] = marked[i + m] = true;
+      for (const st of Object.values(stacks)) while ((st[st.length - 1] ?? -1) > at) st.pop();
+    } else if (own && isOuter(before) && isInner(after)) own.push(i);
+    i += len;
+  }
+  let end = raw.length;
+  while (end > from && isWhitespace(raw[end - 1])) end--;
+  let start = end;
+  while (start > from && raw[start - 1] === open) start--;
+  if (open && end - start <= 2 && start > from && raw[start - 1] !== open && isInner(raw[start - 1]))
+    for (let m = start; m < end && !marked[m]; m++) marked[m] = true;
+  let out = "";
+  for (let i = from; i < raw.length; i++) if (!marked[i]) out += raw[i];
+  return out;
+}
+
 // src/tracklist/times.ts
 function isGapSeparator(ch) {
   return ch === "-" || ch === "\u2013" || ch === "\u2014" || ch === "|" || ch === "." || ch === ":";
@@ -56,9 +95,11 @@ function untimed(raw, invalid) {
     parts: { lead, time: "", gap: "", rest: raw.slice(lead.length) },
     time: null,
     style: null,
-    invalid
+    invalid,
+    text: withoutMarkers(raw, lead.length)
   };
 }
+var closingRun = (raw, at, open) => open && raw[at] === open ? at + emphasisRun(raw, at) : at;
 function secondsOf(whole, frac) {
   return frac.length === 0 ? whole : Number(`${whole}.${frac}`);
 }
@@ -91,8 +132,22 @@ function shapeSeconds(parts) {
 }
 function scanTime(raw) {
   let i = skipWhitespace(raw, 0);
+  if (isBullet(raw[i]) && isWhitespace(raw[i + 1])) i = skipWhitespace(raw, i + 1);
+  let outerOpen;
+  let n = emphasisRun(raw, i);
+  if (n && (raw[i + n] === "[" || raw[i + n] === "(" || isDigit(raw[i + n]))) {
+    outerOpen = raw[i];
+    i += n;
+  }
   const closer = raw[i] === "[" ? "]" : raw[i] === "(" ? ")" : null;
-  if (closer) i++;
+  let innerOpen;
+  if (closer) {
+    n = emphasisRun(raw, ++i);
+    if (n && isDigit(raw[i + n])) {
+      innerOpen = raw[i];
+      i += n;
+    }
+  }
   const leadEnd = i;
   const shape = shapeAt(raw, i);
   if (!shape) return untimed(raw, false);
@@ -103,19 +158,30 @@ function scanTime(raw) {
   let frac = "";
   const sep = raw[j];
   if (sep === "." || sep === ",") {
-    const n = digitRun(raw, j + 1);
-    if (n >= 1 && n <= 3) {
+    const n2 = digitRun(raw, j + 1);
+    if (n2 >= 1 && n2 <= 3) {
       fracSep = sep;
-      frac = raw.slice(j + 1, j + 1 + n);
-      j += 1 + n;
+      frac = raw.slice(j + 1, j + 1 + n2);
+      j += 1 + n2;
     }
   }
   const timeEnd = j;
+  const followsTime = (at) => at >= raw.length || isWhitespace(raw[at]) || isGapSeparator(raw[at]);
+  let open;
   if (closer) {
+    let k = closingRun(raw, j, innerOpen);
+    if (k === j) open = innerOpen;
+    j = k;
     if (raw[j] !== closer) return untimed(raw, false);
     j++;
-  } else if (j < raw.length && !isWhitespace(raw[j]) && !isGapSeparator(raw[j])) {
-    return untimed(raw, false);
+    k = closingRun(raw, j, outerOpen);
+    if (k > j && followsTime(k)) j = k;
+    else open = outerOpen ?? open;
+  } else {
+    const k = closingRun(raw, j, outerOpen);
+    if (k === j) open = outerOpen;
+    j = k;
+    if (!followsTime(j)) return untimed(raw, false);
   }
   j = skipWhitespace(raw, j);
   if (isGapSeparator(raw[j])) j = skipWhitespace(raw, j + 1);
@@ -143,7 +209,8 @@ function scanTime(raw) {
       fracSep,
       fracDigits: frac.length
     },
-    invalid: false
+    invalid: false,
+    text: withoutMarkers(raw, j, open)
   };
 }
 var pad = (n, width) => String(n).padStart(width, "0");
@@ -438,6 +505,7 @@ function applyEdits(text, edits, options) {
 
 // src/tracklist/kinds.ts
 var headerWords = new Set(headerWordsData.words);
+var layeredWords = new Set(layeredWordsData.words);
 var defaultMarkers = null;
 function markerTable(extra) {
   const more = stringList(extra);
@@ -468,6 +536,15 @@ function markerWords(text) {
   flush();
   return out;
 }
+function layeredPrefix(text) {
+  let i = 0;
+  while (i < text.length && isWhitespace(text[i])) i++;
+  let j = i;
+  while (j < text.length && !isWhitespace(text[j])) j++;
+  if (j === i || j === text.length || !inVocab(text.slice(i, j), layeredWords)) return 0;
+  while (j < text.length && isWhitespace(text[j])) j++;
+  return j < text.length ? j : 0;
+}
 function isBlank(raw) {
   for (let i = 0; i < raw.length; i++) if (!isWhitespace(raw[i])) return false;
   return true;
@@ -691,7 +768,8 @@ function tracklistWarnings(input) {
     if (e.time) timed.push(i);
   });
   entries.forEach((e, i) => {
-    if (e.kind === "track" && e.time === null && timed.length > 0) add(i, "time-missing");
+    if (e.kind === "track" && e.time === null && !e.layered && timed.length > 0)
+      add(i, "time-missing");
     if (invalid[i]) add(i, "invalid-time");
     if (unparsed[i]) add(i, "line-unparsed");
   });
@@ -732,9 +810,12 @@ function parseTracklist(text, options) {
   const rows = lines.map((line) => {
     const scan = scanTime(line.raw);
     const blank = isBlank(line.raw);
+    const layered = blank ? 0 : layeredPrefix(scan.text);
     const row = {
       line,
       scan,
+      text: scan.text.slice(layered),
+      layered: layered > 0,
       blank,
       candidate: false,
       dash: false,
@@ -745,11 +826,11 @@ function parseTracklist(text, options) {
       marker: false
     };
     if (blank) return row;
-    const probe = lp.probe(scan.parts.rest);
+    const probe = lp.probe(row.text);
     row.probe = probe;
     row.dash = probe.spacedDash;
     row.candidate = scan.time !== null || row.dash;
-    row.bare = bareCandidate(scan.parts.rest, probe.position);
+    row.bare = row.layered ? null : bareCandidate(row.text, probe.position);
     return row;
   });
   let candidates = 0;
@@ -762,13 +843,13 @@ function parseTracklist(text, options) {
   const listContext = candidates > 0 && 2 * dashes >= candidates;
   const confirmed = confirmPositions(
     rows.map((r) => r.bare),
-    rows.map((r) => r.candidate)
+    rows.map((r) => r.candidate && !r.layered)
   );
   rows.forEach((r, i) => {
     if (r.blank || !r.probe) return;
     const bare = confirmed[i] ? r.bare : null;
     const probe = bare ? lp.probe(bare.stripped) : r.probe;
-    r.marker = hasMarkerWord(bare ? bare.stripped : r.scan.parts.rest, markers);
+    r.marker = hasMarkerWord(bare ? bare.stripped : r.text, markers);
     const track = probe.finish(listContext && r.scan.time !== null && !r.marker);
     if (bare) track.position = { raw: bare.raw, number: bare.number };
     r.track = track;
@@ -784,7 +865,8 @@ function parseTracklist(text, options) {
       raw: r.line.raw,
       parts: r.scan.parts,
       time: r.scan.time,
-      track: keep ? r.track : null
+      track: keep ? r.track : null,
+      layered: r.layered
     };
   });
   const warnings = tracklistWarnings({
@@ -800,9 +882,8 @@ function kindOf(r) {
   if (r.blank || !r.track) return "blank";
   const marker = !r.separated && r.marker;
   if (r.scan.time) return marker ? "marker" : "track";
-  const rest = r.scan.parts.rest;
-  if (isLink(rest)) return "link";
-  if (isHeader(rest)) return "header";
+  if (isLink(r.text)) return "link";
+  if (isHeader(r.text)) return "header";
   if (marker) return "marker";
   return r.separated ? "track" : "note";
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trackparse",
-  "version": "0.3.2",
+  "version": "0.4.0",
   "description": "Spec-driven parser for music track strings: artists, feat credits, remixes/versions, junk and more from single track strings (store titles, YouTube titles, filenames) and multi-line tracklists.",
   "license": "MIT",
   "author": "Maksim Maksimov",