goscript 0.0.84 → 0.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (428) hide show
  1. package/README.md +267 -243
  2. package/cmd/goscript/cmd-test.go +193 -0
  3. package/cmd/goscript/cmd-test_test.go +76 -0
  4. package/cmd/goscript/cmd_compile.go +70 -69
  5. package/cmd/goscript/cmd_compile_test.go +79 -0
  6. package/cmd/goscript/main.go +11 -5
  7. package/compiler/build-flags.go +38 -0
  8. package/compiler/compile-request.go +220 -0
  9. package/compiler/compiler.go +16 -1336
  10. package/compiler/compliance_test.go +188 -0
  11. package/compiler/config.go +6 -13
  12. package/compiler/diagnostic.go +70 -0
  13. package/compiler/gotest/owner.go +24 -0
  14. package/compiler/gotest/package-result.go +67 -0
  15. package/compiler/gotest/request.go +145 -0
  16. package/compiler/gotest/result.go +28 -0
  17. package/compiler/gotest/runner.go +588 -0
  18. package/compiler/gotest/runner_test.go +627 -0
  19. package/compiler/gotest/test.go +9 -0
  20. package/compiler/index.test.ts +28 -28
  21. package/compiler/index.ts +40 -72
  22. package/compiler/lowered-program.go +184 -0
  23. package/compiler/lowering.go +8072 -0
  24. package/compiler/override-facts.go +307 -0
  25. package/compiler/override-registry.go +283 -0
  26. package/compiler/override-registry_test.go +254 -0
  27. package/compiler/package-graph.go +254 -0
  28. package/compiler/package-graph_test.go +316 -0
  29. package/compiler/package-test-function.go +9 -0
  30. package/compiler/package-test-graph-package.go +40 -0
  31. package/compiler/package-test-graph-variant.go +105 -0
  32. package/compiler/package-test-graph.go +117 -0
  33. package/compiler/package-test-graph_test.go +144 -0
  34. package/compiler/result.go +13 -0
  35. package/compiler/runtime-contract.go +439 -0
  36. package/compiler/runtime-contract_test.go +104 -0
  37. package/compiler/semantic-model-types.go +113 -0
  38. package/compiler/semantic-model.go +1422 -0
  39. package/compiler/semantic-model_test.go +471 -0
  40. package/compiler/service.go +133 -0
  41. package/compiler/skeleton_test.go +1775 -0
  42. package/compiler/tsworkspace/owner.go +334 -0
  43. package/compiler/tsworkspace/owner_test.go +93 -0
  44. package/compiler/tsworkspace/result.go +17 -0
  45. package/compiler/typescript-emitter.go +1040 -0
  46. package/compiler/wasm/compile.go +2 -3
  47. package/compiler/wasm/compile_test.go +79 -0
  48. package/compiler/wasm_api.go +140 -124
  49. package/dist/compiler/index.d.ts +1 -3
  50. package/dist/compiler/index.js +31 -55
  51. package/dist/compiler/index.js.map +1 -1
  52. package/dist/gs/builtin/builtin.d.ts +33 -2
  53. package/dist/gs/builtin/builtin.js +217 -6
  54. package/dist/gs/builtin/builtin.js.map +1 -1
  55. package/dist/gs/builtin/channel.d.ts +11 -3
  56. package/dist/gs/builtin/channel.js +12 -0
  57. package/dist/gs/builtin/channel.js.map +1 -1
  58. package/dist/gs/builtin/hostio.d.ts +15 -1
  59. package/dist/gs/builtin/hostio.js +134 -49
  60. package/dist/gs/builtin/hostio.js.map +1 -1
  61. package/dist/gs/builtin/index.d.ts +1 -0
  62. package/dist/gs/builtin/index.js +1 -0
  63. package/dist/gs/builtin/index.js.map +1 -1
  64. package/dist/gs/builtin/slice.d.ts +23 -3
  65. package/dist/gs/builtin/slice.js +216 -44
  66. package/dist/gs/builtin/slice.js.map +1 -1
  67. package/dist/gs/builtin/type.d.ts +16 -2
  68. package/dist/gs/builtin/type.js +134 -21
  69. package/dist/gs/builtin/type.js.map +1 -1
  70. package/dist/gs/builtin/varRef.d.ts +5 -0
  71. package/dist/gs/builtin/varRef.js +23 -0
  72. package/dist/gs/builtin/varRef.js.map +1 -1
  73. package/dist/gs/bytes/buffer.gs.js +48 -44
  74. package/dist/gs/bytes/buffer.gs.js.map +1 -1
  75. package/dist/gs/bytes/bytes.gs.js.map +1 -1
  76. package/dist/gs/bytes/reader.gs.js +20 -18
  77. package/dist/gs/bytes/reader.gs.js.map +1 -1
  78. package/dist/gs/context/context.d.ts +5 -4
  79. package/dist/gs/context/context.js +10 -10
  80. package/dist/gs/context/context.js.map +1 -1
  81. package/dist/gs/crypto/internal/fips140deps/byteorder/index.d.ts +1 -0
  82. package/dist/gs/crypto/internal/fips140deps/byteorder/index.js +2 -0
  83. package/dist/gs/crypto/internal/fips140deps/byteorder/index.js.map +1 -0
  84. package/dist/gs/crypto/internal/fips140deps/godebug/index.d.ts +1 -0
  85. package/dist/gs/crypto/internal/fips140deps/godebug/index.js +2 -0
  86. package/dist/gs/crypto/internal/fips140deps/godebug/index.js.map +1 -0
  87. package/dist/gs/crypto/rand/index.d.ts +5 -0
  88. package/dist/gs/crypto/rand/index.js +77 -0
  89. package/dist/gs/crypto/rand/index.js.map +1 -0
  90. package/dist/gs/embed/index.d.ts +7 -0
  91. package/dist/gs/embed/index.js +16 -0
  92. package/dist/gs/embed/index.js.map +1 -0
  93. package/dist/gs/encoding/json/index.d.ts +4 -0
  94. package/dist/gs/encoding/json/index.js +178 -0
  95. package/dist/gs/encoding/json/index.js.map +1 -0
  96. package/dist/gs/errors/errors.d.ts +4 -0
  97. package/dist/gs/errors/errors.js +81 -0
  98. package/dist/gs/errors/errors.js.map +1 -1
  99. package/dist/gs/fmt/fmt.d.ts +4 -4
  100. package/dist/gs/fmt/fmt.js +42 -11
  101. package/dist/gs/fmt/fmt.js.map +1 -1
  102. package/dist/gs/github.com/aperturerobotics/protobuf-go-lite/index.d.ts +36 -1
  103. package/dist/gs/github.com/aperturerobotics/protobuf-go-lite/index.js +212 -2
  104. package/dist/gs/github.com/aperturerobotics/protobuf-go-lite/index.js.map +1 -1
  105. package/dist/gs/github.com/aperturerobotics/protobuf-go-lite/json/index.d.ts +189 -0
  106. package/dist/gs/github.com/aperturerobotics/protobuf-go-lite/json/index.js +825 -0
  107. package/dist/gs/github.com/aperturerobotics/protobuf-go-lite/json/index.js.map +1 -0
  108. package/dist/gs/github.com/aperturerobotics/starpc/srpc/index.d.ts +163 -0
  109. package/dist/gs/github.com/aperturerobotics/starpc/srpc/index.js +449 -0
  110. package/dist/gs/github.com/aperturerobotics/starpc/srpc/index.js.map +1 -0
  111. package/dist/gs/github.com/aperturerobotics/wasivm/wazero/kernel/runtime/browser/browser.js.map +1 -1
  112. package/dist/gs/github.com/klauspost/compress/internal/le/index.d.ts +9 -0
  113. package/dist/gs/github.com/klauspost/compress/internal/le/index.js +71 -0
  114. package/dist/gs/github.com/klauspost/compress/internal/le/index.js.map +1 -0
  115. package/dist/gs/github.com/pkg/errors/errors.js.map +1 -1
  116. package/dist/gs/github.com/pkg/errors/stack.js.map +1 -1
  117. package/dist/gs/go/internal/scannerhooks/index.d.ts +3 -0
  118. package/dist/gs/go/internal/scannerhooks/index.js +5 -0
  119. package/dist/gs/go/internal/scannerhooks/index.js.map +1 -0
  120. package/dist/gs/go/scanner/index.d.ts +42 -0
  121. package/dist/gs/go/scanner/index.js +155 -0
  122. package/dist/gs/go/scanner/index.js.map +1 -0
  123. package/dist/gs/go/token/index.d.ts +187 -0
  124. package/dist/gs/go/token/index.js +578 -0
  125. package/dist/gs/go/token/index.js.map +1 -0
  126. package/dist/gs/internal/abi/index.d.ts +4 -0
  127. package/dist/gs/internal/abi/index.js +10 -0
  128. package/dist/gs/internal/abi/index.js.map +1 -1
  129. package/dist/gs/internal/bytealg/index.d.ts +2 -0
  130. package/dist/gs/internal/bytealg/index.js +14 -0
  131. package/dist/gs/internal/bytealg/index.js.map +1 -1
  132. package/dist/gs/internal/byteorder/index.d.ts +8 -2
  133. package/dist/gs/internal/byteorder/index.js +56 -25
  134. package/dist/gs/internal/byteorder/index.js.map +1 -1
  135. package/dist/gs/internal/godebug/index.d.ts +12 -0
  136. package/dist/gs/internal/godebug/index.js +30 -0
  137. package/dist/gs/internal/godebug/index.js.map +1 -0
  138. package/dist/gs/io/fs/fs.js.map +1 -1
  139. package/dist/gs/io/fs/index.d.ts +1 -0
  140. package/dist/gs/io/fs/index.js +1 -0
  141. package/dist/gs/io/fs/index.js.map +1 -1
  142. package/dist/gs/io/fs/readdir.js.map +1 -1
  143. package/dist/gs/io/fs/readfile.js.map +1 -1
  144. package/dist/gs/io/fs/readlink.d.ts +8 -0
  145. package/dist/gs/io/fs/readlink.js +64 -0
  146. package/dist/gs/io/fs/readlink.js.map +1 -0
  147. package/dist/gs/io/fs/stat.js.map +1 -1
  148. package/dist/gs/io/fs/sub.js.map +1 -1
  149. package/dist/gs/io/fs/walk.d.ts +3 -3
  150. package/dist/gs/io/fs/walk.js +7 -7
  151. package/dist/gs/io/fs/walk.js.map +1 -1
  152. package/dist/gs/io/io.d.ts +40 -6
  153. package/dist/gs/io/io.js +151 -26
  154. package/dist/gs/io/io.js.map +1 -1
  155. package/dist/gs/maps/iter.d.ts +3 -3
  156. package/dist/gs/maps/iter.js +3 -3
  157. package/dist/gs/maps/iter.js.map +1 -1
  158. package/dist/gs/maps/maps.d.ts +2 -2
  159. package/dist/gs/maps/maps.js +1 -1
  160. package/dist/gs/maps/maps.js.map +1 -1
  161. package/dist/gs/math/bits/index.d.ts +13 -4
  162. package/dist/gs/math/bits/index.js +66 -34
  163. package/dist/gs/math/bits/index.js.map +1 -1
  164. package/dist/gs/math/const.gs.d.ts +5 -5
  165. package/dist/gs/math/const.gs.js +4 -4
  166. package/dist/gs/math/const.gs.js.map +1 -1
  167. package/dist/gs/mime/index.d.ts +1 -0
  168. package/dist/gs/mime/index.js +50 -0
  169. package/dist/gs/mime/index.js.map +1 -0
  170. package/dist/gs/net/http/httptest/index.d.ts +11 -0
  171. package/dist/gs/net/http/httptest/index.js +21 -0
  172. package/dist/gs/net/http/httptest/index.js.map +1 -0
  173. package/dist/gs/net/http/index.d.ts +27 -0
  174. package/dist/gs/net/http/index.js +61 -0
  175. package/dist/gs/net/http/index.js.map +1 -0
  176. package/dist/gs/os/dir_unix.gs.js +2 -2
  177. package/dist/gs/os/dir_unix.gs.js.map +1 -1
  178. package/dist/gs/os/error.gs.js +2 -4
  179. package/dist/gs/os/error.gs.js.map +1 -1
  180. package/dist/gs/os/exec.gs.js.map +1 -1
  181. package/dist/gs/os/exec_posix.gs.js.map +1 -1
  182. package/dist/gs/os/rawconn_js.gs.js.map +1 -1
  183. package/dist/gs/os/root_js.gs.js.map +1 -1
  184. package/dist/gs/os/tempfile.gs.js +66 -9
  185. package/dist/gs/os/tempfile.gs.js.map +1 -1
  186. package/dist/gs/os/types.gs.js.map +1 -1
  187. package/dist/gs/os/types_js.gs.js +9 -9
  188. package/dist/gs/os/types_js.gs.js.map +1 -1
  189. package/dist/gs/os/types_unix.gs.js.map +1 -1
  190. package/dist/gs/path/filepath/match.js +165 -3
  191. package/dist/gs/path/filepath/match.js.map +1 -1
  192. package/dist/gs/path/filepath/path.d.ts +3 -1
  193. package/dist/gs/path/filepath/path.js +133 -4
  194. package/dist/gs/path/filepath/path.js.map +1 -1
  195. package/dist/gs/path/match.js.map +1 -1
  196. package/dist/gs/path/path.d.ts +4 -1
  197. package/dist/gs/path/path.js +16 -4
  198. package/dist/gs/path/path.js.map +1 -1
  199. package/dist/gs/reflect/index.d.ts +3 -3
  200. package/dist/gs/reflect/index.js +2 -2
  201. package/dist/gs/reflect/index.js.map +1 -1
  202. package/dist/gs/reflect/map.js +3 -0
  203. package/dist/gs/reflect/map.js.map +1 -1
  204. package/dist/gs/reflect/type.d.ts +9 -5
  205. package/dist/gs/reflect/type.js +233 -21
  206. package/dist/gs/reflect/type.js.map +1 -1
  207. package/dist/gs/reflect/types.js.map +1 -1
  208. package/dist/gs/reflect/visiblefields.js.map +1 -1
  209. package/dist/gs/runtime/debug/index.d.ts +2 -0
  210. package/dist/gs/runtime/debug/index.js +8 -0
  211. package/dist/gs/runtime/debug/index.js.map +1 -0
  212. package/dist/gs/runtime/runtime.d.ts +35 -3
  213. package/dist/gs/runtime/runtime.js +72 -0
  214. package/dist/gs/runtime/runtime.js.map +1 -1
  215. package/dist/gs/slices/slices.d.ts +24 -5
  216. package/dist/gs/slices/slices.js +214 -5
  217. package/dist/gs/slices/slices.js.map +1 -1
  218. package/dist/gs/sort/slice.gs.d.ts +3 -3
  219. package/dist/gs/sort/slice.gs.js +6 -6
  220. package/dist/gs/sort/slice.gs.js.map +1 -1
  221. package/dist/gs/sort/sort.gs.d.ts +4 -4
  222. package/dist/gs/sort/sort.gs.js +11 -8
  223. package/dist/gs/sort/sort.gs.js.map +1 -1
  224. package/dist/gs/strconv/atoi.gs.js.map +1 -1
  225. package/dist/gs/strconv/quote.gs.js.map +1 -1
  226. package/dist/gs/strings/builder.d.ts +1 -1
  227. package/dist/gs/strings/builder.js +3 -2
  228. package/dist/gs/strings/builder.js.map +1 -1
  229. package/dist/gs/strings/reader.js.map +1 -1
  230. package/dist/gs/strings/replace.js.map +1 -1
  231. package/dist/gs/sync/atomic/type.gs.d.ts +9 -8
  232. package/dist/gs/sync/atomic/type.gs.js +0 -2
  233. package/dist/gs/sync/atomic/type.gs.js.map +1 -1
  234. package/dist/gs/sync/atomic/value.gs.js.map +1 -1
  235. package/dist/gs/sync/sync.d.ts +3 -0
  236. package/dist/gs/sync/sync.js +39 -0
  237. package/dist/gs/sync/sync.js.map +1 -1
  238. package/dist/gs/syscall/constants.d.ts +36 -24
  239. package/dist/gs/syscall/constants.js +12 -0
  240. package/dist/gs/syscall/constants.js.map +1 -1
  241. package/dist/gs/syscall/errors.d.ts +2 -0
  242. package/dist/gs/syscall/errors.js +8 -0
  243. package/dist/gs/syscall/errors.js.map +1 -1
  244. package/dist/gs/syscall/fs.d.ts +43 -0
  245. package/dist/gs/syscall/fs.js +102 -0
  246. package/dist/gs/syscall/fs.js.map +1 -1
  247. package/dist/gs/syscall/js/index.d.ts +90 -0
  248. package/dist/gs/syscall/js/index.js +375 -0
  249. package/dist/gs/syscall/js/index.js.map +1 -0
  250. package/dist/gs/syscall/types.d.ts +22 -0
  251. package/dist/gs/syscall/types.js +45 -1
  252. package/dist/gs/syscall/types.js.map +1 -1
  253. package/dist/gs/testing/index.d.ts +1 -0
  254. package/dist/gs/testing/index.js +2 -0
  255. package/dist/gs/testing/index.js.map +1 -0
  256. package/dist/gs/testing/testing.d.ts +77 -0
  257. package/dist/gs/testing/testing.js +301 -0
  258. package/dist/gs/testing/testing.js.map +1 -0
  259. package/dist/gs/time/time.d.ts +41 -4
  260. package/dist/gs/time/time.js +205 -36
  261. package/dist/gs/time/time.js.map +1 -1
  262. package/dist/gs/unicode/unicode.d.ts +23 -1
  263. package/dist/gs/unicode/unicode.js +79 -10
  264. package/dist/gs/unicode/unicode.js.map +1 -1
  265. package/dist/gs/unicode/utf8/utf8.d.ts +4 -4
  266. package/dist/gs/unicode/utf8/utf8.js +24 -11
  267. package/dist/gs/unicode/utf8/utf8.js.map +1 -1
  268. package/dist/gs/unique/index.d.ts +11 -0
  269. package/dist/gs/unique/index.js +71 -0
  270. package/dist/gs/unique/index.js.map +1 -0
  271. package/go.mod +2 -2
  272. package/go.sum +9 -0
  273. package/gs/builtin/builtin.ts +266 -8
  274. package/gs/builtin/channel.ts +22 -0
  275. package/gs/builtin/hostio.test.ts +177 -0
  276. package/gs/builtin/hostio.ts +171 -56
  277. package/gs/builtin/index.ts +1 -0
  278. package/gs/builtin/runtime-contract.test.ts +356 -0
  279. package/gs/builtin/slice.ts +259 -50
  280. package/gs/builtin/type.ts +188 -30
  281. package/gs/builtin/varRef.ts +38 -1
  282. package/gs/bytes/buffer.gs.ts +48 -44
  283. package/gs/bytes/meta.json +8 -3
  284. package/gs/bytes/reader.gs.ts +20 -19
  285. package/gs/context/context.test.ts +41 -0
  286. package/gs/context/context.ts +22 -26
  287. package/gs/crypto/internal/fips140deps/byteorder/index.ts +1 -0
  288. package/gs/crypto/internal/fips140deps/godebug/index.ts +1 -0
  289. package/gs/crypto/rand/index.test.ts +32 -0
  290. package/gs/crypto/rand/index.ts +90 -0
  291. package/gs/crypto/rand/meta.json +5 -0
  292. package/gs/embed/index.ts +20 -0
  293. package/gs/embed/meta.json +5 -0
  294. package/gs/encoding/json/index.test.ts +79 -0
  295. package/gs/encoding/json/index.ts +210 -0
  296. package/gs/errors/errors.test.ts +82 -0
  297. package/gs/errors/errors.ts +104 -0
  298. package/gs/fmt/fmt.ts +56 -16
  299. package/gs/github.com/aperturerobotics/protobuf-go-lite/index.test.ts +95 -0
  300. package/gs/github.com/aperturerobotics/protobuf-go-lite/index.ts +300 -2
  301. package/gs/github.com/aperturerobotics/protobuf-go-lite/json/index.test.ts +159 -0
  302. package/gs/github.com/aperturerobotics/protobuf-go-lite/json/index.ts +1005 -0
  303. package/gs/github.com/aperturerobotics/starpc/srpc/index.ts +719 -0
  304. package/gs/github.com/aperturerobotics/starpc/srpc/meta.json +40 -0
  305. package/gs/github.com/aperturerobotics/wasivm/wazero/kernel/runtime/browser/meta.json +3 -1
  306. package/gs/github.com/klauspost/compress/internal/le/index.test.ts +36 -0
  307. package/gs/github.com/klauspost/compress/internal/le/index.ts +114 -0
  308. package/gs/go/internal/scannerhooks/index.test.ts +14 -0
  309. package/gs/go/internal/scannerhooks/index.ts +9 -0
  310. package/gs/go/scanner/index.test.ts +72 -0
  311. package/gs/go/scanner/index.ts +204 -0
  312. package/gs/go/token/index.test.ts +67 -0
  313. package/gs/go/token/index.ts +686 -0
  314. package/gs/internal/abi/index.test.ts +18 -0
  315. package/gs/internal/abi/index.ts +14 -0
  316. package/gs/internal/bytealg/index.test.ts +18 -0
  317. package/gs/internal/bytealg/index.ts +16 -0
  318. package/gs/internal/byteorder/index.test.ts +39 -0
  319. package/gs/internal/byteorder/index.ts +100 -27
  320. package/gs/internal/godebug/index.test.ts +16 -0
  321. package/gs/internal/godebug/index.ts +35 -0
  322. package/gs/io/fs/index.ts +1 -0
  323. package/gs/io/fs/meta.json +5 -0
  324. package/gs/io/fs/readlink.test.ts +43 -0
  325. package/gs/io/fs/readlink.ts +77 -0
  326. package/gs/io/fs/walk.test.ts +61 -0
  327. package/gs/io/fs/walk.ts +9 -9
  328. package/gs/io/io.ts +174 -31
  329. package/gs/io/meta.json +10 -2
  330. package/gs/maps/iter.ts +12 -6
  331. package/gs/maps/maps.ts +8 -6
  332. package/gs/math/bits/index.ts +103 -47
  333. package/gs/math/const.gs.test.ts +11 -5
  334. package/gs/math/const.gs.ts +5 -6
  335. package/gs/mime/index.ts +54 -0
  336. package/gs/net/http/httptest/index.ts +25 -0
  337. package/gs/net/http/index.test.ts +20 -0
  338. package/gs/net/http/index.ts +81 -0
  339. package/gs/os/dir_unix.gs.ts +2 -3
  340. package/gs/os/file_unix_js.test.ts +50 -0
  341. package/gs/os/meta.json +1 -2
  342. package/gs/os/tempfile.gs.test.ts +85 -0
  343. package/gs/os/tempfile.gs.ts +71 -11
  344. package/gs/os/types_js.gs.ts +11 -11
  345. package/gs/path/filepath/match.test.ts +31 -12
  346. package/gs/path/filepath/match.ts +178 -3
  347. package/gs/path/filepath/path.test.ts +25 -0
  348. package/gs/path/filepath/path.ts +159 -5
  349. package/gs/path/path.ts +20 -5
  350. package/gs/reflect/index.ts +2 -1
  351. package/gs/reflect/map.test.ts +19 -0
  352. package/gs/reflect/map.ts +4 -0
  353. package/gs/reflect/type.ts +298 -29
  354. package/gs/reflect/typefor.test.ts +75 -0
  355. package/gs/runtime/debug/index.test.ts +24 -0
  356. package/gs/runtime/debug/index.ts +8 -0
  357. package/gs/runtime/runtime.test.ts +19 -0
  358. package/gs/runtime/runtime.ts +98 -3
  359. package/gs/slices/slices.test.ts +94 -0
  360. package/gs/slices/slices.ts +245 -5
  361. package/gs/sort/meta.json +7 -0
  362. package/gs/sort/slice.gs.ts +16 -7
  363. package/gs/sort/sort.gs.ts +16 -13
  364. package/gs/strings/builder.ts +4 -3
  365. package/gs/sync/atomic/type.gs.ts +13 -14
  366. package/gs/sync/meta.json +3 -1
  367. package/gs/sync/sync.test.ts +36 -0
  368. package/gs/sync/sync.ts +39 -0
  369. package/gs/syscall/constants.ts +39 -24
  370. package/gs/syscall/errors.ts +10 -0
  371. package/gs/syscall/fs.ts +195 -0
  372. package/gs/syscall/js/index.ts +458 -0
  373. package/gs/syscall/js/meta.json +4 -0
  374. package/gs/syscall/net.test.ts +85 -0
  375. package/gs/syscall/types.ts +56 -0
  376. package/gs/testing/index.ts +1 -0
  377. package/gs/testing/meta.json +5 -0
  378. package/gs/testing/testing.test.ts +90 -0
  379. package/gs/testing/testing.ts +382 -0
  380. package/gs/time/time.test.ts +106 -0
  381. package/gs/time/time.ts +278 -57
  382. package/gs/unicode/unicode.test.ts +25 -0
  383. package/gs/unicode/unicode.ts +119 -9
  384. package/gs/unicode/utf8/utf8.test.ts +13 -0
  385. package/gs/unicode/utf8/utf8.ts +28 -16
  386. package/gs/unique/index.ts +91 -0
  387. package/package.json +14 -13
  388. package/compiler/analysis.go +0 -3475
  389. package/compiler/analysis_test.go +0 -338
  390. package/compiler/assignment.go +0 -580
  391. package/compiler/builtin_test.go +0 -92
  392. package/compiler/code-writer.go +0 -115
  393. package/compiler/compiler_test.go +0 -149
  394. package/compiler/composite-lit.go +0 -779
  395. package/compiler/config_test.go +0 -62
  396. package/compiler/constraint.go +0 -86
  397. package/compiler/decl.go +0 -801
  398. package/compiler/expr-call-async.go +0 -188
  399. package/compiler/expr-call-builtins.go +0 -208
  400. package/compiler/expr-call-helpers.go +0 -382
  401. package/compiler/expr-call-make.go +0 -318
  402. package/compiler/expr-call-type-conversion.go +0 -520
  403. package/compiler/expr-call.go +0 -413
  404. package/compiler/expr-selector.go +0 -343
  405. package/compiler/expr-star.go +0 -82
  406. package/compiler/expr-type.go +0 -442
  407. package/compiler/expr-value.go +0 -89
  408. package/compiler/expr.go +0 -773
  409. package/compiler/field.go +0 -183
  410. package/compiler/gs_dependencies_test.go +0 -298
  411. package/compiler/lit.go +0 -322
  412. package/compiler/output.go +0 -72
  413. package/compiler/primitive.go +0 -149
  414. package/compiler/protobuf.go +0 -697
  415. package/compiler/sanitize.go +0 -100
  416. package/compiler/spec-struct.go +0 -995
  417. package/compiler/spec-value.go +0 -540
  418. package/compiler/spec.go +0 -725
  419. package/compiler/stmt-assign.go +0 -664
  420. package/compiler/stmt-for.go +0 -266
  421. package/compiler/stmt-range.go +0 -475
  422. package/compiler/stmt-select.go +0 -262
  423. package/compiler/stmt-type-switch.go +0 -147
  424. package/compiler/stmt.go +0 -1308
  425. package/compiler/type-assert.go +0 -386
  426. package/compiler/type-info.go +0 -156
  427. package/compiler/type-utils.go +0 -207
  428. package/compiler/type.go +0 -892
