lyrics-structure 1.2.2 → 1.2.3

package/lyrics.test.ts

@@ -1,76 +1,76 @@
-import { getLyricsParts } from './lyrics';
-
-const testLyrics = `[partname 1] (indication 1)
-
-content 1
-
-[/partname 1]
-
-[partname 1] (indication 2)
-
-[partname 2]
-
-content 2
-
-[/partname 2]
-
-[interlude 1]
-
-[partname 3]
-
-content without partname container
-
-content standalone 1
-content standalone 2
-`;
-
-describe('getLyricsParts', () => {
-  it('should correctly parse lyrics into parts', () => {
-    const result = getLyricsParts(testLyrics);
-
-    expect(result).toEqual([
-      {
-        name: 'partname 1',
-        repetition: false,
-        indication: 'indication 1',
-        content: 'content 1',
-      },
-      {
-        name: 'partname 1',
-        repetition: true,
-        indication: 'indication 2',
-        content: 'content 1',
-      },
-      {
-        name: 'partname 2',
-        repetition: false,
-        indication: null,
-        content: 'content 2',
-      },
-      {
-        name: 'interlude 1',
-        repetition: false,
-        indication: null,
-        content: undefined,
-      },
-      {
-        name: 'partname 3',
-        repetition: false,
-        indication: null,
-        content: undefined,
-      },
-      {
-        name: undefined,
-        repetition: false,
-        indication: null,
-        content: 'content without partname container',
-      },
-      {
-        name: undefined,
-        repetition: false,
-        indication: null,
-        content: 'content standalone 1\ncontent standalone 2',
-      },
-    ]);
-  });
-});
+import { getLyricsParts } from './lyrics';
+
+const testLyrics = `[partname 1] (indication 1)
+
+content 1
+
+[/partname 1]
+
+[partname 1] (indication 2)
+
+[partname 2]
+
+content 2
+
+[/partname 2]
+
+[interlude 1]
+
+[partname 3]
+
+content without partname container
+
+content standalone 1
+content standalone 2
+`;
+
+describe('getLyricsParts', () => {
+  it('should correctly parse lyrics into parts', () => {
+    const result = getLyricsParts(testLyrics);
+
+    expect(result).toEqual([
+      {
+        name: 'partname 1',
+        repetition: false,
+        indication: 'indication 1',
+        content: 'content 1',
+      },
+      {
+        name: 'partname 1',
+        repetition: true,
+        indication: 'indication 2',
+        content: 'content 1',
+      },
+      {
+        name: 'partname 2',
+        repetition: false,
+        indication: null,
+        content: 'content 2',
+      },
+      {
+        name: 'interlude 1',
+        repetition: false,
+        indication: null,
+        content: undefined,
+      },
+      {
+        name: 'partname 3',
+        repetition: false,
+        indication: null,
+        content: undefined,
+      },
+      {
+        name: undefined,
+        repetition: false,
+        indication: null,
+        content: 'content without partname container',
+      },
+      {
+        name: undefined,
+        repetition: false,
+        indication: null,
+        content: 'content standalone 1\ncontent standalone 2',
+      },
+    ]);
+  });
+});

package/lyrics.ts

