diff --git a/.gitignore b/.gitignore index 995aba7..1e03e7e 100644 --- a/.gitignore +++ b/.gitignore @@ -14,4 +14,5 @@ lib/ coverage/ *.ngsummary.json .DS_STORE -.compiled \ No newline at end of file +.compiled +*.log \ No newline at end of file diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 0000000..2254ab2 --- /dev/null +++ b/.prettierignore @@ -0,0 +1,3 @@ +/coverage +/docs +/lib \ No newline at end of file diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 0000000..40b6472 --- /dev/null +++ b/.prettierrc @@ -0,0 +1,4 @@ +{ + "singleQuote": true, + "printWidth": 80 +} \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index f8d3c37..7727f55 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,84 @@ -# 6.6.0 - Angular 5 Support +# 9.0.0 -* Add Angular 5+ as peer dependency +## Breaking Changes + +* Updates to Redux 4 typedefs. +* Updates to RxJs 6 import paths. +* Updates to Angular 6. + +# 7.1.1 + +## Bug Fixes + +* #508 (thanks to @ratoaq2) +* #463 (thanks to @draccoz) + +# 7.1.0 + +## Features + +* Add a way to return a false value from a method decorated with `@dispatch` to allow conditionally preventing a dispatch. [PR#497](https://github.com/angular-redux/store/pull/497) + + +```ts +@dispatch() +selectTab(tab) { + return this.active.id !== tab.id ? { type: .... } : false; +} +``` + +* Add a way to access the decorated instance inside of transformer for `@select$` [PR#500](https://github.com/angular-redux/store/pull/500) + +```ts +@Input() public anotherInput: string; + +@select$(['selector'], (obs$, inst) => obs$.filter(x => x.name === inst.anotherInput)) +public selectedObs: Observable; +``` + +Shout out to contributors: + +* [@rart](https://github.com/rart) +* [@MaKCbIMKo](https://github.com/MaKCbIMKo) + +# 7.0.2 - Fixing Publish + +* There are no functional changes / fixes in this release. + +There was accidental publish to the `@latest` tag with an experimental fix for the v6 branch that got pushed out with the incorrect tag. + +For some clarity: + +* v7+ - currently only works with Angular 5+ +* v6+ - works with Angular 4 and earlier, and v5. +* v8 - this was an accidental version bump - and that package is now deprecated. + +# Which Version to use? + +## Angular 5+ + +Use `@angular-redux/store@^7` - this version supports Angular 5, and also changes to using lettable operators. + +Any new major releases will released on the v7 branch and with the `@latest` tag for final publishes. + +## Angular 4 or lower + +Use `@angular-redux/store@^6` - This supports Angular 4 and earlier. + +# Support for `@angular-redux/store@6`? + +Where possible, I will be maintaining and applying any fixes / enhancements for v7 into v6 where it does not introduce a breaking change. + +I made a few mistakes trying to publish fixes / etc to two major versions, which caused some releases to get tagged incorrectly and caused some confusion. Sorry for any confusion this has caused, and will do better on avoiding this in the future, and being more transparent with the releases that are going out. + +# 6.6.0 - Angular 5 Support + +* Add Angular 5+ as peer dependency # 7.0.0 - Angular 5 Upgrade -* Update dependencies to Angular 5 -* Update RxJS to 5.5.2 and use lettable operators +* Update dependencies to Angular 5 +* Update RxJS to 5.5.2 and use lettable operators * Update peer dependencies to only Angular 5+ note: This version requires Angular 5, the code generated by the compiler is not compatible with Angular v4. diff --git a/README.md b/README.md index a5fc116..151fd57 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,27 @@ +# ****REPO DEPRECATED**** + +Please note that this repo has been deprecated. Code and issues are being migrated to a monorepo at https://github.com/angular-redux/platform where we are beginning work on a new and improved v10. To file any new issues or see the state of the current code base, we would love to see you there! Thanks for your support! + +# Which Version to use? + +## Angular 6+ + +`@angular-redux/store@^9` is what you need. This consumes breaking changes from RxJS and Angular 6, as well as updated typedefs from Redux 4. + +## Angular 5 + +Use `@angular-redux/store@^7` - this version supports Angular 5, and also changes to using lettable operators. + +## Angular 4 or lower + +Use `@angular-redux/store@^6` - This supports Angular 4 and earlier. + +# Support for `@angular-redux/store@6`? + +Where possible, I will be maintaining and applying any fixes / enhancements for v7 into v6 where it does not introduce a breaking change. + +I made a few mistakes trying to publish fixes / etc to two major versions, which caused some releases to get tagged incorrectly and caused some confusion. Sorry for any confusion this has caused, and will do better on avoiding this in the future, and being more transparent with the releases that are going out. + # @angular-redux/store Angular bindings for [Redux](https://github.com/reactjs/redux). diff --git a/articles/select-pattern.md b/articles/select-pattern.md index 6f03345..f4e759c 100644 --- a/articles/select-pattern.md +++ b/articles/select-pattern.md @@ -109,7 +109,7 @@ export class Counter { Since it's an observable, you can also transform data using observable operators like `.map`, `.filter`, etc. -## The @sselect$ decorator +## The @select$ decorator The `@select$` decorator works similar to `@select`, however you are able to specify observable chains to execute on the selected result. diff --git a/docs/assets/js/search.js b/docs/assets/js/search.js index a71af9b..c866a2e 100644 --- a/docs/assets/js/search.js +++ b/docs/assets/js/search.js @@ -1,3 +1,3 @@ -var typedoc = typedoc || {}; +var typedoc = typedoc || {}; typedoc.search = typedoc.search || {}; - typedoc.search.data = {"kinds":{"64":"Function","128":"Class","256":"Interface","1024":"Property","2048":"Method","65536":"Type literal","4194304":"Type alias"},"rows":[{"id":0,"kind":4194304,"name":"Comparator","url":"globals.html#comparator","classes":"tsd-kind-type-alias"},{"id":1,"kind":65536,"name":"__type","url":"globals.html#comparator.__type","classes":"tsd-kind-type-literal tsd-parent-kind-type-alias tsd-is-not-exported","parent":"Comparator"},{"id":2,"kind":4194304,"name":"Transformer","url":"globals.html#transformer","classes":"tsd-kind-type-alias"},{"id":3,"kind":65536,"name":"__type","url":"globals.html#transformer.__type","classes":"tsd-kind-type-literal tsd-parent-kind-type-alias tsd-is-not-exported","parent":"Transformer"},{"id":4,"kind":4194304,"name":"PropertySelector","url":"globals.html#propertyselector","classes":"tsd-kind-type-alias"},{"id":5,"kind":4194304,"name":"PathSelector","url":"globals.html#pathselector","classes":"tsd-kind-type-alias"},{"id":6,"kind":4194304,"name":"FunctionSelector","url":"globals.html#functionselector","classes":"tsd-kind-type-alias"},{"id":7,"kind":65536,"name":"__type","url":"globals.html#functionselector.__type","classes":"tsd-kind-type-literal tsd-parent-kind-type-alias tsd-is-not-exported","parent":"FunctionSelector"},{"id":8,"kind":4194304,"name":"Selector","url":"globals.html#selector","classes":"tsd-kind-type-alias"},{"id":9,"kind":256,"name":"ObservableStore","url":"interfaces/observablestore.html","classes":"tsd-kind-interface tsd-has-type-parameter"},{"id":10,"kind":1024,"name":"select","url":"interfaces/observablestore.html#select","classes":"tsd-kind-property tsd-parent-kind-interface","parent":"ObservableStore"},{"id":11,"kind":65536,"name":"__type","url":"interfaces/observablestore.html#select.__type-1","classes":"tsd-kind-type-literal tsd-parent-kind-property tsd-has-type-parameter tsd-is-not-exported","parent":"ObservableStore.select"},{"id":12,"kind":1024,"name":"configureSubStore","url":"interfaces/observablestore.html#configuresubstore","classes":"tsd-kind-property tsd-parent-kind-interface","parent":"ObservableStore"},{"id":13,"kind":65536,"name":"__type","url":"interfaces/observablestore.html#configuresubstore.__type","classes":"tsd-kind-type-literal tsd-parent-kind-property tsd-has-type-parameter tsd-is-not-exported","parent":"ObservableStore.configureSubStore"},{"id":14,"kind":1024,"name":"dispatch","url":"interfaces/observablestore.html#dispatch","classes":"tsd-kind-property tsd-parent-kind-interface tsd-is-inherited","parent":"ObservableStore"},{"id":15,"kind":2048,"name":"getState","url":"interfaces/observablestore.html#getstate","classes":"tsd-kind-method tsd-parent-kind-interface tsd-is-inherited","parent":"ObservableStore"},{"id":16,"kind":2048,"name":"subscribe","url":"interfaces/observablestore.html#subscribe","classes":"tsd-kind-method tsd-parent-kind-interface tsd-is-inherited","parent":"ObservableStore"},{"id":17,"kind":2048,"name":"replaceReducer","url":"interfaces/observablestore.html#replacereducer","classes":"tsd-kind-method tsd-parent-kind-interface tsd-is-inherited","parent":"ObservableStore"},{"id":18,"kind":128,"name":"NgRedux","url":"classes/ngredux.html","classes":"tsd-kind-class tsd-has-type-parameter"},{"id":19,"kind":1024,"name":"instance","url":"classes/ngredux.html#instance","classes":"tsd-kind-property tsd-parent-kind-class tsd-is-static","parent":"NgRedux"},{"id":20,"kind":1024,"name":"configureStore","url":"classes/ngredux.html#configurestore","classes":"tsd-kind-property tsd-parent-kind-class","parent":"NgRedux"},{"id":21,"kind":65536,"name":"__type","url":"classes/ngredux.html#configurestore.__type","classes":"tsd-kind-type-literal tsd-parent-kind-property tsd-is-not-exported","parent":"NgRedux.configureStore"},{"id":22,"kind":1024,"name":"provideStore","url":"classes/ngredux.html#providestore","classes":"tsd-kind-property tsd-parent-kind-class","parent":"NgRedux"},{"id":23,"kind":65536,"name":"__type","url":"classes/ngredux.html#providestore.__type-3","classes":"tsd-kind-type-literal tsd-parent-kind-property tsd-is-not-exported","parent":"NgRedux.provideStore"},{"id":24,"kind":1024,"name":"dispatch","url":"classes/ngredux.html#dispatch","classes":"tsd-kind-property tsd-parent-kind-class","parent":"NgRedux"},{"id":25,"kind":1024,"name":"getState","url":"classes/ngredux.html#getstate","classes":"tsd-kind-property tsd-parent-kind-class","parent":"NgRedux"},{"id":26,"kind":65536,"name":"__type","url":"classes/ngredux.html#getstate.__type-2","classes":"tsd-kind-type-literal tsd-parent-kind-property tsd-is-not-exported","parent":"NgRedux.getState"},{"id":27,"kind":1024,"name":"subscribe","url":"classes/ngredux.html#subscribe","classes":"tsd-kind-property tsd-parent-kind-class","parent":"NgRedux"},{"id":28,"kind":65536,"name":"__type","url":"classes/ngredux.html#subscribe.__type-6","classes":"tsd-kind-type-literal tsd-parent-kind-property tsd-is-not-exported","parent":"NgRedux.subscribe"},{"id":29,"kind":1024,"name":"replaceReducer","url":"classes/ngredux.html#replacereducer","classes":"tsd-kind-property tsd-parent-kind-class","parent":"NgRedux"},{"id":30,"kind":65536,"name":"__type","url":"classes/ngredux.html#replacereducer.__type-4","classes":"tsd-kind-type-literal tsd-parent-kind-property tsd-is-not-exported","parent":"NgRedux.replaceReducer"},{"id":31,"kind":1024,"name":"select","url":"classes/ngredux.html#select","classes":"tsd-kind-property tsd-parent-kind-class","parent":"NgRedux"},{"id":32,"kind":65536,"name":"__type","url":"classes/ngredux.html#select.__type-5","classes":"tsd-kind-type-literal tsd-parent-kind-property tsd-has-type-parameter tsd-is-not-exported","parent":"NgRedux.select"},{"id":33,"kind":1024,"name":"configureSubStore","url":"classes/ngredux.html#configuresubstore","classes":"tsd-kind-property tsd-parent-kind-class","parent":"NgRedux"},{"id":34,"kind":65536,"name":"__type","url":"classes/ngredux.html#configuresubstore.__type-1","classes":"tsd-kind-type-literal tsd-parent-kind-property tsd-has-type-parameter tsd-is-not-exported","parent":"NgRedux.configureSubStore"},{"id":35,"kind":128,"name":"DevToolsExtension","url":"classes/devtoolsextension.html","classes":"tsd-kind-class"},{"id":36,"kind":2048,"name":"enhancer","url":"classes/devtoolsextension.html#enhancer","classes":"tsd-kind-method tsd-parent-kind-class","parent":"DevToolsExtension"},{"id":37,"kind":2048,"name":"isEnabled","url":"classes/devtoolsextension.html#isenabled","classes":"tsd-kind-method tsd-parent-kind-class","parent":"DevToolsExtension"},{"id":38,"kind":64,"name":"enableFractalReducers","url":"globals.html#enablefractalreducers","classes":"tsd-kind-function"},{"id":39,"kind":256,"name":"IFractalStoreOptions","url":"interfaces/ifractalstoreoptions.html","classes":"tsd-kind-interface"},{"id":40,"kind":1024,"name":"basePathMethodName","url":"interfaces/ifractalstoreoptions.html#basepathmethodname","classes":"tsd-kind-property tsd-parent-kind-interface","parent":"IFractalStoreOptions"},{"id":41,"kind":1024,"name":"localReducer","url":"interfaces/ifractalstoreoptions.html#localreducer","classes":"tsd-kind-property tsd-parent-kind-interface","parent":"IFractalStoreOptions"},{"id":42,"kind":64,"name":"select","url":"globals.html#select","classes":"tsd-kind-function tsd-has-type-parameter"},{"id":43,"kind":64,"name":"select$","url":"globals.html#select_","classes":"tsd-kind-function tsd-has-type-parameter"},{"id":44,"kind":64,"name":"dispatch","url":"globals.html#dispatch","classes":"tsd-kind-function"},{"id":45,"kind":64,"name":"WithSubStore","url":"globals.html#withsubstore","classes":"tsd-kind-function"},{"id":46,"kind":128,"name":"NgReduxModule","url":"classes/ngreduxmodule.html","classes":"tsd-kind-class"}]}; \ No newline at end of file + typedoc.search.data = {"kinds":{"64":"Function","128":"Class","256":"Interface","1024":"Property","2048":"Method","65536":"Type literal","4194304":"Type alias"},"rows":[{"id":0,"kind":4194304,"name":"Comparator","url":"globals.html#comparator","classes":"tsd-kind-type-alias"},{"id":1,"kind":65536,"name":"__type","url":"globals.html#comparator.__type","classes":"tsd-kind-type-literal tsd-parent-kind-type-alias tsd-is-not-exported","parent":"Comparator"},{"id":2,"kind":4194304,"name":"Transformer","url":"globals.html#transformer","classes":"tsd-kind-type-alias tsd-has-type-parameter"},{"id":3,"kind":65536,"name":"__type","url":"globals.html#transformer.__type","classes":"tsd-kind-type-literal tsd-parent-kind-type-alias tsd-is-not-exported","parent":"Transformer"},{"id":4,"kind":4194304,"name":"PropertySelector","url":"globals.html#propertyselector","classes":"tsd-kind-type-alias"},{"id":5,"kind":4194304,"name":"PathSelector","url":"globals.html#pathselector","classes":"tsd-kind-type-alias"},{"id":6,"kind":4194304,"name":"FunctionSelector","url":"globals.html#functionselector","classes":"tsd-kind-type-alias tsd-has-type-parameter"},{"id":7,"kind":65536,"name":"__type","url":"globals.html#functionselector.__type","classes":"tsd-kind-type-literal tsd-parent-kind-type-alias tsd-is-not-exported","parent":"FunctionSelector"},{"id":8,"kind":4194304,"name":"Selector","url":"globals.html#selector","classes":"tsd-kind-type-alias tsd-has-type-parameter"},{"id":9,"kind":256,"name":"ObservableStore","url":"interfaces/observablestore.html","classes":"tsd-kind-interface tsd-has-type-parameter"},{"id":10,"kind":1024,"name":"select","url":"interfaces/observablestore.html#select","classes":"tsd-kind-property tsd-parent-kind-interface","parent":"ObservableStore"},{"id":11,"kind":65536,"name":"__type","url":"interfaces/observablestore.html#select.__type-1","classes":"tsd-kind-type-literal tsd-parent-kind-property tsd-has-type-parameter tsd-is-not-exported","parent":"ObservableStore.select"},{"id":12,"kind":1024,"name":"configureSubStore","url":"interfaces/observablestore.html#configuresubstore","classes":"tsd-kind-property tsd-parent-kind-interface","parent":"ObservableStore"},{"id":13,"kind":65536,"name":"__type","url":"interfaces/observablestore.html#configuresubstore.__type","classes":"tsd-kind-type-literal tsd-parent-kind-property tsd-has-type-parameter tsd-is-not-exported","parent":"ObservableStore.configureSubStore"},{"id":14,"kind":1024,"name":"dispatch","url":"interfaces/observablestore.html#dispatch","classes":"tsd-kind-property tsd-parent-kind-interface tsd-is-inherited","parent":"ObservableStore"},{"id":15,"kind":2048,"name":"getState","url":"interfaces/observablestore.html#getstate","classes":"tsd-kind-method tsd-parent-kind-interface tsd-is-inherited","parent":"ObservableStore"},{"id":16,"kind":2048,"name":"subscribe","url":"interfaces/observablestore.html#subscribe","classes":"tsd-kind-method tsd-parent-kind-interface tsd-is-inherited","parent":"ObservableStore"},{"id":17,"kind":2048,"name":"replaceReducer","url":"interfaces/observablestore.html#replacereducer","classes":"tsd-kind-method tsd-parent-kind-interface tsd-is-inherited","parent":"ObservableStore"},{"id":18,"kind":128,"name":"NgRedux","url":"classes/ngredux.html","classes":"tsd-kind-class tsd-has-type-parameter"},{"id":19,"kind":1024,"name":"instance","url":"classes/ngredux.html#instance","classes":"tsd-kind-property tsd-parent-kind-class tsd-is-static","parent":"NgRedux"},{"id":20,"kind":1024,"name":"configureStore","url":"classes/ngredux.html#configurestore","classes":"tsd-kind-property tsd-parent-kind-class","parent":"NgRedux"},{"id":21,"kind":65536,"name":"__type","url":"classes/ngredux.html#configurestore.__type","classes":"tsd-kind-type-literal tsd-parent-kind-property tsd-is-not-exported","parent":"NgRedux.configureStore"},{"id":22,"kind":1024,"name":"provideStore","url":"classes/ngredux.html#providestore","classes":"tsd-kind-property tsd-parent-kind-class","parent":"NgRedux"},{"id":23,"kind":65536,"name":"__type","url":"classes/ngredux.html#providestore.__type-3","classes":"tsd-kind-type-literal tsd-parent-kind-property tsd-is-not-exported","parent":"NgRedux.provideStore"},{"id":24,"kind":1024,"name":"dispatch","url":"classes/ngredux.html#dispatch","classes":"tsd-kind-property tsd-parent-kind-class","parent":"NgRedux"},{"id":25,"kind":1024,"name":"getState","url":"classes/ngredux.html#getstate","classes":"tsd-kind-property tsd-parent-kind-class","parent":"NgRedux"},{"id":26,"kind":65536,"name":"__type","url":"classes/ngredux.html#getstate.__type-2","classes":"tsd-kind-type-literal tsd-parent-kind-property tsd-is-not-exported","parent":"NgRedux.getState"},{"id":27,"kind":1024,"name":"subscribe","url":"classes/ngredux.html#subscribe","classes":"tsd-kind-property tsd-parent-kind-class","parent":"NgRedux"},{"id":28,"kind":65536,"name":"__type","url":"classes/ngredux.html#subscribe.__type-6","classes":"tsd-kind-type-literal tsd-parent-kind-property tsd-is-not-exported","parent":"NgRedux.subscribe"},{"id":29,"kind":1024,"name":"replaceReducer","url":"classes/ngredux.html#replacereducer","classes":"tsd-kind-property tsd-parent-kind-class","parent":"NgRedux"},{"id":30,"kind":65536,"name":"__type","url":"classes/ngredux.html#replacereducer.__type-4","classes":"tsd-kind-type-literal tsd-parent-kind-property tsd-is-not-exported","parent":"NgRedux.replaceReducer"},{"id":31,"kind":1024,"name":"select","url":"classes/ngredux.html#select","classes":"tsd-kind-property tsd-parent-kind-class","parent":"NgRedux"},{"id":32,"kind":65536,"name":"__type","url":"classes/ngredux.html#select.__type-5","classes":"tsd-kind-type-literal tsd-parent-kind-property tsd-has-type-parameter tsd-is-not-exported","parent":"NgRedux.select"},{"id":33,"kind":1024,"name":"configureSubStore","url":"classes/ngredux.html#configuresubstore","classes":"tsd-kind-property tsd-parent-kind-class","parent":"NgRedux"},{"id":34,"kind":65536,"name":"__type","url":"classes/ngredux.html#configuresubstore.__type-1","classes":"tsd-kind-type-literal tsd-parent-kind-property tsd-has-type-parameter tsd-is-not-exported","parent":"NgRedux.configureSubStore"},{"id":35,"kind":128,"name":"DevToolsExtension","url":"classes/devtoolsextension.html","classes":"tsd-kind-class"},{"id":36,"kind":2048,"name":"enhancer","url":"classes/devtoolsextension.html#enhancer","classes":"tsd-kind-method tsd-parent-kind-class","parent":"DevToolsExtension"},{"id":37,"kind":2048,"name":"isEnabled","url":"classes/devtoolsextension.html#isenabled","classes":"tsd-kind-method tsd-parent-kind-class","parent":"DevToolsExtension"},{"id":38,"kind":64,"name":"enableFractalReducers","url":"globals.html#enablefractalreducers","classes":"tsd-kind-function"},{"id":39,"kind":256,"name":"IFractalStoreOptions","url":"interfaces/ifractalstoreoptions.html","classes":"tsd-kind-interface"},{"id":40,"kind":1024,"name":"basePathMethodName","url":"interfaces/ifractalstoreoptions.html#basepathmethodname","classes":"tsd-kind-property tsd-parent-kind-interface","parent":"IFractalStoreOptions"},{"id":41,"kind":1024,"name":"localReducer","url":"interfaces/ifractalstoreoptions.html#localreducer","classes":"tsd-kind-property tsd-parent-kind-interface","parent":"IFractalStoreOptions"},{"id":42,"kind":64,"name":"select","url":"globals.html#select","classes":"tsd-kind-function tsd-has-type-parameter"},{"id":43,"kind":64,"name":"select$","url":"globals.html#select_","classes":"tsd-kind-function tsd-has-type-parameter"},{"id":44,"kind":64,"name":"dispatch","url":"globals.html#dispatch","classes":"tsd-kind-function"},{"id":45,"kind":64,"name":"WithSubStore","url":"globals.html#withsubstore","classes":"tsd-kind-function"},{"id":46,"kind":128,"name":"NgReduxModule","url":"classes/ngreduxmodule.html","classes":"tsd-kind-class"}]}; \ No newline at end of file diff --git a/docs/classes/devtoolsextension.html b/docs/classes/devtoolsextension.html index 3034f4e..8e22406 100644 --- a/docs/classes/devtoolsextension.html +++ b/docs/classes/devtoolsextension.html @@ -933,7 +933,7 @@
  • Comparator
    • -
  • +
  • FunctionSelector
  • @@ -942,10 +942,10 @@
  • PropertySelector
    • -
  • +
  • Selector
    • -
  • +
  • Transformer
  • @@ -1008,7 +1008,7 @@

    enhancer

  • @@ -1038,7 +1038,7 @@

    isEnabled

  • diff --git a/docs/classes/ngredux.html b/docs/classes/ngredux.html index 4d4e67b..1a62d46 100644 --- a/docs/classes/ngredux.html +++ b/docs/classes/ngredux.html @@ -954,7 +954,7 @@
  • Comparator
    • -
  • +
  • FunctionSelector
  • @@ -963,10 +963,10 @@
  • PropertySelector
    • -
  • +
  • Selector
    • -
  • +
  • Transformer
  • @@ -1044,11 +1044,11 @@

    Properties

    Properties

    -

    configureStore

    +

    Abstract configureStore

    configureStore: function
    @@ -1078,14 +1078,14 @@

    Type declaration