feat: support parse short Expr

Author: billyct

field.go

@@ -20,14 +20,18 @@ func NewFieldWithMap(m map[string]interface{}) *Field {
 	return f
 }
 
-func (f *Field) SetName(name string)  {
+func (f *Field) SetName(name string) {
 	f.Name = name
 }
 
 func (f *Field) GetName() string {
 	return f.Name
 }
 
+func (f *Field) SetValue(v string) {
+	f.Value = v
+}
+
 func (f *Field) Set(k string, v interface{}) {
 	if k == "" {
 		return

field_test.go

@@ -22,24 +22,24 @@ func TestNewFieldWithMap(t *testing.T) {
 				},
 			},
 			want: &Field{
-				Name:  "Name",
+				Name: "Name",
 			},
 		},
 		{
 			name: "TestNewFieldWithMap: #2",
 			args: args{
 				m: map[string]interface{}{
-					"name": "Name",
-					"value": "default value",
-					"other": "other",
+					"name":   "Name",
+					"value":  "default value",
+					"other":  "other",
 					"other2": "other2",
 				},
 			},
 			want: &Field{
 				Name:  "Name",
 				Value: "default value",
 				Data: map[string]interface{}{
-					"other": "other",
+					"other":  "other",
 					"other2": "other2",
 				},
 			},
@@ -60,13 +60,13 @@ func TestField_Set(t *testing.T) {
 		v interface{}
 	}
 	tests := []struct {
-		name   string
-		args   args
+		name string
+		args args
 		want *Field
 	}{
 		{
-			name:   "TestField_Set: #1",
-			args:   args{
+			name: "TestField_Set: #1",
+			args: args{
 				k: "name",
 				v: "hello",
 			},
@@ -76,8 +76,8 @@ func TestField_Set(t *testing.T) {
 		},
 
 		{
-			name:   "TestField_Set: #2",
-			args:   args{
+			name: "TestField_Set: #2",
+			args: args{
 				k: "value",
 				v: "hello",
 			},
@@ -87,8 +87,8 @@ func TestField_Set(t *testing.T) {
 		},
 
 		{
-			name:   "TestField_Set: #3",
-			args:   args{
+			name: "TestField_Set: #3",
+			args: args{
 				k: "other",
 				v: "other",
 			},
@@ -122,31 +122,31 @@ func TestField_ToMap(t *testing.T) {
 		want   map[string]interface{}
 	}{
 		{
-			name:   "TestField_ToMap: #1",
+			name: "TestField_ToMap: #1",
 			fields: fields{
 				Name:  "name1",
 				Value: "value1",
 				Data:  nil,
 			},
 			want: map[string]interface{}{
-				"name": "name1",
+				"name":  "name1",
 				"value": "value1",
 			},
 		},
 		{
-			name:   "TestField_ToMap: #2",
+			name: "TestField_ToMap: #2",
 			fields: fields{
 				Name:  "name2",
 				Value: "value2",
 				Data: map[string]interface{}{
-					"type": "type2",
+					"type":  "type2",
 					"label": "label2",
 				},
 			},
 			want: map[string]interface{}{
-				"name": "name2",
+				"name":  "name2",
 				"value": "value2",
-				"type": "type2",
+				"type":  "type2",
 				"label": "label2",
 			},
 		},
@@ -163,4 +163,4 @@ func TestField_ToMap(t *testing.T) {
 			}
 		})
 	}
-}
+}

form.go

@@ -24,11 +24,16 @@ func (f *Form) SetPrefix(prefix string) {
 	f.prefix = prefix
 }
 
-func (f *Form) SetCode(code string)  {
+func (f *Form) SetCode(code string) {
 	f.code = code
 	f.root = nil
 }
 
+func (f *Form) IsSnippetCode() bool {
+	code := strings.TrimSpace(f.code)
+	return !(strings.HasPrefix(code, "<?") || strings.HasPrefix(code, "<?php"))
+}
+
 func (f *Form) Prefix() string {
 	if strings.HasPrefix(f.prefix, "$") {
 		return f.prefix
@@ -42,13 +47,18 @@ func (f *Form) Root() (*ast.Root, error) {
 		return f.root, nil
 	}
 
-	root, err := Parse([]byte(f.code))
+	code := f.code
+	// 如果是代码片段
+	if f.IsSnippetCode() {
+		code = fmt.Sprintf("<?php %s", f.code)
+	}
+
+	root, err := ParseCode([]byte(code))
 	if err != nil {
 		return nil, err
 	}
 
-	f.root = root.(*ast.Root)
-
+	f.root = root
 	return f.root, nil
 }
 
@@ -77,25 +87,34 @@ func (f *Form) Stringify(fields []Field) (string, error) {
 	pr := printer.NewPrinter(buf)
 	root.Accept(pr)
 
-	return buf.String(), nil
+	res := buf.String()
+	if f.IsSnippetCode() {
+		res = strings.Replace(res, "<?php ", "", 1)
+	}
+
+	return res, nil
 }
 
 // 根据 fields 更新 ExprAssign
 func (f *Form) UpdateExprAssign(expr *ast.ExprAssign, fields []Field) {
 	for _, field := range fields {
 		// 变量名匹配
-		isSameVar := field.Name == f.GetExprValue(expr.Var)
-
-		if expr, ok := expr.Expr.(*ast.ExprArray); ok && isSameVar{
-			for _, item := range expr.Items {
-				key, val := f.GetItemExpr(item)
-				if f.GetExprValue(key) == "value" {
-					f.SetExprValue(val, field.Value)
-
-					return
+		if field.Name == f.GetExprValue(expr.Var) {
+			switch e := expr.Expr.(type) {
+			case *ast.ExprArray:
+				for _, item := range e.Items {
+					key, val := f.GetItemExpr(item)
+					if f.GetExprValue(key) == "value" {
+						f.SetExprValue(val, field.Value)
+
+						return
+					}
 				}
+			default:
+				f.SetExprValue(e, field.Value)
 			}
 		}
+
 	}
 }
 
@@ -108,12 +127,15 @@ func (f *Form) IsExprAssignMatched(expr *ast.ExprAssign) bool {
 func (f *Form) ParseExprAssign(expr *ast.ExprAssign) *Field {
 	field := NewField()
 
-	if exprArray, ok := expr.Expr.(*ast.ExprArray); ok {
-		field.SetName(f.GetExprValue(expr.Var))
+	field.SetName(f.GetExprValue(expr.Var))
 
-		for _, item := range exprArray.Items {
+	switch e := expr.Expr.(type) {
+	case *ast.ExprArray:
+		for _, item := range e.Items {
 			field.Set(f.GetItemValues(item))
 		}
+	case *ast.ScalarString, *ast.ScalarLnumber, *ast.ScalarDnumber, *ast.ExprConstFetch:
+		field.SetValue(f.GetExprValue(e))
 	}
 
 	return field

form_test.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"reflect"
-	"strings"
 	"testing"
 )
 
@@ -69,6 +68,33 @@ $_age = [
 			wantErr: false,
 		},
 
+		{
+			name: "TestForm_Parse: short",
+			fields: fields{
+				prefix: "_",
+				code: `
+$_name = 'billyct';
+$_isAdmin = true;
+$_age = 20;
+`,
+			},
+			want: []Field{
+				{
+					Name:  "$_name",
+					Value: "billyct",
+				},
+				{
+					Name:  "$_isAdmin",
+					Value: "true",
+				},
+				{
+					Value: "20",
+					Name:  "$_age",
+				},
+			},
+			wantErr: false,
+		},
+
 		{
 			name: "TestForm_Parse: should match with the prefix",
 			fields: fields{
@@ -363,7 +389,8 @@ $_age = [
 					},
 				},
 			},
-			want: `$_name = [
+			want: `
+$_name = [
 	'label' => 'Name',
 	'value' => 'hello',
 ];
@@ -377,6 +404,38 @@ $_age = [
 ];`,
 			wantErr: false,
 		},
+		{
+			name: "TestForm_Stringify: short",
+			fields: fields{
+				prefix: "_",
+				code: `
+$_name = 'billyct';
+$_isAdmin = true;
+$_age = 20;
+`,
+			},
+			args: args{
+				fields: []Field{
+					{
+						Name:  "$_name",
+						Value: "magic",
+					},
+					{
+						Name:  "$_isAdmin",
+						Value: "false",
+					},
+					{
+						Value: "30",
+						Name:  "$_age",
+					},
+				},
+			},
+			want: `
+$_name = 'magic';
+$_isAdmin = false;
+$_age = 30;`,
+			wantErr: false,
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -389,7 +448,7 @@ $_age = [
 				t.Errorf("Stringify() error = %v, wantErr %v", err, tt.wantErr)
 				return
 			}
-			if !strings.Contains(got, tt.want) {
+			if got != tt.want {
 				t.Errorf("Stringify() got = %v, want %v", got, tt.want)
 			}
 		})

parse.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"bytes"
 	"errors"
 	"github.com/z7zmey/php-parser/pkg/ast"
 	"github.com/z7zmey/php-parser/pkg/conf"
@@ -10,14 +9,6 @@ import (
 	"github.com/z7zmey/php-parser/pkg/version"
 )
 
-func Parse(code []byte) (ast.Vertex, error) {
-	code = bytes.TrimSpace(code)
-	if bytes.HasPrefix(code, []byte("<?")) || bytes.HasPrefix(code, []byte("<?php")) {
-		return ParseCode(code)
-	}
-	return ParseStmtList(code)
-}
-
 func ParseCode(code []byte) (*ast.Root, error) {
 	phpVersion, err := version.New("7.4")
 	if err != nil {
@@ -50,8 +41,3 @@ func ParseCode(code []byte) (*ast.Root, error) {
 
 	return res, nil
 }
-
-func ParseStmtList(code []byte) (*ast.Root, error) {
-	code = append([]byte("<?php "), code...)
-	return ParseCode(code)
-}