整理文件

celt237 · Jul 2, 2024 · 44a0e40 · 44a0e40
1 parent da94ff1
commit 44a0e40
Show file tree

Hide file tree

Showing 23 changed files with 51 additions and 41 deletions.
diff --git a/internal/annotationParser.go → annotationParser.go b/internal/annotationParser.go → annotationParser.go
@@ -1,4 +1,4 @@
-package internal
+package go_annotation
 
 import (
 	"strconv"

diff --git a/internal/annotation_test.go → annotation_test.go b/internal/annotation_test.go → annotation_test.go
@@ -1,4 +1,4 @@
-package internal
+package go_annotation
 
 import (
 	"encoding/json"

diff --git a/internal/astParser.go → astParser.go b/internal/astParser.go → astParser.go
@@ -1,4 +1,4 @@
-package internal
+package go_annotation
 
 import (
 	"fmt"

diff --git a/internal/config.go → config.go b/internal/config.go → config.go
@@ -1,4 +1,4 @@
-package internal
+package go_annotation
 
 const AnnotationPrefix = "@"
 

diff --git a/internal/fileParser.go → fileParser.go b/internal/fileParser.go → fileParser.go
@@ -1,4 +1,4 @@
-package internal
+package go_annotation
 
 import (
 	"fmt"

diff --git a/internal/generate/config.go → generate/config.go b/internal/generate/config.go → generate/config.go
diff --git a/go-annotation.go b/go-annotation.go
@@ -1,19 +1,17 @@
 package go_annotation
 
-import "github.com/celt237/go-annotation/internal"
-
 // GetFileDesc 获取文件描述
 // fileName: 文件名
-func GetFileDesc(fileName string) (*internal.FileDesc, error) {
-	return internal.GetFileParser(fileName).Parse()
+func GetFileDesc(fileName string) (*FileDesc, error) {
+	return GetFileParser(fileName).Parse()
 }
 
 // GetFilesDescList 获取文件描述列表
 // directory: 目录
-func GetFilesDescList(directory string) ([]*internal.FileDesc, error) {
-	var filesDesc []*internal.FileDesc
+func GetFilesDescList(directory string) ([]*FileDesc, error) {
+	var filesDesc []*FileDesc
 	// 读取目录下的所有文件
-	fileNames, err := internal.GetFileNames(directory)
+	fileNames, err := GetFileNames(directory)
 	if err != nil {
 		return nil, err
 	}

diff --git a/internal/interfaceParser.go → interfaceParser.go b/internal/interfaceParser.go → interfaceParser.go
@@ -1,4 +1,4 @@
-package internal
+package go_annotation
 
 import (
 	"fmt"

diff --git a/internal/model.go → model.go b/internal/model.go → model.go
@@ -1,4 +1,4 @@
-package internal
+package go_annotation
 
 type AnnotationMode string // 注解模式
 

diff --git a/internal/structParser.go → structParser.go b/internal/structParser.go → structParser.go
@@ -1,4 +1,4 @@
-package internal
+package go_annotation
 
 import (
 	"go/ast"

diff --git a/...nal/test/data/arraymode/arraymode_mult.go → test/data/arraymode/arraymode_mult.go b/...nal/test/data/arraymode/arraymode_mult.go → test/data/arraymode/arraymode_mult.go
@@ -1,6 +1,8 @@
 package arraymode
 
-import "github.com/celt237/go-annotation/internal/test/data"
+import (
+	"github.com/celt237/go-annotation/test/data"
+)
 
 // InterfaceTwo  test
 // @annotation

diff --git a/...l/test/data/arraymode/arraymode_mult.json → test/data/arraymode/arraymode_mult.json b/...l/test/data/arraymode/arraymode_mult.json → test/data/arraymode/arraymode_mult.json
@@ -1,12 +1,12 @@
 {
   "PackageName": "arraymode",
-  "FullPackageName": "github.com/celt237/go-annotation/internal/test/data/arraymode",
+  "FullPackageName": "github.com/celt237/go-annotation/test/data/arraymode",
   "FileName": "arraymode_mult.go",
   "Imports": {
     "data": {
       "Name": "data",
       "HasAlias": false,
-      "Path": "github.com/celt237/go-annotation/internal/test/data"
+      "Path": "github.com/celt237/go-annotation/test/data"
     }
   },
   "Interfaces": [
@@ -16,7 +16,7 @@
         "data": {
           "Name": "data",
           "HasAlias": false,
-          "Path": "github.com/celt237/go-annotation/internal/test/data"
+          "Path": "github.com/celt237/go-annotation/test/data"
         }
       },
       "Comments": [
@@ -176,7 +176,7 @@
         "data": {
           "Name": "data",
           "HasAlias": false,
-          "Path": "github.com/celt237/go-annotation/internal/test/data"
+          "Path": "github.com/celt237/go-annotation/test/data"
         }
       },
       "Comments": [

diff --git a/...a/arraymode/arraymode_single_interface.go → ...a/arraymode/arraymode_single_interface.go b/...a/arraymode/arraymode_single_interface.go → ...a/arraymode/arraymode_single_interface.go
@@ -1,6 +1,8 @@
 package arraymode
 
-import "github.com/celt237/go-annotation/internal/test/data"
+import (
+	"github.com/celt237/go-annotation/test/data"
+)
 
 // InterfaceOne  test
 // @annotation

diff --git a/...arraymode/arraymode_single_interface.json → ...arraymode/arraymode_single_interface.json b/...arraymode/arraymode_single_interface.json → ...arraymode/arraymode_single_interface.json
@@ -1,12 +1,12 @@
 {
   "PackageName": "arraymode",
-  "FullPackageName": "github.com/celt237/go-annotation/internal/test/data/arraymode",
+  "FullPackageName": "github.com/celt237/go-annotation/test/data/arraymode",
   "FileName": "arraymode_single_interface.go",
   "Imports": {
     "data": {
       "Name": "data",
       "HasAlias": false,
-      "Path": "github.com/celt237/go-annotation/internal/test/data"
+      "Path": "github.com/celt237/go-annotation/test/data"
     }
   },
   "Interfaces": [
@@ -16,7 +16,7 @@
         "data": {
           "Name": "data",
           "HasAlias": false,
-          "Path": "github.com/celt237/go-annotation/internal/test/data"
+          "Path": "github.com/celt237/go-annotation/test/data"
         }
       },
       "Comments": [

diff --git a/...data/arraymode/arraymode_single_struct.go → ...data/arraymode/arraymode_single_struct.go b/...data/arraymode/arraymode_single_struct.go → ...data/arraymode/arraymode_single_struct.go
@@ -1,6 +1,8 @@
 package arraymode
 
-import "github.com/celt237/go-annotation/internal/test/data"
+import (
+	"github.com/celt237/go-annotation/test/data"
+)
 
 // StructOne  test
 // @annotation

diff --git a/...ta/arraymode/arraymode_single_struct.json → ...ta/arraymode/arraymode_single_struct.json b/...ta/arraymode/arraymode_single_struct.json → ...ta/arraymode/arraymode_single_struct.json
@@ -1,12 +1,12 @@
 {
   "PackageName": "arraymode",
-  "FullPackageName": "github.com/celt237/go-annotation/internal/test/data/arraymode",
+  "FullPackageName": "github.com/celt237/go-annotation/test/data/arraymode",
   "FileName": "arraymode_single_struct.go",
   "Imports": {
     "data": {
       "Name": "data",
       "HasAlias": false,
-      "Path": "github.com/celt237/go-annotation/internal/test/data"
+      "Path": "github.com/celt237/go-annotation/test/data"
     }
   },
   "Structs": [
@@ -16,7 +16,7 @@
         "data": {
           "Name": "data",
           "HasAlias": false,
-          "Path": "github.com/celt237/go-annotation/internal/test/data"
+          "Path": "github.com/celt237/go-annotation/test/data"
         }
       },
       "Comments": [

diff --git a/internal/test/data/mapmode/mapmode_mult.go → test/data/mapmode/mapmode_mult.go b/internal/test/data/mapmode/mapmode_mult.go → test/data/mapmode/mapmode_mult.go
@@ -1,6 +1,8 @@
 package mapmode
 
-import "github.com/celt237/go-annotation/internal/test/data"
+import (
+	"github.com/celt237/go-annotation/test/data"
+)
 
 // InterfaceTwo  test
 // @annotation(id="1", name="test")

diff --git a/internal/test/data/mapmode/mapmode_mult.json → test/data/mapmode/mapmode_mult.json b/internal/test/data/mapmode/mapmode_mult.json → test/data/mapmode/mapmode_mult.json
@@ -1,12 +1,12 @@
 {
   "PackageName": "mapmode",
-  "FullPackageName": "github.com/celt237/go-annotation/internal/test/data/mapmode",
+  "FullPackageName": "github.com/celt237/go-annotation/test/data/mapmode",
   "FileName": "mapmode_mult.go",
   "Imports": {
     "data": {
       "Name": "data",
       "HasAlias": false,
-      "Path": "github.com/celt237/go-annotation/internal/test/data"
+      "Path": "github.com/celt237/go-annotation/test/data"
     }
   },
   "Interfaces": [
@@ -16,7 +16,7 @@
         "data": {
           "Name": "data",
           "HasAlias": false,
-          "Path": "github.com/celt237/go-annotation/internal/test/data"
+          "Path": "github.com/celt237/go-annotation/test/data"
         }
       },
       "Comments": [
@@ -176,7 +176,7 @@
         "data": {
           "Name": "data",
           "HasAlias": false,
-          "Path": "github.com/celt237/go-annotation/internal/test/data"
+          "Path": "github.com/celt237/go-annotation/test/data"
         }
       },
       "Comments": [

diff --git a/.../data/mapmode/mapmode_single_interface.go → .../data/mapmode/mapmode_single_interface.go b/.../data/mapmode/mapmode_single_interface.go → .../data/mapmode/mapmode_single_interface.go
@@ -1,6 +1,8 @@
 package mapmode
 
-import "github.com/celt237/go-annotation/internal/test/data"
+import (
+	"github.com/celt237/go-annotation/test/data"
+)
 
 // InterfaceOne  test
 // @annotation(id="1", name="test")

diff --git a/...ata/mapmode/mapmode_single_interface.json → ...ata/mapmode/mapmode_single_interface.json b/...ata/mapmode/mapmode_single_interface.json → ...ata/mapmode/mapmode_single_interface.json
@@ -1,12 +1,12 @@
 {
   "PackageName": "mapmode",
-  "FullPackageName": "github.com/celt237/go-annotation/internal/test/data/mapmode",
+  "FullPackageName": "github.com/celt237/go-annotation/test/data/mapmode",
   "FileName": "mapmode_single_interface.go",
   "Imports": {
     "data": {
       "Name": "data",
       "HasAlias": false,
-      "Path": "github.com/celt237/go-annotation/internal/test/data"
+      "Path": "github.com/celt237/go-annotation/test/data"
     }
   },
   "Interfaces": [
@@ -16,7 +16,7 @@
         "data": {
           "Name": "data",
           "HasAlias": false,
-          "Path": "github.com/celt237/go-annotation/internal/test/data"
+          "Path": "github.com/celt237/go-annotation/test/data"
         }
       },
       "Comments": [

diff --git a/...est/data/mapmode/mapmode_single_struct.go → test/data/mapmode/mapmode_single_struct.go b/...est/data/mapmode/mapmode_single_struct.go → test/data/mapmode/mapmode_single_struct.go
@@ -1,6 +1,8 @@
 package mapmode
 
-import "github.com/celt237/go-annotation/internal/test/data"
+import (
+	"github.com/celt237/go-annotation/test/data"
+)
 
 // StructOne  test
 // @annotation(id="1", name="test")

diff --git a/...t/data/mapmode/mapmode_single_struct.json → test/data/mapmode/mapmode_single_struct.json b/...t/data/mapmode/mapmode_single_struct.json → test/data/mapmode/mapmode_single_struct.json
@@ -1,12 +1,12 @@
 {
   "PackageName": "mapmode",
-  "FullPackageName": "github.com/celt237/go-annotation/internal/test/data/mapmode",
+  "FullPackageName": "github.com/celt237/go-annotation/test/data/mapmode",
   "FileName": "mapmode_single_struct.go",
   "Imports": {
     "data": {
       "Name": "data",
       "HasAlias": false,
-      "Path": "github.com/celt237/go-annotation/internal/test/data"
+      "Path": "github.com/celt237/go-annotation/test/data"
     }
   },
   "Structs": [
@@ -16,7 +16,7 @@
         "data": {
           "Name": "data",
           "HasAlias": false,
-          "Path": "github.com/celt237/go-annotation/internal/test/data"
+          "Path": "github.com/celt237/go-annotation/test/data"
         }
       },
       "Comments": [

diff --git a/internal/test/data/testmodel.go → test/data/testmodel.go b/internal/test/data/testmodel.go → test/data/testmodel.go