repeatable 0.5.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7810dbdca8bf11e8e30101cc1bd22afbcaf698a0
-  data.tar.gz: e1408eb13dbf184b1115d90ae814db6582b0a640
+SHA256:
+  metadata.gz: 71a9ecf64d973e0e8298628e5ab19ab4025c9c3281a357efaae330f42c9767a0
+  data.tar.gz: 190a230b24d32f0df2f6565d35c2da1867d3ae87c82d0e00d98ab16b53baa46c
 SHA512:
-  metadata.gz: ebd63d839565ebe7971e5566462dad20d851a9a110eee829d1f53ec8868559fa6b46f14c8528e067827daa95da6e9929a479ca852d69e54884b4a6c071a3b139
-  data.tar.gz: b623c8e4040e6a8276f86c7b71078019fb830dd2ff88b0d5e784618580350cd5b8c51e45ce3846126765a97a1c448ea3e9d9d1f2261ded030cb7ad7ee195dcab
+  metadata.gz: 8335d2132cd0fc2cdf5d991431bafcec688819b9b2df45090afcdb05886f74632ebb262ae6f014911aa300589a5f1a776d2a5325adb39569824af306cd94bbfc
+  data.tar.gz: 26a637424b6a64a3a1a6b6db0ed8fb6c0e1ece5040b15499182fd3e45cdb3bf7298634620d1f3284af1a47f00655f7bac7212bea369fbc5f287e154fc3ce45cf

data/.git-blame-ignore-revs

@@ -0,0 +1,13 @@
+# These commits should be ignored by git-blame, making it much easier to step through the history
+# of a line without hitting formatting commits (esp. large, update-all-the-files sorts of commits).
+#
+# For git-blame to ignore these revisions, you'll need to tell it about this file.
+#
+# You can either pass it to the command each time:
+#   git blame --ignore-rev-file=.git-blame-ignore-revs -L 12,14 lib/repeatable/conversions.rb
+#
+# Or you can set it as a config value, which will be used by all git-blame commands henceforth:
+#   git config blame.ignoreRevsFile .git-blame-ignore-revs
+
+# Initial style fix after introducing Standard
+80611e9be4fe12e6b9bdb937d37902c12ac3a53b

data/.github/workflows/ci.yml

