Merge pull request #21 from /issues/20/main

common inserterに#{}というパターンをリプレイスさせる変更

Author: moezakura

pkg/inserter/common_inserter.go

@@ -4,6 +4,7 @@ package inserter
 import (
 	"context"
 	"log"
+	"regexp"
 	"strings"
 	"time"
 
@@ -70,34 +71,59 @@ func (c *CommonInserter) tryParseDate(item map[string]interface{}) map[string]in
 	return item
 }
 
+func (c *CommonInserter) replaceMultiRefs(src string, reg *regexp.Regexp) string {
+	ms := reg.FindAllString(src, -1)
+	if len(ms) == 0 {
+		return ""
+	}
+	for _, m := range ms {
+		refID := m[2 : len(m)-1]
+		rv, ok := c.refIDs[refID]
+		if !ok {
+			log.Printf("%s was not found", refID)
+			return ""
+		}
+		src = strings.Replace(src, m, rv, 1)
+	}
+	return src
+}
+
 func (c *CommonInserter) setRefs(item map[string]interface{}) map[string]interface{} {
+	reg := regexp.MustCompile(`\#\{.*?\}`)
 	for k, v := range item {
 		switch vt := v.(type) {
 		case map[string]interface{}:
 			for vtk, vtv := range vt {
-				if !strings.HasPrefix(vtk, "$") {
-					continue
+				if strings.HasPrefix(vtk, "$") && !reg.MatchString(vtk) {
+					refID := strings.TrimPrefix(vtk, "$")
+					rk, ok := c.refIDs[refID]
+					if !ok {
+						log.Printf("%s was not found", refID)
+					} else {
+						vt[rk] = vtv
+						delete(vt, vtk)
+					}
 				}
-				refID := strings.TrimPrefix(vtk, "$")
-				rk, ok := c.refIDs[refID]
-				if !ok {
-					log.Printf("%s was not found", refID)
-					continue
+				nk := c.replaceMultiRefs(vtk, reg)
+				if nk != "" {
+					vt[nk] = vtv
+					delete(vt, vtk)
 				}
-				vt[rk] = vtv
-				delete(vt, vtk)
 			}
 		case string:
-			if !strings.HasPrefix(vt, "$") {
-				continue
+			if strings.HasPrefix(vt, "$") && !reg.MatchString(vt) {
+				refID := strings.TrimPrefix(vt, "$")
+				rv, ok := c.refIDs[refID]
+				if !ok {
+					log.Printf("%s was not found", refID)
+				} else {
+					item[k] = rv
+				}
 			}
-			refID := strings.TrimPrefix(vt, "$")
-			rv, ok := c.refIDs[refID]
-			if !ok {
-				log.Printf("%s was not found", refID)
-				continue
+			n := c.replaceMultiRefs(vt, reg)
+			if n != "" {
+				item[k] = n
 			}
-			item[k] = rv
 		}
 	}
 

samples/Survey/dummies.js

@@ -0,0 +1,14 @@
+[
+  {
+    ref: "Foo__dummy_0",
+    payload: {
+      defaultOption: "$Option__dummy_0",
+      optionsText: "/#{Option__dummy_0}/#{Option__dummy_0}/",
+      options: {
+        $Option__dummy_0: true,
+        $Option__dummy_1: true,
+      },
+      answer: "#{Option__dummy_1}",
+    },
+  },
+];