Skip to content
This repository was archived by the owner on Jul 17, 2024. It is now read-only.

Commit 64e3ff8

Browse files
committed
Fix broken exporter setting types
1 parent 7060a6e commit 64e3ff8

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

types/animatedJavaExporter.d.ts

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,34 +3,35 @@ import type { IAnimatedJavaSettings, Setting } from './settings'
33
declare global {
44
namespace AnimatedJava {
55
type NamespacedString = `${string}${string}:${string}${string}`
6-
export interface IAnimatedJavaExportData<S> {
6+
export interface IAnimatedJavaExportData<ExporterSettings> {
77
ajSettings: IAnimatedJavaSettings
88
projectSettings: AnimatedJava.IProjectSettings
9-
exporterSettings: S
9+
exporterSettings: ExporterSettings
1010
renderedAnimations: AnimatedJava.IRenderedAnimation[]
1111
rig: AnimatedJava.IRenderedRig
1212
}
1313
}
1414
}
1515

16-
export interface IAnimatedJavaExporterOptions<S extends AnimatedJava.IProjectSettings> {
16+
type ExporterSettingsObj = Record<string, Setting<any>>
17+
export interface IAnimatedJavaExporterOptions<ExporterSettings extends ExporterSettingsObj> {
1718
id: AnimatedJava.NamespacedString
1819
name: string
1920
description: string
20-
getSettings(): S
21+
getSettings(): ExporterSettings
2122
settingsStructure: AnimatedJava.GUIStructure
2223
onStartup?: () => void
23-
export(exportData: AnimatedJava.IAnimatedJavaExportData<S>): Promise<void> | void
24+
export(exportData: AnimatedJava.IAnimatedJavaExportData<ExporterSettings>): Promise<void> | void
2425
}
2526

26-
export class AnimatedJavaExporter<S extends AnimatedJava.IProjectSettings> {
27+
export class AnimatedJavaExporter<ExporterSettings extends ExporterSettingsObj> {
2728
static all: AnimatedJavaExporter<any>[]
28-
constructor(options: IAnimatedJavaExporterOptions<S>)
29+
constructor(options: IAnimatedJavaExporterOptions<ExporterSettings>)
2930
id: AnimatedJava.NamespacedString
3031
name: string
3132
description: string
32-
getSettings: IAnimatedJavaExporterOptions<S>['getSettings']
33+
getSettings: IAnimatedJavaExporterOptions<ExporterSettings>['getSettings']
3334
settingsStructure: AnimatedJava.GUIStructure
34-
onStartup?: IAnimatedJavaExporterOptions<S>['onStartup']
35-
export: IAnimatedJavaExporterOptions<S>['export']
35+
onStartup?: IAnimatedJavaExporterOptions<ExporterSettings>['onStartup']
36+
export: IAnimatedJavaExporterOptions<ExporterSettings>['export']
3637
}

types/index.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import type { ExpectedError, formatStr, LimitClock, roundTo, roundToN } from './
1111
import type { ProgressBarController } from './util/progressBarController'
1212
import type { VariantsContainer } from './variants'
1313
import type * as VFS from './virtualFileSystem'
14+
import './projectSettings'
1415

1516
declare global {
1617
namespace AnimatedJava {

0 commit comments

Comments
 (0)