Compare commits

..

No commits in common. "52e03683db55da7762a1af6898cfa15c7c03fdcb" and "bacf05685174b7254ad54a8c764a8fefb191abe3" have entirely different histories.

11 changed files with 679 additions and 819 deletions

View file

@ -1,19 +1,19 @@
name: analysis name: Analysis
on: [push, pull_request, workflow_dispatch] on: [push, pull_request, workflow_dispatch]
jobs: jobs:
run: run:
name: Run Luau Analyze name: Run Luau Analyze
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout Project - name: Checkout Project
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Install Luau - name: Install Luau
uses: encodedvenom/install-luau@v2.1 uses: encodedvenom/install-luau@v2.1
- name: Analyze - name: Analyze
run: | run: |
output=$(luau-analyze src || true) # Suppress errors for now. output=$(luau-analyze src || true) # Suppress errors for now.

View file

@ -1,64 +1,64 @@
# Sample workflow for building and deploying a VitePress site to GitHub Pages # Sample workflow for building and deploying a VitePress site to GitHub Pages
# #
name: deploy-docs name: Deploy VitePress site to Pages
on: on:
# Runs on pushes targeting the `main` branch. Change this to `master` if you're # Runs on pushes targeting the `main` branch. Change this to `master` if you're
# using the `master` branch as the default branch. # using the `master` branch as the default branch.
push: push:
branches: [main] branches: [main]
# Allows you to run this workflow manually from the Actions tab # Allows you to run this workflow manually from the Actions tab
workflow_dispatch: workflow_dispatch:
# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages # Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
permissions: permissions:
contents: read contents: read
pages: write pages: write
id-token: write id-token: write
# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued. # Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete. # However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
concurrency: concurrency:
group: pages group: pages
cancel-in-progress: false cancel-in-progress: false
jobs: jobs:
# Build job # Build job
build: build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
fetch-depth: 0 # Not needed if lastUpdated is not enabled fetch-depth: 0 # Not needed if lastUpdated is not enabled
# - uses: pnpm/action-setup@v3 # Uncomment this if you're using pnpm # - uses: pnpm/action-setup@v3 # Uncomment this if you're using pnpm
# - uses: oven-sh/setup-bun@v1 # Uncomment this if you're using Bun # - uses: oven-sh/setup-bun@v1 # Uncomment this if you're using Bun
- name: Setup Node - name: Setup Node
uses: actions/setup-node@v4 uses: actions/setup-node@v4
with: with:
node-version: 20 node-version: 20
cache: npm # or pnpm / yarn cache: npm # or pnpm / yarn
- name: Setup Pages - name: Setup Pages
uses: actions/configure-pages@v4 uses: actions/configure-pages@v4
- name: Install dependencies - name: Install dependencies
run: npm ci # or pnpm install / yarn install / bun install run: npm ci # or pnpm install / yarn install / bun install
- name: Build with VitePress - name: Build with VitePress
run: npm run docs:build # or pnpm docs:build / yarn docs:build / bun run docs:build run: npm run docs:build # or pnpm docs:build / yarn docs:build / bun run docs:build
- name: Upload artifact - name: Upload artifact
uses: actions/upload-pages-artifact@v3 uses: actions/upload-pages-artifact@v3
with: with:
path: docs/.vitepress/dist path: docs/.vitepress/dist
# Deployment job # Deployment job
deploy: deploy:
environment: environment:
name: github-pages name: github-pages
url: ${{ steps.deployment.outputs.page_url }} url: ${{ steps.deployment.outputs.page_url }}
needs: build needs: build
runs-on: ubuntu-latest runs-on: ubuntu-latest
name: Deploy name: Deploy
steps: steps:
- name: Deploy to GitHub Pages - name: Deploy to GitHub Pages
id: deployment id: deployment
uses: actions/deploy-pages@v4 uses: actions/deploy-pages@v4

View file

@ -1,17 +1,17 @@
name: publish-npm name: Publish to NPM
on: on:
push: push:
branches: [main] branches: main
jobs: jobs:
publish: publish:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: actions/setup-node@v3 - uses: actions/setup-node@v3
with: with:
node-version: "20" node-version: "20"
- uses: JS-DevTools/npm-publish@v3 - uses: JS-DevTools/npm-publish@v3
with: with:
token: ${{ secrets.NPM_AUTH_TOKEN }} token: ${{ secrets.NPM_AUTH_TOKEN }}

View file

