Skip to content

Commit dda2b7f

Browse files
committed
refactor: Avoid barrel imports within project
1 parent 9567c0b commit dda2b7f

File tree

203 files changed

+660
-650
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

203 files changed

+660
-650
lines changed

.vscode/settings.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"**/node_modules/.vite-temp/**"
77
]
88
},
9+
"typescript.preferences.importModuleSpecifier": "non-relative",
910
"[typescript]": {
1011
"editor.defaultFormatter": "biomejs.biome"
1112
},

src.compiler/typescript/CloneEmitter.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ function generateClonePropertyStatements(
8080
.filter(t => t.tagName.text === 'clone_add')
8181
.map(t => t.comment ?? '')[0] as string;
8282

83-
importer(`${arrayItemType.typeAsString}Cloner`, `./${arrayItemType.typeAsString}Cloner`);
83+
importer(`${arrayItemType.typeAsString}Cloner`, `@src/generated/model/${arrayItemType.typeAsString}Cloner`);
8484
const loopItems = [
8585
...assign(ts.factory.createArrayLiteralExpression(undefined)),
8686

@@ -206,7 +206,7 @@ function generateClonePropertyStatements(
206206
}
207207
} else {
208208
if (propertyType.isCloneable) {
209-
importer(`${propertyType.typeAsString}Cloner`, `./${propertyType.typeAsString}Cloner`);
209+
importer(`${propertyType.typeAsString}Cloner`, `@src/generated/model/${propertyType.typeAsString}Cloner`);
210210

211211
// clone.prop = original.prop ? TypeNameCloner.clone(original.prop) : null
212212
// clone.prop = original.prop ? TypeNameCloner.clone(original.prop) : undefined

src.compiler/typescript/JsonDeclarationEmitter.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ function createJsonTypeNode(
6969
if (isOwnType) {
7070
const isGeneratedJsonDeclaration = typeInfo.jsDocTags?.some(t => t.tagName.text === 'json_declaration');
7171
if (isGeneratedJsonDeclaration) {
72-
importer(`${typeInfo.typeAsString}Json`, `./${typeInfo.typeAsString}Json`);
72+
importer(`${typeInfo.typeAsString}Json`, `@src/generated/${typeInfo.typeAsString}Json`);
7373
} else {
7474
importer(`${typeInfo.typeAsString}Json`, typeInfo.modulePath);
7575
}
@@ -205,7 +205,7 @@ const emit = createEmitter('json_declaration', (program, input) => {
205205
)
206206
);
207207

208-
allJsonTypes.set(`${input.name!.text}Json`, `./${input.name!.text}Json`);
208+
allJsonTypes.set(`${input.name!.text}Json`, `@src/generated/${input.name!.text}Json`);
209209
const sourceFile = ts.factory.createSourceFile(
210210
[...statements],
211211
ts.factory.createToken(ts.SyntaxKind.EndOfFileToken),
@@ -236,5 +236,5 @@ export default function emitWithIndex(program: ts.Program, _diagnostics: ts.Diag
236236
ts.NodeFlags.None
237237
);
238238

239-
generateFile(program, sourceFile, 'json.ts');
239+
generateFile(program, sourceFile, '_jsonbarrel.ts');
240240
}

src/AlphaTabApiBase.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,11 @@ import type { MidiEventType } from '@src/midi/MidiEvent';
9191
import type { MidiEventsPlayedEventArgs } from '@src/synth/MidiEventsPlayedEventArgs';
9292
import type { PlaybackRangeChangedEventArgs } from '@src/synth/PlaybackRangeChangedEventArgs';
9393
import { ActiveBeatsChangedEventArgs } from '@src/synth/ActiveBeatsChangedEventArgs';
94-
import type { BeatTickLookupItem } from './midi/BeatTickLookup';
95-
import type { ISynthOutputDevice } from './synth/ISynthOutput';
94+
import type { BeatTickLookupItem } from '@src/midi/BeatTickLookup';
95+
import type { ISynthOutputDevice } from '@src/synth/ISynthOutput';
9696

9797
// biome-ignore lint/correctness/noUnusedImports: https://github.com/biomejs/biome/issues/4677
98-
import type { CoreSettings } from './CoreSettings';
98+
import type { CoreSettings } from '@src/CoreSettings';
9999

100100
class SelectionInfo {
101101
public beat: Beat;

src/CoreSettings.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Environment } from '@src/Environment';
22
import { LogLevel } from '@src/LogLevel';
33
// biome-ignore lint/correctness/noUnusedImports: https://github.com/biomejs/biome/issues/4677
4-
import type { BoundsLookup } from './rendering';
4+
import type { BoundsLookup } from '@src/rendering/utils/BoundsLookup';
55

66
/**
77
* All main settings of alphaTab controlling rather general aspects of its behavior.

src/DisplaySettings.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { RenderingResources } from '@src/RenderingResources';
22
import { LayoutMode } from '@src/LayoutMode';
33
import { StaveProfile } from '@src/StaveProfile';
44
// biome-ignore lint/correctness/noUnusedImports: https://github.com/biomejs/biome/issues/4677
5-
import type { Staff } from './model';
5+
import type { Staff } from '@src/model/Staff';
66

77
/**
88
* Lists the different modes in which the staves and systems are arranged.

src/Environment.ts

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -55,25 +55,25 @@ import { ResizeObserverPolyfill } from '@src/platform/javascript/ResizeObserverP
5555
import { WebPlatform } from '@src/platform/javascript/WebPlatform';
5656
import { IntersectionObserverPolyfill } from '@src/platform/javascript/IntersectionObserverPolyfill';
5757
import { AlphaSynthWebWorklet } from '@src/platform/javascript/AlphaSynthAudioWorkletOutput';
58-
import { SkiaCanvas } from './platform/skia/SkiaCanvas';
59-
import type { Font } from './model';
60-
import type { Settings } from './Settings';
61-
import { AlphaTabError, AlphaTabErrorType } from './AlphaTabError';
62-
import { SlashBarRendererFactory } from './rendering/SlashBarRendererFactory';
63-
import { NumberedBarRendererFactory } from './rendering/NumberedBarRendererFactory';
64-
import { FreeTimeEffectInfo } from './rendering/effects/FreeTimeEffectInfo';
65-
import { ScoreBarRenderer } from './rendering/ScoreBarRenderer';
66-
import { TabBarRenderer } from './rendering/TabBarRenderer';
67-
import { SustainPedalEffectInfo } from './rendering/effects/SustainPedalEffectInfo';
68-
import { GolpeEffectInfo } from './rendering/effects/GolpeEffectInfo';
69-
import { GolpeType } from './model/GolpeType';
70-
import { WahPedalEffectInfo } from './rendering/effects/WahPedalEffectInfo';
71-
import { BeatBarreEffectInfo } from './rendering/effects/BeatBarreEffectInfo';
72-
import { NoteOrnamentEffectInfo } from './rendering/effects/NoteOrnamentEffectInfo';
73-
import { RasgueadoEffectInfo } from './rendering/effects/RasgueadoEffectInfo';
74-
import { DirectionsEffectInfo } from './rendering/effects/DirectionsEffectInfo';
75-
import { BeatTimerEffectInfo } from './rendering/effects/BeatTimerEffectInfo';
76-
import { VersionInfo } from './generated/VersionInfo';
58+
import { SkiaCanvas } from '@src/platform/skia/SkiaCanvas';
59+
import type { Font } from '@src/model/Font';
60+
import type { Settings } from '@src/Settings';
61+
import { AlphaTabError, AlphaTabErrorType } from '@src/AlphaTabError';
62+
import { SlashBarRendererFactory } from '@src/rendering/SlashBarRendererFactory';
63+
import { NumberedBarRendererFactory } from '@src/rendering/NumberedBarRendererFactory';
64+
import { FreeTimeEffectInfo } from '@src/rendering/effects/FreeTimeEffectInfo';
65+
import { ScoreBarRenderer } from '@src/rendering/ScoreBarRenderer';
66+
import { TabBarRenderer } from '@src/rendering/TabBarRenderer';
67+
import { SustainPedalEffectInfo } from '@src/rendering/effects/SustainPedalEffectInfo';
68+
import { GolpeEffectInfo } from '@src/rendering/effects/GolpeEffectInfo';
69+
import { GolpeType } from '@src/model/GolpeType';
70+
import { WahPedalEffectInfo } from '@src/rendering/effects/WahPedalEffectInfo';
71+
import { BeatBarreEffectInfo } from '@src/rendering/effects/BeatBarreEffectInfo';
72+
import { NoteOrnamentEffectInfo } from '@src/rendering/effects/NoteOrnamentEffectInfo';
73+
import { RasgueadoEffectInfo } from '@src/rendering/effects/RasgueadoEffectInfo';
74+
import { DirectionsEffectInfo } from '@src/rendering/effects/DirectionsEffectInfo';
75+
import { BeatTimerEffectInfo } from '@src/rendering/effects/BeatTimerEffectInfo';
76+
import { VersionInfo } from '@src/generated/VersionInfo';
7777

7878
/**
7979
* A factory for custom layout engines.

src/FileLoadError.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { AlphaTabError, AlphaTabErrorType } from './AlphaTabError';
1+
import { AlphaTabError, AlphaTabErrorType } from '@src/AlphaTabError';
22

33
/**
44
* @target web

src/RenderingResources.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Color } from '@src/model/Color';
22
import { Font, FontStyle, FontWeight } from '@src/model/Font';
3-
import { ScoreSubElement } from './model';
3+
import { ScoreSubElement } from '@src/model/Score';
44

55
/**
66
* This public class contains central definitions for controlling the visual appearance.

src/Settings.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { ImporterSettings } from '@src/ImporterSettings';
44
import { FingeringMode, NotationMode, NotationSettings, NotationElement } from '@src/NotationSettings';
55
import { PlayerSettings } from '@src/PlayerSettings';
66
import { SettingsSerializer } from '@src/generated/SettingsSerializer';
7-
import type { SettingsJson } from './generated/SettingsJson';
7+
import type { SettingsJson } from '@src/generated/SettingsJson';
88

99
/**
1010
* This public class contains instance specific settings for alphaTab

0 commit comments

Comments
 (0)