Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Fix circular dependency #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wooorm merged 1 commit into syntax-tree:main from SQReder:fix-circular-deps
Jun 8, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions index.js
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,5 @@
* @typedef {import('./lib/index.js').H} H
*/

export {all} from './lib/all.js'
export {one} from './lib/one.js'
export {one, all} from './lib/traverse.js'
export {toHast} from './lib/index.js'
50 changes: 0 additions & 50 deletions lib/all.js
View file Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion lib/handlers/blockquote.js
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

import {wrap} from '../wrap.js'
import {all} from '../all.js'
import {all} from '../traverse.js'

/**
* @type {Handler}
Expand Down
2 changes: 1 addition & 1 deletion lib/handlers/delete.js
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @typedef {import('../index.js').Handler} Handler
*/

import {all} from '../all.js'
import {all} from '../traverse.js'

/**
* @type {Handler}
Expand Down
2 changes: 1 addition & 1 deletion lib/handlers/emphasis.js
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @typedef {import('../index.js').Handler} Handler
*/

import {all} from '../all.js'
import {all} from '../traverse.js'

/**
* @type {Handler}
Expand Down
2 changes: 1 addition & 1 deletion lib/handlers/heading.js
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @typedef {import('../index.js').Handler} Handler
*/

import {all} from '../all.js'
import {all} from '../traverse.js'

/**
* @type {Handler}
Expand Down
2 changes: 1 addition & 1 deletion lib/handlers/link-reference.js
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import normalize from 'mdurl/encode.js'
import {revert} from '../revert.js'
import {all} from '../all.js'
import {all} from '../traverse.js'

/**
* @type {Handler}
Expand Down
2 changes: 1 addition & 1 deletion lib/handlers/link.js
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

import normalize from 'mdurl/encode.js'
import {all} from '../all.js'
import {all} from '../traverse.js'

/**
* @type {Handler}
Expand Down
2 changes: 1 addition & 1 deletion lib/handlers/list-item.js
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*/

import {u} from 'unist-builder'
import {all} from '../all.js'
import {all} from '../traverse.js'

/**
* @type {Handler}
Expand Down
2 changes: 1 addition & 1 deletion lib/handlers/list.js
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

import {wrap} from '../wrap.js'
import {all} from '../all.js'
import {all} from '../traverse.js'

/**
* @type {Handler}
Expand Down
2 changes: 1 addition & 1 deletion lib/handlers/paragraph.js
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @typedef {import('../index.js').Handler} Handler
*/

import {all} from '../all.js'
import {all} from '../traverse.js'

/**
* @type {Handler}
Expand Down
2 changes: 1 addition & 1 deletion lib/handlers/root.js
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

import {u} from 'unist-builder'
import {all} from '../all.js'
import {all} from '../traverse.js'
import {wrap} from '../wrap.js'

/**
Expand Down
2 changes: 1 addition & 1 deletion lib/handlers/strong.js
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @typedef {import('../index.js').Handler} Handler
*/

import {all} from '../all.js'
import {all} from '../traverse.js'

/**
* @type {Handler}
Expand Down
2 changes: 1 addition & 1 deletion lib/handlers/table.js
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

import {pointStart, pointEnd} from 'unist-util-position'
import {wrap} from '../wrap.js'
import {all} from '../all.js'
import {all} from '../traverse.js'

/**
* @type {Handler}
Expand Down
2 changes: 1 addition & 1 deletion lib/index.js
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ import {visit} from 'unist-util-visit'
import {pointStart, pointEnd} from 'unist-util-position'
import {generated} from 'unist-util-generated'
import {definitions} from 'mdast-util-definitions'
import {one} from './one.js'
import {one} from './traverse.js'
import {footer} from './footer.js'
import {handlers} from './handlers/index.js'

Expand Down
2 changes: 1 addition & 1 deletion lib/revert.js
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

import {u} from 'unist-builder'
import {all} from './all.js'
import {all} from './traverse.js'

/**
* Return the content of a reference without definition as plain text.
Expand Down
44 changes: 43 additions & 1 deletion lib/one.js → lib/traverse.js
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
* @typedef {import('mdast').Text} Text
* @typedef {import('./index.js').H} H
* @typedef {import('./index.js').Handler} Handler
* @typedef {import('./index.js').Content} Content
*/

import {u} from 'unist-builder'
import {all} from './all.js'

var own = {}.hasOwnProperty

Expand Down Expand Up @@ -74,3 +74,45 @@ function returnNode(h, node) {
// @ts-ignore pass through any unknown node.
return node.children ? {...node, children: all(h, node)} : node
}

/**
* @param {H} h
* @param {Node} parent
*/
export function all(h, parent) {
/** @type {Array.<Node>} */
// @ts-ignore looks like a parent.
var nodes = parent.children || []
var index = -1
/** @type {Array.<Content>} */
var values = []
/** @type {Content} */
var result
/** @type {Content} */
var head

while (++index < nodes.length) {
// @ts-ignore looks like a parent.
result = one(h, nodes[index], parent)

if (result) {
if (index && nodes[index - 1].type === 'break') {
if (result.type === 'text') {
result.value = result.value.replace(/^\s+/, '')
}

if (result.type === 'element') {
head = result.children[0]

if (head && head.type === 'text') {
head.value = head.value.replace(/^\s+/, '')
}
}
}

values = values.concat(result)
}
}

return values
}
3 changes: 2 additions & 1 deletion package.json
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,8 @@
"rules": {
"max-depth": "off",
"no-var": "off",
"prefer-arrow-callback": "off"
"prefer-arrow-callback": "off",
"import/no-cycle": "error"
}
},
"remarkConfig": {
Expand Down
3 changes: 1 addition & 2 deletions test/handlers-option.js
View file Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import test from 'tape'
import {u} from 'unist-builder'
import {toHast} from '../index.js'
import {all} from '../lib/all.js'
import {all, toHast} from '../index.js'

test('handlers option', function (t) {
t.deepEqual(
Expand Down

AltStyle によって変換されたページ (->オリジナル) /