refactor: move files

casbin · Aug 19, 2024 · dd6b91a · dd6b91a
1 parent 29c1c27
commit dd6b91a
Show file tree

Hide file tree

Showing 27 changed files with 64 additions and 48 deletions.
diff --git a/adapter_test.go b/adapter_test.go
@@ -20,7 +20,7 @@ import (
 
 	"github.com/casbin/casbin/v2"
 	"github.com/casbin/casbin/v2/util"
-	"github.com/casbin/ent-adapter/ent"
+	"github.com/casbin/ent-adapter/examples/ent"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/template/casbin.tmpl → casbin.tmpl b/template/casbin.tmpl → casbin.tmpl
@@ -1,9 +1,9 @@
-{{ /* Tell Intellij/GoLand to enable the autocompletion based on the *gen.Graph type. */ }}
-{{ /* gotype: entgo.io/ent/entc/gen.Graph */ }}
+{{/* Tell Intellij/GoLand to enable the autocompletion based on the *gen.Graph type. */}}
+{{/* gotype: entgo.io/ent/entc/gen.Graph */}}
 
 {{ define "casbin" }}
 
-{{ /* Add the base header for the generated file */ }}
+{{/* Add the base header for the generated file */}}
 {{ $pkg := base $.Config.Package }}
 {{ template "header" $ }}
 

diff --git a/ent/casbin.go → examples/ent/casbin.go b/ent/casbin.go → examples/ent/casbin.go
diff --git a/ent/casbinrule.go → examples/ent/casbinrule.go b/ent/casbinrule.go → examples/ent/casbinrule.go
diff --git a/ent/casbinrule/casbinrule.go → examples/ent/casbinrule/casbinrule.go b/ent/casbinrule/casbinrule.go → examples/ent/casbinrule/casbinrule.go
diff --git a/ent/casbinrule/where.go → examples/ent/casbinrule/where.go b/ent/casbinrule/where.go → examples/ent/casbinrule/where.go
diff --git a/ent/casbinrule_create.go → examples/ent/casbinrule_create.go b/ent/casbinrule_create.go → examples/ent/casbinrule_create.go
diff --git a/ent/casbinrule_delete.go → examples/ent/casbinrule_delete.go b/ent/casbinrule_delete.go → examples/ent/casbinrule_delete.go
diff --git a/ent/casbinrule_query.go → examples/ent/casbinrule_query.go b/ent/casbinrule_query.go → examples/ent/casbinrule_query.go
diff --git a/ent/casbinrule_update.go → examples/ent/casbinrule_update.go b/ent/casbinrule_update.go → examples/ent/casbinrule_update.go
diff --git a/ent/client.go → examples/ent/client.go b/ent/client.go → examples/ent/client.go
diff --git a/ent/ent.go → examples/ent/ent.go b/ent/ent.go → examples/ent/ent.go
diff --git a/ent/enttest/enttest.go → examples/ent/enttest/enttest.go b/ent/enttest/enttest.go → examples/ent/enttest/enttest.go
diff --git a/examples/ent/generate.go b/examples/ent/generate.go
@@ -0,0 +1,3 @@
+//go:generate go run main.go
+
+package ent
diff --git a/ent/hook/hook.go → examples/ent/hook/hook.go b/ent/hook/hook.go → examples/ent/hook/hook.go
diff --git a/ent/generate.go → examples/ent/main.go b/ent/generate.go → examples/ent/main.go
@@ -8,13 +8,13 @@ import (
 
 	"entgo.io/ent/entc"
 	"entgo.io/ent/entc/gen"
-	"github.com/casbin/ent-adapter/template"
+	"github.com/casbin/ent-adapter"
 )
 
 func main() {
 	err := entc.Generate("./schema",
 		&gen.Config{},
-		entc.Extensions(&template.CasbinExtension{}),
+		entc.Extensions(&entadapter.CasbinExtension{}),
 	)
 	if err != nil {
 		log.Fatal("running ent codegen:", err)

diff --git a/ent/migrate/migrate.go → examples/ent/migrate/migrate.go b/ent/migrate/migrate.go → examples/ent/migrate/migrate.go
diff --git a/ent/migrate/schema.go → examples/ent/migrate/schema.go b/ent/migrate/schema.go → examples/ent/migrate/schema.go
diff --git a/ent/mutation.go → examples/ent/mutation.go b/ent/mutation.go → examples/ent/mutation.go
diff --git a/ent/predicate/predicate.go → examples/ent/predicate/predicate.go b/ent/predicate/predicate.go → examples/ent/predicate/predicate.go
diff --git a/ent/runtime.go → examples/ent/runtime.go b/ent/runtime.go → examples/ent/runtime.go
diff --git a/ent/runtime/runtime.go → examples/ent/runtime/runtime.go b/ent/runtime/runtime.go → examples/ent/runtime/runtime.go
diff --git a/ent/schema/casbinrule.go → examples/ent/schema/casbinrule.go b/ent/schema/casbinrule.go → examples/ent/schema/casbinrule.go
@@ -2,7 +2,7 @@ package schema
 
 import (
 	"entgo.io/ent"
-	"github.com/casbin/ent-adapter/template"
+	"github.com/casbin/ent-adapter"
 )
 
 // CasbinRule holds the schema definition for the CasbinRule entity.
@@ -12,6 +12,6 @@ type CasbinRule struct {
 
 func (CasbinRule) Mixin() []ent.Mixin {
 	return []ent.Mixin{
-		template.CasbinRuleMixin{},
+		entadapter.CasbinRuleMixin{},
 	}
 }
diff --git a/ent/tx.go → examples/ent/tx.go b/ent/tx.go → examples/ent/tx.go
diff --git a/extension.go b/extension.go
@@ -0,0 +1,29 @@
+package entadapter
+
+import (
+	"fmt"
+	"path/filepath"
+	"runtime"
+
+	"entgo.io/ent/entc"
+	"entgo.io/ent/entc/gen"
+)
+
+type CasbinExtension struct {
+	entc.DefaultExtension
+}
+
+func (*CasbinExtension) Templates() []*gen.Template {
+	_, filename, _, ok := runtime.Caller(0)
+	if !ok {
+		_ = fmt.Errorf("error retrieving current file path")
+	}
+
+	dir := filepath.Dir(filename)
+
+	relativePath := filepath.Join(dir, "casbin.tmpl")
+
+	return []*gen.Template{
+		gen.MustParse(gen.NewTemplate("casbin").ParseFiles(relativePath)),
+	}
+}
diff --git a/template/mixin.go → mixin.go b/template/mixin.go → mixin.go
@@ -1,4 +1,4 @@
-package template
+package entadapter
 
 import (
 	"entgo.io/ent"

diff --git a/template/extension.go b/template/extension.go