Merge pull request #42 from Arxcis/add-deno

Arxcis · web-flow · commit 0187751b7729 · 2020-12-07T23:15:02.000+01:00
Add deno language with example, and solutions for day 01 through 07
diff --git a/.github/workflows/day-00-example.yaml b/.github/workflows/day-00-example.yaml
@@ -20,7 +20,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     container:
-      image: "jonasjso/adventofcode2020:2020-12-05-with-node15"
+      image: "jonasjso/adventofcode2020:2020-12-07-with-deno"
     steps:
       - uses: actions/checkout@v2
       - name: make versions
diff --git a/.github/workflows/day-01.yaml b/.github/workflows/day-01.yaml
@@ -16,7 +16,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     container:
-      image: "jonasjso/adventofcode2020:2020-12-05-with-node15"
+      image: "jonasjso/adventofcode2020:2020-12-07-with-deno"
     steps:
       - uses: actions/checkout@v2
       - name: make versions
diff --git a/.github/workflows/day-02.yaml b/.github/workflows/day-02.yaml
@@ -16,7 +16,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     container:
-      image: "jonasjso/adventofcode2020:2020-12-05-with-node15"
+      image: "jonasjso/adventofcode2020:2020-12-07-with-deno"
     steps:
       - uses: actions/checkout@v2
       - name: make versions
diff --git a/.github/workflows/day-03.yaml b/.github/workflows/day-03.yaml
@@ -16,7 +16,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     container:
-      image: "jonasjso/adventofcode2020:2020-12-05-with-node15"
+      image: "jonasjso/adventofcode2020:2020-12-07-with-deno"
     steps:
       - uses: actions/checkout@v2
       - name: make versions
diff --git a/.github/workflows/day-04.yaml b/.github/workflows/day-04.yaml
@@ -16,7 +16,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     container:
-      image: "jonasjso/adventofcode2020:2020-12-05-with-node15"
+      image: "jonasjso/adventofcode2020:2020-12-07-with-deno"
     steps:
       - uses: actions/checkout@v2
       - name: make versions
diff --git a/.github/workflows/day-05.yaml b/.github/workflows/day-05.yaml
@@ -16,7 +16,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     container:
-      image: "jonasjso/adventofcode2020:2020-12-05-with-node15"
+      image: "jonasjso/adventofcode2020:2020-12-07-with-deno"
     steps:
       - uses: actions/checkout@v2
       - name: make versions
diff --git a/.github/workflows/day-06.yaml b/.github/workflows/day-06.yaml
@@ -16,7 +16,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     container:
-      image: "jonasjso/adventofcode2020:2020-12-05-with-node15"
+      image: "jonasjso/adventofcode2020:2020-12-07-with-deno"
     steps:
       - uses: actions/checkout@v2
       - name: make versions
diff --git a/.github/workflows/day-07.yaml b/.github/workflows/day-07.yaml
@@ -16,7 +16,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     container:
-      image: "jonasjso/adventofcode2020:2020-12-05-with-node15"
+      image: "jonasjso/adventofcode2020:2020-12-07-with-deno"
     steps:
       - uses: actions/checkout@v2
       - name: make versions
diff --git a/.github/workflows/day-08.yaml b/.github/workflows/day-08.yaml
@@ -16,7 +16,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     container:
-      image: "jonasjso/adventofcode2020:2020-12-05-with-node15"
+      image: "jonasjso/adventofcode2020:2020-12-07-with-deno"
     steps:
       - uses: actions/checkout@v2
       - name: make versions
diff --git a/.github/workflows/day-09.yaml b/.github/workflows/day-09.yaml
@@ -16,7 +16,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     container:
-      image: "jonasjso/adventofcode2020:2020-12-05-with-node15"
+      image: "jonasjso/adventofcode2020:2020-12-07-with-deno"
     steps:
       - uses: actions/checkout@v2
       - name: make versions
diff --git a/.github/workflows/day-10.yaml b/.github/workflows/day-10.yaml
@@ -16,7 +16,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     container:
-      image: "jonasjso/adventofcode2020:2020-12-05-with-node15"
+      image: "jonasjso/adventofcode2020:2020-12-07-with-deno"
     steps:
       - uses: actions/checkout@v2
       - name: make versions
diff --git a/.github/workflows/day-11.yaml b/.github/workflows/day-11.yaml
@@ -16,7 +16,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     container:
-      image: "jonasjso/adventofcode2020:2020-12-05-with-node15"
+      image: "jonasjso/adventofcode2020:2020-12-07-with-deno"
     steps:
       - uses: actions/checkout@v2
       - name: make versions
