Merge pull request #1 from navikt/update-pipeline

chore: 🤖 updated pipeline to include PRs

Author: nutgaard

.github/workflows/pr.yaml

@@ -2,8 +2,8 @@ name: Test and build
 
 on:
   push:
-    branches:
-      - !master
+    branches-ignore:
+      - master
 
 env:
   CI: true

README.md

@@ -25,7 +25,7 @@ type Rule = {
     scope: RuleScope;
     regex: RegExp;
     parse(match: RegexMatch): ASTNode;
-    react(node: ASTNode): ReactElementDescription;
+    react(node: ASTNode, ast: AST): ReactElementDescription;
 }
 
 const atRule = {
@@ -35,7 +35,7 @@ const atRule = {
   parse(match): ASTNode {
     return { name: 'atRule', content: [match.capture[0]] }
   },
-  react(node: ASTNode): ReactElementDescription {
+  react(node: ASTNode, ast: AST): ReactElementDescription {
     return { type: 'a', props: { href: `https://url.com?user=${Utils.getText(node)}` } }
   }
 };
@@ -48,7 +48,7 @@ import { Link } from 'react-router';
 
 const customLinkRule: Rule = {
     ...LinkRule,
-    react(node: string | { name: string; content: AST }): ReactElementDescription {
+    react(node: ASTNode, ast: AST): ReactElementDescription {
         return {type: Link, props: {className: 'paragraph-class', to: Utils.getText(node) }}
     }
 };

src/domain.ts

@@ -1,4 +1,4 @@
-import React from 'react';
+import { ReactNode, ComponentType } from 'react';
 
 export type ASTNode =
     | string
@@ -19,14 +19,14 @@ export type Rule = {
     scope: RuleScope;
     regex: RegExp;
     parse(match: RegexMatch): ASTNode;
-    react(node: ASTNode): ReactElementDescription;
+    react(node: ASTNode, ast: AST): ReactElementDescription;
     [key: string]: any;
 };
 
 export interface ReactElementDescription {
-    type: string | React.ComponentType<any>;
+    type: string | ComponentType<any>;
     props?: { [key: string]: any };
-    children?: Array<React.ReactNode>;
+    children?: Array<ReactNode>;
 }
 
 export type RegexMatch = {

src/parser.ts

@@ -80,16 +80,16 @@ function simplify(node: ASTNode): Array<ASTNode> {
     }
 }
 
-function internalBuild(ruleMap: { [name: string]: Rule }, node: ASTNode, key: number): React.ReactNode {
+function internalBuild(ast: AST, ruleMap: { [name: string]: Rule }, node: ASTNode, key: number): React.ReactNode {
     if (typeof node === 'string') {
         return node;
     }
     const type = ruleMap[node.name];
-    const element = type.react(node);
+    const element = type.react(node, ast);
     const children =
         element.children?.length === 0 || node.content.length === 0
             ? undefined
-            : element.children || node.content.map((child, i) => internalBuild(ruleMap, child, i));
+            : element.children || node.content.map((child, i) => internalBuild(ast, ruleMap, child, i));
     return createElement(element.type, {...element.props, key}, children);
 }
 
@@ -112,6 +112,6 @@ export function parse(content: string, rules: Array<Rule>): AST {
 
 export function build(ast: AST, rules: Array<Rule>): ReactElement<{}> {
     const ruleMap = rules.reduce((acc, rule) => ({...acc, [rule.name]: rule}), {});
-    const nodes = ast.map((node, i) => internalBuild(ruleMap, node, i));
+    const nodes = ast.map((node, i) => internalBuild(ast, ruleMap, node, i));
     return createElement(Fragment, {}, nodes);
 }

test/rules.test.ts

@@ -26,7 +26,7 @@ describe('rules', () => {
                 name: 'Linebreak',
                 content: []
             });
-            expect(LinebreakRule.react('')).toEqual({
+            expect(LinebreakRule.react('', [])).toEqual({
                 type: 'br'
             });
         });
@@ -46,7 +46,7 @@ describe('rules', () => {
                 name: 'Paragraph',
                 content: ['Content here']
             });
-            expect(ParagraphRule.react('')).toEqual({
+            expect(ParagraphRule.react('', [])).toEqual({
                 type: 'p'
             });
         });
@@ -80,7 +80,7 @@ describe('rules', () => {
                 name: 'Highlight',
                 content: ['Content here']
             });
-            expect(HighlightRule.react('')).toEqual({
+            expect(HighlightRule.react('', [])).toEqual({
                 type: 'em'
             });
         });
@@ -112,7 +112,7 @@ describe('rules', () => {
                 name: 'DynamicHighlight',
                 content: ['Content here']
             });
-            expect(rule.react('')).toEqual({
+            expect(rule.react('', [])).toEqual({
                 type: 'em'
             });
         });
@@ -142,7 +142,7 @@ describe('rules', () => {
                 name: 'Bold',
                 content: ['Content here']
             });
-            expect(BoldRule.react('')).toEqual({
+            expect(BoldRule.react('', [])).toEqual({
                 type: 'b'
             });
         });
@@ -173,7 +173,7 @@ describe('rules', () => {
                 name: 'Link',
                 content: ['Content here']
             });
-            expect(LinkRule.react({name: 'Link', content: ['url.com']})).toEqual({
+            expect(LinkRule.react({name: 'Link', content: ['url.com']}, [])).toEqual({
                 type: 'a',
                 props: {target: '_blank', rel: 'noopener', href: 'https://url.com'}
             });
@@ -188,7 +188,7 @@ describe('rules', () => {
                     '.com'
                 ]
             };
-            expect(LinkRule.react(astnode)).toMatchObject({
+            expect(LinkRule.react(astnode, [])).toMatchObject({
                 type: 'a',
                 props: {
                     href: 'https://www.domain.com',
@@ -208,7 +208,7 @@ describe('rules', () => {
                     '.com'
                 ]
             };
-            expect(LinkRule.react(astnode)).toMatchObject({
+            expect(LinkRule.react(astnode, [])).toMatchObject({
                 type: 'a',
                 props: {
                     href: 'http://www.domain.com',