Update to Oozaru 0.6.3

Yay! It's pig-feeding time! (don't tell anyone but I triggered the porkocalypse)
spheredev · Dec 22, 2023 · cd5e9bc · cd5e9bc
1 parent e4a77a6
commit cd5e9bc
Show file tree

Hide file tree

Showing 17 changed files with 28 additions and 26 deletions.
diff --git a/index.html b/index.html
@@ -16,7 +16,7 @@
 			<a href="."><img alt="Sphere logo" src="logo-dark.svg" width=48 height=48></a>
 			<div id="title">
 				<span id="name">Oozaru</span> <span id="gameTitle">Sphere for the Web</span><br>
-				<span id="copyright">&copy; 2023 Fat Cerberus</span>
+				<span id="copyright">&copy; 2024 Fat Cerberus</span>
 			</div>
 		</nav>
 		<div id="tv">

diff --git a/oozaru.json b/oozaru.json
@@ -1,5 +1,5 @@
 {
     "name": "Oozaru",
     "publisher": "Fat Cerberus",
-    "version": "0.6.2"
+    "version": "0.6.3"
 }
diff --git a/runtime/from.js b/runtime/from.js
@@ -116,7 +116,7 @@ class Query
 
 	all(predicate)
 	{
-		return this.run$(new FindOp((it, key, memo) => !predicate(it) ? (memo.value = false, true) : false, true));
+		return this.run$(new FindOp((it, key, memo) => !predicate(it, key) ? (memo.value = false, true) : false, true));
 	}
 
 	allIn(values)
@@ -127,7 +127,7 @@ class Query
 
 	any(predicate)
 	{
-		return this.run$(new FindOp((it, key, memo) => predicate(it) ? (memo.value = true, true) : false, false));
+		return this.run$(new FindOp((it, key, memo) => predicate(it, key) ? (memo.value = true, true) : false, false));
 	}
 
 	anyIn(values)
@@ -470,9 +470,9 @@ class AggregateOp extends QueryOp
 		return this.accumulator;
 	}
 
-	step(value)
+	step(value, source, key)
 	{
-		this.accumulator = this.aggregator(this.accumulator, value);
+		this.accumulator = this.aggregator(this.accumulator, value, key);
 		return true;
 	}
 }
@@ -601,10 +601,11 @@ class LastOp extends QueryOp
 		return this.lastValue;
 	}
 
-	step(value)
+	step(value, source, key)
 	{
-		if (this.predicate(value))
+		if (this.predicate(value, key))
 			this.lastValue = value;
+		return true;
 	}
 }
 
@@ -730,9 +731,9 @@ class SelectManyOp extends QueryOp
 		super.initialize();
 	}
 
-	step(value)
+	step(value, source, key)
 	{
-		const itemSource = this.selector(value);
+		const itemSource = this.selector(value, key);
 		return feedMeSeymour(this.nextOp, itemSource);
 	}
 }
@@ -756,13 +757,14 @@ class SingleOp extends QueryOp
 		return this.lastValue;
 	}
 
-	step(value)
+	step(value, source, key)
 	{
-		if (this.predicate(value)) {
+		if (this.predicate(value, key)) {
 			if (++this.count > 1)
 				throw new Error("Query would return too many results");
 			this.lastValue = value;
 		}
+		return true;
 	}
 }
 

