marko 5.37.7 → 5.37.8

package/dist/runtime/helpers/tags-compat/runtime-dom.js

@@ -160,27 +160,29 @@ exports.p = function (domCompat) {
     const componentsContext = T_(out);
     const globalComponentsContext = componentsContext.q_;
     let customEvents;
+    let normalizedInput;
     globalComponentsContext.aA_ = existingComponent;
     out.sync();
     if (renderer) {
       const [rawInput] = input;
-      const normalizedInput = {};
+      normalizedInput = {};
 
       for (const key in rawInput) {
-        let value = rawInput[key];
-        if (key.startsWith("on")) {
-          const c = key[2];
-          customEvents = customEvents || {};
-          customEvents[(c === "-" ? "" : c.toLowerCase()) + key.slice(3)] = [
-          value];
-
+        const value = rawInput[key];
+        if (/^on[-A-Z]/.test(key)) {
+          if (typeof value === "function") {
+            (customEvents || (customEvents = {}))[
+            key[2] === "-" ? key.slice(3) : key.slice(2).toLowerCase()] =
+            [value];
+          }
         } else {
-          normalizedInput[key] = rawInput[key];
+          normalizedInput[key === "content" ? "renderBody" : key] = value;
         }
       }
 
       renderer(normalizedInput, out);
     } else {
+      normalizedInput = input[0];
       RenderBodyComponent({ renderBody, args: input }, out);
     }
 
@@ -192,7 +194,7 @@ exports.p = function (domCompat) {
       );
       const component = componentDefs[0].t_;
       component._F_ = rootNode;
-      component.P_ = input[0];
+      component.P_ = normalizedInput;
       component.X_ = customEvents;
       scope.bq_ = component;
     });

package/dist/runtime/helpers/tags-compat/runtime-html.js

@@ -83,17 +83,17 @@ exports.p = function (htmlCompat) {
           const normalizedInput = {};
 
           for (const key in input) {
-            let value = input[key];
-            if (key.startsWith("on") && typeof value === "function") {
-              const c = key[2];
-              customEvents = customEvents || [];
-              customEvents.push([
-              (c === "-" ? "" : c.toLowerCase()) + key.slice(3),
-              value]
-              );
-              value.toJSON = htmlCompat.toJSON;
+            const value = input[key];
+            if (/^on[-A-Z]/.test(key)) {
+              if (typeof value === "function") {
+                (customEvents || (customEvents = [])).push([
+                key[2] === "-" ? key.slice(3) : key.slice(2).toLowerCase(),
+                value]
+                );
+                value.toJSON = htmlCompat.toJSON;
+              }
             } else {
-              normalizedInput[key] = input[key];
+              normalizedInput[key === "content" ? "renderBody" : key] = value;
             }
           }
           renderer5(normalizedInput, out);

package/dist/translator/index.js

@@ -1,4 +1,4 @@
-"use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports.analyze = void 0;exports.getRuntimeEntryFiles = getRuntimeEntryFiles;exports.translate = exports.taglibs = exports.preferAPI = exports.optionalTaglibs = exports.internalEntryBuilder = void 0;var _compiler = require("@marko/compiler");
+"use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports.analyze = void 0;exports.getRuntimeEntryFiles = getRuntimeEntryFiles;exports.translate = exports.taglibs = exports.tagDiscoveryDirs = exports.preferAPI = exports.optionalTaglibs = exports.internalEntryBuilder = void 0;var _compiler = require("@marko/compiler");
 var _babelUtils = require("@marko/compiler/babel-utils");
 
 
@@ -31,7 +31,8 @@ var _getComponentFiles = _interopRequireDefault(require("./util/get-component-fi
 var _optimizeHtmlWrites = require("./util/optimize-html-writes");
 var _optimizeVdomCreate = require("./util/optimize-vdom-create");
 
-var _taglib = _interopRequireWildcard(require("./taglib"));exports.optionalTaglibs = _taglib.optionalTaglibs;exports.taglibs = _taglib.default;function _getRequireWildcardCache(e) {if ("function" != typeof WeakMap) return null;var r = new WeakMap(),t = new WeakMap();return (_getRequireWildcardCache = function (e) {return e ? t : r;})(e);}function _interopRequireWildcard(e, r) {if (!r && e && e.__esModule) return e;if (null === e || "object" != typeof e && "function" != typeof e) return { default: e };var t = _getRequireWildcardCache(r);if (t && t.has(e)) return t.get(e);var n = { __proto__: null },a = Object.defineProperty && Object.getOwnPropertyDescriptor;for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) {var i = a ? Object.getOwnPropertyDescriptor(e, u) : null;i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u];}return n.default = e, t && t.set(e, n), n;}
+
+var _taglib = _interopRequireWildcard(require("./taglib"));exports.optionalTaglibs = _taglib.optionalTaglibs;exports.taglibs = _taglib.default;function _getRequireWildcardCache(e) {if ("function" != typeof WeakMap) return null;var r = new WeakMap(),t = new WeakMap();return (_getRequireWildcardCache = function (e) {return e ? t : r;})(e);}function _interopRequireWildcard(e, r) {if (!r && e && e.__esModule) return e;if (null === e || "object" != typeof e && "function" != typeof e) return { default: e };var t = _getRequireWildcardCache(r);if (t && t.has(e)) return t.get(e);var n = { __proto__: null },a = Object.defineProperty && Object.getOwnPropertyDescriptor;for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) {var i = a ? Object.getOwnPropertyDescriptor(e, u) : null;i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u];}return n.default = e, t && t.set(e, n), n;}const tagDiscoveryDirs = exports.tagDiscoveryDirs = ["components"];
 
 
 const preferAPI = exports.preferAPI = "class";
