@tanstack/router-core 0.0.1-beta.4 → 0.0.1-beta.41

package/src/sharedClone.ts

@@ -0,0 +1,118 @@
+/**
+ * This function returns `a` if `b` is deeply equal.
+ * If not, it will replace any deeply equal children of `b` with those of `a`.
+ * This can be used for structural sharing between JSON values for example.
+ */
+export function sharedClone<T>(prev: any, next: T, touchAll?: boolean): T {
+  const things = new Map()
+
+  function recurse(prev: any, next: any) {
+    if (prev === next) {
+      return prev
+    }
+
+    if (things.has(next)) {
+      return things.get(next)
+    }
+
+    const prevIsArray = Array.isArray(prev)
+    const nextIsArray = Array.isArray(next)
+    const prevIsObj = isPlainObject(prev)
+    const nextIsObj = isPlainObject(next)
+
+    const isArray = prevIsArray && nextIsArray
+    const isObj = prevIsObj && nextIsObj
+
+    const isSameStructure = isArray || isObj
+
+    // Both are arrays or objects
+    if (isSameStructure) {
+      const aSize = isArray ? prev.length : Object.keys(prev).length
+      const bItems = isArray ? next : Object.keys(next)
+      const bSize = bItems.length
+      const copy: any = isArray ? [] : {}
+
+      let equalItems = 0
+
+      for (let i = 0; i < bSize; i++) {
+        const key = isArray ? i : bItems[i]
+        if (copy[key] === prev[key]) {
+          equalItems++
+        }
+      }
+      if (aSize === bSize && equalItems === aSize) {
+        things.set(next, prev)
+        return prev
+      }
+      things.set(next, copy)
+      for (let i = 0; i < bSize; i++) {
+        const key = isArray ? i : bItems[i]
+        if (typeof bItems[i] === 'function') {
+          copy[key] = prev[key]
+        } else {
+          copy[key] = recurse(prev[key], next[key])
+        }
+        if (copy[key] === prev[key]) {
+          equalItems++
+        }
+      }
+
+      return copy
+    }
+
+    if (nextIsArray) {
+      const copy: any[] = []
+      things.set(next, copy)
+      for (let i = 0; i < next.length; i++) {
+        copy[i] = recurse(undefined, next[i])
+      }
+      return copy as T
+    }
+
+    if (nextIsObj) {
+      const copy = {} as any
+      things.set(next, copy)
+      const nextKeys = Object.keys(next)
+      for (let i = 0; i < nextKeys.length; i++) {
+        const key = nextKeys[i]!
+        copy[key] = recurse(undefined, next[key])
+      }
+      return copy as T
+    }
+
+    return next
+  }
+
+  return recurse(prev, next)
+}
+
+// Copied from: https://github.com/jonschlinkert/is-plain-object
+function isPlainObject(o: any) {
+  if (!hasObjectPrototype(o)) {
+    return false
+  }
+
+  // If has modified constructor
+  const ctor = o.constructor
+  if (typeof ctor === 'undefined') {
+    return true
+  }
+
+  // If has modified prototype
+  const prot = ctor.prototype
+  if (!hasObjectPrototype(prot)) {
+    return false
+  }
+
+  // If constructor does not have an Object-specific method
+  if (!prot.hasOwnProperty('isPrototypeOf')) {
+    return false
+  }
+
+  // Most likely a plain Object
+  return true
+}
+
+function hasObjectPrototype(o: any) {
+  return Object.prototype.toString.call(o) === '[object Object]'
+}

package/src/utils.ts

@@ -24,11 +24,11 @@ export type Expand<T> = T extends object
     : never
   : T
 
-// type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (
-//   k: infer I,
-// ) => any
-//   ? I
-//   : never
+export type UnionToIntersection<U> = (
+  U extends any ? (k: U) => void : never
+) extends (k: infer I) => any
+  ? I
+  : never
 
 export type Values<O> = O[ValueKeys<O>]
 export type ValueKeys<O> = Extract<keyof O, PropertyKey>
@@ -40,9 +40,9 @@ export type DeepAwaited<T> = T extends Promise<infer A>
   : T
 
 export type PathParamMask<TRoutePath extends string> =
-  TRoutePath extends `${infer L}/:${infer C}/${infer R}`
+  TRoutePath extends `${infer L}/$${infer C}/${infer R}`
     ? PathParamMask<`${L}/${string}/${R}`>
-    : TRoutePath extends `${infer L}/:${infer C}`
+    : TRoutePath extends `${infer L}/$${infer C}`
     ? PathParamMask<`${L}/${string}`>
     : TRoutePath
 
@@ -60,71 +60,6 @@ export type PickExclude<T, U> = {
   [K in keyof T as T[K] extends U ? never : K]: T[K]
 }
 