@@ -1,107 +1,107 @@
-export type LyricPart = {
-  name: string | undefined;
-  repetition: boolean;
-  indication: string | null;
-  content: string | undefined;
-};
-/**
- * Splits lyrics into structured parts, handling named sections, repetitions, and indications.
- * Works with lyrics formatted using square brackets for section names and optional parentheses for indications.
- *
- * Example input:
- * ```
- * [verse 1] (first time)
- * Lyrics content here
- * [/verse 1]
- *
- * [chorus]
- * Chorus lyrics
- * [/chorus]
- * ```
- *
- * @param lyrics - The input lyrics text to be parsed into parts
- * @returns Array of LyricPart objects containing structured lyrics data
- */
-
-export function getLyricsParts(lyrics: string): LyricPart[] {
-  const parts: LyricPart[] = [];
-  const seenParts = new Map<string, number>();
-  const partContentMap = new Map<string, string>();
-
-  // First pass: extract all content with closing tags
-  const cleanedText = lyrics.replace(
-    /\[([^\]]+)\](?:\s*\(([^)]+)\))?\s*([\s\S]*?)\[\/\1\]/g,
-    (match, key: string, indication: string | undefined, content: string) => {
-      if (!partContentMap.has(key)) {
-        partContentMap.set(key, content.trim());
-      }
-      return `[${key}]${indication ? ` (${indication})` : ''}`;
-    }
-  );
-
-  // Split the lyrics into lines and process them
-  const lines = cleanedText.split('\n');
-  let currentPart: LyricPart | null = null;
-  let currentUnnamedContent: string[] = [];
-
-  for (let i = 0; i < lines.length; i++) {
-    const line = lines[i].trim();
-
-    // Check for part start
-    const partStartMatch = line.match(/^\[([^\]]+)\](?:\s*\(([^)]+)\))?$/);
-    if (partStartMatch) {
-      // If we have accumulated unnamed content, add it as a part
-      if (currentUnnamedContent.length > 0) {
-        parts.push({
-          name: undefined,
-          repetition: false,
-          indication: null,
-          content: currentUnnamedContent.join('\n'),
-        });
-        currentUnnamedContent = [];
-      }
-
-      const partName = partStartMatch[1];
-      const indication = partStartMatch[2] || null;
-
-      // Check if this part has been seen before
-      const partCount = (seenParts.get(partName) || 0) + 1;
-      seenParts.set(partName, partCount);
-
-      currentPart = {
-        name: partName,
-        repetition: partCount > 1,
-        indication,
-        content: partContentMap.get(partName),
-      };
-      parts.push(currentPart);
-      continue;
-    }
-
-    // Handle content without a part container
-    if (line && !line.startsWith('[') && !line.startsWith('[/')) {
-      currentUnnamedContent.push(line);
-    } else if (currentUnnamedContent.length > 0) {
-      // If we hit a part marker or empty line, add the accumulated content
-      parts.push({
-        name: undefined,
-        repetition: false,
-        indication: null,
-        content: currentUnnamedContent.join('\n'),
-      });
-      currentUnnamedContent = [];
-    }
-  }
-
-  // Add any remaining unnamed content
-  if (currentUnnamedContent.length > 0) {
-    parts.push({
-      name: undefined,
-      repetition: false,
-      indication: null,
-      content: currentUnnamedContent.join('\n'),
-    });
-  }
-
-  return parts;
-}
+export type LyricPart = {
+  name: string | undefined;
+  repetition: boolean;
+  indication: string | null;
+  content: string | undefined;
+};
+/**
+ * Splits lyrics into structured parts, handling named sections, repetitions, and indications.
+ * Works with lyrics formatted using square brackets for section names and optional parentheses for indications.
+ *
+ * Example input:
+ * ```
+ * [verse 1] (first time)
+ * Lyrics content here
+ * [/verse 1]
+ *
+ * [chorus]
+ * Chorus lyrics
+ * [/chorus]
+ * ```
+ *
+ * @param lyrics - The input lyrics text to be parsed into parts
+ * @returns Array of LyricPart objects containing structured lyrics data
+ */
+
+export function getLyricsParts(lyrics: string): LyricPart[] {
+  const parts: LyricPart[] = [];
+  const seenParts = new Map<string, number>();
+  const partContentMap = new Map<string, string>();
+
+  // First pass: extract all content with closing tags
+  const cleanedText = lyrics.replace(
+    /\[([^\]]+)\](?:\s*\(([^)]+)\))?\s*([\s\S]*?)\[\/\1\]/g,
+    (match, key: string, indication: string | undefined, content: string) => {
+      if (!partContentMap.has(key)) {
+        partContentMap.set(key, content.trim());
+      }
+      return `[${key}]${indication ? ` (${indication})` : ''}`;
+    }
+  );
+
+  // Split the lyrics into lines and process them
+  const lines = cleanedText.split('\n');
+  let currentPart: LyricPart | null = null;
+  let currentUnnamedContent: string[] = [];
+
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i].trim();
+
+    // Check for part start
+    const partStartMatch = line.match(/^\[([^\]]+)\](?:\s*\(([^)]+)\))?$/);
+    if (partStartMatch) {
+      // If we have accumulated unnamed content, add it as a part
+      if (currentUnnamedContent.length > 0) {
+        parts.push({
+          name: undefined,
+          repetition: false,
+          indication: null,
+          content: currentUnnamedContent.join('\n'),
+        });
+        currentUnnamedContent = [];
+      }
+
+      const partName = partStartMatch[1];
+      const indication = partStartMatch[2] || null;
+
+      // Check if this part has been seen before
+      const partCount = (seenParts.get(partName) || 0) + 1;
+      seenParts.set(partName, partCount);
+
+      currentPart = {
+        name: partName,
+        repetition: partCount > 1,
+        indication,
+        content: partContentMap.get(partName),
+      };
+      parts.push(currentPart);
+      continue;
+    }
+
+    // Handle content without a part container
+    if (line && !line.startsWith('[') && !line.startsWith('[/')) {
+      currentUnnamedContent.push(line);
+    } else if (currentUnnamedContent.length > 0) {
+      // If we hit a part marker or empty line, add the accumulated content
+      parts.push({
+        name: undefined,
+        repetition: false,
+        indication: null,
+        content: currentUnnamedContent.join('\n'),
+      });
+      currentUnnamedContent = [];
+    }
+  }
+
+  // Add any remaining unnamed content
+  if (currentUnnamedContent.length > 0) {
+    parts.push({
+      name: undefined,
+      repetition: false,
+      indication: null,
+      content: currentUnnamedContent.join('\n'),
+    });
+  }
+
+  return parts;
+}

