Skip to content

Commit

Permalink
Fix 'Can't call super with @params in derived class constructors' com…
Browse files Browse the repository at this point in the history
…pile errors, coming from coffeescript versioon upgrade
  • Loading branch information
michbeck100 committed Feb 12, 2018
1 parent 558eb19 commit 064b6b5
Show file tree
Hide file tree
Showing 11 changed files with 130 additions and 32 deletions.
64 changes: 51 additions & 13 deletions lib/actions.coffee
Expand Up @@ -100,6 +100,7 @@ module.exports = (env) ->
class LogActionProvider extends ActionProvider

constructor: (@framework) ->
super()

parseAction: (input, context) ->
stringToLogTokens = null
Expand All @@ -124,6 +125,7 @@ module.exports = (env) ->
class LogActionHandler extends ActionHandler

constructor: (@framework, @stringToLogTokens) ->
super()

executeAction: (simulate, context) ->
@framework.variableManager.evaluateStringExpression(@stringToLogTokens).then( (strToLog) =>
Expand All @@ -148,6 +150,7 @@ module.exports = (env) ->
class SetVariableActionProvider extends ActionProvider

constructor: (@framework) ->
super()

parseAction: (input, context) ->
result = null
Expand Down Expand Up @@ -198,6 +201,7 @@ module.exports = (env) ->
class SetVariableActionHandler extends ActionHandler

constructor: (@framework, @variableName, @rightTokens) ->
super()

setup: ->
@dependOnVariable(@framework.variableManager, @variableName)
Expand Down Expand Up @@ -225,6 +229,7 @@ module.exports = (env) ->
class SetPresenceActionProvider extends ActionProvider

constructor: (@framework) ->
super()

parseAction: (input, context) ->
retVar = null
Expand Down Expand Up @@ -267,6 +272,7 @@ module.exports = (env) ->
class PresenceActionHandler extends ActionHandler

constructor: (@device, @state) ->
super()

setup: ->
@dependOnDevice(@device)
Expand Down Expand Up @@ -302,6 +308,7 @@ module.exports = (env) ->
class ContactActionProvider extends ActionProvider

constructor: (@framework) ->
super()

parseAction: (input, context) ->
retVar = null
Expand Down Expand Up @@ -342,6 +349,7 @@ module.exports = (env) ->
class ContactActionHandler extends ActionHandler

constructor: (@device, @state) ->
super()

setup: ->
@dependOnDevice(@device)
Expand Down Expand Up @@ -385,6 +393,7 @@ module.exports = (env) ->
class SwitchActionProvider extends ActionProvider

constructor: (@framework) ->
super()

# ### parseAction()
###
Expand Down Expand Up @@ -447,6 +456,7 @@ module.exports = (env) ->
class SwitchActionHandler extends ActionHandler

constructor: (@device, @state) ->
super()

setup: ->
@dependOnDevice(@device)
Expand Down Expand Up @@ -488,6 +498,7 @@ module.exports = (env) ->
class ToggleActionProvider extends ActionProvider

constructor: (@framework) ->
super()

# ### parseAction()
###
Expand Down Expand Up @@ -535,7 +546,8 @@ module.exports = (env) ->

class ToggleActionHandler extends ActionHandler

constructor: (@device) -> #nop
constructor: (@device) ->
super() #nop

setup: ->
@dependOnDevice(@device)
Expand Down Expand Up @@ -563,6 +575,7 @@ module.exports = (env) ->
class ButtonActionProvider extends ActionProvider

constructor: (@framework) ->
super()

# ### parseAction()
###
Expand Down Expand Up @@ -612,6 +625,7 @@ module.exports = (env) ->
class ButtonActionHandler extends ActionHandler

constructor: (@device, @buttonId) ->
super()
assert @device? and @device instanceof env.devices.ButtonsDevice
assert @buttonId? and typeof @buttonId is "string"

Expand Down Expand Up @@ -650,6 +664,7 @@ module.exports = (env) ->
class ShutterActionProvider extends ActionProvider

constructor: (@framework) ->
super()

# ### parseAction()
###
Expand Down Expand Up @@ -704,6 +719,7 @@ module.exports = (env) ->
class ShutterActionHandler extends ActionHandler

constructor: (@device, @position) ->
super()

setup: ->
@dependOnDevice(@device)
Expand Down Expand Up @@ -738,6 +754,7 @@ module.exports = (env) ->
class StopShutterActionProvider extends ActionProvider

constructor: (@framework) ->
super()

# ### parseAction()
###
Expand Down Expand Up @@ -780,6 +797,7 @@ module.exports = (env) ->
class StopShutterActionHandler extends ActionHandler

constructor: (@device) ->
super()

setup: ->
@dependOnDevice(@device)
Expand Down Expand Up @@ -809,6 +827,7 @@ module.exports = (env) ->
class DimmerActionProvider extends ActionProvider

constructor: (@framework) ->
super()

# ### parseAction()
###
Expand Down Expand Up @@ -866,6 +885,7 @@ module.exports = (env) ->
class DimmerActionHandler extends ActionHandler

constructor: (@framework, @device, @valueTokens) ->
super()
assert @device?
assert @valueTokens?

Expand Down Expand Up @@ -911,6 +931,7 @@ module.exports = (env) ->
class HeatingThermostatModeActionProvider extends ActionProvider

constructor: (@framework) ->
super()

# ### parseAction()
###
Expand Down Expand Up @@ -967,6 +988,7 @@ module.exports = (env) ->
class HeatingThermostatModeActionHandler extends ActionHandler

constructor: (@framework, @device, @valueTokens) ->
super()
assert @device?
assert @valueTokens?

Expand Down Expand Up @@ -1002,6 +1024,7 @@ module.exports = (env) ->
class HeatingThermostatSetpointActionProvider extends ActionProvider

constructor: (@framework) ->
super()

# ### parseAction()
###
Expand Down Expand Up @@ -1059,6 +1082,7 @@ module.exports = (env) ->
class HeatingThermostatSetpointActionHandler extends ActionHandler

constructor: (@framework, @device, @valueTokens) ->
super()
assert @device?
assert @valueTokens?

Expand Down Expand Up @@ -1105,6 +1129,7 @@ module.exports = (env) ->
class TimerActionProvider extends ActionProvider

constructor: (@framework) ->
super()

# ### parseAction()
###
Expand Down Expand Up @@ -1155,6 +1180,7 @@ module.exports = (env) ->
class TimerActionHandler extends ActionHandler

constructor: (@device, @action) ->
super()

setup: ->
@dependOnDevice(@device)
Expand All @@ -1174,7 +1200,8 @@ module.exports = (env) ->
# Pause play volume actions
class AVPlayerPauseActionProvider extends ActionProvider

constructor: (@framework) ->
constructor: (@framework) ->
super()
# ### executeAction()
###
This function handles action in the form of `play device`
Expand Down Expand Up @@ -1211,7 +1238,8 @@ module.exports = (env) ->

class AVPlayerPauseActionHandler extends ActionHandler

constructor: (@device) -> #nop
constructor: (@device) ->
super() #nop

setup: ->
@dependOnDevice(@device)
Expand All @@ -1228,7 +1256,8 @@ module.exports = (env) ->
# stop play volume actions
class AVPlayerStopActionProvider extends ActionProvider

constructor: (@framework) ->
constructor: (@framework) ->
super()
# ### executeAction()
###
This function handles action in the form of `execute "some string"`
Expand Down Expand Up @@ -1266,7 +1295,8 @@ module.exports = (env) ->

class AVPlayerStopActionHandler extends ActionHandler

constructor: (@device) -> #nop
constructor: (@device) ->
super() #nop

setup: ->
@dependOnDevice(@device)
Expand All @@ -1282,7 +1312,8 @@ module.exports = (env) ->

class AVPlayerPlayActionProvider extends ActionProvider

constructor: (@framework) ->
constructor: (@framework) ->
super()
# ### executeAction()
###
This function handles action in the form of `execute "some string"`
Expand Down Expand Up @@ -1319,7 +1350,8 @@ module.exports = (env) ->

class AVPlayerPlayActionHandler extends ActionHandler

constructor: (@device) -> #nop
constructor: (@device) ->
super() #nop

setup: ->
@dependOnDevice(@device)
Expand All @@ -1335,7 +1367,8 @@ module.exports = (env) ->

class AVPlayerVolumeActionProvider extends ActionProvider

constructor: (@framework) ->
constructor: (@framework) ->
super()
# ### executeAction()
###
This function handles action in the form of `execute "some string"`
Expand Down Expand Up @@ -1395,7 +1428,8 @@ module.exports = (env) ->

class AVPlayerVolumeActionHandler extends ActionHandler

constructor: (@framework, @device, @valueTokens) -> #nop
constructor: (@framework, @device, @valueTokens) ->
super() #nop

setup: ->
@dependOnDevice(@device)
Expand All @@ -1415,7 +1449,8 @@ module.exports = (env) ->

class AVPlayerNextActionProvider extends ActionProvider

constructor: (@framework) ->
constructor: (@framework) ->
super()
# ### executeAction()
###
This function handles action in the form of `execute "some string"`
Expand Down Expand Up @@ -1455,7 +1490,8 @@ module.exports = (env) ->
return null

class AVPlayerNextActionHandler extends ActionHandler
constructor: (@device) -> #nop
constructor: (@device) ->
super() #nop

setup: ->
@dependOnDevice(@device)
Expand All @@ -1471,7 +1507,8 @@ module.exports = (env) ->

class AVPlayerPrevActionProvider extends ActionProvider

constructor: (@framework) ->
constructor: (@framework) ->
super()
# ### executeAction()
###
This function handles action in the form of `execute "some string"`
Expand Down Expand Up @@ -1511,7 +1548,8 @@ module.exports = (env) ->
return null

class AVPlayerPrevActionHandler extends ActionHandler
constructor: (@device) -> #nop
constructor: (@device) ->
super() #nop

setup: ->
@dependOnDevice(@device)
Expand Down
1 change: 1 addition & 0 deletions lib/database.coffee
Expand Up @@ -47,6 +47,7 @@ module.exports = (env) ->
class Database extends require('events').EventEmitter

constructor: (@framework, @dbSettings) ->
super()

init: () ->
connection = _.clone(@dbSettings.connection)
Expand Down

0 comments on commit 064b6b5

Please sign in to comment.