reorg common blocks

src/blocks/common/controls_if.js

@@ -1,10 +1,10 @@
 export default {
+  commonType: 'controls_if',
+
   toolbox: {
     category: 'Logic',
   },
 
-  commonType: 'controls_if',
-
   generators: {
     json: (block, generator) => {
       // If/elseif/else condition.

src/blocks/common/logic_boolean.js

@@ -1,10 +1,10 @@
 export default {
+  commonType: 'logic_boolean',
+
   toolbox: {
     category: 'Values',
   },
 
-  commonType: 'logic_boolean',
-
   generators: {
     json: (block, generator) => {
       const bool = block.getFieldValue('BOOL') === 'TRUE'

src/blocks/common/logic_compare.js

@@ -1,10 +1,10 @@
 export default {
+  commonType: 'logic_compare',
+
   toolbox: {
     category: 'Logic',
   },
 
-  commonType: 'logic_compare',
-
   generators: {
     json: (block, generator) => {
       const

src/blocks/common/logic_negate.js

@@ -1,10 +1,10 @@
 export default {
+  commonType: 'logic_negate',
+
   toolbox: {
     category: 'Logic',
   },
 
-  commonType: 'logic_negate',
-
   generators: {
     json: (block, generator) => {
       const

src/blocks/common/logic_null.js

@@ -1,10 +1,10 @@
 export default {
+  commonType: 'logic_null',
+
   toolbox: {
     category: 'Values',
   },
 
-  commonType: 'logic_null',
-
   generators: {
     json: (block, generator) => {
       return [ null, 0]

src/blocks/common/logic_operation.js

@@ -1,10 +1,10 @@
 export default {
+  commonType: 'logic_operation',
+
   toolbox: {
     category: 'Logic',
   },
 
-  commonType: 'logic_operation',
-
   generators: {
     json: (block, generator) => {
       const

src/blocks/common/math_arithmetic.js

@@ -1,10 +1,10 @@
 export default {
+  commonType: 'math_arithmetic',
+
   toolbox: {
     category: 'Math',
   },
 
-  commonType: 'math_arithmetic',
-
   generators: {
     json: (block, generator) => {
       const

src/blocks/common/math_change.js

@@ -1,8 +1,8 @@
 export default {
-  toolbox: { },
-
   commonType: 'math_change',
 
+  toolbox: { },
+
   generators: {
     json: (block, generator) => {
       const

src/blocks/common/math_number.js

@@ -1,10 +1,10 @@
 export default {
+  commonType: 'math_number',
+
   toolbox: {
     category: 'Values',
   },
 
-  commonType: 'math_number',
-
   generators: {
     json: (block, generator) => {
       return [Number(block.getFieldValue('NUM')) || '0', 0]

src/blocks/common/text.js

@@ -1,10 +1,10 @@
 export default {
+  commonType: 'text',
+
   toolbox: {
     category: 'Values',
   },
 
-  commonType: 'text',
-
   generators: {
     json: (block, generator) => {
       const text = block.getFieldValue('TEXT')

src/blocks/common/text_multiline.js

@@ -1,10 +1,10 @@
 export default {
+  commonType: 'text_multiline',
+
   toolbox: {
     category: 'Values',
   },
 
-  commonType: 'text_multiline',
-
   generators: {
     json: (block, generator) => {
       const text = block.getFieldValue('TEXT')

src/blocks/common/variables_get.js

@@ -1,8 +1,8 @@
 export default {
-  toolbox: { },
-
   commonType: 'variables_get',
 
+  toolbox: { },
+
   generators: {
     json: (block, generator) => {
       const variableName = block.getField('VAR').getText()

src/blocks/common/variables_set.js

@@ -1,8 +1,8 @@
 export default {
-  toolbox: { },
-
   commonType: 'variables_set',
 
+  toolbox: { },
+
   generators: {
     json: (block, generator) => {
       const