Handle v2 operators

root/.eslintrc

@@ -1,6 +1,7 @@
 {
   "env": {
-    "browser": true
+    "browser": true,
+    "es6": true
   },
   "globals": {
     "MashupPlatform": false,

root/Gruntfile.js

@@ -105,7 +105,7 @@ module.exports = function (grunt) {
                             'images/**/*',{% if(!js) { %}
                             'ts/**/*',{% }%}{% if (json) { %}
                             "config.json",{% } else { %}
-                            "config.xml", {% } %}
+                            "config.xml",{% } %}
                         ]
                     },
                     {

root/src/config.json

@@ -5,6 +5,7 @@
             "name": "{%= author_name %}"
         }
     ],
+    "macversion": 2,
     "changelog": "doc/changelog.md",
     "default_lang": "en",
     "description": "{%= description %}",
@@ -17,6 +18,7 @@
     "js_files": [
         "js/main.js"
     ],
+    "entrypoint": "{%= entrypoint %}",
     "license": "{%= licenses %}",
     "longdescription": "DESCRIPTION.md",
     "name": "{%= name %}",

root/src/config.xml

@@ -1,6 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <operator xmlns="http://wirecloud.conwet.fi.upm.es/ns/macdescription/1" vendor="{%= vendor %}" name="{%= name %}" version="{%= version %}">
 
+    <macversion>2</macversion>
+
     <details>
         <title>{%= project_name %}</title>
         <homepage>{%= homepage %}</homepage>
@@ -32,4 +34,6 @@
         <script src="js/main.js"/>
     </scripts>
 
+    <entrypoint name="{%= entrypoint %}" />
+
 </operator>

root/src/js/main.js

@@ -6,13 +6,24 @@
  * Licensed under the {%= licenses.join(', ') %} license{%= licenses.length === 1 ? '' : 's' %}.
  */
 
+/* exported {%= entrypoint %} */
+
 (function () {
 
     "use strict";
 
-    MashupPlatform.prefs.registerCallback(function (new_preferences) {
+    class {%= entrypoint %} {
+        constructor(MashupPlatform, extra) {
+            this.MashupPlatform = MashupPlatform;
+
+            MashupPlatform.prefs.registerCallback(function (new_preferences) {
+
+            }.bind(this));
+        }
+    }
 
-    }.bind(this));
+    // We define the class as part of the window object so that it can be instantiated by Wirecloud
+    window.{%= entrypoint %} = {%= entrypoint %};
 
     /* test-code */
 

root/src/ts/main.ts

@@ -16,8 +16,21 @@ import MashupPlatform = require("MashupPlatform");
 {% if (ngsi) { %}import NGSI = require("NGSI");{% }%}
 /* end-import-block */
 
-export class {%= jsname %} {
+export class {%= entrypoint %} {
+    private MashupPlatform: MashupPlatform;
+    {% if (ngsi) { %}private NGSI: NGSI;{% }%}
+
+    constructor(MashupPlatform: MashupPlatform, extra: any) {
+        this.MashupPlatform = MashupPlatform;
+        {% if (ngsi) { %}this.NGSI = extra.NGSI;{% }%}
+
+        this.init();
+    }
+
     init() {
         console.log("Loaded!!");
     }
 }
+
+// We define the class as part of the window object so that it can be instantiated by Wirecloud
+(<any>window)["{%= entrypoint %}"] = {%= entrypoint %};

root/tests/js/nameSpec.js

@@ -6,8 +6,10 @@
 
     describe("{%= jsname %}", function () {
 
+        var MashupPlatform;
+
         beforeAll(function () {
-            window.MashupPlatform = new MockMP({
+            MashupPlatform = new MockMP({
                 type: 'operator'
             });
         });

root/typings/MashupPlatform/MashupPlatform.d.ts

@@ -115,4 +115,6 @@ declare module "MashupPlatform" {
     interface onExceptionCB {
         (response: Object, exception: Error): void;
     }
+
+    var location: string;
 }

template.js

@@ -44,6 +44,13 @@ var capitalizeAndRemoveUnderscore = function capitalizeAndRemoveUnderscore(old)
     return t.charAt(0).toUpperCase() + t.slice(1);
 };
 
+var getEntrypointName = function getEntrypointName(vendor, name) {
+    // Remove all non-alphanumeric characters. Replace spaces with underscores.
+    vendor = vendor.replace(/[^a-zA-Z0-9]/g, '').replace(/\s/g, '_');
+    name = name.replace(/[^a-zA-Z0-9]/g, '').replace(/\s/g, '_');
+    return vendor + '_' + name;
+}
+
 // The actual init template.
 exports.template = function(grunt, init, done) {
     init.process([
@@ -124,6 +131,7 @@ exports.template = function(grunt, init, done) {
     ], function(err, props){
         var exportsOverride = {};
         props.jsname = capitalizeAndRemoveUnderscore(props.name);
+        props.entrypoint = getEntrypointName(props.vendor, props.name);
         props.bower = props.jquery; // Change way to determine bower?
         props.ngsi = false; // ??
         var bowerdeps = {};