Resolves issues with remote schema refs

Author: cybtachyon

js/patternkit.jsoneditor.es6.js

@@ -87,7 +87,7 @@
             this.refs[url] = 'loading';
             waiting++;
             let r = new XMLHttpRequest();
-            let uri = settings.path.baseUrl + url + '/schema';
+            let uri = settings.path.baseUrl + url;
             r.open("GET", uri, true);
             r.onreadystatechange = () => {
               if (r.readyState !== 4) {

js/patternkit.jsoneditor.js

@@ -121,7 +121,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "functi
             _this.refs[url] = 'loading';
             waiting++;
             var r = new XMLHttpRequest();
-            var uri = settings.path.baseUrl + url + '/schema';
+            var uri = settings.path.baseUrl + url;
             r.open("GET", uri, true);
 
             r.onreadystatechange = function () {

src/PatternLibraryJSONParserTrait.php

@@ -2,6 +2,7 @@
 
 namespace Drupal\patternkit;
 
+use Drupal\Core\Url;
 use Drupal\patternkit\Entity\PatternInterface;
 
 /**
@@ -39,7 +40,7 @@ public function fetchJsonSchemaAsset($file_uri) {
    * @return object
    *   The updated schema properties object.
    *
-   * @todo JSON Schema technically allows the following valid refs:
+   * @example JSON Schema technically allows the following valid refs:
    *   - URI "example.json" "../../example.json" "./example.json"
    *   - URL "https://json-schema.org/person.schema.json"
    *   - JSON Pointer "#/definitions/example" "example.json#/example"
@@ -76,15 +77,23 @@ public static function schemaDereference($properties, PatternInterface $pattern)
       }
       $path = $value;
       if (strpos($value,'@') === 0) {
-        $library_name = strstr($value, '/', TRUE);
-        $pattern_library = $library->getLibraryDefinitions()[trim($library_name, '@')];
-        $path = substr($value, strlen());
+        $library_namespace = strstr($value, '/', TRUE);
+        $path = substr($value, strlen("$library_namespace/"));
+      }
+      $ref = '';
+      if (strstr($path, '#/')) {
+        $ref = explode('#/', $path);
+        $path = reset($ref);
+        $ref = !empty($ref[1]) ? '#/' . $ref[1] : '';
       }
+      $library_name = $pattern->getLibrary();
       if (strstr($path, './')) {
+        $pattern_library = $library->getLibraryDefinitions()[trim($library_name, '@')];
+        $library_path = $pattern_library->getPatternInfo()['data'] ?? $pattern_library->getExtension()->getPath();
         /** @var \Drupal\Core\File\FileSystem $filesystem */
-        $path = realpath($pattern->getPath() . $path);
+        $path = substr(str_replace('\\', '/', realpath($library_path . '/' . $path)), strlen(\Drupal::root() . '/' . $library_path . '/'));
       }
-      $properties[$property] = 'api/patternkit/' . trim($value, '.json');
+      $properties[$property] = Url::fromUserInput('/api/patternkit/' . trim($library_namespace ?? $library_name, '@') . '/' . trim($path, '.json') . '/json')->toString() . $ref;
     }
     return $properties;
   }

src/Plugin/PatternLibrary/PatternLibraryFile.php

@@ -3,8 +3,8 @@
 namespace Drupal\patternkit\Plugin\PatternLibrary;
 
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
+use Drupal\patternkit\Annotation\PatternLibrary;
 use Drupal\patternkit\Entity\PatternInterface;
-use Drupal\patternkit\Pattern;
 use Drupal\patternkit\PatternEditorConfig;
 use Drupal\patternkit\PatternLibraryPluginDefault;
 use Drupal\patternkit\PatternLibraryPluginInterface;
@@ -36,7 +36,7 @@ class PatternLibraryFile extends PatternLibraryPluginDefault implements Containe
   /**
    * File pattern library parser service.
    *
-   * @var \Drupal\patternkit\PatternLibraryParser\FilePatternLibraryParser
+   * @var \Drupal\patternkit\Asset\PatternLibraryParser\FilePatternLibraryParser
    */
   protected $fileParser;
 
@@ -47,7 +47,7 @@ class PatternLibraryFile extends PatternLibraryPluginDefault implements Containe
    */
   public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition): PatternLibraryPluginInterface {
     $root = $container->get('app.root');
-    /** @var \Drupal\patternkit\PatternLibraryParserInterface $file_parser */
+    /** @var \Drupal\patternkit\Asset\PatternLibraryParserInterface $file_parser */
     $file_parser = $container->get('patternkit.asset.library.parser.file');
     /** @var \Drupal\Core\Config\ConfigFactoryInterface $config_factory */
     $config_factory = $container->get('config.factory');