use crate::models::paging::Paging;
use crate::models::{Number, PageId, UserId};
use chrono::{DateTime, Utc};
use serde::ser::SerializeMap;
use serde::{Serialize, Serializer};

#[derive(Serialize, Debug, Eq, PartialEq, Hash, Copy, Clone)]
#[serde(rename_all = "snake_case")]
pub enum SortDirection {
    Ascending,
    Descending,
}

#[derive(Serialize, Debug, Eq, PartialEq, Hash, Copy, Clone)]
#[serde(rename_all = "snake_case")]
pub enum SortTimestamp {
    LastEditedTime,
}

#[derive(Serialize, Debug, Eq, PartialEq, Hash, Copy, Clone)]
#[serde(rename_all = "snake_case")]
pub enum DatabaseSortTimestamp {
    CreatedTime,
    LastEditedTime,
}

#[derive(Serialize, Debug, Eq, PartialEq, Hash, Copy, Clone)]
#[serde(rename_all = "snake_case")]
pub enum FilterValue {
    Page,
    Database,
}

#[derive(Serialize, Debug, Eq, PartialEq, Hash, Copy, Clone)]
#[serde(rename_all = "snake_case")]
pub enum FilterProperty {
    Object,
}

#[derive(Serialize, Debug, Eq, PartialEq, Clone)]
pub struct Sort {
    /// The name of the timestamp to sort against.
    timestamp: SortTimestamp,
    direction: SortDirection,
}

#[derive(Serialize, Debug, Eq, PartialEq, Clone)]
pub struct Filter {
    property: FilterProperty,
    value: FilterValue,
}

#[derive(Serialize, Debug, Eq, PartialEq, Default)]
pub struct SearchRequest {
    #[serde(skip_serializing_if = "Option::is_none")]
    query: Option<String>,
    #[serde(skip_serializing_if = "Option::is_none")]
    sort: Option<Sort>,
    #[serde(skip_serializing_if = "Option::is_none")]
    filter: Option<Filter>,
    #[serde(flatten)]
    paging: Option<Paging>,
}

#[derive(Serialize, Debug, Eq, PartialEq, Clone)]
#[serde(rename_all = "snake_case")]
pub enum TextCondition {
    Equals(String),
    DoesNotEqual(String),
    Contains(String),
    DoesNotContain(String),
    StartsWith(String),
    EndsWith(String),
    #[serde(serialize_with = "serialize_to_true")]
    IsEmpty,
    #[serde(serialize_with = "serialize_to_true")]
    IsNotEmpty,
}

fn serialize_to_true<S>(serializer: S) -> Result<S::Ok, S::Error>
where
    S: Serializer,
{
    serializer.serialize_bool(true)
}

fn serialize_to_empty_object<S>(serializer: S) -> Result<S::Ok, S::Error>
where
    S: Serializer,
{
    // Todo: there has to be a better way?
    serializer.serialize_map(Some(0))?.end()
}

#[derive(Serialize, Debug, Eq, PartialEq, Clone)]
#[serde(rename_all = "snake_case")]
pub enum NumberCondition {
    Equals(Number),
    DoesNotEqual(Number),
    GreaterThan(Number),
    LessThan(Number),
    GreaterThanOrEqualTo(Number),
    LessThanOrEqualTo(Number),
    #[serde(serialize_with = "serialize_to_true")]
    IsEmpty,
    #[serde(serialize_with = "serialize_to_true")]
    IsNotEmpty,
}

#[derive(Serialize, Debug, Eq, PartialEq, Clone)]
#[serde(rename_all = "snake_case")]
pub enum CheckboxCondition {
    Equals(bool),
    DoesNotEqual(bool),
}

#[derive(Serialize, Debug, Eq, PartialEq, Clone)]
#[serde(rename_all = "snake_case")]
pub enum SelectCondition {
    /// Only return pages where the page property value matches the provided value exactly.
    Equals(String),
    /// Only return pages where the page property value does not match the provided value exactly.
    DoesNotEqual(String),
    /// Only return pages where the page property value is empty.
    #[serde(serialize_with = "serialize_to_true")]
    IsEmpty,
    /// Only return pages where the page property value is present.
    #[serde(serialize_with = "serialize_to_true")]
    IsNotEmpty,
}

#[derive(Serialize, Debug, Eq, PartialEq, Clone)]
#[serde(rename_all = "snake_case")]
pub enum MultiSelectCondition {
    /// Only return pages where the page property value contains the provided value.
    Contains(String),
    /// Only return pages where the page property value does not contain the provided value.
    DoesNotContain(String),
    /// Only return pages where the page property value is empty.
    #[serde(serialize_with = "serialize_to_true")]
    IsEmpty,
    /// Only return pages where the page property value is present.
    #[serde(serialize_with = "serialize_to_true")]
    IsNotEmpty,
}

