From d3169c483f6ba5d4b18b8bc31ec389f7ec954275 Mon Sep 17 00:00:00 2001 From: Steve Christensen Date: Thu, 26 Jun 2025 00:04:22 -0600 Subject: [PATCH 01/31] updates for new laptop --- .vscode/launch.json | 9 +++++++++ .vscode/settings.json | 1 + example/main.dart | 9 ++++++--- mise.toml | 2 +- pubspec.yaml | 10 +++++----- 5 files changed, 22 insertions(+), 9 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 3bc65ea..93baa94 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -26,6 +26,15 @@ "request": "launch", "type": "dart" }, + { + "name": "(3d6!! + 4d6!) -<2", + "program": "example/main.dart", + "args": [ + "(3d6!! + 4d6!) -<2", + ], + "request": "launch", + "type": "dart" + }, { "name": "explode - old syntax", "program": "example/main.dart", diff --git a/.vscode/settings.json b/.vscode/settings.json index 056cf1b..42c961a 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -35,4 +35,5 @@ // Force all files to have a trailing newline for consistency and reduced diffs when // adding new lines at the bottom of the file. "files.insertFinalNewline": true, + "dart.sdkPath": "~/.local/share/mise/installs/dart/3", } diff --git a/example/main.dart b/example/main.dart index 46b52fc..4e9b5f9 100644 --- a/example/main.dart +++ b/example/main.dart @@ -26,7 +26,7 @@ void main(List arguments) async { var random = Random.secure(); DiceExpression.registerListener((rollResult) { - //stdout.writeln('${rollResult.opType.name} -> $rollResult'); + //stdout.writeln('cb: ${rollResult.opType.name} -> $rollResult'); }); final argParser = ArgParser() @@ -110,6 +110,8 @@ void main(List arguments) async { try { final collectStats = results['stats'] as bool; if (collectStats) { + // if the user wants to collect stats, always use a non-secure RNG + // (aka fast and non-seeded) random = Random(); } final diceExpr = DiceExpression.create(input, random); @@ -135,8 +137,9 @@ Future run({ required String output, }) async { if (stats) { - final stats = - await expression.stats(num: numRolls == 1 ? defaultStatsNum : numRolls); + final stats = await expression.stats( + num: numRolls == 1 ? defaultStatsNum : numRolls, + ); stdout.writeln(stats); } else { await for (final r in expression.rollN(numRolls)) { diff --git a/mise.toml b/mise.toml index 084fb3d..3392434 100644 --- a/mise.toml +++ b/mise.toml @@ -1,2 +1,2 @@ [tools] -dart = "3.7" +dart = "3" diff --git a/pubspec.yaml b/pubspec.yaml index 56a4368..5f05dfa 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -5,17 +5,17 @@ homepage: https://github.com/Adventuresmith/dart-dice-parser repository: https://github.com/Adventuresmith/dart-dice-parser environment: - sdk: "^3.6.0" + sdk: "^3.8.0" dependencies: collection: ^1.0.0 equatable: ^2.0.0 logging: ^1.3.0 - petitparser: ^6.0.0 + petitparser: ^6.1.0 dev_dependencies: - args: ^2.6.0 + args: ^2.0.0 io: ^1.0.0 - lint: ^2.0.0 + lint: ^2.8.0 mocktail: ^1.0.0 - test: ^1.25.0 + test: ^1.26.0 From f36c4b89d2cd8fce7a173e70b0d587fd867c2856 Mon Sep 17 00:00:00 2001 From: Steve Christensen Date: Thu, 26 Jun 2025 00:04:39 -0600 Subject: [PATCH 02/31] upgrade to dart 3.8 and petitparser 7.0.0 --- CHANGELOG.md | 13 ++++++++++++- lib/src/parser.dart | 16 ++++++++-------- pubspec.yaml | 4 ++-- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b581fb..2cedadc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,19 @@ +# 8.0.0 +## ⚠️⚠️ Breaking changes ⚠️⚠️ + +Roll results have changed significantly (again). It's amazing what having users will do to a package! + +Rather than the result collection being a simple list of integers, each roll is a + + +## 📈 Enhancements +- upgrade to dart 3.8.0 +- upgrade to petitparser 7.0.0 + # 7.1.1 ## 🛠️ Bug fixes - fix typo in readme - # 7.1.0 ## 📈 Enhancements diff --git a/lib/src/parser.dart b/lib/src/parser.dart index 1e8b886..423ee5f 100644 --- a/lib/src/parser.dart +++ b/lib/src/parser.dart @@ -8,7 +8,7 @@ Parser parserBuilder(DiceRoller roller) { final builder = ExpressionBuilder(); // numbers builder.primitive( - digit().star().flatten('integer expected').trim().map(SimpleValue.new), + digit().star().flatten(message: 'integer expected').trim().map(SimpleValue.new), ); // parens builder.group().wrapper( @@ -50,7 +50,7 @@ Parser parserBuilder(DiceRoller roller) { // compounding dice (has to be in separate group from exploding) builder.group().left( (string('!!') & - pattern('oO').optional() & + pattern('o', ignoreCase: true).optional() & pattern('<>').optional() & char('=').optional()) .flatten() @@ -60,8 +60,8 @@ Parser parserBuilder(DiceRoller roller) { builder.group() // reroll & reroll once ..left( - (pattern('rR') & - pattern('oO').optional() & + (pattern('r', ignoreCase: true) & + pattern('o', ignoreCase: true).optional() & pattern('<>').optional() & char('=').optional()) .flatten() @@ -71,7 +71,7 @@ Parser parserBuilder(DiceRoller roller) { // exploding ..left( (char('!') & - pattern('oO').optional() & + pattern('o', ignoreCase: true).optional() & pattern('<>').optional() & char('=').optional()) .flatten() @@ -80,7 +80,7 @@ Parser parserBuilder(DiceRoller roller) { ) // cap/clamp >,< ..left( - (pattern('cC') & pattern('<>').optional()).flatten().trim(), + (pattern('c', ignoreCase: true) & pattern('<>').optional()).flatten().trim(), (a, op, b) => ClampOp(op.toLowerCase(), a, b), ) // drop >=,<=,>,< @@ -94,12 +94,12 @@ Parser parserBuilder(DiceRoller roller) { ) // drop(-) low, high ..left( - (char('-') & pattern('LlHh')).flatten().trim(), + (char('-') & pattern('lh', ignoreCase: true)).flatten().trim(), (a, op, b) => DropHighLowOp(op.toLowerCase(), a, b), ) // keep low/high ..left( - (pattern('Kk') & pattern('LlHh').optional()).flatten().trim(), + (pattern('k', ignoreCase: true) & pattern('lh',ignoreCase: true).optional()).flatten().trim(), (a, op, b) => DropHighLowOp(op.toLowerCase(), a, b), ); diff --git a/pubspec.yaml b/pubspec.yaml index 5f05dfa..d668392 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: dart_dice_parser description: A dart library for parsing dice notation (`2d6+4`). Supports advantage/disadvantage, exploding die, and other variations. -version: 7.1.1 +version: 8.0.0 homepage: https://github.com/Adventuresmith/dart-dice-parser repository: https://github.com/Adventuresmith/dart-dice-parser @@ -11,7 +11,7 @@ dependencies: collection: ^1.0.0 equatable: ^2.0.0 logging: ^1.3.0 - petitparser: ^6.1.0 + petitparser: ^7.0.0 dev_dependencies: args: ^2.0.0 From 2694ed81fdfc6fac1a3c9fefc75319dbb24820b2 Mon Sep 17 00:00:00 2001 From: Steve Christensen Date: Thu, 26 Jun 2025 00:21:19 -0600 Subject: [PATCH 03/31] reformat w/ latest dart fmt --- CHANGELOG.md | 7 +- example/simple.dart | 42 +------ lib/src/ast.dart | 99 ++++++---------- lib/src/dice_expression.dart | 13 +-- lib/src/dice_roller.dart | 4 +- lib/src/parser.dart | 78 ++++++------- lib/src/results.dart | 219 +++++++++++++++-------------------- lib/src/stats.dart | 14 +-- 8 files changed, 190 insertions(+), 286 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2cedadc..843494f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,7 @@ # 8.0.0 ## ⚠️⚠️ Breaking changes ⚠️⚠️ -Roll results have changed significantly (again). It's amazing what having users will do to a package! - -Rather than the result collection being a simple list of integers, each roll is a +Roll results have changed significantly (again). It's amazing what having users will do to a package! ## 📈 Enhancements @@ -18,7 +16,7 @@ Rather than the result collection being a simple list of integers, each roll is ## 📈 Enhancements - upgrade to dart 3.6.0 -- add roll notation to support defining your own values. `1d[val1,val2,val3]` +- add roll notation to support defining your own values. `1d[val1,val2,val3]`. For example, to roll 2 dice of primes under 20, use: `2d[2,3,5,7,11,13,17,19]` @@ -253,4 +251,3 @@ traverse the graph. # 0.0.1 - Initial version, created by Steve Christensen - diff --git a/example/simple.dart b/example/simple.dart index 5b0107a..902a268 100644 --- a/example/simple.dart +++ b/example/simple.dart @@ -36,24 +36,14 @@ Future main() async { // demonstrate navigation of the result graph assert(result2.total == 39); - assert( - listEquals( - result2.results, - [20, 19], - ), - ); + assert(listEquals(result2.results, [20, 19])); // read the score-related properties assert(!result2.hasSuccesses); assert(!result2.hasFailures); assert(!result2.hasCritFailures); assert(result2.hasCritSuccesses); assert(result2.metadata.score.critSuccessCount == 1); - assert( - listEquals( - result2.metadata.score.critSuccesses, - [20], - ), - ); + assert(listEquals(result2.metadata.score.critSuccesses, [20])); // look at the expression tree : // ((((4d20) kh 2) #cf ) #cs ) ===> RollSummary(total: 39, results: [20, 19], metadata: {rolled: [1, 12, 19, 20], discarded: [12, 1], score: {critSuccesses: [20]}}) @@ -65,12 +55,7 @@ Future main() async { final top = result2.detailedResults; assert(top.opType == OpType.count); assert( - top.metadata == - const RollMetadata( - score: RollScore( - critSuccesses: [20], - ), - ), + top.metadata == const RollMetadata(score: RollScore(critSuccesses: [20])), ); // next level is the count critical failures node of the graph // NOTE: despite there being a 1 rolled, the criticalFailure expression is _after_ the `1` is discarded by the lower expression @@ -78,27 +63,12 @@ Future main() async { assert(top.left!.metadata.score.hasCritFailures == false); assert(top.left!.left!.opType == OpType.drop); - assert( - listEquals( - top.left!.left!.metadata.discarded, - [12, 1], - ), - ); + assert(listEquals(top.left!.left!.metadata.discarded, [12, 1])); assert(top.left!.left!.left!.opType == OpType.rollDice); - assert( - listEquals( - top.left!.left!.left!.results, - [1, 12, 19, 20], - ), - ); - assert( - listEquals( - top.left!.left!.left!.metadata.rolled, - [1, 12, 19, 20], - ), - ); + assert(listEquals(top.left!.left!.left!.results, [1, 12, 19, 20])); + assert(listEquals(top.left!.left!.left!.metadata.rolled, [1, 12, 19, 20])); final stats = await DiceExpression.create('2d6', Random(1234)).stats(); // output: diff --git a/lib/src/ast.dart b/lib/src/ast.dart index 75260d9..99cdd59 100644 --- a/lib/src/ast.dart +++ b/lib/src/ast.dart @@ -13,11 +13,11 @@ const defaultRerollLimit = 1000; /// it must parse as an int, and an empty string will return empty set. class SimpleValue extends DiceExpression { SimpleValue(this.value) - : _results = RollResult( - expression: value, - opType: OpType.value, - results: value.isEmpty ? [] : [int.parse(value)], - ); + : _results = RollResult( + expression: value, + opType: OpType.value, + results: value.isEmpty ? [] : [int.parse(value)], + ); final String value; final RollResult _results; @@ -121,30 +121,28 @@ class CountOp extends Binary { final rhs = right(); var rhsEmptyAndSimpleCount = false; - final target = rhs.totalOrDefault( - () { - // if missing RHS, we can make assumptions depending on operator. - // - switch (name) { - case '#': - // example: '3d6#' should be 3. target is ignored in case statement below. - rhsEmptyAndSimpleCount = true; - return 0; - case '#s' || '#cs': - // example: '3d6#s' -- assume target is nsides (maximum) - return lhs.nsides; - case '#f' || '#cf': - // example: '3d6#f' -- assume target is 1 (minimum) - return 1; - default: - throw FormatException( - 'Invalid count operation. Missing count target', - toString(), - toString().length, - ); - } - }, - ); + final target = rhs.totalOrDefault(() { + // if missing RHS, we can make assumptions depending on operator. + // + switch (name) { + case '#': + // example: '3d6#' should be 3. target is ignored in case statement below. + rhsEmptyAndSimpleCount = true; + return 0; + case '#s' || '#cs': + // example: '3d6#s' -- assume target is nsides (maximum) + return lhs.nsides; + case '#f' || '#cf': + // example: '3d6#f' -- assume target is 1 (minimum) + return 1; + default: + throw FormatException( + 'Invalid count operation. Missing count target', + toString(), + toString().length, + ); + } + }); bool test(int v) { switch (name) { case '#>=' || '#s>=' || '#f>=' || '#cs>=' || '#cf>=': @@ -189,9 +187,7 @@ class CountOp extends Binary { return RollResult( expression: toString(), opType: OpType.count, - metadata: RollMetadata( - discarded: lhs.results, - ), + metadata: RollMetadata(discarded: lhs.results), results: [filteredResults.length], ndice: lhs.ndice, nsides: lhs.nsides, @@ -266,9 +262,7 @@ class DropOp extends Binary { ndice: lhs.ndice, nsides: lhs.nsides, results: results, - metadata: RollMetadata( - discarded: dropped, - ), + metadata: RollMetadata(discarded: dropped), left: lhs, right: rhs, ); @@ -316,9 +310,7 @@ class DropHighLowOp extends Binary { ndice: lhs.ndice, nsides: lhs.nsides, results: results, - metadata: RollMetadata( - discarded: dropped, - ), + metadata: RollMetadata(discarded: dropped), left: lhs, right: rhs, ); @@ -378,10 +370,7 @@ class ClampOp extends Binary { ndice: lhs.ndice, nsides: lhs.nsides, results: results, - metadata: RollMetadata( - discarded: discarded, - rolled: added, - ), + metadata: RollMetadata(discarded: discarded, rolled: added), left: lhs, right: rhs, ); @@ -427,9 +416,7 @@ class FudgeDice extends UnaryDice { roll, expression: toString(), opType: roll.opType, - metadata: RollMetadata( - rolled: roll.results, - ), + metadata: RollMetadata(rolled: roll.results), left: lhs, ); } @@ -473,9 +460,7 @@ class PercentDice extends UnaryDice { roll, expression: toString(), opType: OpType.rollPercent, - metadata: RollMetadata( - rolled: roll.results, - ), + metadata: RollMetadata(rolled: roll.results), left: lhs, ); } @@ -498,9 +483,7 @@ class D66Dice extends UnaryDice { opType: OpType.rollD66, ndice: ndice, results: results, - metadata: RollMetadata( - rolled: results, - ), + metadata: RollMetadata(rolled: results), left: lhs, ); } @@ -540,9 +523,7 @@ class StdDice extends BinaryDice { roll, expression: toString(), opType: roll.opType, - metadata: RollMetadata( - rolled: roll.results, - ), + metadata: RollMetadata(rolled: roll.results), left: lhs, right: rhs, ); @@ -633,10 +614,7 @@ class RerollDice extends BinaryDice { ndice: lhs.ndice, nsides: lhs.nsides, results: results, - metadata: RollMetadata( - rolled: added, - discarded: discarded, - ), + metadata: RollMetadata(rolled: added, discarded: discarded), left: lhs, right: rhs, ); @@ -722,10 +700,7 @@ class CompoundingDice extends BinaryDice { ndice: lhs.ndice, nsides: lhs.nsides, results: results, - metadata: RollMetadata( - rolled: added, - discarded: discarded, - ), + metadata: RollMetadata(rolled: added, discarded: discarded), left: lhs, right: rhs, ); diff --git a/lib/src/dice_expression.dart b/lib/src/dice_expression.dart index b5c4ebc..7e17e20 100644 --- a/lib/src/dice_expression.dart +++ b/lib/src/dice_expression.dart @@ -14,9 +14,7 @@ abstract class DiceExpression { static List listeners = [defaultListener]; static List summaryListeners = []; - static void registerListener( - Function(RollResult rollResult) callback, - ) { + static void registerListener(Function(RollResult rollResult) callback) { listeners.add(callback); } @@ -58,10 +56,7 @@ abstract class DiceExpression { /// Parse the given input into a DiceExpression /// /// Throws [FormatException] if invalid - static DiceExpression create( - String input, [ - Random? random, - ]) { + static DiceExpression create(String input, [Random? random]) { final builder = parserBuilder(DiceRoller(random)); final result = builder.parse(input); if (result is Failure) { @@ -108,9 +103,7 @@ abstract class DiceExpression { /// Performs [num] rolls and outputs stats (stddev, mean, min/max, and a histogram) /// /// Throws [FormatException] - Future> stats({ - int num = 1000, - }) async { + Future> stats({int num = 1000}) async { final stats = StatsCollector(); await for (final r in rollN(num)) { diff --git a/lib/src/dice_roller.dart b/lib/src/dice_roller.dart index 3c975c8..7c16527 100644 --- a/lib/src/dice_roller.dart +++ b/lib/src/dice_roller.dart @@ -49,8 +49,8 @@ class DiceRoller with LoggingMixin { /// select n items from the list of values List selectN(int n, List vals) => [ - for (var i = 0; i < n; i++) vals[_random.nextInt(vals.length)], - ]; + for (var i = 0; i < n; i++) vals[_random.nextInt(vals.length)], + ]; /// Roll N fudge dice, return results RollResult rollFudge(int ndice) { diff --git a/lib/src/parser.dart b/lib/src/parser.dart index 423ee5f..38632bd 100644 --- a/lib/src/parser.dart +++ b/lib/src/parser.dart @@ -8,28 +8,23 @@ Parser parserBuilder(DiceRoller roller) { final builder = ExpressionBuilder(); // numbers builder.primitive( - digit().star().flatten(message: 'integer expected').trim().map(SimpleValue.new), + digit() + .star() + .flatten(message: 'integer expected') + .trim() + .map(SimpleValue.new), ); // parens builder.group().wrapper( - char('(').trim(), - char(')').trim(), - (left, value, right) => value, - ); + char('(').trim(), + char(')').trim(), + (left, value, right) => value, + ); // special dice handling need to have higher precedence than 'd' builder.group() - ..postfix( - string('dF').trim(), - (a, op) => FudgeDice(op, a, roller), - ) - ..postfix( - string('D66').trim(), - (a, op) => D66Dice(op, a, roller), - ) - ..postfix( - string('d%').trim(), - (a, op) => PercentDice(op, a, roller), - ) + ..postfix(string('dF').trim(), (a, op) => FudgeDice(op, a, roller)) + ..postfix(string('D66').trim(), (a, op) => D66Dice(op, a, roller)) + ..postfix(string('d%').trim(), (a, op) => PercentDice(op, a, roller)) ..postfix( seq4( char('d').trim(), @@ -43,20 +38,20 @@ Parser parserBuilder(DiceRoller roller) { (a, op) => CSVDice(op.toString(), a, roller, op.$3), ); builder.group().left( - char('d').trim(), - (a, op, b) => StdDice(op, a, b, roller), - ); + char('d').trim(), + (a, op, b) => StdDice(op, a, b, roller), + ); // compounding dice (has to be in separate group from exploding) builder.group().left( - (string('!!') & - pattern('o', ignoreCase: true).optional() & - pattern('<>').optional() & - char('=').optional()) - .flatten() - .trim(), - (a, op, b) => CompoundingDice(op.toLowerCase(), a, b, roller), - ); + (string('!!') & + pattern('o', ignoreCase: true).optional() & + pattern('<>').optional() & + char('=').optional()) + .flatten() + .trim(), + (a, op, b) => CompoundingDice(op.toLowerCase(), a, b, roller), + ); builder.group() // reroll & reroll once ..left( @@ -80,7 +75,9 @@ Parser parserBuilder(DiceRoller roller) { ) // cap/clamp >,< ..left( - (pattern('c', ignoreCase: true) & pattern('<>').optional()).flatten().trim(), + (pattern('c', ignoreCase: true) & pattern('<>').optional()) + .flatten() + .trim(), (a, op, b) => ClampOp(op.toLowerCase(), a, b), ) // drop >=,<=,>,< @@ -99,7 +96,10 @@ Parser parserBuilder(DiceRoller roller) { ) // keep low/high ..left( - (pattern('k', ignoreCase: true) & pattern('lh',ignoreCase: true).optional()).flatten().trim(), + (pattern('k', ignoreCase: true) & + pattern('lh', ignoreCase: true).optional()) + .flatten() + .trim(), (a, op, b) => DropHighLowOp(op.toLowerCase(), a, b), ); @@ -110,14 +110,14 @@ Parser parserBuilder(DiceRoller roller) { // count >=, <=, <, >, =, // #s, #cs, #f, #cf -- count (critical) successes / failures builder.group().left( - (char('#') & - char('c').optional() & - pattern('sf').optional() & - pattern('<>').optional() & - char('=').optional()) - .flatten() - .trim(), - (a, op, b) => CountOp(op.toLowerCase(), a, b), - ); + (char('#') & + char('c').optional() & + pattern('sf').optional() & + pattern('<>').optional() & + char('=').optional()) + .flatten() + .trim(), + (a, op, b) => CountOp(op.toLowerCase(), a, b), + ); return builder.build().end(); } diff --git a/lib/src/results.dart b/lib/src/results.dart index 588f94b..d605029 100644 --- a/lib/src/results.dart +++ b/lib/src/results.dart @@ -21,15 +21,9 @@ enum OpType { explode, } -enum CountType { - count, - success, - failure, - critSuccess, - critFailure; -} +enum CountType { count, success, failure, critSuccess, critFailure } -/// RollScore represents the # of successes and failures. +/// RollScore represents the number of successes and failures. class RollScore extends Equatable { const RollScore({ this.successes = const [], @@ -41,21 +35,13 @@ class RollScore extends Equatable { factory RollScore.forCountType(CountType countType, List vals) { switch (countType) { case CountType.success: - return RollScore( - successes: vals, - ); + return RollScore(successes: vals); case CountType.failure: - return RollScore( - failures: vals, - ); + return RollScore(failures: vals); case CountType.critSuccess: - return RollScore( - critSuccesses: vals, - ); + return RollScore(critSuccesses: vals); case CountType.critFailure: - return RollScore( - critFailures: vals, - ); + return RollScore(critFailures: vals); case CountType.count: throw UnimplementedError(); } @@ -91,29 +77,24 @@ class RollScore extends Equatable { bool get hasCritFailures => critFailures.isNotEmpty; @override - List get props => [ - successes, - failures, - critSuccesses, - critFailures, - ]; + List get props => [successes, failures, critSuccesses, critFailures]; @override String toString() => '${toJson()}'; Map toJson() => { - 'successes': successes, - 'failures': failures, - 'critSuccesses': critSuccesses, - 'critFailures': critFailures, - }..removeWhere((k, v) => (v is List && v.isEmpty)); + 'successes': successes, + 'failures': failures, + 'critSuccesses': critSuccesses, + 'critFailures': critFailures, + }..removeWhere((k, v) => (v is List && v.isEmpty)); RollScore operator +(RollScore other) => RollScore( - successes: successes + other.successes, - failures: failures + other.failures, - critSuccesses: critSuccesses + other.critSuccesses, - critFailures: critFailures + other.critFailures, - ); + successes: successes + other.successes, + failures: failures + other.failures, + critSuccesses: critSuccesses + other.critSuccesses, + critFailures: critFailures + other.critFailures, + ); } /// RollMetadata represents 'interesting' things that happens during certain operations. @@ -136,28 +117,22 @@ class RollMetadata extends Equatable { bool get isNotEmpty => !isEmpty; @override - List get props => [ - rolled, - discarded, - score, - ]; + List get props => [rolled, discarded, score]; @override String toString() => '${toJson()}'; Map toJson() => { - 'rolled': rolled, - 'discarded': discarded, - 'score': score.toJson(), - }..removeWhere( - (k, v) => (v is List && v.isEmpty) || (v is Map && v.isEmpty), - ); + 'rolled': rolled, + 'discarded': discarded, + 'score': score.toJson(), + }..removeWhere((k, v) => (v is List && v.isEmpty) || (v is Map && v.isEmpty)); RollMetadata operator +(RollMetadata other) => RollMetadata( - rolled: rolled + other.rolled, - discarded: discarded + other.discarded, - score: score + other.score, - ); + rolled: rolled + other.rolled, + discarded: discarded + other.discarded, + score: score + other.score, + ); } /// [RollSummary] is the final result of rolling a dice expression. @@ -173,9 +148,7 @@ class RollMetadata extends Equatable { /// you may need to traverse the tree to inspect all the events. class RollSummary extends Equatable { - RollSummary({ - required this.detailedResults, - }) { + RollSummary({required this.detailedResults}) { total = detailedResults.results.sum; results = detailedResults.results; expression = detailedResults.expression; @@ -204,12 +177,12 @@ class RollSummary extends Equatable { @override List get props => [ - total, - expression, - results, - //detailedResults, - metadata, - ]; + total, + expression, + results, + //detailedResults, + metadata, + ]; @override String toString() { @@ -223,20 +196,21 @@ class RollSummary extends Equatable { return buffer.toString(); } - Map toJson() => { + Map toJson() => + { 'expression': expression, 'total': total, 'results': results, 'detailedResults': detailedResults.toJson(), 'metadata': metadata.toJson(), }..removeWhere( - (k, v) => - v == null || - (v is Map && v.isEmpty) || - (v is List && v.isEmpty) || - (v is RollScore && v.isEmpty) || - (v is int && v == 0), - ); + (k, v) => + v == null || + (v is Map && v.isEmpty) || + (v is List && v.isEmpty) || + (v is RollScore && v.isEmpty) || + (v is int && v == 0), + ); String toStringPretty() { final buffer = StringBuffer(); @@ -275,17 +249,16 @@ class RollResult extends Equatable { RollMetadata metadata = const RollMetadata(), RollResult? left, RollResult? right, - }) => - RollResult( - expression: expression, - ndice: ndice ?? other.ndice, - nsides: nsides ?? other.nsides, - results: results ?? other.results, - opType: opType ?? other.opType, - metadata: metadata, - left: left ?? other.left, - right: right ?? other.right, - ); + }) => RollResult( + expression: expression, + ndice: ndice ?? other.ndice, + nsides: nsides ?? other.nsides, + results: results ?? other.results, + opType: opType ?? other.opType, + metadata: metadata, + left: left ?? other.left, + right: right ?? other.right, + ); /// addition operator for [RollResult]. /// @@ -293,41 +266,41 @@ class RollResult extends Equatable { /// this is so we can explode a dice expr like `(2d6 + 1)!`. /// NOTE: A side-effect of this decision is `(2d6 + 2d10)!` will explode with 10s, not 6s. RollResult operator +(RollResult other) => RollResult.fromRollResult( - other, - expression: '($expression + ${other.expression})', - results: results + other.results, - nsides: max(nsides, other.nsides), - opType: OpType.add, - left: this, - right: other, - ); + other, + expression: '($expression + ${other.expression})', + results: results + other.results, + nsides: max(nsides, other.nsides), + opType: OpType.add, + left: this, + right: other, + ); /// multiplication operator for [RollResult]. /// /// Results are collapsed into a single value (the result of multiplication). /// RollResult operator *(RollResult other) => RollResult.fromRollResult( - other, - expression: '($expression * ${other.expression})', - results: [results.sum * other.results.sum], - opType: OpType.multiply, - left: this, - right: other, - ); + other, + expression: '($expression * ${other.expression})', + results: [results.sum * other.results.sum], + opType: OpType.multiply, + left: this, + right: other, + ); /// subtraction operator for [RollResult]. /// /// Results create new list lhs.results + (-1)*(other.results). /// RollResult operator -(RollResult other) => RollResult.fromRollResult( - other, - expression: '($expression - ${other.expression})', - opType: OpType.subtract, - results: results + other.results.map((v) => v * -1).toList(), - nsides: max(nsides, other.nsides), - left: this, - right: other, - ); + other, + expression: '($expression - ${other.expression})', + opType: OpType.subtract, + results: results + other.results.map((v) => v * -1).toList(), + nsides: max(nsides, other.nsides), + left: this, + right: other, + ); /// the parsed expression final String expression; @@ -350,16 +323,16 @@ class RollResult extends Equatable { @override List get props => [ - expression, - opType, - nsides, - ndice, - results, - metadata, - opType, - //left, - //right, - ]; + expression, + opType, + nsides, + ndice, + results, + metadata, + opType, + //left, + //right, + ]; /// Get the total, or if results are empty return result of calling [defaultCb]. int totalOrDefault(int Function() defaultCb) { @@ -388,7 +361,8 @@ class RollResult extends Equatable { String toStringPretty({String indent = ''}) => pprint(this, indent: indent); - Map toJson() => { + Map toJson() => + { 'expression': expression, 'opType': opType.name, 'nsides': nsides, @@ -402,12 +376,12 @@ class RollResult extends Equatable { ? right?.toJson() : null, }..removeWhere( - (k, v) => - v == null || - (v is Map && v.isEmpty) || - (v is List && v.isEmpty) || - (v is int && v == 0), - ); + (k, v) => + v == null || + (v is Map && v.isEmpty) || + (v is List && v.isEmpty) || + (v is int && v == 0), + ); } String pprint(RollResult? rr, {String indent = ''}) { @@ -424,12 +398,7 @@ String pprint(RollResult? rr, {String indent = ''}) { if (rr.right != null && rr.right?.opType != OpType.value) { buffer ..write('\n') - ..write( - pprint( - rr.right, - indent: '$indent ', - ), - ); + ..write(pprint(rr.right, indent: '$indent ')); } return buffer.toString(); diff --git a/lib/src/stats.dart b/lib/src/stats.dart index 24e429c..cbaaffc 100644 --- a/lib/src/stats.dart +++ b/lib/src/stats.dart @@ -50,11 +50,11 @@ class StatsCollector { /// retrieve stats as map Map toJson({int precision = 3}) => { - 'mean': double.parse(_mean.toStringAsPrecision(precision)), - 'stddev': double.parse(_stddev.toStringAsPrecision(precision)), - 'min': _minVal, - 'max': _maxVal, - 'count': _count, - 'histogram': _histogram, - }; + 'mean': double.parse(_mean.toStringAsPrecision(precision)), + 'stddev': double.parse(_stddev.toStringAsPrecision(precision)), + 'min': _minVal, + 'max': _maxVal, + 'count': _count, + 'histogram': _histogram, + }; } From 95f435dbfae66baa9dbaeb2366cd90d92677692d Mon Sep 17 00:00:00 2001 From: Steve Christensen Date: Thu, 26 Jun 2025 23:02:19 -0600 Subject: [PATCH 04/31] RollResult's results are now list of RolledDie introduce new object to hold roll results. among the fixes this will enable is exploding after a sum of heterogenous die `((1d6 + 1d8)-L)!`. it'll also enable roll rendering in client applications --- CHANGELOG.md | 89 +++++- README.md | 302 +++++++++--------- example/simple.dart | 69 ++-- lib/src/ast.dart | 340 +++++++++----------- lib/src/dice_roller.dart | 28 +- lib/src/results.dart | 536 +++++++++++++++++++++----------- test/dart_dice_parser_test.dart | 374 +++++++++------------- 7 files changed, 934 insertions(+), 804 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 843494f..4f57e7a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,36 +1,46 @@ # 8.0.0 + ## ⚠️⚠️ Breaking changes ⚠️⚠️ Roll results have changed significantly (again). It's amazing what having users will do to a package! - ## 📈 Enhancements + - upgrade to dart 3.8.0 - upgrade to petitparser 7.0.0 +- remove metadata & score from RollResult +- rather than simple list of Integers representing the output of a roll or operation, now each + die rolled is a 'RolledDie' object which has the metadata/score. +- RollResult.results will include both discarded an not-discarded RolledDie. TODO: change? # 7.1.1 + ## 🛠️ Bug fixes + - fix typo in readme # 7.1.0 ## 📈 Enhancements + - upgrade to dart 3.6.0 - add roll notation to support defining your own values. `1d[val1,val2,val3]`. - For example, to roll 2 dice of primes under 20, use: `2d[2,3,5,7,11,13,17,19]` - + For example, to roll 2 dice of primes under 20, use: `2d[2,3,5,7,11,13,17,19]` # 7.0.3 ## 🛠️ Bug fixes + - Previously, `4d6 + 3d6 #s #f` would only count success/failures of the 3d6 rolls, since counting had higher priority than the plus operation. You could workaround that with parens `(4d6 + 3d6) #s #f` In 7.0.3 and later, the counting operations now have the lowest priority. # 7.0.2 + - remove demo code accidentally added # 7.0.1 + - remove direct dependency on `meta` # 7.0.0 @@ -42,175 +52,219 @@ a tree of results from evaluating the dice expression. See the README for exampl traverse the graph. ## 📈 Enhancements + - new API for registering roll listeners. see README.md - analysis cleanup and dep upgrades ## 🛠️ Bug fixes -- propagate the roll metadata up to the top of the graph +- propagate the roll metadata up to the top of the graph # 6.0.2 + - more readme fixes - cleanup error handling / exceptions # 6.0.1 + - fix deprecation - minor readme language changes # 6.0.0 + - dart 3.0 requirement - upgrade deps # 5.1.5 + - clean up example documenation in README.md # 5.1.4 + - upgrade deps (lint) # 5.1.3 + - transfer repository to Adventuresmith org # 5.1.2 + - fix error messages with extraneous `'` - make examples in README less abstract - add method for json encoding roll result # 5.1.1 + - add syntax for exploding/compounding/reroll once - - `4d6 !o` - - `4d6 !!o` - - `4d6 ro` + - `4d6 !o` + - `4d6 !!o` + - `4d6 ro` - add syntax for success, failure, as well as crit success & failure. - - `4d6 #s=6` - - plain `#` counts results and transforms the expression from rolls into a count. - - but `#s`, `#f`, `#cs`, `#cf` only add metadata to the roll result, and can be chained together. - - `9d6! -= 3 #s>=5#f1#cs` -- roll 9d6 with exploding, drop any threes, count >=5 as success, 1s as failures, and 6 as critical success + - `4d6 #s=6` + - plain `#` counts results and transforms the expression from rolls into a count. + - but `#s`, `#f`, `#cs`, `#cf` only add metadata to the roll result, and can be chained together. + - `9d6! -= 3 #s>=5#f1#cs` -- roll 9d6 with exploding, drop any threes, count >=5 as success, 1s as failures, and + 6 as critical success # 5.1.0 + - make RollResult aggregate _all_ results for whole AST # 5.0.0 + - add compounding dice: `5d6!!` - add keep high/low: `2d20k` - add reroll: `10d4 r<=2` - allow exploding/compounding dice to have an rhs expression (>=,<=,=,<,>) - remove `!!` as 'limited explosion' (make it compounding, like Roll20 dice notation) -- fix syntax for exploding dice (2d6!, not 2d!6). -- remove exploding method from DiceRoller -- now it's part of the AST. +- fix syntax for exploding dice (2d6!, not 2d!6). +- remove exploding method from DiceRoller -- now it's part of the AST. - dice rolls return RollResult - clean up redundant parser config # 4.1.0 + - cleanup examples - add syntax for `>=` and `<=` for counts, drop, clamp - remove redundancy in parser defintion # 4.0.6 + - allow subtraction # 4.0.5 + - remove unused dev dependency # 4.0.4 + - fix typo in unit test # 4.0.3 + - increase test coverage -- test rollN and stats. # 4.0.1 + - add github actions, remove circleci - add codecov # 4.0.0 + - cleanup petitparser usage -- generate AST so that parsing the dice expression can be separate from rolling dice. # 3.1.0 + - remove subtraction - clean up add/mult -- don't collapse lists to ints - - `[1,4,5] + 2` => `[1,4,5,2]` - - `[1,4,5] * 2` => `[2,8,10]` + - `[1,4,5] + 2` => `[1,4,5,2]` + - `[1,4,5] * 2` => `[2,8,10]` - remove subtraction -- like division, too many corner cases - clean up error handling -- throw less often, less complex if/else statements. # 3.0.3 -- update linter and fix analysis + +- update linter and fix analysis # 3.0.2 + - fix circleci build # 3.0.1 + - minor analysis cleanup (dead code) # 3.0.0 + - upgrade deps & null safety - more error handling # 2.0.1 + - downgrade petitparser # 2.0.0 + - library upgrades including sdk >2.7.0 # 1.4.2 + - use unmodifiable view return types # 1.4.1 + - fix return types of stats objects # 1.4.0 + - replace use of stats library w/ implementation of welford's algorithm. see http://alias-i.com/lingpipe/docs/api/com/aliasi/stats/OnlineNormalEstimator.html - make DiceParser.rollN an async generator returning stream of results # 1.3.6 + - allow lowercase for `-H`, `-L`, `C>`, `C<` # 1.3.5 + - back off petitparser dependency -- back off to 2.2.1, so that we don't have dependency on Dart 2.3.0 (current stable flutter is 2.3.0-dev) # 1.3.4 + - make code more idiomatic # 1.3.3 + - make log fields non-public # 1.3.2 + - upgrade mockito dep # 1.3.0 + - add drop equals/less-than/greater-than - add cap/clamp - add counting operation - add exploding dice # 1.2.2 + - more logging and error handling cleanup # 1.2.1 + - more logging and error handling cleanup # 1.2.0 + - add dice stats to the parser - logging & error handling cleanup # 1.1.2 + - more tests and cleanup examples # 1.1.1 + - fix typo in readme # 1.1.0 + - add drop high/low parsing # 1.0.2 + - fix readme example # 1.0.1 + - fix readme issues # 1.0.0 + - bump min dart SDK to 2.2.2 - cleanup parser code - cleanup analysis problems @@ -219,12 +273,15 @@ traverse the graph. - flesh out API docs # 0.2.2 + - reformat # 0.2.1 + - upgrade some dependencies # 0.2.0 + - upgrade to dart 2 # 0.1.2 diff --git a/README.md b/README.md index 7c154e7..9b4e690 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,12 @@ # dart_dice_parser + [![Pub Package](https://img.shields.io/pub/v/dart_dice_parser.svg)](https://pub.dartlang.org/packages/dart_dice_parser) [![Dart](https://github.com/Adventuresmith/dart-dice-parser/actions/workflows/dart.yml/badge.svg)](https://github.com/Adventuresmith/dart-dice-parser/actions/workflows/dart.yml) [![codecov](https://codecov.io/gh/Adventuresmith/dart-dice-parser/branch/main/graph/badge.svg?token=YG5OYN9VY1)](https://codecov.io/gh/Adventuresmith/dart-dice-parser) [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](CODE_OF_CONDUCT.md) [![style: lint](https://img.shields.io/badge/style-lint-4BC0F5.svg)](https://pub.dev/packages/lint) - - -A dart library for parsing dice notation (`2d6+4`). Supports advantage/disadvantage, counting success/failures, +A dart library for parsing dice notation (`2d6+4`). Supports advantage/disadvantage, counting success/failures, exploding, compounding, and other variations. # Example @@ -22,11 +21,11 @@ void main() { stdout.writeln(d20adv.roll()); // outputs: - // ((2d20) kh ) ===> RollSummary(total: 16, results: [16], metadata: {rolled: [4, 16], discarded: [4]}) + // ((2d20) kh ) ===> RollSummary(total: 16, results: [16(d20), 4(d20)⛔︎]) stdout.writeln(d20adv.roll()); // outputs: - // ((2d20) kh ) ===> RollSummary(total: 19, results: [19], metadata: {rolled: [13, 19], discarded: [13]}) + // ((2d20) kh ) ===> RollSummary(total: 19, results: [19(d20), 13(d20)⛔︎]) } ``` @@ -35,10 +34,10 @@ void main() { ## Examples: * `2d20 #cf #cs` - * roll 2d20, result will include counts of critical successes (20) and failures (1) + * roll 2d20, result will include counts of critical successes (20) and failures (1) * advantage - * `2d20-L` -- drop lowest + * `2d20-L` -- drop lowest * `2d20k`, `2d20kh` -- keep highest * disadvantage * `2d20-H` -- drop highest @@ -46,103 +45,106 @@ void main() { * `(2d10+3d20)-L3` -- roll 2d10 and 3d20, combine the two results lists, and drop lowest 3 results * `20d10-<3->8#` -- roll 20 d10, drop any less than 3 or greater than 8 and count the number of remaining dice - ## Supported notation * `2d6` -- roll `2` dice of `6` sides * special dice variations: - * `4dF` -- roll `4` fudge dice (sides: `[-1, -1, 0, 0, 1, 1]`) - * `1d%` -- roll `1` percentile dice (equivalent to `1d100`) - * `1D66` -- roll `1` D66, aka `1d6*10 + 1d6` - * **_NOTE_**: you _must_ use uppercase `D66`, lowercase `d66` will be interpreted as a 66-sided die - * `2d[2,3,5,7]`-- roll 2 dice with values `[2,3,5,7]` - + * `4dF` -- roll `4` fudge dice (sides: `[-1, -1, 0, 0, 1, 1]`) + * `1d%` -- roll `1` percentile dice (equivalent to `1d100`) + * `1D66` -- roll `1` D66, aka `1d6*10 + 1d6` + * **_NOTE_**: you _must_ use uppercase `D66`, lowercase `d66` will be interpreted as a 66-sided die + * `2d[2,3,5,7]`-- roll 2 dice with values `[2,3,5,7]` + * exploding dice - * `4d6!` -- roll `4` `6`-sided dice, explode if max (`6`) is rolled (re-roll and include in results) - * `4d6 !=5` or `4d6!5` -- explode a roll if equal to 5 - * `4d6 !>=4` - explode if >= 4 - * `4d6 !<=2` - explode if <=2 - * `4d6 !>5` - explode if > 5 - * `4d6 !<2` - explode if <2 - * To explode only once, use syntax `!o` - * `4d6 !o<5` + * `4d6!` -- roll `4` `6`-sided dice, explode if max (`6`) is rolled (re-roll and include in results) + * `4d6 !=5` or `4d6!5` -- explode a roll if equal to 5 + * `4d6 !>=4` - explode if >= 4 + * `4d6 !<=2` - explode if <=2 + * `4d6 !>5` - explode if > 5 + * `4d6 !<2` - explode if <2 + * To explode only once, use syntax `!o` + * `4d6 !o<5` * compounding dice (Shadowrun, L5R, etc). Similar to exploding, but the additional rolls for each dice are added together as a single "roll". The original roll is replaced by the sum of it and any additional rolls. - * `5d6 !!` -- roll `5` `6`-sided dice, compound - * `5d6 !!=5` or `5d6!5` -- compound a roll if equal to 5 - * `5d6 !!>=4` - compound if >= 4 - * `5d6 !!<=4` - compound if <= 4 - * `5d6 !!>5` - compound if > 5 - * `5d6 !!<3` - compound if < 3 - * To compound only once, use syntax `!!o` - * `5d6 !!o<2` + * `5d6 !!` -- roll `5` `6`-sided dice, compound + * `5d6 !!=5` or `5d6!5` -- compound a roll if equal to 5 + * `5d6 !!>=4` - compound if >= 4 + * `5d6 !!<=4` - compound if <= 4 + * `5d6 !!>5` - compound if > 5 + * `5d6 !!<3` - compound if < 3 + * To compound only once, use syntax `!!o` + * `5d6 !!o<2` * re-rolling dice: - * `4d4 r2` -- roll 4d4, re-roll any result = 2 - * `4d4 r=2` -- roll 4d4, re-roll any result = 2 - * `4d4 r<=2` -- roll 4d4, re-roll any <= 2 - * `4d4 r>=3` -- roll 4d4, re-roll any >= 3 - * `4d4 r<2` -- roll 4d4, re-roll any < 2 - * `4d4 r>3` -- roll 4d4, re-roll any > 3 - * To reroll only once, use syntax `ro` - * `4d4 ro<2` + * `4d4 r2` -- roll 4d4, re-roll any result = 2 + * `4d4 r=2` -- roll 4d4, re-roll any result = 2 + * `4d4 r<=2` -- roll 4d4, re-roll any <= 2 + * `4d4 r>=3` -- roll 4d4, re-roll any >= 3 + * `4d4 r<2` -- roll 4d4, re-roll any < 2 + * `4d4 r>3` -- roll 4d4, re-roll any > 3 + * To reroll only once, use syntax `ro` + * `4d4 ro<2` * keeping dice: - * `3d20 k 2` -- roll 3d20, keep 2 highest - * `3d20 kh 2` -- roll 3d20, keep 2 highest - * `3d20 kl 2` -- roll 3d20, keep 2 lowest + * `3d20 k 2` -- roll 3d20, keep 2 highest + * `3d20 kh 2` -- roll 3d20, keep 2 highest + * `3d20 kl 2` -- roll 3d20, keep 2 lowest * dropping dice: - * `4d6 -H` -- roll 4d6, drop 1 highest - * `4d6 -L` -- roll 4d6, drop 1 lowest - * `4d6 -H2` -- roll 4d6, drop 2 highest - * `4d6 -L2` -- roll 4d6, drop 2 lowest - * `4d6 ->5` -- roll 4d6, drop any results > 5 - * `4d6 -<2` -- roll 4d6, drop any results < 2 - * `4d6 ->=5` -- roll 4d6, drop any results >= 5 - * `4d6 -<=2` -- roll 4d6, drop any results <= 2 - * `4d6 -=1` -- roll 4d6, drop any results equal to 1 - * NOTE: the drop operators have higher precedence than - the arithmetic operators; `4d10-L2+2` is equivalent to `(4d10-L2)+2` - * NOTE: drop is not subtraction. - * `4d6 - 3` -- roll 4d6, subtract 3 - * `4d6 - 2d6` -- roll 4d6, subtract the result of rolling 2d6 + * `4d6 -H` -- roll 4d6, drop 1 highest + * `4d6 -L` -- roll 4d6, drop 1 lowest + * `4d6 -H2` -- roll 4d6, drop 2 highest + * `4d6 -L2` -- roll 4d6, drop 2 lowest + * `4d6 ->5` -- roll 4d6, drop any results > 5 + * `4d6 -<2` -- roll 4d6, drop any results < 2 + * `4d6 ->=5` -- roll 4d6, drop any results >= 5 + * `4d6 -<=2` -- roll 4d6, drop any results <= 2 + * `4d6 -=1` -- roll 4d6, drop any results equal to 1 + * NOTE: the drop operators have higher precedence than + the arithmetic operators; `4d10-L2+2` is equivalent to `(4d10-L2)+2` + * NOTE: drop is not subtraction. + * `4d6 - 3` -- roll 4d6, subtract 3 + * `4d6 - 2d6` -- roll 4d6, subtract the result of rolling 2d6 * cap/clamp: - * `4d20 C<5` -- roll 4d20, change any value < 5 to 5 - * `4d20 C>15` -- roll 4d20, change any value > 15 to 15 + * `4d20 C<5` -- roll 4d20, change any value < 5 to 5 + * `4d20 C>15` -- roll 4d20, change any value > 15 to 15 * scoring dice rolls: - * counting: - * `4d6 #` -- how many results? - * For example, you might use this to count # of dice above a target. `(5d10 -<6)#` -- roll 5 d10, drop any less than 6, count results - * `4d6 #>3` -- roll 4d6, count any > 3 - * `4d6 #<3` -- roll 4d6, count any < 3 - * `4d6 #>=5` -- roll 4d6, count any >= 5 - * `4d6 #<=2` -- roll 4d6, count any <= 2 - * `4d6 #=5` -- roll 4d6, count any equal to 5 - * successes and failures - * A normal count operation `#` discards the rolled dice and changes the result to be the count - * For example, `2d6#<=3` rolls `[3,4]` then counts which results are `<=3` , returning `[1]` - * But, sometimes you want to be able to count successes/failures without discarding the dice rolls. - In this case, use modifiers `#s`, `#f`, `#cs`, `#cf` to add metadata to the results. - * `6d6 #f<=2 #s>=5 #cs6 #cf1` -- roll 6d6, count results <= 2 as failures, >= 5 as successes, =6 as critical successes, =1 as critical failures - * The above returns a result like: `RollSummary(total: 22, results: [6, 2, 1, 5, 3, 5], metadata: {rolled: [6, 2, 1, 5, 3, 5], score: {successes: [6, 5, 5], failures: [2, 1], critSuccesses: [6], critFailures: [1]}})` - * NOTE: order matters - * `2d20 kh #cf #cs` -- roll 2d20, keep the highest, count critical successes & failures. If this - rolled `[1,18]`, the `1` is dropped and the result metadata won't record a critical failure. - If that's not the behavior you want, move the counts prior to the drop (`2d20 #cf #cs kh`). - -* arithmetic operations - * parenthesis to force a certain order of operations - * addition is a little special -- could be a sum of ints, or it can be used to aggregate results of multiple dice rolls - * Addition of integers is the usual sum - * `4+5` - * `2d6 + 1` - * Addition of roll results combines the results (use parens to ensure the order of operations is what you desire) - * `(5d6+5d10)-L2` -- roll 5d6 and 5d10, and from aggregate results drop the lowest 2. - * `5d6+5d10-L2` -- roll 5d6 and 5d10, and from only the 5d10 results drop the lowest 2. equivalent to `5d6+(5d10-L2)` - * `*` for multiplication - * `-` for subtraction - * numbers must be integers - * division is not supported. + * counting: + * `4d6 #` -- how many results? + * For example, you might use this to count # of dice above a target. `(5d10 -<6)#` -- roll 5 d10, drop any + less than 6, count results + * `4d6 #>3` -- roll 4d6, count any > 3 + * `4d6 #<3` -- roll 4d6, count any < 3 + * `4d6 #>=5` -- roll 4d6, count any >= 5 + * `4d6 #<=2` -- roll 4d6, count any <= 2 + * `4d6 #=5` -- roll 4d6, count any equal to 5 + * successes and failures + * A normal count operation `#` discards the rolled dice and changes the result to be the count + * For example, `2d6#<=3` rolls `[3,4]` then counts which results are `<=3` , returning `[1]` + * But, sometimes you want to be able to count successes/failures without discarding the dice rolls. + In this case, use modifiers `#s`, `#f`, `#cs`, `#cf` to add metadata to the results. + * `6d6 #f<=2 #s>=5 #cs6 #cf1` -- roll 6d6, count results <= 2 as failures, >= 5 as successes, =6 as critical + successes, =1 as critical failures + * The above returns a result like: + `RollSummary(total: 22, results: [6, 2, 1, 5, 3, 5], metadata: {rolled: [6, 2, 1, 5, 3, 5], score: {successes: [6, 5, 5], failures: [2, 1], critSuccesses: [6], critFailures: [1]}})` + * NOTE: order matters + * `2d20 kh #cf #cs` -- roll 2d20, keep the highest, count critical successes & failures. If this + rolled `[1,18]`, the `1` is dropped and the result does not record a critical failure. +* arithmetic operations + * parenthesis to force a certain order of operations + * addition is a little special -- could be a sum of ints, or it can be used to aggregate results of multiple dice + rolls + * Addition of integers is the usual sum + * `4+5` + * `2d6 + 1` + * Addition of roll results combines the results (use parens to ensure the order of operations is what you + desire) + * `(5d6+5d10)-L2` -- roll 5d6 and 5d10, and from aggregate results drop the lowest 2. + * `5d6+5d10-L2` -- roll 5d6 and 5d10, and from only the 5d10 results drop the lowest 2. equivalent to + `5d6+(5d10-L2)` + * `*` for multiplication + * `-` for subtraction + * numbers must be integers + * division is not supported. # Random Number Generator @@ -156,25 +158,29 @@ For example, you might create a dice-rolling app that both provides rolls _and_ clicks a button), and the second to display min/max/mean/stddev/etc ```dart - final diceExpr_SecureRNG = DiceExpression.create('2d6'); - final diceExpr_FastRNG = DiceExpression.create('2d6', Random()); - - //.... - // on button-click, roll the dice - final roll = diceExpr_SecureRNG.roll(); - - //.... - // when dice expr changes, update the stats graph. - final stats = await diceExpr_FastRNG.stats(); - // output of stats: {mean: 6.98, stddev: 2.41, min: 2, max: 12, count: 10000, histogram: {2: 310, 3: 557, 4: 787, 5: 1090, 6: 1450, 7: 1646, 8: 1395, 9: 1147, 10: 825, 11: 526, 12: 267}} + +final diceExpr_SecureRNG = DiceExpression.create('2d6'); +final diceExpr_FastRNG = DiceExpression.create('2d6', Random()); + +//.... +// on button-click, roll the dice +final roll = diceExpr_SecureRNG.roll(); + +//.... +// when dice expr changes, update the stats graph. +final stats = await +diceExpr_FastRNG.stats +(); +// output of stats: {mean: 6.98, stddev: 2.41, min: 2, max: 12, count: 10000, histogram: {2: 310, 3: 557, 4: 787, 5: 1090, 6: 1450, 7: 1646, 8: 1395, 9: 1147, 10: 825, 11: 526, 12: 267}} ``` # CLI Usage -There's no executable in bin, but there's an example CLI at `example/main.dart`. +There's no executable in bin, but there's an example CLI at `example/main.dart`. Usage: + ``` ❯ dart run example/main.dart -h Usage: @@ -202,16 +208,16 @@ Examples: ```console ❯ dart example/main.dart '3d6' -(3d6) ===> RollSummary(total: 13, results: [3, 6, 4], metadata: {rolled: [3, 6, 4]}) - +(3d6) ===> RollSummary(total: 9, results: [6(d6), 2(d6), 1(d6)]) # run N number of rolls ❯ dart run example/main.dart -n5 '3d6' -(3d6) ===> RollSummary(total: 10, results: [2, 2, 6], metadata: {rolled: [2, 2, 6]}) -(3d6) ===> RollSummary(total: 12, results: [6, 4, 2], metadata: {rolled: [6, 4, 2]}) -(3d6) ===> RollSummary(total: 5, results: [2, 1, 2], metadata: {rolled: [2, 1, 2]}) -(3d6) ===> RollSummary(total: 10, results: [5, 3, 2], metadata: {rolled: [5, 3, 2]}) -(3d6) ===> RollSummary(total: 13, results: [4, 5, 4], metadata: {rolled: [4, 5, 4]}) +(3d6) ===> RollSummary(total: 6, results: [1(d6), 4(d6), 1(d6)]) +(3d6) ===> RollSummary(total: 9, results: [4(d6), 1(d6), 4(d6)]) +(3d6) ===> RollSummary(total: 14, results: [4(d6), 6(d6), 4(d6)]) +(3d6) ===> RollSummary(total: 10, results: [4(d6), 3(d6), 3(d6)]) +(3d6) ===> RollSummary(total: 6, results: [3(d6), 2(d6), 1(d6)]) + @@ -222,14 +228,14 @@ Examples: ``` Sometimes it's nice to change the output type so you can see the graph of results: + ```console # show the result graph: -❯ dart run example/main.dart -o pretty '3d6 #cs #cf' -(((3d6) #cs ) #cf ) ===> RollSummary(total: 13, results: [1, 6, 6], metadata: {rolled: [1, 6, 6], score: {critSuccesses: [6, 6], critFailures: [1]}}) - (((3d6) #cs ) #cf ) =count=> RollResult(total: 13, results: [1, 6, 6], metadata: {score: {critFailures: [1]}}) - ((3d6) #cs ) =count=> RollResult(total: 13, results: [1, 6, 6], metadata: {score: {critSuccesses: [6, 6]}}) - (3d6) =rollDice=> RollResult(total: 13, results: [1, 6, 6], metadata: {rolled: [1, 6, 6]}) - +❯ dart run example/main.dart -o pretty '3d6 #cs #cf' +(((3d6) #cs ) #cf ) ===> RollSummary(total: 9, results: [1(d6)❌, 3(d6), 5(d6)], critFailureCount: 1) + (((3d6) #cs ) #cf ) =count=> RollResult(total: 9, results: [1(d6)❌, 3(d6), 5(d6)]) + ((3d6) #cs ) =count=> RollResult(total: 9, results: [1(d6), 3(d6), 5(d6)]) + (3d6) =rollDice=> RollResult(total: 9, results: [1(d6), 3(d6), 5(d6)]) ❯ dart run example/main.dart -o json '3d6 #cs #cf' {"expression":"(((3d6) #cs ) #cf )","total":9,"results":[2,3,4],"detailedResults":{"expression":"(((3d6) #cs ) #cf )","opType":"count","nsides":6,"ndice":3,"results":[2,3,4],"left":{"expression":"((3d6) #cs )","opType":"count","nsides":6,"ndice":3,"results":[2,3,4],"left":{"expression":"(3d6)","opType":"rollDice","nsides":6,"ndice":3,"results":[2,3,4],"metadata":{"rolled":[2,3,4]}}}},"metadata":{"rolled":[2,3,4]}} @@ -239,10 +245,9 @@ Sometimes it's nice to change the output type so you can see the graph of result ## Statistics output +I often wonder, "what range of values should I expect?" or "how likely will this roll explode or compound?" -I often wonder, "what range of values should I expect?" or "how likely will this roll explode or compound?" - -To explore that, you can use stats output: +To explore that, you can use stats output: ```console @@ -261,8 +266,8 @@ To explore that, you can use stats output: ``` -Or, if I wonder, "in those rolls, how many times might I see a roll >=6?". For that case, I can include a count operation - +Or, if I wonder, "in those rolls, how many times might I see a roll >=6?". For that case, I can include a count +operation ```console ❯ dart run example/main.dart -s '4d6 #>=6' @@ -275,17 +280,19 @@ Or, if I wonder, "in those rolls, how many times might I see a roll >=6?". For t {mean: 0.665, stddev: 0.747, min: 0, max: 4, count: 10000, histogram: {0: 4840, 1: 3845, 2: 1144, 3: 164, 4: 7}} ``` - # Reacting to dice rolls in your application If you're using this package within an app, you probably want to display dice-rolling events to the user. -There's a couple ways for you to act on roll results. Depending on your use-case, one or more will hopefully fit your needs. +There's a couple ways for you to act on roll results. Depending on your use-case, one or more will hopefully fit your +needs. ## Traversing the result graph -Use the 'left' and 'right' fields of each RollResult node to walk the graph. For an example, see [simple.dart](example/simple.dart) -When a dice expression is parsed, it creates a binary tree to evaluate the roll. +Use the 'left' and 'right' fields of each RollResult node to walk the graph. For an example, +see [simple.dart](example/simple.dart) + +When a dice expression is parsed, it creates a binary tree to evaluate the roll. For example, the expression `(3d6 + 3d6!) kh3` means "roll 3d6 and 3d6!, combine results. Keep the 3 highest" and it creates a graph like: @@ -304,7 +311,7 @@ flowchart TD; ROLLA(["3d6"]); ``` -When you roll the dice expression, it traverses the tree from the bottom up and rolls dice or performs the +When you roll the dice expression, it traverses the tree from the bottom up and rolls dice or performs the requested operations. ```mermaid @@ -338,13 +345,15 @@ flowchart TD SUMMARY@{ shape: doc, label: "RollSummary

Total: 15
results:6,5,4

rolled: 2,3,6,4,1,5,2
discarded: 2,3,1,2" }; ``` -## Convert RollResult to JSON +## Convert RollResult to JSON ```dart - Map rollResultAsJson = DiceExpression.create('2d20kh').roll().toJson(); + +Map rollResultAsJson = DiceExpression.create('2d20kh').roll().toJson(); ``` -The returned objects will look roughly like: +The returned objects will look roughly like: + ```json { "expression": "((2d20) kh )", @@ -396,35 +405,44 @@ The returned objects will look roughly like: ``` - ## Listen to RollResult events You can register one or more listeners that will be informed of roll events. There is a default logging listener that logs at FINE level. + ```dart - // if you want to listen to every individual operation within the expression - DiceExpression.registerListener((rollResult) { - stdout.writeln('${rollResult.opType.name} -> $rollResult'); - }); +// if you want to listen to every individual operation within the expression +DiceExpression.registerListener +( +(rollResult) { +stdout.writeln('${rollResult.opType.name} -> $rollResult'); +}); - // if you want to listen for the RollSummary - DiceExpression.registerSummaryListener((rollSummary) { - stdout.writeln('$rollSummary'); - }); +// if you want to listen for the RollSummary +DiceExpression.registerSummaryListener((rollSummary) { +stdout.writeln('$rollSummary'); +}); ``` Alternatively, you may not want to know _all_ roll events, and are only interested in the events for your specific roll. In that case, pass an 'onRoll' method to the `roll()` method + ```dart - DiceExpression.create('2d20kh').roll( - onRoll: (rr) => stdout.writeln('roll - $rr'), - onSummary: (summary) => stdout.writeln('summary - $summary') - ); + DiceExpression.create +('2d20kh +' +) +.roll( +onRoll: (rr) => stdout.writeln('roll - $rr'), +onSummary: (summary) => stdout.writeln('summary - $ +summary +' +) +); ``` - # Features and bugs Please file feature requests and bugs at the [issue tracker][tracker]. diff --git a/example/simple.dart b/example/simple.dart index 902a268..99a0110 100644 --- a/example/simple.dart +++ b/example/simple.dart @@ -31,44 +31,65 @@ Future main() async { stdout.writeln(result1); stdout.writeln(result2); // outputs: - // ((((4d20) kh 2) #cf ) #cs ) ===> RollSummary(total: 34, results: [17, 17], metadata: {rolled: [11, 12, 17, 17], discarded: [12, 11]}) - // ((((4d20) kh 2) #cf ) #cs ) ===> RollSummary(total: 39, results: [20, 19], metadata: {rolled: [1, 12, 19, 20], discarded: [12, 1], score: {critSuccesses: [20]}}) + // ((((4d20) kh 2) #cf ) #cs ) ===> RollSummary(total: 34, results: [17(d20), 17(d20), 12(d20)⛔︎, 11(d20)⛔︎]) + // ((((4d20) kh 2) #cf ) #cs ) ===> RollSummary(total: 39, results: [20(d20)☘, 19(d20), 12(d20)⛔︎, 1(d20)⛔︎], {critSuccessCount: 1}) // demonstrate navigation of the result graph assert(result2.total == 39); - assert(listEquals(result2.results, [20, 19])); + assert( + listEquals(result2.results.notDiscarded.map((d) => d.result).toList(), [ + 20, + 19, + ]), + ); // read the score-related properties - assert(!result2.hasSuccesses); - assert(!result2.hasFailures); - assert(!result2.hasCritFailures); - assert(result2.hasCritSuccesses); - assert(result2.metadata.score.critSuccessCount == 1); - assert(listEquals(result2.metadata.score.critSuccesses, [20])); + assert(result2.successCount == 0); + assert(result2.failureCount == 0); + assert(result2.critFailureCount == 0); + assert(result2.critSuccessCount == 1); + assert( + result2.results.notDiscarded.where((d) => d.critSuccess).first.result == 20, + ); // look at the expression tree : - // ((((4d20) kh 2) #cf ) #cs ) ===> RollSummary(total: 39, results: [20, 19], metadata: {rolled: [1, 12, 19, 20], discarded: [12, 1], score: {critSuccesses: [20]}}) - // ((((4d20) kh 2) #cf ) #cs ) =count=> RollResult(total: 39, results: [20, 19], metadata: {score: {critSuccesses: [20]}}) - // (((4d20) kh 2) #cf ) =count=> RollResult(total: 39, results: [20, 19]) - // ((4d20) kh 2) =drop=> RollResult(total: 39, results: [20, 19], metadata: {discarded: [12, 1]}) - // (4d20) =rollDice=> RollResult(total: 52, results: [1, 12, 19, 20], metadata: {rolled: [1, 12, 19, 20]}) // at the top level, it's a 'count' operation that counted the critical success final top = result2.detailedResults; assert(top.opType == OpType.count); - assert( - top.metadata == const RollMetadata(score: RollScore(critSuccesses: [20])), - ); + // next level is the count critical failures node of the graph // NOTE: despite there being a 1 rolled, the criticalFailure expression is _after_ the `1` is discarded by the lower expression - assert(top.left!.opType == OpType.count); - assert(top.left!.metadata.score.hasCritFailures == false); + final critFailureResult = top.left; + assert(critFailureResult!.opType == OpType.count); + assert(critFailureResult!.critFailureCount == 0); - assert(top.left!.left!.opType == OpType.drop); - assert(listEquals(top.left!.left!.metadata.discarded, [12, 1])); + final dropResult = critFailureResult!.left; + assert(dropResult!.opType == OpType.drop); - assert(top.left!.left!.left!.opType == OpType.rollDice); + assert( + listEquals(result2.results.discarded.map((d) => d.result).toList(), [ + 12, + 1, + ]), + ); + + assert( + listEquals(dropResult!.results.discarded.map((d) => d.result).toList(), [ + 12, + 1, + ]), + ); - assert(listEquals(top.left!.left!.left!.results, [1, 12, 19, 20])); - assert(listEquals(top.left!.left!.left!.metadata.rolled, [1, 12, 19, 20])); + final rollResult = dropResult!.left; + assert(rollResult!.opType == OpType.rollDice); + + assert( + listEquals(rollResult!.results.notDiscarded.map((d) => d.result).toList(), [ + 20, + 19, + 1, + 12, + ]), + ); final stats = await DiceExpression.create('2d6', Random(1234)).stats(); // output: diff --git a/lib/src/ast.dart b/lib/src/ast.dart index 99cdd59..ee36274 100644 --- a/lib/src/ast.dart +++ b/lib/src/ast.dart @@ -16,7 +16,9 @@ class SimpleValue extends DiceExpression { : _results = RollResult( expression: value, opType: OpType.value, - results: value.isEmpty ? [] : [int.parse(value)], + results: value.isEmpty + ? [] + : [RolledDie.singleVal(result: int.parse(value))], ); final String value; @@ -120,30 +122,30 @@ class CountOp extends Binary { final lhs = left(); final rhs = right(); - var rhsEmptyAndSimpleCount = false; - final target = rhs.totalOrDefault(() { - // if missing RHS, we can make assumptions depending on operator. - // - switch (name) { - case '#': - // example: '3d6#' should be 3. target is ignored in case statement below. - rhsEmptyAndSimpleCount = true; - return 0; - case '#s' || '#cs': - // example: '3d6#s' -- assume target is nsides (maximum) - return lhs.nsides; - case '#f' || '#cf': - // example: '3d6#f' -- assume target is 1 (minimum) - return 1; - default: - throw FormatException( - 'Invalid count operation. Missing count target', - toString(), - toString().length, - ); - } - }); - bool test(int v) { + bool test(RolledDie rolledDie) { + var rhsEmptyAndSimpleCount = false; + final target = rhs.totalOrDefault(() { + // if missing RHS, we can make assumptions depending on operator. + switch (name) { + case '#': + // example: '3d6#' should be 3. target is ignored in case statement below. + rhsEmptyAndSimpleCount = true; + return 0; + case '#s' || '#cs': + // example: '3d6#s' -- assume target is nsides (maximum) + return rolledDie.nsides; + case '#f' || '#cf': + // example: '3d6#f' -- assume target is 1 (minimum) + return 1; + default: + throw FormatException( + 'Invalid count operation. Missing count target', + toString(), + toString().length, + ); + } + }); + final v = rolledDie.result; switch (name) { case '#>=' || '#s>=' || '#f>=' || '#cs>=' || '#cf>=': // how many results on lhs are greater than or equal to rhs? @@ -179,7 +181,7 @@ class CountOp extends Binary { } } - final filteredResults = lhs.results.where(test); + final filteredResults = lhs.results.notDiscarded.where(test); if (countType == CountType.count) { // if counting, the count becomes the new result @@ -187,25 +189,29 @@ class CountOp extends Binary { return RollResult( expression: toString(), opType: OpType.count, - metadata: RollMetadata(discarded: lhs.results), - results: [filteredResults.length], - ndice: lhs.ndice, - nsides: lhs.nsides, + results: [ + RolledDie.singleVal(result: filteredResults.length), + ...lhs.results.notDiscarded.map(RolledDie.discard), + ...lhs.results.discarded, + ], left: lhs, right: rhs, ); } else { - // if counting success/failures, the results are unchanged + // if counting success/failures, the results are updated w/ scoring + + final otherResults = lhs.results.notDiscarded.whereNot(test); return RollResult( expression: toString(), - results: lhs.results, opType: OpType.count, - metadata: RollMetadata( - score: RollScore.forCountType(countType, List.of(filteredResults)), - ), - ndice: lhs.ndice, - nsides: lhs.nsides, + results: [ + ...filteredResults.map( + (v) => RolledDie.scoreForCountType(v, countType: countType), + ), + ...otherResults, + ...lhs.results.discarded, + ], left: lhs, right: rhs, ); @@ -230,24 +236,25 @@ class DropOp extends Binary { ); }); - var results = []; - var dropped = []; + final Iterable results; + final Iterable dropped; + final notDiscarded = lhs.results.notDiscarded; switch (name) { case '-<': // drop < - results = lhs.results.where((v) => v >= target).toList(); - dropped = lhs.results.where((v) => v < target).toList(); + results = notDiscarded.where((v) => v.result >= target); + dropped = notDiscarded.where((v) => v.result < target); case '-<=': // drop <= - results = lhs.results.where((v) => v > target).toList(); - dropped = lhs.results.where((v) => v <= target).toList(); + results = notDiscarded.where((v) => v.result > target); + dropped = notDiscarded.where((v) => v.result <= target); case '->': // drop > - results = lhs.results.where((v) => v <= target).toList(); - dropped = lhs.results.where((v) => v > target).toList(); + results = notDiscarded.where((v) => v.result <= target); + dropped = notDiscarded.where((v) => v.result > target); case '->=': // drop >= - results = lhs.results.where((v) => v < target).toList(); - dropped = lhs.results.where((v) => v >= target).toList(); + results = notDiscarded.where((v) => v.result < target); + dropped = notDiscarded.where((v) => v.result >= target); case '-=': // drop = - results = lhs.results.where((v) => v != target).toList(); - dropped = lhs.results.where((v) => v == target).toList(); + results = notDiscarded.where((v) => v.result != target); + dropped = notDiscarded.where((v) => v.result == target); default: throw FormatException( "unknown drop operation '$name'", @@ -259,10 +266,11 @@ class DropOp extends Binary { return RollResult( expression: toString(), opType: OpType.drop, - ndice: lhs.ndice, - nsides: lhs.nsides, - results: results, - metadata: RollMetadata(discarded: dropped), + results: [ + ...results, + ...dropped.map(RolledDie.discard), + ...lhs.results.discarded, + ], left: lhs, right: rhs, ); @@ -277,26 +285,26 @@ class DropHighLowOp extends Binary { RollResult eval() { final lhs = left(); final rhs = right(); - final sorted = lhs.results..sort(); + final sorted = lhs.results.notDiscarded.toList()..sort(); final numToDrop = rhs.totalOrDefault(() => 1); // if missing, assume '1' - var results = []; - var dropped = []; + final Iterable results; + final Iterable dropped; switch (name) { case '-h': // drop high - results = sorted.reversed.skip(numToDrop).toList(); - dropped = sorted.reversed.take(numToDrop).toList(); + results = sorted.reversed.skip(numToDrop); + dropped = sorted.reversed.take(numToDrop); case '-l': // drop low - results = sorted.skip(numToDrop).toList(); - dropped = sorted.take(numToDrop).toList(); + results = sorted.skip(numToDrop); + dropped = sorted.take(numToDrop); case 'kl': - results = sorted.take(numToDrop).toList(); - dropped = sorted.skip(numToDrop).toList(); + results = sorted.take(numToDrop); + dropped = sorted.skip(numToDrop); case 'kh': - results = sorted.reversed.take(numToDrop).toList(); - dropped = sorted.reversed.skip(numToDrop).toList(); + results = sorted.reversed.take(numToDrop); + dropped = sorted.reversed.skip(numToDrop); case 'k': - results = sorted.reversed.take(numToDrop).toList(); - dropped = sorted.reversed.skip(numToDrop).toList(); + results = sorted.reversed.take(numToDrop); + dropped = sorted.reversed.skip(numToDrop); default: throw FormatException( "unknown drop operation '$name'", @@ -307,10 +315,11 @@ class DropHighLowOp extends Binary { return RollResult( expression: toString(), opType: OpType.drop, - ndice: lhs.ndice, - nsides: lhs.nsides, - results: results, - metadata: RollMetadata(discarded: dropped), + results: [ + ...results, + ...dropped.map(RolledDie.discard), + ...lhs.results.discarded, + ], left: lhs, right: rhs, ); @@ -333,44 +342,20 @@ class ClampOp extends Binary { ); }); - List results; - final discarded = []; - final added = []; - switch (name) { - case 'c>': // change any value > rhs to rhs - results = lhs.results.map((v) { - if (v > target) { - discarded.add(v); - added.add(target); - return target; - } else { - return v; - } - }).toList(); - case 'c<': // change any value < rhs to rhs - results = lhs.results.map((v) { - if (v < target) { - discarded.add(v); - added.add(target); - return target; - } else { - return v; - } - }).toList(); - default: - throw FormatException( - "unknown clamp operation '$name'", - toString(), - toString().indexOf(name), - ); + final newResults = []; + for (final d in lhs.results.notDiscarded) { + if (name == 'c>' && d.result > target) { + newResults.add(RolledDie.copyWith(d, result: target, clampHigh: true)); + } else if (name == 'c<' && d.result < target) { + newResults.add(RolledDie.copyWith(d, result: target, clampLow: true)); + } else { + newResults.add(d); + } } return RollResult( expression: toString(), opType: OpType.clamp, - ndice: lhs.ndice, - nsides: lhs.nsides, - results: results, - metadata: RollMetadata(discarded: discarded, rolled: added), + results: [...newResults, ...lhs.results.discarded], left: lhs, right: rhs, ); @@ -416,7 +401,6 @@ class FudgeDice extends UnaryDice { roll, expression: toString(), opType: roll.opType, - metadata: RollMetadata(rolled: roll.results), left: lhs, ); } @@ -435,7 +419,10 @@ class CSVDice extends UnaryDice { final lhs = left(); final ndice = lhs.totalOrDefault(() => 1); - final roll = roller.rollVals(ndice, vals.elements.map(int.parse).toList()); + final roll = roller.rollVals( + ndice, + vals.elements.map(int.parse).toList(growable: false), + ); return RollResult.fromRollResult( roll, @@ -453,14 +440,12 @@ class PercentDice extends UnaryDice { @override RollResult eval() { final lhs = left(); - const nsides = 100; final ndice = lhs.totalOrDefault(() => 1); - final roll = roller.roll(ndice, nsides); + final roll = roller.roll(ndice, 100); return RollResult.fromRollResult( roll, expression: toString(), opType: OpType.rollPercent, - metadata: RollMetadata(rolled: roll.results), left: lhs, ); } @@ -476,14 +461,12 @@ class D66Dice extends UnaryDice { final ndice = lhs.totalOrDefault(() => 1); final results = [ for (var i = 0; i < ndice; i++) - roller.roll(1, 6).results.sum * 10 + roller.roll(1, 6).results.sum, - ]; + roller.roll(1, 6).total * 10 + roller.roll(1, 6).total, + ].map((i) => RolledDie.d66(result: i)); return RollResult( expression: toString(), opType: OpType.rollD66, - ndice: ndice, - results: results, - metadata: RollMetadata(rolled: results), + results: [...results], left: lhs, ); } @@ -523,7 +506,6 @@ class StdDice extends BinaryDice { roll, expression: toString(), opType: roll.opType, - metadata: RollMetadata(rolled: roll.results), left: lhs, right: rhs, ); @@ -550,13 +532,6 @@ class RerollDice extends BinaryDice { final lhs = left(); final rhs = right(); - if (lhs.nsides == 0) { - throw FormatException( - "Invalid reroll operation. Cannot determine # sides from '$left'", - toString(), - left.toString().length, - ); - } final target = rhs.totalOrDefault(() { throw FormatException( 'Invalid reroll operation. Missing reroll target', @@ -564,11 +539,9 @@ class RerollDice extends BinaryDice { toString().length, ); }); - final results = []; - final discarded = []; - final added = []; - bool test(int val) { + bool test(RolledDie rolledDie) { + final val = rolledDie.result; switch (name) { case 'r' || 'ro' || 'r=' || 'ro=': return val == target; @@ -589,20 +562,20 @@ class RerollDice extends BinaryDice { } } - lhs.results.forEachIndexed((i, v) { + final results = []; + lhs.results.notDiscarded.forEachIndexed((i, v) { if (test(v)) { - int rerolled; + RolledDie rerolled; var rerollCount = 0; do { rerolled = roller - .roll(1, lhs.nsides, '(reroll ind $i, #$rerollCount)') - .results - .sum; + .roll(1, v.nsides, '(reroll ind $i, #$rerollCount)') + .results[0]; rerollCount++; } while (test(rerolled) && rerollCount < limit); - results.add(rerolled); - discarded.add(v); - added.add(rerolled); + results.add( + RolledDie.copyWith(v, result: rerolled.result, rerolled: true), + ); } else { results.add(v); } @@ -611,10 +584,7 @@ class RerollDice extends BinaryDice { return RollResult( expression: toString(), opType: OpType.reroll, - ndice: lhs.ndice, - nsides: lhs.nsides, - results: results, - metadata: RollMetadata(rolled: added, discarded: discarded), + results: [...results, ...lhs.results.discarded], left: lhs, right: rhs, ); @@ -641,15 +611,12 @@ class CompoundingDice extends BinaryDice { final lhs = left(); final rhs = right(); - if (lhs.nsides == 0) { - throw FormatException( - "Invalid compounding operation. Cannot determine # sides from '$left'", - toString(), - left.toString().length, - ); - } - final target = rhs.totalOrDefault(() => lhs.nsides); - bool test(int val) { + bool test(RolledDie rolledDie) { + final target = rhs.totalOrDefault(() => rolledDie.nsides); + final val = rolledDie.result; + if (!rolledDie.isCompoundable) { + return false; + } switch (name) { case '!!' || '!!=' || '!!o' || '!!o=': return val == target; @@ -670,25 +637,20 @@ class CompoundingDice extends BinaryDice { } } - final results = []; - final discarded = []; - final added = []; - lhs.results.forEachIndexed((i, v) { + final results = []; + lhs.results.notDiscarded.forEachIndexed((i, v) { if (test(v)) { - var sum = v; - int rerolled; + var sum = v.result; + RolledDie rerolled; var numCompounded = 0; do { rerolled = roller - .roll(1, lhs.nsides, '(compound ind $i, #$numCompounded)') - .results - .sum; - sum += rerolled; + .roll(1, v.nsides, '(compound ind $i, #$numCompounded)') + .results[0]; + sum += rerolled.result; numCompounded++; } while (test(rerolled) && numCompounded < limit); - results.add(sum); - discarded.add(v); - added.add(sum); + results.add(RolledDie.copyWith(v, result: sum, compounded: true)); } else { results.add(v); } @@ -697,10 +659,7 @@ class CompoundingDice extends BinaryDice { return RollResult( expression: toString(), opType: OpType.compound, - ndice: lhs.ndice, - nsides: lhs.nsides, - results: results, - metadata: RollMetadata(rolled: added, discarded: discarded), + results: [...results, ...lhs.results.discarded], left: lhs, right: rhs, ); @@ -727,19 +686,12 @@ class ExplodingDice extends BinaryDice { final lhs = left(); final rhs = right(); - if (lhs.nsides == 0) { - throw FormatException( - "Invalid exploding operation. Cannot determine # sides from '$left'", - toString(), - left.toString().length, - ); - } - final target = rhs.totalOrDefault(() => lhs.nsides); - - final allResults = []; - final newResults = []; - - bool test(int val) { + bool test(RolledDie rolledDie) { + final target = rhs.totalOrDefault(() => rolledDie.nsides); + final val = rolledDie.result; + if (!rolledDie.isExplodable) { + return false; + } switch (name) { case '!' || '!=' || '!o' || '!o=': return val == target; @@ -760,28 +712,28 @@ class ExplodingDice extends BinaryDice { } } - allResults.addAll(lhs.results); - var numToRoll = lhs.results.where(test).length; - var explodeCount = 0; - while (numToRoll > 0 && explodeCount < limit) { - final results = roller.roll( - numToRoll, - lhs.nsides, - '(explode #${explodeCount + 1})', - ); - newResults.addAll(results.results); - numToRoll = results.results.where(test).length; - explodeCount++; + final newResults = []; + for (final rolledDie in lhs.results.notDiscarded.where(test)) { + var numExplosions = 0; + RolledDie rerolledDie; + do { + rerolledDie = roller + .roll(1, rolledDie.nsides, '(explode #${numExplosions + 1})') + .results[0]; + numExplosions++; + newResults.add(RolledDie.copyWith(rolledDie, exploded: true)); + newResults.add(RolledDie.copyWith(rerolledDie, explosion: true)); + } while (test(rerolledDie) && numExplosions < limit); } - allResults.addAll(newResults); return RollResult( expression: toString(), opType: OpType.explode, - ndice: lhs.ndice, - nsides: lhs.nsides, - results: allResults, - metadata: RollMetadata(rolled: newResults), + results: [ + ...newResults, + ...lhs.results.notDiscarded.whereNot(test), + ...lhs.results.discarded, + ], left: lhs, right: rhs, ); diff --git a/lib/src/dice_roller.dart b/lib/src/dice_roller.dart index 7c16527..cf07c75 100644 --- a/lib/src/dice_roller.dart +++ b/lib/src/dice_roller.dart @@ -38,15 +38,12 @@ class DiceRoller with LoggingMixin { return RollResult( expression: '${ndice}d$nsides', opType: OpType.rollDice, - metadata: RollMetadata(rolled: results), - ndice: ndice, - nsides: nsides, - results: results, + results: [ + ...results.map((i) => RolledDie.polyhedral(result: i, nsides: nsides)), + ], ); } - static const _fudgeVals = [-1, -1, 0, 0, 1, 1]; - /// select n items from the list of values List selectN(int n, List vals) => [ for (var i = 0; i < n; i++) vals[_random.nextInt(vals.length)], @@ -55,16 +52,14 @@ class DiceRoller with LoggingMixin { /// Roll N fudge dice, return results RollResult rollFudge(int ndice) { RangeError.checkValueInInterval(ndice, minDice, maxDice, 'ndice'); - final results = selectN(ndice, _fudgeVals); + final results = selectN(ndice, RolledDie.defaultFudgeVals); logger.finest(() => 'roll ${ndice}dF => $results'); return RollResult( expression: '${ndice}dF', opType: OpType.rollFudge, - metadata: RollMetadata(rolled: results), - ndice: ndice, - results: results, + results: [...results.map((i) => RolledDie.fudge(result: i))], ); } @@ -78,9 +73,16 @@ class DiceRoller with LoggingMixin { return RollResult( expression: '${ndice}d$sideVals', opType: OpType.rollVals, - metadata: RollMetadata(rolled: results), - ndice: ndice, - results: results, + results: [ + ...results.map( + (i) => RolledDie( + result: i, + nsides: sideVals.length, + dieType: DieType.special, + potentialValues: sideVals, + ), + ), + ], ); } } diff --git a/lib/src/results.dart b/lib/src/results.dart index d605029..1a49cff 100644 --- a/lib/src/results.dart +++ b/lib/src/results.dart @@ -1,8 +1,15 @@ -import 'dart:math'; - import 'package:collection/collection.dart'; import 'package:equatable/equatable.dart'; +/// types of die +enum DieType { + polyhedral, // normal polyhedral (1d6, 1d20, etc) + fudge, // fudge dice + d66, // 1D66 (equivalent to `1d6*10 + 1d6`). + special, // 1d[1,3,5,7,9] + singleVal, // single value (e.g. a sum or count of dice) +} + enum OpType { value, // leaf nodes which are simple integer values add, @@ -23,125 +30,13 @@ enum OpType { enum CountType { count, success, failure, critSuccess, critFailure } -/// RollScore represents the number of successes and failures. -class RollScore extends Equatable { - const RollScore({ - this.successes = const [], - this.failures = const [], - this.critSuccesses = const [], - this.critFailures = const [], - }); - - factory RollScore.forCountType(CountType countType, List vals) { - switch (countType) { - case CountType.success: - return RollScore(successes: vals); - case CountType.failure: - return RollScore(failures: vals); - case CountType.critSuccess: - return RollScore(critSuccesses: vals); - case CountType.critFailure: - return RollScore(critFailures: vals); - case CountType.count: - throw UnimplementedError(); - } - } - - final List successes; - final List failures; - final List critSuccesses; - final List critFailures; - - int get successCount => successes.length; - - int get failureCount => failures.length; - - int get critSuccessCount => critSuccesses.length; - - int get critFailureCount => critFailures.length; - - bool get isEmpty => - successes.isEmpty && - failures.isEmpty && - critSuccesses.isEmpty && - critFailures.isEmpty; - - bool get isNotEmpty => !isEmpty; - - bool get hasSuccesses => successes.isNotEmpty; - - bool get hasFailures => failures.isNotEmpty; - - bool get hasCritSuccesses => critSuccesses.isNotEmpty; - - bool get hasCritFailures => critFailures.isNotEmpty; - - @override - List get props => [successes, failures, critSuccesses, critFailures]; - - @override - String toString() => '${toJson()}'; - - Map toJson() => { - 'successes': successes, - 'failures': failures, - 'critSuccesses': critSuccesses, - 'critFailures': critFailures, - }..removeWhere((k, v) => (v is List && v.isEmpty)); - - RollScore operator +(RollScore other) => RollScore( - successes: successes + other.successes, - failures: failures + other.failures, - critSuccesses: critSuccesses + other.critSuccesses, - critFailures: critFailures + other.critFailures, - ); -} - -/// RollMetadata represents 'interesting' things that happens during certain operations. -/// This will include the 'score' (if any), a list of which dice were rolled -/// by the operation, and a list of which dice were discarded by the operation. -/// -class RollMetadata extends Equatable { - const RollMetadata({ - this.rolled = const [], - this.discarded = const [], - this.score = const RollScore(), - }); - - final List rolled; - final List discarded; - final RollScore score; - - bool get isEmpty => rolled.isEmpty && discarded.isEmpty && score.isEmpty; - - bool get isNotEmpty => !isEmpty; - - @override - List get props => [rolled, discarded, score]; - - @override - String toString() => '${toJson()}'; - - Map toJson() => { - 'rolled': rolled, - 'discarded': discarded, - 'score': score.toJson(), - }..removeWhere((k, v) => (v is List && v.isEmpty) || (v is Map && v.isEmpty)); - - RollMetadata operator +(RollMetadata other) => RollMetadata( - rolled: rolled + other.rolled, - discarded: discarded + other.discarded, - score: score + other.score, - ); -} - /// [RollSummary] is the final result of rolling a dice expression. /// It rolls up the metadata of sub-expressions, and includes a `detailResults` /// if the caller wants to do something interesting to display the result graph. /// /// A [RollResult] is modeled as a binary tree. The dice expression /// is parsed into an AST, and when rolled the results reflect the structure of -/// the AST. +/// that AST. /// /// In general, users will only care about the root node of the tree. /// But, depending on the information you want from the evaluated dice rolls, @@ -150,38 +45,41 @@ class RollMetadata extends Equatable { class RollSummary extends Equatable { RollSummary({required this.detailedResults}) { total = detailedResults.results.sum; - results = detailedResults.results; + results = detailedResults.results.notDiscarded.toList(growable: false); + discarded = detailedResults.results.discarded.toList(growable: false); expression = detailedResults.expression; - metadata = rollupMetadata(detailedResults); + successCount = detailedResults.results.successCount; + failureCount = detailedResults.results.failureCount; + critSuccessCount = detailedResults.results.critSuccessCount; + critFailureCount = detailedResults.results.critFailureCount; } final RollResult detailedResults; /// sum of [results] late final int total; + late final int successCount; + late final int failureCount; + late final int critSuccessCount; + late final int critFailureCount; /// the parsed expression late final String expression; /// the results of the evaluating the expression - late final List results; - late final RollMetadata metadata; - - bool get hasSuccesses => metadata.score.hasSuccesses; - - bool get hasFailures => metadata.score.hasFailures; - - bool get hasCritSuccesses => metadata.score.hasCritSuccesses; - - bool get hasCritFailures => metadata.score.hasCritFailures; + late final List results; + late final List discarded; @override List get props => [ total, + successCount, + failureCount, + critSuccessCount, + critFailureCount, expression, results, - //detailedResults, - metadata, + discarded, ]; @override @@ -189,9 +87,24 @@ class RollSummary extends Equatable { final buffer = StringBuffer( '$expression ===> RollSummary(total: $total, results: $results', ); - if (metadata.isNotEmpty) { - buffer.write(', metadata: $metadata'); + if (discarded.isNotEmpty) { + buffer.write(', discarded: $discarded'); + } + final params = { + 'successCount': successCount, + 'failureCount': failureCount, + 'critSuccessCount': critSuccessCount, + 'critFailureCount': critFailureCount, + }..removeWhere((k, v) => v == 0); + + if (params.isNotEmpty) { + buffer.write(', '); + buffer.writeAll( + params.entries.map((entry) => '${entry.key}: ${entry.value}'), + ', ', + ); } + buffer.write(')'); return buffer.toString(); } @@ -200,16 +113,20 @@ class RollSummary extends Equatable { { 'expression': expression, 'total': total, - 'results': results, + 'successCount': successCount, + 'failureCount': failureCount, + 'critSuccessCount': critSuccessCount, + 'critFailureCount': critFailureCount, + 'results': results.map((e) => e.toJson()).toList(growable: false), + 'discarded': discarded.map((e) => e.toJson()).toList(growable: false), 'detailedResults': detailedResults.toJson(), - 'metadata': metadata.toJson(), }..removeWhere( (k, v) => v == null || (v is Map && v.isEmpty) || (v is List && v.isEmpty) || - (v is RollScore && v.isEmpty) || - (v is int && v == 0), + (v is int && v == 0) || + (v is bool && !v), ); String toStringPretty() { @@ -223,16 +140,270 @@ class RollSummary extends Equatable { } } +/// representation of a single dice roll result. +class RolledDie extends Equatable implements Comparable { + static const defaultFudgeVals = [-1, -1, 0, 0, 1, 1]; + + const RolledDie({ + required this.result, + required this.dieType, + this.nsides = 0, + this.potentialValues = const [], + this.discarded = false, + this.success = false, + this.failure = false, + this.critSuccess = false, + this.critFailure = false, + this.exploded = false, + this.explosion = false, + this.compounded = false, + this.rerolled = false, + this.clampHigh = false, + this.clampLow = false, + this.modifiedFrom, + }); + + factory RolledDie.polyhedral({required int result, required int nsides}) => + RolledDie(result: result, nsides: nsides, dieType: DieType.polyhedral); + + factory RolledDie.fudge({required int result}) => RolledDie( + result: result, + nsides: defaultFudgeVals.length, + dieType: DieType.fudge, + potentialValues: defaultFudgeVals, + ); + + factory RolledDie.singleVal({required int result}) => + RolledDie(result: result, dieType: DieType.singleVal); + + factory RolledDie.d66({required int result}) => + RolledDie(result: result, dieType: DieType.d66); + + factory RolledDie.copyWith( + RolledDie other, { + int? result, + bool? discarded, + bool? success, + bool? failure, + bool? critSuccess, + bool? critFailure, + bool? exploded, + bool? explosion, + bool? compounded, + bool? rerolled, + bool? clampHigh, + bool? clampLow, + }) => RolledDie( + potentialValues: other.potentialValues, + nsides: other.nsides, + dieType: other.dieType, + result: result ?? other.result, + discarded: discarded ?? other.discarded, + success: success ?? other.success, + failure: failure ?? other.failure, + critSuccess: critSuccess ?? other.critSuccess, + critFailure: critFailure ?? other.critFailure, + exploded: exploded ?? other.exploded, + explosion: explosion ?? other.explosion, + compounded: compounded ?? other.compounded, + rerolled: rerolled ?? other.rerolled, + clampHigh: clampHigh ?? other.clampHigh, + clampLow: clampLow ?? other.clampLow, + modifiedFrom: other, + ); + + factory RolledDie.discard(RolledDie other) => + RolledDie.copyWith(other, discarded: true); + + factory RolledDie.score( + RolledDie other, { + bool? success, + bool? failure, + bool? critSuccess, + bool? critFailure, + }) => RolledDie.copyWith( + other, + success: success, + failure: failure, + critSuccess: critSuccess, + critFailure: critFailure, + ); + + factory RolledDie.scoreForCountType( + RolledDie other, { + required CountType countType, + }) => RolledDie.copyWith( + other, + success: other.success || countType == CountType.success, + failure: other.failure || countType == CountType.failure, + critSuccess: other.critSuccess || countType == CountType.critSuccess, + critFailure: other.critFailure || countType == CountType.critFailure, + ); + + /// the rolled result + final int result; + + /// the number of sides on the die. + final int nsides; + + /// the die faces (potential values). + /// this will be empty for polyhedral roles -- values will be range of (0,nsides] + final List potentialValues; + + /// true if the result has been discarded + final bool discarded; + + bool get isDiscarded => discarded; + + bool get isExplodable => dieType == DieType.polyhedral; + + bool get isCompoundable => isExplodable; + + /// whether the die was scored as a 'success' + final bool success; + + /// whether the die was scored as a 'failure' + final bool failure; + + /// whether the die was scored as a 'critical success' + final bool critSuccess; + + /// whether the die was scored as a 'critical failure' + final bool critFailure; + + /// the type of die + final DieType dieType; + + final RolledDie? modifiedFrom; + + /// true if the die exploded + final bool exploded; + + /// true if the die is the result of a die exploding + final bool explosion; + + /// true if the die is the result of a compounding operation + final bool compounded; + final bool rerolled; + final bool clampHigh; + final bool clampLow; + + @override + List get props => [ + result, + nsides, + potentialValues, + dieType, + discarded, + success, + failure, + critFailure, + critSuccess, + ]; + + Map toJson() => + { + 'result': result, + 'nsides': nsides, + 'vals': potentialValues, + 'dieType': dieType.name, + 'discarded': discarded, + 'success': success, + 'failure': failure, + 'critSuccess': critSuccess, + 'critFailure': critFailure, + }..removeWhere( + (k, v) => + v == null || + (v is Map && v.isEmpty) || + (v is List && v.isEmpty) || + (v is int && v == 0) || + (v is bool && !v), + ); + + @override + String toString() { + final buffer = StringBuffer(); + buffer.write(result); + buffer.write('('); + switch (dieType) { + case DieType.polyhedral: + buffer.write('d$nsides'); + case DieType.fudge: + buffer.write('dF'); + case DieType.d66: + buffer.write('D66'); + case DieType.singleVal: + //no-op + break; + default: + buffer.write('?'); + } + + if (discarded) { + buffer.write('⛔︎'); + } + if (rerolled) { + buffer.write('↩'); + } + if (exploded) { + buffer.write('💣'); //'⇪'); + } + if (explosion) { + buffer.write('🔥'); //'⇪'); + } + if (compounded) { + buffer.write('∑'); + } + if (clampHigh) { + buffer.write('⌉'); + } + if (clampLow) { + buffer.write('⌋'); + } + if (success) { + buffer.write('✓'); + } + if (failure) { + buffer.write('✗'); + } + if (critSuccess) { + buffer.write('✅'); + } + if (critFailure) { + buffer.write('❌'); //'☠' + } + buffer.write(')'); + return buffer.toString(); + } + + @override + int compareTo(RolledDie other) => result - other.result; +} + +extension RolledDieListExtensions on List { + int get sum => notDiscarded.map((d) => d.result).fold(0, (sum, i) => sum + i); + + int get successCount => notDiscarded.where((d) => d.success).length; + + int get failureCount => notDiscarded.where((d) => d.failure).length; + + int get critSuccessCount => notDiscarded.where((d) => d.critSuccess).length; + + int get critFailureCount => notDiscarded.where((d) => d.critFailure).length; + + Iterable get discarded => where((d) => d.discarded); + + Iterable get notDiscarded => whereNot((d) => d.discarded); +} + /// [RollResult] represents the result of evaluating a particular node of the AST. /// class RollResult extends Equatable { const RollResult({ required this.expression, required this.opType, - this.ndice = 0, - this.nsides = 0, this.results = const [], - this.metadata = const RollMetadata(), this.left, this.right, }); @@ -243,19 +414,13 @@ class RollResult extends Equatable { RollResult other, { required String expression, OpType? opType, - int? ndice, - int? nsides, - List? results, - RollMetadata metadata = const RollMetadata(), + List? results, RollResult? left, RollResult? right, }) => RollResult( expression: expression, - ndice: ndice ?? other.ndice, - nsides: nsides ?? other.nsides, - results: results ?? other.results, opType: opType ?? other.opType, - metadata: metadata, + results: results ?? other.results, left: left ?? other.left, right: right ?? other.right, ); @@ -269,7 +434,6 @@ class RollResult extends Equatable { other, expression: '($expression + ${other.expression})', results: results + other.results, - nsides: max(nsides, other.nsides), opType: OpType.add, left: this, right: other, @@ -277,12 +441,16 @@ class RollResult extends Equatable { /// multiplication operator for [RollResult]. /// - /// Results are collapsed into a single value (the result of multiplication). + /// Results are collapsed into a single value (the result of multiplication), all other rolled die are discarded. /// RollResult operator *(RollResult other) => RollResult.fromRollResult( other, expression: '($expression * ${other.expression})', - results: [results.sum * other.results.sum], + results: [ + RolledDie.singleVal(result: results.sum * other.results.sum), + ...results.map(RolledDie.discard), + ...other.results.map(RolledDie.discard), + ], opType: OpType.multiply, left: this, right: other, @@ -291,13 +459,17 @@ class RollResult extends Equatable { /// subtraction operator for [RollResult]. /// /// Results create new list lhs.results + (-1)*(other.results). + /// other.results are discarded, and a single value result is added /// RollResult operator -(RollResult other) => RollResult.fromRollResult( other, expression: '($expression - ${other.expression})', opType: OpType.subtract, - results: results + other.results.map((v) => v * -1).toList(), - nsides: max(nsides, other.nsides), + results: [ + ...results, + RolledDie.singleVal(result: -1 * other.results.sum), + ...other.results.map(RolledDie.discard), + ], left: this, right: other, ); @@ -305,30 +477,30 @@ class RollResult extends Equatable { /// the parsed expression final String expression; - /// number of sides. may be zero if complex expression or arithmetic result - final int nsides; - - /// number of dice rolled. may be zero if complex expression or arithmetic result - final int ndice; - /// the results of the evaluating the expression - final List results; - - final RollMetadata metadata; + final List results; final RollResult? left; final RollResult? right; final OpType opType; + /// sum of [results] + int get total => totalOrDefault(() => 0); + + int get successCount => results.successCount; + + int get failureCount => results.failureCount; + + int get critSuccessCount => results.critSuccessCount; + + int get critFailureCount => results.critFailureCount; + @override List get props => [ expression, opType, - nsides, - ndice, results, - metadata, opType, //left, //right, @@ -344,19 +516,15 @@ class RollResult extends Equatable { @override String toString() { - if (opType == OpType.value) { - return '$expression => RollResult(value: ${results.sum})'; - } else { - final buffer = StringBuffer(); - buffer.write( - '$expression =${opType.name}=> RollResult(total: ${results.sum}, results: $results', - ); - if (metadata.isNotEmpty) { - buffer.write(', metadata: $metadata'); - } - buffer.write(')'); - return buffer.toString(); + final buffer = StringBuffer(); + buffer.write( + '$expression =${opType.name}=> RollResult(${opType == OpType.value ? 'value' : 'total'}: $total', + ); + if (opType != OpType.value) { + buffer.write(', results: $results'); } + buffer.write(')'); + return buffer.toString(); } String toStringPretty({String indent = ''}) => pprint(this, indent: indent); @@ -365,16 +533,18 @@ class RollResult extends Equatable { { 'expression': expression, 'opType': opType.name, - 'nsides': nsides, - 'ndice': ndice, - 'results': results, - 'metadata': metadata.toJson(), + 'results': results.map((e) => e.toJson()).toList(growable: false), 'left': left != null && left?.opType != OpType.value ? left?.toJson() : null, 'right': right != null && right?.opType != OpType.value ? right?.toJson() : null, + 'total': total, + 'successCount': successCount, + 'failureCount': failureCount, + 'critSuccessCount': critSuccessCount, + 'critFailureCount': critFailureCount, }..removeWhere( (k, v) => v == null || @@ -403,11 +573,3 @@ String pprint(RollResult? rr, {String indent = ''}) { return buffer.toString(); } - -RollMetadata rollupMetadata(RollResult? rr) { - if (rr == null || rr.opType == OpType.value) { - return const RollMetadata(); - } - - return rollupMetadata(rr.left) + rollupMetadata(rr.right) + rr.metadata; -} diff --git a/test/dart_dice_parser_test.dart b/test/dart_dice_parser_test.dart index ab65891..408b761 100644 --- a/test/dart_dice_parser_test.dart +++ b/test/dart_dice_parser_test.dart @@ -17,9 +17,7 @@ void main() { staticMockRandom = MockRandom(); // NOTE: this mocks the random number generator to always return '1' // -- that means the dice-roll is '2' (since rolls are 1-based) - when( - () => staticMockRandom.nextInt(any()), - ).thenReturn(1); + when(() => staticMockRandom.nextInt(any())).thenReturn(1); }); void staticRandTest(String name, String input, int expectedTotal) { test('$name - $input', () { @@ -35,7 +33,6 @@ void main() { String inputExpr, int? expectedTotal, { List? expectedResults, - RollMetadata? expectedMetadata, int? successCount, int? failureCount, int? critSuccessCount, @@ -51,63 +48,39 @@ void main() { ); } if (expectedResults != null) { + final actualResults = rollSummary.results.notDiscarded + .map((d) => d.result) + .toList(); expect( - rollSummary.results, - equals(expectedResults), + actualResults, + unorderedEquals(expectedResults), reason: 'mismatching results', ); } - if (expectedMetadata != null) { - expect( - rollSummary.metadata, - equals(expectedMetadata), - reason: 'mismatching roll metadata', - ); - } if (successCount != null) { expect( - rollSummary.hasSuccesses, - equals(successCount > 0), - reason: 'summary missing success', - ); - expect( - rollSummary.metadata.score.successCount, + rollSummary.successCount, equals(successCount), reason: 'mismatched success count', ); } if (failureCount != null) { expect( - rollSummary.hasFailures, - equals(failureCount > 0), - reason: 'summary missing success', - ); - expect( - rollSummary.metadata.score.failureCount, + rollSummary.failureCount, equals(failureCount), reason: 'mismatched success count', ); } if (critSuccessCount != null) { expect( - rollSummary.hasCritSuccesses, - equals(critSuccessCount > 0), - reason: 'summary missing success', - ); - expect( - rollSummary.metadata.score.critSuccessCount, + rollSummary.critSuccessCount, equals(critSuccessCount), reason: 'mismatched success count', ); } if (critFailureCount != null) { expect( - rollSummary.hasCritFailures, - equals(critFailureCount > 0), - reason: 'summary missing success', - ); - expect( - rollSummary.metadata.score.critFailureCount, + rollSummary.critFailureCount, equals(critFailureCount), reason: 'mismatched success count', ); @@ -142,15 +115,6 @@ void main() { '4d6#s#f#cs#cf', 14, expectedResults: const [6, 2, 1, 5], - expectedMetadata: const RollMetadata( - rolled: [6, 2, 1, 5], - score: RollScore( - successes: [6], - failures: [1], - critSuccesses: [6], - critFailures: [1], - ), - ), successCount: 1, failureCount: 1, critSuccessCount: 1, @@ -161,13 +125,6 @@ void main() { '4d6#s6#f1', 14, expectedResults: const [6, 2, 1, 5], - expectedMetadata: const RollMetadata( - rolled: [6, 2, 1, 5], - score: RollScore( - successes: [6], - failures: [1], - ), - ), successCount: 1, failureCount: 1, critSuccessCount: 0, @@ -178,13 +135,6 @@ void main() { '4d6#s=6#f=1', 14, expectedResults: [6, 2, 1, 5], - expectedMetadata: const RollMetadata( - rolled: [6, 2, 1, 5], - score: RollScore( - successes: [6], - failures: [1], - ), - ), successCount: 1, failureCount: 1, critSuccessCount: 0, @@ -196,15 +146,6 @@ void main() { '4d6#s>4#f<=2#cs>5#cf<2', 14, expectedResults: [6, 2, 1, 5], - expectedMetadata: const RollMetadata( - rolled: [6, 2, 1, 5], - score: RollScore( - successes: [6, 5], - failures: [2, 1], - critSuccesses: [6], - critFailures: [1], - ), - ), successCount: 2, failureCount: 2, critSuccessCount: 1, @@ -216,13 +157,8 @@ void main() { '4d6#s>=4#f<2', 14, expectedResults: [6, 2, 1, 5], - expectedMetadata: const RollMetadata( - rolled: [6, 2, 1, 5], - score: RollScore( - successes: [6, 5], - failures: [1], - ), - ), + successCount: 2, + failureCount: 1, ); seededRandTest( @@ -230,27 +166,17 @@ void main() { '4d6#s<2#f>5', 14, expectedResults: [6, 2, 1, 5], - expectedMetadata: const RollMetadata( - rolled: [6, 2, 1, 5], - score: RollScore( - successes: [1], - failures: [6], - ), - ), + successCount: 1, + failureCount: 1, ); seededRandTest( 'critical success is also a success', '4d6 #s>=5 #cs=6 #f=1', 14, expectedResults: [6, 2, 1, 5], - expectedMetadata: const RollMetadata( - rolled: [6, 2, 1, 5], - score: RollScore( - successes: [6, 5], - failures: [1], - critSuccesses: [6], - ), - ), + failureCount: 1, + successCount: 2, + critSuccessCount: 1, ); seededRandTest( @@ -258,15 +184,10 @@ void main() { '4d6 #s>=5 #cs=6 #f<=2 #cf', 14, expectedResults: [6, 2, 1, 5], - expectedMetadata: const RollMetadata( - rolled: [6, 2, 1, 5], - score: RollScore( - successes: [6, 5], - failures: [2, 1], - critSuccesses: [6], - critFailures: [1], - ), - ), + successCount: 2, + failureCount: 2, + critSuccessCount: 1, + critFailureCount: 1, ); }); @@ -328,10 +249,7 @@ void main() { ]; for (final v in invalids) { test('invalid count - $v', () { - expect( - () => DiceExpression.create(v).roll(), - throwsFormatException, - ); + expect(() => DiceExpression.create(v).roll(), throwsFormatException); }); } }); @@ -409,41 +327,31 @@ void main() { summaries.add(rs); }, ); - const rrRoll = RollResult( + final rrRoll = RollResult( expression: '(2d6)', opType: OpType.rollDice, - nsides: 6, - ndice: 2, - results: [2, 6], - metadata: RollMetadata( - rolled: [2, 6], - ), + results: [ + RolledDie.polyhedral(result: 6, nsides: 6), + RolledDie.polyhedral(result: 2, nsides: 6), + ], ); - const rrDrop = RollResult( + final rrDrop = RollResult( expression: '((2d6) kh )', opType: OpType.drop, - nsides: 6, - ndice: 2, - results: [6], - metadata: RollMetadata( - discarded: [2], - ), + results: [ + RolledDie.polyhedral(result: 6, nsides: 6), + const RolledDie( + result: 2, + nsides: 6, + dieType: DieType.polyhedral, + discarded: true, + ), + ], left: rrRoll, ); final expectedSummary = RollSummary(detailedResults: rrDrop); - expect( - results, - equals([ - rrRoll, - rrDrop, - ]), - ); - expect( - summaries, - equals([ - expectedSummary, - ]), - ); + expect(results, equals([rrRoll, rrDrop])); + expect(summaries, equals([expectedSummary])); }); }); @@ -485,13 +393,7 @@ void main() { '(((10d6 r=3)kh2 #s>5)#f<2)+2', 14, expectedResults: [6, 6, 2], - expectedMetadata: const RollMetadata( - rolled: [6, 2, 1, 5, 3, 5, 1, 4, 6, 5, 6], - discarded: [3, 6, 5, 5, 5, 4, 2, 1, 1], - score: RollScore( - successes: [6, 6], - ), - ), + successCount: 2, ); seededRandTest( @@ -499,14 +401,8 @@ void main() { '(4d6#s<=2#f>=5) + 1', 15, expectedResults: [6, 2, 1, 5, 1], - expectedMetadata: const RollMetadata( - rolled: [6, 2, 1, 5], - score: RollScore( - // `+ 1` isn't included in success, since it's after parens - successes: [2, 1], - failures: [6, 5], - ), - ), + successCount: 2, + failureCount: 2, ); seededRandTest( @@ -514,10 +410,6 @@ void main() { '(((4d6 kh3) + (4d6 kh2))kh3)', 16, expectedResults: [6, 5, 5], - expectedMetadata: const RollMetadata( - rolled: [1, 2, 5, 6, 1, 3, 4, 5], - discarded: [1, 3, 1, 4, 2], - ), ); }); @@ -628,11 +520,7 @@ void main() { seededRandTest('differing nsides addition', '4dF + 6dF', 2); // fudge dice can be added to [1, -1, -1, 1] seededRandTest('differing nsides addition', '4dF + 1', 1); - seededRandTest( - 'fudge add to d6', - '4d6+4dF', - 14, - ); + seededRandTest('fudge add to d6', '4d6+4dF', 14); seededRandTest('fudge add to d6', '4dF+4d6', 13); test('multiple rolls is multiple results', () { @@ -659,15 +547,15 @@ void main() { throwsFormatException, ); }); - final invalids = [ - '4!', - '4dF!', - '4dF!!', - '4dFr', - '4D66!', - '4D66!!', - '4D66 r', - ]; + + seededRandTest('no-op explode', '4!', 4); + seededRandTest('no-op compound', '4!!', 4); + + seededRandTest('no-op explode', '4dF!', 0); + seededRandTest('no-op compound', '4dF!!', 0); + seededRandTest('no-op explode', '4d66!', 128); + seededRandTest('no-op compound', '4d66!!', 128); + final invalids = ['4dFr', '4D66 r']; for (final i in invalids) { test('invalid - $i', () { expect( @@ -687,7 +575,7 @@ void main() { expect( out, equals( - '(((((((4d(3 + 3)) ! ) + ((2 + 2)d6)) #cs ) #cf ) #s ) #f ) ===> RollSummary(total: 33, results: [6, 2, 1, 5, 3, 5, 1, 4, 6], metadata: {rolled: [6, 2, 1, 5, 3, 5, 1, 4, 6], score: {successes: [6, 6], failures: [1, 1], critSuccesses: [6, 6], critFailures: [1, 1]}})', + '(((((((4d(3 + 3)) ! ) + ((2 + 2)d6)) #cs ) #cf ) #s ) #f ) ===> RollSummary(total: 33, results: [1(d6)✗❌, 1(d6)✗❌, 6(d6)✓✅, 6(d6)✓✅, 2(d6), 5(d6), 3(d6)🔥, 5(d6), 4(d6)], successCount: 2, failureCount: 2, critSuccessCount: 2, critFailureCount: 2)', ), ); }); @@ -702,18 +590,18 @@ void main() { out, equals( ''' -(((((((4d(3 + 3)) ! ) + ((2 + 2)d6)) #cs ) #cf ) #s ) #f ) ===> RollSummary(total: 33, results: [6, 2, 1, 5, 3, 5, 1, 4, 6], metadata: {rolled: [6, 2, 1, 5, 3, 5, 1, 4, 6], score: {successes: [6, 6], failures: [1, 1], critSuccesses: [6, 6], critFailures: [1, 1]}}) - (((((((4d(3 + 3)) ! ) + ((2 + 2)d6)) #cs ) #cf ) #s ) #f ) =count=> RollResult(total: 33, results: [6, 2, 1, 5, 3, 5, 1, 4, 6], metadata: {score: {failures: [1, 1]}}) - ((((((4d(3 + 3)) ! ) + ((2 + 2)d6)) #cs ) #cf ) #s ) =count=> RollResult(total: 33, results: [6, 2, 1, 5, 3, 5, 1, 4, 6], metadata: {score: {successes: [6, 6]}}) - (((((4d(3 + 3)) ! ) + ((2 + 2)d6)) #cs ) #cf ) =count=> RollResult(total: 33, results: [6, 2, 1, 5, 3, 5, 1, 4, 6], metadata: {score: {critFailures: [1, 1]}}) - ((((4d(3 + 3)) ! ) + ((2 + 2)d6)) #cs ) =count=> RollResult(total: 33, results: [6, 2, 1, 5, 3, 5, 1, 4, 6], metadata: {score: {critSuccesses: [6, 6]}}) - (((4d(3 + 3)) ! ) + ((2 + 2)d6)) =add=> RollResult(total: 33, results: [6, 2, 1, 5, 3, 5, 1, 4, 6]) - ((4d(3 + 3)) ! ) =explode=> RollResult(total: 17, results: [6, 2, 1, 5, 3], metadata: {rolled: [3]}) - (4d(3 + 3)) =rollDice=> RollResult(total: 14, results: [6, 2, 1, 5], metadata: {rolled: [6, 2, 1, 5]}) +(((((((4d(3 + 3)) ! ) + ((2 + 2)d6)) #cs ) #cf ) #s ) #f ) ===> RollSummary(total: 33, results: [1(d6)✗❌, 1(d6)✗❌, 6(d6)✓✅, 6(d6)✓✅, 2(d6), 5(d6), 3(d6)🔥, 5(d6), 4(d6)], successCount: 2, failureCount: 2, critSuccessCount: 2, critFailureCount: 2) + (((((((4d(3 + 3)) ! ) + ((2 + 2)d6)) #cs ) #cf ) #s ) #f ) =count=> RollResult(total: 33, results: [1(d6)✗❌, 1(d6)✗❌, 6(d6)✓✅, 6(d6)✓✅, 2(d6), 5(d6), 3(d6)🔥, 5(d6), 4(d6)]) + ((((((4d(3 + 3)) ! ) + ((2 + 2)d6)) #cs ) #cf ) #s ) =count=> RollResult(total: 33, results: [6(d6)✓✅, 6(d6)✓✅, 1(d6)❌, 1(d6)❌, 2(d6), 5(d6), 3(d6)🔥, 5(d6), 4(d6)]) + (((((4d(3 + 3)) ! ) + ((2 + 2)d6)) #cs ) #cf ) =count=> RollResult(total: 33, results: [1(d6)❌, 1(d6)❌, 6(d6)✅, 6(d6)✅, 2(d6), 5(d6), 3(d6)🔥, 5(d6), 4(d6)]) + ((((4d(3 + 3)) ! ) + ((2 + 2)d6)) #cs ) =count=> RollResult(total: 33, results: [6(d6)✅, 6(d6)✅, 2(d6), 1(d6), 5(d6), 3(d6)🔥, 5(d6), 1(d6), 4(d6)]) + (((4d(3 + 3)) ! ) + ((2 + 2)d6)) =add=> RollResult(total: 33, results: [6(d6), 2(d6), 1(d6), 5(d6), 3(d6)🔥, 5(d6), 1(d6), 4(d6), 6(d6)]) + ((4d(3 + 3)) ! ) =explode=> RollResult(total: 17, results: [6(d6), 2(d6), 1(d6), 5(d6), 3(d6)🔥]) + (4d(3 + 3)) =rollDice=> RollResult(total: 14, results: [6(d6), 2(d6), 1(d6), 5(d6)]) (3 + 3) =add=> RollResult(total: 6, results: [3, 3]) - ((2 + 2)d6) =rollDice=> RollResult(total: 16, results: [5, 1, 4, 6], metadata: {rolled: [5, 1, 4, 6]}) + ((2 + 2)d6) =rollDice=> RollResult(total: 16, results: [5(d6), 1(d6), 4(d6), 6(d6)]) (2 + 2) =add=> RollResult(total: 4, results: [2, 2]) - ''' + ''' .trim(), ), ); @@ -727,86 +615,116 @@ void main() { equals({ 'expression': '(4d6)', 'total': 14, - 'results': [6, 2, 1, 5], + 'results': [ + {'result': 6, 'nsides': 6, 'dieType': 'polyhedral'}, + {'result': 2, 'nsides': 6, 'dieType': 'polyhedral'}, + {'result': 1, 'nsides': 6, 'dieType': 'polyhedral'}, + {'result': 5, 'nsides': 6, 'dieType': 'polyhedral'}, + ], 'detailedResults': { 'expression': '(4d6)', 'opType': 'rollDice', - 'nsides': 6, - 'ndice': 4, - 'results': [6, 2, 1, 5], - 'metadata': { - 'rolled': [6, 2, 1, 5], - }, - }, - 'metadata': { - 'rolled': [6, 2, 1, 5], + 'results': [ + {'result': 6, 'nsides': 6, 'dieType': 'polyhedral'}, + {'result': 2, 'nsides': 6, 'dieType': 'polyhedral'}, + {'result': 1, 'nsides': 6, 'dieType': 'polyhedral'}, + {'result': 5, 'nsides': 6, 'dieType': 'polyhedral'}, + ], + 'total': 14, }, }), ); }); - test('toJson - metadata', () { + test('toJson - with scoring', () { // mocked responses should return rolls of 6, 2, 1, 5 final dice = DiceExpression.create('4d6 #cf #cs', seededRandom); final obj = dice.roll().toJson(); expect( obj, - equals( - { - 'expression': '(((4d6) #cf ) #cs )', - 'total': 14, - 'results': [6, 2, 1, 5], - 'detailedResults': { - 'expression': '(((4d6) #cf ) #cs )', - 'opType': 'count', + equals({ + 'expression': '(((4d6) #cf ) #cs )', + 'total': 14, + 'critSuccessCount': 1, + 'critFailureCount': 1, + 'results': [ + { + 'result': 6, 'nsides': 6, - 'ndice': 4, - 'results': [6, 2, 1, 5], - 'metadata': { - 'score': { - 'critSuccesses': [6], - }, + 'dieType': 'polyhedral', + 'critSuccess': true, + }, + { + 'result': 1, + 'nsides': 6, + 'dieType': 'polyhedral', + 'critFailure': true, + }, + {'result': 2, 'nsides': 6, 'dieType': 'polyhedral'}, + {'result': 5, 'nsides': 6, 'dieType': 'polyhedral'}, + ], + 'detailedResults': { + 'expression': '(((4d6) #cf ) #cs )', + 'opType': 'count', + 'results': [ + { + 'result': 6, + 'nsides': 6, + 'dieType': 'polyhedral', + 'critSuccess': true, }, - 'left': { - 'expression': '((4d6) #cf )', - 'opType': 'count', + { + 'result': 1, 'nsides': 6, - 'ndice': 4, - 'results': [6, 2, 1, 5], - 'metadata': { - 'score': { - 'critFailures': [1], - }, - }, - 'left': { - 'expression': '(4d6)', - 'opType': 'rollDice', + 'dieType': 'polyhedral', + 'critFailure': true, + }, + {'result': 2, 'nsides': 6, 'dieType': 'polyhedral'}, + {'result': 5, 'nsides': 6, 'dieType': 'polyhedral'}, + ], + 'left': { + 'expression': '((4d6) #cf )', + 'opType': 'count', + 'results': [ + { + 'result': 1, 'nsides': 6, - 'ndice': 4, - 'results': [6, 2, 1, 5], - 'metadata': { - 'rolled': [6, 2, 1, 5], - }, + 'dieType': 'polyhedral', + 'critFailure': true, }, + {'result': 6, 'nsides': 6, 'dieType': 'polyhedral'}, + {'result': 2, 'nsides': 6, 'dieType': 'polyhedral'}, + {'result': 5, 'nsides': 6, 'dieType': 'polyhedral'}, + ], + 'left': { + 'expression': '(4d6)', + 'opType': 'rollDice', + 'results': [ + {'result': 6, 'nsides': 6, 'dieType': 'polyhedral'}, + {'result': 2, 'nsides': 6, 'dieType': 'polyhedral'}, + {'result': 1, 'nsides': 6, 'dieType': 'polyhedral'}, + {'result': 5, 'nsides': 6, 'dieType': 'polyhedral'}, + ], + 'total': 14, }, + 'total': 14, + 'critFailureCount': 1, }, - 'metadata': { - 'rolled': [6, 2, 1, 5], - 'score': { - 'critSuccesses': [6], - 'critFailures': [1], - }, - }, + 'total': 14, + 'critSuccessCount': 1, + 'critFailureCount': 1, }, - ), + }), ); }); test('rollN test', () async { final dice = DiceExpression.create('2d6', seededRandom); - final results = - await dice.rollN(2).map((result) => result.total).toList(); + final results = await dice + .rollN(2) + .map((result) => result.total) + .toList(); // mocked responses should return rolls of 6, 2, 1, 5 expect(results, equals([8, 6])); }); From a1a9789c37d9d0139bcde3160d938a7e787554ba Mon Sep 17 00:00:00 2001 From: Steve Christensen Date: Tue, 1 Jul 2025 13:37:38 -0600 Subject: [PATCH 05/31] split results into 'results' and 'discarded' feels like these are distinct things, so they should be put into distinct bins. it also felt awkward to always remember when performing operations on 'results' that some of those need to be skipped due to being discarded. --- CHANGELOG.md | 7 +- README.md | 7 +- lib/src/ast.dart | 85 ++++++++++----------- lib/src/parser.dart | 2 + lib/src/results.dart | 131 +++++++++++++++++++------------- test/dart_dice_parser_test.dart | 38 +++++---- 6 files changed, 149 insertions(+), 121 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f57e7a..a09aa23 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,12 @@ Roll results have changed significantly (again). It's amazing what having users - remove metadata & score from RollResult - rather than simple list of Integers representing the output of a roll or operation, now each die rolled is a 'RolledDie' object which has the metadata/score. -- RollResult.results will include both discarded an not-discarded RolledDie. TODO: change? + - the RollResult's results field changes from List to List. RolledDie represents not just the + outcome of the roll, but also includes metadata about the type of die, nsides of the die (if polyhedral die), + and metadata about the dice expression's modification of the rolls. +- RollResult.results will include both discarded an not-discarded RolledDie. +- RollSummary.results is just not-discarded die, there's a separate RollSummary.discarded. Alternatively, look at + RollSummary.detailedResults.results to see the whole set of die that accumulated while evaluating the expression. # 7.1.1 diff --git a/README.md b/README.md index 9b4e690..03db868 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ void main() { * advantage * `2d20-L` -- drop lowest - * `2d20k`, `2d20kh` -- keep highest + * `2d20k`, or `2d20kh` -- keep highest * disadvantage * `2d20-H` -- drop highest * `2d20-kl` -- keep lowest @@ -141,6 +141,7 @@ void main() { * `(5d6+5d10)-L2` -- roll 5d6 and 5d10, and from aggregate results drop the lowest 2. * `5d6+5d10-L2` -- roll 5d6 and 5d10, and from only the 5d10 results drop the lowest 2. equivalent to `5d6+(5d10-L2)` + * `((1d6 + 1d8)-L)!` -- roll 1d6 and 1d8, drop the lowest result, and explode the remaining die * `*` for multiplication * `-` for subtraction * numbers must be integers @@ -168,9 +169,7 @@ final roll = diceExpr_SecureRNG.roll(); //.... // when dice expr changes, update the stats graph. -final stats = await -diceExpr_FastRNG.stats -(); +final stats = await diceExpr_FastRNG.stats(); // output of stats: {mean: 6.98, stddev: 2.41, min: 2, max: 12, count: 10000, histogram: {2: 310, 3: 557, 4: 787, 5: 1090, 6: 1450, 7: 1646, 8: 1395, 9: 1147, 10: 825, 11: 526, 12: 267}} ``` diff --git a/lib/src/ast.dart b/lib/src/ast.dart index ee36274..151212e 100644 --- a/lib/src/ast.dart +++ b/lib/src/ast.dart @@ -181,7 +181,7 @@ class CountOp extends Binary { } } - final filteredResults = lhs.results.notDiscarded.where(test); + final filteredResults = lhs.results.where(test); if (countType == CountType.count) { // if counting, the count becomes the new result @@ -189,18 +189,15 @@ class CountOp extends Binary { return RollResult( expression: toString(), opType: OpType.count, - results: [ - RolledDie.singleVal(result: filteredResults.length), - ...lhs.results.notDiscarded.map(RolledDie.discard), - ...lhs.results.discarded, - ], + results: [RolledDie.singleVal(result: filteredResults.length)], + discarded: [...lhs.results.map(RolledDie.discard), ...lhs.discarded], left: lhs, right: rhs, ); } else { // if counting success/failures, the results are updated w/ scoring - final otherResults = lhs.results.notDiscarded.whereNot(test); + final nonScoredResults = lhs.results.whereNot(test); return RollResult( expression: toString(), @@ -209,9 +206,9 @@ class CountOp extends Binary { ...filteredResults.map( (v) => RolledDie.scoreForCountType(v, countType: countType), ), - ...otherResults, - ...lhs.results.discarded, + ...nonScoredResults, ], + discarded: lhs.discarded, left: lhs, right: rhs, ); @@ -238,23 +235,22 @@ class DropOp extends Binary { final Iterable results; final Iterable dropped; - final notDiscarded = lhs.results.notDiscarded; switch (name) { case '-<': // drop < - results = notDiscarded.where((v) => v.result >= target); - dropped = notDiscarded.where((v) => v.result < target); + results = lhs.results.where((v) => v.result >= target); + dropped = lhs.results.where((v) => v.result < target); case '-<=': // drop <= - results = notDiscarded.where((v) => v.result > target); - dropped = notDiscarded.where((v) => v.result <= target); + results = lhs.results.where((v) => v.result > target); + dropped = lhs.results.where((v) => v.result <= target); case '->': // drop > - results = notDiscarded.where((v) => v.result <= target); - dropped = notDiscarded.where((v) => v.result > target); + results = lhs.results.where((v) => v.result <= target); + dropped = lhs.results.where((v) => v.result > target); case '->=': // drop >= - results = notDiscarded.where((v) => v.result < target); - dropped = notDiscarded.where((v) => v.result >= target); + results = lhs.results.where((v) => v.result < target); + dropped = lhs.results.where((v) => v.result >= target); case '-=': // drop = - results = notDiscarded.where((v) => v.result != target); - dropped = notDiscarded.where((v) => v.result == target); + results = lhs.results.where((v) => v.result != target); + dropped = lhs.results.where((v) => v.result == target); default: throw FormatException( "unknown drop operation '$name'", @@ -266,11 +262,8 @@ class DropOp extends Binary { return RollResult( expression: toString(), opType: OpType.drop, - results: [ - ...results, - ...dropped.map(RolledDie.discard), - ...lhs.results.discarded, - ], + results: [...results], + discarded: [...dropped.map(RolledDie.discard), ...lhs.discarded], left: lhs, right: rhs, ); @@ -285,7 +278,7 @@ class DropHighLowOp extends Binary { RollResult eval() { final lhs = left(); final rhs = right(); - final sorted = lhs.results.notDiscarded.toList()..sort(); + final sorted = lhs.results.toList()..sort(); final numToDrop = rhs.totalOrDefault(() => 1); // if missing, assume '1' final Iterable results; final Iterable dropped; @@ -315,11 +308,8 @@ class DropHighLowOp extends Binary { return RollResult( expression: toString(), opType: OpType.drop, - results: [ - ...results, - ...dropped.map(RolledDie.discard), - ...lhs.results.discarded, - ], + results: [...results], + discarded: [...dropped.map(RolledDie.discard), ...lhs.discarded], left: lhs, right: rhs, ); @@ -343,7 +333,7 @@ class ClampOp extends Binary { }); final newResults = []; - for (final d in lhs.results.notDiscarded) { + for (final d in lhs.results) { if (name == 'c>' && d.result > target) { newResults.add(RolledDie.copyWith(d, result: target, clampHigh: true)); } else if (name == 'c<' && d.result < target) { @@ -355,7 +345,8 @@ class ClampOp extends Binary { return RollResult( expression: toString(), opType: OpType.clamp, - results: [...newResults, ...lhs.results.discarded], + results: newResults, + discarded: lhs.discarded, left: lhs, right: rhs, ); @@ -459,6 +450,7 @@ class D66Dice extends UnaryDice { RollResult eval() { final lhs = left(); final ndice = lhs.totalOrDefault(() => 1); + // TODO: capture the rolls as discarded. final results = [ for (var i = 0; i < ndice; i++) roller.roll(1, 6).total * 10 + roller.roll(1, 6).total, @@ -563,7 +555,7 @@ class RerollDice extends BinaryDice { } final results = []; - lhs.results.notDiscarded.forEachIndexed((i, v) { + lhs.results.forEachIndexed((i, v) { if (test(v)) { RolledDie rerolled; var rerollCount = 0; @@ -584,7 +576,8 @@ class RerollDice extends BinaryDice { return RollResult( expression: toString(), opType: OpType.reroll, - results: [...results, ...lhs.results.discarded], + results: results, + discarded: lhs.discarded, left: lhs, right: rhs, ); @@ -638,7 +631,8 @@ class CompoundingDice extends BinaryDice { } final results = []; - lhs.results.notDiscarded.forEachIndexed((i, v) { + final discarded = []; + lhs.results.forEachIndexed((i, v) { if (test(v)) { var sum = v.result; RolledDie rerolled; @@ -647,10 +641,13 @@ class CompoundingDice extends BinaryDice { rerolled = roller .roll(1, v.nsides, '(compound ind $i, #$numCompounded)') .results[0]; + discarded.add( + RolledDie.copyWith(rerolled, discarded: true, compounded: true), + ); sum += rerolled.result; numCompounded++; } while (test(rerolled) && numCompounded < limit); - results.add(RolledDie.copyWith(v, result: sum, compounded: true)); + results.add(RolledDie.copyWith(v, result: sum, compoundedFinal: true)); } else { results.add(v); } @@ -659,7 +656,8 @@ class CompoundingDice extends BinaryDice { return RollResult( expression: toString(), opType: OpType.compound, - results: [...results, ...lhs.results.discarded], + results: results, + discarded: lhs.discarded + discarded, left: lhs, right: rhs, ); @@ -713,7 +711,8 @@ class ExplodingDice extends BinaryDice { } final newResults = []; - for (final rolledDie in lhs.results.notDiscarded.where(test)) { + for (final rolledDie in lhs.results.where(test)) { + newResults.add(RolledDie.copyWith(rolledDie, exploded: true)); var numExplosions = 0; RolledDie rerolledDie; do { @@ -721,7 +720,6 @@ class ExplodingDice extends BinaryDice { .roll(1, rolledDie.nsides, '(explode #${numExplosions + 1})') .results[0]; numExplosions++; - newResults.add(RolledDie.copyWith(rolledDie, exploded: true)); newResults.add(RolledDie.copyWith(rerolledDie, explosion: true)); } while (test(rerolledDie) && numExplosions < limit); } @@ -729,11 +727,8 @@ class ExplodingDice extends BinaryDice { return RollResult( expression: toString(), opType: OpType.explode, - results: [ - ...newResults, - ...lhs.results.notDiscarded.whereNot(test), - ...lhs.results.discarded, - ], + results: [...newResults, ...lhs.results.whereNot(test)], + discarded: lhs.discarded, left: lhs, right: rhs, ); diff --git a/lib/src/parser.dart b/lib/src/parser.dart index 38632bd..7776b95 100644 --- a/lib/src/parser.dart +++ b/lib/src/parser.dart @@ -4,6 +4,8 @@ import 'ast.dart'; import 'dice_expression.dart'; import 'dice_roller.dart'; +// TODO: support commas `(,,)kh` -- evaluate each subexpression into a new die result, discarding the ones that had been combined + Parser parserBuilder(DiceRoller roller) { final builder = ExpressionBuilder(); // numbers diff --git a/lib/src/results.dart b/lib/src/results.dart index 1a49cff..4bfdcd2 100644 --- a/lib/src/results.dart +++ b/lib/src/results.dart @@ -45,8 +45,8 @@ enum CountType { count, success, failure, critSuccess, critFailure } class RollSummary extends Equatable { RollSummary({required this.detailedResults}) { total = detailedResults.results.sum; - results = detailedResults.results.notDiscarded.toList(growable: false); - discarded = detailedResults.results.discarded.toList(growable: false); + results = detailedResults.results; + discarded = detailedResults.discarded; expression = detailedResults.expression; successCount = detailedResults.results.successCount; failureCount = detailedResults.results.failureCount; @@ -68,6 +68,8 @@ class RollSummary extends Equatable { /// the results of the evaluating the expression late final List results; + + /// the dice we lost along the way late final List discarded; @override @@ -156,10 +158,11 @@ class RolledDie extends Equatable implements Comparable { this.critFailure = false, this.exploded = false, this.explosion = false, + this.compoundedFinal = false, this.compounded = false, this.rerolled = false, - this.clampHigh = false, - this.clampLow = false, + this.clampCeiling = false, + this.clampFloor = false, this.modifiedFrom, }); @@ -190,6 +193,7 @@ class RolledDie extends Equatable implements Comparable { bool? exploded, bool? explosion, bool? compounded, + bool? compoundedFinal, bool? rerolled, bool? clampHigh, bool? clampLow, @@ -206,29 +210,16 @@ class RolledDie extends Equatable implements Comparable { exploded: exploded ?? other.exploded, explosion: explosion ?? other.explosion, compounded: compounded ?? other.compounded, + compoundedFinal: compoundedFinal ?? other.compoundedFinal, rerolled: rerolled ?? other.rerolled, - clampHigh: clampHigh ?? other.clampHigh, - clampLow: clampLow ?? other.clampLow, + clampCeiling: clampHigh ?? other.clampCeiling, + clampFloor: clampLow ?? other.clampFloor, modifiedFrom: other, ); factory RolledDie.discard(RolledDie other) => RolledDie.copyWith(other, discarded: true); - factory RolledDie.score( - RolledDie other, { - bool? success, - bool? failure, - bool? critSuccess, - bool? critFailure, - }) => RolledDie.copyWith( - other, - success: success, - failure: failure, - critSuccess: critSuccess, - critFailure: critFailure, - ); - factory RolledDie.scoreForCountType( RolledDie other, { required CountType countType, @@ -243,7 +234,7 @@ class RolledDie extends Equatable implements Comparable { /// the rolled result final int result; - /// the number of sides on the die. + /// the number of sides on the die. Generally only set if dieType == polyhedral final int nsides; /// the die faces (potential values). @@ -255,6 +246,7 @@ class RolledDie extends Equatable implements Comparable { bool get isDiscarded => discarded; + // TODO: is this true? can fudge dice explode? bool get isExplodable => dieType == DieType.polyhedral; bool get isCompoundable => isExplodable; @@ -282,11 +274,14 @@ class RolledDie extends Equatable implements Comparable { /// true if the die is the result of a die exploding final bool explosion; - /// true if the die is the result of a compounding operation + /// true if the die was discarded as a roll during compounding final bool compounded; + + /// true if the die is the sum a multiple die due to compounding + final bool compoundedFinal; final bool rerolled; - final bool clampHigh; - final bool clampLow; + final bool clampCeiling; + final bool clampFloor; @override List get props => [ @@ -299,6 +294,13 @@ class RolledDie extends Equatable implements Comparable { failure, critFailure, critSuccess, + exploded, + explosion, + compounded, + compoundedFinal, + rerolled, + clampCeiling, + clampFloor, ]; Map toJson() => @@ -312,6 +314,13 @@ class RolledDie extends Equatable implements Comparable { 'failure': failure, 'critSuccess': critSuccess, 'critFailure': critFailure, + 'exploded': exploded, + 'explosion': explosion, + 'compounded': compounded, + 'compoundedFinal': compoundedFinal, + 'rerolled': rerolled, + 'clampHigh': clampCeiling, + 'clampLow': clampFloor, }..removeWhere( (k, v) => v == null || @@ -321,24 +330,23 @@ class RolledDie extends Equatable implements Comparable { (v is bool && !v), ); - @override - String toString() { - final buffer = StringBuffer(); - buffer.write(result); - buffer.write('('); + String getDieGlyph() { switch (dieType) { case DieType.polyhedral: - buffer.write('d$nsides'); + return 'd$nsides'; case DieType.fudge: - buffer.write('dF'); + return 'dF'; case DieType.d66: - buffer.write('D66'); + return 'D66'; case DieType.singleVal: - //no-op - break; + return ''; default: - buffer.write('?'); + return '?'; } + } + + String getDieStateGlyphs() { + final buffer = StringBuffer(); if (discarded) { buffer.write('⛔︎'); @@ -352,13 +360,16 @@ class RolledDie extends Equatable implements Comparable { if (explosion) { buffer.write('🔥'); //'⇪'); } - if (compounded) { + if (compoundedFinal) { buffer.write('∑'); } - if (clampHigh) { + if (compounded) { + buffer.write('+'); + } + if (clampCeiling) { buffer.write('⌉'); } - if (clampLow) { + if (clampFloor) { buffer.write('⌋'); } if (success) { @@ -373,6 +384,16 @@ class RolledDie extends Equatable implements Comparable { if (critFailure) { buffer.write('❌'); //'☠' } + return buffer.toString(); + } + + @override + String toString() { + final buffer = StringBuffer(); + buffer.write(result); + buffer.write('('); + buffer.write(getDieGlyph()); + buffer.write(getDieStateGlyphs()); buffer.write(')'); return buffer.toString(); } @@ -382,19 +403,15 @@ class RolledDie extends Equatable implements Comparable { } extension RolledDieListExtensions on List { - int get sum => notDiscarded.map((d) => d.result).fold(0, (sum, i) => sum + i); - - int get successCount => notDiscarded.where((d) => d.success).length; + int get sum => map((d) => d.result).fold(0, (sum, i) => sum + i); - int get failureCount => notDiscarded.where((d) => d.failure).length; + int get successCount => where((d) => d.success).length; - int get critSuccessCount => notDiscarded.where((d) => d.critSuccess).length; + int get failureCount => where((d) => d.failure).length; - int get critFailureCount => notDiscarded.where((d) => d.critFailure).length; + int get critSuccessCount => where((d) => d.critSuccess).length; - Iterable get discarded => where((d) => d.discarded); - - Iterable get notDiscarded => whereNot((d) => d.discarded); + int get critFailureCount => where((d) => d.critFailure).length; } /// [RollResult] represents the result of evaluating a particular node of the AST. @@ -404,6 +421,7 @@ class RollResult extends Equatable { required this.expression, required this.opType, this.results = const [], + this.discarded = const [], this.left, this.right, }); @@ -415,12 +433,14 @@ class RollResult extends Equatable { required String expression, OpType? opType, List? results, + List? discarded, RollResult? left, RollResult? right, }) => RollResult( expression: expression, opType: opType ?? other.opType, results: results ?? other.results, + discarded: discarded ?? other.discarded, left: left ?? other.left, right: right ?? other.right, ); @@ -434,6 +454,7 @@ class RollResult extends Equatable { other, expression: '($expression + ${other.expression})', results: results + other.results, + discarded: discarded + other.discarded, opType: OpType.add, left: this, right: other, @@ -446,8 +467,8 @@ class RollResult extends Equatable { RollResult operator *(RollResult other) => RollResult.fromRollResult( other, expression: '($expression * ${other.expression})', - results: [ - RolledDie.singleVal(result: results.sum * other.results.sum), + results: [RolledDie.singleVal(result: results.sum * other.results.sum)], + discarded: [ ...results.map(RolledDie.discard), ...other.results.map(RolledDie.discard), ], @@ -468,8 +489,8 @@ class RollResult extends Equatable { results: [ ...results, RolledDie.singleVal(result: -1 * other.results.sum), - ...other.results.map(RolledDie.discard), ], + discarded: [...other.results.map(RolledDie.discard)], left: this, right: other, ); @@ -479,6 +500,7 @@ class RollResult extends Equatable { /// the results of the evaluating the expression final List results; + final List discarded; final RollResult? left; final RollResult? right; @@ -501,6 +523,7 @@ class RollResult extends Equatable { expression, opType, results, + discarded, opType, //left, //right, @@ -521,7 +544,12 @@ class RollResult extends Equatable { '$expression =${opType.name}=> RollResult(${opType == OpType.value ? 'value' : 'total'}: $total', ); if (opType != OpType.value) { - buffer.write(', results: $results'); + if (results.isNotEmpty) { + buffer.write(', results: $results'); + } + if (discarded.isNotEmpty) { + buffer.write(', discarded: $discarded'); + } } buffer.write(')'); return buffer.toString(); @@ -534,6 +562,7 @@ class RollResult extends Equatable { 'expression': expression, 'opType': opType.name, 'results': results.map((e) => e.toJson()).toList(growable: false), + 'discarded': discarded.map((e) => e.toJson()).toList(growable: false), 'left': left != null && left?.opType != OpType.value ? left?.toJson() : null, diff --git a/test/dart_dice_parser_test.dart b/test/dart_dice_parser_test.dart index 408b761..b08ac20 100644 --- a/test/dart_dice_parser_test.dart +++ b/test/dart_dice_parser_test.dart @@ -48,9 +48,7 @@ void main() { ); } if (expectedResults != null) { - final actualResults = rollSummary.results.notDiscarded - .map((d) => d.result) - .toList(); + final actualResults = rollSummary.results.map((d) => d.result).toList(); expect( actualResults, unorderedEquals(expectedResults), @@ -338,9 +336,9 @@ void main() { final rrDrop = RollResult( expression: '((2d6) kh )', opType: OpType.drop, - results: [ - RolledDie.polyhedral(result: 6, nsides: 6), - const RolledDie( + results: [RolledDie.polyhedral(result: 6, nsides: 6)], + discarded: const [ + RolledDie( result: 2, nsides: 6, dieType: DieType.polyhedral, @@ -574,8 +572,8 @@ void main() { final out = dice.roll().toString(); expect( out, - equals( - '(((((((4d(3 + 3)) ! ) + ((2 + 2)d6)) #cs ) #cf ) #s ) #f ) ===> RollSummary(total: 33, results: [1(d6)✗❌, 1(d6)✗❌, 6(d6)✓✅, 6(d6)✓✅, 2(d6), 5(d6), 3(d6)🔥, 5(d6), 4(d6)], successCount: 2, failureCount: 2, critSuccessCount: 2, critFailureCount: 2)', + equalsIgnoringWhitespace( + '(((((((4d(3 + 3)) ! ) + ((2 + 2)d6)) #cs ) #cf ) #s ) #f ) ===> RollSummary(total: 33, results: [1(d6✗❌), 1(d6✗❌), 6(d6💣✓✅), 6(d6✓✅), 3(d6🔥), 2(d6), 5(d6), 5(d6), 4(d6)], successCount: 2, failureCount: 2, critSuccessCount: 2, critFailureCount: 2)', ), ); }); @@ -588,19 +586,19 @@ void main() { final out = dice.roll().toStringPretty(); expect( out, - equals( + equalsIgnoringWhitespace( ''' -(((((((4d(3 + 3)) ! ) + ((2 + 2)d6)) #cs ) #cf ) #s ) #f ) ===> RollSummary(total: 33, results: [1(d6)✗❌, 1(d6)✗❌, 6(d6)✓✅, 6(d6)✓✅, 2(d6), 5(d6), 3(d6)🔥, 5(d6), 4(d6)], successCount: 2, failureCount: 2, critSuccessCount: 2, critFailureCount: 2) - (((((((4d(3 + 3)) ! ) + ((2 + 2)d6)) #cs ) #cf ) #s ) #f ) =count=> RollResult(total: 33, results: [1(d6)✗❌, 1(d6)✗❌, 6(d6)✓✅, 6(d6)✓✅, 2(d6), 5(d6), 3(d6)🔥, 5(d6), 4(d6)]) - ((((((4d(3 + 3)) ! ) + ((2 + 2)d6)) #cs ) #cf ) #s ) =count=> RollResult(total: 33, results: [6(d6)✓✅, 6(d6)✓✅, 1(d6)❌, 1(d6)❌, 2(d6), 5(d6), 3(d6)🔥, 5(d6), 4(d6)]) - (((((4d(3 + 3)) ! ) + ((2 + 2)d6)) #cs ) #cf ) =count=> RollResult(total: 33, results: [1(d6)❌, 1(d6)❌, 6(d6)✅, 6(d6)✅, 2(d6), 5(d6), 3(d6)🔥, 5(d6), 4(d6)]) - ((((4d(3 + 3)) ! ) + ((2 + 2)d6)) #cs ) =count=> RollResult(total: 33, results: [6(d6)✅, 6(d6)✅, 2(d6), 1(d6), 5(d6), 3(d6)🔥, 5(d6), 1(d6), 4(d6)]) - (((4d(3 + 3)) ! ) + ((2 + 2)d6)) =add=> RollResult(total: 33, results: [6(d6), 2(d6), 1(d6), 5(d6), 3(d6)🔥, 5(d6), 1(d6), 4(d6), 6(d6)]) - ((4d(3 + 3)) ! ) =explode=> RollResult(total: 17, results: [6(d6), 2(d6), 1(d6), 5(d6), 3(d6)🔥]) - (4d(3 + 3)) =rollDice=> RollResult(total: 14, results: [6(d6), 2(d6), 1(d6), 5(d6)]) - (3 + 3) =add=> RollResult(total: 6, results: [3, 3]) - ((2 + 2)d6) =rollDice=> RollResult(total: 16, results: [5(d6), 1(d6), 4(d6), 6(d6)]) - (2 + 2) =add=> RollResult(total: 4, results: [2, 2]) + (((((((4d(3 + 3)) ! ) + ((2 + 2)d6)) #cs ) #cf ) #s ) #f ) ===> RollSummary(total: 33, results: [1(d6✗❌), 1(d6✗❌), 6(d6💣✓✅), 6(d6✓✅), 3(d6🔥), 2(d6), 5(d6), 5(d6), 4(d6)], successCount: 2, failureCount: 2, critSuccessCount: 2, critFailureCount: 2) + (((((((4d(3 + 3)) ! ) + ((2 + 2)d6)) #cs ) #cf ) #s ) #f ) =count=> RollResult(total: 33, results: [1(d6✗❌), 1(d6✗❌), 6(d6💣✓✅), 6(d6✓✅), 3(d6🔥), 2(d6), 5(d6), 5(d6), 4(d6)]) + ((((((4d(3 + 3)) ! ) + ((2 + 2)d6)) #cs ) #cf ) #s ) =count=> RollResult(total: 33, results: [6(d6💣✓✅), 6(d6✓✅), 1(d6❌), 1(d6❌), 3(d6🔥), 2(d6), 5(d6), 5(d6), 4(d6)]) + (((((4d(3 + 3)) ! ) + ((2 + 2)d6)) #cs ) #cf ) =count=> RollResult(total: 33, results: [1(d6❌), 1(d6❌), 6(d6💣✅), 6(d6✅), 3(d6🔥), 2(d6), 5(d6), 5(d6), 4(d6)]) + ((((4d(3 + 3)) ! ) + ((2 + 2)d6)) #cs ) =count=> RollResult(total: 33, results: [6(d6💣✅), 6(d6✅), 3(d6🔥), 2(d6), 1(d6), 5(d6), 5(d6), 1(d6), 4(d6)]) + (((4d(3 + 3)) ! ) + ((2 + 2)d6)) =add=> RollResult(total: 33, results: [6(d6💣), 3(d6🔥), 2(d6), 1(d6), 5(d6), 5(d6), 1(d6), 4(d6), 6(d6)]) + ((4d(3 + 3)) ! ) =explode=> RollResult(total: 17, results: [6(d6💣), 3(d6🔥), 2(d6), 1(d6), 5(d6)]) + (4d(3 + 3)) =rollDice=> RollResult(total: 14, results: [6(d6), 2(d6), 1(d6), 5(d6)]) + (3 + 3) =add=> RollResult(total: 6, results: [3(), 3()]) + ((2 + 2)d6) =rollDice=> RollResult(total: 16, results: [5(d6), 1(d6), 4(d6), 6(d6)]) + (2 + 2) =add=> RollResult(total: 4, results: [2(), 2()]) ''' .trim(), ), From 2f488eac53d0fa4c6a02d65b8f487fb8c724a103 Mon Sep 17 00:00:00 2001 From: Steve Christensen Date: Wed, 2 Jul 2025 23:46:22 -0600 Subject: [PATCH 06/31] correct examples/simple.dart --- example/simple.dart | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/example/simple.dart b/example/simple.dart index 99a0110..56d3e65 100644 --- a/example/simple.dart +++ b/example/simple.dart @@ -31,25 +31,18 @@ Future main() async { stdout.writeln(result1); stdout.writeln(result2); // outputs: - // ((((4d20) kh 2) #cf ) #cs ) ===> RollSummary(total: 34, results: [17(d20), 17(d20), 12(d20)⛔︎, 11(d20)⛔︎]) - // ((((4d20) kh 2) #cf ) #cs ) ===> RollSummary(total: 39, results: [20(d20)☘, 19(d20), 12(d20)⛔︎, 1(d20)⛔︎], {critSuccessCount: 1}) + //((((4d20) kh 2) #cf ) #cs ) ===> RollSummary(total: 34, results: [17(d20), 17(d20)], discarded: [12(d20⛔︎), 11(d20⛔︎)]) + //((((4d20) kh 2) #cf ) #cs ) ===> RollSummary(total: 39, results: [20(d20✅), 19(d20)], discarded: [12(d20⛔︎), 1(d20⛔︎)], critSuccessCount: 1) // demonstrate navigation of the result graph assert(result2.total == 39); - assert( - listEquals(result2.results.notDiscarded.map((d) => d.result).toList(), [ - 20, - 19, - ]), - ); + assert(listEquals(result2.results.map((d) => d.result).toList(), [20, 19])); // read the score-related properties assert(result2.successCount == 0); assert(result2.failureCount == 0); assert(result2.critFailureCount == 0); assert(result2.critSuccessCount == 1); - assert( - result2.results.notDiscarded.where((d) => d.critSuccess).first.result == 20, - ); + assert(result2.results.where((d) => d.critSuccess).first.result == 20); // look at the expression tree : // at the top level, it's a 'count' operation that counted the critical success @@ -65,25 +58,17 @@ Future main() async { final dropResult = critFailureResult!.left; assert(dropResult!.opType == OpType.drop); - assert( - listEquals(result2.results.discarded.map((d) => d.result).toList(), [ - 12, - 1, - ]), - ); + assert(listEquals(result2.discarded.map((d) => d.result).toList(), [12, 1])); assert( - listEquals(dropResult!.results.discarded.map((d) => d.result).toList(), [ - 12, - 1, - ]), + listEquals(dropResult!.discarded.map((d) => d.result).toList(), [12, 1]), ); final rollResult = dropResult!.left; assert(rollResult!.opType == OpType.rollDice); assert( - listEquals(rollResult!.results.notDiscarded.map((d) => d.result).toList(), [ + listEquals(rollResult!.results.map((d) => d.result).toList(), [ 20, 19, 1, From bbd0c762231d218abb7e266baacc2fa0e04272ab Mon Sep 17 00:00:00 2001 From: Steve Christensen Date: Thu, 3 Jul 2025 00:07:43 -0600 Subject: [PATCH 07/31] fix analysis error -- unused import --- lib/src/results.dart | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/src/results.dart b/lib/src/results.dart index 4bfdcd2..2868d8f 100644 --- a/lib/src/results.dart +++ b/lib/src/results.dart @@ -1,4 +1,3 @@ -import 'package:collection/collection.dart'; import 'package:equatable/equatable.dart'; /// types of die From f1b2513229600f3da96cee8d07735e57ba59ae14 Mon Sep 17 00:00:00 2001 From: Steve Christensen Date: Fri, 4 Jul 2025 15:46:42 -0600 Subject: [PATCH 08/31] refactor ast into multiple files. cleanup rerolls. allow explode of dF, d66 --- CHANGELOG.md | 11 +- README.md | 4 +- lib/src/ast_core.dart | 108 ++++++++++ lib/src/ast_dice.dart | 133 +++++++++++++ lib/src/{ast.dart => ast_ops.dart} | 305 ++++------------------------- lib/src/dice_roller.dart | 53 ++++- lib/src/parser.dart | 5 +- lib/src/results.dart | 209 ++++++++++++++------ pubspec.yaml | 1 + test/dart_dice_parser_test.dart | 142 ++++++++++++-- 10 files changed, 611 insertions(+), 360 deletions(-) create mode 100644 lib/src/ast_core.dart create mode 100644 lib/src/ast_dice.dart rename lib/src/{ast.dart => ast_ops.dart} (63%) diff --git a/CHANGELOG.md b/CHANGELOG.md index a09aa23..697f513 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,16 +2,23 @@ ## ⚠️⚠️ Breaking changes ⚠️⚠️ -Roll results have changed significantly (again). It's amazing what having users will do to a package! +Roll results have changed significantly. Now, the individual die results are modeled +as a RolledDie object, rather than an integer. The RolledDie object incorporates +a lot of the metadata/scoring in pre-8.0.0 results. + +Having a more elaborate result will make it easier for client applications +to render the outcome of a roll. Each RolledDie knows its result, the # of sides on the die, +whether it was counted as a success/failure, and ## 📈 Enhancements - upgrade to dart 3.8.0 - upgrade to petitparser 7.0.0 +- added dependency on fast_immutable_collections - remove metadata & score from RollResult - rather than simple list of Integers representing the output of a roll or operation, now each die rolled is a 'RolledDie' object which has the metadata/score. - - the RollResult's results field changes from List to List. RolledDie represents not just the + - the RollResult's results field changes from List to IList. RolledDie represents not just the outcome of the roll, but also includes metadata about the type of die, nsides of the die (if polyhedral die), and metadata about the dice expression's modification of the rolls. - RollResult.results will include both discarded an not-discarded RolledDie. diff --git a/README.md b/README.md index 03db868..f0e5e21 100644 --- a/README.md +++ b/README.md @@ -117,10 +117,12 @@ void main() { * `4d6 #<=2` -- roll 4d6, count any <= 2 * `4d6 #=5` -- roll 4d6, count any equal to 5 * successes and failures - * A normal count operation `#` discards the rolled dice and changes the result to be the count + * A simple count operation `#` discards the rolled dice and changes the result to be the count of results matching the condition * For example, `2d6#<=3` rolls `[3,4]` then counts which results are `<=3` , returning `[1]` * But, sometimes you want to be able to count successes/failures without discarding the dice rolls. In this case, use modifiers `#s`, `#f`, `#cs`, `#cf` to add metadata to the results. + * without modifiers, `#s` or `#cs` will count the result as a success if it matches the maximum possible value for the die + * without modifiers, `#f` or `#cf` will count the result as a failure if it matches the minimum possible value for the die * `6d6 #f<=2 #s>=5 #cs6 #cf1` -- roll 6d6, count results <= 2 as failures, >= 5 as successes, =6 as critical successes, =1 as critical failures * The above returns a result like: diff --git a/lib/src/ast_core.dart b/lib/src/ast_core.dart new file mode 100644 index 0000000..1066eba --- /dev/null +++ b/lib/src/ast_core.dart @@ -0,0 +1,108 @@ +import 'package:fast_immutable_collections/fast_immutable_collections.dart'; + +import 'dice_expression.dart'; +import 'dice_roller.dart'; +import 'results.dart'; +import 'utils.dart'; + +/// All our operations will inherit from this class. +/// The `call()` method will be called by the parent node. +/// The `eval()` method is called from the node +abstract class DiceOp extends DiceExpression with LoggingMixin { + // each child class should override this to implement their operation + RollResult eval(); + + // all children can share this call operator -- and it'll let us be consistent w/ regard to logging + @override + RollResult call() { + final result = eval(); + logger.finer(() => '$result'); + return result; + } +} + +/// base class for unary operations +abstract class Unary extends DiceOp { + Unary(this.name, this.left); + + final String name; + final DiceExpression left; + + @override + String toString() => '($left)$name'; +} + +/// base class for binary operations +abstract class Binary extends DiceOp { + Binary(this.name, this.left, this.right); + + final String name; + final DiceExpression left; + final DiceExpression right; + + @override + String toString() => '($left $name $right)'; +} + +/// multiply operation (flattens results) +class MultiplyOp extends Binary { + MultiplyOp(super.name, super.left, super.right); + + @override + RollResult eval() => left() * right(); +} + +/// add operation +class AddOp extends Binary { + AddOp(super.name, super.left, super.right); + + @override + RollResult eval() => left() + right(); +} + +/// subtraction operation +class SubOp extends Binary { + SubOp(super.name, super.left, super.right); + + @override + RollResult eval() => left() - right(); +} + +/// base class for unary dice operations +abstract class UnaryDice extends Unary { + UnaryDice(super.name, super.left, this.roller); + + final DiceRoller roller; + + @override + String toString() => '($left$name)'; +} + +/// base class for binary dice expressions +abstract class BinaryDice extends Binary { + BinaryDice(super.name, super.left, super.right, this.roller); + + final DiceRoller roller; +} + +/// A value expression. The token we read from input will be a String, +/// it must parse as an int, and an empty string will return empty set. +class SimpleValue extends DiceExpression { + SimpleValue(this.value) + : _results = RollResult( + expression: value, + opType: OpType.value, + results: value.isEmpty + ? [] + : [RolledDie.singleVal(result: int.parse(value))], + ); + + final String value; + final RollResult _results; + + @override + RollResult call() => _results; + + @override + String toString() => value; +} diff --git a/lib/src/ast_dice.dart b/lib/src/ast_dice.dart new file mode 100644 index 0000000..fc24ad6 --- /dev/null +++ b/lib/src/ast_dice.dart @@ -0,0 +1,133 @@ +import 'package:fast_immutable_collections/fast_immutable_collections.dart'; +import 'package:petitparser/parser.dart'; + +import 'ast_core.dart'; +import 'dice_roller.dart'; +import 'results.dart'; + +/// roll fudge dice +class FudgeDice extends UnaryDice { + FudgeDice(super.name, super.left, super.roller); + + @override + RollResult eval() { + final lhs = left(); + final ndice = lhs.totalOrDefault(() => 1); + + // redundant w/ RangeError checks in the DiceRoller. But we can construct better error messages here. + if (ndice < DiceRoller.minDice || ndice > DiceRoller.maxDice) { + throw FormatException( + 'Invalid number of dice ($ndice)', + toString(), + left.toString().length, + ); + } + final roll = roller.rollFudge(ndice); + return RollResult.fromRollResult( + roll, + expression: toString(), + opType: roll.opType, + left: lhs, + ); + } +} + +class CSVDice extends UnaryDice { + CSVDice(super.op, super.left, super.roller, this.vals); + + final SeparatedList vals; + + @override + String toString() => '(${left}d${vals.elements})'; + + @override + RollResult eval() { + final lhs = left(); + final ndice = lhs.totalOrDefault(() => 1); + + final roll = roller.rollVals(ndice, IList(vals.elements.map(int.parse))); + + return RollResult.fromRollResult( + roll, + expression: toString(), + opType: OpType.rollVals, + left: lhs, + ); + } +} + +/// roll n % dice +class PercentDice extends UnaryDice { + PercentDice(super.name, super.left, super.roller); + + @override + RollResult eval() { + final lhs = left(); + final ndice = lhs.totalOrDefault(() => 1); + final roll = roller.roll(ndice, 100); + return RollResult.fromRollResult( + roll, + expression: toString(), + opType: OpType.rollPercent, + left: lhs, + ); + } +} + +/// roll n D66 +class D66Dice extends UnaryDice { + D66Dice(super.name, super.left, super.roller); + + @override + RollResult eval() { + final lhs = left(); + final ndice = lhs.totalOrDefault(() => 1); + final roll = roller.rollD66(ndice); + return RollResult.fromRollResult( + roll, + expression: toString(), + opType: OpType.rollD66, + left: lhs, + ); + } +} + +/// roll N dice of Y sides. +class StdDice extends BinaryDice { + StdDice(super.name, super.left, super.right, super.roller); + + @override + String toString() => '($left$name$right)'; + + @override + RollResult eval() { + final lhs = left(); + final rhs = right(); + final ndice = lhs.totalOrDefault(() => 1); + final nsides = rhs.totalOrDefault(() => 1); + + // redundant w/ RangeError checks in the DiceRoller. But we can construct better error messages here. + if (ndice < DiceRoller.minDice || ndice > DiceRoller.maxDice) { + throw FormatException( + 'Invalid number of dice ($ndice)', + toString(), + left.toString().length, + ); + } + if (nsides < DiceRoller.minSides || nsides > DiceRoller.maxSides) { + throw FormatException( + 'Invalid number of sides ($nsides)', + toString(), + left.toString().length + name.length + 1, + ); + } + final roll = roller.roll(ndice, nsides); + return RollResult.fromRollResult( + roll, + expression: toString(), + opType: roll.opType, + left: lhs, + right: rhs, + ); + } +} diff --git a/lib/src/ast.dart b/lib/src/ast_ops.dart similarity index 63% rename from lib/src/ast.dart rename to lib/src/ast_ops.dart index 151212e..ba95b58 100644 --- a/lib/src/ast.dart +++ b/lib/src/ast_ops.dart @@ -1,99 +1,11 @@ import 'package:collection/collection.dart'; -import 'package:petitparser/parser.dart'; -import 'dice_expression.dart'; -import 'dice_roller.dart'; +import 'ast_core.dart'; import 'results.dart'; -import 'utils.dart'; /// default limit for rerolls/exploding/compounding to avoid getting stuck in loop const defaultRerollLimit = 1000; -/// A value expression. The token we read from input will be a String, -/// it must parse as an int, and an empty string will return empty set. -class SimpleValue extends DiceExpression { - SimpleValue(this.value) - : _results = RollResult( - expression: value, - opType: OpType.value, - results: value.isEmpty - ? [] - : [RolledDie.singleVal(result: int.parse(value))], - ); - - final String value; - final RollResult _results; - - @override - RollResult call() => _results; - - @override - String toString() => value; -} - -/// All our operations will inherit from this class. -/// The `call()` method will be called by the parent node. -/// The `eval()` method is called from the node -abstract class DiceOp extends DiceExpression with LoggingMixin { - // each child class should override this to implement their operation - RollResult eval(); - - // all children can share this call operator -- and it'll let us be consistent w/ regard to logging - @override - RollResult call() { - final result = eval(); - logger.finer(() => '$result'); - return result; - } -} - -/// base class for unary operations -abstract class Unary extends DiceOp { - Unary(this.name, this.left); - - final String name; - final DiceExpression left; - - @override - String toString() => '($left)$name'; -} - -/// base class for binary operations -abstract class Binary extends DiceOp { - Binary(this.name, this.left, this.right); - - final String name; - final DiceExpression left; - final DiceExpression right; - - @override - String toString() => '($left $name $right)'; -} - -/// multiply operation (flattens results) -class MultiplyOp extends Binary { - MultiplyOp(super.name, super.left, super.right); - - @override - RollResult eval() => left() * right(); -} - -/// add operation -class AddOp extends Binary { - AddOp(super.name, super.left, super.right); - - @override - RollResult eval() => left() + right(); -} - -/// subtraction operation -class SubOp extends Binary { - SubOp(super.name, super.left, super.right); - - @override - RollResult eval() => left() - right(); -} - /// variation on count -- count how many results from lhs are =,<,> rhs. class CountOp extends Binary { CountOp( @@ -181,7 +93,7 @@ class CountOp extends Binary { } } - final filteredResults = lhs.results.where(test); + final scoredResults = lhs.results.where(test); if (countType == CountType.count) { // if counting, the count becomes the new result @@ -189,7 +101,9 @@ class CountOp extends Binary { return RollResult( expression: toString(), opType: OpType.count, - results: [RolledDie.singleVal(result: filteredResults.length)], + results: [ + RolledDie.singleVal(result: scoredResults.length, from: lhs.results), + ], discarded: [...lhs.results.map(RolledDie.discard), ...lhs.discarded], left: lhs, right: rhs, @@ -203,7 +117,7 @@ class CountOp extends Binary { expression: toString(), opType: OpType.count, results: [ - ...filteredResults.map( + ...scoredResults.map( (v) => RolledDie.scoreForCountType(v, countType: countType), ), ...nonScoredResults, @@ -333,10 +247,13 @@ class ClampOp extends Binary { }); final newResults = []; + final discarded = []; for (final d in lhs.results) { if (name == 'c>' && d.result > target) { + discarded.add(RolledDie.discard(d)); newResults.add(RolledDie.copyWith(d, result: target, clampHigh: true)); } else if (name == 'c<' && d.result < target) { + discarded.add(RolledDie.discard(d)); newResults.add(RolledDie.copyWith(d, result: target, clampLow: true)); } else { newResults.add(d); @@ -346,158 +263,7 @@ class ClampOp extends Binary { expression: toString(), opType: OpType.clamp, results: newResults, - discarded: lhs.discarded, - left: lhs, - right: rhs, - ); - } -} - -/// base class for unary dice operations -abstract class UnaryDice extends Unary { - UnaryDice(super.name, super.left, this.roller); - - final DiceRoller roller; - - @override - String toString() => '($left$name)'; -} - -/// base class for binary dice expressions -abstract class BinaryDice extends Binary { - BinaryDice(super.name, super.left, super.right, this.roller); - - final DiceRoller roller; -} - -/// roll fudge dice -class FudgeDice extends UnaryDice { - FudgeDice(super.name, super.left, super.roller); - - @override - RollResult eval() { - final lhs = left(); - final ndice = lhs.totalOrDefault(() => 1); - - // redundant w/ RangeError checks in the DiceRoller. But we can construct better error messages here. - if (ndice < DiceRoller.minDice || ndice > DiceRoller.maxDice) { - throw FormatException( - 'Invalid number of dice ($ndice)', - toString(), - left.toString().length, - ); - } - final roll = roller.rollFudge(ndice); - return RollResult.fromRollResult( - roll, - expression: toString(), - opType: roll.opType, - left: lhs, - ); - } -} - -class CSVDice extends UnaryDice { - CSVDice(super.op, super.left, super.roller, this.vals); - - final SeparatedList vals; - - @override - String toString() => '(${left}d${vals.elements})'; - - @override - RollResult eval() { - final lhs = left(); - final ndice = lhs.totalOrDefault(() => 1); - - final roll = roller.rollVals( - ndice, - vals.elements.map(int.parse).toList(growable: false), - ); - - return RollResult.fromRollResult( - roll, - expression: toString(), - opType: OpType.rollVals, - left: lhs, - ); - } -} - -/// roll n % dice -class PercentDice extends UnaryDice { - PercentDice(super.name, super.left, super.roller); - - @override - RollResult eval() { - final lhs = left(); - final ndice = lhs.totalOrDefault(() => 1); - final roll = roller.roll(ndice, 100); - return RollResult.fromRollResult( - roll, - expression: toString(), - opType: OpType.rollPercent, - left: lhs, - ); - } -} - -/// roll n D66 -class D66Dice extends UnaryDice { - D66Dice(super.name, super.left, super.roller); - - @override - RollResult eval() { - final lhs = left(); - final ndice = lhs.totalOrDefault(() => 1); - // TODO: capture the rolls as discarded. - final results = [ - for (var i = 0; i < ndice; i++) - roller.roll(1, 6).total * 10 + roller.roll(1, 6).total, - ].map((i) => RolledDie.d66(result: i)); - return RollResult( - expression: toString(), - opType: OpType.rollD66, - results: [...results], - left: lhs, - ); - } -} - -/// roll N dice of Y sides. -class StdDice extends BinaryDice { - StdDice(super.name, super.left, super.right, super.roller); - - @override - String toString() => '($left$name$right)'; - - @override - RollResult eval() { - final lhs = left(); - final rhs = right(); - final ndice = lhs.totalOrDefault(() => 1); - final nsides = rhs.totalOrDefault(() => 1); - - // redundant w/ RangeError checks in the DiceRoller. But we can construct better error messages here. - if (ndice < DiceRoller.minDice || ndice > DiceRoller.maxDice) { - throw FormatException( - 'Invalid number of dice ($ndice)', - toString(), - left.toString().length, - ); - } - if (nsides < DiceRoller.minSides || nsides > DiceRoller.maxSides) { - throw FormatException( - 'Invalid number of sides ($nsides)', - toString(), - left.toString().length + name.length + 1, - ); - } - final roll = roller.roll(ndice, nsides); - return RollResult.fromRollResult( - roll, - expression: toString(), - opType: roll.opType, + discarded: lhs.discarded + discarded, left: lhs, right: rhs, ); @@ -532,7 +298,7 @@ class RerollDice extends BinaryDice { ); }); - bool test(RolledDie rolledDie) { + bool shouldReroll(RolledDie rolledDie) { final val = rolledDie.result; switch (name) { case 'r' || 'ro' || 'r=' || 'ro=': @@ -555,18 +321,21 @@ class RerollDice extends BinaryDice { } final results = []; + final discarded = []; lhs.results.forEachIndexed((i, v) { - if (test(v)) { + if (shouldReroll(v)) { RolledDie rerolled; var rerollCount = 0; do { rerolled = roller - .roll(1, v.nsides, '(reroll ind $i, #$rerollCount)') - .results[0]; + .reroll(v, '(reroll ind $i, #$rerollCount)') + .results + .first; rerollCount++; - } while (test(rerolled) && rerollCount < limit); + } while (shouldReroll(rerolled) && rerollCount < limit); + discarded.add(RolledDie.copyWith(v, discarded: true, rerolled: true)); results.add( - RolledDie.copyWith(v, result: rerolled.result, rerolled: true), + RolledDie.copyWith(v, result: rerolled.result, reroll: true), ); } else { results.add(v); @@ -577,7 +346,7 @@ class RerollDice extends BinaryDice { expression: toString(), opType: OpType.reroll, results: results, - discarded: lhs.discarded, + discarded: lhs.discarded + discarded, left: lhs, right: rhs, ); @@ -604,12 +373,13 @@ class CompoundingDice extends BinaryDice { final lhs = left(); final rhs = right(); - bool test(RolledDie rolledDie) { - final target = rhs.totalOrDefault(() => rolledDie.nsides); + bool shouldCompound(RolledDie rolledDie) { final val = rolledDie.result; - if (!rolledDie.isCompoundable) { + if (!rolledDie.dieType.compoundable) { + logger.finest('$rolledDie cannot compound due to dieType'); return false; } + final target = rhs.totalOrDefault(() => rolledDie.maxPotentialValue); switch (name) { case '!!' || '!!=' || '!!o' || '!!o=': return val == target; @@ -633,20 +403,21 @@ class CompoundingDice extends BinaryDice { final results = []; final discarded = []; lhs.results.forEachIndexed((i, v) { - if (test(v)) { + if (shouldCompound(v)) { var sum = v.result; RolledDie rerolled; var numCompounded = 0; do { rerolled = roller - .roll(1, v.nsides, '(compound ind $i, #$numCompounded)') - .results[0]; + .reroll(v, '(compound ind $i, #$numCompounded)') + .results + .first; discarded.add( RolledDie.copyWith(rerolled, discarded: true, compounded: true), ); sum += rerolled.result; numCompounded++; - } while (test(rerolled) && numCompounded < limit); + } while (shouldCompound(rerolled) && numCompounded < limit); results.add(RolledDie.copyWith(v, result: sum, compoundedFinal: true)); } else { results.add(v); @@ -684,12 +455,13 @@ class ExplodingDice extends BinaryDice { final lhs = left(); final rhs = right(); - bool test(RolledDie rolledDie) { - final target = rhs.totalOrDefault(() => rolledDie.nsides); + bool shouldExplode(RolledDie rolledDie) { final val = rolledDie.result; - if (!rolledDie.isExplodable) { + if (!rolledDie.dieType.explodable) { + logger.finest('$rolledDie cannot compound due to dieType'); return false; } + final target = rhs.totalOrDefault(() => rolledDie.maxPotentialValue); switch (name) { case '!' || '!=' || '!o' || '!o=': return val == target; @@ -711,23 +483,24 @@ class ExplodingDice extends BinaryDice { } final newResults = []; - for (final rolledDie in lhs.results.where(test)) { + for (final rolledDie in lhs.results.where(shouldExplode)) { newResults.add(RolledDie.copyWith(rolledDie, exploded: true)); var numExplosions = 0; RolledDie rerolledDie; do { rerolledDie = roller - .roll(1, rolledDie.nsides, '(explode #${numExplosions + 1})') - .results[0]; + .reroll(rolledDie, '(explode #${numExplosions + 1})') + .results + .first; numExplosions++; newResults.add(RolledDie.copyWith(rerolledDie, explosion: true)); - } while (test(rerolledDie) && numExplosions < limit); + } while (shouldExplode(rerolledDie) && numExplosions < limit); } return RollResult( expression: toString(), opType: OpType.explode, - results: [...newResults, ...lhs.results.whereNot(test)], + results: [...newResults, ...lhs.results.whereNot(shouldExplode)], discarded: lhs.discarded, left: lhs, right: rhs, diff --git a/lib/src/dice_roller.dart b/lib/src/dice_roller.dart index cf07c75..c7f9371 100644 --- a/lib/src/dice_roller.dart +++ b/lib/src/dice_roller.dart @@ -1,5 +1,7 @@ import 'dart:math'; +import 'package:fast_immutable_collections/fast_immutable_collections.dart'; + import 'results.dart'; import 'utils.dart'; @@ -26,7 +28,48 @@ class DiceRoller with LoggingMixin { /// default limit to # of times dice rolls can explode (100) static const int defaultExplodeLimit = 100; - /// Roll ndice of nsides and return results as list. + RollResult reroll(RolledDie rolledDie, [String msg = '']) { + switch (rolledDie.dieType) { + case DieType.polyhedral: + return roll(1, rolledDie.nsides, msg); + case DieType.fudge: + return rollFudge(1); + case DieType.d66: + return rollD66(1); + case DieType.special: + return rollVals(1, rolledDie.potentialValues); + default: + return RollResult( + expression: rolledDie.result.toString(), + opType: OpType.value, + results: [RolledDie.singleVal(result: rolledDie.result)], + ); + } + } + + RollResult rollD66(int ndice) { + final results = []; + final discarded = []; + for (var i = 0; i < ndice; i++) { + final tensRoll = roll(1, 6); + final onesRoll = roll(1, 6); + final total = tensRoll.total * 10 + onesRoll.total; + final rolled = [ + RolledDie.discard(tensRoll.results.first), + RolledDie.discard(onesRoll.results.first), + ]; + discarded.addAll(rolled); + results.add(RolledDie.d66(result: total, from: rolled)); + } + return RollResult( + expression: toString(), + opType: OpType.rollD66, + results: results, + discarded: discarded, + ); + } + + /// Roll ndice of nsides and return results RollResult roll(int ndice, int nsides, [String msg = '']) { RangeError.checkValueInInterval(ndice, minDice, maxDice, 'ndice'); RangeError.checkValueInInterval(nsides, minSides, maxSides, 'nsides'); @@ -45,7 +88,7 @@ class DiceRoller with LoggingMixin { } /// select n items from the list of values - List selectN(int n, List vals) => [ + Iterable selectN(int n, IList vals) => [ for (var i = 0; i < n; i++) vals[_random.nextInt(vals.length)], ]; @@ -64,11 +107,13 @@ class DiceRoller with LoggingMixin { } /// Roll N fudge dice, return results - RollResult rollVals(int ndice, List sideVals) { + RollResult rollVals(int ndice, IList sideVals) { RangeError.checkValueInInterval(ndice, minDice, maxDice, 'ndice'); final results = selectN(ndice, sideVals); - logger.finest(() => 'roll ${ndice}d$sideVals => $results'); + logger.finest( + () => 'roll ${ndice}d${sideVals.toString(false)} => $results', + ); return RollResult( expression: '${ndice}d$sideVals', diff --git a/lib/src/parser.dart b/lib/src/parser.dart index 7776b95..443de86 100644 --- a/lib/src/parser.dart +++ b/lib/src/parser.dart @@ -1,6 +1,8 @@ import 'package:petitparser/petitparser.dart'; -import 'ast.dart'; +import 'ast_core.dart'; +import 'ast_dice.dart'; +import 'ast_ops.dart'; import 'dice_expression.dart'; import 'dice_roller.dart'; @@ -44,6 +46,7 @@ Parser parserBuilder(DiceRoller roller) { (a, op, b) => StdDice(op, a, b, roller), ); + // TODO: !p penetrating dice // compounding dice (has to be in separate group from exploding) builder.group().left( (string('!!') & diff --git a/lib/src/results.dart b/lib/src/results.dart index 2868d8f..c0c2871 100644 --- a/lib/src/results.dart +++ b/lib/src/results.dart @@ -1,12 +1,27 @@ +import 'package:collection/collection.dart'; import 'package:equatable/equatable.dart'; +import 'package:fast_immutable_collections/fast_immutable_collections.dart'; /// types of die -enum DieType { - polyhedral, // normal polyhedral (1d6, 1d20, etc) - fudge, // fudge dice - d66, // 1D66 (equivalent to `1d6*10 + 1d6`). - special, // 1d[1,3,5,7,9] - singleVal, // single value (e.g. a sum or count of dice) +enum DieType implements Comparable { + // normal polyhedral (1d6, 1d20, etc) + polyhedral(explodable: true, compoundable: true), + // fudge dice + fudge(explodable: true, compoundable: true), + // 1D66 (equivalent to `1d6*10 + 1d6`). + d66(explodable: true, compoundable: true), + // 1d[1,3,5,7,9] + special(explodable: true, compoundable: true), + // single value (e.g. a sum or count of dice) + singleVal(explodable: false, compoundable: false); + + const DieType({required this.explodable, required this.compoundable}); + + final bool explodable; + final bool compoundable; + + @override + int compareTo(DieType dieType) => index.compareTo(dieType.index); } enum OpType { @@ -42,16 +57,15 @@ enum CountType { count, success, failure, critSuccess, critFailure } /// you may need to traverse the tree to inspect all the events. class RollSummary extends Equatable { - RollSummary({required this.detailedResults}) { - total = detailedResults.results.sum; - results = detailedResults.results; - discarded = detailedResults.discarded; - expression = detailedResults.expression; - successCount = detailedResults.results.successCount; - failureCount = detailedResults.results.failureCount; - critSuccessCount = detailedResults.results.critSuccessCount; - critFailureCount = detailedResults.results.critFailureCount; - } + RollSummary({required this.detailedResults}) + : total = detailedResults.results.sum, + results = IList(detailedResults.results), + discarded = IList(detailedResults.discarded), + expression = detailedResults.expression, + successCount = detailedResults.results.successCount, + failureCount = detailedResults.results.failureCount, + critSuccessCount = detailedResults.results.critSuccessCount, + critFailureCount = detailedResults.results.critFailureCount; final RollResult detailedResults; @@ -66,10 +80,10 @@ class RollSummary extends Equatable { late final String expression; /// the results of the evaluating the expression - late final List results; + late final IList results; /// the dice we lost along the way - late final List discarded; + late final IList discarded; @override List get props => [ @@ -86,10 +100,10 @@ class RollSummary extends Equatable { @override String toString() { final buffer = StringBuffer( - '$expression ===> RollSummary(total: $total, results: $results', + '$expression ===> RollSummary(total: $total, results: ${results.toString(false)}', ); if (discarded.isNotEmpty) { - buffer.write(', discarded: $discarded'); + buffer.write(', discarded: ${discarded.toString(false)}'); } final params = { 'successCount': successCount, @@ -110,6 +124,7 @@ class RollSummary extends Equatable { return buffer.toString(); } + // TODO: implement fromJson Map toJson() => { 'expression': expression, @@ -125,7 +140,7 @@ class RollSummary extends Equatable { (k, v) => v == null || (v is Map && v.isEmpty) || - (v is List && v.isEmpty) || + (v is Iterable && v.isEmpty) || (v is int && v == 0) || (v is bool && !v), ); @@ -143,13 +158,13 @@ class RollSummary extends Equatable { /// representation of a single dice roll result. class RolledDie extends Equatable implements Comparable { - static const defaultFudgeVals = [-1, -1, 0, 0, 1, 1]; + static const defaultFudgeVals = IListConst([-1, -1, 0, 0, 1, 1]); - const RolledDie({ + RolledDie({ required this.result, required this.dieType, this.nsides = 0, - this.potentialValues = const [], + Iterable potentialValues = const IList.empty(), this.discarded = false, this.success = false, this.failure = false, @@ -159,11 +174,31 @@ class RolledDie extends Equatable implements Comparable { this.explosion = false, this.compoundedFinal = false, this.compounded = false, + this.reroll = false, this.rerolled = false, this.clampCeiling = false, this.clampFloor = false, - this.modifiedFrom, - }); + this.from = const IList.empty(), + }) : potentialValues = IList(potentialValues) { + switch (dieType) { + case DieType.polyhedral: + maxPotentialValue = nsides; + minPotentialValue = 1; + case DieType.d66: + maxPotentialValue = 66; + minPotentialValue = 1; + case DieType.singleVal: + maxPotentialValue = minPotentialValue = result; + case DieType.special || DieType.fudge: + if (potentialValues.isEmpty) { + throw new ArgumentError( + 'Invalid die -- ${dieType} must have a potentialValues field', + ); + } + maxPotentialValue = potentialValues.max; + minPotentialValue = potentialValues.min; + } + } factory RolledDie.polyhedral({required int result, required int nsides}) => RolledDie(result: result, nsides: nsides, dieType: DieType.polyhedral); @@ -175,11 +210,22 @@ class RolledDie extends Equatable implements Comparable { potentialValues: defaultFudgeVals, ); - factory RolledDie.singleVal({required int result}) => - RolledDie(result: result, dieType: DieType.singleVal); + factory RolledDie.singleVal({ + required int result, + Iterable? from, + }) => RolledDie( + result: result, + dieType: DieType.singleVal, + potentialValues: [result], + from: IList.orNull(from) ?? const IList.empty(), + ); - factory RolledDie.d66({required int result}) => - RolledDie(result: result, dieType: DieType.d66); + factory RolledDie.d66({required int result, Iterable? from}) => + RolledDie( + result: result, + dieType: DieType.d66, + from: IList.orNull(from) ?? const IList.empty(), + ); factory RolledDie.copyWith( RolledDie other, { @@ -193,9 +239,11 @@ class RolledDie extends Equatable implements Comparable { bool? explosion, bool? compounded, bool? compoundedFinal, + bool? reroll, bool? rerolled, bool? clampHigh, bool? clampLow, + Iterable? from, }) => RolledDie( potentialValues: other.potentialValues, nsides: other.nsides, @@ -210,10 +258,11 @@ class RolledDie extends Equatable implements Comparable { explosion: explosion ?? other.explosion, compounded: compounded ?? other.compounded, compoundedFinal: compoundedFinal ?? other.compoundedFinal, + reroll: reroll ?? other.reroll, rerolled: rerolled ?? other.rerolled, clampCeiling: clampHigh ?? other.clampCeiling, clampFloor: clampLow ?? other.clampFloor, - modifiedFrom: other, + from: IList.orNull(from) ?? IList([other]), ); factory RolledDie.discard(RolledDie other) => @@ -236,20 +285,19 @@ class RolledDie extends Equatable implements Comparable { /// the number of sides on the die. Generally only set if dieType == polyhedral final int nsides; + /// the maximum possible result of this die + late final int maxPotentialValue; + + /// the minimum possible result of this die + late final int minPotentialValue; + /// the die faces (potential values). - /// this will be empty for polyhedral roles -- values will be range of (0,nsides] - final List potentialValues; + /// this will be empty for polyhedral roles -- values of a polyhederal die will be range of [1,nsides] + final IList potentialValues; /// true if the result has been discarded final bool discarded; - bool get isDiscarded => discarded; - - // TODO: is this true? can fudge dice explode? - bool get isExplodable => dieType == DieType.polyhedral; - - bool get isCompoundable => isExplodable; - /// whether the die was scored as a 'success' final bool success; @@ -265,7 +313,8 @@ class RolledDie extends Equatable implements Comparable { /// the type of die final DieType dieType; - final RolledDie? modifiedFrom; + /// the die that were operated on to become this die. + final IList from; /// true if the die exploded final bool exploded; @@ -278,14 +327,24 @@ class RolledDie extends Equatable implements Comparable { /// true if the die is the sum a multiple die due to compounding final bool compoundedFinal; + + /// true if the (discarded) result is from a reroll final bool rerolled; + + /// true if the result is the rerolled die + final bool reroll; + + /// true if the result has been clamped via `C>` final bool clampCeiling; + + /// true if the result has been clamped via `C<` final bool clampFloor; @override List get props => [ result, nsides, + maxPotentialValue, potentialValues, dieType, discarded, @@ -297,6 +356,7 @@ class RolledDie extends Equatable implements Comparable { explosion, compounded, compoundedFinal, + reroll, rerolled, clampCeiling, clampFloor, @@ -306,7 +366,8 @@ class RolledDie extends Equatable implements Comparable { { 'result': result, 'nsides': nsides, - 'vals': potentialValues, + 'potentialValues': potentialValues.toList(growable: false), + 'maxPotentialValue': maxPotentialValue, 'dieType': dieType.name, 'discarded': discarded, 'success': success, @@ -317,6 +378,7 @@ class RolledDie extends Equatable implements Comparable { 'explosion': explosion, 'compounded': compounded, 'compoundedFinal': compoundedFinal, + 'reroll': reroll, 'rerolled': rerolled, 'clampHigh': clampCeiling, 'clampLow': clampFloor, @@ -324,7 +386,7 @@ class RolledDie extends Equatable implements Comparable { (k, v) => v == null || (v is Map && v.isEmpty) || - (v is List && v.isEmpty) || + (v is Iterable && v.isEmpty) || (v is int && v == 0) || (v is bool && !v), ); @@ -338,9 +400,9 @@ class RolledDie extends Equatable implements Comparable { case DieType.d66: return 'D66'; case DieType.singleVal: - return ''; + return 'val'; default: - return '?'; + return 'd?'; } } @@ -353,6 +415,9 @@ class RolledDie extends Equatable implements Comparable { if (rerolled) { buffer.write('↩'); } + if (reroll) { + buffer.write('↩'); + } if (exploded) { buffer.write('💣'); //'⇪'); } @@ -366,10 +431,10 @@ class RolledDie extends Equatable implements Comparable { buffer.write('+'); } if (clampCeiling) { - buffer.write('⌉'); + buffer.write('⌈⌉'); } if (clampFloor) { - buffer.write('⌋'); + buffer.write('⌊⌋'); } if (success) { buffer.write('✓'); @@ -381,7 +446,7 @@ class RolledDie extends Equatable implements Comparable { buffer.write('✅'); } if (critFailure) { - buffer.write('❌'); //'☠' + buffer.write('❌'); } return buffer.toString(); } @@ -397,11 +462,19 @@ class RolledDie extends Equatable implements Comparable { return buffer.toString(); } + //TODO: should this compare other fields too? @override - int compareTo(RolledDie other) => result - other.result; + int compareTo(RolledDie other) => result + .compareTo(other.result) + .if0(dieType.compareTo(other.dieType)) + .if0( + dieType == DieType.polyhedral && other.dieType == DieType.polyhedral + ? nsides.compareTo(other.nsides) + : 0, + ); } -extension RolledDieListExtensions on List { +extension RolledDieIListExtensions on IList { int get sum => map((d) => d.result).fold(0, (sum, i) => sum + i); int get successCount => where((d) => d.success).length; @@ -416,14 +489,15 @@ extension RolledDieListExtensions on List { /// [RollResult] represents the result of evaluating a particular node of the AST. /// class RollResult extends Equatable { - const RollResult({ + RollResult({ required this.expression, required this.opType, - this.results = const [], - this.discarded = const [], + Iterable results = const IList.empty(), + Iterable discarded = const IList.empty(), this.left, this.right, - }); + }) : results = IList(results), + discarded = IList(discarded); /// factory constructor to merge [other] with the params of this function /// and produce a new [RollResult]. @@ -431,15 +505,15 @@ class RollResult extends Equatable { RollResult other, { required String expression, OpType? opType, - List? results, - List? discarded, + Iterable? results, + Iterable? discarded, RollResult? left, RollResult? right, }) => RollResult( expression: expression, opType: opType ?? other.opType, - results: results ?? other.results, - discarded: discarded ?? other.discarded, + results: IList.orNull(results) ?? other.results, + discarded: IList.orNull(discarded) ?? other.discarded, left: left ?? other.left, right: right ?? other.right, ); @@ -466,7 +540,12 @@ class RollResult extends Equatable { RollResult operator *(RollResult other) => RollResult.fromRollResult( other, expression: '($expression * ${other.expression})', - results: [RolledDie.singleVal(result: results.sum * other.results.sum)], + results: [ + RolledDie.singleVal( + result: results.sum * other.results.sum, + from: results + other.results, + ), + ], discarded: [ ...results.map(RolledDie.discard), ...other.results.map(RolledDie.discard), @@ -487,7 +566,7 @@ class RollResult extends Equatable { opType: OpType.subtract, results: [ ...results, - RolledDie.singleVal(result: -1 * other.results.sum), + RolledDie.singleVal(result: -1 * other.results.sum, from: other.results), ], discarded: [...other.results.map(RolledDie.discard)], left: this, @@ -498,8 +577,8 @@ class RollResult extends Equatable { final String expression; /// the results of the evaluating the expression - final List results; - final List discarded; + final IList results; + final IList discarded; final RollResult? left; final RollResult? right; @@ -544,10 +623,10 @@ class RollResult extends Equatable { ); if (opType != OpType.value) { if (results.isNotEmpty) { - buffer.write(', results: $results'); + buffer.write(', results: ${results.toString(false)}'); } if (discarded.isNotEmpty) { - buffer.write(', discarded: $discarded'); + buffer.write(', discarded: ${discarded.toString(false)}'); } } buffer.write(')'); @@ -577,7 +656,7 @@ class RollResult extends Equatable { (k, v) => v == null || (v is Map && v.isEmpty) || - (v is List && v.isEmpty) || + (v is Iterable && v.isEmpty) || (v is int && v == 0), ); } diff --git a/pubspec.yaml b/pubspec.yaml index d668392..2569015 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -10,6 +10,7 @@ environment: dependencies: collection: ^1.0.0 equatable: ^2.0.0 + fast_immutable_collections: ^11.0.0 logging: ^1.3.0 petitparser: ^7.0.0 diff --git a/test/dart_dice_parser_test.dart b/test/dart_dice_parser_test.dart index b08ac20..b9c0f89 100644 --- a/test/dart_dice_parser_test.dart +++ b/test/dart_dice_parser_test.dart @@ -32,7 +32,7 @@ void main() { String testName, String inputExpr, int? expectedTotal, { - List? expectedResults, + Iterable? expectedResults, int? successCount, int? failureCount, int? critSuccessCount, @@ -337,7 +337,7 @@ void main() { expression: '((2d6) kh )', opType: OpType.drop, results: [RolledDie.polyhedral(result: 6, nsides: 6)], - discarded: const [ + discarded: [ RolledDie( result: 2, nsides: 6, @@ -614,19 +614,59 @@ void main() { 'expression': '(4d6)', 'total': 14, 'results': [ - {'result': 6, 'nsides': 6, 'dieType': 'polyhedral'}, - {'result': 2, 'nsides': 6, 'dieType': 'polyhedral'}, - {'result': 1, 'nsides': 6, 'dieType': 'polyhedral'}, - {'result': 5, 'nsides': 6, 'dieType': 'polyhedral'}, + { + 'result': 6, + 'nsides': 6, + 'maxPotentialValue': 6, + 'dieType': 'polyhedral', + }, + { + 'result': 2, + 'nsides': 6, + 'maxPotentialValue': 6, + 'dieType': 'polyhedral', + }, + { + 'result': 1, + 'nsides': 6, + 'maxPotentialValue': 6, + 'dieType': 'polyhedral', + }, + { + 'result': 5, + 'nsides': 6, + 'maxPotentialValue': 6, + 'dieType': 'polyhedral', + }, ], 'detailedResults': { 'expression': '(4d6)', 'opType': 'rollDice', 'results': [ - {'result': 6, 'nsides': 6, 'dieType': 'polyhedral'}, - {'result': 2, 'nsides': 6, 'dieType': 'polyhedral'}, - {'result': 1, 'nsides': 6, 'dieType': 'polyhedral'}, - {'result': 5, 'nsides': 6, 'dieType': 'polyhedral'}, + { + 'result': 6, + 'nsides': 6, + 'maxPotentialValue': 6, + 'dieType': 'polyhedral', + }, + { + 'result': 2, + 'nsides': 6, + 'maxPotentialValue': 6, + 'dieType': 'polyhedral', + }, + { + 'result': 1, + 'nsides': 6, + 'maxPotentialValue': 6, + 'dieType': 'polyhedral', + }, + { + 'result': 5, + 'nsides': 6, + 'maxPotentialValue': 6, + 'dieType': 'polyhedral', + }, ], 'total': 14, }, @@ -649,17 +689,29 @@ void main() { { 'result': 6, 'nsides': 6, + 'maxPotentialValue': 6, 'dieType': 'polyhedral', 'critSuccess': true, }, { 'result': 1, 'nsides': 6, + 'maxPotentialValue': 6, 'dieType': 'polyhedral', 'critFailure': true, }, - {'result': 2, 'nsides': 6, 'dieType': 'polyhedral'}, - {'result': 5, 'nsides': 6, 'dieType': 'polyhedral'}, + { + 'result': 2, + 'nsides': 6, + 'maxPotentialValue': 6, + 'dieType': 'polyhedral', + }, + { + 'result': 5, + 'nsides': 6, + 'maxPotentialValue': 6, + 'dieType': 'polyhedral', + }, ], 'detailedResults': { 'expression': '(((4d6) #cf ) #cs )', @@ -668,17 +720,29 @@ void main() { { 'result': 6, 'nsides': 6, + 'maxPotentialValue': 6, 'dieType': 'polyhedral', 'critSuccess': true, }, { 'result': 1, 'nsides': 6, + 'maxPotentialValue': 6, 'dieType': 'polyhedral', 'critFailure': true, }, - {'result': 2, 'nsides': 6, 'dieType': 'polyhedral'}, - {'result': 5, 'nsides': 6, 'dieType': 'polyhedral'}, + { + 'result': 2, + 'nsides': 6, + 'maxPotentialValue': 6, + 'dieType': 'polyhedral', + }, + { + 'result': 5, + 'nsides': 6, + 'maxPotentialValue': 6, + 'dieType': 'polyhedral', + }, ], 'left': { 'expression': '((4d6) #cf )', @@ -687,21 +751,57 @@ void main() { { 'result': 1, 'nsides': 6, + 'maxPotentialValue': 6, 'dieType': 'polyhedral', 'critFailure': true, }, - {'result': 6, 'nsides': 6, 'dieType': 'polyhedral'}, - {'result': 2, 'nsides': 6, 'dieType': 'polyhedral'}, - {'result': 5, 'nsides': 6, 'dieType': 'polyhedral'}, + { + 'result': 6, + 'nsides': 6, + 'maxPotentialValue': 6, + 'dieType': 'polyhedral', + }, + { + 'result': 2, + 'nsides': 6, + 'maxPotentialValue': 6, + 'dieType': 'polyhedral', + }, + { + 'result': 5, + 'nsides': 6, + 'maxPotentialValue': 6, + 'dieType': 'polyhedral', + }, ], 'left': { 'expression': '(4d6)', 'opType': 'rollDice', 'results': [ - {'result': 6, 'nsides': 6, 'dieType': 'polyhedral'}, - {'result': 2, 'nsides': 6, 'dieType': 'polyhedral'}, - {'result': 1, 'nsides': 6, 'dieType': 'polyhedral'}, - {'result': 5, 'nsides': 6, 'dieType': 'polyhedral'}, + { + 'result': 6, + 'nsides': 6, + 'maxPotentialValue': 6, + 'dieType': 'polyhedral', + }, + { + 'result': 2, + 'nsides': 6, + 'maxPotentialValue': 6, + 'dieType': 'polyhedral', + }, + { + 'result': 1, + 'nsides': 6, + 'maxPotentialValue': 6, + 'dieType': 'polyhedral', + }, + { + 'result': 5, + 'nsides': 6, + 'maxPotentialValue': 6, + 'dieType': 'polyhedral', + }, ], 'total': 14, }, From 352c8a7bf9d2c907d4d12b1089fa2cd49e60619c Mon Sep 17 00:00:00 2001 From: Steve Christensen Date: Fri, 4 Jul 2025 16:17:48 -0600 Subject: [PATCH 09/31] consistent logging for rerolls. cleanup min/max --- CHANGELOG.md | 5 +- lib/src/ast_core.dart | 2 - lib/src/ast_ops.dart | 14 ++-- lib/src/dice_roller.dart | 19 +++-- lib/src/results.dart | 5 +- test/dart_dice_parser_test.dart | 142 +++++--------------------------- 6 files changed, 44 insertions(+), 143 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 697f513..503674a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,8 +7,8 @@ as a RolledDie object, rather than an integer. The RolledDie object incorporates a lot of the metadata/scoring in pre-8.0.0 results. Having a more elaborate result will make it easier for client applications -to render the outcome of a roll. Each RolledDie knows its result, the # of sides on the die, -whether it was counted as a success/failure, and +to render the outcome of a roll. Each RolledDie knows its result, the # of sides on the die, and +whether it was counted as a success/failure. ## 📈 Enhancements @@ -16,6 +16,7 @@ whether it was counted as a success/failure, and - upgrade to petitparser 7.0.0 - added dependency on fast_immutable_collections - remove metadata & score from RollResult +- allow compounding, exploding, and rerolls for 'odd' die (`dF, D66, and d[vals]`) - rather than simple list of Integers representing the output of a roll or operation, now each die rolled is a 'RolledDie' object which has the metadata/score. - the RollResult's results field changes from List to IList. RolledDie represents not just the diff --git a/lib/src/ast_core.dart b/lib/src/ast_core.dart index 1066eba..bf85e70 100644 --- a/lib/src/ast_core.dart +++ b/lib/src/ast_core.dart @@ -1,5 +1,3 @@ -import 'package:fast_immutable_collections/fast_immutable_collections.dart'; - import 'dice_expression.dart'; import 'dice_roller.dart'; import 'results.dart'; diff --git a/lib/src/ast_ops.dart b/lib/src/ast_ops.dart index ba95b58..64cde62 100644 --- a/lib/src/ast_ops.dart +++ b/lib/src/ast_ops.dart @@ -34,7 +34,7 @@ class CountOp extends Binary { final lhs = left(); final rhs = right(); - bool test(RolledDie rolledDie) { + bool shouldCount(RolledDie rolledDie) { var rhsEmptyAndSimpleCount = false; final target = rhs.totalOrDefault(() { // if missing RHS, we can make assumptions depending on operator. @@ -44,11 +44,11 @@ class CountOp extends Binary { rhsEmptyAndSimpleCount = true; return 0; case '#s' || '#cs': - // example: '3d6#s' -- assume target is nsides (maximum) - return rolledDie.nsides; + // example: '3d6#s' should match 6, or '3D66' should match 66 + return rolledDie.maxPotentialValue; case '#f' || '#cf': - // example: '3d6#f' -- assume target is 1 (minimum) - return 1; + // generally should be 1. + return rolledDie.minPotentialValue; default: throw FormatException( 'Invalid count operation. Missing count target', @@ -93,7 +93,7 @@ class CountOp extends Binary { } } - final scoredResults = lhs.results.where(test); + final scoredResults = lhs.results.where(shouldCount); if (countType == CountType.count) { // if counting, the count becomes the new result @@ -111,7 +111,7 @@ class CountOp extends Binary { } else { // if counting success/failures, the results are updated w/ scoring - final nonScoredResults = lhs.results.whereNot(test); + final nonScoredResults = lhs.results.whereNot(shouldCount); return RollResult( expression: toString(), diff --git a/lib/src/dice_roller.dart b/lib/src/dice_roller.dart index c7f9371..59d2f3c 100644 --- a/lib/src/dice_roller.dart +++ b/lib/src/dice_roller.dart @@ -33,11 +33,11 @@ class DiceRoller with LoggingMixin { case DieType.polyhedral: return roll(1, rolledDie.nsides, msg); case DieType.fudge: - return rollFudge(1); + return rollFudge(1, msg); case DieType.d66: - return rollD66(1); + return rollD66(1, msg); case DieType.special: - return rollVals(1, rolledDie.potentialValues); + return rollVals(1, rolledDie.potentialValues, msg); default: return RollResult( expression: rolledDie.result.toString(), @@ -47,7 +47,7 @@ class DiceRoller with LoggingMixin { } } - RollResult rollD66(int ndice) { + RollResult rollD66(int ndice, [String msg = '']) { final results = []; final discarded = []; for (var i = 0; i < ndice; i++) { @@ -61,6 +61,9 @@ class DiceRoller with LoggingMixin { discarded.addAll(rolled); results.add(RolledDie.d66(result: total, from: rolled)); } + logger.finest( + () => 'roll ${ndice}D66 => $results {discarded: $discarded} $msg', + ); return RollResult( expression: toString(), opType: OpType.rollD66, @@ -93,11 +96,11 @@ class DiceRoller with LoggingMixin { ]; /// Roll N fudge dice, return results - RollResult rollFudge(int ndice) { + RollResult rollFudge(int ndice, [String msg = '']) { RangeError.checkValueInInterval(ndice, minDice, maxDice, 'ndice'); final results = selectN(ndice, RolledDie.defaultFudgeVals); - logger.finest(() => 'roll ${ndice}dF => $results'); + logger.finest(() => 'roll ${ndice}dF => $results $msg'); return RollResult( expression: '${ndice}dF', @@ -107,12 +110,12 @@ class DiceRoller with LoggingMixin { } /// Roll N fudge dice, return results - RollResult rollVals(int ndice, IList sideVals) { + RollResult rollVals(int ndice, IList sideVals, [String msg = '']) { RangeError.checkValueInInterval(ndice, minDice, maxDice, 'ndice'); final results = selectN(ndice, sideVals); logger.finest( - () => 'roll ${ndice}d${sideVals.toString(false)} => $results', + () => 'roll ${ndice}d${sideVals.toString(false)} => $results $msg', ); return RollResult( diff --git a/lib/src/results.dart b/lib/src/results.dart index c0c2871..20bd38c 100644 --- a/lib/src/results.dart +++ b/lib/src/results.dart @@ -191,8 +191,8 @@ class RolledDie extends Equatable implements Comparable { maxPotentialValue = minPotentialValue = result; case DieType.special || DieType.fudge: if (potentialValues.isEmpty) { - throw new ArgumentError( - 'Invalid die -- ${dieType} must have a potentialValues field', + throw ArgumentError( + 'Invalid die -- ${dieType.name} must have a potentialValues field', ); } maxPotentialValue = potentialValues.max; @@ -367,7 +367,6 @@ class RolledDie extends Equatable implements Comparable { 'result': result, 'nsides': nsides, 'potentialValues': potentialValues.toList(growable: false), - 'maxPotentialValue': maxPotentialValue, 'dieType': dieType.name, 'discarded': discarded, 'success': success, diff --git a/test/dart_dice_parser_test.dart b/test/dart_dice_parser_test.dart index b9c0f89..3f6f680 100644 --- a/test/dart_dice_parser_test.dart +++ b/test/dart_dice_parser_test.dart @@ -596,9 +596,9 @@ void main() { (((4d(3 + 3)) ! ) + ((2 + 2)d6)) =add=> RollResult(total: 33, results: [6(d6💣), 3(d6🔥), 2(d6), 1(d6), 5(d6), 5(d6), 1(d6), 4(d6), 6(d6)]) ((4d(3 + 3)) ! ) =explode=> RollResult(total: 17, results: [6(d6💣), 3(d6🔥), 2(d6), 1(d6), 5(d6)]) (4d(3 + 3)) =rollDice=> RollResult(total: 14, results: [6(d6), 2(d6), 1(d6), 5(d6)]) - (3 + 3) =add=> RollResult(total: 6, results: [3(), 3()]) + (3 + 3) =add=> RollResult(total: 6, results: [3(val), 3(val)]) ((2 + 2)d6) =rollDice=> RollResult(total: 16, results: [5(d6), 1(d6), 4(d6), 6(d6)]) - (2 + 2) =add=> RollResult(total: 4, results: [2(), 2()]) + (2 + 2) =add=> RollResult(total: 4, results: [2(val), 2(val)]) ''' .trim(), ), @@ -614,59 +614,19 @@ void main() { 'expression': '(4d6)', 'total': 14, 'results': [ - { - 'result': 6, - 'nsides': 6, - 'maxPotentialValue': 6, - 'dieType': 'polyhedral', - }, - { - 'result': 2, - 'nsides': 6, - 'maxPotentialValue': 6, - 'dieType': 'polyhedral', - }, - { - 'result': 1, - 'nsides': 6, - 'maxPotentialValue': 6, - 'dieType': 'polyhedral', - }, - { - 'result': 5, - 'nsides': 6, - 'maxPotentialValue': 6, - 'dieType': 'polyhedral', - }, + {'result': 6, 'nsides': 6, 'dieType': 'polyhedral'}, + {'result': 2, 'nsides': 6, 'dieType': 'polyhedral'}, + {'result': 1, 'nsides': 6, 'dieType': 'polyhedral'}, + {'result': 5, 'nsides': 6, 'dieType': 'polyhedral'}, ], 'detailedResults': { 'expression': '(4d6)', 'opType': 'rollDice', 'results': [ - { - 'result': 6, - 'nsides': 6, - 'maxPotentialValue': 6, - 'dieType': 'polyhedral', - }, - { - 'result': 2, - 'nsides': 6, - 'maxPotentialValue': 6, - 'dieType': 'polyhedral', - }, - { - 'result': 1, - 'nsides': 6, - 'maxPotentialValue': 6, - 'dieType': 'polyhedral', - }, - { - 'result': 5, - 'nsides': 6, - 'maxPotentialValue': 6, - 'dieType': 'polyhedral', - }, + {'result': 6, 'nsides': 6, 'dieType': 'polyhedral'}, + {'result': 2, 'nsides': 6, 'dieType': 'polyhedral'}, + {'result': 1, 'nsides': 6, 'dieType': 'polyhedral'}, + {'result': 5, 'nsides': 6, 'dieType': 'polyhedral'}, ], 'total': 14, }, @@ -689,29 +649,17 @@ void main() { { 'result': 6, 'nsides': 6, - 'maxPotentialValue': 6, 'dieType': 'polyhedral', 'critSuccess': true, }, { 'result': 1, 'nsides': 6, - 'maxPotentialValue': 6, 'dieType': 'polyhedral', 'critFailure': true, }, - { - 'result': 2, - 'nsides': 6, - 'maxPotentialValue': 6, - 'dieType': 'polyhedral', - }, - { - 'result': 5, - 'nsides': 6, - 'maxPotentialValue': 6, - 'dieType': 'polyhedral', - }, + {'result': 2, 'nsides': 6, 'dieType': 'polyhedral'}, + {'result': 5, 'nsides': 6, 'dieType': 'polyhedral'}, ], 'detailedResults': { 'expression': '(((4d6) #cf ) #cs )', @@ -720,29 +668,17 @@ void main() { { 'result': 6, 'nsides': 6, - 'maxPotentialValue': 6, 'dieType': 'polyhedral', 'critSuccess': true, }, { 'result': 1, 'nsides': 6, - 'maxPotentialValue': 6, 'dieType': 'polyhedral', 'critFailure': true, }, - { - 'result': 2, - 'nsides': 6, - 'maxPotentialValue': 6, - 'dieType': 'polyhedral', - }, - { - 'result': 5, - 'nsides': 6, - 'maxPotentialValue': 6, - 'dieType': 'polyhedral', - }, + {'result': 2, 'nsides': 6, 'dieType': 'polyhedral'}, + {'result': 5, 'nsides': 6, 'dieType': 'polyhedral'}, ], 'left': { 'expression': '((4d6) #cf )', @@ -751,57 +687,21 @@ void main() { { 'result': 1, 'nsides': 6, - 'maxPotentialValue': 6, 'dieType': 'polyhedral', 'critFailure': true, }, - { - 'result': 6, - 'nsides': 6, - 'maxPotentialValue': 6, - 'dieType': 'polyhedral', - }, - { - 'result': 2, - 'nsides': 6, - 'maxPotentialValue': 6, - 'dieType': 'polyhedral', - }, - { - 'result': 5, - 'nsides': 6, - 'maxPotentialValue': 6, - 'dieType': 'polyhedral', - }, + {'result': 6, 'nsides': 6, 'dieType': 'polyhedral'}, + {'result': 2, 'nsides': 6, 'dieType': 'polyhedral'}, + {'result': 5, 'nsides': 6, 'dieType': 'polyhedral'}, ], 'left': { 'expression': '(4d6)', 'opType': 'rollDice', 'results': [ - { - 'result': 6, - 'nsides': 6, - 'maxPotentialValue': 6, - 'dieType': 'polyhedral', - }, - { - 'result': 2, - 'nsides': 6, - 'maxPotentialValue': 6, - 'dieType': 'polyhedral', - }, - { - 'result': 1, - 'nsides': 6, - 'maxPotentialValue': 6, - 'dieType': 'polyhedral', - }, - { - 'result': 5, - 'nsides': 6, - 'maxPotentialValue': 6, - 'dieType': 'polyhedral', - }, + {'result': 6, 'nsides': 6, 'dieType': 'polyhedral'}, + {'result': 2, 'nsides': 6, 'dieType': 'polyhedral'}, + {'result': 1, 'nsides': 6, 'dieType': 'polyhedral'}, + {'result': 5, 'nsides': 6, 'dieType': 'polyhedral'}, ], 'total': 14, }, From 2f96d9600c148a69e78f40f805ffdd07e08d9db5 Mon Sep 17 00:00:00 2001 From: Steve Christensen Date: Fri, 4 Jul 2025 16:36:39 -0600 Subject: [PATCH 10/31] enhance dieType to know more capabilities, throw error on misconfigure --- lib/src/dice_roller.dart | 4 ++-- lib/src/results.dart | 45 +++++++++++++++++++++++++++++----------- 2 files changed, 35 insertions(+), 14 deletions(-) diff --git a/lib/src/dice_roller.dart b/lib/src/dice_roller.dart index 59d2f3c..f33d39a 100644 --- a/lib/src/dice_roller.dart +++ b/lib/src/dice_roller.dart @@ -51,8 +51,8 @@ class DiceRoller with LoggingMixin { final results = []; final discarded = []; for (var i = 0; i < ndice; i++) { - final tensRoll = roll(1, 6); - final onesRoll = roll(1, 6); + final tensRoll = roll(1, 6, 'D66*10 $msg'); + final onesRoll = roll(1, 6, 'D66*1 $msg'); final total = tensRoll.total * 10 + onesRoll.total; final rolled = [ RolledDie.discard(tensRoll.results.first), diff --git a/lib/src/results.dart b/lib/src/results.dart index 20bd38c..9130132 100644 --- a/lib/src/results.dart +++ b/lib/src/results.dart @@ -2,24 +2,38 @@ import 'package:collection/collection.dart'; import 'package:equatable/equatable.dart'; import 'package:fast_immutable_collections/fast_immutable_collections.dart'; -/// types of die +/// types of die. enum DieType implements Comparable { // normal polyhedral (1d6, 1d20, etc) - polyhedral(explodable: true, compoundable: true), + polyhedral(), // fudge dice - fudge(explodable: true, compoundable: true), + fudge(hasPotentialValues: true), // 1D66 (equivalent to `1d6*10 + 1d6`). - d66(explodable: true, compoundable: true), + d66(hasNSides: false), // 1d[1,3,5,7,9] - special(explodable: true, compoundable: true), + special(hasPotentialValues: true), // single value (e.g. a sum or count of dice) - singleVal(explodable: false, compoundable: false); + singleVal(explodable: false, compoundable: false, hasPotentialValues: true); - const DieType({required this.explodable, required this.compoundable}); + const DieType({ + this.explodable = true, + this.compoundable = true, + this.hasPotentialValues = false, + this.hasNSides = true, + }); + /// can the die be exploded? final bool explodable; + + /// can the die be compounded? final bool compoundable; + /// whether the RolledDie must have non-empty potentialValues + final bool hasPotentialValues; + + /// whether the RolledDie must have non-zero nsides + final bool hasNSides; + @override int compareTo(DieType dieType) => index.compareTo(dieType.index); } @@ -180,6 +194,16 @@ class RolledDie extends Equatable implements Comparable { this.clampFloor = false, this.from = const IList.empty(), }) : potentialValues = IList(potentialValues) { + if (dieType.hasPotentialValues && potentialValues.isEmpty) { + throw ArgumentError( + 'Invalid die -- ${dieType.name} must have a potentialValues field', + ); + } + if (dieType.hasNSides && nsides == 0) { + throw ArgumentError( + 'Invalid die -- ${dieType.name} must have a nsides != 0', + ); + } switch (dieType) { case DieType.polyhedral: maxPotentialValue = nsides; @@ -190,11 +214,6 @@ class RolledDie extends Equatable implements Comparable { case DieType.singleVal: maxPotentialValue = minPotentialValue = result; case DieType.special || DieType.fudge: - if (potentialValues.isEmpty) { - throw ArgumentError( - 'Invalid die -- ${dieType.name} must have a potentialValues field', - ); - } maxPotentialValue = potentialValues.max; minPotentialValue = potentialValues.min; } @@ -215,6 +234,7 @@ class RolledDie extends Equatable implements Comparable { Iterable? from, }) => RolledDie( result: result, + nsides: 1, dieType: DieType.singleVal, potentialValues: [result], from: IList.orNull(from) ?? const IList.empty(), @@ -345,6 +365,7 @@ class RolledDie extends Equatable implements Comparable { result, nsides, maxPotentialValue, + minPotentialValue, potentialValues, dieType, discarded, From d7933fe30c64913046888d51a8f4936255b95046 Mon Sep 17 00:00:00 2001 From: Steve Christensen Date: Fri, 4 Jul 2025 16:47:12 -0600 Subject: [PATCH 11/31] split results.dart into multiple files --- lib/dart_dice_parser.dart | 6 +- lib/src/ast_core.dart | 4 +- lib/src/ast_dice.dart | 3 +- lib/src/ast_ops.dart | 4 +- lib/src/dice_expression.dart | 4 +- lib/src/dice_roller.dart | 4 +- lib/src/enums.dart | 55 +++ lib/src/extensions.dart | 15 + lib/src/results.dart | 702 ----------------------------------- lib/src/roll_result.dart | 201 ++++++++++ lib/src/roll_summary.dart | 118 ++++++ lib/src/rolled_die.dart | 329 ++++++++++++++++ 12 files changed, 737 insertions(+), 708 deletions(-) create mode 100644 lib/src/enums.dart create mode 100644 lib/src/extensions.dart delete mode 100644 lib/src/results.dart create mode 100644 lib/src/roll_result.dart create mode 100644 lib/src/roll_summary.dart create mode 100644 lib/src/rolled_die.dart diff --git a/lib/dart_dice_parser.dart b/lib/dart_dice_parser.dart index 59a16b8..6b16a59 100644 --- a/lib/dart_dice_parser.dart +++ b/lib/dart_dice_parser.dart @@ -15,4 +15,8 @@ library; export 'src/dice_expression.dart'; export 'src/dice_roller.dart'; -export 'src/results.dart'; +export 'src/enums.dart'; +export 'src/extensions.dart'; +export 'src/roll_result.dart'; +export 'src/roll_summary.dart'; +export 'src/rolled_die.dart'; diff --git a/lib/src/ast_core.dart b/lib/src/ast_core.dart index bf85e70..1d053cb 100644 --- a/lib/src/ast_core.dart +++ b/lib/src/ast_core.dart @@ -1,6 +1,8 @@ import 'dice_expression.dart'; import 'dice_roller.dart'; -import 'results.dart'; +import 'enums.dart'; +import 'roll_result.dart'; +import 'rolled_die.dart'; import 'utils.dart'; /// All our operations will inherit from this class. diff --git a/lib/src/ast_dice.dart b/lib/src/ast_dice.dart index fc24ad6..d1e7212 100644 --- a/lib/src/ast_dice.dart +++ b/lib/src/ast_dice.dart @@ -3,7 +3,8 @@ import 'package:petitparser/parser.dart'; import 'ast_core.dart'; import 'dice_roller.dart'; -import 'results.dart'; +import 'enums.dart'; +import 'roll_result.dart'; /// roll fudge dice class FudgeDice extends UnaryDice { diff --git a/lib/src/ast_ops.dart b/lib/src/ast_ops.dart index 64cde62..fda1f17 100644 --- a/lib/src/ast_ops.dart +++ b/lib/src/ast_ops.dart @@ -1,7 +1,9 @@ import 'package:collection/collection.dart'; import 'ast_core.dart'; -import 'results.dart'; +import 'enums.dart'; +import 'roll_result.dart'; +import 'rolled_die.dart'; /// default limit for rerolls/exploding/compounding to avoid getting stuck in loop const defaultRerollLimit = 1000; diff --git a/lib/src/dice_expression.dart b/lib/src/dice_expression.dart index 7e17e20..050efbd 100644 --- a/lib/src/dice_expression.dart +++ b/lib/src/dice_expression.dart @@ -4,8 +4,10 @@ import 'package:logging/logging.dart'; import 'package:petitparser/petitparser.dart'; import 'dice_roller.dart'; +import 'enums.dart'; import 'parser.dart'; -import 'results.dart'; +import 'roll_result.dart'; +import 'roll_summary.dart'; import 'stats.dart'; /// An abstract expression that can be evaluated. diff --git a/lib/src/dice_roller.dart b/lib/src/dice_roller.dart index f33d39a..1a9eab7 100644 --- a/lib/src/dice_roller.dart +++ b/lib/src/dice_roller.dart @@ -2,7 +2,9 @@ import 'dart:math'; import 'package:fast_immutable_collections/fast_immutable_collections.dart'; -import 'results.dart'; +import 'enums.dart'; +import 'roll_result.dart'; +import 'rolled_die.dart'; import 'utils.dart'; /// A dice roller for M dice of N sides (e.g. `2d6`). diff --git a/lib/src/enums.dart b/lib/src/enums.dart new file mode 100644 index 0000000..a9b2f2a --- /dev/null +++ b/lib/src/enums.dart @@ -0,0 +1,55 @@ +/// types of die. +enum DieType implements Comparable { + // normal polyhedral (1d6, 1d20, etc) + polyhedral(), + // fudge dice + fudge(hasPotentialValues: true), + // 1D66 (equivalent to `1d6*10 + 1d6`). + d66(hasNSides: false), + // 1d[1,3,5,7,9] + special(hasPotentialValues: true), + // single value (e.g. a sum or count of dice) + singleVal(explodable: false, compoundable: false, hasPotentialValues: true); + + const DieType({ + this.explodable = true, + this.compoundable = true, + this.hasPotentialValues = false, + this.hasNSides = true, + }); + + /// can the die be exploded? + final bool explodable; + + /// can the die be compounded? + final bool compoundable; + + /// whether the RolledDie must have non-empty potentialValues + final bool hasPotentialValues; + + /// whether the RolledDie must have non-zero nsides + final bool hasNSides; + + @override + int compareTo(DieType dieType) => index.compareTo(dieType.index); +} + +enum OpType { + value, // leaf nodes which are simple integer values + add, + subtract, + multiply, + count, + drop, + clamp, + rollDice, + rollFudge, + rollPercent, + rollD66, + rollVals, + reroll, + compound, + explode, +} + +enum CountType { count, success, failure, critSuccess, critFailure } diff --git a/lib/src/extensions.dart b/lib/src/extensions.dart new file mode 100644 index 0000000..e3249f3 --- /dev/null +++ b/lib/src/extensions.dart @@ -0,0 +1,15 @@ +import 'package:fast_immutable_collections/fast_immutable_collections.dart'; + +import 'rolled_die.dart'; + +extension RolledDieIListExtensions on IList { + int get sum => map((d) => d.result).fold(0, (sum, i) => sum + i); + + int get successCount => where((d) => d.success).length; + + int get failureCount => where((d) => d.failure).length; + + int get critSuccessCount => where((d) => d.critSuccess).length; + + int get critFailureCount => where((d) => d.critFailure).length; +} diff --git a/lib/src/results.dart b/lib/src/results.dart deleted file mode 100644 index 9130132..0000000 --- a/lib/src/results.dart +++ /dev/null @@ -1,702 +0,0 @@ -import 'package:collection/collection.dart'; -import 'package:equatable/equatable.dart'; -import 'package:fast_immutable_collections/fast_immutable_collections.dart'; - -/// types of die. -enum DieType implements Comparable { - // normal polyhedral (1d6, 1d20, etc) - polyhedral(), - // fudge dice - fudge(hasPotentialValues: true), - // 1D66 (equivalent to `1d6*10 + 1d6`). - d66(hasNSides: false), - // 1d[1,3,5,7,9] - special(hasPotentialValues: true), - // single value (e.g. a sum or count of dice) - singleVal(explodable: false, compoundable: false, hasPotentialValues: true); - - const DieType({ - this.explodable = true, - this.compoundable = true, - this.hasPotentialValues = false, - this.hasNSides = true, - }); - - /// can the die be exploded? - final bool explodable; - - /// can the die be compounded? - final bool compoundable; - - /// whether the RolledDie must have non-empty potentialValues - final bool hasPotentialValues; - - /// whether the RolledDie must have non-zero nsides - final bool hasNSides; - - @override - int compareTo(DieType dieType) => index.compareTo(dieType.index); -} - -enum OpType { - value, // leaf nodes which are simple integer values - add, - subtract, - multiply, - count, - drop, - clamp, - rollDice, - rollFudge, - rollPercent, - rollD66, - rollVals, - reroll, - compound, - explode, -} - -enum CountType { count, success, failure, critSuccess, critFailure } - -/// [RollSummary] is the final result of rolling a dice expression. -/// It rolls up the metadata of sub-expressions, and includes a `detailResults` -/// if the caller wants to do something interesting to display the result graph. -/// -/// A [RollResult] is modeled as a binary tree. The dice expression -/// is parsed into an AST, and when rolled the results reflect the structure of -/// that AST. -/// -/// In general, users will only care about the root node of the tree. -/// But, depending on the information you want from the evaluated dice rolls, -/// you may need to traverse the tree to inspect all the events. - -class RollSummary extends Equatable { - RollSummary({required this.detailedResults}) - : total = detailedResults.results.sum, - results = IList(detailedResults.results), - discarded = IList(detailedResults.discarded), - expression = detailedResults.expression, - successCount = detailedResults.results.successCount, - failureCount = detailedResults.results.failureCount, - critSuccessCount = detailedResults.results.critSuccessCount, - critFailureCount = detailedResults.results.critFailureCount; - - final RollResult detailedResults; - - /// sum of [results] - late final int total; - late final int successCount; - late final int failureCount; - late final int critSuccessCount; - late final int critFailureCount; - - /// the parsed expression - late final String expression; - - /// the results of the evaluating the expression - late final IList results; - - /// the dice we lost along the way - late final IList discarded; - - @override - List get props => [ - total, - successCount, - failureCount, - critSuccessCount, - critFailureCount, - expression, - results, - discarded, - ]; - - @override - String toString() { - final buffer = StringBuffer( - '$expression ===> RollSummary(total: $total, results: ${results.toString(false)}', - ); - if (discarded.isNotEmpty) { - buffer.write(', discarded: ${discarded.toString(false)}'); - } - final params = { - 'successCount': successCount, - 'failureCount': failureCount, - 'critSuccessCount': critSuccessCount, - 'critFailureCount': critFailureCount, - }..removeWhere((k, v) => v == 0); - - if (params.isNotEmpty) { - buffer.write(', '); - buffer.writeAll( - params.entries.map((entry) => '${entry.key}: ${entry.value}'), - ', ', - ); - } - - buffer.write(')'); - return buffer.toString(); - } - - // TODO: implement fromJson - Map toJson() => - { - 'expression': expression, - 'total': total, - 'successCount': successCount, - 'failureCount': failureCount, - 'critSuccessCount': critSuccessCount, - 'critFailureCount': critFailureCount, - 'results': results.map((e) => e.toJson()).toList(growable: false), - 'discarded': discarded.map((e) => e.toJson()).toList(growable: false), - 'detailedResults': detailedResults.toJson(), - }..removeWhere( - (k, v) => - v == null || - (v is Map && v.isEmpty) || - (v is Iterable && v.isEmpty) || - (v is int && v == 0) || - (v is bool && !v), - ); - - String toStringPretty() { - final buffer = StringBuffer(); - buffer - ..write(toString()) - ..write('\n') - ..write(detailedResults.toStringPretty(indent: ' ')); - - return buffer.toString(); - } -} - -/// representation of a single dice roll result. -class RolledDie extends Equatable implements Comparable { - static const defaultFudgeVals = IListConst([-1, -1, 0, 0, 1, 1]); - - RolledDie({ - required this.result, - required this.dieType, - this.nsides = 0, - Iterable potentialValues = const IList.empty(), - this.discarded = false, - this.success = false, - this.failure = false, - this.critSuccess = false, - this.critFailure = false, - this.exploded = false, - this.explosion = false, - this.compoundedFinal = false, - this.compounded = false, - this.reroll = false, - this.rerolled = false, - this.clampCeiling = false, - this.clampFloor = false, - this.from = const IList.empty(), - }) : potentialValues = IList(potentialValues) { - if (dieType.hasPotentialValues && potentialValues.isEmpty) { - throw ArgumentError( - 'Invalid die -- ${dieType.name} must have a potentialValues field', - ); - } - if (dieType.hasNSides && nsides == 0) { - throw ArgumentError( - 'Invalid die -- ${dieType.name} must have a nsides != 0', - ); - } - switch (dieType) { - case DieType.polyhedral: - maxPotentialValue = nsides; - minPotentialValue = 1; - case DieType.d66: - maxPotentialValue = 66; - minPotentialValue = 1; - case DieType.singleVal: - maxPotentialValue = minPotentialValue = result; - case DieType.special || DieType.fudge: - maxPotentialValue = potentialValues.max; - minPotentialValue = potentialValues.min; - } - } - - factory RolledDie.polyhedral({required int result, required int nsides}) => - RolledDie(result: result, nsides: nsides, dieType: DieType.polyhedral); - - factory RolledDie.fudge({required int result}) => RolledDie( - result: result, - nsides: defaultFudgeVals.length, - dieType: DieType.fudge, - potentialValues: defaultFudgeVals, - ); - - factory RolledDie.singleVal({ - required int result, - Iterable? from, - }) => RolledDie( - result: result, - nsides: 1, - dieType: DieType.singleVal, - potentialValues: [result], - from: IList.orNull(from) ?? const IList.empty(), - ); - - factory RolledDie.d66({required int result, Iterable? from}) => - RolledDie( - result: result, - dieType: DieType.d66, - from: IList.orNull(from) ?? const IList.empty(), - ); - - factory RolledDie.copyWith( - RolledDie other, { - int? result, - bool? discarded, - bool? success, - bool? failure, - bool? critSuccess, - bool? critFailure, - bool? exploded, - bool? explosion, - bool? compounded, - bool? compoundedFinal, - bool? reroll, - bool? rerolled, - bool? clampHigh, - bool? clampLow, - Iterable? from, - }) => RolledDie( - potentialValues: other.potentialValues, - nsides: other.nsides, - dieType: other.dieType, - result: result ?? other.result, - discarded: discarded ?? other.discarded, - success: success ?? other.success, - failure: failure ?? other.failure, - critSuccess: critSuccess ?? other.critSuccess, - critFailure: critFailure ?? other.critFailure, - exploded: exploded ?? other.exploded, - explosion: explosion ?? other.explosion, - compounded: compounded ?? other.compounded, - compoundedFinal: compoundedFinal ?? other.compoundedFinal, - reroll: reroll ?? other.reroll, - rerolled: rerolled ?? other.rerolled, - clampCeiling: clampHigh ?? other.clampCeiling, - clampFloor: clampLow ?? other.clampFloor, - from: IList.orNull(from) ?? IList([other]), - ); - - factory RolledDie.discard(RolledDie other) => - RolledDie.copyWith(other, discarded: true); - - factory RolledDie.scoreForCountType( - RolledDie other, { - required CountType countType, - }) => RolledDie.copyWith( - other, - success: other.success || countType == CountType.success, - failure: other.failure || countType == CountType.failure, - critSuccess: other.critSuccess || countType == CountType.critSuccess, - critFailure: other.critFailure || countType == CountType.critFailure, - ); - - /// the rolled result - final int result; - - /// the number of sides on the die. Generally only set if dieType == polyhedral - final int nsides; - - /// the maximum possible result of this die - late final int maxPotentialValue; - - /// the minimum possible result of this die - late final int minPotentialValue; - - /// the die faces (potential values). - /// this will be empty for polyhedral roles -- values of a polyhederal die will be range of [1,nsides] - final IList potentialValues; - - /// true if the result has been discarded - final bool discarded; - - /// whether the die was scored as a 'success' - final bool success; - - /// whether the die was scored as a 'failure' - final bool failure; - - /// whether the die was scored as a 'critical success' - final bool critSuccess; - - /// whether the die was scored as a 'critical failure' - final bool critFailure; - - /// the type of die - final DieType dieType; - - /// the die that were operated on to become this die. - final IList from; - - /// true if the die exploded - final bool exploded; - - /// true if the die is the result of a die exploding - final bool explosion; - - /// true if the die was discarded as a roll during compounding - final bool compounded; - - /// true if the die is the sum a multiple die due to compounding - final bool compoundedFinal; - - /// true if the (discarded) result is from a reroll - final bool rerolled; - - /// true if the result is the rerolled die - final bool reroll; - - /// true if the result has been clamped via `C>` - final bool clampCeiling; - - /// true if the result has been clamped via `C<` - final bool clampFloor; - - @override - List get props => [ - result, - nsides, - maxPotentialValue, - minPotentialValue, - potentialValues, - dieType, - discarded, - success, - failure, - critFailure, - critSuccess, - exploded, - explosion, - compounded, - compoundedFinal, - reroll, - rerolled, - clampCeiling, - clampFloor, - ]; - - Map toJson() => - { - 'result': result, - 'nsides': nsides, - 'potentialValues': potentialValues.toList(growable: false), - 'dieType': dieType.name, - 'discarded': discarded, - 'success': success, - 'failure': failure, - 'critSuccess': critSuccess, - 'critFailure': critFailure, - 'exploded': exploded, - 'explosion': explosion, - 'compounded': compounded, - 'compoundedFinal': compoundedFinal, - 'reroll': reroll, - 'rerolled': rerolled, - 'clampHigh': clampCeiling, - 'clampLow': clampFloor, - }..removeWhere( - (k, v) => - v == null || - (v is Map && v.isEmpty) || - (v is Iterable && v.isEmpty) || - (v is int && v == 0) || - (v is bool && !v), - ); - - String getDieGlyph() { - switch (dieType) { - case DieType.polyhedral: - return 'd$nsides'; - case DieType.fudge: - return 'dF'; - case DieType.d66: - return 'D66'; - case DieType.singleVal: - return 'val'; - default: - return 'd?'; - } - } - - String getDieStateGlyphs() { - final buffer = StringBuffer(); - - if (discarded) { - buffer.write('⛔︎'); - } - if (rerolled) { - buffer.write('↩'); - } - if (reroll) { - buffer.write('↩'); - } - if (exploded) { - buffer.write('💣'); //'⇪'); - } - if (explosion) { - buffer.write('🔥'); //'⇪'); - } - if (compoundedFinal) { - buffer.write('∑'); - } - if (compounded) { - buffer.write('+'); - } - if (clampCeiling) { - buffer.write('⌈⌉'); - } - if (clampFloor) { - buffer.write('⌊⌋'); - } - if (success) { - buffer.write('✓'); - } - if (failure) { - buffer.write('✗'); - } - if (critSuccess) { - buffer.write('✅'); - } - if (critFailure) { - buffer.write('❌'); - } - return buffer.toString(); - } - - @override - String toString() { - final buffer = StringBuffer(); - buffer.write(result); - buffer.write('('); - buffer.write(getDieGlyph()); - buffer.write(getDieStateGlyphs()); - buffer.write(')'); - return buffer.toString(); - } - - //TODO: should this compare other fields too? - @override - int compareTo(RolledDie other) => result - .compareTo(other.result) - .if0(dieType.compareTo(other.dieType)) - .if0( - dieType == DieType.polyhedral && other.dieType == DieType.polyhedral - ? nsides.compareTo(other.nsides) - : 0, - ); -} - -extension RolledDieIListExtensions on IList { - int get sum => map((d) => d.result).fold(0, (sum, i) => sum + i); - - int get successCount => where((d) => d.success).length; - - int get failureCount => where((d) => d.failure).length; - - int get critSuccessCount => where((d) => d.critSuccess).length; - - int get critFailureCount => where((d) => d.critFailure).length; -} - -/// [RollResult] represents the result of evaluating a particular node of the AST. -/// -class RollResult extends Equatable { - RollResult({ - required this.expression, - required this.opType, - Iterable results = const IList.empty(), - Iterable discarded = const IList.empty(), - this.left, - this.right, - }) : results = IList(results), - discarded = IList(discarded); - - /// factory constructor to merge [other] with the params of this function - /// and produce a new [RollResult]. - factory RollResult.fromRollResult( - RollResult other, { - required String expression, - OpType? opType, - Iterable? results, - Iterable? discarded, - RollResult? left, - RollResult? right, - }) => RollResult( - expression: expression, - opType: opType ?? other.opType, - results: IList.orNull(results) ?? other.results, - discarded: IList.orNull(discarded) ?? other.discarded, - left: left ?? other.left, - right: right ?? other.right, - ); - - /// addition operator for [RollResult]. - /// - /// in the returned results, nsides will be max(nsides, other.nsides). - /// this is so we can explode a dice expr like `(2d6 + 1)!`. - /// NOTE: A side-effect of this decision is `(2d6 + 2d10)!` will explode with 10s, not 6s. - RollResult operator +(RollResult other) => RollResult.fromRollResult( - other, - expression: '($expression + ${other.expression})', - results: results + other.results, - discarded: discarded + other.discarded, - opType: OpType.add, - left: this, - right: other, - ); - - /// multiplication operator for [RollResult]. - /// - /// Results are collapsed into a single value (the result of multiplication), all other rolled die are discarded. - /// - RollResult operator *(RollResult other) => RollResult.fromRollResult( - other, - expression: '($expression * ${other.expression})', - results: [ - RolledDie.singleVal( - result: results.sum * other.results.sum, - from: results + other.results, - ), - ], - discarded: [ - ...results.map(RolledDie.discard), - ...other.results.map(RolledDie.discard), - ], - opType: OpType.multiply, - left: this, - right: other, - ); - - /// subtraction operator for [RollResult]. - /// - /// Results create new list lhs.results + (-1)*(other.results). - /// other.results are discarded, and a single value result is added - /// - RollResult operator -(RollResult other) => RollResult.fromRollResult( - other, - expression: '($expression - ${other.expression})', - opType: OpType.subtract, - results: [ - ...results, - RolledDie.singleVal(result: -1 * other.results.sum, from: other.results), - ], - discarded: [...other.results.map(RolledDie.discard)], - left: this, - right: other, - ); - - /// the parsed expression - final String expression; - - /// the results of the evaluating the expression - final IList results; - final IList discarded; - - final RollResult? left; - final RollResult? right; - - final OpType opType; - - /// sum of [results] - int get total => totalOrDefault(() => 0); - - int get successCount => results.successCount; - - int get failureCount => results.failureCount; - - int get critSuccessCount => results.critSuccessCount; - - int get critFailureCount => results.critFailureCount; - - @override - List get props => [ - expression, - opType, - results, - discarded, - opType, - //left, - //right, - ]; - - /// Get the total, or if results are empty return result of calling [defaultCb]. - int totalOrDefault(int Function() defaultCb) { - if (results.isEmpty) { - return defaultCb(); - } - return results.sum; - } - - @override - String toString() { - final buffer = StringBuffer(); - buffer.write( - '$expression =${opType.name}=> RollResult(${opType == OpType.value ? 'value' : 'total'}: $total', - ); - if (opType != OpType.value) { - if (results.isNotEmpty) { - buffer.write(', results: ${results.toString(false)}'); - } - if (discarded.isNotEmpty) { - buffer.write(', discarded: ${discarded.toString(false)}'); - } - } - buffer.write(')'); - return buffer.toString(); - } - - String toStringPretty({String indent = ''}) => pprint(this, indent: indent); - - Map toJson() => - { - 'expression': expression, - 'opType': opType.name, - 'results': results.map((e) => e.toJson()).toList(growable: false), - 'discarded': discarded.map((e) => e.toJson()).toList(growable: false), - 'left': left != null && left?.opType != OpType.value - ? left?.toJson() - : null, - 'right': right != null && right?.opType != OpType.value - ? right?.toJson() - : null, - 'total': total, - 'successCount': successCount, - 'failureCount': failureCount, - 'critSuccessCount': critSuccessCount, - 'critFailureCount': critFailureCount, - }..removeWhere( - (k, v) => - v == null || - (v is Map && v.isEmpty) || - (v is Iterable && v.isEmpty) || - (v is int && v == 0), - ); -} - -String pprint(RollResult? rr, {String indent = ''}) { - if (rr == null) { - return ''; - } - final buffer = StringBuffer(indent); - buffer.write(rr.toString()); - if (rr.left != null && rr.left?.opType != OpType.value) { - buffer - ..write('\n') - ..write(pprint(rr.left, indent: '$indent ')); - } - if (rr.right != null && rr.right?.opType != OpType.value) { - buffer - ..write('\n') - ..write(pprint(rr.right, indent: '$indent ')); - } - - return buffer.toString(); -} diff --git a/lib/src/roll_result.dart b/lib/src/roll_result.dart new file mode 100644 index 0000000..613f0b8 --- /dev/null +++ b/lib/src/roll_result.dart @@ -0,0 +1,201 @@ +import 'package:equatable/equatable.dart'; +import 'package:fast_immutable_collections/fast_immutable_collections.dart'; + +import 'enums.dart'; +import 'extensions.dart'; +import 'rolled_die.dart'; + +/// [RollResult] represents the result of evaluating a particular node of the AST. +/// +class RollResult extends Equatable { + RollResult({ + required this.expression, + required this.opType, + Iterable results = const IList.empty(), + Iterable discarded = const IList.empty(), + this.left, + this.right, + }) : results = IList(results), + discarded = IList(discarded); + + /// factory constructor to merge [other] with the params of this function + /// and produce a new [RollResult]. + factory RollResult.fromRollResult( + RollResult other, { + required String expression, + OpType? opType, + Iterable? results, + Iterable? discarded, + RollResult? left, + RollResult? right, + }) => RollResult( + expression: expression, + opType: opType ?? other.opType, + results: IList.orNull(results) ?? other.results, + discarded: IList.orNull(discarded) ?? other.discarded, + left: left ?? other.left, + right: right ?? other.right, + ); + + /// addition operator for [RollResult]. + /// + /// in the returned results, nsides will be max(nsides, other.nsides). + /// this is so we can explode a dice expr like `(2d6 + 1)!`. + /// NOTE: A side-effect of this decision is `(2d6 + 2d10)!` will explode with 10s, not 6s. + RollResult operator +(RollResult other) => RollResult.fromRollResult( + other, + expression: '($expression + ${other.expression})', + results: results + other.results, + discarded: discarded + other.discarded, + opType: OpType.add, + left: this, + right: other, + ); + + /// multiplication operator for [RollResult]. + /// + /// Results are collapsed into a single value (the result of multiplication), all other rolled die are discarded. + /// + RollResult operator *(RollResult other) => RollResult.fromRollResult( + other, + expression: '($expression * ${other.expression})', + results: [ + RolledDie.singleVal( + result: results.sum * other.results.sum, + from: results + other.results, + ), + ], + discarded: [ + ...results.map(RolledDie.discard), + ...other.results.map(RolledDie.discard), + ], + opType: OpType.multiply, + left: this, + right: other, + ); + + /// subtraction operator for [RollResult]. + /// + /// Results create new list lhs.results + (-1)*(other.results). + /// other.results are discarded, and a single value result is added + /// + RollResult operator -(RollResult other) => RollResult.fromRollResult( + other, + expression: '($expression - ${other.expression})', + opType: OpType.subtract, + results: [ + ...results, + RolledDie.singleVal(result: -1 * other.results.sum, from: other.results), + ], + discarded: [...other.results.map(RolledDie.discard)], + left: this, + right: other, + ); + + /// the parsed expression + final String expression; + + /// the results of the evaluating the expression + final IList results; + final IList discarded; + + final RollResult? left; + final RollResult? right; + + final OpType opType; + + /// sum of [results] + int get total => totalOrDefault(() => 0); + + int get successCount => results.successCount; + + int get failureCount => results.failureCount; + + int get critSuccessCount => results.critSuccessCount; + + int get critFailureCount => results.critFailureCount; + + @override + List get props => [ + expression, + opType, + results, + discarded, + opType, + //left, + //right, + ]; + + /// Get the total, or if results are empty return result of calling [defaultCb]. + int totalOrDefault(int Function() defaultCb) { + if (results.isEmpty) { + return defaultCb(); + } + return results.sum; + } + + @override + String toString() { + final buffer = StringBuffer(); + buffer.write( + '$expression =${opType.name}=> RollResult(${opType == OpType.value ? 'value' : 'total'}: $total', + ); + if (opType != OpType.value) { + if (results.isNotEmpty) { + buffer.write(', results: ${results.toString(false)}'); + } + if (discarded.isNotEmpty) { + buffer.write(', discarded: ${discarded.toString(false)}'); + } + } + buffer.write(')'); + return buffer.toString(); + } + + String toStringPretty({String indent = ''}) => pprint(this, indent: indent); + + Map toJson() => + { + 'expression': expression, + 'opType': opType.name, + 'results': results.map((e) => e.toJson()).toList(growable: false), + 'discarded': discarded.map((e) => e.toJson()).toList(growable: false), + 'left': left != null && left?.opType != OpType.value + ? left?.toJson() + : null, + 'right': right != null && right?.opType != OpType.value + ? right?.toJson() + : null, + 'total': total, + 'successCount': successCount, + 'failureCount': failureCount, + 'critSuccessCount': critSuccessCount, + 'critFailureCount': critFailureCount, + }..removeWhere( + (k, v) => + v == null || + (v is Map && v.isEmpty) || + (v is Iterable && v.isEmpty) || + (v is int && v == 0), + ); +} + +String pprint(RollResult? rr, {String indent = ''}) { + if (rr == null) { + return ''; + } + final buffer = StringBuffer(indent); + buffer.write(rr.toString()); + if (rr.left != null && rr.left?.opType != OpType.value) { + buffer + ..write('\n') + ..write(pprint(rr.left, indent: '$indent ')); + } + if (rr.right != null && rr.right?.opType != OpType.value) { + buffer + ..write('\n') + ..write(pprint(rr.right, indent: '$indent ')); + } + + return buffer.toString(); +} diff --git a/lib/src/roll_summary.dart b/lib/src/roll_summary.dart new file mode 100644 index 0000000..2a693e7 --- /dev/null +++ b/lib/src/roll_summary.dart @@ -0,0 +1,118 @@ +import 'package:equatable/equatable.dart'; +import 'package:fast_immutable_collections/fast_immutable_collections.dart'; + +import 'extensions.dart'; +import 'roll_result.dart'; +import 'rolled_die.dart'; + +/// [RollSummary] is the final result of rolling a dice expression. +/// It rolls up the metadata of sub-expressions, and includes a `detailResults` +/// if the caller wants to do something interesting to display the result graph. +/// +/// A [RollResult] is modeled as a binary tree. The dice expression +/// is parsed into an AST, and when rolled the results reflect the structure of +/// that AST. +/// +/// In general, users will only care about the root node of the tree. +/// But, depending on the information you want from the evaluated dice rolls, +/// you may need to traverse the tree to inspect all the events. + +class RollSummary extends Equatable { + RollSummary({required this.detailedResults}) + : total = detailedResults.results.sum, + results = IList(detailedResults.results), + discarded = IList(detailedResults.discarded), + expression = detailedResults.expression, + successCount = detailedResults.results.successCount, + failureCount = detailedResults.results.failureCount, + critSuccessCount = detailedResults.results.critSuccessCount, + critFailureCount = detailedResults.results.critFailureCount; + + final RollResult detailedResults; + + /// sum of [results] + late final int total; + late final int successCount; + late final int failureCount; + late final int critSuccessCount; + late final int critFailureCount; + + /// the parsed expression + late final String expression; + + /// the results of the evaluating the expression + late final IList results; + + /// the dice we lost along the way + late final IList discarded; + + @override + List get props => [ + total, + successCount, + failureCount, + critSuccessCount, + critFailureCount, + expression, + results, + discarded, + ]; + + @override + String toString() { + final buffer = StringBuffer( + '$expression ===> RollSummary(total: $total, results: ${results.toString(false)}', + ); + if (discarded.isNotEmpty) { + buffer.write(', discarded: ${discarded.toString(false)}'); + } + final params = { + 'successCount': successCount, + 'failureCount': failureCount, + 'critSuccessCount': critSuccessCount, + 'critFailureCount': critFailureCount, + }..removeWhere((k, v) => v == 0); + + if (params.isNotEmpty) { + buffer.write(', '); + buffer.writeAll( + params.entries.map((entry) => '${entry.key}: ${entry.value}'), + ', ', + ); + } + + buffer.write(')'); + return buffer.toString(); + } + + // TODO: implement fromJson? + Map toJson() => + { + 'expression': expression, + 'total': total, + 'successCount': successCount, + 'failureCount': failureCount, + 'critSuccessCount': critSuccessCount, + 'critFailureCount': critFailureCount, + 'results': results.map((e) => e.toJson()).toList(growable: false), + 'discarded': discarded.map((e) => e.toJson()).toList(growable: false), + 'detailedResults': detailedResults.toJson(), + }..removeWhere( + (k, v) => + v == null || + (v is Map && v.isEmpty) || + (v is Iterable && v.isEmpty) || + (v is int && v == 0) || + (v is bool && !v), + ); + + String toStringPretty() { + final buffer = StringBuffer(); + buffer + ..write(toString()) + ..write('\n') + ..write(detailedResults.toStringPretty(indent: ' ')); + + return buffer.toString(); + } +} diff --git a/lib/src/rolled_die.dart b/lib/src/rolled_die.dart new file mode 100644 index 0000000..8efd5bf --- /dev/null +++ b/lib/src/rolled_die.dart @@ -0,0 +1,329 @@ +import 'package:collection/collection.dart'; +import 'package:equatable/equatable.dart'; +import 'package:fast_immutable_collections/fast_immutable_collections.dart'; + +import 'enums.dart'; + +/// representation of a single dice roll result. +class RolledDie extends Equatable implements Comparable { + static const defaultFudgeVals = IListConst([-1, -1, 0, 0, 1, 1]); + + RolledDie({ + required this.result, + required this.dieType, + this.nsides = 0, + Iterable potentialValues = const IList.empty(), + this.discarded = false, + this.success = false, + this.failure = false, + this.critSuccess = false, + this.critFailure = false, + this.exploded = false, + this.explosion = false, + this.compoundedFinal = false, + this.compounded = false, + this.reroll = false, + this.rerolled = false, + this.clampCeiling = false, + this.clampFloor = false, + this.from = const IList.empty(), + }) : potentialValues = IList(potentialValues) { + if (dieType.hasPotentialValues && potentialValues.isEmpty) { + throw ArgumentError( + 'Invalid die -- ${dieType.name} must have a potentialValues field', + ); + } + if (dieType.hasNSides && nsides == 0) { + throw ArgumentError( + 'Invalid die -- ${dieType.name} must have a nsides != 0', + ); + } + switch (dieType) { + case DieType.polyhedral: + maxPotentialValue = nsides; + minPotentialValue = 1; + case DieType.d66: + maxPotentialValue = 66; + minPotentialValue = 1; + case DieType.singleVal: + maxPotentialValue = minPotentialValue = result; + case DieType.special || DieType.fudge: + maxPotentialValue = potentialValues.max; + minPotentialValue = potentialValues.min; + } + } + + factory RolledDie.polyhedral({required int result, required int nsides}) => + RolledDie(result: result, nsides: nsides, dieType: DieType.polyhedral); + + factory RolledDie.fudge({required int result}) => RolledDie( + result: result, + nsides: defaultFudgeVals.length, + dieType: DieType.fudge, + potentialValues: defaultFudgeVals, + ); + + factory RolledDie.singleVal({ + required int result, + Iterable? from, + }) => RolledDie( + result: result, + nsides: 1, + dieType: DieType.singleVal, + potentialValues: [result], + from: IList.orNull(from) ?? const IList.empty(), + ); + + factory RolledDie.d66({required int result, Iterable? from}) => + RolledDie( + result: result, + dieType: DieType.d66, + from: IList.orNull(from) ?? const IList.empty(), + ); + + factory RolledDie.copyWith( + RolledDie other, { + int? result, + bool? discarded, + bool? success, + bool? failure, + bool? critSuccess, + bool? critFailure, + bool? exploded, + bool? explosion, + bool? compounded, + bool? compoundedFinal, + bool? reroll, + bool? rerolled, + bool? clampHigh, + bool? clampLow, + Iterable? from, + }) => RolledDie( + potentialValues: other.potentialValues, + nsides: other.nsides, + dieType: other.dieType, + result: result ?? other.result, + discarded: discarded ?? other.discarded, + success: success ?? other.success, + failure: failure ?? other.failure, + critSuccess: critSuccess ?? other.critSuccess, + critFailure: critFailure ?? other.critFailure, + exploded: exploded ?? other.exploded, + explosion: explosion ?? other.explosion, + compounded: compounded ?? other.compounded, + compoundedFinal: compoundedFinal ?? other.compoundedFinal, + reroll: reroll ?? other.reroll, + rerolled: rerolled ?? other.rerolled, + clampCeiling: clampHigh ?? other.clampCeiling, + clampFloor: clampLow ?? other.clampFloor, + from: IList.orNull(from) ?? IList([other]), + ); + + factory RolledDie.discard(RolledDie other) => + RolledDie.copyWith(other, discarded: true); + + factory RolledDie.scoreForCountType( + RolledDie other, { + required CountType countType, + }) => RolledDie.copyWith( + other, + success: other.success || countType == CountType.success, + failure: other.failure || countType == CountType.failure, + critSuccess: other.critSuccess || countType == CountType.critSuccess, + critFailure: other.critFailure || countType == CountType.critFailure, + ); + + /// the rolled result + final int result; + + /// the number of sides on the die. Generally only set if dieType == polyhedral + final int nsides; + + /// the maximum possible result of this die + late final int maxPotentialValue; + + /// the minimum possible result of this die + late final int minPotentialValue; + + /// the die faces (potential values). + /// this will be empty for polyhedral roles -- values of a polyhederal die will be range of [1,nsides] + final IList potentialValues; + + /// true if the result has been discarded + final bool discarded; + + /// whether the die was scored as a 'success' + final bool success; + + /// whether the die was scored as a 'failure' + final bool failure; + + /// whether the die was scored as a 'critical success' + final bool critSuccess; + + /// whether the die was scored as a 'critical failure' + final bool critFailure; + + /// the type of die + final DieType dieType; + + /// the die that were operated on to become this die. + final IList from; + + /// true if the die exploded + final bool exploded; + + /// true if the die is the result of a die exploding + final bool explosion; + + /// true if the die was discarded as a roll during compounding + final bool compounded; + + /// true if the die is the sum a multiple die due to compounding + final bool compoundedFinal; + + /// true if the (discarded) result is from a reroll + final bool rerolled; + + /// true if the result is the rerolled die + final bool reroll; + + /// true if the result has been clamped via `C>` + final bool clampCeiling; + + /// true if the result has been clamped via `C<` + final bool clampFloor; + + @override + List get props => [ + result, + nsides, + maxPotentialValue, + minPotentialValue, + potentialValues, + dieType, + discarded, + success, + failure, + critFailure, + critSuccess, + exploded, + explosion, + compounded, + compoundedFinal, + reroll, + rerolled, + clampCeiling, + clampFloor, + ]; + + Map toJson() => + { + 'result': result, + 'nsides': nsides, + 'potentialValues': potentialValues.toList(growable: false), + 'dieType': dieType.name, + 'discarded': discarded, + 'success': success, + 'failure': failure, + 'critSuccess': critSuccess, + 'critFailure': critFailure, + 'exploded': exploded, + 'explosion': explosion, + 'compounded': compounded, + 'compoundedFinal': compoundedFinal, + 'reroll': reroll, + 'rerolled': rerolled, + 'clampHigh': clampCeiling, + 'clampLow': clampFloor, + }..removeWhere( + (k, v) => + v == null || + (v is Map && v.isEmpty) || + (v is Iterable && v.isEmpty) || + (v is int && v == 0) || + (v is bool && !v), + ); + + String getDieGlyph() { + switch (dieType) { + case DieType.polyhedral: + return 'd$nsides'; + case DieType.fudge: + return 'dF'; + case DieType.d66: + return 'D66'; + case DieType.singleVal: + return 'val'; + default: + return 'd?'; + } + } + + String getDieStateGlyphs() { + final buffer = StringBuffer(); + + if (discarded) { + buffer.write('⛔︎'); + } + if (rerolled) { + buffer.write('↩'); + } + if (reroll) { + buffer.write('↩'); + } + if (exploded) { + buffer.write('💣'); //'⇪'); + } + if (explosion) { + buffer.write('🔥'); //'⇪'); + } + if (compoundedFinal) { + buffer.write('∑'); + } + if (compounded) { + buffer.write('+'); + } + if (clampCeiling) { + buffer.write('⌈⌉'); + } + if (clampFloor) { + buffer.write('⌊⌋'); + } + if (success) { + buffer.write('✓'); + } + if (failure) { + buffer.write('✗'); + } + if (critSuccess) { + buffer.write('✅'); + } + if (critFailure) { + buffer.write('❌'); + } + return buffer.toString(); + } + + @override + String toString() { + final buffer = StringBuffer(); + buffer.write(result); + buffer.write('('); + buffer.write(getDieGlyph()); + buffer.write(getDieStateGlyphs()); + buffer.write(')'); + return buffer.toString(); + } + + //TODO: should this compare other fields too? + @override + int compareTo(RolledDie other) => result + .compareTo(other.result) + .if0(dieType.compareTo(other.dieType)) + .if0( + dieType == DieType.polyhedral && other.dieType == DieType.polyhedral + ? nsides.compareTo(other.nsides) + : 0, + ); +} From 88751ed11f580b50ee1dacb774efe6383cb62f36 Mon Sep 17 00:00:00 2001 From: Steve Christensen Date: Fri, 4 Jul 2025 18:47:49 -0600 Subject: [PATCH 12/31] implement penetrating dice --- CHANGELOG.md | 3 + README.md | 10 +- lib/src/ast_dice.dart | 84 ++++++++++++ lib/src/ast_ops.dart | 3 +- lib/src/enums.dart | 7 +- lib/src/parser.dart | 16 ++- lib/src/roll_summary.dart | 1 - lib/src/rolled_die.dart | 65 ++++++--- test/dart_dice_parser_test.dart | 224 ++++++++++++++++++++++++++++++++ 9 files changed, 384 insertions(+), 29 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 503674a..49e11a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,9 @@ whether it was counted as a success/failure. - upgrade to dart 3.8.0 - upgrade to petitparser 7.0.0 +- implement penetrating dice ala Hackmaster + - `1d6p` -- roll d6, if 6 is rolled explode with d6s subtracting one each time. + - `1d100p20` -- roll a d100, if 100 is rolled penetrate with d20s - added dependency on fast_immutable_collections - remove metadata & score from RollResult - allow compounding, exploding, and rerolls for 'odd' die (`dF, D66, and d[vals]`) diff --git a/README.md b/README.md index f0e5e21..9766e94 100644 --- a/README.md +++ b/README.md @@ -54,6 +54,8 @@ void main() { * `1D66` -- roll `1` D66, aka `1d6*10 + 1d6` * **_NOTE_**: you _must_ use uppercase `D66`, lowercase `d66` will be interpreted as a 66-sided die * `2d[2,3,5,7]`-- roll 2 dice with values `[2,3,5,7]` + * `4d6p` -- penetrating dice. Similar to exploding, and -1 is added for each subsequent reroll. + * `1d20p6`, `1d100p20` -- HackMaster rules say a d20 penetrates with d6s, and a d100 penetrates with d20s * exploding dice * `4d6!` -- roll `4` `6`-sided dice, explode if max (`6`) is rolled (re-roll and include in results) @@ -422,7 +424,7 @@ stdout.writeln('${rollResult.opType.name} -> $rollResult'); // if you want to listen for the RollSummary DiceExpression.registerSummaryListener((rollSummary) { -stdout.writeln('$rollSummary'); +stdout.writeln('$rollSummary');[README.md](README.md) }); ``` @@ -431,11 +433,7 @@ Alternatively, you may not want to know _all_ roll events, and are only interest the events for your specific roll. In that case, pass an 'onRoll' method to the `roll()` method ```dart - DiceExpression.create -('2d20kh -' -) -.roll( + DiceExpression.create('2d20kh').roll( onRoll: (rr) => stdout.writeln('roll - $rr'), onSummary: (summary) => stdout.writeln('summary - $ summary diff --git a/lib/src/ast_dice.dart b/lib/src/ast_dice.dart index d1e7212..99c8dab 100644 --- a/lib/src/ast_dice.dart +++ b/lib/src/ast_dice.dart @@ -1,10 +1,13 @@ +import 'package:collection/collection.dart'; import 'package:fast_immutable_collections/fast_immutable_collections.dart'; import 'package:petitparser/parser.dart'; import 'ast_core.dart'; +import 'ast_ops.dart'; import 'dice_roller.dart'; import 'enums.dart'; import 'roll_result.dart'; +import 'rolled_die.dart'; /// roll fudge dice class FudgeDice extends UnaryDice { @@ -57,6 +60,87 @@ class CSVDice extends UnaryDice { } } +class PenetratingDice extends UnaryDice { + PenetratingDice( + super.op, + super.left, + super.roller, { + required String nsides, + required String nsidesPenetration, + }) : nsides = int.parse(nsides), + nsidesPenetration = nsidesPenetration.isEmpty + ? int.parse(nsides) + : int.parse(nsidesPenetration); + + final int nsides; + final int nsidesPenetration; + final limit = defaultRerollLimit; + + @override + String toString() => '(${left}d${nsides}p$nsidesPenetration)'; + + @override + RollResult eval() { + final lhs = left(); + final ndice = lhs.totalOrDefault(() => 1); + + final roll = roller.roll(ndice, nsides); + + final results = []; + final discarded = []; + roll.results.forEachIndexed((i, rolledDie) { + if (rolledDie.isMaxResult) { + var sum = rolledDie.result; + RolledDie rerolled; + var numPenetrated = 0; + discarded.add( + RolledDie.copyWith(rolledDie, discarded: true, penetrator: true), + ); + do { + rerolled = roller + .roll( + 1, + nsidesPenetration, + '(penetration ind $i, $numPenetrated)', + ) + .results + .first; + discarded.add( + RolledDie.copyWith(rerolled, discarded: true, penetrator: true), + ); + sum += rerolled.result; + numPenetrated++; + } while (rerolled.isMaxResult && numPenetrated < limit); + discarded.add( + RolledDie.singleVal( + result: -numPenetrated, + discarded: true, + penetrator: true, + ), + ); + results.add( + RolledDie.copyWith( + rolledDie, + result: sum - numPenetrated, + penetrated: true, + from: discarded, + ), + ); + } else { + results.add(rolledDie); + } + }); + + return RollResult( + expression: toString(), + opType: OpType.rollPenetration, + results: results, + discarded: lhs.discarded + discarded, + left: lhs, + ); + } +} + /// roll n % dice class PercentDice extends UnaryDice { PercentDice(super.name, super.left, super.roller); diff --git a/lib/src/ast_ops.dart b/lib/src/ast_ops.dart index fda1f17..2211df9 100644 --- a/lib/src/ast_ops.dart +++ b/lib/src/ast_ops.dart @@ -377,7 +377,7 @@ class CompoundingDice extends BinaryDice { bool shouldCompound(RolledDie rolledDie) { final val = rolledDie.result; - if (!rolledDie.dieType.compoundable) { + if (!rolledDie.dieType.explodable) { logger.finest('$rolledDie cannot compound due to dieType'); return false; } @@ -409,6 +409,7 @@ class CompoundingDice extends BinaryDice { var sum = v.result; RolledDie rerolled; var numCompounded = 0; + discarded.add(RolledDie.copyWith(v, discarded: true, compounded: true)); do { rerolled = roller .reroll(v, '(compound ind $i, #$numCompounded)') diff --git a/lib/src/enums.dart b/lib/src/enums.dart index a9b2f2a..136a0cb 100644 --- a/lib/src/enums.dart +++ b/lib/src/enums.dart @@ -9,11 +9,10 @@ enum DieType implements Comparable { // 1d[1,3,5,7,9] special(hasPotentialValues: true), // single value (e.g. a sum or count of dice) - singleVal(explodable: false, compoundable: false, hasPotentialValues: true); + singleVal(explodable: false, hasPotentialValues: true); const DieType({ this.explodable = true, - this.compoundable = true, this.hasPotentialValues = false, this.hasNSides = true, }); @@ -21,9 +20,6 @@ enum DieType implements Comparable { /// can the die be exploded? final bool explodable; - /// can the die be compounded? - final bool compoundable; - /// whether the RolledDie must have non-empty potentialValues final bool hasPotentialValues; @@ -47,6 +43,7 @@ enum OpType { rollPercent, rollD66, rollVals, + rollPenetration, reroll, compound, explode, diff --git a/lib/src/parser.dart b/lib/src/parser.dart index 443de86..0a6488a 100644 --- a/lib/src/parser.dart +++ b/lib/src/parser.dart @@ -40,13 +40,27 @@ Parser parserBuilder(DiceRoller roller) { char(']').trim(), ), (a, op) => CSVDice(op.toString(), a, roller, op.$3), + ) + ..postfix( + seq4( + char('d').trim(), + digit().plus().flatten().trim(), + char('p').trim(), + digit().plus().optional().flatten().trim(), + ), + (a, op) => PenetratingDice( + op.toString(), + a, + roller, + nsides: op.$2, + nsidesPenetration: op.$4, + ), ); builder.group().left( char('d').trim(), (a, op, b) => StdDice(op, a, b, roller), ); - // TODO: !p penetrating dice // compounding dice (has to be in separate group from exploding) builder.group().left( (string('!!') & diff --git a/lib/src/roll_summary.dart b/lib/src/roll_summary.dart index 2a693e7..254dc0b 100644 --- a/lib/src/roll_summary.dart +++ b/lib/src/roll_summary.dart @@ -85,7 +85,6 @@ class RollSummary extends Equatable { return buffer.toString(); } - // TODO: implement fromJson? Map toJson() => { 'expression': expression, diff --git a/lib/src/rolled_die.dart b/lib/src/rolled_die.dart index 8efd5bf..22fe652 100644 --- a/lib/src/rolled_die.dart +++ b/lib/src/rolled_die.dart @@ -22,6 +22,8 @@ class RolledDie extends Equatable implements Comparable { this.explosion = false, this.compoundedFinal = false, this.compounded = false, + this.penetrated = false, + this.penetrator = false, this.reroll = false, this.rerolled = false, this.clampCeiling = false, @@ -65,21 +67,23 @@ class RolledDie extends Equatable implements Comparable { factory RolledDie.singleVal({ required int result, - Iterable? from, + bool discarded = false, + bool penetrator = false, + Iterable? from = const IList.empty(), }) => RolledDie( result: result, nsides: 1, + discarded: discarded, + penetrator: penetrator, dieType: DieType.singleVal, potentialValues: [result], - from: IList.orNull(from) ?? const IList.empty(), + from: IList(from), ); - factory RolledDie.d66({required int result, Iterable? from}) => - RolledDie( - result: result, - dieType: DieType.d66, - from: IList.orNull(from) ?? const IList.empty(), - ); + factory RolledDie.d66({ + required int result, + Iterable? from = const IList.empty(), + }) => RolledDie(result: result, dieType: DieType.d66, from: IList(from)); factory RolledDie.copyWith( RolledDie other, { @@ -93,6 +97,8 @@ class RolledDie extends Equatable implements Comparable { bool? explosion, bool? compounded, bool? compoundedFinal, + bool? penetrator, + bool? penetrated, bool? reroll, bool? rerolled, bool? clampHigh, @@ -106,6 +112,8 @@ class RolledDie extends Equatable implements Comparable { discarded: discarded ?? other.discarded, success: success ?? other.success, failure: failure ?? other.failure, + penetrated: penetrated ?? other.penetrated, + penetrator: penetrator ?? other.penetrator, critSuccess: critSuccess ?? other.critSuccess, critFailure: critFailure ?? other.critFailure, exploded: exploded ?? other.exploded, @@ -182,6 +190,12 @@ class RolledDie extends Equatable implements Comparable { /// true if the die is the sum a multiple die due to compounding final bool compoundedFinal; + /// true if the die was a discarded result during penetration + final bool penetrator; + + /// true if the die was the result of penetration + final bool penetrated; + /// true if the (discarded) result is from a reroll final bool rerolled; @@ -194,6 +208,8 @@ class RolledDie extends Equatable implements Comparable { /// true if the result has been clamped via `C<` final bool clampFloor; + bool get isMaxResult => result == maxPotentialValue; + @override List get props => [ result, @@ -215,6 +231,8 @@ class RolledDie extends Equatable implements Comparable { rerolled, clampCeiling, clampFloor, + penetrated, + penetrator, ]; Map toJson() => @@ -236,6 +254,8 @@ class RolledDie extends Equatable implements Comparable { 'rerolled': rerolled, 'clampHigh': clampCeiling, 'clampLow': clampFloor, + 'penetrated': penetrated, + 'penetrator': penetrator, }..removeWhere( (k, v) => v == null || @@ -278,11 +298,17 @@ class RolledDie extends Equatable implements Comparable { if (explosion) { buffer.write('🔥'); //'⇪'); } + if (penetrated) { + buffer.write('➶'); + } + if (penetrator) { + buffer.write('⥅'); + } if (compoundedFinal) { buffer.write('∑'); } if (compounded) { - buffer.write('+'); + buffer.write('⥅'); } if (clampCeiling) { buffer.write('⌈⌉'); @@ -316,14 +342,23 @@ class RolledDie extends Equatable implements Comparable { return buffer.toString(); } - //TODO: should this compare other fields too? @override int compareTo(RolledDie other) => result .compareTo(other.result) .if0(dieType.compareTo(other.dieType)) - .if0( - dieType == DieType.polyhedral && other.dieType == DieType.polyhedral - ? nsides.compareTo(other.nsides) - : 0, - ); + .if0(nsides.compareTo(other.nsides)) + .if0(discarded.compareTo(other.discarded)) + .if0(success.compareTo(other.success)) + .if0(failure.compareTo(other.failure)) + .if0(failure.compareTo(other.failure)) + .if0(critSuccess.compareTo(other.critSuccess)) + .if0(critFailure.compareTo(other.critFailure)) + .if0(exploded.compareTo(other.exploded)) + .if0(explosion.compareTo(other.explosion)) + .if0(compoundedFinal.compareTo(other.compoundedFinal)) + .if0(compounded.compareTo(other.compounded)) + .if0(reroll.compareTo(other.reroll)) + .if0(rerolled.compareTo(other.rerolled)) + .if0(clampCeiling.compareTo(other.clampCeiling)) + .if0(clampFloor.compareTo(other.clampFloor)); } diff --git a/test/dart_dice_parser_test.dart b/test/dart_dice_parser_test.dart index 3f6f680..70b8a95 100644 --- a/test/dart_dice_parser_test.dart +++ b/test/dart_dice_parser_test.dart @@ -505,6 +505,9 @@ void main() { seededRandTest('compounding dice', '9d6!!o<=3', 50); seededRandTest('compounding dice', '9d6!!o1', 44); + seededRandTest('penetrating dice', '9d6p', 45); + seededRandTest('penetrating dice', '9d6p4', 50); + seededRandTest('explode arith result', '(9d6+3)!', 51); // explode, then count 6's @@ -716,6 +719,227 @@ void main() { ); }); + test('toJson - 9d6p4', () { + final dice = DiceExpression.create('9d6p4', seededRandom); + final obj = dice.roll().toJson(); + expect( + obj, + equals({ + 'expression': '(9d6p4)', + 'total': 50, + 'results': [ + { + 'result': 8, + 'nsides': 6, + 'dieType': 'polyhedral', + 'penetrated': true, + }, + {'result': 2, 'nsides': 6, 'dieType': 'polyhedral'}, + {'result': 1, 'nsides': 6, 'dieType': 'polyhedral'}, + {'result': 5, 'nsides': 6, 'dieType': 'polyhedral'}, + {'result': 3, 'nsides': 6, 'dieType': 'polyhedral'}, + {'result': 5, 'nsides': 6, 'dieType': 'polyhedral'}, + {'result': 1, 'nsides': 6, 'dieType': 'polyhedral'}, + {'result': 4, 'nsides': 6, 'dieType': 'polyhedral'}, + { + 'result': 21, + 'nsides': 6, + 'dieType': 'polyhedral', + 'penetrated': true, + }, + ], + 'discarded': [ + { + 'result': 6, + 'nsides': 6, + 'dieType': 'polyhedral', + 'discarded': true, + 'penetrator': true, + }, + { + 'result': 3, + 'nsides': 4, + 'dieType': 'polyhedral', + 'discarded': true, + 'penetrator': true, + }, + { + 'result': -1, + 'nsides': 1, + 'potentialValues': [-1], + 'dieType': 'singleVal', + 'discarded': true, + 'penetrator': true, + }, + { + 'result': 6, + 'nsides': 6, + 'dieType': 'polyhedral', + 'discarded': true, + 'penetrator': true, + }, + { + 'result': 4, + 'nsides': 4, + 'dieType': 'polyhedral', + 'discarded': true, + 'penetrator': true, + }, + { + 'result': 4, + 'nsides': 4, + 'dieType': 'polyhedral', + 'discarded': true, + 'penetrator': true, + }, + { + 'result': 4, + 'nsides': 4, + 'dieType': 'polyhedral', + 'discarded': true, + 'penetrator': true, + }, + { + 'result': 4, + 'nsides': 4, + 'dieType': 'polyhedral', + 'discarded': true, + 'penetrator': true, + }, + { + 'result': 4, + 'nsides': 4, + 'dieType': 'polyhedral', + 'discarded': true, + 'penetrator': true, + }, + { + 'result': 1, + 'nsides': 4, + 'dieType': 'polyhedral', + 'discarded': true, + 'penetrator': true, + }, + { + 'result': -6, + 'nsides': 1, + 'potentialValues': [-6], + 'dieType': 'singleVal', + 'discarded': true, + 'penetrator': true, + }, + ], + 'detailedResults': { + 'expression': '(9d6p4)', + 'opType': 'rollPenetration', + 'results': [ + { + 'result': 8, + 'nsides': 6, + 'dieType': 'polyhedral', + 'penetrated': true, + }, + {'result': 2, 'nsides': 6, 'dieType': 'polyhedral'}, + {'result': 1, 'nsides': 6, 'dieType': 'polyhedral'}, + {'result': 5, 'nsides': 6, 'dieType': 'polyhedral'}, + {'result': 3, 'nsides': 6, 'dieType': 'polyhedral'}, + {'result': 5, 'nsides': 6, 'dieType': 'polyhedral'}, + {'result': 1, 'nsides': 6, 'dieType': 'polyhedral'}, + {'result': 4, 'nsides': 6, 'dieType': 'polyhedral'}, + { + 'result': 21, + 'nsides': 6, + 'dieType': 'polyhedral', + 'penetrated': true, + }, + ], + 'discarded': [ + { + 'result': 6, + 'nsides': 6, + 'dieType': 'polyhedral', + 'discarded': true, + 'penetrator': true, + }, + { + 'result': 3, + 'nsides': 4, + 'dieType': 'polyhedral', + 'discarded': true, + 'penetrator': true, + }, + { + 'result': -1, + 'nsides': 1, + 'potentialValues': [-1], + 'dieType': 'singleVal', + 'discarded': true, + 'penetrator': true, + }, + { + 'result': 6, + 'nsides': 6, + 'dieType': 'polyhedral', + 'discarded': true, + 'penetrator': true, + }, + { + 'result': 4, + 'nsides': 4, + 'dieType': 'polyhedral', + 'discarded': true, + 'penetrator': true, + }, + { + 'result': 4, + 'nsides': 4, + 'dieType': 'polyhedral', + 'discarded': true, + 'penetrator': true, + }, + { + 'result': 4, + 'nsides': 4, + 'dieType': 'polyhedral', + 'discarded': true, + 'penetrator': true, + }, + { + 'result': 4, + 'nsides': 4, + 'dieType': 'polyhedral', + 'discarded': true, + 'penetrator': true, + }, + { + 'result': 4, + 'nsides': 4, + 'dieType': 'polyhedral', + 'discarded': true, + 'penetrator': true, + }, + { + 'result': 1, + 'nsides': 4, + 'dieType': 'polyhedral', + 'discarded': true, + 'penetrator': true, + }, + { + 'result': -6, + 'nsides': 1, + 'potentialValues': [-6], + 'dieType': 'singleVal', + 'discarded': true, + 'penetrator': true, + }, + ], + 'total': 50, + }, + }), + ); + }); + test('rollN test', () async { final dice = DiceExpression.create('2d6', seededRandom); From 954ad7cbdd0339182a74d6848d702660dd7bbe8f Mon Sep 17 00:00:00 2001 From: Steve Christensen Date: Sat, 5 Jul 2025 03:01:25 -0600 Subject: [PATCH 13/31] add support for commas and sorting --- CHANGELOG.md | 2 + README.md | 114 +++++++++++++++++++++++++++++--- lib/src/ast_core.dart | 43 ++++++++++++ lib/src/ast_dice.dart | 2 +- lib/src/ast_ops.dart | 31 ++++++++- lib/src/dice_roller.dart | 4 +- lib/src/enums.dart | 20 +++--- lib/src/parser.dart | 30 +++++---- lib/src/rolled_die.dart | 8 ++- test/dart_dice_parser_test.dart | 85 ++++++++++++++++++++++-- 10 files changed, 298 insertions(+), 41 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 49e11a1..fdeb93b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,8 @@ whether it was counted as a success/failure. - upgrade to dart 3.8.0 - upgrade to petitparser 7.0.0 +- add 'sort' to dice syntax -- `4d6 s` (ascending) or `4d6 sd` (descending) +- allow commas to separate different dice expressions: `4d4,6d6,8d8` - implement penetrating dice ala Hackmaster - `1d6p` -- roll d6, if 6 is rolled explode with d6s subtracting one each time. - `1d100p20` -- roll a d100, if 100 is rolled penetrate with d20s diff --git a/README.md b/README.md index 9766e94..8b292eb 100644 --- a/README.md +++ b/README.md @@ -107,6 +107,18 @@ void main() { * cap/clamp: * `4d20 C<5` -- roll 4d20, change any value < 5 to 5 * `4d20 C>15` -- roll 4d20, change any value > 15 to 15 +* sorting results + * `4d20 s` -- results sorted in ascending order + * `4d20 sd` -- results sorted in descending order + +* multiple expressions separated by comma + * `(1d8!,1d6!)kh` -- rolls 1d8 and 1d6 exploding, and keeps the highest result + * NOTE: each subexpression is evaluated into a result, and the individual rolls are discarded. + * example: `(1d8!,1d6!)kh` + * `1d6!` rolls a 6, and explodes with a 4. total: 10 + * `1d8!` rolls an 8, and explodes with a 1. total: 9 + * the comma-separated results are each replaced -- the rolls are discarded, and the results now are `10,9` + * the highest is kept. the expression's total is 10. * scoring dice rolls: * counting: @@ -234,16 +246,100 @@ Sometimes it's nice to change the output type so you can see the graph of result ```console # show the result graph: -❯ dart run example/main.dart -o pretty '3d6 #cs #cf' -(((3d6) #cs ) #cf ) ===> RollSummary(total: 9, results: [1(d6)❌, 3(d6), 5(d6)], critFailureCount: 1) - (((3d6) #cs ) #cf ) =count=> RollResult(total: 9, results: [1(d6)❌, 3(d6), 5(d6)]) - ((3d6) #cs ) =count=> RollResult(total: 9, results: [1(d6), 3(d6), 5(d6)]) - (3d6) =rollDice=> RollResult(total: 9, results: [1(d6), 3(d6), 5(d6)]) - -❯ dart run example/main.dart -o json '3d6 #cs #cf' -{"expression":"(((3d6) #cs ) #cf )","total":9,"results":[2,3,4],"detailedResults":{"expression":"(((3d6) #cs ) #cf )","opType":"count","nsides":6,"ndice":3,"results":[2,3,4],"left":{"expression":"((3d6) #cs )","opType":"count","nsides":6,"ndice":3,"results":[2,3,4],"left":{"expression":"(3d6)","opType":"rollDice","nsides":6,"ndice":3,"results":[2,3,4],"metadata":{"rolled":[2,3,4]}}}},"metadata":{"rolled":[2,3,4]}} - +❯ dart run example/main.dart -o pretty '3d6 #cs #cf' +(((3d6) #cs ) #cf ) ===> RollSummary(total: 13, results: [6(d6✅), 5(d6), 2(d6)], critSuccessCount: 1) + (((3d6) #cs ) #cf ) =count=> RollResult(total: 13, results: [6(d6✅), 5(d6), 2(d6)]) + ((3d6) #cs ) =count=> RollResult(total: 13, results: [6(d6✅), 5(d6), 2(d6)]) + (3d6) =rollDice=> RollResult(total: 13, results: [6(d6), 5(d6), 2(d6)]) +❯ dart run example/main.dart -o json '3d6 #cs #cf' | jq +{ + "expression": "(((3d6) #cs ) #cf )", + "total": 12, + "results": [ + { + "result": 4, + "nsides": 6, + "dieType": "polyhedral" + }, + { + "result": 5, + "nsides": 6, + "dieType": "polyhedral" + }, + { + "result": 3, + "nsides": 6, + "dieType": "polyhedral" + } + ], + "detailedResults": { + "expression": "(((3d6) #cs ) #cf )", + "opType": "count", + "results": [ + { + "result": 4, + "nsides": 6, + "dieType": "polyhedral" + }, + { + "result": 5, + "nsides": 6, + "dieType": "polyhedral" + }, + { + "result": 3, + "nsides": 6, + "dieType": "polyhedral" + } + ], + "left": { + "expression": "((3d6) #cs )", + "opType": "count", + "results": [ + { + "result": 4, + "nsides": 6, + "dieType": "polyhedral" + }, + { + "result": 5, + "nsides": 6, + "dieType": "polyhedral" + }, + { + "result": 3, + "nsides": 6, + "dieType": "polyhedral" + } + ], + "left": { + "expression": "(3d6)", + "opType": "rollDice", + "results": [ + { + "result": 4, + "nsides": 6, + "dieType": "polyhedral" + }, + { + "result": 5, + "nsides": 6, + "dieType": "polyhedral" + }, + { + "result": 3, + "nsides": 6, + "dieType": "polyhedral" + } + ], + "total": 12 + }, + "total": 12 + }, + "total": 12 + } +} ``` ## Statistics output diff --git a/lib/src/ast_core.dart b/lib/src/ast_core.dart index 1d053cb..b905f01 100644 --- a/lib/src/ast_core.dart +++ b/lib/src/ast_core.dart @@ -1,6 +1,7 @@ import 'dice_expression.dart'; import 'dice_roller.dart'; import 'enums.dart'; +import 'extensions.dart'; import 'roll_result.dart'; import 'rolled_die.dart'; import 'utils.dart'; @@ -44,6 +45,48 @@ abstract class Binary extends DiceOp { String toString() => '($left $name $right)'; } +class CommaOp extends Binary { + CommaOp(super.name, super.left, super.right); + + @override + RollResult eval() { + final lhs = left(); + final rhs = right(); + + final results = []; + final discarded = []; + + discarded.addAll(lhs.discarded); + discarded.addAll(rhs.discarded); + + if (lhs.opType == OpType.comma) { + results.addAll(lhs.results); + } else { + results.add( + RolledDie.singleVal(result: lhs.results.sum, from: lhs.results), + ); + discarded.addAll(lhs.results.map(RolledDie.discard)); + } + if (rhs.opType == OpType.comma) { + results.addAll(rhs.results); + } else { + results.add( + RolledDie.singleVal(result: rhs.results.sum, from: rhs.results), + ); + discarded.addAll(rhs.results.map(RolledDie.discard)); + } + + return RollResult( + expression: toString(), + opType: OpType.comma, + results: results, + discarded: discarded, + left: lhs, + right: rhs, + ); + } +} + /// multiply operation (flattens results) class MultiplyOp extends Binary { MultiplyOp(super.name, super.left, super.right); diff --git a/lib/src/ast_dice.dart b/lib/src/ast_dice.dart index 99c8dab..02f7cf1 100644 --- a/lib/src/ast_dice.dart +++ b/lib/src/ast_dice.dart @@ -101,7 +101,7 @@ class PenetratingDice extends UnaryDice { .roll( 1, nsidesPenetration, - '(penetration ind $i, $numPenetrated)', + '(penetration ind $i, #$numPenetrated)', ) .results .first; diff --git a/lib/src/ast_ops.dart b/lib/src/ast_ops.dart index 2211df9..5c4f1ff 100644 --- a/lib/src/ast_ops.dart +++ b/lib/src/ast_ops.dart @@ -8,6 +8,25 @@ import 'rolled_die.dart'; /// default limit for rerolls/exploding/compounding to avoid getting stuck in loop const defaultRerollLimit = 1000; +class SortOp extends Unary { + SortOp(super.name, super.left); + + @override + RollResult eval() { + final lhs = left(); + final bool reversed = name == 'sd'; + + return RollResult( + results: reversed ? lhs.results.sortReversed() : lhs.results.sort(), + discarded: reversed ? lhs.discarded.sortReversed() : lhs.discarded.sort(), + opType: OpType.sort, + + expression: toString(), + left: lhs, + ); + } +} + /// variation on count -- count how many results from lhs are =,<,> rhs. class CountOp extends Binary { CountOp( @@ -38,8 +57,10 @@ class CountOp extends Binary { bool shouldCount(RolledDie rolledDie) { var rhsEmptyAndSimpleCount = false; + var calculatedDefault = false; final target = rhs.totalOrDefault(() { - // if missing RHS, we can make assumptions depending on operator. + calculatedDefault = true; + // if missing RHS, we can make assumptions depending on operator and the dietype switch (name) { case '#': // example: '3d6#' should be 3. target is ignored in case statement below. @@ -49,7 +70,7 @@ class CountOp extends Binary { // example: '3d6#s' should match 6, or '3D66' should match 66 return rolledDie.maxPotentialValue; case '#f' || '#cf': - // generally should be 1. + // generally should be 1 or whatever the minimum potential val is return rolledDie.minPotentialValue; default: throw FormatException( @@ -82,6 +103,12 @@ class CountOp extends Binary { // that is, '3d6#' should return 3 return true; } else { + // don't allow a singleVal/nvals(with 1 element) be counted as a success just because it's the min or max. + if (calculatedDefault && + rolledDie.dieType.requirePotentialValues && + rolledDie.potentialValues.length == 1) { + return false; + } // if not missing rhs, treat it as equivalent to '#='. // that is, '3d6#2' should count 2s return v == target; diff --git a/lib/src/dice_roller.dart b/lib/src/dice_roller.dart index 1a9eab7..6d6766a 100644 --- a/lib/src/dice_roller.dart +++ b/lib/src/dice_roller.dart @@ -38,7 +38,7 @@ class DiceRoller with LoggingMixin { return rollFudge(1, msg); case DieType.d66: return rollD66(1, msg); - case DieType.special: + case DieType.nvals: return rollVals(1, rolledDie.potentialValues, msg); default: return RollResult( @@ -128,7 +128,7 @@ class DiceRoller with LoggingMixin { (i) => RolledDie( result: i, nsides: sideVals.length, - dieType: DieType.special, + dieType: DieType.nvals, potentialValues: sideVals, ), ), diff --git a/lib/src/enums.dart b/lib/src/enums.dart index 136a0cb..5acb417 100644 --- a/lib/src/enums.dart +++ b/lib/src/enums.dart @@ -3,28 +3,30 @@ enum DieType implements Comparable { // normal polyhedral (1d6, 1d20, etc) polyhedral(), // fudge dice - fudge(hasPotentialValues: true), + fudge(requirePotentialValues: true), // 1D66 (equivalent to `1d6*10 + 1d6`). - d66(hasNSides: false), + d66(requireNSides: false), // 1d[1,3,5,7,9] - special(hasPotentialValues: true), + nvals(requirePotentialValues: true), // single value (e.g. a sum or count of dice) - singleVal(explodable: false, hasPotentialValues: true); + singleVal(explodable: false, requirePotentialValues: true) + //penetration(explodable: false) + ; const DieType({ this.explodable = true, - this.hasPotentialValues = false, - this.hasNSides = true, + this.requirePotentialValues = false, + this.requireNSides = true, }); /// can the die be exploded? final bool explodable; /// whether the RolledDie must have non-empty potentialValues - final bool hasPotentialValues; + final bool requirePotentialValues; /// whether the RolledDie must have non-zero nsides - final bool hasNSides; + final bool requireNSides; @override int compareTo(DieType dieType) => index.compareTo(dieType.index); @@ -47,6 +49,8 @@ enum OpType { reroll, compound, explode, + sort, + comma, } enum CountType { count, success, failure, critSuccess, critFailure } diff --git a/lib/src/parser.dart b/lib/src/parser.dart index 0a6488a..33753b9 100644 --- a/lib/src/parser.dart +++ b/lib/src/parser.dart @@ -6,8 +6,6 @@ import 'ast_ops.dart'; import 'dice_expression.dart'; import 'dice_roller.dart'; -// TODO: support commas `(,,)kh` -- evaluate each subexpression into a new die result, discarding the ones that had been combined - Parser parserBuilder(DiceRoller roller) { final builder = ExpressionBuilder(); // numbers @@ -128,15 +126,23 @@ Parser parserBuilder(DiceRoller roller) { ..left(char('-').trim(), (a, op, b) => SubOp(op, a, b)); // count >=, <=, <, >, =, // #s, #cs, #f, #cf -- count (critical) successes / failures - builder.group().left( - (char('#') & - char('c').optional() & - pattern('sf').optional() & - pattern('<>').optional() & - char('=').optional()) - .flatten() - .trim(), - (a, op, b) => CountOp(op.toLowerCase(), a, b), - ); + builder.group() + ..left( + (char('#') & + char('c').optional() & + pattern('sf').optional() & + pattern('<>').optional() & + char('=').optional()) + .flatten() + .trim(), + (a, op, b) => CountOp(op.toLowerCase(), a, b), + ) + ..postfix( + (char('s', ignoreCase: true) & char('d', ignoreCase: true).optional()) + .flatten() + .trim(), + (a, op) => SortOp(op.toLowerCase(), a), + ) + ..left(char(',').trim(), (a, op, b) => CommaOp(op, a, b)); return builder.build().end(); } diff --git a/lib/src/rolled_die.dart b/lib/src/rolled_die.dart index 22fe652..8887e82 100644 --- a/lib/src/rolled_die.dart +++ b/lib/src/rolled_die.dart @@ -30,12 +30,12 @@ class RolledDie extends Equatable implements Comparable { this.clampFloor = false, this.from = const IList.empty(), }) : potentialValues = IList(potentialValues) { - if (dieType.hasPotentialValues && potentialValues.isEmpty) { + if (dieType.requirePotentialValues && potentialValues.isEmpty) { throw ArgumentError( 'Invalid die -- ${dieType.name} must have a potentialValues field', ); } - if (dieType.hasNSides && nsides == 0) { + if (dieType.requireNSides && nsides == 0) { throw ArgumentError( 'Invalid die -- ${dieType.name} must have a nsides != 0', ); @@ -49,7 +49,7 @@ class RolledDie extends Equatable implements Comparable { minPotentialValue = 1; case DieType.singleVal: maxPotentialValue = minPotentialValue = result; - case DieType.special || DieType.fudge: + case DieType.nvals || DieType.fudge: maxPotentialValue = potentialValues.max; minPotentialValue = potentialValues.min; } @@ -210,6 +210,8 @@ class RolledDie extends Equatable implements Comparable { bool get isMaxResult => result == maxPotentialValue; + bool get isCountable => minPotentialValue != maxPotentialValue; + @override List get props => [ result, diff --git a/test/dart_dice_parser_test.dart b/test/dart_dice_parser_test.dart index 70b8a95..be18b91 100644 --- a/test/dart_dice_parser_test.dart +++ b/test/dart_dice_parser_test.dart @@ -37,6 +37,7 @@ void main() { int? failureCount, int? critSuccessCount, int? critFailureCount, + bool? verifyResultOrder, }) { test('$testName - $inputExpr', () { final rollSummary = DiceExpression.create(inputExpr, seededRandom).roll(); @@ -51,7 +52,9 @@ void main() { final actualResults = rollSummary.results.map((d) => d.result).toList(); expect( actualResults, - unorderedEquals(expectedResults), + verifyResultOrder ?? true + ? unorderedEquals(expectedResults) + : equals(expectedResults), reason: 'mismatching results', ); } @@ -221,9 +224,29 @@ void main() { seededRandTest('count > (missing from result)', '4d6#>6', 0); seededRandTest('count #', '4d6#', 4); seededRandTest('count # after drop', '4d6-<2#', 3); - seededRandTest('count # after drop', '4d6#1', 1); - seededRandTest('count # after drop', '4d6#=1', 1); - seededRandTest('count arith result', '(4d6+1)#1', 2); + seededRandTest('count # missing equals', '4d6#1', 1); + seededRandTest('count # with equals', '4d6#=1', 1); + // this only counts one if you use equals sign. + seededRandTest('count arith result - #1', '(4d6+1)#1', 2); + seededRandTest('count arith result - #=1', '(4d6+1)#=1', 2); + seededRandTest('count arith result - #', '(4d6+1)#', 5); + seededRandTest( + 'count arith result - #=1', + '(4d6+1)#s#f', + 15, + expectedResults: [1, 6, 2, 5, 1], + successCount: 1, + failureCount: 1, // the 1(val) does not count as a failure + ); + + seededRandTest( + 'count arith result - #=1', + '(4d6+1)#s#f=1', + 15, + expectedResults: [1, 6, 2, 5, 1], + successCount: 1, + failureCount: 2, + ); // 1234 seed will return [1, -1, -1, 1, 0, 1] seededRandTest('count fudge', '6dF#', 6); @@ -524,6 +547,43 @@ void main() { seededRandTest('fudge add to d6', '4d6+4dF', 14); seededRandTest('fudge add to d6', '4dF+4d6', 13); + seededRandTest( + 'sorted add', + '(1d4+1d6+1d8+1d10) s', + 20, + expectedResults: [2, 4, 5, 9], + verifyResultOrder: true, + ); + seededRandTest( + 'sorted comma', + '(1d4,1d6,1d8,1d10) s', + 20, + expectedResults: [2, 4, 5, 9], + verifyResultOrder: true, + ); + seededRandTest( + 'unsorted add', + '(1d4+1d6+1d8+1d10)', + 20, + expectedResults: [4, 2, 5, 9], + verifyResultOrder: true, + ); + seededRandTest( + 'unsorted comma', + '(1d4,1d6,1d8,1d10)', + 20, + expectedResults: [4, 2, 5, 9], + verifyResultOrder: true, + ); + + seededRandTest( + 'scored comma', + '(1d4,1d4p,1d4!,1d4!!)#s>=4', + 14, + expectedResults: [4, 4, 3, 3], + successCount: 2, + ); + test('multiple rolls is multiple results', () { final dice = DiceExpression.create('2d6', seededRandom); expect(dice.roll().total, 8); @@ -607,6 +667,23 @@ void main() { ), ); }); + + test('toStringPretty - penetrating', () { + // mocked responses should return rolls of 6, 2, 1, 5 + final dice = DiceExpression.create('9d6p', seededRandom); + final out = dice.roll().toStringPretty(); + expect( + out, + equalsIgnoringWhitespace( + ''' +(9d6p6) ===> RollSummary(total: 45, results: [10(d6➶), 2(d6), 1(d6), 5(d6), 3(d6), 5(d6), 1(d6), 4(d6), 14(d6➶)], discarded: [6(d6⛔︎⥅), 5(d6⛔︎⥅), -1(val⛔︎⥅), 6(d6⛔︎⥅), 6(d6⛔︎⥅), 4(d6⛔︎⥅), -2(val⛔︎⥅)]) + (9d6p6) =rollPenetration=> RollResult(total: 45, results: [10(d6➶), 2(d6), 1(d6), 5(d6), 3(d6), 5(d6), 1(d6), 4(d6), 14(d6➶)], discarded: [6(d6⛔︎⥅), 5(d6⛔︎⥅), -1(val⛔︎⥅), 6(d6⛔︎⥅), 6(d6⛔︎⥅), 4(d6⛔︎⥅), -2(val⛔︎⥅)]) + + ''' + .trim(), + ), + ); + }); test('toJson', () { // mocked responses should return rolls of 6, 2, 1, 5 final dice = DiceExpression.create('4d6', seededRandom); From 893a1caecb654bafcbe3d0ff2ddd71bcffaf6e5e Mon Sep 17 00:00:00 2001 From: Steve Christensen Date: Sat, 5 Jul 2025 03:15:24 -0600 Subject: [PATCH 14/31] fix analysis error --- lib/src/ast_ops.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/src/ast_ops.dart b/lib/src/ast_ops.dart index 5c4f1ff..7db70f1 100644 --- a/lib/src/ast_ops.dart +++ b/lib/src/ast_ops.dart @@ -14,7 +14,7 @@ class SortOp extends Unary { @override RollResult eval() { final lhs = left(); - final bool reversed = name == 'sd'; + final reversed = name == 'sd'; return RollResult( results: reversed ? lhs.results.sortReversed() : lhs.results.sort(), From ab9b67476c3cf1f4a279cd1ba47e0d6c162069ec Mon Sep 17 00:00:00 2001 From: Steve Christensen Date: Sat, 5 Jul 2025 03:52:25 -0600 Subject: [PATCH 15/31] add topics to pubspec --- pubspec.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pubspec.yaml b/pubspec.yaml index 2569015..824bacc 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -7,6 +7,11 @@ repository: https://github.com/Adventuresmith/dart-dice-parser environment: sdk: "^3.8.0" +topics: + - dice + - rpg + - ttrpg + dependencies: collection: ^1.0.0 equatable: ^2.0.0 From aaa1a927e59b7d441bee19bc4cdbe78c349a565d Mon Sep 17 00:00:00 2001 From: Steve Christensen Date: Sat, 5 Jul 2025 16:27:59 -0600 Subject: [PATCH 16/31] cleanup comments --- lib/src/dice_roller.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/src/dice_roller.dart b/lib/src/dice_roller.dart index 6d6766a..3646139 100644 --- a/lib/src/dice_roller.dart +++ b/lib/src/dice_roller.dart @@ -7,12 +7,12 @@ import 'roll_result.dart'; import 'rolled_die.dart'; import 'utils.dart'; -/// A dice roller for M dice of N sides (e.g. `2d6`). -/// A roll returns a list of ints. +/// A dice roller for standard polyhedral dice, fudge dice, etc class DiceRoller with LoggingMixin { /// Constructs a dice roller DiceRoller([Random? r]) : _random = r ?? Random.secure(); + /// the RNG to use final Random _random; /// minimum dice to roll (0) From 5efce2b5247556705a335557d308d2032fb8dd2d Mon Sep 17 00:00:00 2001 From: Steve Christensen Date: Sat, 5 Jul 2025 23:14:17 -0600 Subject: [PATCH 17/31] setup pubspec Workspace and split off example/main.dart into dicecli package --- .github/workflows/dart.yml | 6 ++-- LICENSE | 2 +- README.md | 28 ++++++++--------- .../example/dart_dice_parser_example.dart | 0 .../lib}/dart_dice_parser.dart | 0 .../dart_dice_parser/lib}/src/ast_core.dart | 0 .../dart_dice_parser/lib}/src/ast_dice.dart | 0 .../dart_dice_parser/lib}/src/ast_ops.dart | 5 ++-- .../lib}/src/dice_expression.dart | 0 .../lib}/src/dice_roller.dart | 0 .../dart_dice_parser/lib}/src/enums.dart | 0 .../dart_dice_parser/lib}/src/extensions.dart | 0 .../dart_dice_parser/lib}/src/parser.dart | 0 .../lib}/src/roll_result.dart | 0 .../lib}/src/roll_summary.dart | 0 .../dart_dice_parser/lib}/src/rolled_die.dart | 0 .../dart_dice_parser/lib}/src/stats.dart | 0 .../dart_dice_parser/lib}/src/utils.dart | 0 packages/dart_dice_parser/pubspec.yaml | 28 +++++++++++++++++ .../test}/dart_dice_parser_test.dart | 0 .../dicecli/bin/dicecli.dart | 0 packages/dicecli/pubspec.yaml | 24 +++++++++++++++ pubspec.yaml | 30 ++++--------------- 23 files changed, 78 insertions(+), 45 deletions(-) rename example/simple.dart => packages/dart_dice_parser/example/dart_dice_parser_example.dart (100%) rename {lib => packages/dart_dice_parser/lib}/dart_dice_parser.dart (100%) rename {lib => packages/dart_dice_parser/lib}/src/ast_core.dart (100%) rename {lib => packages/dart_dice_parser/lib}/src/ast_dice.dart (100%) rename {lib => packages/dart_dice_parser/lib}/src/ast_ops.dart (98%) rename {lib => packages/dart_dice_parser/lib}/src/dice_expression.dart (100%) rename {lib => packages/dart_dice_parser/lib}/src/dice_roller.dart (100%) rename {lib => packages/dart_dice_parser/lib}/src/enums.dart (100%) rename {lib => packages/dart_dice_parser/lib}/src/extensions.dart (100%) rename {lib => packages/dart_dice_parser/lib}/src/parser.dart (100%) rename {lib => packages/dart_dice_parser/lib}/src/roll_result.dart (100%) rename {lib => packages/dart_dice_parser/lib}/src/roll_summary.dart (100%) rename {lib => packages/dart_dice_parser/lib}/src/rolled_die.dart (100%) rename {lib => packages/dart_dice_parser/lib}/src/stats.dart (100%) rename {lib => packages/dart_dice_parser/lib}/src/utils.dart (100%) create mode 100644 packages/dart_dice_parser/pubspec.yaml rename {test => packages/dart_dice_parser/test}/dart_dice_parser_test.dart (100%) rename example/main.dart => packages/dicecli/bin/dicecli.dart (100%) create mode 100644 packages/dicecli/pubspec.yaml diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index 0a23d16..eafebb9 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -48,9 +48,9 @@ jobs: - name: "Chrome Tests" run: dart test --platform chrome - name: "Run example/simple.dart" - run: dart run --enable-asserts example/simple.dart - - name: "Run example/main.dart" - run: "dart run --enable-asserts example/main.dart -n 10 -o pretty '(3d6 + 3d6! + 3d6!!) #cs #cf #s #f'" + run: cd packages/dart_dice_parser && dart run --enable-asserts example/dart_dice_parser_example.dart + - name: "Run dicecli" + run: "dart run --enable-asserts dicecli -n 10 -o pretty '(3d6 + 3d6! + 3d6!!) #cs #cf #s #f'" - name: "Collect coverage" run: | dart pub global activate coverage diff --git a/LICENSE b/LICENSE index 02e8890..56f8f12 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2022 Stephen Christensen +Copyright (c) 2025 Stephen Christensen Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 8b292eb..8f9c9e9 100644 --- a/README.md +++ b/README.md @@ -192,12 +192,12 @@ final stats = await diceExpr_FastRNG.stats(); # CLI Usage -There's no executable in bin, but there's an example CLI at `example/main.dart`. +Within the repository, there's a packages/dicecli that can be used to experiment with different syntax. Usage: ``` -❯ dart run example/main.dart -h +❯ dart run dicecli -h Usage: -n, --num Number of times to roll the expression (defaults to "1") @@ -222,11 +222,11 @@ Usage: Examples: ```console -❯ dart example/main.dart '3d6' +❯ dart run dicecli '3d6' (3d6) ===> RollSummary(total: 9, results: [6(d6), 2(d6), 1(d6)]) # run N number of rolls -❯ dart run example/main.dart -n5 '3d6' +❯ dart run dicecli -n5 '3d6' (3d6) ===> RollSummary(total: 6, results: [1(d6), 4(d6), 1(d6)]) (3d6) ===> RollSummary(total: 9, results: [4(d6), 1(d6), 4(d6)]) (3d6) ===> RollSummary(total: 14, results: [4(d6), 6(d6), 4(d6)]) @@ -237,7 +237,7 @@ Examples: # show statistics for a dice expression -❯ dart example/main.dart -s '3d6' +❯ dart run dicecli -s '3d6' {mean: 10.5, stddev: 2.97, min: 3, max: 18, count: 10000, histogram: {3: 49, 4: 121, 5: 273, 6: 461, 7: 727, 8: 961, 9: 1153, 10: 1182, 11: 1272, 12: 1151, 13: 952, 14: 733, 15: 486, 16: 289, 17: 154, 18: 36}} ``` @@ -246,13 +246,13 @@ Sometimes it's nice to change the output type so you can see the graph of result ```console # show the result graph: -❯ dart run example/main.dart -o pretty '3d6 #cs #cf' +❯ dart run dicecli -o pretty '3d6 #cs #cf' (((3d6) #cs ) #cf ) ===> RollSummary(total: 13, results: [6(d6✅), 5(d6), 2(d6)], critSuccessCount: 1) (((3d6) #cs ) #cf ) =count=> RollResult(total: 13, results: [6(d6✅), 5(d6), 2(d6)]) ((3d6) #cs ) =count=> RollResult(total: 13, results: [6(d6✅), 5(d6), 2(d6)]) (3d6) =rollDice=> RollResult(total: 13, results: [6(d6), 5(d6), 2(d6)]) -❯ dart run example/main.dart -o json '3d6 #cs #cf' | jq +❯ dart run dicecli -o json '3d6 #cs #cf' | jq { "expression": "(((3d6) #cs ) #cf )", "total": 12, @@ -351,16 +351,16 @@ To explore that, you can use stats output: ```console # roll 4d6 -❯ dart run example/main.dart -s '4d6' +❯ dart run dicecli -s '4d6' {mean: 14.0, stddev: 3.44, min: 4, max: 24, count: 10000, histogram: {4: 5, 5: 28, 6: 72, 7: 163, 8: 280, 9: 468, 10: 573, 11: 816, 12: 948, 13: 1069, 14: 1047, 15: 1118, 16: 1010, 17: 786, 18: 637, 19: 412, 20: 278, 21: 161, 22: 84, 23: 32, 24: 13}} # roll 4d6 explode -❯ dart run example/main.dart -s '4d6!' +❯ dart run dicecli -s '4d6!' {mean: 16.7, stddev: 6.46, min: 4, max: 54, count: 10000, histogram: {4: 6, 5: 32, 6: 87, 7: 166, 8: 264, 9: 403, 10: 558, 11: 655, 12: 690, 13: 734, 14: 695, 15: 651, 16: 621, 17: 607, 18: 498, 19: 507, 20: 425, 21: 350, 22: 353, 23: 260, 24: 229, 25: 194, 26: 167, 27: 150, 28: 143, 29: 118, 30: 99, 31: 69, 32: 53 # roll 4d5 compounding -❯ dart run example/main.dart -s '4d6!!' +❯ dart run dicecli -s '4d6!!' {mean: 16.8, stddev: 6.43, min: 4, max: 58, count: 10000, histogram: {4: 6, 5: 29, 6: 78, 7: 162, 8: 230, 9: 389, 10: 506, 11: 635, 12: 726, 13: 705, 14: 751, 15: 682, 16: 597, 17: 602, 18: 571, 19: 498, 20: 456, 21: 365, 22: 310, 23: 286, 24: 262, 25: 192, 26: 167, 27: 156, 28: 114, 29: 92, 30: 76, 31: 72, 32: 57, 33: 41, 34: 32, 35: 31, 36: 20, 37: 15, 38: 16, 39: 10, 40: 12, 41: 8, 42: 10, 43: 4, 44: 8, 45: 5, 46: 4, 47: 2, 48: 1, 49: 2, 50: 3, 51: 2, 53: 1, 58: 1}} ``` @@ -369,13 +369,13 @@ Or, if I wonder, "in those rolls, how many times might I see a roll >=6?". For t operation ```console -❯ dart run example/main.dart -s '4d6 #>=6' +❯ dart run dicecli -s '4d6 #>=6' {mean: 0.664, stddev: 0.75, min: 0, max: 4, count: 10000, histogram: {0: 4871, 1: 3781, 2: 1192, 3: 144, 4: 12}} -❯ dart run example/main.dart -s '4d6! #>=6' +❯ dart run dicecli -s '4d6! #>=6' {mean: 0.793, stddev: 0.973, min: 0, max: 7, count: 10000, histogram: {0: 4846, 1: 3213, 2: 1328, 3: 449, 4: 116, 5: 40, 6: 4, 7: 4}} -❯ dart run example/main.dart -s '4d6!! #>=6' +❯ dart run dicecli -s '4d6!! #>=6' {mean: 0.665, stddev: 0.747, min: 0, max: 4, count: 10000, histogram: {0: 4840, 1: 3845, 2: 1144, 3: 164, 4: 7}} ``` @@ -389,7 +389,7 @@ needs. ## Traversing the result graph Use the 'left' and 'right' fields of each RollResult node to walk the graph. For an example, -see [simple.dart](example/simple.dart) +see [simple.dart](packages/dart_dice_parser/example/dart_dice_parser_example.dart) When a dice expression is parsed, it creates a binary tree to evaluate the roll. diff --git a/example/simple.dart b/packages/dart_dice_parser/example/dart_dice_parser_example.dart similarity index 100% rename from example/simple.dart rename to packages/dart_dice_parser/example/dart_dice_parser_example.dart diff --git a/lib/dart_dice_parser.dart b/packages/dart_dice_parser/lib/dart_dice_parser.dart similarity index 100% rename from lib/dart_dice_parser.dart rename to packages/dart_dice_parser/lib/dart_dice_parser.dart diff --git a/lib/src/ast_core.dart b/packages/dart_dice_parser/lib/src/ast_core.dart similarity index 100% rename from lib/src/ast_core.dart rename to packages/dart_dice_parser/lib/src/ast_core.dart diff --git a/lib/src/ast_dice.dart b/packages/dart_dice_parser/lib/src/ast_dice.dart similarity index 100% rename from lib/src/ast_dice.dart rename to packages/dart_dice_parser/lib/src/ast_dice.dart diff --git a/lib/src/ast_ops.dart b/packages/dart_dice_parser/lib/src/ast_ops.dart similarity index 98% rename from lib/src/ast_ops.dart rename to packages/dart_dice_parser/lib/src/ast_ops.dart index 7db70f1..2fbab9c 100644 --- a/lib/src/ast_ops.dart +++ b/packages/dart_dice_parser/lib/src/ast_ops.dart @@ -278,11 +278,12 @@ class ClampOp extends Binary { final newResults = []; final discarded = []; for (final d in lhs.results) { + // TODO: add clamped flag? if (name == 'c>' && d.result > target) { - discarded.add(RolledDie.discard(d)); + discarded.add(RolledDie.copyWith(d, discarded: true, clampHigh: true)); newResults.add(RolledDie.copyWith(d, result: target, clampHigh: true)); } else if (name == 'c<' && d.result < target) { - discarded.add(RolledDie.discard(d)); + discarded.add(RolledDie.copyWith(d, discarded: true, clampLow: true)); newResults.add(RolledDie.copyWith(d, result: target, clampLow: true)); } else { newResults.add(d); diff --git a/lib/src/dice_expression.dart b/packages/dart_dice_parser/lib/src/dice_expression.dart similarity index 100% rename from lib/src/dice_expression.dart rename to packages/dart_dice_parser/lib/src/dice_expression.dart diff --git a/lib/src/dice_roller.dart b/packages/dart_dice_parser/lib/src/dice_roller.dart similarity index 100% rename from lib/src/dice_roller.dart rename to packages/dart_dice_parser/lib/src/dice_roller.dart diff --git a/lib/src/enums.dart b/packages/dart_dice_parser/lib/src/enums.dart similarity index 100% rename from lib/src/enums.dart rename to packages/dart_dice_parser/lib/src/enums.dart diff --git a/lib/src/extensions.dart b/packages/dart_dice_parser/lib/src/extensions.dart similarity index 100% rename from lib/src/extensions.dart rename to packages/dart_dice_parser/lib/src/extensions.dart diff --git a/lib/src/parser.dart b/packages/dart_dice_parser/lib/src/parser.dart similarity index 100% rename from lib/src/parser.dart rename to packages/dart_dice_parser/lib/src/parser.dart diff --git a/lib/src/roll_result.dart b/packages/dart_dice_parser/lib/src/roll_result.dart similarity index 100% rename from lib/src/roll_result.dart rename to packages/dart_dice_parser/lib/src/roll_result.dart diff --git a/lib/src/roll_summary.dart b/packages/dart_dice_parser/lib/src/roll_summary.dart similarity index 100% rename from lib/src/roll_summary.dart rename to packages/dart_dice_parser/lib/src/roll_summary.dart diff --git a/lib/src/rolled_die.dart b/packages/dart_dice_parser/lib/src/rolled_die.dart similarity index 100% rename from lib/src/rolled_die.dart rename to packages/dart_dice_parser/lib/src/rolled_die.dart diff --git a/lib/src/stats.dart b/packages/dart_dice_parser/lib/src/stats.dart similarity index 100% rename from lib/src/stats.dart rename to packages/dart_dice_parser/lib/src/stats.dart diff --git a/lib/src/utils.dart b/packages/dart_dice_parser/lib/src/utils.dart similarity index 100% rename from lib/src/utils.dart rename to packages/dart_dice_parser/lib/src/utils.dart diff --git a/packages/dart_dice_parser/pubspec.yaml b/packages/dart_dice_parser/pubspec.yaml new file mode 100644 index 0000000..c80e81e --- /dev/null +++ b/packages/dart_dice_parser/pubspec.yaml @@ -0,0 +1,28 @@ +name: dart_dice_parser +description: A dart library for parsing dice notation (`2d6+4`). Supports advantage/disadvantage, exploding die, and other variations. +version: 8.0.0 +homepage: https://github.com/Adventuresmith/dart-dice-parser +repository: https://github.com/Adventuresmith/dart-dice-parser + +resolution: workspace + +environment: + sdk: "^3.8.0" + +topics: + - dice + - rpg + - ttrpg + +dependencies: + collection: ^1.0.0 + equatable: ^2.0.0 + fast_immutable_collections: ^11.0.0 + logging: ^1.3.0 + petitparser: ^7.0.0 + +dev_dependencies: + io: ^1.0.0 + lint: ^2.8.0 + mocktail: ^1.0.0 + test: ^1.26.0 diff --git a/test/dart_dice_parser_test.dart b/packages/dart_dice_parser/test/dart_dice_parser_test.dart similarity index 100% rename from test/dart_dice_parser_test.dart rename to packages/dart_dice_parser/test/dart_dice_parser_test.dart diff --git a/example/main.dart b/packages/dicecli/bin/dicecli.dart similarity index 100% rename from example/main.dart rename to packages/dicecli/bin/dicecli.dart diff --git a/packages/dicecli/pubspec.yaml b/packages/dicecli/pubspec.yaml new file mode 100644 index 0000000..c94eb31 --- /dev/null +++ b/packages/dicecli/pubspec.yaml @@ -0,0 +1,24 @@ +name: dicecli +description: A CLI tool +version: 8.0.0 +homepage: https://github.com/Adventuresmith/dart-dice-parser +repository: https://github.com/Adventuresmith/dart-dice-parser + +publish_to: none +resolution: workspace + +environment: + sdk: "^3.8.0" + +executables: + dicecli: + +dependencies: + args: ^2.0.0 + dart_dice_parser: + path: ../dart_dice_parser + io: ^1.0.0 + logging: ^1.3.0 + +dev_dependencies: + lint: ^2.8.0 diff --git a/pubspec.yaml b/pubspec.yaml index 824bacc..6999330 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,27 +1,7 @@ -name: dart_dice_parser -description: A dart library for parsing dice notation (`2d6+4`). Supports advantage/disadvantage, exploding die, and other variations. -version: 8.0.0 -homepage: https://github.com/Adventuresmith/dart-dice-parser -repository: https://github.com/Adventuresmith/dart-dice-parser - +name: dart_dice_parser_repo +publish_to: none environment: sdk: "^3.8.0" - -topics: - - dice - - rpg - - ttrpg - -dependencies: - collection: ^1.0.0 - equatable: ^2.0.0 - fast_immutable_collections: ^11.0.0 - logging: ^1.3.0 - petitparser: ^7.0.0 - -dev_dependencies: - args: ^2.0.0 - io: ^1.0.0 - lint: ^2.8.0 - mocktail: ^1.0.0 - test: ^1.26.0 +workspace: + - packages/dart_dice_parser + - packages/dicecli From 9d9c50d395bddbb800ce52fdc12d387ecc4e040f Mon Sep 17 00:00:00 2001 From: Steve Christensen Date: Sat, 5 Jul 2025 23:15:46 -0600 Subject: [PATCH 18/31] fix paths --- .github/workflows/dart.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index eafebb9..a019b58 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -44,9 +44,9 @@ jobs: run: dart analyze --fatal-infos . - name: "VM Tests" - run: dart test --platform vm + run: cd packages/dart_dice_parser && dart test --platform vm - name: "Chrome Tests" - run: dart test --platform chrome + run: cd packages/dart_dice_parser && dart test --platform chrome - name: "Run example/simple.dart" run: cd packages/dart_dice_parser && dart run --enable-asserts example/dart_dice_parser_example.dart - name: "Run dicecli" From 8c24ae6b2402bda9336752ae077c8b73d0fc8356 Mon Sep 17 00:00:00 2001 From: Steve Christensen Date: Sat, 5 Jul 2025 23:17:44 -0600 Subject: [PATCH 19/31] more github actions flailing --- .github/workflows/dart.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index a019b58..3ef93c1 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -47,14 +47,14 @@ jobs: run: cd packages/dart_dice_parser && dart test --platform vm - name: "Chrome Tests" run: cd packages/dart_dice_parser && dart test --platform chrome - - name: "Run example/simple.dart" + - name: "Run example/dart_dice_parser_example.dart" run: cd packages/dart_dice_parser && dart run --enable-asserts example/dart_dice_parser_example.dart - name: "Run dicecli" run: "dart run --enable-asserts dicecli -n 10 -o pretty '(3d6 + 3d6! + 3d6!!) #cs #cf #s #f'" - name: "Collect coverage" run: | - dart pub global activate coverage - dart pub global run coverage:test_with_coverage --branch-coverage + cd packages/dart_dice_parser && dart pub global activate coverage + cd packages/dart_dice_parser && dart pub global run coverage:test_with_coverage --branch-coverage - name: "Upload coverage" uses: codecov/codecov-action@v4 env: From 9bccc51c3d74af1cbb0a97172b5f4a5d0b9dd29c Mon Sep 17 00:00:00 2001 From: Steve Christensen Date: Sat, 5 Jul 2025 23:20:38 -0600 Subject: [PATCH 20/31] more github actions flailing --- .github/workflows/dart.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index 3ef93c1..d1b8744 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -53,8 +53,8 @@ jobs: run: "dart run --enable-asserts dicecli -n 10 -o pretty '(3d6 + 3d6! + 3d6!!) #cs #cf #s #f'" - name: "Collect coverage" run: | - cd packages/dart_dice_parser && dart pub global activate coverage - cd packages/dart_dice_parser && dart pub global run coverage:test_with_coverage --branch-coverage + dart pub global activate coverage -C packages/dart_dice_parser + dart pub global run coverage:test_with_coverage --branch-coverage -C packages/dart_dice_parser - name: "Upload coverage" uses: codecov/codecov-action@v4 env: From aa7ee1a4789127dd132d6a79e1f7e8ad04eb5366 Mon Sep 17 00:00:00 2001 From: Steve Christensen Date: Sat, 5 Jul 2025 23:25:32 -0600 Subject: [PATCH 21/31] make example README.md --- .github/workflows/dart.yml | 4 ++-- packages/dart_dice_parser/example/README.md | 16 ++++++++++++++++ ...dart_dice_parser_example.dart => simple.dart} | 0 3 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 packages/dart_dice_parser/example/README.md rename packages/dart_dice_parser/example/{dart_dice_parser_example.dart => simple.dart} (100%) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index d1b8744..dd6fd81 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -47,8 +47,8 @@ jobs: run: cd packages/dart_dice_parser && dart test --platform vm - name: "Chrome Tests" run: cd packages/dart_dice_parser && dart test --platform chrome - - name: "Run example/dart_dice_parser_example.dart" - run: cd packages/dart_dice_parser && dart run --enable-asserts example/dart_dice_parser_example.dart + - name: "Run example/simple.dart" + run: cd packages/dart_dice_parser && dart run --enable-asserts example/simple.dart - name: "Run dicecli" run: "dart run --enable-asserts dicecli -n 10 -o pretty '(3d6 + 3d6! + 3d6!!) #cs #cf #s #f'" - name: "Collect coverage" diff --git a/packages/dart_dice_parser/example/README.md b/packages/dart_dice_parser/example/README.md new file mode 100644 index 0000000..f63c35c --- /dev/null +++ b/packages/dart_dice_parser/example/README.md @@ -0,0 +1,16 @@ +# dart_dice_parser examples + +## D20 advantage + +```dart +import 'dart:io'; +import 'package:dart_dice_parser/dart_dice_parser.dart'; + + +Future main() async { + final d20adv = DiceExpression.create('2d20 kh'); + + final result1 = d20adv.roll(); + stdout.writeln(result1); +} +``` diff --git a/packages/dart_dice_parser/example/dart_dice_parser_example.dart b/packages/dart_dice_parser/example/simple.dart similarity index 100% rename from packages/dart_dice_parser/example/dart_dice_parser_example.dart rename to packages/dart_dice_parser/example/simple.dart From 3c06d848e0a5df8a3723d4dd81c723ff28cb9426 Mon Sep 17 00:00:00 2001 From: Steve Christensen Date: Sat, 5 Jul 2025 23:28:08 -0600 Subject: [PATCH 22/31] more gha actions --- .github/workflows/dart.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index dd6fd81..e919092 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -53,8 +53,8 @@ jobs: run: "dart run --enable-asserts dicecli -n 10 -o pretty '(3d6 + 3d6! + 3d6!!) #cs #cf #s #f'" - name: "Collect coverage" run: | - dart pub global activate coverage -C packages/dart_dice_parser - dart pub global run coverage:test_with_coverage --branch-coverage -C packages/dart_dice_parser + dart pub global activate coverage + cd packages/dart_dice_parser && dart pub global run coverage:test_with_coverage --branch-coverage - name: "Upload coverage" uses: codecov/codecov-action@v4 env: From c9d5057d872f8574594337c7dd150ff50d1cdb2b Mon Sep 17 00:00:00 2001 From: Steve Christensen Date: Sat, 5 Jul 2025 23:47:47 -0600 Subject: [PATCH 23/31] create diceui via flutter cli --- mise.toml | 1 + packages/diceui/.gitignore | 45 ++ packages/diceui/.metadata | 45 ++ packages/diceui/README.md | 16 + packages/diceui/analysis_options.yaml | 28 + packages/diceui/android/.gitignore | 14 + packages/diceui/android/app/build.gradle.kts | 44 ++ .../android/app/src/debug/AndroidManifest.xml | 7 + .../android/app/src/main/AndroidManifest.xml | 45 ++ .../kotlin/com/example/diceui/MainActivity.kt | 5 + .../res/drawable-v21/launch_background.xml | 12 + .../main/res/drawable/launch_background.xml | 12 + .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 544 bytes .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 442 bytes .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 721 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 1031 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 1443 bytes .../app/src/main/res/values-night/styles.xml | 18 + .../app/src/main/res/values/styles.xml | 18 + .../app/src/profile/AndroidManifest.xml | 7 + packages/diceui/android/build.gradle.kts | 21 + packages/diceui/android/gradle.properties | 3 + .../gradle/wrapper/gradle-wrapper.properties | 5 + packages/diceui/android/settings.gradle.kts | 25 + packages/diceui/ios/.gitignore | 34 + .../diceui/ios/Flutter/AppFrameworkInfo.plist | 26 + packages/diceui/ios/Flutter/Debug.xcconfig | 1 + packages/diceui/ios/Flutter/Release.xcconfig | 1 + .../ios/Runner.xcodeproj/project.pbxproj | 616 +++++++++++++++ .../contents.xcworkspacedata | 7 + .../xcshareddata/IDEWorkspaceChecks.plist | 8 + .../xcshareddata/WorkspaceSettings.xcsettings | 8 + .../xcshareddata/xcschemes/Runner.xcscheme | 101 +++ .../contents.xcworkspacedata | 7 + .../xcshareddata/IDEWorkspaceChecks.plist | 8 + .../xcshareddata/WorkspaceSettings.xcsettings | 8 + packages/diceui/ios/Runner/AppDelegate.swift | 13 + .../AppIcon.appiconset/Contents.json | 122 +++ .../Icon-App-1024x1024@1x.png | Bin 0 -> 10932 bytes .../AppIcon.appiconset/Icon-App-20x20@1x.png | Bin 0 -> 295 bytes .../AppIcon.appiconset/Icon-App-20x20@2x.png | Bin 0 -> 406 bytes .../AppIcon.appiconset/Icon-App-20x20@3x.png | Bin 0 -> 450 bytes .../AppIcon.appiconset/Icon-App-29x29@1x.png | Bin 0 -> 282 bytes .../AppIcon.appiconset/Icon-App-29x29@2x.png | Bin 0 -> 462 bytes .../AppIcon.appiconset/Icon-App-29x29@3x.png | Bin 0 -> 704 bytes .../AppIcon.appiconset/Icon-App-40x40@1x.png | Bin 0 -> 406 bytes .../AppIcon.appiconset/Icon-App-40x40@2x.png | Bin 0 -> 586 bytes .../AppIcon.appiconset/Icon-App-40x40@3x.png | Bin 0 -> 862 bytes .../AppIcon.appiconset/Icon-App-60x60@2x.png | Bin 0 -> 862 bytes .../AppIcon.appiconset/Icon-App-60x60@3x.png | Bin 0 -> 1674 bytes .../AppIcon.appiconset/Icon-App-76x76@1x.png | Bin 0 -> 762 bytes .../AppIcon.appiconset/Icon-App-76x76@2x.png | Bin 0 -> 1226 bytes .../Icon-App-83.5x83.5@2x.png | Bin 0 -> 1418 bytes .../LaunchImage.imageset/Contents.json | 23 + .../LaunchImage.imageset/LaunchImage.png | Bin 0 -> 68 bytes .../LaunchImage.imageset/LaunchImage@2x.png | Bin 0 -> 68 bytes .../LaunchImage.imageset/LaunchImage@3x.png | Bin 0 -> 68 bytes .../LaunchImage.imageset/README.md | 5 + .../Runner/Base.lproj/LaunchScreen.storyboard | 37 + .../ios/Runner/Base.lproj/Main.storyboard | 26 + packages/diceui/ios/Runner/Info.plist | 49 ++ .../ios/Runner/Runner-Bridging-Header.h | 1 + .../diceui/ios/RunnerTests/RunnerTests.swift | 12 + packages/diceui/lib/main.dart | 122 +++ packages/diceui/linux/.gitignore | 1 + packages/diceui/linux/CMakeLists.txt | 128 ++++ packages/diceui/linux/flutter/CMakeLists.txt | 88 +++ .../flutter/generated_plugin_registrant.cc | 11 + .../flutter/generated_plugin_registrant.h | 15 + .../linux/flutter/generated_plugins.cmake | 23 + packages/diceui/linux/runner/CMakeLists.txt | 26 + packages/diceui/linux/runner/main.cc | 6 + .../diceui/linux/runner/my_application.cc | 130 ++++ packages/diceui/linux/runner/my_application.h | 18 + packages/diceui/macos/.gitignore | 7 + .../macos/Flutter/Flutter-Debug.xcconfig | 1 + .../macos/Flutter/Flutter-Release.xcconfig | 1 + .../Flutter/GeneratedPluginRegistrant.swift | 10 + .../macos/Runner.xcodeproj/project.pbxproj | 705 ++++++++++++++++++ .../xcshareddata/IDEWorkspaceChecks.plist | 8 + .../xcshareddata/xcschemes/Runner.xcscheme | 99 +++ .../contents.xcworkspacedata | 7 + .../xcshareddata/IDEWorkspaceChecks.plist | 8 + .../diceui/macos/Runner/AppDelegate.swift | 13 + .../AppIcon.appiconset/Contents.json | 68 ++ .../AppIcon.appiconset/app_icon_1024.png | Bin 0 -> 102994 bytes .../AppIcon.appiconset/app_icon_128.png | Bin 0 -> 5680 bytes .../AppIcon.appiconset/app_icon_16.png | Bin 0 -> 520 bytes .../AppIcon.appiconset/app_icon_256.png | Bin 0 -> 14142 bytes .../AppIcon.appiconset/app_icon_32.png | Bin 0 -> 1066 bytes .../AppIcon.appiconset/app_icon_512.png | Bin 0 -> 36406 bytes .../AppIcon.appiconset/app_icon_64.png | Bin 0 -> 2218 bytes .../macos/Runner/Base.lproj/MainMenu.xib | 343 +++++++++ .../macos/Runner/Configs/AppInfo.xcconfig | 14 + .../macos/Runner/Configs/Debug.xcconfig | 2 + .../macos/Runner/Configs/Release.xcconfig | 2 + .../macos/Runner/Configs/Warnings.xcconfig | 13 + .../macos/Runner/DebugProfile.entitlements | 12 + packages/diceui/macos/Runner/Info.plist | 32 + .../macos/Runner/MainFlutterWindow.swift | 15 + .../diceui/macos/Runner/Release.entitlements | 8 + .../macos/RunnerTests/RunnerTests.swift | 12 + packages/diceui/pubspec.yaml | 91 +++ packages/diceui/test/widget_test.dart | 30 + packages/diceui/web/favicon.png | Bin 0 -> 917 bytes packages/diceui/web/icons/Icon-192.png | Bin 0 -> 5292 bytes packages/diceui/web/icons/Icon-512.png | Bin 0 -> 8252 bytes .../diceui/web/icons/Icon-maskable-192.png | Bin 0 -> 5594 bytes .../diceui/web/icons/Icon-maskable-512.png | Bin 0 -> 20998 bytes packages/diceui/web/index.html | 38 + packages/diceui/web/manifest.json | 35 + packages/diceui/windows/.gitignore | 17 + packages/diceui/windows/CMakeLists.txt | 108 +++ .../diceui/windows/flutter/CMakeLists.txt | 109 +++ .../flutter/generated_plugin_registrant.cc | 11 + .../flutter/generated_plugin_registrant.h | 15 + .../windows/flutter/generated_plugins.cmake | 23 + packages/diceui/windows/runner/CMakeLists.txt | 40 + packages/diceui/windows/runner/Runner.rc | 121 +++ .../diceui/windows/runner/flutter_window.cpp | 71 ++ .../diceui/windows/runner/flutter_window.h | 33 + packages/diceui/windows/runner/main.cpp | 43 ++ packages/diceui/windows/runner/resource.h | 16 + .../windows/runner/resources/app_icon.ico | Bin 0 -> 33772 bytes .../diceui/windows/runner/runner.exe.manifest | 14 + packages/diceui/windows/runner/utils.cpp | 65 ++ packages/diceui/windows/runner/utils.h | 19 + .../diceui/windows/runner/win32_window.cpp | 288 +++++++ packages/diceui/windows/runner/win32_window.h | 102 +++ 129 files changed, 4721 insertions(+) create mode 100644 packages/diceui/.gitignore create mode 100644 packages/diceui/.metadata create mode 100644 packages/diceui/README.md create mode 100644 packages/diceui/analysis_options.yaml create mode 100644 packages/diceui/android/.gitignore create mode 100644 packages/diceui/android/app/build.gradle.kts create mode 100644 packages/diceui/android/app/src/debug/AndroidManifest.xml create mode 100644 packages/diceui/android/app/src/main/AndroidManifest.xml create mode 100644 packages/diceui/android/app/src/main/kotlin/com/example/diceui/MainActivity.kt create mode 100644 packages/diceui/android/app/src/main/res/drawable-v21/launch_background.xml create mode 100644 packages/diceui/android/app/src/main/res/drawable/launch_background.xml create mode 100644 packages/diceui/android/app/src/main/res/mipmap-hdpi/ic_launcher.png create mode 100644 packages/diceui/android/app/src/main/res/mipmap-mdpi/ic_launcher.png create mode 100644 packages/diceui/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png create mode 100644 packages/diceui/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png create mode 100644 packages/diceui/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png create mode 100644 packages/diceui/android/app/src/main/res/values-night/styles.xml create mode 100644 packages/diceui/android/app/src/main/res/values/styles.xml create mode 100644 packages/diceui/android/app/src/profile/AndroidManifest.xml create mode 100644 packages/diceui/android/build.gradle.kts create mode 100644 packages/diceui/android/gradle.properties create mode 100644 packages/diceui/android/gradle/wrapper/gradle-wrapper.properties create mode 100644 packages/diceui/android/settings.gradle.kts create mode 100644 packages/diceui/ios/.gitignore create mode 100644 packages/diceui/ios/Flutter/AppFrameworkInfo.plist create mode 100644 packages/diceui/ios/Flutter/Debug.xcconfig create mode 100644 packages/diceui/ios/Flutter/Release.xcconfig create mode 100644 packages/diceui/ios/Runner.xcodeproj/project.pbxproj create mode 100644 packages/diceui/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata create mode 100644 packages/diceui/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 packages/diceui/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings create mode 100644 packages/diceui/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme create mode 100644 packages/diceui/ios/Runner.xcworkspace/contents.xcworkspacedata create mode 100644 packages/diceui/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 packages/diceui/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings create mode 100644 packages/diceui/ios/Runner/AppDelegate.swift create mode 100644 packages/diceui/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json create mode 100644 packages/diceui/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png create mode 100644 packages/diceui/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png create mode 100644 packages/diceui/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png create mode 100644 packages/diceui/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png create mode 100644 packages/diceui/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png create mode 100644 packages/diceui/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png create mode 100644 packages/diceui/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png create mode 100644 packages/diceui/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png create mode 100644 packages/diceui/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png create mode 100644 packages/diceui/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png create mode 100644 packages/diceui/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png create mode 100644 packages/diceui/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png create mode 100644 packages/diceui/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png create mode 100644 packages/diceui/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png create mode 100644 packages/diceui/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png create mode 100644 packages/diceui/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json create mode 100644 packages/diceui/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png create mode 100644 packages/diceui/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png create mode 100644 packages/diceui/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png create mode 100644 packages/diceui/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md create mode 100644 packages/diceui/ios/Runner/Base.lproj/LaunchScreen.storyboard create mode 100644 packages/diceui/ios/Runner/Base.lproj/Main.storyboard create mode 100644 packages/diceui/ios/Runner/Info.plist create mode 100644 packages/diceui/ios/Runner/Runner-Bridging-Header.h create mode 100644 packages/diceui/ios/RunnerTests/RunnerTests.swift create mode 100644 packages/diceui/lib/main.dart create mode 100644 packages/diceui/linux/.gitignore create mode 100644 packages/diceui/linux/CMakeLists.txt create mode 100644 packages/diceui/linux/flutter/CMakeLists.txt create mode 100644 packages/diceui/linux/flutter/generated_plugin_registrant.cc create mode 100644 packages/diceui/linux/flutter/generated_plugin_registrant.h create mode 100644 packages/diceui/linux/flutter/generated_plugins.cmake create mode 100644 packages/diceui/linux/runner/CMakeLists.txt create mode 100644 packages/diceui/linux/runner/main.cc create mode 100644 packages/diceui/linux/runner/my_application.cc create mode 100644 packages/diceui/linux/runner/my_application.h create mode 100644 packages/diceui/macos/.gitignore create mode 100644 packages/diceui/macos/Flutter/Flutter-Debug.xcconfig create mode 100644 packages/diceui/macos/Flutter/Flutter-Release.xcconfig create mode 100644 packages/diceui/macos/Flutter/GeneratedPluginRegistrant.swift create mode 100644 packages/diceui/macos/Runner.xcodeproj/project.pbxproj create mode 100644 packages/diceui/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 packages/diceui/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme create mode 100644 packages/diceui/macos/Runner.xcworkspace/contents.xcworkspacedata create mode 100644 packages/diceui/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 packages/diceui/macos/Runner/AppDelegate.swift create mode 100644 packages/diceui/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json create mode 100644 packages/diceui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png create mode 100644 packages/diceui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png create mode 100644 packages/diceui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png create mode 100644 packages/diceui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png create mode 100644 packages/diceui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png create mode 100644 packages/diceui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png create mode 100644 packages/diceui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png create mode 100644 packages/diceui/macos/Runner/Base.lproj/MainMenu.xib create mode 100644 packages/diceui/macos/Runner/Configs/AppInfo.xcconfig create mode 100644 packages/diceui/macos/Runner/Configs/Debug.xcconfig create mode 100644 packages/diceui/macos/Runner/Configs/Release.xcconfig create mode 100644 packages/diceui/macos/Runner/Configs/Warnings.xcconfig create mode 100644 packages/diceui/macos/Runner/DebugProfile.entitlements create mode 100644 packages/diceui/macos/Runner/Info.plist create mode 100644 packages/diceui/macos/Runner/MainFlutterWindow.swift create mode 100644 packages/diceui/macos/Runner/Release.entitlements create mode 100644 packages/diceui/macos/RunnerTests/RunnerTests.swift create mode 100644 packages/diceui/pubspec.yaml create mode 100644 packages/diceui/test/widget_test.dart create mode 100644 packages/diceui/web/favicon.png create mode 100644 packages/diceui/web/icons/Icon-192.png create mode 100644 packages/diceui/web/icons/Icon-512.png create mode 100644 packages/diceui/web/icons/Icon-maskable-192.png create mode 100644 packages/diceui/web/icons/Icon-maskable-512.png create mode 100644 packages/diceui/web/index.html create mode 100644 packages/diceui/web/manifest.json create mode 100644 packages/diceui/windows/.gitignore create mode 100644 packages/diceui/windows/CMakeLists.txt create mode 100644 packages/diceui/windows/flutter/CMakeLists.txt create mode 100644 packages/diceui/windows/flutter/generated_plugin_registrant.cc create mode 100644 packages/diceui/windows/flutter/generated_plugin_registrant.h create mode 100644 packages/diceui/windows/flutter/generated_plugins.cmake create mode 100644 packages/diceui/windows/runner/CMakeLists.txt create mode 100644 packages/diceui/windows/runner/Runner.rc create mode 100644 packages/diceui/windows/runner/flutter_window.cpp create mode 100644 packages/diceui/windows/runner/flutter_window.h create mode 100644 packages/diceui/windows/runner/main.cpp create mode 100644 packages/diceui/windows/runner/resource.h create mode 100644 packages/diceui/windows/runner/resources/app_icon.ico create mode 100644 packages/diceui/windows/runner/runner.exe.manifest create mode 100644 packages/diceui/windows/runner/utils.cpp create mode 100644 packages/diceui/windows/runner/utils.h create mode 100644 packages/diceui/windows/runner/win32_window.cpp create mode 100644 packages/diceui/windows/runner/win32_window.h diff --git a/mise.toml b/mise.toml index 3392434..b252394 100644 --- a/mise.toml +++ b/mise.toml @@ -1,2 +1,3 @@ [tools] dart = "3" +flutter = "3" diff --git a/packages/diceui/.gitignore b/packages/diceui/.gitignore new file mode 100644 index 0000000..79c113f --- /dev/null +++ b/packages/diceui/.gitignore @@ -0,0 +1,45 @@ +# Miscellaneous +*.class +*.log +*.pyc +*.swp +.DS_Store +.atom/ +.build/ +.buildlog/ +.history +.svn/ +.swiftpm/ +migrate_working_dir/ + +# IntelliJ related +*.iml +*.ipr +*.iws +.idea/ + +# The .vscode folder contains launch configuration and tasks you configure in +# VS Code which you may wish to be included in version control, so this line +# is commented out by default. +#.vscode/ + +# Flutter/Dart/Pub related +**/doc/api/ +**/ios/Flutter/.last_build_id +.dart_tool/ +.flutter-plugins +.flutter-plugins-dependencies +.pub-cache/ +.pub/ +/build/ + +# Symbolication related +app.*.symbols + +# Obfuscation related +app.*.map.json + +# Android Studio will place build artifacts here +/android/app/debug +/android/app/profile +/android/app/release diff --git a/packages/diceui/.metadata b/packages/diceui/.metadata new file mode 100644 index 0000000..fdb4416 --- /dev/null +++ b/packages/diceui/.metadata @@ -0,0 +1,45 @@ +# This file tracks properties of this Flutter project. +# Used by Flutter tool to assess capabilities and perform upgrades etc. +# +# This file should be version controlled and should not be manually edited. + +version: + revision: "fcf2c11572af6f390246c056bc905eca609533a0" + channel: "stable" + +project_type: app + +# Tracks metadata for the flutter migrate command +migration: + platforms: + - platform: root + create_revision: fcf2c11572af6f390246c056bc905eca609533a0 + base_revision: fcf2c11572af6f390246c056bc905eca609533a0 + - platform: android + create_revision: fcf2c11572af6f390246c056bc905eca609533a0 + base_revision: fcf2c11572af6f390246c056bc905eca609533a0 + - platform: ios + create_revision: fcf2c11572af6f390246c056bc905eca609533a0 + base_revision: fcf2c11572af6f390246c056bc905eca609533a0 + - platform: linux + create_revision: fcf2c11572af6f390246c056bc905eca609533a0 + base_revision: fcf2c11572af6f390246c056bc905eca609533a0 + - platform: macos + create_revision: fcf2c11572af6f390246c056bc905eca609533a0 + base_revision: fcf2c11572af6f390246c056bc905eca609533a0 + - platform: web + create_revision: fcf2c11572af6f390246c056bc905eca609533a0 + base_revision: fcf2c11572af6f390246c056bc905eca609533a0 + - platform: windows + create_revision: fcf2c11572af6f390246c056bc905eca609533a0 + base_revision: fcf2c11572af6f390246c056bc905eca609533a0 + + # User provided section + + # List of Local paths (relative to this file) that should be + # ignored by the migrate tool. + # + # Files that are not part of the templates will be ignored by default. + unmanaged_files: + - 'lib/main.dart' + - 'ios/Runner.xcodeproj/project.pbxproj' diff --git a/packages/diceui/README.md b/packages/diceui/README.md new file mode 100644 index 0000000..e813d48 --- /dev/null +++ b/packages/diceui/README.md @@ -0,0 +1,16 @@ +# diceui + +A new Flutter project. + +## Getting Started + +This project is a starting point for a Flutter application. + +A few resources to get you started if this is your first Flutter project: + +- [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab) +- [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook) + +For help getting started with Flutter development, view the +[online documentation](https://docs.flutter.dev/), which offers tutorials, +samples, guidance on mobile development, and a full API reference. diff --git a/packages/diceui/analysis_options.yaml b/packages/diceui/analysis_options.yaml new file mode 100644 index 0000000..0d29021 --- /dev/null +++ b/packages/diceui/analysis_options.yaml @@ -0,0 +1,28 @@ +# This file configures the analyzer, which statically analyzes Dart code to +# check for errors, warnings, and lints. +# +# The issues identified by the analyzer are surfaced in the UI of Dart-enabled +# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be +# invoked from the command line by running `flutter analyze`. + +# The following line activates a set of recommended lints for Flutter apps, +# packages, and plugins designed to encourage good coding practices. +include: package:flutter_lints/flutter.yaml + +linter: + # The lint rules applied to this project can be customized in the + # section below to disable rules from the `package:flutter_lints/flutter.yaml` + # included above or to enable additional rules. A list of all available lints + # and their documentation is published at https://dart.dev/lints. + # + # Instead of disabling a lint rule for the entire project in the + # section below, it can also be suppressed for a single line of code + # or a specific dart file by using the `// ignore: name_of_lint` and + # `// ignore_for_file: name_of_lint` syntax on the line or in the file + # producing the lint. + rules: + # avoid_print: false # Uncomment to disable the `avoid_print` rule + # prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule + +# Additional information about this file can be found at +# https://dart.dev/guides/language/analysis-options diff --git a/packages/diceui/android/.gitignore b/packages/diceui/android/.gitignore new file mode 100644 index 0000000..be3943c --- /dev/null +++ b/packages/diceui/android/.gitignore @@ -0,0 +1,14 @@ +gradle-wrapper.jar +/.gradle +/captures/ +/gradlew +/gradlew.bat +/local.properties +GeneratedPluginRegistrant.java +.cxx/ + +# Remember to never publicly share your keystore. +# See https://flutter.dev/to/reference-keystore +key.properties +**/*.keystore +**/*.jks diff --git a/packages/diceui/android/app/build.gradle.kts b/packages/diceui/android/app/build.gradle.kts new file mode 100644 index 0000000..9f50570 --- /dev/null +++ b/packages/diceui/android/app/build.gradle.kts @@ -0,0 +1,44 @@ +plugins { + id("com.android.application") + id("kotlin-android") + // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. + id("dev.flutter.flutter-gradle-plugin") +} + +android { + namespace = "com.example.diceui" + compileSdk = flutter.compileSdkVersion + ndkVersion = flutter.ndkVersion + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 + } + + kotlinOptions { + jvmTarget = JavaVersion.VERSION_11.toString() + } + + defaultConfig { + // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). + applicationId = "com.example.diceui" + // You can update the following values to match your application needs. + // For more information, see: https://flutter.dev/to/review-gradle-config. + minSdk = flutter.minSdkVersion + targetSdk = flutter.targetSdkVersion + versionCode = flutter.versionCode + versionName = flutter.versionName + } + + buildTypes { + release { + // TODO: Add your own signing config for the release build. + // Signing with the debug keys for now, so `flutter run --release` works. + signingConfig = signingConfigs.getByName("debug") + } + } +} + +flutter { + source = "../.." +} diff --git a/packages/diceui/android/app/src/debug/AndroidManifest.xml b/packages/diceui/android/app/src/debug/AndroidManifest.xml new file mode 100644 index 0000000..399f698 --- /dev/null +++ b/packages/diceui/android/app/src/debug/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/packages/diceui/android/app/src/main/AndroidManifest.xml b/packages/diceui/android/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..0005d06 --- /dev/null +++ b/packages/diceui/android/app/src/main/AndroidManifest.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/diceui/android/app/src/main/kotlin/com/example/diceui/MainActivity.kt b/packages/diceui/android/app/src/main/kotlin/com/example/diceui/MainActivity.kt new file mode 100644 index 0000000..589a7bd --- /dev/null +++ b/packages/diceui/android/app/src/main/kotlin/com/example/diceui/MainActivity.kt @@ -0,0 +1,5 @@ +package com.example.diceui + +import io.flutter.embedding.android.FlutterActivity + +class MainActivity : FlutterActivity() diff --git a/packages/diceui/android/app/src/main/res/drawable-v21/launch_background.xml b/packages/diceui/android/app/src/main/res/drawable-v21/launch_background.xml new file mode 100644 index 0000000..f74085f --- /dev/null +++ b/packages/diceui/android/app/src/main/res/drawable-v21/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/packages/diceui/android/app/src/main/res/drawable/launch_background.xml b/packages/diceui/android/app/src/main/res/drawable/launch_background.xml new file mode 100644 index 0000000..304732f --- /dev/null +++ b/packages/diceui/android/app/src/main/res/drawable/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/packages/diceui/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/packages/diceui/android/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..db77bb4b7b0906d62b1847e87f15cdcacf6a4f29 GIT binary patch literal 544 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`olAj~WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2!h8bpbvhu0Wd6uZuB!w&u2PAxD2eNXD>P5D~Wn-+_Wa#27Xc zC?Zj|6r#X(-D3u$NCt}(Ms06KgJ4FxJVv{GM)!I~&n8Bnc94O7-Hd)cjDZswgC;Qs zO=b+9!WcT8F?0rF7!Uys2bs@gozCP?z~o%U|N3vA*22NaGQG zlg@K`O_XuxvZ&Ks^m&R!`&1=spLvfx7oGDKDwpwW`#iqdw@AL`7MR}m`rwr|mZgU`8P7SBkL78fFf!WnuYWm$5Z0 zNXhDbCv&49sM544K|?c)WrFfiZvCi9h0O)B3Pgg&ebxsLQ05GG~ AQ2+n{ literal 0 HcmV?d00001 diff --git a/packages/diceui/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/packages/diceui/android/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..17987b79bb8a35cc66c3c1fd44f5a5526c1b78be GIT binary patch literal 442 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5Xx&nMcT!A!W`0S9QKQy;}1Cl^CgaH=;G9cpY;r$Q>i*pfB zP2drbID<_#qf;rPZx^FqH)F_D#*k@@q03KywUtLX8Ua?`H+NMzkczFPK3lFz@i_kW%1NOn0|D2I9n9wzH8m|-tHjsw|9>@K=iMBhxvkv6m8Y-l zytQ?X=U+MF$@3 zt`~i=@j|6y)RWMK--}M|=T`o&^Ni>IoWKHEbBXz7?A@mgWoL>!*SXo`SZH-*HSdS+ yn*9;$7;m`l>wYBC5bq;=U}IMqLzqbYCidGC!)_gkIk_C@Uy!y&wkt5C($~2D>~)O*cj@FGjOCM)M>_ixfudOh)?xMu#Fs z#}Y=@YDTwOM)x{K_j*Q;dPdJ?Mz0n|pLRx{4n|)f>SXlmV)XB04CrSJn#dS5nK2lM zrZ9#~WelCp7&e13Y$jvaEXHskn$2V!!DN-nWS__6T*l;H&Fopn?A6HZ-6WRLFP=R` zqG+CE#d4|IbyAI+rJJ`&x9*T`+a=p|0O(+s{UBcyZdkhj=yS1>AirP+0R;mf2uMgM zC}@~JfByORAh4SyRgi&!(cja>F(l*O+nd+@4m$|6K6KDn_&uvCpV23&>G9HJp{xgg zoq1^2_p9@|WEo z*X_Uko@K)qYYv~>43eQGMdbiGbo>E~Q& zrYBH{QP^@Sti!`2)uG{irBBq@y*$B zi#&(U-*=fp74j)RyIw49+0MRPMRU)+a2r*PJ$L5roHt2$UjExCTZSbq%V!HeS7J$N zdG@vOZB4v_lF7Plrx+hxo7(fCV&}fHq)$ literal 0 HcmV?d00001 diff --git a/packages/diceui/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/packages/diceui/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..d5f1c8d34e7a88e3f88bea192c3a370d44689c3c GIT binary patch literal 1031 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q8Ax83A=Cw=BuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrIztFa`(sgt!6~Yi|1%a`XoT0ojZ}lNrNjb9xjc(B0U1_% zz5^97Xt*%oq$rQy4?0GKNfJ44uvxI)gC`h-NZ|&0-7(qS@?b!5r36oQ}zyZrNO3 zMO=Or+<~>+A&uN&E!^Sl+>xE!QC-|oJv`ApDhqC^EWD|@=#J`=d#Xzxs4ah}w&Jnc z$|q_opQ^2TrnVZ0o~wh<3t%W&flvYGe#$xqda2bR_R zvPYgMcHgjZ5nSA^lJr%;<&0do;O^tDDh~=pIxA#coaCY>&N%M2^tq^U%3DB@ynvKo}b?yu-bFc-u0JHzced$sg7S3zqI(2 z#Km{dPr7I=pQ5>FuK#)QwK?Y`E`B?nP+}U)I#c1+FM*1kNvWG|a(TpksZQ3B@sD~b zpQ2)*V*TdwjFOtHvV|;OsiDqHi=6%)o4b!)x$)%9pGTsE z-JL={-Ffv+T87W(Xpooq<`r*VzWQcgBN$$`u}f>-ZQI1BB8ykN*=e4rIsJx9>z}*o zo~|9I;xof literal 0 HcmV?d00001 diff --git a/packages/diceui/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/packages/diceui/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..4d6372eebdb28e45604e46eeda8dd24651419bc0 GIT binary patch literal 1443 zcmb`G{WsKk6vsdJTdFg%tJav9_E4vzrOaqkWF|A724Nly!y+?N9`YV6wZ}5(X(D_N(?!*n3`|_r0Hc?=PQw&*vnU?QTFY zB_MsH|!j$PP;I}?dppoE_gA(4uc!jV&0!l7_;&p2^pxNo>PEcNJv za5_RT$o2Mf!<+r?&EbHH6nMoTsDOa;mN(wv8RNsHpG)`^ymG-S5By8=l9iVXzN_eG%Xg2@Xeq76tTZ*dGh~Lo9vl;Zfs+W#BydUw zCkZ$o1LqWQO$FC9aKlLl*7x9^0q%0}$OMlp@Kk_jHXOjofdePND+j!A{q!8~Jn+s3 z?~~w@4?egS02}8NuulUA=L~QQfm;MzCGd)XhiftT;+zFO&JVyp2mBww?;QByS_1w! zrQlx%{^cMj0|Bo1FjwY@Q8?Hx0cIPF*@-ZRFpPc#bBw{5@tD(5%sClzIfl8WU~V#u zm5Q;_F!wa$BSpqhN>W@2De?TKWR*!ujY;Yylk_X5#~V!L*Gw~;$%4Q8~Mad z@`-kG?yb$a9cHIApZDVZ^U6Xkp<*4rU82O7%}0jjHlK{id@?-wpN*fCHXyXh(bLt* zPc}H-x0e4E&nQ>y%B-(EL=9}RyC%MyX=upHuFhAk&MLbsF0LP-q`XnH78@fT+pKPW zu72MW`|?8ht^tz$iC}ZwLp4tB;Q49K!QCF3@!iB1qOI=?w z7In!}F~ij(18UYUjnbmC!qKhPo%24?8U1x{7o(+?^Zu0Hx81|FuS?bJ0jgBhEMzf< zCgUq7r2OCB(`XkKcN-TL>u5y#dD6D!)5W?`O5)V^>jb)P)GBdy%t$uUMpf$SNV31$ zb||OojAbvMP?T@$h_ZiFLFVHDmbyMhJF|-_)HX3%m=CDI+ID$0^C>kzxprBW)hw(v zr!Gmda);ICoQyhV_oP5+C%?jcG8v+D@9f?Dk*!BxY}dazmrT@64UrP3hlslANK)bq z$67n83eh}OeW&SV@HG95P|bjfqJ7gw$e+`Hxo!4cx`jdK1bJ>YDSpGKLPZ^1cv$ek zIB?0S<#tX?SJCLWdMd{-ME?$hc7A$zBOdIJ)4!KcAwb=VMov)nK;9z>x~rfT1>dS+ zZ6#`2v@`jgbqq)P22H)Tx2CpmM^o1$B+xT6`(v%5xJ(?j#>Q$+rx_R|7TzDZe{J6q zG1*EcU%tE?!kO%^M;3aM6JN*LAKUVb^xz8-Pxo#jR5(-KBeLJvA@-gxNHx0M-ZJLl z;#JwQoh~9V?`UVo#}{6ka@II>++D@%KqGpMdlQ}?9E*wFcf5(#XQnP$Dk5~%iX^>f z%$y;?M0BLp{O3a(-4A?ewryHrrD%cx#Q^%KY1H zNre$ve+vceSLZcNY4U(RBX&)oZn*Py()h)XkE?PL$!bNb{N5FVI2Y%LKEm%yvpyTP z(1P?z~7YxD~Rf<(a@_y` literal 0 HcmV?d00001 diff --git a/packages/diceui/android/app/src/main/res/values-night/styles.xml b/packages/diceui/android/app/src/main/res/values-night/styles.xml new file mode 100644 index 0000000..06952be --- /dev/null +++ b/packages/diceui/android/app/src/main/res/values-night/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/packages/diceui/android/app/src/main/res/values/styles.xml b/packages/diceui/android/app/src/main/res/values/styles.xml new file mode 100644 index 0000000..cb1ef88 --- /dev/null +++ b/packages/diceui/android/app/src/main/res/values/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/packages/diceui/android/app/src/profile/AndroidManifest.xml b/packages/diceui/android/app/src/profile/AndroidManifest.xml new file mode 100644 index 0000000..399f698 --- /dev/null +++ b/packages/diceui/android/app/src/profile/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/packages/diceui/android/build.gradle.kts b/packages/diceui/android/build.gradle.kts new file mode 100644 index 0000000..89176ef --- /dev/null +++ b/packages/diceui/android/build.gradle.kts @@ -0,0 +1,21 @@ +allprojects { + repositories { + google() + mavenCentral() + } +} + +val newBuildDir: Directory = rootProject.layout.buildDirectory.dir("../../build").get() +rootProject.layout.buildDirectory.value(newBuildDir) + +subprojects { + val newSubprojectBuildDir: Directory = newBuildDir.dir(project.name) + project.layout.buildDirectory.value(newSubprojectBuildDir) +} +subprojects { + project.evaluationDependsOn(":app") +} + +tasks.register("clean") { + delete(rootProject.layout.buildDirectory) +} diff --git a/packages/diceui/android/gradle.properties b/packages/diceui/android/gradle.properties new file mode 100644 index 0000000..f018a61 --- /dev/null +++ b/packages/diceui/android/gradle.properties @@ -0,0 +1,3 @@ +org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError +android.useAndroidX=true +android.enableJetifier=true diff --git a/packages/diceui/android/gradle/wrapper/gradle-wrapper.properties b/packages/diceui/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..ac3b479 --- /dev/null +++ b/packages/diceui/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip diff --git a/packages/diceui/android/settings.gradle.kts b/packages/diceui/android/settings.gradle.kts new file mode 100644 index 0000000..ab39a10 --- /dev/null +++ b/packages/diceui/android/settings.gradle.kts @@ -0,0 +1,25 @@ +pluginManagement { + val flutterSdkPath = run { + val properties = java.util.Properties() + file("local.properties").inputStream().use { properties.load(it) } + val flutterSdkPath = properties.getProperty("flutter.sdk") + require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" } + flutterSdkPath + } + + includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") + + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} + +plugins { + id("dev.flutter.flutter-plugin-loader") version "1.0.0" + id("com.android.application") version "8.7.3" apply false + id("org.jetbrains.kotlin.android") version "2.1.0" apply false +} + +include(":app") diff --git a/packages/diceui/ios/.gitignore b/packages/diceui/ios/.gitignore new file mode 100644 index 0000000..7a7f987 --- /dev/null +++ b/packages/diceui/ios/.gitignore @@ -0,0 +1,34 @@ +**/dgph +*.mode1v3 +*.mode2v3 +*.moved-aside +*.pbxuser +*.perspectivev3 +**/*sync/ +.sconsign.dblite +.tags* +**/.vagrant/ +**/DerivedData/ +Icon? +**/Pods/ +**/.symlinks/ +profile +xcuserdata +**/.generated/ +Flutter/App.framework +Flutter/Flutter.framework +Flutter/Flutter.podspec +Flutter/Generated.xcconfig +Flutter/ephemeral/ +Flutter/app.flx +Flutter/app.zip +Flutter/flutter_assets/ +Flutter/flutter_export_environment.sh +ServiceDefinitions.json +Runner/GeneratedPluginRegistrant.* + +# Exceptions to above rules. +!default.mode1v3 +!default.mode2v3 +!default.pbxuser +!default.perspectivev3 diff --git a/packages/diceui/ios/Flutter/AppFrameworkInfo.plist b/packages/diceui/ios/Flutter/AppFrameworkInfo.plist new file mode 100644 index 0000000..7c56964 --- /dev/null +++ b/packages/diceui/ios/Flutter/AppFrameworkInfo.plist @@ -0,0 +1,26 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + App + CFBundleIdentifier + io.flutter.flutter.app + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + App + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1.0 + MinimumOSVersion + 12.0 + + diff --git a/packages/diceui/ios/Flutter/Debug.xcconfig b/packages/diceui/ios/Flutter/Debug.xcconfig new file mode 100644 index 0000000..592ceee --- /dev/null +++ b/packages/diceui/ios/Flutter/Debug.xcconfig @@ -0,0 +1 @@ +#include "Generated.xcconfig" diff --git a/packages/diceui/ios/Flutter/Release.xcconfig b/packages/diceui/ios/Flutter/Release.xcconfig new file mode 100644 index 0000000..592ceee --- /dev/null +++ b/packages/diceui/ios/Flutter/Release.xcconfig @@ -0,0 +1 @@ +#include "Generated.xcconfig" diff --git a/packages/diceui/ios/Runner.xcodeproj/project.pbxproj b/packages/diceui/ios/Runner.xcodeproj/project.pbxproj new file mode 100644 index 0000000..51284f4 --- /dev/null +++ b/packages/diceui/ios/Runner.xcodeproj/project.pbxproj @@ -0,0 +1,616 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 54; + objects = { + +/* Begin PBXBuildFile section */ + 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; + 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; }; + 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; + 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; + 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; + 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; + 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 331C8085294A63A400263BE5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 97C146E61CF9000F007C117D /* Project object */; + proxyType = 1; + remoteGlobalIDString = 97C146ED1CF9000F007C117D; + remoteInfo = Runner; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 9705A1C41CF9048500538489 /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; + 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; + 331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; + 331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; + 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; + 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; + 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; + 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; + 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; + 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 97C146EB1CF9000F007C117D /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 331C8082294A63A400263BE5 /* RunnerTests */ = { + isa = PBXGroup; + children = ( + 331C807B294A618700263BE5 /* RunnerTests.swift */, + ); + path = RunnerTests; + sourceTree = ""; + }; + 9740EEB11CF90186004384FC /* Flutter */ = { + isa = PBXGroup; + children = ( + 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */, + 9740EEB21CF90195004384FC /* Debug.xcconfig */, + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, + 9740EEB31CF90195004384FC /* Generated.xcconfig */, + ); + name = Flutter; + sourceTree = ""; + }; + 97C146E51CF9000F007C117D = { + isa = PBXGroup; + children = ( + 9740EEB11CF90186004384FC /* Flutter */, + 97C146F01CF9000F007C117D /* Runner */, + 97C146EF1CF9000F007C117D /* Products */, + 331C8082294A63A400263BE5 /* RunnerTests */, + ); + sourceTree = ""; + }; + 97C146EF1CF9000F007C117D /* Products */ = { + isa = PBXGroup; + children = ( + 97C146EE1CF9000F007C117D /* Runner.app */, + 331C8081294A63A400263BE5 /* RunnerTests.xctest */, + ); + name = Products; + sourceTree = ""; + }; + 97C146F01CF9000F007C117D /* Runner */ = { + isa = PBXGroup; + children = ( + 97C146FA1CF9000F007C117D /* Main.storyboard */, + 97C146FD1CF9000F007C117D /* Assets.xcassets */, + 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */, + 97C147021CF9000F007C117D /* Info.plist */, + 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */, + 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */, + 74858FAE1ED2DC5600515810 /* AppDelegate.swift */, + 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */, + ); + path = Runner; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 331C8080294A63A400263BE5 /* RunnerTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; + buildPhases = ( + 331C807D294A63A400263BE5 /* Sources */, + 331C807F294A63A400263BE5 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 331C8086294A63A400263BE5 /* PBXTargetDependency */, + ); + name = RunnerTests; + productName = RunnerTests; + productReference = 331C8081294A63A400263BE5 /* RunnerTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; + 97C146ED1CF9000F007C117D /* Runner */ = { + isa = PBXNativeTarget; + buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; + buildPhases = ( + 9740EEB61CF901F6004384FC /* Run Script */, + 97C146EA1CF9000F007C117D /* Sources */, + 97C146EB1CF9000F007C117D /* Frameworks */, + 97C146EC1CF9000F007C117D /* Resources */, + 9705A1C41CF9048500538489 /* Embed Frameworks */, + 3B06AD1E1E4923F5004D2608 /* Thin Binary */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = Runner; + productName = Runner; + productReference = 97C146EE1CF9000F007C117D /* Runner.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 97C146E61CF9000F007C117D /* Project object */ = { + isa = PBXProject; + attributes = { + BuildIndependentTargetsInParallel = YES; + LastUpgradeCheck = 1510; + ORGANIZATIONNAME = ""; + TargetAttributes = { + 331C8080294A63A400263BE5 = { + CreatedOnToolsVersion = 14.0; + TestTargetID = 97C146ED1CF9000F007C117D; + }; + 97C146ED1CF9000F007C117D = { + CreatedOnToolsVersion = 7.3.1; + LastSwiftMigration = 1100; + }; + }; + }; + buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 97C146E51CF9000F007C117D; + productRefGroup = 97C146EF1CF9000F007C117D /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 97C146ED1CF9000F007C117D /* Runner */, + 331C8080294A63A400263BE5 /* RunnerTests */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 331C807F294A63A400263BE5 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 97C146EC1CF9000F007C117D /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */, + 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */, + 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */, + 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { + isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}", + ); + name = "Thin Binary"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; + }; + 9740EEB61CF901F6004384FC /* Run Script */ = { + isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Run Script"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 331C807D294A63A400263BE5 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 97C146EA1CF9000F007C117D /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */, + 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + 331C8086294A63A400263BE5 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 97C146ED1CF9000F007C117D /* Runner */; + targetProxy = 331C8085294A63A400263BE5 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin PBXVariantGroup section */ + 97C146FA1CF9000F007C117D /* Main.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 97C146FB1CF9000F007C117D /* Base */, + ); + name = Main.storyboard; + sourceTree = ""; + }; + 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 97C147001CF9000F007C117D /* Base */, + ); + name = LaunchScreen.storyboard; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 249021D3217E4FDB00AE95B9 /* Profile */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Profile; + }; + 249021D4217E4FDB00AE95B9 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + ENABLE_BITCODE = NO; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.example.diceui; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Profile; + }; + 331C8088294A63A400263BE5 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.example.diceui.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; + }; + name = Debug; + }; + 331C8089294A63A400263BE5 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.example.diceui.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; + }; + name = Release; + }; + 331C808A294A63A400263BE5 /* Profile */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.example.diceui.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; + }; + name = Profile; + }; + 97C147031CF9000F007C117D /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + 97C147041CF9000F007C117D /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = iphoneos; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + 97C147061CF9000F007C117D /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + ENABLE_BITCODE = NO; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.example.diceui; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Debug; + }; + 97C147071CF9000F007C117D /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + ENABLE_BITCODE = NO; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.example.diceui; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 331C8088294A63A400263BE5 /* Debug */, + 331C8089294A63A400263BE5 /* Release */, + 331C808A294A63A400263BE5 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 97C147031CF9000F007C117D /* Debug */, + 97C147041CF9000F007C117D /* Release */, + 249021D3217E4FDB00AE95B9 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 97C147061CF9000F007C117D /* Debug */, + 97C147071CF9000F007C117D /* Release */, + 249021D4217E4FDB00AE95B9 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 97C146E61CF9000F007C117D /* Project object */; +} diff --git a/packages/diceui/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/packages/diceui/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..919434a --- /dev/null +++ b/packages/diceui/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/packages/diceui/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/packages/diceui/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/packages/diceui/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/packages/diceui/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/packages/diceui/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..f9b0d7c --- /dev/null +++ b/packages/diceui/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + PreviewsEnabled + + + diff --git a/packages/diceui/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/diceui/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme new file mode 100644 index 0000000..e3773d4 --- /dev/null +++ b/packages/diceui/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/diceui/ios/Runner.xcworkspace/contents.xcworkspacedata b/packages/diceui/ios/Runner.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..1d526a1 --- /dev/null +++ b/packages/diceui/ios/Runner.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/packages/diceui/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/packages/diceui/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/packages/diceui/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/packages/diceui/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/packages/diceui/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..f9b0d7c --- /dev/null +++ b/packages/diceui/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + PreviewsEnabled + + + diff --git a/packages/diceui/ios/Runner/AppDelegate.swift b/packages/diceui/ios/Runner/AppDelegate.swift new file mode 100644 index 0000000..6266644 --- /dev/null +++ b/packages/diceui/ios/Runner/AppDelegate.swift @@ -0,0 +1,13 @@ +import Flutter +import UIKit + +@main +@objc class AppDelegate: FlutterAppDelegate { + override func application( + _ application: UIApplication, + didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? + ) -> Bool { + GeneratedPluginRegistrant.register(with: self) + return super.application(application, didFinishLaunchingWithOptions: launchOptions) + } +} diff --git a/packages/diceui/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/packages/diceui/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000..d36b1fa --- /dev/null +++ b/packages/diceui/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,122 @@ +{ + "images" : [ + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "Icon-App-20x20@2x.png", + "scale" : "2x" + }, + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "Icon-App-20x20@3x.png", + "scale" : "3x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@1x.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@2x.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@3x.png", + "scale" : "3x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-App-40x40@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-App-40x40@3x.png", + "scale" : "3x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-App-60x60@2x.png", + "scale" : "2x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-App-60x60@3x.png", + "scale" : "3x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "Icon-App-20x20@1x.png", + "scale" : "1x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "Icon-App-20x20@2x.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-App-29x29@1x.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-App-29x29@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-App-40x40@1x.png", + "scale" : "1x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-App-40x40@2x.png", + "scale" : "2x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-App-76x76@1x.png", + "scale" : "1x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-App-76x76@2x.png", + "scale" : "2x" + }, + { + "size" : "83.5x83.5", + "idiom" : "ipad", + "filename" : "Icon-App-83.5x83.5@2x.png", + "scale" : "2x" + }, + { + "size" : "1024x1024", + "idiom" : "ios-marketing", + "filename" : "Icon-App-1024x1024@1x.png", + "scale" : "1x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/packages/diceui/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/packages/diceui/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..dc9ada4725e9b0ddb1deab583e5b5102493aa332 GIT binary patch literal 10932 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 literal 0 HcmV?d00001 diff --git a/packages/diceui/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/packages/diceui/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..797d452e458972bab9d994556c8305db4c827017 GIT binary patch literal 406 zcmV;H0crk;P))>cdjpWt&rLJgVp-t?DREyuq1A%0Z4)6_WsQ7{nzjN zo!X zGXV)2i3kcZIL~_j>uIKPK_zib+3T+Nt3Mb&Br)s)UIaA}@p{wDda>7=Q|mGRp7pqY zkJ!7E{MNz$9nOwoVqpFb)}$IP24Wn2JJ=Cw(!`OXJBr45rP>>AQr$6c7slJWvbpNW z@KTwna6d?PP>hvXCcp=4F;=GR@R4E7{4VU^0p4F>v^#A|>07*qoM6N<$f*5nx ACIA2c literal 0 HcmV?d00001 diff --git a/packages/diceui/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/packages/diceui/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..6ed2d933e1120817fe9182483a228007b18ab6ae GIT binary patch literal 450 zcmV;z0X_bSP)iGWQ_5NJQ_~rNh*z)}eT%KUb z`7gNk0#AwF^#0T0?hIa^`~Ck;!}#m+_uT050aTR(J!bU#|IzRL%^UsMS#KsYnTF*!YeDOytlP4VhV?b} z%rz_<=#CPc)tU1MZTq~*2=8~iZ!lSa<{9b@2Jl;?IEV8)=fG217*|@)CCYgFze-x? zIFODUIA>nWKpE+bn~n7;-89sa>#DR>TSlqWk*!2hSN6D~Qb#VqbP~4Fk&m`@1$JGr zXPIdeRE&b2Thd#{MtDK$px*d3-Wx``>!oimf%|A-&-q*6KAH)e$3|6JV%HX{Hig)k suLT-RhftRq8b9;(V=235Wa|I=027H2wCDra;{X5v07*qoM6N<$f;9x^2LJ#7 literal 0 HcmV?d00001 diff --git a/packages/diceui/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/packages/diceui/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..4cd7b0099ca80c806f8fe495613e8d6c69460d76 GIT binary patch literal 282 zcmV+#0p(^bcu7P-R4C8Q z&e;xxFbF_Vrezo%_kH*OKhshZ6BFpG-Y1e10`QXJKbND7AMQ&cMj60B5TNObaZxYybcN07*qoM6N<$g3m;S%K!iX literal 0 HcmV?d00001 diff --git a/packages/diceui/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/packages/diceui/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..fe730945a01f64a61e2235dbe3f45b08f7729182 GIT binary patch literal 462 zcmV;<0WtoGP)-}iV`2<;=$?g5M=KQbZ{F&YRNy7Nn@%_*5{gvDM0aKI4?ESmw z{NnZg)A0R`+4?NF_RZexyVB&^^ZvN!{I28tr{Vje;QNTz`dG&Jz0~Ek&f2;*Z7>B|cg}xYpxEFY+0YrKLF;^Q+-HreN0P{&i zK~zY`?b7ECf-n?@;d<&orQ*Q7KoR%4|C>{W^h6@&01>0SKS`dn{Q}GT%Qj_{PLZ_& zs`MFI#j-(>?bvdZ!8^xTwlY{qA)T4QLbY@j(!YJ7aXJervHy6HaG_2SB`6CC{He}f zHVw(fJWApwPq!6VY7r1w-Fs)@ox~N+q|w~e;JI~C4Vf^@d>Wvj=fl`^u9x9wd9 zR%3*Q+)t%S!MU_`id^@&Y{y7-r98lZX0?YrHlfmwb?#}^1b{8g&KzmkE(L>Z&)179 zp<)v6Y}pRl100G2FL_t(o!|l{-Q-VMg#&MKg7c{O0 z2wJImOS3Gy*Z2Qifdv~JYOp;v+U)a|nLoc7hNH;I$;lzDt$}rkaFw1mYK5_0Q(Sut zvbEloxON7$+HSOgC9Z8ltuC&0OSF!-mXv5caV>#bc3@hBPX@I$58-z}(ZZE!t-aOG zpjNkbau@>yEzH(5Yj4kZiMH32XI!4~gVXNnjAvRx;Sdg^`>2DpUEwoMhTs_st8pKG z(%SHyHdU&v%f36~uERh!bd`!T2dw;z6PrOTQ7Vt*#9F2uHlUVnb#ev_o^fh}Dzmq} zWtlk35}k=?xj28uO|5>>$yXadTUE@@IPpgH`gJ~Ro4>jd1IF|(+IX>8M4Ps{PNvmI zNj4D+XgN83gPt_Gm}`Ybv{;+&yu-C(Grdiahmo~BjG-l&mWM+{e5M1sm&=xduwgM9 z`8OEh`=F3r`^E{n_;%9weN{cf2%7=VzC@cYj+lg>+3|D|_1C@{hcU(DyQG_BvBWe? zvTv``=%b1zrol#=R`JB)>cdjpWt&rLJgVp-t?DREyuq1A%0Z4)6_WsQ7{nzjN zo!X zGXV)2i3kcZIL~_j>uIKPK_zib+3T+Nt3Mb&Br)s)UIaA}@p{wDda>7=Q|mGRp7pqY zkJ!7E{MNz$9nOwoVqpFb)}$IP24Wn2JJ=Cw(!`OXJBr45rP>>AQr$6c7slJWvbpNW z@KTwna6d?PP>hvXCcp=4F;=GR@R4E7{4VU^0p4F>v^#A|>07*qoM6N<$f*5nx ACIA2c literal 0 HcmV?d00001 diff --git a/packages/diceui/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/packages/diceui/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..502f463a9bc882b461c96aadf492d1729e49e725 GIT binary patch literal 586 zcmV-Q0=4~#P)+}#`wDE{8-2Mebf5<{{PqV{TgVcv*r8?UZ3{-|G?_}T*&y;@cqf{ z{Q*~+qr%%p!1pS*_Uicl#q9lc(D`!D`LN62sNwq{oYw(Wmhk)k<@f$!$@ng~_5)Ru z0Z)trIA5^j{DIW^c+vT2%lW+2<(RtE2wR;4O@)Tm`Xr*?A(qYoM}7i5Yxw>D(&6ou zxz!_Xr~yNF+waPe00049Nkl*;a!v6h%{rlvIH#gW3s8p;bFr=l}mRqpW2h zw=OA%hdyL~z+UHOzl0eKhEr$YYOL-c-%Y<)=j?(bzDweB7{b+%_ypvm_cG{SvM=DK zhv{K@m>#Bw>2W$eUI#iU)Wdgs8Y3U+A$Gd&{+j)d)BmGKx+43U_!tik_YlN)>$7G! zhkE!s;%oku3;IwG3U^2kw?z+HM)jB{@zFhK8P#KMSytSthr+4!c(5c%+^UBn`0X*2 zy3(k600_CSZj?O$Qu%&$;|TGUJrptR(HzyIx>5E(2r{eA(<6t3e3I0B)7d6s7?Z5J zZ!rtKvA{MiEBm&KFtoifx>5P^Z=vl)95XJn()aS5%ad(s?4-=Tkis9IGu{`Fy8r+H07*qoM6N<$f20Z)wqMt%V?S?~D#06};F zA3KcL`Wb+>5ObvgQIG&ig8(;V04hz?@cqy3{mSh8o!|U|)cI!1_+!fWH@o*8vh^CU z^ws0;(c$gI+2~q^tO#GDHf@=;DncUw00J^eL_t(&-tE|HQ`%4vfZ;WsBqu-$0nu1R zq^Vj;p$clf^?twn|KHO+IGt^q#a3X?w9dXC@*yxhv&l}F322(8Y1&=P&I}~G@#h6; z1CV9ecD9ZEe87{{NtI*)_aJ<`kJa z?5=RBtFF50s;jQLFil-`)m2wrb=6h(&brpj%nG_U&ut~$?8Rokzxi8zJoWr#2dto5 zOX_URcc<1`Iky+jc;A%Vzx}1QU{2$|cKPom2Vf1{8m`vja4{F>HS?^Nc^rp}xo+Nh zxd}eOm`fm3@MQC1< zIk&aCjb~Yh%5+Yq0`)D;q{#-Uqlv*o+Oor zE!I71Z@ASH3grl8&P^L0WpavHoP|UX4e?!igT`4?AZk$hu*@%6WJ;zDOGlw7kj@ zY5!B-0ft0f?Lgb>C;$Ke07*qoM6N<$f~t1N9smFU literal 0 HcmV?d00001 diff --git a/packages/diceui/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/packages/diceui/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..0ec303439225b78712f49115768196d8d76f6790 GIT binary patch literal 862 zcmV-k1EKthP)20Z)wqMt%V?S?~D#06};F zA3KcL`Wb+>5ObvgQIG&ig8(;V04hz?@cqy3{mSh8o!|U|)cI!1_+!fWH@o*8vh^CU z^ws0;(c$gI+2~q^tO#GDHf@=;DncUw00J^eL_t(&-tE|HQ`%4vfZ;WsBqu-$0nu1R zq^Vj;p$clf^?twn|KHO+IGt^q#a3X?w9dXC@*yxhv&l}F322(8Y1&=P&I}~G@#h6; z1CV9ecD9ZEe87{{NtI*)_aJ<`kJa z?5=RBtFF50s;jQLFil-`)m2wrb=6h(&brpj%nG_U&ut~$?8Rokzxi8zJoWr#2dto5 zOX_URcc<1`Iky+jc;A%Vzx}1QU{2$|cKPom2Vf1{8m`vja4{F>HS?^Nc^rp}xo+Nh zxd}eOm`fm3@MQC1< zIk&aCjb~Yh%5+Yq0`)D;q{#-Uqlv*o+Oor zE!I71Z@ASH3grl8&P^L0WpavHoP|UX4e?!igT`4?AZk$hu*@%6WJ;zDOGlw7kj@ zY5!B-0ft0f?Lgb>C;$Ke07*qoM6N<$f~t1N9smFU literal 0 HcmV?d00001 diff --git a/packages/diceui/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/packages/diceui/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..e9f5fea27c705180eb716271f41b582e76dcbd90 GIT binary patch literal 1674 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 literal 0 HcmV?d00001 diff --git a/packages/diceui/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/packages/diceui/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..0467bf12aa4d28f374bb26596605a46dcbb3e7c8 GIT binary patch literal 1418 zcmV;51$Fv~P)q zKfU)WzW*n(@|xWGCA9ScMt*e9`2kdxPQ&&>|-UCa7_51w+ zLUsW@ZzZSW0y$)Hp~e9%PvP|a03ks1`~K?q{u;6NC8*{AOqIUq{CL&;p56Lf$oQGq z^={4hPQv)y=I|4n+?>7Fim=dxt1 z2H+Dm+1+fh+IF>G0SjJMkQQre1x4|G*Z==(Ot&kCnUrL4I(rf(ucITwmuHf^hXiJT zkdTm&kdTm&kdTm&kdP`esgWG0BcWCVkVZ&2dUwN`cgM8QJb`Z7Z~e<&Yj2(}>Tmf` zm1{eLgw!b{bXkjWbF%dTkTZEJWyWOb##Lfw4EK2}<0d6%>AGS{po>WCOy&f$Tay_> z?NBlkpo@s-O;0V%Y_Xa-G#_O08q5LR*~F%&)}{}r&L%Sbs8AS4t7Y0NEx*{soY=0MZExqA5XHQkqi#4gW3 zqODM^iyZl;dvf)-bOXtOru(s)Uc7~BFx{w-FK;2{`VA?(g&@3z&bfLFyctOH!cVsF z7IL=fo-qBndRUm;kAdXR4e6>k-z|21AaN%ubeVrHl*<|s&Ax@W-t?LR(P-24A5=>a z*R9#QvjzF8n%@1Nw@?CG@6(%>+-0ASK~jEmCV|&a*7-GKT72W<(TbSjf)&Eme6nGE z>Gkj4Sq&2e+-G%|+NM8OOm5zVl9{Z8Dd8A5z3y8mZ=4Bv4%>as_{9cN#bm~;h>62( zdqY93Zy}v&c4n($Vv!UybR8ocs7#zbfX1IY-*w~)p}XyZ-SFC~4w>BvMVr`dFbelV{lLL0bx7@*ZZdebr3`sP;? zVImji)kG)(6Juv0lz@q`F!k1FE;CQ(D0iG$wchPbKZQELlsZ#~rt8#90Y_Xh&3U-< z{s<&cCV_1`^TD^ia9!*mQDq& zn2{r`j};V|uV%_wsP!zB?m%;FeaRe+X47K0e+KE!8C{gAWF8)lCd1u1%~|M!XNRvw zvtqy3iz0WSpWdhn6$hP8PaRBmp)q`#PCA`Vd#Tc$@f1tAcM>f_I@bC)hkI9|o(Iqv zo}Piadq!j76}004RBio<`)70k^`K1NK)q>w?p^C6J2ZC!+UppiK6&y3Kmbv&O!oYF z34$0Z;QO!JOY#!`qyGH<3Pd}Pt@q*A0V=3SVtWKRR8d8Z&@)3qLPA19LPA19LPEUC YUoZo%k(ykuW&i*H07*qoM6N<$f+CH{y8r+H literal 0 HcmV?d00001 diff --git a/packages/diceui/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/packages/diceui/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json new file mode 100644 index 0000000..0bedcf2 --- /dev/null +++ b/packages/diceui/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "LaunchImage.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "LaunchImage@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "LaunchImage@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/packages/diceui/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/packages/diceui/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png new file mode 100644 index 0000000000000000000000000000000000000000..9da19eacad3b03bb08bbddbbf4ac48dd78b3d838 GIT binary patch literal 68 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx0wlM}@Gt=>Zci7-kcv6Uzs@r-FtIZ-&5|)J Q1PU{Fy85}Sb4q9e0B4a5jsO4v literal 0 HcmV?d00001 diff --git a/packages/diceui/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/packages/diceui/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..9da19eacad3b03bb08bbddbbf4ac48dd78b3d838 GIT binary patch literal 68 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx0wlM}@Gt=>Zci7-kcv6Uzs@r-FtIZ-&5|)J Q1PU{Fy85}Sb4q9e0B4a5jsO4v literal 0 HcmV?d00001 diff --git a/packages/diceui/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/packages/diceui/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..9da19eacad3b03bb08bbddbbf4ac48dd78b3d838 GIT binary patch literal 68 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx0wlM}@Gt=>Zci7-kcv6Uzs@r-FtIZ-&5|)J Q1PU{Fy85}Sb4q9e0B4a5jsO4v literal 0 HcmV?d00001 diff --git a/packages/diceui/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/packages/diceui/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md new file mode 100644 index 0000000..89c2725 --- /dev/null +++ b/packages/diceui/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md @@ -0,0 +1,5 @@ +# Launch Screen Assets + +You can customize the launch screen with your own desired assets by replacing the image files in this directory. + +You can also do it by opening your Flutter project's Xcode project with `open ios/Runner.xcworkspace`, selecting `Runner/Assets.xcassets` in the Project Navigator and dropping in the desired images. \ No newline at end of file diff --git a/packages/diceui/ios/Runner/Base.lproj/LaunchScreen.storyboard b/packages/diceui/ios/Runner/Base.lproj/LaunchScreen.storyboard new file mode 100644 index 0000000..f2e259c --- /dev/null +++ b/packages/diceui/ios/Runner/Base.lproj/LaunchScreen.storyboard @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/diceui/ios/Runner/Base.lproj/Main.storyboard b/packages/diceui/ios/Runner/Base.lproj/Main.storyboard new file mode 100644 index 0000000..f3c2851 --- /dev/null +++ b/packages/diceui/ios/Runner/Base.lproj/Main.storyboard @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/diceui/ios/Runner/Info.plist b/packages/diceui/ios/Runner/Info.plist new file mode 100644 index 0000000..2551497 --- /dev/null +++ b/packages/diceui/ios/Runner/Info.plist @@ -0,0 +1,49 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleDisplayName + Diceui + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + diceui + CFBundlePackageType + APPL + CFBundleShortVersionString + $(FLUTTER_BUILD_NAME) + CFBundleSignature + ???? + CFBundleVersion + $(FLUTTER_BUILD_NUMBER) + LSRequiresIPhoneOS + + UILaunchStoryboardName + LaunchScreen + UIMainStoryboardFile + Main + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + CADisableMinimumFrameDurationOnPhone + + UIApplicationSupportsIndirectInputEvents + + + diff --git a/packages/diceui/ios/Runner/Runner-Bridging-Header.h b/packages/diceui/ios/Runner/Runner-Bridging-Header.h new file mode 100644 index 0000000..308a2a5 --- /dev/null +++ b/packages/diceui/ios/Runner/Runner-Bridging-Header.h @@ -0,0 +1 @@ +#import "GeneratedPluginRegistrant.h" diff --git a/packages/diceui/ios/RunnerTests/RunnerTests.swift b/packages/diceui/ios/RunnerTests/RunnerTests.swift new file mode 100644 index 0000000..86a7c3b --- /dev/null +++ b/packages/diceui/ios/RunnerTests/RunnerTests.swift @@ -0,0 +1,12 @@ +import Flutter +import UIKit +import XCTest + +class RunnerTests: XCTestCase { + + func testExample() { + // If you add code to the Runner application, consider adding tests here. + // See https://developer.apple.com/documentation/xctest for more information about using XCTest. + } + +} diff --git a/packages/diceui/lib/main.dart b/packages/diceui/lib/main.dart new file mode 100644 index 0000000..7b7f5b6 --- /dev/null +++ b/packages/diceui/lib/main.dart @@ -0,0 +1,122 @@ +import 'package:flutter/material.dart'; + +void main() { + runApp(const MyApp()); +} + +class MyApp extends StatelessWidget { + const MyApp({super.key}); + + // This widget is the root of your application. + @override + Widget build(BuildContext context) { + return MaterialApp( + title: 'Flutter Demo', + theme: ThemeData( + // This is the theme of your application. + // + // TRY THIS: Try running your application with "flutter run". You'll see + // the application has a purple toolbar. Then, without quitting the app, + // try changing the seedColor in the colorScheme below to Colors.green + // and then invoke "hot reload" (save your changes or press the "hot + // reload" button in a Flutter-supported IDE, or press "r" if you used + // the command line to start the app). + // + // Notice that the counter didn't reset back to zero; the application + // state is not lost during the reload. To reset the state, use hot + // restart instead. + // + // This works for code too, not just values: Most code changes can be + // tested with just a hot reload. + colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepPurple), + ), + home: const MyHomePage(title: 'Flutter Demo Home Page'), + ); + } +} + +class MyHomePage extends StatefulWidget { + const MyHomePage({super.key, required this.title}); + + // This widget is the home page of your application. It is stateful, meaning + // that it has a State object (defined below) that contains fields that affect + // how it looks. + + // This class is the configuration for the state. It holds the values (in this + // case the title) provided by the parent (in this case the App widget) and + // used by the build method of the State. Fields in a Widget subclass are + // always marked "final". + + final String title; + + @override + State createState() => _MyHomePageState(); +} + +class _MyHomePageState extends State { + int _counter = 0; + + void _incrementCounter() { + setState(() { + // This call to setState tells the Flutter framework that something has + // changed in this State, which causes it to rerun the build method below + // so that the display can reflect the updated values. If we changed + // _counter without calling setState(), then the build method would not be + // called again, and so nothing would appear to happen. + _counter++; + }); + } + + @override + Widget build(BuildContext context) { + // This method is rerun every time setState is called, for instance as done + // by the _incrementCounter method above. + // + // The Flutter framework has been optimized to make rerunning build methods + // fast, so that you can just rebuild anything that needs updating rather + // than having to individually change instances of widgets. + return Scaffold( + appBar: AppBar( + // TRY THIS: Try changing the color here to a specific color (to + // Colors.amber, perhaps?) and trigger a hot reload to see the AppBar + // change color while the other colors stay the same. + backgroundColor: Theme.of(context).colorScheme.inversePrimary, + // Here we take the value from the MyHomePage object that was created by + // the App.build method, and use it to set our appbar title. + title: Text(widget.title), + ), + body: Center( + // Center is a layout widget. It takes a single child and positions it + // in the middle of the parent. + child: Column( + // Column is also a layout widget. It takes a list of children and + // arranges them vertically. By default, it sizes itself to fit its + // children horizontally, and tries to be as tall as its parent. + // + // Column has various properties to control how it sizes itself and + // how it positions its children. Here we use mainAxisAlignment to + // center the children vertically; the main axis here is the vertical + // axis because Columns are vertical (the cross axis would be + // horizontal). + // + // TRY THIS: Invoke "debug painting" (choose the "Toggle Debug Paint" + // action in the IDE, or press "p" in the console), to see the + // wireframe for each widget. + mainAxisAlignment: MainAxisAlignment.center, + children: [ + const Text('You have pushed the button this many times:'), + Text( + '$_counter', + style: Theme.of(context).textTheme.headlineMedium, + ), + ], + ), + ), + floatingActionButton: FloatingActionButton( + onPressed: _incrementCounter, + tooltip: 'Increment', + child: const Icon(Icons.add), + ), // This trailing comma makes auto-formatting nicer for build methods. + ); + } +} diff --git a/packages/diceui/linux/.gitignore b/packages/diceui/linux/.gitignore new file mode 100644 index 0000000..d3896c9 --- /dev/null +++ b/packages/diceui/linux/.gitignore @@ -0,0 +1 @@ +flutter/ephemeral diff --git a/packages/diceui/linux/CMakeLists.txt b/packages/diceui/linux/CMakeLists.txt new file mode 100644 index 0000000..851f789 --- /dev/null +++ b/packages/diceui/linux/CMakeLists.txt @@ -0,0 +1,128 @@ +# Project-level configuration. +cmake_minimum_required(VERSION 3.13) +project(runner LANGUAGES CXX) + +# The name of the executable created for the application. Change this to change +# the on-disk name of your application. +set(BINARY_NAME "diceui") +# The unique GTK application identifier for this application. See: +# https://wiki.gnome.org/HowDoI/ChooseApplicationID +set(APPLICATION_ID "com.example.diceui") + +# Explicitly opt in to modern CMake behaviors to avoid warnings with recent +# versions of CMake. +cmake_policy(SET CMP0063 NEW) + +# Load bundled libraries from the lib/ directory relative to the binary. +set(CMAKE_INSTALL_RPATH "$ORIGIN/lib") + +# Root filesystem for cross-building. +if(FLUTTER_TARGET_PLATFORM_SYSROOT) + set(CMAKE_SYSROOT ${FLUTTER_TARGET_PLATFORM_SYSROOT}) + set(CMAKE_FIND_ROOT_PATH ${CMAKE_SYSROOT}) + set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) + set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) + set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) + set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +endif() + +# Define build configuration options. +if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + set(CMAKE_BUILD_TYPE "Debug" CACHE + STRING "Flutter build mode" FORCE) + set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS + "Debug" "Profile" "Release") +endif() + +# Compilation settings that should be applied to most targets. +# +# Be cautious about adding new options here, as plugins use this function by +# default. In most cases, you should add new options to specific targets instead +# of modifying this function. +function(APPLY_STANDARD_SETTINGS TARGET) + target_compile_features(${TARGET} PUBLIC cxx_std_14) + target_compile_options(${TARGET} PRIVATE -Wall -Werror) + target_compile_options(${TARGET} PRIVATE "$<$>:-O3>") + target_compile_definitions(${TARGET} PRIVATE "$<$>:NDEBUG>") +endfunction() + +# Flutter library and tool build rules. +set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter") +add_subdirectory(${FLUTTER_MANAGED_DIR}) + +# System-level dependencies. +find_package(PkgConfig REQUIRED) +pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) + +# Application build; see runner/CMakeLists.txt. +add_subdirectory("runner") + +# Run the Flutter tool portions of the build. This must not be removed. +add_dependencies(${BINARY_NAME} flutter_assemble) + +# Only the install-generated bundle's copy of the executable will launch +# correctly, since the resources must in the right relative locations. To avoid +# people trying to run the unbundled copy, put it in a subdirectory instead of +# the default top-level location. +set_target_properties(${BINARY_NAME} + PROPERTIES + RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/intermediates_do_not_run" +) + + +# Generated plugin build rules, which manage building the plugins and adding +# them to the application. +include(flutter/generated_plugins.cmake) + + +# === Installation === +# By default, "installing" just makes a relocatable bundle in the build +# directory. +set(BUILD_BUNDLE_DIR "${PROJECT_BINARY_DIR}/bundle") +if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE) +endif() + +# Start with a clean build bundle directory every time. +install(CODE " + file(REMOVE_RECURSE \"${BUILD_BUNDLE_DIR}/\") + " COMPONENT Runtime) + +set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data") +set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib") + +install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +foreach(bundled_library ${PLUGIN_BUNDLED_LIBRARIES}) + install(FILES "${bundled_library}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endforeach(bundled_library) + +# Copy the native assets provided by the build.dart from all packages. +set(NATIVE_ASSETS_DIR "${PROJECT_BUILD_DIR}native_assets/linux/") +install(DIRECTORY "${NATIVE_ASSETS_DIR}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +# Fully re-copy the assets directory on each build to avoid having stale files +# from a previous install. +set(FLUTTER_ASSET_DIR_NAME "flutter_assets") +install(CODE " + file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\") + " COMPONENT Runtime) +install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}" + DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime) + +# Install the AOT library on non-Debug builds only. +if(NOT CMAKE_BUILD_TYPE MATCHES "Debug") + install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endif() diff --git a/packages/diceui/linux/flutter/CMakeLists.txt b/packages/diceui/linux/flutter/CMakeLists.txt new file mode 100644 index 0000000..d5bd016 --- /dev/null +++ b/packages/diceui/linux/flutter/CMakeLists.txt @@ -0,0 +1,88 @@ +# This file controls Flutter-level build steps. It should not be edited. +cmake_minimum_required(VERSION 3.10) + +set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral") + +# Configuration provided via flutter tool. +include(${EPHEMERAL_DIR}/generated_config.cmake) + +# TODO: Move the rest of this into files in ephemeral. See +# https://github.com/flutter/flutter/issues/57146. + +# Serves the same purpose as list(TRANSFORM ... PREPEND ...), +# which isn't available in 3.10. +function(list_prepend LIST_NAME PREFIX) + set(NEW_LIST "") + foreach(element ${${LIST_NAME}}) + list(APPEND NEW_LIST "${PREFIX}${element}") + endforeach(element) + set(${LIST_NAME} "${NEW_LIST}" PARENT_SCOPE) +endfunction() + +# === Flutter Library === +# System-level dependencies. +find_package(PkgConfig REQUIRED) +pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) +pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0) +pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0) + +set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/libflutter_linux_gtk.so") + +# Published to parent scope for install step. +set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE) +set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE) +set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE) +set(AOT_LIBRARY "${PROJECT_DIR}/build/lib/libapp.so" PARENT_SCOPE) + +list(APPEND FLUTTER_LIBRARY_HEADERS + "fl_basic_message_channel.h" + "fl_binary_codec.h" + "fl_binary_messenger.h" + "fl_dart_project.h" + "fl_engine.h" + "fl_json_message_codec.h" + "fl_json_method_codec.h" + "fl_message_codec.h" + "fl_method_call.h" + "fl_method_channel.h" + "fl_method_codec.h" + "fl_method_response.h" + "fl_plugin_registrar.h" + "fl_plugin_registry.h" + "fl_standard_message_codec.h" + "fl_standard_method_codec.h" + "fl_string_codec.h" + "fl_value.h" + "fl_view.h" + "flutter_linux.h" +) +list_prepend(FLUTTER_LIBRARY_HEADERS "${EPHEMERAL_DIR}/flutter_linux/") +add_library(flutter INTERFACE) +target_include_directories(flutter INTERFACE + "${EPHEMERAL_DIR}" +) +target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}") +target_link_libraries(flutter INTERFACE + PkgConfig::GTK + PkgConfig::GLIB + PkgConfig::GIO +) +add_dependencies(flutter flutter_assemble) + +# === Flutter tool backend === +# _phony_ is a non-existent file to force this command to run every time, +# since currently there's no way to get a full input/output list from the +# flutter tool. +add_custom_command( + OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS} + ${CMAKE_CURRENT_BINARY_DIR}/_phony_ + COMMAND ${CMAKE_COMMAND} -E env + ${FLUTTER_TOOL_ENVIRONMENT} + "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.sh" + ${FLUTTER_TARGET_PLATFORM} ${CMAKE_BUILD_TYPE} + VERBATIM +) +add_custom_target(flutter_assemble DEPENDS + "${FLUTTER_LIBRARY}" + ${FLUTTER_LIBRARY_HEADERS} +) diff --git a/packages/diceui/linux/flutter/generated_plugin_registrant.cc b/packages/diceui/linux/flutter/generated_plugin_registrant.cc new file mode 100644 index 0000000..e71a16d --- /dev/null +++ b/packages/diceui/linux/flutter/generated_plugin_registrant.cc @@ -0,0 +1,11 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#include "generated_plugin_registrant.h" + + +void fl_register_plugins(FlPluginRegistry* registry) { +} diff --git a/packages/diceui/linux/flutter/generated_plugin_registrant.h b/packages/diceui/linux/flutter/generated_plugin_registrant.h new file mode 100644 index 0000000..e0f0a47 --- /dev/null +++ b/packages/diceui/linux/flutter/generated_plugin_registrant.h @@ -0,0 +1,15 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#ifndef GENERATED_PLUGIN_REGISTRANT_ +#define GENERATED_PLUGIN_REGISTRANT_ + +#include + +// Registers Flutter plugins. +void fl_register_plugins(FlPluginRegistry* registry); + +#endif // GENERATED_PLUGIN_REGISTRANT_ diff --git a/packages/diceui/linux/flutter/generated_plugins.cmake b/packages/diceui/linux/flutter/generated_plugins.cmake new file mode 100644 index 0000000..2e1de87 --- /dev/null +++ b/packages/diceui/linux/flutter/generated_plugins.cmake @@ -0,0 +1,23 @@ +# +# Generated file, do not edit. +# + +list(APPEND FLUTTER_PLUGIN_LIST +) + +list(APPEND FLUTTER_FFI_PLUGIN_LIST +) + +set(PLUGIN_BUNDLED_LIBRARIES) + +foreach(plugin ${FLUTTER_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/linux plugins/${plugin}) + target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin) + list(APPEND PLUGIN_BUNDLED_LIBRARIES $) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) +endforeach(plugin) + +foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin) diff --git a/packages/diceui/linux/runner/CMakeLists.txt b/packages/diceui/linux/runner/CMakeLists.txt new file mode 100644 index 0000000..e97dabc --- /dev/null +++ b/packages/diceui/linux/runner/CMakeLists.txt @@ -0,0 +1,26 @@ +cmake_minimum_required(VERSION 3.13) +project(runner LANGUAGES CXX) + +# Define the application target. To change its name, change BINARY_NAME in the +# top-level CMakeLists.txt, not the value here, or `flutter run` will no longer +# work. +# +# Any new source files that you add to the application should be added here. +add_executable(${BINARY_NAME} + "main.cc" + "my_application.cc" + "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" +) + +# Apply the standard set of build settings. This can be removed for applications +# that need different build settings. +apply_standard_settings(${BINARY_NAME}) + +# Add preprocessor definitions for the application ID. +add_definitions(-DAPPLICATION_ID="${APPLICATION_ID}") + +# Add dependency libraries. Add any application-specific dependencies here. +target_link_libraries(${BINARY_NAME} PRIVATE flutter) +target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::GTK) + +target_include_directories(${BINARY_NAME} PRIVATE "${CMAKE_SOURCE_DIR}") diff --git a/packages/diceui/linux/runner/main.cc b/packages/diceui/linux/runner/main.cc new file mode 100644 index 0000000..e7c5c54 --- /dev/null +++ b/packages/diceui/linux/runner/main.cc @@ -0,0 +1,6 @@ +#include "my_application.h" + +int main(int argc, char** argv) { + g_autoptr(MyApplication) app = my_application_new(); + return g_application_run(G_APPLICATION(app), argc, argv); +} diff --git a/packages/diceui/linux/runner/my_application.cc b/packages/diceui/linux/runner/my_application.cc new file mode 100644 index 0000000..4bc6103 --- /dev/null +++ b/packages/diceui/linux/runner/my_application.cc @@ -0,0 +1,130 @@ +#include "my_application.h" + +#include +#ifdef GDK_WINDOWING_X11 +#include +#endif + +#include "flutter/generated_plugin_registrant.h" + +struct _MyApplication { + GtkApplication parent_instance; + char** dart_entrypoint_arguments; +}; + +G_DEFINE_TYPE(MyApplication, my_application, GTK_TYPE_APPLICATION) + +// Implements GApplication::activate. +static void my_application_activate(GApplication* application) { + MyApplication* self = MY_APPLICATION(application); + GtkWindow* window = + GTK_WINDOW(gtk_application_window_new(GTK_APPLICATION(application))); + + // Use a header bar when running in GNOME as this is the common style used + // by applications and is the setup most users will be using (e.g. Ubuntu + // desktop). + // If running on X and not using GNOME then just use a traditional title bar + // in case the window manager does more exotic layout, e.g. tiling. + // If running on Wayland assume the header bar will work (may need changing + // if future cases occur). + gboolean use_header_bar = TRUE; +#ifdef GDK_WINDOWING_X11 + GdkScreen* screen = gtk_window_get_screen(window); + if (GDK_IS_X11_SCREEN(screen)) { + const gchar* wm_name = gdk_x11_screen_get_window_manager_name(screen); + if (g_strcmp0(wm_name, "GNOME Shell") != 0) { + use_header_bar = FALSE; + } + } +#endif + if (use_header_bar) { + GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new()); + gtk_widget_show(GTK_WIDGET(header_bar)); + gtk_header_bar_set_title(header_bar, "diceui"); + gtk_header_bar_set_show_close_button(header_bar, TRUE); + gtk_window_set_titlebar(window, GTK_WIDGET(header_bar)); + } else { + gtk_window_set_title(window, "diceui"); + } + + gtk_window_set_default_size(window, 1280, 720); + gtk_widget_show(GTK_WIDGET(window)); + + g_autoptr(FlDartProject) project = fl_dart_project_new(); + fl_dart_project_set_dart_entrypoint_arguments(project, self->dart_entrypoint_arguments); + + FlView* view = fl_view_new(project); + gtk_widget_show(GTK_WIDGET(view)); + gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(view)); + + fl_register_plugins(FL_PLUGIN_REGISTRY(view)); + + gtk_widget_grab_focus(GTK_WIDGET(view)); +} + +// Implements GApplication::local_command_line. +static gboolean my_application_local_command_line(GApplication* application, gchar*** arguments, int* exit_status) { + MyApplication* self = MY_APPLICATION(application); + // Strip out the first argument as it is the binary name. + self->dart_entrypoint_arguments = g_strdupv(*arguments + 1); + + g_autoptr(GError) error = nullptr; + if (!g_application_register(application, nullptr, &error)) { + g_warning("Failed to register: %s", error->message); + *exit_status = 1; + return TRUE; + } + + g_application_activate(application); + *exit_status = 0; + + return TRUE; +} + +// Implements GApplication::startup. +static void my_application_startup(GApplication* application) { + //MyApplication* self = MY_APPLICATION(object); + + // Perform any actions required at application startup. + + G_APPLICATION_CLASS(my_application_parent_class)->startup(application); +} + +// Implements GApplication::shutdown. +static void my_application_shutdown(GApplication* application) { + //MyApplication* self = MY_APPLICATION(object); + + // Perform any actions required at application shutdown. + + G_APPLICATION_CLASS(my_application_parent_class)->shutdown(application); +} + +// Implements GObject::dispose. +static void my_application_dispose(GObject* object) { + MyApplication* self = MY_APPLICATION(object); + g_clear_pointer(&self->dart_entrypoint_arguments, g_strfreev); + G_OBJECT_CLASS(my_application_parent_class)->dispose(object); +} + +static void my_application_class_init(MyApplicationClass* klass) { + G_APPLICATION_CLASS(klass)->activate = my_application_activate; + G_APPLICATION_CLASS(klass)->local_command_line = my_application_local_command_line; + G_APPLICATION_CLASS(klass)->startup = my_application_startup; + G_APPLICATION_CLASS(klass)->shutdown = my_application_shutdown; + G_OBJECT_CLASS(klass)->dispose = my_application_dispose; +} + +static void my_application_init(MyApplication* self) {} + +MyApplication* my_application_new() { + // Set the program name to the application ID, which helps various systems + // like GTK and desktop environments map this running application to its + // corresponding .desktop file. This ensures better integration by allowing + // the application to be recognized beyond its binary name. + g_set_prgname(APPLICATION_ID); + + return MY_APPLICATION(g_object_new(my_application_get_type(), + "application-id", APPLICATION_ID, + "flags", G_APPLICATION_NON_UNIQUE, + nullptr)); +} diff --git a/packages/diceui/linux/runner/my_application.h b/packages/diceui/linux/runner/my_application.h new file mode 100644 index 0000000..72271d5 --- /dev/null +++ b/packages/diceui/linux/runner/my_application.h @@ -0,0 +1,18 @@ +#ifndef FLUTTER_MY_APPLICATION_H_ +#define FLUTTER_MY_APPLICATION_H_ + +#include + +G_DECLARE_FINAL_TYPE(MyApplication, my_application, MY, APPLICATION, + GtkApplication) + +/** + * my_application_new: + * + * Creates a new Flutter-based application. + * + * Returns: a new #MyApplication. + */ +MyApplication* my_application_new(); + +#endif // FLUTTER_MY_APPLICATION_H_ diff --git a/packages/diceui/macos/.gitignore b/packages/diceui/macos/.gitignore new file mode 100644 index 0000000..746adbb --- /dev/null +++ b/packages/diceui/macos/.gitignore @@ -0,0 +1,7 @@ +# Flutter-related +**/Flutter/ephemeral/ +**/Pods/ + +# Xcode-related +**/dgph +**/xcuserdata/ diff --git a/packages/diceui/macos/Flutter/Flutter-Debug.xcconfig b/packages/diceui/macos/Flutter/Flutter-Debug.xcconfig new file mode 100644 index 0000000..c2efd0b --- /dev/null +++ b/packages/diceui/macos/Flutter/Flutter-Debug.xcconfig @@ -0,0 +1 @@ +#include "ephemeral/Flutter-Generated.xcconfig" diff --git a/packages/diceui/macos/Flutter/Flutter-Release.xcconfig b/packages/diceui/macos/Flutter/Flutter-Release.xcconfig new file mode 100644 index 0000000..c2efd0b --- /dev/null +++ b/packages/diceui/macos/Flutter/Flutter-Release.xcconfig @@ -0,0 +1 @@ +#include "ephemeral/Flutter-Generated.xcconfig" diff --git a/packages/diceui/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/diceui/macos/Flutter/GeneratedPluginRegistrant.swift new file mode 100644 index 0000000..cccf817 --- /dev/null +++ b/packages/diceui/macos/Flutter/GeneratedPluginRegistrant.swift @@ -0,0 +1,10 @@ +// +// Generated file. Do not edit. +// + +import FlutterMacOS +import Foundation + + +func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { +} diff --git a/packages/diceui/macos/Runner.xcodeproj/project.pbxproj b/packages/diceui/macos/Runner.xcodeproj/project.pbxproj new file mode 100644 index 0000000..af41526 --- /dev/null +++ b/packages/diceui/macos/Runner.xcodeproj/project.pbxproj @@ -0,0 +1,705 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 54; + objects = { + +/* Begin PBXAggregateTarget section */ + 33CC111A2044C6BA0003C045 /* Flutter Assemble */ = { + isa = PBXAggregateTarget; + buildConfigurationList = 33CC111B2044C6BA0003C045 /* Build configuration list for PBXAggregateTarget "Flutter Assemble" */; + buildPhases = ( + 33CC111E2044C6BF0003C045 /* ShellScript */, + ); + dependencies = ( + ); + name = "Flutter Assemble"; + productName = FLX; + }; +/* End PBXAggregateTarget section */ + +/* Begin PBXBuildFile section */ + 331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C80D7294CF71000263BE5 /* RunnerTests.swift */; }; + 335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */; }; + 33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC10F02044A3C60003C045 /* AppDelegate.swift */; }; + 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; }; + 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; }; + 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 331C80D9294CF71000263BE5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 33CC10E52044A3C60003C045 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 33CC10EC2044A3C60003C045; + remoteInfo = Runner; + }; + 33CC111F2044C79F0003C045 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 33CC10E52044A3C60003C045 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 33CC111A2044C6BA0003C045; + remoteInfo = FLX; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 33CC110E2044A8840003C045 /* Bundle Framework */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + ); + name = "Bundle Framework"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 331C80D5294CF71000263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; + 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; + 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = ""; }; + 33CC10ED2044A3C60003C045 /* diceui.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "diceui.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = ""; }; + 33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; }; + 33CC10F72044A3C60003C045 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = Runner/Info.plist; sourceTree = ""; }; + 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainFlutterWindow.swift; sourceTree = ""; }; + 33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Debug.xcconfig"; sourceTree = ""; }; + 33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Release.xcconfig"; sourceTree = ""; }; + 33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "Flutter-Generated.xcconfig"; path = "ephemeral/Flutter-Generated.xcconfig"; sourceTree = ""; }; + 33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = ""; }; + 33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = ""; }; + 33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = ""; }; + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; + 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 331C80D2294CF70F00263BE5 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 33CC10EA2044A3C60003C045 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 331C80D6294CF71000263BE5 /* RunnerTests */ = { + isa = PBXGroup; + children = ( + 331C80D7294CF71000263BE5 /* RunnerTests.swift */, + ); + path = RunnerTests; + sourceTree = ""; + }; + 33BA886A226E78AF003329D5 /* Configs */ = { + isa = PBXGroup; + children = ( + 33E5194F232828860026EE4D /* AppInfo.xcconfig */, + 9740EEB21CF90195004384FC /* Debug.xcconfig */, + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, + 333000ED22D3DE5D00554162 /* Warnings.xcconfig */, + ); + path = Configs; + sourceTree = ""; + }; + 33CC10E42044A3C60003C045 = { + isa = PBXGroup; + children = ( + 33FAB671232836740065AC1E /* Runner */, + 33CEB47122A05771004F2AC0 /* Flutter */, + 331C80D6294CF71000263BE5 /* RunnerTests */, + 33CC10EE2044A3C60003C045 /* Products */, + D73912EC22F37F3D000D13A0 /* Frameworks */, + ); + sourceTree = ""; + }; + 33CC10EE2044A3C60003C045 /* Products */ = { + isa = PBXGroup; + children = ( + 33CC10ED2044A3C60003C045 /* diceui.app */, + 331C80D5294CF71000263BE5 /* RunnerTests.xctest */, + ); + name = Products; + sourceTree = ""; + }; + 33CC11242044D66E0003C045 /* Resources */ = { + isa = PBXGroup; + children = ( + 33CC10F22044A3C60003C045 /* Assets.xcassets */, + 33CC10F42044A3C60003C045 /* MainMenu.xib */, + 33CC10F72044A3C60003C045 /* Info.plist */, + ); + name = Resources; + path = ..; + sourceTree = ""; + }; + 33CEB47122A05771004F2AC0 /* Flutter */ = { + isa = PBXGroup; + children = ( + 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */, + 33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */, + 33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */, + 33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */, + ); + path = Flutter; + sourceTree = ""; + }; + 33FAB671232836740065AC1E /* Runner */ = { + isa = PBXGroup; + children = ( + 33CC10F02044A3C60003C045 /* AppDelegate.swift */, + 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */, + 33E51913231747F40026EE4D /* DebugProfile.entitlements */, + 33E51914231749380026EE4D /* Release.entitlements */, + 33CC11242044D66E0003C045 /* Resources */, + 33BA886A226E78AF003329D5 /* Configs */, + ); + path = Runner; + sourceTree = ""; + }; + D73912EC22F37F3D000D13A0 /* Frameworks */ = { + isa = PBXGroup; + children = ( + ); + name = Frameworks; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 331C80D4294CF70F00263BE5 /* RunnerTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; + buildPhases = ( + 331C80D1294CF70F00263BE5 /* Sources */, + 331C80D2294CF70F00263BE5 /* Frameworks */, + 331C80D3294CF70F00263BE5 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 331C80DA294CF71000263BE5 /* PBXTargetDependency */, + ); + name = RunnerTests; + productName = RunnerTests; + productReference = 331C80D5294CF71000263BE5 /* RunnerTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; + 33CC10EC2044A3C60003C045 /* Runner */ = { + isa = PBXNativeTarget; + buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; + buildPhases = ( + 33CC10E92044A3C60003C045 /* Sources */, + 33CC10EA2044A3C60003C045 /* Frameworks */, + 33CC10EB2044A3C60003C045 /* Resources */, + 33CC110E2044A8840003C045 /* Bundle Framework */, + 3399D490228B24CF009A79C7 /* ShellScript */, + ); + buildRules = ( + ); + dependencies = ( + 33CC11202044C79F0003C045 /* PBXTargetDependency */, + ); + name = Runner; + productName = Runner; + productReference = 33CC10ED2044A3C60003C045 /* diceui.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 33CC10E52044A3C60003C045 /* Project object */ = { + isa = PBXProject; + attributes = { + BuildIndependentTargetsInParallel = YES; + LastSwiftUpdateCheck = 0920; + LastUpgradeCheck = 1510; + ORGANIZATIONNAME = ""; + TargetAttributes = { + 331C80D4294CF70F00263BE5 = { + CreatedOnToolsVersion = 14.0; + TestTargetID = 33CC10EC2044A3C60003C045; + }; + 33CC10EC2044A3C60003C045 = { + CreatedOnToolsVersion = 9.2; + LastSwiftMigration = 1100; + ProvisioningStyle = Automatic; + SystemCapabilities = { + com.apple.Sandbox = { + enabled = 1; + }; + }; + }; + 33CC111A2044C6BA0003C045 = { + CreatedOnToolsVersion = 9.2; + ProvisioningStyle = Manual; + }; + }; + }; + buildConfigurationList = 33CC10E82044A3C60003C045 /* Build configuration list for PBXProject "Runner" */; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 33CC10E42044A3C60003C045; + productRefGroup = 33CC10EE2044A3C60003C045 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 33CC10EC2044A3C60003C045 /* Runner */, + 331C80D4294CF70F00263BE5 /* RunnerTests */, + 33CC111A2044C6BA0003C045 /* Flutter Assemble */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 331C80D3294CF70F00263BE5 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 33CC10EB2044A3C60003C045 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */, + 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 3399D490228B24CF009A79C7 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "echo \"$PRODUCT_NAME.app\" > \"$PROJECT_DIR\"/Flutter/ephemeral/.app_filename && \"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh embed\n"; + }; + 33CC111E2044C6BF0003C045 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + Flutter/ephemeral/FlutterInputs.xcfilelist, + ); + inputPaths = ( + Flutter/ephemeral/tripwire, + ); + outputFileListPaths = ( + Flutter/ephemeral/FlutterOutputs.xcfilelist, + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 331C80D1294CF70F00263BE5 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 33CC10E92044A3C60003C045 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */, + 33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */, + 335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + 331C80DA294CF71000263BE5 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 33CC10EC2044A3C60003C045 /* Runner */; + targetProxy = 331C80D9294CF71000263BE5 /* PBXContainerItemProxy */; + }; + 33CC11202044C79F0003C045 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 33CC111A2044C6BA0003C045 /* Flutter Assemble */; + targetProxy = 33CC111F2044C79F0003C045 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin PBXVariantGroup section */ + 33CC10F42044A3C60003C045 /* MainMenu.xib */ = { + isa = PBXVariantGroup; + children = ( + 33CC10F52044A3C60003C045 /* Base */, + ); + name = MainMenu.xib; + path = Runner; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 331C80DB294CF71000263BE5 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.example.diceui.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/diceui.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/diceui"; + }; + name = Debug; + }; + 331C80DC294CF71000263BE5 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.example.diceui.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/diceui.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/diceui"; + }; + name = Release; + }; + 331C80DD294CF71000263BE5 /* Profile */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.example.diceui.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/diceui.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/diceui"; + }; + name = Profile; + }; + 338D0CE9231458BD00FA5F75 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.14; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = macosx; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + }; + name = Profile; + }; + 338D0CEA231458BD00FA5F75 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_VERSION = 5.0; + }; + name = Profile; + }; + 338D0CEB231458BD00FA5F75 /* Profile */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Manual; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Profile; + }; + 33CC10F92044A3C60003C045 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.14; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = macosx; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + }; + name = Debug; + }; + 33CC10FA2044A3C60003C045 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.14; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = macosx; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + }; + name = Release; + }; + 33CC10FC2044A3C60003C045 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + }; + name = Debug; + }; + 33CC10FD2044A3C60003C045 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_VERSION = 5.0; + }; + name = Release; + }; + 33CC111C2044C6BA0003C045 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Manual; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 33CC111D2044C6BA0003C045 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 331C80DB294CF71000263BE5 /* Debug */, + 331C80DC294CF71000263BE5 /* Release */, + 331C80DD294CF71000263BE5 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 33CC10E82044A3C60003C045 /* Build configuration list for PBXProject "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 33CC10F92044A3C60003C045 /* Debug */, + 33CC10FA2044A3C60003C045 /* Release */, + 338D0CE9231458BD00FA5F75 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 33CC10FC2044A3C60003C045 /* Debug */, + 33CC10FD2044A3C60003C045 /* Release */, + 338D0CEA231458BD00FA5F75 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 33CC111B2044C6BA0003C045 /* Build configuration list for PBXAggregateTarget "Flutter Assemble" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 33CC111C2044C6BA0003C045 /* Debug */, + 33CC111D2044C6BA0003C045 /* Release */, + 338D0CEB231458BD00FA5F75 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 33CC10E52044A3C60003C045 /* Project object */; +} diff --git a/packages/diceui/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/packages/diceui/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/packages/diceui/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/packages/diceui/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/diceui/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme new file mode 100644 index 0000000..fbf7999 --- /dev/null +++ b/packages/diceui/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/diceui/macos/Runner.xcworkspace/contents.xcworkspacedata b/packages/diceui/macos/Runner.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..1d526a1 --- /dev/null +++ b/packages/diceui/macos/Runner.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/packages/diceui/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/packages/diceui/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/packages/diceui/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/packages/diceui/macos/Runner/AppDelegate.swift b/packages/diceui/macos/Runner/AppDelegate.swift new file mode 100644 index 0000000..b3c1761 --- /dev/null +++ b/packages/diceui/macos/Runner/AppDelegate.swift @@ -0,0 +1,13 @@ +import Cocoa +import FlutterMacOS + +@main +class AppDelegate: FlutterAppDelegate { + override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool { + return true + } + + override func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool { + return true + } +} diff --git a/packages/diceui/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/packages/diceui/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000..a2ec33f --- /dev/null +++ b/packages/diceui/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,68 @@ +{ + "images" : [ + { + "size" : "16x16", + "idiom" : "mac", + "filename" : "app_icon_16.png", + "scale" : "1x" + }, + { + "size" : "16x16", + "idiom" : "mac", + "filename" : "app_icon_32.png", + "scale" : "2x" + }, + { + "size" : "32x32", + "idiom" : "mac", + "filename" : "app_icon_32.png", + "scale" : "1x" + }, + { + "size" : "32x32", + "idiom" : "mac", + "filename" : "app_icon_64.png", + "scale" : "2x" + }, + { + "size" : "128x128", + "idiom" : "mac", + "filename" : "app_icon_128.png", + "scale" : "1x" + }, + { + "size" : "128x128", + "idiom" : "mac", + "filename" : "app_icon_256.png", + "scale" : "2x" + }, + { + "size" : "256x256", + "idiom" : "mac", + "filename" : "app_icon_256.png", + "scale" : "1x" + }, + { + "size" : "256x256", + "idiom" : "mac", + "filename" : "app_icon_512.png", + "scale" : "2x" + }, + { + "size" : "512x512", + "idiom" : "mac", + "filename" : "app_icon_512.png", + "scale" : "1x" + }, + { + "size" : "512x512", + "idiom" : "mac", + "filename" : "app_icon_1024.png", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/packages/diceui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/packages/diceui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png new file mode 100644 index 0000000000000000000000000000000000000000..82b6f9d9a33e198f5747104729e1fcef999772a5 GIT binary patch literal 102994 zcmeEugo5nb1G~3xi~y`}h6XHx5j$(L*3|5S2UfkG$|UCNI>}4f?MfqZ+HW-sRW5RKHEm z^unW*Xx{AH_X3Xdvb%C(Bh6POqg==@d9j=5*}oEny_IS;M3==J`P0R!eD6s~N<36C z*%-OGYqd0AdWClO!Z!}Y1@@RkfeiQ$Ib_ z&fk%T;K9h`{`cX3Hu#?({4WgtmkR!u3ICS~|NqH^fdNz>51-9)OF{|bRLy*RBv#&1 z3Oi_gk=Y5;>`KbHf~w!`u}!&O%ou*Jzf|Sf?J&*f*K8cftMOKswn6|nb1*|!;qSrlw= zr-@X;zGRKs&T$y8ENnFU@_Z~puu(4~Ir)>rbYp{zxcF*!EPS6{(&J}qYpWeqrPWW< zfaApz%<-=KqxrqLLFeV3w0-a0rEaz9&vv^0ZfU%gt9xJ8?=byvNSb%3hF^X_n7`(fMA;C&~( zM$cQvQ|g9X)1AqFvbp^B{JEX$o;4iPi?+v(!wYrN{L}l%e#5y{j+1NMiT-8=2VrCP zmFX9=IZyAYA5c2!QO96Ea-6;v6*$#ZKM-`%JCJtrA3d~6h{u+5oaTaGE)q2b+HvdZ zvHlY&9H&QJ5|uG@wDt1h99>DdHy5hsx)bN`&G@BpxAHh$17yWDyw_jQhhjSqZ=e_k z_|r3=_|`q~uA47y;hv=6-o6z~)gO}ZM9AqDJsR$KCHKH;QIULT)(d;oKTSPDJ}Jx~G#w-(^r<{GcBC*~4bNjfwHBumoPbU}M)O za6Hc2ik)2w37Yyg!YiMq<>Aov?F2l}wTe+>h^YXcK=aesey^i)QC_p~S zp%-lS5%)I29WfywP(r4@UZ@XmTkqo51zV$|U|~Lcap##PBJ}w2b4*kt7x6`agP34^ z5fzu_8rrH+)2u*CPcr6I`gL^cI`R2WUkLDE5*PX)eJU@H3HL$~o_y8oMRoQ0WF9w| z6^HZDKKRDG2g;r8Z4bn+iJNFV(CG;K-j2>aj229gl_C6n12Jh$$h!}KVhn>*f>KcH z;^8s3t(ccVZ5<{>ZJK@Z`hn_jL{bP8Yn(XkwfRm?GlEHy=T($8Z1Mq**IM`zxN9>-yXTjfB18m_$E^JEaYn>pj`V?n#Xu;Z}#$- zw0Vw;T*&9TK$tKI7nBk9NkHzL++dZ^;<|F6KBYh2+XP-b;u`Wy{~79b%IBZa3h*3^ zF&BKfQ@Ej{7ku_#W#mNJEYYp=)bRMUXhLy2+SPMfGn;oBsiG_6KNL8{p1DjuB$UZB zA)a~BkL)7?LJXlCc}bB~j9>4s7tlnRHC5|wnycQPF_jLl!Avs2C3^lWOlHH&v`nGd zf&U!fn!JcZWha`Pl-B3XEe;(ks^`=Z5R zWyQR0u|do2`K3ec=YmWGt5Bwbu|uBW;6D8}J3{Uep7_>L6b4%(d=V4m#(I=gkn4HT zYni3cnn>@F@Wr<hFAY3Y~dW+3bte;70;G?kTn4Aw5nZ^s5|47 z4$rCHCW%9qa4)4vE%^QPMGf!ET!^LutY$G zqdT(ub5T5b+wi+OrV}z3msoy<4)`IPdHsHJggmog0K*pFYMhH!oZcgc5a)WmL?;TPSrerTVPp<#s+imF3v#!FuBNNa`#6 z!GdTCF|IIpz#(eV^mrYKThA4Bnv&vQet@%v9kuRu3EHx1-2-it@E`%9#u`)HRN#M? z7aJ{wzKczn#w^`OZ>Jb898^Xxq)0zd{3Tu7+{-sge-rQ z&0PME&wIo6W&@F|%Z8@@N3)@a_ntJ#+g{pUP7i?~3FirqU`rdf8joMG^ld?(9b7Iv z>TJgBg#)(FcW)h!_if#cWBh}f+V08GKyg|$P#KTS&%=!+0a%}O${0$i)kn9@G!}En zv)_>s?glPiLbbx)xk(lD-QbY(OP3;MSXM5E*P&_`Zks2@46n|-h$Y2L7B)iH{GAAq19h5-y0q>d^oy^y+soJu9lXxAe%jcm?=pDLFEG2kla40e!5a}mpe zdL=WlZ=@U6{>g%5a+y-lx)01V-x;wh%F{=qy#XFEAqcd+m}_!lQ)-9iiOL%&G??t| z?&NSdaLqdPdbQs%y0?uIIHY7rw1EDxtQ=DU!i{)Dkn~c$LG5{rAUYM1j5*G@oVn9~ zizz{XH(nbw%f|wI=4rw^6mNIahQpB)OQy10^}ACdLPFc2@ldVi|v@1nWLND?)53O5|fg`RZW&XpF&s3@c-R?aad!$WoH6u0B|}zt)L($E^@U- zO#^fxu9}Zw7Xl~nG1FVM6DZSR0*t!4IyUeTrnp@?)Z)*!fhd3)&s(O+3D^#m#bAem zpf#*aiG_0S^ofpm@9O7j`VfLU0+{$x!u^}3!zp=XST0N@DZTp!7LEVJgqB1g{psNr za0uVmh3_9qah14@M_pi~vAZ#jc*&aSm$hCNDsuQ-zPe&*Ii#2=2gP+DP4=DY z_Y0lUsyE6yaV9)K)!oI6+*4|spx2at*30CAx~6-5kfJzQ`fN8$!lz%hz^J6GY?mVH zbYR^JZ(Pmj6@vy-&!`$5soyy-NqB^8cCT40&R@|6s@m+ZxPs=Bu77-+Os7+bsz4nA3DrJ8#{f98ZMaj-+BD;M+Jk?pgFcZIb}m9N z{ct9T)Kye&2>l^39O4Q2@b%sY?u#&O9PO4@t0c$NUXG}(DZJ<;_oe2~e==3Z1+`Zo zFrS3ns-c}ZognVBHbg#e+1JhC(Yq7==rSJQ8J~}%94(O#_-zJKwnBXihl#hUd9B_>+T& z7eHHPRC?5ONaUiCF7w|{J`bCWS7Q&xw-Sa={j-f)n5+I=9s;E#fBQB$`DDh<^mGiF zu-m_k+)dkBvBO(VMe2O4r^sf3;sk9K!xgXJU>|t9Vm8Ty;fl5pZzw z9j|}ZD}6}t;20^qrS?YVPuPRS<39d^y0#O1o_1P{tN0?OX!lc-ICcHI@2#$cY}_CY zev|xdFcRTQ_H)1fJ7S0*SpPs8e{d+9lR~IZ^~dKx!oxz?=Dp!fD`H=LH{EeC8C&z-zK$e=!5z8NL=4zx2{hl<5z*hEmO=b-7(k5H`bA~5gT30Sjy`@-_C zKM}^so9Ti1B;DovHByJkTK87cfbF16sk-G>`Q4-txyMkyQS$d}??|Aytz^;0GxvOs zPgH>h>K+`!HABVT{sYgzy3CF5ftv6hI-NRfgu613d|d1cg^jh+SK7WHWaDX~hlIJ3 z>%WxKT0|Db1N-a4r1oPKtF--^YbP=8Nw5CNt_ZnR{N(PXI>Cm$eqi@_IRmJ9#)~ZHK_UQ8mi}w^`+4$OihUGVz!kW^qxnCFo)-RIDbA&k-Y=+*xYv5y4^VQ9S)4W5Pe?_RjAX6lS6Nz#!Hry=+PKx2|o_H_3M`}Dq{Bl_PbP(qel~P@=m}VGW*pK96 zI@fVag{DZHi}>3}<(Hv<7cVfWiaVLWr@WWxk5}GDEbB<+Aj;(c>;p1qmyAIj+R!`@#jf$ zy4`q23L-72Zs4j?W+9lQD;CYIULt%;O3jPWg2a%Zs!5OW>5h1y{Qof!p&QxNt5=T( zd5fy&7=hyq;J8%86YBOdc$BbIFxJx>dUyTh`L z-oKa=OhRK9UPVRWS`o2x53bAv+py)o)kNL6 z9W1Dlk-g6Ht@-Z^#6%`9S9`909^EMj?9R^4IxssCY-hYzei^TLq7Cj>z$AJyaU5=z zl!xiWvz0U8kY$etrcp8mL;sYqGZD!Hs-U2N{A|^oEKA482v1T%cs%G@X9M?%lX)p$ zZoC7iYTPe8yxY0Jne|s)fCRe1mU=Vb1J_&WcIyP|x4$;VSVNC`M+e#oOA`#h>pyU6 z?7FeVpk`Hsu`~T3i<_4<5fu?RkhM;@LjKo6nX>pa%8dSdgPO9~Jze;5r>Tb1Xqh5q z&SEdTXevV@PT~!O6z|oypTk7Qq+BNF5IQ(8s18c=^0@sc8Gi|3e>VKCsaZ?6=rrck zl@oF5Bd0zH?@15PxSJIRroK4Wa?1o;An;p0#%ZJ^tI=(>AJ2OY0GP$E_3(+Zz4$AQ zW)QWl<4toIJ5TeF&gNXs>_rl}glkeG#GYbHHOv-G!%dJNoIKxn)FK$5&2Zv*AFic! z@2?sY&I*PSfZ8bU#c9fdIJQa_cQijnj39-+hS@+~e*5W3bj%A}%p9N@>*tCGOk+cF zlcSzI6j%Q|2e>QG3A<86w?cx6sBtLNWF6_YR?~C)IC6_10SNoZUHrCpp6f^*+*b8` zlx4ToZZuI0XW1W)24)92S)y0QZa);^NRTX6@gh8@P?^=#2dV9s4)Q@K+gnc{6|C}& zDLHr7nDOLrsH)L@Zy{C_2UrYdZ4V{|{c8&dRG;wY`u>w%$*p>PO_}3`Y21pk?8Wtq zGwIXTulf7AO2FkPyyh2TZXM1DJv>hI`}x`OzQI*MBc#=}jaua&czSkI2!s^rOci|V zFkp*Vbiz5vWa9HPFXMi=BV&n3?1?%8#1jq?p^3wAL`jgcF)7F4l<(H^!i=l-(OTDE zxf2p71^WRIExLf?ig0FRO$h~aA23s#L zuZPLkm>mDwBeIu*C7@n@_$oSDmdWY7*wI%aL73t~`Yu7YwE-hxAATmOi0dmB9|D5a zLsR7OQcA0`vN9m0L|5?qZ|jU+cx3_-K2!K$zDbJ$UinQy<9nd5ImWW5n^&=Gg>Gsh zY0u?m1e^c~Ug39M{{5q2L~ROq#c{eG8Oy#5h_q=#AJj2Yops|1C^nv0D1=fBOdfAG z%>=vl*+_w`&M7{qE#$xJJp_t>bSh7Mpc(RAvli9kk3{KgG5K@a-Ue{IbU{`umXrR3ra5Y7xiX42+Q%N&-0#`ae_ z#$Y6Wa++OPEDw@96Zz##PFo9sADepQe|hUy!Zzc2C(L`k9&=a8XFr+!hIS>D2{pdGP1SzwyaGLiH3j--P>U#TWw90t8{8Bt%m7Upspl#=*hS zhy|(XL6HOqBW}Og^tLX7 z+`b^L{O&oqjwbxDDTg2B;Yh2(fW>%S5Pg8^u1p*EFb z`(fbUM0`afawYt%VBfD&b3MNJ39~Ldc@SAuzsMiN%E}5{uUUBc7hc1IUE~t-Y9h@e7PC|sv$xGx=hZiMXNJxz5V(np%6u{n24iWX#!8t#>Ob$in<>dw96H)oGdTHnU zSM+BPss*5)Wz@+FkooMxxXZP1{2Nz7a6BB~-A_(c&OiM)UUNoa@J8FGxtr$)`9;|O z(Q?lq1Q+!E`}d?KemgC!{nB1JJ!B>6J@XGQp9NeQvtbM2n7F%v|IS=XWPVZY(>oq$ zf=}8O_x`KOxZoGnp=y24x}k6?gl_0dTF!M!T`={`Ii{GnT1jrG9gPh)R=RZG8lIR| z{ZJ6`x8n|y+lZuy${fuEDTAf`OP!tGySLXD}ATJO5UoZv|Xo3%7O~L63+kw}v)Ci=&tWx3bQJfL@5O18CbPlkR^IcKA zy1=^Vl-K-QBP?9^R`@;czcUw;Enbbyk@vJQB>BZ4?;DM%BUf^eZE+sOy>a){qCY6Y znYy;KGpch-zf=5|p#SoAV+ie8M5(Xg-{FoLx-wZC9IutT!(9rJ8}=!$!h%!J+vE2e z(sURwqCC35v?1>C1L)swfA^sr16{yj7-zbT6Rf26-JoEt%U?+|rQ zeBuGohE?@*!zR9)1P|3>KmJSgK*fOt>N>j}LJB`>o(G#Dduvx7@DY7};W7K;Yj|8O zGF<+gTuoIKe7Rf+LQG3-V1L^|E;F*}bQ-{kuHq}| ze_NwA7~US19sAZ)@a`g*zkl*ykv2v3tPrb4Og2#?k6Lc7@1I~+ew48N&03hW^1Cx+ zfk5Lr4-n=#HYg<7ka5i>2A@ZeJ60gl)IDX!!p zzfXZQ?GrT>JEKl7$SH!otzK6=0dIlqN)c23YLB&Krf9v-{@V8p+-e2`ujFR!^M%*; ze_7(Jh$QgoqwB!HbX=S+^wqO15O_TQ0-qX8f-|&SOuo3ZE{{9Jw5{}>MhY}|GBhO& zv48s_B=9aYQfa;d>~1Z$y^oUUaDer>7ve5+Gf?rIG4GZ!hRKERlRNgg_C{W_!3tsI2TWbX8f~MY)1Q`6Wj&JJ~*;ay_0@e zzx+mE-pu8{cEcVfBqsnm=jFU?H}xj@%CAx#NO>3 z_re3Rq%d1Y7VkKy{=S73&p;4^Praw6Y59VCP6M?!Kt7{v#DG#tz?E)`K95gH_mEvb z%$<~_mQ$ad?~&T=O0i0?`YSp?E3Dj?V>n+uTRHAXn`l!pH9Mr}^D1d@mkf+;(tV45 zH_yfs^kOGLXlN*0GU;O&{=awxd?&`{JPRr$z<1HcAO2K`K}92$wC}ky&>;L?#!(`w z68avZGvb728!vgw>;8Z8I@mLtI`?^u6R>sK4E7%=y)jpmE$fH!Dj*~(dy~-2A5Cm{ zl{1AZw`jaDmfvaB?jvKwz!GC}@-Dz|bFm1OaPw(ia#?>vF7Y5oh{NVbyD~cHB1KFn z9C@f~X*Wk3>sQH9#D~rLPslAd26@AzMh=_NkH_yTNXx6-AdbAb z{Ul89YPHslD?xAGzOlQ*aMYUl6#efCT~WI zOvyiewT=~l1W(_2cEd(8rDywOwjM-7P9!8GCL-1<9KXXO=6%!9=W++*l1L~gRSxLVd8K=A7&t52ql=J&BMQu{fa6y zXO_e>d?4X)xp2V8e3xIQGbq@+vo#&n>-_WreTTW0Yr?|YRPP43cDYACMQ(3t6(?_k zfgDOAU^-pew_f5U#WxRXB30wcfDS3;k~t@b@w^GG&<5n$Ku?tT(%bQH(@UHQGN)N|nfC~7?(etU`}XB)$>KY;s=bYGY#kD%i9fz= z2nN9l?UPMKYwn9bX*^xX8Y@%LNPFU>s#Ea1DaP%bSioqRWi9JS28suTdJycYQ+tW7 zrQ@@=13`HS*dVKaVgcem-45+buD{B;mUbY$YYULhxK)T{S?EB<8^YTP$}DA{(&)@S zS#<8S96y9K2!lG^VW-+CkfXJIH;Vo6wh)N}!08bM$I7KEW{F6tqEQ?H@(U zAqfi%KCe}2NUXALo;UN&k$rU0BLNC$24T_mcNY(a@lxR`kqNQ0z%8m>`&1ro40HX} z{{3YQ;2F9JnVTvDY<4)x+88i@MtXE6TBd7POk&QfKU-F&*C`isS(T_Q@}K)=zW#K@ zbXpcAkTT-T5k}Wj$dMZl7=GvlcCMt}U`#Oon1QdPq%>9J$rKTY8#OmlnNWBYwafhx zqFnym@okL#Xw>4SeRFejBnZzY$jbO)e^&&sHBgMP%Ygfi!9_3hp17=AwLBNFTimf0 zw6BHNXw19Jg_Ud6`5n#gMpqe%9!QB^_7wAYv8nrW94A{*t8XZu0UT&`ZHfkd(F{Px zD&NbRJP#RX<=+sEeGs2`9_*J2OlECpR;4uJie-d__m*(aaGE}HIo+3P{my@;a~9Y$ zHBXVJ83#&@o6{M+pE9^lI<4meLLFN_3rwgR4IRyp)~OF0n+#ORrcJ2_On9-78bWbG zuCO0esc*n1X3@p1?lN{qWS?l7J$^jbpeel{w~51*0CM+q9@9X=>%MF(ce~om(}?td zjkUmdUR@LOn-~6LX#=@a%rvj&>DFEoQscOvvC@&ZB5jVZ-;XzAshwx$;Qf@U41W=q zOSSjQGQV8Qi3*4DngNMIM&Cxm7z*-K`~Bl(TcEUxjQ1c=?)?wF8W1g;bAR%sM#LK( z_Op?=P%)Z+J!>vpN`By0$?B~Out%P}kCriDq@}In&fa_ZyKV+nLM0E?hfxuu%ciUz z>yAk}OydbWNl7{)#112j&qmw;*Uj&B;>|;Qwfc?5wIYIHH}s6Mve@5c5r+y)jK9i( z_}@uC(98g)==AGkVN?4>o@w=7x9qhW^ zB(b5%%4cHSV?3M?k&^py)j*LK16T^Ef4tb05-h-tyrjt$5!oo4spEfXFK7r_Gfv7#x$bsR7T zs;dqxzUg9v&GjsQGKTP*=B(;)be2aN+6>IUz+Hhw-n>^|`^xu*xvjGPaDoFh2W4-n z@Wji{5Y$m>@Vt7TE_QVQN4*vcfWv5VY-dT0SV=l=8LAEq1go*f zkjukaDV=3kMAX6GAf0QOQHwP^{Z^=#Lc)sh`QB)Ftl&31jABvq?8!3bt7#8vxB z53M{4{GR4Hl~;W3r}PgXSNOt477cO62Yj(HcK&30zsmWpvAplCtpp&mC{`2Ue*Bwu zF&UX1;w%`Bs1u%RtGPFl=&sHu@Q1nT`z={;5^c^^S~^?2-?<|F9RT*KQmfgF!7=wD@hytxbD;=9L6PZrK*1<4HMObNWehA62DtTy)q5H|57 z9dePuC!1;0MMRRl!S@VJ8qG=v^~aEU+}2Qx``h1LII!y{crP2ky*R;Cb;g|r<#ryo zju#s4dE?5CTIZKc*O4^3qWflsQ(voX>(*_JP7>Q&$%zCAIBTtKC^JUi@&l6u&t0hXMXjz_y!;r@?k|OU9aD%938^TZ>V? zqJmom_6dz4DBb4Cgs_Ef@}F%+cRCR%UMa9pi<-KHN;t#O@cA%(LO1Rb=h?5jiTs93 zPLR78p+3t>z4|j=<>2i4b`ketv}9Ax#B0)hn7@bFl;rDfP8p7u9XcEb!5*PLKB(s7wQC2kzI^@ae)|DhNDmSy1bOLid%iIap@24A(q2XI!z_hkl-$1T10 z+KKugG4-}@u8(P^S3PW4x>an;XWEF-R^gB{`t8EiP{ZtAzoZ!JRuMRS__-Gg#Qa3{<;l__CgsF+nfmFNi}p z>rV!Y6B@cC>1up)KvaEQiAvQF!D>GCb+WZsGHjDeWFz?WVAHP65aIA8u6j6H35XNYlyy8>;cWe3ekr};b;$9)0G`zsc9LNsQ&D?hvuHRpBxH)r-1t9|Stc*u<}Ol&2N+wPMom}d15_TA=Aprp zjN-X3*Af$7cDWMWp##kOH|t;c2Pa9Ml4-)o~+7P;&q8teF-l}(Jt zTGKOQqJTeT!L4d}Qw~O0aanA$Vn9Rocp-MO4l*HK)t%hcp@3k0%&_*wwpKD6ThM)R z8k}&7?)YS1ZYKMiy?mn>VXiuzX7$Ixf7EW8+C4K^)m&eLYl%#T=MC;YPvD&w#$MMf zQ=>`@rh&&r!@X&v%ZlLF42L_c=5dSU^uymKVB>5O?AouR3vGv@ei%Z|GX5v1GK2R* zi!!}?+-8>J$JH^fPu@)E6(}9$d&9-j51T^n-e0Ze%Q^)lxuex$IL^XJ&K2oi`wG}QVGk2a7vC4X?+o^z zsCK*7`EUfSuQA*K@Plsi;)2GrayQOG9OYF82Hc@6aNN5ulqs1Of-(iZQdBI^U5of^ zZg2g=Xtad7$hfYu6l~KDQ}EU;oIj(3nO#u9PDz=eO3(iax7OCmgT2p_7&^3q zg7aQ;Vpng*)kb6=sd5?%j5Dm|HczSChMo8HHq_L8R;BR5<~DVyU$8*Tk5}g0eW5x7 z%d)JFZ{(Y<#OTKLBA1fwLM*fH7Q~7Sc2Ne;mVWqt-*o<;| z^1@vo_KTYaMnO$7fbLL+qh#R$9bvnpJ$RAqG+z8h|} z3F5iwG*(sCn9Qbyg@t0&G}3fE0jGq3J!JmG2K&$urx^$z95) z7h?;4vE4W=v)uZ*Eg3M^6f~|0&T)2D;f+L_?M*21-I1pnK(pT$5l#QNlT`SidYw~o z{`)G)Asv#cue)Ax1RNWiRUQ(tQ(bzd-f2U4xlJK+)ZWBxdq#fp=A>+Qc%-tl(c)`t z$e2Ng;Rjvnbu7((;v4LF9Y1?0el9hi!g>G{^37{ z`^s-03Z5jlnD%#Mix19zkU_OS|86^_x4<0(*YbPN}mi-$L?Z4K(M|2&VV*n*ZYN_UqI?eKZi3!b)i z%n3dzUPMc-dc|q}TzvPy!VqsEWCZL(-eURDRG4+;Eu!LugSSI4Fq$Ji$Dp08`pfP_C5Yx~`YKcywlMG;$F z)R5!kVml_Wv6MSpeXjG#g?kJ0t_MEgbXlUN3k|JJ%N>|2xn8yN>>4qxh!?dGI}s|Y zDTKd^JCrRSN+%w%D_uf=Tj6wIV$c*g8D96jb^Kc#>5Fe-XxKC@!pIJw0^zu;`_yeb zhUEm-G*C=F+jW%cP(**b61fTmPn2WllBr4SWNdKe*P8VabZsh0-R|?DO=0x`4_QY) zR7sthW^*BofW7{Sak&S1JdiG?e=SfL24Y#w_)xrBVhGB-13q$>mFU|wd9Xqe-o3{6 zSn@@1@&^)M$rxb>UmFuC+pkio#T;mSnroMVZJ%nZ!uImi?%KsIX#@JU2VY(`kGb1A z7+1MEG)wd@)m^R|a2rXeviv$!emwcY(O|M*xV!9%tBzarBOG<4%gI9SW;Um_gth4=gznYzOFd)y8e+3APCkL)i-OI`;@7-mCJgE`js(M} z;~ZcW{{FMVVO)W>VZ}ILouF#lWGb%Couu}TI4kubUUclW@jEn6B_^v!Ym*(T*4HF9 zWhNKi8%sS~viSdBtnrq!-Dc5(G^XmR>DFx8jhWvR%*8!m*b*R8e1+`7{%FACAK`7 zzdy8TmBh?FVZ0vtw6npnWwM~XjF2fNvV#ZlGG z?FxHkXHN>JqrBYoPo$)zNC7|XrQfcqmEXWud~{j?La6@kbHG@W{xsa~l1=%eLly8B z4gCIH05&Y;6O2uFSopNqP|<$ml$N40^ikxw0`o<~ywS1(qKqQN!@?Ykl|bE4M?P+e zo$^Vs_+x)iuw?^>>`$&lOQOUkZ5>+OLnRA)FqgpDjW&q*WAe(_mAT6IKS9;iZBl8M z<@=Y%zcQUaSBdrs27bVK`c$)h6A1GYPS$y(FLRD5Yl8E3j0KyH08#8qLrsc_qlws; znMV%Zq8k+&T2kf%6ZO^2=AE9>?a587g%-={X}IS~P*I(NeCF9_9&`)|ok0iiIun zo+^odT0&Z4k;rn7I1v87=z!zKU(%gfB$(1mrRYeO$sbqM22Kq68z9wgdg8HBxp>_< zn9o%`f?sVO=IN#5jSX&CGODWlZfQ9A)njK2O{JutYwRZ?n0G_p&*uwpE`Md$iQxrd zoQfF^b8Ou)+3BO_3_K5y*~?<(BF@1l+@?Z6;^;U>qlB)cdro;rxOS1M{Az$s^9o5sXDCg8yD<=(pKI*0e zLk>@lo#&s0)^*Q+G)g}C0IErqfa9VbL*Qe=OT@&+N8m|GJF7jd83vY#SsuEv2s{Q> z>IpoubNs>D_5?|kXGAPgF@mb_9<%hjU;S0C8idI)a=F#lPLuQJ^7OnjJlH_Sks9JD zMl1td%YsWq3YWhc;E$H1<0P$YbSTqs`JKY%(}svsifz|h8BHguL82dBl+z0^YvWk8 zGy;7Z0v5_FJ2A$P0wIr)lD?cPR%cz>kde!=W%Ta^ih+Dh4UKdf7ip?rBz@%y2&>`6 zM#q{JXvW9ZlaSk1oD!n}kSmcDa2v6T^Y-dy+#fW^y>eS8_%<7tWXUp8U@s$^{JFfKMjDAvR z$YmVB;n3ofl!ro9RNT!TpQpcycXCR}$9k5>IPWDXEenQ58os?_weccrT+Bh5sLoiH zZ_7~%t(vT)ZTEO= zb0}@KaD{&IyK_sd8b$`Qz3%UA`nSo zn``!BdCeN!#^G;lK@G2ron*0jQhbdw)%m$2;}le@z~PSLnU-z@tL)^(p%P>OO^*Ff zNRR9oQ`W+x^+EU+3BpluwK77|B3=8QyT|$V;02bn_LF&3LhLA<#}{{)jE)}CiW%VEU~9)SW+=F%7U-iYlQ&q!#N zwI2{(h|Pi&<8_fqvT*}FLN^0CxN}#|3I9G_xmVg$gbn2ZdhbmGk7Q5Q2Tm*ox8NMo zv`iaZW|ZEOMyQga5fts?&T-eCCC9pS0mj7v0SDkD=*^MxurP@89v&Z#3q{FM!a_nr zb?KzMv`BBFOew>4!ft@A&(v-kWXny-j#egKef|#!+3>26Qq0 zv!~8ev4G`7Qk>V1TaMT-&ziqoY3IJp8_S*%^1j73D|=9&;tDZH^!LYFMmME4*Wj(S zRt~Q{aLb_O;wi4u&=}OYuj}Lw*j$@z*3>4&W{)O-oi@9NqdoU!=U%d|se&h?^$Ip# z)BY+(1+cwJz!yy4%l(aLC;T!~Ci>yAtXJb~b*yr&v7f{YCU8P|N1v~H`xmGsG)g)y z4%mv=cPd`s7a*#OR7f0lpD$ueP>w8qXj0J&*7xX+U!uat5QNk>zwU$0acn5p=$88L=jn_QCSYkTV;1~(yUem#0gB`FeqY98sf=>^@ z_MCdvylv~WL%y_%y_FE1)j;{Szj1+K7Lr_y=V+U zk6Tr;>XEqlEom~QGL!a+wOf(@ZWoxE<$^qHYl*H1a~kk^BLPn785%nQb$o;Cuz0h& za9LMx^bKEbPS%e8NM33Jr|1T|ELC(iE!FUci38xW_Y7kdHid#2ie+XZhP;2!Z;ZAM zB_cXKm)VrPK!SK|PY00Phwrpd+x0_Aa;}cDQvWKrwnQrqz##_gvHX2ja?#_{f#;bz`i>C^^ zTLDy;6@HZ~XQi7rph!mz9k!m;KchA)uMd`RK4WLK7)5Rl48m#l>b(#`WPsl<0j z-sFkSF6>Nk|LKnHtZ`W_NnxZP62&w)S(aBmmjMDKzF%G;3Y?FUbo?>b5;0j8Lhtc4 zr*8d5Y9>g@FFZaViw7c16VsHcy0u7M%6>cG1=s=Dtx?xMJSKIu9b6GU8$uSzf43Y3 zYq|U+IWfH;SM~*N1v`KJo!|yfLxTFS?oHsr3qvzeVndVV^%BWmW6re_S!2;g<|Oao z+N`m#*i!)R%i1~NO-xo{qpwL0ZrL7hli;S z3L0lQ_z}z`fdK39Mg~Zd*%mBdD;&5EXa~@H(!###L`ycr7gW`f)KRuqyHL3|uyy3h zSS^td#E&Knc$?dXs*{EnPYOp^-vjAc-h4z#XkbG&REC7;0>z^^Z}i8MxGKerEY z>l?(wReOlXEsNE5!DO&ZWyxY)gG#FSZs%fXuzA~XIAPVp-%yb2XLSV{1nH6{)5opg z(dZKckn}Q4Li-e=eUDs1Psg~5zdn1>ql(*(nn6)iD*OcVkwmKL(A{fix(JhcVB&}V zVt*Xb!{gzvV}dc446>(D=SzfCu7KB`oMjv6kPzSv&B>>HLSJP|wN`H;>oRw*tl#N) z*zZ-xwM7D*AIsBfgqOjY1Mp9aq$kRa^dZU_xw~KxP;|q(m+@e+YSn~`wEJzM|Ippb zzb@%;hB7iH4op9SqmX?j!KP2chsb79(mFossBO-Zj8~L}9L%R%Bw<`^X>hjkCY5SG z7lY!8I2mB#z)1o;*3U$G)3o0A&{0}#B;(zPd2`OF`Gt~8;0Re8nIseU z_yzlf$l+*-wT~_-cYk$^wTJ@~7i@u(CZs9FVkJCru<*yK8&>g+t*!JqCN6RH%8S-P zxH8+Cy#W?!;r?cLMC(^BtAt#xPNnwboI*xWw#T|IW^@3|q&QYY6Ehxoh@^URylR|T zne-Y6ugE^7p5bkRDWIh)?JH5V^ub82l-LuVjDr7UT^g`q4dB&mBFRWGL_C?hoeL(% zo}ocH5t7|1Mda}T!^{Qt9vmA2ep4)dQSZO>?Eq8}qRp&ZJ?-`Tnw+MG(eDswP(L*X3ahC2Ad0_wD^ff9hfzb%Jd`IXx5 zae@NMzBXJDwJS?7_%!TB^E$N8pvhOHDK$7YiOelTY`6KX8hK6YyT$tk*adwN>s^Kp zwM3wGVPhwKU*Yq-*BCs}l`l#Tej(NQ>jg*S0TN%D+GcF<14Ms6J`*yMY;W<-mMN&-K>((+P}+t+#0KPGrzjP zJ~)=Bcz%-K!L5ozIWqO(LM)l_9lVOc4*S65&DKM#TqsiWNG{(EZQw!bc>qLW`=>p-gVJ;T~aN2D_- z{>SZC=_F+%hNmH6ub%Ykih0&YWB!%sd%W5 zHC2%QMP~xJgt4>%bU>%6&uaDtSD?;Usm}ari0^fcMhi_)JZgb1g5j zFl4`FQ*%ROfYI}e7RIq^&^a>jZF23{WB`T>+VIxj%~A-|m=J7Va9FxXV^%UwccSZd zuWINc-g|d6G5;95*%{e;9S(=%yngpfy+7ao|M7S|Jb0-4+^_q-uIqVS&ufU880UDH*>(c)#lt2j zzvIEN>>$Y(PeALC-D?5JfH_j+O-KWGR)TKunsRYKLgk7eu4C{iF^hqSz-bx5^{z0h ze2+u>Iq0J4?)jIo)}V!!m)%)B;a;UfoJ>VRQ*22+ncpe9f4L``?v9PH&;5j{WF?S_C>Lq>nkChZB zjF8(*v0c(lU^ZI-)_uGZnnVRosrO4`YinzI-RSS-YwjYh3M`ch#(QMNw*)~Et7Qpy z{d<3$4FUAKILq9cCZpjvKG#yD%-juhMj>7xIO&;c>_7qJ%Ae8Z^m)g!taK#YOW3B0 zKKSMOd?~G4h}lrZbtPk)n*iOC1~mDhASGZ@N{G|dF|Q^@1ljhe=>;wusA&NvY*w%~ zl+R6B^1yZiF)YN>0ms%}qz-^U-HVyiN3R9k1q4)XgDj#qY4CE0)52%evvrrOc898^ z*^)XFR?W%g0@?|6Mxo1ZBp%(XNv_RD-<#b^?-Fs+NL^EUW=iV|+Vy*F%;rBz~pN7%-698U-VMfGEVnmEz7fL1p)-5sLT zL;Iz>FCLM$p$c}g^tbkGK1G$IALq1Gd|We@&TtW!?4C7x4l*=4oF&&sr0Hu`x<5!m zhX&&Iyjr?AkNXU_5P_b^Q3U9sy#f6ZF@2C96$>1k*E-E%DjwvA{VL0PdU~suN~DZo zm{T!>sRdp`Ldpp9olrH@(J$QyGq!?#o1bUo=XP2OEuT3`XzI>s^0P{manUaE4pI%! zclQq;lbT;nx7v3tR9U)G39h?ryrxzd0xq4KX7nO?piJZbzT_CU&O=T(Vt;>jm?MgC z2vUL#*`UcMsx%w#vvjdamHhmN!(y-hr~byCA-*iCD};#l+bq;gkwQ0oN=AyOf@8ow>Pj<*A~2*dyjK}eYdN);%!t1 z6Y=|cuEv-|5BhA?n2Db@4s%y~(%Wse4&JXw=HiO48%c6LB~Z0SL1(k^9y?ax%oj~l zf7(`iAYLdPRq*ztFC z7VtAb@s{as%&Y;&WnyYl+6Wm$ru*u!MKIg_@01od-iQft0rMjIj8e7P9eKvFnx_X5 zd%pDg-|8<>T2Jdqw>AII+fe?CgP+fL(m0&U??QL8YzSjV{SFi^vW~;wN@or_(q<0Y zRt~L}#JRcHOvm$CB)T1;;7U>m%)QYBLTR)KTARw%zoDxgssu5#v{UEVIa<>{8dtkm zXgbCGp$tfue+}#SD-PgiNT{Zu^YA9;4BnM(wZ9-biRo_7pN}=aaimjYgC=;9@g%6< zxol5sT_$<8{LiJ6{l1+sV)Z_QdbsfEAEMw!5*zz6)Yop?T0DMtR_~wfta)E6_G@k# zZRP11D}$ir<`IQ`<(kGfAS?O-DzCyuzBq6dxGTNNTK?r^?zT30mLY!kQ=o~Hv*k^w zvq!LBjW=zzIi%UF@?!g9vt1CqdwV(-2LYy2=E@Z?B}JDyVkluHtzGsWuI1W5svX~K z&?UJ45$R7g>&}SFnLnmw09R2tUgmr_w6mM9C}8GvQX>nL&5R#xBqnp~Se(I>R42`T zqZe9p6G(VzNB3QD><8+y%{e%6)sZDRXTR|MI zM#eZmao-~_`N|>Yf;a;7yvd_auTG#B?Vz5D1AHx=zpVUFe7*hME z+>KH5h1In8hsVhrstc>y0Q!FHR)hzgl+*Q&5hU9BVJlNGRkXiS&06eOBV^dz3;4d5 zeYX%$62dNOprZV$px~#h1RH?_E%oD6y;J;pF%~y8M)8pQ0olYKj6 zE+hd|7oY3ot=j9ZZ))^CCPADL6Jw%)F@A{*coMApcA$7fZ{T@3;WOQ352F~q6`Mgi z$RI6$8)a`Aaxy<8Bc;{wlDA%*%(msBh*xy$L-cBJvQ8hj#FCyT^%+Phw1~PaqyDou^JR0rxDkSrmAdjeYDFDZ`E z)G3>XtpaSPDlydd$RGHg;#4|4{aP5c_Om z2u5xgnhnA)K%8iU==}AxPxZCYC)lyOlj9as#`5hZ=<6<&DB%i_XCnt5=pjh?iusH$ z>)E`@HNZcAG&RW3Ys@`Ci{;8PNzE-ZsPw$~Wa!cP$ye+X6;9ceE}ah+3VY7Mx}#0x zbqYa}eO*FceiY2jNS&2cH9Y}(;U<^^cWC5Ob&)dZedvZA9HewU3R;gRQ)}hUdf+~Q zS_^4ds*W1T#bxS?%RH&<739q*n<6o|mV;*|1s>ly-Biu<2*{!!0#{_234&9byvn0* z5=>{95Zfb{(?h_Jk#ocR$FZ78O*UTOxld~0UF!kyGM|nH%B*qf)Jy}N!uT9NGeM19 z-@=&Y0yGGo_dw!FD>juk%P$6$qJkj}TwLBoefi;N-$9LAeV|)|-ET&culW9Sb_pc_ zp{cXI0>I0Jm_i$nSvGnYeLSSj{ccVS2wyL&0x~&5v;3Itc82 z5lIAkfn~wcY-bQB$G!ufWt%qO;P%&2B_R5UKwYxMemIaFm)qF1rA zc>gEihb=jBtsXCi0T%J37s&kt*3$s7|6)L(%UiY)6axuk{6RWIS8^+u;)6!R?Sgap z9|6<0bx~AgVi|*;zL@2x>Pbt2Bz*uv4x-`{F)XatTs`S>unZ#P^ZiyjpfL_q2z^fqgR-fbOcG=Y$q>ozkw1T6dH8-)&ww+z?E0 zR|rV(9bi6zpX3Ub>PrPK!{X>e$C66qCXAeFm)Y+lX8n2Olt7PNs*1^si)j!QmFV#t z0P2fyf$N^!dyTot&`Ew5{i5u<8D`8U`qs(KqaWq5iOF3x2!-z65-|HsyYz(MAKZ?< zCpQR;E)wn%s|&q(LVm0Ab>gdmCFJeKwVTnv@Js%!At;I=A>h=l=p^&<4;Boc{$@h< z38v`3&2wJtka@M}GS%9!+SpJ}sdtoYzMevVbnH+d_eMxN@~~ zZq@k)7V5f8u!yAX2qF3qjS7g%n$JuGrMhQF!&S^7(%Y{rP*w2FWj(v_J{+Hg*}wdWOd~pHQ19&n3RWeljK9W%sz&Y3Tm3 zR`>6YR54%qBHGa)2xbs`9cs_EsNHxsfraEgZ)?vrtooeA0sPKJK7an){ngtV@{SBa zkO6ORr1_Xqp+`a0e}sC*_y(|RKS13ikmHp3C^XkE@&wjbGWrt^INg^9lDz#B;bHiW zkK4{|cg08b!yHFSgPca5)vF&gqCgeu+c82%&FeM^Bb}GUxLy-zo)}N;#U?sJ2?G2BNe*9u_7kE5JeY!it=f`A_4gV3} z`M!HXZy#gN-wS!HvHRqpCHUmjiM;rVvpkC!voImG%OFVN3k(QG@X%e``VJSJ@Z7tb z*Onlf>z^D+&$0!4`IE$;2-NSO9HQWd+UFW(r;4hh;(j^p4H-~6OE!HQp^96v?{9Zt z;@!ZcccV%C2s6FMP#qvo4kG6C04A>XILt>JW}%0oE&HM5f6 zYLD!;My>CW+j<~=Wzev{aYtx2ZNw|ptTFV(4;9`6Tmbz6K1)fv4qPXa2mtoPt&c?P zhmO+*o8uP3ykL6E$il00@TDf6tOW7fmo?Oz_6GU^+5J=c22bWyuH#aNj!tT-^IHrJ zu{aqTYw@q;&$xDE*_kl50Jb*dp`(-^p={z}`rqECTi~3 z>0~A7L6X)=L5p#~$V}gxazgGT7$3`?a)zen>?TvAuQ+KAIAJ-s_v}O6@`h9n-sZk> z`3{IJeb2qu9w=P*@q>iC`5wea`KxCxrx{>(4{5P+!cPg|pn~;n@DiZ0Y>;k5mnKeS z!LIfT4{Lgd=MeysR5YiQKCeNhUQ;Os1kAymg6R!u?j%LF z4orCszIq_n52ulpes{(QN|zirdtBsc{9^Z72Ycb2ht?G^opkT_#|4$wa9`)8k3ilU z%ntAi`nakS1r10;#k^{-ZGOD&Z2|k=p40hRh5D7(&JG#Cty|ECOvwsSHkkSa)36$4 z?;v#%@D(=Raw(HP5s>#4Bm?f~n1@ebH}2tv#7-0l-i^H#H{PC|F@xeNS+Yw{F-&wH z07)bj8MaE6`|6NoqKM~`4%X> zKFl&7g1$Z3HB>lxn$J`P`6GSb6CE6_^NA1V%=*`5O!zP$a7Vq)IwJAki~XBLf=4TF zPYSL}>4nOGZ`fyHChq)jy-f{PKFp6$plHB2=;|>%Z^%)ecVue(*mf>EH_uO^+_zm? zJATFa9SF~tFwR#&0xO{LLf~@}s_xvCPU8TwIJgBs%FFzjm`u?1699RTui;O$rrR{# z1^MqMl5&6)G%@_k*$U5Kxq84!AdtbZ!@8FslBML}<`(Jr zenXrC6bFJP=R^FMBg7P?Pww-!a%G@kJH_zezKvuWU0>m1uyy}#Vf<$>u?Vzo3}@O% z1JR`B?~Tx2)Oa|{DQ_)y9=oY%haj!80GNHw3~qazgU-{|q+Bl~H94J!a%8UR?XsZ@ z0*ZyQugyru`V9b(0OrJOKISfi89bSVR zQy<+i_1XY}4>|D%X_`IKZUPz6=TDb)t1mC9eg(Z=tv zq@|r37AQM6A%H%GaH3szv1L^ku~H%5_V*fv$UvHl*yN4iaqWa69T2G8J2f3kxc7UE zOia@p0YNu_q-IbT%RwOi*|V|&)e5B-u>4=&n@`|WzH}BK4?33IPpXJg%`b=dr_`hU z8JibW_3&#uIN_#D&hX<)x(__jUT&lIH$!txEC@cXv$7yB&Rgu){M`9a`*PH} zRcU)pMWI2O?x;?hzR{WdzKt^;_pVGJAKKd)F$h;q=Vw$MP1XSd<;Mu;EU5ffyKIg+ z&n-Nb?h-ERN7(fix`htopPIba?0Gd^y(4EHvfF_KU<4RpN0PgVxt%7Yo99X*Pe|zR z?ytK&5qaZ$0KSS$3ZNS$$k}y(2(rCl=cuYZg{9L?KVgs~{?5adxS))Upm?LDo||`H zV)$`FF3icFmxcQshXX*1k*w3O+NjBR-AuE70=UYM*7>t|I-oix=bzDwp2*RoIwBp@r&vZukG; zyi-2zdyWJ3+E?{%?>e2Ivk`fAn&Ho(KhGSVE4C-zxM-!j01b~mTr>J|5={PrZHOgO zw@ND3=z(J7D>&C7aw{zT>GHhL2BmUX0GLt^=31RRPSnjoUO9LYzh_yegyPoAKhAQE z>#~O27dR4&LdQiak6={9_{LN}Z>;kyVYKH^d^*!`JVSXJlx#&r4>VnP$zb{XoTb=> zZsLvh>keP3fkLTIDdpf-@(ADfq4=@X=&n>dyU0%dwD{zsjCWc;r`-e~X$Q3NTz_TJ zOXG|LMQQIjGXY3o5tBm9>k6y<6XNO<=9H@IXF;63rzsC=-VuS*$E{|L_i;lZmHOD< zY92;>4spdeRn4L6pY4oUKZG<~+8U-q7ZvNOtW0i*6Q?H`9#U3M*k#4J;ek(MwF02x zUo1wgq9o6XG#W^mxl>pAD)Ll-V5BNsdVQ&+QS0+K+?H-gIBJ-ccB1=M_hxB6qcf`C zJ?!q!J4`kLhAMry4&a_0}up{CFevcjBl|N(uDM^N5#@&-nQt2>z*U}eJGi}m5f}l|IRVj-Q;a>wcLpK5RRWJ> zysdd$)Nv0tS?b~bw1=gvz3L_ZAIdDDPj)y|bp1;LE`!av!rODs-tlc}J#?erTgXRX z$@ph%*~_wr^bQYHM7<7=Q=45v|Hk7T=mDpW@OwRy3A_v`ou@JX5h!VI*e((v*5Aq3 zVYfB4<&^Dq5%^?~)NcojqK`(VXP$`#w+&VhQOn%;4pCkz;NEH6-FPHTQ+7I&JE1+Ozq-g43AEZV>ceQ^9PCx zZG@OlEF~!Lq@5dttlr%+gNjRyMwJdJU(6W_KpuVnd{3Yle(-p#6erIRc${l&qx$HA z89&sp=rT7MJ=DuTL1<5{)wtUfpPA|Gr6Q2T*=%2RFm@jyo@`@^*{5{lFPgv>84|pv z%y{|cVNz&`9C*cUely>-PRL)lHVErAKPO!NQ3<&l5(>Vp(MuJnrOf^4qpIa!o3D7( z1bjn#Vv$#or|s7Hct5D@%;@48mM%ISY7>7@ft8f?q~{s)@BqGiupoK1BAg?PyaDQ1 z`YT8{0Vz{zBwJ={I4)#ny{RP{K1dqzAaQN_aaFC%Z>OZ|^VhhautjDavGtsQwx@WH zr|1UKk^+X~S*RjCY_HN!=Jx>b6J8`Q(l4y|mc<6jnkHVng^Wk(A13-;AhawATsmmE#H%|8h}f1frs2x@Fwa_|ea+$tdG2Pz{7 z!ox^w^>^Cv4e{Xo7EQ7bxCe8U+LZG<_e$RnR?p3t?s^1Mb!ieB z#@45r*PTc_yjh#P=O8Zogo+>1#|a2nJvhOjIqKK1U&6P)O%5s~M;99O<|Y9zomWTL z666lK^QW`)cXV_^Y05yQZH3IRCW%25BHAM$c0>w`x!jh^15Zp6xYb!LoQ zr+RukTw0X2mxN%K0%=8|JHiaA3pg5+GMfze%9o5^#upx0M?G9$+P^DTx7~qq9$Qoi zV$o)yy zuUq>3c{_q+HA5OhdN*@*RkxRuD>Bi{Ttv_hyaaB;XhB%mJ2Cb{yL;{Zu@l{N?!GKE7es6_9J{9 zO(tmc0ra2;@oC%SS-8|D=omQ$-Dj>S)Utkthh{ovD3I%k}HoranSepC_yco2Q8 zY{tAuPIhD{X`KbhQIr%!t+GeH%L%q&p z3P%<-S0YY2Emjc~Gb?!su85}h_qdu5XN2XJUM}X1k^!GbwuUPT(b$Ez#LkG6KEWQB z7R&IF4srHe$g2R-SB;inW9T{@+W+~wi7VQd?}7||zi!&V^~o0kM^aby7YE_-B63^d zf_uo8#&C77HBautt_YH%v6!Q>H?}(0@4pv>cM6_7dHJ)5JdyV0Phi!)vz}dv{*n;t zf(+#Hdr=f8DbJqbMez)(n>@QT+amJ7g&w6vZ-vG^H1v~aZqG~u!1D(O+jVAG0EQ*aIsr*bsBdbD`)i^FNJ z&B@yxqPFCRGT#}@dmu-{0vp47xk(`xNM6E=7QZ5{tg6}#zFrd8Pb_bFg7XP{FsYP8 zbvWqG6#jfg*4gvY9!gJxJ3l2UjP}+#QMB(*(?Y&Q4PO`EknE&Cb~Yb@lCbk;-KY)n zzbjS~W5KZ3FV%y>S#$9Sqi$FIBCw`GfPDP|G=|y32VV-g@a1D&@%_oAbB@cAUx#aZ zlAPTJ{iz#Qda8(aNZE&0q+8r3&z_Ln)b=5a%U|OEcc3h1f&8?{b8ErEbilrun}mh3 z$1o^$-XzIiH|iGoJA`w`o|?w3m*NX|sd$`Mt+f*!hyJvQ2fS*&!SYn^On-M|pHGlu z4SC5bM7f6BAkUhGuN*w`97LLkbCx=p@K5RL2p>YpDtf{WTD|d3ucb6iVZ-*DRtoEA zCC5(x)&e=giR_id>5bE^l%Mxx>0@FskpCD4oq@%-Fg$8IcdRwkfn;DsjoX(v;mt3d z_4Mnf#Ft4x!bY!7Hz?RRMq9;5FzugD(sbt4up~6j?-or+ch~y_PqrM2hhTToJjR_~ z)E1idgt7EW>G*9%Q^K;o_#uFjX!V2pwfpgi>}J&p_^QlZki!@#dkvR`p?bckC`J*g z=%3PkFT3HAX2Q+dShHUbb1?ZcK8U7oaufLTCB#1W{=~k0Jabgv>q|H+GU=f-y|{p4 zwN|AE+YbCgx=7vlXE?@gkXW9PaqbO#GB=4$o0FkNT#EI?aLVd2(qnPK$Yh%YD%v(mdwn}bgsxyIBI^)tY?&G zi^2JfClZ@4b{xFjyTY?D61w@*ez2@5rWLpG#34id?>>oPg{`4F-l`7Lg@D@Hc}On} zx%BO4MsLYosLGACJ-d?ifZ35r^t*}wde>AAWO*J-X%jvD+gL9`u`r=kP zyeJ%FqqKfz8e_3K(M1RmB?gIYi{W7Z<THP2ihue0mbpu5n(x_l|e1tw(q!#m5lmef6ktqIb${ zV+ee#XRU}_dDDUiV@opHZ@EbQ<9qIZJMDsZDkW0^t3#j`S)G#>N^ZBs8k+FJhAfu< z%u!$%dyP3*_+jUvCf-%{x#MyDAK?#iPfE<(@Q0H7;a125eD%I(+!x1f;Sy`e<9>nm zQH4czZDQmW7^n>jL)@P@aAuAF$;I7JZE5a8~AJI5CNDqyf$gjloKR7C?OPt9yeH}n5 zNF8Vhmd%1O>T4EZD&0%Dt7YWNImmEV{7QF(dy!>q5k>Kh&Xy8hcBMUvVV~Xn8O&%{ z&q=JCYw#KlwM8%cu-rNadu(P~i3bM<_a{3!J*;vZhR6dln6#eW0^0kN)Vv3!bqM`w z{@j*eyzz=743dgFPY`Cx3|>ata;;_hQ3RJd+kU}~p~aphRx`03B>g4*~f%hUV+#D9rYRbsGD?jkB^$3XcgB|3N1L& zrmk9&Dg450mAd=Q_p?gIy5Zx7vRL?*rpNq76_rysFo)z)tp0B;7lSb9G5wX1vC9Lc z5Q8tb-alolVNWFsxO_=12o}X(>@Mwz1mkYh1##(qQwN=7VKz?61kay8A9(94Ky(4V zq6qd2+4a20Z0QRrmp6C?4;%U?@MatfXnkj&U6bP_&2Ny}BF%4{QhNx*Tabik9Y-~Z z@0WV6XD}aI(%pN}oW$X~Qo_R#+1$@J8(31?zM`#e`#(0f<-AZ^={^NgH#lc?oi(Mu zMk|#KR^Q;V@?&(sh5)D;-fu)rx%gXZ1&5)MR+Mhssy+W>V%S|PRNyTAd}74<(#J>H zR(1BfM%eIv0+ngHH6(i`?-%_4!6PpK*0X)79SX0X$`lv_q>9(E2kkkP;?c@rW2E^Q zs<;`9dg|lDMNECFrD3jTM^Mn-C$44}9d9Kc z#>*k&e#25;D^%82^1d@Yt{Y91MbEu0C}-;HR4+IaCeZ`l?)Q8M2~&E^FvJ?EBJJ(% zz1>tCW-E~FB}DI}z#+fUo+=kQME^=eH>^%V8w)dh*ugPFdhMUi3R2Cg}Zak4!k_8YW(JcR-)hY8C zXja}R7@%Q0&IzQTk@M|)2ViZDNCDRLNI)*lH%SDa^2TG4;%jE4n`8`aQAA$0SPH2@ z)2eWZuP26+uGq+m8F0fZn)X^|bNe z#f{qYZS!(CdBdM$N2(JH_a^b#R2=>yVf%JI_ieRFB{w&|o9txwMrVxv+n78*aXFGb z>Rkj2yq-ED<)A46T9CL^$iPynv`FoEhUM10@J+UZ@+*@_gyboQ>HY9CiwTUo7OM=w zd~$N)1@6U8H#Zu(wGLa_(Esx%h@*pmm5Y9OX@CY`3kPYPQx@z8yAgtm(+agDU%4?c zy8pR4SYbu8vY?JX6HgVq7|f=?w(%`m-C+a@E{euXo>XrGmkmFGzktI*rj*8D z)O|CHKXEzH{~iS+6)%ybRD|JRQ6j<+u_+=SgnJP%K+4$st+~XCVcAjI9e5`RYq$n{ zzy!X9Nv7>T4}}BZpSj9G9|(4ei-}Du<_IZw+CB`?fd$w^;=j8?vlp(#JOWiHaXJjB0Q00RHJ@sG6N#y^H7t^&V} z;VrDI4?75G$q5W9mV=J2iP24NHJy&d|HWHva>FaS#3AO?+ohh1__FMx;?`f{HG3v0 ztiO^Wanb>U4m9eLhoc_2B(ca@YdnHMB*~aYO+AE(&qh@?WukLbf_y z>*3?Xt-lxr?#}y%kTv+l8;!q?Hq8XSU+1E8x~o@9$)zO2z9K#(t`vPDri`mKhv|sh z{KREcy`#pnV>cTT7dm7M9B@9qJRt3lfo(C`CNkIq@>|2<(yn!AmVN?ST zbX_`JjtWa3&N*U{K7FYX8})*D#2@KBae` zhKS~s!r%SrXdhCsv~sF}7?ocyS?afya6%rDBu6g^b2j#TOGp^1zrMR}|70Z>CeYq- z1o|-=FBKlu{@;pm@QQJ_^!&hzi;0Z_Ho){x3O1KQ#TYk=rAt9`YKC0Y^}8GWIN{QW znYJyVTrmNvl!L=YS1G8BAxGmMUPi+Q7yb0XfG`l+L1NQVSbe^BICYrD;^(rke{jWCEZOtVv3xFze!=Z&(7}!)EcN;v0Dbit?RJ6bOr;N$ z=nk8}H<kCEE+IK3z<+3mkn4q!O7TMWpKShWWWM)X*)m6k%3luF6c>zOsFccvfLWf zH+mNkh!H@vR#~oe=ek}W3!71z$Dlj0c(%S|sJr>rvw!x;oCek+8f8s!U{DmfHcNpO z9>(IKOMfJwv?ey`V2ysSx2Npeh_x#bMh)Ngdj$al;5~R7Ac5R2?*f{hI|?{*$0qU- zY$6}ME%OGh^zA^z9zJUs-?a4ni8cw_{cYED*8x{bWg!Fn9)n;E9@B+t;#k}-2_j@# zg#b%R(5_SJAOtfgFCBZc`n<&z6)%nOIu@*yo!a% zpLg#36KBN$01W{b;qWN`Tp(T#jh%;Zp_zpS64lvBVY2B#UK)p`B4Oo)IO3Z&D6<3S zfF?ZdeNEnzE{}#gyuv)>;z6V{!#bx)` zY;hL*f(WVD*D9A4$WbRKF2vf;MoZVdhfWbWhr{+Db5@M^A4wrFReuWWimA4qp`GgoL2`W4WPUL5A=y3Y3P z%G?8lLUhqo@wJW8VDT`j&%YY7xh51NpVYlsrk_i4J|pLO(}(b8_>%U2M`$iVRDc-n zQiOdJbroQ%*vhN{!{pL~N|cfGooK_jTJCA3g_qs4c#6a&_{&$OoSQr_+-O^mKP=Fu zGObEx`7Qyu{nHTGNj(XSX*NPtAILL(0%8Jh)dQh+rtra({;{W2=f4W?Qr3qHi*G6B zOEj7%nw^sPy^@05$lOCjAI)?%B%&#cZ~nC|=g1r!9W@C8T0iUc%T*ne z)&u$n>Ue3FN|hv+VtA+WW)odO-sdtDcHfJ7s&|YCPfWaVHpTGN46V7Lx@feE#Od%0XwiZy40plD%{xl+K04*se zw@X4&*si2Z_0+FU&1AstR)7!Th(fdaOlsWh`d!y=+3m!QC$Zlkg8gnz!}_B7`+wSz z&kD?6{zPnE3uo~Tv8mLP%RaNt2hcCJBq=0T>%MW~Q@Tpt2pPP1?KcywH>in5@ zx+5;xu-ltFfo5vLU;2>r$-KCHjwGR&1XZ0YNyrXXAUK!FLM_7mV&^;;X^*YH(FLRr z`0Jjg7wiq2bisa`CG%o9i)o1`uG?oFjU_Zrv1S^ipz$G-lc^X@~6*)#%nn+RbgksJfl{w=k31(q>7a!PCMp5YY{+Neh~mo zG-3dd!0cy`F!nWR?=9f_KP$X?Lz&cLGm_ohy-|u!VhS1HG~e7~xKpYOh=GmiiU;nu zrZ5tWfan3kp-q_vO)}vY6a$19Q6UL0r znJ+iSHN-&w@vDEZ0V%~?(XBr|jz&vrBNLOngULxtH(Rp&U*rMY42n;05F11xh?k;n_DX2$4|vWIkXnbwfC z=ReH=(O~a;VEgVO?>qsP*#eOC9Y<_9Yt<6X}X{PyF7UXIA$f)>NR5P&4G_Ygq(9TwwQH*P>Rq>3T4I+t2X(b5ogXBAfNf!xiF#Gilm zp2h{&D4k!SkKz-SBa%F-ZoVN$7GX2o=(>vkE^j)BDSGXw?^%RS9F)d_4}PN+6MlI8*Uk7a28CZ)Gp*EK)`n5i z){aq=0SFSO-;sw$nAvJU-$S-cW?RSc7kjEBvWDr1zxb1J7i;!i+3PQwb=)www?7TZ zE~~u)vO>#55eLZW;)F(f0KFf8@$p)~llV{nO7K_Nq-+S^h%QV_CnXLi)p*Pq&`s!d zK2msiR;Hk_rO8`kqe_jfTmmv|$MMo0ll}mI)PO4!ikVd(ZThhi&4ZwK?tD-}noj}v zBJ?jH-%VS|=t)HuTk?J1XaDUjd_5p1kPZi6y#F6$lLeRQbj4hsr=hX z4tXkX2d5DeLMcAYTeYm|u(XvG5JpW}hcOs4#s8g#ihK%@hVz|kL=nfiBqJ{*E*WhC zht3mi$P3a(O5JiDq$Syu9p^HY&9~<#H89D8 zJm84@%TaL_BZ+qy8+T3_pG7Q%z80hnjN;j>S=&WZWF48PDD%55lVuC0%#r5(+S;WH zS7!HEzmn~)Ih`gE`faPRjPe^t%g=F ztpGVW=Cj5ZkpghCf~`ar0+j@A=?3(j@7*pq?|9)n*B4EQTA1xj<+|(Y72?m7F%&&& zdO44owDBPT(8~RO=dT-K4#Ja@^4_0v$O3kn73p6$s?mCmVDUZ+Xl@QcpR6R3B$=am z%>`r9r2Z79Q#RNK?>~lwk^nQlR=Hr-ji$Ss3ltbmB)x@0{VzHL-rxVO(++@Yr@Iu2 zTEX)_9sVM>cX$|xuqz~Y8F-(n;KLAfi*63M7mh&gsPR>N0pd9h!0bm%nA?Lr zS#iEmG|wQd^BSDMk0k?G>S-uE$vtKEF8Dq}%vLD07zK4RLoS?%F1^oZZI$0W->7Z# z?v&|a`u#UD=_>i~`kzBGaPj!mYX5g?3RC4$5EV*j0sV)>H#+$G6!ci=6`)85LWR=FCp-NUff`;2zG9nU6F~ z;3ZyE*>*LvUgae+uMf}aV}V*?DCM>{o31+Sx~6+sz;TI(VmIpDrN3z+BUj`oGGgLP z>h9~MP}Pw#YwzfGP8wSkz`V#}--6}7S9yZvb{;SX?6PM_KuYpbi~*=teZr-ga2QqIz{QrEyZ@>eN*qmy;N@FCBbRNEeeoTmQyrX;+ zCkaJ&vOIbc^2BD6_H+Mrcl?Nt7O{xz9R_L0ZPV_u!sz+TKbXmhK)0QWoe-_HwtKJ@@7=L+ z+K8hhf=4vbdg3GqGN<;v-SMIzvX=Z`WUa_91Yf89^#`G(f-Eq>odB^p-Eqx}ENk#&MxJ+%~Ad2-*`1LNT>2INPw?*V3&kE;tt?rQyBw? zI+xJD04GTz1$7~KMnfpkPRW>f%n|0YCML@ODe`10;^DXX-|Hb*IE%_Vi#Pn9@#ufA z_8NY*1U%VseqYrSm?%>F@`laz+f?+2cIE4Jg6 z_VTcx|DSEA`g!R%RS$2dSRM|9VQClsW-G<~=j5T`pTbu-x6O`R z98b;}`rPM(2={YiytrqX+uh65f?%XiPp`;4CcMT*E*dQJ+if9^D>c_Dk8A(cE<#r=&!& z_`Z01=&MEE+2@yr!|#El=yM}v>i=?w^2E_FLPy(*4A9XmCNy>cBWdx3U>1RylsItO z4V8T$z3W-qqq*H`@}lYpfh=>C!tieKhoMGUi)EpWDr;yIL&fy};Y&l|)f^QE*k~4C zH>y`Iu%#S)z)YUqWO%el*Z)ME#p{1_8-^~6UF;kBTW zMQ!eXQuzkR#}j{qb(y9^Y!X7&T}}-4$%4w@w=;w+>Z%uifR9OoQ>P?0d9xpcwa>7kTv2U zT-F?3`Q`7xOR!gS@j>7In>_h){j#@@(ynYh;nB~}+N6qO(JO1xA z@59Pxc#&I~I64slNR?#hB-4XE>EFU@lUB*D)tu%uEa))B#eJ@ZOX0hIulfnDQz-y8 z`CX@(O%_VC{Ogh&ot``jlDL%R!f>-8yq~oLGxBO?+tQb5%k@a9zTs!+=NOwSVH-cR zqFo^jHeXDA_!rx$NzdP;>{-j5w3QUrR<;}=u2|FBJ;D#v{SK@Z6mjeV7_kFmWt95$ zeGaF{IU?U>?W`jzrG_9=9}yN*LKyzz))PLE+)_jc#4Rd$yFGol;NIk(qO1$5VXR)+ zxF7%f4=Q!NzR>DVXUB&nUT&>Nyf+5QRF+Z`X-bB*7=`|Go5D1&h~ zflKLw??kpiRm0h3|1GvySC2^#kcFz^5{79KKlq@`(leBa=_4CgV9sSHr{RIJ^KwR_ zY??M}-x^=MD+9`v@I3jue=OCn0kxno#6i>b(XKk_XTp_LpI}X*UA<#* zsgvq@yKTe_dTh>q1aeae@8yur08S(Q^8kXkP_ty48V$pX#y9)FQa~E7P7}GP_CbCm zc2dQxTeW(-~Y6}im24*XOC8ySfH*HMEnW3 z4CXp8iK(Nk<^D$g0kUW`8PXn2kdcDk-H@P0?G8?|YVlIFb?a>QunCx%B9TzsqQQ~HD!UO7zq^V!v9jho_FUob&Hxi ztU1nNOK)a!gkb-K4V^QVX05*>-^i|{b`hhvQLyj`E1vAnj0fbqqO%r z6Q;X1x0dL~GqMv%8QindZ4CZ%7pYQW~ z9)I*#Gjref-q(4Z*E#1c&rE0-_(4;_M(V7rgH_7H;ps1s%GBmU z{4a|X##j#XUF2n({v?ZUUAP5k>+)^F)7n-npbV3jAlY8V3*W=fwroDS$c&r$>8aH` zH+irV{RG3^F3oW2&E%5hXgMH9>$WlqX76Cm+iFmFC-DToTa`AcuN9S!SB+BT-IA#3P)JW1m~Cuwjs`Ep(wDXE4oYmt*aU z!Naz^lM}B)JFp7ejro7MU9#cI>wUoi{lylR2~s)3M!6a=_W~ITXCPd@U9W)qA5(mdOf zd3PntGPJyRX<9cgX?(9~TZB5FdEHW~gkJXY51}?s4ZT_VEdwOwD{T2E-B>oC8|_ZwsPNj=-q(-kwy%xX2K0~H z{*+W`-)V`7@c#Iuaef=?RR2O&x>W0A^xSwh5MsjTz(DVG-EoD@asu<>72A_h<39_# zawWVU<9t{r*e^u-5Q#SUI6dV#p$NYEGyiowT>>d*or=Ps!H$-3={bB|An$GPkP5F1 zTnu=ktmF|6E*>ZQvk^~DX(k!N`tiLut*?3FZhs$NUEa4ccDw66-~P;x+0b|<!ZN7Z%A`>2tN#CdoG>((QR~IV_Gj^Yh%!HdA~4C3jOXaqb6Ou z21T~Wmi9F6(_K0@KR@JDTh3-4mv2=T7&ML<+$4;b9SAtv*Uu`0>;VVZHB{4?aIl3J zL(rMfk?1V@l)fy{J5DhVlj&cWKJCcrpOAad(7mC6#%|Sn$VwMjtx6RDx1zbQ|Ngg8N&B56DGhu;dYg$Z{=YmCNn+?ceDclp65c_RnKs4*vefnhudSlrCy6-96vSB4_sFAj# zftzECwmNEOtED^NUt{ZDjT7^g>k1w<=af>+0)%NA;IPq6qx&ya7+QAu=pk8t>KTm` zEBj9J*2t|-(h)xc>Us*jHs)w9qmA>8@u21UqzKk*Ei#0kCeW6o z-2Q+Tvt25IUkb}-_LgD1_FUJ!U8@8OC^9(~Kd*0#zr*8IQkD)6Keb(XFai5*DYf~` z@U?-{)9X&BTf!^&@^rjmvea#9OE~m(D>qfM?CFT9Q4RxqhO0sA7S)=--^*Q=kNh7Y zq%2mu_d_#23d`+v`Ol263CZ<;D%D8Njj6L4T`S*^{!lPL@pXSm>2;~Da- zBX97TS{}exvSva@J5FJVCM$j4WDQuME`vTw>PWS0!;J7R+Kq zVUy6%#n5f7EV(}J#FhDpts;>=d6ow!yhJj8j>MJ@Wr_?x30buuutIG97L1A*QFT$c ziC5rBS;#qj=~yP-yWm-p(?llTwDuhS^f&<(9vA9@UhMH2-Fe_YAG$NvK6X{!mvPK~ zuEA&PA}meylmaIbbJXDOzuIn8cJNCV{tUA<$Vb?57JyAM`*GpEfMmFq>)6$E(9e1@W`l|R%-&}38#bl~levA#fx2wiBk^)mPj?<=S&|gv zQO)4*91$n08@W%2b|QxEiO0KxABAZC{^4BX^6r>Jm?{!`ZId9jjz<%pl(G5l));*`UU3KfnuXSDj2aP>{ zRIB$9pm7lj3*Xg)c1eG!cb+XGt&#?7yJ@C)(Ik)^OZ5><4u$VLCqZ#q2NMCt5 z6$|VN(RWM;5!JV?-h<JkEZ(SZF zC(6J+>A6Am9H7OlOFq6S62-2&z^Np=#xXsOq0WUKr zY_+Ob|CQd1*!Hirj5rn*=_bM5_zKmq6lG zn*&_=x%?ATxZ8ZTzd%biKY_qyNC#ZQ1vX+vc48N>aJXEjs{Y*3Op`Q7-oz8jyAh>d zNt_qvn`>q9aO~7xm{z`ree%lJ3YHCyC`q`-jUVCn*&NIml!uuMNm|~u3#AV?6kC+B z?qrT?xu2^mobSlzb&m(8jttB^je0mx;TT8}`_w(F11IKz83NLj@OmYDpCU^u?fD{) z&=$ptwVw#uohPb2_PrFX;X^I=MVXPDpqTuYhRa>f-=wy$y3)40-;#EUDYB1~V9t%$ z^^<7Zbs0{eB93Pcy)96%XsAi2^k`Gmnypd-&x4v9rAq<>a(pG|J#+Q>E$FvMLmy7T z5_06W=*ASUyPRfgCeiPIe{b47Hjqpb`9Xyl@$6*ntH@SV^bgH&Fk3L9L=6VQb)Uqa z33u#>ecDo&bK(h1WqSH)b_Th#Tvk&%$NXC@_pg5f-Ma#7q;&0QgtsFO~`V&{1b zbSP*X)jgLtd@9XdZ#2_BX4{X~pS8okF7c1xUhEV9>PZco>W-qz7YMD`+kCGULdK|^ zE7VwQ-at{%&fv`a+b&h`TjzxsyQX05UB~a0cuU-}{*%jR48J+yGWyl3Kdz5}U>;lE zgkba*yI5>xqIPz*Y!-P$#_mhHB!0Fpnv{$k-$xxjLAc`XdmHd1k$V@2QlblfJPrly z*~-4HVCq+?9vha>&I6aRGyq2VUon^L1a)g`-Xm*@bl2|hi2b|UmVYW|b+Gy?!aS-p z86a}Jep6Mf>>}n^*Oca@Xz}kxh)Y&pX$^CFAmi#$YVf57X^}uQD!IQSN&int=D> zJ>_|au3Be?hmPKK)1^JQ(O29eTf`>-x^jF2xYK6j_9d_qFkWHIan5=7EmDvZoQWz5 zZGb<{szHc9Nf@om)K_<=FuLR<&?5RKo3LONFQZ@?dyjemAe4$yDrnD zglU#XYo6|~L+YpF#?deK6S{8A*Ou;9G`cdC4S0U74EW18bc5~4>)<*}?Z!1Y)j;Ot zosEP!pc$O^wud(={WG%hY07IE^SwS-fGbvpP?;l8>H$;}urY2JF$u#$q}E*ZG%fR# z`p{xslcvG)kBS~B*^z6zVT@e}imYcz_8PRzM4GS52#ms5Jg9z~ME+uke`(Tq1w3_6 zxUa{HerS7!Wq&y(<9yyN@P^PrQT+6ij_qW3^Q)I53iIFCJE?MVyGLID!f?QHUi1tq z0)RNIMGO$2>S%3MlBc09l!6_(ECxXTU>$KjWdZX^3R~@3!SB zah5Za2$63;#y!Y}(wg1#shMePQTzfQfXyJ-Tf`R05KYcyvo8UW9-IWGWnzxR6Vj8_la;*-z5vWuwUe7@sKr#Tr51d z2PWn5h@|?QU3>k=s{pZ9+(}oye zc*95N_iLmtmu}H-t$smi49Y&ovX}@mKYt2*?C-i3Lh4*#q5YDg1Mh`j9ovRDf9&& zp_UMQh`|pC!|=}1uWoMK5RAjdTg3pXPCsYmRkWW}^m&)u-*c_st~gcss(`haA)xVw zAf=;s>$`Gq_`A}^MjY_BnCjktBNHY1*gzh(i0BFZ{Vg^F?Pbf`8_clvdZ)5(J4EWzAP}Ba5zX=S(2{gDugTQ3`%!q`h7kYSnwC`zEWeuFlODKiityMaM9u{Z%E@@y1jmZA#ⅅ8MglG&ER{i5lN315cO?EdHNLrg? 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 z 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 Pe7HEdAEg|=c=LY&YVNkY literal 0 HcmV?d00001 diff --git a/packages/diceui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/packages/diceui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png new file mode 100644 index 0000000000000000000000000000000000000000..13b35eba55c6dabc3aac36f33d859266c18fa0d0 GIT binary patch literal 5680 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 literal 0 HcmV?d00001 diff --git a/packages/diceui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/packages/diceui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png new file mode 100644 index 0000000000000000000000000000000000000000..0a3f5fa40fb3d1e0710331a48de5d256da3f275d GIT binary patch literal 520 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 literal 0 HcmV?d00001 diff --git a/packages/diceui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/packages/diceui/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png new file mode 100644 index 0000000000000000000000000000000000000000..2f1632cfddf3d9dade342351e627a0a75609fb46 GIT binary patch literal 2218 zcmV;b2vzrqP)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91K%fHv1ONa40RR91KmY&$07g+lumAuE6iGxuRCodHTWf3-RTMruyW6Fu zQYeUM04eX6D5c0FCjKKPrco1(K`<0SL=crI{PC3-^hZU0kQie$gh-5!7z6SH6Q0J% zqot*`H1q{R5fHFYS}dje@;kG=v$L0(yY0?wY2%*c?A&{2?!D*x?m71{of2gv!$5|C z3>qG_BW}7K_yUcT3A5C6QD<+{aq?x;MAUyAiJn#Jv8_zZtQ{P zTRzbL3U9!qVuZzS$xKU10KiW~Bgdcv1-!uAhQxf3a7q+dU6lj?yoO4Lq4TUN4}h{N z*fIM=SS8|C2$(T>w$`t@3Tka!(r!7W`x z-isCVgQD^mG-MJ;XtJuK3V{Vy72GQ83KRWsHU?e*wrhKk=ApIYeDqLi;JI1e zuvv}5^Dc=k7F7?nm3nIw$NVmU-+R>> zyqOR$-2SDpJ}Pt;^RkJytDVXNTsu|mI1`~G7yw`EJR?VkGfNdqK9^^8P`JdtTV&tX4CNcV4 z&N06nZa??Fw1AgQOUSE2AmPE@WO(Fvo`%m`cDgiv(fAeRA%3AGXUbsGw{7Q`cY;1BI#ac3iN$$Hw z0LT0;xc%=q)me?Y*$xI@GRAw?+}>=9D+KTk??-HJ4=A>`V&vKFS75@MKdSF1JTq{S zc1!^8?YA|t+uKigaq!sT;Z!&0F2=k7F0PIU;F$leJLaw2UI6FL^w}OG&!;+b%ya1c z1n+6-inU<0VM-Y_s5iTElq)ThyF?StVcebpGI znw#+zLx2@ah{$_2jn+@}(zJZ{+}_N9BM;z)0yr|gF-4=Iyu@hI*Lk=-A8f#bAzc9f z`Kd6K--x@t04swJVC3JK1cHY-Hq+=|PN-VO;?^_C#;coU6TDP7Bt`;{JTG;!+jj(` zw5cLQ-(Cz-Tlb`A^w7|R56Ce;Wmr0)$KWOUZ6ai0PhzPeHwdl0H(etP zUV`va_i0s-4#DkNM8lUlqI7>YQLf)(lz9Q3Uw`)nc(z3{m5ZE77Ul$V%m)E}3&8L0 z-XaU|eB~Is08eORPk;=<>!1w)Kf}FOVS2l&9~A+@R#koFJ$Czd%Y(ENTV&A~U(IPI z;UY+gf+&6ioZ=roly<0Yst8ck>(M=S?B-ys3mLdM&)ex!hbt+ol|T6CTS+Sc0jv(& z7ijdvFwBq;0a{%3GGwkDKTeG`b+lyj0jjS1OMkYnepCdoosNY`*zmBIo*981BU%%U z@~$z0V`OVtIbEx5pa|Tct|Lg#ZQf5OYMUMRD>Wdxm5SAqV2}3!ceE-M2 z@O~lQ0OiKQp}o9I;?uxCgYVV?FH|?Riri*U$Zi_`V2eiA>l zdSm6;SEm6#T+SpcE8Ro_f2AwxzI z44hfe^WE3!h@W3RDyA_H440cpmYkv*)6m1XazTqw%=E5Xv7^@^^T7Q2wxr+Z2kVYr + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/diceui/macos/Runner/Configs/AppInfo.xcconfig b/packages/diceui/macos/Runner/Configs/AppInfo.xcconfig new file mode 100644 index 0000000..b7fb38d --- /dev/null +++ b/packages/diceui/macos/Runner/Configs/AppInfo.xcconfig @@ -0,0 +1,14 @@ +// Application-level settings for the Runner target. +// +// This may be replaced with something auto-generated from metadata (e.g., pubspec.yaml) in the +// future. If not, the values below would default to using the project name when this becomes a +// 'flutter create' template. + +// The application's name. By default this is also the title of the Flutter window. +PRODUCT_NAME = diceui + +// The application's bundle identifier +PRODUCT_BUNDLE_IDENTIFIER = com.example.diceui + +// The copyright displayed in application information +PRODUCT_COPYRIGHT = Copyright © 2025 com.example. All rights reserved. diff --git a/packages/diceui/macos/Runner/Configs/Debug.xcconfig b/packages/diceui/macos/Runner/Configs/Debug.xcconfig new file mode 100644 index 0000000..36b0fd9 --- /dev/null +++ b/packages/diceui/macos/Runner/Configs/Debug.xcconfig @@ -0,0 +1,2 @@ +#include "../../Flutter/Flutter-Debug.xcconfig" +#include "Warnings.xcconfig" diff --git a/packages/diceui/macos/Runner/Configs/Release.xcconfig b/packages/diceui/macos/Runner/Configs/Release.xcconfig new file mode 100644 index 0000000..dff4f49 --- /dev/null +++ b/packages/diceui/macos/Runner/Configs/Release.xcconfig @@ -0,0 +1,2 @@ +#include "../../Flutter/Flutter-Release.xcconfig" +#include "Warnings.xcconfig" diff --git a/packages/diceui/macos/Runner/Configs/Warnings.xcconfig b/packages/diceui/macos/Runner/Configs/Warnings.xcconfig new file mode 100644 index 0000000..42bcbf4 --- /dev/null +++ b/packages/diceui/macos/Runner/Configs/Warnings.xcconfig @@ -0,0 +1,13 @@ +WARNING_CFLAGS = -Wall -Wconditional-uninitialized -Wnullable-to-nonnull-conversion -Wmissing-method-return-type -Woverlength-strings +GCC_WARN_UNDECLARED_SELECTOR = YES +CLANG_UNDEFINED_BEHAVIOR_SANITIZER_NULLABILITY = YES +CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE +CLANG_WARN__DUPLICATE_METHOD_MATCH = YES +CLANG_WARN_PRAGMA_PACK = YES +CLANG_WARN_STRICT_PROTOTYPES = YES +CLANG_WARN_COMMA = YES +GCC_WARN_STRICT_SELECTOR_MATCH = YES +CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES +CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES +GCC_WARN_SHADOW = YES +CLANG_WARN_UNREACHABLE_CODE = YES diff --git a/packages/diceui/macos/Runner/DebugProfile.entitlements b/packages/diceui/macos/Runner/DebugProfile.entitlements new file mode 100644 index 0000000..dddb8a3 --- /dev/null +++ b/packages/diceui/macos/Runner/DebugProfile.entitlements @@ -0,0 +1,12 @@ + + + + + com.apple.security.app-sandbox + + com.apple.security.cs.allow-jit + + com.apple.security.network.server + + + diff --git a/packages/diceui/macos/Runner/Info.plist b/packages/diceui/macos/Runner/Info.plist new file mode 100644 index 0000000..4789daa --- /dev/null +++ b/packages/diceui/macos/Runner/Info.plist @@ -0,0 +1,32 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIconFile + + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + $(FLUTTER_BUILD_NAME) + CFBundleVersion + $(FLUTTER_BUILD_NUMBER) + LSMinimumSystemVersion + $(MACOSX_DEPLOYMENT_TARGET) + NSHumanReadableCopyright + $(PRODUCT_COPYRIGHT) + NSMainNibFile + MainMenu + NSPrincipalClass + NSApplication + + diff --git a/packages/diceui/macos/Runner/MainFlutterWindow.swift b/packages/diceui/macos/Runner/MainFlutterWindow.swift new file mode 100644 index 0000000..3cc05eb --- /dev/null +++ b/packages/diceui/macos/Runner/MainFlutterWindow.swift @@ -0,0 +1,15 @@ +import Cocoa +import FlutterMacOS + +class MainFlutterWindow: NSWindow { + override func awakeFromNib() { + let flutterViewController = FlutterViewController() + let windowFrame = self.frame + self.contentViewController = flutterViewController + self.setFrame(windowFrame, display: true) + + RegisterGeneratedPlugins(registry: flutterViewController) + + super.awakeFromNib() + } +} diff --git a/packages/diceui/macos/Runner/Release.entitlements b/packages/diceui/macos/Runner/Release.entitlements new file mode 100644 index 0000000..852fa1a --- /dev/null +++ b/packages/diceui/macos/Runner/Release.entitlements @@ -0,0 +1,8 @@ + + + + + com.apple.security.app-sandbox + + + diff --git a/packages/diceui/macos/RunnerTests/RunnerTests.swift b/packages/diceui/macos/RunnerTests/RunnerTests.swift new file mode 100644 index 0000000..61f3bd1 --- /dev/null +++ b/packages/diceui/macos/RunnerTests/RunnerTests.swift @@ -0,0 +1,12 @@ +import Cocoa +import FlutterMacOS +import XCTest + +class RunnerTests: XCTestCase { + + func testExample() { + // If you add code to the Runner application, consider adding tests here. + // See https://developer.apple.com/documentation/xctest for more information about using XCTest. + } + +} diff --git a/packages/diceui/pubspec.yaml b/packages/diceui/pubspec.yaml new file mode 100644 index 0000000..b118220 --- /dev/null +++ b/packages/diceui/pubspec.yaml @@ -0,0 +1,91 @@ +name: diceui +description: "A new Flutter project." +# The following line prevents the package from being accidentally published to +# pub.dev using `flutter pub publish`. This is preferred for private packages. +publish_to: 'none' # Remove this line if you wish to publish to pub.dev + +# The following defines the version and build number for your application. +# A version number is three numbers separated by dots, like 1.2.43 +# followed by an optional build number separated by a +. +# Both the version and the builder number may be overridden in flutter +# build by specifying --build-name and --build-number, respectively. +# In Android, build-name is used as versionName while build-number used as versionCode. +# Read more about Android versioning at https://developer.android.com/studio/publish/versioning +# In iOS, build-name is used as CFBundleShortVersionString while build-number is used as CFBundleVersion. +# Read more about iOS versioning at +# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html +# In Windows, build-name is used as the major, minor, and patch parts +# of the product and file versions while build-number is used as the build suffix. +version: 1.0.0+1 + +environment: + sdk: ^3.8.1 + +# Dependencies specify other packages that your package needs in order to work. +# To automatically upgrade your package dependencies to the latest versions +# consider running `flutter pub upgrade --major-versions`. Alternatively, +# dependencies can be manually updated by changing the version numbers below to +# the latest version available on pub.dev. To see which dependencies have newer +# versions available, run `flutter pub outdated`. +dependencies: + flutter: + sdk: flutter + + # The following adds the Cupertino Icons font to your application. + # Use with the CupertinoIcons class for iOS style icons. + cupertino_icons: ^1.0.8 + dart_dice_parser: + path: ../dart_dice_parser + +dev_dependencies: + flutter_test: + sdk: flutter + + # The "flutter_lints" package below contains a set of recommended lints to + # encourage good coding practices. The lint set provided by the package is + # activated in the `analysis_options.yaml` file located at the root of your + # package. See that file for information about deactivating specific lint + # rules and activating additional ones. + flutter_lints: ^5.0.0 + +# For information on the generic Dart part of this file, see the +# following page: https://dart.dev/tools/pub/pubspec + +# The following section is specific to Flutter packages. +flutter: + + # The following line ensures that the Material Icons font is + # included with your application, so that you can use the icons in + # the material Icons class. + uses-material-design: true + + # To add assets to your application, add an assets section, like this: + # assets: + # - images/a_dot_burr.jpeg + # - images/a_dot_ham.jpeg + + # An image asset can refer to one or more resolution-specific "variants", see + # https://flutter.dev/to/resolution-aware-images + + # For details regarding adding assets from package dependencies, see + # https://flutter.dev/to/asset-from-package + + # To add custom fonts to your application, add a fonts section here, + # in this "flutter" section. Each entry in this list should have a + # "family" key with the font family name, and a "fonts" key with a + # list giving the asset and other descriptors for the font. For + # example: + # fonts: + # - family: Schyler + # fonts: + # - asset: fonts/Schyler-Regular.ttf + # - asset: fonts/Schyler-Italic.ttf + # style: italic + # - family: Trajan Pro + # fonts: + # - asset: fonts/TrajanPro.ttf + # - asset: fonts/TrajanPro_Bold.ttf + # weight: 700 + # + # For details regarding fonts from package dependencies, + # see https://flutter.dev/to/font-from-package diff --git a/packages/diceui/test/widget_test.dart b/packages/diceui/test/widget_test.dart new file mode 100644 index 0000000..55706c8 --- /dev/null +++ b/packages/diceui/test/widget_test.dart @@ -0,0 +1,30 @@ +// This is a basic Flutter widget test. +// +// To perform an interaction with a widget in your test, use the WidgetTester +// utility in the flutter_test package. For example, you can send tap and scroll +// gestures. You can also use WidgetTester to find child widgets in the widget +// tree, read text, and verify that the values of widget properties are correct. + +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; + +import 'package:diceui/main.dart'; + +void main() { + testWidgets('Counter increments smoke test', (WidgetTester tester) async { + // Build our app and trigger a frame. + await tester.pumpWidget(const MyApp()); + + // Verify that our counter starts at 0. + expect(find.text('0'), findsOneWidget); + expect(find.text('1'), findsNothing); + + // Tap the '+' icon and trigger a frame. + await tester.tap(find.byIcon(Icons.add)); + await tester.pump(); + + // Verify that our counter has incremented. + expect(find.text('0'), findsNothing); + expect(find.text('1'), findsOneWidget); + }); +} diff --git a/packages/diceui/web/favicon.png b/packages/diceui/web/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..8aaa46ac1ae21512746f852a42ba87e4165dfdd1 GIT binary patch literal 917 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|I14-?iy0X7 zltGxWVyS%@P(fs7NJL45ua8x7ey(0(N`6wRUPW#JP&EUCO@$SZnVVXYs8ErclUHn2 zVXFjIVFhG^g!Ppaz)DK8ZIvQ?0~DO|i&7O#^-S~(l1AfjnEK zjFOT9D}DX)@^Za$W4-*MbbUihOG|wNBYh(yU7!lx;>x^|#0uTKVr7USFmqf|i<65o z3raHc^AtelCMM;Vme?vOfh>Xph&xL%(-1c06+^uR^q@XSM&D4+Kp$>4P^%3{)XKjo zGZknv$b36P8?Z_gF{nK@`XI}Z90TzwSQO}0J1!f2c(B=V`5aP@1P1a|PZ!4!3&Gl8 zTYqUsf!gYFyJnXpu0!n&N*SYAX-%d(5gVjrHJWqXQshj@!Zm{!01WsQrH~9=kTxW#6SvuapgMqt>$=j#%eyGrQzr zP{L-3gsMA^$I1&gsBAEL+vxi1*Igl=8#8`5?A-T5=z-sk46WA1IUT)AIZHx1rdUrf zVJrJn<74DDw`j)Ki#gt}mIT-Q`XRa2-jQXQoI%w`nb|XblvzK${ZzlV)m-XcwC(od z71_OEC5Bt9GEXosOXaPTYOia#R4ID2TiU~`zVMl08TV_C%DnU4^+HE>9(CE4D6?Fz oujB08i7adh9xk7*FX66dWH6F5TM;?E2b5PlUHx3vIVCg!0Dx9vYXATM literal 0 HcmV?d00001 diff --git a/packages/diceui/web/icons/Icon-192.png b/packages/diceui/web/icons/Icon-192.png new file mode 100644 index 0000000000000000000000000000000000000000..b749bfef07473333cf1dd31e9eed89862a5d52aa GIT binary patch literal 5292 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 literal 0 HcmV?d00001 diff --git a/packages/diceui/web/icons/Icon-512.png b/packages/diceui/web/icons/Icon-512.png new file mode 100644 index 0000000000000000000000000000000000000000..88cfd48dff1169879ba46840804b412fe02fefd6 GIT binary patch literal 8252 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 literal 0 HcmV?d00001 diff --git a/packages/diceui/web/icons/Icon-maskable-192.png b/packages/diceui/web/icons/Icon-maskable-192.png new file mode 100644 index 0000000000000000000000000000000000000000..eb9b4d76e525556d5d89141648c724331630325d GIT binary patch literal 5594 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 X>c!)3PgKfL&lX^$Z>Cpu&6)6jvi^Z! literal 0 HcmV?d00001 diff --git a/packages/diceui/web/icons/Icon-maskable-512.png b/packages/diceui/web/icons/Icon-maskable-512.png new file mode 100644 index 0000000000000000000000000000000000000000..d69c56691fbdb0b7efa65097c7cc1edac12a6d3e GIT binary patch literal 20998 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 MPgg&ebxsLQ025IeI{*Lx literal 0 HcmV?d00001 diff --git a/packages/diceui/web/index.html b/packages/diceui/web/index.html new file mode 100644 index 0000000..2ff1ff5 --- /dev/null +++ b/packages/diceui/web/index.html @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + diceui + + + + + + diff --git a/packages/diceui/web/manifest.json b/packages/diceui/web/manifest.json new file mode 100644 index 0000000..78da035 --- /dev/null +++ b/packages/diceui/web/manifest.json @@ -0,0 +1,35 @@ +{ + "name": "diceui", + "short_name": "diceui", + "start_url": ".", + "display": "standalone", + "background_color": "#0175C2", + "theme_color": "#0175C2", + "description": "A new Flutter project.", + "orientation": "portrait-primary", + "prefer_related_applications": false, + "icons": [ + { + "src": "icons/Icon-192.png", + "sizes": "192x192", + "type": "image/png" + }, + { + "src": "icons/Icon-512.png", + "sizes": "512x512", + "type": "image/png" + }, + { + "src": "icons/Icon-maskable-192.png", + "sizes": "192x192", + "type": "image/png", + "purpose": "maskable" + }, + { + "src": "icons/Icon-maskable-512.png", + "sizes": "512x512", + "type": "image/png", + "purpose": "maskable" + } + ] +} diff --git a/packages/diceui/windows/.gitignore b/packages/diceui/windows/.gitignore new file mode 100644 index 0000000..d492d0d --- /dev/null +++ b/packages/diceui/windows/.gitignore @@ -0,0 +1,17 @@ +flutter/ephemeral/ + +# Visual Studio user-specific files. +*.suo +*.user +*.userosscache +*.sln.docstates + +# Visual Studio build-related files. +x64/ +x86/ + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ diff --git a/packages/diceui/windows/CMakeLists.txt b/packages/diceui/windows/CMakeLists.txt new file mode 100644 index 0000000..2fb11df --- /dev/null +++ b/packages/diceui/windows/CMakeLists.txt @@ -0,0 +1,108 @@ +# Project-level configuration. +cmake_minimum_required(VERSION 3.14) +project(diceui LANGUAGES CXX) + +# The name of the executable created for the application. Change this to change +# the on-disk name of your application. +set(BINARY_NAME "diceui") + +# Explicitly opt in to modern CMake behaviors to avoid warnings with recent +# versions of CMake. +cmake_policy(VERSION 3.14...3.25) + +# Define build configuration option. +get_property(IS_MULTICONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) +if(IS_MULTICONFIG) + set(CMAKE_CONFIGURATION_TYPES "Debug;Profile;Release" + CACHE STRING "" FORCE) +else() + if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + set(CMAKE_BUILD_TYPE "Debug" CACHE + STRING "Flutter build mode" FORCE) + set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS + "Debug" "Profile" "Release") + endif() +endif() +# Define settings for the Profile build mode. +set(CMAKE_EXE_LINKER_FLAGS_PROFILE "${CMAKE_EXE_LINKER_FLAGS_RELEASE}") +set(CMAKE_SHARED_LINKER_FLAGS_PROFILE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE}") +set(CMAKE_C_FLAGS_PROFILE "${CMAKE_C_FLAGS_RELEASE}") +set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_RELEASE}") + +# Use Unicode for all projects. +add_definitions(-DUNICODE -D_UNICODE) + +# Compilation settings that should be applied to most targets. +# +# Be cautious about adding new options here, as plugins use this function by +# default. In most cases, you should add new options to specific targets instead +# of modifying this function. +function(APPLY_STANDARD_SETTINGS TARGET) + target_compile_features(${TARGET} PUBLIC cxx_std_17) + target_compile_options(${TARGET} PRIVATE /W4 /WX /wd"4100") + target_compile_options(${TARGET} PRIVATE /EHsc) + target_compile_definitions(${TARGET} PRIVATE "_HAS_EXCEPTIONS=0") + target_compile_definitions(${TARGET} PRIVATE "$<$:_DEBUG>") +endfunction() + +# Flutter library and tool build rules. +set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter") +add_subdirectory(${FLUTTER_MANAGED_DIR}) + +# Application build; see runner/CMakeLists.txt. +add_subdirectory("runner") + + +# Generated plugin build rules, which manage building the plugins and adding +# them to the application. +include(flutter/generated_plugins.cmake) + + +# === Installation === +# Support files are copied into place next to the executable, so that it can +# run in place. This is done instead of making a separate bundle (as on Linux) +# so that building and running from within Visual Studio will work. +set(BUILD_BUNDLE_DIR "$") +# Make the "install" step default, as it's required to run. +set(CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD 1) +if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE) +endif() + +set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data") +set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}") + +install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +if(PLUGIN_BUNDLED_LIBRARIES) + install(FILES "${PLUGIN_BUNDLED_LIBRARIES}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endif() + +# Copy the native assets provided by the build.dart from all packages. +set(NATIVE_ASSETS_DIR "${PROJECT_BUILD_DIR}native_assets/windows/") +install(DIRECTORY "${NATIVE_ASSETS_DIR}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +# Fully re-copy the assets directory on each build to avoid having stale files +# from a previous install. +set(FLUTTER_ASSET_DIR_NAME "flutter_assets") +install(CODE " + file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\") + " COMPONENT Runtime) +install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}" + DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime) + +# Install the AOT library on non-Debug builds only. +install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + CONFIGURATIONS Profile;Release + COMPONENT Runtime) diff --git a/packages/diceui/windows/flutter/CMakeLists.txt b/packages/diceui/windows/flutter/CMakeLists.txt new file mode 100644 index 0000000..903f489 --- /dev/null +++ b/packages/diceui/windows/flutter/CMakeLists.txt @@ -0,0 +1,109 @@ +# This file controls Flutter-level build steps. It should not be edited. +cmake_minimum_required(VERSION 3.14) + +set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral") + +# Configuration provided via flutter tool. +include(${EPHEMERAL_DIR}/generated_config.cmake) + +# TODO: Move the rest of this into files in ephemeral. See +# https://github.com/flutter/flutter/issues/57146. +set(WRAPPER_ROOT "${EPHEMERAL_DIR}/cpp_client_wrapper") + +# Set fallback configurations for older versions of the flutter tool. +if (NOT DEFINED FLUTTER_TARGET_PLATFORM) + set(FLUTTER_TARGET_PLATFORM "windows-x64") +endif() + +# === Flutter Library === +set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/flutter_windows.dll") + +# Published to parent scope for install step. +set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE) +set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE) +set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE) +set(AOT_LIBRARY "${PROJECT_DIR}/build/windows/app.so" PARENT_SCOPE) + +list(APPEND FLUTTER_LIBRARY_HEADERS + "flutter_export.h" + "flutter_windows.h" + "flutter_messenger.h" + "flutter_plugin_registrar.h" + "flutter_texture_registrar.h" +) +list(TRANSFORM FLUTTER_LIBRARY_HEADERS PREPEND "${EPHEMERAL_DIR}/") +add_library(flutter INTERFACE) +target_include_directories(flutter INTERFACE + "${EPHEMERAL_DIR}" +) +target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}.lib") +add_dependencies(flutter flutter_assemble) + +# === Wrapper === +list(APPEND CPP_WRAPPER_SOURCES_CORE + "core_implementations.cc" + "standard_codec.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_CORE PREPEND "${WRAPPER_ROOT}/") +list(APPEND CPP_WRAPPER_SOURCES_PLUGIN + "plugin_registrar.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_PLUGIN PREPEND "${WRAPPER_ROOT}/") +list(APPEND CPP_WRAPPER_SOURCES_APP + "flutter_engine.cc" + "flutter_view_controller.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_APP PREPEND "${WRAPPER_ROOT}/") + +# Wrapper sources needed for a plugin. +add_library(flutter_wrapper_plugin STATIC + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_PLUGIN} +) +apply_standard_settings(flutter_wrapper_plugin) +set_target_properties(flutter_wrapper_plugin PROPERTIES + POSITION_INDEPENDENT_CODE ON) +set_target_properties(flutter_wrapper_plugin PROPERTIES + CXX_VISIBILITY_PRESET hidden) +target_link_libraries(flutter_wrapper_plugin PUBLIC flutter) +target_include_directories(flutter_wrapper_plugin PUBLIC + "${WRAPPER_ROOT}/include" +) +add_dependencies(flutter_wrapper_plugin flutter_assemble) + +# Wrapper sources needed for the runner. +add_library(flutter_wrapper_app STATIC + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_APP} +) +apply_standard_settings(flutter_wrapper_app) +target_link_libraries(flutter_wrapper_app PUBLIC flutter) +target_include_directories(flutter_wrapper_app PUBLIC + "${WRAPPER_ROOT}/include" +) +add_dependencies(flutter_wrapper_app flutter_assemble) + +# === Flutter tool backend === +# _phony_ is a non-existent file to force this command to run every time, +# since currently there's no way to get a full input/output list from the +# flutter tool. +set(PHONY_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/_phony_") +set_source_files_properties("${PHONY_OUTPUT}" PROPERTIES SYMBOLIC TRUE) +add_custom_command( + OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS} + ${CPP_WRAPPER_SOURCES_CORE} ${CPP_WRAPPER_SOURCES_PLUGIN} + ${CPP_WRAPPER_SOURCES_APP} + ${PHONY_OUTPUT} + COMMAND ${CMAKE_COMMAND} -E env + ${FLUTTER_TOOL_ENVIRONMENT} + "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat" + ${FLUTTER_TARGET_PLATFORM} $ + VERBATIM +) +add_custom_target(flutter_assemble DEPENDS + "${FLUTTER_LIBRARY}" + ${FLUTTER_LIBRARY_HEADERS} + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_PLUGIN} + ${CPP_WRAPPER_SOURCES_APP} +) diff --git a/packages/diceui/windows/flutter/generated_plugin_registrant.cc b/packages/diceui/windows/flutter/generated_plugin_registrant.cc new file mode 100644 index 0000000..8b6d468 --- /dev/null +++ b/packages/diceui/windows/flutter/generated_plugin_registrant.cc @@ -0,0 +1,11 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#include "generated_plugin_registrant.h" + + +void RegisterPlugins(flutter::PluginRegistry* registry) { +} diff --git a/packages/diceui/windows/flutter/generated_plugin_registrant.h b/packages/diceui/windows/flutter/generated_plugin_registrant.h new file mode 100644 index 0000000..dc139d8 --- /dev/null +++ b/packages/diceui/windows/flutter/generated_plugin_registrant.h @@ -0,0 +1,15 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#ifndef GENERATED_PLUGIN_REGISTRANT_ +#define GENERATED_PLUGIN_REGISTRANT_ + +#include + +// Registers Flutter plugins. +void RegisterPlugins(flutter::PluginRegistry* registry); + +#endif // GENERATED_PLUGIN_REGISTRANT_ diff --git a/packages/diceui/windows/flutter/generated_plugins.cmake b/packages/diceui/windows/flutter/generated_plugins.cmake new file mode 100644 index 0000000..b93c4c3 --- /dev/null +++ b/packages/diceui/windows/flutter/generated_plugins.cmake @@ -0,0 +1,23 @@ +# +# Generated file, do not edit. +# + +list(APPEND FLUTTER_PLUGIN_LIST +) + +list(APPEND FLUTTER_FFI_PLUGIN_LIST +) + +set(PLUGIN_BUNDLED_LIBRARIES) + +foreach(plugin ${FLUTTER_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/windows plugins/${plugin}) + target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin) + list(APPEND PLUGIN_BUNDLED_LIBRARIES $) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) +endforeach(plugin) + +foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin) diff --git a/packages/diceui/windows/runner/CMakeLists.txt b/packages/diceui/windows/runner/CMakeLists.txt new file mode 100644 index 0000000..394917c --- /dev/null +++ b/packages/diceui/windows/runner/CMakeLists.txt @@ -0,0 +1,40 @@ +cmake_minimum_required(VERSION 3.14) +project(runner LANGUAGES CXX) + +# Define the application target. To change its name, change BINARY_NAME in the +# top-level CMakeLists.txt, not the value here, or `flutter run` will no longer +# work. +# +# Any new source files that you add to the application should be added here. +add_executable(${BINARY_NAME} WIN32 + "flutter_window.cpp" + "main.cpp" + "utils.cpp" + "win32_window.cpp" + "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" + "Runner.rc" + "runner.exe.manifest" +) + +# Apply the standard set of build settings. This can be removed for applications +# that need different build settings. +apply_standard_settings(${BINARY_NAME}) + +# Add preprocessor definitions for the build version. +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION=\"${FLUTTER_VERSION}\"") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MAJOR=${FLUTTER_VERSION_MAJOR}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MINOR=${FLUTTER_VERSION_MINOR}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_PATCH=${FLUTTER_VERSION_PATCH}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_BUILD=${FLUTTER_VERSION_BUILD}") + +# Disable Windows macros that collide with C++ standard library functions. +target_compile_definitions(${BINARY_NAME} PRIVATE "NOMINMAX") + +# Add dependency libraries and include directories. Add any application-specific +# dependencies here. +target_link_libraries(${BINARY_NAME} PRIVATE flutter flutter_wrapper_app) +target_link_libraries(${BINARY_NAME} PRIVATE "dwmapi.lib") +target_include_directories(${BINARY_NAME} PRIVATE "${CMAKE_SOURCE_DIR}") + +# Run the Flutter tool portions of the build. This must not be removed. +add_dependencies(${BINARY_NAME} flutter_assemble) diff --git a/packages/diceui/windows/runner/Runner.rc b/packages/diceui/windows/runner/Runner.rc new file mode 100644 index 0000000..f74a528 --- /dev/null +++ b/packages/diceui/windows/runner/Runner.rc @@ -0,0 +1,121 @@ +// Microsoft Visual C++ generated resource script. +// +#pragma code_page(65001) +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "winres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (United States) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""winres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_APP_ICON ICON "resources\\app_icon.ico" + + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +#if defined(FLUTTER_VERSION_MAJOR) && defined(FLUTTER_VERSION_MINOR) && defined(FLUTTER_VERSION_PATCH) && defined(FLUTTER_VERSION_BUILD) +#define VERSION_AS_NUMBER FLUTTER_VERSION_MAJOR,FLUTTER_VERSION_MINOR,FLUTTER_VERSION_PATCH,FLUTTER_VERSION_BUILD +#else +#define VERSION_AS_NUMBER 1,0,0,0 +#endif + +#if defined(FLUTTER_VERSION) +#define VERSION_AS_STRING FLUTTER_VERSION +#else +#define VERSION_AS_STRING "1.0.0" +#endif + +VS_VERSION_INFO VERSIONINFO + FILEVERSION VERSION_AS_NUMBER + PRODUCTVERSION VERSION_AS_NUMBER + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +#ifdef _DEBUG + FILEFLAGS VS_FF_DEBUG +#else + FILEFLAGS 0x0L +#endif + FILEOS VOS__WINDOWS32 + FILETYPE VFT_APP + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904e4" + BEGIN + VALUE "CompanyName", "com.example" "\0" + VALUE "FileDescription", "diceui" "\0" + VALUE "FileVersion", VERSION_AS_STRING "\0" + VALUE "InternalName", "diceui" "\0" + VALUE "LegalCopyright", "Copyright (C) 2025 com.example. All rights reserved." "\0" + VALUE "OriginalFilename", "diceui.exe" "\0" + VALUE "ProductName", "diceui" "\0" + VALUE "ProductVersion", VERSION_AS_STRING "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1252 + END +END + +#endif // English (United States) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED diff --git a/packages/diceui/windows/runner/flutter_window.cpp b/packages/diceui/windows/runner/flutter_window.cpp new file mode 100644 index 0000000..955ee30 --- /dev/null +++ b/packages/diceui/windows/runner/flutter_window.cpp @@ -0,0 +1,71 @@ +#include "flutter_window.h" + +#include + +#include "flutter/generated_plugin_registrant.h" + +FlutterWindow::FlutterWindow(const flutter::DartProject& project) + : project_(project) {} + +FlutterWindow::~FlutterWindow() {} + +bool FlutterWindow::OnCreate() { + if (!Win32Window::OnCreate()) { + return false; + } + + RECT frame = GetClientArea(); + + // The size here must match the window dimensions to avoid unnecessary surface + // creation / destruction in the startup path. + flutter_controller_ = std::make_unique( + frame.right - frame.left, frame.bottom - frame.top, project_); + // Ensure that basic setup of the controller was successful. + if (!flutter_controller_->engine() || !flutter_controller_->view()) { + return false; + } + RegisterPlugins(flutter_controller_->engine()); + SetChildContent(flutter_controller_->view()->GetNativeWindow()); + + flutter_controller_->engine()->SetNextFrameCallback([&]() { + this->Show(); + }); + + // Flutter can complete the first frame before the "show window" callback is + // registered. The following call ensures a frame is pending to ensure the + // window is shown. It is a no-op if the first frame hasn't completed yet. + flutter_controller_->ForceRedraw(); + + return true; +} + +void FlutterWindow::OnDestroy() { + if (flutter_controller_) { + flutter_controller_ = nullptr; + } + + Win32Window::OnDestroy(); +} + +LRESULT +FlutterWindow::MessageHandler(HWND hwnd, UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + // Give Flutter, including plugins, an opportunity to handle window messages. + if (flutter_controller_) { + std::optional result = + flutter_controller_->HandleTopLevelWindowProc(hwnd, message, wparam, + lparam); + if (result) { + return *result; + } + } + + switch (message) { + case WM_FONTCHANGE: + flutter_controller_->engine()->ReloadSystemFonts(); + break; + } + + return Win32Window::MessageHandler(hwnd, message, wparam, lparam); +} diff --git a/packages/diceui/windows/runner/flutter_window.h b/packages/diceui/windows/runner/flutter_window.h new file mode 100644 index 0000000..6da0652 --- /dev/null +++ b/packages/diceui/windows/runner/flutter_window.h @@ -0,0 +1,33 @@ +#ifndef RUNNER_FLUTTER_WINDOW_H_ +#define RUNNER_FLUTTER_WINDOW_H_ + +#include +#include + +#include + +#include "win32_window.h" + +// A window that does nothing but host a Flutter view. +class FlutterWindow : public Win32Window { + public: + // Creates a new FlutterWindow hosting a Flutter view running |project|. + explicit FlutterWindow(const flutter::DartProject& project); + virtual ~FlutterWindow(); + + protected: + // Win32Window: + bool OnCreate() override; + void OnDestroy() override; + LRESULT MessageHandler(HWND window, UINT const message, WPARAM const wparam, + LPARAM const lparam) noexcept override; + + private: + // The project to run. + flutter::DartProject project_; + + // The Flutter instance hosted by this window. + std::unique_ptr flutter_controller_; +}; + +#endif // RUNNER_FLUTTER_WINDOW_H_ diff --git a/packages/diceui/windows/runner/main.cpp b/packages/diceui/windows/runner/main.cpp new file mode 100644 index 0000000..97a494e --- /dev/null +++ b/packages/diceui/windows/runner/main.cpp @@ -0,0 +1,43 @@ +#include +#include +#include + +#include "flutter_window.h" +#include "utils.h" + +int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev, + _In_ wchar_t *command_line, _In_ int show_command) { + // Attach to console when present (e.g., 'flutter run') or create a + // new console when running with a debugger. + if (!::AttachConsole(ATTACH_PARENT_PROCESS) && ::IsDebuggerPresent()) { + CreateAndAttachConsole(); + } + + // Initialize COM, so that it is available for use in the library and/or + // plugins. + ::CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED); + + flutter::DartProject project(L"data"); + + std::vector command_line_arguments = + GetCommandLineArguments(); + + project.set_dart_entrypoint_arguments(std::move(command_line_arguments)); + + FlutterWindow window(project); + Win32Window::Point origin(10, 10); + Win32Window::Size size(1280, 720); + if (!window.Create(L"diceui", origin, size)) { + return EXIT_FAILURE; + } + window.SetQuitOnClose(true); + + ::MSG msg; + while (::GetMessage(&msg, nullptr, 0, 0)) { + ::TranslateMessage(&msg); + ::DispatchMessage(&msg); + } + + ::CoUninitialize(); + return EXIT_SUCCESS; +} diff --git a/packages/diceui/windows/runner/resource.h b/packages/diceui/windows/runner/resource.h new file mode 100644 index 0000000..66a65d1 --- /dev/null +++ b/packages/diceui/windows/runner/resource.h @@ -0,0 +1,16 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by Runner.rc +// +#define IDI_APP_ICON 101 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 102 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1001 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/packages/diceui/windows/runner/resources/app_icon.ico b/packages/diceui/windows/runner/resources/app_icon.ico new file mode 100644 index 0000000000000000000000000000000000000000..c04e20caf6370ebb9253ad831cc31de4a9c965f6 GIT binary patch literal 33772 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 literal 0 HcmV?d00001 diff --git a/packages/diceui/windows/runner/runner.exe.manifest b/packages/diceui/windows/runner/runner.exe.manifest new file mode 100644 index 0000000..153653e --- /dev/null +++ b/packages/diceui/windows/runner/runner.exe.manifest @@ -0,0 +1,14 @@ + + + + + PerMonitorV2 + + + + + + + + + diff --git a/packages/diceui/windows/runner/utils.cpp b/packages/diceui/windows/runner/utils.cpp new file mode 100644 index 0000000..3a0b465 --- /dev/null +++ b/packages/diceui/windows/runner/utils.cpp @@ -0,0 +1,65 @@ +#include "utils.h" + +#include +#include +#include +#include + +#include + +void CreateAndAttachConsole() { + if (::AllocConsole()) { + FILE *unused; + if (freopen_s(&unused, "CONOUT$", "w", stdout)) { + _dup2(_fileno(stdout), 1); + } + if (freopen_s(&unused, "CONOUT$", "w", stderr)) { + _dup2(_fileno(stdout), 2); + } + std::ios::sync_with_stdio(); + FlutterDesktopResyncOutputStreams(); + } +} + +std::vector GetCommandLineArguments() { + // Convert the UTF-16 command line arguments to UTF-8 for the Engine to use. + int argc; + wchar_t** argv = ::CommandLineToArgvW(::GetCommandLineW(), &argc); + if (argv == nullptr) { + return std::vector(); + } + + std::vector command_line_arguments; + + // Skip the first argument as it's the binary name. + for (int i = 1; i < argc; i++) { + command_line_arguments.push_back(Utf8FromUtf16(argv[i])); + } + + ::LocalFree(argv); + + return command_line_arguments; +} + +std::string Utf8FromUtf16(const wchar_t* utf16_string) { + if (utf16_string == nullptr) { + return std::string(); + } + unsigned int target_length = ::WideCharToMultiByte( + CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, + -1, nullptr, 0, nullptr, nullptr) + -1; // remove the trailing null character + int input_length = (int)wcslen(utf16_string); + std::string utf8_string; + if (target_length == 0 || target_length > utf8_string.max_size()) { + return utf8_string; + } + utf8_string.resize(target_length); + int converted_length = ::WideCharToMultiByte( + CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, + input_length, utf8_string.data(), target_length, nullptr, nullptr); + if (converted_length == 0) { + return std::string(); + } + return utf8_string; +} diff --git a/packages/diceui/windows/runner/utils.h b/packages/diceui/windows/runner/utils.h new file mode 100644 index 0000000..3879d54 --- /dev/null +++ b/packages/diceui/windows/runner/utils.h @@ -0,0 +1,19 @@ +#ifndef RUNNER_UTILS_H_ +#define RUNNER_UTILS_H_ + +#include +#include + +// Creates a console for the process, and redirects stdout and stderr to +// it for both the runner and the Flutter library. +void CreateAndAttachConsole(); + +// Takes a null-terminated wchar_t* encoded in UTF-16 and returns a std::string +// encoded in UTF-8. Returns an empty std::string on failure. +std::string Utf8FromUtf16(const wchar_t* utf16_string); + +// Gets the command line arguments passed in as a std::vector, +// encoded in UTF-8. Returns an empty std::vector on failure. +std::vector GetCommandLineArguments(); + +#endif // RUNNER_UTILS_H_ diff --git a/packages/diceui/windows/runner/win32_window.cpp b/packages/diceui/windows/runner/win32_window.cpp new file mode 100644 index 0000000..60608d0 --- /dev/null +++ b/packages/diceui/windows/runner/win32_window.cpp @@ -0,0 +1,288 @@ +#include "win32_window.h" + +#include +#include + +#include "resource.h" + +namespace { + +/// Window attribute that enables dark mode window decorations. +/// +/// Redefined in case the developer's machine has a Windows SDK older than +/// version 10.0.22000.0. +/// See: https://docs.microsoft.com/windows/win32/api/dwmapi/ne-dwmapi-dwmwindowattribute +#ifndef DWMWA_USE_IMMERSIVE_DARK_MODE +#define DWMWA_USE_IMMERSIVE_DARK_MODE 20 +#endif + +constexpr const wchar_t kWindowClassName[] = L"FLUTTER_RUNNER_WIN32_WINDOW"; + +/// Registry key for app theme preference. +/// +/// A value of 0 indicates apps should use dark mode. A non-zero or missing +/// value indicates apps should use light mode. +constexpr const wchar_t kGetPreferredBrightnessRegKey[] = + L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize"; +constexpr const wchar_t kGetPreferredBrightnessRegValue[] = L"AppsUseLightTheme"; + +// The number of Win32Window objects that currently exist. +static int g_active_window_count = 0; + +using EnableNonClientDpiScaling = BOOL __stdcall(HWND hwnd); + +// Scale helper to convert logical scaler values to physical using passed in +// scale factor +int Scale(int source, double scale_factor) { + return static_cast(source * scale_factor); +} + +// Dynamically loads the |EnableNonClientDpiScaling| from the User32 module. +// This API is only needed for PerMonitor V1 awareness mode. +void EnableFullDpiSupportIfAvailable(HWND hwnd) { + HMODULE user32_module = LoadLibraryA("User32.dll"); + if (!user32_module) { + return; + } + auto enable_non_client_dpi_scaling = + reinterpret_cast( + GetProcAddress(user32_module, "EnableNonClientDpiScaling")); + if (enable_non_client_dpi_scaling != nullptr) { + enable_non_client_dpi_scaling(hwnd); + } + FreeLibrary(user32_module); +} + +} // namespace + +// Manages the Win32Window's window class registration. +class WindowClassRegistrar { + public: + ~WindowClassRegistrar() = default; + + // Returns the singleton registrar instance. + static WindowClassRegistrar* GetInstance() { + if (!instance_) { + instance_ = new WindowClassRegistrar(); + } + return instance_; + } + + // Returns the name of the window class, registering the class if it hasn't + // previously been registered. + const wchar_t* GetWindowClass(); + + // Unregisters the window class. Should only be called if there are no + // instances of the window. + void UnregisterWindowClass(); + + private: + WindowClassRegistrar() = default; + + static WindowClassRegistrar* instance_; + + bool class_registered_ = false; +}; + +WindowClassRegistrar* WindowClassRegistrar::instance_ = nullptr; + +const wchar_t* WindowClassRegistrar::GetWindowClass() { + if (!class_registered_) { + WNDCLASS window_class{}; + window_class.hCursor = LoadCursor(nullptr, IDC_ARROW); + window_class.lpszClassName = kWindowClassName; + window_class.style = CS_HREDRAW | CS_VREDRAW; + window_class.cbClsExtra = 0; + window_class.cbWndExtra = 0; + window_class.hInstance = GetModuleHandle(nullptr); + window_class.hIcon = + LoadIcon(window_class.hInstance, MAKEINTRESOURCE(IDI_APP_ICON)); + window_class.hbrBackground = 0; + window_class.lpszMenuName = nullptr; + window_class.lpfnWndProc = Win32Window::WndProc; + RegisterClass(&window_class); + class_registered_ = true; + } + return kWindowClassName; +} + +void WindowClassRegistrar::UnregisterWindowClass() { + UnregisterClass(kWindowClassName, nullptr); + class_registered_ = false; +} + +Win32Window::Win32Window() { + ++g_active_window_count; +} + +Win32Window::~Win32Window() { + --g_active_window_count; + Destroy(); +} + +bool Win32Window::Create(const std::wstring& title, + const Point& origin, + const Size& size) { + Destroy(); + + const wchar_t* window_class = + WindowClassRegistrar::GetInstance()->GetWindowClass(); + + const POINT target_point = {static_cast(origin.x), + static_cast(origin.y)}; + HMONITOR monitor = MonitorFromPoint(target_point, MONITOR_DEFAULTTONEAREST); + UINT dpi = FlutterDesktopGetDpiForMonitor(monitor); + double scale_factor = dpi / 96.0; + + HWND window = CreateWindow( + window_class, title.c_str(), WS_OVERLAPPEDWINDOW, + Scale(origin.x, scale_factor), Scale(origin.y, scale_factor), + Scale(size.width, scale_factor), Scale(size.height, scale_factor), + nullptr, nullptr, GetModuleHandle(nullptr), this); + + if (!window) { + return false; + } + + UpdateTheme(window); + + return OnCreate(); +} + +bool Win32Window::Show() { + return ShowWindow(window_handle_, SW_SHOWNORMAL); +} + +// static +LRESULT CALLBACK Win32Window::WndProc(HWND const window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + if (message == WM_NCCREATE) { + auto window_struct = reinterpret_cast(lparam); + SetWindowLongPtr(window, GWLP_USERDATA, + reinterpret_cast(window_struct->lpCreateParams)); + + auto that = static_cast(window_struct->lpCreateParams); + EnableFullDpiSupportIfAvailable(window); + that->window_handle_ = window; + } else if (Win32Window* that = GetThisFromHandle(window)) { + return that->MessageHandler(window, message, wparam, lparam); + } + + return DefWindowProc(window, message, wparam, lparam); +} + +LRESULT +Win32Window::MessageHandler(HWND hwnd, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + switch (message) { + case WM_DESTROY: + window_handle_ = nullptr; + Destroy(); + if (quit_on_close_) { + PostQuitMessage(0); + } + return 0; + + case WM_DPICHANGED: { + auto newRectSize = reinterpret_cast(lparam); + LONG newWidth = newRectSize->right - newRectSize->left; + LONG newHeight = newRectSize->bottom - newRectSize->top; + + SetWindowPos(hwnd, nullptr, newRectSize->left, newRectSize->top, newWidth, + newHeight, SWP_NOZORDER | SWP_NOACTIVATE); + + return 0; + } + case WM_SIZE: { + RECT rect = GetClientArea(); + if (child_content_ != nullptr) { + // Size and position the child window. + MoveWindow(child_content_, rect.left, rect.top, rect.right - rect.left, + rect.bottom - rect.top, TRUE); + } + return 0; + } + + case WM_ACTIVATE: + if (child_content_ != nullptr) { + SetFocus(child_content_); + } + return 0; + + case WM_DWMCOLORIZATIONCOLORCHANGED: + UpdateTheme(hwnd); + return 0; + } + + return DefWindowProc(window_handle_, message, wparam, lparam); +} + +void Win32Window::Destroy() { + OnDestroy(); + + if (window_handle_) { + DestroyWindow(window_handle_); + window_handle_ = nullptr; + } + if (g_active_window_count == 0) { + WindowClassRegistrar::GetInstance()->UnregisterWindowClass(); + } +} + +Win32Window* Win32Window::GetThisFromHandle(HWND const window) noexcept { + return reinterpret_cast( + GetWindowLongPtr(window, GWLP_USERDATA)); +} + +void Win32Window::SetChildContent(HWND content) { + child_content_ = content; + SetParent(content, window_handle_); + RECT frame = GetClientArea(); + + MoveWindow(content, frame.left, frame.top, frame.right - frame.left, + frame.bottom - frame.top, true); + + SetFocus(child_content_); +} + +RECT Win32Window::GetClientArea() { + RECT frame; + GetClientRect(window_handle_, &frame); + return frame; +} + +HWND Win32Window::GetHandle() { + return window_handle_; +} + +void Win32Window::SetQuitOnClose(bool quit_on_close) { + quit_on_close_ = quit_on_close; +} + +bool Win32Window::OnCreate() { + // No-op; provided for subclasses. + return true; +} + +void Win32Window::OnDestroy() { + // No-op; provided for subclasses. +} + +void Win32Window::UpdateTheme(HWND const window) { + DWORD light_mode; + DWORD light_mode_size = sizeof(light_mode); + LSTATUS result = RegGetValue(HKEY_CURRENT_USER, kGetPreferredBrightnessRegKey, + kGetPreferredBrightnessRegValue, + RRF_RT_REG_DWORD, nullptr, &light_mode, + &light_mode_size); + + if (result == ERROR_SUCCESS) { + BOOL enable_dark_mode = light_mode == 0; + DwmSetWindowAttribute(window, DWMWA_USE_IMMERSIVE_DARK_MODE, + &enable_dark_mode, sizeof(enable_dark_mode)); + } +} diff --git a/packages/diceui/windows/runner/win32_window.h b/packages/diceui/windows/runner/win32_window.h new file mode 100644 index 0000000..e901dde --- /dev/null +++ b/packages/diceui/windows/runner/win32_window.h @@ -0,0 +1,102 @@ +#ifndef RUNNER_WIN32_WINDOW_H_ +#define RUNNER_WIN32_WINDOW_H_ + +#include + +#include +#include +#include + +// A class abstraction for a high DPI-aware Win32 Window. Intended to be +// inherited from by classes that wish to specialize with custom +// rendering and input handling +class Win32Window { + public: + struct Point { + unsigned int x; + unsigned int y; + Point(unsigned int x, unsigned int y) : x(x), y(y) {} + }; + + struct Size { + unsigned int width; + unsigned int height; + Size(unsigned int width, unsigned int height) + : width(width), height(height) {} + }; + + Win32Window(); + virtual ~Win32Window(); + + // Creates a win32 window with |title| that is positioned and sized using + // |origin| and |size|. New windows are created on the default monitor. Window + // sizes are specified to the OS in physical pixels, hence to ensure a + // consistent size this function will scale the inputted width and height as + // as appropriate for the default monitor. The window is invisible until + // |Show| is called. Returns true if the window was created successfully. + bool Create(const std::wstring& title, const Point& origin, const Size& size); + + // Show the current window. Returns true if the window was successfully shown. + bool Show(); + + // Release OS resources associated with window. + void Destroy(); + + // Inserts |content| into the window tree. + void SetChildContent(HWND content); + + // Returns the backing Window handle to enable clients to set icon and other + // window properties. Returns nullptr if the window has been destroyed. + HWND GetHandle(); + + // If true, closing this window will quit the application. + void SetQuitOnClose(bool quit_on_close); + + // Return a RECT representing the bounds of the current client area. + RECT GetClientArea(); + + protected: + // Processes and route salient window messages for mouse handling, + // size change and DPI. Delegates handling of these to member overloads that + // inheriting classes can handle. + virtual LRESULT MessageHandler(HWND window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept; + + // Called when CreateAndShow is called, allowing subclass window-related + // setup. Subclasses should return false if setup fails. + virtual bool OnCreate(); + + // Called when Destroy is called. + virtual void OnDestroy(); + + private: + friend class WindowClassRegistrar; + + // OS callback called by message pump. Handles the WM_NCCREATE message which + // is passed when the non-client area is being created and enables automatic + // non-client DPI scaling so that the non-client area automatically + // responds to changes in DPI. All other messages are handled by + // MessageHandler. + static LRESULT CALLBACK WndProc(HWND const window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept; + + // Retrieves a class instance pointer for |window| + static Win32Window* GetThisFromHandle(HWND const window) noexcept; + + // Update the window frame's theme to match the system theme. + static void UpdateTheme(HWND const window); + + bool quit_on_close_ = false; + + // window handle for top level window. + HWND window_handle_ = nullptr; + + // window handle for hosted content. + HWND child_content_ = nullptr; +}; + +#endif // RUNNER_WIN32_WINDOW_H_ From a25b7a928b46eb10686537358648fe45e39d7477 Mon Sep 17 00:00:00 2001 From: Steve Christensen Date: Sun, 6 Jul 2025 23:39:05 -0600 Subject: [PATCH 24/31] change to async roll method and allow passing in dice roller support curly brace syntax for totals --- CHANGELOG.md | 28 ++-- README.md | 50 +++--- packages/dart_dice_parser/example/simple.dart | 14 +- .../lib/dart_dice_parser.dart | 2 +- .../dart_dice_parser/lib/src/ast_core.dart | 67 ++++++-- .../dart_dice_parser/lib/src/ast_dice.dart | 62 ++++---- .../dart_dice_parser/lib/src/ast_ops.dart | 104 ++++++------- .../lib/src/dice_expression.dart | 16 +- .../dart_dice_parser/lib/src/dice_roller.dart | 143 +++++++++++++----- packages/dart_dice_parser/lib/src/enums.dart | 1 + packages/dart_dice_parser/lib/src/parser.dart | 14 +- .../dart_dice_parser/lib/src/rolled_die.dart | 31 +++- .../test/dart_dice_parser_test.dart | 117 +++++++++----- packages/dicecli/bin/dicecli.dart | 2 +- packages/diceui/pubspec.yaml | 4 +- 15 files changed, 421 insertions(+), 234 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fdeb93b..1119c2d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,22 +14,28 @@ whether it was counted as a success/failure. - upgrade to dart 3.8.0 - upgrade to petitparser 7.0.0 -- add 'sort' to dice syntax -- `4d6 s` (ascending) or `4d6 sd` (descending) -- allow commas to separate different dice expressions: `4d4,6d6,8d8` -- implement penetrating dice ala Hackmaster - - `1d6p` -- roll d6, if 6 is rolled explode with d6s subtracting one each time. - - `1d100p20` -- roll a d100, if 100 is rolled penetrate with d20s - added dependency on fast_immutable_collections -- remove metadata & score from RollResult - allow compounding, exploding, and rerolls for 'odd' die (`dF, D66, and d[vals]`) -- rather than simple list of Integers representing the output of a roll or operation, now each - die rolled is a 'RolledDie' object which has the metadata/score. +- API Changes + - change signature of roll method to be async `Future DiceExpression.roll()` + - on DiceExpression.create(), allow passing a `DiceRoller` implementation that returns `Stream` results + - remove metadata & score from RollResult + - rather than simple list of Integers representing the output of a roll or operation, now each + die rolled is a 'RolledDie' object which has the metadata/score. - the RollResult's results field changes from List to IList. RolledDie represents not just the outcome of the roll, but also includes metadata about the type of die, nsides of the die (if polyhedral die), and metadata about the dice expression's modification of the rolls. -- RollResult.results will include both discarded an not-discarded RolledDie. -- RollSummary.results is just not-discarded die, there's a separate RollSummary.discarded. Alternatively, look at - RollSummary.detailedResults.results to see the whole set of die that accumulated while evaluating the expression. + - RollResult.results will include both discarded an not-discarded RolledDie. + - RollSummary.results is just not-discarded die, there's a separate RollSummary.discarded. Alternatively, look at + RollSummary.detailedResults.results to see the whole set of die that accumulated while evaluating the expression. +- new dice expression syntax: + - add 'sort' to dice syntax -- `4d6 s` (ascending) or `4d6 sd` (descending) + - allow commas to separate different dice expressions: `4d4,6d6,8d8` + - implement penetrating dice ala Hackmaster + - `1d6p` -- roll d6, if 6 is rolled explode with d6s subtracting one each time. + - `1d100p20` -- roll a d100, if 100 is rolled penetrate with d20s + - use curly braces to create a 'total' result instead of keeping each individual result. + - `{3d6}` -- if that rolled `2,4,1`, those would be discarded and replaced with a `7` for the total. # 7.1.1 diff --git a/README.md b/README.md index 8f9c9e9..92f7744 100644 --- a/README.md +++ b/README.md @@ -15,15 +15,15 @@ exploding, compounding, and other variations. import 'package:dart_dice_parser/dart_dice_parser.dart'; -void main() { +Future main() async { // Create a roller for D20 advantage (roll 2d20, keep highest). final d20adv = DiceExpression.create('2d20 kh'); - stdout.writeln(d20adv.roll()); + stdout.writeln(await d20adv.roll()); // outputs: // ((2d20) kh ) ===> RollSummary(total: 16, results: [16(d20), 4(d20)⛔︎]) - stdout.writeln(d20adv.roll()); + stdout.writeln(await d20adv.roll()); // outputs: // ((2d20) kh ) ===> RollSummary(total: 19, results: [19(d20), 13(d20)⛔︎]) } @@ -105,11 +105,22 @@ void main() { * `4d6 - 3` -- roll 4d6, subtract 3 * `4d6 - 2d6` -- roll 4d6, subtract the result of rolling 2d6 * cap/clamp: - * `4d20 C<5` -- roll 4d20, change any value < 5 to 5 - * `4d20 C>15` -- roll 4d20, change any value > 15 to 15 + * You can think of these similar to the floor and ceiling mathematical operations. + * `4d20 C<5` -- roll 4d20, change any value < 5 to 5. + * `4d20 C>15` -- roll 4d20, change any value > 15 to 15. * sorting results * `4d20 s` -- results sorted in ascending order * `4d20 sd` -- results sorted in descending order +* totalling results - `{`,`}` + * In general, this library will try to keep each individual die result as its own separate entity + as long as possible. But, that can have unwanted consequences certain operations. + * For example, say you want to roll `2d6+2` but have a maximum result of 10. + * `(2d6+2)C>10` -- rolls 2d6 and adds 2. But, these are all individual results: `[3,6,2]`. + The clamping tests on each die roll individually, and doesn't have our desired effect + -- limiting the total result to no more than 10. + * Instead, use curly braces to aggregate the results into a total: `{2d6+2} C>10`. + If that subexpression resulted in `[3,6,2]` then the curly braces discard those results and replaces + them with `[11]`, which will be clamped to `10` * multiple expressions separated by comma * `(1d8!,1d6!)kh` -- rolls 1d8 and 1d6 exploding, and keeps the highest result @@ -166,8 +177,10 @@ void main() { # Random Number Generator By default, Random.secure() is used. You can select other RNGs when creating the -dice expression. Random() will be faster than Random.secure(); if you're doing lots of rolls -for use cases where security doesn't matter, you will want to use Random(). +dice expression. + +Random() is much faster than Random.secure(); if you're doing many rolls +for use cases where security doesn't matter, you probably want to use Random(). For example, you might create a dice-rolling app that both provides rolls _and_ displays statistics (mean, stddev, etc) about the dice expression. To do that, you might create two separate @@ -177,11 +190,11 @@ clicks a button), and the second to display min/max/mean/stddev/etc ```dart final diceExpr_SecureRNG = DiceExpression.create('2d6'); -final diceExpr_FastRNG = DiceExpression.create('2d6', Random()); +final diceExpr_FastRNG = DiceExpression.create('2d6', RNGRoller(Random())); //.... // on button-click, roll the dice -final roll = diceExpr_SecureRNG.roll(); +final roll = await diceExpr_SecureRNG.roll(); //.... // when dice expr changes, update the stats graph. @@ -448,7 +461,7 @@ flowchart TD ```dart -Map rollResultAsJson = DiceExpression.create('2d20kh').roll().toJson(); +Map rollResultAsJson = (await DiceExpression.create('2d20kh').roll()).toJson(); ``` The returned objects will look roughly like: @@ -512,15 +525,13 @@ There is a default logging listener that logs at FINE level. ```dart // if you want to listen to every individual operation within the expression -DiceExpression.registerListener -( -(rollResult) { -stdout.writeln('${rollResult.opType.name} -> $rollResult'); +DiceExpression.registerListener((rollResult) { + stdout.writeln('${rollResult.opType.name} -> $rollResult'); }); // if you want to listen for the RollSummary DiceExpression.registerSummaryListener((rollSummary) { -stdout.writeln('$rollSummary');[README.md](README.md) + stdout.writeln('$rollSummary');[README.md](README.md) }); ``` @@ -530,12 +541,9 @@ the events for your specific roll. In that case, pass an 'onRoll' method to the ```dart DiceExpression.create('2d20kh').roll( -onRoll: (rr) => stdout.writeln('roll - $rr'), -onSummary: (summary) => stdout.writeln('summary - $ -summary -' -) -); + onRoll: (rr) => stdout.writeln('roll - $rr'), + onSummary: (summary) => stdout.writeln('summary - $summary') + ); ``` # Features and bugs diff --git a/packages/dart_dice_parser/example/simple.dart b/packages/dart_dice_parser/example/simple.dart index 56d3e65..c039351 100644 --- a/packages/dart_dice_parser/example/simple.dart +++ b/packages/dart_dice_parser/example/simple.dart @@ -22,11 +22,14 @@ Future main() async { // // The following example uses a seeded RNG so that results are the same on every run (so that the asserts below won't fail) // - final d20adv = DiceExpression.create('4d20 kh2 #cf #cs', Random(4321)); + final d20adv = DiceExpression.create( + '4d20 kh2 #cf #cs', + roller: RNGRoller(Random(4321)), + ); // repeated rolls of the dice expression generate different results - final result1 = d20adv.roll(); - final result2 = d20adv.roll(); + final result1 = await d20adv.roll(); + final result2 = await d20adv.roll(); stdout.writeln(result1); stdout.writeln(result2); @@ -76,7 +79,10 @@ Future main() async { ]), ); - final stats = await DiceExpression.create('2d6', Random(1234)).stats(); + final stats = await DiceExpression.create( + '2d6', + roller: RNGRoller(Random(1234)), + ).stats(); // output: // {mean: 6.99, stddev: 2.4, min: 2, max: 12, count: 1000, histogram: {2: 27, 3: 56, 4: 90, 5: 98, 6: 138, 7: 180, 8: 141, 9: 109, 10: 80, 11: 51, 12: 30}} stdout.writeln(stats); diff --git a/packages/dart_dice_parser/lib/dart_dice_parser.dart b/packages/dart_dice_parser/lib/dart_dice_parser.dart index 6b16a59..91e669a 100644 --- a/packages/dart_dice_parser/lib/dart_dice_parser.dart +++ b/packages/dart_dice_parser/lib/dart_dice_parser.dart @@ -7,7 +7,7 @@ /// const input = '2d20-L'; // D20 advantage -- roll 2d20, drop lowest /// final diceExpr = DiceExpression.create(input); /// for (var i = 0; i < 2; i++) { -/// final int result = diceExpr.roll(); +/// final int result = await diceExpr.roll(); /// stdout.writeln("$i : $result"); /// } /// ``` diff --git a/packages/dart_dice_parser/lib/src/ast_core.dart b/packages/dart_dice_parser/lib/src/ast_core.dart index b905f01..61cbce6 100644 --- a/packages/dart_dice_parser/lib/src/ast_core.dart +++ b/packages/dart_dice_parser/lib/src/ast_core.dart @@ -11,12 +11,12 @@ import 'utils.dart'; /// The `eval()` method is called from the node abstract class DiceOp extends DiceExpression with LoggingMixin { // each child class should override this to implement their operation - RollResult eval(); + Future eval(); // all children can share this call operator -- and it'll let us be consistent w/ regard to logging @override - RollResult call() { - final result = eval(); + Future call() async { + final result = await eval(); logger.finer(() => '$result'); return result; } @@ -49,9 +49,9 @@ class CommaOp extends Binary { CommaOp(super.name, super.left, super.right); @override - RollResult eval() { - final lhs = left(); - final rhs = right(); + Future eval() async { + final lhs = await left(); + final rhs = await right(); final results = []; final discarded = []; @@ -63,7 +63,11 @@ class CommaOp extends Binary { results.addAll(lhs.results); } else { results.add( - RolledDie.singleVal(result: lhs.results.sum, from: lhs.results), + RolledDie.singleVal( + result: lhs.results.sum, + from: lhs.results, + totaled: true, + ), ); discarded.addAll(lhs.results.map(RolledDie.discard)); } @@ -71,7 +75,11 @@ class CommaOp extends Binary { results.addAll(rhs.results); } else { results.add( - RolledDie.singleVal(result: rhs.results.sum, from: rhs.results), + RolledDie.singleVal( + result: rhs.results.sum, + from: rhs.results, + totaled: true, + ), ); discarded.addAll(rhs.results.map(RolledDie.discard)); } @@ -92,7 +100,7 @@ class MultiplyOp extends Binary { MultiplyOp(super.name, super.left, super.right); @override - RollResult eval() => left() * right(); + Future eval() async => await left() * await right(); } /// add operation @@ -100,7 +108,7 @@ class AddOp extends Binary { AddOp(super.name, super.left, super.right); @override - RollResult eval() => left() + right(); + Future eval() async => await left() + await right(); } /// subtraction operation @@ -108,14 +116,14 @@ class SubOp extends Binary { SubOp(super.name, super.left, super.right); @override - RollResult eval() => left() - right(); + Future eval() async => await left() - await right(); } /// base class for unary dice operations abstract class UnaryDice extends Unary { UnaryDice(super.name, super.left, this.roller); - final DiceRoller roller; + final DiceResultRoller roller; @override String toString() => '($left$name)'; @@ -125,7 +133,7 @@ abstract class UnaryDice extends Unary { abstract class BinaryDice extends Binary { BinaryDice(super.name, super.left, super.right, this.roller); - final DiceRoller roller; + final DiceResultRoller roller; } /// A value expression. The token we read from input will be a String, @@ -144,8 +152,39 @@ class SimpleValue extends DiceExpression { final RollResult _results; @override - RollResult call() => _results; + Future call() async => _results; @override String toString() => value; } + +class AggregateOp extends DiceOp { + AggregateOp(this.subexpression); + + final DiceExpression subexpression; + + @override + String toString() => '{$subexpression}'; + + @override + Future eval() async { + final outcome = await subexpression(); + + return RollResult( + expression: toString(), + opType: OpType.total, + results: [ + RolledDie.singleVal( + result: outcome.results.sum, + from: outcome.results, + totaled: true, + ), + ], + discarded: [ + ...outcome.discarded, + ...outcome.results.map(RolledDie.discard), + ], + left: outcome, + ); + } +} diff --git a/packages/dart_dice_parser/lib/src/ast_dice.dart b/packages/dart_dice_parser/lib/src/ast_dice.dart index 02f7cf1..c31e5dc 100644 --- a/packages/dart_dice_parser/lib/src/ast_dice.dart +++ b/packages/dart_dice_parser/lib/src/ast_dice.dart @@ -1,9 +1,7 @@ -import 'package:collection/collection.dart'; import 'package:fast_immutable_collections/fast_immutable_collections.dart'; import 'package:petitparser/parser.dart'; import 'ast_core.dart'; -import 'ast_ops.dart'; import 'dice_roller.dart'; import 'enums.dart'; import 'roll_result.dart'; @@ -14,8 +12,8 @@ class FudgeDice extends UnaryDice { FudgeDice(super.name, super.left, super.roller); @override - RollResult eval() { - final lhs = left(); + Future eval() async { + final lhs = await left(); final ndice = lhs.totalOrDefault(() => 1); // redundant w/ RangeError checks in the DiceRoller. But we can construct better error messages here. @@ -26,7 +24,7 @@ class FudgeDice extends UnaryDice { left.toString().length, ); } - final roll = roller.rollFudge(ndice); + final roll = await roller.rollFudge(ndice); return RollResult.fromRollResult( roll, expression: toString(), @@ -45,11 +43,14 @@ class CSVDice extends UnaryDice { String toString() => '(${left}d${vals.elements})'; @override - RollResult eval() { - final lhs = left(); + Future eval() async { + final lhs = await left(); final ndice = lhs.totalOrDefault(() => 1); - final roll = roller.rollVals(ndice, IList(vals.elements.map(int.parse))); + final roll = await roller.rollVals( + ndice, + IList(vals.elements.map(int.parse)), + ); return RollResult.fromRollResult( roll, @@ -74,21 +75,21 @@ class PenetratingDice extends UnaryDice { final int nsides; final int nsidesPenetration; - final limit = defaultRerollLimit; + final limit = DiceRoller.defaultRerollLimit; @override String toString() => '(${left}d${nsides}p$nsidesPenetration)'; @override - RollResult eval() { - final lhs = left(); + Future eval() async { + final lhs = await left(); final ndice = lhs.totalOrDefault(() => 1); - final roll = roller.roll(ndice, nsides); + final roll = await roller.roll(ndice, nsides); final results = []; final discarded = []; - roll.results.forEachIndexed((i, rolledDie) { + for (final (index, rolledDie) in roll.results.indexed) { if (rolledDie.isMaxResult) { var sum = rolledDie.result; RolledDie rerolled; @@ -97,14 +98,11 @@ class PenetratingDice extends UnaryDice { RolledDie.copyWith(rolledDie, discarded: true, penetrator: true), ); do { - rerolled = roller - .roll( - 1, - nsidesPenetration, - '(penetration ind $i, #$numPenetrated)', - ) - .results - .first; + rerolled = (await roller.roll( + 1, + nsidesPenetration, + '(penetration ind[$index] #${numPenetrated + 1})', + )).results.first; discarded.add( RolledDie.copyWith(rerolled, discarded: true, penetrator: true), ); @@ -129,7 +127,7 @@ class PenetratingDice extends UnaryDice { } else { results.add(rolledDie); } - }); + } return RollResult( expression: toString(), @@ -146,10 +144,10 @@ class PercentDice extends UnaryDice { PercentDice(super.name, super.left, super.roller); @override - RollResult eval() { - final lhs = left(); + Future eval() async { + final lhs = await left(); final ndice = lhs.totalOrDefault(() => 1); - final roll = roller.roll(ndice, 100); + final roll = await roller.roll(ndice, 100); return RollResult.fromRollResult( roll, expression: toString(), @@ -164,10 +162,10 @@ class D66Dice extends UnaryDice { D66Dice(super.name, super.left, super.roller); @override - RollResult eval() { - final lhs = left(); + Future eval() async { + final lhs = await left(); final ndice = lhs.totalOrDefault(() => 1); - final roll = roller.rollD66(ndice); + final roll = await roller.rollD66(ndice); return RollResult.fromRollResult( roll, expression: toString(), @@ -185,9 +183,9 @@ class StdDice extends BinaryDice { String toString() => '($left$name$right)'; @override - RollResult eval() { - final lhs = left(); - final rhs = right(); + Future eval() async { + final lhs = await left(); + final rhs = await right(); final ndice = lhs.totalOrDefault(() => 1); final nsides = rhs.totalOrDefault(() => 1); @@ -206,7 +204,7 @@ class StdDice extends BinaryDice { left.toString().length + name.length + 1, ); } - final roll = roller.roll(ndice, nsides); + final roll = await roller.roll(ndice, nsides); return RollResult.fromRollResult( roll, expression: toString(), diff --git a/packages/dart_dice_parser/lib/src/ast_ops.dart b/packages/dart_dice_parser/lib/src/ast_ops.dart index 2fbab9c..14939d9 100644 --- a/packages/dart_dice_parser/lib/src/ast_ops.dart +++ b/packages/dart_dice_parser/lib/src/ast_ops.dart @@ -1,19 +1,15 @@ -import 'package:collection/collection.dart'; - import 'ast_core.dart'; +import 'dice_roller.dart'; import 'enums.dart'; import 'roll_result.dart'; import 'rolled_die.dart'; -/// default limit for rerolls/exploding/compounding to avoid getting stuck in loop -const defaultRerollLimit = 1000; - class SortOp extends Unary { SortOp(super.name, super.left); @override - RollResult eval() { - final lhs = left(); + Future eval() async { + final lhs = await left(); final reversed = name == 'sd'; return RollResult( @@ -51,9 +47,9 @@ class CountOp extends Binary { CountType countType; @override - RollResult eval() { - final lhs = left(); - final rhs = right(); + Future eval() async { + final lhs = await left(); + final rhs = await right(); bool shouldCount(RolledDie rolledDie) { var rhsEmptyAndSimpleCount = false; @@ -164,9 +160,9 @@ class DropOp extends Binary { DropOp(super.name, super.left, super.right); @override - RollResult eval() { - final lhs = left(); - final rhs = right(); + Future eval() async { + final lhs = await left(); + final rhs = await right(); final target = rhs.totalOrDefault(() { throw FormatException( @@ -218,9 +214,9 @@ class DropHighLowOp extends Binary { DropHighLowOp(super.name, super.left, super.right); @override - RollResult eval() { - final lhs = left(); - final rhs = right(); + Future eval() async { + final lhs = await left(); + final rhs = await right(); final sorted = lhs.results.toList()..sort(); final numToDrop = rhs.totalOrDefault(() => 1); // if missing, assume '1' final Iterable results; @@ -264,9 +260,9 @@ class ClampOp extends Binary { ClampOp(super.name, super.left, super.right); @override - RollResult eval() { - final lhs = left(); - final rhs = right(); + Future eval() async { + final lhs = await left(); + final rhs = await right(); final target = rhs.totalOrDefault(() { throw FormatException( 'Invalid clamp operation. Missing clamp target', @@ -306,7 +302,7 @@ class RerollDice extends BinaryDice { super.left, super.right, super.roller, { - this.limit = defaultRerollLimit, + this.limit = DiceRoller.defaultRerollLimit, }) { if (name.startsWith('ro')) { limit = 1; @@ -316,9 +312,9 @@ class RerollDice extends BinaryDice { int limit; @override - RollResult eval() { - final lhs = left(); - final rhs = right(); + Future eval() async { + final lhs = await left(); + final rhs = await right(); final target = rhs.totalOrDefault(() { throw FormatException( @@ -352,15 +348,15 @@ class RerollDice extends BinaryDice { final results = []; final discarded = []; - lhs.results.forEachIndexed((i, v) { + for (final v in lhs.results) { if (shouldReroll(v)) { RolledDie rerolled; var rerollCount = 0; do { - rerolled = roller - .reroll(v, '(reroll ind $i, #$rerollCount)') - .results - .first; + rerolled = (await roller.reroll( + v, + '(reroll #$rerollCount)', + )).results.first; rerollCount++; } while (shouldReroll(rerolled) && rerollCount < limit); discarded.add(RolledDie.copyWith(v, discarded: true, rerolled: true)); @@ -370,7 +366,7 @@ class RerollDice extends BinaryDice { } else { results.add(v); } - }); + } return RollResult( expression: toString(), @@ -389,7 +385,7 @@ class CompoundingDice extends BinaryDice { super.left, super.right, super.roller, { - this.limit = defaultRerollLimit, + this.limit = DiceRoller.defaultRerollLimit, }) { if (name.startsWith('!!o')) { limit = 1; @@ -399,9 +395,9 @@ class CompoundingDice extends BinaryDice { int limit; @override - RollResult eval() { - final lhs = left(); - final rhs = right(); + Future eval() async { + final lhs = await left(); + final rhs = await right(); bool shouldCompound(RolledDie rolledDie) { final val = rolledDie.result; @@ -432,28 +428,32 @@ class CompoundingDice extends BinaryDice { final results = []; final discarded = []; - lhs.results.forEachIndexed((i, v) { - if (shouldCompound(v)) { - var sum = v.result; + for (final (index, rolledDie) in lhs.results.indexed) { + if (shouldCompound(rolledDie)) { + var sum = rolledDie.result; RolledDie rerolled; var numCompounded = 0; - discarded.add(RolledDie.copyWith(v, discarded: true, compounded: true)); + discarded.add( + RolledDie.copyWith(rolledDie, discarded: true, compounded: true), + ); do { - rerolled = roller - .reroll(v, '(compound ind $i, #$numCompounded)') - .results - .first; + rerolled = (await roller.reroll( + rolledDie, + '(compound ind[$index] #$numCompounded)', + )).results.first; discarded.add( RolledDie.copyWith(rerolled, discarded: true, compounded: true), ); sum += rerolled.result; numCompounded++; } while (shouldCompound(rerolled) && numCompounded < limit); - results.add(RolledDie.copyWith(v, result: sum, compoundedFinal: true)); + results.add( + RolledDie.copyWith(rolledDie, result: sum, compoundedFinal: true), + ); } else { - results.add(v); + results.add(rolledDie); } - }); + } return RollResult( expression: toString(), @@ -472,7 +472,7 @@ class ExplodingDice extends BinaryDice { super.left, super.right, super.roller, { - this.limit = defaultRerollLimit, + this.limit = DiceRoller.defaultRerollLimit, }) { if (name.startsWith('!o')) { limit = 1; @@ -482,9 +482,9 @@ class ExplodingDice extends BinaryDice { int limit; @override - RollResult eval() { - final lhs = left(); - final rhs = right(); + Future eval() async { + final lhs = await left(); + final rhs = await right(); bool shouldExplode(RolledDie rolledDie) { final val = rolledDie.result; @@ -519,10 +519,10 @@ class ExplodingDice extends BinaryDice { var numExplosions = 0; RolledDie rerolledDie; do { - rerolledDie = roller - .reroll(rolledDie, '(explode #${numExplosions + 1})') - .results - .first; + rerolledDie = (await roller.reroll( + rolledDie, + '(explode #${numExplosions + 1})', + )).results.first; numExplosions++; newResults.add(RolledDie.copyWith(rerolledDie, explosion: true)); } while (shouldExplode(rerolledDie) && numExplosions < limit); diff --git a/packages/dart_dice_parser/lib/src/dice_expression.dart b/packages/dart_dice_parser/lib/src/dice_expression.dart index 050efbd..1871d4c 100644 --- a/packages/dart_dice_parser/lib/src/dice_expression.dart +++ b/packages/dart_dice_parser/lib/src/dice_expression.dart @@ -1,5 +1,3 @@ -import 'dart:math'; - import 'package:logging/logging.dart'; import 'package:petitparser/petitparser.dart'; @@ -58,8 +56,8 @@ abstract class DiceExpression { /// Parse the given input into a DiceExpression /// /// Throws [FormatException] if invalid - static DiceExpression create(String input, [Random? random]) { - final builder = parserBuilder(DiceRoller(random)); + static DiceExpression create(String input, {DiceRoller? roller}) { + final builder = parserBuilder(DiceResultRoller(roller)); final result = builder.parse(input); if (result is Failure) { throw FormatException( @@ -72,16 +70,16 @@ abstract class DiceExpression { } /// each DiceExpression operation is callable (when we call the parsed string, this is the method that'll be used) - RollResult call(); + Future call(); /// Rolls the dice expression /// /// Throws [FormatException] - RollSummary roll({ + Future roll({ Function(RollResult rollResult) onRoll = noopListener, Function(RollSummary rollSummary) onSummary = noopSummaryListener, - }) { - final rollResult = this(); + }) async { + final rollResult = await this(); callListeners(rollResult, onRoll: onRoll); @@ -98,7 +96,7 @@ abstract class DiceExpression { /// Throws [FormatException] Stream rollN(int num) async* { for (var i = 0; i < num; i++) { - yield roll(); + yield await roll(); } } diff --git a/packages/dart_dice_parser/lib/src/dice_roller.dart b/packages/dart_dice_parser/lib/src/dice_roller.dart index 3646139..4362226 100644 --- a/packages/dart_dice_parser/lib/src/dice_roller.dart +++ b/packages/dart_dice_parser/lib/src/dice_roller.dart @@ -7,30 +7,95 @@ import 'roll_result.dart'; import 'rolled_die.dart'; import 'utils.dart'; -/// A dice roller for standard polyhedral dice, fudge dice, etc -class DiceRoller with LoggingMixin { - /// Constructs a dice roller - DiceRoller([Random? r]) : _random = r ?? Random.secure(); - - /// the RNG to use - final Random _random; - +abstract class DiceRoller { /// minimum dice to roll (0) - static const int minDice = 0; + static const minDice = 0; /// maximum dice to allow to be rolled (1k) - static const int maxDice = 1000; + static const maxDice = 1000; /// minimum sides of dice (2) - static const int minSides = 2; + static const minSides = 2; /// maximum sides of dice (100k) - static const int maxSides = 100000; + static const maxSides = 100000; + + /// default limit for rerolls/exploding/compounding to avoid getting stuck in loop + static const defaultRerollLimit = 1000; + + /// return an Stream of ints. length == ndice, range: [min,nsides] + /// duplicates allowed. + Stream roll({required int ndice, required int nsides, int min = 1}); + + /// return an Stream of ints selected from the given vals. length = ndice. + /// results should be selected at random from vals. + /// duplicates allowed. + Stream rollVals(int ndice, List vals); +} + +/// a dice roller that uses an RNG +class RNGRoller extends DiceRoller { + RNGRoller([Random? random]) : _random = random ?? Random.secure(); + + final Random _random; + + /// select n items from the list of values. duplicates are possible + Iterable selectNFromVals(num ndice, List vals) => [ + for (var i = 0; i < ndice; i++) vals[_random.nextInt(vals.length)], + ]; + + Iterable selectN({ + required int ndice, + required int nsides, + int min = 1, + }) => [for (int i = 0; i < ndice; i++) _random.nextInt(nsides) + min]; + + @override + Stream roll({ + required int ndice, + required int nsides, + int min = 1, + }) async* { + RangeError.checkValueInInterval( + ndice, + DiceRoller.minDice, + DiceRoller.maxDice, + 'ndice', + ); + RangeError.checkValueInInterval( + nsides, + DiceRoller.minSides, + DiceRoller.maxSides, + 'nsides', + ); + for (final i in selectN(ndice: ndice, nsides: nsides, min: min)) { + yield i; + } + } + + @override + Stream rollVals(int ndice, List vals) async* { + RangeError.checkValueInInterval( + ndice, + DiceRoller.minDice, + DiceRoller.maxDice, + 'ndice', + ); + for (final i in selectNFromVals(ndice, vals)) { + yield i; + } + } +} + +/// A dice roller for standard polyhedral dice, fudge dice, etc. +class DiceResultRoller with LoggingMixin { + /// Constructs a dice roller + DiceResultRoller([DiceRoller? r]) + : _diceRoller = r ?? RNGRoller(Random.secure()); - /// default limit to # of times dice rolls can explode (100) - static const int defaultExplodeLimit = 100; + final DiceRoller _diceRoller; - RollResult reroll(RolledDie rolledDie, [String msg = '']) { + Future reroll(RolledDie rolledDie, [String msg = '']) async { switch (rolledDie.dieType) { case DieType.polyhedral: return roll(1, rolledDie.nsides, msg); @@ -49,16 +114,19 @@ class DiceRoller with LoggingMixin { } } - RollResult rollD66(int ndice, [String msg = '']) { + Future rollD66(int ndice, [String msg = '']) async { final results = []; final discarded = []; for (var i = 0; i < ndice; i++) { - final tensRoll = roll(1, 6, 'D66*10 $msg'); - final onesRoll = roll(1, 6, 'D66*1 $msg'); - final total = tensRoll.total * 10 + onesRoll.total; + final digits = await _diceRoller.roll(ndice: 2, nsides: 6).toList(); + logger.finest(() => 'roll ${ndice}D66 => $digits $msg'); + final tens = digits[0]; + final ones = digits[1]; + final total = tens * 10 + ones; final rolled = [ - RolledDie.discard(tensRoll.results.first), - RolledDie.discard(onesRoll.results.first), + ...digits.map( + (i) => RolledDie.polyhedral(result: i, nsides: 6, discarded: true), + ), ]; discarded.addAll(rolled); results.add(RolledDie.d66(result: total, from: rolled)); @@ -75,13 +143,11 @@ class DiceRoller with LoggingMixin { } /// Roll ndice of nsides and return results - RollResult roll(int ndice, int nsides, [String msg = '']) { - RangeError.checkValueInInterval(ndice, minDice, maxDice, 'ndice'); - RangeError.checkValueInInterval(nsides, minSides, maxSides, 'nsides'); + Future roll(int ndice, int nsides, [String msg = '']) async { // nextInt is zero-inclusive; add 1 so result will be in range 1-nsides - final results = [ - for (int i = 0; i < ndice; i++) _random.nextInt(nsides) + 1, - ]; + final results = await _diceRoller + .roll(ndice: ndice, nsides: nsides) + .toList(); logger.finest(() => 'roll ${ndice}d$nsides => $results $msg'); return RollResult( expression: '${ndice}d$nsides', @@ -92,15 +158,11 @@ class DiceRoller with LoggingMixin { ); } - /// select n items from the list of values - Iterable selectN(int n, IList vals) => [ - for (var i = 0; i < n; i++) vals[_random.nextInt(vals.length)], - ]; - /// Roll N fudge dice, return results - RollResult rollFudge(int ndice, [String msg = '']) { - RangeError.checkValueInInterval(ndice, minDice, maxDice, 'ndice'); - final results = selectN(ndice, RolledDie.defaultFudgeVals); + Future rollFudge(int ndice, [String msg = '']) async { + final results = await _diceRoller + .rollVals(ndice, RolledDie.defaultFudgeVals) + .toList(); logger.finest(() => 'roll ${ndice}dF => $results $msg'); @@ -112,9 +174,14 @@ class DiceRoller with LoggingMixin { } /// Roll N fudge dice, return results - RollResult rollVals(int ndice, IList sideVals, [String msg = '']) { - RangeError.checkValueInInterval(ndice, minDice, maxDice, 'ndice'); - final results = selectN(ndice, sideVals); + Future rollVals( + int ndice, + IList sideVals, [ + String msg = '', + ]) async { + final results = await _diceRoller + .rollVals(ndice, sideVals.toList(growable: false)) + .toList(); logger.finest( () => 'roll ${ndice}d${sideVals.toString(false)} => $results $msg', diff --git a/packages/dart_dice_parser/lib/src/enums.dart b/packages/dart_dice_parser/lib/src/enums.dart index 5acb417..67d9997 100644 --- a/packages/dart_dice_parser/lib/src/enums.dart +++ b/packages/dart_dice_parser/lib/src/enums.dart @@ -51,6 +51,7 @@ enum OpType { explode, sort, comma, + total, } enum CountType { count, success, failure, critSuccess, critFailure } diff --git a/packages/dart_dice_parser/lib/src/parser.dart b/packages/dart_dice_parser/lib/src/parser.dart index 33753b9..8ed938f 100644 --- a/packages/dart_dice_parser/lib/src/parser.dart +++ b/packages/dart_dice_parser/lib/src/parser.dart @@ -6,7 +6,7 @@ import 'ast_ops.dart'; import 'dice_expression.dart'; import 'dice_roller.dart'; -Parser parserBuilder(DiceRoller roller) { +Parser parserBuilder(DiceResultRoller roller) { final builder = ExpressionBuilder(); // numbers builder.primitive( @@ -17,11 +17,13 @@ Parser parserBuilder(DiceRoller roller) { .map(SimpleValue.new), ); // parens - builder.group().wrapper( - char('(').trim(), - char(')').trim(), - (left, value, right) => value, - ); + builder.group() + ..wrapper(char('(').trim(), char(')').trim(), (left, value, right) => value) + ..wrapper( + char('{').trim(), + char('}').trim(), + (left, value, right) => AggregateOp(value), + ); // special dice handling need to have higher precedence than 'd' builder.group() ..postfix(string('dF').trim(), (a, op) => FudgeDice(op, a, roller)) diff --git a/packages/dart_dice_parser/lib/src/rolled_die.dart b/packages/dart_dice_parser/lib/src/rolled_die.dart index 8887e82..cfa301f 100644 --- a/packages/dart_dice_parser/lib/src/rolled_die.dart +++ b/packages/dart_dice_parser/lib/src/rolled_die.dart @@ -6,7 +6,7 @@ import 'enums.dart'; /// representation of a single dice roll result. class RolledDie extends Equatable implements Comparable { - static const defaultFudgeVals = IListConst([-1, -1, 0, 0, 1, 1]); + static const defaultFudgeVals = [-1, -1, 0, 0, 1, 1]; RolledDie({ required this.result, @@ -28,6 +28,7 @@ class RolledDie extends Equatable implements Comparable { this.rerolled = false, this.clampCeiling = false, this.clampFloor = false, + this.totaled = false, this.from = const IList.empty(), }) : potentialValues = IList(potentialValues) { if (dieType.requirePotentialValues && potentialValues.isEmpty) { @@ -55,8 +56,16 @@ class RolledDie extends Equatable implements Comparable { } } - factory RolledDie.polyhedral({required int result, required int nsides}) => - RolledDie(result: result, nsides: nsides, dieType: DieType.polyhedral); + factory RolledDie.polyhedral({ + required int result, + required int nsides, + bool discarded = false, + }) => RolledDie( + result: result, + nsides: nsides, + dieType: DieType.polyhedral, + discarded: discarded, + ); factory RolledDie.fudge({required int result}) => RolledDie( result: result, @@ -69,6 +78,7 @@ class RolledDie extends Equatable implements Comparable { required int result, bool discarded = false, bool penetrator = false, + bool totaled = false, Iterable? from = const IList.empty(), }) => RolledDie( result: result, @@ -77,6 +87,7 @@ class RolledDie extends Equatable implements Comparable { penetrator: penetrator, dieType: DieType.singleVal, potentialValues: [result], + totaled: totaled, from: IList(from), ); @@ -103,6 +114,7 @@ class RolledDie extends Equatable implements Comparable { bool? rerolled, bool? clampHigh, bool? clampLow, + bool? totaled, Iterable? from, }) => RolledDie( potentialValues: other.potentialValues, @@ -124,6 +136,7 @@ class RolledDie extends Equatable implements Comparable { rerolled: rerolled ?? other.rerolled, clampCeiling: clampHigh ?? other.clampCeiling, clampFloor: clampLow ?? other.clampFloor, + totaled: totaled ?? other.totaled, from: IList.orNull(from) ?? IList([other]), ); @@ -208,6 +221,9 @@ class RolledDie extends Equatable implements Comparable { /// true if the result has been clamped via `C<` final bool clampFloor; + /// true if the result is a sum of other die results + final bool totaled; + bool get isMaxResult => result == maxPotentialValue; bool get isCountable => minPotentialValue != maxPotentialValue; @@ -304,13 +320,13 @@ class RolledDie extends Equatable implements Comparable { buffer.write('➶'); } if (penetrator) { - buffer.write('⥅'); + buffer.write('⇡'); } if (compoundedFinal) { - buffer.write('∑'); + buffer.write('⇈'); } if (compounded) { - buffer.write('⥅'); + buffer.write('↑'); } if (clampCeiling) { buffer.write('⌈⌉'); @@ -318,6 +334,9 @@ class RolledDie extends Equatable implements Comparable { if (clampFloor) { buffer.write('⌊⌋'); } + if (totaled) { + buffer.write('∑'); + } if (success) { buffer.write('✓'); } diff --git a/packages/dart_dice_parser/test/dart_dice_parser_test.dart b/packages/dart_dice_parser/test/dart_dice_parser_test.dart index be18b91..3ee4b08 100644 --- a/packages/dart_dice_parser/test/dart_dice_parser_test.dart +++ b/packages/dart_dice_parser/test/dart_dice_parser_test.dart @@ -20,9 +20,12 @@ void main() { when(() => staticMockRandom.nextInt(any())).thenReturn(1); }); void staticRandTest(String name, String input, int expectedTotal) { - test('$name - $input', () { + test('$name - $input', () async { expect( - DiceExpression.create(input, staticMockRandom).roll().total, + (await DiceExpression.create( + input, + roller: RNGRoller(staticMockRandom), + ).roll()).total, equals(expectedTotal), ); }); @@ -39,8 +42,11 @@ void main() { int? critFailureCount, bool? verifyResultOrder, }) { - test('$testName - $inputExpr', () { - final rollSummary = DiceExpression.create(inputExpr, seededRandom).roll(); + test('$testName - $inputExpr', () async { + final rollSummary = await DiceExpression.create( + inputExpr, + roller: RNGRoller(seededRandom), + ).roll(); if (expectedTotal != null) { expect( rollSummary.total, @@ -329,18 +335,24 @@ void main() { test('missing clamp target', () { expect( - () => DiceExpression.create('6d6 C<', seededRandom).roll(), + () => DiceExpression.create( + '6d6 C<', + roller: RNGRoller(seededRandom), + ).roll(), throwsFormatException, ); }); }); group('listeners', () { - test('basic', () { - final dice = DiceExpression.create('2d6 kh', seededRandom); + test('basic', () async { + final dice = DiceExpression.create( + '2d6 kh', + roller: RNGRoller(seededRandom), + ); final results = []; final summaries = []; - dice.roll( + await dice.roll( onRoll: (rr) { results.add(rr); }, @@ -403,7 +415,8 @@ void main() { test('missing nsides', () { expect( - () => DiceExpression.create('6d', seededRandom).roll(), + () => + DiceExpression.create('6d', roller: RNGRoller(seededRandom)).roll(), throwsFormatException, ); }); @@ -584,10 +597,13 @@ void main() { successCount: 2, ); - test('multiple rolls is multiple results', () { - final dice = DiceExpression.create('2d6', seededRandom); - expect(dice.roll().total, 8); - expect(dice.roll().total, 6); + test('multiple rolls is multiple results', () async { + final dice = DiceExpression.create( + '2d6', + roller: RNGRoller(seededRandom), + ); + expect((await dice.roll()).total, 8); + expect((await dice.roll()).total, 6); }); test('create dice with real random', () { @@ -598,13 +614,19 @@ void main() { }); test('string method returns expr', () { - final dice = DiceExpression.create('2d6# + 5d6!>=5 + 5D66', seededRandom); + final dice = DiceExpression.create( + '2d6# + 5d6!>=5 + 5D66', + roller: RNGRoller(seededRandom), + ); expect(dice.toString(), '((2d6) # (( + ((5d6) !>= 5)) + (5D66)))'); }); test('invalid dice str', () { expect( - () => DiceExpression.create('1d5 + x2', seededRandom).roll(), + () => DiceExpression.create( + '1d5 + x2', + roller: RNGRoller(seededRandom), + ).roll(), throwsFormatException, ); }); @@ -620,19 +642,20 @@ void main() { for (final i in invalids) { test('invalid - $i', () { expect( - () => DiceExpression.create(i, seededRandom).roll(), + () => + DiceExpression.create(i, roller: RNGRoller(seededRandom)).roll(), throwsFormatException, ); }); } - test('toString', () { + test('toString', () async { // mocked responses should return rolls of 6, 2, 1, 5 final dice = DiceExpression.create( '(4d(3+3)! + (2+2)d6) #cs #cf #s #f', - seededRandom, + roller: RNGRoller(seededRandom), ); - final out = dice.roll().toString(); + final out = (await dice.roll()).toString(); expect( out, equalsIgnoringWhitespace( @@ -640,13 +663,13 @@ void main() { ), ); }); - test('toStringPretty', () { + test('toStringPretty', () async { // mocked responses should return rolls of 6, 2, 1, 5 final dice = DiceExpression.create( '(4d(3+3)! + (2+2)d6) #cs #cf #s #f', - seededRandom, + roller: RNGRoller(seededRandom), ); - final out = dice.roll().toStringPretty(); + final out = (await dice.roll()).toStringPretty(); expect( out, equalsIgnoringWhitespace( @@ -668,26 +691,32 @@ void main() { ); }); - test('toStringPretty - penetrating', () { + test('toStringPretty - penetrating', () async { // mocked responses should return rolls of 6, 2, 1, 5 - final dice = DiceExpression.create('9d6p', seededRandom); - final out = dice.roll().toStringPretty(); + final dice = DiceExpression.create( + '9d6p', + roller: RNGRoller(seededRandom), + ); + final out = (await dice.roll()).toStringPretty(); expect( out, equalsIgnoringWhitespace( ''' -(9d6p6) ===> RollSummary(total: 45, results: [10(d6➶), 2(d6), 1(d6), 5(d6), 3(d6), 5(d6), 1(d6), 4(d6), 14(d6➶)], discarded: [6(d6⛔︎⥅), 5(d6⛔︎⥅), -1(val⛔︎⥅), 6(d6⛔︎⥅), 6(d6⛔︎⥅), 4(d6⛔︎⥅), -2(val⛔︎⥅)]) - (9d6p6) =rollPenetration=> RollResult(total: 45, results: [10(d6➶), 2(d6), 1(d6), 5(d6), 3(d6), 5(d6), 1(d6), 4(d6), 14(d6➶)], discarded: [6(d6⛔︎⥅), 5(d6⛔︎⥅), -1(val⛔︎⥅), 6(d6⛔︎⥅), 6(d6⛔︎⥅), 4(d6⛔︎⥅), -2(val⛔︎⥅)]) +(9d6p6) ===> RollSummary(total: 45, results: [10(d6➶), 2(d6), 1(d6), 5(d6), 3(d6), 5(d6), 1(d6), 4(d6), 14(d6➶)], discarded: [6(d6⛔︎⇡), 5(d6⛔︎⇡), -1(val⛔︎⇡), 6(d6⛔︎⇡), 6(d6⛔︎⇡), 4(d6⛔︎⇡), -2(val⛔︎⇡)]) + (9d6p6) =rollPenetration=> RollResult(total: 45, results: [10(d6➶), 2(d6), 1(d6), 5(d6), 3(d6), 5(d6), 1(d6), 4(d6), 14(d6➶)], discarded: [6(d6⛔︎⇡), 5(d6⛔︎⇡), -1(val⛔︎⇡), 6(d6⛔︎⇡), 6(d6⛔︎⇡), 4(d6⛔︎⇡), -2(val⛔︎⇡)]) ''' .trim(), ), ); }); - test('toJson', () { + test('toJson', () async { // mocked responses should return rolls of 6, 2, 1, 5 - final dice = DiceExpression.create('4d6', seededRandom); - final obj = dice.roll().toJson(); + final dice = DiceExpression.create( + '4d6', + roller: RNGRoller(seededRandom), + ); + final obj = (await dice.roll()).toJson(); expect( obj, equals({ @@ -714,10 +743,13 @@ void main() { ); }); - test('toJson - with scoring', () { + test('toJson - with scoring', () async { // mocked responses should return rolls of 6, 2, 1, 5 - final dice = DiceExpression.create('4d6 #cf #cs', seededRandom); - final obj = dice.roll().toJson(); + final dice = DiceExpression.create( + '4d6 #cf #cs', + roller: RNGRoller(seededRandom), + ); + final obj = (await dice.roll()).toJson(); expect( obj, equals({ @@ -796,9 +828,12 @@ void main() { ); }); - test('toJson - 9d6p4', () { - final dice = DiceExpression.create('9d6p4', seededRandom); - final obj = dice.roll().toJson(); + test('toJson - 9d6p4', () async { + final dice = DiceExpression.create( + '9d6p4', + roller: RNGRoller(seededRandom), + ); + final obj = (await dice.roll()).toJson(); expect( obj, equals({ @@ -1018,7 +1053,10 @@ void main() { }); test('rollN test', () async { - final dice = DiceExpression.create('2d6', seededRandom); + final dice = DiceExpression.create( + '2d6', + roller: RNGRoller(seededRandom), + ); final results = await dice .rollN(2) @@ -1029,7 +1067,10 @@ void main() { }); test('stats test', () async { - final dice = DiceExpression.create('2d6', seededRandom); + final dice = DiceExpression.create( + '2d6', + roller: RNGRoller(seededRandom), + ); final stats = await dice.stats(num: 100); diff --git a/packages/dicecli/bin/dicecli.dart b/packages/dicecli/bin/dicecli.dart index 4e9b5f9..43827d8 100644 --- a/packages/dicecli/bin/dicecli.dart +++ b/packages/dicecli/bin/dicecli.dart @@ -114,7 +114,7 @@ void main(List arguments) async { // (aka fast and non-seeded) random = Random(); } - final diceExpr = DiceExpression.create(input, random); + final diceExpr = DiceExpression.create(input, roller: RNGRoller(random)); exit( await run( diff --git a/packages/diceui/pubspec.yaml b/packages/diceui/pubspec.yaml index b118220..bedca37 100644 --- a/packages/diceui/pubspec.yaml +++ b/packages/diceui/pubspec.yaml @@ -3,6 +3,7 @@ description: "A new Flutter project." # The following line prevents the package from being accidentally published to # pub.dev using `flutter pub publish`. This is preferred for private packages. publish_to: 'none' # Remove this line if you wish to publish to pub.dev +resolution: workspace # The following defines the version and build number for your application. # A version number is three numbers separated by dots, like 1.2.43 @@ -19,7 +20,8 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev version: 1.0.0+1 environment: - sdk: ^3.8.1 + sdk: ^3.8.0 + flutter: ">=3.27.1 <4.0.0" # Dependencies specify other packages that your package needs in order to work. # To automatically upgrade your package dependencies to the latest versions From 15404cd281dadc0e27a6ebd129078941f86c07a9 Mon Sep 17 00:00:00 2001 From: Steve Christensen Date: Sun, 6 Jul 2025 23:47:57 -0600 Subject: [PATCH 25/31] exclude diceui from analysis --- analysis_options.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/analysis_options.yaml b/analysis_options.yaml index d45e01d..af5e7f4 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -12,7 +12,7 @@ analyzer: strict-casts: true strict-raw-types: true exclude: - - dice_parser_demo/** + - packages/diceui/** #- '**.freezed.dart' #- '**.g.dart' From 467c4eae34893fef7a5db0ad8f2fb700ec721d16 Mon Sep 17 00:00:00 2001 From: Steve Christensen Date: Mon, 7 Jul 2025 00:34:39 -0600 Subject: [PATCH 26/31] rollback to petitparser 6.1.0 dep conflicts w/ flutter SDK upon upgrading to petitparser 7.0.0. --- CHANGELOG.md | 1 - packages/dart_dice_parser/lib/src/parser.dart | 29 ++++++------------- packages/dart_dice_parser/pubspec.yaml | 5 ++-- packages/diceui/pubspec.yaml | 3 +- pubspec.yaml | 1 + 5 files changed, 14 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1119c2d..68258cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,6 @@ whether it was counted as a success/failure. ## 📈 Enhancements - upgrade to dart 3.8.0 -- upgrade to petitparser 7.0.0 - added dependency on fast_immutable_collections - allow compounding, exploding, and rerolls for 'odd' die (`dF, D66, and d[vals]`) - API Changes diff --git a/packages/dart_dice_parser/lib/src/parser.dart b/packages/dart_dice_parser/lib/src/parser.dart index 8ed938f..de4b292 100644 --- a/packages/dart_dice_parser/lib/src/parser.dart +++ b/packages/dart_dice_parser/lib/src/parser.dart @@ -10,11 +10,7 @@ Parser parserBuilder(DiceResultRoller roller) { final builder = ExpressionBuilder(); // numbers builder.primitive( - digit() - .star() - .flatten(message: 'integer expected') - .trim() - .map(SimpleValue.new), + digit().star().flatten('integer expected').trim().map(SimpleValue.new), ); // parens builder.group() @@ -64,7 +60,7 @@ Parser parserBuilder(DiceResultRoller roller) { // compounding dice (has to be in separate group from exploding) builder.group().left( (string('!!') & - pattern('o', ignoreCase: true).optional() & + pattern('o').optional() & pattern('<>').optional() & char('=').optional()) .flatten() @@ -74,8 +70,8 @@ Parser parserBuilder(DiceResultRoller roller) { builder.group() // reroll & reroll once ..left( - (pattern('r', ignoreCase: true) & - pattern('o', ignoreCase: true).optional() & + (pattern('rR') & + pattern('oO').optional() & pattern('<>').optional() & char('=').optional()) .flatten() @@ -85,7 +81,7 @@ Parser parserBuilder(DiceResultRoller roller) { // exploding ..left( (char('!') & - pattern('o', ignoreCase: true).optional() & + pattern('oO').optional() & pattern('<>').optional() & char('=').optional()) .flatten() @@ -94,9 +90,7 @@ Parser parserBuilder(DiceResultRoller roller) { ) // cap/clamp >,< ..left( - (pattern('c', ignoreCase: true) & pattern('<>').optional()) - .flatten() - .trim(), + (pattern('cC') & pattern('<>').optional()).flatten().trim(), (a, op, b) => ClampOp(op.toLowerCase(), a, b), ) // drop >=,<=,>,< @@ -110,15 +104,12 @@ Parser parserBuilder(DiceResultRoller roller) { ) // drop(-) low, high ..left( - (char('-') & pattern('lh', ignoreCase: true)).flatten().trim(), + (char('-') & pattern('lLhH')).flatten().trim(), (a, op, b) => DropHighLowOp(op.toLowerCase(), a, b), ) // keep low/high ..left( - (pattern('k', ignoreCase: true) & - pattern('lh', ignoreCase: true).optional()) - .flatten() - .trim(), + (pattern('k') & pattern('lLhH').optional()).flatten().trim(), (a, op, b) => DropHighLowOp(op.toLowerCase(), a, b), ); @@ -140,9 +131,7 @@ Parser parserBuilder(DiceResultRoller roller) { (a, op, b) => CountOp(op.toLowerCase(), a, b), ) ..postfix( - (char('s', ignoreCase: true) & char('d', ignoreCase: true).optional()) - .flatten() - .trim(), + (char('s') & char('d').optional()).flatten().trim(), (a, op) => SortOp(op.toLowerCase(), a), ) ..left(char(',').trim(), (a, op, b) => CommaOp(op, a, b)); diff --git a/packages/dart_dice_parser/pubspec.yaml b/packages/dart_dice_parser/pubspec.yaml index c80e81e..b316306 100644 --- a/packages/dart_dice_parser/pubspec.yaml +++ b/packages/dart_dice_parser/pubspec.yaml @@ -19,10 +19,11 @@ dependencies: equatable: ^2.0.0 fast_immutable_collections: ^11.0.0 logging: ^1.3.0 - petitparser: ^7.0.0 + # TODO: upgrade to 7.0.0 once version constraints from stable flutter sdk don't barf + petitparser: ^6.1.0 dev_dependencies: io: ^1.0.0 lint: ^2.8.0 mocktail: ^1.0.0 - test: ^1.26.0 + test: ^1.0.0 diff --git a/packages/diceui/pubspec.yaml b/packages/diceui/pubspec.yaml index bedca37..91090b3 100644 --- a/packages/diceui/pubspec.yaml +++ b/packages/diceui/pubspec.yaml @@ -3,7 +3,6 @@ description: "A new Flutter project." # The following line prevents the package from being accidentally published to # pub.dev using `flutter pub publish`. This is preferred for private packages. publish_to: 'none' # Remove this line if you wish to publish to pub.dev -resolution: workspace # The following defines the version and build number for your application. # A version number is three numbers separated by dots, like 1.2.43 @@ -21,7 +20,7 @@ version: 1.0.0+1 environment: sdk: ^3.8.0 - flutter: ">=3.27.1 <4.0.0" + flutter: ">=3.32.0 <4.0.0" # Dependencies specify other packages that your package needs in order to work. # To automatically upgrade your package dependencies to the latest versions diff --git a/pubspec.yaml b/pubspec.yaml index 6999330..3df556d 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -5,3 +5,4 @@ environment: workspace: - packages/dart_dice_parser - packages/dicecli + #- packages/diceui From 65438e852ce3051a64c700d3820bcff553c734cb Mon Sep 17 00:00:00 2001 From: Steve Christensen Date: Mon, 7 Jul 2025 10:31:05 -0600 Subject: [PATCH 27/31] move default fudge vals field to RolledDie --- packages/dart_dice_parser/lib/src/dice_roller.dart | 4 +++- packages/dart_dice_parser/lib/src/rolled_die.dart | 7 +++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/dart_dice_parser/lib/src/dice_roller.dart b/packages/dart_dice_parser/lib/src/dice_roller.dart index 4362226..98cc80a 100644 --- a/packages/dart_dice_parser/lib/src/dice_roller.dart +++ b/packages/dart_dice_parser/lib/src/dice_roller.dart @@ -23,6 +23,8 @@ abstract class DiceRoller { /// default limit for rerolls/exploding/compounding to avoid getting stuck in loop static const defaultRerollLimit = 1000; + static const defaultFudgeVals = [-1, -1, 0, 0, 1, 1]; + /// return an Stream of ints. length == ndice, range: [min,nsides] /// duplicates allowed. Stream roll({required int ndice, required int nsides, int min = 1}); @@ -161,7 +163,7 @@ class DiceResultRoller with LoggingMixin { /// Roll N fudge dice, return results Future rollFudge(int ndice, [String msg = '']) async { final results = await _diceRoller - .rollVals(ndice, RolledDie.defaultFudgeVals) + .rollVals(ndice, DiceRoller.defaultFudgeVals) .toList(); logger.finest(() => 'roll ${ndice}dF => $results $msg'); diff --git a/packages/dart_dice_parser/lib/src/rolled_die.dart b/packages/dart_dice_parser/lib/src/rolled_die.dart index cfa301f..93da888 100644 --- a/packages/dart_dice_parser/lib/src/rolled_die.dart +++ b/packages/dart_dice_parser/lib/src/rolled_die.dart @@ -2,12 +2,11 @@ import 'package:collection/collection.dart'; import 'package:equatable/equatable.dart'; import 'package:fast_immutable_collections/fast_immutable_collections.dart'; +import 'dice_roller.dart'; import 'enums.dart'; /// representation of a single dice roll result. class RolledDie extends Equatable implements Comparable { - static const defaultFudgeVals = [-1, -1, 0, 0, 1, 1]; - RolledDie({ required this.result, required this.dieType, @@ -69,9 +68,9 @@ class RolledDie extends Equatable implements Comparable { factory RolledDie.fudge({required int result}) => RolledDie( result: result, - nsides: defaultFudgeVals.length, + nsides: DiceRoller.defaultFudgeVals.length, dieType: DieType.fudge, - potentialValues: defaultFudgeVals, + potentialValues: DiceRoller.defaultFudgeVals, ); factory RolledDie.singleVal({ From 33e436d5f1fc5d0b31cf58428d9a978266940e14 Mon Sep 17 00:00:00 2001 From: Steve Christensen Date: Mon, 7 Jul 2025 10:31:23 -0600 Subject: [PATCH 28/31] bring the diceui package into the workspace again --- packages/diceui/analysis_options.yaml | 77 ++++++++++++++++++--------- packages/diceui/pubspec.yaml | 14 ++--- packages/diceui/test/widget_test.dart | 3 +- pubspec.yaml | 3 +- 4 files changed, 61 insertions(+), 36 deletions(-) diff --git a/packages/diceui/analysis_options.yaml b/packages/diceui/analysis_options.yaml index 0d29021..af5e7f4 100644 --- a/packages/diceui/analysis_options.yaml +++ b/packages/diceui/analysis_options.yaml @@ -1,28 +1,57 @@ -# This file configures the analyzer, which statically analyzes Dart code to -# check for errors, warnings, and lints. -# -# The issues identified by the analyzer are surfaced in the UI of Dart-enabled -# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be -# invoked from the command line by running `flutter analyze`. +# This file configures the analyzer to use the lint rule set from `package:lint` -# The following line activates a set of recommended lints for Flutter apps, -# packages, and plugins designed to encourage good coding practices. -include: package:flutter_lints/flutter.yaml +#include: package:lint/strict.yaml # For production apps +# include: package:lint/casual.yaml # For code samples, hackathons and other non-production code +include: package:lint/package.yaml # Use this for packages with public API + +# You might want to exclude auto-generated files from dart analysis +analyzer: + + language: + strict-casts: true + strict-raw-types: true + exclude: + - packages/diceui/** + #- '**.freezed.dart' + #- '**.g.dart' + + errors: + always_use_package_imports: false + + +# You can customize the lint rules set to your own liking. A list of all rules +# can be found at https://dart-lang.github.io/linter/lints/options/options.html linter: - # The lint rules applied to this project can be customized in the - # section below to disable rules from the `package:flutter_lints/flutter.yaml` - # included above or to enable additional rules. A list of all available lints - # and their documentation is published at https://dart.dev/lints. - # - # Instead of disabling a lint rule for the entire project in the - # section below, it can also be suppressed for a single line of code - # or a specific dart file by using the `// ignore: name_of_lint` and - # `// ignore_for_file: name_of_lint` syntax on the line or in the file - # producing the lint. rules: - # avoid_print: false # Uncomment to disable the `avoid_print` rule - # prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule - -# Additional information about this file can be found at -# https://dart.dev/guides/language/analysis-options + - annotate_redeclares + - avoid_dynamic_calls + - avoid_final_parameters + - avoid_print + - avoid_unused_constructor_parameters + - combinators_ordering + - comment_references + - directives_ordering + - invalid_case_patterns + - leading_newlines_in_multiline_strings + - missing_code_block_language_in_doc_comment + - no_self_assignments + - omit_local_variable_types + - prefer_const_constructors + - prefer_const_constructors_in_immutables + - prefer_const_declarations + - prefer_const_literals_to_create_immutables + - prefer_expression_function_bodies + - prefer_final_in_for_each + - prefer_final_locals + - prefer_if_elements_to_conditional_expressions + - prefer_relative_imports + - prefer_single_quotes + - unnecessary_await_in_return + - unnecessary_breaks + - unnecessary_lambdas + - unnecessary_null_aware_operator_on_extension_on_nullable + - unnecessary_null_checks + - unnecessary_parenthesis + - unnecessary_statements + - unreachable_from_main diff --git a/packages/diceui/pubspec.yaml b/packages/diceui/pubspec.yaml index 91090b3..3fb2bce 100644 --- a/packages/diceui/pubspec.yaml +++ b/packages/diceui/pubspec.yaml @@ -3,6 +3,7 @@ description: "A new Flutter project." # The following line prevents the package from being accidentally published to # pub.dev using `flutter pub publish`. This is preferred for private packages. publish_to: 'none' # Remove this line if you wish to publish to pub.dev +resolution: workspace # The following defines the version and build number for your application. # A version number is three numbers separated by dots, like 1.2.43 @@ -29,25 +30,20 @@ environment: # the latest version available on pub.dev. To see which dependencies have newer # versions available, run `flutter pub outdated`. dependencies: - flutter: - sdk: flutter - # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^1.0.8 dart_dice_parser: path: ../dart_dice_parser + flutter: + sdk: flutter dev_dependencies: flutter_test: sdk: flutter - # The "flutter_lints" package below contains a set of recommended lints to - # encourage good coding practices. The lint set provided by the package is - # activated in the `analysis_options.yaml` file located at the root of your - # package. See that file for information about deactivating specific lint - # rules and activating additional ones. - flutter_lints: ^5.0.0 + lint: ^2.8.0 + # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/packages/diceui/test/widget_test.dart b/packages/diceui/test/widget_test.dart index 55706c8..1653355 100644 --- a/packages/diceui/test/widget_test.dart +++ b/packages/diceui/test/widget_test.dart @@ -5,11 +5,10 @@ // gestures. You can also use WidgetTester to find child widgets in the widget // tree, read text, and verify that the values of widget properties are correct. +import 'package:diceui/main.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:diceui/main.dart'; - void main() { testWidgets('Counter increments smoke test', (WidgetTester tester) async { // Build our app and trigger a frame. diff --git a/pubspec.yaml b/pubspec.yaml index 3df556d..54334dd 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -2,7 +2,8 @@ name: dart_dice_parser_repo publish_to: none environment: sdk: "^3.8.0" + flutter: ">=3.32.0 <4.0.0" workspace: - packages/dart_dice_parser - packages/dicecli - #- packages/diceui + - packages/diceui From 2a346e92aeafcc8e8266673b77e452106e73fc6b Mon Sep 17 00:00:00 2001 From: Steve Christensen Date: Mon, 7 Jul 2025 11:00:50 -0600 Subject: [PATCH 29/31] don't bring in diceui package --- packages/diceui/pubspec.yaml | 2 +- pubspec.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/diceui/pubspec.yaml b/packages/diceui/pubspec.yaml index 3fb2bce..2145c7f 100644 --- a/packages/diceui/pubspec.yaml +++ b/packages/diceui/pubspec.yaml @@ -3,7 +3,7 @@ description: "A new Flutter project." # The following line prevents the package from being accidentally published to # pub.dev using `flutter pub publish`. This is preferred for private packages. publish_to: 'none' # Remove this line if you wish to publish to pub.dev -resolution: workspace +#resolution: workspace # The following defines the version and build number for your application. # A version number is three numbers separated by dots, like 1.2.43 diff --git a/pubspec.yaml b/pubspec.yaml index 54334dd..9df8932 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -2,8 +2,8 @@ name: dart_dice_parser_repo publish_to: none environment: sdk: "^3.8.0" - flutter: ">=3.32.0 <4.0.0" + #flutter: ">=3.32.0 <4.0.0" workspace: - packages/dart_dice_parser - packages/dicecli - - packages/diceui + #- packages/diceui From 143b958975baef4386cff1c909bd4dc4157c295b Mon Sep 17 00:00:00 2001 From: Steve Christensen Date: Mon, 7 Jul 2025 22:46:09 -0600 Subject: [PATCH 30/31] pass dieType as param to DiceRoller --- README.md | 2 +- .../dart_dice_parser/lib/src/dice_roller.dart | 38 ++++++++++++++----- packages/dart_dice_parser/lib/src/enums.dart | 4 +- packages/dart_dice_parser/lib/src/parser.dart | 2 +- 4 files changed, 32 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 92f7744..90777e2 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ Future main() async { * `2d6` -- roll `2` dice of `6` sides * special dice variations: * `4dF` -- roll `4` fudge dice (sides: `[-1, -1, 0, 0, 1, 1]`) - * `1d%` -- roll `1` percentile dice (equivalent to `1d100`) + * `1d%` -- roll `1` percentile dice (equivalent to `1d100` or `1d10 * 10 + 1d10`) * `1D66` -- roll `1` D66, aka `1d6*10 + 1d6` * **_NOTE_**: you _must_ use uppercase `D66`, lowercase `d66` will be interpreted as a 66-sided die * `2d[2,3,5,7]`-- roll 2 dice with values `[2,3,5,7]` diff --git a/packages/dart_dice_parser/lib/src/dice_roller.dart b/packages/dart_dice_parser/lib/src/dice_roller.dart index 98cc80a..8110100 100644 --- a/packages/dart_dice_parser/lib/src/dice_roller.dart +++ b/packages/dart_dice_parser/lib/src/dice_roller.dart @@ -27,12 +27,21 @@ abstract class DiceRoller { /// return an Stream of ints. length == ndice, range: [min,nsides] /// duplicates allowed. - Stream roll({required int ndice, required int nsides, int min = 1}); + Stream roll({ + required int ndice, + required int nsides, + int min = 1, + DieType dieType = DieType.polyhedral, + }); - /// return an Stream of ints selected from the given vals. length = ndice. + /// return an Stream of results selected from the given vals. length == ndice. /// results should be selected at random from vals. - /// duplicates allowed. - Stream rollVals(int ndice, List vals); + /// duplicates are allowed. + Stream rollVals( + int ndice, + List vals, { + DieType dieType = DieType.polyhedral, + }); } /// a dice roller that uses an RNG @@ -42,7 +51,7 @@ class RNGRoller extends DiceRoller { final Random _random; /// select n items from the list of values. duplicates are possible - Iterable selectNFromVals(num ndice, List vals) => [ + Iterable selectNFromVals(num ndice, List vals) => [ for (var i = 0; i < ndice; i++) vals[_random.nextInt(vals.length)], ]; @@ -57,6 +66,7 @@ class RNGRoller extends DiceRoller { required int ndice, required int nsides, int min = 1, + DieType dieType = DieType.polyhedral, }) async* { RangeError.checkValueInInterval( ndice, @@ -76,7 +86,11 @@ class RNGRoller extends DiceRoller { } @override - Stream rollVals(int ndice, List vals) async* { + Stream rollVals( + int ndice, + List vals, { + DieType dieType = DieType.polyhedral, + }) async* { RangeError.checkValueInInterval( ndice, DiceRoller.minDice, @@ -120,7 +134,9 @@ class DiceResultRoller with LoggingMixin { final results = []; final discarded = []; for (var i = 0; i < ndice; i++) { - final digits = await _diceRoller.roll(ndice: 2, nsides: 6).toList(); + final digits = await _diceRoller + .roll(ndice: 2, nsides: 6, dieType: DieType.d66) + .toList(); logger.finest(() => 'roll ${ndice}D66 => $digits $msg'); final tens = digits[0]; final ones = digits[1]; @@ -163,7 +179,7 @@ class DiceResultRoller with LoggingMixin { /// Roll N fudge dice, return results Future rollFudge(int ndice, [String msg = '']) async { final results = await _diceRoller - .rollVals(ndice, DiceRoller.defaultFudgeVals) + .rollVals(ndice, DiceRoller.defaultFudgeVals, dieType: DieType.fudge) .toList(); logger.finest(() => 'roll ${ndice}dF => $results $msg'); @@ -182,7 +198,11 @@ class DiceResultRoller with LoggingMixin { String msg = '', ]) async { final results = await _diceRoller - .rollVals(ndice, sideVals.toList(growable: false)) + .rollVals( + ndice, + sideVals.toList(growable: false), + dieType: DieType.nvals, + ) .toList(); logger.finest( diff --git a/packages/dart_dice_parser/lib/src/enums.dart b/packages/dart_dice_parser/lib/src/enums.dart index 67d9997..690a771 100644 --- a/packages/dart_dice_parser/lib/src/enums.dart +++ b/packages/dart_dice_parser/lib/src/enums.dart @@ -9,9 +9,7 @@ enum DieType implements Comparable { // 1d[1,3,5,7,9] nvals(requirePotentialValues: true), // single value (e.g. a sum or count of dice) - singleVal(explodable: false, requirePotentialValues: true) - //penetration(explodable: false) - ; + singleVal(explodable: false, requirePotentialValues: true); const DieType({ this.explodable = true, diff --git a/packages/dart_dice_parser/lib/src/parser.dart b/packages/dart_dice_parser/lib/src/parser.dart index de4b292..076c3e0 100644 --- a/packages/dart_dice_parser/lib/src/parser.dart +++ b/packages/dart_dice_parser/lib/src/parser.dart @@ -12,7 +12,7 @@ Parser parserBuilder(DiceResultRoller roller) { builder.primitive( digit().star().flatten('integer expected').trim().map(SimpleValue.new), ); - // parens + // parens & curlies builder.group() ..wrapper(char('(').trim(), char(')').trim(), (left, value, right) => value) ..wrapper( From c748e66e764ecdf6ae042f3aa5ea38b190353714 Mon Sep 17 00:00:00 2001 From: Steve Christensen Date: Mon, 7 Jul 2025 22:52:11 -0600 Subject: [PATCH 31/31] minor cleanup --- packages/dart_dice_parser/example/README.md | 8 ++++++-- packages/dart_dice_parser/lib/src/dice_roller.dart | 5 +++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/packages/dart_dice_parser/example/README.md b/packages/dart_dice_parser/example/README.md index f63c35c..0c10bb4 100644 --- a/packages/dart_dice_parser/example/README.md +++ b/packages/dart_dice_parser/example/README.md @@ -8,9 +8,13 @@ import 'package:dart_dice_parser/dart_dice_parser.dart'; Future main() async { - final d20adv = DiceExpression.create('2d20 kh'); + // roll 2 d20s, keep the highest. + // score the results: + // cf == a 1 is a critical failure + // cs == a 20 is a critical success + final d20adv = DiceExpression.create('2d20 kh #cs #cf'); - final result1 = d20adv.roll(); + final result1 = await d20adv.roll(); stdout.writeln(result1); } ``` diff --git a/packages/dart_dice_parser/lib/src/dice_roller.dart b/packages/dart_dice_parser/lib/src/dice_roller.dart index 8110100..e946881 100644 --- a/packages/dart_dice_parser/lib/src/dice_roller.dart +++ b/packages/dart_dice_parser/lib/src/dice_roller.dart @@ -50,11 +50,12 @@ class RNGRoller extends DiceRoller { final Random _random; - /// select n items from the list of values. duplicates are possible - Iterable selectNFromVals(num ndice, List vals) => [ + /// select ndice random items from the list of values. duplicates are possible + Iterable selectNFromVals(int ndice, List vals) => [ for (var i = 0; i < ndice; i++) vals[_random.nextInt(vals.length)], ]; + /// return an iterable of ndice random integer values in range [min,nsides] Iterable selectN({ required int ndice, required int nsides,