diff --git a/.github/workflows/day-12.yaml b/.github/workflows/day-12.yaml
@@ -16,7 +16,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     container:
-      image: "jonasjso/adventofcode2020:2020-12-05-with-node15"
+      image: "jonasjso/adventofcode2020:2020-12-07-with-deno"
     steps:
       - uses: actions/checkout@v2
       - name: make versions
diff --git a/.github/workflows/day-13.yaml b/.github/workflows/day-13.yaml
@@ -16,7 +16,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     container:
-      image: "jonasjso/adventofcode2020:2020-12-05-with-node15"
+      image: "jonasjso/adventofcode2020:2020-12-07-with-deno"
     steps:
       - uses: actions/checkout@v2
       - name: make versions
diff --git a/.github/workflows/day-14.yaml b/.github/workflows/day-14.yaml
@@ -16,7 +16,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     container:
-      image: "jonasjso/adventofcode2020:2020-12-05-with-node15"
+      image: "jonasjso/adventofcode2020:2020-12-07-with-deno"
     steps:
       - uses: actions/checkout@v2
       - name: make versions
diff --git a/.github/workflows/day-15.yaml b/.github/workflows/day-15.yaml
@@ -16,7 +16,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     container:
-      image: "jonasjso/adventofcode2020:2020-12-05-with-node15"
+      image: "jonasjso/adventofcode2020:2020-12-07-with-deno"
     steps:
       - uses: actions/checkout@v2
       - name: make versions
diff --git a/.github/workflows/day-16.yaml b/.github/workflows/day-16.yaml
@@ -16,7 +16,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     container:
-      image: "jonasjso/adventofcode2020:2020-12-05-with-node15"
+      image: "jonasjso/adventofcode2020:2020-12-07-with-deno"
     steps:
       - uses: actions/checkout@v2
       - name: make versions
diff --git a/.github/workflows/day-17.yaml b/.github/workflows/day-17.yaml
@@ -16,7 +16,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     container:
-      image: "jonasjso/adventofcode2020:2020-12-05-with-node15"
+      image: "jonasjso/adventofcode2020:2020-12-07-with-deno"
     steps:
       - uses: actions/checkout@v2
       - name: make versions
diff --git a/.github/workflows/day-18.yaml b/.github/workflows/day-18.yaml
@@ -16,7 +16,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     container:
-      image: "jonasjso/adventofcode2020:2020-12-05-with-node15"
+      image: "jonasjso/adventofcode2020:2020-12-07-with-deno"
     steps:
       - uses: actions/checkout@v2
       - name: make versions
diff --git a/.github/workflows/day-19.yaml b/.github/workflows/day-19.yaml
@@ -16,7 +16,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     container:
-      image: "jonasjso/adventofcode2020:2020-12-05-with-node15"
+      image: "jonasjso/adventofcode2020:2020-12-07-with-deno"
     steps:
       - uses: actions/checkout@v2
       - name: make versions
diff --git a/.github/workflows/day-20.yaml b/.github/workflows/day-20.yaml
@@ -16,7 +16,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     container:
-      image: "jonasjso/adventofcode2020:2020-12-05-with-node15"
+      image: "jonasjso/adventofcode2020:2020-12-07-with-deno"
     steps:
       - uses: actions/checkout@v2
       - name: make versions
diff --git a/.github/workflows/day-21.yaml b/.github/workflows/day-21.yaml
@@ -16,7 +16,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     container:
-      image: "jonasjso/adventofcode2020:2020-12-05-with-node15"
+      image: "jonasjso/adventofcode2020:2020-12-07-with-deno"
     steps:
       - uses: actions/checkout@v2
       - name: make versions
diff --git a/.github/workflows/day-22.yaml b/.github/workflows/day-22.yaml
@@ -16,7 +16,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     container:
-      image: "jonasjso/adventofcode2020:2020-12-05-with-node15"
+      image: "jonasjso/adventofcode2020:2020-12-07-with-deno"
     steps:
       - uses: actions/checkout@v2
       - name: make versions
diff --git a/.github/workflows/day-23.yaml b/.github/workflows/day-23.yaml
@@ -16,7 +16,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     container:
-      image: "jonasjso/adventofcode2020:2020-12-05-with-node15"
+      image: "jonasjso/adventofcode2020:2020-12-07-with-deno"
     steps:
       - uses: actions/checkout@v2
       - name: make versions
