Fix typings: tuple -> array (#885)

* Fix typings: tuple -> array * chlog * 6.1.2
ukrbublik · Mar 1, 2023 · a6ade23 · a6ade23
1 parent 1d04f4f
commit a6ade23
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,7 @@
 # Changelog
+- 6.1.2
+  - Fix typings for `children1`: tuple -> array (PR #885) (issue #881)
+  - Fix compare fields for case when type != widget.type (PR #875) (issue #758)
 - 6.1.1
   - Fix CJS build (issue with antd/es and antd/lib) (PR #859) (issue #858)
   - Fix button labels (PR #856) (issue #824)

diff --git a/lerna.json b/lerna.json
@@ -5,5 +5,5 @@
     "./packages/*"
   ],
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "6.1.1"
+  "version": "6.1.2"
 }
diff --git a/packages/antd/package.json b/packages/antd/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-awesome-query-builder/antd",
-  "version": "6.1.1",
+  "version": "6.1.2",
   "description": "User-friendly query builder for React. AntDesign widgets",
   "keywords": [
     "query-builder",

diff --git a/packages/bootstrap/package.json b/packages/bootstrap/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-awesome-query-builder/bootstrap",
-  "version": "6.1.1",
+  "version": "6.1.2",
   "description": "User-friendly query builder for React. Bootstrap widgets",
   "keywords": [
     "query-builder",

diff --git a/packages/core/modules/index.d.ts b/packages/core/modules/index.d.ts
@@ -101,32 +101,32 @@ type JsonItem = JsonGroup|JsonAnyRule;
 type JsonSwitchGroup = {
   type: "switch_group",
   id?: string,
-  children1?: {[id: string]: JsonCaseGroup} | [JsonCaseGroup],
+  children1?: {[id: string]: JsonCaseGroup} | JsonCaseGroup[],
   properties?: SwitchGroupProperties
 };
 type JsonCaseGroup = {
   type: "case_group",
   id?: string,
-  children1?: {[id: string]: JsonGroup} | [JsonGroup],
+  children1?: {[id: string]: JsonGroup} | JsonGroup[],
   properties?: CaseGroupProperties
 };
 type JsonGroup = {
   type: "group",
   id?: string,
   // tip: if got array, it will be converted to immutable ordered map in `_addChildren1`
-  children1?: {[id: string]: JsonItem} | [JsonItem],
+  children1?: {[id: string]: JsonItem} | JsonItem[],
   properties?: GroupProperties
 }
 type JsonRuleGroup = {
   type: "rule_group",
   id?: string,
-  children1?: {[id: string]: JsonRule} | [JsonRule],
+  children1?: {[id: string]: JsonRule} | JsonRule[],
   properties?: RuleGroupProperties
 }
 type JsonRuleGroupExt = {
   type: "rule_group",
   id?: string,
-  children1?: {[id: string]: JsonRule} | [JsonRule],
+  children1?: {[id: string]: JsonRule} | JsonRule[],
   properties?: RuleGroupExtProperties
 }
 type JsonRule = {
@@ -460,7 +460,7 @@ export interface Conjunction {
   jsonLogicConj?: string,
   sqlConj?: string,
   spelConj?: string,
-  spelConjs?: [string],
+  spelConjs?: string[],
   reversedConj?: string,
 }
 export type Conjunctions = TypedMap<Conjunction>;
@@ -534,7 +534,7 @@ interface BaseOperator {
   sqlOp?: string,
   sqlFormatOp?: SqlFormatOperator,
   spelOp?: string,
-  spelOps?: [string],
+  spelOps?: string[],
   spelFormatOp?: SpelFormatOperator,
   jsonLogic?: string | JsonLogicFormatOperator,
   _jsonLogicIsRevArgs?: boolean,

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-awesome-query-builder/core",
-  "version": "6.1.1",
+  "version": "6.1.2",
   "description": "User-friendly query builder for React. Core",
   "keywords": [
     "query-builder",

diff --git a/packages/examples/package.json b/packages/examples/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-awesome-query-builder/examples",
-  "version": "6.1.1",
+  "version": "6.1.2",
   "description": "Local hot-reloadable demo for @react-awesome-query-builder",
   "repository": {
     "type": "git",

diff --git a/packages/fluent/package.json b/packages/fluent/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-awesome-query-builder/fluent",
-  "version": "6.1.1",
+  "version": "6.1.2",
   "description": "User-friendly query builder for React. Fluent 8 widgets",
   "keywords": [
     "query-builder",

diff --git a/packages/material/package.json b/packages/material/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-awesome-query-builder/material",
-  "version": "6.1.1",
+  "version": "6.1.2",
   "description": "User-friendly query builder for React. Material-UI 4 widgets",
   "keywords": [
     "query-builder",

diff --git a/packages/mui/package.json b/packages/mui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-awesome-query-builder/mui",
-  "version": "6.1.1",
+  "version": "6.1.2",
   "description": "User-friendly query builder for React. MUI 5 widgets",
   "keywords": [
     "query-builder",

diff --git a/packages/sandbox/package.json b/packages/sandbox/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-awesome-query-builder/sandbox",
-  "version": "6.1.1",
+  "version": "6.1.2",
   "description": "Demo for @react-awesome-query-builder",
   "repository": {
     "type": "git",

diff --git a/packages/sandbox_simple/package.json b/packages/sandbox_simple/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-awesome-query-builder/sandbox-simple",
-  "version": "6.1.1",
+  "version": "6.1.2",
   "description": "Simple demo for @react-awesome-query-builder",
   "repository": {
     "type": "git",

diff --git a/packages/tests/package.json b/packages/tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-awesome-query-builder/tests",
-  "version": "6.1.1",
+  "version": "6.1.2",
   "private": true,
   "description": "Tests for @react-awesome-query-builder",
   "repository": {

diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-awesome-query-builder/ui",
-  "version": "6.1.1",
+  "version": "6.1.2",
   "description": "User-friendly query builder for React. Core React UI",
   "keywords": [
     "query-builder",