Skip to content

Commit

Permalink
Remove LoDash dependency (#1467)
Browse files Browse the repository at this point in the history
  • Loading branch information
ChrisMBarr authored Dec 9, 2024
1 parent f882bb0 commit 4b1d6aa
Show file tree
Hide file tree
Showing 7 changed files with 381 additions and 493 deletions.
4 changes: 0 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
"@parcel/transformer-typescript-types": "^2.13.2",
"@types/eslint__js": "^8.42.3",
"@types/jest": "^27.4.1",
"@types/lodash.get": "^4.4.7",
"@types/node": "^22.0.0",
"concat-md": "^0.5.1",
"detect-newline": "^4.0.1",
Expand Down Expand Up @@ -74,8 +73,5 @@
"test": "yarn unibuild lint && yarn unibuild test",
"unibuild": "tsx ./unibuild.ts"
},
"dependencies": {
"lodash.get": "^4.4.2"
},
"packageManager": "[email protected]"
}
2 changes: 1 addition & 1 deletion src/formatter/chord_pro_formatter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class ChordProFormatter extends Formatter {

formatOrEvaluateItem(item: Evaluatable, metadata: Metadata): string {
if (this.configuration.evaluate) {
return item.evaluate(metadata, this.configuration.get('metadata.separator'));
return item.evaluate(metadata, this.configuration.metadataSeparator);
}

if (item instanceof Ternary) {
Expand Down
2 changes: 1 addition & 1 deletion src/formatter/chords_over_words_formatter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ class ChordsOverWordsFormatter extends Formatter {
}

private formatEvaluatable(item: Ternary, metadata: Metadata) {
return item.evaluate(metadata, this.configuration.get('metadata.separator'));
return item.evaluate(metadata, this.configuration.metadataSeparator);
}

private formatChordLyricsPair(item: ChordLyricsPair, line: Line) {
Expand Down
10 changes: 4 additions & 6 deletions src/formatter/configuration/configuration.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import lodashGet from 'lodash.get';

import Key from '../../key';
import { ContentType } from '../../serialized_types';

Expand Down Expand Up @@ -53,6 +51,10 @@ class Configuration {

delegates: Partial<Record<ContentType, Delegate>>;

get metadataSeparator(): string {
return this.metadata.separator ?? '';
}

constructor(configuration: Partial<ConfigurationProperties> = defaultConfiguration) {
const mergedConfig: ConfigurationProperties = { ...defaultConfiguration, ...configuration };
this.evaluate = mergedConfig.evaluate;
Expand All @@ -64,10 +66,6 @@ class Configuration {
this.delegates = { ...defaultConfiguration.delegates, ...configuration.delegates };
this.configuration = { configuration, delegates: this.delegates };
}

get(key: string): string {
return lodashGet(this, key);
}
}

export default Configuration;
2 changes: 1 addition & 1 deletion src/formatter/text_formatter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ class TextFormatter extends Formatter {
}

if ('evaluate' in item) {
return item.evaluate(metadata, this.configuration.get('metadata.separator'));
return item.evaluate(metadata, this.configuration.metadataSeparator);
}

return '';
Expand Down
2 changes: 1 addition & 1 deletion src/template_helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ export function paragraphClasses(paragraph: Paragraph): string {
}

export function evaluate(item: Evaluatable, metadata: Metadata, configuration: Configuration): string {
return item.evaluate(metadata, configuration.get('metadata.separator'));
return item.evaluate(metadata, configuration.metadataSeparator);
}

export function fontStyleTag(font: Font): string {
Expand Down
Loading

0 comments on commit 4b1d6aa

Please sign in to comment.