refactor(ts): rename ts->typesystem

internal/compiler/analyzer/analyzer.go

@@ -1,4 +1,3 @@
-// Package analyzer implements source code analysis.
 package analyzer
 
 import (
@@ -8,15 +7,18 @@ import (
 	"github.com/nevalang/neva/internal/compiler/src"
 )
 
+// TODO move to task that package must not be empty
 type Analyzer struct{}
 
 var (
-	ErrEmptyProgram    = errors.New("empty program")
-	ErrMainPkgNotFound = errors.New("main package not found")
+	ErrEmptyProgram      = errors.New("empty program")
+	ErrMainPkgNotFound   = errors.New("main package not found")
+	ErrEmptyPkg          = errors.New("package must not be empty")
+	ErrUnknownEntityKind = errors.New("unknown entity kind")
 )
 
 func (a Analyzer) Analyze(prog src.Program) (src.Program, error) {
-	if prog == nil {
+	if len(prog) == 0 {
 		return nil, ErrEmptyProgram
 	}
 
@@ -29,5 +31,65 @@ func (a Analyzer) Analyze(prog src.Program) (src.Program, error) {
 		return nil, fmt.Errorf("main specific pkg validation: %w", err)
 	}
 
+	for _, pkg := range prog {
+		if err := a.analyzePkg(pkg, prog); err != nil {
+			return nil, fmt.Errorf("analyze pkg: %w", err)
+		}
+	}
+
 	return nil, nil
 }
+
+func (a Analyzer) analyzePkg(pkg src.Package, prog src.Program) error {
+	if len(pkg) == 0 {
+		return ErrEmptyPkg
+	}
+
+	if err := pkg.Entities(func(entity src.Entity, entityName, fileName string) error {
+		return a.analyzeEntity(entityName, entity, pkg, prog)
+	}); err != nil {
+		return fmt.Errorf("entities: %w", err)
+	}
+
+	return nil
+}
+
+func (a Analyzer) analyzeEntity(entityName string, entity src.Entity, pkg src.Package, prog src.Program) error {
+	analyzedEntity := src.Entity{
+		Exported: entity.Exported,
+		Kind:     entity.Kind,
+	}
+
+	switch entity.Kind {
+	case src.TypeEntity:
+		resolvedType, err := a.resolveType(entity.Type)
+		if err != nil {
+			return fmt.Errorf("resolve type: %w", err)
+		}
+		analyzedEntity.Type = resolvedType
+	case src.ConstEntity:
+		analyzedConst, err := a.analyzeConst(entity.Const)
+		if err != nil {
+			return fmt.Errorf("analyze const: %w", err)
+		}
+		analyzedEntity.Const = analyzedConst
+	case src.InterfaceEntity:
+		analyzedEntity, err := a.analyzeInterface(entity.Interface)
+		if err != nil {
+			return fmt.Errorf("analyze interface: %w", err)
+		}
+		analyzedEntity.Interface = analyzedEntity
+	case src.ComponentEntity:
+		analyzedComponent, err := a.analyzeComponent(entity.Component)
+		if err != nil {
+			return fmt.Errorf("analyze component: %w", err)
+		}
+		analyzedEntity.Component = analyzedComponent
+	default:
+		return fmt.Errorf("%w: %v", ErrUnknownEntityKind, entity.Kind)
+	}
+
+	pkg[entityName] = analyzedEntity
+
+	return nil
+}

internal/compiler/analyzer/main_pkg.go

@@ -32,13 +32,14 @@ func (a Analyzer) mainSpecificPkgValidation(pkg src.Package, pkgs map[string]src
 		return fmt.Errorf("analyze main component: %w", err)
 	}
 
-	if err := pkg.Entities(func(entity src.Entity, entityName, fileName string) error { // FIXME will conflict with general validation
+	// FIXME will conflict with general validation
+	if err := pkg.Entities(func(entity src.Entity, entityName, fileName string) error {
 		if entity.Exported {
 			return fmt.Errorf("%w: file %v, entity %v", ErrMainPkgExports, fileName, entityName)
 		}
 		return nil
 	}); err != nil {
-		return err
+		return fmt.Errorf("entities: %w", err)
 	}
 
 	return nil

internal/compiler/parser/listener.go

@@ -6,7 +6,7 @@ import (
 
 	generated "github.com/nevalang/neva/internal/compiler/parser/generated"
 	"github.com/nevalang/neva/internal/compiler/src"
-	"github.com/nevalang/neva/pkg/ts"
+	ts "github.com/nevalang/neva/pkg/typesystem"
 )
 
 func (s *treeShapeListener) EnterProg(actx *generated.ProgContext) {

internal/compiler/parser/listener_helpers.go

@@ -3,7 +3,7 @@ package parser
 import (
 	generated "github.com/nevalang/neva/internal/compiler/parser/generated"
 	"github.com/nevalang/neva/internal/compiler/src"
-	"github.com/nevalang/neva/pkg/ts"
+	ts "github.com/nevalang/neva/pkg/typesystem"
 )
 
 func parseTypeParams(params generated.ITypeParamsContext) []ts.Param {

internal/compiler/src/src.go

@@ -4,7 +4,7 @@ package src
 import (
 	"fmt"
 
-	ts "github.com/nevalang/neva/pkg/ts"
+	ts "github.com/nevalang/neva/pkg/typesystem"
 )
 
 type Program map[string]Package

internal/compiler/std/std.go

@@ -3,7 +3,7 @@ package std
 
 import (
 	"github.com/nevalang/neva/internal/compiler/src"
-	"github.com/nevalang/neva/pkg/ts"
+	ts "github.com/nevalang/neva/pkg/typesystem"
 )
 
 // New returns single-package std library with only runtime-function interfaces. TODO add HOCs.

pkg/ts/compat_checker.go → pkg/typesystem/compat_checker.go

@@ -1,4 +1,4 @@
-package ts
+package typesystem
 
 import (
 	"errors"

pkg/ts/compat_checker_test.go → pkg/typesystem/compat_checker_test.go

@@ -1,10 +1,10 @@
-package ts_test
+package typesystem_test
 
 import (
 	"testing"
 
 	"github.com/golang/mock/gomock"
-	ts "github.com/nevalang/neva/pkg/ts"
+	ts "github.com/nevalang/neva/pkg/typesystem"
 	"github.com/stretchr/testify/require"
 )
 

pkg/ts/helper.go → pkg/typesystem/helper.go

@@ -1,4 +1,4 @@
-package ts
+package typesystem
 
 // Helper is just a namespace for helper functions to avoid conflicts with entity types.
 // It's a stateless type and it's safe to share it between goroutines.

pkg/ts/integration_test.go → pkg/typesystem/integration_test.go

@@ -1,14 +1,14 @@
 //go:build integration
 // +build integration
 
-package ts_test
+package typesystem_test
 
 import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 
-	ts "github.com/nevalang/neva/pkg/ts"
+	ts "github.com/nevalang/neva/pkg/typesystem"
 )
 
 func TestDefaultResolver(t *testing.T) {

pkg/ts/resolver.go → pkg/typesystem/resolver.go

@@ -1,4 +1,4 @@
-package ts
+package typesystem
 
 import (
 	"errors"

pkg/ts/resolver_test.go → pkg/typesystem/resolver_test.go

@@ -1,4 +1,4 @@
-package ts_test
+package typesystem_test
 
 import (
 	"errors"
@@ -7,7 +7,7 @@ import (
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 
-	ts "github.com/nevalang/neva/pkg/ts"
+	ts "github.com/nevalang/neva/pkg/typesystem"
 )
 
 var errTest = errors.New("")

pkg/ts/scope_test.go → pkg/typesystem/scope_test.go

@@ -1,9 +1,9 @@
-package ts_test
+package typesystem_test
 
 import (
 	"errors"
 
-	ts "github.com/nevalang/neva/pkg/ts"
+	ts "github.com/nevalang/neva/pkg/typesystem"
 )
 
 var ErrDefaultScope = errors.New("default scope")

pkg/ts/terminator.go → pkg/typesystem/terminator.go

@@ -1,4 +1,4 @@
-package ts
+package typesystem
 
 import (
 	"errors"

pkg/ts/terminator_test.go → pkg/typesystem/terminator_test.go

@@ -1,9 +1,9 @@
-package ts_test
+package typesystem_test
 
 import (
 	"testing"
 
-	ts "github.com/nevalang/neva/pkg/ts"
+	ts "github.com/nevalang/neva/pkg/typesystem"
 
 	"github.com/stretchr/testify/assert"
 )

pkg/ts/trace.go → pkg/typesystem/trace.go

@@ -1,4 +1,4 @@
-package ts
+package typesystem
 
 // Linked-list to handle recursive types
 type Trace struct {

pkg/ts/trace_test.go → pkg/typesystem/trace_test.go

@@ -1,9 +1,9 @@
-package ts_test
+package typesystem_test
 
 import (
 	"testing"
 
-	ts "github.com/nevalang/neva/pkg/ts"
+	ts "github.com/nevalang/neva/pkg/typesystem"
 	"github.com/stretchr/testify/assert"
 )
 

pkg/ts/ts.go → pkg/typesystem/ts.go

@@ -1,5 +1,5 @@
-// Package ts implements static type-system with generics and structural subtyping.
-package ts
+// package typesystem implements static type-system with generics and structural subtyping.
+package typesystem
 
 import "fmt"
 

pkg/ts/ts_test.go → pkg/typesystem/ts_test.go

@@ -1,11 +1,11 @@
-package ts_test
+package typesystem_test
 
 import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
 
-	ts "github.com/nevalang/neva/pkg/ts"
+	ts "github.com/nevalang/neva/pkg/typesystem"
 )
 
 var h ts.Helper

pkg/ts/validator.go → pkg/typesystem/validator.go

@@ -1,4 +1,4 @@
-package ts
+package typesystem
 
 import (
 	"errors"

pkg/ts/validator_test.go → pkg/typesystem/validator_test.go

@@ -1,11 +1,11 @@
-package ts_test
+package typesystem_test
 
 import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
 
-	ts "github.com/nevalang/neva/pkg/ts"
+	ts "github.com/nevalang/neva/pkg/typesystem"
 )
 
 func TestValidator_Validate(t *testing.T) {