feat: modify comment annotation detection regex

Author: ginokent

README.md

@@ -22,9 +22,9 @@ package sample
 
 // User is a user model struct.
 //
-// pgddl:      table: "users"
-// pgddl: constraint: UNIQUE ("username")
-// pgddl:      index: "index_users_username" ON "users" ("username")
+//pgddl:table "users"
+//pgddl:constraint UNIQUE ("username")
+//pgddl:index "index_users_username" ON "users" ("username")
 type User struct {
     UserID   string `db:"user_id"  pgddl:"TEXT NOT NULL" pk:"true"`
     Username string `db:"username" pgddl:"TEXT NOT NULL"`
@@ -33,8 +33,8 @@ type User struct {
 
 // Group is a group model struct.
 //
-// pgddl: table: CREATE TABLE IF NOT EXISTS "groups"
-// pgddl: index: CREATE UNIQUE INDEX "index_groups_group_name" ON "groups" ("group_name")
+//pgddl:table CREATE TABLE IF NOT EXISTS "groups"
+//pgddl:index CREATE UNIQUE INDEX "index_groups_group_name" ON "groups" ("group_name")
 type Group struct {
     GroupID     string `db:"group_id"    pgddl:"TEXT NOT NULL" pk:"true"`
     GroupName   string `db:"group_name"  pgddl:"TEXT NOT NULL"`
@@ -55,8 +55,8 @@ $ cat /tmp/sample.sql
 -- source: tmp/sample.go:5
 -- User is a user model struct.
 --
--- pgddl:      table: "users"
--- pgddl: constraint: UNIQUE ("username")
+-- pgddl:table "users"
+-- pgddl:constraint UNIQUE ("username")
 CREATE TABLE "users" (
     "user_id"  TEXT NOT NULL,
     "username" TEXT NOT NULL,
@@ -66,13 +66,13 @@ CREATE TABLE "users" (
 );
 
 -- source: tmp/sample.go:7
--- pgddl:      index: "index_users_username" ON "users" ("username")
+-- pgddl:index "index_users_username" ON "users" ("username")
 CREATE INDEX "index_users_username" ON "users" ("username");
 
 -- source: tmp/sample.go:16
 -- Group is a group model struct.
 --
--- pgddl: table: CREATE TABLE IF NOT EXISTS "groups"
+-- pgddl:table CREATE TABLE IF NOT EXISTS "groups"
 CREATE TABLE IF NOT EXISTS "groups" (
     "group_id"    TEXT NOT NULL,
     "group_name"  TEXT NOT NULL,
@@ -81,7 +81,7 @@ CREATE TABLE IF NOT EXISTS "groups" (
 );
 
 -- source: tmp/sample.go:17
--- pgddl: index: CREATE UNIQUE INDEX "index_groups_group_name" ON "groups" ("group_name")
+-- pgddl:index CREATE UNIQUE INDEX "index_groups_group_name" ON "groups" ("group_name")
 CREATE UNIQUE INDEX "index_groups_group_name" ON "groups" ("group_name");
 
 ```

internal/ddlgen/ddl/dialect/spanner/integrationtest_go_001.golden

@@ -59,8 +59,8 @@ CREATE TABLE Author (
 -- source: spanner/integrationtest_go_001.source:49
 -- Book is a book.
 --
--- spanddl:table:`Books`
--- spanddl:option: INTERLEAVE IN PARENT `Author` ON DELETE CASCADE
+-- spanddl:table `Books`
+-- spanddl:option INTERLEAVE IN PARENT `Author` ON DELETE CASCADE
 CREATE TABLE `Books` (
     -- WARN: the "Book" struct's "AuthorID" field does not have a tag for column name (`dbtest:"<ColumnName>"`), so the field name "AuthorID" is used as the column name.
     -- AuthorID is a book author.

internal/ddlgen/ddl/dialect/spanner/integrationtest_go_001.source

@@ -46,8 +46,8 @@ type (
 
 	// Book is a book.
 	//
-	// spanddl:table:`Books`
-	// spanddl:option: INTERLEAVE IN PARENT `Author` ON DELETE CASCADE
+	//spanddl:table `Books`
+	//spanddl:option INTERLEAVE IN PARENT `Author` ON DELETE CASCADE
 	Book struct {
 		// AuthorID is a book author.
 		AuthorID string `spanddl:"STRING(255) NOT NULL" pkey:"true"`

internal/ddlgen/lang/go/parse.go

@@ -12,9 +12,11 @@ import (
 	"reflect"
 	"sort"
 	"strings"
+	"unicode"
 
 	errorz "github.com/kunitsucom/util.go/errors"
 	filepathz "github.com/kunitsucom/util.go/path/filepath"
+	slicez "github.com/kunitsucom/util.go/slices"
 
 	"github.com/kunitsucom/ddlgen/internal/config"
 	ddlast "github.com/kunitsucom/ddlgen/internal/ddlgen/ddl"
@@ -110,7 +112,9 @@ func parseFile(ctx context.Context, filename string) ([]ddlast.Stmt, error) {
 		createTableStmt.SourceLine = r.Position.Line
 
 		// CREATE TABLE (or INDEX) / CONSTRAINT / OPTIONS (from comments)
-		comments := strings.Split(strings.Trim(r.CommentGroup.Text(), "\n"), "\n")
+		comments := slicez.Select(r.CommentGroup.List, func(_ int, comment *ast.Comment) string {
+			return strings.TrimLeftFunc(strings.TrimPrefix(strings.TrimPrefix(strings.TrimPrefix(comment.Text, "//"), "/*"), "*/"), unicode.IsSpace)
+		})
 		for _, comment := range comments {
 			logs.Debug.Printf("[COMMENT DETECTED]: %s:%d: %s", createTableStmt.SourceFile, createTableStmt.SourceLine, comment)
 

internal/ddlgen/lang/util/regex.go

@@ -10,19 +10,19 @@ type StmtRegex struct {
 //nolint:gochecknoglobals
 var (
 	StmtRegexCreateTable = StmtRegex{
-		Regex: regexp.MustCompile(`^\s*(//+\s*|/\*\s*)?\S+\s*:\s*table(s)?\s*:\s*((CREATE\s+TABLE\s+)?\S+.*)`),
+		Regex: regexp.MustCompile(`^\s*(//+\s*|/\*\s*)?\S+\s*:\s*table(s)?\s*[: ]\s*((CREATE\s+TABLE\s+)?\S+.*)`),
 		Index: 3,
 	}
 	StmtRegexCreateTableConstraint = StmtRegex{
-		Regex: regexp.MustCompile(`^\s*(//+\s*|/\*\s*)?\S+\s*:\s*constraint(s)?\s*:\s*(\S+.*)`),
+		Regex: regexp.MustCompile(`^\s*(//+\s*|/\*\s*)?\S+\s*:\s*constraint(s)?\s*[: ]\s*(\S+.*)`),
 		Index: 3,
 	}
 	StmtRegexCreateTableOptions = StmtRegex{
-		Regex: regexp.MustCompile(`^\s*(//+\s*|/\*\s*)?\S+\s*:\s*option(s)?\s*:\s*(\S+.*)`),
+		Regex: regexp.MustCompile(`^\s*(//+\s*|/\*\s*)?\S+\s*:\s*option(s)?\s*[: ]\s*(\S+.*)`),
 		Index: 3,
 	}
 	StmtRegexCreateIndex = StmtRegex{
-		Regex: regexp.MustCompile(`^\s*(//+\s*|/\*\s*)?\S+\s*:\s*index(es)?\s*:\s*(\S+.*)`),
+		Regex: regexp.MustCompile(`^\s*(//+\s*|/\*\s*)?\S+\s*:\s*index(es)?\s*[: ]\s*(\S+.*)`),
 		Index: 3,
 	}
 )