mirror of
https://github.com/google/blockly.git
synced 2026-01-04 15:40:08 +01:00
refactor(generators): Migrate JavaScript generators to TypeScript (#7602)
* refactor(generators): Migrate javascript_generator.js to TypeScript * refactor(generators): Simplify getAdjusted Slightly simplify the implementation of getAdjusted, in part to make it more readable. Also improve its JSDoc comment. * refactor(generators): Migrate generators/javascript/* to TypeScript First pass doing very mechanistic migration, not attempting to fix all the resulting type errors. * fix(generators): Fix type errors in generator functions This consists almost entirely of adding casts, so the code output by tsc should be as similar as possible to the pre-migration .js source files. * refactor(generators): Migrate generators/javascript.js to TypeScript The way the generator functions are added to javascriptGenerator.forBlock has been modified so that incorrect generator function signatures will cause tsc to generate a type error. * chore(generator): Format One block protected with // prettier-ignore to preserve careful comment formatting. Where there are repeated concatenations prettier has made a pretty mess of things, but the correct fix is probably to use template literals instead (rather than just locally disabling prettier). This has been added to the to-do list in #7600. * fix(generators): Fixes for PR #7602 * fix(generators): Fix syntax error
This commit is contained in:
committed by
GitHub
parent
7d2c307fed
commit
4ab8d00099
48
generators/javascript.ts
Normal file
48
generators/javascript.ts
Normal file
@@ -0,0 +1,48 @@
|
||||
/**
|
||||
* @license
|
||||
* Copyright 2021 Google LLC
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
||||
/**
|
||||
* @fileoverview Complete helper functions for generating JavaScript for
|
||||
* blocks. This is the entrypoint for javascript_compressed.js.
|
||||
* @suppress {extraRequire}
|
||||
*/
|
||||
|
||||
// Former goog.module ID: Blockly.JavaScript.all
|
||||
|
||||
import {JavascriptGenerator} from './javascript/javascript_generator.js';
|
||||
import * as colour from './javascript/colour.js';
|
||||
import * as lists from './javascript/lists.js';
|
||||
import * as logic from './javascript/logic.js';
|
||||
import * as loops from './javascript/loops.js';
|
||||
import * as math from './javascript/math.js';
|
||||
import * as procedures from './javascript/procedures.js';
|
||||
import * as text from './javascript/text.js';
|
||||
import * as variables from './javascript/variables.js';
|
||||
import * as variablesDynamic from './javascript/variables_dynamic.js';
|
||||
|
||||
export * from './javascript/javascript_generator.js';
|
||||
|
||||
/**
|
||||
* JavaScript code generator instance.
|
||||
* @type {!JavascriptGenerator}
|
||||
*/
|
||||
export const javascriptGenerator = new JavascriptGenerator();
|
||||
|
||||
// Install per-block-type generator functions:
|
||||
const generators: typeof javascriptGenerator.forBlock = {
|
||||
...colour,
|
||||
...lists,
|
||||
...logic,
|
||||
...loops,
|
||||
...math,
|
||||
...procedures,
|
||||
...text,
|
||||
...variables,
|
||||
...variablesDynamic,
|
||||
};
|
||||
for (const name in generators) {
|
||||
javascriptGenerator.forBlock[name] = generators[name];
|
||||
}
|
||||
Reference in New Issue
Block a user