@@ -0,0 +1,40 @@
1
+ {
2
+ "dependencies": [
3
+ "context",
4
+ "errors",
5
+ "io",
6
+ "github.com/aperturerobotics/protobuf-go-lite"
7
+ ],
8
+ "asyncMethods": {
9
+ "Client.ExecCall": true,
10
+ "Client.NewStream": true,
11
+ "ClientSet.ExecCall": true,
12
+ "ClientSet.NewStream": true,
13
+ "PrefixClient.ExecCall": true,
14
+ "PrefixClient.NewStream": true,
15
+ "Stream.MsgSend": true,
16
+ "Stream.MsgRecv": true,
17
+ "Stream.CloseSend": true,
18
+ "Stream.Close": true,
19
+ "StreamRecv.MsgRecv": true,
20
+ "StreamRecv.CloseSend": true,
21
+ "StreamRecv.Close": true,
22
+ "StreamRecv.Recv": true,
23
+ "StreamRecv.RecvTo": true,
24
+ "StreamSend.MsgSend": true,
25
+ "StreamSend.CloseSend": true,
26
+ "StreamSend.Close": true,
27
+ "StreamSend.Send": true,
28
+ "StreamSendAndClose.MsgSend": true,
29
+ "StreamSendAndClose.CloseSend": true,
30
+ "StreamSendAndClose.Close": true,
31
+ "StreamSendAndClose.Send": true,
32
+ "StreamSendAndClose.SendAndClose": true,
33
+ "InvokerFunc.InvokeMethod": true,
34
+ "InvokerSlice.InvokeMethod": true,
35
+ "Invoker.InvokeMethod": true,
36
+ "PrefixInvoker.InvokeMethod": true,
37
+ "Handler.InvokeMethod": true,
38
+ "Mux.InvokeMethod": true
39
+ }
40
+ }
@@ -1,5 +1,7 @@
1
1
  {
2
- "dependencies": [],
2
+ "dependencies": [
3
+ "github.com/aperturerobotics/wasivm/wazero/kernel/runtime"
4
+ ],
3
5
  "asyncMethods": {
4
6
  "Runtime.Compile": true,
5
7
  "Runtime.Close": true,
@@ -0,0 +1,36 @@
1
+ import { describe, expect, it } from 'vitest'
2
+
3
+ import { arrayToSlice } from '@goscript/builtin/index.js'
4
+ import { TrailingZeros64 } from '@goscript/math/bits/index.js'
5
+
6
+ import { Load32, Load64, Store64 } from './index.js'
7
+
8
+ function bytes(value: string): number[] {
9
+ return Array.from(value, (char) => char.charCodeAt(0))
10
+ }
11
+
12
+ function matchBytes(a: number[], b: number[]): number {
13
+ const diff = (Load64(undefined, arrayToSlice(a), 0) as unknown as bigint) ^
14
+ (Load64(undefined, arrayToSlice(b), 0) as unknown as bigint)
15
+ return TrailingZeros64(diff) >> 3
16
+ }
17
+
18
+ describe('klauspost internal le override', () => {
19
+ it('loads 32-bit little-endian values as unsigned numbers', () => {
20
+ expect(Load32(undefined, arrayToSlice([0x78, 0x78, 0x78, 0x78]), 0)).toBe(
21
+ 2021161080,
22
+ )
23
+ })
24
+
25
+ it('keeps high-byte 64-bit differences exact for S2 match length', () => {
26
+ const base = bytes('xxxxxxxx')
27
+ expect(matchBytes(base, bytes('yxxxxxxx'))).toBe(0)
28
+ expect(matchBytes(base, bytes('xxxxyxxx'))).toBe(4)
29
+ })
30
+
31
+ it('stores 64-bit little-endian values at the requested offset', () => {
32
+ const out = arrayToSlice<number>([0, 0, 0, 0, 0, 0, 0, 0, 0, 0])
33
+ Store64(undefined, out, 1, 0x0102030405060708n)
34
+ expect(Array.from(out!)).toEqual([0, 8, 7, 6, 5, 4, 3, 2, 1, 0])
35
+ })
36
+ })
@@ -0,0 +1,114 @@
1
+ import * as $ from '@goscript/builtin/index.js'
2
+
3
+ export type Indexer = number
4
+
5
+ function index(value: unknown): number {
6
+ return Number(value)
7
+ }
8
+
9
+ function byteAt(b: $.Slice<number>, i: number): number {
10
+ return b![i] ?? 0
11
+ }
12
+
13
+ function isSlice(value: unknown): value is $.Slice<number> {
14
+ return (
15
+ Array.isArray(value) ||
16
+ value === null ||
17
+ value instanceof Uint8Array ||
18
+ (typeof value === 'object' && value !== undefined && '__meta__' in value)
19
+ )
20
+ }
21
+
22
+ function loadArgs(
23
+ typeArgsOrB: $.GenericTypeArgs | $.Slice<number> | undefined,
24
+ bOrI?: $.Slice<number> | unknown,
25
+ i?: unknown,
26
+ ): [$.Slice<number>, number] {
27
+ if (isSlice(typeArgsOrB)) {
28
+ return [typeArgsOrB, index(bOrI)]
29
+ }
30
+ return [bOrI as $.Slice<number>, index(i)]
31
+ }
32
+
33
+ export function Load8(
34
+ typeArgsOrB: $.GenericTypeArgs | $.Slice<number> | undefined,
35
+ bOrI?: $.Slice<number> | unknown,
36
+ i?: unknown,
37
+ ): number {
38
+ const [b, off] = loadArgs(typeArgsOrB, bOrI, i)
39
+ return byteAt(b, off)
40
+ }
41
+
42
+ export function Load16(
43
+ typeArgsOrB: $.GenericTypeArgs | $.Slice<number> | undefined,
44
+ bOrI?: $.Slice<number> | unknown,
45
+ i?: unknown,
46
+ ): number {
47
+ const [b, off] = loadArgs(typeArgsOrB, bOrI, i)
48
+ return byteAt(b, off) | (byteAt(b, off + 1) << 8)
49
+ }
50
+
51
+ export function Load32(
52
+ typeArgsOrB: $.GenericTypeArgs | $.Slice<number> | undefined,
53
+ bOrI?: $.Slice<number> | unknown,
54
+ i?: unknown,
55
+ ): number {
56
+ const [b, off] = loadArgs(typeArgsOrB, bOrI, i)
57
+ return (
58
+ byteAt(b, off) |
59
+ (byteAt(b, off + 1) << 8) |
60
+ (byteAt(b, off + 2) << 16) |
61
+ (byteAt(b, off + 3) << 24)
62
+ ) >>> 0
63
+ }
64
+
65
+ export function Load64(
66
+ typeArgsOrB: $.GenericTypeArgs | $.Slice<number> | undefined,
67
+ bOrI?: $.Slice<number> | unknown,
68
+ i?: unknown,
69
+ ): number {
70
+ const [b, off] = loadArgs(typeArgsOrB, bOrI, i)
71
+ const value =
72
+ BigInt(byteAt(b, off)) |
73
+ (BigInt(byteAt(b, off + 1)) << 8n) |
74
+ (BigInt(byteAt(b, off + 2)) << 16n) |
75
+ (BigInt(byteAt(b, off + 3)) << 24n) |
76
+ (BigInt(byteAt(b, off + 4)) << 32n) |
77
+ (BigInt(byteAt(b, off + 5)) << 40n) |
78
+ (BigInt(byteAt(b, off + 6)) << 48n) |
79
+ (BigInt(byteAt(b, off + 7)) << 56n)
80
+ return value as unknown as number
81
+ }
82
+
83
+ export function Store16(b: $.Slice<number>, v: number): void {
84
+ b![0] = v & 0xff
85
+ b![1] = (v >> 8) & 0xff
86
+ }
87
+
88
+ export function Store32(b: $.Slice<number>, v: number): void {
89
+ b![0] = v & 0xff
90
+ b![1] = (v >> 8) & 0xff
91
+ b![2] = (v >> 16) & 0xff
92
+ b![3] = (v >> 24) & 0xff
93
+ }
94
+
95
+ export function Store64(
96
+ typeArgsOrB: $.GenericTypeArgs | $.Slice<number> | undefined,
97
+ bOrI?: $.Slice<number> | unknown,
98
+ iOrV?: unknown,
99
+ maybeV?: number | bigint,
100
+ ): void {
101
+ const genericCall = !isSlice(typeArgsOrB)
102
+ const b = (genericCall ? bOrI : typeArgsOrB) as $.Slice<number>
103
+ const off = genericCall ? index(iOrV) : index(bOrI)
104
+ const v = genericCall ? maybeV : iOrV
105
+ const value = BigInt(v as number | bigint) & ((1n << 64n) - 1n)
106
+ b![off] = Number(value & 0xffn)
107
+ b![off + 1] = Number((value >> 8n) & 0xffn)
108
+ b![off + 2] = Number((value >> 16n) & 0xffn)
109
+ b![off + 3] = Number((value >> 24n) & 0xffn)
110
+ b![off + 4] = Number((value >> 32n) & 0xffn)
111
+ b![off + 5] = Number((value >> 40n) & 0xffn)
112
+ b![off + 6] = Number((value >> 48n) & 0xffn)
113
+ b![off + 7] = Number((value >> 56n) & 0xffn)
114
+ }
@@ -0,0 +1,14 @@
1
+ import { describe, expect, it } from 'vitest'
2
+
3
+ import { StringEnd, __goscript_set_StringEnd } from './index.js'
4
+
5
+ describe('go/internal/scannerhooks override', () => {
6
+ it('stores a synchronous StringEnd hook', () => {
7
+ __goscript_set_StringEnd(() => 12)
8
+
9
+ expect(StringEnd?.({})).toBe(12)
10
+
11
+ __goscript_set_StringEnd(null)
12
+ expect(StringEnd).toBeNull()
13
+ })
14
+ })
@@ -0,0 +1,9 @@
1
+ import type * as token from '@goscript/go/token/index.js'
2
+
3
+ export let StringEnd: ((scanner: any) => token.Pos) | null = null
4
+
5
+ export function __goscript_set_StringEnd(
6
+ value: ((scanner: any) => token.Pos) | null,
7
+ ): void {
8
+ StringEnd = value
9
+ }
@@ -0,0 +1,72 @@
1
+ import { describe, expect, it } from 'vitest'
2
+
3
+ import * as $ from '@goscript/builtin/index.js'
4
+ import * as token from '@goscript/go/token/index.js'
5
+
6
+ import {
7
+ ErrorList_Add,
8
+ ErrorList_Err,
9
+ ErrorList_Error,
10
+ ErrorList_Len,
11
+ ErrorList_RemoveMultiples,
12
+ Scanner,
13
+ type ErrorList,
14
+ } from './index.js'
15
+
16
+ describe('go/scanner override', () => {
17
+ it('adds and formats scanner errors', () => {
18
+ const list: $.VarRef<ErrorList> = $.varRef(null)
19
+
20
+ ErrorList_Add(
21
+ list,
22
+ $.markAsStructValue(
23
+ new token.Position({
24
+ Filename: 'test.go',
25
+ Line: 1,
26
+ Column: 1,
27
+ }),
28
+ ),
29
+ 'test error',
30
+ )
31
+
32
+ expect(ErrorList_Len(list.value)).toBe(1)
33
+ expect(ErrorList_Error(list.value)).toBe('test.go:1:1: test error')
34
+ })
35
+
36
+ it('removes repeated line errors', () => {
37
+ const list: $.VarRef<ErrorList> = $.varRef(null)
38
+ const pos = $.markAsStructValue(
39
+ new token.Position({
40
+ Filename: 'test.go',
41
+ Line: 1,
42
+ Column: 1,
43
+ }),
44
+ )
45
+
46
+ ErrorList_Add(list, pos, 'first')
47
+ ErrorList_Add(list, pos, 'second')
48
+ ErrorList_RemoveMultiples(list)
49
+
50
+ expect(ErrorList_Len(list.value)).toBe(1)
51
+ })
52
+
53
+ it('returns nil Err for an empty list and an error for non-empty lists', () => {
54
+ const empty: ErrorList = null
55
+ expect(ErrorList_Err(empty)).toBeNull()
56
+
57
+ const list: $.VarRef<ErrorList> = $.varRef(null)
58
+ ErrorList_Add(list, new token.Position({ Line: 1 }), 'first')
59
+ expect(ErrorList_Err(list.value)?.Error()).toBe('1: first')
60
+ })
61
+
62
+ it('provides a Scanner surface for generated go/parser code', () => {
63
+ const fset = token.NewFileSet()
64
+ const file = fset.AddFile('test.go', -1, 0)
65
+ const scanner = new Scanner()
66
+
67
+ scanner.Init(file, null, null, 0)
68
+
69
+ expect(scanner.Scan()).toEqual([file.Pos(0), token.EOF, ''])
70
+ expect(scanner.Scan()).toEqual([file.Pos(0), token.EOF, ''])
71
+ })
72
+ })
@@ -0,0 +1,204 @@
1
+ import * as $ from '@goscript/builtin/index.js'
2
+ import * as token from '@goscript/go/token/index.js'
3
+
4
+ export class Error {
5
+ public get Pos(): token.Position {
6
+ return this._fields.Pos.value
7
+ }
8
+
9
+ public set Pos(value: token.Position) {
10
+ this._fields.Pos.value = value
11
+ }
12
+
13
+ public get Msg(): string {
14
+ return this._fields.Msg.value
15
+ }
16
+
17
+ public set Msg(value: string) {
18
+ this._fields.Msg.value = value
19
+ }
20
+
21
+ public _fields: {
22
+ Pos: $.VarRef<token.Position>
23
+ Msg: $.VarRef<string>
24
+ }
25
+
26
+ constructor(init?: Partial<{ Pos: token.Position; Msg: string }>) {
27
+ this._fields = {
28
+ Pos: $.varRef(init?.Pos ?? new token.Position()),
29
+ Msg: $.varRef(init?.Msg ?? ''),
30
+ }
31
+ }
32
+
33
+ public clone(): Error {
34
+ return $.markAsStructValue(
35
+ new Error({
36
+ Pos: this.Pos.clone(),
37
+ Msg: this.Msg,
38
+ }),
39
+ )
40
+ }
41
+
42
+ public Error(): string {
43
+ return Error_Error(this)
44
+ }
45
+
46
+ static __typeInfo = $.registerStructType(
47
+ 'go/scanner.Error',
48
+ new Error(),
49
+ [
50
+ {
51
+ name: 'Error',
52
+ args: [],
53
+ returns: [{ type: { kind: $.TypeKind.Basic, name: 'string' } }],
54
+ },
55
+ ],
56
+ Error,
57
+ {
58
+ Pos: { type: 'go/token.Position' },
59
+ Msg: { kind: $.TypeKind.Basic, name: 'string' },
60
+ },
61
+ )
62
+ }
63
+
64
+ export type ErrorList = $.Slice<Error | null>
65
+ export type ErrorHandler = (pos: token.Position, msg: string) => void
66
+ export type Mode = number
67
+
68
+ export const ScanComments = 1
69
+
70
+ export class Scanner {
71
+ public ErrorCount = 0
72
+ private file: token.File | null = null
73
+ private src: $.Slice<number> = null
74
+ private err: ErrorHandler | null = null
75
+ private done = false
76
+
77
+ public clone(): Scanner {
78
+ const scanner = new Scanner()
79
+ scanner.ErrorCount = this.ErrorCount
80
+ scanner.file = this.file
81
+ scanner.src = this.src
82
+ scanner.err = this.err
83
+ scanner.done = this.done
84
+ return scanner
85
+ }
86
+
87
+ public Init(
88
+ file: token.File | $.VarRef<token.File> | null,
89
+ src: $.Slice<number>,
90
+ err: ErrorHandler | null,
91
+ _mode: Mode,
92
+ ): void {
93
+ this.file = file === null ? null : $.pointerValue<token.File>(file)
94
+ this.src = src
95
+ this.err = err
96
+ this.done = false
97
+ }
98
+
99
+ public Scan(): [token.Pos, token.Token, string] {
100
+ if (this.done) {
101
+ return [this.file?.Pos($.len(this.src)) ?? token.NoPos, token.EOF, '']
102
+ }
103
+ this.done = true
104
+ return [this.file?.Pos(0) ?? token.NoPos, token.EOF, '']
105
+ }
106
+ }
107
+
108
+ export function Error_Error(err: Error): string {
109
+ if (!err.Pos.IsValid()) {
110
+ return err.Msg
111
+ }
112
+ return `${err.Pos.String()}: ${err.Msg}`
113
+ }
114
+
115
+ export function ErrorList_Add(
116
+ list: $.VarRef<ErrorList>,
117
+ pos: token.Position,
118
+ msg: string,
119
+ ): void {
120
+ list.value = $.append(
121
+ list.value,
122
+ $.markAsStructValue(new Error({ Pos: pos, Msg: msg })),
123
+ )
124
+ }
125
+
126
+ export function ErrorList_Len(list: ErrorList): number {
127
+ return $.len(list)
128
+ }
129
+
130
+ export function ErrorList_Less(list: ErrorList, i: number, j: number): boolean {
131
+ const left = list![i]!
132
+ const right = list![j]!
133
+ if (left.Pos.Filename !== right.Pos.Filename) {
134
+ return left.Pos.Filename < right.Pos.Filename
135
+ }
136
+ if (left.Pos.Line !== right.Pos.Line) {
137
+ return left.Pos.Line < right.Pos.Line
138
+ }
139
+ if (left.Pos.Column !== right.Pos.Column) {
140
+ return left.Pos.Column < right.Pos.Column
141
+ }
142
+ return left.Msg < right.Msg
143
+ }
144
+
145
+ export function ErrorList_Swap(list: ErrorList, i: number, j: number): void {
146
+ const first = list![i]
147
+ list![i] = list![j]
148
+ list![j] = first
149
+ }
150
+
151
+ export function ErrorList_Sort(list: ErrorList): void {
152
+ list?.sort((left, right) => {
153
+ if (left === null || right === null) {
154
+ if (left === right) {
155
+ return 0
156
+ }
157
+ if (left === null) {
158
+ return -1
159
+ }
160
+ return 1
161
+ }
162
+ if (ErrorList_Less([left, right], 0, 1)) {
163
+ return -1
164
+ }
165
+ if (ErrorList_Less([right, left], 0, 1)) {
166
+ return 1
167
+ }
168
+ return 0
169
+ })
170
+ }
171
+
172
+ export function ErrorList_RemoveMultiples(list: $.VarRef<ErrorList>): void {
173
+ ErrorList_Sort(list.value)
174
+ const seen = new Set<string>()
175
+ list.value = $.asArray(list.value).filter((err) => {
176
+ if (err === null) {
177
+ return false
178
+ }
179
+ const key = `${err.Pos.Filename}:${err.Pos.Line}`
180
+ if (seen.has(key)) {
181
+ return false
182
+ }
183
+ seen.add(key)
184
+ return true
185
+ })
186
+ }
187
+
188
+ export function ErrorList_Error(list: ErrorList): string {
189
+ const errors = $.asArray(list).filter((err) => err !== null)
190
+ if (errors.length === 0) {
191
+ return 'no errors'
192
+ }
193
+ if (errors.length === 1) {
194
+ return errors[0]!.Error()
195
+ }
196
+ return `${errors[0]!.Error()} (and ${errors.length - 1} more errors)`
197
+ }
198
+
199
+ export function ErrorList_Err(list: ErrorList): $.GoError {
200
+ if ($.len(list) === 0) {
201
+ return null
202
+ }
203
+ return $.newError(ErrorList_Error(list))
204
+ }
@@ -0,0 +1,67 @@
1
+ import { describe, expect, it } from 'vitest'
2
+
3
+ import * as $ from '@goscript/builtin/index.js'
4
+
5
+ import {
6
+ ADD,
7
+ COMMENT,
8
+ FileSet,
9
+ IDENT,
10
+ IF,
11
+ IsIdentifier,
12
+ IsKeyword,
13
+ Lookup,
14
+ NewFileSet,
15
+ Position,
16
+ Position_IsValid,
17
+ Position_String,
18
+ Token_IsKeyword,
19
+ Token_IsLiteral,
20
+ Token_Precedence,
21
+ Token_String,
22
+ } from './index.js'
23
+
24
+ describe('go/token override', () => {
25
+ it('models Position values', () => {
26
+ const pos = $.markAsStructValue(
27
+ new Position({
28
+ Filename: 'test.go',
29
+ Line: 3,
30
+ Column: 9,
31
+ }),
32
+ )
33
+
34
+ expect(Position_IsValid(pos)).toBe(true)
35
+ expect(Position_String(pos)).toBe('test.go:3:9')
36
+ expect(pos.clone().String()).toBe('test.go:3:9')
37
+ })
38
+
39
+ it('exports Go token constants and predicates', () => {
40
+ expect(Token_String(ADD)).toBe('+')
41
+ expect(Token_String(COMMENT)).toBe('COMMENT')
42
+ expect(Token_Precedence(ADD)).toBe(4)
43
+ expect(Token_IsLiteral(IDENT)).toBe(true)
44
+ expect(Token_IsKeyword(IF)).toBe(true)
45
+ expect(Lookup('if')).toBe(IF)
46
+ expect(Lookup('value')).toBe(IDENT)
47
+ expect(IsKeyword('func')).toBe(true)
48
+ expect(IsIdentifier('value42')).toBe(true)
49
+ expect(IsIdentifier('func')).toBe(false)
50
+ })
51
+
52
+ it('tracks files and source positions', () => {
53
+ const fset = NewFileSet()
54
+ expect(fset).toBeInstanceOf(FileSet)
55
+
56
+ const file = fset.AddFile('test.go', -1, 12)
57
+ file.SetLinesForContent($.stringToBytes('one\ntwo\nthree'))
58
+ file.AddLineColumnInfo(4, 'other.go', 20, 3)
59
+
60
+ const pos = file.Pos(5)
61
+ expect(file.Offset(pos)).toBe(5)
62
+ expect(file.Line(pos)).toBe(20)
63
+ expect(Position_String(file.Position(pos))).toBe('other.go:20:4')
64
+ expect(Position_String(fset.Position(pos))).toBe('other.go:20:4')
65
+ expect(fset.File(pos)).toBe(file)
66
+ })
67
+ })