@farm.js/react 0.1.0-beta.6 → 0.1.0-beta.7

package/dist/vite.cjs

@@ -845,6 +845,13 @@ function staticSliceIndex(expression) {
   }
   return void 0;
 }
+function validateKeyedArrayPositionExpression(expression, safeGlobals) {
+  const isNumericLiteral = core.types.isNumericLiteral(expression) || core.types.isUnaryExpression(expression) && (expression.operator === "+" || expression.operator === "-") && core.types.isNumericLiteral(expression.argument);
+  if (isNumericLiteral && staticSliceIndex(expression) === void 0) {
+    return "non-safe-integer position literals";
+  }
+  return validateDerivedExpression(expression, safeGlobals);
+}
 function rewriteKeyedArrayPositionHints(root, hintedStateIndices, statesBySetter, helperIdentifier, safeGlobals) {
   if (hintedStateIndices.size === 0) {
     return { root: core.types.cloneNode(root, true), count: 0, stateIndices: /* @__PURE__ */ new Set() };
@@ -866,11 +873,11 @@ function rewriteKeyedArrayPositionHints(root, hintedStateIndices, statesBySetter
       }
       const methodName = updater.body.callee.property.name;
       const args = updater.body.arguments;
-      const kind = methodName === "with" && args.length === 2 ? "replace" : methodName === "toSpliced" && args.length === 3 && core.types.isNumericLiteral(args[1], { value: 0 }) ? "insert" : void 0;
-      if (!kind || !core.types.isExpression(args[0]) || !core.types.isExpression(args.at(-1))) return;
-      const position = staticSliceIndex(args[0]);
-      const item = args.at(-1);
-      if (position === void 0 || !core.types.isExpression(item) || validateDerivedExpression(item, safeGlobals) !== void 0) {
+      const kind = methodName === "with" && args.length === 2 ? "replace" : methodName === "toSpliced" && args.length === 3 && core.types.isNumericLiteral(args[1], { value: 0 }) ? "insert" : methodName === "toSpliced" && args.length === 2 && core.types.isNumericLiteral(args[1], { value: 1 }) ? "remove" : void 0;
+      if (!kind || !core.types.isExpression(args[0])) return;
+      const position = args[0];
+      const item = kind === "remove" ? void 0 : args.at(-1);
+      if (validateKeyedArrayPositionExpression(position, safeGlobals) !== void 0 || item !== void 0 && (!core.types.isExpression(item) || validateDerivedExpression(item, safeGlobals) !== void 0)) {
         return;
       }
       const previous = core.types.cloneNode(updater.params[0]);
@@ -956,6 +963,61 @@ function rewriteKeyedArrayReorderHints(root, hintedStateIndices, statesBySetter,
     stateIndices
   };
 }
+function rewriteKeyedArraySortHints(root, hintedStateIndices, statesBySetter, helperIdentifier, safeGlobals) {
+  if (hintedStateIndices.size === 0) {
+    return { root: core.types.cloneNode(root, true), count: 0, stateIndices: /* @__PURE__ */ new Set() };
+  }
+  const file = expressionFile(core.types.cloneNode(root, true));
+  const stateIndices = /* @__PURE__ */ new Set();
+  let count = 0;
+  core.traverse(file, {
+    CallExpression(path) {
+      const callee = path.get("callee");
+      if (!callee.isIdentifier() || callee.scope.hasBinding(callee.node.name)) return;
+      const state = statesBySetter.get(callee.node.name);
+      if (!state || !hintedStateIndices.has(state.index) || path.node.arguments.length !== 1) {
+        return;
+      }
+      const updater = path.node.arguments[0];
+      if (!core.types.isArrowFunctionExpression(updater) || updater.async || updater.generator || updater.params.length !== 1 || !core.types.isIdentifier(updater.params[0]) || !core.types.isCallExpression(updater.body) || updater.body.arguments.length > 1 || !core.types.isMemberExpression(updater.body.callee) || updater.body.callee.computed || !core.types.isIdentifier(updater.body.callee.object, { name: updater.params[0].name }) || !core.types.isIdentifier(updater.body.callee.property, { name: "toSorted" })) {
+        return;
+      }
+      const comparator = updater.body.arguments[0];
+      if (comparator && !core.types.isArrowFunctionExpression(comparator) && !core.types.isFunctionExpression(comparator)) {
+        return;
+      }
+      if (comparator && validateCollectionCallback(comparator, "toSorted", safeGlobals)) return;
+      const previous = core.types.cloneNode(updater.params[0]);
+      const method = path.scope.generateUidIdentifier("farmToSorted");
+      path.node.arguments[0] = core.types.arrowFunctionExpression(
+        [core.types.cloneNode(previous)],
+        core.types.blockStatement([
+          core.types.variableDeclaration("const", [
+            core.types.variableDeclarator(
+              core.types.cloneNode(method),
+              core.types.memberExpression(core.types.cloneNode(previous), core.types.identifier("toSorted"))
+            )
+          ]),
+          core.types.returnStatement(
+            core.types.callExpression(core.types.cloneNode(helperIdentifier), [
+              core.types.cloneNode(previous),
+              core.types.cloneNode(method),
+              ...comparator ? [core.types.cloneNode(comparator, true)] : []
+            ])
+          )
+        ])
+      );
+      count += 1;
+      stateIndices.add(state.index);
+      path.skip();
+    }
+  });
+  return {
+    root: file.program.body[0].expression,
+    count,
+    stateIndices
+  };
+}
 function rewriteKeyedArraySliceHints(root, hintedStateIndices, statesBySetter, helperIdentifier) {
   if (hintedStateIndices.size === 0) {
     return { root: core.types.cloneNode(root, true), count: 0, stateIndices: /* @__PURE__ */ new Set() };
@@ -4757,7 +4819,7 @@ function wrapperElement(definitionIdentifier, props) {
   const attributes = props ? [core.types.jsxSpreadAttribute(core.types.cloneNode(props))] : [];
   return core.types.jsxElement(core.types.jsxOpeningElement(name, attributes, true), null, [], true);
 }
-function compileCandidate(candidate, createComponentIdentifier, keyedMapUpdateIdentifier, keyedArrayAppendIdentifier, keyedArrayFilterIdentifier, keyedArrayPrependIdentifier, keyedArrayPositionIdentifier, keyedArrayReorderIdentifier, keyedArrayRollingWindowIdentifier, keyedArraySliceIdentifier, keyedCollectionUpdateIdentifier, keyedCollectionMutationIdentifier, runtimeFeatureIdentifiers, usedRuntimeFeatures, optimizationCounts, useStateNames, reactNames, listNames, moduleId, reactivity) {
+function compileCandidate(candidate, createComponentIdentifier, keyedMapUpdateIdentifier, keyedArrayAppendIdentifier, keyedArrayFilterIdentifier, keyedArrayPrependIdentifier, keyedArrayPositionIdentifier, keyedArrayReorderIdentifier, keyedArraySortIdentifier, keyedArrayRollingWindowIdentifier, keyedArraySliceIdentifier, keyedCollectionUpdateIdentifier, keyedCollectionMutationIdentifier, runtimeFeatureIdentifiers, usedRuntimeFeatures, optimizationCounts, useStateNames, reactNames, listNames, moduleId, reactivity) {
   const { path, name, statementPath } = candidate;
   if (path.node.async || path.node.generator)
     return "async and generator components are not supported";
@@ -5193,6 +5255,41 @@ function compileCandidate(candidate, createComponentIdentifier, keyedMapUpdateId
       optimizationCounts.keyedArrayReorderHints += reorderHintedRoot.count;
     }
   }
+  const sortHintedRoot = rewriteKeyedArraySortHints(
+    expandedReactiveRoot,
+    shiftedIndexIndependentStateIndices,
+    statesBySetter,
+    keyedArraySortIdentifier,
+    safeGlobals
+  );
+  let appliedKeyedArraySortHints = 0;
+  let appliedSortHintedStateIndices = /* @__PURE__ */ new Set();
+  if (sortHintedRoot.count > 0) {
+    const hintedBlockAnalysis = analyzeComposableBlocks(
+      sortHintedRoot.root,
+      reactiveByValue,
+      safeGlobals,
+      listNames,
+      allowedComponentNames
+    );
+    const hintedAnalysis = analyzeHostTree(
+      sortHintedRoot.root,
+      reactiveByValue,
+      safeGlobals,
+      hintedBlockAnalysis.conditionalExpressions || /* @__PURE__ */ new Set(),
+      hintedBlockAnalysis.keyedExpressions || /* @__PURE__ */ new Set(),
+      hintedBlockAnalysis.ownedElements || /* @__PURE__ */ new Set(),
+      hintedBlockAnalysis.componentElements || /* @__PURE__ */ new Set()
+    );
+    if (!hintedBlockAnalysis.reason && !hintedAnalysis.reason) {
+      expandedReactiveRoot = sortHintedRoot.root;
+      blockAnalysis = hintedBlockAnalysis;
+      analysis = hintedAnalysis;
+      appliedKeyedArraySortHints = sortHintedRoot.count;
+      appliedSortHintedStateIndices = sortHintedRoot.stateIndices;
+      optimizationCounts.keyedArraySortHints += sortHintedRoot.count;
+    }
+  }
   const sliceHintedRoot = rewriteKeyedArraySliceHints(
     expandedReactiveRoot,
     shiftedIndexIndependentStateIndices,
@@ -5327,7 +5424,7 @@ function compileCandidate(candidate, createComponentIdentifier, keyedMapUpdateId
     (count, plan) => count + (plan.kind === "keyed-rows" ? plan.bindings.filter((binding) => binding.mapLookupTarget !== void 0).length : 0),
     0
   );
-  const hasKeyedUpdateHints = appliedKeyedMapUpdateHints > 0 || appliedKeyedArrayAppendHints > 0 || appliedKeyedArrayFilterHints > 0 || appliedKeyedArrayPrependHints > 0 || appliedKeyedArrayPositionHints > 0 || appliedKeyedArrayReorderHints > 0 || appliedKeyedArrayRollingWindowHints > 0 || appliedKeyedArraySliceHints > 0;
+  const hasKeyedUpdateHints = appliedKeyedMapUpdateHints > 0 || appliedKeyedArrayAppendHints > 0 || appliedKeyedArrayFilterHints > 0 || appliedKeyedArrayPrependHints > 0 || appliedKeyedArrayPositionHints > 0 || appliedKeyedArrayReorderHints > 0 || appliedKeyedArraySortHints > 0 || appliedKeyedArrayRollingWindowHints > 0 || appliedKeyedArraySliceHints > 0;
   const hasKeyedArrayRemovalHints = appliedKeyedArrayFilterHints > 0 || appliedKeyedArrayRollingWindowHints > 0 || appliedKeyedArraySliceHints > 0;
   const runtimeFeatures = runtimeFeaturesForPlans(
     blockPlans,
@@ -5335,7 +5432,7 @@ function compileCandidate(candidate, createComponentIdentifier, keyedMapUpdateId
     hasKeyedArrayRemovalHints,
     appliedKeyedArrayPrependHints > 0,
     appliedKeyedArrayPositionHints > 0,
-    appliedKeyedArrayReorderHints > 0,
+    appliedKeyedArrayReorderHints > 0 || appliedKeyedArraySortHints > 0,
     appliedKeyedArrayRollingWindowHints > 0
   );
   markShortCircuitBindings(analysis.bindings || []);
@@ -5364,7 +5461,7 @@ function compileCandidate(candidate, createComponentIdentifier, keyedMapUpdateId
     appliedRemovalHintedStateIndices,
     appliedPrependHintedStateIndices,
     appliedPositionHintedStateIndices,
-    appliedReorderHintedStateIndices
+    /* @__PURE__ */ new Set([...appliedReorderHintedStateIndices, ...appliedSortHintedStateIndices])
   );
   const rewrittenRoot = rewriteStateAccess(
     rootWithBlocks,
@@ -5508,6 +5605,7 @@ async function compileReactModule(code, id, options) {
     keyedArrayPrependHints: 0,
     keyedArrayPositionHints: 0,
     keyedArrayReorderHints: 0,
+    keyedArraySortHints: 0,
     keyedArrayRollingWindowHints: 0,
     keyedArraySliceHints: 0,
     keyedCollectionUpdateHints: 0,
@@ -5563,6 +5661,9 @@ async function compileReactModule(code, id, options) {
         const keyedArrayReorderIdentifier = programPath.scope.generateUidIdentifier(
           "createCompilerKeyedArrayReorder"
         );
+        const keyedArraySortIdentifier = programPath.scope.generateUidIdentifier(
+          "createCompilerKeyedArraySort"
+        );
         const keyedArrayRollingWindowIdentifier = programPath.scope.generateUidIdentifier(
           "createCompilerKeyedArrayRollingWindow"
         );
@@ -5598,6 +5699,7 @@ async function compileReactModule(code, id, options) {
             keyedArrayPrependIdentifier,
             keyedArrayPositionIdentifier,
             keyedArrayReorderIdentifier,
+            keyedArraySortIdentifier,
             keyedArrayRollingWindowIdentifier,
             keyedArraySliceIdentifier,
             keyedCollectionUpdateIdentifier,
@@ -5666,6 +5768,12 @@ async function compileReactModule(code, id, options) {
                     core.types.identifier("createCompilerKeyedArrayReorder")
                   )
                 ] : [],
+                ...optimizationCounts.keyedArraySortHints > 0 ? [
+                  core.types.importSpecifier(
+                    keyedArraySortIdentifier,
+                    core.types.identifier("createCompilerKeyedArraySort")
+                  )
+                ] : [],
                 ...optimizationCounts.keyedArrayRollingWindowHints > 0 ? [
                   core.types.importSpecifier(
                     keyedArrayRollingWindowIdentifier,
@@ -5741,6 +5849,7 @@ function createReactCompilerReport(projectRoot, observations) {
   let keyedArrayPrependHints = 0;
   let keyedArrayPositionHints = 0;
   let keyedArrayReorderHints = 0;
+  let keyedArraySortHints = 0;
   let keyedArrayRollingWindowHints = 0;
   let keyedArraySliceHints = 0;
   let keyedCollectionUpdateHints = 0;
@@ -5757,6 +5866,7 @@ function createReactCompilerReport(projectRoot, observations) {
     keyedArrayPrependHints += result.optimizations.keyedArrayPrependHints || 0;
     keyedArrayPositionHints += result.optimizations.keyedArrayPositionHints || 0;
     keyedArrayReorderHints += result.optimizations.keyedArrayReorderHints || 0;
+    keyedArraySortHints += result.optimizations.keyedArraySortHints || 0;
     keyedArrayRollingWindowHints += result.optimizations.keyedArrayRollingWindowHints || 0;
     keyedArraySliceHints += result.optimizations.keyedArraySliceHints || 0;
     keyedCollectionUpdateHints += result.optimizations.keyedCollectionUpdateHints || 0;
@@ -5789,6 +5899,7 @@ function createReactCompilerReport(projectRoot, observations) {
       keyedArrayPrependHints,
       keyedArrayPositionHints,
       keyedArrayReorderHints,
+      keyedArraySortHints,
       keyedArrayRollingWindowHints,
       keyedArraySliceHints,
       keyedCollectionUpdateHints,