@@ -0,0 +1,72 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - main
+      - 'ml/**'
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  RSpec:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version:
+          - '2.5' # deprecated
+          - '2.6'
+          - '2.7'
+          - '3.0'
+          - '3.1'
+        include:
+          - ruby-version: '3.0'
+            coverage: 'true'
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby ${{ matrix.ruby-version }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+      - uses: amancevice/setup-code-climate@v0
+        name: CodeClimate setup
+        if: ${{ matrix.coverage == 'true' }}
+        with:
+          cc_test_reporter_id: ${{ secrets.CC_TEST_REPORTER_ID }}
+      - name: CodeClimate before-build
+        run: cc-test-reporter before-build
+        if: ${{ matrix.coverage == 'true' }}
+        continue-on-error: true
+      - name: Run tests
+        env:
+          COVERAGE: ${{ matrix.coverage }}
+        run: bundle exec rake spec
+      - name: CodeClimate after-build
+        run: cc-test-reporter after-build
+        if: ${{ matrix.coverage == 'true' }}
+        continue-on-error: true
+  Standard:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.0'
+          bundler-cache: true
+      - name: Run Standard
+        run: bundle exec rake standard
+  Sorbet:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.0'
+          bundler-cache: true
+      - name: Run Sorbet
+        run: bundle exec rake sorbet

data/.gitignore

@@ -1,7 +1,6 @@
 /*.gem
 /.bundle/
 /.yardoc
-/Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/

data/.rspec

@@ -1,2 +1 @@
---format documentation
 --color

data/.standard.yml

@@ -0,0 +1,3 @@
+# For available configuration options, see: https://github.com/testdouble/standard
+
+default_ignores: true

data/CHANGELOG.md

@@ -2,7 +2,59 @@
 
 ### Unreleased
 
-[Commits](https://github.com/molawson/repeatable/compare/v0.5.0...master)
+[Commits](https://github.com/molawson/repeatable/compare/v1.1.0...main)
+
+### 1.1.0 (2022-02-25)
+
+Changes:
+
+* Add [sorbet](https://sorbet.org) for type checking
+
+Bug Fixes:
+
+* Ensure `first_occurrence` is never part of `#to_h` output for `Expression::Biweekly`
+
+Chores:
+
+* Add support for Ruby 3.1
+* Deprecate support for Ruby 2.5
+
+[Commits](https://github.com/molawson/repeatable/compare/v1.0.0...v1.1.0)
+
+### 1.0.0 (2021-03-25)
+
+Breaking Changes:
+
+* Change `Expression::DayInMonth` to take negative numbers instead of special `:last` symbol (or string)
+* Stop including `Conversions` in top level namespace (must now be accessed via `Repeatable::Conversions::Date()` or by calling `include Repeatable::Conversions` in whatever namespace(s) it's needed)
+* Require Ruby 2.5.0 or greater
+
+Changes:
+
+* Flatten nested `Expression::Union` elements during initialization ([@cmoel][])
+* Flatten nested `Expression::Intersection` elements during initialization
+
+Chores:
+
+* Add support for Ruby 2.5, 2.6, 2.7, 3.0
+* Introduce [standard](https://github.com/testdouble/standard) for code formatting
+
+[Commits](https://github.com/molawson/repeatable/compare/v0.6.0...v1.0.0)
+
+
+### 0.6.0 (2017-05-04)
+
+Features:
+
+* Add `Expression::Difference` for set differences between 2 schedules ([@danott][])
+* Allow `Expression::DayInMonth` to take `:last` (or `'last'`) for its `day:` argument ([@PatrickLerner][])
+* Allow `Expression::WeekdayInMonth` to take negative `count` argument for last, second-to-last, etc. of a given weekday ([@danielma][])
+
+Bug Fixes:
+
+* Fix `Expression::RangeInYear` to properly handle using `start_day` and `end_day` when `start_month == end_month` ([@danielma][])
+
+[Commits](https://github.com/molawson/repeatable/compare/v0.5.0...v0.6.0)
 
 ### 0.5.0 (2016-01-27)
 
@@ -38,7 +90,7 @@ Features:
 * Add `ParseError` class for better error handling
 * Extract `Parser` class from `Schedule`
 
-Bugfixes:
+Bug Fixes:
 
 * Enable `Schedule` to take a hash with string keys
 
@@ -51,7 +103,7 @@ Features:
 * Add `Schedule#to_h` and `Expression#to_h` methods
 * Enable building a `Schedule` from composed `Expression` objects
 
-Bugfixes:
+Bug Fixes:
 
 * Fix default case equality for `Expression::Base` to work with classes and instances
 
@@ -65,3 +117,6 @@ Initial Release
 
 
 [@danott]: https://github.com/danott
+[@PatrickLerner]: https://github.com/PatrickLerner
+[@danielma]: https://github.com/danielma
+[@cmoel]: https://github.com/cmoel

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+mo@molawson.com.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.

data/Gemfile

@@ -1,7 +1,15 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in repeatable.gemspec
 gemspec
 
-gem 'pry'
-gem 'codeclimate-test-reporter', group: :test, require: nil
+gem "parlour"
+gem "pry", "~> 0.13"
+gem "rake", ">= 12.3.3"
+gem "sorbet"
+gem "standard", "~> 1.0"
+
+group :test do
+  gem "rspec", "~> 3.0"
+  gem "simplecov", "~> 0.18"
+end

data/Gemfile.lock

@@ -0,0 +1,95 @@
+PATH
+  remote: .
+  specs:
+    repeatable (1.1.0)
+      sorbet-runtime
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ast (2.4.2)
+    coderay (1.1.3)
+    commander (4.6.0)
+      highline (~> 2.0.0)
+    diff-lcs (1.4.4)
+    docile (1.4.0)
+    highline (2.0.3)
+    method_source (1.0.0)
+    parallel (1.20.1)
+    parlour (6.0.1)
+      commander (~> 4.5)
+      parser
+      rainbow (~> 3.0)
+      sorbet-runtime (>= 0.5)
+    parser (3.0.0.0)
+      ast (~> 2.4.1)
+    pry (0.14.0)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rainbow (3.0.0)
+    rake (13.0.3)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    rubocop (1.11.0)
+      parallel (~> 1.10)
+      parser (>= 3.0.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.2.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.4.1)
+      parser (>= 2.7.1.5)
+    rubocop-performance (1.10.1)
+      rubocop (>= 0.90.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    ruby-progressbar (1.11.0)
+    simplecov (0.21.2)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.4)
+    sorbet (0.5.9672)
+      sorbet-static (= 0.5.9672)
+    sorbet-runtime (0.5.6357)
+    sorbet-static (0.5.9672-universal-darwin-19)
+    sorbet-static (0.5.9672-universal-darwin-21)
+    sorbet-static (0.5.9672-x86_64-linux)
+    standard (1.0.4)
+      rubocop (= 1.11.0)
+      rubocop-performance (= 1.10.1)
+    unicode-display_width (2.0.0)
+
+PLATFORMS
+  arm64-darwin-21
+  linux
+  x86_64-darwin-19
+  x86_64-linux
+
+DEPENDENCIES
+  parlour
+  pry (~> 0.13)
+  rake (>= 12.3.3)
+  repeatable!
+  rspec (~> 3.0)
+  simplecov (~> 0.18)
+  sorbet
+  standard (~> 1.0)
+
+BUNDLED WITH
+   2.3.6

data/README.md

@@ -1,8 +1,8 @@
 # Repeatable
 
-[![Build Status](https://img.shields.io/travis/molawson/repeatable.svg)](https://travis-ci.org/molawson/repeatable)
-[![Code Climate](https://img.shields.io/codeclimate/github/molawson/repeatable.svg)](https://codeclimate.com/github/molawson/repeatable)
-[![Code Climate Coverage](https://img.shields.io/codeclimate/coverage/github/molawson/repeatable.svg)](https://codeclimate.com/github/molawson/repeatable)
+[![CI](https://github.com/molawson/repeatable/actions/workflows/ci.yml/badge.svg)](https://github.com/molawson/repeatable/actions/workflows/ci.yml)
+[![Maintainability](https://api.codeclimate.com/v1/badges/73707efd5eeffd364c0d/maintainability)](https://codeclimate.com/github/molawson/repeatable/maintainability)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/73707efd5eeffd364c0d/test_coverage)](https://codeclimate.com/github/molawson/repeatable/test_coverage)
 
 Ruby implementation of Martin Fowler's [Recurring Events for Calendars](http://martinfowler.com/apsupp/recurring.pdf) paper.
 
@@ -33,9 +33,9 @@ You can create a schedule in one of two ways.
 Instantiate and compose each of the `Repeatable::Expression` objects manually.
 
 ```ruby
-second_monday = Repeatabe::Expression::WeekdayInMonth.new(weekday: 1, count: 2)
+second_monday = Repeatable::Expression::WeekdayInMonth.new(weekday: 1, count: 2)
 oct_thru_dec = Repeatable::Expression::RangeInYear.new(start_month: 10, end_month: 12)
-intersection = Repeatable::Expresson::Intersection.new(second_monday, oct_thru_dec)
+intersection = Repeatable::Expression::Intersection.new(second_monday, oct_thru_dec)
 
 schedule = Repeatable::Schedule.new(intersection)
 ```
@@ -49,7 +49,8 @@ Or describe the same structure with a `Hash`, and the gem will handle instantiat
 arg = {
   intersection: [
     { weekday_in_month: { weekday: 1, count: 2 } },
-    { range_in_year: { start_month: 10, end_month: 12 } }
+    { range_in_year: { start_month: 10, end_month: 12 } },
+    { exact_date: { date: "2015-08-01" } }
   ]
 }
 
@@ -73,6 +74,10 @@ Repeatable::Expression::Union.new(expressions)
 { intersection: [] }
 Repeatable::Expression::Intersection.new(expressions)
 
+# Date is part of the first set (`included`) but not part of the second set (`excluded`)
+{ difference: { included: expression, excluded: another_expression } }
+Repeatable::Expression::Difference.new(included: expression, excluded: another_expression)
+
 
 # DATES
 
@@ -84,14 +89,22 @@ Repeatable::Expression::Weekday.new(weekday: 0)
 { weekday_in_month: { weekday: 1, count: 3 } }
 Repeatable::Expression::WeekdayInMonth.new(weekday: 1, count: 3)
 
+# The last Thursday of every month
+{ weekday_in_month: { weekday: 4, count: -1 } }
+Repeatable::Expression::WeekdayInMonth.new(weekday: 4, count: -1)
+
 # Every other Monday, starting from December 1, 2015
-{ biweekly: { weekday: 1, start_date: '2015-12-01' } }
-Repeatable::Expression::Biweekly.new(weekday: 1, start_date: Date.new(2015, 12, 1))
+{ biweekly: { weekday: 1, start_after: '2015-12-01' } }
+Repeatable::Expression::Biweekly.new(weekday: 1, start_after: Date.new(2015, 12, 1))
 
 # The 13th of every month
 { day_in_month: { day: 13 } }
 Repeatable::Expression::DayInMonth.new(day: 13)
 
+# The last day of every month
+{ day_in_month: { day: -1 } }
+Repeatable::Expression::DayInMonth.new(day: -1)
+
 # All days in October
 { range_in_year: { start_month: 10 } }
 Repeatable::Expression::RangeInYear.new(start_month: 10)
@@ -103,6 +116,10 @@ Repeatable::Expression::RangeInYear.new(start_month: 10, end_month: 12)
 # All days from October 1 through December 20
 { range_in_year: { start_month: 10, end_month: 12, start_day: 1, end_day: 20 } }
 Repeatable::Expression::RangeInYear.new(start_month: 10, end_month: 12, start_day: 1, end_day: 20)
+
+# only December 21, 2012
+{ exact_date: { date: '2012-12-21' } }
+Repeatable::Expression::ExactDate.new(date: Date.new(2012, 12, 21)
 ```
 
 #### Schedule Errors
@@ -165,16 +182,39 @@ Repeatable::Schedule.new(union) == Repeatable::Schedule.new(another_union)
 
 ```
 
+## Ruby version support
+
+Currently tested and supported: 
+- 2.6
+- 2.7
+- 3.0
+- 3.1
+
+Deprecated (currently tested but has reached EOL and will be unsupported in the next major version):
+- 2.5
+
+The supported versions will roughly track with versions that are currently maintained by the Ruby core team.
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/console` for an interactive prompt that will allow you to experiment.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release` to create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+You can run the tests with `bundle exec rake`.
 
 ## Contributing
 
+Bug reports and pull requests are welcome on GitHub at https://github.com/molawson/repeatable. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+
 1. Fork it ( https://github.com/molawson/repeatable/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create a new Pull Request
+
+## License
+
+The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+
+## Code of Conduct
+
+Everyone interacting in the Repeatable project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/molawson/repeatable/blob/main/CODE_OF_CONDUCT.md).

data/Rakefile

@@ -1,6 +1,12 @@
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
-task default: :spec
+require "standard/rake"
+
+task :sorbet do
+  sh %(bundle exec srb tc)
+end
+
+task default: %i[spec sorbet standard]

data/lib/repeatable/conversions.rb

@@ -1,7 +1,11 @@
+# typed: strict
 module Repeatable
   module Conversions
+    extend T::Sig
+
     module_function
 
+    sig { params(arg: Object).returns(::Date) }
     def Date(arg)
       case arg
       when Date, Time
@@ -10,7 +14,7 @@ module Repeatable
         Date.parse(arg)
       end
     rescue ArgumentError
-      raise TypeError, "Cannot convert #{arg.inspect} to Date"
+      Kernel.raise TypeError, "Cannot convert #{arg.inspect} to Date"
     end
   end
 end

data/lib/repeatable/expression/base.rb

@@ -1,6 +1,13 @@
+# typed: strict
 module Repeatable
   module Expression
     class Base
+      extend T::Sig
+      extend T::Helpers
+
+      abstract!
+
+      sig { params(other: Object).returns(T::Boolean) }
       def self.===(other)
         case other
         when Class
@@ -10,28 +17,47 @@ module Repeatable
         end
       end
 
-      def include?(_date)
-        fail(
-          NotImplementedError,
-          "Don't use Expression::Base directly. Subclasses must implement `#include?`"
-        )
+      sig { abstract.params(date: ::Date).returns(T::Boolean) }
+      def include?(date)
       end
 
+      sig { returns(T::Hash[Symbol, T.any(Types::SymbolHash, T::Array[Types::SymbolHash])]) }
       def to_h
-        fail(
-          NotImplementedError,
-          "Don't use Expression::Base directly. Subclasses must implement `#to_h`"
-        )
+        {hash_key => hash_value}
+      end
+
+      sig { params(other: Expression::Base).returns(Expression::Union) }
+      def union(other)
+        Union.new(self, other)
+      end
+      alias_method :+, :union
+      alias_method :|, :union
+
+      sig { params(other: Expression::Base).returns(Expression::Intersection) }
+      def intersection(other)
+        Intersection.new(self, other)
+      end
+      alias_method :&, :intersection
+
+      sig { params(other: T.untyped).returns(Expression::Difference) }
+      def difference(other)
+        Difference.new(included: self, excluded: other)
       end
+      alias_method :-, :difference
 
       private
 
+      sig { returns(Symbol) }
       def hash_key
-        self.class.name.split('::').last
-          .gsub(/(?<!\b)[A-Z]/) { "_#{Regexp.last_match[0]}" }
+        T.must(T.must(self.class.name).split("::").last)
+          .gsub(/(?<!\b)[A-Z]/) { "_#{T.must(Regexp.last_match)[0]}" }
           .downcase
           .to_sym
       end
+
+      sig { abstract.returns(T.any(Types::SymbolHash, T::Array[Types::SymbolHash])) }
+      def hash_value
+      end
     end
   end
 end