@ -1,71 +1,71 @@
name: release name: Release
on: on:
push: push:
tags: ["v*"] tags: ["v*"]
jobs: jobs:
build: build:
name: Build name: Build
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout Project - name: Checkout Project
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Install Rokit - name: Install Rokit
uses: CompeyDev/setup-rokit@v0.1.2 uses: CompeyDev/setup-rokit@v0.1.2
- name: Install Dependencies - name: Install Dependencies
run: wally install run: wally install
- name: Build - name: Build
run: rojo build --output build.rbxm default.project.json run: rojo build --output build.rbxm default.project.json
- name: Upload Build Artifact - name: Upload Build Artifact
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: build name: build
path: build.rbxm path: build.rbxm
release: release:
name: Release name: Release
needs: [build] needs: [build]
runs-on: ubuntu-latest runs-on: ubuntu-latest
permissions: permissions:
contents: write contents: write
steps: steps:
- name: Checkout Project - name: Checkout Project
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Download Jecs Build - name: Download Jecs Build
uses: actions/download-artifact@v3 uses: actions/download-artifact@v3
with: with:
name: build name: build
path: build path: build
- name: Rename Build - name: Rename Build
run: mv build/build.rbxm jecs.rbxm run: mv build/build.rbxm jecs.rbxm
- name: Create Release - name: Create Release
uses: softprops/action-gh-release@v1 uses: softprops/action-gh-release@v1
with: with:
name: Jecs ${{ github.ref_name }} name: Jecs ${{ github.ref_name }}
files: | files: |
jecs.rbxm jecs.rbxm
publish: publish:
name: Publish name: Publish
needs: [release] needs: [release]
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout Project - name: Checkout Project
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Install Rokit - name: Install Rokit
uses: CompeyDev/setup-rokit@v0.1.2 uses: CompeyDev/setup-rokit@v0.1.2
- name: Wally Login - name: Wally Login
run: wally login --token ${{ secrets.WALLY_AUTH_TOKEN }} run: wally login --token ${{ secrets.WALLY_AUTH_TOKEN }}
- name: Publish - name: Publish
run: wally publish run: wally publish

View file

@ -1,31 +1,31 @@
name: unit-testing name: Unit Testing
on: [push, pull_request, workflow_dispatch] on: [push, pull_request, workflow_dispatch]
jobs: jobs:
run: run:
name: Run Luau Tests name: Run Luau Tests
runs-on: ubuntu-latest runs-on: ubuntu-latest
timeout-minutes: 2 timeout-minutes: 2
steps: steps:
- name: Checkout Project - name: Checkout Project
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Install Luau - name: Install Luau
uses: encodedvenom/install-luau@v4.3 uses: encodedvenom/install-luau@v4.3
with: with:
version: "latest" version: 'latest'
verbose: "true" verbose: 'true'
- name: Run Unit Tests - name: Run Unit Tests
id: run_tests id: run_tests
run: | run: |
output=$(luau test/tests.luau) output=$(luau test/tests.luau)
echo "$output" echo "$output"
if [[ "$output" == *"0 fails"* ]]; then if [[ "$output" == *"0 fails"* ]]; then
echo "Unit Tests Passed" echo "Unit Tests Passed"
else else
echo "Error: One or More Unit Tests Failed." echo "Error: One or More Unit Tests Failed."
exit 1 exit 1
fi fi

View file

