@robotical/martyblocksjr 3.5.34 → 4.0.1

package/editions/free/src/localizations/th.json

@@ -1122,5 +1122,39 @@
   "MARTY_JRBLOCKS5_STEP_21_TEXT": "สุดท้ายให้เพิ่มบล็อกการทำซ้ำแบบตลอดไปที่ส่วนท้าย",
   "MARTY_JRBLOCKS5_STEP_22_TEXT": "เกือบเสร็จแล้ว! สุดท้าย เพิ่มบล็อกธงสีเขียวอีกอันลงในโค้ดตาข่ายฟุตบอล",
   "MARTY_JRBLOCKS5_STEP_23_TEXT": "ปิดท้ายด้วยบล็อก<b/>เคาน์เตอร์เริ่ม/หยุด</b> เพื่อให้คะแนนของคุณรีเซ็ตทุกครั้งที่คุณเริ่มเกมใหม่",
-  "MARTY_JRBLOCKS5_END": "ทำได้แล้ว! กดธงเขียวแล้วเล่นเกมยิงประตูของมาร์ตี้!"
-}
+  "MARTY_JRBLOCKS5_END": "ทำได้แล้ว! กดธงเขียวแล้วเล่นเกมยิงประตูของมาร์ตี้!",
+  "A11Y_APP_NAVIGATION": "App navigation",
+  "A11Y_CLEAR_TRACE": "Clear trace",
+  "A11Y_CLOSE": "Close",
+  "A11Y_CONNECTION_LOST": "Connection lost",
+  "A11Y_CONNECT": "Connect",
+  "A11Y_CREATE": "Create",
+  "A11Y_DELETE": "Delete",
+  "A11Y_DISCONNECT": "Disconnect",
+  "A11Y_GUIDE_SECTIONS": "Guide sections",
+  "A11Y_HELP": "Help",
+  "A11Y_MAIN_CONTENT": "Main content",
+  "A11Y_MARTY_MODE": "Marty mode",
+  "A11Y_NEXT": "Next",
+  "A11Y_OPEN": "Open",
+  "A11Y_PAGE_TITLE_EDITOR": "Project Editor",
+  "A11Y_PARENTAL_GATE_DIALOG": "Parent approval",
+  "A11Y_PLAY": "Play",
+  "A11Y_PREVIOUS": "Previous",
+  "A11Y_PROJECT_INFO": "Project information",
+  "A11Y_PROJECT_INFO_DIALOG": "Project information",
+  "A11Y_READ_ALOUD": "Read aloud",
+  "A11Y_RECORD": "Record",
+  "A11Y_RECORD_DIALOG": "Record sound",
+  "A11Y_RESET_ALL_CHARACTERS": "Reset all characters",
+  "A11Y_RUN_PROJECT": "Run project",
+  "A11Y_SKIP_TO_MAIN": "Skip to main content",
+  "A11Y_STOP": "Stop",
+  "A11Y_TRACE": "Trace",
+  "A11Y_TUTORIAL_DIALOG": "Tutorial media",
+  "A11Y_ADD_PAGE": "Add page",
+  "A11Y_COPY_TO_PAGE": "Copy to page {PAGE}",
+  "A11Y_DELETE_PAGE": "Delete page {PAGE}",
+  "A11Y_MOVE_PAGE_EARLIER": "Move page {PAGE} earlier",
+  "A11Y_MOVE_PAGE_LATER": "Move page {PAGE} later"
+}

package/editions/free/src/localizations/tr.json

@@ -1122,5 +1122,39 @@
   "MARTY_JRBLOCKS5_STEP_21_TEXT": "Son olarak, sonuna sonsuza kadar tekrar eden bir blok ekleyin.",
   "MARTY_JRBLOCKS5_STEP_22_TEXT": "Neredeyse bitti! Son olarak, futbol ağı koduna bir yeşil bayrak bloğu daha ekleyin",
   "MARTY_JRBLOCKS5_STEP_23_TEXT": "Bunu bir <b/>başlat/durdur sayacı</b> bloğuyla tamamlayın, böylece her yeni oyuna başladığınızda puanınız sıfırlanır.",
