Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace TSC bundler by nodenext module resolution #32

Open
wants to merge 25 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3,760 changes: 757 additions & 3,003 deletions package-lock.json

Large diffs are not rendered by default.

19 changes: 8 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
{
"name": "@aresrpg/aresrpg-world",
"version": "1.7.3",
"version": "1.8.12",
"description": "Procedural voxel terrain generation for AresRPG",
"type": "module",
"source": "src/index.ts",
"main": "dist/index.js",
"types": "dist/types.d.ts",
"scripts": {
"watch": "tsc --watch",
"build": "parcel build",
"clean": "rm -rf .parcel-cache && rm -rf dist/",
"build": "tsc",
"lint": "eslint . --ext .ts && prettier . --check && npm run typecheck",
"typecheck": "tsc --build",
"format": "prettier . --write && eslint . --fix --ext .ts",
Expand All @@ -36,20 +34,19 @@
"devDependencies": {
"@parcel/packager-ts": "^2.13.3",
"@parcel/transformer-typescript-types": "^2.13.3",
"@types/node": "^22.10.7",
"@types/node": "^22.13.1",
"@types/poisson-disk-sampling": "^2.2.4",
"@types/three": "^0.172.0",
"@types/three": "^0.173.0",
"@types/ws": "^8.5.14",
"@typescript-eslint/eslint-plugin": "^8.20.0",
"@typescript-eslint/parser": "^8.20.0",
"@typescript-eslint/eslint-plugin": "^8.24.0",
"@typescript-eslint/parser": "^8.24.0",
"eslint": "^8.57.1",
"eslint-config-prettier": "10.0.1",
"eslint-config-standard": "17.1.0",
"eslint-plugin-import": "2.31.0",
"husky": "^4.3.8",
"lint-staged": "15.4.1",
"parcel": "^2.13.3",
"prettier": "3.4.2",
"lint-staged": "15.4.3",
"prettier": "3.5.0",
"typescript": "^5.7.3"
},
"husky": {
Expand Down
12 changes: 6 additions & 6 deletions src/config/WorldEnv.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { Vector2, Vector3 } from 'three'

import { ItemType } from '../factory/ItemsFactory'
import { DensityVolume, Heightmap } from '../index'
import { Biome, BlockType } from '../procgen/Biome'
import { ProcItemConf } from '../tools/ProceduralGenerators'
import { SchematicsBlocksMapping } from '../tools/SchematicLoader'
import { BiomesRawConf, BlockMode } from '../utils/common_types'
import { ItemType } from '../factory/ItemsFactory.js'
import { DensityVolume, Heightmap } from '../index.js'
import { Biome, BlockType } from '../procgen/Biome.js'
import { ProcItemConf } from '../tools/ProceduralGenerators.js'
import { SchematicsBlocksMapping } from '../tools/SchematicLoader.js'
import { BiomesRawConf, BlockMode } from '../utils/common_types.js'

export type WorldIndividualSeeds = {
heightmap?: string // 'heatmap',
Expand Down
4 changes: 2 additions & 2 deletions src/config/demo-samples/configs/biome_landscapes.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { BiomeType, BlockType } from '../../../index'
import { BiomeType, BlockType } from '../../../index.js'

import { SCHEMATICS_COLLECTIONS } from './schematics_collections'
import { SCHEMATICS_COLLECTIONS } from './schematics_collections.js'

const { alpine, temperate_forest, siberian } = SCHEMATICS_COLLECTIONS

Expand Down
4 changes: 2 additions & 2 deletions src/config/demo-samples/configs/blocks_mappings.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { BlockType } from '../../../index'
import { typesNumbering } from '../../../utils/misc_utils'
import { BlockType } from '../../../index.js'
import { typesNumbering } from '../../../utils/misc_utils.js'

/**
* Extending world reserved blocks
Expand Down
2 changes: 1 addition & 1 deletion src/config/demo-samples/configs/procedural_items.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ProcItemCategory, ProcItemType } from '../../../index'
import { ProcItemCategory, ProcItemType } from '../../../index.js'

export const proc_items = {
AppleTree_S: 'appletree_s',
Expand Down
10 changes: 5 additions & 5 deletions src/config/demo-samples/world_demo_setup.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
// import { SCHEMATICS_FILES_INDEX } from '../assets/schematics/index'
import { WorldEnv } from '../../index'
import { WorldEnv } from '../../index.js'
// import { initWorldDevTools } from '../../tools/DevTools'
import { WorldIndividualSeeds } from '../WorldEnv'
import { WorldIndividualSeeds } from '../WorldEnv.js'

import { BIOMES_LANDSCAPES_CONFIG } from './configs/biome_landscapes'
import { PROC_ITEMS_CONFIG } from './configs/procedural_items'
import { BIOMES_LANDSCAPES_CONFIG } from './configs/biome_landscapes.js'
import { PROC_ITEMS_CONFIG } from './configs/procedural_items.js'
import {
BLOCKS_COLOR_MAPPING,
SCHEMATICS_BLOCKS_MAPPING,
} from './configs/blocks_mappings'
} from './configs/blocks_mappings.js'

const restoreOriginalSeeds = (individualSeeds: WorldIndividualSeeds) => {
individualSeeds.heightmap = 'heightmap'
Expand Down
10 changes: 5 additions & 5 deletions src/datacontainers/ChunkContainer.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
import { Vector2, Box3, Vector3 } from 'three'

import { BlockMode, ChunkId, ChunkKey } from '../utils/common_types'
import { BlockMode, ChunkId, ChunkKey } from '../utils/common_types.js'
import {
asVect3,
asChunkBounds,
parseChunkKey,
serializeChunkId,
parseThreeStub,
asVect2,
} from '../utils/patch_chunk'
import { WorldEnv } from '../config/WorldEnv'
import { BlockType } from '../index'
import { concatData, deconcatData } from '../utils/chunk_utils'
} from '../utils/patch_chunk.js'
import { WorldEnv } from '../config/WorldEnv.js'
import { BlockType } from '../index.js'
import { concatData, deconcatData } from '../utils/chunk_utils.js'

enum ChunkAxisOrder {
ZXY,
Expand Down
6 changes: 3 additions & 3 deletions src/datacontainers/PatchBase.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { Vector2, Box2, Vector3 } from 'three'

import { PatchKey } from '../utils/common_types'
import { PatchKey } from '../utils/common_types.js'
import {
parsePatchKey,
asPatchBounds,
asVect2,
parseThreeStub,
} from '../utils/patch_chunk'
import { WorldEnv } from '../index'
} from '../utils/patch_chunk.js'
import { WorldEnv } from '../index.js'

// export class PatchChunkCommon<T> {

Expand Down
14 changes: 7 additions & 7 deletions src/factory/ChunksFactory.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
// import { MathUtils, Vector3 } from 'three'
import { Vector3 } from 'three'

import { WorldEnv } from '../config/WorldEnv'
import { asVect2, serializePatchId, asBox2 } from '../utils/patch_chunk'
import { BlockMode, ChunkKey, PatchBlock } from '../utils/common_types'
import { WorldEnv } from '../config/WorldEnv.js'
import { asVect2, serializePatchId, asBox2 } from '../utils/patch_chunk.js'
import { BlockMode, ChunkKey, PatchBlock } from '../utils/common_types.js'
import {
ChunkBuffer,
ChunkContainer,
ChunkMask,
} from '../datacontainers/ChunkContainer'
import { BlockType, Biome, BiomeType, DensityVolume } from '../index'
import { GroundPatch, parseGroundFlags } from '../processing/GroundPatch'
import { clamp } from '../utils/math_utils'
} from '../datacontainers/ChunkContainer.js'
import { BlockType, Biome, BiomeType, DensityVolume } from '../index.js'
import { GroundPatch, parseGroundFlags } from '../processing/GroundPatch.js'
import { clamp } from '../utils/math_utils.js'

export class EmptyChunk extends ChunkContainer {
constructor(chunkKey: ChunkKey) {
Expand Down
8 changes: 4 additions & 4 deletions src/factory/ItemsFactory.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Box3, Vector3 } from 'three'

import { ChunkContainer } from '../datacontainers/ChunkContainer'
import { ProceduralItemGenerator } from '../tools/ProceduralGenerators'
import { SchematicLoader } from '../tools/SchematicLoader'
import { WorldEnv } from '../config/WorldEnv'
import { ChunkContainer } from '../datacontainers/ChunkContainer.js'
import { ProceduralItemGenerator } from '../tools/ProceduralGenerators.js'
import { SchematicLoader } from '../tools/SchematicLoader.js'
import { WorldEnv } from '../config/WorldEnv.js'

export type ItemType = string
export type SpawnedItems = Record<ItemType, Vector3[]>
Expand Down
44 changes: 22 additions & 22 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,47 +6,47 @@ export {
asVect3,
parseChunkKey,
parseThreeStub,
} from './utils/patch_chunk'
export { BlockMode } from './utils/common_types'
} from './utils/patch_chunk.js'
export { BlockMode } from './utils/common_types.js'
// Processing
export { ProcessingTask } from './processing/TaskProcessing'
export { ProcessingTask } from './processing/TaskProcessing.js'
export {
BlocksProcessing,
BlocksProcessingRecipe,
} from './processing/BlocksProcessing'
export { BoardProvider, BlockCategory } from './processing/BoardProvider'
export { ChunksScheduler } from './processing/ChunksScheduling'
} from './processing/BlocksProcessing.js'
export { BoardProvider, BlockCategory } from './processing/BoardProvider.js'
export { ChunksScheduler } from './processing/ChunksScheduling.js'
export {
PseudoDistributionMap,
DistributionProfile,
} from './processing/RandomDistributionMap'
export { ProcessingState } from './processing/TaskProcessing'
export { WorkerPool } from './processing/WorkerPool'
export { taskWorkerSetup } from './processing/TaskWorker'
export { chunksStreamClientWorkerSetup } from './remote-clients/ChunksStreamClientWorker'
} from './processing/RandomDistributionMap.js'
export { ProcessingState } from './processing/TaskProcessing.js'
export { WorkerPool } from './processing/WorkerPool.js'
export { taskWorkerSetup } from './processing/TaskWorker.js'
export { chunksStreamClientWorkerSetup } from './remote-clients/ChunksStreamClientWorker.js'
// Procgen
export { Biome, BiomeType, BlockType } from './procgen/Biome'
export { Heightmap } from './procgen/Heightmap'
export { DensityVolume } from './procgen/DensityVolume'
export { Biome, BiomeType, BlockType } from './procgen/Biome.js'
export { Heightmap } from './procgen/Heightmap.js'
export { DensityVolume } from './procgen/DensityVolume.js'
// Data structures
// export { GroundContainer, GroundCache } from './datacontainers/PatchesIndexer'
export { ChunkContainer } from './datacontainers/ChunkContainer'
export { ChunkContainer } from './datacontainers/ChunkContainer.js'
// Factory
export { ItemsInventory } from './factory/ItemsFactory'
export { GroundChunk, EmptyChunk, CavesMask } from './factory/ChunksFactory'
export { ItemsInventory } from './factory/ItemsFactory.js'
export { GroundChunk, EmptyChunk, CavesMask } from './factory/ChunksFactory.js'
// Tools
export { SchematicLoader } from './tools/SchematicLoader'
export { SchematicLoader } from './tools/SchematicLoader.js'
export {
ProceduralItemGenerator,
ProcItemType,
ProcItemCategory,
} from './tools/ProceduralGenerators'
export { ChunksStreamClientProxy } from './remote-clients/ChunksStreamClientProxy'
} from './tools/ProceduralGenerators.js'
export { ChunksStreamClientProxy } from './remote-clients/ChunksStreamClientProxy.js'
// export * as ProceduralGenerators from './tools/ProceduralGenerators'
// Config
export { WorldEnv } from './config/WorldEnv'
export { WorldEnv } from './config/WorldEnv.js'
// export * as WorldDevSetup from './config/demo-samples/configs/world_dev_setup'
export {
EnvOverride,
BlocksColorOverride,
} from './config/demo-samples/world_demo_setup'
} from './config/demo-samples/world_demo_setup.js'
12 changes: 6 additions & 6 deletions src/processing/BlocksProcessing.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,24 @@ import {
ProcessingTask,
DensityVolume,
BlockType,
} from '../index'
} from '../index.js'
import {
serializePatchId,
getPatchId,
asVect3,
asVect2,
// parseThreeStub,
} from '../utils/patch_chunk'
import { PatchKey, Block, BlockData } from '../utils/common_types'
} from '../utils/patch_chunk.js'
import { PatchKey, Block, BlockData } from '../utils/common_types.js'

import { GroundBlockData, GroundPatch } from './GroundPatch'
import { ItemsProcessing } from './ItemsProcessing'
import { GroundBlockData, GroundPatch } from './GroundPatch.js'
import { ItemsProcessing } from './ItemsProcessing.js'
import {
parseTaskInputStubs,
ProcessingContext,
ProcessingTaskHandler,
ProcessingTaskStub,
} from './TaskProcessing'
} from './TaskProcessing.js'

/**
* Calling side
Expand Down
16 changes: 8 additions & 8 deletions src/processing/BoardProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@ import {
getUpperScalarId,
parsePatchKey,
serializePatchId,
} from '../utils/patch_chunk'
import { WorldEnv, ChunkContainer, BlockType, WorkerPool } from '../index'
import { BlockMode, ChunkId, PatchId, PatchKey } from '../utils/common_types'
} from '../utils/patch_chunk.js'
import { WorldEnv, ChunkContainer, BlockType, WorkerPool } from '../index.js'
import { BlockMode, ChunkId, PatchId, PatchKey } from '../utils/common_types.js'
import {
DataContainer,
PatchBase,
PatchElement,
} from '../datacontainers/PatchBase'
import { copySourceToTargetPatch } from '../utils/data_operations'
import { ChunkStub } from '../datacontainers/ChunkContainer'
} from '../datacontainers/PatchBase.js'
import { copySourceToTargetPatch } from '../utils/data_operations.js'
import { ChunkStub } from '../datacontainers/ChunkContainer.js'

import { ChunksProcessing } from './ChunksProcessing'
import { ItemsProcessing } from './ItemsProcessing'
import { ChunksProcessing } from './ChunksProcessing.js'
import { ItemsProcessing } from './ItemsProcessing.js'

export enum BlockCategory {
EMPTY = 0,
Expand Down
16 changes: 8 additions & 8 deletions src/processing/ChunksProcessing.ts
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
import { WorldEnv } from '../config/WorldEnv'
import { asVect3, serializeChunkId } from '../utils/patch_chunk'
import { PatchId, PatchKey } from '../utils/common_types'
import { WorldEnv } from '../config/WorldEnv.js'
import { asVect3, serializeChunkId } from '../utils/patch_chunk.js'
import { PatchId, PatchKey } from '../utils/common_types.js'
import {
ChunkContainer,
ChunkStub,
defaultDataEncoder,
} from '../datacontainers/ChunkContainer'
import { CavesMask, EmptyChunk, GroundChunk } from '../factory/ChunksFactory'
} from '../datacontainers/ChunkContainer.js'
import { CavesMask, EmptyChunk, GroundChunk } from '../factory/ChunksFactory.js'

import { GroundPatch } from './GroundPatch'
import { GroundPatch } from './GroundPatch.js'
import {
GenericTask,
ProcessingTask,
ProcessingTaskHandler,
ProcessingTaskStub,
} from './TaskProcessing'
import { ItemsProcessing } from './ItemsProcessing'
} from './TaskProcessing.js'
import { ItemsProcessing } from './ItemsProcessing.js'

/**
* Calling side
Expand Down
8 changes: 4 additions & 4 deletions src/processing/ChunksScheduling.ts
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
import { Vector2 } from 'three'

import { WorkerPool, WorldEnv } from '../index'
import { WorkerPool, WorldEnv } from '../index.js'
import {
asVect3,
genPatchMapIndex,
getPatchMapRange,
parsePatchKey,
} from '../utils/patch_chunk'
import { ChunkId, PatchId, PatchKey } from '../utils/common_types'
} from '../utils/patch_chunk.js'
import { ChunkId, PatchId, PatchKey } from '../utils/common_types.js'

import {
ChunksProcessing,
ChunksProcessingTask,
isChunksProcessingTask,
} from './ChunksProcessing'
} from './ChunksProcessing.js'

const chunksRange = WorldEnv.current.chunks.range
const getTaskPatchId = (task: ChunksProcessingTask) =>
Expand Down
Loading
Loading