[WIP] Use dprint for internal js/ts formating

cli/js/net.ts

@@ -72,7 +72,7 @@ export class ListenerImpl implements Listener {
   async *[Symbol.asyncIterator](): AsyncIterator<Conn> {
     while (true) {
       try {
-        yield await this.accept();
+        yield (await this.accept());
       } catch (error) {
         if (error instanceof errors.BadResource) {
           break;
@@ -115,7 +115,7 @@ export class DatagramImpl implements DatagramConn {
   async *[Symbol.asyncIterator](): AsyncIterator<[Uint8Array, Addr]> {
     while (true) {
       try {
-        yield await this.receive();
+        yield (await this.receive());
       } catch (error) {
         if (error instanceof errors.BadResource) {
           break;

cli/js/tests/text_encoding_test.ts

@@ -63,7 +63,7 @@ unitTest(function btoaFailed(): void {
 });
 
 unitTest(function textDecoder2(): void {
-  // prettier-ignore
+  // dprint-ignore
   const fixture = new Uint8Array([
     0xf0, 0x9d, 0x93, 0xbd,
     0xf0, 0x9d, 0x93, 0xae,
@@ -75,7 +75,7 @@ unitTest(function textDecoder2(): void {
 });
 
 unitTest(function textDecoderIgnoreBOM(): void {
-  // prettier-ignore
+  // dprint-ignore
   const fixture = new Uint8Array([
     0xef, 0xbb, 0xbf,
     0xf0, 0x9d, 0x93, 0xbd,
@@ -88,7 +88,7 @@ unitTest(function textDecoderIgnoreBOM(): void {
 });
 
 unitTest(function textDecoderNotBOM(): void {
-  // prettier-ignore
+  // dprint-ignore
   const fixture = new Uint8Array([
     0xef, 0xbb, 0x89,
     0xf0, 0x9d, 0x93, 0xbd,
@@ -120,7 +120,7 @@ unitTest(function textDecoderErrorEncoding(): void {
 unitTest(function textEncoder(): void {
   const fixture = "𝓽𝓮𝔁𝓽";
   const encoder = new TextEncoder();
-  // prettier-ignore
+  // dprint-ignore
   assertEquals(Array.from(encoder.encode(fixture)), [
     0xf0, 0x9d, 0x93, 0xbd,
     0xf0, 0x9d, 0x93, 0xae,
@@ -136,7 +136,7 @@ unitTest(function textEncodeInto(): void {
   const result = encoder.encodeInto(fixture, bytes);
   assertEquals(result.read, 4);
   assertEquals(result.written, 4);
-  // prettier-ignore
+  // dprint-ignore
   assertEquals(Array.from(bytes), [
     0x74, 0x65, 0x78, 0x74, 0x00,
   ]);
@@ -149,7 +149,7 @@ unitTest(function textEncodeInto2(): void {
   const result = encoder.encodeInto(fixture, bytes);
   assertEquals(result.read, 8);
   assertEquals(result.written, 16);
-  // prettier-ignore
+  // dprint-ignore
   assertEquals(Array.from(bytes), [
     0xf0, 0x9d, 0x93, 0xbd,
     0xf0, 0x9d, 0x93, 0xae,

cli/js/web/decode_utf8.ts

@@ -72,7 +72,7 @@ export function decodeUtf8(
       state = 0;
     }
 
-    // prettier-ignore
+    // dprint-ignore
     type = [
        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -87,7 +87,7 @@ export function decodeUtf8(
       state !== 0
         ? (input[i] & 0x3f) | (codepoint << 6)
         : (0xff >> type) & input[i];
-    // prettier-ignore
+    // dprint-ignore
     state = [
        0,12,24,36,60,96,84,12,12,12,48,72, 12,12,12,12,12,12,12,12,12,12,12,12,
       12, 0,12,12,12,12,12, 0,12, 0,12,12, 12,24,12,12,12,12,12,24,12,24,12,12,

cli/js/web/text_encoding.ts

@@ -219,7 +219,7 @@ const decoders = new Map<string, (options: DecoderOptions) => Decoder>();
 
 // Single byte decoders are an array of code point lookups
 const encodingIndexes = new Map<string, number[]>();
-// prettier-ignore
+// dprint-ignore
 encodingIndexes.set("windows-1252", [
   8364,129,8218,402,8222,8230,8224,8225,710,8240,352,8249,338,141,381,143,144,
   8216,8217,8220,8221,8226,8211,8212,732,8482,353,8250,339,157,382,376,160,161,

cli/tests/error_syntax.js

@@ -1,3 +1,3 @@
 
-// prettier-ignore
+// dprint-ignore
 (the following is a syntax error  ^^ ! )

cli/tests/wasm.ts

@@ -1,4 +1,4 @@
-// prettier-ignore
+// dprint-ignore
 const wasmCode = new Uint8Array([
     0, 97, 115, 109, 1, 0, 0, 0, 1, 133, 128, 128, 128, 0, 1, 96, 0, 1, 127,
     3, 130, 128, 128, 128, 0, 1, 0, 4, 132, 128, 128, 128, 0, 1, 112, 0, 0,

cli/tests/wasm_async.js

@@ -7,7 +7,7 @@
 //        i32.add)
 //      (export "add" (func $add))
 //    )
-// prettier-ignore
+// dprint-ignore
 const bytes = new Uint8Array([
   0x00, 0x61, 0x73, 0x6d, 0x01, 0x00, 0x00, 0x00, 0x01, 0x07, 0x01, 0x60,
   0x02, 0x7f, 0x7f, 0x01, 0x7f, 0x03, 0x02, 0x01, 0x00, 0x07, 0x07, 0x01,

core/encode_decode_test.js

@@ -11,14 +11,14 @@ function assertArrayEquals(a1, a2) {
 }
 
 function main() {
-  // prettier-ignore
+  // dprint-ignore
   const fixture1 = [
     0xf0, 0x9d, 0x93, 0xbd,
     0xf0, 0x9d, 0x93, 0xae,
     0xf0, 0x9d, 0x94, 0x81,
     0xf0, 0x9d, 0x93, 0xbd
   ];
-  // prettier-ignore
+  // dprint-ignore
   const fixture2 = [ 
     72, 101, 108, 108, 
     111, 32, 239, 191, 

std/fs/testdata/0-link.ts

@@ -1 +1 @@
-./fs/testdata/0.ts
+0.ts

std/ws/test.ts

@@ -88,7 +88,7 @@ test("[ws] read unmasked ping / pong frame", async () => {
   const ping = await readFrame(buf);
   assertEquals(ping.opcode, OpCode.Ping);
   assertEquals(new Buffer(ping.payload).toString(), "Hello");
-  // prettier-ignore
+  // dprint-ignore
   const pongFrame= [0x8a, 0x85, 0x37, 0xfa, 0x21, 0x3d, 0x7f, 0x9f, 0x4d, 0x51, 0x58]
   const buf2 = new BufReader(new Buffer(new Uint8Array(pongFrame)));
   const pong = await readFrame(buf2);

tools/format.py

@@ -19,6 +19,7 @@ def main():
     did_fmt = False
     if args.js:
         prettier()
+        dprint()
         did_fmt = True
     if args.py:
         yapf()
@@ -29,6 +30,7 @@ def main():
 
     if not did_fmt:
         prettier()
+        dprint()
         yapf()
         rustfmt()
 
@@ -37,12 +39,21 @@ def prettier():
     print "prettier"
     script = os.path.join(third_party_path, "node_modules", "prettier",
                           "bin-prettier.js")
-    source_files = git_ls_files(root_path, ["*.js", "*.json", "*.ts", "*.md"])
+    source_files = git_ls_files(root_path, ["*.json", "*.md", "*.d.ts"])
     run(["node", script, "--write", "--loglevel=error", "--"] + source_files,
         shell=False,
         quiet=True)
 
 
+def dprint():
+    print "dprint"
+    source_files = git_ls_files(root_path, ["*.js", "*.ts"])
+    source_files = filter(lambda x: ("d.ts" in x) == False, source_files)
+    run(["cargo", "run", "--", "fmt", "-q"] + source_files,
+        shell=False,
+        quiet=True)
+
+
 def yapf():
     print "yapf"
     script = os.path.join(third_party_path, "python_packages", "bin", "yapf")