Skip to content

Commit a3169f3

Browse files
committed
rework typescript setup
1 parent 94e4103 commit a3169f3

19 files changed

+30
-20
lines changed

src/emit/blacklist.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ export default class BlacklistEmitter implements BlacklistRules, ClearableEmitte
8080
if ('fluid' in ingredient) return [ingredient.fluid]
8181
if ('block' in ingredient) return [ingredient.block]
8282

83-
throw new IllegalShapeError('illegal blacklist entry', test)
83+
throw new IllegalShapeError('illegal blacklist entry', input)
8484
}
8585

8686
async emit(acceptor: Acceptor) {
@@ -102,8 +102,10 @@ export default class BlacklistEmitter implements BlacklistRules, ClearableEmitte
102102
private async emitPolytone(acceptor: Acceptor, hiddenIds: NormalizedId[]) {
103103
const tabs = this.lookup().keys('minecraft:creative_mode_tab')
104104

105+
if (!tabs) throw new Error('Cannot use polytone output without creative mod tab registry')
106+
105107
const content = toJson({
106-
targets: tabs,
108+
targets: [...tabs.values()],
107109
removals: [
108110
{
109111
type: 'items_match',

test/advancedTags.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { describe, expect, it } from 'vitest'
12
import createTestAcceptor from './mock/TestAcceptor.js'
23
import setupLoader from './shared/loaderSetup.js'
34

test/content.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { describe, expect, it } from 'vitest'
12
import createTestAcceptor from './mock/TestAcceptor.js'
23
import setupLoader from './shared/loaderSetup.js'
34

test/id.test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
import { expect, it } from 'vitest'
12
import { createId, encodeId, Id, NormalizedId } from '../src/common/id.js'
2-
import Registry from '../src/common/registry.js'
33
import { resolveIDTest } from '../src/common/predicates.js'
4+
import Registry from '../src/common/registry.js'
45

56
it('parses id from string', () => {
67
expect(createId('minecraft:stone')).toMatchObject({ namespace: 'minecraft', path: 'stone' })

test/ingredient.test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
import createTestAcceptor from './mock/TestAcceptor.js'
1+
import { describe, expect, it } from 'vitest'
22
import { createIngredient } from '../src/common/ingredient.js'
33
import { createResult } from '../src/common/result.js'
44
import { tryCatching } from '../src/error.js'
5+
import createTestAcceptor from './mock/TestAcceptor.js'
56
import setupLoader from './shared/loaderSetup.js'
67

78
const { logger, loader } = setupLoader({ include: ['data/*/tags/**/*.json'] })

test/jeiBlacklist.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { describe, expect, it } from 'vitest'
12
import { Ingredient } from '../src/index.js'
23
import createTestAcceptor from './mock/TestAcceptor.js'
34
import { createDumpResolver } from './mock/TestResolver.js'

test/lang.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { describe, expect, it } from 'vitest'
12
import createTestAcceptor from './mock/TestAcceptor.js'
23
import setupLoader from './shared/loaderSetup.js'
34

test/logger.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import chalk from 'chalk'
2+
import { afterAll, describe, expect, it, vi } from 'vitest'
23
import { createLogger } from '../src/index.js'
34

45
/* eslint-disable no-console */

test/loot.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { afterEach, describe, expect, it } from 'vitest'
12
import { EMPTY_LOOT_TABLE } from '../src/emit/data/loot.js'
23
import { LootEntrySchema, LootTableSchema } from '../src/schema/data/loot.js'
34
import createTestAcceptor from './mock/TestAcceptor.js'

test/mock/TestLogger.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { Mock } from 'vitest'
1+
import { vi, type Mock } from 'vitest'
22
import { Logger, wrapLogMethods } from '../../src/logger.js'
33

44
export interface TestLogger extends Logger {

test/packFormat.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { describe, expect, it } from 'vitest'
12
import { EMPTY_LOOT_TABLE, EMPTY_RECIPE } from '../src/index.js'
23
import createTestAcceptor from './mock/TestAcceptor.js'
34
import setupLoader from './shared/loaderSetup.js'

test/polytoneBlacklist.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { describe, expect, it } from 'vitest'
12
import createTestAcceptor from './mock/TestAcceptor.js'
23
import setupLoader from './shared/loaderSetup.js'
34

test/recipe.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { describe, expect, it } from 'vitest'
12
import { EMPTY_RECIPE, RecipeTest } from '../src/emit/data/recipe.js'
23
import { NormalizedId } from '../src/index.js'
34
import { ShapedRecipeDefinition } from '../src/parser/recipe/vanilla/shaped.js'

test/registryDump.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { beforeEach, describe, expect, it } from 'vitest'
12
import { createIngredient, createResult } from '../src/index.js'
23
import { createDumpResolver } from './mock/TestResolver.js'
34
import setupLoader from './shared/loaderSetup.js'

test/setup.ts

Lines changed: 0 additions & 7 deletions
This file was deleted.

test/tags.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { describe, expect, it } from 'vitest'
12
import createTestAcceptor from './mock/TestAcceptor.js'
23
import setupLoader from './shared/loaderSetup.js'
34

test/tsconfig.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"extends": "../tsconfig.json"
3+
}

test/warnings.test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
import setupLoader from './shared/loaderSetup.js'
1+
import { describe, expect, it } from 'vitest'
22
import createTestAcceptor from './mock/TestAcceptor.js'
3+
import setupLoader from './shared/loaderSetup.js'
34

45
const { logger, loader } = setupLoader({ include: ['data/*/recipes/**/*.json'], from: 'test/resources/failing' })
56

tsconfig.json

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,18 @@
1616
"experimentalDecorators": true,
1717
"declaration": true,
1818
"declarationMap": true,
19+
"skipLibCheck": true,
1920
"typeRoots": [
2021
"node_modules/@types",
21-
"node_modules",
22-
"@types",
23-
],
24-
"types": [
25-
"vitest/globals"
26-
],
22+
"@types"
23+
]
2724
},
2825
"include": [
29-
"."
26+
"src",
3027
],
3128
"exclude": [
3229
"node_modules",
3330
"dist",
31+
"test"
3432
]
3533
}

0 commit comments

Comments
 (0)