@atjson/renderer-commonmark - npm Package Compare versions

Comparing version 0.7.1 to 0.7.2

dist/commonjs/index.js

@@ -67,3 +67,3 @@ "use strict";
     }
-    *'blockquote'(_, state) {
+    *'quotation'(_, state) {
         let text = yield;
@@ -103,5 +103,5 @@ let lines = text.join('').split('\n');
             let title = props.title.replace(/"/g, '\\"');
-            return `![${props.alt}](${props.url} "${title}")`;
+            return `![${props.description}](${props.url} "${title}")`;
         }
-        return `![${props.alt}](${props.url})`;
+        return `![${props.description}](${props.url})`;
     }
@@ -121,8 +121,8 @@ *'italic'(_, state) {
         let [before, text, after] = yield* split();
-        let href = escapeAttribute(props.href);
+        let url = escapeAttribute(props.url);
         if (props.title) {
             let title = props.title.replace(/"/g, '\\"');
-            return `${before}[${text}](${href} "${title}")${after}`;
+            return `${before}[${text}](${url} "${title}")${after}`;
         }
-        return `${before}[${text}](${href})${after}`;
+        return `${before}[${text}](${url})${after}`;
     }
@@ -149,3 +149,3 @@ *'code'(props, state) {
         else if (props.style === 'block') {
-            return code.split('\n').map(line => `    ${line}`).join('\n') + '\n';
+            return code.split('\n').map((line) => `    ${line}`).join('\n') + '\n';
         }
@@ -187,4 +187,4 @@ else {
         let lines = item.split('\n');
-        lines.push(lines.pop().replace(/[ ]+$/, ''));
-        lines.unshift(lines.shift().replace(/^[ ]+/, ''));
+        lines.push((lines.pop() || '').replace(/[ ]+$/, ''));
+        lines.unshift((lines.shift() || '').replace(/^[ ]+/, ''));
         let [first, ...rest] = lines;
@@ -197,11 +197,22 @@ item = ' '.repeat(firstCharacter) + first + '\n' + rest.map(line => indent + line).join('\n').replace(/[ ]+$/, '');
     }
-    *'ordered-list'(props, state) {
+    *'list'(props, state) {
         let start = 1;
-        if (props && props.start != null) {
-            start = props.start;
+        if (props && props.startsAt != null) {
+            start = props.startsAt;
         }
-        let delimiter = '.';
-        if (state.get('previous.type') === 'numbered' && state.get('previous.delimiter') === '.') {
-            delimiter = ')';
+        let delimiter = '';
+        if (props.type === 'numbered') {
+            delimiter = '.';
+            if (state.get('previous.type') === 'numbered' &&
+                state.get('previous.delimiter') === '.') {
+                delimiter = ')';
+            }
         }
+        else if (props.type === 'bulleted') {
+            delimiter = '-';
+            if (state.get('previous.type') === 'bulleted' &&
+                state.get('previous.delimiter') === '-') {
+                delimiter = '+';
+            }
+        }
         let hasCodeBlockFollowing = state.get('nextAnnotation.type') === 'code' &&
@@ -211,3 +222,3 @@ state.get('nextAnnotation.attributes.style') === 'block';
             isList: true,
-            type: 'numbered',
+            type: props.type,
             digit: start,
@@ -226,3 +237,3 @@ previous: state.get('previous'),
             isList: true,
-            type: 'numbered',
+            type: props.type,
             delimiter
@@ -232,29 +243,2 @@ });
     }
-    *'unordered-list'(props, state) {
-        let delimiter = '-';
-        if (state.get('previous.type') === 'bulleted' && state.get('previous.delimiter') === '-') {
-            delimiter = '+';
-        }
-        let hasCodeBlockFollowing = state.get('nextAnnotation.type') === 'code' &&
-            state.get('nextAnnotation.attributes.style') === 'block';
-        state.push({
-            isList: true,
-            type: 'bulleted',
-            previous: state.get('previous'),
-            delimiter,
-            tight: props && props.tight,
-            hasCodeBlockFollowing
-        });
-        let list = yield;
-        state.pop();
-        state.set('previous', {
-            isList: true,
-            type: 'bulleted',
-            delimiter
-        });
-        if (props && props.tight) {
-            list = list.map(item => item.replace(/([ \n])+$/, '\n'));
-        }
-        return list.join('') + '\n';
-    }
     *'paragraph'(_, state) {
@@ -269,2 +253,2 @@ let text = yield;
 exports.default = CommonmarkRenderer;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}

dist/modules/index.js

@@ -1,2 +0,1 @@
-"use strict";
 import Renderer from '@atjson/renderer-hir';
@@ -65,3 +64,3 @@ export function* split() {
     }
-    *'blockquote'(_, state) {
+    *'quotation'(_, state) {
         let text = yield;
@@ -101,5 +100,5 @@ let lines = text.join('').split('\n');
             let title = props.title.replace(/"/g, '\\"');
-            return `![${props.alt}](${props.url} "${title}")`;
+            return `![${props.description}](${props.url} "${title}")`;
         }
-        return `![${props.alt}](${props.url})`;
+        return `![${props.description}](${props.url})`;
     }
@@ -119,8 +118,8 @@ *'italic'(_, state) {
         let [before, text, after] = yield* split();
-        let href = escapeAttribute(props.href);
+        let url = escapeAttribute(props.url);
         if (props.title) {
             let title = props.title.replace(/"/g, '\\"');
-            return `${before}[${text}](${href} "${title}")${after}`;
+            return `${before}[${text}](${url} "${title}")${after}`;
         }
-        return `${before}[${text}](${href})${after}`;
+        return `${before}[${text}](${url})${after}`;
     }
@@ -147,3 +146,3 @@ *'code'(props, state) {
         else if (props.style === 'block') {
-            return code.split('\n').map(line => `    ${line}`).join('\n') + '\n';
+            return code.split('\n').map((line) => `    ${line}`).join('\n') + '\n';
         }
@@ -185,4 +184,4 @@ else {
         let lines = item.split('\n');
-        lines.push(lines.pop().replace(/[ ]+$/, ''));
-        lines.unshift(lines.shift().replace(/^[ ]+/, ''));
+        lines.push((lines.pop() || '').replace(/[ ]+$/, ''));
+        lines.unshift((lines.shift() || '').replace(/^[ ]+/, ''));
         let [first, ...rest] = lines;
@@ -195,11 +194,22 @@ item = ' '.repeat(firstCharacter) + first + '\n' + rest.map(line => indent + line).join('\n').replace(/[ ]+$/, '');
     }
-    *'ordered-list'(props, state) {
+    *'list'(props, state) {
         let start = 1;
-        if (props && props.start != null) {
-            start = props.start;
+        if (props && props.startsAt != null) {
+            start = props.startsAt;
         }
-        let delimiter = '.';
-        if (state.get('previous.type') === 'numbered' && state.get('previous.delimiter') === '.') {
-            delimiter = ')';
+        let delimiter = '';
+        if (props.type === 'numbered') {
+            delimiter = '.';
+            if (state.get('previous.type') === 'numbered' &&
+                state.get('previous.delimiter') === '.') {
+                delimiter = ')';
+            }
         }
+        else if (props.type === 'bulleted') {
+            delimiter = '-';
+            if (state.get('previous.type') === 'bulleted' &&
+                state.get('previous.delimiter') === '-') {
+                delimiter = '+';
+            }
+        }
         let hasCodeBlockFollowing = state.get('nextAnnotation.type') === 'code' &&
@@ -209,3 +219,3 @@ state.get('nextAnnotation.attributes.style') === 'block';
             isList: true,
-            type: 'numbered',
+            type: props.type,
             digit: start,
@@ -224,3 +234,3 @@ previous: state.get('previous'),
             isList: true,
-            type: 'numbered',
+            type: props.type,
             delimiter
@@ -230,29 +240,2 @@ });
     }
-    *'unordered-list'(props, state) {
-        let delimiter = '-';
-        if (state.get('previous.type') === 'bulleted' && state.get('previous.delimiter') === '-') {
-            delimiter = '+';
-        }
-        let hasCodeBlockFollowing = state.get('nextAnnotation.type') === 'code' &&
-            state.get('nextAnnotation.attributes.style') === 'block';
-        state.push({
-            isList: true,
-            type: 'bulleted',
-            previous: state.get('previous'),
-            delimiter,
-            tight: props && props.tight,
-            hasCodeBlockFollowing
-        });
-        let list = yield;
-        state.pop();
-        state.set('previous', {
-            isList: true,
-            type: 'bulleted',
-            delimiter
-        });
-        if (props && props.tight) {
-            list = list.map(item => item.replace(/([ \n])+$/, '\n'));
-        }
-        return list.join('') + '\n';
-    }
     *'paragraph'(_, state) {
@@ -266,2 +249,2 @@ let text = yield;
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}

package.json

 {
   "name": "@atjson/renderer-commonmark",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "description": "A brand new TypeScript library.",
@@ -18,5 +18,5 @@ "main": "dist/commonjs/index.js",
   "devDependencies": {
-    "@atjson/document": "^0.7.0",
-    "@atjson/hir": "^0.7.0",
-    "@atjson/source-commonmark": "^0.7.1",
+    "@atjson/document": "^0.7.2",
+    "@atjson/hir": "^0.7.2",
+    "@atjson/source-commonmark": "^0.7.2",
     "commonmark-spec": "^0.28.0",
@@ -27,4 +27,4 @@ "tslint": "^5.9.1",
   "dependencies": {
-    "@atjson/renderer-hir": "^0.7.0"
+    "@atjson/renderer-hir": "^0.7.2"
   }
 }

src/index.ts

 import { HIRNode } from '@atjson/hir';
 import Renderer, { State } from '@atjson/renderer-hir';
 
-export function* split() {
+export function* split(): IterableIterator<string> {
   let rawText = yield;
@@ -20,3 +20,3 @@ let text = rawText.join('');
 
-type CodeStyle = 'block' | 'inline' | 'fence';
+export type CodeStyle = 'block' | 'inline' | 'fence';
 
@@ -93,3 +93,3 @@ // http://spec.commonmark.org/0.28/#backslash-escapes
    */
-  *'blockquote'(_, state: State): IterableIterator<string> {
+  *'quotation'(_: any, state: State): IterableIterator<string> {
     let text: string[] = yield;
@@ -149,8 +149,8 @@ let lines: string[] = text.join('').split('\n');
    */
-  *'image'(props: { alt: string, title?: string, url: string }): IterableIterator<string> {
+  *'image'(props: { description: string, title?: string, url: string }): IterableIterator<string> {
     if (props.title) {
       let title = props.title.replace(/"/g, '\\"');
-      return `![${props.alt}](${props.url} "${title}")`;
+      return `![${props.description}](${props.url} "${title}")`;
     }
-    return `![${props.alt}](${props.url})`;
+    return `![${props.description}](${props.url})`;
   }
@@ -161,3 +161,3 @@
    */
-  *'italic'(_, state: State): IterableIterator<string> {
+  *'italic'(_: any, state: State): IterableIterator<string> {
     // This adds support for strong emphasis (per Commonmark)
@@ -184,10 +184,10 @@ // Strong emphasis includes _*two*_ emphasis markers around text.
    */
-  *'link'(props: { href: string, title?: string }): IterableIterator<string> {
+  *'link'(props: { url: string, title?: string }): IterableIterator<string> {
     let [before, text, after] = yield* split();
-    let href = escapeAttribute(props.href);
+    let url = escapeAttribute(props.url);
     if (props.title) {
       let title = props.title.replace(/"/g, '\\"');
-      return `${before}[${text}](${href} "${title}")${after}`;
+      return `${before}[${text}](${url} "${title}")${after}`;
     }
-    return `${before}[${text}](${href})${after}`;
+    return `${before}[${text}](${url})${after}`;
   }
@@ -222,3 +222,3 @@
     } else if (props.style === 'block') {
-      return code.split('\n').map(line => `    ${line}`).join('\n') + '\n';
+      return code.split('\n').map((line: string) => `    ${line}`).join('\n') + '\n';
     } else {
@@ -253,3 +253,3 @@ // MarkdownIt strips all leading and trailing whitespace from code blocks,
    */
-  *'list-item'(_, state: State): IterableIterator<string> {
+  *'list-item'(_: any, state: State): IterableIterator<string> {
     let digit: number = state.get('digit');
@@ -262,2 +262,3 @@ let delimiter = state.get('delimiter');
     }
+
     let indent = ' '.repeat(marker.length + 1);
@@ -268,5 +269,6 @@ let text: string[] = yield;
     while (item[firstCharacter] === ' ') firstCharacter++;
-    let lines = item.split('\n');
-    lines.push(lines.pop().replace(/[ ]+$/, ''));
-    lines.unshift(lines.shift().replace(/^[ ]+/, ''));
+
+    let lines: string[] = item.split('\n');
+    lines.push((lines.pop() || '').replace(/[ ]+$/, ''));
+    lines.unshift((lines.shift() || '').replace(/^[ ]+/, ''));
     let [first, ...rest] = lines;
@@ -292,11 +294,24 @@
    */
-  *'ordered-list'(props: { start?: number, tight: boolean }, state: State): IterableIterator<string> {
+  *'list'(props: { type: string, startsAt?: number, tight: boolean }, state: State): IterableIterator<string> {
     let start = 1;
 
-    if (props && props.start != null) {
-      start = props.start;
+    if (props && props.startsAt != null) {
+      start = props.startsAt;
     }
-    let delimiter = '.';
-    if (state.get('previous.type') === 'numbered' && state.get('previous.delimiter') === '.') {
-      delimiter = ')';
+
+    let delimiter = '';
+    if (props.type === 'numbered') {
+      delimiter = '.';
+
+      if (state.get('previous.type') === 'numbered' &&
+          state.get('previous.delimiter') === '.') {
+        delimiter = ')';
+      }
+    } else if (props.type === 'bulleted') {
+      delimiter = '-';
+
+      if (state.get('previous.type') === 'bulleted' &&
+          state.get('previous.delimiter') === '-') {
+        delimiter = '+';
+      }
     }
@@ -307,7 +322,7 @@
     let hasCodeBlockFollowing = state.get('nextAnnotation.type') === 'code' &&
-                                state.get('nextAnnotation.attributes.style') === 'block');
+                                state.get('nextAnnotation.attributes.style') === 'block';
 
     state.push({
       isList: true,
-      type: 'numbered',
+      type: props.type,
       digit: start,
@@ -319,7 +334,7 @@ previous: state.get('previous'),
     });
-    let list = yield;
+    let list: string[] = yield;
     state.pop();
 
     if (props && props.tight) {
-      list = list.map(item => item.replace(/([ \n])+$/, '\n');
+      list = list.map(item => item.replace(/([ \n])+$/, '\n'));
     }
@@ -329,3 +344,3 @@
       isList: true,
-      type: 'numbered',
+      type: props.type,
       delimiter
@@ -338,46 +353,5 @@ });
   /**
-   * - An unordered list contains
-   * - A number
-   * - Of things with dashes preceding them
-   */
-  *'unordered-list'(props: { tight: boolean }, state: State): IterableIterator<string> {
-    let delimiter = '-';
-    if (state.get('previous.type') === 'bulleted' && state.get('previous.delimiter') === '-') {
-      delimiter = '+';
-    }
-
-    // Handle indendation for code blocks that immediately follow
-    // a list.
-    let hasCodeBlockFollowing = state.get('nextAnnotation.type') === 'code' &&
-                                state.get('nextAnnotation.attributes.style') === 'block');
-
-    state.push({
-      isList: true,
-      type: 'bulleted',
-      previous: state.get('previous'),
-      delimiter,
-      tight: props && props.tight,
-      hasCodeBlockFollowing
-    });
-
-    let list = yield;
-    state.pop();
-
-    state.set('previous', {
-      isList: true,
-      type: 'bulleted',
-      delimiter
-    });
-
-    if (props && props.tight) {
-      list = list.map(item => item.replace(/([ \n])+$/, '\n');
-    }
-
-    return list.join('') + '\n';
-  }
-
-  /**
    * Paragraphs are delimited by two or more newlines in markdown.
    */
-  *'paragraph'(_, state: State): IterableIterator<string> {
+  *'paragraph'(_: any, state: State): IterableIterator<string> {
     let text = yield;
@@ -384,0 +358,0 @@ if (state.get('tight')) {

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Major refactor

Supply chain risk

Package has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.

Found 1 instance in 1 package

New author

Supply chain risk

A new npm collaborator published a version of the package for the first time. New collaborators are usually benign additions to a project, but do indicate a change to the security surface area of a package.

Found 1 instance in 1 package

Improved metrics

Number of package files

7

increased by16.67%

Lines of code

863

increased by2.25%

Number of medium supply chain risk alerts

0

decreased by-100%

Worsened metrics

Total package byte prevSize

55806

decreased by-0.81%

Dependency changes

• Updated@atjson/renderer-hir@^0.7.2