@plasmicapp/host 1.0.231 → 1.0.232

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

@@ -8,82 +8,78 @@ 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 ParamTypeBase extends CommonTypeBase {
-    name: string;
-    isOptional?: boolean;
-    isRestParameter?: boolean;
-}
-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 ParamTypeBaseDefault<any[], T> {
+export type TypeBaseDefault<Ctx extends any[], T> = CommonTypeBase & Defaultable<Ctx, T>;
+export interface PlainStringType<T extends Nullish<string> = string> extends TypeBaseDefault<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 ParamTypeBaseDefault<any[], T> {
+export interface PlainNumberType<T extends Nullish<number> = number> extends TypeBaseDefault<any[], T> {
     type: "number" | `${number extends T ? number : T}`;
 }
-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> {
+export type NumberType<P, T extends number = number> = PlainNumberType<T> | (TypeBaseDefault<FunctionControlContext<P>, T> & NumberTypeBaseCore<FunctionControlContext<P>>) | ChoiceType<P, T> | AnyType;
+export interface PlainBooleanType<T extends Nullish<boolean> = boolean> extends TypeBaseDefault<any[], T> {
     type: "boolean" | `${boolean extends T ? boolean : T}`;
 }
-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> {
+export type BooleanType<P, T extends boolean = boolean> = PlainBooleanType<T> | (TypeBaseDefault<FunctionControlContext<P>, T> & RichBooleanCore) | ChoiceType<P, T> | AnyType;
+export type GraphQLType<P> = TypeBaseDefault<FunctionControlContext<P>, any> & GraphQLCore<FunctionControlContext<P>>;
+export interface PlainNullType extends TypeBaseDefault<any[], null> {
     type: "null";
 }
 export type NullType = PlainNullType | AnyType;
-export interface PlainUndefinedType extends ParamTypeBaseDefault<any[], undefined> {
+export interface PlainUndefinedType extends TypeBaseDefault<any[], undefined> {
     type: "undefined";
 }
 export type UndefinedType = PlainUndefinedType | AnyType;
-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> {
+export type ExtractObjectKeys<T extends object> = keyof T & string;
+export type ObjectType<P, T extends object> = TypeBaseDefault<FunctionControlContext<P>, T> & ObjectTypeBaseCore<FunctionControlContext<P>, GenericType<P, any>, ExtractObjectKeys<T>>;
+export type ArrayType<P> = TypeBaseDefault<FunctionControlContext<P>, any[]> & ArrayTypeBaseCore<FunctionControlContext<P>, GenericType<P, any>>;
+export type QueryBuilderType<P> = TypeBaseDefault<FunctionControlContext<P>, any> & QueryBuilderCore<FunctionControlContext<P>>;
+export interface PlainAnyType extends TypeBaseDefault<FunctionControlContext<any>, any> {
     type: "any";
 }
 export type AnyType = PlainAnyType;
-export interface PlainVoidType extends ParamTypeBase {
+export interface PlainVoidType extends CommonTypeBase {
     type: "void";
 }
 export 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>;
 export type ToTuple<T> = T extends any[] ? T : never;
-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> {
+export type ChoiceTypeBase<Args, Opt extends ChoiceValue = ChoiceValue> = TypeBaseDefault<FunctionControlContext<ToTuple<Args>>, Opt | Opt[]> & ChoiceCore<FunctionControlContext<ToTuple<Args>>, Opt>;
+export interface SingleChoiceType<P, Opt extends ChoiceValue = ChoiceValue> extends ChoiceTypeBase<P, Opt> {
     multiSelect?: false;
 }
-export interface MultiChoiceType<P, Opt extends ChoiceValue = ChoiceValue> extends FunctionChoiceType<P, Opt> {
+export interface MultiChoiceType<P, Opt extends ChoiceValue = ChoiceValue> extends ChoiceTypeBase<P, Opt> {
     multiSelect: true;
 }
-export interface CustomChoiceType<P, Opt extends ChoiceValue = ChoiceValue> extends FunctionChoiceType<P, Opt> {
+export interface CustomChoiceType<P, Opt extends ChoiceValue = ChoiceValue> extends ChoiceTypeBase<P, Opt> {
     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 = ParamTypeBaseDefault<FunctionControlContext<string>, string> & DateStringCore;
-export type DateRangeStringsType = ParamTypeBaseDefault<FunctionControlContext<[string, string]>, [
+export type DateStringType = TypeBaseDefault<FunctionControlContext<string>, string> & DateStringCore;
+export type DateRangeStringsType = TypeBaseDefault<FunctionControlContext<[string, string]>, [
     string,
     string
 ]> & DateRangeStringsCore;
-export interface DynamicType<P> extends ParamTypeBase, DynamicCore<FunctionControlContext<ToTuple<P>>, ParamType<P, any>> {
+export interface DynamicType<P> extends CommonTypeBase, DynamicCore<FunctionControlContext<ToTuple<P>>, GenericType<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> | QueryBuilderType<P>;
-export type RequiredParam<P, T> = ParamType<P, T> & {
+export type GenericType<P, T> = RestrictedType<P, T> | DynamicType<P> | QueryBuilderType<P>;
+export interface ParamTypeBase {
+    name: string;
+}
+export type ParamType<P, T> = ParamTypeBase & GenericType<P, T>;
+export type RequiredParam<P, T> = ParamTypeBase & ParamType<P, T> & {
     isOptional?: false;
     isRestParameter?: false;
 };
-export type OptionalParam<P, T> = ParamType<P, T> & {
+export type OptionalParam<P, T> = ParamTypeBase & ParamType<P, T> & {
     isRestParameter?: false;
 };
-export type RestParam<P, T> = ParamType<P, T> & {
+export type RestParam<P, T> = ParamTypeBase & ParamType<P, T> & {
     isOptional?: false;
     isRestParameter: true;
 };

package/registerTrait/dist/version.d.ts

@@ -1 +1 @@
-export declare const hostVersion = "1.0.231";
+export declare const hostVersion = "1.0.232";