diff --git a/.github/workflows/day-24.yaml b/.github/workflows/day-24.yaml
@@ -16,7 +16,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     container:
-      image: "jonasjso/adventofcode2020:2020-12-05-with-node15"
+      image: "jonasjso/adventofcode2020:2020-12-07-with-deno"
     steps:
       - uses: actions/checkout@v2
       - name: make versions
diff --git a/.github/workflows/day-25.yaml b/.github/workflows/day-25.yaml
@@ -16,7 +16,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     container:
-      image: "jonasjso/adventofcode2020:2020-12-05-with-node15"
+      image: "jonasjso/adventofcode2020:2020-12-07-with-deno"
     steps:
       - uses: actions/checkout@v2
       - name: make versions
diff --git a/Dockerfile b/Dockerfile
@@ -8,7 +8,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 # 2. Build things from source first, so get build deps installed
 RUN apt-get update && apt-get install -yqq --no-install-recommends\
   # build-essential includes `make`, `gcc` and `g++`
-  build-essential git wget ca-certificates curl
+  build-essential git wget ca-certificates curl unzip
 
 # 3. Install zig compiler, from ziglang.org
 RUN cd /opt && wget https://ziglang.org/download/0.7.0/zig-linux-x86_64-0.7.0.tar.xz\
@@ -25,7 +25,10 @@ RUN git clone https://github.com/polyml/polyml.git /tmp/polyml && cd /tmp/polyml
 # 5. Tell apt to install node.js from nodesource.com, to get v15.x instead of v12.x
 RUN curl -sL https://deb.nodesource.com/setup_15.x | bash -
 
-# 6. Install all other compilers, from apt-get
+# 6. Install deno.js run-time from deno.land
+RUN curl -fsSL https://deno.land/x/install/install.sh | sh && cp ~/.deno/bin/deno /bin/
+
+# 7. Install all other compilers, from apt-get
 RUN apt-get update && apt-get install -yqq --no-install-recommends\
     default-jdk golang nodejs php-cli python3 ruby rustc \
   # Cleanup what we don't need
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-export DOCKER_TAG="jonasjso/adventofcode2020:2020-12-05-with-node15"
+export DOCKER_TAG="jonasjso/adventofcode2020:2020-12-07-with-deno"
 
 .PHONY:
 	test\
diff --git a/days/day-00-example/solutions/example.ts b/days/day-00-example/solutions/example.ts
@@ -0,0 +1,14 @@
+const file = (await Deno.readTextFile('/dev/stdin'))
+  .split("\n")
+  .slice(0, -1)
+
+let sum_all = 0;
+let sum_odd = 0;
+
+for (const line of file) {
+  const num = parseInt(line);
+  sum_all += num;
+  sum_odd += num % 2 == 1 ? num : 0;
+}
+console.log(`${sum_all}`);
+console.log(`${sum_odd}`);
diff --git a/days/day-00-example/test.sh b/days/day-00-example/test.sh
@@ -13,7 +13,8 @@ $D/../../languages/sml.sh    $D/input.txt $D/output.txt $D/solutions/example.sml
 $D/../../languages/bash.sh   $D/input.txt $D/output.txt $D/solutions/example.bash
 $D/../../languages/php.sh    $D/input.txt $D/output.txt $D/solutions/example.php
 $D/../../languages/python.sh $D/input.txt $D/output.txt $D/solutions/example.py
-$D/../../languages/ruby.sh   $D/input.txt $D/output.txt $D/solutions/example.rb
+$D/../../languages/deno.sh   $D/input.txt $D/output.txt $D/solutions/example.ts
 $D/../../languages/node.sh   $D/input.txt $D/output.txt $D/solutions/example.mjs
+$D/../../languages/ruby.sh   $D/input.txt $D/output.txt $D/solutions/example.rb
 $D/../../languages/java.sh   $D/input.txt $D/output.txt $D/solutions Example
 echo ""
diff --git a/days/day-01/solutions/day01.ts b/days/day-01/solutions/day01.ts
@@ -0,0 +1,22 @@
+const numbers = (await Deno.readTextFile('/dev/stdin'))
+  .split("\n")
+  .slice(0, -1)
+  .map((line: string) => parseInt(line))
+
+let part1 = 0, part2 = 0;
+
+for (const i of numbers) {
+  for (const j of numbers) {
+    if (!part1 && i + j === 2020) {
+      part1 = i * j;
+    }
+    for (const k of numbers) {
+      if (!part2 && i + j + k === 2020) {
+        part2 = i * j * k;
+      }
+    }
+  }
+}
+
+console.log(`${part1}`)
+console.log(`${part2}`)
diff --git a/days/day-01/test.sh b/days/day-01/test.sh
@@ -10,6 +10,7 @@ $D/../../languages/go.sh     $D/input.txt $D/output.txt $D/solutions/day01.tholo
 $D/../../languages/c.sh      $D/input.txt $D/output.txt $D/solutions/day01.c
 $D/../../languages/zig.sh    $D/input.txt $D/output.txt $D/solutions/day01.zig
 $D/../../languages/sml.sh    $D/input.txt $D/output.txt $D/solutions/day01.sml
