goscript 0.1.4 → 0.2.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.
- package/README.md +5 -2
- package/cmd/go_js_wasm_exec/main.go +201 -0
- package/cmd/go_js_wasm_exec/main_test.go +83 -0
- package/cmd/goscript/{cmd_compile.go → cmd-compile.go} +7 -0
- package/cmd/goscript/cmd-test.go +14 -0
- package/cmd/goscript/cmd-test_test.go +1 -1
- package/cmd/goscript-wasm/main.go +38 -6
- package/compiler/compile-request.go +12 -9
- package/compiler/compliance_test.go +0 -1
- package/compiler/config.go +2 -0
- package/compiler/diagnostic.go +104 -12
- package/compiler/diagnostic_test.go +106 -0
- package/compiler/gotest/request.go +28 -0
- package/compiler/gotest/runner.go +354 -44
- package/compiler/gotest/runner_test.go +293 -1
- package/compiler/gotest/testdata/browserapi/browserapi_test.go +20 -0
- package/compiler/gotest/testdata/browserapi/go.mod +3 -0
- package/compiler/index.test.ts +23 -0
- package/compiler/lowered-program.go +33 -24
- package/compiler/lowering.go +746 -194
- package/compiler/lowering_bench_test.go +42 -27
- package/compiler/lowering_internal_test.go +18 -0
- package/compiler/override-facts.go +15 -0
- package/compiler/override-parity-verifier.go +450 -0
- package/compiler/override-parity.go +122 -0
- package/compiler/override-registry_test.go +559 -0
- package/compiler/protobuf-ts-binding.go +567 -0
- package/compiler/protobuf-ts-binding_test.go +402 -0
- package/compiler/runtime-contract.go +4 -0
- package/compiler/runtime-contract_test.go +2 -0
- package/compiler/semantic-model-types.go +9 -4
- package/compiler/semantic-model.go +282 -70
- package/compiler/semantic-model_test.go +82 -1
- package/compiler/service.go +21 -1
- package/compiler/skeleton_test.go +118 -10
- package/compiler/typescript-emitter.go +128 -13
- package/compiler/wasm/compile_test.go +37 -4
- package/compiler/{wasm_api.go → wasm-api.go} +57 -7
- package/dist/gs/builtin/hostio.js +5 -0
- package/dist/gs/builtin/hostio.js.map +1 -1
- package/dist/gs/builtin/slice.d.ts +13 -2
- package/dist/gs/builtin/slice.js +187 -6
- package/dist/gs/builtin/slice.js.map +1 -1
- package/dist/gs/builtin/type.d.ts +13 -5
- package/dist/gs/builtin/type.js +153 -60
- package/dist/gs/builtin/type.js.map +1 -1
- package/dist/gs/builtin/varRef.d.ts +11 -0
- package/dist/gs/builtin/varRef.js +57 -2
- package/dist/gs/builtin/varRef.js.map +1 -1
- package/dist/gs/bytes/buffer.gs.js +1 -1
- package/dist/gs/bytes/buffer.gs.js.map +1 -1
- package/dist/gs/bytes/reader.gs.js +1 -1
- package/dist/gs/bytes/reader.gs.js.map +1 -1
- package/dist/gs/compress/zlib/index.d.ts +10 -3
- package/dist/gs/compress/zlib/index.js +50 -16
- package/dist/gs/compress/zlib/index.js.map +1 -1
- package/dist/gs/encoding/json/index.d.ts +114 -0
- package/dist/gs/encoding/json/index.js +544 -36
- package/dist/gs/encoding/json/index.js.map +1 -1
- package/dist/gs/github.com/aperturerobotics/protobuf-go-lite/index.d.ts +101 -0
- package/dist/gs/github.com/aperturerobotics/protobuf-go-lite/index.js +589 -0
- package/dist/gs/github.com/aperturerobotics/protobuf-go-lite/index.js.map +1 -1
- package/dist/gs/github.com/aperturerobotics/protobuf-go-lite/json/index.d.ts +1 -0
- package/dist/gs/github.com/aperturerobotics/protobuf-go-lite/json/index.js +17 -11
- package/dist/gs/github.com/aperturerobotics/protobuf-go-lite/json/index.js.map +1 -1
- package/dist/gs/github.com/pkg/errors/errors.js +54 -30
- package/dist/gs/github.com/pkg/errors/errors.js.map +1 -1
- package/dist/gs/go/scanner/index.d.ts +2 -0
- package/dist/gs/go/scanner/index.js +29 -5
- package/dist/gs/go/scanner/index.js.map +1 -1
- package/dist/gs/go/token/index.js +22 -6
- package/dist/gs/go/token/index.js.map +1 -1
- package/dist/gs/hash/index.d.ts +6 -0
- package/dist/gs/hash/index.js +20 -0
- package/dist/gs/hash/index.js.map +1 -1
- package/dist/gs/internal/byteorder/index.js +2 -2
- package/dist/gs/internal/byteorder/index.js.map +1 -1
- package/dist/gs/internal/goarch/index.d.ts +43 -3
- package/dist/gs/internal/goarch/index.js +42 -10
- package/dist/gs/internal/goarch/index.js.map +1 -1
- package/dist/gs/io/fs/fs.js +26 -14
- package/dist/gs/io/fs/fs.js.map +1 -1
- package/dist/gs/io/fs/readdir.js +4 -2
- package/dist/gs/io/fs/readdir.js.map +1 -1
- package/dist/gs/io/fs/sub.js +8 -1
- package/dist/gs/io/fs/sub.js.map +1 -1
- package/dist/gs/io/io.d.ts +2 -0
- package/dist/gs/io/io.js.map +1 -1
- package/dist/gs/math/bits/index.d.ts +5 -0
- package/dist/gs/math/bits/index.js +16 -4
- package/dist/gs/math/bits/index.js.map +1 -1
- package/dist/gs/mime/index.d.ts +16 -0
- package/dist/gs/mime/index.js +315 -6
- package/dist/gs/mime/index.js.map +1 -1
- package/dist/gs/net/http/httptest/index.d.ts +12 -0
- package/dist/gs/net/http/httptest/index.js +85 -6
- package/dist/gs/net/http/httptest/index.js.map +1 -1
- package/dist/gs/net/http/index.d.ts +300 -5
- package/dist/gs/net/http/index.js +1598 -58
- package/dist/gs/net/http/index.js.map +1 -1
- package/dist/gs/os/dir_unix.gs.js +1 -1
- package/dist/gs/os/dir_unix.gs.js.map +1 -1
- package/dist/gs/os/error.gs.js +1 -1
- package/dist/gs/os/error.gs.js.map +1 -1
- package/dist/gs/os/exec.gs.d.ts +1 -0
- package/dist/gs/os/exec.gs.js +4 -8
- package/dist/gs/os/exec.gs.js.map +1 -1
- package/dist/gs/os/exec_posix.gs.js +1 -1
- package/dist/gs/os/exec_posix.gs.js.map +1 -1
- package/dist/gs/os/index.d.ts +1 -1
- package/dist/gs/os/index.js +1 -1
- package/dist/gs/os/index.js.map +1 -1
- package/dist/gs/os/proc.gs.d.ts +4 -0
- package/dist/gs/os/proc.gs.js +12 -6
- package/dist/gs/os/proc.gs.js.map +1 -1
- package/dist/gs/os/root_js.gs.js +1 -1
- package/dist/gs/os/root_js.gs.js.map +1 -1
- package/dist/gs/os/types.gs.js +1 -1
- package/dist/gs/os/types.gs.js.map +1 -1
- package/dist/gs/os/types_js.gs.js +1 -1
- package/dist/gs/os/types_js.gs.js.map +1 -1
- package/dist/gs/os/types_unix.gs.js +1 -1
- package/dist/gs/os/types_unix.gs.js.map +1 -1
- package/dist/gs/path/path.js +11 -7
- package/dist/gs/path/path.js.map +1 -1
- package/dist/gs/reflect/index.d.ts +5 -4
- package/dist/gs/reflect/index.js +4 -3
- package/dist/gs/reflect/index.js.map +1 -1
- package/dist/gs/reflect/map.js +15 -0
- package/dist/gs/reflect/map.js.map +1 -1
- package/dist/gs/reflect/type.d.ts +25 -6
- package/dist/gs/reflect/type.js +1475 -228
- package/dist/gs/reflect/type.js.map +1 -1
- package/dist/gs/reflect/types.d.ts +14 -6
- package/dist/gs/reflect/types.js +35 -1
- package/dist/gs/reflect/types.js.map +1 -1
- package/dist/gs/reflect/value.d.ts +1 -0
- package/dist/gs/reflect/value.js +83 -41
- package/dist/gs/reflect/value.js.map +1 -1
- package/dist/gs/reflect/visiblefields.js +4 -140
- package/dist/gs/reflect/visiblefields.js.map +1 -1
- package/dist/gs/runtime/pprof/index.d.ts +8 -2
- package/dist/gs/runtime/pprof/index.js +50 -30
- package/dist/gs/runtime/pprof/index.js.map +1 -1
- package/dist/gs/runtime/runtime.js +5 -4
- package/dist/gs/runtime/runtime.js.map +1 -1
- package/dist/gs/runtime/trace/index.js +5 -19
- package/dist/gs/runtime/trace/index.js.map +1 -1
- package/dist/gs/strconv/atoi.gs.js +1 -1
- package/dist/gs/strconv/atoi.gs.js.map +1 -1
- package/dist/gs/strconv/complex.gs.d.ts +3 -0
- package/dist/gs/strconv/complex.gs.js +148 -0
- package/dist/gs/strconv/complex.gs.js.map +1 -0
- package/dist/gs/strconv/index.d.ts +1 -0
- package/dist/gs/strconv/index.js +1 -0
- package/dist/gs/strconv/index.js.map +1 -1
- package/dist/gs/strings/builder.js +1 -1
- package/dist/gs/strings/reader.js +9 -5
- package/dist/gs/strings/reader.js.map +1 -1
- package/dist/gs/strings/replace.js +15 -7
- package/dist/gs/strings/replace.js.map +1 -1
- package/dist/gs/strings/strings.d.ts +5 -0
- package/dist/gs/strings/strings.js +57 -5
- package/dist/gs/strings/strings.js.map +1 -1
- package/dist/gs/sync/atomic/doc_64.gs.js +7 -6
- package/dist/gs/sync/atomic/doc_64.gs.js.map +1 -1
- package/dist/gs/sync/atomic/type.gs.js +9 -9
- package/dist/gs/sync/atomic/type.gs.js.map +1 -1
- package/dist/gs/sync/atomic/value.gs.js +2 -2
- package/dist/gs/sync/atomic/value.gs.js.map +1 -1
- package/dist/gs/syscall/env.js +22 -14
- package/dist/gs/syscall/env.js.map +1 -1
- package/dist/gs/testing/testing.js +55 -13
- package/dist/gs/testing/testing.js.map +1 -1
- package/dist/gs/time/time.d.ts +24 -1
- package/dist/gs/time/time.js +43 -3
- package/dist/gs/time/time.js.map +1 -1
- package/dist/gs/unique/index.js +7 -1
- package/dist/gs/unique/index.js.map +1 -1
- package/go.mod +3 -3
- package/go.sum +16 -0
- package/gs/builtin/hostio.test.ts +16 -0
- package/gs/builtin/hostio.ts +7 -0
- package/gs/builtin/runtime-contract.test.ts +246 -21
- package/gs/builtin/slice.ts +269 -24
- package/gs/builtin/type.ts +226 -59
- package/gs/builtin/varRef.ts +85 -2
- package/gs/bytes/buffer.gs.ts +1 -1
- package/gs/bytes/reader.gs.ts +1 -1
- package/gs/compress/zlib/index.test.ts +62 -1
- package/gs/compress/zlib/index.ts +53 -16
- package/gs/compress/zlib/parity.json +51 -0
- package/gs/encoding/json/index.test.ts +360 -6
- package/gs/encoding/json/index.ts +679 -38
- package/gs/encoding/json/parity.json +81 -0
- package/gs/github.com/aperturerobotics/protobuf-go-lite/index.test.ts +373 -3
- package/gs/github.com/aperturerobotics/protobuf-go-lite/index.ts +893 -1
- package/gs/github.com/aperturerobotics/protobuf-go-lite/json/index.test.ts +18 -0
- package/gs/github.com/aperturerobotics/protobuf-go-lite/json/index.ts +17 -11
- package/gs/github.com/pkg/errors/errors.ts +54 -30
- package/gs/go/scanner/index.test.ts +39 -56
- package/gs/go/scanner/index.ts +33 -5
- package/gs/go/scanner/parity.json +27 -0
- package/gs/go/token/index.ts +22 -6
- package/gs/hash/index.test.ts +20 -33
- package/gs/hash/index.ts +28 -0
- package/gs/hash/parity.json +21 -0
- package/gs/internal/byteorder/index.test.ts +2 -2
- package/gs/internal/byteorder/index.ts +2 -2
- package/gs/internal/goarch/index.test.ts +32 -0
- package/gs/internal/goarch/index.ts +45 -13
- package/gs/internal/goarch/parity.json +144 -0
- package/gs/io/fs/fs.ts +26 -14
- package/gs/io/fs/readdir.ts +4 -4
- package/gs/io/fs/sub.ts +8 -1
- package/gs/io/io.ts +1 -0
- package/gs/io/parity.json +162 -0
- package/gs/math/bits/index.test.ts +14 -1
- package/gs/math/bits/index.ts +23 -4
- package/gs/math/bits/parity.json +156 -0
- package/gs/mime/index.test.ts +90 -0
- package/gs/mime/index.ts +369 -6
- package/gs/mime/parity.json +36 -0
- package/gs/net/http/httptest/index.test.ts +98 -2
- package/gs/net/http/httptest/index.ts +101 -6
- package/gs/net/http/httptest/parity.json +15 -0
- package/gs/net/http/index.test.ts +781 -12
- package/gs/net/http/index.ts +1860 -139
- package/gs/net/http/meta.json +16 -1
- package/gs/net/http/parity.json +193 -0
- package/gs/os/dir_unix.gs.ts +1 -1
- package/gs/os/error.gs.ts +1 -1
- package/gs/os/exec.gs.ts +4 -8
- package/gs/os/exec_posix.gs.ts +1 -1
- package/gs/os/index.test.ts +9 -0
- package/gs/os/index.ts +1 -0
- package/gs/os/parity.json +9 -0
- package/gs/os/proc.gs.ts +18 -5
- package/gs/os/proc.test.ts +26 -0
- package/gs/os/root_js.gs.ts +1 -1
- package/gs/os/types.gs.ts +1 -1
- package/gs/os/types_js.gs.ts +1 -1
- package/gs/os/types_unix.gs.ts +1 -1
- package/gs/path/path.ts +11 -7
- package/gs/reflect/field.test.ts +37 -15
- package/gs/reflect/function-types.test.ts +518 -22
- package/gs/reflect/index.ts +8 -6
- package/gs/reflect/map.ts +20 -0
- package/gs/reflect/meta.json +6 -4
- package/gs/reflect/parity.json +234 -0
- package/gs/reflect/sliceat.test.ts +156 -0
- package/gs/reflect/structof.test.ts +401 -0
- package/gs/reflect/type.ts +1961 -317
- package/gs/reflect/typefor.test.ts +530 -10
- package/gs/reflect/types.ts +43 -18
- package/gs/reflect/value.ts +105 -45
- package/gs/reflect/visiblefields.ts +5 -168
- package/gs/runtime/parity.json +24 -0
- package/gs/runtime/pprof/index.test.ts +29 -7
- package/gs/runtime/pprof/index.ts +56 -30
- package/gs/runtime/pprof/parity.json +27 -0
- package/gs/runtime/runtime.test.ts +3 -1
- package/gs/runtime/runtime.ts +4 -3
- package/gs/runtime/trace/index.test.ts +5 -3
- package/gs/runtime/trace/index.ts +8 -20
- package/gs/runtime/trace/parity.json +36 -0
- package/gs/strconv/atoi.gs.ts +1 -1
- package/gs/strconv/complex.gs.ts +174 -0
- package/gs/strconv/complex.test.ts +65 -0
- package/gs/strconv/index.ts +1 -0
- package/gs/strconv/parity.json +120 -0
- package/gs/strings/builder.ts +1 -1
- package/gs/strings/parity.json +186 -0
- package/gs/strings/reader.ts +9 -5
- package/gs/strings/replace.ts +15 -7
- package/gs/strings/strings.test.ts +22 -2
- package/gs/strings/strings.ts +64 -6
- package/gs/sync/atomic/doc_64.gs.ts +6 -7
- package/gs/sync/atomic/doc_64.test.ts +43 -0
- package/gs/sync/atomic/type.gs.ts +9 -9
- package/gs/sync/atomic/value.gs.ts +2 -2
- package/gs/syscall/env.ts +29 -14
- package/gs/testing/testing.test.ts +67 -0
- package/gs/testing/testing.ts +87 -19
- package/gs/time/parity.json +225 -0
- package/gs/time/time.test.ts +20 -2
- package/gs/time/time.ts +49 -7
- package/gs/unique/index.ts +7 -1
- package/package.json +4 -2
- package/dist/gs/github.com/aperturerobotics/starpc/srpc/index.d.ts +0 -217
- package/dist/gs/github.com/aperturerobotics/starpc/srpc/index.js +0 -926
- package/dist/gs/github.com/aperturerobotics/starpc/srpc/index.js.map +0 -1
- package/gs/github.com/aperturerobotics/starpc/srpc/index.test.ts +0 -38
- package/gs/github.com/aperturerobotics/starpc/srpc/index.ts +0 -1361
- package/gs/github.com/aperturerobotics/starpc/srpc/meta.json +0 -46
package/README.md
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
|
|
6
6
|
<p>
|
|
7
7
|
Compile Go packages into TypeScript modules for shared application logic.<br/>
|
|
8
|
-
|
|
8
|
+
Performance-optimized for fast package builds, Bun, modern bundlers, and browser demos.<br/>
|
|
9
9
|
</p>
|
|
10
10
|
|
|
11
11
|
<p>
|
|
@@ -29,7 +29,10 @@ GoScript compiles Go packages from inside a Go module and writes deterministic
|
|
|
29
29
|
TypeScript packages under `@goscript/<go-package>/`. The compiler keeps package
|
|
30
30
|
loading, semantic modeling, lowering, TypeScript emission, runtime helpers, and
|
|
31
31
|
handwritten override packages as explicit pipeline stages so generated output is
|
|
32
|
-
readable and semantic decisions have one owner.
|
|
32
|
+
readable and semantic decisions have one owner. The compiler is also
|
|
33
|
+
performance-tuned through real package dogfooding, so large package sets can be
|
|
34
|
+
rebuilt quickly instead of treating Go-to-TypeScript generation as an offline
|
|
35
|
+
batch step.
|
|
33
36
|
|
|
34
37
|
> "Right now goscript looks pretty cool if [your] problem is 'I want this
|
|
35
38
|
> self-sufficient algorithm [to] be available in Go and JS runtimes.'"
|
|
@@ -0,0 +1,201 @@
|
|
|
1
|
+
package main
|
|
2
|
+
|
|
3
|
+
import (
|
|
4
|
+
"context"
|
|
5
|
+
"fmt"
|
|
6
|
+
"io"
|
|
7
|
+
"os"
|
|
8
|
+
"strconv"
|
|
9
|
+
"strings"
|
|
10
|
+
"time"
|
|
11
|
+
|
|
12
|
+
"github.com/aperturerobotics/goscript/compiler/gotest"
|
|
13
|
+
"github.com/pkg/errors"
|
|
14
|
+
)
|
|
15
|
+
|
|
16
|
+
func main() {
|
|
17
|
+
if err := run(context.Background(), os.Args[1:], os.Stdout); err != nil {
|
|
18
|
+
_, _ = fmt.Fprintln(os.Stderr, err)
|
|
19
|
+
os.Exit(1)
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
func run(ctx context.Context, args []string, stdout io.Writer) error {
|
|
24
|
+
req, err := requestFromGoToolArgs(args)
|
|
25
|
+
if err != nil {
|
|
26
|
+
return err
|
|
27
|
+
}
|
|
28
|
+
result, err := gotest.NewRunner().Run(ctx, req)
|
|
29
|
+
if err != nil {
|
|
30
|
+
return err
|
|
31
|
+
}
|
|
32
|
+
if err := printResult(stdout, result); err != nil {
|
|
33
|
+
return err
|
|
34
|
+
}
|
|
35
|
+
if !result.Passed() {
|
|
36
|
+
return errors.New("goscript browser test failed")
|
|
37
|
+
}
|
|
38
|
+
return nil
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
func requestFromGoToolArgs(args []string) (*gotest.Request, error) {
|
|
42
|
+
if len(args) != 0 && !strings.HasPrefix(args[0], "-") {
|
|
43
|
+
args = args[1:]
|
|
44
|
+
}
|
|
45
|
+
cwd, err := os.Getwd()
|
|
46
|
+
if err != nil {
|
|
47
|
+
return nil, errors.Wrap(err, "get package working directory")
|
|
48
|
+
}
|
|
49
|
+
req := &gotest.Request{
|
|
50
|
+
Dir: cwd,
|
|
51
|
+
Patterns: []string{"."},
|
|
52
|
+
Count: 1,
|
|
53
|
+
Timeout: 10 * time.Minute,
|
|
54
|
+
RuntimeBackend: gotest.RuntimeBackendBrowser,
|
|
55
|
+
}
|
|
56
|
+
for idx := 0; idx < len(args); idx++ {
|
|
57
|
+
name, value, hasValue := splitFlag(args[idx])
|
|
58
|
+
switch name {
|
|
59
|
+
case "-test.v":
|
|
60
|
+
if !hasValue {
|
|
61
|
+
req.Verbose = true
|
|
62
|
+
continue
|
|
63
|
+
}
|
|
64
|
+
verbose, err := parseTestBool(value)
|
|
65
|
+
if err != nil {
|
|
66
|
+
return nil, errors.Wrapf(err, "parse %s", name)
|
|
67
|
+
}
|
|
68
|
+
req.Verbose = verbose
|
|
69
|
+
case "-test.run":
|
|
70
|
+
if !hasValue {
|
|
71
|
+
idx++
|
|
72
|
+
if idx >= len(args) {
|
|
73
|
+
return nil, errors.New("-test.run requires a value")
|
|
74
|
+
}
|
|
75
|
+
value = args[idx]
|
|
76
|
+
}
|
|
77
|
+
req.Run = value
|
|
78
|
+
case "-test.count":
|
|
79
|
+
if !hasValue {
|
|
80
|
+
idx++
|
|
81
|
+
if idx >= len(args) {
|
|
82
|
+
return nil, errors.New("-test.count requires a value")
|
|
83
|
+
}
|
|
84
|
+
value = args[idx]
|
|
85
|
+
}
|
|
86
|
+
count, err := strconv.Atoi(value)
|
|
87
|
+
if err != nil {
|
|
88
|
+
return nil, errors.Wrap(err, "parse -test.count")
|
|
89
|
+
}
|
|
90
|
+
req.Count = count
|
|
91
|
+
case "-test.short":
|
|
92
|
+
if !hasValue {
|
|
93
|
+
req.Short = true
|
|
94
|
+
continue
|
|
95
|
+
}
|
|
96
|
+
short, err := parseTestBool(value)
|
|
97
|
+
if err != nil {
|
|
98
|
+
return nil, errors.Wrap(err, "parse -test.short")
|
|
99
|
+
}
|
|
100
|
+
req.Short = short
|
|
101
|
+
case "-test.timeout":
|
|
102
|
+
if !hasValue {
|
|
103
|
+
idx++
|
|
104
|
+
if idx >= len(args) {
|
|
105
|
+
return nil, errors.New("-test.timeout requires a value")
|
|
106
|
+
}
|
|
107
|
+
value = args[idx]
|
|
108
|
+
}
|
|
109
|
+
timeout, err := time.ParseDuration(value)
|
|
110
|
+
if err != nil {
|
|
111
|
+
return nil, errors.Wrap(err, "parse -test.timeout")
|
|
112
|
+
}
|
|
113
|
+
req.Timeout = timeout
|
|
114
|
+
case "-test.paniconexit0":
|
|
115
|
+
if !hasValue {
|
|
116
|
+
req.PanicOnExit0 = true
|
|
117
|
+
continue
|
|
118
|
+
}
|
|
119
|
+
panicOnExit0, err := parseTestBool(value)
|
|
120
|
+
if err != nil {
|
|
121
|
+
return nil, errors.Wrap(err, "parse -test.paniconexit0")
|
|
122
|
+
}
|
|
123
|
+
req.PanicOnExit0 = panicOnExit0
|
|
124
|
+
case "-test.parallel":
|
|
125
|
+
if !hasValue {
|
|
126
|
+
idx++
|
|
127
|
+
if idx >= len(args) {
|
|
128
|
+
return nil, errors.New("-test.parallel requires a value")
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
case "-test.testlogfile":
|
|
132
|
+
if !hasValue {
|
|
133
|
+
idx++
|
|
134
|
+
if idx >= len(args) {
|
|
135
|
+
return nil, errors.New("-test.testlogfile requires a value")
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
default:
|
|
139
|
+
return nil, errors.Errorf("unsupported go_js_wasm_exec flag %s", name)
|
|
140
|
+
}
|
|
141
|
+
}
|
|
142
|
+
return req, nil
|
|
143
|
+
}
|
|
144
|
+
|
|
145
|
+
func splitFlag(arg string) (string, string, bool) {
|
|
146
|
+
name, value, ok := strings.Cut(arg, "=")
|
|
147
|
+
return name, value, ok
|
|
148
|
+
}
|
|
149
|
+
|
|
150
|
+
func parseTestBool(value string) (bool, error) {
|
|
151
|
+
switch strings.ToLower(strings.TrimSpace(value)) {
|
|
152
|
+
case "", "1", "t", "true", "test2json":
|
|
153
|
+
return true, nil
|
|
154
|
+
case "0", "f", "false":
|
|
155
|
+
return false, nil
|
|
156
|
+
default:
|
|
157
|
+
return false, errors.Errorf("invalid boolean value %q", value)
|
|
158
|
+
}
|
|
159
|
+
}
|
|
160
|
+
|
|
161
|
+
func printResult(w io.Writer, result *gotest.Result) error {
|
|
162
|
+
if result == nil {
|
|
163
|
+
return errors.New("goscript browser test result is nil")
|
|
164
|
+
}
|
|
165
|
+
for _, pkg := range result.Packages {
|
|
166
|
+
if strings.TrimSpace(pkg.Output) != "" {
|
|
167
|
+
if _, err := io.WriteString(w, strings.TrimSpace(pkg.Output)+"\n"); err != nil {
|
|
168
|
+
return err
|
|
169
|
+
}
|
|
170
|
+
}
|
|
171
|
+
switch pkg.Action {
|
|
172
|
+
case gotest.ActionPass:
|
|
173
|
+
if _, err := io.WriteString(w, "ok \t"+pkg.PackagePath+"\n"); err != nil {
|
|
174
|
+
return err
|
|
175
|
+
}
|
|
176
|
+
case gotest.ActionSkip:
|
|
177
|
+
if _, err := io.WriteString(w, "? \t"+pkg.PackagePath+"\t[no test files]\n"); err != nil {
|
|
178
|
+
return err
|
|
179
|
+
}
|
|
180
|
+
case gotest.ActionFail:
|
|
181
|
+
line := "FAIL\t" + pkg.PackagePath
|
|
182
|
+
if pkg.Owner != "" {
|
|
183
|
+
line += "\towner=" + string(pkg.Owner)
|
|
184
|
+
}
|
|
185
|
+
if _, err := io.WriteString(w, line+"\n"); err != nil {
|
|
186
|
+
return err
|
|
187
|
+
}
|
|
188
|
+
if strings.TrimSpace(pkg.Error) != "" {
|
|
189
|
+
if _, err := io.WriteString(w, strings.TrimSpace(pkg.Error)+"\n"); err != nil {
|
|
190
|
+
return err
|
|
191
|
+
}
|
|
192
|
+
}
|
|
193
|
+
}
|
|
194
|
+
}
|
|
195
|
+
if result.WorkDir != "" {
|
|
196
|
+
if _, err := io.WriteString(w, "goscript browser test workdir: "+result.WorkDir+"\n"); err != nil {
|
|
197
|
+
return err
|
|
198
|
+
}
|
|
199
|
+
}
|
|
200
|
+
return nil
|
|
201
|
+
}
|
|
@@ -0,0 +1,83 @@
|
|
|
1
|
+
package main
|
|
2
|
+
|
|
3
|
+
import (
|
|
4
|
+
"bytes"
|
|
5
|
+
"strings"
|
|
6
|
+
"testing"
|
|
7
|
+
"time"
|
|
8
|
+
|
|
9
|
+
"github.com/aperturerobotics/goscript/compiler/gotest"
|
|
10
|
+
)
|
|
11
|
+
|
|
12
|
+
func TestRequestFromGoToolArgsMapsSupportedFlags(t *testing.T) {
|
|
13
|
+
dir := t.TempDir()
|
|
14
|
+
t.Chdir(dir)
|
|
15
|
+
|
|
16
|
+
req, err := requestFromGoToolArgs([]string{
|
|
17
|
+
"/tmp/pkg.test.wasm",
|
|
18
|
+
"-test.v=test2json",
|
|
19
|
+
"-test.run", "TestBrowser",
|
|
20
|
+
"-test.count=2",
|
|
21
|
+
"-test.short",
|
|
22
|
+
"-test.timeout=3s",
|
|
23
|
+
"-test.paniconexit0",
|
|
24
|
+
"-test.parallel", "8",
|
|
25
|
+
"-test.testlogfile=ignored",
|
|
26
|
+
})
|
|
27
|
+
if err != nil {
|
|
28
|
+
t.Fatalf("parse go tool args: %v", err)
|
|
29
|
+
}
|
|
30
|
+
if req.Dir != dir {
|
|
31
|
+
t.Fatalf("Dir = %q, want %q", req.Dir, dir)
|
|
32
|
+
}
|
|
33
|
+
if len(req.Patterns) != 1 || req.Patterns[0] != "." {
|
|
34
|
+
t.Fatalf("Patterns = %#v, want .", req.Patterns)
|
|
35
|
+
}
|
|
36
|
+
if req.RuntimeBackend != gotest.RuntimeBackendBrowser {
|
|
37
|
+
t.Fatalf("RuntimeBackend = %q, want browser", req.RuntimeBackend)
|
|
38
|
+
}
|
|
39
|
+
if !req.Verbose || req.Run != "TestBrowser" || req.Count != 2 || !req.Short || req.Timeout != 3*time.Second || !req.PanicOnExit0 {
|
|
40
|
+
t.Fatalf("unexpected mapped request: %#v", req)
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
func TestRequestFromGoToolArgsMapsPanicOnExitZeroFalse(t *testing.T) {
|
|
45
|
+
t.Chdir(t.TempDir())
|
|
46
|
+
|
|
47
|
+
req, err := requestFromGoToolArgs([]string{"/tmp/pkg.test.wasm", "-test.paniconexit0=false"})
|
|
48
|
+
if err != nil {
|
|
49
|
+
t.Fatalf("parse go tool args: %v", err)
|
|
50
|
+
}
|
|
51
|
+
if req.PanicOnExit0 {
|
|
52
|
+
t.Fatal("expected explicit -test.paniconexit0=false to disable panic-on-exit-zero")
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
func TestRequestFromGoToolArgsRejectsUnsupportedFlags(t *testing.T) {
|
|
57
|
+
t.Chdir(t.TempDir())
|
|
58
|
+
|
|
59
|
+
if _, err := requestFromGoToolArgs([]string{"/tmp/pkg.test.wasm", "-test.coverprofile=cover.out"}); err == nil {
|
|
60
|
+
t.Fatal("expected unsupported flag to fail")
|
|
61
|
+
} else if !strings.Contains(err.Error(), "unsupported go_js_wasm_exec flag -test.coverprofile") {
|
|
62
|
+
t.Fatalf("unexpected error: %v", err)
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
func TestPrintResult(t *testing.T) {
|
|
67
|
+
var out bytes.Buffer
|
|
68
|
+
err := printResult(&out, &gotest.Result{
|
|
69
|
+
WorkDir: "/work",
|
|
70
|
+
Packages: []gotest.PackageResult{{
|
|
71
|
+
PackagePath: "example.test/browser",
|
|
72
|
+
Action: gotest.ActionPass,
|
|
73
|
+
Output: "browser ok",
|
|
74
|
+
}},
|
|
75
|
+
})
|
|
76
|
+
if err != nil {
|
|
77
|
+
t.Fatalf("print result: %v", err)
|
|
78
|
+
}
|
|
79
|
+
got := out.String()
|
|
80
|
+
if !strings.Contains(got, "browser ok") || !strings.Contains(got, "ok \texample.test/browser") {
|
|
81
|
+
t.Fatalf("unexpected output:\n%s", got)
|
|
82
|
+
}
|
|
83
|
+
}
|
|
@@ -80,6 +80,13 @@ func newCompileCommand() *cli.Command {
|
|
|
80
80
|
Value: false,
|
|
81
81
|
EnvVars: []string{"GOSCRIPT_ALL_DEPENDENCIES"},
|
|
82
82
|
},
|
|
83
|
+
&cli.BoolFlag{
|
|
84
|
+
Name: "protobuf-ts-binding",
|
|
85
|
+
Usage: "bind .pb.go files to sibling .pb.ts files instead of emitting .pb.gs.ts",
|
|
86
|
+
Destination: &config.ProtobufTypeScriptBinding,
|
|
87
|
+
Value: false,
|
|
88
|
+
EnvVars: []string{"GOSCRIPT_PROTOBUF_TS_BINDING"},
|
|
89
|
+
},
|
|
83
90
|
},
|
|
84
91
|
}
|
|
85
92
|
}
|
package/cmd/goscript/cmd-test.go
CHANGED
|
@@ -32,6 +32,7 @@ func newTestCommand() *cli.Command {
|
|
|
32
32
|
var dir string
|
|
33
33
|
var parallelism int
|
|
34
34
|
var runtimeGroups bool
|
|
35
|
+
var browser bool
|
|
35
36
|
var cpuProfile string
|
|
36
37
|
var memProfile string
|
|
37
38
|
var incrementalTypeCheck bool
|
|
@@ -54,6 +55,7 @@ func newTestCommand() *cli.Command {
|
|
|
54
55
|
WorkDir: workDir,
|
|
55
56
|
OutputRoot: outputRoot,
|
|
56
57
|
Parallelism: parallelism,
|
|
58
|
+
RuntimeBackend: testRuntimeBackend(browser),
|
|
57
59
|
RuntimeGroups: runtimeGroups,
|
|
58
60
|
IncrementalTypeCheck: incrementalTypeCheck,
|
|
59
61
|
}
|
|
@@ -147,6 +149,11 @@ func newTestCommand() *cli.Command {
|
|
|
147
149
|
Usage: "run package runtimes in grouped Bun worker processes",
|
|
148
150
|
Destination: &runtimeGroups,
|
|
149
151
|
},
|
|
152
|
+
&cli.BoolFlag{
|
|
153
|
+
Name: "browser",
|
|
154
|
+
Usage: "run package runtimes in a Chromium browser",
|
|
155
|
+
Destination: &browser,
|
|
156
|
+
},
|
|
150
157
|
&cli.BoolFlag{
|
|
151
158
|
Name: "incremental-typecheck",
|
|
152
159
|
Usage: "reuse TypeScript build-info files in the test workdir",
|
|
@@ -166,6 +173,13 @@ func newTestCommand() *cli.Command {
|
|
|
166
173
|
}
|
|
167
174
|
}
|
|
168
175
|
|
|
176
|
+
func testRuntimeBackend(browser bool) gotest.RuntimeBackend {
|
|
177
|
+
if browser {
|
|
178
|
+
return gotest.RuntimeBackendBrowser
|
|
179
|
+
}
|
|
180
|
+
return gotest.RuntimeBackendBun
|
|
181
|
+
}
|
|
182
|
+
|
|
169
183
|
func startCPUProfile(path string) (func(), error) {
|
|
170
184
|
path = strings.TrimSpace(path)
|
|
171
185
|
if path == "" {
|
|
@@ -17,7 +17,7 @@ func TestTestCommandHelp(t *testing.T) {
|
|
|
17
17
|
t.Fatalf("test help failed: %v", err)
|
|
18
18
|
}
|
|
19
19
|
help := out.String()
|
|
20
|
-
for _, expected := range []string{"compile and run Go package tests through GoScript", "--tags", "--run", "--count", "--short", "--timeout", "-p", "--runtime-groups", "--cpuprofile", "--memprofile"} {
|
|
20
|
+
for _, expected := range []string{"compile and run Go package tests through GoScript", "--tags", "--run", "--count", "--short", "--timeout", "-p", "--runtime-groups", "--browser", "--cpuprofile", "--memprofile"} {
|
|
21
21
|
if !strings.Contains(help, expected) {
|
|
22
22
|
t.Fatalf("help output missing %q:\n%s", expected, help)
|
|
23
23
|
}
|
|
@@ -3,8 +3,10 @@
|
|
|
3
3
|
package main
|
|
4
4
|
|
|
5
5
|
import (
|
|
6
|
+
"errors"
|
|
6
7
|
"syscall/js"
|
|
7
8
|
|
|
9
|
+
"github.com/aperturerobotics/goscript/compiler"
|
|
8
10
|
"github.com/aperturerobotics/goscript/compiler/wasm"
|
|
9
11
|
)
|
|
10
12
|
|
|
@@ -20,8 +22,9 @@ func main() {
|
|
|
20
22
|
func compileWrapper(this js.Value, args []js.Value) interface{} {
|
|
21
23
|
if len(args) < 1 {
|
|
22
24
|
return map[string]interface{}{
|
|
23
|
-
"error":
|
|
24
|
-
"output":
|
|
25
|
+
"error": "missing source code argument",
|
|
26
|
+
"output": "",
|
|
27
|
+
"diagnostics": []interface{}{},
|
|
25
28
|
}
|
|
26
29
|
}
|
|
27
30
|
|
|
@@ -33,14 +36,43 @@ func compileWrapper(this js.Value, args []js.Value) interface{} {
|
|
|
33
36
|
|
|
34
37
|
output, err := wasm.CompileSource(source, packageName)
|
|
35
38
|
if err != nil {
|
|
39
|
+
diagnostics := []interface{}{}
|
|
40
|
+
var compileErr *compiler.CompileError
|
|
41
|
+
if errors.As(err, &compileErr) {
|
|
42
|
+
diagnostics = encodeDiagnostics(compileErr.Diagnostics)
|
|
43
|
+
}
|
|
36
44
|
return map[string]interface{}{
|
|
37
|
-
"error":
|
|
38
|
-
"output":
|
|
45
|
+
"error": err.Error(),
|
|
46
|
+
"output": "",
|
|
47
|
+
"diagnostics": diagnostics,
|
|
39
48
|
}
|
|
40
49
|
}
|
|
41
50
|
|
|
42
51
|
return map[string]interface{}{
|
|
43
|
-
"error":
|
|
44
|
-
"output":
|
|
52
|
+
"error": "",
|
|
53
|
+
"output": output,
|
|
54
|
+
"diagnostics": []interface{}{},
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
func encodeDiagnostics(diagnostics []compiler.Diagnostic) []interface{} {
|
|
59
|
+
encoded := make([]interface{}, 0, len(diagnostics))
|
|
60
|
+
for _, diagnostic := range diagnostics {
|
|
61
|
+
item := map[string]interface{}{
|
|
62
|
+
"severity": string(diagnostic.Severity),
|
|
63
|
+
"code": diagnostic.Code,
|
|
64
|
+
"message": diagnostic.Message,
|
|
65
|
+
"detail": diagnostic.Detail,
|
|
66
|
+
}
|
|
67
|
+
if diagnostic.Position != nil {
|
|
68
|
+
item["position"] = map[string]interface{}{
|
|
69
|
+
"file": diagnostic.Position.File,
|
|
70
|
+
"displayFile": diagnostic.Position.DisplayFile,
|
|
71
|
+
"line": diagnostic.Position.Line,
|
|
72
|
+
"column": diagnostic.Position.Column,
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
encoded = append(encoded, item)
|
|
45
76
|
}
|
|
77
|
+
return encoded
|
|
46
78
|
}
|
|
@@ -42,6 +42,8 @@ type CompileRequest struct {
|
|
|
42
42
|
DependencyMode DependencyMode
|
|
43
43
|
// RuntimeEmissionMode controls runtime package emission policy.
|
|
44
44
|
RuntimeEmissionMode RuntimeEmissionMode
|
|
45
|
+
// ProtobufTypeScriptBinding binds .pb.go files to sibling .pb.ts files.
|
|
46
|
+
ProtobufTypeScriptBinding bool
|
|
45
47
|
// Tests controls whether package loading includes Go package-test variants.
|
|
46
48
|
Tests bool
|
|
47
49
|
// AllDependencies controls whether the package graph should include deps.
|
|
@@ -75,15 +77,16 @@ func (o *CompileRequestOwner) NewRequest(conf Config, patterns []string) *Compil
|
|
|
75
77
|
}
|
|
76
78
|
|
|
77
79
|
return &CompileRequest{
|
|
78
|
-
Patterns:
|
|
79
|
-
Dir:
|
|
80
|
-
OutputPath:
|
|
81
|
-
BuildFlags:
|
|
82
|
-
OverrideDirs:
|
|
83
|
-
DependencyMode:
|
|
84
|
-
RuntimeEmissionMode:
|
|
85
|
-
|
|
86
|
-
|
|
80
|
+
Patterns: normalizePatterns(patterns),
|
|
81
|
+
Dir: strings.TrimSpace(dir),
|
|
82
|
+
OutputPath: strings.TrimSpace(conf.OutputPath),
|
|
83
|
+
BuildFlags: append([]string(nil), conf.BuildFlags...),
|
|
84
|
+
OverrideDirs: append([]string(nil), conf.OverrideDirs...),
|
|
85
|
+
DependencyMode: dependencyMode,
|
|
86
|
+
RuntimeEmissionMode: runtimeEmissionMode,
|
|
87
|
+
ProtobufTypeScriptBinding: conf.ProtobufTypeScriptBinding,
|
|
88
|
+
AllDependencies: conf.AllDependencies,
|
|
89
|
+
DisableEmitBuiltin: conf.DisableEmitBuiltin,
|
|
87
90
|
}
|
|
88
91
|
}
|
|
89
92
|
|
|
@@ -172,7 +172,6 @@ var expectedV2ComplianceGaps = map[string]bool{
|
|
|
172
172
|
"promise_return_type": true,
|
|
173
173
|
"protobuf_lite_ts": true,
|
|
174
174
|
"receiver_variable": true,
|
|
175
|
-
"reflect_implements": true,
|
|
176
175
|
"reflect_numfield": true,
|
|
177
176
|
"reserved_words": true,
|
|
178
177
|
"star_expr_destructuring": true,
|
package/compiler/config.go
CHANGED
|
@@ -22,6 +22,8 @@ type Config struct {
|
|
|
22
22
|
AllDependencies bool
|
|
23
23
|
// DisableEmitBuiltin controls whether runtime packages are emitted.
|
|
24
24
|
DisableEmitBuiltin bool
|
|
25
|
+
// ProtobufTypeScriptBinding binds .pb.go files to sibling .pb.ts files.
|
|
26
|
+
ProtobufTypeScriptBinding bool
|
|
25
27
|
}
|
|
26
28
|
|
|
27
29
|
// Validate checks the config and initializes owned defaults.
|
package/compiler/diagnostic.go
CHANGED
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
package compiler
|
|
2
2
|
|
|
3
|
-
import
|
|
3
|
+
import (
|
|
4
|
+
"path/filepath"
|
|
5
|
+
"strconv"
|
|
6
|
+
"strings"
|
|
7
|
+
)
|
|
4
8
|
|
|
5
9
|
// DiagnosticSeverity is the severity of a compiler diagnostic.
|
|
6
10
|
type DiagnosticSeverity string
|
|
@@ -22,6 +26,20 @@ type Diagnostic struct {
|
|
|
22
26
|
Message string
|
|
23
27
|
// Detail carries optional longer guidance.
|
|
24
28
|
Detail string
|
|
29
|
+
// Position is the optional source point that caused the diagnostic.
|
|
30
|
+
Position *DiagnosticPosition
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
// DiagnosticPosition identifies the source point that caused a diagnostic.
|
|
34
|
+
type DiagnosticPosition struct {
|
|
35
|
+
// File is the raw file identity from the compiler source owner.
|
|
36
|
+
File string
|
|
37
|
+
// DisplayFile is the request-relative file identity for human output.
|
|
38
|
+
DisplayFile string
|
|
39
|
+
// Line is the 1-based source line.
|
|
40
|
+
Line int
|
|
41
|
+
// Column is the 1-based source column.
|
|
42
|
+
Column int
|
|
25
43
|
}
|
|
26
44
|
|
|
27
45
|
// CompileError wraps structured diagnostics for ordinary Go error paths.
|
|
@@ -41,25 +59,99 @@ func (e *CompileError) Error() string {
|
|
|
41
59
|
return "goscript: compile failed"
|
|
42
60
|
}
|
|
43
61
|
|
|
62
|
+
return FormatDiagnostics(e.Diagnostics)
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
// FormatDiagnostics returns the canonical human-readable diagnostic summary.
|
|
66
|
+
func FormatDiagnostics(diagnostics []Diagnostic) string {
|
|
44
67
|
var b strings.Builder
|
|
45
|
-
for i, diag := range
|
|
68
|
+
for i, diag := range diagnostics {
|
|
46
69
|
if i != 0 {
|
|
47
70
|
b.WriteString("; ")
|
|
48
71
|
}
|
|
49
|
-
|
|
50
|
-
b.WriteString(diag.Code)
|
|
51
|
-
b.WriteString(": ")
|
|
52
|
-
}
|
|
53
|
-
b.WriteString(diag.Message)
|
|
54
|
-
if diag.Detail != "" {
|
|
55
|
-
b.WriteString(" (")
|
|
56
|
-
b.WriteString(diag.Detail)
|
|
57
|
-
b.WriteString(")")
|
|
58
|
-
}
|
|
72
|
+
b.WriteString(FormatDiagnostic(diag))
|
|
59
73
|
}
|
|
60
74
|
return b.String()
|
|
61
75
|
}
|
|
62
76
|
|
|
77
|
+
// FormatDiagnostic returns the canonical human-readable form of one diagnostic.
|
|
78
|
+
func FormatDiagnostic(diag Diagnostic) string {
|
|
79
|
+
var b strings.Builder
|
|
80
|
+
if pos := formatDiagnosticPosition(diag.Position); pos != "" {
|
|
81
|
+
b.WriteString(pos)
|
|
82
|
+
b.WriteString(": ")
|
|
83
|
+
}
|
|
84
|
+
if diag.Code != "" {
|
|
85
|
+
b.WriteString(diag.Code)
|
|
86
|
+
b.WriteString(": ")
|
|
87
|
+
}
|
|
88
|
+
b.WriteString(diag.Message)
|
|
89
|
+
if diag.Detail != "" {
|
|
90
|
+
b.WriteString(" (")
|
|
91
|
+
b.WriteString(diag.Detail)
|
|
92
|
+
b.WriteString(")")
|
|
93
|
+
}
|
|
94
|
+
return b.String()
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
func formatDiagnosticPosition(pos *DiagnosticPosition) string {
|
|
98
|
+
if pos == nil || pos.Line <= 0 {
|
|
99
|
+
return ""
|
|
100
|
+
}
|
|
101
|
+
file := strings.TrimSpace(pos.DisplayFile)
|
|
102
|
+
if file == "" {
|
|
103
|
+
file = strings.TrimSpace(pos.File)
|
|
104
|
+
}
|
|
105
|
+
if file == "" {
|
|
106
|
+
return ""
|
|
107
|
+
}
|
|
108
|
+
var b strings.Builder
|
|
109
|
+
b.WriteString(filepath.ToSlash(file))
|
|
110
|
+
b.WriteString(":")
|
|
111
|
+
b.WriteString(strconv.Itoa(pos.Line))
|
|
112
|
+
if pos.Column > 0 {
|
|
113
|
+
b.WriteString(":")
|
|
114
|
+
b.WriteString(strconv.Itoa(pos.Column))
|
|
115
|
+
}
|
|
116
|
+
return b.String()
|
|
117
|
+
}
|
|
118
|
+
|
|
119
|
+
func diagnosticPositionFromSource(pos sourcePosition, displayRoot string) *DiagnosticPosition {
|
|
120
|
+
if pos.line <= 0 {
|
|
121
|
+
return nil
|
|
122
|
+
}
|
|
123
|
+
file := strings.TrimSpace(pos.file)
|
|
124
|
+
return &DiagnosticPosition{
|
|
125
|
+
File: file,
|
|
126
|
+
DisplayFile: diagnosticDisplayFile(file, displayRoot),
|
|
127
|
+
Line: pos.line,
|
|
128
|
+
Column: pos.column,
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
|
|
132
|
+
func diagnosticDisplayFile(file string, displayRoot string) string {
|
|
133
|
+
file = strings.TrimSpace(file)
|
|
134
|
+
if file == "" {
|
|
135
|
+
return ""
|
|
136
|
+
}
|
|
137
|
+
displayRoot = strings.TrimSpace(displayRoot)
|
|
138
|
+
if displayRoot == "" {
|
|
139
|
+
return filepath.ToSlash(file)
|
|
140
|
+
}
|
|
141
|
+
root := displayRoot
|
|
142
|
+
if absRoot, err := filepath.Abs(root); err == nil {
|
|
143
|
+
root = absRoot
|
|
144
|
+
}
|
|
145
|
+
candidate := file
|
|
146
|
+
if !filepath.IsAbs(candidate) {
|
|
147
|
+
candidate = filepath.Join(root, candidate)
|
|
148
|
+
}
|
|
149
|
+
if rel, err := filepath.Rel(root, candidate); err == nil && rel != "." && rel != ".." && !strings.HasPrefix(rel, ".."+string(filepath.Separator)) {
|
|
150
|
+
return filepath.ToSlash(rel)
|
|
151
|
+
}
|
|
152
|
+
return filepath.ToSlash(file)
|
|
153
|
+
}
|
|
154
|
+
|
|
63
155
|
func diagnosticsHaveErrors(diagnostics []Diagnostic) bool {
|
|
64
156
|
for _, diag := range diagnostics {
|
|
65
157
|
if diag.Severity == DiagnosticSeverityError {
|