git.iko.soy/rowtype-yoga/purs-eval
on main help sign in
swap
c39e87495 ahead, 0 behind
.github/workflows/release.yml+7−9
since splitsnapshots
unifiedsplit
@@ -7,30 +7,28 @@ jobs:
7 release:
7 release:
8 runs-on: ubuntu-latest
8 runs-on: ubuntu-latest
9 steps:
9 steps:
10− - uses: google-github-actions/release-please-action@v3
10+ - uses: googleapis/release-please-action@v5
11 id: release
11 id: release
12 with:
12 with:
13 release-type: node
13 release-type: node
14− package-name: purs-eval
15− release-as: 1.2.0
16− - uses: actions/checkout@v3
14+ - uses: actions/checkout@v7
17 if: ${{ steps.release.outputs.release_created }}
15 if: ${{ steps.release.outputs.release_created }}
18− - uses: cachix/install-nix-action@v18
16+ - uses: cachix/install-nix-action@v31
19 if: ${{ steps.release.outputs.release_created }}
17 if: ${{ steps.release.outputs.release_created }}
20 with:
18 with:
21 extra_nix_config: |
19 extra_nix_config: |
22 access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
20 access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
23− - uses: cachix/cachix-action@v12
21+ - uses: cachix/cachix-action@v17
24 if: ${{ steps.release.outputs.release_created }}
22 if: ${{ steps.release.outputs.release_created }}
25 with:
23 with:
26 name: klarkc
24 name: klarkc
27 authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
25 authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
28 - run: |
26 - run: |
29− nix build
27+ nix build .#npm
30 mkdir -p dist
28 mkdir -p dist
31− cp result/bin/purs-eval dist
29+ cp result dist/purs-eval
32 if: ${{ steps.release.outputs.release_created }}
30 if: ${{ steps.release.outputs.release_created }}
33− - uses: actions/setup-node@v3
31+ - uses: actions/setup-node@v7
34 if: ${{ steps.release.outputs.release_created }}
32 if: ${{ steps.release.outputs.release_created }}
35 with:
33 with:
36 node-version: 18
34 node-version: 18
.github/workflows/test.yml+3−3
@@ -5,12 +5,12 @@ jobs:
5 tests:
5 tests:
6 runs-on: ubuntu-latest
6 runs-on: ubuntu-latest
7 steps:
7 steps:
8− - uses: actions/checkout@v3
8+ - uses: actions/checkout@v7
9− - uses: cachix/install-nix-action@v18
9+ - uses: cachix/install-nix-action@v31
10 with:
10 with:
11 extra_nix_config: |
11 extra_nix_config: |
12 access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
12 access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
13− - uses: cachix/cachix-action@v12
13+ - uses: cachix/cachix-action@v17
14 with:
14 with:
15 name: klarkc
15 name: klarkc
16 authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
16 authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
.github/workflows/todo.ymlnew file+14
@@ -0,0 +1,14 @@
1+name: "Run TODO to Issue"
2+on:
3+ push:
4+ branches:
5+ - main
6+jobs:
7+ build:
8+ runs-on: "ubuntu-latest"
9+ steps:
10+ - uses: "actions/checkout@v7"
11+ - name: "TODO to Issue"
12+ uses: "alstr/todo-to-issue-action@v5"
13+ with:
14+ IDENTIFIERS: '[{"name": "TODO", "labels": ["help wanted"]}, {"name": "FIXME", "labels": ["bug"]}]'
.github/workflows/update-flake-lock.yml+5−5
@@ -9,20 +9,20 @@ jobs:
9 runs-on: ubuntu-latest
9 runs-on: ubuntu-latest
10 steps:
10 steps:
11 - name: Checkout repository
11 - name: Checkout repository
12− uses: actions/checkout@v3
12+ uses: actions/checkout@v7
13 - name: Install Nix
13 - name: Install Nix
14− uses: cachix/install-nix-action@v18
14+ uses: cachix/install-nix-action@v31
15 with:
15 with:
16 extra_nix_config: |
16 extra_nix_config: |
17 access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
17 access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
18− - uses: cachix/cachix-action@v12
18+ - uses: cachix/cachix-action@v17
19 with:
19 with:
20 name: klarkc
20 name: klarkc
21 authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
21 authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
22 - name: Update flake.lock
22 - name: Update flake.lock
23− uses: DeterminateSystems/update-flake-lock@v14
23+ uses: DeterminateSystems/update-flake-lock@v29
24− commit-msg: "build(deps): Bump flake.lock dependencies"
25 with:
24 with:
25+ commit-msg: "build(deps): Bump flake.lock dependencies"
26 pr-title: "Update flake.lock"
26 pr-title: "Update flake.lock"
27 pr-labels: |
27 pr-labels: |
28 dependencies
28 dependencies
CHANGELOG.md+40
@@ -1,5 +1,45 @@
1# Changelog
1# Changelog
2
2
3+## [1.5.0](https://github.com/rowtype-yoga/purs-eval/compare/v1.4.1...v1.5.0) (2024-07-11)
4+
5+
6+### Features
7+
8+* upgrade purs-nix and change mock server to httpurple ([ddaad01](https://github.com/rowtype-yoga/purs-eval/commit/ddaad01eed68afa45f584c807ed577abc565c247))
9+
10+
11+### Bug Fixes
12+
13+* npm published version not running ([3f1a295](https://github.com/rowtype-yoga/purs-eval/commit/3f1a29567365000f57e6b2c9c54c55448c3a83c7))
14+
15+## [1.4.1](https://github.com/klarkc/purs-eval/compare/v1.4.0...v1.4.1) (2023-08-21)
16+
17+
18+### Bug Fixes
19+
20+* flake changes causing CI breakage ([d5d6085](https://github.com/klarkc/purs-eval/commit/d5d608561096f002d7004c1d54e0ae5aaebc67c8))
21+
22+## [1.4.0](https://github.com/klarkc/purs-eval/compare/v1.3.0...v1.4.0) (2023-08-21)
23+
24+
25+### Features
26+
27+* add LSP to flake ([bb9f0e7](https://github.com/klarkc/purs-eval/commit/bb9f0e7b57980e7972c4ee454227351c599b5d35))
28+
29+
30+### Bug Fixes
31+
32+* library API change ([b5acee9](https://github.com/klarkc/purs-eval/commit/b5acee96178b09f8c0505098a6e29171e27377a0))
33+* npmlock2nix refusing to build ([3270052](https://github.com/klarkc/purs-eval/commit/3270052badb0fd9f1fa9c2166cec6cc2a4db4a75))
34+* purs-nix API changes ([025f93e](https://github.com/klarkc/purs-eval/commit/025f93e75b82009d5d51061937093f052dbbea9e))
35+
36+## [1.3.0](https://github.com/klarkc/purs-eval/compare/v1.2.0...v1.3.0) (2022-12-17)
37+
38+
39+### Features
40+
41+* remove deprecated code ([bd857f1](https://github.com/klarkc/purs-eval/commit/bd857f17d0bae24376f734373c39682290acd1ff))
42+
3## 1.2.0 (2022-11-02)
43## 1.2.0 (2022-11-02)
4
44
5
45
README.md+9−12
@@ -1,23 +1,20 @@
1# purs-eval
1# purs-eval
2−A simple PureScript expression evaluation tool
2+A simple PureScript expression evaluation tool. It uses [try.purescript.org](https://try.purescript.org) as a compilation backend; for this reason, it currently does not support embedding local files or modules.
3
3
4## Usage
4## Usage
5
5
6```bash
6```bash
7−EXAMPLE=cat <<EOF
7+EXAMPLE="module Main where\nimport Effect.Console (log)\nmain = log \"hello from PS\""
8−module Main where
9−
10−import Effect.Console (log)
11−
12−main = log "hello"
13−EOF
14
8
15# With npm
9# With npm
16−echo $EXAMPLE | npx purs-eval
10+echo -e $EXAMPLE | npx purs-eval
17
11
18# With nix
12# With nix
19−echo $EXAMPLE | nix run github:klarkc/purs-eval
13+echo -e $EXAMPLE | nix run github:rowtype-yoga/purs-eval
14+
15+# Pipe node (>v18)
16+echo -e $EXAMPLE | nix run github:rowtype-yoga/purs-eval | nix run nixpkgs#nodejs -- --experimental-network-imports --input-type module
20
17
21−# Piping to node
18+# or with npx
22−echo $EXAMPLE | nix run github:klarkc/purs-eval | nix run nixpkgs#nodejs -- --experimental-network-imports --input-type module
19+echo -e $EXAMPLE | npx purs-eval | node --experimental-network-imports --input-type module
23```
20```
flake.lock+67−395
@@ -1,55 +1,13 @@
1{
1{
2 "nodes": {
2 "nodes": {
3− "deadnix": {
4− "inputs": {
5− "fenix": "fenix",
6− "naersk": "naersk",
7− "nixpkgs": "nixpkgs_4",
8− "utils": "utils"
9− },
10− "locked": {
11− "lastModified": 1655647809,
12− "narHash": "sha256-npyHYIJW7HyGIFpCZZK+t5JM/v2LsyFhAGJxX1DXO7E=",
13− "owner": "astro",
14− "repo": "deadnix",
15− "rev": "83c42cc64d190ecb72f5929eab0f64fe88e25dc4",
16− "type": "github"
17− },
18− "original": {
19− "owner": "astro",
20− "repo": "deadnix",
21− "type": "github"
22− }
23− },
24− "deadnix_2": {
25− "inputs": {
26− "fenix": "fenix_2",
27− "naersk": "naersk_2",
28− "nixpkgs": "nixpkgs_8",
29− "utils": "utils_2"
30− },
31− "locked": {
32− "lastModified": 1656370114,
33− "narHash": "sha256-XBbSWeBuF6Ck0jc634yAp2hjPXWM2JyRDPCdK0dh3w4=",
34− "owner": "astro",
35− "repo": "deadnix",
36− "rev": "9f450f7250ad7680cb5f12ce5985cc18496c2d5f",
37− "type": "github"
38− },
39− "original": {
40− "owner": "astro",
41− "repo": "deadnix",
42− "type": "github"
43− }
44− },
45 "docs-search": {
3 "docs-search": {
46 "flake": false,
4 "flake": false,
47 "locked": {
5 "locked": {
48− "lastModified": 1661787609,
6+ "lastModified": 1675992564,
49− "narHash": "sha256-jgOl8PKisRmcaHOya3HzArI3eKjVErx+XIBGminh9Zk=",
7+ "narHash": "sha256-Tk9VSogFHXtXe9O9vuCEfM/PV/S7plMIO0I++fCZn7U=",
50 "owner": "purs-nix",
8 "owner": "purs-nix",
51 "repo": "purescript-docs-search",
9 "repo": "purescript-docs-search",
52− "rev": "4620575e21886fcbf516d0b43910ba4ead2a60d0",
10+ "rev": "35822b1d6ce65b1a07f80dd9e2caf15c3ee83e2c",
53 "type": "github"
11 "type": "github"
54 },
12 },
55 "original": {
13 "original": {
@@ -58,68 +16,22 @@
58 "type": "github"
16 "type": "github"
59 }
17 }
60 },
18 },
61− "fenix": {
19+ "flake-utils": {
62− "inputs": {
63− "nixpkgs": "nixpkgs_2",
64− "rust-analyzer-src": "rust-analyzer-src"
65− },
66− "locked": {
67− "lastModified": 1655533500,
68− "narHash": "sha256-qJJmLVoMYfDLywI9MNL7sb0W/GsKQF9HDatdHm1tSl0=",
69− "owner": "nix-community",
70− "repo": "fenix",
71− "rev": "b6630603af13df17d0dd4df8629e9a24e6ba0fbd",
72− "type": "github"
73− },
74− "original": {
75− "owner": "nix-community",
76− "repo": "fenix",
77− "type": "github"
78− }
79− },
80− "fenix_2": {
81− "inputs": {
82− "nixpkgs": "nixpkgs_6",
83− "rust-analyzer-src": "rust-analyzer-src_2"
84− },
85− "locked": {
86− "lastModified": 1655533500,
87− "narHash": "sha256-qJJmLVoMYfDLywI9MNL7sb0W/GsKQF9HDatdHm1tSl0=",
88− "owner": "nix-community",
89− "repo": "fenix",
90− "rev": "b6630603af13df17d0dd4df8629e9a24e6ba0fbd",
91− "type": "github"
92− },
93− "original": {
94− "owner": "nix-community",
95− "repo": "fenix",
96− "type": "github"
97− }
98− },
99− "fenix_3": {
100− "inputs": {
101− "nixpkgs": [
102− "purs-nix",
103− "statix",
104− "nixpkgs"
105− ],
106− "rust-analyzer-src": "rust-analyzer-src_3"
107− },
108 "locked": {
20 "locked": {
109− "lastModified": 1645251813,
21+ "lastModified": 1644229661,
110− "narHash": "sha256-cQ66tGjnZclBCS3nD26mZ5fUH+3/HnysGffBiWXUSHk=",
22+ "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
111− "owner": "nix-community",
23+ "owner": "numtide",
112− "repo": "fenix",
24+ "repo": "flake-utils",
113− "rev": "9892337b588c38ec59466a1c89befce464aae7f8",
25+ "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
114 "type": "github"
26 "type": "github"
115 },
27 },
116 "original": {
28 "original": {
117− "owner": "nix-community",
29+ "owner": "numtide",
118− "repo": "fenix",
30+ "repo": "flake-utils",
119 "type": "github"
31 "type": "github"
120 }
32 }
121 },
33 },
122− "flake-utils": {
34+ "flake-utils_2": {
123 "locked": {
35 "locked": {
124 "lastModified": 1618217525,
36 "lastModified": 1618217525,
125 "narHash": "sha256-WGrhVczjXTiswQaoxQ+0PTfbLNeOQM6M36zvLn78AYg=",
37 "narHash": "sha256-WGrhVczjXTiswQaoxQ+0PTfbLNeOQM6M36zvLn78AYg=",
@@ -134,7 +46,7 @@
134 "type": "github"
46 "type": "github"
135 }
47 }
136 },
48 },
137− "flake-utils_2": {
49+ "flake-utils_3": {
138 "locked": {
50 "locked": {
139 "lastModified": 1618217525,
51 "lastModified": 1618217525,
140 "narHash": "sha256-WGrhVczjXTiswQaoxQ+0PTfbLNeOQM6M36zvLn78AYg=",
52 "narHash": "sha256-WGrhVczjXTiswQaoxQ+0PTfbLNeOQM6M36zvLn78AYg=",
@@ -149,7 +61,7 @@
149 "type": "github"
61 "type": "github"
150 }
62 }
151 },
63 },
152− "flake-utils_3": {
64+ "flake-utils_4": {
153 "locked": {
65 "locked": {
154 "lastModified": 1618217525,
66 "lastModified": 1618217525,
155 "narHash": "sha256-WGrhVczjXTiswQaoxQ+0PTfbLNeOQM6M36zvLn78AYg=",
67 "narHash": "sha256-WGrhVczjXTiswQaoxQ+0PTfbLNeOQM6M36zvLn78AYg=",
@@ -179,25 +91,41 @@
179 "type": "github"
91 "type": "github"
180 }
92 }
181 },
93 },
182− "gitignore": {
94+ "httpurple-argonaut": {
95+ "flake": false,
96+ "locked": {
97+ "lastModified": 1655138308,
98+ "narHash": "sha256-tWTgc2gERJLkv+XzK4HtqJJbqvw10svVu1cmXFADtls=",
99+ "owner": "sigma-andex",
100+ "repo": "purescript-httpurple-argonaut",
101+ "rev": "3187fba4fe0682849b4acbf215e6a6fc1f6493de",
102+ "type": "github"
103+ },
104+ "original": {
105+ "owner": "sigma-andex",
106+ "repo": "purescript-httpurple-argonaut",
107+ "type": "github"
108+ }
109+ },
110+ "lint-utils": {
183 "inputs": {
111 "inputs": {
112+ "flake-utils": "flake-utils",
184 "nixpkgs": [
113 "nixpkgs": [
185 "purs-nix",
114 "purs-nix",
186− "statix",
187 "nixpkgs"
115 "nixpkgs"
188 ]
116 ]
189 },
117 },
190 "locked": {
118 "locked": {
191− "lastModified": 1635165013,
119+ "lastModified": 1707777931,
192− "narHash": "sha256-o/BdVjNwcB6jOmzZjOH703BesSkkS5O7ej3xhyO8hAY=",
120+ "narHash": "sha256-PsPb5xMBZ9dPDP04o9vqKEUIEG80Z84/74fPuOMs0ZI=",
193− "owner": "hercules-ci",
121+ "owner": "homotopic",
194− "repo": "gitignore.nix",
122+ "repo": "lint-utils",
195− "rev": "5b9e0ff9d3b551234b4f3eb3983744fa354b17f1",
123+ "rev": "5f11e3e51d8f1aa4ed62a89e90f05953931e105a",
196 "type": "github"
124 "type": "github"
197 },
125 },
198 "original": {
126 "original": {
199− "owner": "hercules-ci",
127+ "owner": "homotopic",
200− "repo": "gitignore.nix",
128+ "repo": "lint-utils",
201 "type": "github"
129 "type": "github"
202 }
130 }
203 },
131 },
@@ -233,49 +161,13 @@
233 "type": "github"
161 "type": "github"
234 }
162 }
235 },
163 },
236− "naersk": {
237− "inputs": {
238− "nixpkgs": "nixpkgs_3"
239− },
240− "locked": {
241− "lastModified": 1655042882,
242− "narHash": "sha256-9BX8Fuez5YJlN7cdPO63InoyBy7dm3VlJkkmTt6fS1A=",
243− "owner": "nix-community",
244− "repo": "naersk",
245− "rev": "cddffb5aa211f50c4b8750adbec0bbbdfb26bb9f",
246− "type": "github"
247− },
248− "original": {
249− "owner": "nix-community",
250− "repo": "naersk",
251− "type": "github"
252− }
253− },
254− "naersk_2": {
255− "inputs": {
256− "nixpkgs": "nixpkgs_7"
257− },
258− "locked": {
259− "lastModified": 1655042882,
260− "narHash": "sha256-9BX8Fuez5YJlN7cdPO63InoyBy7dm3VlJkkmTt6fS1A=",
261− "owner": "nix-community",
262− "repo": "naersk",
263− "rev": "cddffb5aa211f50c4b8750adbec0bbbdfb26bb9f",
264− "type": "github"
265− },
266− "original": {
267− "owner": "nix-community",
268− "repo": "naersk",
269− "type": "github"
270− }
271− },
272 "nixpkgs": {
164 "nixpkgs": {
273 "locked": {
165 "locked": {
274− "lastModified": 1667292599,
166+ "lastModified": 1704161960,
275− "narHash": "sha256-7ISOUI1aj6UKMPIL+wwthENL22L3+A9V+jS8Is3QsRo=",
167+ "narHash": "sha256-QGua89Pmq+FBAro8NriTuoO/wNaUtugt29/qqA8zeeM=",
276 "owner": "NixOS",
168 "owner": "NixOS",
277 "repo": "nixpkgs",
169 "repo": "nixpkgs",
278− "rev": "ef2f213d9659a274985778bff4ca322f3ef3ac68",
170+ "rev": "63143ac2c9186be6d9da6035fa22620018c85932",
279 "type": "github"
171 "type": "github"
280 },
172 },
281 "original": {
173 "original": {
@@ -285,127 +177,7 @@
285 "type": "github"
177 "type": "github"
286 }
178 }
287 },
179 },
288− "nixpkgs_10": {
289− "locked": {
290− "lastModified": 1645013224,
291− "narHash": "sha256-b7OEC8vwzJv3rsz9pwnTX2LQDkeOWz2DbKypkVvNHXc=",
292− "owner": "nixos",
293− "repo": "nixpkgs",
294− "rev": "b66b39216b1fef2d8c33cc7a5c72d8da80b79970",
295− "type": "github"
296− },
297− "original": {
298− "owner": "nixos",
299− "ref": "nixpkgs-unstable",
300− "repo": "nixpkgs",
301− "type": "github"
302− }
303− },
304 "nixpkgs_2": {
180 "nixpkgs_2": {
305− "locked": {
306− "lastModified": 1655400192,
307− "narHash": "sha256-49OBVVRgb9H/PSmNT9W61+NRdDbuSJVuDDflwXlaUKU=",
308− "owner": "nixos",
309− "repo": "nixpkgs",
310− "rev": "3d7435c638baffaa826b85459df0fff47f12317d",
311− "type": "github"
312− },
313− "original": {
314− "owner": "nixos",
315− "ref": "nixos-unstable",
316− "repo": "nixpkgs",
317− "type": "github"
318− }
319− },
320− "nixpkgs_3": {
321− "locked": {
322− "lastModified": 1655481042,
323− "narHash": "sha256-XHbcywq2vIQ5CeH1OK3TN793jkiNAAZsSctS1PFgseo=",
324− "owner": "NixOS",
325− "repo": "nixpkgs",
326− "rev": "103a4c0ae46afa9cf008c30744175315ca38e9f9",
327− "type": "github"
328− },
329− "original": {
330− "id": "nixpkgs",
331− "type": "indirect"
332− }
333− },
334− "nixpkgs_4": {
335− "locked": {
336− "lastModified": 1655481042,
337− "narHash": "sha256-XHbcywq2vIQ5CeH1OK3TN793jkiNAAZsSctS1PFgseo=",
338− "owner": "NixOS",
339− "repo": "nixpkgs",
340− "rev": "103a4c0ae46afa9cf008c30744175315ca38e9f9",
341− "type": "github"
342− },
343− "original": {
344− "id": "nixpkgs",
345− "type": "indirect"
346− }
347− },
348− "nixpkgs_5": {
349− "locked": {
350− "lastModified": 1646506091,
351− "narHash": "sha256-sWNAJE2m+HOh1jtXlHcnhxsj6/sXrHgbqVNcVRlveK4=",
352− "owner": "NixOS",
353− "repo": "nixpkgs",
354− "rev": "3e644bd62489b516292c816f70bf0052c693b3c7",
355− "type": "github"
356− },
357− "original": {
358− "owner": "NixOS",
359− "ref": "nixpkgs-unstable",
360− "repo": "nixpkgs",
361− "type": "github"
362− }
363− },
364− "nixpkgs_6": {
365− "locked": {
366− "lastModified": 1655400192,
367− "narHash": "sha256-49OBVVRgb9H/PSmNT9W61+NRdDbuSJVuDDflwXlaUKU=",
368− "owner": "nixos",
369− "repo": "nixpkgs",
370− "rev": "3d7435c638baffaa826b85459df0fff47f12317d",
371− "type": "github"
372− },
373− "original": {
374− "owner": "nixos",
375− "ref": "nixos-unstable",
376− "repo": "nixpkgs",
377− "type": "github"
378− }
379− },
380− "nixpkgs_7": {
381− "locked": {
382− "lastModified": 1655481042,
383− "narHash": "sha256-XHbcywq2vIQ5CeH1OK3TN793jkiNAAZsSctS1PFgseo=",
384− "owner": "NixOS",
385− "repo": "nixpkgs",
386− "rev": "103a4c0ae46afa9cf008c30744175315ca38e9f9",
387− "type": "github"
388− },
389− "original": {
390− "id": "nixpkgs",
391− "type": "indirect"
392− }
393− },
394− "nixpkgs_8": {
395− "locked": {
396− "lastModified": 1655481042,
397− "narHash": "sha256-XHbcywq2vIQ5CeH1OK3TN793jkiNAAZsSctS1PFgseo=",
398− "owner": "NixOS",
399− "repo": "nixpkgs",
400− "rev": "103a4c0ae46afa9cf008c30744175315ca38e9f9",
401− "type": "github"
402− },
403− "original": {
404− "id": "nixpkgs",
405− "type": "indirect"
406− }
407− },
408− "nixpkgs_9": {
409 "locked": {
181 "locked": {
410 "lastModified": 1656549732,
182 "lastModified": 1656549732,
411 "narHash": "sha256-eILutFZGjfk2bEzfim8S/qyYc//0S1KsCeO+OWbtoR0=",
183 "narHash": "sha256-eILutFZGjfk2bEzfim8S/qyYc//0S1KsCeO+OWbtoR0=",
@@ -424,11 +196,11 @@
424 "npmlock2nix": {
196 "npmlock2nix": {
425 "flake": false,
197 "flake": false,
426 "locked": {
198 "locked": {
427− "lastModified": 1666460237,
199+ "lastModified": 1673447413,
428− "narHash": "sha256-HME6rnysvCwUVtH+BDWDGahmweMaLgD2wqHeRuGp6QI=",
200+ "narHash": "sha256-sJM82Sj8yfQYs9axEmGZ9Evzdv/kDcI9sddqJ45frrU=",
429 "owner": "nix-community",
201 "owner": "nix-community",
430 "repo": "npmlock2nix",
202 "repo": "npmlock2nix",
431− "rev": "eeed152290ec2425f96c5e74e469c40b621e1468",
203+ "rev": "9197bbf397d76059a76310523d45df10d2e4ca81",
432 "type": "github"
204 "type": "github"
433 },
205 },
434 "original": {
206 "original": {
@@ -454,17 +226,16 @@
454 },
226 },
455 "ps-tools": {
227 "ps-tools": {
456 "inputs": {
228 "inputs": {
457− "deadnix": "deadnix_2",
458 "make-shell": "make-shell_2",
229 "make-shell": "make-shell_2",
459− "nixpkgs": "nixpkgs_9",
230+ "nixpkgs": "nixpkgs_2",
460− "utils": "utils_3"
231+ "utils": "utils"
461 },
232 },
462 "locked": {
233 "locked": {
463− "lastModified": 1658374818,
234+ "lastModified": 1704567308,
464− "narHash": "sha256-WxbQ/BR4Ep8tBbaOikXechspyZlvwfL5XNmRNEnaOFo=",
235+ "narHash": "sha256-WbFPIkKLtyQOPBUjintckKIYnfs7MvIbmfVsLRSAPlc=",
465 "owner": "purs-nix",
236 "owner": "purs-nix",
466 "repo": "purescript-tools",
237 "repo": "purescript-tools",
467− "rev": "c0f887f60ea2331dfdc5b0e8be2e732976887345",
238+ "rev": "ac626313141cbee78f06eb3c5e90359f695aef9b",
468 "type": "github"
239 "type": "github"
469 },
240 },
470 "original": {
241 "original": {
@@ -475,147 +246,48 @@
475 },
246 },
476 "purs-nix": {
247 "purs-nix": {
477 "inputs": {
248 "inputs": {
478− "deadnix": "deadnix",
479 "docs-search": "docs-search",
249 "docs-search": "docs-search",
480 "get-flake": "get-flake",
250 "get-flake": "get-flake",
251+ "lint-utils": "lint-utils",
481 "make-shell": "make-shell",
252 "make-shell": "make-shell",
482− "nixpkgs": "nixpkgs_5",
253+ "nixpkgs": "nixpkgs",
483 "parsec": "parsec",
254 "parsec": "parsec",
484 "ps-tools": "ps-tools",
255 "ps-tools": "ps-tools",
485− "statix": "statix",
486− "utils": "utils_4"
256+ "utils": "utils_2"
487 },
257 },
488 "locked": {
258 "locked": {
489− "lastModified": 1666378665,
259+ "lastModified": 1711996073,
490− "narHash": "sha256-UnWl0r/PSWOvbGUE7lXbk0rrCLAmoUwsyrEBRPtoUJk=",
260+ "narHash": "sha256-NDV8q9qtpKjHgIcMVBgdNqEfhpfK1d19rHYNa7yq0Qs=",
491 "owner": "purs-nix",
261 "owner": "purs-nix",
492 "repo": "purs-nix",
262 "repo": "purs-nix",
493− "rev": "49c3d4a6cbbc2a8eb494fb3787e64a321521889f",
263+ "rev": "8caa40f7fe69b9fcd05baae04c4ec9eb43953e2e",
494 "type": "github"
264 "type": "github"
495 },
265 },
496 "original": {
266 "original": {
497 "owner": "purs-nix",
267 "owner": "purs-nix",
498− "ref": "ps-0.15",
499 "repo": "purs-nix",
268 "repo": "purs-nix",
500 "type": "github"
269 "type": "github"
501 }
270 }
502 },
271 },
503 "root": {
272 "root": {
504 "inputs": {
273 "inputs": {
274+ "httpurple-argonaut": "httpurple-argonaut",
505− "nixpkgs": "nixpkgs",
275+ "nixpkgs": [
276+ "purs-nix",
277+ "nixpkgs"
278+ ],
506 "npmlock2nix": "npmlock2nix",
279 "npmlock2nix": "npmlock2nix",
507 "ps-tools": [
280 "ps-tools": [
508 "purs-nix",
281 "purs-nix",
509 "ps-tools"
282 "ps-tools"
510 ],
283 ],
511 "purs-nix": "purs-nix",
284 "purs-nix": "purs-nix",
512− "utils": "utils_5"
285+ "utils": "utils_3"
513− }
514− },
515− "rust-analyzer-src": {
516− "flake": false,
517− "locked": {
518− "lastModified": 1655507737,
519− "narHash": "sha256-o+AqNsjL6o2RHh4InZHQVpkmqg570YFJL4Db8mKq+fs=",
520− "owner": "rust-lang",
521− "repo": "rust-analyzer",
522− "rev": "12dd81092e37df28b7a3591cae9675e668927198",
523− "type": "github"
524− },
525− "original": {
526− "owner": "rust-lang",
527− "ref": "nightly",
528− "repo": "rust-analyzer",
529− "type": "github"
530− }
531− },
532− "rust-analyzer-src_2": {
533− "flake": false,
534− "locked": {
535− "lastModified": 1655507737,
536− "narHash": "sha256-o+AqNsjL6o2RHh4InZHQVpkmqg570YFJL4Db8mKq+fs=",
537− "owner": "rust-lang",
538− "repo": "rust-analyzer",
539− "rev": "12dd81092e37df28b7a3591cae9675e668927198",
540− "type": "github"
541− },
542− "original": {
543− "owner": "rust-lang",
544− "ref": "nightly",
545− "repo": "rust-analyzer",
546− "type": "github"
547− }
548− },
549− "rust-analyzer-src_3": {
550− "flake": false,
551− "locked": {
552− "lastModified": 1645205556,
553− "narHash": "sha256-e4lZW3qRyOEJ+vLKFQP7m2Dxh5P44NrnekZYLxlucww=",
554− "owner": "rust-analyzer",
555− "repo": "rust-analyzer",
556− "rev": "acf5874b39f3dc5262317a6074d9fc7285081161",
557− "type": "github"
558− },
559− "original": {
560− "owner": "rust-analyzer",
561− "ref": "nightly",
562− "repo": "rust-analyzer",
563− "type": "github"
564− }
565− },
566− "statix": {
567− "inputs": {
568− "fenix": "fenix_3",
569− "gitignore": "gitignore",
570− "nixpkgs": "nixpkgs_10"
571− },
572− "locked": {
573− "lastModified": 1657460333,
574− "narHash": "sha256-5o6zMBASEsGKtjKDb3SizJnN9A7qpOcbzWBXsacfMyc=",
575− "owner": "nerdypepper",
576− "repo": "statix",
577− "rev": "6422c959d365dee2fda5eda8858fefad31f17b25",
578− "type": "github"
579− },
580− "original": {
581− "owner": "nerdypepper",
582− "repo": "statix",
583− "type": "github"
584 }
286 }
585 },
287 },
586 "utils": {
288 "utils": {
587− "locked": {
588− "lastModified": 1653893745,
589− "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
590− "owner": "numtide",
591− "repo": "flake-utils",
592− "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
593− "type": "github"
594− },
595− "original": {
596− "owner": "numtide",
597− "repo": "flake-utils",
598− "type": "github"
599− }
600− },
601− "utils_2": {
602− "locked": {
603− "lastModified": 1653893745,
604− "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
605− "owner": "numtide",
606− "repo": "flake-utils",
607− "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
608− "type": "github"
609− },
610− "original": {
611− "owner": "numtide",
612− "repo": "flake-utils",
613− "type": "github"
614− }
615− },
616− "utils_3": {
617 "inputs": {
289 "inputs": {
618− "flake-utils": "flake-utils"
290+ "flake-utils": "flake-utils_2"
619 },
291 },
620 "locked": {
292 "locked": {
621 "lastModified": 1656044990,
293 "lastModified": 1656044990,
@@ -632,9 +304,9 @@
632 "type": "github"
304 "type": "github"
633 }
305 }
634 },
306 },
635− "utils_4": {
307+ "utils_2": {
636 "inputs": {
308 "inputs": {
637− "flake-utils": "flake-utils_2"
309+ "flake-utils": "flake-utils_3"
638 },
310 },
639 "locked": {
311 "locked": {
640 "lastModified": 1656044990,
312 "lastModified": 1656044990,
@@ -651,9 +323,9 @@
651 "type": "github"
323 "type": "github"
652 }
324 }
653 },
325 },
654− "utils_5": {
326+ "utils_3": {
655 "inputs": {
327 "inputs": {
656− "flake-utils": "flake-utils_3"
328+ "flake-utils": "flake-utils_4"
657 },
329 },
658 "locked": {
330 "locked": {
659 "lastModified": 1658606827,
331 "lastModified": 1658606827,
flake.nix+61−24
@@ -1,61 +1,87 @@
1{
1{
2 inputs =
2 inputs =
3 {
3 {
4− nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
4+ purs-nix.url = "github:purs-nix/purs-nix";
5− npmlock2nix.url = "github:nix-community/npmlock2nix";
6− npmlock2nix.flake = false;
7− ps-tools.follows = "purs-nix/ps-tools";
5+ nixpkgs.follows = "purs-nix/nixpkgs";
8− purs-nix.url = "github:purs-nix/purs-nix/ps-0.15";
9 utils.url = "github:ursi/flake-utils";
6 utils.url = "github:ursi/flake-utils";
7+ ps-tools.follows = "purs-nix/ps-tools";
8+ npmlock2nix = {
9+ url = "github:nix-community/npmlock2nix";
10+ flake = false;
11+ };
12+ httpurple-argonaut = {
13+ url = "github:sigma-andex/purescript-httpurple-argonaut";
14+ flake = false;
15+ };
10 };
16 };
11
17
12− outputs = { utils, ... }@inputs:
18+ outputs = { self, utils, ... }@inputs:
13 utils.apply-systems
19 utils.apply-systems
14 {
20 {
15 inherit inputs;
21 inherit inputs;
16 # Limited by ps-tools
22 # Limited by ps-tools
17 systems = [ "x86_64-linux" "x86_64-darwin" ];
23 systems = [ "x86_64-linux" "x86_64-darwin" ];
18 }
24 }
19− ({ pkgs, system, ... }:
25+ ({ pkgs, system, ... }@ctx:
20 let
26 let
27+ inherit (pkgs) nodejs;
21 npm = import inputs.npmlock2nix { inherit pkgs; };
28 npm = import inputs.npmlock2nix { inherit pkgs; };
22− ps-tools = inputs.ps-tools.legacyPackages.${system};
29+ node_modules = npm.v2.node_modules { src = ./.; inherit nodejs; } + /node_modules;
30+ inherit (ctx.ps-tools) purescript purs-tidy purescript-language-server;
23 purs-nix = inputs.purs-nix { inherit system; };
31 purs-nix = inputs.purs-nix { inherit system; };
32+ affjax-node_ = pkgs.lib.recursiveUpdate purs-nix.ps-pkgs.affjax-node {
33+ purs-nix-info.foreign."Affjax.Node" = { inherit node_modules; };
34+ };
35+ # TODO use httpurple-argonaut from official index
36+ httpurple-argonaut_ = purs-nix.build
37+ {
38+ name = "httpurple-argonaut";
39+ src.path = inputs.httpurple-argonaut;
40+ info.dependencies = [ "argonaut" "console" "effect" "either" "httpurple" "prelude"];
41+ };
24 ps =
42 ps =
25 purs-nix.purs
43 purs-nix.purs
26 {
44 {
27 dir = ./.;
45 dir = ./.;
28−
29 dependencies =
46 dependencies =
30 with purs-nix.ps-pkgs;
47 with purs-nix.ps-pkgs;
31 [
48 [
32 prelude
49 prelude
33 debug
50 debug
34 aff
51 aff
35− affjax-node
52+ affjax-node_
36 argonaut-codecs
53 argonaut-codecs
37 argonaut-generic
54 argonaut-generic
38 effect
55 effect
39− httpure
56+ httpurple
40− node-buffer
57+ httpurple-argonaut_
41− node-process
42− node-streams-aff
43 test-unit
58 test-unit
44 parsing
59 parsing
45 ];
60 ];
46−
61+ inherit purescript nodejs;
47− foreign."Affjax.Node".node_modules = npm.node_modules { src = ./.; } + /node_modules;
48−
49 };
62 };
63+ name = "purs-eval";
50 in
64 in
51 with ps;
65 with ps;
52 rec {
66 rec {
53− apps.default = {
67+ apps.default =
68+ {
54− type = "app";
69+ type = "app";
55− program = "${packages.default}/bin/purs-eval";
70+ program = "${packages.default}/bin/${name}";
56− };
71+ };
57
72
73+ packages =
74+ {
58− packages.default = modules.Main.app { name = "purs-eval"; };
75+ default = app { inherit name; };
76+ # npm version does not publish a nix-store path
77+ npm = pkgs.runCommand
78+ "purs-eval-npm"
79+ {}
80+ ''
81+ echo "#!/usr/bin/env node" > $out
82+ tail -n +2 ${packages.default}/bin/purs-eval >> $out
83+ '';
84+ };
59
85
60 checks.test = test.check { };
86 checks.test = test.check { };
61
87
@@ -63,11 +89,22 @@
63 packages = with pkgs; [
89 packages = with pkgs; [
64 nodejs
90 nodejs
65 (ps.command { })
91 (ps.command { })
66− ps-tools.for-0_15.purescript-language-server
92+ purescript-language-server
93+ purs-tidy
94+ purescript
67 purs-nix.esbuild
95 purs-nix.esbuild
68− purs-nix.purescript
69 ];
96 ];
70 };
97 };
71 }
98 }
72 );
99 );
100+
101+ nixConfig = {
102+ extra-experimental-features = "nix-command flakes";
103+ extra-substituters = [
104+ "https://klarkc.cachix.org"
105+ ];
106+ extra-trusted-public-keys = [
107+ "klarkc.cachix.org-1:R+z+m4Cq0hMgfZ7AQ42WRpGuHJumLLx3k0XhwpNFq9U="
108+ ];
109+ };
73}
110}
package-lock.json+2−2
@@ -11,7 +11,7 @@
11 "devDependencies": {
11 "devDependencies": {
12 "xhr2": "^0.2.1"
12 "xhr2": "^0.2.1"
13 },
13 },
14− "version": "1.2.0"
14+ "version": "1.5.0"
15 },
15 },
16 "node_modules/xhr2": {
16 "node_modules/xhr2": {
17 "version": "0.2.1",
17 "version": "0.2.1",
@@ -31,5 +31,5 @@
31 "dev": true
31 "dev": true
32 }
32 }
33 },
33 },
34− "version": "1.2.0"
34+ "version": "1.5.0"
35}
35}
package.json+1−1
@@ -4,5 +4,5 @@
4 "devDependencies": {
4 "devDependencies": {
5 "xhr2": "^0.2.1"
5 "xhr2": "^0.2.1"
6 },
6 },
7− "version": "1.2.0"
7+ "version": "1.5.0"
8}
8}
src/Main.purs+2−3
@@ -1,7 +1,6 @@
1module Main (main) where
1module Main (main) where
2
2
3import Prelude (Unit, bind, discard)
3import Prelude (Unit, bind, discard)
4−import Data.Tuple (Tuple (Tuple))
5import Effect (Effect)
4import Effect (Effect)
6import Effect.Aff (launchAff_)
5import Effect.Aff (launchAff_)
7import Node.Process (stdin, stdout)
6import Node.Process (stdin, stdout)
@@ -10,8 +9,8 @@ import Compiler (successFromJson, runCompiler)
10
9
11main :: Effect Unit
10main :: Effect Unit
12main = launchAff_ do
11main = launchAff_ do
13− Tuple input _ <- readSome stdin
12+ { buffers } <- readSome stdin
14− code <- toStringUTF8 input
13+ code <- toStringUTF8 buffers
15 let settings = { protocol: "https"
14 let settings = { protocol: "https"
16 , hostname: "compile.purescript.org"
15 , hostname: "compile.purescript.org"
17 , port: 443
16 , port: 443
test/Test/Compiler/ServerMock.purs+28−66
@@ -1,11 +1,7 @@
1module Test.Compiler.ServerMock (settings, setupSrv) where
1module Test.Compiler.ServerMock (settings, setupSrv) where
2
2
3−import Prelude (Unit, ($), (==), (>>=), (<<<), unit, pure, bind, const, discard)
3+import Prelude (Unit, ($), (<<<), unit, pure, bind, const)
4−import Control.Apply ((*>))
5−import Control.Monad.Error.Class (throwError, liftMaybe)
6−import Control.Monad.Reader.Trans (ReaderT, ask, runReaderT)
7−import Control.Monad.Trans.Class (lift)
8−import Data.Argonaut.Core (Json, stringify)
4+import Data.Argonaut.Core (Json)
9import Data.Argonaut.Decode (JsonDecodeError, printJsonDecodeError)
5import Data.Argonaut.Decode (JsonDecodeError, printJsonDecodeError)
10import Data.Argonaut.Decode.Class (class DecodeJson, decodeJson)
6import Data.Argonaut.Decode.Class (class DecodeJson, decodeJson)
11import Data.Argonaut.Decode.Generic (genericDecodeJson)
7import Data.Argonaut.Decode.Generic (genericDecodeJson)
@@ -17,19 +13,13 @@ import Data.Functor ((<$>))
17import Data.Generic.Rep (class Generic)
13import Data.Generic.Rep (class Generic)
18import Data.Maybe (Maybe(Nothing))
14import Data.Maybe (Maybe(Nothing))
19import Data.Newtype (class Newtype, unwrap, wrap)
15import Data.Newtype (class Newtype, unwrap, wrap)
16+import Node.HTTP.Types (ServerResponse)
20−import Effect
17+import Effect (Effect)
21import Effect.Aff (Aff, bracket)
18import Effect.Aff (Aff, bracket)
22import Effect.Class (liftEffect)
19import Effect.Class (liftEffect)
23import Effect.Exception (Error, error)
20import Effect.Exception (Error, error)
24−import HTTPure.Request (Request)
21+import HTTPurple (RouteDuplex', Method(Post), (/), ResponseHeaders, noArgs, mkRoute, serve, ok, notFound, toJson)
25−import HTTPure.Response (ResponseM, Response, ok)
22+import HTTPurple.Json.Argonaut (jsonEncoder)
26−import HTTPure.Server (serve)
27−import HTTPure.Lookup ((!!))
28−import HTTPure.Method (Method(Post))
29−import HTTPure.Body (class Body)
30−import HTTPure.Headers (header)
31−import Node.Stream.Aff (write, end, fromStringUTF8)
32−import Node.HTTP (responseAsStream)
33import Compiler (Settings, Code, SuccessResult)
23import Compiler (Settings, Code, SuccessResult)
34
24
35
25
@@ -51,26 +41,6 @@ successToJson = (encodeJson :: SuccessResult_ -> Json) <<< wrap
51successFromJson_ :: Json -> Either Error SuccessResult
41successFromJson_ :: Json -> Either Error SuccessResult
52successFromJson_ json = unwrap <$> (error <<< printJsonDecodeError) `lmap` (decodeJson json :: Either JsonDecodeError SuccessResult_)
42successFromJson_ json = unwrap <$> (error <<< printJsonDecodeError) `lmap` (decodeJson json :: Either JsonDecodeError SuccessResult_)
53
43
54−newtype Json_ = Json_ Json
55−
56−derive instance Newtype Json_ _
57−
58−instance Body Json_ where
59− defaultHeaders _ = pure $ header "Content-Type" "application/json"
60− write json res = do
61− let stream = responseAsStream res
62− body' <- liftEffect $ fromStringUTF8 $ stringify $ unwrap $ json
63− write stream body'
64− end stream
65−
66−type ServerMock = ReaderT Code (ReaderT Request Aff)
67−
68−askRes :: ServerMock Code
69−askRes = ask
70−
71−askReq :: ServerMock Request
72−askReq = lift ask
73−
74settings :: Settings
44settings :: Settings
75settings = { protocol: "http"
45settings = { protocol: "http"
76 , hostname: "localhost"
46 , hostname: "localhost"
@@ -78,38 +48,30 @@ settings = { protocol: "http"
78 , parser: successFromJson_
48 , parser: successFromJson_
79 }
49 }
80
50
81−validatePath :: ServerMock Unit
51+data Route = Compile
82−validatePath = do
52+
83− let invalidPath = error "invalid path"
53+derive instance Generic Route _
84− missingPath = error "missing path"
54+
85− req <- askReq
55+route :: RouteDuplex' Route
86− p <- liftMaybe missingPath $ req.path !! 0
56+route = mkRoute
87− case p == "compile" of
57+ { "Compile": "compile" / noArgs
88− true -> pure unit
58+ }
89− false -> throwError invalidPath
59+
90−
60+
91−validateMethod :: ServerMock Unit
61+mkRouter
92−validateMethod = askReq >>= case _ of
62+ :: forall a.
93− { method: Post } -> pure unit
63+ String
94− _ -> throwError $ error "invalid method"
64+ -> { method :: Method, route :: Route | a }
95−
65+ -> Aff { headers :: ResponseHeaders, status :: Int , writeBody :: ServerResponse -> Aff Unit }
96−validate :: ServerMock Unit
66+mkRouter js = case _ of
97−validate = validatePath *> validateMethod
98−
99−answer :: ServerMock Response
100−answer = do
101− res <- askRes
102− let json :: Json_
103− json = wrap $ successToJson { js: res, warnings: Nothing }
67+ { route: Compile, method: Post } -> ok $ toJson jsonEncoder $ successToJson { js, warnings: Nothing }
104− ok json
68+ _ -> notFound
105−
106−runServerMock :: Code -> Request -> ResponseM
107−runServerMock res req = runReaderT (runReaderT (validate *> answer) res) req
108
69
109launchServerMock :: Code -> Aff (Effect Unit)
70launchServerMock :: Code -> Aff (Effect Unit)
110−launchServerMock res = do
71+launchServerMock c = liftEffect do
72+ let router = mkRouter c
111− close <- liftEffect $ serve settings.port (\req -> runServerMock res req) $ pure unit
73+ close <- serve { port: settings.port } { route, router }
112− pure $ close $ pure unit
74+ pure $ close $ pure unit
113
75
114setupSrv :: forall b. Code -> Aff b -> Aff b
76setupSrv :: forall b. Code -> Aff b -> Aff b
115setupSrv code act = bracket (launchServerMock code) liftEffect (const act)
77setupSrv code act = bracket (launchServerMock code) liftEffect (const act)