#[derive(Serialize, Debug, Eq, PartialEq, Clone)]
#[serde(rename_all = "snake_case")]
pub enum DateCondition {
    /// Only return pages where the page property value matches the provided date exactly.
    /// Note that the comparison is done against the date.
    /// Any time information sent will be ignored.
    Equals(DateTime<Utc>),
    /// Only return pages where the page property value is before the provided date.
    /// Note that the comparison is done against the date.
    /// Any time information sent will be ignored.
    Before(DateTime<Utc>),
    /// Only return pages where the page property value is after the provided date.
    /// Note that the comparison is done against the date.
    /// Any time information sent will be ignored.
    After(DateTime<Utc>),
    /// Only return pages where the page property value is on or before the provided date.
    /// Note that the comparison is done against the date.
    /// Any time information sent will be ignored.
    OnOrBefore(DateTime<Utc>),
    /// Only return pages where the page property value is on or after the provided date.
    /// Note that the comparison is done against the date.
    /// Any time information sent will be ignored.
    OnOrAfter(DateTime<Utc>),
    /// Only return pages where the page property value is empty.
    #[serde(serialize_with = "serialize_to_true")]
    IsEmpty,
    /// Only return pages where the page property value is present.
    #[serde(serialize_with = "serialize_to_true")]
    IsNotEmpty,
    /// Only return pages where the page property value is within the past week.
    #[serde(serialize_with = "serialize_to_empty_object")]
    PastWeek,
    /// Only return pages where the page property value is within the past month.
    #[serde(serialize_with = "serialize_to_empty_object")]
    PastMonth,
    /// Only return pages where the page property value is within the past year.
    #[serde(serialize_with = "serialize_to_empty_object")]
    PastYear,
    /// Only return pages where the page property value is within the next week.
    #[serde(serialize_with = "serialize_to_empty_object")]
    NextWeek,
    /// Only return pages where the page property value is within the next month.
    #[serde(serialize_with = "serialize_to_empty_object")]
    NextMonth,
    /// Only return pages where the page property value is within the next year.
    #[serde(serialize_with = "serialize_to_empty_object")]
    NextYear,
}

#[derive(Serialize, Debug, Eq, PartialEq, Clone)]
#[serde(rename_all = "snake_case")]
pub enum PeopleCondition {
    Contains(UserId),
    /// Only return pages where the page property value does not contain the provided value.
    DoesNotContain(UserId),
    /// Only return pages where the page property value is empty.
    #[serde(serialize_with = "serialize_to_true")]
    IsEmpty,
    /// Only return pages where the page property value is present.
    #[serde(serialize_with = "serialize_to_true")]
    IsNotEmpty,
}

#[derive(Serialize, Debug, Eq, PartialEq, Clone)]
#[serde(rename_all = "snake_case")]
pub enum FilesCondition {
    /// Only return pages where the page property value is empty.
    #[serde(serialize_with = "serialize_to_true")]
    IsEmpty,
    /// Only return pages where the page property value is present.
    #[serde(serialize_with = "serialize_to_true")]
    IsNotEmpty,
}

#[derive(Serialize, Debug, Eq, PartialEq, Clone)]
#[serde(rename_all = "snake_case")]
pub enum RelationCondition {
    /// Only return pages where the page property value contains the provided value.
    Contains(PageId),
    /// Only return pages where the page property value does not contain the provided value.
    DoesNotContain(PageId),
    /// Only return pages where the page property value is empty.
    #[serde(serialize_with = "serialize_to_true")]
    IsEmpty,
    /// Only return pages where the page property value is present.
    #[serde(serialize_with = "serialize_to_true")]
    IsNotEmpty,
}

#[derive(Serialize, Debug, Eq, PartialEq, Clone)]
#[serde(rename_all = "snake_case")]
pub enum FormulaCondition {
    /// Only return pages where the result type of the page property formula is "text"
    /// and the provided text filter condition matches the formula's value.
    Text(TextCondition),
    /// Only return pages where the result type of the page property formula is "number"
    /// and the provided number filter condition matches the formula's value.
    Number(NumberCondition),
    /// Only return pages where the result type of the page property formula is "checkbox"
    /// and the provided checkbox filter condition matches the formula's value.
    Checkbox(CheckboxCondition),
    /// Only return pages where the result type of the page property formula is "date"
    /// and the provided date filter condition matches the formula's value.
    Date(DateCondition),
}

#[derive(Serialize, Debug, Eq, PartialEq, Clone)]
#[serde(rename_all = "snake_case")]
pub enum PropertyCondition {
    Text(TextCondition),
    Number(NumberCondition),
    Checkbox(CheckboxCondition),
    Select(SelectCondition),
    MultiSelect(MultiSelectCondition),
    Date(DateCondition),
    People(PeopleCondition),
    Files(FilesCondition),
    Relation(RelationCondition),
    Formula(FormulaCondition),
    /// Returns pages when **any** of the filters inside the provided vector match.
    Or(Vec<PropertyCondition>),
    /// Returns pages when **all** of the filters inside the provided vector match.
    And(Vec<PropertyCondition>),
}

