fix: message types being incorrect (google#6414)

* chore: regen msg dts files

* fix: package tasks not packaging msg.d.ts files

* fix: add setLocale to blockly.ts

* chore: format

* chore: move setLocale

* chore: add comment about setLocale not being useful when used with script tags

* chore: format

core/blockly.ts

@@ -118,7 +118,7 @@ import {MarkerManager} from './marker_manager.js';
 import {Menu} from './menu.js';
 import {MenuItem} from './menuitem.js';
 import {MetricsManager} from './metrics_manager.js';
-import {Msg} from './msg.js';
+import {Msg, setLocale} from './msg.js';
 import {Mutator} from './mutator.js';
 import {Names} from './names.js';
 import {Options} from './options.js';
@@ -560,6 +560,7 @@ export const VARIABLE_DYNAMIC_CATEGORY_NAME: string =
  */
 export const PROCEDURE_CATEGORY_NAME: string = Procedures.CATEGORY_NAME;
 
+
 // Context for why we need to monkey-patch in these functions (internal):
 //   https://docs.google.com/document/d/1MbO0LEA-pAyx1ErGLJnyUqTLrcYTo-5zga9qplnxeXo/edit?usp=sharing&resourcekey=0-5h_32-i-dHwHjf_9KYEVKg
 
@@ -720,7 +721,7 @@ export {Menu};
 export {MenuItem};
 export {MetricsManager};
 export {Mutator};
-export {Msg};
+export {Msg, setLocale};
 export {Names};
 export {Options};
 export {RenderedConnection};

core/msg.ts

@@ -15,3 +15,20 @@ goog.declareModuleId('Blockly.Msg');
 
 /** A dictionary of localised messages. */
 export const Msg: {[key: string]: string} = Object.create(null);
+
+/**
+ * Sets the locale (i.e. the localized messages/block-text/etc) to the given
+ * locale.
+ *
+ * This is not useful/necessary when loading from a script tag, because the
+ * messages are automatically cluged into the Blockly.Msg object. But we provide
+ * it in both the script-tag and non-script-tag contexts so that the tscompiler
+ * can properly create our type definition files.
+ *
+ * @param locale An object defining the messages for a given language.
+ */
+export const setLocale = function(locale: {[key: string]: string}) {
+  Object.keys(locale).forEach(function(k) {
+    Msg[k] = locale[k];
+  });
+};

scripts/gulpfiles/package_tasks.js

@@ -377,7 +377,7 @@ function packageReadme() {
 function packageDTS() {
   const handwrittenSrcs = [
     'typings/*.d.ts',
-    'typings/msg/msg.d.ts',
+    'typings/msg/*.d.ts',
   ];
   return gulp.src(handwrittenSrcs, {base: 'typings'})
       .pipe(gulp.src(`${TYPINGS_BUILD_DIR}/**/*.d.ts`))

scripts/package/browser/core.js

@@ -12,9 +12,3 @@
 /* eslint-disable */
 'use strict';
 
-// Add a helper method to set the Blockly locale.
-Blockly.setLocale = function (locale) {
-  Object.keys(locale).forEach(function (k) {
-    Blockly.Msg[k] = locale[k];
-  });
-};

scripts/package/node/core.js

@@ -12,12 +12,6 @@
 /* eslint-disable */
 'use strict';
 
-// Add a helper method to set the Blockly locale.
-Blockly.setLocale = function (locale) {
-  Object.keys(locale).forEach(function (k) {
-    Blockly.Msg[k] = locale[k];
-  });
-};
 
 // Override textToDomDocument and provide Node.js alternatives to DOMParser and
 // XMLSerializer.

typings/msg/ab.d.ts

@@ -1,16 +1,8 @@
 /**
  * @license
- * Copyright 2020 Google LLC
+ * Copyright 2022 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/**
- * @fileoverview Type definitions for the Blockly ab locale.
- * @author samelh@google.com (Sam El-Husseini)
- */
-
-/// <reference path="msg.d.ts" />
-
-import BlocklyMsg = Blockly.Msg;
-export = BlocklyMsg;
+export * from './msg';
 

typings/msg/ace.d.ts

@@ -0,0 +1,8 @@
+/**
+ * @license
+ * Copyright 2022 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './msg';
+

typings/msg/af.d.ts

@@ -0,0 +1,8 @@
+/**
+ * @license
+ * Copyright 2022 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './msg';
+

typings/msg/am.d.ts

@@ -0,0 +1,8 @@
+/**
+ * @license
+ * Copyright 2022 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './msg';
+

typings/msg/ar.d.ts

@@ -1,16 +1,8 @@
 /**
  * @license
- * Copyright 2020 Google LLC
+ * Copyright 2022 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/**
- * @fileoverview Type definitions for the Blockly ar locale.
- * @author samelh@google.com (Sam El-Husseini)
- */
-
-/// <reference path="msg.d.ts" />
-
-import BlocklyMsg = Blockly.Msg;
-export = BlocklyMsg;
+export * from './msg';
 

typings/msg/ast.d.ts

@@ -0,0 +1,8 @@
+/**
+ * @license
+ * Copyright 2022 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './msg';
+

typings/msg/az.d.ts

@@ -1,16 +1,8 @@
 /**
  * @license
- * Copyright 2020 Google LLC
+ * Copyright 2022 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/**
- * @fileoverview Type definitions for the Blockly az locale.
- * @author samelh@google.com (Sam El-Husseini)
- */
-
-/// <reference path="msg.d.ts" />
-
-import BlocklyMsg = Blockly.Msg;
-export = BlocklyMsg;
+export * from './msg';
 

typings/msg/ba.d.ts

@@ -1,16 +1,8 @@
 /**
  * @license
- * Copyright 2020 Google LLC
+ * Copyright 2022 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/**
- * @fileoverview Type definitions for the Blockly ba locale.
- * @author samelh@google.com (Sam El-Husseini)
- */
-
-/// <reference path="msg.d.ts" />
-
-import BlocklyMsg = Blockly.Msg;
-export = BlocklyMsg;
+export * from './msg';
 

typings/msg/bcc.d.ts

@@ -1,16 +1,8 @@
 /**
  * @license
- * Copyright 2020 Google LLC
+ * Copyright 2022 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/**
- * @fileoverview Type definitions for the Blockly bcc locale.
- * @author samelh@google.com (Sam El-Husseini)
- */
-
-/// <reference path="msg.d.ts" />
-
-import BlocklyMsg = Blockly.Msg;
-export = BlocklyMsg;
+export * from './msg';
 

typings/msg/be-tarask.d.ts

@@ -1,16 +1,8 @@
 /**
  * @license
- * Copyright 2020 Google LLC
+ * Copyright 2022 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/**
- * @fileoverview Type definitions for the Blockly be-tarask locale.
- * @author samelh@google.com (Sam El-Husseini)
- */
-
-/// <reference path="msg.d.ts" />
-
-import BlocklyMsg = Blockly.Msg;
-export = BlocklyMsg;
+export * from './msg';
 

typings/msg/be.d.ts

@@ -1,16 +1,8 @@
 /**
  * @license
- * Copyright 2020 Google LLC
+ * Copyright 2022 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/**
- * @fileoverview Type definitions for the Blockly be locale.
- * @author samelh@google.com (Sam El-Husseini)
- */
-
-/// <reference path="msg.d.ts" />
-
-import BlocklyMsg = Blockly.Msg;
-export = BlocklyMsg;
+export * from './msg';
 

typings/msg/bg.d.ts

@@ -1,16 +1,8 @@
 /**
  * @license
- * Copyright 2020 Google LLC
+ * Copyright 2022 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/**
- * @fileoverview Type definitions for the Blockly bg locale.
- * @author samelh@google.com (Sam El-Husseini)
- */
-
-/// <reference path="msg.d.ts" />
-
-import BlocklyMsg = Blockly.Msg;
-export = BlocklyMsg;
+export * from './msg';
 

typings/msg/bn.d.ts

@@ -1,16 +1,8 @@
 /**
  * @license
- * Copyright 2020 Google LLC
+ * Copyright 2022 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/**
- * @fileoverview Type definitions for the Blockly bn locale.
- * @author samelh@google.com (Sam El-Husseini)
- */
-
-/// <reference path="msg.d.ts" />
-
-import BlocklyMsg = Blockly.Msg;
-export = BlocklyMsg;
+export * from './msg';
 

typings/msg/br.d.ts

@@ -1,16 +1,8 @@
 /**
  * @license
- * Copyright 2020 Google LLC
+ * Copyright 2022 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/**
- * @fileoverview Type definitions for the Blockly br locale.
- * @author samelh@google.com (Sam El-Husseini)
- */
-
-/// <reference path="msg.d.ts" />
-
-import BlocklyMsg = Blockly.Msg;
-export = BlocklyMsg;
+export * from './msg';
 

typings/msg/bs.d.ts

@@ -1,16 +1,8 @@
 /**
  * @license
- * Copyright 2020 Google LLC
+ * Copyright 2022 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/**
- * @fileoverview Type definitions for the Blockly bs locale.
- * @author samelh@google.com (Sam El-Husseini)
- */
-
-/// <reference path="msg.d.ts" />
-
-import BlocklyMsg = Blockly.Msg;
-export = BlocklyMsg;
+export * from './msg';
 

typings/msg/ca.d.ts

@@ -1,16 +1,8 @@
 /**
  * @license
- * Copyright 2020 Google LLC
+ * Copyright 2022 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/**
- * @fileoverview Type definitions for the Blockly ca locale.
- * @author samelh@google.com (Sam El-Husseini)
- */
-
-/// <reference path="msg.d.ts" />
-
-import BlocklyMsg = Blockly.Msg;
-export = BlocklyMsg;
+export * from './msg';
 

typings/msg/cdo.d.ts

@@ -0,0 +1,8 @@
+/**
+ * @license
+ * Copyright 2022 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './msg';
+

typings/msg/cs.d.ts

@@ -1,16 +1,8 @@
 /**
  * @license
- * Copyright 2020 Google LLC
+ * Copyright 2022 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/**
- * @fileoverview Type definitions for the Blockly cs locale.
- * @author samelh@google.com (Sam El-Husseini)
- */
-
-/// <reference path="msg.d.ts" />
-
-import BlocklyMsg = Blockly.Msg;
-export = BlocklyMsg;
+export * from './msg';
 

typings/msg/da.d.ts

@@ -1,16 +1,8 @@
 /**
  * @license
- * Copyright 2020 Google LLC
+ * Copyright 2022 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/**
- * @fileoverview Type definitions for the Blockly da locale.
- * @author samelh@google.com (Sam El-Husseini)
- */
-
-/// <reference path="msg.d.ts" />
-
-import BlocklyMsg = Blockly.Msg;
-export = BlocklyMsg;
+export * from './msg';