From 225e38789b16587975bc551e74903accc9b5d5f4 Mon Sep 17 00:00:00 2001 From: moT01 <20648924+moT01@users.noreply.github.com> Date: Tue, 18 Jan 2022 17:31:20 -0600 Subject: [PATCH 1/2] feat: add support for continue config --- src/schema/skeleton.ts | 18 ++++++++++++++++++ src/schema/tutorial.ts | 18 ++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/src/schema/skeleton.ts b/src/schema/skeleton.ts index 2e85583..1a6e9f6 100644 --- a/src/schema/skeleton.ts +++ b/src/schema/skeleton.ts @@ -97,6 +97,19 @@ export default { additionalProperties: false, required: ["uri", "branch"], }, + continue: { + type: "object", + description: "Configuration options for continuing a tutorial", + properties: { + commands: { + $ref: "#/definitions/command_array", + }, + vscodeCommands: { + $ref: "#/definitions/vscode_command_array", + }, + }, + additionalProperties: false, + }, reset: { type: "object", description: "Configuration options for resetting a tutorial", @@ -164,6 +177,11 @@ export default { description: "An event triggered on tutorial startup. Sends tutorialId", }, + continue: { + type: "boolean", + description: + "An event triggered when continuing a tutorial. Sends tutorialId", + }, reset: { type: "boolean", description: diff --git a/src/schema/tutorial.ts b/src/schema/tutorial.ts index 75ed211..9be3315 100644 --- a/src/schema/tutorial.ts +++ b/src/schema/tutorial.ts @@ -116,6 +116,19 @@ export default { additionalProperties: false, required: ["uri", "branch"], }, + continue: { + type: "object", + description: "Configuration options for continuing a tutorial", + properties: { + commands: { + $ref: "#/definitions/command_array", + }, + vscodeCommands: { + $ref: "#/definitions/vscode_command_array", + }, + }, + additionalProperties: false, + }, reset: { type: "object", description: "Configuration options for resetting a tutorial", @@ -183,6 +196,11 @@ export default { description: "An event triggered on tutorial startup. Sends tutorialId", }, + continue: { + type: "boolean", + description: + "An event triggered when continuing a tutorial. Sends tutorialId", + }, reset: { type: "boolean", description: From dbb1a67278467bb4ee3dc67b4f04c4b8ac4010fd Mon Sep 17 00:00:00 2001 From: moT01 <20648924+moT01@users.noreply.github.com> Date: Tue, 18 Jan 2022 18:11:32 -0600 Subject: [PATCH 2/2] fix: id not coming through to final json --- src/schema/tutorial.ts | 2 +- src/utils/parse.ts | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/schema/tutorial.ts b/src/schema/tutorial.ts index 9be3315..206baef 100644 --- a/src/schema/tutorial.ts +++ b/src/schema/tutorial.ts @@ -316,5 +316,5 @@ export default { }, }, additionalProperties: false, - required: ["version", "summary", "config", "levels"], + required: ["id", "version", "summary", "config", "levels"], }; diff --git a/src/utils/parse.ts b/src/utils/parse.ts index dfdbc4d..70d7ad7 100644 --- a/src/utils/parse.ts +++ b/src/utils/parse.ts @@ -144,6 +144,7 @@ export function parse (params: ParseParams): any { const mdContent: TutorialFrame = parseMdContent(params.text + '\n\n') const parsed: Partial = { + id: params.skeleton.id, version: params.skeleton.version, summary: mdContent.summary, config: params.skeleton.config || {},