-  "MARTY_JRBLOCKS5_END": "Başardın! Yeşil bayrağa bas ve Marty'nin gol atıcısı ol!"
-}
+  "MARTY_JRBLOCKS5_END": "Başardın! Yeşil bayrağa bas ve Marty'nin gol atıcısı ol!",
+  "A11Y_APP_NAVIGATION": "App navigation",
+  "A11Y_CLEAR_TRACE": "Clear trace",
+  "A11Y_CLOSE": "Close",
+  "A11Y_CONNECTION_LOST": "Connection lost",
+  "A11Y_CONNECT": "Connect",
+  "A11Y_CREATE": "Create",
+  "A11Y_DELETE": "Delete",
+  "A11Y_DISCONNECT": "Disconnect",
+  "A11Y_GUIDE_SECTIONS": "Guide sections",
+  "A11Y_HELP": "Help",
+  "A11Y_MAIN_CONTENT": "Main content",
+  "A11Y_MARTY_MODE": "Marty mode",
+  "A11Y_NEXT": "Next",
+  "A11Y_OPEN": "Open",
+  "A11Y_PAGE_TITLE_EDITOR": "Project Editor",
+  "A11Y_PARENTAL_GATE_DIALOG": "Parent approval",
+  "A11Y_PLAY": "Play",
+  "A11Y_PREVIOUS": "Previous",
+  "A11Y_PROJECT_INFO": "Project information",
+  "A11Y_PROJECT_INFO_DIALOG": "Project information",
+  "A11Y_READ_ALOUD": "Read aloud",
+  "A11Y_RECORD": "Record",
+  "A11Y_RECORD_DIALOG": "Record sound",
+  "A11Y_RESET_ALL_CHARACTERS": "Reset all characters",
+  "A11Y_RUN_PROJECT": "Run project",
+  "A11Y_SKIP_TO_MAIN": "Skip to main content",
+  "A11Y_STOP": "Stop",
+  "A11Y_TRACE": "Trace",
+  "A11Y_TUTORIAL_DIALOG": "Tutorial media",
+  "A11Y_ADD_PAGE": "Add page",
+  "A11Y_COPY_TO_PAGE": "Copy to page {PAGE}",
+  "A11Y_DELETE_PAGE": "Delete page {PAGE}",
+  "A11Y_MOVE_PAGE_EARLIER": "Move page {PAGE} earlier",
+  "A11Y_MOVE_PAGE_LATER": "Move page {PAGE} later"
+}

package/editions/free/src/localizations/uk.json

@@ -1122,5 +1122,39 @@
   "MARTY_JRBLOCKS5_STEP_21_TEXT": "Нарешті, додайте блок постійного повторення в кінці.",
   "MARTY_JRBLOCKS5_STEP_22_TEXT": "Майже готово! Нарешті, додайте ще один блок зеленого прапора до коду футбольної сітки",
   "MARTY_JRBLOCKS5_STEP_23_TEXT": "Завершіть це блоком <b/>лічильника запуску/зупинки</b>, щоб ваш рахунок скидався щоразу, коли ви починаєте нову гру.",
