Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Fix errors in TS declarations with blocks and generators #6200

Merged
merged 1 commit into from
Jun 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions typings/blockly.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -531,13 +531,13 @@ declare module "core/blocks" {
* A block definition. For now this very lose, but it can potentially
* be refined e.g. by replacing this typedef with a class definition.
*/
export type BlockDefinition = Object;
export type BlockDefinition = any;
/**
* A block definition. For now this very lose, but it can potentially
* be refined e.g. by replacing this typedef with a class definition.
* @typedef {!Object}
*/
export let BlockDefinition: any;
// export let BlockDefinition: any;
/**
* A mapping of block type names to block prototype objects.
* @type {!Object<string,!BlockDefinition>}
Expand Down
13 changes: 11 additions & 2 deletions typings/blocks.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,14 @@

/// <reference path="core.d.ts" />

import * as Blockly from './core';
export = Blockly.Blocks;
export const colour: any;
export const lists: any;
export const logic: any;
export const loops: any;
export const math: any;
export const procedures: any;
export const texts: any;
export const variables: any;
export const variablesDynamic: any;

export const blocks: any;
3 changes: 1 addition & 2 deletions typings/core.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,4 @@

/// <reference path="blockly.d.ts" />

import * as Blockly from 'blockly';
export = Blockly;
export * from 'core/blockly';
2 changes: 1 addition & 1 deletion typings/dart.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@
/// <reference path="core.d.ts" />

import * as Blockly from './core';
declare const dart: Blockly.Generator;
declare const dart: any;
export = dart;
8 changes: 3 additions & 5 deletions typings/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@
/// <reference path="javascript.d.ts" />
/// <reference path="msg/msg.d.ts" />

import * as Blockly from './core';
import './blocks';
import './javascript';
export * from './core';
export * as libraryBlocks from './blocks';
export const JavaScript: any;
import './msg/msg';

export = Blockly;
2 changes: 1 addition & 1 deletion typings/javascript.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@
/// <reference path="core.d.ts" />

import * as Blockly from './core';
declare const javascript: Blockly.Generator;
declare const javascript: any;
export = javascript;
2 changes: 1 addition & 1 deletion typings/lua.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@
/// <reference path="core.d.ts" />

import * as Blockly from './core';
declare const lua: Blockly.Generator;
declare const lua: any;
export = lua;
2 changes: 1 addition & 1 deletion typings/php.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@
/// <reference path="core.d.ts" />

import * as Blockly from './core';
declare const php: Blockly.Generator;
declare const php: any;
export = php;
2 changes: 1 addition & 1 deletion typings/python.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@
/// <reference path="core.d.ts" />

import * as Blockly from './core';
declare const python: Blockly.Generator;
declare const python: any;
export = python;