Skip to content

Commit

Permalink
Merge branch 'update-dependencies' into 'main'
Browse files Browse the repository at this point in the history
Update dependencies

See merge request reportcreator/reportcreator!766
  • Loading branch information
MWedl committed Nov 18, 2024
2 parents e110af3 + 633f97c commit 54dd187
Show file tree
Hide file tree
Showing 13 changed files with 3,023 additions and 9,184 deletions.
2 changes: 1 addition & 1 deletion api/NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -1149,7 +1149,7 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


channels-redis
channels_redis
BSD
Copyright (c) Django Software Foundation and individual contributors.
All rights reserved.
Expand Down
532 changes: 267 additions & 265 deletions api/poetry.lock

Large diffs are not rendered by default.

6,422 changes: 956 additions & 5,466 deletions packages/NOTICE

Large diffs are not rendered by default.

70 changes: 44 additions & 26 deletions packages/markdown/mdext/label-end.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
/**
* @typedef {import('micromark-util-types').Construct} Construct
* @typedef {import('micromark-util-types').Event} Event
* @typedef {import('micromark-util-types').Resolver} Resolver
* @typedef {import('micromark-util-types').State} State
* @typedef {import('micromark-util-types').Token} Token
* @typedef {import('micromark-util-types').TokenizeContext} TokenizeContext
* @typedef {import('micromark-util-types').Tokenizer} Tokenizer
* @import {
* Construct,
* Event,
* Resolver,
* State,
* TokenizeContext,
* Tokenizer,
* Token
* } from 'micromark-util-types'
*/

import {factoryDestination} from 'micromark-factory-destination'
Expand All @@ -20,11 +22,11 @@ import {codes, constants, types} from 'micromark-util-symbol'
import { assert } from './helpers'

/** @type {Construct} */
const labelEnd = {
export const labelEnd = {
name: 'labelEndCustom',
tokenize: tokenizeLabelEnd,
resolveAll: resolveAllLabelEnd,
resolveTo: resolveToLabelEnd,
resolveAll: resolveAllLabelEnd
tokenize: tokenizeLabelEnd
}

/** @type {Construct} */
Expand All @@ -38,8 +40,11 @@ const referenceCollapsedConstruct = {tokenize: tokenizeReferenceCollapsed}
function resolveAllLabelEnd(events) {
let index = -1

/** @type {Array<Event>} */
const newEvents = []
while (++index < events.length) {
const token = events[index][1]
newEvents.push(events[index])

if (
token.type === types.labelImage ||
Expand All @@ -49,12 +54,17 @@ function resolveAllLabelEnd(events) {
token.type === 'inlineFootnoteEnd'
) {
// Remove the marker.
events.splice(index + 1, (token.type === types.labelImage || token.type === 'inlineFootnoteStart') ? 4 : 2)
const offset = (token.type === types.labelImage || token.type === 'inlineFootnoteStart') ? 4 : 2
token.type = types.data
index++
index += offset
}
}

// If the events are equal, we don't have to copy newEvents to events
if (events.length !== newEvents.length) {
splice(events, 0, events.length, newEvents)
}

return events
}

Expand Down Expand Up @@ -93,7 +103,7 @@ function resolveToLabelEnd(events, context) {
if (
events[index][0] === 'enter' &&
(token.type === types.labelImage || token.type === types.labelLink || token.type === 'inlineFootnoteStart') &&
!token._labelEnd_balanced
!token._labelEndCustom_balanced
) {
open = index

Expand All @@ -112,20 +122,20 @@ function resolveToLabelEnd(events, context) {

const group = {
type: events[open][1].type === types.labelLink ? types.link : types.image,
start: Object.assign({}, events[open][1].start),
end: Object.assign({}, events[events.length - 1][1].end)
start: {...events[open][1].start},
end: {...events[events.length - 1][1].end}
}

const label = {
type: types.label,
start: Object.assign({}, events[open][1].start),
end: Object.assign({}, events[close][1].end)
start: {...events[open][1].start},
end: {...events[close][1].end}
}

const text = {
type: types.labelText,
start: Object.assign({}, events[open + offset + 2][1].end),
end: Object.assign({}, events[close - 2][1].start)
start: {...events[open + offset + 2][1].end},
end: {...events[close - 2][1].start}
}

media = [
Expand All @@ -139,6 +149,12 @@ function resolveToLabelEnd(events, context) {
// Text open.
media = push(media, [['enter', text, context]])

// Always populated by defaults.
assert(
context.parser.constructs.insideSpan.null,
'expected `insideSpan.null` to be populated'
)

// Between.
media = push(
media,
Expand All @@ -149,11 +165,6 @@ function resolveToLabelEnd(events, context) {
)
)

// Always populated by defaults.
assert(
context.parser.constructs.insideSpan.null,
'expected `insideSpan.null` to be populated'
)
// Text close, marker close, label close.
media = push(media, [
['exit', text, context],
Expand All @@ -175,6 +186,7 @@ function resolveToLabelEnd(events, context) {

/**
* @this {TokenizeContext}
* Context.
* @type {Tokenizer}
*/
function tokenizeLabelEnd(effects, ok, nok) {
Expand All @@ -191,7 +203,7 @@ function tokenizeLabelEnd(effects, ok, nok) {
(self.events[index][1].type === types.labelImage ||
self.events[index][1].type === types.labelLink ||
self.events[index][1].type === 'inlineFootnoteStart') &&
!self.events[index][1]._labelEnd_balanced
!self.events[index][1]._labelEndCustom_balanced
) {
labelStart = self.events[index][1]
break
Expand Down Expand Up @@ -266,6 +278,9 @@ function tokenizeLabelEnd(effects, ok, nok) {
* @type {State}
*/
function after(code) {
// Note: `markdown-rs` also parses GFM footnotes here, which for us is in
// an extension.

// Resource (`[asd](fgh)`)?
if (code === codes.leftParenthesis) {
return effects.attempt(
Expand Down Expand Up @@ -348,13 +363,14 @@ function tokenizeLabelEnd(effects, ok, nok) {
* @type {State}
*/
function labelEndNok(code) {
labelStart._labelEnd_balanced = true
labelStart._labelEndCustom_balanced = true
return nok(code)
}
}

/**
* @this {TokenizeContext}
* Context.
* @type {Tokenizer}
*/
function tokenizeResource(effects, ok, nok) {
Expand Down Expand Up @@ -523,6 +539,7 @@ function tokenizeResource(effects, ok, nok) {

/**
* @this {TokenizeContext}
* Context.
* @type {Tokenizer}
*/
function tokenizeReferenceFull(effects, ok, nok) {
Expand Down Expand Up @@ -590,6 +607,7 @@ function tokenizeReferenceFull(effects, ok, nok) {

/**
* @this {TokenizeContext}
* Context.
* @type {Tokenizer}
*/
function tokenizeReferenceCollapsed(effects, ok, nok) {
Expand Down
2 changes: 1 addition & 1 deletion packages/nuxt-base-layer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"@pinia/nuxt": "^0.5.1",
"@pinia-plugin-persistedstate/nuxt": "^1.2.0",
"sass-embedded": "^1.79.5",
"@nuxt/eslint": "^0.6.1",
"@nuxt/eslint": "^0.7.0",
"@vueuse/nuxt": "^11.1.0",

"emoji-mart-vue-fast": "^15.0.0",
Expand Down
Loading

0 comments on commit 54dd187

Please sign in to comment.