-/**
- * This function returns `a` if `b` is deeply equal.
- * If not, it will replace any deeply equal children of `b` with those of `a`.
- * This can be used for structural sharing between JSON values for example.
- */
-export function replaceEqualDeep(prev: any, next: any) {
-  if (prev === next) {
-    return prev
-  }
-
-  const array = Array.isArray(prev) && Array.isArray(next)
-
-  if (array || (isPlainObject(prev) && isPlainObject(next))) {
-    const aSize = array ? prev.length : Object.keys(prev).length
-    const bItems = array ? next : Object.keys(next)
-    const bSize = bItems.length
-    const copy: any = array ? [] : {}
-
-    let equalItems = 0
-
-    for (let i = 0; i < bSize; i++) {
-      const key = array ? i : bItems[i]
-      copy[key] = replaceEqualDeep(prev[key], next[key])
-      if (copy[key] === prev[key]) {
-        equalItems++
-      }
-    }
-
-    return aSize === bSize && equalItems === aSize ? prev : copy
-  }
-
-  return next
-}
-
-// Copied from: https://github.com/jonschlinkert/is-plain-object
-function isPlainObject(o: any) {
-  if (!hasObjectPrototype(o)) {
-    return false
-  }
-
-  // If has modified constructor
-  const ctor = o.constructor
-  if (typeof ctor === 'undefined') {
-    return true
-  }
-
-  // If has modified prototype
-  const prot = ctor.prototype
-  if (!hasObjectPrototype(prot)) {
-    return false
-  }
-
-  // If constructor does not have an Object-specific method
-  if (!prot.hasOwnProperty('isPrototypeOf')) {
-    return false
-  }
-
-  // Most likely a plain Object
-  return true
-}
-
-function hasObjectPrototype(o: any) {
-  return Object.prototype.toString.call(o) === '[object Object]'
-}
-
 export function last<T>(arr: T[]) {
   return arr[arr.length - 1]
 }
@@ -155,3 +90,10 @@ export function functionalUpdate<TResult>(
 
   return updater
 }
+
+export function pick<T, K extends keyof T>(parent: T, keys: K[]): Pick<T, K> {
+  return keys.reduce((obj: any, key: K) => {
+    obj[key] = parent[key]
+    return obj
+  }, {} as any)
+}

package/build/cjs/_virtual/_rollupPluginBabelHelpers.js

@@ -1,33 +0,0 @@
-/**
- * router-core
- *
- * Copyright (c) TanStack
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE.md file in the root directory of this source tree.
- *
- * @license MIT
- */
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-function _extends() {
-  _extends = Object.assign ? Object.assign.bind() : function (target) {
-    for (var i = 1; i < arguments.length; i++) {
-      var source = arguments[i];
-
-      for (var key in source) {
-        if (Object.prototype.hasOwnProperty.call(source, key)) {
-          target[key] = source[key];
-        }
-      }
-    }
-
-    return target;
-  };
-  return _extends.apply(this, arguments);
-}
-
-exports["extends"] = _extends;
-//# sourceMappingURL=_rollupPluginBabelHelpers.js.map

package/build/cjs/_virtual/_rollupPluginBabelHelpers.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"_rollupPluginBabelHelpers.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/build/cjs/node_modules/@babel/runtime/helpers/esm/extends.js

@@ -1,33 +0,0 @@
-/**
- * router-core
- *
- * Copyright (c) TanStack
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE.md file in the root directory of this source tree.
- *
- * @license MIT
- */
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-function _extends() {
-  _extends = Object.assign ? Object.assign.bind() : function (target) {
-    for (var i = 1; i < arguments.length; i++) {
-      var source = arguments[i];
-
-      for (var key in source) {
-        if (Object.prototype.hasOwnProperty.call(source, key)) {
-          target[key] = source[key];
-        }
-      }
-    }
-
-    return target;
-  };
-  return _extends.apply(this, arguments);
-}
-
-exports["default"] = _extends;
-//# sourceMappingURL=extends.js.map

package/build/cjs/node_modules/@babel/runtime/helpers/esm/extends.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"extends.js","sources":["../../../../../../../../../node_modules/@babel/runtime/helpers/esm/extends.js"],"sourcesContent":["export default function _extends() {\n  _extends = Object.assign ? Object.assign.bind() : function (target) {\n    for (var i = 1; i < arguments.length; i++) {\n      var source = arguments[i];\n\n      for (var key in source) {\n        if (Object.prototype.hasOwnProperty.call(source, key)) {\n          target[key] = source[key];\n        }\n      }\n    }\n\n    return target;\n  };\n  return _extends.apply(this, arguments);\n}"],"names":[],"mappings":";;;;;;;;;;;;;;AAAe,SAAS,QAAQ,GAAG;AACnC,EAAE,QAAQ,GAAG,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,UAAU,MAAM,EAAE;AACtE,IAAI,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;AAC/C,MAAM,IAAI,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;AAChC;AACA,MAAM,KAAK,IAAI,GAAG,IAAI,MAAM,EAAE;AAC9B,QAAQ,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE;AAC/D,UAAU,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;AACpC,SAAS;AACT,OAAO;AACP,KAAK;AACL;AACA,IAAI,OAAO,MAAM,CAAC;AAClB,GAAG,CAAC;AACJ,EAAE,OAAO,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;AACzC;;;;"}