Skip to content

Commit bcc5e18

Browse files
committed
Config file checks.
Calculate module sub sir from package.json. Added `module` first party translation.
1 parent aef08fc commit bcc5e18

File tree

3 files changed

+25
-6
lines changed

3 files changed

+25
-6
lines changed

pkg/commands/generate.go

+12
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,12 @@ func (c *GenerateCmd) generate(configYAML string) error {
9494
if err := yaml.Unmarshal([]byte(configYAML), &config); err != nil {
9595
return err
9696
}
97+
if config.Schema == "" {
98+
return errors.New("schema is required")
99+
}
100+
if len(config.Generates) == 0 {
101+
return errors.New("generates is required")
102+
}
97103

98104
schemaBytes, err := readFile(config.Schema)
99105
if err != nil {
@@ -108,6 +114,12 @@ func (c *GenerateCmd) generate(configYAML string) error {
108114
srcDir := filepath.Join(homeDir, "src")
109115

110116
for filename, target := range config.Generates {
117+
if target.Module == "" {
118+
return fmt.Errorf("module is required for %s", filename)
119+
}
120+
if target.VisitorClass == "" {
121+
return fmt.Errorf("visitorClass is required for %s", filename)
122+
}
111123
if target.IfNotExists {
112124
_, err := os.Stat(filename)
113125
if err != nil && !os.IsNotExist(err) {

pkg/commands/install.go

+12-6
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,12 @@ func (c *InstallCmd) doRun(ctx *Context, homeDir string) error {
5757

5858
fmt.Printf("Installing %s/%s %s...\n", release.Org, release.Module, release.Tag)
5959

60-
moduleSubDir := release.Module
61-
if release.Org != "" {
62-
moduleSubDir = filepath.Join(release.Org, release.Module)
63-
}
64-
6560
if release.Directory != "" {
61+
moduleSubDir := release.Module
62+
if release.Org != "" {
63+
moduleSubDir = filepath.Join(release.Org, release.Module)
64+
}
65+
6666
return c.installDir(
6767
release.Directory,
6868
homeDir,
@@ -130,7 +130,13 @@ func (c *InstallCmd) doRun(ctx *Context, homeDir string) error {
130130
for _, entry := range dirEntries {
131131
if entry.IsDir() {
132132
contentsDir := filepath.Join(downloadDir, entry.Name())
133-
readPackage(contentsDir, release)
133+
if err = readPackage(contentsDir, release); err != nil {
134+
return err
135+
}
136+
moduleSubDir := release.Module
137+
if release.Org != "" {
138+
moduleSubDir = filepath.Join(release.Org, release.Module)
139+
}
134140

135141
if err = c.installDir(
136142
contentsDir,

pkg/commands/new.go

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ type NewCmd struct {
3434
}
3535

3636
var firstPartyTranslations = map[string]string{
37+
"module": filepath.Join("@wapc", "widl", "module"),
3738
"assemblyscript": filepath.Join("@wapc", "widl-codegen", "assemblyscript"),
3839
"rust": filepath.Join("@wapc", "widl-codegen", "rust"),
3940
"tinygo": filepath.Join("@wapc", "widl-codegen", "tinygo"),

0 commit comments

Comments
 (0)