@plasmicapp/host 1.0.227 → 1.0.229

package/registerComponent/dist/types/component-types.d.ts

@@ -4,20 +4,16 @@ import { ChoiceCore, ChoiceValue } from "./choice-type";
 import { ArrayTypeBaseCore, ObjectTypeBaseCore } from "./container-types";
 import { DataPickerValueType, DataSourceCore, DynamicCore, GraphQLCore, GraphQLValue, RichDataPickerCore, RichExprEditorCore } from "./misc-types";
 import { CardPickerCore, ClassCore, CodeStringCore, ColorCore, DateRangeStringsCore, DateStringCore, HrefCore, NumberTypeBaseCore, PlainNumberCore, PlainStringCore, RichBooleanCore, RichTextCore, SliderNumberCore, ThemeResetClassCore } from "./primitive-types";
-import { CommonTypeBase, ContextDependentConfig, ControlExtras, GenericContext, InferDataType } from "./shared-controls";
+import { CommonTypeBase, ContextDependentConfig, ControlExtras, Defaultable, GenericContext, InferDataType } from "./shared-controls";
 export type ComponentControlContext<P> = GenericContext<P, // Full component props
 // Full component props
 InferDataType<P> | null, // Canvas data
 ControlExtras>;
 export type ComponentContextConfig<Props, R> = ContextDependentConfig<ComponentControlContext<Props>, R>;
