Replace rest with graphql for theme level support

src/Actions/FetchMainTheme.php

@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Osiset\ShopifyApp\Actions;
+
+use Illuminate\Support\Facades\Log;
+use Osiset\ShopifyApp\Contracts\ShopModel;
+
+final class FetchMainTheme
+{
+    /**
+     * @return array{id: ?string, name: ?string}
+     */
+    public function handle(ShopModel $shop): array
+    {
+        $response = $shop->api()->graph('{
+            themes(first: 1, roles: MAIN) {
+                nodes {
+                    id
+                    name
+                }
+            }
+        }');
+
+        if ($response['errors']) {
+            Log::error('Fetching main theme error: '.json_encode($response['errors']));
+
+            return [];
+        }
+
+        return data_get($response['body']->toArray(), 'data.themes.nodes.0', []);
+    }
+}

src/Actions/FetchThemeAssets.php

@@ -0,0 +1,61 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Osiset\ShopifyApp\Actions;
+
+use Illuminate\Support\Facades\Log;
+use Osiset\ShopifyApp\Contracts\ShopModel;
+
+final class FetchThemeAssets
+{
+    /**
+     * @param  string[]  $filenames
+     */
+    public function handle(ShopModel $shop, string $mainThemeId, array $filenames): array
+    {
+        $response = $shop->api()->graph('query ($id: ID!, $filenames: [String!]) {
+            theme(id: $id) {
+                id
+                name
+                role
+                files(filenames: $filenames) {
+                    nodes {
+                        filename
+                        body {
+                            ... on OnlineStoreThemeFileBodyText {
+                                content
+                            }
+                        }
+                    }
+                }
+            }
+        }', [
+            'id' => $mainThemeId,
+            'filenames' => array_values($filenames),
+        ]);
+
+        if ($response['errors']) {
+            Log::error('Fetching settings data error: '.json_encode($response['errors']));
+
+            return [];
+        }
+
+        $nodes = data_get($response['body']->toArray(), 'data.theme.files.nodes', []);
+
+        return array_values(array_filter(array_map(function (array $data) {
+            $content = data_get($data, 'body.content');
+
+            if ($content === null) {
+                Log::warning('Theme file body is not text, skipping: '.data_get($data, 'filename', '?'));
+
+                return null;
+            }
+
+            return [
+                'filename' => $data['filename'],
+                'content' => $content,
+            ];
+        }, $nodes)));
+    }
+}

src/Actions/VerifyThemeSupport.php

@@ -1,45 +1,119 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Osiset\ShopifyApp\Actions;
 
 use Osiset\ShopifyApp\Contracts\Queries\Shop as IShopQuery;
+use Osiset\ShopifyApp\Contracts\ShopModel;
 use Osiset\ShopifyApp\Objects\Enums\ThemeSupportLevel;
 use Osiset\ShopifyApp\Objects\Values\ShopId;
-use Osiset\ShopifyApp\Services\ThemeHelper;
 
