pxt-core 8.5.13 → 8.5.15

package/localtypings/pxtarget.d.ts

@@ -531,6 +531,7 @@ declare namespace pxt {
         hash?: string;
         usedBlocks: Map<number>;
         snippetBlocks: Map<Map<number>>;
+        highlightBlocks: Map<Map<number>>;
     }
 
     interface PackageApiInfo {
@@ -635,6 +636,10 @@ declare namespace pxt.editor {
         NoPython = "no-python",
         NoJavaScript = "no-javascript"
     }
+
+    // Placeholder for IProjectView defined in pxteditor.d.ts
+    interface IProjectView {
+    }
 }
 
 declare namespace ts.pxtc {
@@ -1102,6 +1107,7 @@ declare namespace pxt.tutorial {
         customTs?: string; // custom typescript code loaded in a separate file for the tutorial
         tutorialValidationRules?: pxt.Map<boolean>; //a map of rules used in a tutorial and if the rules are activated
         globalBlockConfig?: TutorialBlockConfig; // concatenated `blockconfig.global` sections. Contains block configs applicable to all tutorial steps
+        globalValidationConfig?: CodeValidationConfig; // concatenated 'validation.global' sections. Contains validation config applicable to all steps
     }
 
     interface TutorialMetadata {
@@ -1137,6 +1143,30 @@ declare namespace pxt.tutorial {
         blocks?: TutorialBlockConfigEntry[]; // markdown fragment can contain multiple block definitions
     }
 
+    interface CodeValidationResult {
+        isValid: Boolean;
+        hint: any;
+    }
+
+    interface CodeValidationExecuteOptions {
+        parent: pxt.editor.IProjectView;
+        tutorialOptions: TutorialOptions;
+    }
+
+    interface CodeValidator {
+        enabled: boolean;
+        execute(options: CodeValidationExecuteOptions): Promise<CodeValidationResult>;
+    }
+    
+    interface CodeValidatorMetadata {
+        validatorType: string;
+        properties: pxt.Map<string>;
+    }
+
+    interface CodeValidationConfig {
+        validatorsMetadata: CodeValidatorMetadata[];
+    }
+    
     interface TutorialStepInfo {
         // Step metadata
         showHint?: boolean; // automatically displays hint
@@ -1161,6 +1191,9 @@ declare namespace pxt.tutorial {
 
         // concatenated `blockconfig.local` sections. Contains block configs applicable to the current step only
         localBlockConfig?: pxt.tutorial.TutorialBlockConfig;
+
+        // concatenated 'validation.local' sections. Contains config applicable to this step only.
+        localValidationConfig?: pxt.tutorial.CodeValidationConfig;
     }
 
     interface TutorialActivityInfo {
@@ -1193,6 +1226,7 @@ declare namespace pxt.tutorial {
         tutorialValidationRules?: pxt.Map<boolean>; //a map of rules used in a tutorial and if the rules are activated
         templateLoaded?: boolean; // if the template code has been loaded once, we skip
         globalBlockConfig?: TutorialBlockConfig; // concatenated `blockconfig.global` sections. Contains block configs applicable to all tutorial steps
+        globalValidationConfig?: CodeValidationConfig // concatenated 'validation.global' sections. Contains validation config applicable to all steps
     }
     interface TutorialCompletionInfo {
         // id of the tutorial

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pxt-core",
-  "version": "8.5.13",
+  "version": "8.5.15",
   "description": "Microsoft MakeCode provides Blocks / JavaScript / Python tools and editors",
   "keywords": [
     "TypeScript",

package/theme/tutorial-sidebar.less

@@ -555,6 +555,82 @@
     }
 }
 
+/*********************************
+        Validation
+*********************************/
+.tutorial-validation-error-container {
+    position: fixed;
+    top: unset;
+    right: unset;
+    bottom: 5.5rem;
+    left: 23rem;
+    max-width: 60%;
+    min-width: 18.75rem;
+    max-height: 70%;
+    background: @white;
+    box-shadow: 0 0rem 0.5rem;
+    border-radius: 0.5rem;
+    z-index: 40;
+}
+
+.tutorial-validation-error-body {
+    display: flex;
+    flex-direction: row;
+    padding: 2rem 2rem 2rem 0.5rem;
+}
+
+.tutorial-validation-error-hint {
+    padding: 1.5rem;
+}
+
+.tutorial-validation-error-inner {
+    display: flex;
+    flex-direction: column;
+}
+
+.tutorial-validation-error-emoji {
+    font-size: 3rem;
+    padding-top: 1rem;
+    padding-right: 0.2rem;
+}
+
+.tutorial-validation-error-controls {
+    display: flex;
+    justify-content: right;
+    margin: 0;
+    margin-top: 0.5rem;
+
+    > .common-button {
+        width: unset;
+    }
+}
+
+.tutorial-validation-error-close.common-button {
+    position: absolute;
+    right: 0.6rem;
+    top: 0.8rem;
+    padding: 0 !important;
+
+    i.right {
+        opacity: 1;
+        font-size: 1.3rem;
+        margin: 0 !important;
+    }
+}
+
+.tutorial-validation-answer-key-hint {
+    max-height: 50vh;
+    overflow: auto;
+    padding-right: 2rem;
+}
+
+/* Remove border around blocks in the hint */
+.tutorial-validation-answer-key-hint .lang-blocks .segment.raised {
+    border: none;
+    background: none;
+    box-shadow: none;
+    padding: 0;
+}
 /*******************************
         Media Adjustments
 *******************************/
@@ -876,6 +952,15 @@
     .tutorial-title {
         max-width: calc(100% - 10rem);
     }
+
+    /*******************************
+        Validation
+    *******************************/
+
+    .tutorial-validation-error-container {
+        right: 1rem;
+        left: unset;
+    }
 }
 
 /* thin tablet header */

package/webapp/public/multiplayer.html

@@ -9,7 +9,7 @@
     <link rel="stylesheet" data-rtl="/blb/rtlsemantic.css" href="/blb/semantic.css">
     <link rel="stylesheet" href="/blb/icons.css">
     <link rel="stylesheet" href="/blb/react-common-multiplayer.css">
-  <script defer="defer" src="/blb/multiplayer/js/main.1a1e5af6.js"></script><link href="/blb/multiplayer/css/main.30eccbaa.css" rel="stylesheet"></head>
+  <script defer="defer" src="/blb/multiplayer/js/main.816fb70a.js"></script><link href="/blb/multiplayer/css/main.30eccbaa.css" rel="stylesheet"></head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>
 

package/webapp/public/skillmap.html

@@ -7,7 +7,7 @@
     <link rel="stylesheet" data-rtl="/blb/rtlsemantic.css" href="/blb/semantic.css">
     <link rel="stylesheet" href="/blb/icons.css">
     <link rel="stylesheet" href="/blb/react-common-skillmap.css">
-  <script defer="defer" src="/blb/skillmap/js/main.3008f5a9.js"></script><link href="/blb/skillmap/css/main.06a18ee8.css" rel="stylesheet"></head>
+  <script defer="defer" src="/blb/skillmap/js/main.ae646473.js"></script><link href="/blb/skillmap/css/main.06a18ee8.css" rel="stylesheet"></head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>