-export interface PropTypeBase<Ctx extends any[]> extends CommonTypeBase<Ctx> {
+export interface PropTypeBase<Ctx extends any[]> extends CommonTypeBase {
     displayName?: string;
+    required?: boolean;
     readOnly?: boolean | ContextDependentConfig<Ctx, boolean>;
-    /**
-     * If true, will hide the prop in a collapsed section; good for props that
-     * should not usually be used.
-     */
-    advanced?: boolean;
     /**
      * If set to true, the component will be remounted when the prop value is updated.
      * (This behavior only applies to canvas)
@@ -27,17 +23,13 @@ export interface PropTypeBase<Ctx extends any[]> extends CommonTypeBase<Ctx> {
      * If true, the prop can't be overriden in different variants.
      */
     invariantable?: boolean;
-}
-export interface Defaultable<Ctx extends any[], T> {
     /**
-     * Default value to set for this prop when the component is instantiated
-     */
-    defaultValue?: T;
-    /**
-     * If no prop is given, the component uses a default; specify what
-     * that default is so the Plasmic user can see it in the studio UI
+     * Function for whether this prop should be hidden in the right panel,
+     * given the current props for this component
      */
-    defaultValueHint?: T | ContextDependentConfig<Ctx, T | undefined>;
+    hidden?: ContextDependentConfig<Ctx, boolean>;
+}
+interface ExtendedDefaultable<Ctx extends any[], T> extends Defaultable<Ctx, T> {
     /**
      * Use a dynamic value expression as the default instead
      */
@@ -65,7 +57,7 @@ export interface Controllable {
      */
     uncontrolledProp?: string;
 }
-export type PropTypeBaseDefault<P, T> = PropTypeBase<ComponentControlContext<P>> & Defaultable<ComponentControlContext<P>, T> & Controllable;
+export type PropTypeBaseDefault<P, T> = PropTypeBase<ComponentControlContext<P>> & ExtendedDefaultable<ComponentControlContext<P>, T> & Controllable;
 export type PlainStringType<P> = PropTypeBaseDefault<P, string> & PlainStringCore;
 export type CodeStringType<P> = PropTypeBaseDefault<P, string> & CodeStringCore;
 export type RichTextType<P> = PropTypeBaseDefault<P, string> & RichTextCore;
@@ -256,3 +248,4 @@ export type StringCompatType<P> = DateStringType<P> | StringType<P> | ChoiceType
 export type BoolCompatType<P> = BooleanType<P> | CustomType<P> | DataPickerType<P>;
 export type NumberCompatType<P> = NumberType<P> | CustomType<P> | DataPickerType<P>;
 export type RestrictPropType<T, P> = T extends string ? StringCompatType<P> : T extends boolean ? BoolCompatType<P> : T extends number ? NumberCompatType<P> : PropType<P>;
+export {};

package/registerComponent/dist/types/function-types.d.ts

@@ -2,49 +2,51 @@ import { ChoiceCore, ChoiceValue } from "./choice-type";
 import { ArrayTypeBaseCore, ObjectTypeBaseCore } from "./container-types";
 import { DynamicCore, GraphQLCore, GraphQLValue } from "./misc-types";
 import { DateRangeStringsCore, DateStringCore, NumberTypeBaseCore, RichBooleanCore } from "./primitive-types";
-import { CommonTypeBase, ContextDependentConfig, GenericContext } from "./shared-controls";
+import { QueryBuilderCore } from "./query-builder-types";
+import { CommonTypeBase, ContextDependentConfig, Defaultable, GenericContext } from "./shared-controls";
 import { Nullish } from "./type-utils";
 export type FunctionControlContext<P> = GenericContext<Partial<P>, // Partial function props
 any>;
 export type FunctionContextConfig<Args extends any[], R> = ContextDependentConfig<FunctionControlContext<Args>, R>;
-export interface BaseParam {
+export interface ParamTypeBase extends CommonTypeBase {
     name: string;
-    description?: string;
     isOptional?: boolean;
     isRestParameter?: boolean;
 }
-export interface FunctionMeta<Args extends any[] = any> extends CommonTypeBase<FunctionControlContext<Args>> {
+export type ParamTypeBaseDefault<Ctx extends any[], T> = ParamTypeBase & Defaultable<Ctx, T>;
+export interface FunctionMeta extends CommonTypeBase {
     name: string;
     rest?: boolean;
 }
-export interface PlainStringType<T extends Nullish<string> = string> extends BaseParam {
+export interface PlainStringType<T extends Nullish<string> = string> extends ParamTypeBaseDefault<any[], T> {
     type: "string" | `'${T}'`;
 }
 export type StringType<P, T extends string = string> = "string" | PlainStringType<T> | ChoiceType<P, T> | DateStringType | DateRangeStringsType | AnyType;
-export interface PlainNumberType<T extends Nullish<number> = number> extends BaseParam {
+export interface PlainNumberType<T extends Nullish<number> = number> extends ParamTypeBaseDefault<any[], T> {
     type: "number" | `${number extends T ? number : T}`;
 }
-export type NumberType<P, T extends number = number> = PlainNumberType<T> | (BaseParam & NumberTypeBaseCore<FunctionControlContext<P>>) | ChoiceType<P, T> | AnyType;
-export interface PlainBooleanType<T extends Nullish<boolean> = boolean> extends BaseParam {
+export type NumberType<P, T extends number = number> = PlainNumberType<T> | (ParamTypeBaseDefault<FunctionControlContext<P>, T> & NumberTypeBaseCore<FunctionControlContext<P>>) | ChoiceType<P, T> | AnyType;
+export interface PlainBooleanType<T extends Nullish<boolean> = boolean> extends ParamTypeBaseDefault<any[], T> {
     type: "boolean" | `${boolean extends T ? boolean : T}`;
 }
-export type BooleanType<P, T extends boolean = boolean> = PlainBooleanType<T> | (BaseParam & RichBooleanCore) | ChoiceType<P, T> | AnyType;
-export type GraphQLType<P> = BaseParam & GraphQLCore<FunctionControlContext<P>>;
-export interface PlainNullType extends BaseParam {
+export type BooleanType<P, T extends boolean = boolean> = PlainBooleanType<T> | (ParamTypeBaseDefault<FunctionControlContext<P>, T> & RichBooleanCore) | ChoiceType<P, T> | AnyType;
+export type GraphQLType<P> = ParamTypeBaseDefault<FunctionControlContext<P>, any> & GraphQLCore<FunctionControlContext<P>>;
+export interface PlainNullType extends ParamTypeBaseDefault<any[], null> {
     type: "null";
 }
 export type NullType = PlainNullType | AnyType;
-export interface PlainUndefinedType extends BaseParam {
+export interface PlainUndefinedType extends ParamTypeBaseDefault<any[], undefined> {
     type: "undefined";
 }
 export type UndefinedType = PlainUndefinedType | AnyType;
-export type ObjectType<P> = BaseParam & ObjectTypeBaseCore<FunctionControlContext<P>, AnyTyping<P, any>>;
-export type ArrayType<P> = BaseParam & ArrayTypeBaseCore<FunctionControlContext<P>, AnyTyping<P, any>>;
-export interface PlainAnyType extends BaseParam {
+export type ObjectType<P> = ParamTypeBaseDefault<FunctionControlContext<P>, Record<string, any>> & ObjectTypeBaseCore<FunctionControlContext<P>, AnyTyping<P, any>>;
+export type ArrayType<P> = ParamTypeBaseDefault<FunctionControlContext<P>, any[]> & ArrayTypeBaseCore<FunctionControlContext<P>, AnyTyping<P, any>>;
+export type QueryBuilderType<P> = ParamTypeBaseDefault<FunctionControlContext<P>, any> & QueryBuilderCore<FunctionControlContext<P>>;
+export interface PlainAnyType extends ParamTypeBaseDefault<FunctionControlContext<any>, any> {
     type: "any";
 }
 export type AnyType = PlainAnyType;
-export interface PlainVoidType extends BaseParam {
+export interface PlainVoidType extends ParamTypeBase {
     type: "void";
 }
 export type VoidType = PlainVoidType | AnyType;
@@ -52,7 +54,7 @@ type IsAny<T> = 0 extends 1 & T ? true : false;
 type CommonType<P, T> = T extends GraphQLValue ? GraphQLType<P> : T extends null ? NullType : T extends undefined ? UndefinedType : T extends Array<any> ? ArrayType<P> : T extends object ? ObjectType<P> : AnyType;
 type AnyTyping<P, T> = T extends string ? StringType<P, T> : T extends number ? NumberType<P, T> : T extends boolean ? BooleanType<P, T> : CommonType<P, T>;
 export type ToTuple<T> = T extends any[] ? T : never;
-export type FunctionChoiceType<Args, Opt extends ChoiceValue = ChoiceValue> = FunctionMeta<ToTuple<Args>> & ChoiceCore<FunctionControlContext<ToTuple<Args>>, Opt>;
+export type FunctionChoiceType<Args, Opt extends ChoiceValue = ChoiceValue> = FunctionMeta & Defaultable<FunctionControlContext<ToTuple<Args>>, Opt | Opt[]> & ChoiceCore<FunctionControlContext<ToTuple<Args>>, Opt>;
 export interface SingleChoiceType<P, Opt extends ChoiceValue = ChoiceValue> extends FunctionChoiceType<P, Opt> {
     multiSelect?: false;
 }
@@ -63,14 +65,17 @@ export interface CustomChoiceType<P, Opt extends ChoiceValue = ChoiceValue> exte
     multiSelect: FunctionContextConfig<ToTuple<P>, boolean>;
 }
 export type ChoiceType<P, T extends ChoiceValue = ChoiceValue> = SingleChoiceType<P, T> | MultiChoiceType<P, T> | CustomChoiceType<P, T>;
-export type DateStringType = BaseParam & DateStringCore;
-export type DateRangeStringsType = BaseParam & DateRangeStringsCore;
-export interface DynamicType<P> extends BaseParam, DynamicCore<FunctionControlContext<ToTuple<P>>, ParamType<P, any>> {
+export type DateStringType = ParamTypeBaseDefault<FunctionControlContext<string>, string> & DateStringCore;
+export type DateRangeStringsType = ParamTypeBaseDefault<FunctionControlContext<[string, string]>, [
+    string,
+    string
+]> & DateRangeStringsCore;
+export interface DynamicType<P> extends ParamTypeBase, DynamicCore<FunctionControlContext<ToTuple<P>>, ParamType<P, any>> {
 }
 export type RestrictedType<P, T> = IsAny<T> extends true ? AnyTyping<P, T> : [
     T
 ] extends [string] ? StringType<P, T> : [T] extends [number] ? NumberType<P, T> : [T] extends [boolean] ? BooleanType<P, T> : T extends string | null | undefined ? Exclude<T, null | undefined> extends string ? StringType<P, T extends string ? T : string> : CommonType<P, T> : T extends number | null | undefined ? Exclude<T, null | undefined> extends number ? NumberType<P, T extends number ? T : number> : CommonType<P, T> : T extends boolean | null | undefined ? Exclude<T, null | undefined> extends boolean ? BooleanType<P, T extends boolean ? T : boolean> : CommonType<P, T> : CommonType<P, T>;
-export type ParamType<P, T> = RestrictedType<P, T> | DynamicType<P>;
+export type ParamType<P, T> = RestrictedType<P, T> | DynamicType<P> | QueryBuilderType<P>;
 export type RequiredParam<P, T> = ParamType<P, T> & {
     isOptional?: false;
     isRestParameter?: false;

package/registerComponent/dist/types/query-builder-types.d.ts

@@ -0,0 +1,51 @@
+import { ContextDependentConfig } from "./shared-controls";
+/**
+ * Control type for building a custom query format.
+ *
+ * This control is based on react-awesome-query-builder
+ * and returns data in JsonLogic format.
+ *
+ * If using this control type, it's recommended to install
+ * @react-awesome-query-builder/core and json-logic-js as devDependencies
+ * so that you can reference their types.
+ *
+ * References:
+ * - https://github.com/ukrbublik/react-awesome-query-builder
+ * - https://github.com/jwadhams/json-logic-js
+ * - https://jsonlogic.com/
+ */
+export interface QueryBuilderCore<Ctx extends any[]> {
+    type: "queryBuilder";
+    /**
+     * Return a @react-awesome-query-builder/core `Config` that will be merged
+     * with Plasmic's built-in config.
+     *
+     * https://github.com/plasmicapp/plasmic/blob/master/platform/wab/src/wab/client/components/QueryBuilder/QueryBuilderConfig.tsx
+     *
+     * At a minimum, this should return fields and their types.
+     * For configuration options, see react-awesome-query-builder docs.
+     */
+    config: ContextDependentConfig<Ctx, SimplifiedConfig>;
+}
+/**
+ * A simplified subset of @react-awesome-query-builder/core `Config`.
+ */
+interface SimplifiedConfig {
+    fields: SimplifiedFields;
+}
+/**
+ * A simplified subset of @react-awesome-query-builder/core `Fields`.
+ */
+interface SimplifiedFields {
+    [key: string]: SimplifiedField;
+}
+/**
+ * A simplified subset of @react-awesome-query-builder/core `FieldOrGroup`.
+ */
+interface SimplifiedField {
+    type: "text" | "number" | "boolean" | "date" | "time" | "datetime" | "select" | "multiselect" | "treeselect" | "treemultiselect" | string;
+    label?: string;
+    defaultValue?: unknown;
+    fieldSettings?: {};
+}
+export {};

package/registerComponent/dist/types/shared-controls.d.ts

@@ -17,10 +17,14 @@ export type ControlExtras = {
     item?: any;
 };
 export type InferDataType<P> = P extends CanvasComponentProps<infer Data> ? Data : any;
-export interface CommonTypeBase<Ctx extends any[]> {
+export interface CommonTypeBase {
     description?: string;
     helpText?: string;
-    required?: boolean;
+    /**
+     * If true, will hide the prop in a collapsed section; good for props that
+     * should not usually be used.
+     */
+    advanced?: boolean;
     /**
      * If the user has chosen to use a dynamic expression for this prop, provide
      * a hint as to the expected values that the expression should evaluate to.
@@ -28,13 +32,19 @@ export interface CommonTypeBase<Ctx extends any[]> {
      * markdown in the text here.
      */
     exprHint?: string;
-    /**
-     * Function for whether this prop should be hidden in the right panel,
-     * given the current props for this component
-     */
-    hidden?: ContextDependentConfig<Ctx, boolean>;
     /**
      * If true, does not allow the user to use a dynamic expression for this prop
      */
     disableDynamicValue?: boolean;
 }
+export interface Defaultable<Ctx extends any[], T> {
+    /**
+     * Default value to set for this prop when the component is instantiated
+     */
+    defaultValue?: T;
+    /**
+     * Specify that default when no prop/param is provided,
+     * so the Plasmic user can see it in the studio UI
+     */
+    defaultValueHint?: T | ContextDependentConfig<Ctx, T | undefined>;
+}

package/registerComponent/dist/version.d.ts

@@ -1 +1 @@
-export declare const hostVersion = "1.0.227";
+export declare const hostVersion = "1.0.229";

package/registerFunction/dist/types/component-types.d.ts

@@ -4,20 +4,16 @@ import { ChoiceCore, ChoiceValue } from "./choice-type";
 import { ArrayTypeBaseCore, ObjectTypeBaseCore } from "./container-types";
 import { DataPickerValueType, DataSourceCore, DynamicCore, GraphQLCore, GraphQLValue, RichDataPickerCore, RichExprEditorCore } from "./misc-types";
 import { CardPickerCore, ClassCore, CodeStringCore, ColorCore, DateRangeStringsCore, DateStringCore, HrefCore, NumberTypeBaseCore, PlainNumberCore, PlainStringCore, RichBooleanCore, RichTextCore, SliderNumberCore, ThemeResetClassCore } from "./primitive-types";
-import { CommonTypeBase, ContextDependentConfig, ControlExtras, GenericContext, InferDataType } from "./shared-controls";
+import { CommonTypeBase, ContextDependentConfig, ControlExtras, Defaultable, GenericContext, InferDataType } from "./shared-controls";
 export type ComponentControlContext<P> = GenericContext<P, // Full component props
 // Full component props
 InferDataType<P> | null, // Canvas data
 ControlExtras>;
 export type ComponentContextConfig<Props, R> = ContextDependentConfig<ComponentControlContext<Props>, R>;
-export interface PropTypeBase<Ctx extends any[]> extends CommonTypeBase<Ctx> {
+export interface PropTypeBase<Ctx extends any[]> extends CommonTypeBase {
     displayName?: string;
+    required?: boolean;
     readOnly?: boolean | ContextDependentConfig<Ctx, boolean>;
-    /**
-     * If true, will hide the prop in a collapsed section; good for props that
-     * should not usually be used.
-     */
-    advanced?: boolean;
     /**
      * If set to true, the component will be remounted when the prop value is updated.
      * (This behavior only applies to canvas)
@@ -27,17 +23,13 @@ export interface PropTypeBase<Ctx extends any[]> extends CommonTypeBase<Ctx> {
      * If true, the prop can't be overriden in different variants.
      */
     invariantable?: boolean;
-}
-export interface Defaultable<Ctx extends any[], T> {
     /**
-     * Default value to set for this prop when the component is instantiated
-     */
-    defaultValue?: T;
-    /**
-     * If no prop is given, the component uses a default; specify what
-     * that default is so the Plasmic user can see it in the studio UI
+     * Function for whether this prop should be hidden in the right panel,
+     * given the current props for this component
      */
-    defaultValueHint?: T | ContextDependentConfig<Ctx, T | undefined>;
+    hidden?: ContextDependentConfig<Ctx, boolean>;
+}
+interface ExtendedDefaultable<Ctx extends any[], T> extends Defaultable<Ctx, T> {
     /**
      * Use a dynamic value expression as the default instead
      */
@@ -65,7 +57,7 @@ export interface Controllable {
      */
     uncontrolledProp?: string;
 }
-export type PropTypeBaseDefault<P, T> = PropTypeBase<ComponentControlContext<P>> & Defaultable<ComponentControlContext<P>, T> & Controllable;
+export type PropTypeBaseDefault<P, T> = PropTypeBase<ComponentControlContext<P>> & ExtendedDefaultable<ComponentControlContext<P>, T> & Controllable;
 export type PlainStringType<P> = PropTypeBaseDefault<P, string> & PlainStringCore;
 export type CodeStringType<P> = PropTypeBaseDefault<P, string> & CodeStringCore;
 export type RichTextType<P> = PropTypeBaseDefault<P, string> & RichTextCore;
@@ -256,3 +248,4 @@ export type StringCompatType<P> = DateStringType<P> | StringType<P> | ChoiceType
 export type BoolCompatType<P> = BooleanType<P> | CustomType<P> | DataPickerType<P>;
 export type NumberCompatType<P> = NumberType<P> | CustomType<P> | DataPickerType<P>;
 export type RestrictPropType<T, P> = T extends string ? StringCompatType<P> : T extends boolean ? BoolCompatType<P> : T extends number ? NumberCompatType<P> : PropType<P>;
+export {};

package/registerFunction/dist/types/function-types.d.ts

@@ -2,49 +2,51 @@ import { ChoiceCore, ChoiceValue } from "./choice-type";
 import { ArrayTypeBaseCore, ObjectTypeBaseCore } from "./container-types";
 import { DynamicCore, GraphQLCore, GraphQLValue } from "./misc-types";
 import { DateRangeStringsCore, DateStringCore, NumberTypeBaseCore, RichBooleanCore } from "./primitive-types";
-import { CommonTypeBase, ContextDependentConfig, GenericContext } from "./shared-controls";
+import { QueryBuilderCore } from "./query-builder-types";
+import { CommonTypeBase, ContextDependentConfig, Defaultable, GenericContext } from "./shared-controls";
 import { Nullish } from "./type-utils";
 export type FunctionControlContext<P> = GenericContext<Partial<P>, // Partial function props
 any>;
 export type FunctionContextConfig<Args extends any[], R> = ContextDependentConfig<FunctionControlContext<Args>, R>;
-export interface BaseParam {
+export interface ParamTypeBase extends CommonTypeBase {
     name: string;
-    description?: string;
     isOptional?: boolean;
     isRestParameter?: boolean;
 }
-export interface FunctionMeta<Args extends any[] = any> extends CommonTypeBase<FunctionControlContext<Args>> {
+export type ParamTypeBaseDefault<Ctx extends any[], T> = ParamTypeBase & Defaultable<Ctx, T>;
+export interface FunctionMeta extends CommonTypeBase {
     name: string;
     rest?: boolean;
 }
-export interface PlainStringType<T extends Nullish<string> = string> extends BaseParam {
+export interface PlainStringType<T extends Nullish<string> = string> extends ParamTypeBaseDefault<any[], T> {
     type: "string" | `'${T}'`;
 }
 export type StringType<P, T extends string = string> = "string" | PlainStringType<T> | ChoiceType<P, T> | DateStringType | DateRangeStringsType | AnyType;
-export interface PlainNumberType<T extends Nullish<number> = number> extends BaseParam {
+export interface PlainNumberType<T extends Nullish<number> = number> extends ParamTypeBaseDefault<any[], T> {
     type: "number" | `${number extends T ? number : T}`;
 }
-export type NumberType<P, T extends number = number> = PlainNumberType<T> | (BaseParam & NumberTypeBaseCore<FunctionControlContext<P>>) | ChoiceType<P, T> | AnyType;
-export interface PlainBooleanType<T extends Nullish<boolean> = boolean> extends BaseParam {
+export type NumberType<P, T extends number = number> = PlainNumberType<T> | (ParamTypeBaseDefault<FunctionControlContext<P>, T> & NumberTypeBaseCore<FunctionControlContext<P>>) | ChoiceType<P, T> | AnyType;
+export interface PlainBooleanType<T extends Nullish<boolean> = boolean> extends ParamTypeBaseDefault<any[], T> {
     type: "boolean" | `${boolean extends T ? boolean : T}`;
 }
-export type BooleanType<P, T extends boolean = boolean> = PlainBooleanType<T> | (BaseParam & RichBooleanCore) | ChoiceType<P, T> | AnyType;
-export type GraphQLType<P> = BaseParam & GraphQLCore<FunctionControlContext<P>>;
-export interface PlainNullType extends BaseParam {
+export type BooleanType<P, T extends boolean = boolean> = PlainBooleanType<T> | (ParamTypeBaseDefault<FunctionControlContext<P>, T> & RichBooleanCore) | ChoiceType<P, T> | AnyType;
+export type GraphQLType<P> = ParamTypeBaseDefault<FunctionControlContext<P>, any> & GraphQLCore<FunctionControlContext<P>>;
+export interface PlainNullType extends ParamTypeBaseDefault<any[], null> {
     type: "null";
 }
 export type NullType = PlainNullType | AnyType;
-export interface PlainUndefinedType extends BaseParam {
+export interface PlainUndefinedType extends ParamTypeBaseDefault<any[], undefined> {
     type: "undefined";
 }
 export type UndefinedType = PlainUndefinedType | AnyType;
-export type ObjectType<P> = BaseParam & ObjectTypeBaseCore<FunctionControlContext<P>, AnyTyping<P, any>>;
-export type ArrayType<P> = BaseParam & ArrayTypeBaseCore<FunctionControlContext<P>, AnyTyping<P, any>>;
-export interface PlainAnyType extends BaseParam {
+export type ObjectType<P> = ParamTypeBaseDefault<FunctionControlContext<P>, Record<string, any>> & ObjectTypeBaseCore<FunctionControlContext<P>, AnyTyping<P, any>>;
+export type ArrayType<P> = ParamTypeBaseDefault<FunctionControlContext<P>, any[]> & ArrayTypeBaseCore<FunctionControlContext<P>, AnyTyping<P, any>>;
+export type QueryBuilderType<P> = ParamTypeBaseDefault<FunctionControlContext<P>, any> & QueryBuilderCore<FunctionControlContext<P>>;
+export interface PlainAnyType extends ParamTypeBaseDefault<FunctionControlContext<any>, any> {
     type: "any";
 }
 export type AnyType = PlainAnyType;
-export interface PlainVoidType extends BaseParam {
+export interface PlainVoidType extends ParamTypeBase {
     type: "void";
 }
 export type VoidType = PlainVoidType | AnyType;
@@ -52,7 +54,7 @@ type IsAny<T> = 0 extends 1 & T ? true : false;
 type CommonType<P, T> = T extends GraphQLValue ? GraphQLType<P> : T extends null ? NullType : T extends undefined ? UndefinedType : T extends Array<any> ? ArrayType<P> : T extends object ? ObjectType<P> : AnyType;
 type AnyTyping<P, T> = T extends string ? StringType<P, T> : T extends number ? NumberType<P, T> : T extends boolean ? BooleanType<P, T> : CommonType<P, T>;
 export type ToTuple<T> = T extends any[] ? T : never;
-export type FunctionChoiceType<Args, Opt extends ChoiceValue = ChoiceValue> = FunctionMeta<ToTuple<Args>> & ChoiceCore<FunctionControlContext<ToTuple<Args>>, Opt>;
+export type FunctionChoiceType<Args, Opt extends ChoiceValue = ChoiceValue> = FunctionMeta & Defaultable<FunctionControlContext<ToTuple<Args>>, Opt | Opt[]> & ChoiceCore<FunctionControlContext<ToTuple<Args>>, Opt>;
 export interface SingleChoiceType<P, Opt extends ChoiceValue = ChoiceValue> extends FunctionChoiceType<P, Opt> {
     multiSelect?: false;
 }
@@ -63,14 +65,17 @@ export interface CustomChoiceType<P, Opt extends ChoiceValue = ChoiceValue> exte
     multiSelect: FunctionContextConfig<ToTuple<P>, boolean>;
 }
 export type ChoiceType<P, T extends ChoiceValue = ChoiceValue> = SingleChoiceType<P, T> | MultiChoiceType<P, T> | CustomChoiceType<P, T>;
-export type DateStringType = BaseParam & DateStringCore;
-export type DateRangeStringsType = BaseParam & DateRangeStringsCore;
-export interface DynamicType<P> extends BaseParam, DynamicCore<FunctionControlContext<ToTuple<P>>, ParamType<P, any>> {
+export type DateStringType = ParamTypeBaseDefault<FunctionControlContext<string>, string> & DateStringCore;
+export type DateRangeStringsType = ParamTypeBaseDefault<FunctionControlContext<[string, string]>, [
+    string,
+    string
+]> & DateRangeStringsCore;
+export interface DynamicType<P> extends ParamTypeBase, DynamicCore<FunctionControlContext<ToTuple<P>>, ParamType<P, any>> {
 }
 export type RestrictedType<P, T> = IsAny<T> extends true ? AnyTyping<P, T> : [
     T
 ] extends [string] ? StringType<P, T> : [T] extends [number] ? NumberType<P, T> : [T] extends [boolean] ? BooleanType<P, T> : T extends string | null | undefined ? Exclude<T, null | undefined> extends string ? StringType<P, T extends string ? T : string> : CommonType<P, T> : T extends number | null | undefined ? Exclude<T, null | undefined> extends number ? NumberType<P, T extends number ? T : number> : CommonType<P, T> : T extends boolean | null | undefined ? Exclude<T, null | undefined> extends boolean ? BooleanType<P, T extends boolean ? T : boolean> : CommonType<P, T> : CommonType<P, T>;
-export type ParamType<P, T> = RestrictedType<P, T> | DynamicType<P>;
+export type ParamType<P, T> = RestrictedType<P, T> | DynamicType<P> | QueryBuilderType<P>;
 export type RequiredParam<P, T> = ParamType<P, T> & {
     isOptional?: false;
     isRestParameter?: false;

package/registerFunction/dist/types/query-builder-types.d.ts

@@ -0,0 +1,51 @@
+import { ContextDependentConfig } from "./shared-controls";
+/**
+ * Control type for building a custom query format.
+ *
+ * This control is based on react-awesome-query-builder
+ * and returns data in JsonLogic format.
+ *
+ * If using this control type, it's recommended to install
+ * @react-awesome-query-builder/core and json-logic-js as devDependencies
+ * so that you can reference their types.
+ *
+ * References:
+ * - https://github.com/ukrbublik/react-awesome-query-builder
+ * - https://github.com/jwadhams/json-logic-js
+ * - https://jsonlogic.com/
+ */
+export interface QueryBuilderCore<Ctx extends any[]> {
+    type: "queryBuilder";
+    /**
+     * Return a @react-awesome-query-builder/core `Config` that will be merged
+     * with Plasmic's built-in config.
+     *
+     * https://github.com/plasmicapp/plasmic/blob/master/platform/wab/src/wab/client/components/QueryBuilder/QueryBuilderConfig.tsx
+     *
+     * At a minimum, this should return fields and their types.
+     * For configuration options, see react-awesome-query-builder docs.
+     */
+    config: ContextDependentConfig<Ctx, SimplifiedConfig>;
+}
+/**
+ * A simplified subset of @react-awesome-query-builder/core `Config`.
+ */
+interface SimplifiedConfig {
+    fields: SimplifiedFields;
+}
+/**
+ * A simplified subset of @react-awesome-query-builder/core `Fields`.
+ */
+interface SimplifiedFields {
+    [key: string]: SimplifiedField;
+}
+/**
+ * A simplified subset of @react-awesome-query-builder/core `FieldOrGroup`.
+ */
+interface SimplifiedField {
+    type: "text" | "number" | "boolean" | "date" | "time" | "datetime" | "select" | "multiselect" | "treeselect" | "treemultiselect" | string;
+    label?: string;
+    defaultValue?: unknown;
+    fieldSettings?: {};
+}
+export {};

package/registerFunction/dist/types/shared-controls.d.ts

@@ -17,10 +17,14 @@ export type ControlExtras = {
     item?: any;
 };
 export type InferDataType<P> = P extends CanvasComponentProps<infer Data> ? Data : any;
-export interface CommonTypeBase<Ctx extends any[]> {
+export interface CommonTypeBase {
     description?: string;
     helpText?: string;
-    required?: boolean;
+    /**
+     * If true, will hide the prop in a collapsed section; good for props that
+     * should not usually be used.
+     */
+    advanced?: boolean;
     /**
      * If the user has chosen to use a dynamic expression for this prop, provide
      * a hint as to the expected values that the expression should evaluate to.
@@ -28,13 +32,19 @@ export interface CommonTypeBase<Ctx extends any[]> {
      * markdown in the text here.
      */
     exprHint?: string;
-    /**
-     * Function for whether this prop should be hidden in the right panel,
-     * given the current props for this component
-     */
-    hidden?: ContextDependentConfig<Ctx, boolean>;
     /**
      * If true, does not allow the user to use a dynamic expression for this prop
      */
     disableDynamicValue?: boolean;
 }
+export interface Defaultable<Ctx extends any[], T> {
+    /**
+     * Default value to set for this prop when the component is instantiated
+     */
+    defaultValue?: T;
+    /**
+     * Specify that default when no prop/param is provided,
+     * so the Plasmic user can see it in the studio UI
+     */
+    defaultValueHint?: T | ContextDependentConfig<Ctx, T | undefined>;
+}

package/registerFunction/dist/version.d.ts

@@ -1 +1 @@
-export declare const hostVersion = "1.0.227";
+export declare const hostVersion = "1.0.229";

package/registerGlobalContext/dist/types/component-types.d.ts

@@ -4,20 +4,16 @@ import { ChoiceCore, ChoiceValue } from "./choice-type";
 import { ArrayTypeBaseCore, ObjectTypeBaseCore } from "./container-types";
 import { DataPickerValueType, DataSourceCore, DynamicCore, GraphQLCore, GraphQLValue, RichDataPickerCore, RichExprEditorCore } from "./misc-types";
 import { CardPickerCore, ClassCore, CodeStringCore, ColorCore, DateRangeStringsCore, DateStringCore, HrefCore, NumberTypeBaseCore, PlainNumberCore, PlainStringCore, RichBooleanCore, RichTextCore, SliderNumberCore, ThemeResetClassCore } from "./primitive-types";
-import { CommonTypeBase, ContextDependentConfig, ControlExtras, GenericContext, InferDataType } from "./shared-controls";
+import { CommonTypeBase, ContextDependentConfig, ControlExtras, Defaultable, GenericContext, InferDataType } from "./shared-controls";
 export type ComponentControlContext<P> = GenericContext<P, // Full component props
 // Full component props
 InferDataType<P> | null, // Canvas data
 ControlExtras>;
 export type ComponentContextConfig<Props, R> = ContextDependentConfig<ComponentControlContext<Props>, R>;
-export interface PropTypeBase<Ctx extends any[]> extends CommonTypeBase<Ctx> {
+export interface PropTypeBase<Ctx extends any[]> extends CommonTypeBase {
     displayName?: string;
+    required?: boolean;
     readOnly?: boolean | ContextDependentConfig<Ctx, boolean>;
-    /**
-     * If true, will hide the prop in a collapsed section; good for props that
-     * should not usually be used.
-     */
-    advanced?: boolean;
     /**
      * If set to true, the component will be remounted when the prop value is updated.
      * (This behavior only applies to canvas)
@@ -27,17 +23,13 @@ export interface PropTypeBase<Ctx extends any[]> extends CommonTypeBase<Ctx> {
      * If true, the prop can't be overriden in different variants.
      */
     invariantable?: boolean;
-}
-export interface Defaultable<Ctx extends any[], T> {
     /**
-     * Default value to set for this prop when the component is instantiated
-     */
-    defaultValue?: T;
-    /**
-     * If no prop is given, the component uses a default; specify what
-     * that default is so the Plasmic user can see it in the studio UI
+     * Function for whether this prop should be hidden in the right panel,
+     * given the current props for this component
      */
-    defaultValueHint?: T | ContextDependentConfig<Ctx, T | undefined>;
+    hidden?: ContextDependentConfig<Ctx, boolean>;
+}
+interface ExtendedDefaultable<Ctx extends any[], T> extends Defaultable<Ctx, T> {
     /**
      * Use a dynamic value expression as the default instead
      */
@@ -65,7 +57,7 @@ export interface Controllable {
      */
     uncontrolledProp?: string;
 }
-export type PropTypeBaseDefault<P, T> = PropTypeBase<ComponentControlContext<P>> & Defaultable<ComponentControlContext<P>, T> & Controllable;
+export type PropTypeBaseDefault<P, T> = PropTypeBase<ComponentControlContext<P>> & ExtendedDefaultable<ComponentControlContext<P>, T> & Controllable;
 export type PlainStringType<P> = PropTypeBaseDefault<P, string> & PlainStringCore;
 export type CodeStringType<P> = PropTypeBaseDefault<P, string> & CodeStringCore;
 export type RichTextType<P> = PropTypeBaseDefault<P, string> & RichTextCore;
@@ -256,3 +248,4 @@ export type StringCompatType<P> = DateStringType<P> | StringType<P> | ChoiceType
 export type BoolCompatType<P> = BooleanType<P> | CustomType<P> | DataPickerType<P>;
 export type NumberCompatType<P> = NumberType<P> | CustomType<P> | DataPickerType<P>;
 export type RestrictPropType<T, P> = T extends string ? StringCompatType<P> : T extends boolean ? BoolCompatType<P> : T extends number ? NumberCompatType<P> : PropType<P>;
+export {};