Skip to content

Commit

Permalink
Upate docs CI to choose theirs in merge. (#61)
Browse files Browse the repository at this point in the history
* Updated typedoc
  • Loading branch information
simlay authored Jan 6, 2021
1 parent ef36cb5 commit 7102fe2
Show file tree
Hide file tree
Showing 5 changed files with 109 additions and 37 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Docs
on:
workflow_dispatch:
push:
tags:
tags:
- 'v*'
jobs:
docs:
Expand All @@ -28,7 +28,7 @@ jobs:
git config --local user.name "Fluvio Authors"
git fetch --all
git checkout -b docs --track origin/docs
git merge origin/master
git merge -X theirs origin/master -m "Merge remote-tracking branch 'origin/master' into docs"
- name: Install Build Dependencies
run: |
npm install
Expand Down
131 changes: 97 additions & 34 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"ts-jest": "^26.4.4",
"ts-node": "^9.1.1",
"tslint": "^6.1.3",
"typedoc": "^0.19.2",
"typedoc": "^0.20.12",
"uuid": "^8.3.2"
}
}
1 change: 1 addition & 0 deletions src/consumer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@ impl<'a> FetchablePartitionResponseWrapper {
fn records(&'a self) -> Option<RecordSetWrapper> {
Some(RecordSetWrapper(&self.0.as_ref()?.records))
}

#[node_bindgen]
fn to_records(&'a self) -> Vec<String> {
let mut records = Vec::new();
Expand Down
8 changes: 8 additions & 0 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -856,6 +856,14 @@ export interface FetchablePartitionResponse {
lastStableOffset: number
logStartOffset: number
records: RecordSet
/**
* ```typescript
* let response = await this.fluvioConsumer.fetch(Offset.FromStart())
* response.toRecords().forEach(msg => {
* console.log(msg)
* })
* ```
*/
toRecords(): Array<string>
aborted?: ArrayBuffer
}
Expand Down

0 comments on commit 7102fe2

Please sign in to comment.