Skip to content

Commit

Permalink
fix conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@pmlopes
pmlopes committed Sep 17, 2018
2 parents 1de5368 + 9640004 commit 463d04c
Show file tree
Hide file tree
Showing 695 changed files with 3,165 additions and 12,118 deletions.
9 changes: 8 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.


## [Unreleased]
### Added
- Bump `pg-reactive-client` to 0.10.3
- Fix `parsePaths` to properly convert slashes on windows.
- Unit tests are now fully async and do not lead file descriptors.
- Added a shortcut (`engine`) to the `process` object with the engine name.
- Fix `util.promisify` on Graal when dealing with Java Objects.
- `AsyncError` helper to stitch asynchronous exception stacktraces.

## [0.5.3] - 2018-07-20
- Added docs about Worker and Graal
- Code clean ups
- `vertx-scripts` will install `mvnw` by default (for Graal users, this means there are no extra
Expand Down
2 changes: 1 addition & 1 deletion docs/@reactiverse/reactive-pg-client/assets/js/search.js
View file

Large diffs are not rendered by default.

260 changes: 157 additions & 103 deletions ...ars/classes/handlebarstemplateengine.html → .../reactive-pg-client/classes/interval.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>HandlebarsTemplateEngine | @vertx/web-templ-handlebars</title>
<title>Interval | @reactiverse/reactive-pg-client</title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="../assets/css/main.css">
Expand All @@ -22,7 +22,7 @@
<li class="state loading">Preparing search index...</li>
<li class="state failure">The search index is not available</li>
</ul>
<a href="../index.html" class="title">@vertx/web-templ-handlebars</a>
<a href="../index.html" class="title">@reactiverse/reactive-pg-client</a>
</div>
<div class="table-cell" id="tsd-widgets">
<div id="tsd-filter">
Expand All @@ -38,8 +38,6 @@
</div>
<input type="checkbox" id="tsd-filter-inherited" checked />
<label class="tsd-widget" for="tsd-filter-inherited">Inherited</label>
<input type="checkbox" id="tsd-filter-externals" checked />
<label class="tsd-widget" for="tsd-filter-externals">Externals</label>
<input type="checkbox" id="tsd-filter-only-exported" />
<label class="tsd-widget" for="tsd-filter-only-exported">Only exported</label>
</div>
Expand All @@ -56,10 +54,10 @@
<a href="../globals.html">Globals</a>
</li>
<li>
<a href="handlebarstemplateengine.html">HandlebarsTemplateEngine</a>
<a href="interval.html">Interval</a>
</li>
</ul>
<h1>Class HandlebarsTemplateEngine</h1>
<h1>Class Interval</h1>
</div>
</div>
</header>
Expand All @@ -70,7 +68,7 @@ <h1>Class HandlebarsTemplateEngine</h1>
<h3>Hierarchy</h3>
<ul class="tsd-hierarchy">
<li>
<span class="target">HandlebarsTemplateEngine</span>
<span class="target">Interval</span>
</li>
</ul>
</section>
Expand All @@ -79,104 +77,91 @@ <h2>Index</h2>
<section class="tsd-panel tsd-index-panel">
<div class="tsd-index-content">
<section class="tsd-index-section ">
<h3>Methods</h3>
<h3>Properties</h3>
<ul class="tsd-index-list">
<li class="tsd-kind-method tsd-parent-kind-class"><a href="handlebarstemplateengine.html#setextension" class="tsd-kind-icon">set<wbr>Extension</a></li>
<li class="tsd-kind-method tsd-parent-kind-class"><a href="handlebarstemplateengine.html#setmaxcachesize" class="tsd-kind-icon">set<wbr>Max<wbr>Cache<wbr>Size</a></li>
<li class="tsd-kind-method tsd-parent-kind-class tsd-is-static"><a href="handlebarstemplateengine.html#create" class="tsd-kind-icon">create</a></li>
<li class="tsd-kind-property tsd-parent-kind-class"><a href="interval.html#days" class="tsd-kind-icon">days</a></li>
<li class="tsd-kind-property tsd-parent-kind-class"><a href="interval.html#hours" class="tsd-kind-icon">hours</a></li>
<li class="tsd-kind-property tsd-parent-kind-class"><a href="interval.html#microseconds" class="tsd-kind-icon">microseconds</a></li>
<li class="tsd-kind-property tsd-parent-kind-class"><a href="interval.html#minutes" class="tsd-kind-icon">minutes</a></li>
<li class="tsd-kind-property tsd-parent-kind-class"><a href="interval.html#months" class="tsd-kind-icon">months</a></li>
<li class="tsd-kind-property tsd-parent-kind-class"><a href="interval.html#seconds" class="tsd-kind-icon">seconds</a></li>
<li class="tsd-kind-property tsd-parent-kind-class"><a href="interval.html#years" class="tsd-kind-icon">years</a></li>
</ul>
</section>
</div>
</section>
</section>
<section class="tsd-panel-group tsd-member-group ">
<h2>Methods</h2>
<section class="tsd-panel tsd-member tsd-kind-method tsd-parent-kind-class">
<a name="setextension" class="tsd-anchor"></a>
<h3>set<wbr>Extension</h3>
<ul class="tsd-signatures tsd-kind-method tsd-parent-kind-class">
<li class="tsd-signature tsd-kind-icon">set<wbr>Extension<span class="tsd-signature-symbol">(</span>extension<span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">string</span><span class="tsd-signature-symbol">)</span><span class="tsd-signature-symbol">: </span><a href="handlebarstemplateengine.html" class="tsd-signature-type">HandlebarsTemplateEngine</a></li>
</ul>
<ul class="tsd-descriptions">
<li class="tsd-description">
<aside class="tsd-sources">
<ul>
<li>Defined in index.d.ts:19</li>
</ul>
</aside>
<div class="tsd-comment tsd-typography">
<div class="lead">
<p> Set the extension for the engine</p>
</div>
</div>
<h4 class="tsd-parameters-title">Parameters</h4>
<ul class="tsd-parameters">
<li>
<h5>extension: <span class="tsd-signature-type">string</span></h5>
<div class="tsd-comment tsd-typography">
<p>the extension</p>
</div>
</li>
</ul>
<h4 class="tsd-returns-title">Returns <a href="handlebarstemplateengine.html" class="tsd-signature-type">HandlebarsTemplateEngine</a></h4>
<p>a reference to this for fluency</p>
</li>
</ul>
<h2>Properties</h2>
<section class="tsd-panel tsd-member tsd-kind-property tsd-parent-kind-class">
<a name="days" class="tsd-anchor"></a>
<h3>days</h3>
<div class="tsd-signature tsd-kind-icon">days<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">number</span></div>
<aside class="tsd-sources">
<ul>
<li>Defined in options.d.ts:4</li>
</ul>
</aside>
</section>
<section class="tsd-panel tsd-member tsd-kind-method tsd-parent-kind-class">
<a name="setmaxcachesize" class="tsd-anchor"></a>
<h3>set<wbr>Max<wbr>Cache<wbr>Size</h3>
<ul class="tsd-signatures tsd-kind-method tsd-parent-kind-class">
<li class="tsd-signature tsd-kind-icon">set<wbr>Max<wbr>Cache<wbr>Size<span class="tsd-signature-symbol">(</span>maxCacheSize<span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">number</span><span class="tsd-signature-symbol">)</span><span class="tsd-signature-symbol">: </span><a href="handlebarstemplateengine.html" class="tsd-signature-type">HandlebarsTemplateEngine</a></li>
</ul>
<ul class="tsd-descriptions">
<li class="tsd-description">
<aside class="tsd-sources">
<ul>
<li>Defined in index.d.ts:27</li>
</ul>
</aside>
<div class="tsd-comment tsd-typography">
<div class="lead">
<p> Set the max cache size for the engine</p>
</div>
</div>
<h4 class="tsd-parameters-title">Parameters</h4>
<ul class="tsd-parameters">
<li>
<h5>maxCacheSize: <span class="tsd-signature-type">number</span></h5>
<div class="tsd-comment tsd-typography">
<p>the maxCacheSize</p>
</div>
</li>
</ul>
<h4 class="tsd-returns-title">Returns <a href="handlebarstemplateengine.html" class="tsd-signature-type">HandlebarsTemplateEngine</a></h4>
<p>a reference to this for fluency</p>
</li>
</ul>
<section class="tsd-panel tsd-member tsd-kind-property tsd-parent-kind-class">
<a name="hours" class="tsd-anchor"></a>
<h3>hours</h3>
<div class="tsd-signature tsd-kind-icon">hours<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">number</span></div>
<aside class="tsd-sources">
<ul>
<li>Defined in options.d.ts:6</li>
</ul>
</aside>
</section>
<section class="tsd-panel tsd-member tsd-kind-method tsd-parent-kind-class tsd-is-static">
<a name="create" class="tsd-anchor"></a>
<h3><span class="tsd-flag ts-flagStatic">Static</span> create</h3>
<ul class="tsd-signatures tsd-kind-method tsd-parent-kind-class tsd-is-static">
<li class="tsd-signature tsd-kind-icon">create<span class="tsd-signature-symbol">(</span><span class="tsd-signature-symbol">)</span><span class="tsd-signature-symbol">: </span><a href="handlebarstemplateengine.html" class="tsd-signature-type">HandlebarsTemplateEngine</a></li>
</ul>
<ul class="tsd-descriptions">
<li class="tsd-description">
<aside class="tsd-sources">
<ul>
<li>Defined in index.d.ts:11</li>
</ul>
</aside>
<div class="tsd-comment tsd-typography">
<div class="lead">
<p> Create a template engine using defaults</p>
</div>
</div>
<h4 class="tsd-returns-title">Returns <a href="handlebarstemplateengine.html" class="tsd-signature-type">HandlebarsTemplateEngine</a></h4>
<p>the engine</p>
</li>
</ul>
<section class="tsd-panel tsd-member tsd-kind-property tsd-parent-kind-class">
<a name="microseconds" class="tsd-anchor"></a>
<h3>microseconds</h3>
<div class="tsd-signature tsd-kind-icon">microseconds<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">number</span></div>
<aside class="tsd-sources">
<ul>
<li>Defined in options.d.ts:8</li>
</ul>
</aside>
</section>
<section class="tsd-panel tsd-member tsd-kind-property tsd-parent-kind-class">
<a name="minutes" class="tsd-anchor"></a>
<h3>minutes</h3>
<div class="tsd-signature tsd-kind-icon">minutes<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">number</span></div>
<aside class="tsd-sources">
<ul>
<li>Defined in options.d.ts:10</li>
</ul>
</aside>
</section>
<section class="tsd-panel tsd-member tsd-kind-property tsd-parent-kind-class">
<a name="months" class="tsd-anchor"></a>
<h3>months</h3>
<div class="tsd-signature tsd-kind-icon">months<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">number</span></div>
<aside class="tsd-sources">
<ul>
<li>Defined in options.d.ts:12</li>
</ul>
</aside>
</section>
<section class="tsd-panel tsd-member tsd-kind-property tsd-parent-kind-class">
<a name="seconds" class="tsd-anchor"></a>
<h3>seconds</h3>
<div class="tsd-signature tsd-kind-icon">seconds<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">number</span></div>
<aside class="tsd-sources">
<ul>
<li>Defined in options.d.ts:14</li>
</ul>
</aside>
</section>
<section class="tsd-panel tsd-member tsd-kind-property tsd-parent-kind-class">
<a name="years" class="tsd-anchor"></a>
<h3>years</h3>
<div class="tsd-signature tsd-kind-icon">years<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">number</span></div>
<aside class="tsd-sources">
<ul>
<li>Defined in options.d.ts:16</li>
</ul>
</aside>
</section>
</section>
</div>
Expand All @@ -193,21 +178,90 @@ <h4 class="tsd-returns-title">Returns <a href="handlebarstemplateengine.html" cl
</ul>
<ul class="current">
<li class="current tsd-kind-class">
<a href="handlebarstemplateengine.html" class="tsd-kind-icon">Handlebars<wbr>Template<wbr>Engine</a>
<a href="interval.html" class="tsd-kind-icon">Interval</a>
<ul>
<li class=" tsd-kind-method tsd-parent-kind-class">
<a href="handlebarstemplateengine.html#setextension" class="tsd-kind-icon">set<wbr>Extension</a>
<li class=" tsd-kind-property tsd-parent-kind-class">
<a href="interval.html#days" class="tsd-kind-icon">days</a>
</li>
<li class=" tsd-kind-property tsd-parent-kind-class">
<a href="interval.html#hours" class="tsd-kind-icon">hours</a>
</li>
<li class=" tsd-kind-property tsd-parent-kind-class">
<a href="interval.html#microseconds" class="tsd-kind-icon">microseconds</a>
</li>
<li class=" tsd-kind-property tsd-parent-kind-class">
<a href="interval.html#minutes" class="tsd-kind-icon">minutes</a>
</li>
<li class=" tsd-kind-method tsd-parent-kind-class">
<a href="handlebarstemplateengine.html#setmaxcachesize" class="tsd-kind-icon">set<wbr>Max<wbr>Cache<wbr>Size</a>
<li class=" tsd-kind-property tsd-parent-kind-class">
<a href="interval.html#months" class="tsd-kind-icon">months</a>
</li>
<li class=" tsd-kind-method tsd-parent-kind-class tsd-is-static">
<a href="handlebarstemplateengine.html#create" class="tsd-kind-icon">create</a>
<li class=" tsd-kind-property tsd-parent-kind-class">
<a href="interval.html#seconds" class="tsd-kind-icon">seconds</a>
</li>
<li class=" tsd-kind-property tsd-parent-kind-class">
<a href="interval.html#years" class="tsd-kind-icon">years</a>
</li>
</ul>
</li>
</ul>
<ul class="after-current">
<li class=" tsd-kind-class">
<a href="json.html" class="tsd-kind-icon">Json</a>
</li>
<li class=" tsd-kind-class">
<a href="pgchannel.html" class="tsd-kind-icon">Pg<wbr>Channel</a>
</li>
<li class=" tsd-kind-class">
<a href="pgclient.html" class="tsd-kind-icon">Pg<wbr>Client</a>
</li>
<li class=" tsd-kind-class">
<a href="pgconnectoptions.html" class="tsd-kind-icon">Pg<wbr>Connect<wbr>Options</a>
</li>
<li class=" tsd-kind-class">
<a href="pgconnection.html" class="tsd-kind-icon">Pg<wbr>Connection</a>
</li>
<li class=" tsd-kind-class">
<a href="pgcursor.html" class="tsd-kind-icon">Pg<wbr>Cursor</a>
</li>
<li class=" tsd-kind-class">
<a href="pgiterator.html" class="tsd-kind-icon">Pg<wbr>Iterator</a>
</li>
<li class=" tsd-kind-class">
<a href="pgnotification.html" class="tsd-kind-icon">Pg<wbr>Notification</a>
</li>
<li class=" tsd-kind-class">
<a href="pgpool.html" class="tsd-kind-icon">Pg<wbr>Pool</a>
</li>
<li class=" tsd-kind-class">
<a href="pgpooloptions.html" class="tsd-kind-icon">Pg<wbr>Pool<wbr>Options</a>
</li>
<li class=" tsd-kind-class">
<a href="pgpreparedquery.html" class="tsd-kind-icon">Pg<wbr>Prepared<wbr>Query</a>
</li>
<li class=" tsd-kind-class">
<a href="pgresult.html" class="tsd-kind-icon">Pg<wbr>Result</a>
</li>
<li class=" tsd-kind-class">
<a href="pgrowset.html" class="tsd-kind-icon">Pg<wbr>Row<wbr>Set</a>
</li>
<li class=" tsd-kind-class">
<a href="pgstream.html" class="tsd-kind-icon">Pg<wbr>Stream</a>
</li>
<li class=" tsd-kind-class">
<a href="pgsubscriber.html" class="tsd-kind-icon">Pg<wbr>Subscriber</a>
</li>
<li class=" tsd-kind-class">
<a href="pgtransaction.html" class="tsd-kind-icon">Pg<wbr>Transaction</a>
</li>
<li class=" tsd-kind-class">
<a href="point.html" class="tsd-kind-icon">Point</a>
</li>
<li class=" tsd-kind-class">
<a href="row.html" class="tsd-kind-icon">Row</a>
</li>
<li class=" tsd-kind-class">
<a href="tuple.html" class="tsd-kind-icon">Tuple</a>
</li>
</ul>
</nav>
</div>
Expand Down
5 changes: 3 additions & 2 deletions docs/@reactiverse/reactive-pg-client/classes/json.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@
</div>
<input type="checkbox" id="tsd-filter-inherited" checked />
<label class="tsd-widget" for="tsd-filter-inherited">Inherited</label>
<input type="checkbox" id="tsd-filter-externals" checked />
<label class="tsd-widget" for="tsd-filter-externals">Externals</label>
<input type="checkbox" id="tsd-filter-only-exported" />
<label class="tsd-widget" for="tsd-filter-only-exported">Only exported</label>
</div>
Expand Down Expand Up @@ -142,6 +140,9 @@ <h4 class="tsd-returns-title">Returns <a href="json.html" class="tsd-signature-t
</nav>
<nav class="tsd-navigation secondary menu-sticky">
<ul class="before-current">
<li class=" tsd-kind-class">
<a href="interval.html" class="tsd-kind-icon">Interval</a>
</li>
</ul>
<ul class="current">
<li class="current tsd-kind-class">
Expand Down
5 changes: 3 additions & 2 deletions docs/@reactiverse/reactive-pg-client/classes/pgchannel.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@
</div>
<input type="checkbox" id="tsd-filter-inherited" checked />
<label class="tsd-widget" for="tsd-filter-inherited">Inherited</label>
<input type="checkbox" id="tsd-filter-externals" checked />
<label class="tsd-widget" for="tsd-filter-externals">Externals</label>
<input type="checkbox" id="tsd-filter-only-exported" />
<label class="tsd-widget" for="tsd-filter-only-exported">Only exported</label>
</div>
Expand Down Expand Up @@ -363,6 +361,9 @@ <h4 class="tsd-returns-title">Returns <a href="pgchannel.html" class="tsd-signat
</nav>
<nav class="tsd-navigation secondary menu-sticky">
<ul class="before-current">
<li class=" tsd-kind-class">
<a href="interval.html" class="tsd-kind-icon">Interval</a>
</li>
<li class=" tsd-kind-class">
<a href="json.html" class="tsd-kind-icon">Json</a>
</li>
Expand Down
Loading

0 comments on commit 463d04c

Please sign in to comment.