refactor(structure): reorganize source files into categorized directories

codehz · codehz · commit 8c30d95e5c1f · 2026-01-26T23:44:30.000+08:00
diff --git a/examples/advanced-scheduling/demo.ts b/examples/advanced-scheduling/demo.ts
@@ -1,7 +1,5 @@
 import { pipeline } from "@codehz/pipeline";
-import { component } from "../../src/entity";
-import type { Query } from "../../src/query";
-import { World } from "../../src/world";
+import { World, component, type Query } from "../../src";
 
 // 定义组件类型
 type Position = { x: number; y: number };
diff --git a/examples/simple/demo.ts b/examples/simple/demo.ts
@@ -1,7 +1,5 @@
 import { pipeline } from "@codehz/pipeline";
-import { component, relation } from "../../src/entity";
-import type { Query } from "../../src/query";
-import { World } from "../../src/world";
+import { component, relation, World, type Query } from "../../src";
 
 // 定义组件类型
 type Position = { x: number; y: number };
diff --git a/scripts/release.ts b/scripts/release.ts
@@ -40,9 +40,12 @@ pkg.version = version;
 
 // 运行构建
 console.log("🔨 Running build process...");
-const entries = ["/index", "/testing"];
+const entries = [
+  { name: "/index", path: "/index.ts" },
+  { name: "/testing", path: "/testing/index.ts" },
+];
 await build({
-  entry: entries.map((e) => `src${e}.ts`),
+  entry: Object.fromEntries(entries.map((e) => [e.name, `src${e.path}`])),
   outDir: "dist",
   dts: true,
   sourcemap: true,
@@ -52,10 +55,10 @@ await build({
 // 生成 exports
 const exports: Record<string, any> = Object.fromEntries(
   entries.map((e) => [
-    `.${e === "/index" ? "" : e}`,
+    `.${e.name === "/index" ? "" : e.name}`,
     {
-      types: `.${e}.d.mts`,
-      import: `.${e}.mjs`,
+      types: `.${e.name}.d.mts`,
+      import: `.${e.name}.mjs`,
     },
   ]),
 );
diff --git a/src/__tests__/archetype.test.ts b/src/__tests__/archetype.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from "bun:test";
-import { Archetype } from "../archetype";
-import { component, createEntityId, relation, type EntityId } from "../entity";
+import { Archetype } from "../core/archetype";
+import { component, createEntityId, relation, type EntityId } from "../core/entity";
 
 describe("Archetype", () => {
   type Position = { x: number; y: number };
diff --git a/src/__tests__/changeset.test.ts b/src/__tests__/changeset.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from "bun:test";
-import { ComponentChangeset } from "../changeset";
-import { component } from "../entity";
+import { ComponentChangeset } from "../commands/changeset";
+import { component } from "../core/entity";
 
 describe("ComponentChangeset", () => {
   const PositionId = component<{ x: number; y: number }>();
diff --git a/src/__tests__/command-buffer.test.ts b/src/__tests__/command-buffer.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from "bun:test";
-import { CommandBuffer, type Command } from "../command-buffer";
-import type { EntityId } from "../entity";
+import { CommandBuffer, type Command } from "../commands/command-buffer";
+import type { EntityId } from "../core/entity";
 
 describe("CommandBuffer", () => {
   it("should buffer commands and execute them", () => {
diff --git a/src/__tests__/dont-fragment-query-notification.test.ts b/src/__tests__/dont-fragment-query-notification.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from "bun:test";
-import { component, relation } from "../entity";
-import { World } from "../world";
+import { component, relation } from "../core/entity";
+import { World } from "../core/world";
 
 describe("DontFragment Query Notification Issue", () => {
   it("should notify queries when new archetypes with dontFragment relations are created", () => {
diff --git a/src/__tests__/dont-fragment.test.ts b/src/__tests__/dont-fragment.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from "bun:test";
-import { component, relation, type EntityId } from "../entity";
-import { World } from "../world";
+import { component, relation, type EntityId } from "../core/entity";
+import { World } from "../core/world";
 
 describe("DontFragment Relations", () => {
   it("should prevent archetype fragmentation for dontFragment relations", () => {
diff --git a/src/__tests__/entity.test.ts b/src/__tests__/entity.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from "bun:test";
-import type { ComponentId, EntityId } from "../entity";
+import type { ComponentId, EntityId } from "../core/entity";
 import {
   component,
   COMPONENT_ID_MAX,
@@ -24,7 +24,7 @@ import {
   isRelationId,
   isWildcardRelationId,
   relation,
-} from "../entity";
+} from "../core/entity";
 
 describe("Entity ID System", () => {
   describe("Component IDs", () => {
diff --git a/src/__tests__/get-optional.test.ts b/src/__tests__/get-optional.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from "bun:test";
-import { component, relation } from "../entity";
-import { World } from "../world";
+import { component, relation } from "../core/entity";
+import { World } from "../core/world";
 
 describe("World.getOptional", () => {
   it("should return { value: T } when component exists", () => {
diff --git a/src/__tests__/multi-map.test.ts b/src/__tests__/multi-map.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, test } from "bun:test";
-import { MultiMap } from "../multi-map";
+import { MultiMap } from "../utils/multi-map";
 
 describe("MultiMap", () => {
   test("add and get values", () => {
diff --git a/src/__tests__/query-filter.test.ts b/src/__tests__/query-filter.test.ts
@@ -1,8 +1,8 @@
 import { describe, expect, it } from "bun:test";
-import { Archetype } from "../archetype";
-import type { ComponentId, EntityId } from "../entity";
-import { relation } from "../entity";
-import { matchesComponentTypes, matchesFilter, type QueryFilter } from "../query-filter";
+import { Archetype } from "../core/archetype";
+import type { ComponentId, EntityId } from "../core/entity";
+import { relation } from "../core/entity";
+import { matchesComponentTypes, matchesFilter, type QueryFilter } from "../query/filter";
 
 // Mock component IDs for testing
 const positionComponent = 1 as ComponentId<{ x: number; y: number }>;
diff --git a/src/__tests__/query.test.ts b/src/__tests__/query.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from "bun:test";
-import { component, relation, type EntityId } from "../entity";
-import { World } from "../world";
+import { component, relation, type EntityId } from "../core/entity";
+import { World } from "../core/world";
 
 describe("Query", () => {
   describe("Query Creation and Basic Functionality", () => {
diff --git a/src/__tests__/testing.test.ts b/src/__tests__/testing.test.ts
@@ -1,7 +1,14 @@
 import { describe, expect, it } from "bun:test";
-import { component, relation } from "../entity";
-import { AssertionError, Assertions, EntityBuilder, Snapshot, WorldFixture, type WorldSnapshot } from "../testing";
-import { World } from "../world";
+import { component, relation } from "../core/entity";
+import { World } from "../core/world";
+import {
+  AssertionError,
+  Assertions,
+  EntityBuilder,
+  Snapshot,
+  WorldFixture,
+  type WorldSnapshot,
+} from "../testing/index";
 
 // Test components
 type Position = { x: number; y: number };
diff --git a/src/__tests__/world.perf.test.ts b/src/__tests__/world.perf.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from "bun:test";
-import { component } from "../entity";
-import { World } from "../world";
+import { component } from "../core/entity";
+import { World } from "../core/world";
 
 describe("World Performance", () => {
   it("should handle archetype creation efficiently", () => {
diff --git a/src/__tests__/world.serialize.test.ts b/src/__tests__/world.serialize.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from "bun:test";
-import { component, relation, type EntityId } from "../entity";
-import { World } from "../world";
+import { component, relation, type EntityId } from "../core/entity";
+import { World } from "../core/world";
 
 describe("World serialization", () => {
   it("should serialize and deserialize a world with components and relations", () => {
diff --git a/src/__tests__/world.test.ts b/src/__tests__/world.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from "bun:test";
-import { component, createEntityId, relation, type EntityId } from "../entity";
-import { World } from "../world";
+import { component, createEntityId, relation, type EntityId } from "../core/entity";
+import { World } from "../core/world";
 
 describe("World", () => {
   describe("Entity Management", () => {
diff --git a/src/commands/changeset.ts b/src/commands/changeset.ts
@@ -1,4 +1,4 @@
-import type { EntityId } from "./entity";
+import type { EntityId } from "../core/entity";
 
 /**
  * @internal Represents a set of component changes to be applied to an entity
diff --git a/src/commands/command-buffer.ts b/src/commands/command-buffer.ts
@@ -1,4 +1,4 @@
-import type { EntityId } from "./entity";
+import type { EntityId } from "../core/entity";
 
 /**
  * Command for deferred execution
diff --git a/src/core/archetype.ts b/src/core/archetype.ts
@@ -1,3 +1,4 @@
+import { getOrComputeCache } from "../utils/utils";
 import type { EntityId, WildcardRelationId } from "./entity";
 import {
   getComponentIdFromRelationId,
@@ -8,7 +9,6 @@ import {
   isWildcardRelationId,
 } from "./entity";
 import { isOptionalEntityId, type ComponentTuple, type ComponentType } from "./types";
-import { getOrComputeCache } from "./utils";
 
 /**
  * Special value to represent missing component data
diff --git a/src/core/entity.ts b/src/core/entity.ts
@@ -1,4 +1,4 @@
-import { BitSet } from "./bit-set";
+import { BitSet } from "../utils/bit-set";
 
 /**
  * Unique symbol brand for associating component type information with EntityId
diff --git a/src/core/types.ts b/src/core/types.ts
diff --git a/src/core/world.ts b/src/core/world.ts
@@ -1,6 +1,10 @@
+import { ComponentChangeset } from "../commands/changeset";
+import { CommandBuffer, type Command } from "../commands/command-buffer";
+import { serializeQueryFilter, type QueryFilter } from "../query/filter";
+import { Query } from "../query/query";
+import { MultiMap } from "../utils/multi-map";
+import { getOrCreateWithSideEffect } from "../utils/utils";
 import { Archetype, MISSING_COMPONENT } from "./archetype";
-import { ComponentChangeset } from "./changeset";
-import { CommandBuffer, type Command } from "./command-buffer";
 import type { ComponentId, EntityId, WildcardRelationId } from "./entity";
 import {
   EntityIdManager,
@@ -18,12 +22,8 @@ import {
   isWildcardRelationId,
   relation,
 } from "./entity";
-import { MultiMap } from "./multi-map";
-import { Query } from "./query";
-import { serializeQueryFilter, type QueryFilter } from "./query-filter";
 import type { ComponentTuple, ComponentType, LifecycleHook, MultiLifecycleHook } from "./types";
 import { isOptionalEntityId } from "./types";
-import { getOrCreateWithSideEffect } from "./utils";
 
 // -----------------------------------------------------------------------------
 // Serialization helpers for IDs
diff --git a/src/index.ts b/src/index.ts
@@ -9,7 +9,7 @@ export type {
   EntityRelationId,
   RelationId,
   WildcardRelationId,
-} from "./entity";
+} from "./core/entity";
 
 export {
   component,
@@ -21,14 +21,20 @@ export {
   isRelationId,
   isWildcardRelationId,
   relation,
-} from "./entity";
+} from "./core/entity";
 
 // World class
-export { EntityBuilder, World } from "./world";
-export type { ComponentDef, SerializedComponent, SerializedEntity, SerializedEntityId, SerializedWorld } from "./world";
+export { EntityBuilder, World } from "./core/world";
+export type {
+  ComponentDef,
+  SerializedComponent,
+  SerializedEntity,
+  SerializedEntityId,
+  SerializedWorld,
+} from "./core/world";
 
 // Query class
-export { Query } from "./query";
+export { Query } from "./query/query";
 
 // Type utilities
-export type { ComponentTuple, ComponentType, LifecycleHook } from "./types";
+export type { ComponentTuple, ComponentType, LifecycleHook } from "./core/types";
diff --git a/src/query/example.ts b/src/query/example.ts
@@ -1,4 +1,4 @@
-import { World, component } from "./index";
+import { World, component } from "../index";
 
 // 定义组件类型
 type Position = { x: number; y: number };
diff --git a/src/query/filter.ts b/src/query/filter.ts
@@ -1,6 +1,6 @@
-import type { Archetype } from "./archetype";
-import type { EntityId } from "./entity";
-import { getComponentIdFromRelationId, getDetailedIdType, isRelationId } from "./entity";
+import type { Archetype } from "../core/archetype";
+import type { EntityId } from "../core/entity";
+import { getComponentIdFromRelationId, getDetailedIdType, isRelationId } from "../core/entity";
 
 /**
  * Filter options for queries
diff --git a/src/query/query.ts b/src/query/query.ts
@@ -1,9 +1,9 @@
-import type { Archetype } from "./archetype";
-import type { EntityId, WildcardRelationId } from "./entity";
-import { getDetailedIdType } from "./entity";
-import { matchesComponentTypes, matchesFilter, type QueryFilter } from "./query-filter";
-import type { ComponentTuple, ComponentType } from "./types";
-import type { World } from "./world";
+import type { Archetype } from "../core/archetype";
+import type { EntityId, WildcardRelationId } from "../core/entity";
+import { getDetailedIdType } from "../core/entity";
+import type { ComponentTuple, ComponentType } from "../core/types";
+import type { World } from "../core/world";
+import { matchesComponentTypes, matchesFilter, type QueryFilter } from "./filter";
 
 /**
  * Query class for efficient entity queries with cached archetypes
diff --git a/src/testing/index.ts b/src/testing/index.ts
@@ -33,12 +33,12 @@
  * ```
  */
 
-import type { ComponentId, EntityId, WildcardRelationId } from "./entity";
-import { isWildcardRelationId, relation } from "./entity";
-import type { Query } from "./query";
-import { World } from "./world";
-export { EntityBuilder } from "./world";
-export type { ComponentDef } from "./world";
+import type { ComponentId, EntityId, WildcardRelationId } from "../core/entity";
+import { isWildcardRelationId, relation } from "../core/entity";
+import { World } from "../core/world";
+import type { Query } from "../query/query";
+export { EntityBuilder } from "../core/world";
+export type { ComponentDef } from "../core/world";
 
 // =============================================================================
 // Types
@@ -47,7 +47,7 @@ export type { ComponentDef } from "./world";
 /**
  * A component definition for entity building, supporting both regular components and relations
  */
-import type { EntityBuilder } from "./world";
+import type { EntityBuilder } from "../core/world";
 
 /**
  * Snapshot of a single entity's component state
@@ -627,8 +627,8 @@ function deepClone<T>(value: T): T {
 // Re-exports for convenience
 // =============================================================================
 
-export { component, relation } from "./entity";
-export type { ComponentId, EntityId, RelationId, WildcardRelationId } from "./entity";
-export type { Query } from "./query";
-export type { LifecycleHook } from "./types";
-export { World } from "./world";
+export { component, relation } from "../core/entity";
+export type { ComponentId, EntityId, RelationId, WildcardRelationId } from "../core/entity";
+export type { LifecycleHook } from "../core/types";
+export { World } from "../core/world";
+export type { Query } from "../query/query";
diff --git a/src/utils/bit-set.ts b/src/utils/bit-set.ts
diff --git a/src/utils/multi-map.ts b/src/utils/multi-map.ts
diff --git a/src/utils/utils.ts b/src/utils/utils.ts
