jsdc - npm Package Compare versions

Comparing version 0.5.10 to 0.5.11

index.js

@@ -0,0 +0,0 @@ if(typeof define === 'function' && (define.amd || define.cmd)) {

package.json

 {
   "name": "jsdc",
-  "version": "0.5.10",
+  "version": "0.5.11",
   "description": "compiler ecmascript6 to ecmascript5",
@@ -5,0 +5,0 @@ "maintainers": [

README.md

@@ -0,0 +0,0 @@ Javascript Downcast

src/ArrayCmph.js

@@ -0,0 +0,0 @@ var homunculus = require('homunculus');

src/ArrowFn.js

@@ -0,0 +0,0 @@ var homunculus = require('homunculus');

src/DefaultValue.js

@@ -0,0 +0,0 @@ var homunculus = require('homunculus');

src/Destruct.js

@@ -0,0 +0,0 @@ var homunculus = require('homunculus');

src/eventbus.js

@@ -0,0 +0,0 @@ var events = {};

src/Forof.js

@@ -0,0 +0,0 @@ var homunculus = require('homunculus');

src/Generator.js

@@ -0,0 +0,0 @@ var homunculus = require('homunculus');

src/join.js

@@ -0,0 +0,0 @@ var homunculus = require('homunculus');

src/Jsdc.js

@@ -0,0 +0,0 @@ var homunculus = require('homunculus');

src/Klass.js

@@ -11,2 +11,3 @@ var homunculus = require('homunculus');
   this.hash = {};
+  this.hash2 = {};
   this.sup = {};
@@ -197,2 +198,10 @@ this.gs = {};
         if(node.next().name() == JsNode.ARGS) {
+          var list = node.next().leaf(1);
+          if(list.size() > 1) {
+            var rest = list.last().prev();
+            //待被rest改写apply
+            if(rest.isToken() && rest.token().content() == '...') {
+              return;
+            }
+          }
           this.jsdc.append('.call');
@@ -220,7 +229,17 @@ }
       var i = this.jsdc.res.lastIndexOf('(');
-      this.jsdc.insert('.call', i);
       if(node.size()) {
+        var hasRest = false;
+        if(node.size() > 1) {
+          var rest = node.last().prev();
+          if(rest.isToken() && rest.token().content() == '...') {
+            hasRest = true;
+          }
+        }
+        if(!hasRest) {
+          this.jsdc.insert('.call', i);
+        }
         this.jsdc.append('this,');
       }
       else {
+        this.jsdc.insert('.call', i);
         this.jsdc.append('this');
@@ -251,3 +270,16 @@ }
         && parent.prev().token().content() == 'super') {
-        this.jsdc.appendBefore('this');
+        var list = parent.leaf(1);
+        var hasRest = false;
+        if(list.size() > 1) {
+          var rest = list.last().prev();
+          if(rest.isToken() && rest.token().content() == '...') {
+            hasRest = true;
+          }
+        }
+        if(!hasRest) {
+          this.jsdc.appendBefore('this');
+        }
+        if(!hasRest && list.size()) {
+          this.jsdc.appendBefore(',');
+        }
       }
@@ -254,0 +286,0 @@ }

src/Module.js

@@ -0,0 +0,0 @@ var homunculus = require('homunculus');

src/Num.js

@@ -0,0 +0,0 @@ var homunculus = require('homunculus');

src/Obj.js

@@ -0,0 +0,0 @@ var homunculus = require('homunculus');

src/patch.js

@@ -0,0 +0,0 @@ var fs = require('fs');

src/Rest.js

@@ -167,2 +167,3 @@ var homunculus = require('homunculus');
       var o = this.hash2[parent.nid()];
+      var isSuper = false;
       if(o.needTemp) {
@@ -175,6 +176,13 @@ //主表达式中含有生成的对象，不是直接引用，使用临时变量引用
         var mmb = this.hash2[parent.nid()].node;
-        this.jsdc.append(mmb.name() == JsNode.MMBEXPR ? join(mmb.first()) : 'this');
+        if(mmb.name() == JsNode.MMBEXPR) {
+          var s = join(mmb.first());
+          isSuper = s == 'super';
+          this.jsdc.append(isSuper ? '' : s);
+        }
+        else {
+          this.jsdc.append('this');
+        }
       }
       //用数组来concat可变参数，注意前面可能存在的固定参数需带上
-      this.jsdc.append(', [');
+      this.jsdc.append(isSuper ? '[' : ',[');
       var leaves = node.leaves();
@@ -181,0 +189,0 @@ for(var i = 0; i < leaves.length - 3; i++) {

src/Scope.js

@@ -0,0 +0,0 @@ var homunculus = require('homunculus');

src/Str.js

@@ -0,0 +0,0 @@ var homunculus = require('homunculus');

src/Template.js

@@ -0,0 +0,0 @@ var homunculus = require('homunculus');

src/util/character.js

@@ -0,0 +0,0 @@ exports.LINE = '\n';

src/util/Class.js

@@ -0,0 +0,0 @@ function inheritPrototype(subType, superType) {

src/util/sort.js

@@ -0,0 +0,0 @@ function quickSort(arr, begin, end, compare) {

web/ArrayCmph.js

@@ -0,0 +0,0 @@ define(function(require, exports, module){var homunculus = require('homunculus');

web/ArrowFn.js

@@ -0,0 +0,0 @@ define(function(require, exports, module){var homunculus = require('homunculus');

web/DefaultValue.js

@@ -0,0 +0,0 @@ define(function(require, exports, module){var homunculus = require('homunculus');

web/Destruct.js

@@ -0,0 +0,0 @@ define(function(require, exports, module){var homunculus = require('homunculus');

web/eventbus.js

@@ -0,0 +0,0 @@ define(function(require, exports, module){var events = {};

web/Forof.js

@@ -0,0 +0,0 @@ define(function(require, exports, module){var homunculus = require('homunculus');

web/Generator.js

@@ -0,0 +0,0 @@ define(function(require, exports, module){var homunculus = require('homunculus');

web/join.js

@@ -0,0 +0,0 @@ define(function(require, exports, module){var homunculus = require('homunculus');

web/Jsdc.js

@@ -0,0 +0,0 @@ define(function(require, exports, module){var homunculus = require('homunculus');

web/Klass.js

@@ -11,2 +11,3 @@ define(function(require, exports, module){var homunculus = require('homunculus');
   this.hash = {};
+  this.hash2 = {};
   this.sup = {};
@@ -197,2 +198,10 @@ this.gs = {};
         if(node.next().name() == JsNode.ARGS) {
+          var list = node.next().leaf(1);
+          if(list.size() > 1) {
+            var rest = list.last().prev();
+            //待被rest改写apply
+            if(rest.isToken() && rest.token().content() == '...') {
+              return;
+            }
+          }
           this.jsdc.append('.call');
@@ -220,7 +229,17 @@ }
       var i = this.jsdc.res.lastIndexOf('(');
-      this.jsdc.insert('.call', i);
       if(node.size()) {
+        var hasRest = false;
+        if(node.size() > 1) {
+          var rest = node.last().prev();
+          if(rest.isToken() && rest.token().content() == '...') {
+            hasRest = true;
+          }
+        }
+        if(!hasRest) {
+          this.jsdc.insert('.call', i);
+        }
         this.jsdc.append('this,');
       }
       else {
+        this.jsdc.insert('.call', i);
         this.jsdc.append('this');
@@ -251,3 +270,16 @@ }
         && parent.prev().token().content() == 'super') {
-        this.jsdc.appendBefore('this');
+        var list = parent.leaf(1);
+        var hasRest = false;
+        if(list.size() > 1) {
+          var rest = list.last().prev();
+          if(rest.isToken() && rest.token().content() == '...') {
+            hasRest = true;
+          }
+        }
+        if(!hasRest) {
+          this.jsdc.appendBefore('this');
+        }
+        if(!hasRest && list.size()) {
+          this.jsdc.appendBefore(',');
+        }
       }
@@ -254,0 +286,0 @@ }

web/Module.js

@@ -0,0 +0,0 @@ define(function(require, exports, module){var homunculus = require('homunculus');

web/Num.js

@@ -0,0 +0,0 @@ define(function(require, exports, module){var homunculus = require('homunculus');

web/Obj.js

@@ -0,0 +0,0 @@ define(function(require, exports, module){var homunculus = require('homunculus');

web/patch.js

@@ -0,0 +0,0 @@ define(function(require, exports, module){var fs = require('fs');

web/Rest.js

@@ -167,2 +167,3 @@ define(function(require, exports, module){var homunculus = require('homunculus');
       var o = this.hash2[parent.nid()];
+      var isSuper = false;
       if(o.needTemp) {
@@ -175,6 +176,13 @@ //主表达式中含有生成的对象，不是直接引用，使用临时变量引用
         var mmb = this.hash2[parent.nid()].node;
-        this.jsdc.append(mmb.name() == JsNode.MMBEXPR ? join(mmb.first()) : 'this');
+        if(mmb.name() == JsNode.MMBEXPR) {
+          var s = join(mmb.first());
+          isSuper = s == 'super';
+          this.jsdc.append(isSuper ? '' : s);
+        }
+        else {
+          this.jsdc.append('this');
+        }
       }
       //用数组来concat可变参数，注意前面可能存在的固定参数需带上
-      this.jsdc.append(', [');
+      this.jsdc.append(isSuper ? '[' : ',[');
       var leaves = node.leaves();
@@ -181,0 +189,0 @@ for(var i = 0; i < leaves.length - 3; i++) {

web/Scope.js

@@ -0,0 +0,0 @@ define(function(require, exports, module){var homunculus = require('homunculus');

web/Str.js

@@ -0,0 +0,0 @@ define(function(require, exports, module){var homunculus = require('homunculus');

web/Template.js

@@ -0,0 +0,0 @@ define(function(require, exports, module){var homunculus = require('homunculus');

web/util/character.js

@@ -0,0 +0,0 @@ define(function(require, exports, module){exports.LINE = '\n';

web/util/Class.js

@@ -0,0 +0,0 @@ define(function(require, exports, module){function inheritPrototype(subType, superType) {

web/util/sort.js

@@ -0,0 +0,0 @@ define(function(require, exports, module){function quickSort(arr, begin, end, compare) {

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Lines of code

8119

increased by1%

Worsened metrics

Total package byte prevSize

307879

decreased by-8.46%

Number of package files

56

decreased by-3.45%

No dependency changes