Skip to content

Commit 115a936

Browse files
mattfyshmattfysh
authored
Merge pull request #51 from getlang-dev/mod-ctx-matze-opts
modifier flags: `useContext` and `materialize`
2 parents 5a02cc5 + e9df7de commit 115a936

File tree

15 files changed

+110
-146
lines changed

15 files changed

+110
-146
lines changed

‎.changeset/chilly-bobcats-notice.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"@getlang/parser": patch
3+
"@getlang/get": patch
4+
"@getlang/lib": patch
5+
---
6+
7+
modifier flags: `useContext` and `materialize`

‎bun.lock‎

Lines changed: 32 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -4,32 +4,30 @@
44
"": {
55
"name": "get",
66
"devDependencies": {
7-
"@biomejs/biome": "^2.2.3",
7+
"@biomejs/biome": "^2.2.4",
88
"@changesets/changelog-github": "^0.5.1",
9-
"@changesets/cli": "^2.29.6",
10-
"@types/bun": "^1.2.21",
9+
"@changesets/cli": "^2.29.7",
10+
"@types/bun": "^1.2.22",
1111
"knip": "^5.63.1",
1212
"sherif": "^1.6.1",
1313
"typescript": "^5.9.2",
1414
},
1515
},
1616
"packages/ast": {
1717
"name": "@getlang/ast",
18-
"version": "0.0.1",
18+
"version": "0.1.0",
1919
"dependencies": {
2020
"moo": "^0.5.2",
2121
},
2222
},
2323
"packages/get": {
2424
"name": "@getlang/get",
25-
"version": "0.2.5",
25+
"version": "0.3.0",
2626
"dependencies": {
27-
"@getlang/ast": "workspace:^0.0.1",
28-
"@getlang/lib": "workspace:^0.1.5",
29-
"@getlang/parser": "workspace:^0.3.4",
30-
"@getlang/walker": "workspace:^0.0.1",
31-
"acorn": "^8.15.0",
32-
"estree-toolkit": "^1.7.13",
27+
"@getlang/ast": "workspace:^0.1.0",
28+
"@getlang/lib": "workspace:^0.2.0",
29+
"@getlang/parser": "workspace:^0.4.0",
30+
"@getlang/walker": "workspace:^0.1.0",
3331
"lodash-es": "^4.17.21",
3432
},
3533
"devDependencies": {
@@ -38,9 +36,9 @@
3836
},
3937
"packages/lib": {
4038
"name": "@getlang/lib",
41-
"version": "0.1.5",
39+
"version": "0.2.0",
4240
"dependencies": {
43-
"@getlang/ast": "workspace:^0.0.1",
41+
"@getlang/ast": "workspace:^0.1.0",
4442
"@getlang/xpath": "0.0.35-0",
4543
"@types/esquery": "^1.5.4",
4644
"@types/lodash-es": "^4.17.12",
@@ -61,16 +59,16 @@
6159
},
6260
"packages/parser": {
6361
"name": "@getlang/parser",
64-
"version": "0.3.4",
62+
"version": "0.4.0",
6563
"dependencies": {
66-
"@getlang/ast": "workspace:^0.0.1",
67-
"@getlang/lib": "workspace:^0.1.5",
68-
"@getlang/walker": "workspace:^0.0.1",
64+
"@getlang/ast": "workspace:^0.1.0",
65+
"@getlang/lib": "workspace:^0.2.0",
66+
"@getlang/walker": "workspace:^0.1.0",
6967
"@types/moo": "^0.5.10",
7068
"@types/nearley": "^2.11.5",
7169
"acorn": "^8.15.0",
7270
"estree-toolkit": "^1.7.13",
73-
"globals": "^16.3.0",
71+
"globals": "^16.4.0",
7472
"lodash-es": "^4.17.21",
7573
"moo": "^0.5.2",
7674
"nearley": "^2.20.1",
@@ -82,9 +80,9 @@
8280
},
8381
"packages/walker": {
8482
"name": "@getlang/walker",
85-
"version": "0.0.1",
83+
"version": "0.1.0",
8684
"dependencies": {
87-
"@getlang/ast": "workspace:^0.0.1",
85+
"@getlang/ast": "workspace:^0.1.0",
8886
},
8987
},
9088
"test": {
@@ -103,33 +101,33 @@
103101
"packages": {
104102
"@babel/runtime": ["@babel/[email protected]", "", {}, "sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ=="],
105103

106-
"@biomejs/biome": ["@biomejs/[email protected].3", "", { "optionalDependencies": { "@biomejs/cli-darwin-arm64": "2.2.3", "@biomejs/cli-darwin-x64": "2.2.3", "@biomejs/cli-linux-arm64": "2.2.3", "@biomejs/cli-linux-arm64-musl": "2.2.3", "@biomejs/cli-linux-x64": "2.2.3", "@biomejs/cli-linux-x64-musl": "2.2.3", "@biomejs/cli-win32-arm64": "2.2.3", "@biomejs/cli-win32-x64": "2.2.3" }, "bin": { "biome": "bin/biome" } }, "sha512-9w0uMTvPrIdvUrxazZ42Ib7t8Y2yoGLKLdNne93RLICmaHw7mcLv4PPb5LvZLJF3141gQHiCColOh/v6VWlWmg=="],
104+
"@biomejs/biome": ["@biomejs/[email protected].4", "", { "optionalDependencies": { "@biomejs/cli-darwin-arm64": "2.2.4", "@biomejs/cli-darwin-x64": "2.2.4", "@biomejs/cli-linux-arm64": "2.2.4", "@biomejs/cli-linux-arm64-musl": "2.2.4", "@biomejs/cli-linux-x64": "2.2.4", "@biomejs/cli-linux-x64-musl": "2.2.4", "@biomejs/cli-win32-arm64": "2.2.4", "@biomejs/cli-win32-x64": "2.2.4" }, "bin": { "biome": "bin/biome" } }, "sha512-TBHU5bUy/Ok6m8c0y3pZiuO/BZoY/OcGxoLlrfQof5s8ISVwbVBdFINPQZyFfKwil8XibYWb7JMwnT8wT4WVPg=="],
107105

108-
"@biomejs/cli-darwin-arm64": ["@biomejs/[email protected].3", "", { "os": "darwin", "cpu": "arm64" }, "sha512-OrqQVBpadB5eqzinXN4+Q6honBz+tTlKVCsbEuEpljK8ASSItzIRZUA02mTikl3H/1nO2BMPFiJ0nkEZNy3B1w=="],
106+
"@biomejs/cli-darwin-arm64": ["@biomejs/[email protected].4", "", { "os": "darwin", "cpu": "arm64" }, "sha512-RJe2uiyaloN4hne4d2+qVj3d3gFJFbmrr5PYtkkjei1O9c+BjGXgpUPVbi8Pl8syumhzJjFsSIYkcLt2VlVLMA=="],
109107

110-
"@biomejs/cli-darwin-x64": ["@biomejs/[email protected].3", "", { "os": "darwin", "cpu": "x64" }, "sha512-OCdBpb1TmyfsTgBAM1kPMXyYKTohQ48WpiN9tkt9xvU6gKVKHY4oVwteBebiOqyfyzCNaSiuKIPjmHjUZ2ZNMg=="],
108+
"@biomejs/cli-darwin-x64": ["@biomejs/[email protected].4", "", { "os": "darwin", "cpu": "x64" }, "sha512-cFsdB4ePanVWfTnPVaUX+yr8qV8ifxjBKMkZwN7gKb20qXPxd/PmwqUH8mY5wnM9+U0QwM76CxFyBRJhC9tQwg=="],
111109

112-
"@biomejs/cli-linux-arm64": ["@biomejs/[email protected].3", "", { "os": "linux", "cpu": "arm64" }, "sha512-g/Uta2DqYpECxG+vUmTAmUKlVhnGEcY7DXWgKP8ruLRa8Si1QHsWknPY3B/wCo0KgYiFIOAZ9hjsHfNb9L85+g=="],
110+
"@biomejs/cli-linux-arm64": ["@biomejs/[email protected].4", "", { "os": "linux", "cpu": "arm64" }, "sha512-M/Iz48p4NAzMXOuH+tsn5BvG/Jb07KOMTdSVwJpicmhN309BeEyRyQX+n1XDF0JVSlu28+hiTQ2L4rZPvu7nMw=="],
113111

114-
"@biomejs/cli-linux-arm64-musl": ["@biomejs/[email protected].3", "", { "os": "linux", "cpu": "arm64" }, "sha512-q3w9jJ6JFPZPeqyvwwPeaiS/6NEszZ+pXKF+IczNo8Xj6fsii45a4gEEicKyKIytalV+s829ACZujQlXAiVLBQ=="],
112+
"@biomejs/cli-linux-arm64-musl": ["@biomejs/[email protected].4", "", { "os": "linux", "cpu": "arm64" }, "sha512-7TNPkMQEWfjvJDaZRSkDCPT/2r5ESFPKx+TEev+I2BXDGIjfCZk2+b88FOhnJNHtksbOZv8ZWnxrA5gyTYhSsQ=="],
115113

116-
"@biomejs/cli-linux-x64": ["@biomejs/[email protected].3", "", { "os": "linux", "cpu": "x64" }, "sha512-LEtyYL1fJsvw35CxrbQ0gZoxOG3oZsAjzfRdvRBRHxOpQ91Q5doRVjvWW/wepgSdgk5hlaNzfeqpyGmfSD0Eyw=="],
114+
"@biomejs/cli-linux-x64": ["@biomejs/[email protected].4", "", { "os": "linux", "cpu": "x64" }, "sha512-orr3nnf2Dpb2ssl6aihQtvcKtLySLta4E2UcXdp7+RTa7mfJjBgIsbS0B9GC8gVu0hjOu021aU8b3/I1tn+pVQ=="],
117115

118-
"@biomejs/cli-linux-x64-musl": ["@biomejs/[email protected].3", "", { "os": "linux", "cpu": "x64" }, "sha512-y76Dn4vkP1sMRGPFlNc+OTETBhGPJ90jY3il6jAfur8XWrYBQV3swZ1Jo0R2g+JpOeeoA0cOwM7mJG6svDz79w=="],
116+
"@biomejs/cli-linux-x64-musl": ["@biomejs/[email protected].4", "", { "os": "linux", "cpu": "x64" }, "sha512-m41nFDS0ksXK2gwXL6W6yZTYPMH0LughqbsxInSKetoH6morVj43szqKx79Iudkp8WRT5SxSh7qVb8KCUiewGg=="],
119117

120-
"@biomejs/cli-win32-arm64": ["@biomejs/[email protected].3", "", { "os": "win32", "cpu": "arm64" }, "sha512-Ms9zFYzjcJK7LV+AOMYnjN3pV3xL8Prxf9aWdDVL74onLn5kcvZ1ZMQswE5XHtnd/r/0bnUd928Rpbs14BzVmA=="],
118+
"@biomejs/cli-win32-arm64": ["@biomejs/[email protected].4", "", { "os": "win32", "cpu": "arm64" }, "sha512-NXnfTeKHDFUWfxAefa57DiGmu9VyKi0cDqFpdI+1hJWQjGJhJutHPX0b5m+eXvTKOaf+brU+P0JrQAZMb5yYaQ=="],
121119

122-
"@biomejs/cli-win32-x64": ["@biomejs/[email protected].3", "", { "os": "win32", "cpu": "x64" }, "sha512-gvCpewE7mBwBIpqk1YrUqNR4mCiyJm6UI3YWQQXkedSSEwzRdodRpaKhbdbHw1/hmTWOVXQ+Eih5Qctf4TCVOQ=="],
120+
"@biomejs/cli-win32-x64": ["@biomejs/[email protected].4", "", { "os": "win32", "cpu": "x64" }, "sha512-3Y4V4zVRarVh/B/eSHczR4LYoSVyv3Dfuvm3cWs5w/HScccS0+Wt/lHOcDTRYeHjQmMYVC3rIRWqyN2EI52+zg=="],
123121

124-
"@changesets/apply-release-plan": ["@changesets/[email protected].12", "", { "dependencies": { "@changesets/config": "^3.1.1", "@changesets/get-version-range-type": "^0.4.0", "@changesets/git": "^3.0.4", "@changesets/should-skip-package": "^0.1.2", "@changesets/types": "^6.1.0", "@manypkg/get-packages": "^1.1.3", "detect-indent": "^6.0.0", "fs-extra": "^7.0.1", "lodash.startcase": "^4.4.0", "outdent": "^0.5.0", "prettier": "^2.7.1", "resolve-from": "^5.0.0", "semver": "^7.5.3" } }, "sha512-EaET7As5CeuhTzvXTQCRZeBUcisoYPDDcXvgTE/2jmmypKp0RC7LxKj/yzqeh/1qFTZI7oDGFcL1PHRuQuketQ=="],
122+
"@changesets/apply-release-plan": ["@changesets/[email protected].13", "", { "dependencies": { "@changesets/config": "^3.1.1", "@changesets/get-version-range-type": "^0.4.0", "@changesets/git": "^3.0.4", "@changesets/should-skip-package": "^0.1.2", "@changesets/types": "^6.1.0", "@manypkg/get-packages": "^1.1.3", "detect-indent": "^6.0.0", "fs-extra": "^7.0.1", "lodash.startcase": "^4.4.0", "outdent": "^0.5.0", "prettier": "^2.7.1", "resolve-from": "^5.0.0", "semver": "^7.5.3" } }, "sha512-BIW7bofD2yAWoE8H4V40FikC+1nNFEKBisMECccS16W1rt6qqhNTBDmIw5HaqmMgtLNz9e7oiALiEUuKrQ4oHg=="],
125123

126124
"@changesets/assemble-release-plan": ["@changesets/[email protected]", "", { "dependencies": { "@changesets/errors": "^0.2.0", "@changesets/get-dependents-graph": "^2.1.3", "@changesets/should-skip-package": "^0.1.2", "@changesets/types": "^6.1.0", "@manypkg/get-packages": "^1.1.3", "semver": "^7.5.3" } }, "sha512-tPgeeqCHIwNo8sypKlS3gOPmsS3wP0zHt67JDuL20P4QcXiw/O4Hl7oXiuLnP9yg+rXLQ2sScdV1Kkzde61iSQ=="],
127125

128126
"@changesets/changelog-git": ["@changesets/[email protected]", "", { "dependencies": { "@changesets/types": "^6.1.0" } }, "sha512-x/xEleCFLH28c3bQeQIyeZf8lFXyDFVn1SgcBiR2Tw/r4IAWlk1fzxCEZ6NxQAjF2Nwtczoen3OA2qR+UawQ8Q=="],
129127

130128
"@changesets/changelog-github": ["@changesets/[email protected]", "", { "dependencies": { "@changesets/get-github-info": "^0.6.0", "@changesets/types": "^6.1.0", "dotenv": "^8.1.0" } }, "sha512-BVuHtF+hrhUScSoHnJwTELB4/INQxVFc+P/Qdt20BLiBFIHFJDDUaGsZw+8fQeJTRP5hJZrzpt3oZWh0G19rAQ=="],
131129

132-
"@changesets/cli": ["@changesets/[email protected]", "", { "dependencies": { "@changesets/apply-release-plan": "^7.0.12", "@changesets/assemble-release-plan": "^6.0.9", "@changesets/changelog-git": "^0.2.1", "@changesets/config": "^3.1.1", "@changesets/errors": "^0.2.0", "@changesets/get-dependents-graph": "^2.1.3", "@changesets/get-release-plan": "^4.0.13", "@changesets/git": "^3.0.4", "@changesets/logger": "^0.1.1", "@changesets/pre": "^2.0.2", "@changesets/read": "^0.6.5", "@changesets/should-skip-package": "^0.1.2", "@changesets/types": "^6.1.0", "@changesets/write": "^0.4.0", "@inquirer/external-editor": "^1.0.0", "@manypkg/get-packages": "^1.1.3", "ansi-colors": "^4.1.3", "ci-info": "^3.7.0", "enquirer": "^2.4.1", "fs-extra": "^7.0.1", "mri": "^1.2.0", "p-limit": "^2.2.0", "package-manager-detector": "^0.2.0", "picocolors": "^1.1.0", "resolve-from": "^5.0.0", "semver": "^7.5.3", "spawndamnit": "^3.0.1", "term-size": "^2.1.0" }, "bin": { "changeset": "bin.js" } }, "sha512-6qCcVsIG1KQLhpQ5zE8N0PckIx4+9QlHK3z6/lwKnw7Tir71Bjw8BeOZaxA/4Jt00pcgCnCSWZnyuZf5Il05QQ=="],
130+
"@changesets/cli": ["@changesets/[email protected]", "", { "dependencies": { "@changesets/apply-release-plan": "^7.0.13", "@changesets/assemble-release-plan": "^6.0.9", "@changesets/changelog-git": "^0.2.1", "@changesets/config": "^3.1.1", "@changesets/errors": "^0.2.0", "@changesets/get-dependents-graph": "^2.1.3", "@changesets/get-release-plan": "^4.0.13", "@changesets/git": "^3.0.4", "@changesets/logger": "^0.1.1", "@changesets/pre": "^2.0.2", "@changesets/read": "^0.6.5", "@changesets/should-skip-package": "^0.1.2", "@changesets/types": "^6.1.0", "@changesets/write": "^0.4.0", "@inquirer/external-editor": "^1.0.0", "@manypkg/get-packages": "^1.1.3", "ansi-colors": "^4.1.3", "ci-info": "^3.7.0", "enquirer": "^2.4.1", "fs-extra": "^7.0.1", "mri": "^1.2.0", "p-limit": "^2.2.0", "package-manager-detector": "^0.2.0", "picocolors": "^1.1.0", "resolve-from": "^5.0.0", "semver": "^7.5.3", "spawndamnit": "^3.0.1", "term-size": "^2.1.0" }, "bin": { "changeset": "bin.js" } }, "sha512-R7RqWoaksyyKXbKXBTbT4REdy22yH81mcFK6sWtqSanxUCbUi9Uf+6aqxZtDQouIqPdem2W56CdxXgsxdq7FLQ=="],
133131

134132
"@changesets/config": ["@changesets/[email protected]", "", { "dependencies": { "@changesets/errors": "^0.2.0", "@changesets/get-dependents-graph": "^2.1.3", "@changesets/logger": "^0.1.1", "@changesets/types": "^6.1.0", "@manypkg/get-packages": "^1.1.3", "fs-extra": "^7.0.1", "micromatch": "^4.0.8" } }, "sha512-bd+3Ap2TKXxljCggI0mKPfzCQKeV/TU4yO2h2C6vAihIo8tzseAn2e7klSuiyYYXvgu53zMN1OeYMIQkaQoWnA=="],
135133

@@ -239,7 +237,7 @@
239237

240238
"@tybys/wasm-util": ["@tybys/[email protected]", "", { "dependencies": { "tslib": "^2.4.0" } }, "sha512-VyyPYFlOMNylG45GoAe0xDoLwWuowvf92F9kySqzYh8vmYm7D2u4iUJKa1tOUpS70Ku13ASrOkS4ScXFsTaCNQ=="],
241239

242-
"@types/bun": ["@types/[email protected].21", "", { "dependencies": { "bun-types": "1.2.21" } }, "sha512-NiDnvEqmbfQ6dmZ3EeUO577s4P5bf4HCTXtI6trMc6f6RzirY5IrF3aIookuSpyslFzrnvv2lmEWv5HyC1X79A=="],
240+
"@types/bun": ["@types/[email protected].22", "", { "dependencies": { "bun-types": "1.2.22" } }, "sha512-5A/KrKos2ZcN0c6ljRSOa1fYIyCKhZfIVYeuyb4snnvomnpFqC0tTsEkdqNxbAgExV384OETQ//WAjl3XbYqQA=="],
243241

244242
"@types/esquery": ["@types/[email protected]", "", { "dependencies": { "@types/estree": "*" } }, "sha512-yYO4Q8H+KJHKW1rEeSzHxcZi90durqYgWVfnh5K6ZADVBjBv2e1NEveYX5yT2bffgN7RqzH3k9930m+i2yBoMA=="],
245243

@@ -279,7 +277,7 @@
279277

280278
"braces": ["[email protected]", "", { "dependencies": { "fill-range": "^7.1.1" } }, "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA=="],
281279

282-
"bun-types": ["[email protected].21", "", { "dependencies": { "@types/node": "*" }, "peerDependencies": { "@types/react": "^19" } }, "sha512-sa2Tj77Ijc/NTLS0/Odjq/qngmEPZfbfnOERi0KRUYhT9R8M4VBioWVmMWE5GrYbKMc+5lVybXygLdibHaqVqw=="],
280+
"bun-types": ["[email protected].22", "", { "dependencies": { "@types/node": "*" }, "peerDependencies": { "@types/react": "^19" } }, "sha512-hwaAu8tct/Zn6Zft4U9BsZcXkYomzpHJX28ofvx7k0Zz2HNz54n1n+tDgxoWFGB4PcFvJXJQloPhaV2eP3Q6EA=="],
283281

284282
"chalk": ["[email protected]", "", { "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="],
285283

@@ -351,7 +349,7 @@
351349

352350
"glob-parent": ["[email protected]", "", { "dependencies": { "is-glob": "^4.0.1" } }, "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="],
353351

354-
"globals": ["globals@16.3.0", "", {}, "sha512-bqWEnJ1Nt3neqx2q5SFfGS8r/ahumIakg3HcwtNlrVlwXIeNumWn/c7Pn/wKzGhf6SaW6H6uWXLqC30STCMchQ=="],
352+
"globals": ["globals@16.4.0", "", {}, "sha512-ob/2LcVVaVGCYN+r14cnwnoDPUufjiYgSqRhiFD0Q1iI4Odora5RE8Iv1D24hAz5oMophRGkGz+yuvQmmUMnMw=="],
355353

356354
"globby": ["[email protected]", "", { "dependencies": { "array-union": "^2.1.0", "dir-glob": "^3.0.1", "fast-glob": "^3.2.9", "ignore": "^5.2.0", "merge2": "^1.4.1", "slash": "^3.0.0" } }, "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g=="],
357355

‎package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "get",
33
"license": "Apache-2.0",
44
"private": true,
5-
"packageManager": "[email protected].21",
5+
"packageManager": "[email protected].22",
66
"scripts": {
77
"fmt": "biome check --write",
88
"lint": "bun lint:check && bun lint:types && bun lint:unused && bun lint:repo",
@@ -18,10 +18,10 @@
1818
"test"
1919
],
2020
"devDependencies": {
21-
"@biomejs/biome": "^2.2.3",
21+
"@biomejs/biome": "^2.2.4",
2222
"@changesets/changelog-github": "^0.5.1",
23-
"@changesets/cli": "^2.29.6",
24-
"@types/bun": "^1.2.21",
23+
"@changesets/cli": "^2.29.7",
24+
"@types/bun": "^1.2.22",
2525
"knip": "^5.63.1",
2626
"sherif": "^1.6.1",
2727
"typescript": "^5.9.2"

‎packages/get/package.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
"@getlang/lib": "workspace:^0.2.0",
2222
"@getlang/parser": "workspace:^0.4.0",
2323
"@getlang/walker": "workspace:^0.1.0",
24-
"acorn": "^8.15.0",
25-
"estree-toolkit": "^1.7.13",
2624
"lodash-es": "^4.17.21"
2725
},
2826
"devDependencies": {

‎packages/get/src/calls.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ export async function callModifier(
1616
) {
1717
const entry = await registry.importMod(mod)
1818
if (entry) {
19-
return entry.mod(context?.data, args)
19+
const ctx =
20+
context && entry.materialize ? materialize(context) : context?.data
21+
return entry.mod(ctx, args)
2022
}
2123

2224
invariant(context, 'Modifier requires context')

‎packages/get/src/execute.ts‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ export async function execute(
107107
async SliceExpr({ slice, typeInfo }) {
108108
try {
109109
const ctx = scope.context
110-
const deps = ctx && materialize(ctx)
110+
const deps = ctx ? materialize(ctx) : {}
111111
const ret = await hooks.slice(slice.value, deps)
112112
const data =
113113
ret === undefined ? new lib.NullSelection('<slice>') : ret
@@ -158,12 +158,9 @@ export async function execute(
158158
},
159159

160160
async ModifierExpr(node) {
161-
const data = await callModifier(
162-
registry,
163-
node.modifier.value,
164-
node.args.data,
165-
scope.context,
166-
)
161+
const mod = node.modifier.value
162+
const args = materialize(node.args)
163+
const data = await callModifier(registry, mod, args, scope.context)
167164
return { data, typeInfo: node.typeInfo }
168165
},
169166

‎packages/get/src/registry.ts‎

Lines changed: 15 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@ import { Type } from '@getlang/ast'
33
import type { Hooks, Modifier } from '@getlang/lib'
44
import { RecursiveCallError, ValueTypeError } from '@getlang/lib/errors'
55
import { analyze, desugar, inference, parse } from '@getlang/parser'
6-
import type { Pattern } from 'acorn'
7-
import { parse as acorn } from 'acorn'
8-
import { traverse } from 'estree-toolkit'
96

107
type ModEntry = {
118
mod: Modifier
129
useContext: boolean
10+
materialize: boolean
1311
returnType: TypeInfo
1412
}
1513

@@ -53,31 +51,6 @@ function buildImportKey(module: string, typeInfo?: TypeInfo) {
5351
return key
5452
}
5553

56-
function inferContext(mod: Modifier) {
57-
const src = mod.toString()
58-
const ast = acorn(src, { ecmaVersion: 'latest' })
59-
let useContext = false
60-
traverse(ast, {
61-
$: { scope: true },
62-
Program(path) {
63-
const fn = ast.body[0]
64-
let ctxParam: Pattern | undefined
65-
if (fn?.type === 'FunctionDeclaration') {
66-
ctxParam = fn.params[0]
67-
} else if (fn?.type === 'ExpressionStatement') {
68-
if (fn.expression.type === 'ArrowFunctionExpression') {
69-
ctxParam = fn.expression.params[0]
70-
}
71-
}
72-
const fnScope = path.scope?.children[0]
73-
const bindings = Object.values(fnScope?.bindings || {})
74-
const ctxBinding = bindings.find(b => b?.identifierPath.node === ctxParam)
75-
useContext = Boolean(ctxBinding?.references.length)
76-
},
77-
})
78-
return useContext
79-
}
80-
8154
export class Registry {
8255
private info: Record<string, Promise<Info>> = {}
8356
private entries: Record<string, Promise<Entry>> = {}
@@ -91,10 +64,20 @@ export class Registry {
9164
if (!compiled) {
9265
return null
9366
}
94-
const fn = compiled.modifier
95-
const useContext = inferContext(fn)
96-
const returnType = compiled.typeInfo || { type: Type.Value }
97-
return { mod: fn, useContext, returnType }
67+
68+
const {
69+
modifier: fn,
70+
useContext = false,
71+
materialize = true,
72+
returnType = { type: Type.Value },
73+
} = compiled
74+
75+
return {
76+
mod: fn,
77+
useContext,
78+
materialize,
79+
returnType,
80+
}
9881
})
9982
return this.modifiers[mod]
10083
}

‎packages/lib/src/core/hooks.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ export type Modifier = (context: any, options: Record<string, unknown>) => any
2828
export type ModifierHook = (modifier: string) => MaybePromise<
2929
| {
3030
modifier: Modifier
31-
typeInfo?: TypeInfo
31+
useContext?: boolean
32+
materialize?: boolean
33+
returnType?: TypeInfo
3234
}
3335
| undefined
3436
>

‎packages/parser/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"@types/nearley": "^2.11.5",
3131
"acorn": "^8.15.0",
3232
"estree-toolkit": "^1.7.13",
33-
"globals": "^16.3.0",
33+
"globals": "^16.4.0",
3434
"lodash-es": "^4.17.21",
3535
"moo": "^0.5.2",
3636
"nearley": "^2.20.1",

‎packages/parser/src/passes/desugar.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const visitors = [
2323
dropDrills,
2424
]
2525

26-
export function desugar(ast: Program, macros: string[] = []) {
26+
export function desugar(ast: Program, macros: string[] = []): Program {
2727
const parsers = new RequestParsers()
2828
const program = visitors.reduce((ast, pass) => {
2929
parsers.reset()

0 commit comments

Comments
 (0)