accept JS files as additional output (fixes #111)

neelance · neelance · commit 51e33b76d50c · 2014-11-02T20:59:22.000+01:00
diff --git a/build/build.go b/build/build.go
@@ -206,6 +206,7 @@ func (o *Options) PrintSuccess(format string, a ...interface{}) {
 
 type PackageData struct {
 	*build.Package
+	JsFiles    []string
 	SrcModTime time.Time
 	UpToDate   bool
 	Archive    *compiler.Archive
@@ -283,10 +284,17 @@ func (s *Session) BuildFiles(filenames []string, pkgObj string, packagePath stri
 			Name:       "main",
 			ImportPath: "main",
 			Dir:        packagePath,
-			GoFiles:    filenames,
 		},
 	}
 
+	for _, file := range filenames {
+		if strings.HasSuffix(file, ".js") {
+			pkg.JsFiles = append(pkg.JsFiles, file)
+			continue
+		}
+		pkg.GoFiles = append(pkg.GoFiles, file)
+	}
+
 	if err := s.BuildPackage(pkg); err != nil {
 		return err
 	}
@@ -309,6 +317,17 @@ func (s *Session) ImportPackage(path string) (*compiler.Archive, error) {
 		return nil, err
 	}
 	pkg := &PackageData{Package: buildPkg}
+
+	files, err := ioutil.ReadDir(pkg.Dir)
+	if err != nil {
+		return nil, err
+	}
+	for _, file := range files {
+		if strings.HasSuffix(file.Name(), ".js") {
+			pkg.JsFiles = append(pkg.JsFiles, filepath.Join(pkg.Dir, file.Name()))
+		}
+	}
+
 	if err := s.BuildPackage(pkg); err != nil {
 		return nil, err
 	}
@@ -417,6 +436,18 @@ func (s *Session) BuildPackage(pkg *PackageData) error {
 		return err
 	}
 
+	var jsDecls []compiler.Decl
+	for _, jsFile := range pkg.JsFiles {
+		code, err := ioutil.ReadFile(jsFile)
+		if err != nil {
+			return err
+		}
+		jsDecls = append(jsDecls, compiler.Decl{
+			BodyCode: append(code, '\n'),
+		})
+	}
+	pkg.Archive.Declarations = append(jsDecls, pkg.Archive.Declarations...)
+
 	if s.options.Verbose {
 		fmt.Println(pkg.ImportPath)
 	}
diff --git a/tool.go b/tool.go
@@ -72,9 +72,9 @@ func main() {
 					return s.BuildDir(currentDirectory, currentDirectory, pkgObj)
 				}
 
-				if strings.HasSuffix(args[0], ".go") {
+				if strings.HasSuffix(args[0], ".go") || strings.HasSuffix(args[0], ".js") {
 					for _, arg := range args {
-						if !strings.HasSuffix(arg, ".go") {
+						if !strings.HasSuffix(arg, ".go") && !strings.HasSuffix(arg, ".js") {
 							return fmt.Errorf("named files must be .go files")
 						}
 					}
@@ -201,7 +201,7 @@ func main() {
 		os.Exit(handleError(func() error {
 			lastSourceArg := 0
 			for {
-				if lastSourceArg == len(args) || !strings.HasSuffix(args[lastSourceArg], ".go") {
+				if lastSourceArg == len(args) || !(strings.HasSuffix(args[lastSourceArg], ".go") || strings.HasSuffix(args[lastSourceArg], ".js")) {
 					break
 				}
 				lastSourceArg++

Original file line number	Diff line number	Diff line change
`@@ -72,9 +72,9 @@ func main() {`
`72`	`72`	`return s.BuildDir(currentDirectory, currentDirectory, pkgObj)`
`73`	`73`	`}`
`74`	`74`
`75`		`- if strings.HasSuffix(args[0], ".go") {`
	`75`	`+ if strings.HasSuffix(args[0], ".go") \|\| strings.HasSuffix(args[0], ".js") {`
`76`	`76`	`for _, arg := range args {`
`77`		`- if !strings.HasSuffix(arg, ".go") {`
	`77`	`+ if !strings.HasSuffix(arg, ".go") && !strings.HasSuffix(arg, ".js") {`
`78`	`78`	`return fmt.Errorf("named files must be .go files")`
`79`	`79`	`}`
`80`	`80`	`}`
`@@ -201,7 +201,7 @@ func main() {`
`201`	`201`	`os.Exit(handleError(func() error {`
`202`	`202`	`lastSourceArg := 0`
`203`	`203`	`for {`
`204`		`- if lastSourceArg == len(args) \|\| !strings.HasSuffix(args[lastSourceArg], ".go") {`
	`204`	`+ if lastSourceArg == len(args) \|\| !(strings.HasSuffix(args[lastSourceArg], ".go") \|\| strings.HasSuffix(args[lastSourceArg], ".js")) {`
`205`	`205`	`break`
`206`	`206`	`}`
`207`	`207`	`lastSourceArg++`