Cleanup dashboard JS (#491)

* Cleanup dashboard JS

* Add vscode

* Save start_mark/end_mark

* Updates

* Updates

* Remove need for cv.nameable

It's a bit hacky but removes so much bloat from integrations

* Add enum helper

* Document APIs, and Improvements

* Fixes

* Fixes

* Update PULL_REQUEST_TEMPLATE.md

* Updates

* Updates

* Updates

esphome/components/template/sensor/__init__.py

@@ -1,45 +1,37 @@
-
-from esphome.automation import ACTION_REGISTRY
-from esphome.components import sensor
-import esphome.config_validation as cv
 import esphome.codegen as cg
-from esphome.const import CONF_ID, CONF_LAMBDA, CONF_NAME, CONF_STATE, CONF_UPDATE_INTERVAL
+import esphome.config_validation as cv
+from esphome import automation
+from esphome.components import sensor
+from esphome.const import CONF_ID, CONF_LAMBDA, CONF_STATE, UNIT_EMPTY, ICON_EMPTY
 from .. import template_ns
 
 TemplateSensor = template_ns.class_('TemplateSensor', sensor.PollingSensorComponent)
 
-CONFIG_SCHEMA = cv.nameable(sensor.SENSOR_SCHEMA.extend({
-    cv.GenerateID(): cv.declare_variable_id(TemplateSensor),
+CONFIG_SCHEMA = sensor.sensor_schema(UNIT_EMPTY, ICON_EMPTY, 1).extend({
+    cv.GenerateID(): cv.declare_id(TemplateSensor),
     cv.Optional(CONF_LAMBDA): cv.lambda_,
-    cv.Optional(CONF_UPDATE_INTERVAL, default="60s"): cv.update_interval,
-}).extend(cv.COMPONENT_SCHEMA))
+}).extend(cv.polling_component_schema('60s'))
 
 
 def to_code(config):
-    rhs = TemplateSensor.new(config[CONF_NAME], config[CONF_UPDATE_INTERVAL])
-    template = cg.Pvariable(config[CONF_ID], rhs)
-    yield cg.register_component(template, config)
-    yield sensor.register_sensor(template, config)
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield cg.register_component(var, config)
+    yield sensor.register_sensor(var, config)
 
     if CONF_LAMBDA in config:
         template_ = yield cg.process_lambda(config[CONF_LAMBDA], [],
                                             return_type=cg.optional.template(float))
-        cg.add(template.set_template(template_))
+        cg.add(var.set_template(template_))
 
 
-CONF_SENSOR_TEMPLATE_PUBLISH = 'sensor.template.publish'
-SENSOR_TEMPLATE_PUBLISH_ACTION_SCHEMA = cv.Schema({
-    cv.Required(CONF_ID): cv.use_variable_id(sensor.Sensor),
-    cv.Required(CONF_STATE): cv.templatable(cv.float_),
-})
-
-
-@ACTION_REGISTRY.register(CONF_SENSOR_TEMPLATE_PUBLISH, SENSOR_TEMPLATE_PUBLISH_ACTION_SCHEMA)
+@automation.register_action('sensor.template.publish', sensor.SensorPublishAction,
+                            cv.Schema({
+                                cv.Required(CONF_ID): cv.use_id(sensor.Sensor),
+                                cv.Required(CONF_STATE): cv.templatable(cv.float_),
+                            }))
 def sensor_template_publish_to_code(config, action_id, template_arg, args):
-    var = yield cg.get_variable(config[CONF_ID])
-    type = sensor.SensorPublishAction.template(template_arg)
-    rhs = type.new(var)
-    action = cg.Pvariable(action_id, rhs, type=type)
+    paren = yield cg.get_variable(config[CONF_ID])
+    var = cg.new_Pvariable(action_id, template_arg, paren)
     template_ = yield cg.templatable(config[CONF_STATE], args, float)
-    cg.add(action.set_state(template_))
-    yield action
+    cg.add(var.set_state(template_))
+    yield var

esphome/components/template/sensor/template_sensor.cpp

@@ -6,8 +6,6 @@ namespace template_ {
 
 static const char *TAG = "template.sensor";
 
-TemplateSensor::TemplateSensor(const std::string &name, uint32_t update_interval)
-    : PollingSensorComponent(name, update_interval) {}
 void TemplateSensor::update() {
   if (!this->f_.has_value())
     return;

esphome/components/template/sensor/template_sensor.h

@@ -6,10 +6,8 @@
 namespace esphome {
 namespace template_ {
 
-class TemplateSensor : public sensor::PollingSensorComponent {
+class TemplateSensor : public sensor::Sensor, public PollingComponent {
  public:
-  TemplateSensor(const std::string &name, uint32_t update_interval);
-
   void set_template(std::function<optional<float>()> &&f);
 
   void update() override;