@plasmicapp/react-web 0.2.410 → 0.2.411

package/dist/all.d.ts

@@ -11439,16 +11439,15 @@ interface ChoiceCore<Ctx extends any[], T extends ChoiceValue> {
     onSearch?: MaybeContextDependentConfig<Ctx, ((v: string) => void) | undefined>;
 }
 
-interface ObjectTypeBaseCore<Ctx extends any[], Fields> {
+interface ObjectTypeBaseCore<Ctx extends any[], Values, Keys extends string = string> {
     type: "object";
-    fields?: Record<string, Fields>;
+    fields?: Record<Keys, Values>;
     nameFunc?: (item: any, ...args: Ctx) => string | undefined;
     /**
-     * Controls how the object editor is displayed in the UI.
-     * - "popup":  Displays the object in a popup (default)
+     * Controls how the object editor is displayed in the UI. If not specified, Plasmic will choose the appropriate display mode.
+     * - "popup":  Displays the object in a popup
      * - "inline": Displays the object fields inline
      * - "flatten": Displays the object fields inline at the parent level. The parent label is not displayed.
-     * @default "popup"
      */
     display?: "inline" | "popup" | "flatten";
 }
@@ -12269,82 +12268,78 @@ interface SimplifiedField {
 type FunctionControlContext<P> = GenericContext<Partial<P>, // Partial function props
 any>;
 type FunctionContextConfig<Args extends any[], R> = ContextDependentConfig<FunctionControlContext<Args>, R>;
-interface ParamTypeBase extends CommonTypeBase {
-    name: string;
-    isOptional?: boolean;
-    isRestParameter?: boolean;
-}
-type ParamTypeBaseDefault<Ctx extends any[], T> = ParamTypeBase & Defaultable<Ctx, T>;
-interface FunctionMeta extends CommonTypeBase {
-    name: string;
-    rest?: boolean;
-}
-interface PlainStringType<T extends Nullish<string> = string> extends ParamTypeBaseDefault<any[], T> {
+type TypeBaseDefault<Ctx extends any[], T> = CommonTypeBase & Defaultable<Ctx, T>;
+interface PlainStringType<T extends Nullish<string> = string> extends TypeBaseDefault<any[], T> {
     type: "string" | `'${T}'`;
 }
 type StringType<P, T extends string = string> = "string" | PlainStringType<T> | ChoiceType<P, T> | DateStringType | DateRangeStringsType | AnyType;
-interface PlainNumberType<T extends Nullish<number> = number> extends ParamTypeBaseDefault<any[], T> {
+interface PlainNumberType<T extends Nullish<number> = number> extends TypeBaseDefault<any[], T> {
     type: "number" | `${number extends T ? number : T}`;
 }
-type NumberType<P, T extends number = number> = PlainNumberType<T> | (ParamTypeBaseDefault<FunctionControlContext<P>, T> & NumberTypeBaseCore<FunctionControlContext<P>>) | ChoiceType<P, T> | AnyType;
-interface PlainBooleanType<T extends Nullish<boolean> = boolean> extends ParamTypeBaseDefault<any[], T> {
+type NumberType<P, T extends number = number> = PlainNumberType<T> | (TypeBaseDefault<FunctionControlContext<P>, T> & NumberTypeBaseCore<FunctionControlContext<P>>) | ChoiceType<P, T> | AnyType;
+interface PlainBooleanType<T extends Nullish<boolean> = boolean> extends TypeBaseDefault<any[], T> {
     type: "boolean" | `${boolean extends T ? boolean : T}`;
 }
-type BooleanType<P, T extends boolean = boolean> = PlainBooleanType<T> | (ParamTypeBaseDefault<FunctionControlContext<P>, T> & RichBooleanCore) | ChoiceType<P, T> | AnyType;
-type GraphQLType<P> = ParamTypeBaseDefault<FunctionControlContext<P>, any> & GraphQLCore<FunctionControlContext<P>>;
-interface PlainNullType extends ParamTypeBaseDefault<any[], null> {
+type BooleanType<P, T extends boolean = boolean> = PlainBooleanType<T> | (TypeBaseDefault<FunctionControlContext<P>, T> & RichBooleanCore) | ChoiceType<P, T> | AnyType;
+type GraphQLType<P> = TypeBaseDefault<FunctionControlContext<P>, any> & GraphQLCore<FunctionControlContext<P>>;
+interface PlainNullType extends TypeBaseDefault<any[], null> {
     type: "null";
 }
 type NullType = PlainNullType | AnyType;
-interface PlainUndefinedType extends ParamTypeBaseDefault<any[], undefined> {
+interface PlainUndefinedType extends TypeBaseDefault<any[], undefined> {
     type: "undefined";
 }
 type UndefinedType = PlainUndefinedType | AnyType;
-type ObjectType<P> = ParamTypeBaseDefault<FunctionControlContext<P>, Record<string, any>> & ObjectTypeBaseCore<FunctionControlContext<P>, AnyTyping<P, any>>;
-type ArrayType<P> = ParamTypeBaseDefault<FunctionControlContext<P>, any[]> & ArrayTypeBaseCore<FunctionControlContext<P>, AnyTyping<P, any>>;
-type QueryBuilderType<P> = ParamTypeBaseDefault<FunctionControlContext<P>, any> & QueryBuilderCore<FunctionControlContext<P>>;
-interface PlainAnyType extends ParamTypeBaseDefault<FunctionControlContext<any>, any> {
+type ExtractObjectKeys<T extends object> = keyof T & string;
+type ObjectType<P, T extends object> = TypeBaseDefault<FunctionControlContext<P>, T> & ObjectTypeBaseCore<FunctionControlContext<P>, GenericType<P, any>, ExtractObjectKeys<T>>;
+type ArrayType<P> = TypeBaseDefault<FunctionControlContext<P>, any[]> & ArrayTypeBaseCore<FunctionControlContext<P>, GenericType<P, any>>;
+type QueryBuilderType<P> = TypeBaseDefault<FunctionControlContext<P>, any> & QueryBuilderCore<FunctionControlContext<P>>;
+interface PlainAnyType extends TypeBaseDefault<FunctionControlContext<any>, any> {
     type: "any";
 }
 type AnyType = PlainAnyType;
-interface PlainVoidType extends ParamTypeBase {
+interface PlainVoidType extends CommonTypeBase {
     type: "void";
 }
 type VoidType = PlainVoidType | AnyType;
 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 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, T> : 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>;
 type ToTuple<T> = T extends any[] ? T : never;
-type FunctionChoiceType<Args, Opt extends ChoiceValue = ChoiceValue> = FunctionMeta & Defaultable<FunctionControlContext<ToTuple<Args>>, Opt | Opt[]> & ChoiceCore<FunctionControlContext<ToTuple<Args>>, Opt>;
-interface SingleChoiceType<P, Opt extends ChoiceValue = ChoiceValue> extends FunctionChoiceType<P, Opt> {
+type ChoiceTypeBase<Args, Opt extends ChoiceValue = ChoiceValue> = TypeBaseDefault<FunctionControlContext<ToTuple<Args>>, Opt | Opt[]> & ChoiceCore<FunctionControlContext<ToTuple<Args>>, Opt>;
+interface SingleChoiceType<P, Opt extends ChoiceValue = ChoiceValue> extends ChoiceTypeBase<P, Opt> {
     multiSelect?: false;
 }
-interface MultiChoiceType<P, Opt extends ChoiceValue = ChoiceValue> extends FunctionChoiceType<P, Opt> {
+interface MultiChoiceType<P, Opt extends ChoiceValue = ChoiceValue> extends ChoiceTypeBase<P, Opt> {
     multiSelect: true;
 }
-interface CustomChoiceType<P, Opt extends ChoiceValue = ChoiceValue> extends FunctionChoiceType<P, Opt> {
+interface CustomChoiceType<P, Opt extends ChoiceValue = ChoiceValue> extends ChoiceTypeBase<P, Opt> {
     multiSelect: FunctionContextConfig<ToTuple<P>, boolean>;
 }
 type ChoiceType<P, T extends ChoiceValue = ChoiceValue> = SingleChoiceType<P, T> | MultiChoiceType<P, T> | CustomChoiceType<P, T>;
-type DateStringType = ParamTypeBaseDefault<FunctionControlContext<string>, string> & DateStringCore;
-type DateRangeStringsType = ParamTypeBaseDefault<FunctionControlContext<[string, string]>, [
+type DateStringType = TypeBaseDefault<FunctionControlContext<string>, string> & DateStringCore;
+type DateRangeStringsType = TypeBaseDefault<FunctionControlContext<[string, string]>, [
     string,
     string
 ]> & DateRangeStringsCore;
-interface DynamicType<P> extends ParamTypeBase, DynamicCore<FunctionControlContext<ToTuple<P>>, ParamType<P, any>> {
+interface DynamicType<P> extends CommonTypeBase, DynamicCore<FunctionControlContext<ToTuple<P>>, GenericType<P, any>> {
 }
 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>;
-type ParamType<P, T> = RestrictedType<P, T> | DynamicType<P> | QueryBuilderType<P>;
-type RequiredParam<P, T> = ParamType<P, T> & {
+type GenericType<P, T> = RestrictedType<P, T> | DynamicType<P> | QueryBuilderType<P>;
+interface ParamTypeBase {
+    name: string;
+}
+type ParamType<P, T> = ParamTypeBase & GenericType<P, T>;
+type RequiredParam<P, T> = ParamTypeBase & ParamType<P, T> & {
     isOptional?: false;
     isRestParameter?: false;
 };
-type OptionalParam<P, T> = ParamType<P, T> & {
+type OptionalParam<P, T> = ParamTypeBase & ParamType<P, T> & {
     isRestParameter?: false;
 };
-type RestParam<P, T> = ParamType<P, T> & {
+type RestParam<P, T> = ParamTypeBase & ParamType<P, T> & {
     isOptional?: false;
     isRestParameter: true;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plasmicapp/react-web",
-  "version": "0.2.410",
+  "version": "0.2.411",
   "description": "plasmic library for rendering in the presentational style",
   "main": "dist/index.cjs.js",
   "types": "dist/index.d.ts",
@@ -96,9 +96,9 @@
   },
   "dependencies": {
     "@plasmicapp/auth-react": "0.0.24",
-    "@plasmicapp/data-sources": "0.1.195",
+    "@plasmicapp/data-sources": "0.1.196",
     "@plasmicapp/data-sources-context": "0.1.22",
-    "@plasmicapp/host": "1.0.231",
+    "@plasmicapp/host": "1.0.232",
     "@plasmicapp/loader-splits": "1.0.66",
     "@plasmicapp/nextjs-app-router": "1.0.19",
     "@plasmicapp/prepass": "1.0.21",
@@ -153,5 +153,5 @@
     "react": ">=16.8.0",
     "react-dom": ">=16.8.0"
   },
-  "gitHead": "6b9428c7b4f35d9b84241981523e746e18e2abb7"
+  "gitHead": "b6552bed8840c583a74ba7e1c724fa2850c6c2ed"
 }