@teleporthq/teleport-uidl-resolver 0.41.0 → 0.42.0

package/__tests__/abilities/mocks.ts

@@ -35,7 +35,10 @@ export const phoneMockedDefinition = (): UIDLPhoneLinkNode => ({
 export const sectionMockedDefinition = (): UIDLSectionLinkNode => ({
   type: 'section',
   content: {
-    section: 'contact',
+    section: {
+      type: 'static',
+      content: 'contact',
+    },
   },
 })
 

package/__tests__/abilities/utils.ts

@@ -121,6 +121,6 @@ describe('createLink', () => {
     const result = createLinkNode(link, {})
 
     expect(result.content.elementType).toBe('link')
-    expect(result.content.attrs.url.content).toBe(`#${link.content.section}`)
+    expect(result.content.attrs.url.content).toBe(`#${link.content.section.content}`)
   })
 })

package/__tests__/embed-lottie-node/index.ts

@@ -1,6 +1,6 @@
-import { wrapHtmlNode, createEmbedDivWrapperNode } from '../../src/resolvers/embed-node/utils'
+import { wrapHtmlNode } from '../../src/resolvers/embed-node/utils'
 import { elementNode, staticNode } from '@teleporthq/teleport-uidl-builders'
-import { UIDLElementNode, UIDLStyleDefinitions } from '@teleporthq/teleport-types'
+import { UIDLElementNode } from '@teleporthq/teleport-types'
 
 describe('wrap html-node element', () => {
   it('wraps a simple element', () => {
@@ -20,39 +20,17 @@ describe('wrap html-node element', () => {
     )
 
     const result = wrapHtmlNode(node, {})
-    expect(result.content.elementType).toBe('div')
+    expect(result.content.elementType).toBe('container')
     expect(result.content.children?.length).toBe(1)
     const childNode = result.content.children?.[0] as UIDLElementNode
-    expect(childNode.content.elementType).toBe('html-node')
-    expect(childNode.content.attrs?.html.content).toBe(
-      `<blockquote class='twitter-tweet'><p lang='en' dir='ltr'>Feels like the last 20 mins of Don’t Look Up right about now…</p>&mdash; Netflix (@netflix) <a href='https://twitter.com/netflix/status/1593420772948598784?ref_src=twsrc%5Etfw'>November 18, 2022</a></blockquote> <script async src='https://platform.twitter.com/widgets.js'></script>`
-    )
-  })
-})
+    expect(childNode.content.elementType).toBe('container')
+    expect(childNode.content.children?.length).toBe(1)
 
-describe('create div', () => {
-  it('creates wrapping div', () => {
-    const node = elementNode(
-      'html-node',
-      {
-        html: {
-          type: 'raw',
-          content: `<blockquote class='twitter-tweet'><p lang='en' dir='ltr'>Feels like the last 20 mins of Don’t Look Up right about now…</p>&mdash; Netflix (@netflix) <a href='https://twitter.com/netflix/status/1593420772948598784?ref_src=twsrc%5Etfw'>November 18, 2022</a></blockquote> <script async src='https://platform.twitter.com/widgets.js'></script>`,
-        },
-      },
-      [],
-      undefined,
-      {
-        width: staticNode('100px'),
-      }
+    expect(childNode.content.style).toMatchObject({ display: staticNode('contents') })
+    const subChildNode = childNode.content.children?.[0] as UIDLElementNode
+    expect(subChildNode.content.elementType).toBe('html-node')
+    expect(subChildNode.content.attrs?.html.content).toBe(
+      `<blockquote class='twitter-tweet'><p lang='en' dir='ltr'>Feels like the last 20 mins of Don’t Look Up right about now…</p>&mdash; Netflix (@netflix) <a href='https://twitter.com/netflix/status/1593420772948598784?ref_src=twsrc%5Etfw'>November 18, 2022</a></blockquote> <script async src='https://platform.twitter.com/widgets.js'></script>`
     )
-
-    const result = createEmbedDivWrapperNode(node)
-
-    expect(result.content.elementType).toBe('div')
-    expect(result.content.children?.length).toBe(0)
-    expect(result.content.attrs?.html).toBeUndefined()
-    expect(result.content.style).toBeDefined()
-    expect(Object.keys(result.content.style as UIDLStyleDefinitions).length).toBe(1)
   })
 })

package/__tests__/style-set-definitions/index.ts

@@ -59,7 +59,7 @@ describe('Resolves style-sheet', () => {
   }
 
   it('Sorts the style-sheet in order', () => {
-    const result = resolveStyleSetDefinitions(styleSheet)
+    const result = resolveStyleSetDefinitions(styleSheet, {})
 
     expect((result.primaryButton.conditions[0] as UIDLStyleSetMediaCondition).meta.maxWidth).toBe(
       991
@@ -76,16 +76,15 @@ describe('Resolves style-sheet', () => {
   })
 
   it(`Resolver doesn't throw any error even if conditions are not passed`, () => {
-    const styleSet = {
+    const styleSet: Record<string, UIDLStyleSetDefinition> = {
       primaryButton: {
         type: 'reusable-project-style-map' as const,
-        conditions: [],
         content: {
           display: staticNode('block'),
         },
       },
     }
-    const result = resolveStyleSetDefinitions(styleSet)
+    const result = resolveStyleSetDefinitions(styleSet, {})
 
     expect(result).toEqual(styleSet)
   })

package/__tests__/utils.ts

@@ -34,36 +34,37 @@ describe('generateUniqueKeys', () => {
     const simpleNode = elementNode('container')
 
     const lookup = {
-      container: {
+      'component-container': {
         count: 1,
         nextKey: '0',
       },
     }
 
-    generateUniqueKeys(simpleNode, lookup)
+    generateUniqueKeys(component('component', simpleNode), lookup)
 
     expect(simpleNode.content.name).toBe('container')
-    expect(simpleNode.content.key).toBe('container')
+    expect(simpleNode.content.key).toBe('component-container')
   })
 
   it('adds name and generate unique key', async () => {
     const node = elementNode('container', {}, [elementNode('container')])
 
     const lookup = {
-      container: {
+      'component-container': {
         count: 2,
-        nextKey: '0',
+        nextKey: '1',
       },
     }
 
-    generateUniqueKeys(node, lookup)
+    generateUniqueKeys(component('component', node), lookup)
 
     expect(node.content.name).toBe('container')
-    expect(node.content.key).toBe('container')
+    expect(node.content.key).toBe('component-container1')
 
-    const childNode = node.content.children[0].content as UIDLElement
+    const childNode = node.content.children?.[0].content as UIDLElement
     expect(childNode.name).toBe('container')
-    expect(childNode.key).toBe('container1')
+    expect(childNode.key).toBe('component-container2')
+    expect(lookup['component-container'].nextKey).toBe('3')
   })
 })
 
@@ -74,27 +75,36 @@ describe('createNodesLookup', () => {
     ])
 
     const lookup: Record<string, { count: number; nextKey: string }> = {}
-    createNodesLookup(node, lookup)
+    createNodesLookup(component('component', node), lookup)
+
+    expect(lookup['component-container'].count).toBe(2)
+    expect(lookup['component-container'].nextKey).toBe('1')
+    expect(lookup['component-text'].count).toBe(3)
+    expect(lookup['component-container'].nextKey).toBe('1')
+  })
+
+  it('counts duplicate nodes considering camel case names as well', async () => {
+    const node = elementNode('About-Me', {}, [elementNode('aboutMe')])
+    const lookup: Record<string, { count: number; nextKey: string }> = {}
+    createNodesLookup(component('component', node), lookup)
 
-    expect(lookup.container.count).toBe(2)
-    expect(lookup.container.nextKey).toBe('0')
-    expect(lookup.text.count).toBe(3)
-    expect(lookup.container.nextKey).toBe('0')
+    expect(lookup['component-about-me'].count).toBe(2)
+    expect(lookup['component-about-me'].nextKey).toBe('1')
   })
 
   it('adds zero padding when counting keys', async () => {
     const node = elementNode('container')
 
     const lookup: Record<string, { count: number; nextKey: string }> = {
-      container: {
+      'component-container': {
         count: 9,
         nextKey: '0',
       },
     }
-    createNodesLookup(node, lookup)
+    createNodesLookup(component('component', node), lookup)
 
-    expect(lookup.container.count).toBe(10)
-    expect(lookup.container.nextKey).toBe('00')
+    expect(lookup['component-container'].count).toBe(10)
+    expect(lookup['component-container'].nextKey).toBe('00')
   })
 })
 
@@ -384,7 +394,7 @@ describe('checkForDefaultPropsContainingAssets', () => {
   }
 
   it('find and fix defaultProp containing an asset', () => {
-    checkForDefaultPropsContainingAssets(comp, assets)
+    checkForDefaultPropsContainingAssets(comp, { assets })
     expect(comp.propDefinitions).toBeDefined()
     if (comp.propDefinitions) {
       expect(comp.propDefinitions.myImage).toBeDefined()
@@ -423,7 +433,7 @@ describe('checkForDefaultStateValueContainingAssets', () => {
   }
 
   it('find and fix defaultProp containing an asset', () => {
-    checkForDefaultStateValueContainingAssets(comp, assets)
+    checkForDefaultStateValueContainingAssets(comp, { assets })
     expect(comp.stateDefinitions).toBeDefined()
     if (comp.stateDefinitions) {
       expect(comp.stateDefinitions.imageState).toBeDefined()

package/dist/cjs/html-mapping.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"html-mapping.d.ts","sourceRoot":"","sources":["../../src/html-mapping.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,eAAO,MAAM,WAAW,EAAE,OA4MzB,CAAA"}
+{"version":3,"file":"html-mapping.d.ts","sourceRoot":"","sources":["../../src/html-mapping.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,eAAO,MAAM,WAAW,EAAE,OAsNzB,CAAA"}

package/dist/cjs/html-mapping.js

@@ -200,6 +200,16 @@ exports.HTMLMapping = {
         separator: {
             elementType: 'hr',
         },
+        fragment: {
+            elementType: 'div',
+            name: 'custom-fragment',
+            style: {
+                display: {
+                    type: 'static',
+                    content: 'contents',
+                },
+            },
+        },
     },
     events: {},
     attributes: {},

package/dist/cjs/html-mapping.js.map

@@ -1 +1 @@
-{"version":3,"file":"html-mapping.js","sourceRoot":"","sources":["../../src/html-mapping.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"html-mapping.js","sourceRoot":"","sources":["../../src/html-mapping.ts"],"names":[],"mappings":"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"}

package/dist/cjs/index.d.ts

@@ -2,6 +2,7 @@ import Resolver from './resolver';
 import { HTMLMapping } from './html-mapping';
 import { UIDLElement, GeneratorOptions } from '@teleporthq/teleport-types';
 import { resolveStyleSetDefinitions } from './resolvers/style-set-definitions';
+import { generateUniqueKeys, createNodesLookup } from './utils';
 declare const resolveUIDLElement: (node: UIDLElement, options?: GeneratorOptions) => UIDLElement;
-export { resolveUIDLElement, Resolver, HTMLMapping, resolveStyleSetDefinitions };
+export { resolveUIDLElement, Resolver, HTMLMapping, resolveStyleSetDefinitions, generateUniqueKeys, createNodesLookup, };
 //# sourceMappingURL=index.d.ts.map

package/dist/cjs/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,YAAY,CAAA;AACjC,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAC5C,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAA;AAC1E,OAAO,EAAE,0BAA0B,EAAE,MAAM,mCAAmC,CAAA;AAI9E,QAAA,MAAM,kBAAkB,SAAU,WAAW,YAAY,gBAAgB,gBAExE,CAAA;AAED,OAAO,EAAE,kBAAkB,EAAE,QAAQ,EAAE,WAAW,EAAE,0BAA0B,EAAE,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,YAAY,CAAA;AACjC,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAC5C,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAA;AAC1E,OAAO,EAAE,0BAA0B,EAAE,MAAM,mCAAmC,CAAA;AAC9E,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAA;AAI/D,QAAA,MAAM,kBAAkB,SAAU,WAAW,YAAY,gBAAgB,gBAExE,CAAA;AAED,OAAO,EACL,kBAAkB,EAClB,QAAQ,EACR,WAAW,EACX,0BAA0B,EAC1B,kBAAkB,EAClB,iBAAiB,GAClB,CAAA"}

package/dist/cjs/index.js

@@ -3,13 +3,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveStyleSetDefinitions = exports.HTMLMapping = exports.Resolver = exports.resolveUIDLElement = void 0;
+exports.createNodesLookup = exports.generateUniqueKeys = exports.resolveStyleSetDefinitions = exports.HTMLMapping = exports.Resolver = exports.resolveUIDLElement = void 0;
 var resolver_1 = __importDefault(require("./resolver"));
 exports.Resolver = resolver_1.default;
 var html_mapping_1 = require("./html-mapping");
 Object.defineProperty(exports, "HTMLMapping", { enumerable: true, get: function () { return html_mapping_1.HTMLMapping; } });
 var style_set_definitions_1 = require("./resolvers/style-set-definitions");
 Object.defineProperty(exports, "resolveStyleSetDefinitions", { enumerable: true, get: function () { return style_set_definitions_1.resolveStyleSetDefinitions; } });
+var utils_1 = require("./utils");
+Object.defineProperty(exports, "generateUniqueKeys", { enumerable: true, get: function () { return utils_1.generateUniqueKeys; } });
+Object.defineProperty(exports, "createNodesLookup", { enumerable: true, get: function () { return utils_1.createNodesLookup; } });
 var htmlResolver = new resolver_1.default(html_mapping_1.HTMLMapping);
 var resolveUIDLElement = function (node, options) {
     return htmlResolver.resolveElement(node, options);

package/dist/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,wDAAiC;AAWJ,mBAXtB,kBAAQ,CAWsB;AAVrC,+CAA4C;AAUL,4FAV9B,0BAAW,OAU8B;AARlD,2EAA8E;AAQ1B,2GAR3C,kDAA0B,OAQ2C;AAN9E,IAAM,YAAY,GAAG,IAAI,kBAAQ,CAAC,0BAAW,CAAC,CAAA;AAE9C,IAAM,kBAAkB,GAAG,UAAC,IAAiB,EAAE,OAA0B;IACvE,OAAO,YAAY,CAAC,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;AACnD,CAAC,CAAA;AAEQ,gDAAkB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,wDAAiC;AAc/B,mBAdK,kBAAQ,CAcL;AAbV,+CAA4C;AAc1C,4FAdO,0BAAW,OAcP;AAZb,2EAA8E;AAa5E,2GAbO,kDAA0B,OAaP;AAZ5B,iCAA+D;AAa7D,mGAbO,0BAAkB,OAaP;AAClB,kGAd2B,yBAAiB,OAc3B;AAZnB,IAAM,YAAY,GAAG,IAAI,kBAAQ,CAAC,0BAAW,CAAC,CAAA;AAE9C,IAAM,kBAAkB,GAAG,UAAC,IAAiB,EAAE,OAA0B;IACvE,OAAO,YAAY,CAAC,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;AACnD,CAAC,CAAA;AAGC,gDAAkB"}

package/dist/cjs/resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolver.d.ts","sourceRoot":"","sources":["../../src/resolver.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAA;AAMlG;;;GAGG;AACH,MAAM,CAAC,OAAO,OAAO,QAAQ;IAC3B,OAAO,CAAC,OAAO,CAMd;gBAEW,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,EAAE;IAQlC,UAAU,CAAC,OAAO,EAAE,OAAO;IAI3B,WAAW,CAAC,KAAK,EAAE,aAAa,EAAE,OAAO,GAAE,gBAAqB;IAyChE,cAAc,CAAC,OAAO,EAAE,WAAW,EAAE,OAAO,GAAE,gBAAqB;CAW3E"}
+{"version":3,"file":"resolver.d.ts","sourceRoot":"","sources":["../../src/resolver.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,aAAa,EACb,WAAW,EACX,OAAO,EACP,gBAAgB,EAEjB,MAAM,4BAA4B,CAAA;AAMnC;;;GAGG;AACH,MAAM,CAAC,OAAO,OAAO,QAAQ;IAC3B,OAAO,CAAC,OAAO,CAMd;gBAEW,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,EAAE;IAQlC,UAAU,CAAC,OAAO,EAAE,OAAO;IAI3B,WAAW,CAAC,KAAK,EAAE,aAAa,EAAE,OAAO,GAAE,gBAA6C;IAmCxF,cAAc,CACnB,OAAO,EAAE,WAAW,EACpB,OAAO,GAAE,gBAA6C;CAYzD"}

package/dist/cjs/resolver.js

@@ -65,32 +65,29 @@ var Resolver = /** @class */ (function () {
         this.mapping = utils.mergeMappings(this.mapping, mapping);
     };
     Resolver.prototype.resolveUIDL = function (input, options) {
-        if (options === void 0) { options = {}; }
+        if (options === void 0) { options = { extractedResources: {} }; }
         var mapping = utils.mergeMappings(this.mapping, options.mapping);
         var newOptions = __assign(__assign({}, options), { mapping: mapping });
+        var lookup = {};
         var uidl = teleport_shared_1.UIDLUtils.cloneObject(input);
         uidl.styleSetDefinitions = (0, style_set_definitions_1.resolveStyleSetDefinitions)(input.styleSetDefinitions, newOptions);
         teleport_shared_1.UIDLUtils.setFriendlyOutputOptions(uidl);
         utils.checkForIllegalNames(uidl, mapping);
-        utils.checkForDefaultPropsContainingAssets(uidl, options.assets);
-        utils.checkForDefaultStateValueContainingAssets(uidl, options.assets);
+        utils.checkForDefaultPropsContainingAssets(uidl, newOptions);
+        utils.checkForDefaultStateValueContainingAssets(uidl, newOptions);
         (0, abilities_1.resolveAbilities)(uidl, newOptions);
         (0, referenced_styles_1.resolveReferencedStyle)(uidl, newOptions);
         (0, embed_node_1.resolveHtmlNode)(uidl, newOptions);
-        // TODO: Rename into apply mappings
         utils.resolveNode(uidl.node, newOptions);
-        utils.removeIgnoredNodes(uidl.node);
-        var nodesLookup = {};
-        utils.createNodesLookup(uidl.node, nodesLookup);
-        utils.createCMSNodesLookup(uidl.node, nodesLookup);
-        utils.generateUniqueKeys(uidl.node, nodesLookup);
+        utils.resolveNodeInPropDefinitions(uidl, newOptions);
+        utils.createNodesLookup(uidl, lookup);
+        utils.generateUniqueKeys(uidl, lookup);
         utils.ensureDataSourceUniqueness(uidl.node);
-        // There might be urls that need to be prefixed in the metaTags of the component
         utils.resolveMetaTags(uidl, newOptions);
         return uidl;
     };
     Resolver.prototype.resolveElement = function (element, options) {
-        if (options === void 0) { options = {}; }
+        if (options === void 0) { options = { extractedResources: {} }; }
         var mapping = utils.mergeMappings(this.mapping, options.mapping);
         var newOptions = __assign(__assign({}, options), { mapping: mapping });
         var returnElement = teleport_shared_1.UIDLUtils.cloneObject(element);

package/dist/cjs/resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolver.js","sourceRoot":"","sources":["../../src/resolver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"resolver.js","sourceRoot":"","sources":["../../src/resolver.ts"],"names":[],"mappings":"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"}

package/dist/cjs/resolvers/abilities/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/abilities/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAA;AAG5E,eAAO,MAAM,gBAAgB,SAAU,aAAa,WAAW,gBAAgB,SAE9E,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/abilities/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAmB,MAAM,4BAA4B,CAAA;AAG7F,eAAO,MAAM,gBAAgB,SAAU,aAAa,WAAW,gBAAgB,SAc9E,CAAA"}

package/dist/cjs/resolvers/abilities/index.js

@@ -3,6 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveAbilities = void 0;
 var utils_1 = require("./utils");
 var resolveAbilities = function (uidl, options) {
+    if (uidl.propDefinitions) {
+        for (var _i = 0, _a = Object.keys(uidl.propDefinitions); _i < _a.length; _i++) {
+            var propKey = _a[_i];
+            var prop = uidl.propDefinitions[propKey];
+            if (prop.type === 'element' && typeof prop.defaultValue === 'object') {
+                uidl.propDefinitions[propKey].defaultValue = (0, utils_1.insertLinks)(prop.defaultValue, options);
+            }
+        }
+    }
     uidl.node = (0, utils_1.insertLinks)(uidl.node, options);
 };
 exports.resolveAbilities = resolveAbilities;

package/dist/cjs/resolvers/abilities/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/resolvers/abilities/index.ts"],"names":[],"mappings":";;;AACA,iCAAqC;AAE9B,IAAM,gBAAgB,GAAG,UAAC,IAAmB,EAAE,OAAyB;IAC7E,IAAI,CAAC,IAAI,GAAG,IAAA,mBAAW,EAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;AAC7C,CAAC,CAAA;AAFY,QAAA,gBAAgB,oBAE5B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/resolvers/abilities/index.ts"],"names":[],"mappings":";;;AACA,iCAAqC;AAE9B,IAAM,gBAAgB,GAAG,UAAC,IAAmB,EAAE,OAAyB;IAC7E,IAAI,IAAI,CAAC,eAAe,EAAE;QACxB,KAAsB,UAAiC,EAAjC,KAAA,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,EAAjC,cAAiC,EAAjC,IAAiC,EAAE;YAApD,IAAM,OAAO,SAAA;YAChB,IAAM,IAAI,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAA;YAC1C,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,IAAI,OAAO,IAAI,CAAC,YAAY,KAAK,QAAQ,EAAE;gBACpE,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,YAAY,GAAG,IAAA,mBAAW,EACtD,IAAI,CAAC,YAA+B,EACpC,OAAO,CACR,CAAA;aACF;SACF;KACF;IAED,IAAI,CAAC,IAAI,GAAG,IAAA,mBAAW,EAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;AAC7C,CAAC,CAAA;AAdY,QAAA,gBAAgB,oBAc5B"}

package/dist/cjs/resolvers/abilities/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/abilities/utils.ts"],"names":[],"mappings":"AACA,OAAO,EACL,gBAAgB,EAChB,YAAY,EACZ,eAAe,EAEhB,MAAM,4BAA4B,CAAA;AAGnC,eAAO,MAAM,WAAW,SAChB,eAAe,WACZ,gBAAgB,iBACX,OAAO,eACR,eAAe,KAC3B,eA8HF,CAAA;AAED,eAAO,MAAM,cAAc,SAAU,YAAY,WAAW,gBAAgB,KAAG,eAS9E,CAAA"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/abilities/utils.ts"],"names":[],"mappings":"AACA,OAAO,EACL,gBAAgB,EAChB,YAAY,EACZ,eAAe,EAEhB,MAAM,4BAA4B,CAAA;AAsCnC,eAAO,MAAM,WAAW,SAChB,eAAe,WACZ,gBAAgB,iBACX,OAAO,eACR,eAAe,KAC3B,eAgLF,CAAA;AAED,eAAO,MAAM,cAAc,SAAU,YAAY,WAAW,gBAAgB,KAAG,eAS9E,CAAA"}

package/dist/cjs/resolvers/abilities/utils.js

@@ -13,14 +13,42 @@ var __assign = (this && this.__assign) || function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createLinkNode = exports.insertLinks = void 0;
 var teleport_shared_1 = require("@teleporthq/teleport-shared");
-var path_1 = require("path");
+// Whitelist of attributes that are safe to transfer to anchor tags
+var ANCHOR_SAFE_ATTRIBUTES = new Set([
+    // Standard HTML attributes
+    'class',
+    'id',
+    'style',
+    'title',
+    'lang',
+    'dir',
+    'tabindex',
+    'accesskey',
+    'contenteditable',
+    'draggable',
+    'hidden',
+    'spellcheck',
+    'translate',
+]);
+// ARIA attributes safe for anchor tags (link-specific)
+var ANCHOR_SAFE_ARIA_ATTRIBUTES = new Set([
+    'aria-describedby',
+    'aria-labelledby',
+    'aria-expanded',
+    'aria-haspopup',
+    'aria-current',
+    'aria-disabled', // For disabled links
+]);
+var isAttributeSafeForAnchor = function (attrName) {
+    return (ANCHOR_SAFE_ATTRIBUTES.has(attrName) ||
+        attrName.startsWith('data-') ||
+        ANCHOR_SAFE_ARIA_ATTRIBUTES.has(attrName));
+};
 var insertLinks = function (node, options, linkInParent, parentNode) {
     var _a, _b, _c, _d;
     if (linkInParent === void 0) { linkInParent = false; }
-    // TODO_NOW
-    var _e = node.content, abilities = _e.abilities, children = _e.children, elementType = _e.elementType, semanticType = _e.semanticType;
+    var _e = node.content, abilities = _e.abilities, children = _e.children, elementType = _e.elementType, semanticType = _e.semanticType, _f = _e.attrs, attrs = _f === void 0 ? {} : _f;
     var linkInNode = linkInParent || !!(abilities === null || abilities === void 0 ? void 0 : abilities.link);
-    // TODO: think of a way to reuse the traversal that modifies the tree
     node.content.children = children === null || children === void 0 ? void 0 : children.map(function (child) {
         var _a;
         if (child.type === 'element') {
@@ -48,16 +76,33 @@ var insertLinks = function (node, options, linkInParent, parentNode) {
             }
         }
         if (child.type === 'cms-list-repeater') {
-            var _c = child.content.nodes, list = _c.list, empty = _c.empty;
+            var _c = child.content.nodes, list = _c.list, empty = _c.empty, loading = _c.loading;
             if (list) {
                 (0, exports.insertLinks)(list, options, false, node);
             }
             if (empty) {
                 (0, exports.insertLinks)(empty, options, false, node);
             }
+            if (loading) {
+                (0, exports.insertLinks)(loading, options, false, node);
+            }
+        }
+        if (child.type === 'cms-mixed-type') {
+            if (child.content.mappings) {
+                Object.values(child.content.mappings).forEach(function (mapping) {
+                    (0, exports.insertLinks)(mapping, options, false, node);
+                });
+            }
+            var _d = child.content.nodes, fallback = _d.fallback, error = _d.error;
+            if (fallback) {
+                (0, exports.insertLinks)(fallback, options, false, node);
+            }
+            if (error) {
+                (0, exports.insertLinks)(error, options, false, node);
+            }
         }
         if (child.type === 'cms-item') {
-            var _d = child.content.nodes, success = _d.success, error = _d.error, loading = _d.loading;
+            var _e = child.content.nodes, success = _e.success, error = _e.error, loading = _e.loading;
             if (success) {
                 (0, exports.insertLinks)(success, options, false, node);
             }
@@ -70,6 +115,13 @@ var insertLinks = function (node, options, linkInParent, parentNode) {
         }
         return child;
     });
+    for (var _i = 0, _g = Object.keys(attrs); _i < _g.length; _i++) {
+        var attrKey = _g[_i];
+        var attr = attrs[attrKey];
+        if (attr.type === 'element') {
+            node.content.attrs[attrKey] = (0, exports.insertLinks)(attr, options, false, node);
+        }
+    }
     if (abilities === null || abilities === void 0 ? void 0 : abilities.link) {
         if (linkInParent) {
             console.warn('parent node has a link capability, nesting links is illegal');
@@ -96,8 +148,22 @@ var insertLinks = function (node, options, linkInParent, parentNode) {
             return node;
         }
         var linkNode = (0, exports.createLinkNode)(abilities.link, options);
+        if (node.type === 'element' && node.content.attrs) {
+            // Filter attributes to only transfer those safe for anchor tags
+            var safeAttrs_1 = {};
+            Object.keys(node.content.attrs).forEach(function (attrName) {
+                if (isAttributeSafeForAnchor(attrName)) {
+                    safeAttrs_1[attrName] = __assign({}, node.content.attrs[attrName]);
+                }
+            });
+            linkNode.content.attrs = __assign(__assign({}, linkNode.content.attrs), safeAttrs_1);
+            // Remove only the transferred attributes from the original node
+            Object.keys(safeAttrs_1).forEach(function (attrName) {
+                delete node.content.attrs[attrName];
+            });
+        }
         linkNode.content.children.push(node);
-        if (((_d = (_c = parentNode === null || parentNode === void 0 ? void 0 : parentNode.content.style) === null || _c === void 0 ? void 0 : _c.display) === null || _d === void 0 ? void 0 : _d.content) === 'flex') {
+        if (parentNode === undefined || ((_d = (_c = parentNode === null || parentNode === void 0 ? void 0 : parentNode.content.style) === null || _c === void 0 ? void 0 : _c.display) === null || _d === void 0 ? void 0 : _d.content) === 'flex') {
             linkNode.content.style = __assign(__assign({}, linkNode.content.style), { display: { type: 'static', content: 'contents' } });
         }
         return linkNode;
@@ -142,12 +208,23 @@ var createLinkAttributes = function (link, options) {
                 : {}));
         }
         case 'section': {
-            return {
-                url: {
-                    type: 'static',
-                    content: "#".concat(link.content.section),
-                },
-            };
+            if (link.content.section.type === 'static') {
+                return {
+                    url: {
+                        type: 'static',
+                        content: "#".concat(link.content.section.content),
+                    },
+                };
+            }
+            if (link.content.section.type === 'expr') {
+                return {
+                    url: {
+                        type: 'expr',
+                        content: '`#${' + link.content.section.content + '}`',
+                    },
+                };
+            }
+            return;
         }
         case 'dynamic':
             return {
@@ -177,7 +254,7 @@ var createLinkAttributes = function (link, options) {
     }
 };
 var resolveNavlink = function (route, options) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b;
     if (options.skipNavlinkResolver) {
         return route;
     }
@@ -199,21 +276,16 @@ var resolveNavlink = function (route, options) {
             content: "/".concat(friendlyURL),
         };
     }
-    var value = (_b = (_a = transitionRoute === null || transitionRoute === void 0 ? void 0 : transitionRoute.pageOptions) === null || _a === void 0 ? void 0 : _a.navLink) !== null && _b !== void 0 ? _b : "/".concat(friendlyURL);
-    if (((_c = transitionRoute === null || transitionRoute === void 0 ? void 0 : transitionRoute.pageOptions) === null || _c === void 0 ? void 0 : _c.navLink) === '/') {
-        value = transitionRoute.pageOptions.navLink;
+    if (((_a = transitionRoute === null || transitionRoute === void 0 ? void 0 : transitionRoute.pageOptions) === null || _a === void 0 ? void 0 : _a.navLink) === '/') {
+        return {
+            type: 'static',
+            content: transitionRoute.pageOptions.navLink,
+        };
     }
-    /*
-      We are using `navLink` + fileName for the target location calculation.
-      See `teleport-project-generator` -> createPageUIDL for more info.
-    */
-    value =
-        ((_d = transitionRoute === null || transitionRoute === void 0 ? void 0 : transitionRoute.pageOptions) === null || _d === void 0 ? void 0 : _d.navLink) && ((_e = transitionRoute === null || transitionRoute === void 0 ? void 0 : transitionRoute.pageOptions) === null || _e === void 0 ? void 0 : _e.fileName)
-            ? (0, path_1.join)(transitionRoute.pageOptions.navLink, "../".concat(transitionRoute.pageOptions.fileName))
-            : (_f = transitionRoute.pageOptions.navLink) !== null && _f !== void 0 ? _f : "/".concat(friendlyURL);
+    var pageOptions = transitionRoute.pageOptions;
     return {
         type: 'static',
-        content: value,
+        content: (_b = pageOptions.navLink) !== null && _b !== void 0 ? _b : "/".concat(friendlyURL),
     };
 };
 //# sourceMappingURL=utils.js.map