@@ -92,6 +93,7 @@ const analyze = exports.analyze = {
     const tagDef = (0, _babelUtils.getTagDef)(tag);
     // Check if tag uses stateful tag params.
     const meta = tag.hub.file.metadata.marko;
+    let relativePath;
 
     if (tagDef) {
       if (tagDef.html && !tagDef.template && !tagDef.renderer) {
@@ -106,17 +108,8 @@ const analyze = exports.analyze = {
             );
           }
         }
-      } else if (tag.get("name").isStringLiteral()) {
-        const relativePath = resolveRelativeTagEntry(file, tagDef);
-
-        if (relativePath) {
-          tag.node.extra = tag.node.extra || {};
-          tag.node.extra.relativePath = relativePath;
-
-          if (!meta.tags.includes(relativePath)) {
-            meta.tags.push(relativePath);
-          }
-        }
+      } else if (_compiler.types.isStringLiteral(tag.node.name)) {
+        relativePath = resolveRelativeTagEntry(file, tagDef);
       }
 
       if (tagDef.translator && tagDef.translator.path) {
@@ -126,6 +119,33 @@ const analyze = exports.analyze = {
       }
     }
 
+    if (!relativePath && _compiler.types.isStringLiteral(tag.node.name)) {
+      const tagName = tag.node.name.value;
+      const binding =
+      /^[A-Z][a-zA-Z0-9_$]*$/.test(tagName) && tag.scope.getBinding(tagName);
+      if (binding && binding.kind === "module" && binding.identifier.loc) {
+        const importSource = binding.path.parent.source.value;
+        relativePath = (0, _babelUtils.resolveTagImport)(tag, importSource) || importSource;
+        tag.node.extra = tag.node.extra || {};
+        tag.node.extra.tagNameImported = relativePath;
+      }
+    }
+
+    if (relativePath) {
+      tag.node.extra = tag.node.extra || {};
+      tag.node.extra.relativePath = relativePath;
+
+      if (!meta.tags.includes(relativePath)) {
+        meta.tags.push(relativePath);
+      }
+
+      const childFile = (0, _babelUtils.loadFileForTag)(tag);
+      if (childFile?.ast.program.extra?.featureType === "tags") {
+        tag.node.extra.featureType = "tags";
+        (file.path.node.extra ??= {}).needsCompat = true;
+      }
+    }
+
     if (!(meta.hasFunctionEventHandlers || meta.hasStringEventHandlers)) {
       for (const attr of tag.node.attributes) {
         if (
@@ -311,6 +331,15 @@ const translate = exports.translate = {
       path.unshiftContainer(
         "body",
         [
+        path.node.extra?.needsCompat &&
+        _compiler.types.importDeclaration(
+          [],
+          _compiler.types.stringLiteral(
+            `marko/${markoOpts.optimize ? "dist" : "src"}/runtime/helpers/tags-compat/${
+            markoOpts.output === "html" ? "html" : "dom"}${
+            markoOpts.optimize ? "" : "-debug"}.${markoOpts.modules === "esm" ? "mjs" : "js"}`
+          )
+        ),
         _compiler.types.importDeclaration(
           [_compiler.types.importSpecifier(runtimeTemplateIdentifier, _compiler.types.identifier("t"))],
           _compiler.types.stringLiteral(

package/dist/translator/tag/custom-tag.js

@@ -25,6 +25,16 @@ function _default(path, isNullable) {
 
   let tagIdentifier;
 
+  if (node.extra?.featureType === "tags") {
+    path.set(
+      "name",
+      path.scope.hasBinding(name.value) ?
+      _compiler.types.identifier(name.value) :
+      (0, _babelUtils.importDefault)(file, node.extra.relativePath, name.value)
+    );
+    return (0, _dynamicTag.default)(path);
+  }
+
   if (_compiler.types.isStringLiteral(name)) {
     const tagName = name.value;
     let relativePath = node.extra && node.extra.relativePath;
@@ -42,41 +52,13 @@ function _default(path, isNullable) {
     let binding = !relativePath && path.scope.getBinding(tagName);
     if (binding && !binding.identifier.loc) binding = null;
 
-    if (binding && binding.kind === "module") {
-      const importSource = binding.path.parent.source;
-      relativePath =
-      (0, _babelUtils.resolveTagImport)(path, importSource.value) || importSource.value;
-      (node.extra ??= {}).tagNameImported = relativePath;
-      binding = undefined;
-    }
-
-    const childFile = (0, _babelUtils.loadFileForTag)(path);
-    const childProgram = childFile?.ast.program;
-
-    if (childProgram?.extra?.featureType === "tags") {
-      const compatRuntimeFile = `marko/src/runtime/helpers/tags-compat/${
-      markoOpts.output === "html" ? "html" : "dom"}${
-      markoOpts.optimize ? "" : "-debug"}.${markoOpts.modules === "esm" ? "mjs" : "js"}`;
-      (0, _babelUtils.importDefault)(file, compatRuntimeFile);
-      path.set("name", (0, _babelUtils.importDefault)(file, relativePath, path.node.name.value));
+    if (relativePath) {
+      tagIdentifier = (0, _babelUtils.importDefault)(file, relativePath, tagName);
+    } else if (binding) {
+      path.set("name", _compiler.types.identifier(tagName));
       return (0, _dynamicTag.default)(path);
-    } else if (relativePath) {
-      if (binding) {
-
-
-
-
-
-
-
-        // TODO: implement auto migration for conflicts here
-        // and log below warning
-        // console.warn(
-        //   path.buildCodeFrameError(
-        //     `The <${tagName}> tag has been resolved from the filesystem, however a local variable with the same name exists. In the next major version of Marko the local variable will tag precedence.`
-        //   )
-        // );
-      }tagIdentifier = (0, _babelUtils.importDefault)(file, relativePath, tagName);} else if (binding) {path.set("name", _compiler.types.identifier(tagName));return (0, _dynamicTag.default)(path);} else if (markoOpts.ignoreUnrecognizedTags) {return (0, _nativeTag.default)(path);
+    } else if (markoOpts.ignoreUnrecognizedTags) {
+      return (0, _nativeTag.default)(path);
     } else {
       throw path.
       get("name").

package/dist/translator/tag/dynamic-tag.js

@@ -9,7 +9,8 @@ function _default(path) {
     node,
     hub: { file }
   } = path;
-  const tagProperties = path.node.extra && path.node.extra.properties || [];
+  const extra = path.node.extra || {};
+  const tagProperties = extra.properties || [];
   const { key, arguments: args } = node;
   const foundAttrs = (0, _util.getAttrs)(path, true);
   let renderBodyProp;
@@ -34,8 +35,10 @@ function _default(path) {
   }
 
   if (_compiler.types.isObjectExpression(foundAttrs)) {
+    const renderBodyKey =
+    extra.featureType === "tags" ? "content" : "renderBody";
     const renderBodyIndex = foundAttrs.properties.findIndex(
-      (prop) => prop.key && prop.key.value === "renderBody"
+      (prop) => prop.key && prop.key.value === renderBodyKey
     );
 
     attrsLen = foundAttrs.properties.length;

package/dist/translator/tag/util.js

@@ -4,6 +4,8 @@ var _babelUtils = require("@marko/compiler/babel-utils");
 
 
 
+
+
 var _classValue = _interopRequireDefault(require("marko/src/runtime/helpers/class-value"));
 var _styleValue = _interopRequireDefault(require("marko/src/runtime/helpers/style-value"));
 
@@ -22,6 +24,8 @@ function getAttrs(path, preserveNames, isAttrTag) {
   const tagDef = (0, _babelUtils.getTagDef)(path);
   const foundProperties = {};
   const hasAttributeTags = !!attributeTags.length;
+  const isTagsAPI = findRootTag(path)?.node.extra?.featureType === "tags";
+  const renderBodyKey = isTagsAPI ? "content" : "renderBody";
 
   for (let i = 0; i < attrsLen; i++) {
     const { name, value } = attributes[i];
@@ -78,7 +82,7 @@ function getAttrs(path, preserveNames, isAttrTag) {
   if (childLen && !hasAttributeTags) {
     properties.push(
       _compiler.types.objectProperty(
-        _compiler.types.stringLiteral("renderBody"),
+        _compiler.types.stringLiteral(renderBodyKey),
         _compiler.types.arrowFunctionExpression(
           [_compiler.types.identifier("out"), ...params],
           _compiler.types.blockStatement(body)
@@ -243,4 +247,14 @@ function mergeSpread(properties, value) {
   } else {
     properties.push(_compiler.types.spreadElement(value));
   }
+}
+
+function findRootTag(tag) {
+  let cur = tag;
+
+  while ((0, _babelUtils.isAttributeTag)(cur)) {
+    cur = (0, _babelUtils.findParentTag)(cur);
+  }
+
+  return cur;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "5.37.7",
+  "version": "5.37.8",
   "description": "UI Components + streaming, async, high performance, HTML templating for Node.js and the browser.",
   "keywords": [
     "front-end",
@@ -70,7 +70,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.26.0",
-    "@marko/compiler": "^5.39.6",
+    "@marko/compiler": "^5.39.7",
     "app-module-path": "^2.2.0",
     "argly": "^1.2.0",
     "browser-refresh-client": "1.1.4",

package/src/runtime/helpers/tags-compat/runtime-dom.js

@@ -160,27 +160,29 @@ exports.p = function (domCompat) {
     const componentsContext = ___getComponentsContext(out);
     const globalComponentsContext = componentsContext.___globalContext;
     let customEvents;
+    let normalizedInput;
     globalComponentsContext.___rerenderComponent = existingComponent;
     out.sync();
     if (renderer) {
       const [rawInput] = input;
-      const normalizedInput = {};
+      normalizedInput = {};
 
       for (const key in rawInput) {
-        let value = rawInput[key];
-        if (key.startsWith("on")) {
-          const c = key[2];
-          customEvents = customEvents || {};
-          customEvents[(c === "-" ? "" : c.toLowerCase()) + key.slice(3)] = [
-            value,
-          ];
+        const value = rawInput[key];
+        if (/^on[-A-Z]/.test(key)) {
+          if (typeof value === "function") {
+            (customEvents || (customEvents = {}))[
+              key[2] === "-" ? key.slice(3) : key.slice(2).toLowerCase()
+            ] = [value];
+          }
         } else {
-          normalizedInput[key] = rawInput[key];
+          normalizedInput[key === "content" ? "renderBody" : key] = value;
         }
       }
 
       renderer(normalizedInput, out);
     } else {
+      normalizedInput = input[0];
       RenderBodyComponent({ renderBody, args: input }, out);
     }
 
@@ -192,7 +194,7 @@ exports.p = function (domCompat) {
       );
       const component = componentDefs[0].___component;
       component.___rootNode = rootNode;
-      component.___input = input[0];
+      component.___input = normalizedInput;
       component.___customEvents = customEvents;
       scope.___marko5Component = component;
     });

package/src/runtime/helpers/tags-compat/runtime-html.js

@@ -83,17 +83,17 @@ exports.p = function (htmlCompat) {
           const normalizedInput = {};
 
           for (const key in input) {
-            let value = input[key];
-            if (key.startsWith("on") && typeof value === "function") {
-              const c = key[2];
-              customEvents = customEvents || [];
-              customEvents.push([
-                (c === "-" ? "" : c.toLowerCase()) + key.slice(3),
-                value,
-              ]);
-              value.toJSON = htmlCompat.toJSON;
+            const value = input[key];
+            if (/^on[-A-Z]/.test(key)) {
+              if (typeof value === "function") {
+                (customEvents || (customEvents = [])).push([
+                  key[2] === "-" ? key.slice(3) : key.slice(2).toLowerCase(),
+                  value,
+                ]);
+                value.toJSON = htmlCompat.toJSON;
+              }
             } else {
-              normalizedInput[key] = input[key];
+              normalizedInput[key === "content" ? "renderBody" : key] = value;
             }
           }
           renderer5(normalizedInput, out);

package/src/translator/index.js

@@ -31,6 +31,7 @@ import getComponentFiles from "./util/get-component-files";
 import { optimizeHTMLWrites } from "./util/optimize-html-writes";
 import { analyzeStaticVDOM } from "./util/optimize-vdom-create";
 
+export const tagDiscoveryDirs = ["components"];
 export { optionalTaglibs, default as taglibs } from "./taglib";
 export { entryBuilder as internalEntryBuilder } from "./util/add-dependencies";
 
@@ -92,6 +93,7 @@ export const analyze = {
     const tagDef = getTagDef(tag);
     // Check if tag uses stateful tag params.
     const meta = tag.hub.file.metadata.marko;
+    let relativePath;
 
     if (tagDef) {
       if (tagDef.html && !tagDef.template && !tagDef.renderer) {
@@ -106,17 +108,8 @@ export const analyze = {
             );
           }
         }
-      } else if (tag.get("name").isStringLiteral()) {
-        const relativePath = resolveRelativeTagEntry(file, tagDef);
-
-        if (relativePath) {
-          tag.node.extra = tag.node.extra || {};
-          tag.node.extra.relativePath = relativePath;
-
-          if (!meta.tags.includes(relativePath)) {
-            meta.tags.push(relativePath);
-          }
-        }
+      } else if (t.isStringLiteral(tag.node.name)) {
+        relativePath = resolveRelativeTagEntry(file, tagDef);
       }
 
       if (tagDef.translator && tagDef.translator.path) {
@@ -126,6 +119,33 @@ export const analyze = {
       }
     }
 
+    if (!relativePath && t.isStringLiteral(tag.node.name)) {
+      const tagName = tag.node.name.value;
+      const binding =
+        /^[A-Z][a-zA-Z0-9_$]*$/.test(tagName) && tag.scope.getBinding(tagName);
+      if (binding && binding.kind === "module" && binding.identifier.loc) {
+        const importSource = binding.path.parent.source.value;
+        relativePath = resolveTagImport(tag, importSource) || importSource;
+        tag.node.extra = tag.node.extra || {};
+        tag.node.extra.tagNameImported = relativePath;
+      }
+    }
+
+    if (relativePath) {
+      tag.node.extra = tag.node.extra || {};
+      tag.node.extra.relativePath = relativePath;
+
+      if (!meta.tags.includes(relativePath)) {
+        meta.tags.push(relativePath);
+      }
+
+      const childFile = loadFileForTag(tag);
+      if (childFile?.ast.program.extra?.featureType === "tags") {
+        tag.node.extra.featureType = "tags";
+        (file.path.node.extra ??= {}).needsCompat = true;
+      }
+    }
+
     if (!(meta.hasFunctionEventHandlers || meta.hasStringEventHandlers)) {
       for (const attr of tag.node.attributes) {
         if (
@@ -311,6 +331,15 @@ export const translate = {
       path.unshiftContainer(
         "body",
         [
+          path.node.extra?.needsCompat &&
+            t.importDeclaration(
+              [],
+              t.stringLiteral(
+                `marko/${markoOpts.optimize ? "dist" : "src"}/runtime/helpers/tags-compat/${
+                  markoOpts.output === "html" ? "html" : "dom"
+                }${markoOpts.optimize ? "" : "-debug"}.${markoOpts.modules === "esm" ? "mjs" : "js"}`,
+              ),
+            ),
           t.importDeclaration(
             [t.importSpecifier(runtimeTemplateIdentifier, t.identifier("t"))],
             t.stringLiteral(

package/src/translator/tag/custom-tag.js

@@ -25,6 +25,16 @@ export default function (path, isNullable) {
 
   let tagIdentifier;
 
+  if (node.extra?.featureType === "tags") {
+    path.set(
+      "name",
+      path.scope.hasBinding(name.value)
+        ? t.identifier(name.value)
+        : importDefault(file, node.extra.relativePath, name.value),
+    );
+    return dynamicTag(path);
+  }
+
   if (t.isStringLiteral(name)) {
     const tagName = name.value;
     let relativePath = node.extra && node.extra.relativePath;
@@ -42,35 +52,7 @@ export default function (path, isNullable) {
     let binding = !relativePath && path.scope.getBinding(tagName);
     if (binding && !binding.identifier.loc) binding = null;
 
-    if (binding && binding.kind === "module") {
-      const importSource = binding.path.parent.source;
-      relativePath =
-        resolveTagImport(path, importSource.value) || importSource.value;
-      (node.extra ??= {}).tagNameImported = relativePath;
-      binding = undefined;
-    }
-
-    const childFile = loadFileForTag(path);
-    const childProgram = childFile?.ast.program;
-
-    if (childProgram?.extra?.featureType === "tags") {
-      const compatRuntimeFile = `marko/src/runtime/helpers/tags-compat/${
-        markoOpts.output === "html" ? "html" : "dom"
-      }${markoOpts.optimize ? "" : "-debug"}.${markoOpts.modules === "esm" ? "mjs" : "js"}`;
-      importDefault(file, compatRuntimeFile);
-      path.set("name", importDefault(file, relativePath, path.node.name.value));
-      return dynamicTag(path);
-    } else if (relativePath) {
-      if (binding) {
-        // TODO: implement auto migration for conflicts here
-        // and log below warning
-        // console.warn(
-        //   path.buildCodeFrameError(
-        //     `The <${tagName}> tag has been resolved from the filesystem, however a local variable with the same name exists. In the next major version of Marko the local variable will tag precedence.`
-        //   )
-        // );
-      }
-
+    if (relativePath) {
       tagIdentifier = importDefault(file, relativePath, tagName);
     } else if (binding) {
       path.set("name", t.identifier(tagName));

package/src/translator/tag/dynamic-tag.js

@@ -9,7 +9,8 @@ export default function (path) {
     node,
     hub: { file },
   } = path;
-  const tagProperties = (path.node.extra && path.node.extra.properties) || [];
+  const extra = path.node.extra || {};
+  const tagProperties = extra.properties || [];
   const { key, arguments: args } = node;
   const foundAttrs = getAttrs(path, true);
   let renderBodyProp;
@@ -34,8 +35,10 @@ export default function (path) {
   }
 
   if (t.isObjectExpression(foundAttrs)) {
+    const renderBodyKey =
+      extra.featureType === "tags" ? "content" : "renderBody";
     const renderBodyIndex = foundAttrs.properties.findIndex(
-      (prop) => prop.key && prop.key.value === "renderBody",
+      (prop) => prop.key && prop.key.value === renderBodyKey,
     );
 
     attrsLen = foundAttrs.properties.length;

package/src/translator/tag/util.js

@@ -1,8 +1,10 @@
 import { types as t } from "@marko/compiler";
 import {
   computeNode,
+  findParentTag,
   getTagDef,
   importNamed,
+  isAttributeTag,
 } from "@marko/compiler/babel-utils";
 import classToString from "marko/src/runtime/helpers/class-value";
 import styleToString from "marko/src/runtime/helpers/style-value";
@@ -22,6 +24,8 @@ export function getAttrs(path, preserveNames, isAttrTag) {
   const tagDef = getTagDef(path);
   const foundProperties = {};
   const hasAttributeTags = !!attributeTags.length;
+  const isTagsAPI = findRootTag(path)?.node.extra?.featureType === "tags";
+  const renderBodyKey = isTagsAPI ? "content" : "renderBody";
 
   for (let i = 0; i < attrsLen; i++) {
     const { name, value } = attributes[i];
@@ -78,7 +82,7 @@ export function getAttrs(path, preserveNames, isAttrTag) {
   if (childLen && !hasAttributeTags) {
     properties.push(
       t.objectProperty(
-        t.stringLiteral("renderBody"),
+        t.stringLiteral(renderBodyKey),
         t.arrowFunctionExpression(
           [t.identifier("out"), ...params],
           t.blockStatement(body),
@@ -244,3 +248,13 @@ function mergeSpread(properties, value) {
     properties.push(t.spreadElement(value));
   }
 }
+
+function findRootTag(tag) {
+  let cur = tag;
+
+  while (isAttributeTag(cur)) {
+    cur = findParentTag(cur);
+  }
+
+  return cur;
+}