sanex3339 8 лет назад
Родитель
Сommit
2f688f81fe

+ 4 - 7
dist/index.js

@@ -2085,19 +2085,16 @@ var UnicodeArrayCallsWrapper = function (_AbstractCustomNode_) {
     }, {
     }, {
         key: 'getDecodeUnicodeArrayTemplate',
         key: 'getDecodeUnicodeArrayTemplate',
         value: function getDecodeUnicodeArrayTemplate() {
         value: function getDecodeUnicodeArrayTemplate() {
-            var decodeFunctionName = 'decodeFunction';
-            var code = '';
+            var selfDefendingCode = '';
             if (this.options.selfDefending) {
             if (this.options.selfDefending) {
-                code = SelfDefendingTemplate_1.SelfDefendingTemplate().formatUnicorn({
-                    decodeFunctionName: decodeFunctionName,
+                selfDefendingCode = SelfDefendingTemplate_1.SelfDefendingTemplate().formatUnicorn({
                     unicodeArrayCallsWrapperName: this.unicodeArrayCallsWrapperName,
                     unicodeArrayCallsWrapperName: this.unicodeArrayCallsWrapperName,
                     unicodeArrayName: this.unicodeArrayName
                     unicodeArrayName: this.unicodeArrayName
                 });
                 });
             }
             }
             return UnicodeArrayAtobDecodeNodeTemplate_1.UnicodeArrayAtobDecodeNodeTemplate().formatUnicorn({
             return UnicodeArrayAtobDecodeNodeTemplate_1.UnicodeArrayAtobDecodeNodeTemplate().formatUnicorn({
                 atobPolyfill: AtobTemplate_1.AtobTemplate(),
                 atobPolyfill: AtobTemplate_1.AtobTemplate(),
-                code: code,
-                decodeFunctionName: decodeFunctionName,
+                selfDefendingCode: selfDefendingCode,
                 unicodeArrayCallsWrapperName: this.unicodeArrayCallsWrapperName
                 unicodeArrayCallsWrapperName: this.unicodeArrayCallsWrapperName
             });
             });
         }
         }
@@ -3894,7 +3891,7 @@ exports.SelfDefendingTemplate = SelfDefendingTemplate;
 "use strict";
 "use strict";
 
 
 function UnicodeArrayAtobDecodeNodeTemplate() {
 function UnicodeArrayAtobDecodeNodeTemplate() {
-    return "      \n        if (!{unicodeArrayCallsWrapperName}.atobPolyfillAppended) {\n            {atobPolyfill}\n            \n            {unicodeArrayCallsWrapperName}.atobPolyfillAppended = true;\n        }\n                \n        var decodedValues = {unicodeArrayCallsWrapperName}.data || {};\n        \n        if (!decodedValues[index]) {\n            {code}\n            \n            value = decodeURI(atob(value));\n            decodedValues[index] = value;\n        } else {\n            value = decodedValues[index];\n        }  \n        \n        {unicodeArrayCallsWrapperName}.data = decodedValues;                             \n    ";
+    return "      \n        if (!{unicodeArrayCallsWrapperName}.atobPolyfillAppended) {\n            {atobPolyfill}\n            \n            {unicodeArrayCallsWrapperName}.atobPolyfillAppended = true;\n        }\n                \n        var decodedValues = {unicodeArrayCallsWrapperName}.data || {};\n        \n        if (!decodedValues[index]) {\n            {selfDefendingCode}\n            \n            value = decodeURI(atob(value));\n            decodedValues[index] = value;\n        } else {\n            value = decodedValues[index];\n        }  \n        \n        {unicodeArrayCallsWrapperName}.data = decodedValues;                             \n    ";
 }
 }
 exports.UnicodeArrayAtobDecodeNodeTemplate = UnicodeArrayAtobDecodeNodeTemplate;
 exports.UnicodeArrayAtobDecodeNodeTemplate = UnicodeArrayAtobDecodeNodeTemplate;
 
 

+ 3 - 7
src/custom-nodes/unicode-array-nodes/UnicodeArrayCallsWrapper.ts

@@ -89,13 +89,10 @@ export class UnicodeArrayCallsWrapper extends AbstractCustomNode {
      * @returns {string}
      * @returns {string}
      */
      */
     protected getDecodeUnicodeArrayTemplate (): string {
     protected getDecodeUnicodeArrayTemplate (): string {
-        const decodeFunctionName: string = 'decodeFunction';
-
-        let code: string = '';
+        let selfDefendingCode: string = '';
 
 
         if (this.options.selfDefending) {
         if (this.options.selfDefending) {
-            code = SelfDefendingTemplate().formatUnicorn({
-                decodeFunctionName,
+            selfDefendingCode = SelfDefendingTemplate().formatUnicorn({
                 unicodeArrayCallsWrapperName: this.unicodeArrayCallsWrapperName,
                 unicodeArrayCallsWrapperName: this.unicodeArrayCallsWrapperName,
                 unicodeArrayName: this.unicodeArrayName
                 unicodeArrayName: this.unicodeArrayName
             });
             });
@@ -103,8 +100,7 @@ export class UnicodeArrayCallsWrapper extends AbstractCustomNode {
 
 
         return UnicodeArrayAtobDecodeNodeTemplate().formatUnicorn({
         return UnicodeArrayAtobDecodeNodeTemplate().formatUnicorn({
             atobPolyfill: AtobTemplate(),
             atobPolyfill: AtobTemplate(),
-            code,
-            decodeFunctionName,
+            selfDefendingCode,
             unicodeArrayCallsWrapperName: this.unicodeArrayCallsWrapperName
             unicodeArrayCallsWrapperName: this.unicodeArrayCallsWrapperName
         })
         })
     }
     }

+ 1 - 1
src/templates/custom-nodes/unicode-array-nodes/unicode-array-calls-wrapper/UnicodeArrayAtobDecodeNodeTemplate.ts

@@ -12,7 +12,7 @@ export function UnicodeArrayAtobDecodeNodeTemplate (): string {
         var decodedValues = {unicodeArrayCallsWrapperName}.data || {};
         var decodedValues = {unicodeArrayCallsWrapperName}.data || {};
         
         
         if (!decodedValues[index]) {
         if (!decodedValues[index]) {
-            {code}
+            {selfDefendingCode}
             
             
             value = decodeURI(atob(value));
             value = decodeURI(atob(value));
             decodedValues[index] = value;
             decodedValues[index] = value;

+ 2 - 4
test/functional-tests/templates/custom-nodes/unicode-array-nodes/UnicodeArrayCallsWrapperNodeTemplate.spec.ts

@@ -33,13 +33,11 @@ function getFunctionFromTemplate (
 }
 }
 
 
 describe('UnicodeArrayCallsWrapperNodeTemplate (): string', () => {
 describe('UnicodeArrayCallsWrapperNodeTemplate (): string', () => {
-    let decodeFunctionName: string = 'decodeFunction',
-        unicodeArrayName: string = 'unicodeArrayName',
+    let unicodeArrayName: string = 'unicodeArrayName',
         unicodeArrayCallsWrapperName: string = 'unicodeArrayCallsWrapperName',
         unicodeArrayCallsWrapperName: string = 'unicodeArrayCallsWrapperName',
         atobDecodeNodeTemplate: string = UnicodeArrayAtobDecodeNodeTemplate().formatUnicorn({
         atobDecodeNodeTemplate: string = UnicodeArrayAtobDecodeNodeTemplate().formatUnicorn({
             atobPolyfill: AtobTemplate(),
             atobPolyfill: AtobTemplate(),
-            code: `value = ${decodeFunctionName}(decodedValues, index, value);`,
-            decodeFunctionName,
+            selfDefendingCode: '',
             unicodeArrayCallsWrapperName
             unicodeArrayCallsWrapperName
         });
         });