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

google · Jun 8, 2022 · d61f4ca · d61f4ca
1 parent 7c76208
commit d61f4ca
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 16 deletions.
diff --git a/typings/blockly.d.ts b/typings/blockly.d.ts
@@ -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>}

diff --git a/typings/blocks.d.ts b/typings/blocks.d.ts
@@ -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;
diff --git a/typings/core.d.ts b/typings/core.d.ts
@@ -11,5 +11,4 @@
 
 /// <reference path="blockly.d.ts" />
 
-import * as Blockly from 'blockly';
-export = Blockly;
+export * from 'core/blockly';
diff --git a/typings/dart.d.ts b/typings/dart.d.ts
@@ -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;
diff --git a/typings/index.d.ts b/typings/index.d.ts
@@ -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;
diff --git a/typings/javascript.d.ts b/typings/javascript.d.ts
@@ -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;
diff --git a/typings/lua.d.ts b/typings/lua.d.ts
@@ -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;
diff --git a/typings/php.d.ts b/typings/php.d.ts
@@ -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;
diff --git a/typings/python.d.ts b/typings/python.d.ts
@@ -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;