Skip to content

Commit e543068

Browse files
committed
quarto build-js
1 parent 7085023 commit e543068

File tree

4 files changed

+123
-39
lines changed

4 files changed

+123
-39
lines changed

src/resources/editor/tools/vs-code.mjs

Lines changed: 49 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8215,6 +8215,24 @@ var require_yaml_intelligence_resources = __commonJS({
82158215
long: "Location of output relative to the code that generated it. The possible values are as follows:\n\n- `default`: Normal flow of the slide after the code\n- `fragment`: In a fragment (not visible until you advance)\n- `slide`: On a new slide after the curent one\n- `column`: In an adjacent column \n- `column-fragment`: In an adjacent column (not visible until you advance)\n\nNote that this option is supported only for the `revealjs` format.\n"
82168216
}
82178217
},
8218+
{
8219+
name: "warning",
8220+
tags: {
8221+
engine: "knitr"
8222+
},
8223+
schema: {
8224+
enum: [
8225+
true,
8226+
false,
8227+
"NA"
8228+
]
8229+
},
8230+
default: true,
8231+
description: {
8232+
short: "Include warning in rendered output.",
8233+
long: "Include warnings in rendered output. Possible values are `true`, `false`, or `NA`. \nIf `true`, messages are included in the output. If `false`, messages are not included. \nIf `NA`, messages are not included in output but shown in the knitr log to console.\n"
8234+
}
8235+
},
82188236
{
82198237
name: "message",
82208238
tags: {
@@ -21651,7 +21669,7 @@ var require_yaml_intelligence_resources = __commonJS({
2165121669
"Short/abbreviated form of container-title;",
2165221670
"A minor contributor to the item; typically cited using \u201Cwith\u201D before\nthe name when listed in a bibliography.",
2165321671
"Curator of an exhibit or collection (e.g. in a museum).",
21654-
"Physical (e.g. size) or temporal (e.g.\uFFFD\uFFFDrunning time) dimensions of\nthe item.",
21672+
"Physical (e.g. size) or temporal (e.g. running time) dimensions of\nthe item.",
2165521673
"Director (e.g. of a film).",
2165621674
"Minor subdivision of a court with a <code>jurisdiction</code> for a\nlegal item",
2165721675
"(Container) edition holding the item (e.g.&nbsp;\u201C3\u201D when citing a chapter\nin the third edition of a book).",
@@ -24196,12 +24214,12 @@ var require_yaml_intelligence_resources = __commonJS({
2419624214
mermaid: "%%"
2419724215
},
2419824216
"handlers/mermaid/schema.yml": {
24199-
_internalId: 194269,
24217+
_internalId: 194272,
2420024218
type: "object",
2420124219
description: "be an object",
2420224220
properties: {
2420324221
"mermaid-format": {
24204-
_internalId: 194261,
24222+
_internalId: 194264,
2420524223
type: "enum",
2420624224
enum: [
2420724225
"png",
@@ -24217,7 +24235,7 @@ var require_yaml_intelligence_resources = __commonJS({
2421724235
exhaustiveCompletions: true
2421824236
},
2421924237
theme: {
24220-
_internalId: 194268,
24238+
_internalId: 194271,
2422124239
type: "anyOf",
2422224240
anyOf: [
2422324241
{
@@ -24817,8 +24835,8 @@ function mappedIndexToLineCol(eitherText) {
2481724835
};
2481824836
}
2481924837
function mappedLines(str2, keepNewLines = false) {
24820-
const lines3 = rangedLines(str2.value, keepNewLines);
24821-
return lines3.map((v) => mappedString(str2, [v.range]));
24838+
const lines2 = rangedLines(str2.value, keepNewLines);
24839+
return lines2.map((v) => mappedString(str2, [v.range]));
2482224840
}
2482324841

2482424842
// parsing.ts
@@ -30795,6 +30813,27 @@ function createLocalizedError(obj) {
3079530813
};
3079630814
}
3079730815

30816+
// ../is-circular.ts
30817+
var isCircular = (obj) => {
30818+
const objectSet = /* @__PURE__ */ new WeakSet();
30819+
const detect = (obj2) => {
30820+
if (obj2 && typeof obj2 === "object") {
30821+
if (objectSet.has(obj2)) {
30822+
return true;
30823+
}
30824+
objectSet.add(obj2);
30825+
for (const key in obj2) {
30826+
if (Object.hasOwn(obj2, key) && detect(obj2[key])) {
30827+
return true;
30828+
}
30829+
}
30830+
objectSet.delete(obj2);
30831+
}
30832+
return false;
30833+
};
30834+
return detect(obj);
30835+
};
30836+
3079830837
// annotated-yaml.ts
3079930838
function postProcessAnnotation(parse) {
3080030839
if (parse.components.length === 1 && parse.start === parse.components[0].start && parse.end === parse.components[0].end) {
@@ -30945,16 +30984,10 @@ function buildJsYamlAnnotation(mappedYaml) {
3094530984
`Expected a single result, got ${results.length} instead`
3094630985
);
3094730986
}
30948-
try {
30949-
JSON.stringify(results[0]);
30950-
} catch (e) {
30951-
if (e.message.match("invalid string length")) {
30952-
} else if (e.message.match(/circular structure/)) {
30953-
throw new InternalError(
30954-
`Circular structure detected in parsed yaml: ${e.message}`
30955-
);
30956-
} else {
30957-
}
30987+
if (isCircular(results[0])) {
30988+
throw new InternalError(
30989+
`Circular structure detected in yaml`
30990+
);
3095830991
}
3095930992
return postProcessAnnotation(results[0]);
3096030993
}

src/resources/editor/tools/yaml/web-worker.js

Lines changed: 49 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/resources/editor/tools/yaml/yaml-intelligence-resources.json

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1187,6 +1187,24 @@
11871187
"long": "Location of output relative to the code that generated it. The possible values are as follows:\n\n- `default`: Normal flow of the slide after the code\n- `fragment`: In a fragment (not visible until you advance)\n- `slide`: On a new slide after the curent one\n- `column`: In an adjacent column \n- `column-fragment`: In an adjacent column (not visible until you advance)\n\nNote that this option is supported only for the `revealjs` format.\n"
11881188
}
11891189
},
1190+
{
1191+
"name": "warning",
1192+
"tags": {
1193+
"engine": "knitr"
1194+
},
1195+
"schema": {
1196+
"enum": [
1197+
true,
1198+
false,
1199+
"NA"
1200+
]
1201+
},
1202+
"default": true,
1203+
"description": {
1204+
"short": "Include warning in rendered output.",
1205+
"long": "Include warnings in rendered output. Possible values are `true`, `false`, or `NA`. \nIf `true`, messages are included in the output. If `false`, messages are not included. \nIf `NA`, messages are not included in output but shown in the knitr log to console.\n"
1206+
}
1207+
},
11901208
{
11911209
"name": "message",
11921210
"tags": {
@@ -14623,7 +14641,7 @@
1462314641
"Short/abbreviated form of container-title;",
1462414642
"A minor contributor to the item; typically cited using “with” before\nthe name when listed in a bibliography.",
1462514643
"Curator of an exhibit or collection (e.g.&nbsp;in a museum).",
14626-
"Physical (e.g.&nbsp;size) or temporal (e.g.��running time) dimensions of\nthe item.",
14644+
"Physical (e.g.&nbsp;size) or temporal (e.g.&nbsp;running time) dimensions of\nthe item.",
1462714645
"Director (e.g.&nbsp;of a film).",
1462814646
"Minor subdivision of a court with a <code>jurisdiction</code> for a\nlegal item",
1462914647
"(Container) edition holding the item (e.g.&nbsp;“3” when citing a chapter\nin the third edition of a book).",
@@ -17168,12 +17186,12 @@
1716817186
"mermaid": "%%"
1716917187
},
1717017188
"handlers/mermaid/schema.yml": {
17171-
"_internalId": 194269,
17189+
"_internalId": 194272,
1717217190
"type": "object",
1717317191
"description": "be an object",
1717417192
"properties": {
1717517193
"mermaid-format": {
17176-
"_internalId": 194261,
17194+
"_internalId": 194264,
1717717195
"type": "enum",
1717817196
"enum": [
1717917197
"png",
@@ -17189,7 +17207,7 @@
1718917207
"exhaustiveCompletions": true
1719017208
},
1719117209
"theme": {
17192-
"_internalId": 194268,
17210+
"_internalId": 194271,
1719317211
"type": "anyOf",
1719417212
"anyOf": [
1719517213
{

src/resources/formats/html/esbuild-analysis-cache.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"quarto.js": {
33
"inputs": {
44
"quarto.js": {
5-
"bytes": 26327,
5+
"bytes": 26396,
66
"imports": [],
77
"format": "esm"
88
}
@@ -20,10 +20,10 @@
2020
"entryPoint": "quarto.js",
2121
"inputs": {
2222
"quarto.js": {
23-
"bytesInOutput": 21890
23+
"bytesInOutput": 21946
2424
}
2525
},
26-
"bytes": 21890
26+
"bytes": 21946
2727
}
2828
}
2929
}

0 commit comments

Comments
 (0)