-class VerifyThemeSupport
+final class VerifyThemeSupport
 {
+    private const ASSET_FILE_NAMES = ['templates/product.json', 'templates/collection.json', 'templates/index.json'];
+
+    private const MAIN_ROLE = 'main';
+
     public function __construct(
-        protected IShopQuery $shopQuery,
-        protected ThemeHelper $themeHelper
+        private IShopQuery $shopQuery,
+        private FetchMainTheme $fetchMainTheme,
+        private FetchThemeAssets $fetchThemeAssets,
     ) {
     }
 
     public function __invoke(ShopId $shopId): int
     {
-        $this->themeHelper->extractStoreMainTheme($shopId);
-
-        if ($this->themeHelper->themeIsReady()) {
-            $templateJSONFiles = $this->themeHelper->templateJSONFiles();
-            $templateMainSections = $this->themeHelper->mainSections($templateJSONFiles);
-            $sectionsWithAppBlock = $this->themeHelper->sectionsWithAppBlock($templateMainSections);
+        $shop = $this->shopQuery->getById($shopId);
 
-            $hasTemplates = count($templateJSONFiles) > 0;
-            $allTemplatesHasRightType = count($templateJSONFiles) === count($sectionsWithAppBlock);
-            $templatesСountWithRightType = count($sectionsWithAppBlock);
+        /** @var array{id: string, name: string} */
+        $mainTheme = $this->fetchMainTheme->handle($shop);
 
-            switch (true) {
-                case $hasTemplates && $allTemplatesHasRightType:
-                    return ThemeSupportLevel::FULL;
+        if (isset($mainTheme['id'])) {
+            /** @var array<int, array{filename: string, content: string}> */
+            $assets = $this->fetchThemeAssets->handle(
+                shop: $shop,
+                mainThemeId: $mainTheme['id'],
+                filenames: self::ASSET_FILE_NAMES
+            );
+            $templateMainSections = $this->mainSections(
+                shop: $shop,
+                mainTheme: $mainTheme,
+                assets: $assets
+            );
+            $sectionsWithAppBlock = $this->sectionsWithAppBlock($templateMainSections);
 
-                case $templatesСountWithRightType:
-                    return ThemeSupportLevel::PARTIAL;
+            $hasTemplates = count($assets) > 0;
+            $allTemplatesHasRightType = count($assets) === count($sectionsWithAppBlock);
+            $hasTemplatesCountWithRightType = count($sectionsWithAppBlock) > 0;
 
-                default:
-                    return ThemeSupportLevel::UNSUPPORTED;
-            }
+            return match (true) {
+                $hasTemplates && $allTemplatesHasRightType => ThemeSupportLevel::FULL,
+                $hasTemplatesCountWithRightType => ThemeSupportLevel::PARTIAL,
+                default => ThemeSupportLevel::UNSUPPORTED
+            };
         }
 
         return ThemeSupportLevel::UNSUPPORTED;
     }
+
+    /**
+     * @param  array{id: string}  $mainTheme
+     * @param  array{content: string}  $assets
+     *
+     * @return array<int, array{filename: string, content: string}>
+     */
+    private function mainSections(ShopModel $shop, array $mainTheme, array $assets): array
+    {
+        $filenamesForMainSections = array_filter(
+            array_map(function ($asset) {
+                $content = $asset['content'];
+
+                if (! $this->json_validate($content)) {
+                    $content = preg_replace("#(/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*+/)|([\s\t]//.*)|(^//.*)#", '', $content);
+                }
+
+                $assetContent = json_decode($content, true);
+
+
+                $mainAsset = array_filter($assetContent['sections'], function ($value, $key) {
+                    return $key == self::MAIN_ROLE || str_starts_with($value['type'], self::MAIN_ROLE);
+                }, ARRAY_FILTER_USE_BOTH);
+
+                if ($mainAsset) {
+                    return 'sections/'.end($mainAsset)['type'].'.liquid';
+                }
+            }, $assets)
+        );
+
+        return $this->fetchThemeAssets->handle(
+            shop: $shop,
+            mainThemeId: $mainTheme['id'],
+            filenames: $filenamesForMainSections
+        );
+    }
+
+    private function sectionsWithAppBlock(array $templateMainSections): array
+    {
+        return array_filter(array_map(function ($file) {
+            $acceptsAppBlock = false;
+
+            preg_match('/\{\%-?\s+schema\s+-?\%\}([\s\S]*?)\{\%-?\s+endschema\s+-?\%\}/m', $file['content'], $matches);
+            $schema = json_decode($matches[1] ?? '{}', true);
+
+            if ($schema && isset($schema['blocks'])) {
+                $acceptsAppBlock = in_array('@app', array_column($schema['blocks'], 'type'));
+            }
+
+            return $acceptsAppBlock ? $file : null;
+        }, $templateMainSections));
+    }
+
+
+    private function json_validate(string $string): bool
+    {
+        json_decode($string);
+
+        return json_last_error() === JSON_ERROR_NONE;
+    }
 }

src/Http/Middleware/VerifyScopes.php

@@ -68,7 +68,7 @@ private function currentScopes(ShopModel $shop): array
             }')
         );
 
-        if (! $response['errors'] && blank(data_get($response['body']->toArray(), 'data.currentAppInstallation.userErrors'))) {
+        if (! $response['errors']) {
             return [
                 'hasErrors' => false,
                 'result' => array_column(
@@ -78,7 +78,7 @@ private function currentScopes(ShopModel $shop): array
             ];
         }
 
-        Log::error('Fetch current app installation access scopes error: '.json_encode(data_get($response['body']->toArray(), 'data.currentAppInstallation.userErrors')));
+        Log::error('Fetch current app installation access scopes error: '.json_encode($response['errors']));
 
         return [
             'hasErrors' => true,