don't apply implicit setup() when setup/draw defined as var. Fixes #36.

Author: toolness

lib/implicit-sketch.ts

@@ -18,6 +18,22 @@ export default function makeImplicitSketch(code: string) {
         return code;
       }
     }
+
+    if (statement.type === esprima.Syntax.VariableDeclaration) {
+      let varDecl = statement as ESTree.VariableDeclaration;
+
+      for (let j = 0; j < varDecl.declarations.length; j++) {
+        // This is a bit odd because our ESTree typings indicate
+        // that a VariableDeclarator.id is a Pattern, but it
+        // seems to actually be an Identifier, so we'll forcibly
+        // typecast it as such.
+        let id = varDecl.declarations[j].id as ESTree.Identifier;
+
+        if (id.name === "setup" || id.name === "draw") {
+          return code;
+        }
+      }
+    }
   }
 
   return "function setup() { " + code + " }";

test/test-implicit-sketch.tsx

@@ -15,14 +15,24 @@ describe("makeImplicitSketch()", () => {
     ensureUnchanged("#W$OTN#$ROGK$#%OKRr<T$R>");
   });
 
-  it("does nothing to code w/ existing setup()", () => {
+  it("does nothing to code w/ setup() func decl", () => {
     ensureUnchanged("function setup() {}");
   });
 
-  it("does nothing to code w/ existing draw()", () => {
+  it("does nothing to code w/ setup var decl", () => {
+    ensureUnchanged("var setup = function() {}");
+    ensureUnchanged("let setup = function() {}");
+  });
+
+  it("does nothing to code w/ draw() func decl", () => {
     ensureUnchanged("function draw() {}");
   });
 
+  it("does nothing to code w/ draw var decl", () => {
+    ensureUnchanged("var draw = function() {}");
+    ensureUnchanged("let draw = function() {}");
+  });
+
   it("wraps code that lacks setup/draw in setup()", () => {
     expect(makeImplicitSketch("foo()"))
       .to.eql("function setup() { foo() }");