mirror of
https://github.com/google/blockly.git
synced 2026-01-04 23:50:12 +01:00
81b427f4ad
* refactor(generators): Migrate dart_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/dart/* 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.
* fix(generators): Fix minor inconsistencies in JS and Python
The migration of the JavaScript and Python generators
inadvertently introduced some inconsistencies in the code,
e.g.:
- Incorrect import ordering.
- Putting executable code before the initial comment line that
most generator functions begin with, and/or deleting or
replacing these comments.
- N.B. however that these inline comments should have been
JSDocs; a task to convert them has been added to #7600.
* refactor(generators): Migrate generators/dart.js to TypeScript
The way the generator functions are added to
dartGenerator.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 is one of the items in the to-do list in #7600.
* fix(generators): Fix for PR #7646
53 lines
1.4 KiB
TypeScript
53 lines
1.4 KiB
TypeScript
/**
|
|
* @license
|
|
* Copyright 2021 Google LLC
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
/**
|
|
* @fileoverview Complete helper functions for generating Dart for
|
|
* blocks. This is the entrypoint for dart_compressed.js.
|
|
* @suppress {extraRequire}
|
|
*/
|
|
|
|
// Former goog.module ID: Blockly.Dart.all
|
|
|
|
import {DartGenerator} from './dart/dart_generator.js';
|
|
import * as colour from './dart/colour.js';
|
|
import * as lists from './dart/lists.js';
|
|
import * as logic from './dart/logic.js';
|
|
import * as loops from './dart/loops.js';
|
|
import * as math from './dart/math.js';
|
|
import * as procedures from './dart/procedures.js';
|
|
import * as text from './dart/text.js';
|
|
import * as variables from './dart/variables.js';
|
|
import * as variablesDynamic from './dart/variables_dynamic.js';
|
|
|
|
export * from './dart/dart_generator.js';
|
|
|
|
/**
|
|
* Dart code generator instance.
|
|
* @type {!DartGenerator}
|
|
*/
|
|
export const dartGenerator = new DartGenerator();
|
|
|
|
// Add reserved words. This list should include all words mentioned
|
|
// in RESERVED WORDS: comments in the imports above.
|
|
dartGenerator.addReservedWords('Html,Math');
|
|
|
|
// Install per-block-type generator functions:
|
|
const generators: typeof dartGenerator.forBlock = {
|
|
...colour,
|
|
...lists,
|
|
...logic,
|
|
...loops,
|
|
...math,
|
|
...procedures,
|
|
...text,
|
|
...variables,
|
|
...variablesDynamic,
|
|
};
|
|
for (const name in generators) {
|
|
dartGenerator.forBlock[name] = generators[name];
|
|
}
|