From f362feb959b290e0d076621e9cd3c97d28f19e30 Mon Sep 17 00:00:00 2001
From: Neil Fraser <fraser@google.com>
Date: Wed, 19 Oct 2022 21:21:55 +0200
Subject: [PATCH] fix: Fix the compiler test.

---
 tests/compile/index.html |  4 +--
 tests/compile/main.js    |  4 +++
 tests/compile/tsick.js   | 58 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 64 insertions(+), 2 deletions(-)
 create mode 100644 tests/compile/tsick.js
diff --git a/tests/compile/index.html b/tests/compile/index.html
index 97fb52031..f065612ac 100644
--- a/tests/compile/index.html
+++ b/tests/compile/index.html
@@ -3,8 +3,8 @@
 <head>
   <meta charset="utf-8">
   <title>Blockly: Advanced Compilation Test</title>
-  <script src="main_compressed.js"></script>
   <script src="../../msg/js/en.js"></script>
+  <script src="main_compressed.js"></script>
   <style>
     body {
       background-color: #fff;
@@ -22,7 +22,7 @@
 <body>
   <h1>Blockly: Advanced Compilation Test</h1>
 
-  <p>To run this test manually, run `npm run test:compile:advanced`
+  <p>To run this test manually, run `node tsick.js` and `npm run test:compile:advanced`
   from the command line, then open this file in your web browser.</p>
 
   <p>Measure the size of main_compressed.js (295kb as of October 2017), then reload
diff --git a/tests/compile/main.js b/tests/compile/main.js
index 9e4aad1d7..e8ecd356e 100644
--- a/tests/compile/main.js
+++ b/tests/compile/main.js
@@ -16,6 +16,9 @@ const {inject} = goog.require('Blockly.inject');
 goog.require('Blockly.geras.Renderer');
 /** @suppress {extraRequire} */
 goog.require('Blockly.VerticalFlyout');
+/** @suppress {extraRequire} */
+const {Msg} = goog.require('Blockly.Msg');
+
 // Blocks
 /** @suppress {extraRequire} */
 goog.require('Blockly.libraryBlocks.logic');
@@ -30,6 +33,7 @@ goog.require('testBlocks');
 
 
 function init() {
+  Object.assign(Msg, window['Blockly']['Msg']);
   inject('blocklyDiv', /** @type {BlocklyOptions} */ ({
            'toolbox': document.getElementById('toolbox')
          }));
diff --git a/tests/compile/tsick.js b/tests/compile/tsick.js
new file mode 100644
index 000000000..06b8edca8
--- /dev/null
+++ b/tests/compile/tsick.js
@@ -0,0 +1,58 @@
+/**
+ * @license
+ * Copyright 2022 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Lightweight conversion from tsc to Closure Compiler.
+ */
+'use strict';
+
+const fs = require('fs');
+
+const DIR = '../../build/src/core/';
+
+function spider(dir) {
+  const data = fs.readdirSync(dir, {withFileTypes: true});
+  for (const datum of data) {
+    if (datum.isDirectory()) {
+      spider(dir + datum.name + '/')
+    } else if (datum.name.endsWith('.js')) {
+      rewriteFile(dir + datum.name);
+    }
+  }
+}
+
+function rewriteFile(path) {
+  const oldCode = fs.readFileSync(path, 'utf8');
+  const newCode = rewriteEnum(oldCode);
+  if (newCode !== oldCode) {
+    console.log('Rewrote: ' + path);
+    fs.writeFileSync(path, newCode);
+  }
+}
+
+function rewriteEnum(code) {
+  while (true) {
+    // Extract the entire enum structure.
+    const m = code.match(/\s+\(function \((\w+)\) \{\n[^\}]*\}\)\(\1 [^)]+\1 = \{\}\)\);/);
+    if (!m) {
+      break;
+    }
+    // m[0] looks like a bunch of lines in one of these two formats:
+    //   ScopeType["BLOCK"] = "block";
+    //   KeyCodes[KeyCodes["TAB"] = 9] = "TAB";
+    // We need to unquote them to look like one of these two formats:
+    //   ScopeType.BLOCK = "block";
+    //   KeyCodes[KeyCodes.TAB = 9] = "TAB";
+    const oldSnippet = m[0];
+    let newSnippet = oldSnippet.replace(/\["(\w+)"\]/g, '.$1');
+    // Add a comment so we don't keep trying to modify this enum.
+    newSnippet = newSnippet.replace(') {', ') {  // Converted by tsick.');
+    code = code.replace(oldSnippet, newSnippet);
+  }
+  return code;
+}
+
+spider(DIR);