package/package.json

@@ -1,28 +1,28 @@
-{
-  "name": "lyrics-structure",
-  "version": "1.2.2",
-  "description": "Parser for lyrics with structured sections, names, and indications",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "scripts": {
-    "build": "tsc",
-    "test": "jest",
-    "test:watch": "jest --watch",
-    "format": "prettier --write \"**/*.{ts,js,json,md}\""
-  },
-  "keywords": [
-    "lyrics",
-    "parser",
-    "slides",
-    "sections"
-  ],
-  "author": "",
-  "license": "MIT",
-  "devDependencies": {
-    "@types/jest": "^29.0.0",
-    "jest": "^29.0.0",
-    "prettier": "^3.5.3",
-    "ts-jest": "^29.0.0",
-    "typescript": "^5.0.0"
-  }
-}
+{
+  "name": "lyrics-structure",
+  "version": "1.2.3",
+  "description": "Parser for lyrics with structured sections, names, and indications",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "scripts": {
+    "build": "tsc",
+    "test": "jest",
+    "test:watch": "jest --watch",
+    "format": "prettier --write \"**/*.{ts,js,json,md}\""
+  },
+  "keywords": [
+    "lyrics",
+    "parser",
+    "slides",
+    "sections"
+  ],
+  "author": "",
+  "license": "MIT",
+  "devDependencies": {
+    "@types/jest": "^29.0.0",
+    "jest": "^29.0.0",
+    "prettier": "^3.5.3",
+    "ts-jest": "^29.0.0",
+    "typescript": "^5.0.0"
+  }
+}

package/slide.test.ts

