CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-01-06 08:30:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor(generators): Migrate Dart generators to TypeScript (#7646)

Browse Source 
* 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
This commit is contained in:
Christopher Allen
2023-11-14 16:13:50 +00:00
committed by GitHub
parent 7cb83f21f4
commit 81b427f4ad
18 changed files with 1194 additions and 796 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
generators/javascript/lists.ts
View File

@@ -29,8 +29,8 @@ export function lists_create_with(
block: Block,
generator: JavascriptGenerator,
): [string, Order] {
const createWithBlock = block as CreateWithBlock;
// Create a list with any number of elements of any type.
const createWithBlock = block as CreateWithBlock;
const elements = new Array(createWithBlock.itemCount_);
for (let i = 0; i < createWithBlock.itemCount_; i++) {
elements[i] = generator.valueToCode(block, 'ADD' + i, Order.NONE) || 'null';

2
generators/javascript/logic.ts
View File

@@ -63,7 +63,7 @@ export function logic_compare(
block: Block,
generator: JavascriptGenerator,
): [string, Order] {
// Dictionary of OP comparison operators and their implementations.
// Comparison operator.
const OPERATORS = {
'EQ': '==',
'NEQ': '!=',

4
generators/javascript/text.ts
View File

@@ -11,8 +11,8 @@
// Former goog.module ID: Blockly.JavaScript.texts
import type {Block} from '../../core/block.js';
import type {JoinMutatorBlock} from '../../blocks/text.js';
import type {JavascriptGenerator} from './javascript_generator.js';
import type {JoinMutatorBlock} from '../../blocks/text.js';
import {Order} from './javascript_generator.js';
/**
@@ -80,8 +80,8 @@ export function text_join(
block: Block,
generator: JavascriptGenerator,
): [string, Order] {
const joinBlock = block as JoinMutatorBlock;
// Create a string made up of any number of elements of any type.
const joinBlock = block as JoinMutatorBlock;
switch (joinBlock.itemCount_) {
case 0:
return ["''", Order.ATOMIC];