#[derive(Serialize, Debug, Eq, PartialEq, Clone)]
pub struct FilterCondition {
    pub property: String,
    #[serde(flatten)]
    pub condition: PropertyCondition,
}

#[derive(Serialize, Debug, Eq, PartialEq, Clone)]
pub struct DatabaseSort {
    // Todo: Should property and timestamp be mutually exclusive? (i.e a flattened enum?)
    //  the documentation is not clear:
    //  https://developers.notion.com/reference/post-database-query#post-database-query-sort
    property: Option<String>,
    /// The name of the timestamp to sort against.
    timestamp: Option<SortTimestamp>,
    direction: SortDirection,
}

#[derive(Serialize, Debug, Eq, PartialEq, Default)]
pub struct DatabaseQuery {
    #[serde(skip_serializing_if = "Option::is_none")]
    pub sorts: Option<Vec<DatabaseSort>>,
    #[serde(skip_serializing_if = "Option::is_none")]
    pub filter: Option<FilterCondition>,
    #[serde(flatten)]
    pub paging: Option<Paging>,
}

#[derive(Debug, Eq, PartialEq)]
pub enum NotionSearch {
    Query(String),
    Sort {
        timestamp: SortTimestamp,
        direction: SortDirection,
    },
    Filter {
        property: FilterProperty,
        value: FilterValue,
    },
}

impl From<NotionSearch> for SearchRequest {
    fn from(search: NotionSearch) -> Self {
        match search {
            NotionSearch::Query(query) => SearchRequest {
                query: Some(query),
                ..Default::default()
            },
            NotionSearch::Sort {
                direction,
                timestamp,
            } => SearchRequest {
                sort: Some(Sort {
                    direction,
                    timestamp,
                }),
                ..Default::default()
            },
            NotionSearch::Filter { value, property } => SearchRequest {
                filter: Some(Filter { value, property }),
                ..Default::default()
            },
        }
    }
}

#[cfg(test)]
mod tests {
    mod text_filters {
        use crate::models::search::PropertyCondition::Text;
        use crate::models::search::{FilterCondition, TextCondition};
        use serde_json::json;

        #[test]
        fn text_property_equals() -> Result<(), Box<dyn std::error::Error>> {
            let json = serde_json::to_value(&FilterCondition {
                property: "Name".to_string(),
                condition: Text(TextCondition::Equals("Test".to_string())),
            })?;
            assert_eq!(json, json!({"property":"Name","text":{"equals":"Test"}}));

            Ok(())
        }

        #[test]
        fn text_property_contains() -> Result<(), Box<dyn std::error::Error>> {
            let json = serde_json::to_value(&FilterCondition {
                property: "Name".to_string(),
                condition: Text(TextCondition::Contains("Test".to_string())),
            })?;
            assert_eq!(
                dbg!(json),
                json!({"property":"Name","text":{"contains":"Test"}})
            );

            Ok(())
        }

        #[test]
        fn text_property_is_empty() -> Result<(), Box<dyn std::error::Error>> {
            let json = serde_json::to_value(&FilterCondition {
                property: "Name".to_string(),
                condition: Text(TextCondition::IsEmpty),
            })?;
            assert_eq!(
                dbg!(json),
                json!({"property":"Name","text":{"is_empty":true}})
            );

            Ok(())
        }