diff --git a/scripts/audialis.js b/scripts/audialis.js
@@ -1,6 +1,6 @@
 /**
  *  Oozaru: Sphere for the Web
- *  Copyright (c) 2015-2023, Fat Cerberus
+ *  Copyright (c) 2016-2024, Fat Cerberus
  *  All rights reserved.
  *
  *  Redistribution and use in source and binary forms, with or without

diff --git a/scripts/data-stream.js b/scripts/data-stream.js
@@ -1,6 +1,6 @@
 /**
  *  Oozaru: Sphere for the Web
- *  Copyright (c) 2015-2023, Fat Cerberus
+ *  Copyright (c) 2016-2024, Fat Cerberus
  *  All rights reserved.
  *
  *  Redistribution and use in source and binary forms, with or without

diff --git a/scripts/deque.js b/scripts/deque.js
@@ -1,6 +1,6 @@
 /**
  *  Oozaru: Sphere for the Web
- *  Copyright (c) 2015-2023, Fat Cerberus
+ *  Copyright (c) 2016-2024, Fat Cerberus
  *  All rights reserved.
  *
  *  Redistribution and use in source and binary forms, with or without

diff --git a/scripts/fido.js b/scripts/fido.js
@@ -1,6 +1,6 @@
 /**
  *  Oozaru: Sphere for the Web
- *  Copyright (c) 2015-2023, Fat Cerberus
+ *  Copyright (c) 2016-2024, Fat Cerberus
  *  All rights reserved.
  *
  *  Redistribution and use in source and binary forms, with or without

diff --git a/scripts/fontso.js b/scripts/fontso.js
@@ -1,6 +1,6 @@
 /**
  *  Oozaru: Sphere for the Web
- *  Copyright (c) 2015-2023, Fat Cerberus
+ *  Copyright (c) 2016-2024, Fat Cerberus
  *  All rights reserved.
  *
  *  Redistribution and use in source and binary forms, with or without

diff --git a/scripts/galileo.js b/scripts/galileo.js
@@ -1,6 +1,6 @@
 /**
  *  Oozaru: Sphere for the Web
- *  Copyright (c) 2015-2023, Fat Cerberus
+ *  Copyright (c) 2016-2024, Fat Cerberus
  *  All rights reserved.
  *
  *  Redistribution and use in source and binary forms, with or without

diff --git a/scripts/game.js b/scripts/game.js
@@ -1,6 +1,6 @@
 /**
  *  Oozaru: Sphere for the Web
- *  Copyright (c) 2015-2023, Fat Cerberus
+ *  Copyright (c) 2016-2024, Fat Cerberus
  *  All rights reserved.
  *
  *  Redistribution and use in source and binary forms, with or without

diff --git a/scripts/input-engine.js b/scripts/input-engine.js
@@ -1,6 +1,6 @@
 /**
  *  Oozaru: Sphere for the Web
- *  Copyright (c) 2015-2023, Fat Cerberus
+ *  Copyright (c) 2016-2024, Fat Cerberus
  *  All rights reserved.
  *
  *  Redistribution and use in source and binary forms, with or without

diff --git a/scripts/job-queue.js b/scripts/job-queue.js
@@ -1,6 +1,6 @@
 /**
  *  Oozaru: Sphere for the Web
- *  Copyright (c) 2015-2023, Fat Cerberus
+ *  Copyright (c) 2016-2024, Fat Cerberus
  *  All rights reserved.
  *
  *  Redistribution and use in source and binary forms, with or without

diff --git a/scripts/main.js b/scripts/main.js
@@ -1,6 +1,6 @@
 /**
  *  Oozaru: Sphere for the Web
- *  Copyright (c) 2015-2023, Fat Cerberus
+ *  Copyright (c) 2016-2024, Fat Cerberus
  *  All rights reserved.
  *
  *  Redistribution and use in source and binary forms, with or without

diff --git a/scripts/package.js b/scripts/package.js
@@ -1,6 +1,6 @@
 /**
  *  Oozaru: Sphere for the Web
- *  Copyright (c) 2015-2023, Fat Cerberus
+ *  Copyright (c) 2016-2024, Fat Cerberus
  *  All rights reserved.
  *
  *  Redistribution and use in source and binary forms, with or without

diff --git a/scripts/pegasus.js b/scripts/pegasus.js
@@ -1,6 +1,6 @@
 /**
  *  Oozaru: Sphere for the Web
- *  Copyright (c) 2015-2023, Fat Cerberus
+ *  Copyright (c) 2016-2024, Fat Cerberus
  *  All rights reserved.
  *
  *  Redistribution and use in source and binary forms, with or without

diff --git a/scripts/utilities.js b/scripts/utilities.js
@@ -1,6 +1,6 @@
 /**
  *  Oozaru: Sphere for the Web
- *  Copyright (c) 2015-2023, Fat Cerberus
+ *  Copyright (c) 2016-2024, Fat Cerberus
  *  All rights reserved.
  *
  *  Redistribution and use in source and binary forms, with or without

diff --git a/scripts/version.js b/scripts/version.js
@@ -1,6 +1,6 @@
 /**
  *  Oozaru: Sphere for the Web
- *  Copyright (c) 2015-2023, Fat Cerberus
+ *  Copyright (c) 2016-2024, Fat Cerberus
  *  All rights reserved.
  *
  *  Redistribution and use in source and binary forms, with or without