From db6e282c67c44e2ced9bc3377639542433d357f1 Mon Sep 17 00:00:00 2001
From: JaimeGensler <jaimegensler0@gmail.com>
Date: Sat, 13 Jan 2024 11:16:13 -0800
Subject: [PATCH] Update Maybe

---
 packages/thyseus/src/index.ts             | 4 ++--
 packages/thyseus/src/queries/index.ts     | 2 +-
 packages/thyseus/src/queries/modifiers.ts | 9 +++++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/packages/thyseus/src/index.ts b/packages/thyseus/src/index.ts
index cb74b0d..4db40e6 100644
--- a/packages/thyseus/src/index.ts
+++ b/packages/thyseus/src/index.ts
@@ -3,7 +3,7 @@ export { applyCommands, Commands } from './commands';
 export { Tag } from './components';
 export { Entity } from './entities';
 export { EventReader, Events, EventWriter } from './events';
-export { Query, With, Without, Or, And, MaybeModifier } from './queries';
+export { Query, With, Without, Or, And, Maybe, MaybeModifier } from './queries';
 export { Res, SystemRes } from './resources';
 export { cloneSystem } from './systems';
 export { expose, Thread, Threads } from './threads';
@@ -13,7 +13,7 @@ export { World, Schedule } from './world';
 export type { EntityCommands } from './commands';
 export type { Table, Class } from './components';
 export type { Entities } from './entities';
-export type { Filter, Maybe } from './queries';
+export type { Filter } from './queries';
 export type { System, SystemParameter } from './systems';
 export type { StructuredCloneable } from './threads';
 export type { Plugin, WorldConfig } from './world';
diff --git a/packages/thyseus/src/queries/index.ts b/packages/thyseus/src/queries/index.ts
index d721d9c..dace0f1 100644
--- a/packages/thyseus/src/queries/index.ts
+++ b/packages/thyseus/src/queries/index.ts
@@ -1,3 +1,3 @@
 export { Query } from './Query';
 export { With, Without, Or, And, type Filter } from './filters';
-export { MaybeModifier, type Maybe } from './modifiers';
+export { Maybe, MaybeModifier } from './modifiers';
diff --git a/packages/thyseus/src/queries/modifiers.ts b/packages/thyseus/src/queries/modifiers.ts
index cd48506..655d8c1 100644
--- a/packages/thyseus/src/queries/modifiers.ts
+++ b/packages/thyseus/src/queries/modifiers.ts
@@ -5,11 +5,12 @@ import { World } from '../world';
  * A type that may or may not be present.
  */
 export type Maybe<T> = T | undefined;
+export const Maybe = {
+	intoArgument(_: World, type: Class) {
+		return new MaybeModifier(type);
+	},
+};
 export class MaybeModifier {
-	static intoArgument(_: World, type: Class) {
-		return new this(type);
-	}
-
 	type: Class;
 	constructor(type: Class) {
 		this.type = type;