Merge pull request #570 from gpujs/fix-519

fix: #519 funny names from minification and upgrade typescript

Author: robertleeplummerjr

dist/gpu-browser-core.js

@@ -4,8 +4,8 @@
  *
  * GPU Accelerated JavaScript
  *
- * @version 2.6.4
- * @date Tue Jan 21 2020 08:05:29 GMT-0500 (Eastern Standard Time)
+ * @version 2.6.5
+ * @date Thu Jan 23 2020 07:17:48 GMT-0500 (Eastern Standard Time)
  *
  * @license MIT
  * The MIT License
@@ -6948,6 +6948,7 @@ module.exports = {
   fragmentShader
 };
 },{}],37:[function(require,module,exports){
+const { utils } = require('../../utils');
 const { FunctionNode } = require('../function-node');
 
 class WebGLFunctionNode extends FunctionNode {
@@ -7033,11 +7034,11 @@ class WebGLFunctionNode extends FunctionNode {
         if (!type) {
           throw this.astErrorOutput('Unexpected expression', ast);
         }
-
+        const name = utils.sanitizeName(argumentName);
         if (type === 'sampler2D' || type === 'sampler2DArray') {
-          retArr.push(`${type} user_${argumentName},ivec2 user_${argumentName}Size,ivec3 user_${argumentName}Dim`);
+          retArr.push(`${type} user_${name},ivec2 user_${name}Size,ivec3 user_${name}Dim`);
         } else {
-          retArr.push(`${type} user_${argumentName}`);
+          retArr.push(`${type} user_${name}`);
         }
       }
     }
@@ -7479,16 +7480,17 @@ class WebGLFunctionNode extends FunctionNode {
 
     const type = this.getType(idtNode);
 
+    const name = utils.sanitizeName(idtNode.name);
     if (idtNode.name === 'Infinity') {
       retArr.push('3.402823466e+38');
     } else if (type === 'Boolean') {
-      if (this.argumentNames.indexOf(idtNode.name) > -1) {
-        retArr.push(`bool(user_${idtNode.name})`);
+      if (this.argumentNames.indexOf(name) > -1) {
+        retArr.push(`bool(user_${name})`);
       } else {
-        retArr.push(`user_${idtNode.name}`);
+        retArr.push(`user_${name}`);
       }
     } else {
-      retArr.push(`user_${idtNode.name}`);
+      retArr.push(`user_${name}`);
     }
 
     return retArr;
@@ -7682,7 +7684,7 @@ class WebGLFunctionNode extends FunctionNode {
           throw new Error('Unhandled declaration');
         }
         lastType = type;
-        declarationResult.push(`user_${declaration.id.name}=`);
+        declarationResult.push(`user_${utils.sanitizeName(declaration.id.name)}=`);
         declarationResult.push('float(');
         this.astGeneric(init, declarationResult);
         declarationResult.push(')');
@@ -7696,7 +7698,7 @@ class WebGLFunctionNode extends FunctionNode {
           declarationResult.push(`${markupType} `);
         }
         lastType = type;
-        declarationResult.push(`user_${declaration.id.name}=`);
+        declarationResult.push(`user_${utils.sanitizeName(declaration.id.name)}=`);
         if (actualType === 'Number' && type === 'Integer') {
           if (init.left && init.left.type === 'Literal') {
             this.astGeneric(init, declarationResult);
@@ -7932,18 +7934,19 @@ class WebGLFunctionNode extends FunctionNode {
           retArr.push(Math[name]);
           return retArr;
         }
+        const cleanName = utils.sanitizeName(name);
         switch (property) {
           case 'r':
-            retArr.push(`user_${ name }.r`);
+            retArr.push(`user_${ cleanName }.r`);
             return retArr;
           case 'g':
-            retArr.push(`user_${ name }.g`);
+            retArr.push(`user_${ cleanName }.g`);
             return retArr;
           case 'b':
-            retArr.push(`user_${ name }.b`);
+            retArr.push(`user_${ cleanName }.b`);
             return retArr;
           case 'a':
-            retArr.push(`user_${ name }.a`);
+            retArr.push(`user_${ cleanName }.a`);
             return retArr;
         }
         break;
@@ -8225,7 +8228,7 @@ class WebGLFunctionNode extends FunctionNode {
           case 'Array(4)':
             if (targetType === argumentType) {
               if (argument.type === 'Identifier') {
-                retArr.push(`user_${argument.name}`);
+                retArr.push(`user_${utils.sanitizeName(argument.name)}`);
               } else if (argument.type === 'ArrayExpression' || argument.type === 'MemberExpression') {
                 this.astGeneric(argument, retArr);
               } else {
@@ -8247,7 +8250,8 @@ class WebGLFunctionNode extends FunctionNode {
             if (targetType === argumentType) {
               if (argument.type !== 'Identifier') throw this.astErrorOutput(`Unhandled argument type ${ argument.type }`, ast);
               this.triggerImplyArgumentBitRatio(this.name, argument.name, functionName, i);
-              retArr.push(`user_${argument.name},user_${argument.name}Size,user_${argument.name}Dim`);
+              const name = utils.sanitizeName(argument.name);
+              retArr.push(`user_${name},user_${name}Size,user_${name}Dim`);
               continue;
             }
             break;
@@ -8345,7 +8349,7 @@ const operatorMap = {
 module.exports = {
   WebGLFunctionNode
 };
-},{"../function-node":9}],38:[function(require,module,exports){
+},{"../../utils":113,"../function-node":9}],38:[function(require,module,exports){
 const { WebGLKernelValueBoolean } = require('./kernel-value/boolean');
 const { WebGLKernelValueFloat } = require('./kernel-value/float');
 const { WebGLKernelValueInteger } = require('./kernel-value/integer');
@@ -9967,7 +9971,7 @@ class WebGLKernel extends GLKernel {
 
     for (let index = 0; index < args.length; index++) {
       const value = args[index];
-      const name = this.argumentNames[index];
+      const name = utils.sanitizeName(this.argumentNames[index]);
       let type;
       if (needsArgumentTypes) {
         type = utils.getVariableType(value, this.strictIntegers);
@@ -10016,7 +10020,8 @@ class WebGLKernel extends GLKernel {
     }
     this.constantBitRatios = {};
     let textureIndexes = 0;
-    for (const name in this.constants) {
+    for (const p in this.constants) {
+      const name = utils.sanitizeName(p);
       const value = this.constants[name];
       let type;
       if (needsConstantTypes) {
@@ -11463,6 +11468,7 @@ module.exports = {
   fragmentShader
 };
 },{}],72:[function(require,module,exports){
+const { utils } = require('../../utils');
 const { WebGLFunctionNode } = require('../web-gl/function-node');
 
 class WebGL2FunctionNode extends WebGLFunctionNode {
@@ -11477,16 +11483,17 @@ class WebGL2FunctionNode extends WebGLFunctionNode {
 
     const type = this.getType(idtNode);
 
+    const name = utils.sanitizeName(idtNode.name);
     if (idtNode.name === 'Infinity') {
       retArr.push('intBitsToFloat(2139095039)');
     } else if (type === 'Boolean') {
-      if (this.argumentNames.indexOf(idtNode.name) > -1) {
-        retArr.push(`bool(user_${idtNode.name})`);
+      if (this.argumentNames.indexOf(name) > -1) {
+        retArr.push(`bool(user_${name})`);
       } else {
-        retArr.push(`user_${idtNode.name}`);
+        retArr.push(`user_${name}`);
       }
     } else {
-      retArr.push(`user_${idtNode.name}`);
+      retArr.push(`user_${name}`);
     }
 
     return retArr;
@@ -11496,7 +11503,7 @@ class WebGL2FunctionNode extends WebGLFunctionNode {
 module.exports = {
   WebGL2FunctionNode
 };
-},{"../web-gl/function-node":37}],73:[function(require,module,exports){
+},{"../../utils":113,"../web-gl/function-node":37}],73:[function(require,module,exports){
 const { WebGL2KernelValueBoolean } = require('./kernel-value/boolean');
 const { WebGL2KernelValueFloat } = require('./kernel-value/float');
 const { WebGL2KernelValueInteger } = require('./kernel-value/integer');
@@ -14539,8 +14546,23 @@ const utils = {
       throw new Error('Unrecognized function type.  Please use `() => yourFunctionVariableHere` or function() { return yourFunctionVariableHere; }');
     }
   },
+  sanitizeName: function(name) {
+    if (dollarSign.test(name)) {
+      name = name.replace(dollarSign, 'S_S');
+    }
+    if (doubleUnderscore.test(name)) {
+      name = name.replace(doubleUnderscore, 'U_U');
+    } else if (singleUnderscore.test(name)) {
+      name = name.replace(singleUnderscore, 'u_u');
+    }
+    return name;
+  }
 };
 
+const dollarSign = /\$/;
+const doubleUnderscore = /__/;
+const singleUnderscore = /_/;
+
 const _systemEndianness = utils.getSystemEndianness();
 
 module.exports = {