@swell/apps-sdk 1.0.185 → 1.0.187

package/dist/index.js

@@ -3529,7 +3529,15 @@
         }, {}),
         ...preset.settings || void 0
       },
-      blocks: preset.blocks?.map((block) => {
+      blocks: resolveSectionBlockPresets(preset, schema)
+    }));
+  }
+  function resolveSectionBlockPresets(preset, schema) {
+    if (!preset.blocks) {
+      return;
+    }
+    if (Array.isArray(preset.blocks)) {
+      return preset.blocks.map((block) => {
         const blockDef = schema.blocks?.find((b) => b.type === block.type);
         return blockDef ? {
           ...block,
@@ -3543,8 +3551,9 @@
             ...block.settings || void 0
           }
         } : block;
-      })
-    }));
+      });
+    }
+    return Object.values(preset.blocks);
   }
   async function getLayoutSectionGroups(allSections, renderTemplateSchema) {
     const allSectionsList = Array.from(allSections.values());
@@ -3621,7 +3630,15 @@
       };
       const id = sectionGroup.id ? `page__${sectionGroup.id}__${key}` : schema.id;
       const blockOrder = Array.isArray(section.block_order) ? section.block_order : Object.keys(section.blocks || {});
-      const blocks = blockOrder.map((key2) => section.blocks?.[key2]).filter(Boolean);
+      const blocks = blockOrder.map((key2) => {
+        const block = section.blocks?.[key2];
+        if (block) {
+          return {
+            ...block,
+            id: `${schema.id}__${key2}`
+          };
+        }
+      }).filter(Boolean);
       const settings = {
         section: {
           id,
@@ -5615,7 +5632,7 @@ ${formattedMessage}`;
               // TODO: figure out how to make this work, doesn't work for collections normally
               defaultValue: section.presets?.reduce(
                 (acc, preset, index) => {
-                  if (!preset.blocks) {
+                  if (!preset.blocks || !Array.isArray(preset.blocks)) {
                     return acc;
                   }
                   return preset.blocks.reduce(
@@ -5822,7 +5839,7 @@ ${formattedMessage}`;
             custom_css: preset.settings?.["custom_css"] || "",
             ...processFields(section.fields, preset.settings),
             // Process blocks inside the preset
-            Blocks: (preset.blocks || []).map((block) => {
+            Blocks: (Array.isArray(preset.blocks) ? preset.blocks : []).map((block) => {
               const blockSchema = section.blocks?.find(
                 ({ type }) => type === block.type
               );
@@ -6282,11 +6299,11 @@ ${formattedMessage}`;
   }
 
   // src/menus.ts
-  var import_lodash_es15 = __require("lodash-es");
+  var import_lodash_es17 = __require("lodash-es");
 
   // src/theme.ts
   var import_json56 = __toESM(__require("json5"), 1);
-  var import_lodash_es14 = __require("lodash-es");
+  var import_lodash_es16 = __require("lodash-es");
 
   // src/compatibility/shopify.ts
   var import_lodash_es7 = __require("lodash-es");
@@ -11581,16 +11598,16 @@ ${formattedMessage}`;
       if (!Array.isArray(blogs?.results)) {
         return [];
       }
-      const set3 = blogs.results.reduce(
-        (set4, blog) => {
+      const set4 = blogs.results.reduce(
+        (set5, blog) => {
           for (const tag of blog.tags || []) {
-            set4.add(tag);
+            set5.add(tag);
           }
-          return set4;
+          return set5;
         },
         /* @__PURE__ */ new Set()
       );
-      return Array.from(set3.values());
+      return Array.from(set4.values());
     });
     return new ShopifyResource({
       all_tags: allTags,
@@ -11974,18 +11991,18 @@ ${formattedMessage}`;
         if (!resolved) {
           return [];
         }
-        const set3 = /* @__PURE__ */ new Set();
+        const set4 = /* @__PURE__ */ new Set();
         await Promise.all(
           resolved.results.map(async (product) => {
             const tags2 = await Promise.resolve().then(() => product.tags);
             if (Array.isArray(tags2)) {
               for (const tag of tags2) {
-                set3.add(tag);
+                set4.add(tag);
               }
             }
           })
         );
-        return Array.from(set3.values());
+        return Array.from(set4.values());
       }),
       all_types: defer(async () => {
         const products = await resolveProducts();
@@ -12089,6 +12106,31 @@ ${formattedMessage}`;
     return resolveProducts;
   }
 
+  // src/compatibility/shopify-objects/content.ts
+  var import_liquidjs6 = __require("liquidjs");
+  var ShopifySwellContent = class extends import_liquidjs6.Drop {
+    content;
+    description;
+    constructor(product) {
+      super();
+      this.content = product?.content || {};
+      this.description = product?.description || "";
+    }
+    toString() {
+      return this.description;
+    }
+    toObject() {
+      const combined = Object.assign({}, this.content);
+      return combined;
+    }
+    toJSON() {
+      return this.toObject();
+    }
+    toLiquid() {
+      return this.toObject();
+    }
+  };
+
   // src/compatibility/shopify-objects/product.ts
   function ShopifyProduct(instance, product, depth = 0) {
     if (product instanceof ShopifyResource) {
@@ -12122,7 +12164,7 @@ ${formattedMessage}`;
       compare_at_price_max: compareAtPrice,
       compare_at_price_min: compareAtPrice,
       compare_at_price_varies: false,
-      content: defer(() => product.description),
+      content: defer(() => new ShopifySwellContent(product)),
       created_at: defer(() => product.date_created),
       description: defer(() => product.description),
       featured_image: deferWith(product, (product2) => {
@@ -13000,8 +13042,8 @@ ${formattedMessage}`;
   }
 
   // src/compatibility/drops/money.ts
-  var import_liquidjs6 = __require("liquidjs");
-  var MoneyDrop = class extends import_liquidjs6.Drop {
+  var import_liquidjs7 = __require("liquidjs");
+  var MoneyDrop = class extends import_liquidjs7.Drop {
     constructor(value, decimals, currency) {
       super();
       this.value = value;
@@ -13602,8 +13644,8 @@ ${formattedMessage}`;
   }
 
   // src/compatibility/drops/all_products.ts
-  var import_liquidjs7 = __require("liquidjs");
-  var AllProductsDrop = class extends import_liquidjs7.Drop {
+  var import_liquidjs8 = __require("liquidjs");
+  var AllProductsDrop = class extends import_liquidjs8.Drop {
     #instance;
     #map;
     constructor(instance) {
@@ -13645,8 +13687,8 @@ ${formattedMessage}`;
   };
 
   // src/compatibility/drops/articles.ts
-  var import_liquidjs8 = __require("liquidjs");
-  var ArticlesDrop = class extends import_liquidjs8.Drop {
+  var import_liquidjs9 = __require("liquidjs");
+  var ArticlesDrop = class extends import_liquidjs9.Drop {
     #instance;
     #map;
     constructor(instance) {
@@ -13688,8 +13730,8 @@ ${formattedMessage}`;
   };
 
   // src/compatibility/drops/blogs.ts
-  var import_liquidjs9 = __require("liquidjs");
-  var BlogsDrop = class extends import_liquidjs9.Drop {
+  var import_liquidjs10 = __require("liquidjs");
+  var BlogsDrop = class extends import_liquidjs10.Drop {
     #instance;
     #map;
     constructor(instance) {
@@ -13735,7 +13777,7 @@ ${formattedMessage}`;
   };
 
   // src/compatibility/drops/collections.ts
-  var import_liquidjs10 = __require("liquidjs");
+  var import_liquidjs11 = __require("liquidjs");
   var AllCategoryResource = class extends StorefrontResource {
     constructor(instance) {
       super(() => {
@@ -13749,7 +13791,7 @@ ${formattedMessage}`;
       });
     }
   };
-  var CollectionsDrop = class extends import_liquidjs10.Drop {
+  var CollectionsDrop = class extends import_liquidjs11.Drop {
     #instance;
     #map;
     constructor(instance) {
@@ -13876,8 +13918,8 @@ ${formattedMessage}`;
   };
 
   // src/compatibility/drops/images.ts
-  var import_liquidjs11 = __require("liquidjs");
-  var ImagesDrop = class extends import_liquidjs11.Drop {
+  var import_liquidjs12 = __require("liquidjs");
+  var ImagesDrop = class extends import_liquidjs12.Drop {
     #instance;
     #map;
     constructor(instance) {
@@ -13931,8 +13973,8 @@ ${formattedMessage}`;
   };
 
   // src/compatibility/drops/object-handles.ts
-  var import_liquidjs12 = __require("liquidjs");
-  var ObjectHandlesDrop = class extends import_liquidjs12.Drop {
+  var import_liquidjs13 = __require("liquidjs");
+  var ObjectHandlesDrop = class extends import_liquidjs13.Drop {
     #map;
     constructor(map) {
       super();
@@ -13972,8 +14014,8 @@ ${formattedMessage}`;
   };
 
   // src/compatibility/drops/pages.ts
-  var import_liquidjs13 = __require("liquidjs");
-  var PagesDrop = class extends import_liquidjs13.Drop {
+  var import_liquidjs14 = __require("liquidjs");
+  var PagesDrop = class extends import_liquidjs14.Drop {
     #instance;
     #map;
     constructor(instance) {
@@ -14548,6 +14590,8 @@ ${injects.join("\n")}<\/script>`;
           return `templates/${this.getPageType(name)}`;
         case "sections":
           return `sections/${name}`;
+        case "blocks":
+          return `blocks/${name}`;
         default:
           throw new Error(`Theme file type not supported: ${type}`);
       }
@@ -14693,9 +14737,9 @@ ${injects.join("\n")}<\/script>`;
   };
 
   // src/liquid/drops/render.ts
-  var import_liquidjs14 = __require("liquidjs");
+  var import_liquidjs15 = __require("liquidjs");
   var import_lodash_es8 = __require("lodash-es");
-  var RenderDrop = class extends import_liquidjs14.Drop {
+  var RenderDrop = class extends import_liquidjs15.Drop {
     #result;
     #handler;
     constructor(handler) {
@@ -14721,7 +14765,7 @@ ${injects.join("\n")}<\/script>`;
   };
 
   // src/liquid/index.ts
-  var import_liquidjs34 = __require("liquidjs");
+  var import_liquidjs40 = __require("liquidjs");
 
   // src/utils/escape.ts
   function replacerUnescape(match) {
@@ -14732,9 +14776,9 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/tags/assign.ts
-  var import_liquidjs15 = __require("liquidjs");
+  var import_liquidjs16 = __require("liquidjs");
   function bind(_liquidSwell) {
-    return class AssignTag extends import_liquidjs15.Tag {
+    return class AssignTag extends import_liquidjs16.Tag {
       key;
       value;
       identifier;
@@ -14746,7 +14790,7 @@ ${injects.join("\n")}<\/script>`;
         this.tokenizer.skipBlank();
         this.tokenizer.advance();
         try {
-          this.value = new import_liquidjs15.Value(this.tokenizer.readFilteredValue(), this.liquid);
+          this.value = new import_liquidjs16.Value(this.tokenizer.readFilteredValue(), this.liquid);
         } catch (e) {
           console.warn(
             `Liquid "assign" tag: ${e instanceof Error ? e.stack : String(e)}`
@@ -14773,9 +14817,9 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/tags/case.ts
-  var import_liquidjs16 = __require("liquidjs");
+  var import_liquidjs17 = __require("liquidjs");
   function bind2(liquidSwell) {
-    return class CaseTag extends import_liquidjs16.Tag {
+    return class CaseTag extends import_liquidjs17.Tag {
       value;
       branches;
       elseTemplates;
@@ -14786,7 +14830,7 @@ ${injects.join("\n")}<\/script>`;
         const caseVar = this.tokenizer.readValue()?.getText();
         this.isBlock = Boolean(caseVar?.startsWith("block."));
         this.tokenizer.p = begin;
-        this.value = new import_liquidjs16.Value(this.tokenizer.readFilteredValue(), this.liquid);
+        this.value = new import_liquidjs17.Value(this.tokenizer.readFilteredValue(), this.liquid);
         this.branches = [];
         this.elseTemplates = [];
         let p = [];
@@ -14824,12 +14868,12 @@ ${injects.join("\n")}<\/script>`;
       }
       *render(ctx, emitter) {
         const r = this.liquid.renderer;
-        const target = (0, import_liquidjs16.toValue)(yield this.value.value(ctx, ctx.opts.lenientIf));
+        const target = (0, import_liquidjs17.toValue)(yield this.value.value(ctx, ctx.opts.lenientIf));
         let branchHit = false;
         let output = "";
         for (const branch of this.branches) {
           for (const valueToken of branch.values) {
-            const value = yield (0, import_liquidjs16.evalToken)(valueToken, ctx, ctx.opts.lenientIf);
+            const value = yield (0, import_liquidjs17.evalToken)(valueToken, ctx, ctx.opts.lenientIf);
             if (target === value) {
               const blockOutput = yield r.renderTemplates(branch.templates, ctx);
               output += blockOutput;
@@ -14862,15 +14906,15 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/tags/comment.ts
-  var import_liquidjs17 = __require("liquidjs");
+  var import_liquidjs18 = __require("liquidjs");
   function bind3(_liquidSwell) {
-    return class CommentTag extends import_liquidjs17.Tag {
+    return class CommentTag extends import_liquidjs18.Tag {
       constructor(tagToken, remainTokens, liquid) {
         super(tagToken, remainTokens, liquid);
         let nested = 1;
         while (remainTokens.length > 0) {
           const token = remainTokens.shift();
-          if (import_liquidjs17.TypeGuards.isTagToken(token)) {
+          if (import_liquidjs18.TypeGuards.isTagToken(token)) {
             switch (token.name) {
               case "comment":
                 nested += 1;
@@ -14894,14 +14938,161 @@ ${injects.join("\n")}<\/script>`;
     };
   }
 
+  // src/liquid/tags/content_for.ts
+  var import_liquidjs22 = __require("liquidjs");
+  var import_lodash_es10 = __require("lodash-es");
+
+  // src/liquid/hash.ts
+  var import_lodash_es9 = __require("lodash-es");
+  var import_liquidjs21 = __require("liquidjs");
+
+  // src/liquid/tokienizer.ts
+  var import_liquidjs20 = __require("liquidjs");
+
+  // src/liquid/tokens/identifier-token.ts
+  var import_liquidjs19 = __require("liquidjs");
+  var IdentifierToken = class extends import_liquidjs19.Token {
+    constructor(input, begin, end, file) {
+      super(import_liquidjs19.TokenKind.Word, input, begin, end, file);
+      this.input = input;
+      this.begin = begin;
+      this.end = end;
+      this.file = file;
+      this.content = this.getText();
+    }
+    content;
+  };
+
+  // src/liquid/tokienizer.ts
+  var isNumber2 = (c) => c >= "0" && c <= "9";
+  var isCharacter = (c) => c >= "a" && c <= "z" || c >= "A" && c <= "Z";
+  var isWord = (c) => "_-?".includes(c) || isCharacter(c) || isNumber2(c);
+  var TokenizerSwell = class extends import_liquidjs20.Tokenizer {
+    readIdentifier() {
+      this.skipBlank();
+      const begin = this.p;
+      while (!this.end()) {
+        const char = this.peek();
+        if (isWord(char) || char === ".") {
+          this.p++;
+        } else {
+          break;
+        }
+      }
+      return new IdentifierToken(this.input, begin, this.p, this.file);
+    }
+  };
+
+  // src/liquid/hash.ts
+  var HashSwell = class extends import_liquidjs21.Hash {
+    constructor(input, jekyllStyle) {
+      super(input, jekyllStyle);
+      const tokenizer = input instanceof import_liquidjs21.Tokenizer ? input : new TokenizerSwell(input, {});
+      for (const hash of tokenizer.readHashes(jekyllStyle)) {
+        this.hash[hash.name.content] = hash.value;
+      }
+    }
+    *render(ctx) {
+      const hash = {};
+      for (const key of Object.keys(this.hash)) {
+        const token = this.hash[key];
+        if (token !== void 0) {
+          const value = yield (0, import_liquidjs21.evalToken)(token, ctx);
+          (0, import_lodash_es9.set)(hash, key, value);
+        }
+      }
+      return hash;
+    }
+  };
+
+  // src/liquid/tags/content_for.ts
+  function bind4(liquidSwell) {
+    return class ContentForTag extends import_liquidjs22.Tag {
+      name;
+      hash;
+      constructor(token, remainTokens, liquid) {
+        super(token, remainTokens, liquid);
+        const tokenizer = token.tokenizer;
+        this.name = tokenizer.readValue()?.content;
+        this.hash = new HashSwell(tokenizer.remaining());
+      }
+      *render(ctx, emitter) {
+        const section = yield ctx._get(["section"]);
+        const block = yield ctx._get(["block"]);
+        const hash = yield this.hash.render(ctx);
+        const blocks = this.getBlocks(section, block, hash);
+        for (const block2 of blocks) {
+          if (!isObject2(block2) || typeof block2.type !== "string") {
+            continue;
+          }
+          const blockPath = yield liquidSwell.getThemeBlockPath(
+            block2.type
+          );
+          if (!blockPath) {
+            continue;
+          }
+          const childCtx = ctx.spawn();
+          const scope = childCtx.bottom();
+          (0, import_lodash_es10.assign)(scope, { section });
+          (0, import_lodash_es10.assign)(scope, { block: block2 });
+          (0, import_lodash_es10.assign)(scope, hash);
+          const templates = yield this.liquid._parseFile(
+            blockPath,
+            childCtx.sync
+          );
+          yield this.liquid.renderer.renderTemplates(
+            templates,
+            childCtx,
+            emitter
+          );
+        }
+      }
+      getBlocks(section, block, hash) {
+        const blockConfigs = this.getBlockConfigs(section, block);
+        if (!isObject2(hash) || !hash.type) {
+          return blockConfigs;
+        }
+        const blockConfig = blockConfigs.find(
+          (blockConfig2) => isObject2(blockConfig2) && blockConfig2.type === hash.type
+        );
+        return blockConfig ? [blockConfig] : [];
+      }
+      getBlockConfigs(section, block) {
+        if (isObject2(block) && block.blocks) {
+          return Object.values(block.blocks);
+        }
+        if (isObject2(section) && Array.isArray(section.blocks)) {
+          return section.blocks;
+        }
+        return [];
+      }
+    };
+  }
+
+  // src/liquid/tags/doc.ts
+  var import_liquidjs23 = __require("liquidjs");
+  function bind5() {
+    return class DocTag extends import_liquidjs23.Tag {
+      constructor(token, remainTokens, liquid, parser) {
+        super(token, remainTokens, liquid);
+        const stream = parser.parseStream(remainTokens).on("tag:enddoc", () => {
+          stream.stop();
+        });
+        stream.start();
+      }
+      render() {
+      }
+    };
+  }
+
   // src/liquid/tags/for.ts
-  var import_liquidjs18 = __require("liquidjs");
+  var import_liquidjs24 = __require("liquidjs");
   var MODIFIERS = Object.freeze(["offset", "limit", "reversed"]);
-  function bind4(_liquidSwell) {
-    return class ForTag extends import_liquidjs18.ForTag {
+  function bind6(_liquidSwell) {
+    return class ForTag extends import_liquidjs24.ForTag {
       *render(ctx, emitter) {
         const r = this.liquid.renderer;
-        let collection = yield (0, import_liquidjs18.evalToken)(this.collection, ctx);
+        let collection = yield (0, import_liquidjs24.evalToken)(this.collection, ctx);
         collection = yield resolveEnumerable(collection);
         if (!collection.length) {
           yield r.renderTemplates(this.elseTemplates, ctx, emitter);
@@ -14968,10 +15159,10 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/tags/form.ts
-  var import_liquidjs19 = __require("liquidjs");
+  var import_liquidjs25 = __require("liquidjs");
   var IGNORED_SHOPIFY_FORMS = Object.freeze(["new_comment", "guest_login"]);
-  function bind5(liquidSwell) {
-    return class FormTag extends import_liquidjs19.Tag {
+  function bind7(liquidSwell) {
+    return class FormTag extends import_liquidjs25.Tag {
       formType;
       formConfig;
       templates;
@@ -14984,10 +15175,10 @@ ${injects.join("\n")}<\/script>`;
         this.formConfig = liquidSwell.theme.getFormConfig(this.formType);
         this.arg = tokenizer.readValue();
         this.templates = [];
-        this.hash = new import_liquidjs19.Hash(this.tokenizer.remaining());
+        this.hash = new import_liquidjs25.Hash(this.tokenizer.remaining());
         while (remainTokens.length > 0) {
           const token2 = remainTokens.shift();
-          if (import_liquidjs19.TypeGuards.isTagToken(token2) && token2.name === "endform") {
+          if (import_liquidjs25.TypeGuards.isTagToken(token2) && token2.name === "endform") {
             return;
           }
           this.templates.push(parser.parseToken(token2, remainTokens));
@@ -15005,7 +15196,7 @@ ${injects.join("\n")}<\/script>`;
           return;
         }
         const r = this.liquid.renderer;
-        const arg = yield (0, import_liquidjs19.evalToken)(this.arg, ctx);
+        const arg = yield (0, import_liquidjs25.evalToken)(this.arg, ctx);
         const hash = yield this.hash.render(ctx);
         const scope = ctx.getAll();
         const attrs = " " + Object.entries({ id: `${this.formConfig.id}_form`, ...hash }).reduce((acc, [key, value]) => {
@@ -15066,9 +15257,9 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/tags/if.ts
-  var import_liquidjs20 = __require("liquidjs");
-  function bind6(_liquidSwell) {
-    return class IfTag extends import_liquidjs20.Tag {
+  var import_liquidjs26 = __require("liquidjs");
+  function bind8(_liquidSwell) {
+    return class IfTag extends import_liquidjs26.Tag {
       branches = [];
       elseTemplates;
       constructor(tagToken, remainTokens, liquid, parser) {
@@ -15077,22 +15268,22 @@ ${injects.join("\n")}<\/script>`;
         parser.parseStream(remainTokens).on(
           "start",
           () => this.branches.push({
-            value: new import_liquidjs20.Value(
+            value: new import_liquidjs26.Value(
               tagToken.tokenizer.readFilteredValue(),
               this.liquid
             ),
             templates: p = []
           })
         ).on("tag:elsif", (token) => {
-          (0, import_liquidjs20.assert)(!this.elseTemplates, "unexpected elsif after else");
+          (0, import_liquidjs26.assert)(!this.elseTemplates, "unexpected elsif after else");
           this.branches.push({
-            value: new import_liquidjs20.Value(token.tokenizer.readFilteredValue(), this.liquid),
+            value: new import_liquidjs26.Value(token.tokenizer.readFilteredValue(), this.liquid),
             templates: p = []
           });
         }).on("tag:else", (tag) => {
           if (tag.args.length > 0) {
             this.branches.push({
-              value: new import_liquidjs20.Value(tag.tokenizer.readFilteredValue(), this.liquid),
+              value: new import_liquidjs26.Value(tag.tokenizer.readFilteredValue(), this.liquid),
               templates: p = []
             });
           } else {
@@ -15110,7 +15301,7 @@ ${injects.join("\n")}<\/script>`;
         const r = this.liquid.renderer;
         for (const { value, templates } of this.branches) {
           const v = yield value.value(ctx, ctx.opts.lenientIf);
-          if ((0, import_liquidjs20.isTruthy)(v, ctx)) {
+          if ((0, import_liquidjs26.isTruthy)(v, ctx)) {
             yield r.renderTemplates(templates, ctx, emitter);
             return;
           }
@@ -15131,20 +15322,20 @@ ${injects.join("\n")}<\/script>`;
     };
   }
   function assertEmpty(predicate, message = `unexpected ${JSON.stringify(predicate)}`) {
-    (0, import_liquidjs20.assert)(!predicate, message);
+    (0, import_liquidjs26.assert)(!predicate, message);
   }
 
   // src/liquid/tags/javascript.ts
-  var import_liquidjs21 = __require("liquidjs");
-  function bind7(_liquidSwell) {
-    return class JavascriptTag extends import_liquidjs21.Tag {
+  var import_liquidjs27 = __require("liquidjs");
+  function bind9(_liquidSwell) {
+    return class JavascriptTag extends import_liquidjs27.Tag {
       templates;
       constructor(token, remainTokens, liquid, parser) {
         super(token, remainTokens, liquid);
         this.templates = [];
         while (remainTokens.length > 0) {
           const token2 = remainTokens.shift();
-          if (import_liquidjs21.TypeGuards.isTagToken(token2) && token2.name === "endjavascript") {
+          if (import_liquidjs27.TypeGuards.isTagToken(token2) && token2.name === "endjavascript") {
             return;
           }
           this.templates.push(parser.parseToken(token2, remainTokens));
@@ -15162,9 +15353,9 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/tags/layout.ts
-  var import_liquidjs22 = __require("liquidjs");
-  function bind8(liquidSwell) {
-    return class LayoutTag extends import_liquidjs22.Tag {
+  var import_liquidjs28 = __require("liquidjs");
+  function bind10(liquidSwell) {
+    return class LayoutTag extends import_liquidjs28.Tag {
       fileName;
       constructor(token, remainTokens, liquid, _parser) {
         super(token, remainTokens, liquid);
@@ -15180,9 +15371,9 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/tags/paginate.ts
-  var import_liquidjs23 = __require("liquidjs");
-  function bind9(liquidSwell) {
-    return class PaginateTag extends import_liquidjs23.Tag {
+  var import_liquidjs29 = __require("liquidjs");
+  function bind11(liquidSwell) {
+    return class PaginateTag extends import_liquidjs29.Tag {
       collection;
       pageSize;
       templates;
@@ -15197,7 +15388,7 @@ ${injects.join("\n")}<\/script>`;
         }
         this.templates = [];
         this.collection = collection;
-        this.hash = new import_liquidjs23.Hash(this.tokenizer.remaining());
+        this.hash = new import_liquidjs29.Hash(this.tokenizer.remaining());
         const stream = parser.parseStream(remainTokens).on("tag:endpaginate", () => stream.stop()).on("template", (tpl) => {
           this.templates.push(tpl);
         }).on("end", () => {
@@ -15207,8 +15398,8 @@ ${injects.join("\n")}<\/script>`;
       }
       *render(ctx, emitter) {
         const r = this.liquid.renderer;
-        const collection = yield (0, import_liquidjs23.evalToken)(this.collection, ctx);
-        const pageSize = Number(yield (0, import_liquidjs23.evalToken)(this.pageSize, ctx));
+        const collection = yield (0, import_liquidjs29.evalToken)(this.collection, ctx);
+        const pageSize = Number(yield (0, import_liquidjs29.evalToken)(this.pageSize, ctx));
         const hash = yield this.hash.render(ctx);
         if (!Number.isNaN(pageSize) && collection instanceof SwellStorefrontCollection && collection.limit !== pageSize) {
           yield collection._get({
@@ -15234,10 +15425,10 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/tags/render.ts
-  var import_lodash_es9 = __require("lodash-es");
-  var import_liquidjs24 = __require("liquidjs");
-  function bind10(liquidSwell) {
-    return class RenderTag extends import_liquidjs24.RenderTag {
+  var import_lodash_es11 = __require("lodash-es");
+  var import_liquidjs30 = __require("liquidjs");
+  function bind12(liquidSwell) {
+    return class RenderTag extends import_liquidjs30.RenderTag {
       *render(ctx, emitter) {
         const self = this;
         const { liquid } = this;
@@ -15247,23 +15438,26 @@ ${injects.join("\n")}<\/script>`;
           ctx,
           liquid
         );
-        (0, import_liquidjs24.assert)(filename, () => `illegal file path "${filename}"`);
+        (0, import_liquidjs30.assert)(filename, () => `illegal file path "${filename}"`);
         const configPath = yield liquidSwell.getComponentPath(
           filename
         );
         const childCtx = ctx.spawn();
         const scope = childCtx.bottom();
-        (0, import_lodash_es9.assign)(scope, yield hash.render(ctx));
+        (0, import_lodash_es11.assign)(scope, ctx.bottom());
         const parentSection = yield ctx._get(["section"]);
-        if (parentSection) (0, import_lodash_es9.assign)(scope, { section: parentSection });
+        if (parentSection) (0, import_lodash_es11.assign)(scope, { section: parentSection });
+        const parentBlock = yield ctx._get(["block"]);
+        if (parentBlock) (0, import_lodash_es11.assign)(scope, { block: parentBlock });
+        (0, import_lodash_es11.assign)(scope, yield hash.render(ctx));
         if (self["with"]) {
           const { value, alias } = self["with"];
           const aliasName = alias || filename;
-          scope[aliasName] = yield (0, import_liquidjs24.evalToken)(value, ctx);
+          scope[aliasName] = yield (0, import_liquidjs30.evalToken)(value, ctx);
         }
         if (self["for"]) {
           const { value, alias } = self["for"];
-          let collection = yield (0, import_liquidjs24.evalToken)(value, ctx);
+          let collection = yield (0, import_liquidjs30.evalToken)(value, ctx);
           collection = yield resolveEnumerable(collection);
           scope["forloop"] = new ForloopDrop(
             collection.length,
@@ -15306,13 +15500,13 @@ ${injects.join("\n")}<\/script>`;
       default:
         break;
     }
-    return yield (0, import_liquidjs24.evalToken)(file, ctx);
+    return yield (0, import_liquidjs30.evalToken)(file, ctx);
   }
 
   // src/liquid/tags/section.ts
-  var import_liquidjs25 = __require("liquidjs");
-  function bind11(liquidSwell) {
-    return class SectionTag extends import_liquidjs25.Tag {
+  var import_liquidjs31 = __require("liquidjs");
+  function bind13(liquidSwell) {
+    return class SectionTag extends import_liquidjs31.Tag {
       fileName;
       constructor(token, remainTokens, liquid, _parser) {
         super(token, remainTokens, liquid);
@@ -15363,10 +15557,10 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/tags/sections.ts
-  var import_liquidjs26 = __require("liquidjs");
+  var import_liquidjs32 = __require("liquidjs");
   var import_json54 = __toESM(__require("json5"), 1);
-  function bind12(liquidSwell) {
-    return class SectionsTag extends import_liquidjs26.Tag {
+  function bind14(liquidSwell) {
+    return class SectionsTag extends import_liquidjs32.Tag {
       fileName;
       constructor(token, remainTokens, liquid, _parser) {
         super(token, remainTokens, liquid);
@@ -15406,9 +15600,9 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/tags/style.ts
-  var import_liquidjs27 = __require("liquidjs");
-  function bind13(_liquidSwell) {
-    return class StyleTag extends import_liquidjs27.Tag {
+  var import_liquidjs33 = __require("liquidjs");
+  function bind15(_liquidSwell) {
+    return class StyleTag extends import_liquidjs33.Tag {
       templates;
       hash;
       constructor(token, remainTokens, liquid, parser) {
@@ -15417,7 +15611,7 @@ ${injects.join("\n")}<\/script>`;
         const tagBegin = token.begin;
         while (remainTokens.length > 0) {
           const token2 = remainTokens.shift();
-          if (import_liquidjs27.TypeGuards.isTagToken(token2) && token2.name === "endstyle") {
+          if (import_liquidjs33.TypeGuards.isTagToken(token2) && token2.name === "endstyle") {
             this.hash = md5(token2.input.slice(tagBegin, token2.end));
             return;
           }
@@ -15440,16 +15634,16 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/tags/stylesheet.ts
-  var import_liquidjs28 = __require("liquidjs");
-  function bind14(_liquidSwell) {
-    return class StyleSheetTag extends import_liquidjs28.Tag {
+  var import_liquidjs34 = __require("liquidjs");
+  function bind16(_liquidSwell) {
+    return class StyleSheetTag extends import_liquidjs34.Tag {
       templates;
       constructor(token, remainTokens, liquid, parser) {
         super(token, remainTokens, liquid);
         this.templates = [];
         while (remainTokens.length > 0) {
           const token2 = remainTokens.shift();
-          if (import_liquidjs28.TypeGuards.isTagToken(token2) && token2.name === "endstylesheet") {
+          if (import_liquidjs34.TypeGuards.isTagToken(token2) && token2.name === "endstylesheet") {
             return;
           }
           this.templates.push(parser.parseToken(token2, remainTokens));
@@ -15465,9 +15659,9 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/tags/shopify/include.ts
-  var import_liquidjs29 = __require("liquidjs");
-  function bind15(liquidSwell) {
-    return class IncludeTag extends import_liquidjs29.IncludeTag {
+  var import_liquidjs35 = __require("liquidjs");
+  function bind17(liquidSwell) {
+    return class IncludeTag extends import_liquidjs35.IncludeTag {
       *render(ctx, emitter) {
         const { hash } = this;
         const filepath = yield renderFilePath(
@@ -15475,13 +15669,13 @@ ${injects.join("\n")}<\/script>`;
           ctx,
           this.liquid
         );
-        (0, import_liquidjs29.assert)(filepath, () => `illegal file path "${filepath}"`);
+        (0, import_liquidjs35.assert)(filepath, () => `illegal file path "${filepath}"`);
         const saved = ctx.saveRegister("blocks", "blockMode");
         ctx.setRegister("blocks", {});
         ctx.setRegister("blockMode", 0);
         const scope = yield hash.render(ctx);
         if (this.withVar) {
-          scope[filepath] = yield (0, import_liquidjs29.evalToken)(this.withVar, ctx);
+          scope[filepath] = yield (0, import_liquidjs35.evalToken)(this.withVar, ctx);
         }
         ctx.push(ctx.opts.jekyllInclude ? { include: scope } : scope);
         const output = yield liquidSwell.getComponentPath(filepath).then((path) => liquidSwell.getThemeConfig(path)).then((themeConfig) => liquidSwell.renderTemplate(themeConfig, ctx));
@@ -15493,10 +15687,10 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/tags/shopify/schema.ts
-  var import_liquidjs30 = __require("liquidjs");
+  var import_liquidjs36 = __require("liquidjs");
   var import_json55 = __toESM(__require("json5"), 1);
-  function bind16(liquidSwell) {
-    return class SchemaTag extends import_liquidjs30.Tag {
+  function bind18(liquidSwell) {
+    return class SchemaTag extends import_liquidjs36.Tag {
       templates;
       constructor(token, remainTokens, liquid, parser) {
         super(token, remainTokens, liquid);
@@ -15518,6 +15712,7 @@ ${injects.join("\n")}<\/script>`;
           liquidSwell.lastSchema = void 0;
           if (typeof jsonOutput === "string") {
             liquidSwell.lastSchema = import_json55.default.parse(jsonOutput);
+            expandThemeBlocks(liquidSwell);
           }
         } catch (err) {
           console.warn(err);
@@ -15527,11 +15722,22 @@ ${injects.join("\n")}<\/script>`;
       }
     };
   }
+  function expandThemeBlocks(liquidSwell) {
+    const blocks = liquidSwell.lastSchema?.blocks;
+    if (!Array.isArray(blocks)) {
+      return;
+    }
+    for (let i = 0; i < blocks.length; i++) {
+      if (blocks[i].type === "@theme") {
+        blocks.splice(i, 1, ...liquidSwell.theme.getAllThemeBlockSchemas());
+      }
+    }
+  }
 
   // src/liquid/tags/inline_editable.ts
-  var import_liquidjs31 = __require("liquidjs");
-  function bind17(_liquidSwell) {
-    return class InlineEditableTag extends import_liquidjs31.Tag {
+  var import_liquidjs37 = __require("liquidjs");
+  function bind19(_liquidSwell) {
+    return class InlineEditableTag extends import_liquidjs37.Tag {
       key;
       value;
       constructor(token, remainTokens, liquid, _parser) {
@@ -15559,129 +15765,131 @@ ${injects.join("\n")}<\/script>`;
     assign: bind,
     case: bind2,
     comment: bind3,
-    for: bind4,
-    form: bind5,
-    if: bind6,
-    javascript: bind7,
-    layout: bind8,
-    paginate: bind9,
-    render: bind10,
-    section: bind11,
-    sections: bind12,
-    style: bind13,
+    content_for: bind4,
+    doc: bind5,
+    for: bind6,
+    form: bind7,
+    if: bind8,
+    javascript: bind9,
+    layout: bind10,
+    paginate: bind11,
+    render: bind12,
+    section: bind13,
+    sections: bind14,
+    style: bind15,
     // Shopify compatibility only
-    include: bind15,
-    schema: bind16,
-    stylesheet: bind14,
+    include: bind17,
+    schema: bind18,
+    stylesheet: bind16,
     // Swell only
-    inline_editable: bind17
+    inline_editable: bind19
   };
   function bindTags(liquidSwell) {
     Object.entries(tags).forEach(
-      ([tag, bind67]) => liquidSwell.registerTag(tag, bind67(liquidSwell))
+      ([tag, bind70]) => liquidSwell.registerTag(tag, bind70(liquidSwell))
     );
   }
 
   // src/liquid/filters/asset_url.ts
-  function bind18(liquidSwell) {
+  function bind20(liquidSwell) {
     return function filterAssetUrl(assetPath) {
       return liquidSwell.getAssetUrl(assetPath).then((url) => url || "");
     };
   }
 
   // src/liquid/filters/brightness_difference.ts
-  function bind19(_liquidSwell) {
+  function bind21(_liquidSwell) {
     return (color1, color2) => {
       return ThemeColor.get(color1).brightnessDifference(ThemeColor.get(color2));
     };
   }
 
   // src/liquid/filters/color_brightness.ts
-  function bind20(_liquidSwell) {
+  function bind22(_liquidSwell) {
     return (color) => {
       return ThemeColor.get(color).brightness();
     };
   }
 
   // src/liquid/filters/color_contrast.ts
-  function bind21(_liquidSwell) {
+  function bind23(_liquidSwell) {
     return (color1, color2) => {
       return ThemeColor.get(color1).contrast(ThemeColor.get(color2));
     };
   }
 
   // src/liquid/filters/color_darken.ts
-  function bind22(_liquidSwell) {
+  function bind24(_liquidSwell) {
     return (color, percent) => {
       return ThemeColor.get(color).darken(percent);
     };
   }
 
   // src/liquid/filters/color_desaturate.ts
-  function bind23(_liquidSwell) {
+  function bind25(_liquidSwell) {
     return (color, value) => {
       return ThemeColor.get(color).desaturate(value);
     };
   }
 
   // src/liquid/filters/color_difference.ts
-  function bind24(_liquidSwell) {
+  function bind26(_liquidSwell) {
     return (color1, color2) => {
       return ThemeColor.get(color1).difference(ThemeColor.get(color2));
     };
   }
 
   // src/liquid/filters/color_extract.ts
-  function bind25(_liquidSwell) {
+  function bind27(_liquidSwell) {
     return (color, field) => {
       return ThemeColor.get(color).extract(field);
     };
   }
 
   // src/liquid/filters/color_lighten.ts
-  function bind26(_liquidSwell) {
+  function bind28(_liquidSwell) {
     return (color, percent) => {
       return ThemeColor.get(color).lighten(percent);
     };
   }
 
   // src/liquid/filters/color_mix.ts
-  function bind27(_liquidSwell) {
+  function bind29(_liquidSwell) {
     return (color1, color2, ratio) => {
       return ThemeColor.get(color1).mix(ThemeColor.get(color2), ratio);
     };
   }
 
   // src/liquid/filters/color_modify.ts
-  function bind28(_liquidSwell) {
+  function bind30(_liquidSwell) {
     return function filterColorModify(color, field, value) {
       return ThemeColor.get(color).modify(field, Number(value) || 0);
     };
   }
 
   // src/liquid/filters/color_saturate.ts
-  function bind29(_liquidSwell) {
+  function bind31(_liquidSwell) {
     return (color, value) => {
       return ThemeColor.get(color).saturate(value);
     };
   }
 
   // src/liquid/filters/color_to_hex.ts
-  function bind30(_liquidSwell) {
+  function bind32(_liquidSwell) {
     return (color) => {
       return ThemeColor.get(color).hex();
     };
   }
 
   // src/liquid/filters/color_to_hsl.ts
-  function bind31(_liquidSwell) {
+  function bind33(_liquidSwell) {
     return (color) => {
       return ThemeColor.get(color).hsl();
     };
   }
 
   // src/liquid/filters/color_to_rgb.ts
-  function bind32(_liquidSwell) {
+  function bind34(_liquidSwell) {
     return (color, alpha) => {
       return alpha !== void 0 ? ThemeColor.get(color).rgba(alpha) : ThemeColor.get(color).rgb();
     };
@@ -15689,7 +15897,7 @@ ${injects.join("\n")}<\/script>`;
 
   // src/liquid/filters/date.ts
   var import_strftime = __toESM(__require("strftime"), 1);
-  function bind33(_liquidSwell) {
+  function bind35(_liquidSwell) {
     return (dateValue, ...params) => {
       const date = ensureDate(dateValue);
       const { format } = getDateFilterParams(params);
@@ -15747,7 +15955,7 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/filters/date_next_interval.ts
-  function bind34(_liquidSwell) {
+  function bind36(_liquidSwell) {
     return (dateValue, interval, intervalCount) => {
       const date = ensureDate(dateValue);
       const result = getNextIntervalDate(date, interval, Number(intervalCount));
@@ -15799,7 +16007,7 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/filters/default_errors.ts
-  function bind35(_liquidSwell) {
+  function bind37(_liquidSwell) {
     return async function filterDefaultError(errors) {
       if (!errors) {
         return "";
@@ -15825,7 +16033,7 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/filters/divided_by.ts
-  function bind36(_liquidSwell) {
+  function bind38(_liquidSwell) {
     return (dividend, divisor, integerArithmetic) => {
       if (!isNumber(dividend) || !isNumber(divisor)) {
         return dividend;
@@ -15835,20 +16043,20 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/filters/embedded_content.ts
-  var import_lodash_es10 = __require("lodash-es");
-  function bind37(_liquidSwell) {
+  var import_lodash_es12 = __require("lodash-es");
+  function bind39(_liquidSwell) {
     return (value, tag = "iframe") => {
       const escapeIframes = value.replaceAll(`<${tag}`, `&lt;${tag}`).replaceAll(`</${tag}`, `&lt;/${tag}`);
       const removeTags = escapeIframes.replaceAll(/<(.*?)>/gi, "");
-      const unescaped = (0, import_lodash_es10.unescape)(removeTags);
+      const unescaped = (0, import_lodash_es12.unescape)(removeTags);
       const replaceSpaces = unescaped.replaceAll("&nbsp;", " ");
       return replaceSpaces;
     };
   }
 
   // src/liquid/filters/escape.ts
-  var import_lodash_es11 = __require("lodash-es");
-  function bind38(_liquidSwell) {
+  var import_lodash_es13 = __require("lodash-es");
+  function bind40(_liquidSwell) {
     return function escapeTag(input) {
       if (!input?.startsWith) {
         return input;
@@ -15856,12 +16064,12 @@ ${injects.join("\n")}<\/script>`;
       if (input.startsWith("<img") || input.startsWith("<video")) {
         return input;
       }
-      return (0, import_lodash_es11.escape)(input);
+      return (0, import_lodash_es13.escape)(input);
     };
   }
 
   // src/liquid/filters/font_face.ts
-  function bind39(_liquidSwell) {
+  function bind41(_liquidSwell) {
     return (fontSetting, ...params) => {
       if (!fontSetting) {
         return null;
@@ -15873,14 +16081,14 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/filters/font_modify.ts
-  function bind40(_liquidSwell) {
+  function bind42(_liquidSwell) {
     return (fontSetting, prop, value) => {
       return ThemeFont.clone(fontSetting).modify(prop, value);
     };
   }
 
   // src/liquid/filters/font_url.ts
-  function bind41(_liquidSwell) {
+  function bind43(_liquidSwell) {
     return (fontSetting) => {
       return ThemeFont.get(fontSetting).url();
     };
@@ -15929,15 +16137,15 @@ ${injects.join("\n")}<\/script>`;
   };
 
   // src/liquid/filters/handleize.ts
-  var import_lodash_es12 = __require("lodash-es");
-  function bind42(_liquidSwell) {
+  var import_lodash_es14 = __require("lodash-es");
+  function bind44(_liquidSwell) {
     return function filterHandleize(handle) {
-      return (0, import_lodash_es12.kebabCase)(handle);
+      return (0, import_lodash_es14.kebabCase)(handle);
     };
   }
 
   // src/liquid/filters/image_tag.ts
-  function bind43(_liquidSwell) {
+  function bind45(_liquidSwell) {
     return function filterImageTag(imageUrl, ...params) {
       imageUrl = String(imageUrl || "");
       let {
@@ -16101,7 +16309,7 @@ ${injects.join("\n")}<\/script>`;
   var image_url_default = filterDefinition;
 
   // src/liquid/filters/inline_asset_content.ts
-  function bind44(liquidSwell) {
+  function bind46(liquidSwell) {
     return async (assetPath) => {
       const config = await liquidSwell.theme.getThemeConfig(
         `theme/assets/${assetPath}`
@@ -16111,14 +16319,14 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/filters/json.ts
-  function bind45(_liquidSwell) {
+  function bind47(_liquidSwell) {
     return async function filterJson(input, space = 0) {
       return jsonStringifyAsync(input, space);
     };
   }
 
   // src/liquid/filters/json_pretty.ts
-  function bind46(_liquidSwell) {
+  function bind48(_liquidSwell) {
     return async function filterJsonPretty(input, space = 2) {
       const output = await jsonStringifyAsync(input, space);
       return `<pre>${output}</pre>`;
@@ -16128,7 +16336,7 @@ ${injects.join("\n")}<\/script>`;
   // src/liquid/filters/locale_flag.ts
   var import_country_flag_icons = __require("country-flag-icons");
   var flags = __toESM(__require("country-flag-icons/string/1x1"), 1);
-  function bind47(_liquidSwell) {
+  function bind49(_liquidSwell) {
     return (localeCode) => {
       if (typeof localeCode !== "string") {
         return flags.US;
@@ -16139,7 +16347,7 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/filters/minus.ts
-  function bind48(_liquidSwell) {
+  function bind50(_liquidSwell) {
     return (first, second) => {
       const firstValue = isNumber(first) ? first : 0;
       const secondValue = isNumber(second) ? second : 0;
@@ -16148,7 +16356,7 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/filters/money.ts
-  function bind49(liquidSwell) {
+  function bind51(liquidSwell) {
     return function filterMoney(value) {
       const amount = getMoneyAmount(liquidSwell, value);
       return liquidSwell.renderCurrency(amount);
@@ -16165,7 +16373,7 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/filters/money_with_currency.ts
-  function bind50(liquidSwell) {
+  function bind52(liquidSwell) {
     return function filterMoneyWithCurrency(value) {
       const { currency } = liquidSwell.theme.swell.getStorefrontLocalization();
       const amount = getMoneyAmount(liquidSwell, value);
@@ -16174,7 +16382,7 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/filters/money_without_currency.ts
-  function bind51(liquidSwell) {
+  function bind53(liquidSwell) {
     return function filterMoneyWithoutCurrency(value) {
       const amount = getMoneyAmount(liquidSwell, value);
       return liquidSwell.renderCurrency(amount).replace(/[^0-9.,]/g, "");
@@ -16182,30 +16390,45 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/filters/money_without_trailing_zeros.ts
-  function bind52(liquidSwell) {
+  function bind54(liquidSwell) {
     return function filterMoneyWithoutTrailingZeros(value) {
       const amount = getMoneyAmount(liquidSwell, value);
       return liquidSwell.renderCurrency(amount).split(".")[0].split(",")[0];
     };
   }
 
+  // src/liquid/filters/preload_tag.ts
+  function bind55(_liquidSwell) {
+    return function filterPreloadTag(assetUrl, ...params) {
+      if (!assetUrl) {
+        return "";
+      }
+      const { as } = paramsToProps(params);
+      let attributes = "";
+      if (typeof as === "string" && as) {
+        attributes += `as="${as}"`;
+      }
+      return `<link href="${assetUrl}" rel="preload" ${attributes} />`;
+    };
+  }
+
   // src/liquid/filters/script_tag.ts
-  function bind53(_liquidSwell) {
+  function bind56(_liquidSwell) {
     return function filterScriptTag(assetUrl) {
       return `<script src="${assetUrl}" type="text/javascript"><\/script>`;
     };
   }
 
   // src/liquid/filters/stylesheet_tag.ts
-  function bind54(_liquidSwell) {
+  function bind57(_liquidSwell) {
     return function filterStyleSheetTag(assetUrl) {
       return `<link href="${assetUrl}" rel="stylesheet" type="text/css" media="all" />`;
     };
   }
 
   // src/liquid/filters/time_tag.ts
-  function bind55(_liquidSwell) {
-    const dateFilter = bind33(_liquidSwell);
+  function bind58(_liquidSwell) {
+    const dateFilter = bind35(_liquidSwell);
     return (dateValue, ...params) => {
       const date = ensureDate(dateValue);
       const formattedDate = dateFilter(dateValue, ...params);
@@ -16215,7 +16438,7 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/filters/translate.ts
-  function bind56(liquidSwell) {
+  function bind59(liquidSwell) {
     return async function filterTranslate(key, params) {
       const props = params && paramsToProps(params);
       const str = await liquidSwell.renderTranslation(key, props);
@@ -16224,7 +16447,7 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/filters/where.ts
-  function bind57(_liquidSwell) {
+  function bind60(_liquidSwell) {
     return function* filterWhere(arr, property, expected) {
       const results = [];
       const list = yield resolveEnumerable(arr);
@@ -16278,7 +16501,7 @@ ${injects.join("\n")}<\/script>`;
       height: height ? Number(height) : void 0
     };
   }
-  function bind58(liquidSwell) {
+  function bind61(liquidSwell) {
     return async function filterAssetImgUrl(assetPath, size = "small") {
       const imageUrl = await liquidSwell.getAssetUrl(assetPath).then((url) => url || "");
       const sizes = getSizesFromParam(size);
@@ -16294,14 +16517,14 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/filters/shopify/hex_to_rgba.ts
-  function bind59(_liquidSwell) {
+  function bind62(_liquidSwell) {
     return (color, alpha) => {
       return ThemeColor.get(color).rgba(alpha || 1);
     };
   }
 
   // src/liquid/filters/shopify/img_url.ts
-  function bind60(liquidSwell) {
+  function bind63(liquidSwell) {
     return async function filterImgUrl(input, ...params) {
       const url = await getImageUrlFromInput(input, liquidSwell);
       if (typeof url !== "string" || url === "") {
@@ -16339,14 +16562,14 @@ ${injects.join("\n")}<\/script>`;
   };
 
   // src/liquid/filters/shopify/payment_button.ts
-  function bind61(_liquidSwell) {
+  function bind64(_liquidSwell) {
     return (form) => {
       return `<button style="display: block; visibility: hidden;"></button>`;
     };
   }
 
   // src/liquid/filters/shopify/payment_terms.ts
-  function bind62(_liquidSwell) {
+  function bind65(_liquidSwell) {
     return (form) => {
       return null;
     };
@@ -16448,7 +16671,7 @@ ${injects.join("\n")}<\/script>`;
   var placeholder_svgs_default = svgs;
 
   // src/liquid/filters/shopify/placeholder_svg_tag.ts
-  function bind63(_liquidSwell) {
+  function bind66(_liquidSwell) {
     return function filterPlaceholderSvgTag(name, className) {
       const svg = placeholder_svgs_default[name];
       if (typeof svg === "object" && svg !== null) {
@@ -16459,7 +16682,7 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/filters/shopify/shopify_asset_url.ts
-  function bind64(_liquidSwell) {
+  function bind67(_liquidSwell) {
     return function filterShopifyAssetUrl(input) {
       if (typeof input === "string") {
         switch (input) {
@@ -16484,7 +16707,7 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/filters/shopify/structured_data.ts
-  function bind65(_liquidSwell) {
+  function bind68(_liquidSwell) {
     return async function filterStructuredData(input) {
       let value = input;
       if (value instanceof StorefrontResource) {
@@ -16562,7 +16785,7 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/filters/inline_editable.ts
-  function bind66(_liquidSwell) {
+  function bind69(_liquidSwell) {
     return (value, key) => {
       if (typeof value === "object" && "value" in value) {
         value = value.value;
@@ -16573,64 +16796,65 @@ ${injects.join("\n")}<\/script>`;
 
   // src/liquid/filters/index.ts
   var filters = {
-    asset_url: bind18,
-    brightness_difference: bind19,
-    color_brightness: bind20,
-    color_contrast: bind21,
-    color_darken: bind22,
-    color_desaturate: bind23,
-    color_difference: bind24,
-    color_extract: bind25,
-    color_lighten: bind26,
-    color_mix: bind27,
-    color_modify: bind28,
-    color_saturate: bind29,
-    color_to_hex: bind30,
-    color_to_hsl: bind31,
-    color_to_rgb: bind32,
-    date_next_interval: bind34,
-    date: bind33,
-    default_errors: bind35,
-    divided_by: bind36,
-    embedded_content: bind37,
-    escape: bind38,
-    font_face: bind39,
-    font_modify: bind40,
-    font_url: bind41,
+    asset_url: bind20,
+    brightness_difference: bind21,
+    color_brightness: bind22,
+    color_contrast: bind23,
+    color_darken: bind24,
+    color_desaturate: bind25,
+    color_difference: bind26,
+    color_extract: bind27,
+    color_lighten: bind28,
+    color_mix: bind29,
+    color_modify: bind30,
+    color_saturate: bind31,
+    color_to_hex: bind32,
+    color_to_hsl: bind33,
+    color_to_rgb: bind34,
+    date_next_interval: bind36,
+    date: bind35,
+    default_errors: bind37,
+    divided_by: bind38,
+    embedded_content: bind39,
+    escape: bind40,
+    font_face: bind41,
+    font_modify: bind42,
+    font_url: bind43,
     format_address: format_address_default,
-    handle: bind42,
+    handle: bind44,
     // alias
-    handleize: bind42,
-    image_tag: bind43,
+    handleize: bind44,
+    image_tag: bind45,
     image_url: image_url_default,
-    inline_asset_content: bind44,
-    json: bind45,
-    json_pretty: bind46,
-    locale_flag: bind47,
-    minus: bind48,
-    money: bind49,
-    money_with_currency: bind50,
-    money_without_currency: bind51,
-    money_without_trailing_zeros: bind52,
-    script_tag: bind53,
-    stylesheet_tag: bind54,
-    time_tag: bind55,
-    translate: bind56,
-    t: bind56,
+    inline_asset_content: bind46,
+    json: bind47,
+    json_pretty: bind48,
+    locale_flag: bind49,
+    minus: bind50,
+    money: bind51,
+    money_with_currency: bind52,
+    money_without_currency: bind53,
+    money_without_trailing_zeros: bind54,
+    preload_tag: bind55,
+    script_tag: bind56,
+    stylesheet_tag: bind57,
+    time_tag: bind58,
+    translate: bind59,
+    t: bind59,
     // alias
-    where: bind57,
+    where: bind60,
     // Shopify compatibility only
-    asset_img_url: bind58,
-    hex_to_rgba: bind59,
-    img_url: bind60,
+    asset_img_url: bind61,
+    hex_to_rgba: bind62,
+    img_url: bind63,
     item_count_for_variant: item_count_for_variant_default,
-    payment_button: bind61,
-    payment_terms: bind62,
-    placeholder_svg_tag: bind63,
-    shopify_asset_url: bind64,
-    structured_data: bind65,
+    payment_button: bind64,
+    payment_terms: bind65,
+    placeholder_svg_tag: bind66,
+    shopify_asset_url: bind67,
+    structured_data: bind68,
     // Swell only
-    inline_editable: bind66
+    inline_editable: bind69
   };
   function bindFilters(liquidSwell) {
     for (const [tag, handler] of Object.entries(filters)) {
@@ -16644,8 +16868,8 @@ ${injects.join("\n")}<\/script>`;
       }
     }
   }
-  function bindWithResolvedProps(liquidSwell, bind67, resolve = []) {
-    const handler = bind67(liquidSwell);
+  function bindWithResolvedProps(liquidSwell, bind70, resolve = []) {
+    const handler = bind70(liquidSwell);
     if (!Array.isArray(resolve)) {
       return handler;
     }
@@ -16697,9 +16921,9 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/operators.ts
-  var import_liquidjs32 = __require("liquidjs");
+  var import_liquidjs38 = __require("liquidjs");
   var swellOperators = {
-    ...import_liquidjs32.defaultOperators,
+    ...import_liquidjs38.defaultOperators,
     "==": equal,
     "!=": (l, r) => !equal(l, r),
     contains: (l, r) => {
@@ -16727,8 +16951,8 @@ ${injects.join("\n")}<\/script>`;
 
   // src/liquid/color.ts
   var import_color = __toESM(__require("color"), 1);
-  var import_liquidjs33 = __require("liquidjs");
-  var ThemeColor = class _ThemeColor extends import_liquidjs33.Drop {
+  var import_liquidjs39 = __require("liquidjs");
+  var ThemeColor = class _ThemeColor extends import_liquidjs39.Drop {
     color;
     colorValues;
     red;
@@ -16772,10 +16996,16 @@ ${injects.join("\n")}<\/script>`;
       return this.color.darken(percent / 100).hex().toLowerCase();
     }
     rgb() {
-      return this.color.rgb().toString();
+      return `${this.red} ${this.green} ${this.blue}`;
     }
     rgba(alpha) {
-      return this.color.alpha(alpha).rgb().toString();
+      const colorValues = this.color.object();
+      const alphaValue = alpha || colorValues.alpha;
+      const rgb = this.rgb();
+      if (alphaValue === void 0) {
+        return rgb;
+      }
+      return `${rgb} / ${Number(alphaValue).toFixed(2)}`;
     }
     hsl() {
       return this.color.hsl().round().toString();
@@ -16863,7 +17093,7 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/index.ts
-  var LiquidSwell31 = class extends import_liquidjs34.Liquid {
+  var LiquidSwell31 = class extends import_liquidjs40.Liquid {
     theme;
     getThemeConfig;
     getThemeTemplateConfigByType;
@@ -16880,6 +17110,7 @@ ${injects.join("\n")}<\/script>`;
     extName;
     componentsDir;
     sectionsDir;
+    blocksDir;
     lastSchema;
     constructor({
       theme,
@@ -16897,7 +17128,8 @@ ${injects.join("\n")}<\/script>`;
       layoutName,
       extName,
       componentsDir,
-      sectionsDir
+      sectionsDir,
+      blocksDir
     }) {
       getThemeConfig = getThemeConfig || theme.getThemeConfig.bind(theme);
       extName = extName || "liquid";
@@ -16926,6 +17158,7 @@ ${injects.join("\n")}<\/script>`;
       this.extName = extName;
       this.componentsDir = componentsDir || "components";
       this.sectionsDir = sectionsDir || "sections";
+      this.blocksDir = blocksDir || "blocks";
       this.lastSchema = void 0;
       bindTags(this);
       bindFilters(this);
@@ -16948,6 +17181,9 @@ ${injects.join("\n")}<\/script>`;
     async getSectionGroupPath(sectionName) {
       return await this.resolveFilePathByType("sections", `${sectionName}.json`) || resolveFilePath(`${this.sectionsDir}/${sectionName}`, "json");
     }
+    async getThemeBlockPath(blockName) {
+      return await this.resolveFilePathByType("blocks", blockName) || resolveFilePath(`${this.blocksDir}/${blockName}`, this.extName);
+    }
   };
   function resolveFilePath(fileName, extName) {
     return `theme/${fileName}.${extName}`;
@@ -17347,11 +17583,11 @@ ${injects.join("\n")}<\/script>`;
   };
 
   // src/globals.ts
-  var import_lodash_es13 = __require("lodash-es");
+  var import_lodash_es15 = __require("lodash-es");
 
   // src/compatibility/drops/robots-rule.ts
-  var import_liquidjs35 = __require("liquidjs");
-  var RobotsRule = class _RobotsRule extends import_liquidjs35.Drop {
+  var import_liquidjs41 = __require("liquidjs");
+  var RobotsRule = class _RobotsRule extends import_liquidjs41.Drop {
     constructor(directive, value) {
       super();
       this.directive = directive;
@@ -17447,7 +17683,7 @@ ${injects.join("\n")}<\/script>`;
     }).filter(Boolean).join("\n");
   }
   function getRobotsGlobals(canonicalUrl) {
-    const sitemapUrl = `${(0, import_lodash_es13.trimEnd)(canonicalUrl, "/")}/sitemap.xml`;
+    const sitemapUrl = `${(0, import_lodash_es15.trimEnd)(canonicalUrl, "/")}/sitemap.xml`;
     const defaultRules = [
       { directive: "Disallow", value: "/admin" },
       { directive: "Disallow", value: "/cart" },
@@ -17942,7 +18178,7 @@ ${injects.join("\n")}<\/script>`;
         return languageConfig;
       }
       const localeShortCode = locale.split("-")[0];
-      return (0, import_lodash_es14.reduce)(
+      return (0, import_lodash_es16.reduce)(
         languageConfig,
         (acc, value, key) => {
           if (isObject2(value)) {
@@ -17966,15 +18202,15 @@ ${injects.join("\n")}<\/script>`;
               const translationEnd = translationParts.pop();
               const translationPath = translationParts.join(".");
               const translationConfigGlobal = this.globals.language;
-              acc[key] = (0, import_lodash_es14.get)(
+              acc[key] = (0, import_lodash_es16.get)(
                 translationConfigGlobal,
                 `${translationPath}.$locale.${locale}.${translationEnd}`
-              ) || (0, import_lodash_es14.get)(
+              ) || (0, import_lodash_es16.get)(
                 translationConfigGlobal,
                 `${translationPath}.$locale.${localeShortCode}.${translationEnd}`
-              ) || (0, import_lodash_es14.get)(translationConfigGlobal, translationKey) || value;
+              ) || (0, import_lodash_es16.get)(translationConfigGlobal, translationKey) || value;
             } else {
-              acc[key] = (0, import_lodash_es14.get)(languageConfig, `$locale.${locale}.${key}`) || (0, import_lodash_es14.get)(languageConfig, `$locale.${localeShortCode}.${key}`) || value;
+              acc[key] = (0, import_lodash_es16.get)(languageConfig, `$locale.${locale}.${key}`) || (0, import_lodash_es16.get)(languageConfig, `$locale.${localeShortCode}.${key}`) || value;
             }
           }
           return acc;
@@ -18659,6 +18895,30 @@ ${this.shopifyCompatibility.getContentForHeader()}`;
       const configs = this.getThemeConfigsByPath("theme/sections/");
       return getAllSections(configs, this.getTemplateSchema.bind(this));
     }
+    /**
+     * Returns all theme block schemas from /blocks folder.
+     */
+    getAllThemeBlockSchemas() {
+      const schemas = [];
+      const configs = this.getThemeConfigsByPath("theme/blocks/");
+      for (const config of configs.values()) {
+        const { name, file_path: filePath, file_data: fileData } = config;
+        const rawSchema = extractSchemaTag(fileData, true);
+        if (!rawSchema) {
+          continue;
+        }
+        try {
+          const schema = import_json56.default.parse(rawSchema);
+          if (!schema.type) {
+            schema.type = name;
+          }
+          schemas.push(schema);
+        } catch (error) {
+          console.warn(`Invalid schema in block: ${filePath}`, error);
+        }
+      }
+      return schemas;
+    }
     async getPageSections(sectionGroup, resolveSettings = true) {
       const sectionConfigs = await getPageSections(
         sectionGroup,
@@ -18810,8 +19070,8 @@ ${this.shopifyCompatibility.getContentForHeader()}`;
       const keyParts = key?.split(".") || [];
       const keyName = keyParts.pop() || "";
       const keyPath = keyParts.join(".");
-      const langObject = (0, import_lodash_es14.get)(langConfig, keyPath);
-      let localeValue = (0, import_lodash_es14.get)(langObject?.[localeCode], keyName) || (0, import_lodash_es14.get)(langObject?.[localeCode.split("-")[0]], keyName) || langObject?.[keyName];
+      const langObject = (0, import_lodash_es16.get)(langConfig, keyPath);
+      let localeValue = (0, import_lodash_es16.get)(langObject?.[localeCode], keyName) || (0, import_lodash_es16.get)(langObject?.[localeCode.split("-")[0]], keyName) || langObject?.[keyName];
       if (data?.count !== void 0 && localeValue?.one) {
         localeValue = data.count === 1 ? localeValue.one : localeValue.other;
       }
@@ -18891,7 +19151,7 @@ ${this.shopifyCompatibility.getContentForHeader()}`;
     }
   }
   function resolveThemeSettings(theme, themeSettings, editorSchemaSettings) {
-    const settings = (0, import_lodash_es14.cloneDeep)(themeSettings);
+    const settings = (0, import_lodash_es16.cloneDeep)(themeSettings);
     if (settings.$locale) {
       const { locale } = theme.swell.getStorefrontLocalization();
       const localeConfig = settings.$locale[locale] || {};
@@ -18901,16 +19161,16 @@ ${this.shopifyCompatibility.getContentForHeader()}`;
         }
       }
     }
-    (0, import_lodash_es14.each)(settings, (value, key) => {
+    (0, import_lodash_es16.each)(settings, (value, key) => {
       const setting = (editorSchemaSettings && findEditorSetting(editorSchemaSettings, key)) ?? null;
       if (isObject2(value) && !(value instanceof StorefrontResource)) {
         switch (setting?.type) {
           case "color_scheme_group": {
-            (0, import_lodash_es14.each)(value, (scheme, schemeId) => {
+            (0, import_lodash_es16.each)(value, (scheme, schemeId) => {
               if (isObject2(scheme) && typeof scheme.settings === "object" && scheme.settings) {
                 const settings2 = scheme.settings;
-                (0, import_lodash_es14.each)(settings2, (colorValue, colorId) => {
-                  const fieldDef = (0, import_lodash_es14.find)(setting.fields, { id: colorId });
+                (0, import_lodash_es16.each)(settings2, (colorValue, colorId) => {
+                  const fieldDef = (0, import_lodash_es16.find)(setting.fields, { id: colorId });
                   if (fieldDef?.type === "color" && colorValue) {
                     scheme.id = schemeId;
                     settings2[colorId] = new ThemeColor(colorValue);
@@ -18961,7 +19221,7 @@ ${this.shopifyCompatibility.getContentForHeader()}`;
   }
   function findThemeSettingsByType(type, themeSettings, editorSchemaSettings) {
     const foundSettings = [];
-    (0, import_lodash_es14.each)(themeSettings, (value, key) => {
+    (0, import_lodash_es16.each)(themeSettings, (value, key) => {
       if (isObject2(value) && !(value instanceof ThemeFont) && !(value instanceof StorefrontResource)) {
         foundSettings.push(
           ...findThemeSettingsByType(type, value, editorSchemaSettings)
@@ -19019,14 +19279,14 @@ ${this.shopifyCompatibility.getContentForHeader()}`;
       return {};
     }
   }
-  function extractSchemaTag(template) {
+  function extractSchemaTag(template, inner = false) {
     const list = template.match(
       /\{%-?\s*schema\s*-?%\}(.*)\{%-?\s*endschema\s*-?%\}/s
     );
     if (list === null) {
       return template;
     }
-    return list[0];
+    return inner ? list[1] : list[0];
   }
   function withSuffix(path, suffix) {
     return suffix ? `${path}.${suffix}` : path;
@@ -19135,7 +19395,7 @@ ${this.shopifyCompatibility.getContentForHeader()}`;
   }
   function getMenuItemValueId(value) {
     const fallback = typeof value === "string" ? value : "";
-    const slug = (0, import_lodash_es15.get)(value, "id", (0, import_lodash_es15.get)(value, "slug", fallback)) || "";
+    const slug = (0, import_lodash_es17.get)(value, "id", (0, import_lodash_es17.get)(value, "slug", fallback)) || "";
     return slug;
   }
   async function getMenuItemUrlAndResource(theme, menuItem) {