Commit Diff


commit - 2be9c652b5eef11859a57d0ef2251ce1e20c5582
commit + 4465ac43a29e475856275fd88b3b7d72f5574a00
blob - 22d68be13129a32b345f875a1796a05099dc9899
blob + a3b026f5f7fa41ba7aeaf90a0a06e4958c193530
--- README.md
+++ README.md
@@ -87,6 +87,8 @@ external_rel
 {{- partial "schema/json-ld.html" . | safeHTML }}
 ```
 
+Если в Page Bundle есть файл <тип>.jsonld (например, Person.jsonld), он будет использован при генерации схемы.
+
 #### Статья
 Для указания publisher в статье укажите publisher в Params страницы, либо в настройках сайта.
 
blob - 0bb96a41dcdf30249f1ff27d70eacf5a9ba8fa42
blob + c802472c3e1842b880b5ab4bba11591ef81394a3
--- layouts/_partials/schema/Thing.html
+++ layouts/_partials/schema/Thing.html
@@ -1,13 +1,13 @@
 {{ $type := .Store.Get "schema" | default "Thing" }}
 {{ $processedParams := dict }}
-{{ with .Resources.GetMatch (printf "%s.{json,toml,yaml,yml}" $type) }}
-  {{ with . | transform.Unmarshal }}
+{{ with .Resources.Get (printf "%s.jsonld" $type) }}
+  {{ with . | transform.Unmarshal (dict "format" "json") }}
     {{ range $key, $value := . }}
       {{ if and
-            (reflect.IsMap $value)
-            (index $value "@id")
-            (eq (len $value) 1)
-            (findRE `^/.+#.+$` (index $value "@id"))
+        (reflect.IsMap $value)
+        (index $value "@id")
+        (eq (len $value) 1)
+        (findRE `^/.+#.+$` (index $value "@id"))
       }}
         {{ $processedParams = merge $processedParams (dict $key (partial "schema/load" (index $value "@id"))) }}
       {{ else }}
@@ -17,13 +17,12 @@
   {{ end }}
 {{ end }}
 
-
 {{ $out := dict
-    "@type" $type
-    "@id" (printf "%s#%s" .Permalink $type)
-    "url" .Permalink
-    "name" (or $processedParams.name .Title)
-    "description" (or $processedParams.description .Description .Summary | plainify)
+  "@type" $type
+  "@id" (printf "%s#%s" .Permalink $type)
+  "url" .Permalink
+  "name" (or $processedParams.name .Title)
+  "description" (or $processedParams.description .Description .Summary | plainify)
 }}
 
 {{ $images := or $processedParams.image (apply (partial "_funcs/get-page-images" . | first 6) "index" "." "Permalink") }}