@ -4,20 +4,11 @@ A World contains entities which have components. The World is queryable and can
# Methods # Methods
## iter
Returns an iterator that can be used to iterate over the query.
```luau
function Query:iter(): () -> (Entity, ...)
```
## with ## with
Adds components (IDs) to query with, but will not use their data. This is useful for Tags or generally just data you do not care for. Adds components (IDs) to query with, but will not use their data. This is useful for Tags or generally just data you do not care for.
```luau ```luau
function Query:with( function query:with(
...: Entity -- The IDs to query with ...: Entity -- The IDs to query with
): Query ): Query
``` ```
@ -33,7 +24,7 @@ end
```ts [typescript] ```ts [typescript]
for (const [id, position] of world.query(Position).with(Velocity)) { for (const [id, position] of world.query(Position).with(Velocity)) {
// Do something // Do something
} }
``` ```
@ -44,11 +35,10 @@ Put the IDs inside of `world:query()` instead if you need the data.
::: :::
## without ## without
Removes entities with the provided components from the query. Removes entities with the provided components from the query.
```luau ```luau
function Query:without( function query:without(
...: Entity -- The IDs to filter against. ...: Entity -- The IDs to filter against.
): Query -- Returns the Query ): Query -- Returns the Query
``` ```
@ -56,7 +46,6 @@ function Query:without(
Example: Example:
::: code-group ::: code-group
```luau [luau] ```luau [luau]
for entity, position in world:query(Position):without(Velocity) do for entity, position in world:query(Position):without(Velocity) do
-- Do something -- Do something
@ -65,18 +54,15 @@ end
```ts [typescript] ```ts [typescript]
for (const [entity, position] of world.query(Position).without(Velocity)) { for (const [entity, position] of world.query(Position).without(Velocity)) {
// Do something // Do something
} }
``` ```
::: :::
## archetypes ## archetypes
Returns the matching archetypes of the query. Returns the matching archetypes of the query.
```luau ```luau
function Query:archetypes(): { Archetype } function query:archetypes(): { Archetype }
``` ```
Example: Example:
@ -100,11 +86,3 @@ end
:::info :::info
This function is meant for people who want to really customize their query behaviour at the archetype-level This function is meant for people who want to really customize their query behaviour at the archetype-level
::: :::
## cached
Returns a cached version of the query. This is useful if you want to iterate over the same query multiple times.
```luau
function Query:cached(): Query -- Returns the cached Query
```

View file

@ -1,13 +1,9 @@
# World # World
A World contains entities which have components. The World is queryable and can be used to get entities with a specific set of components and to perform different kinds of operations on them. A World contains entities which have components. The World is queryable and can be used to get entities with a specific set of components and to perform different kinds of operations on them.
# Functions # Functions
## new ## new
`World` utilizes a class, meaning JECS allows you to create multiple worlds. `World` utilizes a class, meaning JECS allows you to create multiple worlds.
```luau ```luau
function World.new(): World function World.new(): World
``` ```
@ -15,7 +11,6 @@ function World.new(): World
Example: Example:
::: code-group ::: code-group
```luau [luau] ```luau [luau]
local world = jecs.World.new() local world = jecs.World.new()
local myOtherWorld = jecs.World.new() local myOtherWorld = jecs.World.new()
@ -27,15 +22,11 @@ import { World } from "@rbxts/jecs";
const world = new World(); const world = new World();
const myOtherWorld = new World(); const myOtherWorld = new World();
``` ```
::: :::
# Methods # Methods
## entity ## entity
Creates a new entity. Creates a new entity.
```luau ```luau
function World:entity(): Entity function World:entity(): Entity
``` ```
@ -43,7 +34,6 @@ function World:entity(): Entity
Example: Example:
::: code-group ::: code-group
```luau [luau] ```luau [luau]
local entity = world:entity() local entity = world:entity()
``` ```
@ -51,15 +41,12 @@ local entity = world:entity()
```ts [typescript] ```ts [typescript]
const entity = world.entity(); const entity = world.entity();
``` ```
::: :::
## component ## component
Creates a new component. Do note components are entities as well, meaning JECS allows you to add other components onto them. Creates a new component. Do note components are entities as well, meaning JECS allows you to add other components onto them.
These are meant to be added onto other entities through `add` and `set` These are meant to be added onto other entities through `add` and `set`
```luau ```luau
function World:component<T>(): Entity<T> -- The new componen. function World:component<T>(): Entity<T> -- The new componen.
``` ```
@ -67,7 +54,6 @@ function World:component<T>(): Entity<T> -- The new componen.
Example: Example:
::: code-group ::: code-group
```luau [luau] ```luau [luau]
local Health = world:component() :: jecs.Entity<number> -- Typecasting this will allow us to know what kind of data the component holds! local Health = world:component() :: jecs.Entity<number> -- Typecasting this will allow us to know what kind of data the component holds!
``` ```
@ -75,13 +61,10 @@ local Health = world:component() :: jecs.Entity<number> -- Typecasting this will
```ts [typescript] ```ts [typescript]
const Health = world.component<number>(); const Health = world.component<number>();
``` ```
::: :::
## get ## get
Returns the data present in the component that was set in the entity. Will return nil if the component was a tag or is not present. Returns the data present in the component that was set in the entity. Will return nil if the component was a tag or is not present.
```luau ```luau
function World:get<T>( function World:get<T>(
entity: Entity, -- The entity entity: Entity, -- The entity
@ -92,7 +75,6 @@ function World:get<T>(
Example: Example:
::: code-group ::: code-group
```luau [luau] ```luau [luau]
local Health = world:component() :: jecs.Entity<number> local Health = world:component() :: jecs.Entity<number>
@ -111,18 +93,15 @@ const Health = world.component<number>();
const Entity = world.entity(); const Entity = world.entity();
world.set(Entity, Health, 100); world.set(Entity, Health, 100);
print(world.get(Entity, Health)); print(world.get(Entity, Health))
// Outputs: // Outputs:
// 100 // 100
``` ```
::: :::
## has ## has
Returns whether an entity has a component (ID). Useful for checking if an entity has a tag or if you don't care of the data that is inside the component. Returns whether an entity has a component (ID). Useful for checking if an entity has a tag or if you don't care of the data that is inside the component.
```luau ```luau
function World:has( function World:has(
entity: Entity, -- The entity entity: Entity, -- The entity
@ -133,7 +112,6 @@ function World:has(
Example: Example:
::: code-group ::: code-group
```luau [luau] ```luau [luau]
local IsMoving = world:component() local IsMoving = world:component()
local Ragdolled = world:entity() -- This is a tag, meaning it won't contain data local Ragdolled = world:entity() -- This is a tag, meaning it won't contain data
@ -177,11 +155,9 @@ print(world.has(Entity, Ragdolled));
// nil // nil
// true // true
``` ```
::: :::
## add ## add
Adds a component (ID) to the entity. Useful for adding a tag to an entity, as this adds the component to the entity without any additional values inside Adds a component (ID) to the entity. Useful for adding a tag to an entity, as this adds the component to the entity without any additional values inside
```luau ```luau
@ -196,9 +172,7 @@ This function is idempotent, meaning if the entity already has the id, this oper
::: :::
## set ## set
Adds or changes data in the entity's component. Adds or changes data in the entity's component.
```luau ```luau
function World:set( function World:set(
entity: Entity, -- The entity entity: Entity, -- The entity
@ -210,7 +184,6 @@ function World:set(
Example: Example:
::: code-group ::: code-group
```luau [luau] ```luau [luau]
local Health = world:component() :: jecs.Entity<number> local Health = world:component() :: jecs.Entity<number>
@ -233,22 +206,19 @@ const Health = world.component<number>();
const Entity = world.entity(); const Entity = world.entity();
world.set(Entity, Health, 100); world.set(Entity, Health, 100);
print(world.get(Entity, Health)); print(world.get(Entity, Health))
world.set(Entity, Health, 50); world.set(Entity, Health, 50);
print(world.get(Entity, Health)); print(world.get(Entity, Health))
// Outputs: // Outputs:
// 100 // 100
// 50 // 50
``` ```
::: :::
## query ## query
Creates a [`query`](query) with the given components (IDs). Entities that satisfies the conditions of the query will be returned and their corresponding data. Creates a [`query`](query) with the given components (IDs). Entities that satisfies the conditions of the query will be returned and their corresponding data.
```luau ```luau
function World:query( function World:query(
...: Entity -- The components to query with ...: Entity -- The components to query with
@ -258,7 +228,6 @@ function World:query(
Example: Example:
::: code-group ::: code-group
```luau [luau] ```luau [luau]
-- Entity could also be a component if a component also meets the requirements, since they are also entities which you can add more components onto -- Entity could also be a component if a component also meets the requirements, since they are also entities which you can add more components onto
for entity, position, velocity in world:query(Position, Velocity) do for entity, position, velocity in world:query(Position, Velocity) do
@ -273,20 +242,16 @@ for (const [entity, position, velocity] of world.query(Position, Velocity) {
// Do something // Do something
} }
``` ```
::: :::
:::info :::info
Queries are uncached by default, this is generally very cheap unless you have high fragmentation from e.g. relationships. Queries are uncached by default, this is generally very cheap unless you have high fragmentation from e.g. relationships.
::: :::
## target ## target
Get the target of a relationship. Get the target of a relationship.
This will return a target (second element of a pair) of the entity for the specified relationship. The index allows for iterating through the targets, if a single entity has multiple targets for the same relationship. This will return a target (second element of a pair) of the entity for the specified relationship. The index allows for iterating through the targets, if a single entity has multiple targets for the same relationship.
If the index is larger than the total number of instances the entity has for the relationship or if there is no pair with the specified relationship on the entity, the operation will return nil. If the index is larger than the total number of instances the entity has for the relationship or if there is no pair with the specified relationship on the entity, the operation will return nil.
```luau ```luau
function World:target( function World:target(
entity: Entity, -- The entity entity: Entity, -- The entity
@ -296,9 +261,7 @@ function World:target(
``` ```
## parent ## parent
Get parent (target of ChildOf relationship) for entity. If there is no ChildOf relationship pair, it will return nil. Get parent (target of ChildOf relationship) for entity. If there is no ChildOf relationship pair, it will return nil.
```luau ```luau
function World:parent( function World:parent(
child: Entity -- The child ID to find the parent of child: Entity -- The child ID to find the parent of
@ -312,9 +275,7 @@ world:target(entity, jecs.ChildOf, 0)
``` ```
## contains ## contains
Checks if an entity or component (id) exists in the world. Checks if an entity or component (id) exists in the world.
```luau ```luau
function World:contains( function World:contains(
entity: Entity, entity: Entity,
@ -324,7 +285,6 @@ function World:contains(
Example: Example:
::: code-group ::: code-group
```luau [luau] ```luau [luau]
local entity = world:entity() local entity = world:entity()
print(world:contains(entity)) print(world:contains(entity))
@ -348,13 +308,10 @@ print(world.contains(2));
// true // true
// false // false
``` ```
::: :::
## remove ## remove
Removes a component (ID) from an entity Removes a component (ID) from an entity
```luau ```luau
function World:remove( function World:remove(
entity: Entity, entity: Entity,
@ -365,7 +322,6 @@ function World:remove(
Example: Example:
::: code-group ::: code-group
```luau [luau] ```luau [luau]
local IsMoving = world:component() local IsMoving = world:component()
@ -397,13 +353,10 @@ print(world.has(entity, IsMoving));
// true // true
// false // false
``` ```
::: :::
## delete ## delete
Deletes an entity and all of its related components and relationships. Deletes an entity and all of its related components and relationships.
```luau ```luau
function World:delete( function World:delete(
entity: Entity entity: Entity
@ -413,7 +366,6 @@ function World:delete(
Example: Example:
::: code-group ::: code-group
```luau [luau] ```luau [luau]
local entity = world:entity() local entity = world:entity()
print(world:has(entity)) print(world:has(entity))
@ -439,62 +391,12 @@ print(world.has(entity));
// true // true
// false // false
``` ```
::: :::
## clear ## clear
Clears all of the components and relationships of the entity without deleting it. Clears all of the components and relationships of the entity without deleting it.
```luau ```luau
function World:clear( function World:clear(
entity: Entity entity: Entity
): void ): void
``` ```
## each
Iterate over all entities with the specified component.
Useful when you only need the entity for a specific ID and you want to avoid creating a query.
```luau
function World:each(
id: Entity -- The component ID
): () -> Entity
```
Example:
::: code-group
```luau [luau]
local id = world:entity()
for entity in world:each(id) do
-- Do something
end
```
```ts [typescript]
const id = world.entity();
for (const entity of world.each(id)) {
// Do something
}
```
:::
## children
Iterate entities in root of parent
```luau
function World:children(
parent: Entity -- The parent entity
): () -> Entity
```
This is the same as calling:
```luau
world:each(pair(ChildOf, parent))
```

View file

@ -1995,7 +1995,6 @@ local function world_each(world: World, id): () -> ()
archetype = archetypes[archetype_id] archetype = archetypes[archetype_id]
entities = archetype.entities entities = archetype.entities
row = #entities row = #entities
entity = entities[row]
end end
row -= 1 row -= 1
return entity return entity

View file

@ -1,6 +1,6 @@
{ {
"name": "@rbxts/jecs", "name": "@rbxts/jecs",
"version": "0.5.2", "version": "0.5.1",
"description": "Stupidly fast Entity Component System", "description": "Stupidly fast Entity Component System",
"main": "jecs.luau", "main": "jecs.luau",
"repository": { "repository": {

View file

@ -900,39 +900,20 @@ end)
TEST("world:children", function() TEST("world:children", function()
local world = world_new() local world = world_new()
local C = world:component()
local T = world:entity()
local e1 = world:entity() local e1 = world:entity()
world:set(e1, C, true)
local e2 = world:entity() local e2 = world:entity()
world:add(e2, T)
world:add(e2, pair(ChildOf, e1))
local e3 = world:entity() local e3 = world:entity()
world:add(e2, pair(ChildOf, e1))
world:add(e3, pair(ChildOf, e1)) world:add(e3, pair(ChildOf, e1))
local count = 0 for entity in world:children(pair(ChildOf, e1)) do
for entity in world:children(e1) do
count += 1
if entity == e2 or entity == e3 then if entity == e2 or entity == e3 then
CHECK(true) CHECK(true)
continue continue
end end
CHECK(false) CHECK(false)
end end
CHECK(count == 2)
world:remove(e2, pair(ChildOf, e1))
count = 0
for entity in world:children(e1) do
count += 1
end
CHECK(count == 1)
end) end)
TEST("world:clear()", function() TEST("world:clear()", function()

View file

@ -1,6 +1,6 @@
[package] [package]
name = "ukendio/jecs" name = "ukendio/jecs"
version = "0.5.2" version = "0.5.1"
registry = "https://github.com/UpliftGames/wally-index" registry = "https://github.com/UpliftGames/wally-index"
realm = "shared" realm = "shared"
license = "MIT" license = "MIT"