Fix missing imports in generated code (#38)

Author: vearutop

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.4.44] - 2021-04-20
+
+### Fixed
+- Missing imports in generated code.
+
 ## [0.4.43] - 2021-04-20
 
 ### Fixed
@@ -257,6 +262,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - Removed unnecessary regexp dependency, #7.
 
+[0.4.44]: https://github.com/swaggest/go-code-builder/compare/v0.4.43...v0.4.44
 [0.4.43]: https://github.com/swaggest/go-code-builder/compare/v0.4.42...v0.4.43
 [0.4.42]: https://github.com/swaggest/go-code-builder/compare/v0.4.41...v0.4.42
 [0.4.41]: https://github.com/swaggest/go-code-builder/compare/v0.4.40...v0.4.41

src/JsonSchema/MarshalEnum.php

@@ -77,7 +77,9 @@ private function renderConstUnmarshal()
             return '';
         }
 
-        $this->code->imports()->addByName('encoding/json');
+        $this->code->imports()
+            ->addByName('encoding/json')
+            ->addByName('fmt');
         return <<<GO
 // UnmarshalJSON decodes JSON.
 func (i *:type) UnmarshalJSON(data []byte) error {
@@ -143,7 +145,9 @@ private function renderUnmarshal()
             return '';
         }
 
-        $this->code->imports()->addByName('encoding/json');
+        $this->code->imports()
+            ->addByName('encoding/json')
+            ->addByName('fmt');
         return <<<GO
 // UnmarshalJSON decodes JSON.
 func (i *:type) UnmarshalJSON(data []byte) error {

src/JsonSchema/MarshalJson.php

@@ -387,6 +387,7 @@ private function renderUnmarshal()
 
         // Additional properties forbidden.
         if ($this->additionalPropertiesEnabled === false) {
+            $this->code->imports()->addByName('fmt');
             $mapUnmarshal .= <<<'GO'
 
 if len(rawMap) != 0 {
@@ -575,6 +576,7 @@ private function renderOneOfUnmarshal()
 GO;
         }
 
+        $this->code->imports()->addByName('fmt');
         $result .= <<<'GO'
 
 
@@ -596,10 +598,6 @@ private function renderAnyOfUnmarshal()
             return $result;
         }
 
-        $this->code->imports()
-            ->addByName('encoding/json')
-            ->addByName('fmt');
-
         $count = count($this->someOf[$kind]);
         $result .= <<<GO
 
@@ -609,6 +607,7 @@ private function renderAnyOfUnmarshal()
 
 GO;
 
+        $this->code->imports()->addByName('encoding/json');
         foreach ($this->someOf[$kind] as $i => $propertyName) {
             $result .= <<<GO
 
@@ -623,6 +622,7 @@ private function renderAnyOfUnmarshal()
 GO;
         }
 
+        $this->code->imports()->addByName('fmt');
         $result .= <<<'GO'
 
 
@@ -688,6 +688,7 @@ private function renderNot()
             return '';
         }
 
+        $this->code->imports()->addByName('errors');
         return <<<GO
 
 var not {$this->not->render()}

tests/src/PHPUnit/JsonSchema/TypeBuilderTest.php

@@ -5,6 +5,7 @@
 
 use Swaggest\GoCodeBuilder\JsonSchema\GoBuilder;
 use Swaggest\GoCodeBuilder\JsonSchema\TypeBuilder;
+use Swaggest\GoCodeBuilder\Templates\GoFile;
 use Swaggest\JsonSchema\Context;
 use Swaggest\JsonSchema\RemoteRef\Preloaded;
 use Swaggest\JsonSchema\Schema;
@@ -449,7 +450,6 @@ public function testTypeNaming()
             $res .= $generatedStruct->structDef->render();
         }
 
-
         $this->assertEquals(<<<'GO'
 // Another is an enum type.
 type Another string
@@ -570,4 +570,108 @@ public function testTypeNaming()
 
     }
 
+    public function testMissingImport()
+    {
+        $schemaJson = <<<'JSON'
+{
+	"type": "object",
+	"$schema": "http://json-schema.org/draft-04/schema#",
+	"additionalProperties": false,
+	"properties": {
+		"version": {
+			"type": "string"
+		}
+	},
+	"required": [
+		"version"
+	]
+}
+JSON;
+        $schema = Schema::import(json_decode($schemaJson));
+
+        $builder = new GoBuilder();
+        $tb = new TypeBuilder($schema, '#', $builder);
+        $tb->build();
+
+        foreach ($builder->getGeneratedStructs() as $generatedStruct) {
+            $builder->getCode()->addSnippet($generatedStruct->structDef);
+        }
+
+        $res = new GoFile('foo');
+        $res->setCode($builder->getCode());
+
+        $this->assertEquals(<<<'GO'
+// Code generated by github.com/swaggest/go-code-builder, DO NOT EDIT.
+
+package foo
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+)
+
+// Untitled1 structure is generated from "#".
+type Untitled1 struct {
+	Version string `json:"version"` // Required.
+}
+
+type marshalUntitled1 Untitled1
+
+var knownKeysUntitled1 = []string{
+	"version",
+}
+
+var requireKeysUntitled1 = []string{
+	"version",
+}
+
+// UnmarshalJSON decodes JSON.
+func (u *Untitled1) UnmarshalJSON(data []byte) error {
+	var err error
+
+	mu := marshalUntitled1(*u)
+
+	err = json.Unmarshal(data, &mu)
+	if err != nil {
+		return err
+	}
+
+	var rawMap map[string]json.RawMessage
+
+	err = json.Unmarshal(data, &rawMap)
+	if err != nil {
+		rawMap = nil
+	}
+
+	for _, key := range requireKeysUntitled1 {
+		if _, found := rawMap[key]; !found {
+			return errors.New("required key missing: " + key)
+		}
+	}
+
+	for _, key := range knownKeysUntitled1 {
+		delete(rawMap, key)
+	}
+
+	if len(rawMap) != 0 {
+		offendingKeys := make([]string, 0, len(rawMap))
+
+		for key := range rawMap {
+			offendingKeys = append(offendingKeys, key)
+		}
+
+		return fmt.Errorf("additional properties not allowed in Untitled1: %v", offendingKeys)
+	}
+
+	*u = Untitled1(mu)
+
+	return nil
+}
+
+GO
+            , $res->render());
+
+    }
+
 }