-  "MARTY_JRBLOCKS5_END": "Ви зробили це! Натисніть зелений прапорець і грайте в гру \"Гол-боут Марті\"!"
-}
+  "MARTY_JRBLOCKS5_END": "Ви зробили це! Натисніть зелений прапорець і грайте в гру \"Гол-боут Марті\"!",
+  "A11Y_APP_NAVIGATION": "App navigation",
+  "A11Y_CLEAR_TRACE": "Clear trace",
+  "A11Y_CLOSE": "Close",
+  "A11Y_CONNECTION_LOST": "Connection lost",
+  "A11Y_CONNECT": "Connect",
+  "A11Y_CREATE": "Create",
+  "A11Y_DELETE": "Delete",
+  "A11Y_DISCONNECT": "Disconnect",
+  "A11Y_GUIDE_SECTIONS": "Guide sections",
+  "A11Y_HELP": "Help",
+  "A11Y_MAIN_CONTENT": "Main content",
+  "A11Y_MARTY_MODE": "Marty mode",
+  "A11Y_NEXT": "Next",
+  "A11Y_OPEN": "Open",
+  "A11Y_PAGE_TITLE_EDITOR": "Project Editor",
+  "A11Y_PARENTAL_GATE_DIALOG": "Parent approval",
+  "A11Y_PLAY": "Play",
+  "A11Y_PREVIOUS": "Previous",
+  "A11Y_PROJECT_INFO": "Project information",
+  "A11Y_PROJECT_INFO_DIALOG": "Project information",
+  "A11Y_READ_ALOUD": "Read aloud",
+  "A11Y_RECORD": "Record",
+  "A11Y_RECORD_DIALOG": "Record sound",
+  "A11Y_RESET_ALL_CHARACTERS": "Reset all characters",
+  "A11Y_RUN_PROJECT": "Run project",
+  "A11Y_SKIP_TO_MAIN": "Skip to main content",
+  "A11Y_STOP": "Stop",
+  "A11Y_TRACE": "Trace",
+  "A11Y_TUTORIAL_DIALOG": "Tutorial media",
+  "A11Y_ADD_PAGE": "Add page",
+  "A11Y_COPY_TO_PAGE": "Copy to page {PAGE}",
+  "A11Y_DELETE_PAGE": "Delete page {PAGE}",
+  "A11Y_MOVE_PAGE_EARLIER": "Move page {PAGE} earlier",
+  "A11Y_MOVE_PAGE_LATER": "Move page {PAGE} later"
+}

package/editions/free/src/localizations/zh-cn.json

@@ -1122,5 +1122,39 @@
   "MARTY_JRBLOCKS5_STEP_21_TEXT": "最后，在末尾添加一个无限重复模块。",
   "MARTY_JRBLOCKS5_STEP_22_TEXT": "快完成了！最后，在足球网代码中添加另一个绿色旗帜模块。",
   "MARTY_JRBLOCKS5_STEP_23_TEXT": "最后添加一个<b/>开始/停止计数器</b>模块，这样每次开始新游戏时，你的分数都会重置。",
-  "MARTY_JRBLOCKS5_END": "你成功了！按下绿旗，开始玩马蒂的射门游戏吧！"
-}
+  "MARTY_JRBLOCKS5_END": "你成功了！按下绿旗，开始玩马蒂的射门游戏吧！",
+  "A11Y_APP_NAVIGATION": "App navigation",
+  "A11Y_CLEAR_TRACE": "Clear trace",
+  "A11Y_CLOSE": "Close",
+  "A11Y_CONNECTION_LOST": "Connection lost",
+  "A11Y_CONNECT": "Connect",
+  "A11Y_CREATE": "Create",
+  "A11Y_DELETE": "Delete",
+  "A11Y_DISCONNECT": "Disconnect",
+  "A11Y_GUIDE_SECTIONS": "Guide sections",
+  "A11Y_HELP": "Help",
+  "A11Y_MAIN_CONTENT": "Main content",
+  "A11Y_MARTY_MODE": "Marty mode",
+  "A11Y_NEXT": "Next",
+  "A11Y_OPEN": "Open",
+  "A11Y_PAGE_TITLE_EDITOR": "Project Editor",
+  "A11Y_PARENTAL_GATE_DIALOG": "Parent approval",
+  "A11Y_PLAY": "Play",
+  "A11Y_PREVIOUS": "Previous",
+  "A11Y_PROJECT_INFO": "Project information",
+  "A11Y_PROJECT_INFO_DIALOG": "Project information",
+  "A11Y_READ_ALOUD": "Read aloud",
+  "A11Y_RECORD": "Record",
+  "A11Y_RECORD_DIALOG": "Record sound",
+  "A11Y_RESET_ALL_CHARACTERS": "Reset all characters",
+  "A11Y_RUN_PROJECT": "Run project",
+  "A11Y_SKIP_TO_MAIN": "Skip to main content",
+  "A11Y_STOP": "Stop",
+  "A11Y_TRACE": "Trace",
+  "A11Y_TUTORIAL_DIALOG": "Tutorial media",
+  "A11Y_ADD_PAGE": "Add page",
+  "A11Y_COPY_TO_PAGE": "Copy to page {PAGE}",
+  "A11Y_DELETE_PAGE": "Delete page {PAGE}",
+  "A11Y_MOVE_PAGE_EARLIER": "Move page {PAGE} earlier",
+  "A11Y_MOVE_PAGE_LATER": "Move page {PAGE} later"
+}

