types
This commit is contained in:
@@ -14,8 +14,10 @@ import (
|
||||
)
|
||||
|
||||
type Runtime struct {
|
||||
ctx *qjs.Context
|
||||
opts qjs.Option
|
||||
ctx *qjs.Context
|
||||
opts qjs.Option
|
||||
funcs map[string]functions.Function
|
||||
typeDecls map[string]string
|
||||
}
|
||||
|
||||
func New(ctx context.Context, opts ...RuntimeOption) (*Runtime, error) {
|
||||
@@ -41,8 +43,21 @@ func New(ctx context.Context, opts ...RuntimeOption) (*Runtime, error) {
|
||||
}
|
||||
|
||||
func (r *Runtime) populateGlobals() error {
|
||||
for name, fn := range functions.GetRegisteredFunctions() {
|
||||
// Register Main Function
|
||||
// Initialize Maps
|
||||
r.funcs = make(map[string]functions.Function)
|
||||
r.typeDecls = make(map[string]string)
|
||||
|
||||
// Load Requested Functions
|
||||
allFuncs := functions.GetRegisteredFunctions()
|
||||
for name, fn := range allFuncs {
|
||||
r.funcs[name] = fn
|
||||
if err := r.addFunctionTypes(fn); err != nil {
|
||||
return fmt.Errorf("failed to add types for function %s: %w", name, err)
|
||||
}
|
||||
}
|
||||
|
||||
// Register Functions with QuickJS
|
||||
for name, fn := range r.funcs {
|
||||
if fn.IsAsync() {
|
||||
r.ctx.SetAsyncFunc(name, func(this *qjs.This) {
|
||||
qjsVal, err := callFunc(this, fn)
|
||||
@@ -62,6 +77,37 @@ func (r *Runtime) populateGlobals() error {
|
||||
return nil
|
||||
}
|
||||
|
||||
// addFunctionTypes adds types from a function to the runtime's type declarations.
|
||||
// Returns an error if there's a type conflict (same name, different definition).
|
||||
func (r *Runtime) addFunctionTypes(fn functions.Function) error {
|
||||
for name, def := range fn.Types() {
|
||||
if existing, ok := r.typeDecls[name]; ok && existing != def {
|
||||
return fmt.Errorf("type conflict: %s has conflicting definitions (existing: %s, new: %s)",
|
||||
name, existing, def)
|
||||
}
|
||||
r.typeDecls[name] = def
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// GetTypeDeclarations returns all TypeScript type declarations for this runtime.
|
||||
// Includes both type definitions and function declarations.
|
||||
func (r *Runtime) GetTypeDeclarations() string {
|
||||
var decls []string
|
||||
|
||||
// Add Type Definitions
|
||||
for _, def := range r.typeDecls {
|
||||
decls = append(decls, def)
|
||||
}
|
||||
|
||||
// Add Function Declarations
|
||||
for _, fn := range r.funcs {
|
||||
decls = append(decls, fn.Definition())
|
||||
}
|
||||
|
||||
return strings.Join(decls, "\n\n")
|
||||
}
|
||||
|
||||
func (r *Runtime) RunFile(filePath string) error {
|
||||
tsFileContent, err := os.ReadFile(filePath)
|
||||
if err != nil {
|
||||
@@ -86,9 +132,9 @@ func (r *Runtime) RunCode(tsCode string) error {
|
||||
|
||||
func (r *Runtime) transformCode(tsCode string) ([]byte, error) {
|
||||
result := api.Transform(tsCode, api.TransformOptions{
|
||||
Loader: api.LoaderTS,
|
||||
Target: api.ES2022,
|
||||
// Format: api.FormatIIFE,
|
||||
Loader: api.LoaderTS,
|
||||
Target: api.ES2022,
|
||||
Format: api.FormatIIFE,
|
||||
Sourcemap: api.SourceMapNone,
|
||||
TreeShaking: api.TreeShakingFalse,
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user