@modular-component/with-conditional-render 0.1.2 → 0.1.4

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @modular-component/with-conditional-render
 
+## 0.1.4
+
+### Patch Changes
+
+- 820a836: Refactor tuple system for better typescript performance
+- Updated dependencies [f7af9ea]
+- Updated dependencies [820a836]
+  - @modular-component/core@0.1.4
+
+## 0.1.3
+
+### Patch Changes
+
+- Updated dependencies [d5c9031]
+  - @modular-component/core@0.1.3
+
 ## 0.1.2
 
 ### Patch Changes

package/dist/index.d.ts

@@ -1,40 +1,47 @@
 import { FunctionComponent } from 'react';
+declare const withCondition: unique symbol;
 declare const withConditionalFallback: unique symbol;
 declare const withConditionalRender: unique symbol;
+declare module '@modular-component/core' {
+    interface ModularStages<Args, Value> {
+        [withCondition]: {
+            restrict: (args: Args) => boolean;
+            transform: ReturnType<Value extends (args: Args) => boolean ? Value : never>;
+        };
+        [withConditionalFallback]: {
+            restrict: FunctionComponent<Args>;
+            transform: ReturnType<FunctionComponent<Args>> | null;
+        };
+        [withConditionalRender]: {
+            restrict: FunctionComponent<Args>;
+            transform: ReturnType<FunctionComponent<Args>> | null;
+        };
+    }
+}
 export declare const WithConditionalRender: {
-    readonly withCondition: {
+    readonly Condition: {
+        readonly symbol: typeof withCondition;
         readonly field: "condition";
-        readonly multiple: true;
         readonly transform: <A extends {
             condition?: boolean | undefined;
         }, C extends (args: A) => boolean>(args: A, useCondition: C) => boolean;
-        readonly restrict: boolean;
     };
-    readonly withConditionalFallback: {
+    readonly ConditionalRender: {
+        readonly symbol: typeof withConditionalRender;
         readonly field: "render";
-        readonly multiple: true;
-        readonly symbol: typeof withConditionalFallback;
         readonly transform: <A_1 extends {
             condition?: boolean | undefined;
             render?: import("react").ReactElement<any, any> | null | undefined;
         }, P extends FunctionComponent<A_1>>(args: A_1, useRender: P) => import("react").ReactElement<any, any> | null | undefined;
-        readonly restrict: import("react").ReactElement<any, any> | null;
     };
-    readonly withConditionalRender: {
+    readonly ConditionalFallback: {
+        readonly symbol: typeof withConditionalFallback;
         readonly field: "render";
-        readonly symbol: typeof withConditionalRender;
         readonly transform: <A_2 extends {
             condition?: boolean | undefined;
             render?: import("react").ReactElement<any, any> | null | undefined;
         }, P_1 extends FunctionComponent<A_2>>(args: A_2, useRender: P_1) => import("react").ReactElement<any, any> | null | undefined;
-        readonly restrict: import("react").ReactElement<any, any> | null;
     };
 };
-declare module '@modular-component/core' {
-    interface ModularStageTransform<T> {
-        [withConditionalFallback]: T | null;
-        [withConditionalRender]: T | null;
-    }
-}
 export {};
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,OAAO,CAAA;AAEzC,QAAA,MAAM,uBAAuB,eAAW,CAAA;AACxC,QAAA,MAAM,qBAAqB,eAAW,CAAA;AAEtC,eAAO,MAAM,qBAAqB;;;;;;kCAML,OAAO;;;;;;;;;;;;;;;;;;;;;;CA8CzB,CAAA;AAEX,OAAO,QAAQ,yBAAyB,CAAC;IACvC,UAAiB,qBAAqB,CAAC,CAAC;QACtC,CAAC,uBAAuB,CAAC,EAAE,CAAC,GAAG,IAAI,CAAA;QACnC,CAAC,qBAAqB,CAAC,EAAE,CAAC,GAAG,IAAI,CAAA;KAClC;CACF"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,OAAO,CAAA;AAEzC,QAAA,MAAM,aAAa,eAAW,CAAA;AAC9B,QAAA,MAAM,uBAAuB,eAAW,CAAA;AACxC,QAAA,MAAM,qBAAqB,eAAW,CAAA;AAEtC,OAAO,QAAQ,yBAAyB,CAAC;IACvC,UAAiB,aAAa,CAAC,IAAI,EAAE,KAAK;QACxC,CAAC,aAAa,CAAC,EAAE;YACf,QAAQ,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,CAAA;YACjC,SAAS,EAAE,UAAU,CACnB,KAAK,SAAS,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,GAAG,KAAK,GAAG,KAAK,CACtD,CAAA;SACF,CAAA;QACD,CAAC,uBAAuB,CAAC,EAAE;YACzB,QAAQ,EAAE,iBAAiB,CAAC,IAAI,CAAC,CAAA;YACjC,SAAS,EAAE,UAAU,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAA;SACtD,CAAA;QACD,CAAC,qBAAqB,CAAC,EAAE;YACvB,QAAQ,EAAE,iBAAiB,CAAC,IAAI,CAAC,CAAA;YACjC,SAAS,EAAE,UAAU,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAA;SACtD,CAAA;KACF;CACF;AAED,eAAO,MAAM,qBAAqB;;;;;;kCAML,OAAO;;;;;;;;;;;;;;;;;;CAwCzB,CAAA"}

package/dist/index.js

@@ -1,36 +1,32 @@
 import { createMethodRecord } from '@modular-component/core';
+const withCondition = Symbol();
 const withConditionalFallback = Symbol();
 const withConditionalRender = Symbol();
 export const WithConditionalRender = createMethodRecord({
-    withCondition: {
+    Condition: {
+        symbol: withCondition,
         field: 'condition',
-        multiple: true,
-        transform: (args, useCondition) => args.condition !== false &&
-            (typeof useCondition === 'function' ? useCondition(args) : useCondition),
-        restrict: {},
+        transform: (args, useCondition) => args.condition !== false && useCondition(args),
     },
-    withConditionalFallback: {
+    ConditionalRender: {
+        symbol: withConditionalRender,
         field: 'render',
-        multiple: true,
-        symbol: withConditionalFallback,
         transform: (args, useRender) => {
-            if (args.condition !== false || args.render) {
+            if (args.condition === false) {
                 return args.render;
             }
-            return typeof useRender === 'function' ? useRender(args) : useRender;
+            return useRender(args);
         },
-        restrict: {},
     },
-    withConditionalRender: {
+    ConditionalFallback: {
+        symbol: withConditionalFallback,
         field: 'render',
-        symbol: withConditionalRender,
         transform: (args, useRender) => {
-            if (args.condition === false) {
+            if (args.condition !== false || args.render) {
                 return args.render;
             }
-            return typeof useRender === 'function' ? useRender(args) : useRender;
+            return useRender(args);
         },
-        restrict: {},
     },
 });
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAG5D,MAAM,uBAAuB,GAAG,MAAM,EAAE,CAAA;AACxC,MAAM,qBAAqB,GAAG,MAAM,EAAE,CAAA;AAEtC,MAAM,CAAC,MAAM,qBAAqB,GAAG,kBAAkB,CAAC;IACtD,aAAa,EAAE;QACb,KAAK,EAAE,WAAW;QAClB,QAAQ,EAAE,IAAI;QACd,SAAS,EAAE,CAIT,IAAO,EACP,YAAe,EACf,EAAE,CACF,IAAI,CAAC,SAAS,KAAK,KAAK;YACxB,CAAC,OAAO,YAAY,KAAK,UAAU,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC;QAC1E,QAAQ,EAAE,EAAa;KACxB;IACD,uBAAuB,EAAE;QACvB,KAAK,EAAE,QAAQ;QACf,QAAQ,EAAE,IAAI;QACd,MAAM,EAAE,uBAAuB;QAC/B,SAAS,EAAE,CAIT,IAAO,EACP,SAAY,EACZ,EAAE;YACF,IAAI,IAAI,CAAC,SAAS,KAAK,KAAK,IAAI,IAAI,CAAC,MAAM,EAAE;gBAC3C,OAAO,IAAI,CAAC,MAAM,CAAA;aACnB;YAED,OAAO,OAAO,SAAS,KAAK,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;QACtE,CAAC;QACD,QAAQ,EAAE,EAAmC;KAC9C;IACD,qBAAqB,EAAE;QACrB,KAAK,EAAE,QAAQ;QACf,MAAM,EAAE,qBAAqB;QAC7B,SAAS,EAAE,CAIT,IAAO,EACP,SAAY,EACZ,EAAE;YACF,IAAI,IAAI,CAAC,SAAS,KAAK,KAAK,EAAE;gBAC5B,OAAO,IAAI,CAAC,MAAM,CAAA;aACnB;YAED,OAAO,OAAO,SAAS,KAAK,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;QACtE,CAAC;QACD,QAAQ,EAAE,EAAmC;KAC9C;CACO,CAAC,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAI5D,MAAM,aAAa,GAAG,MAAM,EAAE,CAAA;AAC9B,MAAM,uBAAuB,GAAG,MAAM,EAAE,CAAA;AACxC,MAAM,qBAAqB,GAAG,MAAM,EAAE,CAAA;AAqBtC,MAAM,CAAC,MAAM,qBAAqB,GAAG,kBAAkB,CAAC;IACtD,SAAS,EAAE;QACT,MAAM,EAAE,aAAa;QACrB,KAAK,EAAE,WAAW;QAClB,SAAS,EAAE,CAIT,IAAO,EACP,YAAe,EACf,EAAE,CAAC,IAAI,CAAC,SAAS,KAAK,KAAK,IAAI,YAAY,CAAC,IAAI,CAAC;KACpD;IACD,iBAAiB,EAAE;QACjB,MAAM,EAAE,qBAAqB;QAC7B,KAAK,EAAE,QAAQ;QACf,SAAS,EAAE,CAIT,IAAO,EACP,SAAY,EACZ,EAAE;YACF,IAAI,IAAI,CAAC,SAAS,KAAK,KAAK,EAAE;gBAC5B,OAAO,IAAI,CAAC,MAAM,CAAA;aACnB;YAED,OAAO,SAAS,CAAC,IAAI,CAAC,CAAA;QACxB,CAAC;KACF;IACD,mBAAmB,EAAE;QACnB,MAAM,EAAE,uBAAuB;QAC/B,KAAK,EAAE,QAAQ;QACf,SAAS,EAAE,CAIT,IAAO,EACP,SAAY,EACZ,EAAE;YACF,IAAI,IAAI,CAAC,SAAS,KAAK,KAAK,IAAI,IAAI,CAAC,MAAM,EAAE;gBAC3C,OAAO,IAAI,CAAC,MAAM,CAAA;aACnB;YAED,OAAO,SAAS,CAAC,IAAI,CAAC,CAAA;QACxB,CAAC;KACF;CACO,CAAC,CAAA"}

package/package.json

@@ -8,7 +8,7 @@
     "Default",
     "Conditional"
   ],
-  "version": "0.1.2",
+  "version": "0.1.4",
   "type": "module",
   "license": "MIT",
   "publishConfig": {
@@ -26,7 +26,7 @@
     "license": "cp ../../LICENSE ./LICENSE"
   },
   "dependencies": {
-    "@modular-component/core": "0.1.2"
+    "@modular-component/core": "0.1.4"
   },
   "peerDependencies": {
     "react": ">=17 <19"

package/src/index.ts

@@ -1,28 +1,45 @@
 import { createMethodRecord } from '@modular-component/core'
+
 import { FunctionComponent } from 'react'
 
+const withCondition = Symbol()
 const withConditionalFallback = Symbol()
 const withConditionalRender = Symbol()
 
+declare module '@modular-component/core' {
+  export interface ModularStages<Args, Value> {
+    [withCondition]: {
+      restrict: (args: Args) => boolean
+      transform: ReturnType<
+        Value extends (args: Args) => boolean ? Value : never
+      >
+    }
+    [withConditionalFallback]: {
+      restrict: FunctionComponent<Args>
+      transform: ReturnType<FunctionComponent<Args>> | null
+    }
+    [withConditionalRender]: {
+      restrict: FunctionComponent<Args>
+      transform: ReturnType<FunctionComponent<Args>> | null
+    }
+  }
+}
+
 export const WithConditionalRender = createMethodRecord({
-  withCondition: {
+  Condition: {
+    symbol: withCondition,
     field: 'condition',
-    multiple: true,
     transform: <
       A extends { condition?: boolean },
       C extends (args: A) => boolean,
     >(
       args: A,
       useCondition: C,
-    ) =>
-      args.condition !== false &&
-      (typeof useCondition === 'function' ? useCondition(args) : useCondition),
-    restrict: {} as boolean,
+    ) => args.condition !== false && useCondition(args),
   },
-  withConditionalFallback: {
+  ConditionalRender: {
+    symbol: withConditionalRender,
     field: 'render',
-    multiple: true,
-    symbol: withConditionalFallback,
     transform: <
       A extends { condition?: boolean; render?: ReturnType<FunctionComponent> },
       P extends FunctionComponent<A>,
@@ -30,17 +47,16 @@ export const WithConditionalRender = createMethodRecord({
       args: A,
       useRender: P,
     ) => {
-      if (args.condition !== false || args.render) {
+      if (args.condition === false) {
         return args.render
       }
 
-      return typeof useRender === 'function' ? useRender(args) : useRender
+      return useRender(args)
     },
-    restrict: {} as ReturnType<FunctionComponent>,
   },
-  withConditionalRender: {
+  ConditionalFallback: {
+    symbol: withConditionalFallback,
     field: 'render',
-    symbol: withConditionalRender,
     transform: <
       A extends { condition?: boolean; render?: ReturnType<FunctionComponent> },
       P extends FunctionComponent<A>,
@@ -48,19 +64,11 @@ export const WithConditionalRender = createMethodRecord({
       args: A,
       useRender: P,
     ) => {
-      if (args.condition === false) {
+      if (args.condition !== false || args.render) {
         return args.render
       }
 
-      return typeof useRender === 'function' ? useRender(args) : useRender
+      return useRender(args)
     },
-    restrict: {} as ReturnType<FunctionComponent>,
   },
 } as const)
-
-declare module '@modular-component/core' {
-  export interface ModularStageTransform<T> {
-    [withConditionalFallback]: T | null
-    [withConditionalRender]: T | null
-  }
-}