change dir for goja

This commit is contained in:
Star 2024-10-10 17:08:01 +08:00
parent 702ea0fbe9
commit f4666836fc
97 changed files with 127 additions and 126 deletions

View File

@ -4,7 +4,7 @@ import (
"errors"
"path/filepath"
"apigo.cc/gojs/dop251/goja"
"apigo.cc/gojs/goja"
"github.com/ssgo/log"
"github.com/ssgo/u"
)

View File

@ -3,7 +3,7 @@ package gojs
import (
"reflect"
"apigo.cc/gojs/dop251/goja"
"apigo.cc/gojs/goja"
"github.com/ssgo/log"
"github.com/ssgo/u"
)

View File

@ -7,7 +7,7 @@ import (
"reflect"
"strconv"
"apigo.cc/gojs/dop251/goja/unistring"
"apigo.cc/gojs/goja/unistring"
)
type arrayIterObject struct {

View File

@ -8,7 +8,7 @@ import (
"sort"
"strconv"
"apigo.cc/gojs/dop251/goja/unistring"
"apigo.cc/gojs/goja/unistring"
)
type sparseArrayItem struct {

View File

@ -9,9 +9,9 @@ node types are concerned) and may change in the future.
package ast
import (
"apigo.cc/gojs/dop251/goja/file"
"apigo.cc/gojs/dop251/goja/token"
"apigo.cc/gojs/dop251/goja/unistring"
"apigo.cc/gojs/goja/file"
"apigo.cc/gojs/goja/token"
"apigo.cc/gojs/goja/unistring"
)
type PropertyKind string

View File

@ -9,7 +9,7 @@ import (
"strconv"
"sync"
"apigo.cc/gojs/dop251/goja/unistring"
"apigo.cc/gojs/goja/unistring"
)
type valueBigInt big.Int

View File

@ -1,6 +1,6 @@
package goja
import "apigo.cc/gojs/dop251/goja/unistring"
import "apigo.cc/gojs/goja/unistring"
const propNameStack = "stack"

View File

@ -10,7 +10,7 @@ import (
"sync"
"unicode/utf8"
"apigo.cc/gojs/dop251/goja/unistring"
"apigo.cc/gojs/goja/unistring"
)
const hexUpper = "0123456789ABCDEF"

View File

@ -12,7 +12,7 @@ import (
"unicode/utf16"
"unicode/utf8"
"apigo.cc/gojs/dop251/goja/unistring"
"apigo.cc/gojs/goja/unistring"
)
const hex = "0123456789abcdef"

View File

@ -4,7 +4,7 @@ import (
"math"
"sync"
"apigo.cc/gojs/dop251/goja/ftoa"
"apigo.cc/gojs/goja/ftoa"
)
func (r *Runtime) toNumber(v Value) Value {

View File

@ -3,7 +3,7 @@ package goja
import (
"reflect"
"apigo.cc/gojs/dop251/goja/unistring"
"apigo.cc/gojs/goja/unistring"
)
type PromiseState int
@ -606,7 +606,7 @@ func (r *Runtime) wrapPromiseReaction(fObj *Object) func(interface{}) {
// NewPromise creates and returns a Promise and resolving functions for it.
//
// WARNING: The returned values are not goroutine-safe and must not be called in parallel with VM running.
// In order to make use of this method you need an event loop such as the one in goja_nodejs (https://apigo.cc/gojs/dop251/goja_nodejs)
// In order to make use of this method you need an event loop such as the one in goja_nodejs (https://apigo.cc/gojs/goja_nodejs)
// where it can be used like this:
//
// loop := NewEventLoop()

View File

@ -1,7 +1,7 @@
package goja
import (
"apigo.cc/gojs/dop251/goja/unistring"
"apigo.cc/gojs/goja/unistring"
)
type nativeProxyHandler struct {

View File

@ -7,7 +7,7 @@ import (
"unicode/utf16"
"unicode/utf8"
"apigo.cc/gojs/dop251/goja/parser"
"apigo.cc/gojs/goja/parser"
)
func (r *Runtime) newRegexpObject(proto *Object) *regexpObject {

View File

@ -7,9 +7,9 @@ import (
"unicode/utf16"
"unicode/utf8"
"apigo.cc/gojs/dop251/goja/unistring"
"apigo.cc/gojs/goja/unistring"
"apigo.cc/gojs/dop251/goja/parser"
"apigo.cc/gojs/goja/parser"
"golang.org/x/text/collate"
"golang.org/x/text/language"
"golang.org/x/text/unicode/norm"

View File

@ -1,6 +1,6 @@
package goja
import "apigo.cc/gojs/dop251/goja/unistring"
import "apigo.cc/gojs/goja/unistring"
var (
SymHasInstance = newSymbol(asciiString("Symbol.hasInstance"))

View File

@ -8,7 +8,7 @@ import (
"sync"
"unsafe"
"apigo.cc/gojs/dop251/goja/unistring"
"apigo.cc/gojs/goja/unistring"
)
type typedArraySortCtx struct {

View File

@ -4,11 +4,11 @@ import (
"fmt"
"sort"
"apigo.cc/gojs/dop251/goja/token"
"apigo.cc/gojs/goja/token"
"apigo.cc/gojs/dop251/goja/ast"
"apigo.cc/gojs/dop251/goja/file"
"apigo.cc/gojs/dop251/goja/unistring"
"apigo.cc/gojs/goja/ast"
"apigo.cc/gojs/goja/file"
"apigo.cc/gojs/goja/unistring"
)
type blockType int

View File

@ -3,10 +3,10 @@ package goja
import (
"math/big"
"apigo.cc/gojs/dop251/goja/ast"
"apigo.cc/gojs/dop251/goja/file"
"apigo.cc/gojs/dop251/goja/token"
"apigo.cc/gojs/dop251/goja/unistring"
"apigo.cc/gojs/goja/ast"
"apigo.cc/gojs/goja/file"
"apigo.cc/gojs/goja/token"
"apigo.cc/gojs/goja/unistring"
)
type compiledExpr interface {

View File

@ -1,10 +1,10 @@
package goja
import (
"apigo.cc/gojs/dop251/goja/ast"
"apigo.cc/gojs/dop251/goja/file"
"apigo.cc/gojs/dop251/goja/token"
"apigo.cc/gojs/dop251/goja/unistring"
"apigo.cc/gojs/goja/ast"
"apigo.cc/gojs/goja/file"
"apigo.cc/gojs/goja/token"
"apigo.cc/gojs/goja/unistring"
)
func (c *compiler) compileStatement(v ast.Statement, needResult bool) {

View File

@ -3,7 +3,7 @@ package goja
import (
"reflect"
"apigo.cc/gojs/dop251/goja/unistring"
"apigo.cc/gojs/goja/unistring"
)
type destructKeyedSource struct {

View File

@ -4,7 +4,7 @@ import (
"math"
"strconv"
"apigo.cc/gojs/dop251/goja/ftoa/internal/fast"
"apigo.cc/gojs/goja/ftoa/internal/fast"
)
type FToStrMode int

View File

@ -4,7 +4,7 @@ import (
"fmt"
"reflect"
"apigo.cc/gojs/dop251/goja/unistring"
"apigo.cc/gojs/goja/unistring"
)
type resultType uint8

View File

@ -13,9 +13,9 @@ import (
"runtime/pprof"
"time"
"apigo.cc/gojs/dop251/goja"
"apigo.cc/gojs/dop251/goja_nodejs/console"
"apigo.cc/gojs/dop251/goja_nodejs/require"
"apigo.cc/gojs/goja"
"apigo.cc/gojs/goja_nodejs/console"
"apigo.cc/gojs/goja_nodejs/require"
)
var cpuprofile = flag.String("cpuprofile", "", "write cpu profile to file")

View File

@ -6,7 +6,7 @@ import (
"reflect"
"sort"
"apigo.cc/gojs/dop251/goja/unistring"
"apigo.cc/gojs/goja/unistring"
)
const (

View File

@ -1,6 +1,6 @@
package goja
import "apigo.cc/gojs/dop251/goja/unistring"
import "apigo.cc/gojs/goja/unistring"
type argumentsObject struct {
baseObject

View File

@ -5,7 +5,7 @@ import (
"reflect"
"strconv"
"apigo.cc/gojs/dop251/goja/unistring"
"apigo.cc/gojs/goja/unistring"
)
/*

View File

@ -4,7 +4,7 @@ import (
"reflect"
"strconv"
"apigo.cc/gojs/dop251/goja/unistring"
"apigo.cc/gojs/goja/unistring"
)
type objectGoArrayReflect struct {

View File

@ -3,7 +3,7 @@ package goja
import (
"reflect"
"apigo.cc/gojs/dop251/goja/unistring"
"apigo.cc/gojs/goja/unistring"
)
type objectGoMapSimple struct {

View File

@ -4,7 +4,7 @@ import (
"fmt"
"reflect"
"apigo.cc/gojs/dop251/goja/unistring"
"apigo.cc/gojs/goja/unistring"
)
type objectGoMapReflect struct {

View File

@ -6,8 +6,8 @@ import (
"reflect"
"strings"
"apigo.cc/gojs/dop251/goja/parser"
"apigo.cc/gojs/dop251/goja/unistring"
"apigo.cc/gojs/goja/parser"
"apigo.cc/gojs/goja/unistring"
)
// JsonEncodable allows custom JSON encoding by JSON.stringify()

View File

@ -6,7 +6,7 @@ import (
"reflect"
"strconv"
"apigo.cc/gojs/dop251/goja/unistring"
"apigo.cc/gojs/goja/unistring"
)
type objectGoSlice struct {

View File

@ -5,7 +5,7 @@ import (
"math/bits"
"reflect"
"apigo.cc/gojs/dop251/goja/unistring"
"apigo.cc/gojs/goja/unistring"
)
type objectGoSliceReflect struct {

View File

@ -6,7 +6,7 @@ import (
"reflect"
"sort"
"apigo.cc/gojs/dop251/goja/unistring"
"apigo.cc/gojs/goja/unistring"
)
type templatePropFactory func(*Runtime) Value

View File

@ -4,8 +4,8 @@ import (
"fmt"
"sort"
"apigo.cc/gojs/dop251/goja/file"
"apigo.cc/gojs/dop251/goja/token"
"apigo.cc/gojs/goja/file"
"apigo.cc/gojs/goja/token"
)
const (

View File

@ -3,10 +3,10 @@ package parser
import (
"strings"
"apigo.cc/gojs/dop251/goja/ast"
"apigo.cc/gojs/dop251/goja/file"
"apigo.cc/gojs/dop251/goja/token"
"apigo.cc/gojs/dop251/goja/unistring"
"apigo.cc/gojs/goja/ast"
"apigo.cc/gojs/goja/file"
"apigo.cc/gojs/goja/token"
"apigo.cc/gojs/goja/unistring"
)
func (self *_parser) parseIdentifier() *ast.Identifier {

View File

@ -12,9 +12,9 @@ import (
"golang.org/x/text/unicode/rangetable"
"apigo.cc/gojs/dop251/goja/file"
"apigo.cc/gojs/dop251/goja/token"
"apigo.cc/gojs/dop251/goja/unistring"
"apigo.cc/gojs/goja/file"
"apigo.cc/gojs/goja/token"
"apigo.cc/gojs/goja/unistring"
)
var (

View File

@ -2,7 +2,7 @@
Package parser implements a parser for JavaScript.
import (
"apigo.cc/gojs/dop251/goja/parser"
"apigo.cc/gojs/goja/parser"
)
Parse and return an AST
@ -38,10 +38,10 @@ import (
"io"
"os"
"apigo.cc/gojs/dop251/goja/ast"
"apigo.cc/gojs/dop251/goja/file"
"apigo.cc/gojs/dop251/goja/token"
"apigo.cc/gojs/dop251/goja/unistring"
"apigo.cc/gojs/goja/ast"
"apigo.cc/gojs/goja/file"
"apigo.cc/gojs/goja/token"
"apigo.cc/gojs/goja/unistring"
)
// A Mode value is a set of flags (or 0). They control optional parser functionality.

View File

@ -1,8 +1,8 @@
package parser
import (
"apigo.cc/gojs/dop251/goja/ast"
"apigo.cc/gojs/dop251/goja/unistring"
"apigo.cc/gojs/goja/ast"
"apigo.cc/gojs/goja/unistring"
)
type _scope struct {

View File

@ -6,9 +6,9 @@ import (
"os"
"strings"
"apigo.cc/gojs/dop251/goja/ast"
"apigo.cc/gojs/dop251/goja/file"
"apigo.cc/gojs/dop251/goja/token"
"apigo.cc/gojs/goja/ast"
"apigo.cc/gojs/goja/file"
"apigo.cc/gojs/goja/token"
"github.com/go-sourcemap/sourcemap"
)

View File

@ -4,7 +4,7 @@ import (
"fmt"
"reflect"
"apigo.cc/gojs/dop251/goja/unistring"
"apigo.cc/gojs/goja/unistring"
)
// Proxy is a Go wrapper around ECMAScript Proxy. Calling Runtime.ToValue() on it

View File

@ -8,7 +8,7 @@ import (
"strings"
"unicode/utf16"
"apigo.cc/gojs/dop251/goja/unistring"
"apigo.cc/gojs/goja/unistring"
"github.com/dlclark/regexp2"
)

View File

@ -18,10 +18,10 @@ import (
"golang.org/x/text/collate"
js_ast "apigo.cc/gojs/dop251/goja/ast"
"apigo.cc/gojs/dop251/goja/file"
"apigo.cc/gojs/dop251/goja/parser"
"apigo.cc/gojs/dop251/goja/unistring"
js_ast "apigo.cc/gojs/goja/ast"
"apigo.cc/gojs/goja/file"
"apigo.cc/gojs/goja/parser"
"apigo.cc/gojs/goja/unistring"
)
const (

View File

@ -6,7 +6,7 @@ import (
"strings"
"unicode/utf8"
"apigo.cc/gojs/dop251/goja/unistring"
"apigo.cc/gojs/goja/unistring"
)
const (

View File

@ -9,7 +9,7 @@ import (
"strconv"
"strings"
"apigo.cc/gojs/dop251/goja/unistring"
"apigo.cc/gojs/goja/unistring"
)
type asciiString string

View File

@ -9,8 +9,8 @@ import (
"unicode/utf16"
"unicode/utf8"
"apigo.cc/gojs/dop251/goja/parser"
"apigo.cc/gojs/dop251/goja/unistring"
"apigo.cc/gojs/goja/parser"
"apigo.cc/gojs/goja/unistring"
"golang.org/x/text/cases"
"golang.org/x/text/language"

View File

@ -10,8 +10,8 @@ import (
"unicode/utf16"
"unicode/utf8"
"apigo.cc/gojs/dop251/goja/parser"
"apigo.cc/gojs/dop251/goja/unistring"
"apigo.cc/gojs/goja/parser"
"apigo.cc/gojs/goja/unistring"
"golang.org/x/text/cases"
"golang.org/x/text/language"
)

View File

@ -7,7 +7,7 @@ import (
"strconv"
"unsafe"
"apigo.cc/gojs/dop251/goja/unistring"
"apigo.cc/gojs/goja/unistring"
)
type byteOrder bool

View File

@ -9,8 +9,8 @@ import (
"strconv"
"unsafe"
"apigo.cc/gojs/dop251/goja/ftoa"
"apigo.cc/gojs/dop251/goja/unistring"
"apigo.cc/gojs/goja/ftoa"
"apigo.cc/gojs/goja/unistring"
)
var (

View File

@ -10,7 +10,7 @@ import (
"sync/atomic"
"time"
"apigo.cc/gojs/dop251/goja/unistring"
"apigo.cc/gojs/goja/unistring"
)
const (

View File

@ -7,11 +7,11 @@ import (
"reflect"
"strconv"
"apigo.cc/gojs/dop251/goja"
"apigo.cc/gojs/dop251/goja_nodejs/errors"
"apigo.cc/gojs/dop251/goja_nodejs/require"
"apigo.cc/gojs/goja"
"apigo.cc/gojs/goja_nodejs/errors"
"apigo.cc/gojs/goja_nodejs/require"
"apigo.cc/gojs/dop251/base64dec"
"apigo.cc/gojs/base64dec"
"golang.org/x/text/encoding/unicode"
)

View File

@ -1,9 +1,9 @@
package console
import (
"apigo.cc/gojs/dop251/goja"
"apigo.cc/gojs/dop251/goja_nodejs/require"
"apigo.cc/gojs/dop251/goja_nodejs/util"
"apigo.cc/gojs/goja"
"apigo.cc/gojs/goja_nodejs/require"
"apigo.cc/gojs/goja_nodejs/util"
)
const ModuleName = "console"

View File

@ -3,7 +3,7 @@ package errors
import (
"fmt"
"apigo.cc/gojs/dop251/goja"
"apigo.cc/gojs/goja"
)
const (

View File

@ -5,9 +5,9 @@ import (
"sync/atomic"
"time"
"apigo.cc/gojs/dop251/goja"
"apigo.cc/gojs/dop251/goja_nodejs/console"
"apigo.cc/gojs/dop251/goja_nodejs/require"
"apigo.cc/gojs/goja"
"apigo.cc/gojs/goja_nodejs/console"
"apigo.cc/gojs/goja_nodejs/require"
)
type job struct {

View File

@ -4,8 +4,8 @@ import (
"os"
"strings"
"apigo.cc/gojs/dop251/goja"
"apigo.cc/gojs/dop251/goja_nodejs/require"
"apigo.cc/gojs/goja"
"apigo.cc/gojs/goja_nodejs/require"
)
const ModuleName = "process"

View File

@ -12,8 +12,8 @@ import (
"syscall"
"text/template"
js "apigo.cc/gojs/dop251/goja"
"apigo.cc/gojs/dop251/goja/parser"
js "apigo.cc/gojs/goja"
"apigo.cc/gojs/goja/parser"
)
type ModuleLoader func(*js.Runtime, *js.Object)

View File

@ -8,7 +8,7 @@ import (
"runtime"
"strings"
js "apigo.cc/gojs/dop251/goja"
js "apigo.cc/gojs/goja"
)
const NodePrefix = "node:"

View File

@ -1,8 +1,8 @@
package url
import (
"apigo.cc/gojs/dop251/goja"
"apigo.cc/gojs/dop251/goja_nodejs/require"
"apigo.cc/gojs/goja"
"apigo.cc/gojs/goja_nodejs/require"
)
const ModuleName = "url"

View File

@ -7,8 +7,8 @@ import (
"strconv"
"strings"
"apigo.cc/gojs/dop251/goja"
"apigo.cc/gojs/dop251/goja_nodejs/errors"
"apigo.cc/gojs/goja"
"apigo.cc/gojs/goja_nodejs/errors"
"golang.org/x/net/idna"
)

View File

@ -4,9 +4,9 @@ import (
"reflect"
"sort"
"apigo.cc/gojs/dop251/goja_nodejs/errors"
"apigo.cc/gojs/goja_nodejs/errors"
"apigo.cc/gojs/dop251/goja"
"apigo.cc/gojs/goja"
)
var (

View File

@ -3,8 +3,8 @@ package util
import (
"bytes"
"apigo.cc/gojs/dop251/goja"
"apigo.cc/gojs/dop251/goja_nodejs/require"
"apigo.cc/gojs/goja"
"apigo.cc/gojs/goja_nodejs/require"
)
const ModuleName = "util"

View File

@ -13,8 +13,8 @@ import (
"syscall"
"time"
"apigo.cc/gojs/dop251/goja"
"apigo.cc/gojs/dop251/goja_nodejs/require"
"apigo.cc/gojs/goja"
"apigo.cc/gojs/goja_nodejs/require"
"github.com/ssgo/log"
"github.com/ssgo/tool/watcher"
"github.com/ssgo/u"

View File

@ -7,9 +7,8 @@ import (
"time"
"apigo.cc/gojs"
"apigo.cc/gojs/dop251/goja"
"apigo.cc/gojs/goja"
// _ "apigo.cc/gojs/modules"
"github.com/ssgo/u"
)

View File

@ -56,22 +56,24 @@ func main() {
}
}
_ = os.RemoveAll("../dop251")
_ = os.RemoveAll("../goja")
_ = os.RemoveAll("../goja_nodejs")
_ = os.RemoveAll("../base64dec")
u.CopyFile(gojaPkgPath, "../dop251/goja")
_ = os.Remove("../dop251/goja/go.mod")
_ = os.Remove("../dop251/goja/go.sum")
replacePackage("../dop251/goja")
u.CopyFile(gojaPkgPath, "../goja")
_ = os.Remove("../goja/go.mod")
_ = os.Remove("../goja/go.sum")
replacePackage("../goja")
u.CopyFile(gojaNodejsPkgPath, "../dop251/goja_nodejs")
_ = os.Remove("../dop251/goja_nodejs/go.mod")
_ = os.Remove("../dop251/goja_nodejs/go.sum")
replacePackage("../dop251/goja_nodejs")
u.CopyFile(gojaNodejsPkgPath, "../goja_nodejs")
_ = os.Remove("../goja_nodejs/go.mod")
_ = os.Remove("../goja_nodejs/go.sum")
replacePackage("../goja_nodejs")
u.CopyFile(gojaB64PkgPath, "../dop251/base64dec")
_ = os.Remove("../dop251/base64dec/go.mod")
_ = os.Remove("../dop251/base64dec/go.sum")
replacePackage("../dop251/base64dec")
u.CopyFile(gojaB64PkgPath, "../base64dec")
_ = os.Remove("../base64dec/go.mod")
_ = os.Remove("../base64dec/go.sum")
replacePackage("../base64dec")
_ = os.Chdir("..")
r, err = u.RunCommand("go", "mod", "tidy")
@ -90,7 +92,7 @@ func replacePackage(root string) {
} else if strings.HasSuffix(f.Name, ".go") && !strings.HasSuffix(f.Name, "_test.go") {
str := u.ReadFileN(f.FullName)
if strings.Contains(str, "github.com/dop251/") {
str = strings.ReplaceAll(str, "github.com/dop251/", "apigo.cc/gojs/dop251/")
str = strings.ReplaceAll(str, "github.com/dop251/", "apigo.cc/gojs/")
if strings.HasSuffix(f.FullName, "/dop251/goja/runtime.go") {
str = strings.ReplaceAll(str, "\"strconv\"", "\"strconv\"\n\t\"sync\"")
str = strings.ReplaceAll(str, "type Runtime struct {", "type Runtime struct {\n\tGoData map[string]any\n\tLocker sync.Mutex\n\tCallbackLocker sync.Mutex")