@plasmicapp/react-web 0.2.428 → 0.2.430

package/dist/all.d.ts

@@ -12266,9 +12266,15 @@ interface SimplifiedField {
     fieldSettings?: {};
 }
 
-type FunctionControlContext<P> = GenericContext<Partial<P>, // Partial function props
+/**
+ * `[string, number]` -> `[string | undefined, number | undefined]`
+ */
+type PartialParams<P extends any[]> = {
+    [K in keyof P]: P[K] | undefined;
+};
+type FunctionControlContext<P extends any[]> = GenericContext<PartialParams<P>, // Function params, each may be undefined
 any>;
-type FunctionContextConfig<Args extends any[], R> = ContextDependentConfig<FunctionControlContext<Args>, R>;
+type FunctionContextConfig<P extends any[], R> = ContextDependentConfig<FunctionControlContext<P>, R>;
 interface TypeBaseDefault<Ctx extends any[], T> extends CommonTypeBase, Defaultable<Ctx, T> {
     displayName?: string;
     /**
@@ -12277,77 +12283,76 @@ interface TypeBaseDefault<Ctx extends any[], T> extends CommonTypeBase, Defaulta
      */
     hidden?: ContextDependentConfig<Ctx, boolean>;
 }
-interface PlainStringType<T extends Nullish<string> = string> extends TypeBaseDefault<any[], T> {
+interface PlainStringType<P extends any[], T extends Nullish<string> = string> extends TypeBaseDefault<FunctionControlContext<P>, 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 TypeBaseDefault<any[], T> {
+type StringType<P extends any[], T extends string = string> = "string" | PlainStringType<P, T> | ChoiceType<P, T> | DateStringType<P> | DateRangeStringsType<P> | AnyType<P>;
+interface PlainNumberType<P extends any[], T extends Nullish<number> = number> extends TypeBaseDefault<FunctionControlContext<P>, T> {
     type: "number" | `${number extends T ? number : 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 NumberType<P extends any[], T extends number = number> = PlainNumberType<P, T> | (TypeBaseDefault<FunctionControlContext<P>, T> & NumberTypeBaseCore<FunctionControlContext<P>>) | ChoiceType<P, T> | AnyType<P>;
+interface PlainBooleanType<P extends any[], T extends Nullish<boolean> = boolean> extends TypeBaseDefault<FunctionControlContext<P>, T> {
     type: "boolean" | `${boolean extends T ? boolean : T}`;
 }
-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 BooleanType<P extends any[], T extends boolean = boolean> = PlainBooleanType<P, T> | (TypeBaseDefault<FunctionControlContext<P>, T> & RichBooleanCore) | ChoiceType<P, T> | AnyType<P>;
+type GraphQLType<P extends any[]> = TypeBaseDefault<FunctionControlContext<P>, any> & GraphQLCore<FunctionControlContext<P>>;
+interface PlainNullType<P extends any[]> extends TypeBaseDefault<FunctionControlContext<P>, null> {
     type: "null";
 }
-type NullType = PlainNullType | AnyType;
-interface PlainUndefinedType extends TypeBaseDefault<any[], undefined> {
+type NullType<P extends any[]> = PlainNullType<P> | AnyType<P>;
+interface PlainUndefinedType<P extends any[]> extends TypeBaseDefault<FunctionControlContext<P>, undefined> {
     type: "undefined";
 }
-type UndefinedType = PlainUndefinedType | AnyType;
+type UndefinedType<P extends any[]> = PlainUndefinedType<P> | AnyType<P>;
 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 ObjectType<P extends any[], T extends Record<string, any> = Record<string, any>> = TypeBaseDefault<FunctionControlContext<P>, T> & ObjectTypeBaseCore<FunctionControlContext<P>, GenericType<P, any>, ExtractObjectKeys<T>>;
+type ArrayType<P extends any[], T extends any[] = any[]> = TypeBaseDefault<FunctionControlContext<P>, T> & ArrayTypeBaseCore<FunctionControlContext<P>, GenericType<P, any>>;
+type QueryBuilderType<P extends any[]> = TypeBaseDefault<FunctionControlContext<P>, any> & QueryBuilderCore<FunctionControlContext<P>>;
+interface PlainAnyType<P extends any[]> extends TypeBaseDefault<FunctionControlContext<P>, any> {
     type: "any";
 }
-type AnyType = PlainAnyType;
+type AnyType<P extends any[]> = PlainAnyType<P>;
 interface PlainVoidType extends CommonTypeBase {
     type: "void";
 }
-type VoidType = PlainVoidType | AnyType;
+type VoidType<P extends any[]> = PlainVoidType | AnyType<P>;
 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, 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 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> {
+type CommonType<P extends any[], T> = T extends GraphQLValue ? GraphQLType<P> : T extends null ? NullType<P> : T extends undefined ? UndefinedType<P> : T extends Array<any> ? ArrayType<P> : T extends object ? ObjectType<P, T> : AnyType<P>;
+type AnyTyping<P extends any[], T> = T extends string ? StringType<P, T> : T extends number ? NumberType<P, T> : T extends boolean ? BooleanType<P, T> : CommonType<P, T>;
+type ChoiceTypeBase<P extends any[], Opt extends ChoiceValue = ChoiceValue> = TypeBaseDefault<FunctionControlContext<P>, Opt | Opt[]> & ChoiceCore<FunctionControlContext<P>, Opt>;
+interface SingleChoiceType<P extends any[], Opt extends ChoiceValue = ChoiceValue> extends ChoiceTypeBase<P, Opt> {
     multiSelect?: false;
 }
-interface MultiChoiceType<P, Opt extends ChoiceValue = ChoiceValue> extends ChoiceTypeBase<P, Opt> {
+interface MultiChoiceType<P extends any[], Opt extends ChoiceValue = ChoiceValue> extends ChoiceTypeBase<P, Opt> {
     multiSelect: true;
 }
-interface CustomChoiceType<P, Opt extends ChoiceValue = ChoiceValue> extends ChoiceTypeBase<P, Opt> {
-    multiSelect: FunctionContextConfig<ToTuple<P>, boolean>;
+interface CustomChoiceType<P extends any[], Opt extends ChoiceValue = ChoiceValue> extends ChoiceTypeBase<P, Opt> {
+    multiSelect: FunctionContextConfig<P, boolean>;
 }
-type ChoiceType<P, T extends ChoiceValue = ChoiceValue> = SingleChoiceType<P, T> | MultiChoiceType<P, T> | CustomChoiceType<P, T>;
-type DateStringType = TypeBaseDefault<FunctionControlContext<string>, string> & DateStringCore;
-type DateRangeStringsType = TypeBaseDefault<FunctionControlContext<[string, string]>, [
+type ChoiceType<P extends any[], T extends ChoiceValue = ChoiceValue> = SingleChoiceType<P, T> | MultiChoiceType<P, T> | CustomChoiceType<P, T>;
+type DateStringType<P extends any[]> = TypeBaseDefault<FunctionControlContext<P>, string> & DateStringCore;
+type DateRangeStringsType<P extends any[]> = TypeBaseDefault<FunctionControlContext<P>, [
     string,
     string
 ]> & DateRangeStringsCore;
-interface DynamicType<P> extends CommonTypeBase, DynamicCore<FunctionControlContext<ToTuple<P>>, GenericType<P, any>> {
+interface DynamicType<P extends any[]> extends CommonTypeBase, DynamicCore<FunctionControlContext<P>, GenericType<P, any>> {
 }
-type RestrictedType<P, T> = IsAny<T> extends true ? AnyTyping<P, T> : [
+type RestrictedType<P extends any[], 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 GenericType<P, T> = RestrictedType<P, T> | DynamicType<P> | QueryBuilderType<P>;
+type GenericType<P extends any[], 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> & {
+type ParamType<P extends any[], T> = ParamTypeBase & GenericType<P, T>;
+type RequiredParam<P extends any[], T> = ParamTypeBase & ParamType<P, T> & {
     isOptional?: false;
     isRestParameter?: false;
 };
-type OptionalParam<P, T> = ParamTypeBase & ParamType<P, T> & {
+type OptionalParam<P extends any[], T> = ParamTypeBase & ParamType<P, T> & {
     isRestParameter?: false;
 };
-type RestParam<P, T> = ParamTypeBase & ParamType<P, T> & {
+type RestParam<P extends any[], T> = ParamTypeBase & ParamType<P, T> & {
     isOptional?: false;
     isRestParameter: true;
 };
@@ -12356,8 +12361,14 @@ type OptionalParams<T extends any[]> = T extends [
     ...RequiredParams<T>,
     ...infer R
 ] ? [...R] : [];
-type HandleRequiredParams<P, R extends any[]> = R extends [infer H, ...infer T] ? [string | RequiredParam<P, H>, ...HandleRequiredParams<P, T>] : [];
-type HandleOptionalParams<P, R extends any[]> = R extends [infer H, ...infer T] ? [] | [
+type HandleRequiredParams<P extends any[], R extends any[]> = R extends [
+    infer H,
+    ...infer T
+] ? [string | RequiredParam<P, H>, ...HandleRequiredParams<P, T>] : [];
+type HandleOptionalParams<P extends any[], R extends any[]> = R extends [
+    infer H,
+    ...infer T
+] ? [] | [
     string | OptionalParam<P, H | undefined>,
     ...HandleOptionalParams<P, T>
 ] : R extends [] ? [] : R extends Array<infer T> ? [] | [RestParam<P, T[]>] : [];
@@ -12365,7 +12376,7 @@ type HandleParams<P extends any[]> = [
     ...HandleRequiredParams<P, RequiredParams<P>>,
     ...HandleOptionalParams<P, Required<OptionalParams<P>>>
 ];
-type HandleReturnType<P, T> = VoidType | ParamType<P, T>;
+type HandleReturnType<P extends any[], T> = VoidType<P> | ParamType<P, T>;
 
 interface CustomFunctionMeta<F extends (...args: any[]) => any> {
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plasmicapp/react-web",
-  "version": "0.2.428",
+  "version": "0.2.430",
   "description": "plasmic library for rendering in the presentational style",
   "main": "dist/index.cjs.js",
   "types": "dist/index.d.ts",
@@ -95,14 +95,14 @@
     "test-storybook": "test-storybook"
   },
   "dependencies": {
-    "@plasmicapp/auth-react": "0.0.26",
-    "@plasmicapp/data-sources": "0.1.207",
+    "@plasmicapp/auth-react": "0.0.27",
+    "@plasmicapp/data-sources": "0.1.209",
     "@plasmicapp/data-sources-context": "0.1.23",
-    "@plasmicapp/host": "1.0.238",
+    "@plasmicapp/host": "1.0.240",
     "@plasmicapp/loader-splits": "1.0.69",
-    "@plasmicapp/nextjs-app-router": "1.0.21",
-    "@plasmicapp/prepass": "1.0.23",
-    "@plasmicapp/query": "0.1.83",
+    "@plasmicapp/nextjs-app-router": "1.0.22",
+    "@plasmicapp/prepass": "1.0.24",
+    "@plasmicapp/query": "0.1.84",
     "@react-aria/checkbox": "^3.15.5",
     "@react-aria/focus": "^3.20.3",
     "@react-aria/interactions": "^3.25.1",
@@ -153,5 +153,5 @@
     "react": ">=16.8.0",
     "react-dom": ">=16.8.0"
   },
-  "gitHead": "7a1fdd1cd5163fed32cfe3cb80b8bbcbce0505ce"
+  "gitHead": "e1ca5cfd7107719663e14b557a79161e7e657a1a"
 }