shift-scope - npm Package Compare versions

Comparing version 1.0.0 to 1.0.1

lib/scope-analyzer.js

@@ -69,11 +69,24 @@ "use strict";
   ScopeAnalyzer.prototype.reduceForInStatement = function (node, left, right, body) {
-    var s = MonoidalReducer.prototype.reduceForInStatement.call(this, node, left, right, body);
     if (node.left.type === "IdentifierExpression") {
       return this.append(right, body).addReference(new WriteReference(node.left.identifier));
-    } else if (node.left.type === "VariableDeclaration" && node.left.declarators[0].init == null) {
-      s = s.addReference(new WriteReference(node.left.declarators[0].binding));
+    } else {
+      // node.left.type === "VariableDeclaration"
+      var declarator = node.left.declarators[0];
+      if (declarator.init == null) {
+        left = left.addReference(new WriteReference(declarator.binding));
+      }
+      if (left.blockScopedDeclarations.size > 0) {
+        return this.append(this.append(left, body).finish(node, ScopeType.BLOCK), right);
+      }
+      return MonoidalReducer.prototype.reduceForInStatement.call(this, node, left, right, body);
     }
-    return s;
   };
 
+  ScopeAnalyzer.prototype.reduceForStatement = function (node, init, test, update, body) {
+    if (node.init.type === "VariableDeclaration" && init.blockScopedDeclarations.size > 0) {
+      return this.append3(this.append(init, body).finish(node, ScopeType.BLOCK), test, update);
+    }
+    return MonoidalReducer.prototype.reduceForStatement.call(this, node, init, test, update, body);
+  };
+
   ScopeAnalyzer.prototype.reduceFunctionDeclaration = function (node, name, parameters, functionBody) {
@@ -147,2 +160,2 @@ return node.parameters.reduce(function (s, p) {
 exports["default"] = ScopeAnalyzer;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["src/scope-analyzer.js"],"names":[],"mappings":";;;;;;;;;;;;;;IAgBO,MAAM;IAAG,eAAe,4BAAf,eAAe;IACxB,UAAU;IACT,aAAa,0BAAb,aAAa;IAAE,cAAc,0BAAd,cAAc;IAAE,kBAAkB,0BAAlB,kBAAkB;IACjD,WAAW,4BAAX,WAAW;IAAE,cAAc,4BAAd,cAAc;IAAE,gBAAgB,4BAAhB,gBAAgB;IAAE,cAAc,4BAAd,cAAc;IAAE,gBAAgB,4BAAhB,gBAAgB;IAAE,oBAAoB,4BAApB,oBAAoB;IAAE,uBAAuB,4BAAvB,uBAAuB;IAC9H,SAAS,sBAAT,SAAS;IAEI,aAAa,cAAS,eAAe;MAArC,aAAa,GAErB,SAFQ,aAAa,GAElB;AAF2B,AAGvC,mBAHsD,YAGhD,UAAU,CAAC,CAAC;GACnB;;WAJkB,aAAa,EAAS,eAAe;;AAArC,eAAa,CAMzB,OAAO,GAAA,UAAC,MAAM,EAAE;AACrB,WAAO,MAAM,CAAC,IAAI,IAAI,EAAA,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;GAC7C;;AARkB,eAAa,WAUhC,0BAA0B,GAAA,UAAC,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE;AACpD,QAAI,IAAI,CAAC,OAAO,CAAC,IAAI,KAAK,sBAAsB,EAAE;AAChD,UAAI,aAAa,GAAG,IAAI,CAAC,QAAQ,KAAK,GAAG,GAAG,cAAc,GAAG,kBAAkB,CAAC;AAChF,aAAO,UAAU,CAAC,YAAY,CAAC,IAAI,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;KAC5E;AACD,WAfuC,AAehC,eAf+C,WAezC,0BAA0B,KAAA,OAAC,IAAI,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;GACpE;;AAhBkB,eAAa,WAkBhC,WAAW,GAAA,UAAC,IAAI,EAAE,UAAU,EAAE;AAC5B,QAAI,CAAC,GAnBkC,AAmB/B,eAnB8C,WAmBxC,WAAW,KAAA,OAAC,IAAI,EAAE,UAAU,CAAC,CAAC;AAC5C,QAAI,CAAC,CAAC,uBAAuB,CAAC,IAAI,GAAG,CAAC,EAAE;AACtC,OAAC,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC;KACrC;AACD,WAAO,CAAC,CAAC;GACV;;AAxBkB,eAAa,WA0BhC,oBAAoB,GAAA,UAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE;AACvC,QAAI,CAAC,GA3BkC,AA2B/B,eA3B8C,WA2BxC,oBAAoB,KAAA,OAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;AACvD,QAAI,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,sBAAsB,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,KAAK,MAAM,EAAE;AACzF,aAAO,CAAC,CAAC,KAAK,EAAE,CAAC;KAClB;AACD,WAAO,CAAC,CAAC;GACV;;AAhCkB,eAAa,WAkChC,iBAAiB,GAAA,UAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE;AACrC,WAnCuC,AAmChC,eAnC+C,WAmCzC,iBAAiB,KAAA,OAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,CAChD,cAAc,CAAC,IAAI,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAClD,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC;GAClC;;AAtCkB,eAAa,WAwChC,oBAAoB,GAAA,UAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE;AAC5C,QAAI,CAAC,GAzCkC,AAyC/B,eAzC8C,WAyCxC,oBAAoB,KAAA,OAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;AAC5D,QAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,sBAAsB,EAAE;AAC7C,aAAO,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,YAAY,CAAC,IAAI,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;KACxF,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,qBAAqB,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,IAAI,EAAE;AAC5F,OAAC,GAAG,CAAC,CAAC,YAAY,CAAC,IAAI,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;KAC1E;AACD,WAAO,CAAC,CAAC;GACV;;AAhDkB,eAAa,WAkDhC,yBAAyB,GAAA,UAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,YAAY,EAAE;AAC9D,WAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,UAAC,CAAC,EAAE,CAAC;aAAK,CAAC,CAAC,cAAc,CAAC,IAAI,oBAAoB,CAAC,CAAC,CAAC,CAAC;KAAA,EAAE,YAAY,CAAC,CACjG,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,QAAQ,CAAC,CAChC,cAAc,CAAC,IAAI,uBAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;GAC3D;;AAtDkB,eAAa,WAwDhC,wBAAwB,GAAA,UAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,YAAY,EAAE;AAC7D,QAAI,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,UAAC,CAAC,EAAE,CAAC;aAAK,CAAC,CAAC,cAAc,CAAC,IAAI,oBAAoB,CAAC,CAAC,CAAC,CAAC;KAAA,EAAE,YAAY,CAAC,CAClG,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC;AACpC,QAAI,IAAI,IAAI,IAAI,EAAE;AAChB,OAAC,GAAG,CAAC,CAAC,cAAc,CAAC,IAAI,uBAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CACzD,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,aAAa,CAAC,CAAC;KAC1C;AACD,WAAO,CAAC,CAAC;GACV;;AAhEkB,eAAa,WAkEhC,YAAY,GAAA,UAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE;AAC7B,WAAO,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC;GAC9C;;AApEkB,eAAa,WAsEhC,0BAA0B,GAAA,UAAC,IAAI,EAAE,UAAU,EAAE;AAC3C,WAAO,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;GACvE;;AAxEkB,eAAa,WA0EhC,uBAAuB,GAAA,UAAC,IAAI,EAAE,OAAO,EAAE;AACrC,QAAI,IAAI,CAAC,OAAO,CAAC,IAAI,KAAK,sBAAsB,EAAE;AAChD,aAAO,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;KACpF;AACD,WAAO,OAAO,CAAC;GAChB;;AA/EkB,eAAa,WAiFhC,sBAAsB,GAAA,UAAC,IAAI,EAAE,OAAO,EAAE;AACpC,QAAI,CAAC,IAAI,CAAC,QAAQ,KAAK,IAAI,IAAI,IAAI,CAAC,QAAQ,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,KAAK,sBAAsB,EAAE;AACtG,aAAO,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;KACpF;AACD,WAAO,OAAO,CAAC;GAChB;;AAtFkB,eAAa,WAwFhC,YAAY,GAAA,UAAC,IAAI,EAAE,IAAI,EAAE;AACvB,WAAO,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;GAC5C;;AA1FkB,eAAa,WA4FhC,YAAY,GAAA,UAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE;AACxC,WAAO,IAAI,CAAC,cAAc,CAAC,IAAI,oBAAoB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CACjE,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC;GACrC;;AA/FkB,eAAa,WAiGhC,yBAAyB,GAAA,UAAC,IAAI,EAAE,WAAW,EAAE;AAC3C,WAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAC5B,UAAC,CAAC,EAAE,CAAC;aAAK,CAAC,CAAC,cAAc,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;KAAA,EAnGxC,AAoGrC,eApGoD,WAoG9C,yBAAyB,KAAA,OAAC,IAAI,EAAE,WAAW,CAAC,CACnD,CAAC;GACH;;AAtGkB,eAAa,WAwGhC,wBAAwB,GAAA,UAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE;AAC5C,QAAI,CAAC,GAzGkC,AAyG/B,eAzG8C,WAyGxC,wBAAwB,KAAA,OAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;AAC5D,QAAI,IAAI,IAAI,IAAI,EAAE;AAChB,OAAC,GAAG,CAAC,CAAC,YAAY,CAAC,IAAI,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;KACtD;AACD,WAAO,CAAC,CAAC;GACV;;AA9GkB,eAAa,WAgHhC,mBAAmB,GAAA,UAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE;AACtC,WAjHuC,AAiHhC,eAjH+C,WAiHzC,mBAAmB,KAAA,OAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;GACnF;;SAlHkB,aAAa;GAAS,eAAe;;qBAArC,aAAa","file":"src/scope-analyzer.js","sourcesContent":["/**\n * Copyright 2014 Shape Security, Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\")\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport reduce, {MonoidalReducer} from \"shift-reducer\";\nimport ScopeState from \"./scope-state\";\nimport {ReadReference, WriteReference, ReadWriteReference} from \"./reference\";\nimport {Declaration, VarDeclaration, ConstDeclaration, LetDeclaration, CatchDeclaration, ParameterDeclaration, FunctionNameDeclaration} from \"./declaration\";\nimport {ScopeType} from \"./scope\";\n\nexport default class ScopeAnalyzer extends MonoidalReducer {\n\n  constructor() {\n    super(ScopeState);\n  }\n\n  static analyze(script) {\n    return reduce(new this, script).children[0];\n  }\n\n  reduceAssignmentExpression(node, binding, expression) {\n    if (node.binding.type === \"IdentifierExpression\") {\n      let ReferenceCtor = node.operator === \"=\" ? WriteReference : ReadWriteReference;\n      return expression.addReference(new ReferenceCtor(node.binding.identifier));\n    }\n    return super.reduceAssignmentExpression(node, binding, expression);\n  }\n\n  reduceBlock(node, statements) {\n    let s = super.reduceBlock(node, statements);\n    if (s.blockScopedDeclarations.size > 0) {\n      s = s.finish(node, ScopeType.BLOCK);\n    }\n    return s;\n  }\n\n  reduceCallExpression(node, callee, args) {\n    let s = super.reduceCallExpression(node, callee, args);\n    if (node.callee.type === \"IdentifierExpression\" && node.callee.identifier.name === \"eval\") {\n      return s.taint();\n    }\n    return s;\n  }\n\n  reduceCatchClause(node, binding, body) {\n    return super.reduceCatchClause(node, binding, body)\n      .addDeclaration(new CatchDeclaration(node.binding))\n      .finish(node, ScopeType.CATCH);\n  }\n\n  reduceForInStatement(node, left, right, body) {\n    let s = super.reduceForInStatement(node, left, right, body);\n    if (node.left.type === \"IdentifierExpression\") {\n      return this.append(right, body).addReference(new WriteReference(node.left.identifier));\n    } else if (node.left.type === \"VariableDeclaration\" && node.left.declarators[0].init == null) {\n      s = s.addReference(new WriteReference(node.left.declarators[0].binding));\n    }\n    return s;\n  }\n\n  reduceFunctionDeclaration(node, name, parameters, functionBody) {\n    return node.parameters.reduce((s, p) => s.addDeclaration(new ParameterDeclaration(p)), functionBody)\n      .finish(node, ScopeType.FUNCTION)\n      .addDeclaration(new FunctionNameDeclaration(node.name));\n  }\n\n  reduceFunctionExpression(node, name, parameters, functionBody) {\n    let s = node.parameters.reduce((s, p) => s.addDeclaration(new ParameterDeclaration(p)), functionBody)\n      .finish(node, ScopeType.FUNCTION);\n    if (name != null) {\n      s = s.addDeclaration(new FunctionNameDeclaration(node.name))\n        .finish(node, ScopeType.FUNCTION_NAME);\n    }\n    return s;\n  }\n\n  reduceGetter(node, name, body) {\n    return body.finish(node, ScopeType.FUNCTION);\n  }\n\n  reduceIdentifierExpression(node, identifier) {\n    return this.identity.addReference(new ReadReference(node.identifier));\n  }\n\n  reducePostfixExpression(node, operand) {\n    if (node.operand.type === \"IdentifierExpression\") {\n      return this.identity.addReference(new ReadWriteReference(node.operand.identifier));\n    }\n    return operand;\n  }\n\n  reducePrefixExpression(node, operand) {\n    if ((node.operator === \"--\" || node.operator === \"++\") && node.operand.type === \"IdentifierExpression\") {\n      return this.identity.addReference(new ReadWriteReference(node.operand.identifier));\n    }\n    return operand;\n  }\n\n  reduceScript(node, body) {\n    return body.finish(node, ScopeType.GLOBAL);\n  }\n\n  reduceSetter(node, name, parameter, body) {\n    return body.addDeclaration(new ParameterDeclaration(node.parameter))\n      .finish(node, ScopeType.FUNCTION);\n  }\n\n  reduceVariableDeclaration(node, declarators) {\n    return node.declarators.reduce(\n      (s, d) => s.addDeclaration(Declaration.fromVarDeclKind(d.binding, node.kind)),\n      super.reduceVariableDeclaration(node, declarators)\n    );\n  }\n\n  reduceVariableDeclarator(node, binding, init) {\n    let s = super.reduceVariableDeclarator(node, binding, init);\n    if (init != null) {\n      s = s.addReference(new WriteReference(node.binding));\n    }\n    return s;\n  }\n\n  reduceWithStatement(node, object, body) {\n    return super.reduceWithStatement(node, object, body.finish(node, ScopeType.WITH));\n  }\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["src/scope-analyzer.js"],"names":[],"mappings":"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","file":"src/scope-analyzer.js","sourcesContent":["/**\n * Copyright 2014 Shape Security, Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\")\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport reduce, {MonoidalReducer} from \"shift-reducer\";\nimport ScopeState from \"./scope-state\";\nimport {ReadReference, WriteReference, ReadWriteReference} from \"./reference\";\nimport {Declaration, VarDeclaration, ConstDeclaration, LetDeclaration, CatchDeclaration, ParameterDeclaration, FunctionNameDeclaration} from \"./declaration\";\nimport {ScopeType} from \"./scope\";\n\nexport default class ScopeAnalyzer extends MonoidalReducer {\n\n  constructor() {\n    super(ScopeState);\n  }\n\n  static analyze(script) {\n    return reduce(new this, script).children[0];\n  }\n\n  reduceAssignmentExpression(node, binding, expression) {\n    if (node.binding.type === \"IdentifierExpression\") {\n      let ReferenceCtor = node.operator === \"=\" ? WriteReference : ReadWriteReference;\n      return expression.addReference(new ReferenceCtor(node.binding.identifier));\n    }\n    return super.reduceAssignmentExpression(node, binding, expression);\n  }\n\n  reduceBlock(node, statements) {\n    let s = super.reduceBlock(node, statements);\n    if (s.blockScopedDeclarations.size > 0) {\n      s = s.finish(node, ScopeType.BLOCK);\n    }\n    return s;\n  }\n\n  reduceCallExpression(node, callee, args) {\n    let s = super.reduceCallExpression(node, callee, args);\n    if (node.callee.type === \"IdentifierExpression\" && node.callee.identifier.name === \"eval\") {\n      return s.taint();\n    }\n    return s;\n  }\n\n  reduceCatchClause(node, binding, body) {\n    return super.reduceCatchClause(node, binding, body)\n      .addDeclaration(new CatchDeclaration(node.binding))\n      .finish(node, ScopeType.CATCH);\n  }\n\n  reduceForInStatement(node, left, right, body) {\n    if (node.left.type === \"IdentifierExpression\") {\n      return this.append(right, body).addReference(new WriteReference(node.left.identifier));\n    } else { // node.left.type === \"VariableDeclaration\"\n      let declarator = node.left.declarators[0];\n      if (declarator.init == null) {\n        left = left.addReference(new WriteReference(declarator.binding));\n      }\n      if (left.blockScopedDeclarations.size > 0) {\n        return this.append(this.append(left, body).finish(node, ScopeType.BLOCK), right);\n      }\n      return super.reduceForInStatement(node, left, right, body);\n    }\n  }\n\n  reduceForStatement(node, init, test, update, body) {\n    if (node.init.type === \"VariableDeclaration\" && init.blockScopedDeclarations.size > 0) {\n      return this.append3(this.append(init, body).finish(node, ScopeType.BLOCK), test, update);\n    }\n    return super.reduceForStatement(node, init, test, update, body);\n  }\n\n  reduceFunctionDeclaration(node, name, parameters, functionBody) {\n    return node.parameters.reduce((s, p) => s.addDeclaration(new ParameterDeclaration(p)), functionBody)\n      .finish(node, ScopeType.FUNCTION)\n      .addDeclaration(new FunctionNameDeclaration(node.name));\n  }\n\n  reduceFunctionExpression(node, name, parameters, functionBody) {\n    let s = node.parameters.reduce((s, p) => s.addDeclaration(new ParameterDeclaration(p)), functionBody)\n      .finish(node, ScopeType.FUNCTION);\n    if (name != null) {\n      s = s.addDeclaration(new FunctionNameDeclaration(node.name))\n        .finish(node, ScopeType.FUNCTION_NAME);\n    }\n    return s;\n  }\n\n  reduceGetter(node, name, body) {\n    return body.finish(node, ScopeType.FUNCTION);\n  }\n\n  reduceIdentifierExpression(node, identifier) {\n    return this.identity.addReference(new ReadReference(node.identifier));\n  }\n\n  reducePostfixExpression(node, operand) {\n    if (node.operand.type === \"IdentifierExpression\") {\n      return this.identity.addReference(new ReadWriteReference(node.operand.identifier));\n    }\n    return operand;\n  }\n\n  reducePrefixExpression(node, operand) {\n    if ((node.operator === \"--\" || node.operator === \"++\") && node.operand.type === \"IdentifierExpression\") {\n      return this.identity.addReference(new ReadWriteReference(node.operand.identifier));\n    }\n    return operand;\n  }\n\n  reduceScript(node, body) {\n    return body.finish(node, ScopeType.GLOBAL);\n  }\n\n  reduceSetter(node, name, parameter, body) {\n    return body.addDeclaration(new ParameterDeclaration(node.parameter))\n      .finish(node, ScopeType.FUNCTION);\n  }\n\n  reduceVariableDeclaration(node, declarators) {\n    return node.declarators.reduce(\n      (s, d) => s.addDeclaration(Declaration.fromVarDeclKind(d.binding, node.kind)),\n      super.reduceVariableDeclaration(node, declarators)\n    );\n  }\n\n  reduceVariableDeclarator(node, binding, init) {\n    let s = super.reduceVariableDeclarator(node, binding, init);\n    if (init != null) {\n      s = s.addReference(new WriteReference(node.binding));\n    }\n    return s;\n  }\n\n  reduceWithStatement(node, object, body) {\n    return super.reduceWithStatement(node, object, body.finish(node, ScopeType.WITH));\n  }\n}\n"]}

package.json

 {
   "name": "shift-scope",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "produce a scope tree for Shift format ASTs",
@@ -5,0 +5,0 @@ "author": "Shape Security Labs",

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

Total package byte prevSize

70235

increased by2.98%

Lines of code

466

increased by2.64%

No dependency changes