+$D/../../languages/deno.sh   $D/input.txt $D/output.txt $D/solutions/day01.ts
 $D/../../languages/node.sh   $D/input.txt $D/output.txt $D/solutions/day01.mjs
 $D/../../languages/python.sh $D/input.txt $D/output.txt $D/solutions/one-liner.py
 $D/../../languages/cpp.sh    $D/input.txt $D/output.txt $D/solutions/day01.cpp
diff --git a/days/day-02/solutions/day02.c b/days/day-02/solutions/day02.c
@@ -20,10 +20,12 @@ int main() {
       }
     }
 
+    // --- Part1 ---
     if (letter_occurances >= from && letter_occurances <= to) {
       valid_passwords += 1;
     }
 
+    // --- Part2 ---
     int letter_occurances_part2 = 0;
     if (password[from-1] == letter) {
       letter_occurances_part2 += 1;
diff --git a/days/day-02/solutions/day02.ts b/days/day-02/solutions/day02.ts
@@ -0,0 +1,32 @@
+const passwords = [...(await Deno.readTextFile('/dev/stdin'))
+  .matchAll(/(\d+)-(\d+) (\w): (\w+)/g)]
+  .map(([,from, to, letter, password]) => ({
+    from: parseInt(from),
+    to: parseInt(to),
+    letter,
+    password
+  }))
+
+
+// --- part1 ---
+const part1_passwords = passwords
+  .reduce((count, {from, to, letter, password}) => {
+
+    const letterCount = [...password]
+      .reduce((letterCount, passwordLetter) => letterCount + (letter === passwordLetter ? 1:0), 0)
+
+    return count + (from <= letterCount && letterCount <= to ? 1:0);
+    }, 0)
+
+const part2_passwords = passwords
+  .reduce((count, {from, to, letter, password}) => {
+
+    let letterCount = 0;
+    letterCount += (password.charAt(from-1) === letter ? 1:0);
+    letterCount += (password.charAt(to-1) === letter ? 1:0);
+
+    return count + (letterCount === 1 ? 1:0);
+  }, 0);
+
+console.log(`${part1_passwords}`);
+console.log(`${part2_passwords}`);
diff --git a/days/day-02/test.sh b/days/day-02/test.sh
@@ -12,4 +12,5 @@ $D/../../languages/cpp.sh     $D/input.txt $D/output.txt $D/solutions/day02.cpp
 $D/../../languages/sml.sh     $D/input.txt $D/output.txt $D/solutions/day02.sml
 $D/../../languages/go.sh      $D/input.txt $D/output.txt $D/solutions/day02.tholok97.go
 $D/../../languages/python.sh  $D/input.txt $D/output.txt $D/solutions/day02.py
+$D/../../languages/deno.sh    $D/input.txt $D/output.txt $D/solutions/day02.ts
 echo ""
diff --git a/days/day-03/solutions/day03.ts b/days/day-03/solutions/day03.ts
diff --git a/days/day-03/test.sh b/days/day-03/test.sh
diff --git a/days/day-04/solutions/day04.ts b/days/day-04/solutions/day04.ts
diff --git a/days/day-04/test.sh b/days/day-04/test.sh
diff --git a/days/day-05/solutions/day05.ts b/days/day-05/solutions/day05.ts
diff --git a/days/day-05/test.sh b/days/day-05/test.sh
diff --git a/days/day-06/solutions/day06.mjs b/days/day-06/solutions/day06.mjs
diff --git a/days/day-06/solutions/day06.ts b/days/day-06/solutions/day06.ts
diff --git a/days/day-06/test.sh b/days/day-06/test.sh
diff --git a/days/day-07/solutions/day07.mjs b/days/day-07/solutions/day07.mjs
diff --git a/days/day-07/solutions/day07.ts b/days/day-07/solutions/day07.ts
diff --git a/days/day-07/test.sh b/days/day-07/test.sh
diff --git a/languages/deno.sh b/languages/deno.sh
diff --git a/scripts/print-versions.sh b/scripts/print-versions.sh
