Fixed some bugs with code maker

garlicservices · Sep 17, 2018 · 1aa2d4c · 1aa2d4c
1 parent 9ef60a4
commit 1aa2d4c
Show file tree

Hide file tree

Showing 25 changed files with 36 additions and 13 deletions.
diff --git a/Argument/ArgumentTypeAbstract.php b/Argument/ArgumentTypeAbstract.php
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
diff --git a/DependencyInjection/GarlicGraphQLExtension.php b/DependencyInjection/GarlicGraphQLExtension.php
diff --git a/Field/FieldAbstract.php b/Field/FieldAbstract.php
diff --git a/Field/FieldHelperAbstract.php b/Field/FieldHelperAbstract.php
diff --git a/Maker/MakeGraphQLQuery.php b/Maker/MakeGraphQLQuery.php
@@ -38,7 +38,7 @@ final class MakeGraphQLQuery extends AbstractMaker
      * @param $schemaNamespace
      * @param FileManager $fileManager
      */
-    public function __construct(ClassFinder $classFinder, string $schemaNamespace, FileManager $fileManager)
+    public function __construct(ClassFinder $classFinder, FileManager $fileManager, $schemaNamespace = '')
     {
         $this->classFinder = $classFinder;
         $this->schemaNamespace = $schemaNamespace;

diff --git a/Maker/MakeGraphQLSchema.php b/Maker/MakeGraphQLSchema.php
@@ -16,6 +16,18 @@
  */
 final class MakeGraphQLSchema extends AbstractMaker
 {
+    /** @var string */
+    private $rootDir;
+
+    /**
+     * MakeGraphQLSchema constructor.
+     * @param string $rootDir
+     */
+    public function __construct(string $rootDir)
+    {
+        $this->rootDir = $rootDir;
+    }
+
     /**
      * Return command name
      * @return string
@@ -50,14 +62,14 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
                 'namespace' => 'GraphQL\\Query',
                 'template' => 'Query.tpl.php',
                 'variables' => [
-                    'queries' => []
+                    'fields' => []
                 ]
             ],
             'MutationType' =>[
                 'namespace' => 'GraphQL\\Mutation',
                 'template' => 'Mutation.tpl.php',
                 'variables' => [
-                    'mutations' => []
+                    'fields' => []
                 ]
             ],
             'schema' =>[
@@ -67,11 +79,14 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
             ],
         ];
 
-        $generator->generateFile(
-            dirname(dirname(dirname(__FILE__))).'/config/packages/graphql.yaml',
-            dirname(dirname(__FILE__)) . '/Resources/skeleton/graphql.tpl.yaml',
-            []
-        );
+        $configFile = dirname($this->rootDir).'/config/packages/graphql.yaml';
+        if(!is_file($configFile)) {
+            $generator->generateFile(
+                $configFile,
+                dirname(dirname(__FILE__)) . '/Resources/skeleton/graphql.tpl.yaml',
+                []
+            );
+        }
 
         foreach ($classes as $name => $class) {
             $classNameDetails = $generator->createClassNameDetails(

diff --git a/Maker/MakeGraphQLType.php b/Maker/MakeGraphQLType.php
diff --git a/README.md b/README.md
@@ -18,13 +18,13 @@ composer require garlic/graphql
 ### Initialize GraphQL schema(create schema, query and mutation fields)
 
 ```bash
-bin/console maker:graphql:init
+bin/console make:graphql:init
 ```
 
 ### Create graphql type (command able to get fields from existing Entity)
 
 ```bash
-bin/console maker:graphql:type
+bin/console make:graphql:type
 ```
 
 The command suggest you to create full CRUD mutations and queries, just type "y" to do so. 
@@ -40,7 +40,7 @@ App\Service\GraphQL\:
 ### Make your first graphql query or mutation
 
 ```bash
-bin/console maker:graphql:query
+bin/console make:graphql:query
 ```
 
 Now you can review and update newly created files! 

diff --git a/Resources/config/services.yml b/Resources/config/services.yml
@@ -22,6 +22,14 @@ services:
         arguments:
         - "%kernel.root_dir%"
 
+    # Add maker command for creating GraphQL schema
+    maker.graphql.make_schema:
+        class: Garlic\GraphQL\Maker\MakeGraphQLSchema
+        public: true
+        tags: ['maker.command']
+        arguments:
+        - "%kernel.root_dir%"
+
     # Add maker command for creating GraphQL type
     maker.graphql.make_type:
         class: Garlic\GraphQL\Maker\MakeGraphQLType
@@ -38,5 +46,5 @@ services:
         tags: ['maker.command']
         arguments:
         - "@class_finder"
+        - "@maker.file_manager"
         - '%graphql.schema_class%'
-        - "@maker.file_manager"
diff --git a/Resources/skeleton/Mutation.tpl.php b/Resources/skeleton/Mutation.tpl.php
diff --git a/Resources/skeleton/MutationResolver.tpl.php b/Resources/skeleton/MutationResolver.tpl.php
diff --git a/Resources/skeleton/Query.tpl.php b/Resources/skeleton/Query.tpl.php
diff --git a/Resources/skeleton/QueryResolver.tpl.php b/Resources/skeleton/QueryResolver.tpl.php
diff --git a/Resources/skeleton/Resolver.tpl.php b/Resources/skeleton/Resolver.tpl.php
diff --git a/Resources/skeleton/Schema.tpl.php b/Resources/skeleton/Schema.tpl.php
diff --git a/Resources/skeleton/Service.tpl.php b/Resources/skeleton/Service.tpl.php
@@ -2,7 +2,7 @@
 
 namespace <?= $namespace ?>;
 
-use Garlic\GraphQL\Service\AbstractCrudService;
+use Garlic\GraphQL\Service\Abstracts\AbstractCrudService;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use <?= $entityFullName ?>;
 

diff --git a/Resources/skeleton/Type.tpl.php b/Resources/skeleton/Type.tpl.php
diff --git a/Resources/skeleton/graphql.tpl.yaml b/Resources/skeleton/graphql.tpl.yaml
diff --git a/Service/Abstracts/AbstractCrudService.php b/Service/Abstracts/AbstractCrudService.php
diff --git a/Service/Helper/ClassFinder.php b/Service/Helper/ClassFinder.php
diff --git a/Type/Interfaces/BuilderInterface.php b/Type/Interfaces/BuilderInterface.php
diff --git a/Type/TypeAbstract.php b/Type/TypeAbstract.php
diff --git a/Type/TypeBuilder.php b/Type/TypeBuilder.php
diff --git a/Type/TypeHelper.php b/Type/TypeHelper.php