From ee0b17caedec8cf176335baac68fac6efbf50d71 Mon Sep 17 00:00:00 2001
From: Lea Anthony <lea.anthony@gmail.com>
Date: Fri, 30 Oct 2020 14:28:45 +1100
Subject: [PATCH] Convert to ES6 syntax

---
 .../build/internal/backendjs/index.template    |  6 +-----
 .../build/internal/backendjs/package.template  |  7 +------
 .../build/internal/backendjs/packages.go       | 18 +++++++++++-------
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/v2/pkg/commands/build/internal/backendjs/index.template b/v2/pkg/commands/build/internal/backendjs/index.template
index 019e459b..7d6c41f9 100644
--- a/v2/pkg/commands/build/internal/backendjs/index.template
+++ b/v2/pkg/commands/build/internal/backendjs/index.template
@@ -2,8 +2,4 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 {{range .}}
-const {{.Name}} = require('./{{.Name}}');
-{{end}}
-module.exports = {
-    {{range .}}{{.Name}}: {{.Name}},{{end}}
-}
\ No newline at end of file
+export { default as {{.Name}} } from './{{.Name}}');{{end}}
diff --git a/v2/pkg/commands/build/internal/backendjs/package.template b/v2/pkg/commands/build/internal/backendjs/package.template
index ca5850b3..9964f347 100644
--- a/v2/pkg/commands/build/internal/backendjs/package.template
+++ b/v2/pkg/commands/build/internal/backendjs/package.template
@@ -1,9 +1,7 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
-// {{.Name}}.js
 {{range .Comments}}// {{.}}{{end}}
-
 {{range .Methods}}
 /**{{if .Comments }}
 {{range .Comments}}  * {{ . }}{{end}}
@@ -13,10 +11,7 @@
 {{end}}  *
   * @returns {Promise} 
   */
-function {{.Name}}({{.InputsAsJSText}}) {
+export function {{.Name}}({{.InputsAsJSText}}) {
     return window.backend.{{$.Name}}.{{.Name}}();
 }
 {{end}}
-module.exports = {
-    {{range .Methods}}{{.Name}}: {{.Name}},{{end}}
-}
diff --git a/v2/pkg/commands/build/internal/backendjs/packages.go b/v2/pkg/commands/build/internal/backendjs/packages.go
index eab40e02..1605a97f 100644
--- a/v2/pkg/commands/build/internal/backendjs/packages.go
+++ b/v2/pkg/commands/build/internal/backendjs/packages.go
@@ -3,6 +3,7 @@ package backendjs
 import (
 	"bytes"
 	"io/ioutil"
+	"path/filepath"
 	"reflect"
 	"text/template"
 
@@ -143,6 +144,15 @@ func generatePackageFiles(packages []*Package) error {
 	// Iterate over each package
 	for _, thisPackage := range packages {
 
+		// Calculate target directory
+		packageDir, err := fs.RelativeToCwd("./frontend/backend/" + thisPackage.Name)
+		if err != nil {
+			return errors.Wrap(err, "Error calculating package path")
+		}
+
+		// Make the dir but ignore if it already exists
+		fs.Mkdir(packageDir)
+
 		// Execute template
 		var buffer bytes.Buffer
 		err = packagesTemplate.Execute(&buffer, thisPackage)
@@ -150,13 +160,7 @@ func generatePackageFiles(packages []*Package) error {
 			return errors.Wrap(err, "Error generating code")
 		}
 
-		// Calculate target filename
-		packageFile, err := fs.RelativeToCwd("./frontend/backend/" + thisPackage.Name + ".js")
-		if err != nil {
-			return errors.Wrap(err, "Error calculating package path")
-		}
-
-		err = ioutil.WriteFile(packageFile, buffer.Bytes(), 0755)
+		err = ioutil.WriteFile(filepath.Join(packageDir, "index.js"), buffer.Bytes(), 0755)
 		if err != nil {
 			return errors.Wrap(err, "Error writing backend package file")
 		}