File tree 3 files changed +25
-6
lines changed
3 files changed +25
-6
lines changed Original file line number Diff line number Diff line change @@ -94,6 +94,12 @@ func (c *GenerateCmd) generate(configYAML string) error {
94
94
if err := yaml .Unmarshal ([]byte (configYAML ), & config ); err != nil {
95
95
return err
96
96
}
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
+ }
97
103
98
104
schemaBytes , err := readFile (config .Schema )
99
105
if err != nil {
@@ -108,6 +114,12 @@ func (c *GenerateCmd) generate(configYAML string) error {
108
114
srcDir := filepath .Join (homeDir , "src" )
109
115
110
116
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
+ }
111
123
if target .IfNotExists {
112
124
_ , err := os .Stat (filename )
113
125
if err != nil && ! os .IsNotExist (err ) {
Original file line number Diff line number Diff line change @@ -57,12 +57,12 @@ func (c *InstallCmd) doRun(ctx *Context, homeDir string) error {
57
57
58
58
fmt .Printf ("Installing %s/%s %s...\n " , release .Org , release .Module , release .Tag )
59
59
60
- moduleSubDir := release .Module
61
- if release .Org != "" {
62
- moduleSubDir = filepath .Join (release .Org , release .Module )
63
- }
64
-
65
60
if release .Directory != "" {
61
+ moduleSubDir := release .Module
62
+ if release .Org != "" {
63
+ moduleSubDir = filepath .Join (release .Org , release .Module )
64
+ }
65
+
66
66
return c .installDir (
67
67
release .Directory ,
68
68
homeDir ,
@@ -130,7 +130,13 @@ func (c *InstallCmd) doRun(ctx *Context, homeDir string) error {
130
130
for _ , entry := range dirEntries {
131
131
if entry .IsDir () {
132
132
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
+ }
134
140
135
141
if err = c .installDir (
136
142
contentsDir ,
Original file line number Diff line number Diff line change @@ -34,6 +34,7 @@ type NewCmd struct {
34
34
}
35
35
36
36
var firstPartyTranslations = map [string ]string {
37
+ "module" : filepath .Join ("@wapc" , "widl" , "module" ),
37
38
"assemblyscript" : filepath .Join ("@wapc" , "widl-codegen" , "assemblyscript" ),
38
39
"rust" : filepath .Join ("@wapc" , "widl-codegen" , "rust" ),
39
40
"tinygo" : filepath .Join ("@wapc" , "widl-codegen" , "tinygo" ),
You can’t perform that action at this time.
0 commit comments