unframer 2.6.6 → 2.7.0

package/src/framer.js

@@ -15349,7 +15349,7 @@ function steps(numSteps, direction = 'end',) {
   };
 }
 
-// https :https://app.framerstatic.com/framer.PLXHDWID.mjs
+// https :https://app.framerstatic.com/framer.7SGKTLCE.mjs
 init_chunk_QLPHEVXG();
 import React4 from 'react';
 import { startTransition as startTransition2, } from 'react';
@@ -18651,6 +18651,7 @@ function Router({
   locales = EMPTY_ARRAY,
   preserveQueryParams = false,
   enableAsyncURLUpdates = false,
+  LayoutTemplate,
 },) {
   useMarkRouterEffects();
   useReplaceInitialState({
@@ -18879,14 +18880,27 @@ function Router({
             notFoundPage,
             defaultPageStyle,
             forceUpdateKey: dep,
-            children: jsxs(Fragment, {
-              children: [
-                jsx(MarkSuspenseEffects.Start, {},),
-                pageExistsInCurrentLocale
-                  ? renderPage(current.page, defaultPageStyle,)
-                  : notFoundPage && renderPage(notFoundPage, defaultPageStyle,),
-              ],
-            }, remountKey,),
+            children: jsx(WithLayoutTemplate, {
+              LayoutTemplate,
+              routeId: currentRouteId,
+              children: jsxs(Fragment, {
+                children: [
+                  jsx(MarkSuspenseEffects.Start, {},),
+                  pageExistsInCurrentLocale
+                    ? renderPage(
+                      current.page,
+                      LayoutTemplate
+                        ? {
+                          ...defaultPageStyle,
+                          display: 'content',
+                        }
+                        : defaultPageStyle,
+                    )
+                    : // LAYOUT_TEMPLATE @TODO: display: content for not found page?
+                    notFoundPage && renderPage(notFoundPage, defaultPageStyle,),
+                ],
+              }, remountKey,),
+            },),
           },),
           jsx(TurnOnReactEventHandling, {},),
           jsx(MarkSuspenseEffects.End, {},),
@@ -18895,6 +18909,17 @@ function Router({
     },),
   },);
 }
+function WithLayoutTemplate({
+  LayoutTemplate,
+  routeId,
+  children,
+},) {
+  if (!LayoutTemplate) return children;
+  return jsx(LayoutTemplate, {
+    routeId,
+    children,
+  },);
+}
 function scrollElementIntoView(element, smoothScroll,) {
   const scrollIntoViewOptions = smoothScroll
     ? {
@@ -36218,9 +36243,7 @@ function createHook(forwardedRef,) {
   let preventNextCall = false;
   function cloneChildrenWithPropsAndRef(children, props,) {
     if (preventNextCall) {
-      throw new ReferenceError(
-        'useCloneChildrenWithPropsAndRef: You should not call cloneChildrenWithPropsAndRef more than once during the render cycle.',
-      );
+      ;
     }
     preventNextCall = true;
     if (React2.Children.count(children,) > 1 && forwardedRef) {
@@ -42137,6 +42160,18 @@ var Ordering = class {
     if (this.length !== other.length) return false;
     return this.getHash() === other.getHash();
   }
+  providedByFields(fields,) {
+    for (
+      const {
+        field,
+      } of this.fields
+    ) {
+      if (fields.has(field,)) continue;
+      if (field.name === VIRTUAL_INDEX_FIELD) continue;
+      return false;
+    }
+    return true;
+  }
 };
 var Scope = class {
   constructor(parent,) {
@@ -44740,13 +44775,21 @@ var Normalizer = class {
     return this.newRelationalLeftJoin(right, left, constraint,);
   }
   newRelationalFilter(input, predicate,) {
-    if (input instanceof RelationalLeftJoin && predicate.referencedFields.subsetOf(input.leftGroup.relational.outputFields,)) {
-      const left = this.newRelationalFilter(input.left, predicate,);
-      return this.newRelationalLeftJoin(left, input.right, input.constraint,);
+    if (
+      input instanceof RelationalLeftJoin &&
+      // Check that the predicate doesn't depend on any joined field.
+      predicate.referencedFields.subsetOf(input.leftGroup.relational.outputFields,)
+    ) {
+      const pushedFilter = this.newRelationalFilter(input.left, predicate,);
+      return this.newRelationalLeftJoin(pushedFilter, input.right, input.constraint,);
     }
-    if (input instanceof RelationalRightJoin && predicate.referencedFields.subsetOf(input.rightGroup.relational.outputFields,)) {
-      const right = this.newRelationalFilter(input.right, predicate,);
-      return this.newRelationalLeftJoin(input.left, right, input.constraint,);
+    if (
+      input instanceof RelationalRightJoin &&
+      // Check that the predicate doesn't depend on any joined field.
+      predicate.referencedFields.subsetOf(input.rightGroup.relational.outputFields,)
+    ) {
+      const pushedFilter = this.newRelationalFilter(input.right, predicate,);
+      return this.newRelationalLeftJoin(input.left, pushedFilter, input.constraint,);
     }
     const node = new RelationalFilter(input, predicate,);
     return this.finishRelational(node,);
@@ -44756,6 +44799,16 @@ var Normalizer = class {
     return this.finishRelational(node,);
   }
   newRelationalLimit(input, limit, ordering,) {
+    if (
+      input instanceof RelationalProject &&
+      // Check that the limit doesn't depend on any projected field.
+      limit.referencedFields.subsetOf(input.inputGroup.relational.outputFields,) &&
+      // Check that the ordering doesn't depend on any projected field.
+      ordering.providedByFields(input.inputGroup.relational.outputFields,)
+    ) {
+      const pushedLimit = this.newRelationalLimit(input.input, limit, ordering,);
+      return this.newRelationalProject(pushedLimit, input.projections, input.passthrough,);
+    }
     const node = new RelationalLimit(input, limit, ordering,);
     return this.finishRelational(node,);
   }
@@ -53073,7 +53126,7 @@ var package_default = {
     react: '^18.2.0',
     'react-dom': '^18.2.0',
     semver: '^7.5.2',
-    typescript: '^5.6.2',
+    typescript: '^5.7.2',
     yargs: '^17.6.2',
   },
   peerDependencies: {

package/src/utils.ts

@@ -1,5 +1,14 @@
 import pico from 'picocolors'
 
+import { marked } from 'marked'
+import { markedTerminal } from 'marked-terminal'
+
+marked.use(markedTerminal())
+
+export function terminalMarkdown(markdown: string) {
+    return marked(markdown)
+}
+
 const prefix = '[unframer]'
 export const logger = {
     log(...args) {