Skip to content

Commit 1fb8b7b

Browse files
artifacts
1 parent b2941c4 commit 1fb8b7b

File tree

7 files changed

+111
-22
lines changed

7 files changed

+111
-22
lines changed

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

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13050,6 +13050,22 @@ var require_yaml_intelligence_resources = __commonJS({
1305013050
}
1305113051
}
1305213052
},
13053+
{
13054+
id: "brand-path-only-light-dark",
13055+
anyOf: [
13056+
"string",
13057+
{
13058+
object: {
13059+
closed: true,
13060+
properties: {
13061+
light: "string",
13062+
dark: "string"
13063+
}
13064+
}
13065+
}
13066+
],
13067+
description: "A path to a brand.yml file, or an object with light and dark paths to brand.yml\n"
13068+
},
1305313069
{
1305413070
id: "brand-path-bool-light-dark",
1305513071
anyOf: [
@@ -20452,9 +20468,9 @@ var require_yaml_intelligence_resources = __commonJS({
2045220468
},
2045320469
brand: {
2045420470
schema: {
20455-
ref: "brand-path-bool-light-dark"
20471+
ref: "brand-path-only-light-dark"
2045620472
},
20457-
description: "Branding information to use for this document. If a string, the path to a brand file.\nIf false, don't use branding on this document. If an object, an inline brand\ndefinition, or an object with light and dark brand paths or definitions.\n"
20473+
description: "Path to brand.yml or object with light and dark paths to brand.yml\n"
2045820474
},
2045920475
preview: {
2046020476
description: "Options for `quarto preview`",
@@ -23995,6 +24011,7 @@ var require_yaml_intelligence_resources = __commonJS({
2399524011
"HTML library (JS/CSS/etc.) directory",
2399624012
"Additional file resources to be copied to output directory",
2399724013
"Additional file resources to be copied to output directory",
24014+
"Branding information to use for this document. If a string, the path\nto a brand file. If false, don\u2019t use branding on this document. If an\nobject, an inline brand definition, or an object with light and dark\nbrand paths or definitions.",
2399824015
"Options for <code>quarto preview</code>",
2399924016
"Scripts to run as a pre-render step",
2400024017
"Scripts to run as a post-render step",
@@ -24344,6 +24361,7 @@ var require_yaml_intelligence_resources = __commonJS({
2434424361
"HTML library (JS/CSS/etc.) directory",
2434524362
"Additional file resources to be copied to output directory",
2434624363
"Additional file resources to be copied to output directory",
24364+
"Branding information to use for this document. If a string, the path\nto a brand file. If false, don\u2019t use branding on this document. If an\nobject, an inline brand definition, or an object with light and dark\nbrand paths or definitions.",
2434724365
"Options for <code>quarto preview</code>",
2434824366
"Scripts to run as a pre-render step",
2434924367
"Scripts to run as a post-render step",
@@ -24678,7 +24696,8 @@ var require_yaml_intelligence_resources = __commonJS({
2467824696
"Disambiguating year suffix in author-date styles (e.g.&nbsp;\u201Ca\u201D in \u201CDoe,\n1999a\u201D).",
2467924697
"Manuscript configuration",
2468024698
"internal-schema-hack",
24681-
"List execution engines you want to give priority when determining\nwhich engine should render a notebook. If two engines have support for a\nnotebook, the one listed earlier will be chosen. Quarto\u2019s default order\nis \u2018knitr\u2019, \u2018jupyter\u2019, \u2018markdown\u2019, \u2018julia\u2019."
24699+
"List execution engines you want to give priority when determining\nwhich engine should render a notebook. If two engines have support for a\nnotebook, the one listed earlier will be chosen. Quarto\u2019s default order\nis \u2018knitr\u2019, \u2018jupyter\u2019, \u2018markdown\u2019, \u2018julia\u2019.",
24700+
"A path to a brand.yml file, or an object with light and dark paths to\nbrand.yml"
2468224701
],
2468324702
"schema/external-schemas.yml": [
2468424703
{
@@ -24907,12 +24926,12 @@ var require_yaml_intelligence_resources = __commonJS({
2490724926
mermaid: "%%"
2490824927
},
2490924928
"handlers/mermaid/schema.yml": {
24910-
_internalId: 197505,
24929+
_internalId: 197527,
2491124930
type: "object",
2491224931
description: "be an object",
2491324932
properties: {
2491424933
"mermaid-format": {
24915-
_internalId: 197497,
24934+
_internalId: 197519,
2491624935
type: "enum",
2491724936
enum: [
2491824937
"png",
@@ -24928,7 +24947,7 @@ var require_yaml_intelligence_resources = __commonJS({
2492824947
exhaustiveCompletions: true
2492924948
},
2493024949
theme: {
24931-
_internalId: 197504,
24950+
_internalId: 197526,
2493224951
type: "anyOf",
2493324952
anyOf: [
2493424953
{

src/resources/editor/tools/yaml/all-schema-definitions.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

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

Lines changed: 25 additions & 6 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: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6022,6 +6022,22 @@
60226022
}
60236023
}
60246024
},
6025+
{
6026+
"id": "brand-path-only-light-dark",
6027+
"anyOf": [
6028+
"string",
6029+
{
6030+
"object": {
6031+
"closed": true,
6032+
"properties": {
6033+
"light": "string",
6034+
"dark": "string"
6035+
}
6036+
}
6037+
}
6038+
],
6039+
"description": "A path to a brand.yml file, or an object with light and dark paths to brand.yml\n"
6040+
},
60256041
{
60266042
"id": "brand-path-bool-light-dark",
60276043
"anyOf": [
@@ -13424,9 +13440,9 @@
1342413440
},
1342513441
"brand": {
1342613442
"schema": {
13427-
"ref": "brand-path-bool-light-dark"
13443+
"ref": "brand-path-only-light-dark"
1342813444
},
13429-
"description": "Branding information to use for this document. If a string, the path to a brand file.\nIf false, don't use branding on this document. If an object, an inline brand\ndefinition, or an object with light and dark brand paths or definitions.\n"
13445+
"description": "Path to brand.yml or object with light and dark paths to brand.yml\n"
1343013446
},
1343113447
"preview": {
1343213448
"description": "Options for `quarto preview`",
@@ -16967,6 +16983,7 @@
1696716983
"HTML library (JS/CSS/etc.) directory",
1696816984
"Additional file resources to be copied to output directory",
1696916985
"Additional file resources to be copied to output directory",
16986+
"Branding information to use for this document. If a string, the path\nto a brand file. If false, don’t use branding on this document. If an\nobject, an inline brand definition, or an object with light and dark\nbrand paths or definitions.",
1697016987
"Options for <code>quarto preview</code>",
1697116988
"Scripts to run as a pre-render step",
1697216989
"Scripts to run as a post-render step",
@@ -17316,6 +17333,7 @@
1731617333
"HTML library (JS/CSS/etc.) directory",
1731717334
"Additional file resources to be copied to output directory",
1731817335
"Additional file resources to be copied to output directory",
17336+
"Branding information to use for this document. If a string, the path\nto a brand file. If false, don’t use branding on this document. If an\nobject, an inline brand definition, or an object with light and dark\nbrand paths or definitions.",
1731917337
"Options for <code>quarto preview</code>",
1732017338
"Scripts to run as a pre-render step",
1732117339
"Scripts to run as a post-render step",
@@ -17650,7 +17668,8 @@
1765017668
"Disambiguating year suffix in author-date styles (e.g.&nbsp;“a” in “Doe,\n1999a”).",
1765117669
"Manuscript configuration",
1765217670
"internal-schema-hack",
17653-
"List execution engines you want to give priority when determining\nwhich engine should render a notebook. If two engines have support for a\nnotebook, the one listed earlier will be chosen. Quarto’s default order\nis ‘knitr’, ‘jupyter’, ‘markdown’, ‘julia’."
17671+
"List execution engines you want to give priority when determining\nwhich engine should render a notebook. If two engines have support for a\nnotebook, the one listed earlier will be chosen. Quarto’s default order\nis ‘knitr’, ‘jupyter’, ‘markdown’, ‘julia’.",
17672+
"A path to a brand.yml file, or an object with light and dark paths to\nbrand.yml"
1765417673
],
1765517674
"schema/external-schemas.yml": [
1765617675
{
@@ -17879,12 +17898,12 @@
1787917898
"mermaid": "%%"
1788017899
},
1788117900
"handlers/mermaid/schema.yml": {
17882-
"_internalId": 197505,
17901+
"_internalId": 197527,
1788317902
"type": "object",
1788417903
"description": "be an object",
1788517904
"properties": {
1788617905
"mermaid-format": {
17887-
"_internalId": 197497,
17906+
"_internalId": 197519,
1788817907
"type": "enum",
1788917908
"enum": [
1789017909
"png",
@@ -17900,7 +17919,7 @@
1790017919
"exhaustiveCompletions": true
1790117920
},
1790217921
"theme": {
17903-
"_internalId": 197504,
17922+
"_internalId": 197526,
1790417923
"type": "anyOf",
1790517924
"anyOf": [
1790617925
{

src/resources/schema/json-schemas.json

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4077,6 +4077,25 @@
40774077
}
40784078
}
40794079
},
4080+
"BrandPathOnlyLightDark": {
4081+
"anyOf": [
4082+
{
4083+
"type": "string"
4084+
},
4085+
{
4086+
"object": {
4087+
"properties": {
4088+
"light": {
4089+
"type": "string"
4090+
},
4091+
"dark": {
4092+
"type": "string"
4093+
}
4094+
}
4095+
}
4096+
}
4097+
]
4098+
},
40804099
"BrandPathBoolLightDark": {
40814100
"anyOf": [
40824101
{
@@ -4180,7 +4199,7 @@
41804199
]
41814200
},
41824201
"brand": {
4183-
"$ref": "#/$defs/BrandPathBoolLightDark"
4202+
"$ref": "#/$defs/BrandPathOnlyLightDark"
41844203
},
41854204
"preview": {
41864205
"$ref": "#/$defs/ProjectPreview"

src/resources/types/schema-types.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1553,6 +1553,11 @@ export type BrandUnified = {
15531553
typography?: BrandTypographyUnified;
15541554
};
15551555

1556+
export type BrandPathOnlyLightDark = string | {
1557+
dark?: string;
1558+
light?: string;
1559+
}; /* A path to a brand.yml file, or an object with light and dark paths to brand.yml */
1560+
15561561
export type BrandPathBoolLightDark =
15571562
| string
15581563
| boolean
@@ -1588,7 +1593,7 @@ export type ProjectConfig = {
15881593
"lib-dir"?: string /* HTML library (JS/CSS/etc.) directory */;
15891594
"pre-render"?: MaybeArrayOf<string>;
15901595
"post-render"?: MaybeArrayOf<string>;
1591-
brand?: BrandPathBoolLightDark;
1596+
brand?: BrandPathOnlyLightDark;
15921597
detect?: ((string)[])[];
15931598
preview?: ProjectPreview;
15941599
render?: (string)[] /* Files to render (defaults to all files) */;

src/resources/types/zod/schema-types.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1748,6 +1748,11 @@ export const ZodBrandUnified = z.object({
17481748
defaults: z.lazy(() => ZodBrandDefaults),
17491749
}).strict().partial();
17501750

1751+
export const ZodBrandPathOnlyLightDark = z.union([
1752+
z.string(),
1753+
z.object({ light: z.string(), dark: z.string() }).strict().partial(),
1754+
]);
1755+
17511756
export const ZodBrandPathBoolLightDark = z.union([
17521757
z.string(),
17531758
z.boolean(),
@@ -1777,7 +1782,7 @@ export const ZodProjectConfig = z.object({
17771782
"output-dir": z.string(),
17781783
"lib-dir": z.string(),
17791784
resources: z.union([z.string(), z.array(z.string())]),
1780-
brand: z.lazy(() => ZodBrandPathBoolLightDark),
1785+
brand: z.lazy(() => ZodBrandPathOnlyLightDark),
17811786
preview: z.lazy(() => ZodProjectPreview),
17821787
"pre-render": z.union([z.string(), z.array(z.string())]),
17831788
"post-render": z.union([z.string(), z.array(z.string())]),
@@ -2022,6 +2027,8 @@ export type BrandSingle = z.infer<typeof ZodBrandSingle>;
20222027

20232028
export type BrandUnified = z.infer<typeof ZodBrandUnified>;
20242029

2030+
export type BrandPathOnlyLightDark = z.infer<typeof ZodBrandPathOnlyLightDark>;
2031+
20252032
export type BrandPathBoolLightDark = z.infer<typeof ZodBrandPathBoolLightDark>;
20262033

20272034
export type BrandDefaults = z.infer<typeof ZodBrandDefaults>;
@@ -2137,6 +2144,7 @@ export const Zod = {
21372144
BrandFontFamily: ZodBrandFontFamily,
21382145
BrandSingle: ZodBrandSingle,
21392146
BrandUnified: ZodBrandUnified,
2147+
BrandPathOnlyLightDark: ZodBrandPathOnlyLightDark,
21402148
BrandPathBoolLightDark: ZodBrandPathBoolLightDark,
21412149
BrandDefaults: ZodBrandDefaults,
21422150
BrandDefaultsBootstrap: ZodBrandDefaultsBootstrap,

0 commit comments

Comments
 (0)