@@ -1,67 +1,67 @@
-import { getSlideParts } from './slide.js';
-
-describe('Comprehensive Tests', () => {
-    test('handles all cases in one comprehensive input', () => {
-        const comprehensiveInput = `
-[verse]
-First line of verse
-Second line of verse
-Third line of verse
-Fourth line of verse
-Fifth line of verse
-[/verse]
-[verse]
-(inside parentheses)
-Regular text line 1
-Regular text line 2
-
-[chorus]
-First chorus line
-Second chorus line
-[/chorus]
-
-[verse 1]
-This is a very long line that should be considered too long for the slide
-This is another very long line that should also be considered too long
-Short line 1
-Short line 2
-[/verse 1]
-
-Regular line 1
-Regular line 2
-
-More content
-
-This is a very long line that exceeds forty characters for testing purposes
-This is another very long line that also exceeds the forty character limit
-Another very long line that should be considered too long for the slide
-And yet another very long line that should be split into a new section
-Regular line
-
-[verse 2]
-    First line with spaces    
-  Second line with spaces  
-[/verse 2]
-
-[chorus]`;
-
-        expect(getSlideParts(comprehensiveInput)).toEqual([
-            'First line of verse\nSecond line of verse\nThird line of verse\nFourth line of verse',
-            'Fifth line of verse',
-            'First line of verse\nSecond line of verse\nThird line of verse\nFourth line of verse',
-            'Fifth line of verse',
-            'Regular text line 1\nRegular text line 2',
-            'First chorus line\nSecond chorus line',
-            'This is a very long line that should be considered too long for the slide\nThis is another very long line that should also be considered too long',
-            'Short line 1\nShort line 2',
-            'Regular line 1\nRegular line 2',
-            'More content',
-            'This is a very long line that exceeds forty characters for testing purposes\nThis is another very long line that also exceeds the forty character limit',
-            'Another very long line that should be considered too long for the slide\nAnd yet another very long line that should be split into a new section',
-            'Regular line',
-            'First line with spaces\nSecond line with spaces',
-            'First chorus line\nSecond chorus line'
-        ]);
-    });
-
+import { getSlideParts } from './slide.js';
+
+describe('Comprehensive Tests', () => {
+    test('handles all cases in one comprehensive input', () => {
+        const comprehensiveInput = `
+[verse]
+First line of verse
+Second line of verse
+Third line of verse
+Fourth line of verse
+Fifth line of verse
+[/verse]
+[verse]
+(inside parentheses)
+Regular text line 1
+Regular text line 2
+
+[chorus]
+First chorus line
+Second chorus line
+[/chorus]
+
+[verse 1]
+This is a very long line that should be considered too long for the slide
+This is another very long line that should also be considered too long
+Short line 1
+Short line 2
+[/verse 1]
+
+Regular line 1
+Regular line 2
+
+More content
+
+This is a very long line that exceeds forty characters for testing purposes
+This is another very long line that also exceeds the forty character limit
+Another very long line that should be considered too long for the slide
+And yet another very long line that should be split into a new section
+Regular line
+
+[verse 2]
+    First line with spaces    
+  Second line with spaces  
+[/verse 2]
+
+[chorus]`;
+
+        expect(getSlideParts(comprehensiveInput)).toEqual([
+            'First line of verse\nSecond line of verse\nThird line of verse\nFourth line of verse',
+            'Fifth line of verse',
+            'First line of verse\nSecond line of verse\nThird line of verse\nFourth line of verse',
+            'Fifth line of verse',
+            'Regular text line 1\nRegular text line 2',
+            'First chorus line\nSecond chorus line',
+            'This is a very long line that should be considered too long for the slide\nThis is another very long line that should also be considered too long',
+            'Short line 1\nShort line 2',
+            'Regular line 1\nRegular line 2',
+            'More content',
+            'This is a very long line that exceeds forty characters for testing purposes\nThis is another very long line that also exceeds the forty character limit',
+            'Another very long line that should be considered too long for the slide\nAnd yet another very long line that should be split into a new section',
+            'Regular line',
+            'First line with spaces\nSecond line with spaces',
+            'First chorus line\nSecond chorus line'
+        ]);
+    });
+
 });