fix: dependency error

contracts/foundation/application.go

@@ -3,11 +3,32 @@ package foundation
 import (
 	"context"
 
+	"github.com/goravel/framework/contracts/auth"
+	"github.com/goravel/framework/contracts/auth/access"
+	"github.com/goravel/framework/contracts/cache"
+	"github.com/goravel/framework/contracts/config"
 	"github.com/goravel/framework/contracts/console"
+	"github.com/goravel/framework/contracts/crypt"
+	"github.com/goravel/framework/contracts/database/migration"
+	"github.com/goravel/framework/contracts/database/orm"
+	"github.com/goravel/framework/contracts/database/seeder"
+	"github.com/goravel/framework/contracts/event"
+	"github.com/goravel/framework/contracts/filesystem"
+	"github.com/goravel/framework/contracts/grpc"
+	"github.com/goravel/framework/contracts/hash"
+	"github.com/goravel/framework/contracts/http"
+	"github.com/goravel/framework/contracts/log"
+	"github.com/goravel/framework/contracts/mail"
+	"github.com/goravel/framework/contracts/queue"
+	"github.com/goravel/framework/contracts/route"
+	"github.com/goravel/framework/contracts/schedule"
+	"github.com/goravel/framework/contracts/session"
+	"github.com/goravel/framework/contracts/testing"
+	"github.com/goravel/framework/contracts/translation"
+	"github.com/goravel/framework/contracts/validation"
 )
 
 type Application interface {
-	Container
 	// Boot register and bootstrap configured service providers.
 	Boot()
 	// Commands register the given commands with the console application.
@@ -42,4 +63,66 @@ type Application interface {
 	SetJson(json Json)
 	// GetJson get the JSON implementation.
 	GetJson() Json
+
+	// Container
+	// Bind registers a binding with the container.
+	Bind(key any, callback func(app Application) (any, error))
+	// BindWith registers a binding with the container.
+	BindWith(key any, callback func(app Application, parameters map[string]any) (any, error))
+	// Instance registers an existing instance as shared in the container.
+	Instance(key, instance any)
+	// Make resolves the given type from the container.
+	Make(key any) (any, error)
+	// MakeArtisan resolves the artisan console instance.
+	MakeArtisan() console.Artisan
+	// MakeAuth resolves the auth instance.
+	MakeAuth(ctx http.Context) auth.Auth
+	// MakeCache resolves the cache instance.
+	MakeCache() cache.Cache
+	// MakeConfig resolves the config instance.
+	MakeConfig() config.Config
+	// MakeCrypt resolves the crypt instance.
+	MakeCrypt() crypt.Crypt
+	// MakeEvent resolves the event instance.
+	MakeEvent() event.Instance
+	// MakeGate resolves the gate instance.
+	MakeGate() access.Gate
+	// MakeGrpc resolves the grpc instance.
+	MakeGrpc() grpc.Grpc
+	// MakeHash resolves the hash instance.
+	MakeHash() hash.Hash
+	// MakeLang resolves the lang instance.
+	MakeLang(ctx context.Context) translation.Translator
+	// MakeLog resolves the log instance.
+	MakeLog() log.Log
+	// MakeMail resolves the mail instance.
+	MakeMail() mail.Mail
+	// MakeOrm resolves the orm instance.
+	MakeOrm() orm.Orm
+	// MakeQueue resolves the queue instance.
+	MakeQueue() queue.Queue
+	// MakeRateLimiter resolves the rate limiter instance.
+	MakeRateLimiter() http.RateLimiter
+	// MakeRoute resolves the route instance.
+	MakeRoute() route.Route
+	// MakeSchedule resolves the schedule instance.
+	MakeSchedule() schedule.Schedule
+	// MakeSchema resolves the schema instance.
+	MakeSchema() migration.Schema
+	// MakeSession resolves the session instance.
+	MakeSession() session.Manager
+	// MakeStorage resolves the storage instance.
+	MakeStorage() filesystem.Storage
+	// MakeTesting resolves the testing instance.
+	MakeTesting() testing.Testing
+	// MakeValidation resolves the validation instance.
+	MakeValidation() validation.Validation
+	// MakeView resolves the view instance.
+	MakeView() http.View
+	// MakeSeeder resolves the seeder instance.
+	MakeSeeder() seeder.Facade
+	// MakeWith resolves the given type with the given parameters from the container.
+	MakeWith(key any, parameters map[string]any) (any, error)
+	// Singleton registers a shared binding in the container.
+	Singleton(key any, callback func(app Application) (any, error))
 }

foundation/application.go

@@ -8,7 +8,7 @@
 	"strings"
 
 	"github.com/goravel/framework/config"
-	consolecontract "github.com/goravel/framework/contracts/console"
+	contractsconsole "github.com/goravel/framework/contracts/console"
 	"github.com/goravel/framework/contracts/foundation"
 	"github.com/goravel/framework/foundation/console"
 	"github.com/goravel/framework/foundation/json"
@@ -38,7 +38,7 @@
 }
 
 type Application struct {
-	foundation.Container
+	*Container
 	publishes     map[string]map[string]string
 	publishGroups map[string]map[string]string
 	json          foundation.Json
@@ -52,7 +52,7 @@
 func (app *Application) Boot() {
 	app.registerConfiguredServiceProviders()
 	app.bootConfiguredServiceProviders()
-	app.registerCommands([]consolecontract.Command{
+	app.registerCommands([]contractsconsole.Command{
 		console.NewTestMakeCommand(),
 		console.NewPackageMakeCommand(),
 		console.NewVendorPublishCommand(app.publishes, app.publishGroups),
@@ -61,7 +61,7 @@
 	app.bootArtisan()
 }
 
-func (app *Application) Commands(commands []consolecontract.Command) {
+func (app *Application) Commands(commands []contractsconsole.Command) {
 	app.registerCommands(commands)
 }
 
@@ -209,7 +209,7 @@
 	}
 }
 
-func (app *Application) registerCommands(commands []consolecontract.Command) {
+func (app *Application) registerCommands(commands []contractsconsole.Command) {
 	app.MakeArtisan().Register(commands)
 }