package/editions/free/src/localizations/zh-tw.json

@@ -1122,5 +1122,39 @@
   "MARTY_JRBLOCKS5_STEP_21_TEXT": "最後，在末尾添加一個無限重複模組。",
   "MARTY_JRBLOCKS5_STEP_22_TEXT": "快完成了！最後，在足球網代碼中加入另一個綠色旗幟模組。",
   "MARTY_JRBLOCKS5_STEP_23_TEXT": "最後增加一個<b/>開始/停止計數器</b>模組，這樣每次開始新遊戲時，你的分數都會重置。",
-  "MARTY_JRBLOCKS5_END": "你成功了！按下綠旗，開始玩馬蒂的射門遊戲吧！"
-}
+  "MARTY_JRBLOCKS5_END": "你成功了！按下綠旗，開始玩馬蒂的射門遊戲吧！",
+  "A11Y_APP_NAVIGATION": "App navigation",
+  "A11Y_CLEAR_TRACE": "Clear trace",
+  "A11Y_CLOSE": "Close",
+  "A11Y_CONNECTION_LOST": "Connection lost",
+  "A11Y_CONNECT": "Connect",
+  "A11Y_CREATE": "Create",
+  "A11Y_DELETE": "Delete",
+  "A11Y_DISCONNECT": "Disconnect",
+  "A11Y_GUIDE_SECTIONS": "Guide sections",
+  "A11Y_HELP": "Help",
+  "A11Y_MAIN_CONTENT": "Main content",
+  "A11Y_MARTY_MODE": "Marty mode",
+  "A11Y_NEXT": "Next",
+  "A11Y_OPEN": "Open",
+  "A11Y_PAGE_TITLE_EDITOR": "Project Editor",
+  "A11Y_PARENTAL_GATE_DIALOG": "Parent approval",
+  "A11Y_PLAY": "Play",
+  "A11Y_PREVIOUS": "Previous",
+  "A11Y_PROJECT_INFO": "Project information",
+  "A11Y_PROJECT_INFO_DIALOG": "Project information",
+  "A11Y_READ_ALOUD": "Read aloud",
+  "A11Y_RECORD": "Record",
+  "A11Y_RECORD_DIALOG": "Record sound",
+  "A11Y_RESET_ALL_CHARACTERS": "Reset all characters",
+  "A11Y_RUN_PROJECT": "Run project",
+  "A11Y_SKIP_TO_MAIN": "Skip to main content",
+  "A11Y_STOP": "Stop",
+  "A11Y_TRACE": "Trace",
+  "A11Y_TUTORIAL_DIALOG": "Tutorial media",
+  "A11Y_ADD_PAGE": "Add page",
+  "A11Y_COPY_TO_PAGE": "Copy to page {PAGE}",
+  "A11Y_DELETE_PAGE": "Delete page {PAGE}",
+  "A11Y_MOVE_PAGE_EARLIER": "Move page {PAGE} earlier",
+  "A11Y_MOVE_PAGE_LATER": "Move page {PAGE} later"
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@robotical/martyblocksjr",
-  "version": "3.5.34",
+  "version": "4.0.1",
   "description": "ScratchJr",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
@@ -17,7 +17,10 @@
     "build-prod:copy": "npm run build && cp -f src/build/bundles/* editions/free/src",
     "build:start": "npm run build:copy && npm start",
     "test": "vitest",
-    "test:e2e": "vitest run tests/e2e"
+    "test:e2e": "vitest run tests/e2e",
+    "a11y:structure": "node scripts/a11y-structure.mjs",
+    "test:e2e-accessibility": "vitest run tests/e2e/accessibility.e2e.test.js",
+    "a11y:ci": "npm run a11y:structure && npm run test:e2e-accessibility"
   },
   "author": "Massachusetts Institute of Technology",
   "license": "BSD-3-Clause",
