Fix parsing of ES6 scripts (playcanvas#1958)

vkalpias · web-flow · commit cf75ff1d09a1 · 2020-04-03T10:19:03.000-07:00
diff --git a/src/script/script-type.js b/src/script/script-type.js
@@ -1,4 +1,7 @@
 Object.assign(pc, function () {
+
+    var funcNameRegex = new RegExp('^\\s*function(?:\\s|\\s*\\/\\*.*\\*\\/\\s*)+([^\\(\\s\\/]*)\\s*');
+
     /**
      * @class
      * @name pc.ScriptType
@@ -76,6 +79,14 @@ Object.assign(pc, function () {
      */
     ScriptType.__name = null; // Will be assigned when calling createScript or registerScript.
 
+    ScriptType.__getScriptName = function (constructorFn) {
+        if (typeof constructorFn !== 'function') return undefined;
+        if ('name' in Function.prototype) return constructorFn.name;
+        if (constructorFn === Function || constructorFn === Function.prototype.constructor) return 'Function';
+        var match = ("" + constructorFn).match(funcNameRegex);
+        return match ? match[1] : undefined;
+    };
+
     /**
      * @field
      * @static
diff --git a/src/script/script.js b/src/script/script.js
@@ -1,14 +1,4 @@
 Object.assign(pc, function () {
-    var funcNameRegex = new RegExp('^\\s*function(?:\\s|\\s*\\/\\*.*\\*\\/\\s*)+([^\\(\\s\\/]*)\\s*');
-
-    var _getFuncName = function (func) {
-        if (typeof func !== 'function') return undefined;
-        if ('name' in Function.prototype) return func.name;
-        if (func === Function || func === Function.prototype.constructor) return 'Function';
-        var match = ("" + func).match(funcNameRegex);
-        return match ? match[1] : undefined;
-    };
-
     /* eslint-disable jsdoc/no-undefined-types */
     /**
      * @static
@@ -100,6 +90,9 @@ Object.assign(pc, function () {
      *
      * // register the class as a script
      * pc.registerScript(PlayerController);
+     *
+     * // declare script attributes (Must be after pc.registerScript())
+     * PlayerController.attributes.add('attribute1', {type: 'number'});
      */
     /* eslint-enable jsdoc/check-examples */
     /* eslint-enable jsdoc/no-undefined-types */
@@ -115,9 +108,9 @@ Object.assign(pc, function () {
             throw new Error('script class: \'' + script + '\' must be a constructor function (i.e. class).');
 
         if (!(script.prototype instanceof pc.ScriptType))
-            throw new Error('script class: \'' + _getFuncName(script) + '\' does not extend pc.ScriptType.');
+            throw new Error('script class: \'' + pc.ScriptType.__getScriptName(script) + '\' does not extend pc.ScriptType.');
 
-        name = name || script.__name || _getFuncName(script);
+        name = name || script.__name || pc.ScriptType.__getScriptName(script);
 
         if (createScript.reservedScripts[name])
             throw new Error('script name: \'' + name + '\' is reserved, please change script name');
