Normalized closures to enabled function use statements. (#4)

Author: mcg-web

src/Generator/AbstractTypeGenerator.php

@@ -161,7 +161,7 @@ protected function callableCallbackFromArrayValue(array $value, $key, $argDefini
             return $default;
         }
 
-        $code = $this->getSkeletonContent('ResolverClosure');
+        $code = 'function (%s) <closureUseStatements>{ return %s; }';
 
         if (is_callable($value[$key])) {
             $func = $value[$key];
@@ -205,6 +205,11 @@ protected function generateConfig(array $config)
         return $code;
     }
 
+    protected function generateClosureUseStatements(array $config)
+    {
+        return null;
+    }
+
     protected function typeAlias2String($alias)
     {
         // Non-Null
@@ -235,6 +240,17 @@ protected function resolveTypeCode($alias)
         return $alias . 'Type::getInstance()';
     }
 
+    protected function resolveTypesCode(array $values, $key)
+    {
+        if (isset($values[$key])) {
+            $types = sprintf('function () <closureUseStatements>{ return %s; }', $this->types2String($values[$key]));
+        } else {
+            $types = '[]';
+        }
+
+        return $types;
+    }
+
     protected function types2String(array $types)
     {
         $types = array_map(__CLASS__ . '::typeAlias2String', $types);
@@ -279,7 +295,7 @@ public function generateClasses(array $configs, $outputDirectory, $regenerateIfE
 
     public function generateClass(array $config, $outputDirectory, $regenerateIfExists = false)
     {
-        static $treatLater = ['useStatement', 'spaces'];
+        static $treatLater = ['useStatement', 'spaces', 'closureUseStatements'];
         $this->clearInternalUseStatements();
         $code = $this->processTemplatePlaceHoldersReplacements('TypeSystem', $config, $treatLater);
         $code = $this->processPlaceHoldersReplacements($treatLater, $code, $config) . "\n";

src/Generator/TypeGenerator.php

@@ -60,17 +60,23 @@ protected function generateDefaultValue(array $value)
 
     protected function generateType(array $value)
     {
-        return $this->typeAlias2String($value['type']);
+        if (isset($value['type'])) {
+            $type = sprintf('function () <closureUseStatements>{ return %s; }', $this->typeAlias2String($value['type']));
+        } else {
+            $type = 'null';
+        }
+
+        return $type;
     }
 
     protected function generateInterfaces(array $value)
     {
-        return isset($value['interfaces']) ? $this->types2String($value['interfaces']) : '[]';
+        return $this->resolveTypesCode($value, 'interfaces');
     }
 
     protected function generateTypes(array $value)
     {
-        return isset($value['types']) ? $this->types2String($value['types']) : '[]';
+        return $this->resolveTypesCode($value, 'types');
     }
 
     /**

src/Resources/skeleton/ArgConfig.php.skeleton

@@ -1,8 +1,6 @@
 [
 <spaces>'name' => <name>,
-<spaces>'type' => function () {
-<spaces><spaces>return <type>;
-<spaces>},
+<spaces>'type' => <type>,
 <spaces>'description' => <description>,
 <spaces>'defaultValue' => <defaultValue>,
 ],

src/Resources/skeleton/InputFieldConfig.php.skeleton

@@ -1,5 +1,5 @@
 <name> => [
-<spaces>'type' => function () { return <type>; },
+<spaces>'type' => <type>,
 <spaces>'defaultValue' => <defaultValue>,
 <spaces>'description' => <description>,
 ],

src/Resources/skeleton/ObjectConfig.php.skeleton

@@ -2,7 +2,7 @@
 <spaces>'name' => <name>,
 <spaces>'description' => <description>,
 <spaces>'fields' => <outputFields>,
-<spaces>'interfaces' => function () { return <interfaces>; },
+<spaces>'interfaces' => <interfaces>,
 <spaces>'isTypeOf' => <isTypeOf>,
 <spaces>'resolveField' => <resolveField>,
 ]

src/Resources/skeleton/OutputFieldConfig.php.skeleton

@@ -1,5 +1,5 @@
 <name> => [
-<spaces>'type' => function () { return <type>; },
+<spaces>'type' => <type>,
 <spaces>'args' => <args>,
 <spaces>'resolve' => <resolve>,
 <spaces>'description' => <description>,

src/Resources/skeleton/ResolverClosure.php.skeleton

@@ -1,6 +1,6 @@
 [
 <spaces>'name' => <name>,
-<spaces>'types' => function () { return <types>; },
+<spaces>'types' => <types>,
 <spaces>'resolveType' => <resolveType>,
 <spaces>'description' => <description>,
 ]