        #[test]
        fn text_property_is_not_empty() -> Result<(), Box<dyn std::error::Error>> {
            let json = serde_json::to_value(&FilterCondition {
                property: "Name".to_string(),
                condition: Text(TextCondition::IsNotEmpty),
            })?;
            assert_eq!(
                dbg!(json),
                json!({"property":"Name","text":{"is_not_empty":true}})
            );

            Ok(())
        }
    }
}
hod='get' action='/ansg191/bun/log/src/api/schema.js'>
<input type='hidden' name='h' value='fix-websocket-upgrade'/><input type='hidden' name='showmsg' value='1'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/ansg191/bun/log/?h=fix-websocket-upgrade&amp;showmsg=1&amp;follow=1'>root</a>/<a href='/ansg191/bun/log/src?h=fix-websocket-upgrade&amp;showmsg=1&amp;follow=1'>src</a>/<a href='/ansg191/bun/log/src/api?h=fix-websocket-upgrade&amp;showmsg=1&amp;follow=1'>api</a>/<a href='/ansg191/bun/log/src/api/schema.js?h=fix-websocket-upgrade&amp;showmsg=1&amp;follow=1'>schema.js</a> (<a href='/ansg191/bun/log/src/api/schema.js?h=fix-websocket-upgrade&amp;showmsg=1'>unfollow</a>)</div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/ansg191/bun/log/src/api/schema.js?h=fix-websocket-upgrade&amp;follow=1'>Collapse</a>)</th><th class='left'>Author</th><th class='left'>Files</th><th class='left'>Lines</th></tr>
<tr class='logheader'><td><span title='2023-10-17 13:22:34 -0700'>2023-10-17</span></td><td class='logsubject'><a href='/ansg191/bun/commit/src/CHANGELOG.md?h=fix-websocket-upgrade&amp;id=ac36f5c278197026b2a442d8ac0f18da6d77f9a1&amp;follow=1'>Remove ancient changelog</a></td><td><img src='//www.gravatar.com/avatar/882f2dfc408f3f96e6e745e36d5d1d80?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Ashcon Partovi
</td><td>1</td><td><span class='deletions'>-11</span>/<span class='insertions'>+0</span></td></tr>
<tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'>
</td></tr>
<tr class='logheader'><td><span title='2023-10-17 09:23:10 -0700'>2023-10-17</span></td><td class='logsubject'><a href='/ansg191/bun/commit/docs/api/websockets.md?h=fix-websocket-upgrade&amp;id=bbc2e96090d3cdc4ccfd5e4456a8d2a236c84c44&amp;follow=1'>docs: fix ws.publish (#6558)</a></td><td><img src='//www.gravatar.com/avatar/5343880adbe698969453d9b2271e29c5?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Aral Roca Gomez
</td><td>1</td><td><span class='deletions'>-1</span>/<span class='insertions'>+1</span></td></tr>
<tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'>
In this example there is no server variable in the context, and here it makes more sense to use ws.publish. It is explained below that once the serve is done, the server.publish can be used.

</td></tr>
<tr class='logheader'><td><span title='2023-10-17 08:59:05 -0700'>2023-10-17</span></td><td class='logsubject'><a href='/ansg191/bun/commit/packages/bun-types/scripts/bundle.ts?h=fix-websocket-upgrade&amp;id=f53eb7cd599ed242b3830c7c1dc9e78954c3b1f4&amp;follow=1'>perf(bun-types): remove needless some call (#6550)</a></td><td><img src='//www.gravatar.com/avatar/0d3ef17c9a536577f26a8b8d4094a979?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Mikhail
</td><td>1</td><td><span class='deletions'>-1</span>/<span class='insertions'>+1</span></td></tr>
<tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'>
</td></tr>
<tr class='logheader'><td><span title='2023-10-16 21:22:43 -0700'>2023-10-16</span></td><td class='logsubject'><a href='/ansg191/bun/commit/test/transpiler/decorators.test.ts?h=fix-websocket-upgrade&amp;id=98d19fa6244384f7e17998b5420d724481ed3835&amp;follow=1'>fix(runtime): make some things more stable (partial jsc debug build) (#5881)</a></td><td><img src='//www.gravatar.com/avatar/7eeb3c9446e467f71ba578a6fcc9c614?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> dave caruso
</td><td>116</td><td><span class='deletions'>-1446</span>/<span class='insertions'>+1830</span></td></tr>
<tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'>
* make our debug assertions work

* install bun-webkit-debug

* more progress

* ok

* progress...

* more debug build stuff

* ok

* a

* asdfghjkl

* fix(runtime): fix bad assertion failure in JSBufferList

* ok

* stuff

* upgrade webkit

* Update src/bun.js/bindings/JSDOMWrapperCache.h

Co-authored-by: Jarred Sumner &lt;jarred@jarredsumner.com&gt;

* fix message for colin's changes

* okay

* fix cjs prototype

* implement mainModule

* i think this fixes it all

---------

Co-authored-by: Jarred Sumner &lt;jarred@jarredsumner.com&gt;

</td></tr>
<tr class='logheader'><td><span title='2023-10-16 20:01:24 -0700'>2023-10-16</span></td><td class='logsubject'><a href='/ansg191/bun/commit/src/report.zig?h=fix-websocket-upgrade&amp;id=a3958190e8f106adca7fbf4ba2605056cb22aced&amp;follow=1'>fix(runtime): improve IPC reliability + organization pass on that code (#6475)</a></td><td><img src='//www.gravatar.com/avatar/7eeb3c9446e467f71ba578a6fcc9c614?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> dave caruso
</td><td>15</td><td><span class='deletions'>-98</span>/<span class='insertions'>+266</span></td></tr>
<tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'>
* dfghj

* Handle messages that did not finish

* tidy

* ok

* a

* Merge remote-tracking branch 'origin/main' into dave/ipc-fixes

* test failures

---------

Co-authored-by: Jarred Sumner &lt;jarred@jarredsumner.com&gt;

</td></tr>
<tr class='logheader'><td><span title='2023-10-16 17:16:10 -0700'>2023-10-16</span></td><td class='logsubject'><a href='/ansg191/bun/commit/misctools/mime.js?h=fix-websocket-upgrade&amp;id=6504bfef74b552aa834324adfe102c9ba0193039&amp;follow=1'>Simplify getting Set of extentions (#4975)</a></td><td><img src='//www.gravatar.com/avatar/0d3ef17c9a536577f26a8b8d4094a979?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Mikhail
</td><td>1</td><td><span class='deletions'>-3</span>/<span class='insertions'>+3</span></td></tr>
<tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'>
</td></tr>
<tr class='logheader'><td><span title='2023-10-16 17:11:04 -0700'>2023-10-16</span></td><td class='logsubject'><a href='/ansg191/bun/commit/test/js/bun/sqlite/sqlite.test.js?h=fix-websocket-upgrade&amp;id=220cb0eb941d43f7ea815e46fe50b5c621782be4&amp;follow=1'>Fix formatting</a></td><td><img src='//www.gravatar.com/avatar/882f2dfc408f3f96e6e745e36d5d1d80?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Ashcon Partovi
</td><td>1</td><td><span class='deletions'>-3</span>/<span class='insertions'>+1</span></td></tr>
<tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'>
</td></tr>
<tr class='logheader'><td><span title='2023-10-16 16:33:02 -0700'>2023-10-16</span></td><td class='logsubject'><a href='/ansg191/bun/commit/test/cli/test/bun-test.test.ts?h=fix-websocket-upgrade&amp;id=01e04e3341e8bf19f1b08cb2238663b2fdb48c54&amp;follow=1'>fix(test): when tests run with --only the nested describe blocks `.on… (#5616)</a></td><td><img src='//www.gravatar.com/avatar/7cfb6d5e03edf1683d48935af349e12b?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Igor Shapiro
</td><td>2</td><td><span class='deletions'>-13</span>/<span class='insertions'>+45</span></td></tr>
<tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'>
</td></tr>
<tr class='logheader'><td><span title='2023-10-16 16:18:40 -0700'>2023-10-16</span></td><td class='logsubject'><a href='/ansg191/bun/commit/test/js/node/events/event-emitter.test.ts?h=fix-websocket-upgrade&amp;id=0853e19f53bfeb636971423a62214e0519b10729&amp;follow=1'>perf(node:events): optimize `emit(...)` function (#5485)</a></td><td><img src='//www.gravatar.com/avatar/b6791c921c4df047e8a107dcf3cad7c5?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Yannik Schröder
</td><td>3</td><td><span class='deletions'>-11</span>/<span class='insertions'>+132</span></td></tr>
<tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'>
</td></tr>
<tr class='logheader'><td><span title='2023-10-16 16:11:44 -0700'>2023-10-16</span></td><td class='logsubject'><a href='/ansg191/bun/commit/test/js/web/fetch/fetch.test.ts?h=fix-websocket-upgrade&amp;id=a9b8e3ecc82b01237721ec38afd780407c078d96&amp;follow=1'>fix: don't remove content-encoding header from header table (#5743)</a></td><td><img src='//www.gravatar.com/avatar/9aadcdb0589dd405d985b35764c8856f?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Liz
</td><td>2</td><td><span class='deletions'>-2</span>/<span class='insertions'>+25</span></td></tr>
<tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'>
Closes #5668

</td></tr>
<tr class='logheader'><td><span title='2023-10-16 16:08:58 -0700'>2023-10-16</span></td><td class='logsubject'><a href='/ansg191/bun/commit/test/js/bun/sqlite/sqlite.test.js?h=fix-websocket-upgrade&amp;id=bec6161dce999c51dd1443c1ac7f2ce493bf800c&amp;follow=1'>fix(sqlite) Insert .all() does not return an array #5872 (#5946)</a></td><td><img src='//www.gravatar.com/avatar/532cd8767d0bbc42724e9f321ad826fc?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Hugo Galan
</td><td>2</td><td><span class='deletions'>-7</span>/<span class='insertions'>+11</span></td></tr>
<tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'>
* fixing #5872

* removing useless comment

</td></tr>
<tr class='logheader'><td><span title='2023-10-16 16:02:11 -0700'>2023-10-16</span></td><td class='logsubject'><a href='/ansg191/bun/commit/test/js/bun/spawn/bun-ipc-child.js?h=fix-websocket-upgrade&amp;id=8c580e67645d9718960f930849cbd1841057d7c5&amp;follow=1'>Fix formatting</a></td><td><img src='//www.gravatar.com/avatar/882f2dfc408f3f96e6e745e36d5d1d80?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Ashcon Partovi
</td><td>2</td><td><span class='deletions'>-5</span>/<span class='insertions'>+4</span></td></tr>
<tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'>
</td></tr>
<tr class='logheader'><td><span title='2023-10-16 15:57:16 -0700'>2023-10-16</span></td><td class='logsubject'><a href='/ansg191/bun/commit/test/js/web/fetch/response.test.ts?h=fix-websocket-upgrade&amp;id=c5354951bacb9efee26683d1be83177443e0d784&amp;follow=1'>Fix `Response.statusText` (#6151)</a></td><td><img src='//www.gravatar.com/avatar/c3689a501aae45682368fd8a543f0e7b?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Chris Toshok
</td><td>10</td><td><span class='deletions'>-238</span>/<span class='insertions'>+269</span></td></tr>
<tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'>
</td></tr>
<tr class='logheader'><td><span title='2023-10-16 15:31:14 -0700'>2023-10-16</span></td><td class='logsubject'><a href='/ansg191/bun/commit/test/js/bun/spawn/spawn.test.ts?h=fix-websocket-upgrade&amp;id=f1658e2e58acb1fcdb3181e8238c50b961b822f6&amp;follow=1'>fix-subprocess-argument-missing (#6407)</a></td><td><img src='//www.gravatar.com/avatar/66e4e53a85dcd9c7e95d102111707f60?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Nicolae-Rares Ailincai
</td><td>4</td><td><span class='deletions'>-2</span>/<span class='insertions'>+40</span></td></tr>
<tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'>
* fix-subprocess-argument-missing

* fix-tests

* nitpick, these should === not just be undefined

---------

Co-authored-by: dave caruso &lt;me@paperdave.net&gt;

</td></tr>
<tr class='logheader'><td><span title='2023-10-16 15:24:56 -0700'>2023-10-16</span></td><td class='logsubject'><a href='/ansg191/bun/commit/packages/bun-types/bun-test.d.ts?h=fix-websocket-upgrade&amp;id=90d7f335223d95cb0e603d95fd995dcfb7e6cefa&amp;follow=1'>Add type parameter to `expect` (#6128)</a></td><td><img src='//www.gravatar.com/avatar/b7b186d3fd83d73d0ae48c8bfb837c3f?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Voldemat
</td><td>1</td><td><span class='deletions'>-3</span>/<span class='insertions'>+3</span></td></tr>
<tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'>
</td></tr>
<tr class='logheader'><td><span title='2023-10-16 15:19:38 -0700'>2023-10-16</span></td><td class='logsubject'><a href='/ansg191/bun/commit/test/js/web/worker.test.ts?h=fix-websocket-upgrade&amp;id=d9c0273421f3853f4bb0aa18c3cf2e96487886cf&amp;follow=1'>fix(node:worker_threads): ensure threadId property is exposed on ↵</a></td><td><img src='//www.gravatar.com/avatar/6a1d5a45746ce9c021e393a9bf2ccd80?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Jérôme Benoit
</td><td>6</td><td><span class='deletions'>-15</span>/<span class='insertions'>+75</span></td></tr>
<tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'>
worker_threads instance (#6521)

* fix: ensure threadId property is exposed on worker_threads instance

Signed-off-by: Jérôme Benoit &lt;jerome.benoit@sap.com&gt;

* fix: rename lazy worker_threads module properties

Signed-off-by: Jérôme Benoit &lt;jerome.benoit@sap.com&gt;

* fix: add getter for threadId

Signed-off-by: Jérôme Benoit &lt;jerome.benoit@sap.com&gt;

* test: improve worker_threads UTs

Signed-off-by: Jérôme Benoit &lt;jerome.benoit@sap.com&gt;

* test: fix lazy loading

Signed-off-by: Jérôme Benoit &lt;jerome.benoit@sap.com&gt;

* test: fix worker_threads test

Signed-off-by: Jérôme Benoit &lt;jerome.benoit@piment-noir.org&gt;

* fix: return the worker threadId

Signed-off-by: Jérôme Benoit &lt;jerome.benoit@sap.com&gt;

* test: refine worker_threads expectation on threadId

Signed-off-by: Jérôme Benoit &lt;jerome.benoit@piment-noir.org&gt;

---------

Signed-off-by: Jérôme Benoit &lt;jerome.benoit@sap.com&gt;
Signed-off-by: Jérôme Benoit &lt;jerome.benoit@piment-noir.org&gt;

</td></tr>
<tr class='logheader'><td><span title='2023-10-16 15:14:15 -0700'>2023-10-16</span></td><td class='logsubject'><a href='/ansg191/bun/commit/src/js/out/InternalModuleRegistryConstants.h?h=fix-websocket-upgrade&amp;id=d65b1fd80b2f6d71f7df2de07143284a40baf159&amp;follow=1'>Fix use before define bug in sqlite</a></td><td><img src='//www.gravatar.com/avatar/882f2dfc408f3f96e6e745e36d5d1d80?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Ashcon Partovi
</td><td>2</td><td><span class='deletions'>-5</span>/<span class='insertions'>+5</span></td></tr>
<tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'>
Fixes #6481


</td></tr>
<tr class='logheader'><td><span title='2023-10-16 15:14:15 -0700'>2023-10-16</span></td><td class='logsubject'><a href='/ansg191/bun/commit/test/js/bun/test/expect.test.js?h=fix-websocket-upgrade&amp;id=7becb5ec7457644e5229c03f17c3b99090e6b3c7&amp;follow=1'>fix(jest): fix toStrictEqual on same URLs (#6528)</a></td><td><img src='//www.gravatar.com/avatar/b8ea27b4f281fc528b9371cf11c06568?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> João Alisson
</td><td>2</td><td><span class='deletions'>-13</span>/<span class='insertions'>+16</span></td></tr>
<tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'>
Fixes #6492


</td></tr>
<tr class='logheader'><td><span title='2023-10-16 15:14:15 -0700'>2023-10-16</span></td><td class='logsubject'><a href='/ansg191/bun/commit/src/bun.js/test/expect.zig?h=fix-websocket-upgrade&amp;id=c3f5baa091968e0807724e6fe1d836bbd8a3f115&amp;follow=1'>Fix `toHaveBeenCalled` having wrong error signature</a></td><td><img src='//www.gravatar.com/avatar/882f2dfc408f3f96e6e745e36d5d1d80?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Ashcon Partovi
</td><td>1</td><td><span class='deletions'>-2</span>/<span class='insertions'>+2</span></td></tr>
<tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'>
Fixes #6527


</td></tr>
<tr class='logheader'><td><span title='2023-10-16 15:14:15 -0700'>2023-10-16</span></td><td class='logsubject'><a href='/ansg191/bun/commit/test/regression/issue/06443.test.ts?h=fix-websocket-upgrade&amp;id=800ad150ff7d418eb8c60fe912a632514740e5f5&amp;follow=1'>Fix formatting</a></td><td><img src='//www.gravatar.com/avatar/882f2dfc408f3f96e6e745e36d5d1d80?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Ashcon Partovi
</td><td>1</td><td><span class='deletions'>-2</span>/<span class='insertions'>+1</span></td></tr>
<tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'>
</td></tr>
<tr class='logheader'><td><span title='2023-10-16 15:14:15 -0700'>2023-10-16</span></td><td class='logsubject'><a href='/ansg191/bun/commit/packages/bun-types/bun.d.ts?h=fix-websocket-upgrade&amp;id=5608e59270dbb7051e74d1ba5e7f38a6a7586473&amp;follow=1'>Add `reusePort` to `Bun.serve` types</a></td><td><img src='//www.gravatar.com/avatar/882f2dfc408f3f96e6e745e36d5d1d80?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Ashcon Partovi
</td><td>1</td><td><span class='deletions'>-0</span>/<span class='insertions'>+9</span></td></tr>
<tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'>
</td></tr>
<tr class='logheader'><td><span title='2023-10-16 15:14:15 -0700'>2023-10-16</span></td><td class='logsubject'><a href='/ansg191/bun/commit/test/regression/issue/06443.test.ts?h=fix-websocket-upgrade&amp;id=e31ed84b1bcf65cc8329f589312e3943c5794afb&amp;follow=1'>Fix `request.url` having incorrect port</a></td><td><img src='//www.gravatar.com/avatar/882f2dfc408f3f96e6e745e36d5d1d80?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Ashcon Partovi
</td><td>4</td><td><span class='deletions'>-1</span>/<span class='insertions'>+92</span></td></tr>
<tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'>
Fixes #6443


</td></tr>
<tr class='logheader'><td><span title='2023-10-16 15:14:15 -0700'>2023-10-16</span></td><td class='logsubject'><a href='/ansg191/bun/commit/packages/bun-uws/src/HttpResponse.h?h=fix-websocket-upgrade&amp;id=548b1d02f22c565b3f2457aa96b7faad1716c1dd&amp;follow=1'>Remove uWebSockets header from Bun.serve responses</a></td><td><img src='//www.gravatar.com/avatar/882f2dfc408f3f96e6e745e36d5d1d80?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Ashcon Partovi
</td><td>1</td><td><span class='deletions'>-6</span>/<span class='insertions'>+6</span></td></tr>
<tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'>
</td></tr>
<tr class='logheader'><td><span title='2023-10-16 15:14:15 -0700'>2023-10-16</span></td><td class='logsubject'><a href='/ansg191/bun/commit/test/regression/issue/06467.test.ts?h=fix-websocket-upgrade&amp;id=f63955a01f0b043bc0934c437a6dc1982d2c5925&amp;follow=1'>Rename some tests</a></td><td><img src='//www.gravatar.com/avatar/882f2dfc408f3f96e6e745e36d5d1d80?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Ashcon Partovi
</td><td>3</td><td><span class='deletions'>-0</span>/<span class='insertions'>+0</span></td></tr>
<tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'>
</td></tr>
<tr class='logheader'><td><span title='2023-10-16 15:14:15 -0700'>2023-10-16</span></td><td class='logsubject'><a href='/ansg191/bun/commit/test/regression/issue/006467.test.ts?h=fix-websocket-upgrade&amp;id=2996ef71560ee4e9bd982fdadd7ff5ce32bb3e1c&amp;follow=1'>Fix #6467</a></td><td><img src='//www.gravatar.com/avatar/882f2dfc408f3f96e6e745e36d5d1d80?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Ashcon Partovi
</td><td>2</td><td><span class='deletions'>-3</span>/<span class='insertions'>+10</span></td></tr>
<tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'>
</td></tr>
<tr class='logheader'><td><span title='2023-10-16 14:21:39 -0700'>2023-10-16</span></td><td class='logsubject'><a href='/ansg191/bun/commit/src/js/out/InternalModuleRegistryConstants.h?h=fix-websocket-upgrade&amp;id=2b1f3438e6b928f57f2fd0e74ec6043097565135&amp;follow=1'>Update InternalModuleRegistryConstants.h</a></td><td><img src='//www.gravatar.com/avatar/0f2ac0141773b63a6cd646063e7ebfca?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Dylan Conway
</td><td>1</td><td><span class='deletions'>-3</span>/<span class='insertions'>+3</span></td></tr>
<tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'>
</td></tr>
<tr class='logheader'><td><span title='2023-10-16 16:11:03 -0400'>2023-10-16</span></td><td class='logsubject'><a href='/ansg191/bun/commit/docs/project/contributing.md?h=fix-websocket-upgrade&amp;id=2a8f3a3b4eeea1cd46ac130ec7484b8ff0187a3f&amp;follow=1'>Development -&gt; Contributing (#6538)</a></td><td><img src='//www.gravatar.com/avatar/7314f20052c467b4e5b959ac03e39ff0?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Colin McDonnell
</td><td>2</td><td><span class='deletions'>-1</span>/<span class='insertions'>+1</span></td></tr>
<tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'>
Co-authored-by: Colin McDonnell &lt;colin@KennyM1.local&gt;

</td></tr>
<tr class='logheader'><td><span title='2023-10-14 16:16:49 -0700'>2023-10-14</span></td><td class='logsubject'><a href='/ansg191/bun/commit/test/js/third_party/postgres/postgres.test.ts?h=fix-websocket-upgrade&amp;id=a87aa2fafe05c358455173ea65877be5eefcbd63&amp;follow=1'>fix(net/tls) fix pg hang on end + hanging on query (#6487)</a></td><td><img src='//www.gravatar.com/avatar/209348ae1158d8f3be635b721db356e2?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Ciro Spaciari
</td><td>3</td><td><span class='deletions'>-8</span>/<span class='insertions'>+36</span></td></tr>
<tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'>
* fix pg hang on end + hanging on query

* remove dummy function

* fix node-stream

* add test

* fix test

* return error in test

* fix test use once instead of on

* fix OOM

* generated

* 💅

* 💅

</td></tr>
<tr class='logheader'><td><span title='2023-10-13 20:37:48 -0700'>2023-10-13</span></td><td class='logsubject'><a href='/ansg191/bun/commit/test/cli/install/moo-0.2.0.tgz?h=fix-websocket-upgrade&amp;id=9b5e66453b0879ed77b71dcdbe50e4efa184261e&amp;follow=1'>fix installing dependencies that match workspace versions (#6494)</a></td><td><img src='//www.gravatar.com/avatar/9c0e69537b9d9493708725dd4c91e3af?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Dylan Conway
</td><td>4</td><td><span class='deletions'>-2</span>/<span class='insertions'>+64</span></td></tr>
<tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'>
* check if dependency matches workspace version

* test

* Update lockfile.zig

* set resolution to workspace package id

</td></tr>
<tr class='logheader'><td><span title='2023-10-13 20:37:06 -0700'>2023-10-13</span></td><td class='logsubject'><a href='/ansg191/bun/commit/src/install/padding_checker.zig?h=fix-websocket-upgrade&amp;id=46f978838ddb4326d9ab089fbce50d47d829a60c&amp;follow=1'>fix lockfile struct padding (#6495)</a></td><td><img src='//www.gravatar.com/avatar/9c0e69537b9d9493708725dd4c91e3af?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Dylan Conway
</td><td>3</td><td><span class='deletions'>-3</span>/<span class='insertions'>+18</span></td></tr>
<tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'>
* integrity padding

* error message for bytes at end of struct

</td></tr>