From 6b953106828e6804899ecabe9ba4ef922b1151c5 Mon Sep 17 00:00:00 2001
From: oxixes <aquevedo@ficodes.com>
Date: Thu, 16 May 2024 16:57:16 +0200
Subject: [PATCH 1/4] Add version to entrypoint

---
 template.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/template.js b/template.js
index 0330ae7..6fb4b89 100644
--- a/template.js
+++ b/template.js
@@ -44,11 +44,12 @@ var capitalizeAndRemoveUnderscore = function capitalizeAndRemoveUnderscore(old)
     return t.charAt(0).toUpperCase() + t.slice(1);
 };
 
-var getEntrypointName = function getEntrypointName(vendor, name) {
+var getEntrypointName = function getEntrypointName(vendor, name, version) {
     // 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;
+    version = version.replace(/[^a-zA-Z0-9]/g, '').replace(/\s/g, '_');
+    return vendor + '_' + name + '_' + version;
 }
 
 // The actual init template.
@@ -131,7 +132,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.entrypoint = getEntrypointName(props.vendor, props.name, props.version);
         props.bower = props.jquery; // Change way to determine bower?
         props.ngsi = false; // ??
         var bowerdeps = {};

From 52c3f255d72a4112beaea56df5d3e0537362b825 Mon Sep 17 00:00:00 2001
From: oxixes <aquevedo@ficodes.com>
Date: Tue, 28 May 2024 13:31:39 +0200
Subject: [PATCH 2/4] Adapt to the new loading system

---
 root/src/config.json |  1 -
 root/src/config.xml  |  2 --
 root/src/js/main.js  | 11 ++++-------
 root/src/ts/main.ts  |  5 ++---
 template.js          |  9 ---------
 5 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/root/src/config.json b/root/src/config.json
index 0dec2e1..aa4000f 100644
--- a/root/src/config.json
+++ b/root/src/config.json
@@ -18,7 +18,6 @@
     "js_files": [
         "js/main.js"
     ],
-    "entrypoint": "{%= entrypoint %}",
     "license": "{%= licenses %}",
     "longdescription": "DESCRIPTION.md",
     "name": "{%= name %}",
diff --git a/root/src/config.xml b/root/src/config.xml
index 0a702d5..c7fd500 100644
--- a/root/src/config.xml
+++ b/root/src/config.xml
@@ -34,6 +34,4 @@
         <script src="js/main.js"/>
     </scripts>
 
-    <entrypoint name="{%= entrypoint %}" />
-
 </operator>
diff --git a/root/src/js/main.js b/root/src/js/main.js
index baeead7..32a3fe3 100644
--- a/root/src/js/main.js
+++ b/root/src/js/main.js
@@ -6,13 +6,11 @@
  * Licensed under the {%= licenses.join(', ') %} license{%= licenses.length === 1 ? '' : 's' %}.
  */
 
-/* exported {%= entrypoint %} */
-
-(function () {
+(function (script) {
 
     "use strict";
 
-    class {%= entrypoint %} {
+    class Operator {
         constructor(MashupPlatform, extra) {
             this.MashupPlatform = MashupPlatform;
 
@@ -22,11 +20,10 @@
         }
     }
 
-    // We define the class as part of the window object so that it can be instantiated by Wirecloud
-    window.{%= entrypoint %} = {%= entrypoint %};
+    Wirecloud.registerOperatorClass(script, Operator);
 
     /* test-code */
 
     /* end-test-code */
 
-})();
+})(document.currentScript);
diff --git a/root/src/ts/main.ts b/root/src/ts/main.ts
index efa80ee..904553f 100644
--- a/root/src/ts/main.ts
+++ b/root/src/ts/main.ts
@@ -16,7 +16,7 @@ import MashupPlatform = require("MashupPlatform");
 {% if (ngsi) { %}import NGSI = require("NGSI");{% }%}
 /* end-import-block */
 
-export class {%= entrypoint %} {
+export class Operator {
     private MashupPlatform: MashupPlatform;
     {% if (ngsi) { %}private NGSI: NGSI;{% }%}
 
@@ -32,5 +32,4 @@ export class {%= entrypoint %} {
     }
 }
 
-// We define the class as part of the window object so that it can be instantiated by Wirecloud
-(<any>window)["{%= entrypoint %}"] = {%= entrypoint %};
\ No newline at end of file
+(<any>window).registerOperatorClass((<any>document).currentScript, Operator);
\ No newline at end of file
diff --git a/template.js b/template.js
index 6fb4b89..82564fe 100644
--- a/template.js
+++ b/template.js
@@ -44,14 +44,6 @@ var capitalizeAndRemoveUnderscore = function capitalizeAndRemoveUnderscore(old)
     return t.charAt(0).toUpperCase() + t.slice(1);
 };
 
-var getEntrypointName = function getEntrypointName(vendor, name, version) {
-    // 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, '_');
-    version = version.replace(/[^a-zA-Z0-9]/g, '').replace(/\s/g, '_');
-    return vendor + '_' + name + '_' + version;
-}
-
 // The actual init template.
 exports.template = function(grunt, init, done) {
     init.process([
@@ -132,7 +124,6 @@ exports.template = function(grunt, init, done) {
     ], function(err, props){
         var exportsOverride = {};
         props.jsname = capitalizeAndRemoveUnderscore(props.name);
-        props.entrypoint = getEntrypointName(props.vendor, props.name, props.version);
         props.bower = props.jquery; // Change way to determine bower?
         props.ngsi = false; // ??
         var bowerdeps = {};

From 4fe42967bb127567facc084331d73c76ec8aca4f Mon Sep 17 00:00:00 2001
From: oxixes <aquevedo@ficodes.com>
Date: Fri, 19 Jul 2024 16:48:36 +0200
Subject: [PATCH 3/4] Some fixes

---
 root/src/js/main.js | 9 ++++++++-
 root/src/ts/main.ts | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/root/src/js/main.js b/root/src/js/main.js
index 32a3fe3..1cb5df8 100644
--- a/root/src/js/main.js
+++ b/root/src/js/main.js
@@ -6,6 +6,8 @@
  * Licensed under the {%= licenses.join(', ') %} license{%= licenses.length === 1 ? '' : 's' %}.
  */
 
+/* global Wirecloud */
+
 (function (script) {
 
     "use strict";
@@ -20,7 +22,12 @@
         }
     }
 
-    Wirecloud.registerOperatorClass(script, Operator);
+    if (!('Wirecloud') in window) {
+        // For testing purposes
+        window.Operator = Operator;
+    } else {
+        Wirecloud.registerOperatorClass(script, Operator);
+    }
 
     /* test-code */
 
diff --git a/root/src/ts/main.ts b/root/src/ts/main.ts
index 904553f..05fdcd7 100644
--- a/root/src/ts/main.ts
+++ b/root/src/ts/main.ts
@@ -32,4 +32,4 @@ export class Operator {
     }
 }
 
-(<any>window).registerOperatorClass((<any>document).currentScript, Operator);
\ No newline at end of file
+(<any>window).Wirecloud.registerOperatorClass((<any>document).currentScript, Operator);
\ No newline at end of file

From 03d45b9e05be0d63025aa1c4454518089f7dd0aa Mon Sep 17 00:00:00 2001
From: oxixes <aquevedo@ficodes.com>
Date: Mon, 22 Jul 2024 16:25:20 +0200
Subject: [PATCH 4/4] Fix

---
 root/src/js/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/root/src/js/main.js b/root/src/js/main.js
index 1cb5df8..c0b44a3 100644
--- a/root/src/js/main.js
+++ b/root/src/js/main.js
@@ -22,7 +22,7 @@
         }
     }
 
-    if (!('Wirecloud') in window) {
+    if (!('Wirecloud' in window)) {
         // For testing purposes
         window.Operator = Operator;
     } else {