@@ -28,6 +31,7 @@
   "devDependencies": {
     "@babel/polyfill": "^7.10.4",
     "@babel/preset-env": "^7.25.4",
+    "axe-core": "^4.11.2",
     "babel-core": "^6.4.0",
     "babel-eslint": "^4.1.6",
     "babel-loader": "^8.2.5",

package/scripts/a11y-structure.mjs

@@ -0,0 +1,177 @@
+import fs from 'fs';
+import path from 'path';
+import { fileURLToPath } from 'url';
+
+const ROOT = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..');
+const REPORT_PATH = path.join(ROOT, 'reports', 'a11y', 'structure.json');
+
+function read(relativePath) {
+    return fs.readFileSync(path.join(ROOT, relativePath), 'utf8');
+}
+
+function countMatches(source, regex) {
+    const matches = source.match(regex);
+    return matches ? matches.length : 0;
+}
+
+const findings = [];
+
+function addFinding(file, message) {
+    findings.push({ file, message });
+}
+
+function requireMatch(file, regex, message) {
+    if (!regex.test(read(file))) {
+        addFinding(file, message);
+    }
+}
+
+function forbidMatch(file, regex, message) {
+    if (regex.test(read(file))) {
+        addFinding(file, message);
+    }
+}
+
+function requireButtonIds(file, ids) {
+    const source = read(file);
+    ids.forEach((id) => {
+        if (!new RegExp(`<button[^>]*id="${id}"`, 's').test(source)) {
+            addFinding(file, `Expected \`${id}\` to be implemented as a <button>.`);
+        }
+        if (new RegExp(`<div[^>]*id="${id}"`, 's').test(source)) {
+            addFinding(file, `Found legacy <div> markup for \`${id}\`.`);
+        }
+    });
+}
+
+function requireButtonClassCount(file, className, expectedCount) {
+    const source = read(file);
+    const buttonCount = countMatches(source, new RegExp(`<button[^>]*class="[^"]*${className}[^"]*"`, 'g'));
+    const legacyDivCount = countMatches(source, new RegExp(`<div[^>]*class="[^"]*${className}[^"]*"`, 'g'));
+
+    if (buttonCount !== expectedCount) {
+        addFinding(file, `Expected ${expectedCount} \`${className}\` buttons but found ${buttonCount}.`);
+    }
+    if (legacyDivCount > 0) {
+        addFinding(file, `Found ${legacyDivCount} legacy <div> elements with \`${className}\`.`);
+    }
+}
+
+function requireDecorativeAlt(file, className) {
+    const source = read(file);
+    const matches = source.match(new RegExp(`<img[^>]*class="[^"]*${className}[^"]*"[^>]*>`, 'g')) || [];
+    if (matches.length === 0) {
+        addFinding(file, `Expected at least one \`${className}\` image.`);
+        return;
+    }
+    matches.forEach((match) => {
+        if (!/alt=""/.test(match)) {
+            addFinding(file, `Expected \`${className}\` images to use decorative alt text.`);
+        }
+    });
+}
+
+function requireFocusRecovery(file) {
+    const source = read(file);
+    if (/(outline\s*:\s*(none|0))/i.test(source) && !/:focus-visible|:focus\b/i.test(source)) {
+        addFinding(file, 'Found outline suppression without a replacement focus rule.');
+    }
+}
+
+requireMatch(
+    'src/utils/accessibility.js',
+    /export function ensureSkipLink[\s\S]*export function registerDialog[\s\S]*export function openDialog[\s\S]*export function closeDialog/,
+    'Expected shared skip-link and dialog accessibility helpers.'
+);
+requireMatch(
+    'src/entry/app.js',
+    /setDocumentLanguage\(Localization\.currentLocale\)[\s\S]*setLocalizedDocumentTitle\(titleKey\)[\s\S]*ensureSkipLink\(skipLinkTargetId, Localization\.localize\('A11Y_SKIP_TO_MAIN'\)\)/,
+    'Expected app bootstrap to set language, title, and skip link.'
+);
+requireMatch(
+    'src/lobby/Lobby.js',
+    /iframe\.setAttribute\('title', Lobby\.getGuideFrameTitle\(url\)\)/,
+    'Expected lobby guide iframe titles to be localized.'
+);
+
+requireButtonIds('editions/free/src/home.html', [
+    'logotab',
+    'hometab',
+    'geartab',
+    'booktab',
+    'tabicon',
+    'abouttab',
+    'interfacetab',
+    'painttab',
+    'blockstab',
+    'privacytab'
+]);
+
+requireButtonClassCount('editions/free/src/inapp/interface.html', 'interface-button', 16);
+requireButtonClassCount('editions/free/src/inapp/paint.html', 'paint-button', 13);
+requireDecorativeAlt('editions/free/src/inapp/interface.html', 'ipad-project-view');
+requireDecorativeAlt('editions/free/src/inapp/paint.html', 'ipad-project-view');
+requireDecorativeAlt('editions/free/src/inapp/blocks.html', 'block-image');
+
+requireMatch(
+    'src/editor/ui/UI.js',
+    /newButton\('flipme'[\s\S]*newButton\('addsprite'[\s\S]*newButton\('addText'[\s\S]*newButton\('changeBkg'/,
+    'Expected the remaining editor shell controls to use semantic buttons.'
+);
+forbidMatch(
+    'src/editor/ui/UI.js',
+    /newHTML\('div', 'flipme'|newHTML\('div', 'addsprite'|newHTML\('div', 'addText'|newHTML\('div', 'changeBkg'/,
+    'Found legacy editor shell controls still created as clickable divs.'
+);
+
+requireMatch(
+    'src/editor/ui/Record.js',
+    /registerDialog\(modal[\s\S]*openDialog\(gn\('recorddialog'\)\)[\s\S]*closeDialog\(gn\('recorddialog'\)\)/,
+    'Expected the recording overlay to be wired through the shared dialog helper.'
+);
+requireMatch(
+    'src/editor/ui/TutorialUI.js',
+    /registerDialog\(TutorialUI\.modal[\s\S]*openDialog\(TutorialUI\.modal\)[\s\S]*closeDialog\(TutorialUI\.modal\)/,
+    'Expected the tutorial modal to be wired through the shared dialog helper.'
+);
+
+requireMatch('editions/free/src/css/base.css', /\.skip-link/, 'Expected global skip-link styles.');
+requireMatch('editions/free/src/css/base.css', /:focus-visible/, 'Expected global visible focus styles.');
+requireMatch('editions/free/src/css/connection-modal.css', /:focus-visible/, 'Expected visible focus styles for connection buttons.');
+requireMatch('editions/free/src/css/editorstage.css', /\.edittext:focus-visible/, 'Expected visible focus styles for editor text input.');
+requireMatch('editions/free/src/css/editor.css', /\.textinput:focus/, 'Expected visible focus styles for the info dialog input.');
+
+[
+    'editions/free/src/css/base.css',
+    'editions/free/src/css/connection-modal.css',
+    'editions/free/src/css/editor.css',
+    'editions/free/src/css/editorstage.css',
+    'editions/free/src/css/lobby.css',
+    'editions/free/src/css/thumbs.css',
+    'editions/free/src/css/tutorial.css',
+    'editions/free/src/inapp/style/style.css',
+    'editions/free/src/inapp/style/interface.css',
+    'editions/free/src/inapp/style/paint.css'
+].forEach(requireFocusRecovery);
+
+const report = {
+    checkedAt: new Date().toISOString(),
+    summary: {
+        filesChecked: 15,
+        findingCount: findings.length
+    },
+    findings
+};
+
+fs.mkdirSync(path.dirname(REPORT_PATH), { recursive: true });
+fs.writeFileSync(REPORT_PATH, JSON.stringify(report, null, 2) + '\n');
+
+if (findings.length > 0) {
+    console.error(`Accessibility structure scan found ${findings.length} issue(s).`);
+    findings.forEach((finding) => {
+        console.error(`- ${finding.file}: ${finding.message}`);
+    });
+    process.exit(1);
+}
+
+console.log(`Accessibility structure scan passed. Report written to ${path.relative(ROOT, REPORT_PATH)}.`);