@rocicorp/zero 0.26.0-canary.17 → 0.26.0-canary.19
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/out/shared/src/arrays.js +1 -1
- package/out/shared/src/arrays.js.map +1 -1
- package/out/shared/src/btree-set.js +4 -1
- package/out/shared/src/btree-set.js.map +1 -1
- package/out/shared/src/options.js +1 -1
- package/out/shared/src/options.js.map +1 -1
- package/out/shared/src/queue.js +1 -1
- package/out/shared/src/queue.js.map +1 -1
- package/out/zero/package.json.js +1 -1
- package/out/zero/src/react.js +1 -3
- package/out/zero/src/react.js.map +1 -1
- package/out/zero-cache/src/db/migration.d.ts.map +1 -1
- package/out/zero-cache/src/db/migration.js +38 -49
- package/out/zero-cache/src/db/migration.js.map +1 -1
- package/out/zero-cache/src/observability/events.d.ts.map +1 -1
- package/out/zero-cache/src/observability/events.js +27 -4
- package/out/zero-cache/src/observability/events.js.map +1 -1
- package/out/zero-cache/src/services/change-source/common/backfill-manager.js +2 -2
- package/out/zero-cache/src/services/change-source/common/backfill-manager.js.map +1 -1
- package/out/zero-cache/src/services/change-source/pg/initial-sync.d.ts.map +1 -1
- package/out/zero-cache/src/services/change-source/pg/initial-sync.js +13 -0
- package/out/zero-cache/src/services/change-source/pg/initial-sync.js.map +1 -1
- package/out/zero-cache/src/services/change-streamer/change-streamer-service.js +5 -2
- package/out/zero-cache/src/services/change-streamer/change-streamer-service.js.map +1 -1
- package/out/zero-cache/src/services/change-streamer/storer.d.ts +9 -0
- package/out/zero-cache/src/services/change-streamer/storer.d.ts.map +1 -1
- package/out/zero-cache/src/services/change-streamer/storer.js +33 -6
- package/out/zero-cache/src/services/change-streamer/storer.js.map +1 -1
- package/out/zero-cache/src/types/streams.js +1 -1
- package/out/zero-cache/src/types/streams.js.map +1 -1
- package/out/zero-client/src/client/query-manager.js +1 -1
- package/out/zero-client/src/client/query-manager.js.map +1 -1
- package/out/zero-client/src/client/version.js +1 -1
- package/out/zero-client/src/client/zero.d.ts.map +1 -1
- package/out/zero-client/src/client/zero.js +9 -6
- package/out/zero-client/src/client/zero.js.map +1 -1
- package/out/zero-protocol/src/ast.d.ts.map +1 -1
- package/out/zero-protocol/src/ast.js +6 -3
- package/out/zero-protocol/src/ast.js.map +1 -1
- package/out/zero-protocol/src/protocol-version.js +4 -1
- package/out/zero-protocol/src/protocol-version.js.map +1 -1
- package/out/zero-react/src/mod.d.ts +0 -2
- package/out/zero-react/src/mod.d.ts.map +1 -1
- package/out/zero-react/src/use-query.js +7 -1
- package/out/zero-react/src/use-query.js.map +1 -1
- package/out/zql/src/builder/builder.d.ts.map +1 -1
- package/out/zql/src/builder/builder.js +4 -1
- package/out/zql/src/builder/builder.js.map +1 -1
- package/out/zql/src/query/query-impl.js +1 -1
- package/out/zql/src/query/query-impl.js.map +1 -1
- package/out/zql/src/query/query-internals.js.map +1 -1
- package/package.json +1 -1
- package/out/zero-react/src/paging-reducer.d.ts +0 -61
- package/out/zero-react/src/paging-reducer.d.ts.map +0 -1
- package/out/zero-react/src/paging-reducer.js +0 -77
- package/out/zero-react/src/paging-reducer.js.map +0 -1
- package/out/zero-react/src/use-rows.d.ts +0 -39
- package/out/zero-react/src/use-rows.d.ts.map +0 -1
- package/out/zero-react/src/use-rows.js +0 -130
- package/out/zero-react/src/use-rows.js.map +0 -1
- package/out/zero-react/src/use-zero-virtualizer.d.ts +0 -122
- package/out/zero-react/src/use-zero-virtualizer.d.ts.map +0 -1
- package/out/zero-react/src/use-zero-virtualizer.js +0 -342
- package/out/zero-react/src/use-zero-virtualizer.js.map +0 -1
package/out/shared/src/arrays.js
CHANGED
|
@@ -17,7 +17,7 @@ function areEqual(arr1, arr2) {
|
|
|
17
17
|
return arr1.length === arr2.length && arr1.every((e, i) => e === arr2[i]);
|
|
18
18
|
}
|
|
19
19
|
function zip(a1, a2) {
|
|
20
|
-
assert(a1.length === a2.length);
|
|
20
|
+
assert(a1.length === a2.length, "zip: arrays must have equal length");
|
|
21
21
|
const result = [];
|
|
22
22
|
for (let i = 0; i < a1.length; i++) {
|
|
23
23
|
result.push([a1[i], a2[i]]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"arrays.js","sources":["../../../../shared/src/arrays.ts"],"sourcesContent":["import {assert} from './asserts.ts';\n\n/**\n * Returns `arr` as is if none of the elements are `undefined`.\n * Otherwise returns a new array with only defined elements in `arr`.\n */\nexport function defined<T>(arr: (T | undefined)[]): T[] {\n // avoid an array copy if possible\n let i = arr.findIndex(x => x === undefined);\n if (i < 0) {\n return arr as T[];\n }\n const defined: T[] = arr.slice(0, i) as T[];\n for (i++; i < arr.length; i++) {\n const x = arr[i];\n if (x !== undefined) {\n defined.push(x);\n }\n }\n return defined;\n}\n\nexport function areEqual<T>(arr1: readonly T[], arr2: readonly T[]): boolean {\n return arr1.length === arr2.length && arr1.every((e, i) => e === arr2[i]);\n}\n\nexport function zip<T1, T2>(a1: readonly T1[], a2: readonly T2[]): [T1, T2][] {\n assert(a1.length === a2.length);\n const result: [T1, T2][] = [];\n for (let i = 0; i < a1.length; i++) {\n result.push([a1[i], a2[i]]);\n }\n return result;\n}\n\nexport function last<T>(arr: T[]): T | undefined {\n if (arr.length === 0) {\n return undefined;\n }\n return arr[arr.length - 1];\n}\n\nexport function groupBy<T, K>(\n arr: readonly T[],\n keyFn: (el: T) => K,\n): Map<K, T[]> {\n const groups = new Map<K, T[]>();\n for (const el of arr) {\n const key = keyFn(el);\n let group = groups.get(key);\n if (group === undefined) {\n group = [];\n groups.set(key, group);\n }\n group.push(el);\n }\n return groups;\n}\n"],"names":["defined"],"mappings":";AAMO,SAAS,QAAW,KAA6B;AAEtD,MAAI,IAAI,IAAI,UAAU,CAAA,MAAK,MAAM,MAAS;AAC1C,MAAI,IAAI,GAAG;AACT,WAAO;AAAA,EACT;AACA,QAAMA,WAAe,IAAI,MAAM,GAAG,CAAC;AACnC,OAAK,KAAK,IAAI,IAAI,QAAQ,KAAK;AAC7B,UAAM,IAAI,IAAI,CAAC;AACf,QAAI,MAAM,QAAW;AACnBA,eAAQ,KAAK,CAAC;AAAA,IAChB;AAAA,EACF;AACA,SAAOA;AACT;AAEO,SAAS,SAAY,MAAoB,MAA6B;AAC3E,SAAO,KAAK,WAAW,KAAK,UAAU,KAAK,MAAM,CAAC,GAAG,MAAM,MAAM,KAAK,CAAC,CAAC;AAC1E;AAEO,SAAS,IAAY,IAAmB,IAA+B;AAC5E,SAAO,GAAG,WAAW,GAAG,
|
|
1
|
+
{"version":3,"file":"arrays.js","sources":["../../../../shared/src/arrays.ts"],"sourcesContent":["import {assert} from './asserts.ts';\n\n/**\n * Returns `arr` as is if none of the elements are `undefined`.\n * Otherwise returns a new array with only defined elements in `arr`.\n */\nexport function defined<T>(arr: (T | undefined)[]): T[] {\n // avoid an array copy if possible\n let i = arr.findIndex(x => x === undefined);\n if (i < 0) {\n return arr as T[];\n }\n const defined: T[] = arr.slice(0, i) as T[];\n for (i++; i < arr.length; i++) {\n const x = arr[i];\n if (x !== undefined) {\n defined.push(x);\n }\n }\n return defined;\n}\n\nexport function areEqual<T>(arr1: readonly T[], arr2: readonly T[]): boolean {\n return arr1.length === arr2.length && arr1.every((e, i) => e === arr2[i]);\n}\n\nexport function zip<T1, T2>(a1: readonly T1[], a2: readonly T2[]): [T1, T2][] {\n assert(a1.length === a2.length, 'zip: arrays must have equal length');\n const result: [T1, T2][] = [];\n for (let i = 0; i < a1.length; i++) {\n result.push([a1[i], a2[i]]);\n }\n return result;\n}\n\nexport function last<T>(arr: T[]): T | undefined {\n if (arr.length === 0) {\n return undefined;\n }\n return arr[arr.length - 1];\n}\n\nexport function groupBy<T, K>(\n arr: readonly T[],\n keyFn: (el: T) => K,\n): Map<K, T[]> {\n const groups = new Map<K, T[]>();\n for (const el of arr) {\n const key = keyFn(el);\n let group = groups.get(key);\n if (group === undefined) {\n group = [];\n groups.set(key, group);\n }\n group.push(el);\n }\n return groups;\n}\n"],"names":["defined"],"mappings":";AAMO,SAAS,QAAW,KAA6B;AAEtD,MAAI,IAAI,IAAI,UAAU,CAAA,MAAK,MAAM,MAAS;AAC1C,MAAI,IAAI,GAAG;AACT,WAAO;AAAA,EACT;AACA,QAAMA,WAAe,IAAI,MAAM,GAAG,CAAC;AACnC,OAAK,KAAK,IAAI,IAAI,QAAQ,KAAK;AAC7B,UAAM,IAAI,IAAI,CAAC;AACf,QAAI,MAAM,QAAW;AACnBA,eAAQ,KAAK,CAAC;AAAA,IAChB;AAAA,EACF;AACA,SAAOA;AACT;AAEO,SAAS,SAAY,MAAoB,MAA6B;AAC3E,SAAO,KAAK,WAAW,KAAK,UAAU,KAAK,MAAM,CAAC,GAAG,MAAM,MAAM,KAAK,CAAC,CAAC;AAC1E;AAEO,SAAS,IAAY,IAAmB,IAA+B;AAC5E,SAAO,GAAG,WAAW,GAAG,QAAQ,oCAAoC;AACpE,QAAM,SAAqB,CAAA;AAC3B,WAAS,IAAI,GAAG,IAAI,GAAG,QAAQ,KAAK;AAClC,WAAO,KAAK,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;AAAA,EAC5B;AACA,SAAO;AACT;AAEO,SAAS,KAAQ,KAAyB;AAC/C,MAAI,IAAI,WAAW,GAAG;AACpB,WAAO;AAAA,EACT;AACA,SAAO,IAAI,IAAI,SAAS,CAAC;AAC3B;AAEO,SAAS,QACd,KACA,OACa;AACb,QAAM,6BAAa,IAAA;AACnB,aAAW,MAAM,KAAK;AACpB,UAAM,MAAM,MAAM,EAAE;AACpB,QAAI,QAAQ,OAAO,IAAI,GAAG;AAC1B,QAAI,UAAU,QAAW;AACvB,cAAQ,CAAA;AACR,aAAO,IAAI,KAAK,KAAK;AAAA,IACvB;AACA,UAAM,KAAK,EAAE;AAAA,EACf;AACA,SAAO;AACT;"}
|
|
@@ -147,7 +147,10 @@ function valuesFromReversed(maxKey, root, comparator, highestKey, inclusive) {
|
|
|
147
147
|
return iterator(() => ({ done: true, value: void 0 }));
|
|
148
148
|
}
|
|
149
149
|
let [nodeQueue, nodeIndex, leaf] = findPath(highestKey, root, comparator) || findPath(maxKey, root, comparator);
|
|
150
|
-
assert(
|
|
150
|
+
assert(
|
|
151
|
+
!nodeQueue[0] || leaf === nodeQueue[0][nodeIndex[0]],
|
|
152
|
+
"BTreeSet: leaf node mismatch in iteration"
|
|
153
|
+
);
|
|
151
154
|
let i = indexOf(highestKey, leaf.keys, 0, comparator);
|
|
152
155
|
if (inclusive && i < leaf.keys.length && comparator(leaf.keys[i], highestKey) <= 0) {
|
|
153
156
|
i++;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"btree-set.js","sources":["../../../../shared/src/btree-set.ts"],"sourcesContent":["import {assert} from './asserts.ts';\n\nconst MAX_NODE_SIZE = 32;\n\ntype Comparator<K> = (a: K, b: K) => number;\nexport class BTreeSet<K> {\n #root: BNode<K> = emptyLeaf as BNode<K>;\n size: number = 0;\n\n readonly comparator: Comparator<K>;\n\n constructor(comparator: Comparator<K>, entries?: IterableIterator<K>) {\n this.comparator = comparator;\n if (entries) {\n for (const key of entries) {\n this.add(key);\n }\n }\n }\n\n /** Releases the tree so that its size is 0. */\n clear() {\n this.#root = emptyLeaf as BNode<K>;\n this.size = 0;\n }\n\n clone() {\n this.#root.isShared = true;\n const ret = new BTreeSet<K>(this.comparator);\n ret.#root = this.#root;\n ret.size = this.size;\n return ret;\n }\n\n get(key: K): K | undefined {\n return this.#root.get(key, this);\n }\n\n add(key: K): this {\n if (this.#root.isShared) this.#root = this.#root.clone();\n const result = this.#root.set(key, this);\n if (result === null) return this;\n // Root node has split, so create a new root node.\n this.#root = new BNodeInternal<K>([this.#root, result]);\n return this;\n }\n\n /**\n * Returns true if the key exists in the B+ tree, false if not.\n * Use get() for best performance; use has() if you need to\n * distinguish between \"undefined value\" and \"key not present\".\n * @param key Key to detect\n * @description Computational complexity: O(log size)\n */\n has(key: K): boolean {\n return this.#root.has(key, this);\n }\n\n /**\n * Removes a single key-value pair from the B+ tree.\n * @param key Key to find\n * @returns true if a pair was found and removed, false otherwise.\n * @description Computational complexity: O(log size)\n */\n delete(key: K): boolean {\n return this.#delete(key);\n }\n\n #delete(key: K): boolean {\n let root = this.#root;\n if (root.isShared) {\n this.#root = root = root.clone();\n }\n try {\n return root.delete(key, this);\n } finally {\n let isShared;\n while (root.keys.length <= 1 && root.isInternal()) {\n isShared ||= root.isShared;\n this.#root = root =\n root.keys.length === 0 ? emptyLeaf : root.children[0];\n }\n // If any ancestor of the new root was shared, the new root must also be shared\n if (isShared) {\n root.isShared = true;\n }\n }\n }\n\n keys(): IterableIterator<K> {\n return valuesFrom(this.#root, this.comparator, undefined, true);\n }\n\n values(): IterableIterator<K> {\n return valuesFrom(this.#root, this.comparator, undefined, true);\n }\n\n valuesFrom(lowestKey?: K, inclusive: boolean = true): IterableIterator<K> {\n return valuesFrom(this.#root, this.comparator, lowestKey, inclusive);\n }\n\n valuesReversed(): IterableIterator<K> {\n return valuesFromReversed(\n this.#maxKey(),\n this.#root,\n this.comparator,\n undefined,\n true,\n );\n }\n\n valuesFromReversed(\n highestKey?: K,\n inclusive: boolean = true,\n ): IterableIterator<K> {\n return valuesFromReversed(\n this.#maxKey(),\n this.#root,\n this.comparator,\n highestKey,\n inclusive,\n );\n }\n\n /** Gets the highest key in the tree. Complexity: O(1) */\n #maxKey(): K | undefined {\n return this.#root.maxKey();\n }\n\n [Symbol.iterator](): IterableIterator<K> {\n return this.keys();\n }\n}\n\nfunction valuesFrom<K>(\n root: BNode<K>,\n comparator: Comparator<K>,\n lowestKey: K | undefined,\n inclusive: boolean,\n): IterableIterator<K> {\n const info = findPath(lowestKey, root, comparator);\n if (info === undefined) {\n return iterator<K>(() => ({done: true, value: undefined}));\n }\n\n let [nodeQueue, nodeIndex, leaf] = info;\n let i =\n lowestKey === undefined\n ? -1\n : indexOf(lowestKey, leaf.keys, 0, comparator) - 1;\n\n if (\n !inclusive &&\n i < leaf.keys.length &&\n // +1 because we did -1 above.\n comparator(leaf.keys[i + 1], lowestKey!) === 0\n ) {\n i++;\n }\n\n return iterator<K>(() => {\n for (;;) {\n if (++i < leaf.keys.length) {\n return {done: false, value: leaf.keys[i]};\n }\n\n let level = -1;\n for (;;) {\n if (++level >= nodeQueue.length) {\n return {done: true, value: undefined};\n }\n if (++nodeIndex[level] < nodeQueue[level].length) {\n break;\n }\n }\n for (; level > 0; level--) {\n nodeQueue[level - 1] = (\n nodeQueue[level][nodeIndex[level]] as BNodeInternal<K>\n ).children;\n nodeIndex[level - 1] = 0;\n }\n leaf = nodeQueue[0][nodeIndex[0]];\n i = -1;\n }\n });\n}\n\nfunction valuesFromReversed<K>(\n maxKey: K | undefined,\n root: BNode<K>,\n comparator: Comparator<K>,\n highestKey: K | undefined,\n inclusive: boolean,\n): IterableIterator<K> {\n if (highestKey === undefined) {\n highestKey = maxKey;\n if (highestKey === undefined)\n return iterator<K>(() => ({done: true, value: undefined})); // collection is empty\n }\n let [nodeQueue, nodeIndex, leaf] =\n findPath(highestKey, root, comparator) ||\n findPath(maxKey, root, comparator)!;\n assert(!nodeQueue[0] || leaf === nodeQueue[0][nodeIndex[0]]);\n let i = indexOf(highestKey, leaf.keys, 0, comparator);\n if (\n inclusive &&\n i < leaf.keys.length &&\n comparator(leaf.keys[i], highestKey) <= 0\n ) {\n i++;\n }\n\n return iterator<K>(() => {\n for (;;) {\n if (--i >= 0) {\n return {done: false, value: leaf.keys[i]};\n }\n\n let level;\n // Advance to the next leaf node\n for (level = -1; ; ) {\n if (++level >= nodeQueue.length) {\n return {done: true, value: undefined};\n }\n if (--nodeIndex[level] >= 0) {\n break;\n }\n }\n for (; level > 0; level--) {\n nodeQueue[level - 1] = (\n nodeQueue[level][nodeIndex[level]] as BNodeInternal<K>\n ).children;\n nodeIndex[level - 1] = nodeQueue[level - 1].length - 1;\n }\n leaf = nodeQueue[0][nodeIndex[0]];\n i = leaf.keys.length;\n }\n });\n}\n\nfunction findPath<K>(\n key: K | undefined,\n root: BNode<K>,\n comparator: Comparator<K>,\n): [nodeQueue: BNode<K>[][], nodeIndex: number[], leaf: BNode<K>] | undefined {\n let nextNode = root;\n const nodeQueue: BNode<K>[][] = [];\n const nodeIndex: number[] = [];\n\n if (nextNode.isInternal()) {\n for (let d = 0; nextNode.isInternal(); d++) {\n nodeQueue[d] = nextNode.children;\n nodeIndex[d] =\n key === undefined ? 0 : indexOf(key, nextNode.keys, 0, comparator);\n if (nodeIndex[d] >= nodeQueue[d].length) return; // first key > maxKey()\n nextNode = nodeQueue[d][nodeIndex[d]];\n }\n nodeQueue.reverse();\n nodeIndex.reverse();\n }\n return [nodeQueue, nodeIndex, nextNode];\n}\n\nfunction iterator<T>(next: () => IteratorResult<T>): IterableIterator<T> {\n return {\n next,\n [Symbol.iterator]() {\n return this;\n },\n };\n}\n\n/** Leaf node / base class. **************************************************/\nclass BNode<K> {\n // If this is an internal node, _keys[i] is the highest key in children[i].\n keys: K[];\n // True if this node might be within multiple `BTree`s (or have multiple parents).\n // If so, it must be cloned before being mutated to avoid changing an unrelated tree.\n // This is transitive: if it's true, children are also shared even if `isShared!=true`\n // in those children. (Certain operations will propagate isShared=true to children.)\n isShared: true | undefined;\n\n constructor(keys: K[]) {\n this.keys = keys;\n this.isShared = undefined;\n }\n\n isInternal(): this is BNodeInternal<K> {\n return false;\n }\n\n maxKey() {\n return this.keys[this.keys.length - 1];\n }\n\n minKey(): K | undefined {\n return this.keys[0];\n }\n\n clone(): BNode<K> {\n return new BNode<K>(this.keys.slice(0));\n }\n\n get(key: K, tree: BTreeSet<K>): K | undefined {\n const i = indexOf(key, this.keys, -1, tree.comparator);\n return i < 0 ? undefined : this.keys[i];\n }\n\n has(key: K, tree: BTreeSet<K>): boolean {\n const i = indexOf(key, this.keys, -1, tree.comparator);\n return i >= 0 && i < this.keys.length;\n }\n\n set(key: K, tree: BTreeSet<K>): null | BNode<K> {\n let i = indexOf(key, this.keys, -1, tree.comparator);\n if (i < 0) {\n // key does not exist yet\n i = ~i;\n tree.size++;\n\n if (this.keys.length < MAX_NODE_SIZE) {\n this.keys.splice(i, 0, key);\n return null;\n }\n // This leaf node is full and must split\n const newRightSibling = this.splitOffRightSide();\n // oxlint-disable-next-line @typescript-eslint/no-this-alias\n let target: BNode<K> = this;\n if (i > this.keys.length) {\n i -= this.keys.length;\n target = newRightSibling;\n }\n // target.#insertInLeaf(i, key);\n target.keys.splice(i, 0, key);\n\n return newRightSibling;\n }\n\n // usually this is a no-op, but some users may wish to edit the key\n this.keys[i] = key;\n return null;\n }\n\n takeFromRight(rhs: BNode<K>) {\n this.keys.push(rhs.keys.shift()!);\n }\n\n takeFromLeft(lhs: BNode<K>) {\n this.keys.unshift(lhs.keys.pop()!);\n }\n\n splitOffRightSide(): BNode<K> {\n const half = this.keys.length >> 1;\n const keys = this.keys.splice(half);\n return new BNode<K>(keys);\n }\n\n delete(key: K, tree: BTreeSet<K>): boolean {\n const cmp = tree.comparator;\n const iLow = indexOf(key, this.keys, -1, cmp);\n const iHigh = iLow + 1;\n\n if (iLow < 0) {\n return false;\n }\n\n const {keys} = this;\n for (let i = iLow; i < iHigh; i++) {\n const key = keys[i];\n\n if (key !== keys[i] || this.isShared === true) {\n throw new Error('BTree illegally changed or cloned in delete');\n }\n\n this.keys.splice(i, 1);\n tree.size--;\n return true;\n }\n\n return false;\n }\n\n mergeSibling(rhs: BNode<K>, _: number) {\n this.keys.push(...rhs.keys);\n }\n}\n\n/** Internal node (non-leaf node) ********************************************/\nclass BNodeInternal<K> extends BNode<K> {\n // Note: conventionally B+ trees have one fewer key than the number of\n // children, but I find it easier to keep the array lengths equal: each\n // keys[i] caches the value of children[i].maxKey().\n children: BNode<K>[];\n\n /**\n * This does not mark `children` as shared, so it is the responsibility of the caller\n * to ensure children are either marked shared, or aren't included in another tree.\n */\n constructor(children: BNode<K>[], keys?: K[]) {\n if (!keys) {\n keys = [];\n for (let i = 0; i < children.length; i++) {\n keys[i] = children[i].maxKey();\n }\n }\n super(keys);\n this.children = children;\n }\n\n isInternal(): this is BNodeInternal<K> {\n return true;\n }\n\n clone(): BNode<K> {\n const children = this.children.slice(0);\n for (let i = 0; i < children.length; i++) {\n children[i].isShared = true;\n }\n return new BNodeInternal<K>(children, this.keys.slice(0));\n }\n\n minKey() {\n return this.children[0].minKey();\n }\n\n get(key: K, tree: BTreeSet<K>): K | undefined {\n const i = indexOf(key, this.keys, 0, tree.comparator);\n const {children} = this;\n return i < children.length ? children[i].get(key, tree) : undefined;\n }\n\n has(key: K, tree: BTreeSet<K>): boolean {\n const i = indexOf(key, this.keys, 0, tree.comparator);\n const {children} = this;\n return i < children.length ? children[i].has(key, tree) : false;\n }\n\n set(key: K, tree: BTreeSet<K>): null | BNode<K> {\n const c = this.children;\n const cmp = tree.comparator;\n let i = Math.min(indexOf(key, this.keys, 0, cmp), c.length - 1);\n let child = c[i];\n\n if (child.isShared) {\n c[i] = child = child.clone();\n }\n if (child.keys.length >= MAX_NODE_SIZE) {\n // child is full; inserting anything else will cause a split.\n // Shifting an item to the left or right sibling may avoid a split.\n // We can do a shift if the adjacent node is not full and if the\n // current key can still be placed in the same node after the shift.\n let other: BNode<K>;\n if (\n i > 0 &&\n (other = c[i - 1]).keys.length < MAX_NODE_SIZE &&\n cmp(child.keys[0], key) < 0\n ) {\n if (other.isShared) {\n c[i - 1] = other = other.clone();\n }\n other.takeFromRight(child);\n this.keys[i - 1] = other.maxKey();\n } else if (\n (other = c[i + 1]) !== undefined &&\n other.keys.length < MAX_NODE_SIZE &&\n cmp(child.maxKey(), key) < 0\n ) {\n if (other.isShared) c[i + 1] = other = other.clone();\n other.takeFromLeft(child);\n this.keys[i] = c[i].maxKey();\n }\n }\n\n const result = child.set(key, tree);\n this.keys[i] = child.maxKey();\n if (result === null) return null;\n\n // The child has split and `result` is a new right child... does it fit?\n if (this.keys.length < MAX_NODE_SIZE) {\n // yes\n this.insert(i + 1, result);\n return null;\n }\n // no, we must split also\n const newRightSibling = this.splitOffRightSide();\n // oxlint-disable-next-line @typescript-eslint/no-this-alias\n let target: BNodeInternal<K> = this;\n if (cmp(result.maxKey(), this.maxKey()) > 0) {\n target = newRightSibling;\n i -= this.keys.length;\n }\n target.insert(i + 1, result);\n return newRightSibling;\n }\n\n /**\n * Inserts `child` at index `i`.\n * This does not mark `child` as shared, so it is the responsibility of the caller\n * to ensure that either child is marked shared, or it is not included in another tree.\n */\n insert(i: number, child: BNode<K>) {\n this.children.splice(i, 0, child);\n this.keys.splice(i, 0, child.maxKey());\n }\n\n /**\n * Split this node.\n * Modifies this to remove the second half of the items, returning a separate node containing them.\n */\n splitOffRightSide() {\n const half = this.children.length >> 1;\n return new BNodeInternal<K>(\n this.children.splice(half),\n this.keys.splice(half),\n );\n }\n\n takeFromRight(rhs: BNode<K>) {\n this.keys.push(rhs.keys.shift()!);\n this.children.push((rhs as BNodeInternal<K>).children.shift()!);\n }\n\n takeFromLeft(lhs: BNode<K>) {\n this.keys.unshift(lhs.keys.pop()!);\n this.children.unshift((lhs as BNodeInternal<K>).children.pop()!);\n }\n\n delete(key: K, tree: BTreeSet<K>): boolean {\n const cmp = tree.comparator;\n const {keys} = this;\n const {children} = this;\n let iLow = indexOf(key, this.keys, 0, cmp);\n let i = iLow;\n const iHigh = Math.min(iLow, keys.length - 1);\n if (i <= iHigh) {\n try {\n if (children[i].isShared) {\n children[i] = children[i].clone();\n }\n const result = children[i].delete(key, tree);\n // Note: if children[i] is empty then keys[i]=undefined.\n // This is an invalid state, but it is fixed below.\n keys[i] = children[i].maxKey();\n return result;\n } finally {\n // Deletions may have occurred, so look for opportunities to merge nodes.\n const half = MAX_NODE_SIZE >> 1;\n if (iLow > 0) iLow--;\n for (i = iHigh; i >= iLow; i--) {\n if (children[i].keys.length <= half) {\n if (children[i].keys.length !== 0) {\n this.tryMerge(i, MAX_NODE_SIZE);\n } else {\n // child is empty! delete it!\n keys.splice(i, 1);\n children.splice(i, 1);\n }\n }\n }\n }\n }\n return false;\n }\n\n /** Merges child i with child i+1 if their combined size is not too large */\n tryMerge(i: number, maxSize: number): boolean {\n const {children} = this;\n if (i >= 0 && i + 1 < children.length) {\n if (children[i].keys.length + children[i + 1].keys.length <= maxSize) {\n if (children[i].isShared)\n // cloned already UNLESS i is outside scan range\n children[i] = children[i].clone();\n children[i].mergeSibling(children[i + 1], maxSize);\n children.splice(i + 1, 1);\n this.keys.splice(i + 1, 1);\n this.keys[i] = children[i].maxKey();\n return true;\n }\n }\n return false;\n }\n\n /**\n * Move children from `rhs` into this.\n * `rhs` must be part of this tree, and be removed from it after this call\n * (otherwise isShared for its children could be incorrect).\n */\n mergeSibling(rhs: BNode<K>, maxNodeSize: number) {\n // assert !this.isShared;\n const oldLength = this.keys.length;\n this.keys.push(...rhs.keys);\n const rhsChildren = (rhs as unknown as BNodeInternal<K>).children;\n this.children.push(...rhsChildren);\n\n if (rhs.isShared && !this.isShared) {\n // All children of a shared node are implicitly shared, and since their new\n // parent is not shared, they must now be explicitly marked as shared.\n for (let i = 0; i < rhsChildren.length; i++) {\n rhsChildren[i].isShared = true;\n }\n }\n\n // If our children are themselves almost empty due to a mass-delete,\n // they may need to be merged too (but only the oldLength-1 and its\n // right sibling should need this).\n this.tryMerge(oldLength - 1, maxNodeSize);\n }\n}\n\n// If key not found, returns i^failXor where i is the insertion index.\n// Callers that don't care whether there was a match will set failXor=0.\nfunction indexOf<K>(\n key: K,\n keys: K[],\n failXor: number,\n comparator: Comparator<K>,\n): number {\n let lo = 0;\n let hi = keys.length;\n let mid = hi >> 1;\n while (lo < hi) {\n const c = comparator(keys[mid], key);\n if (c < 0) {\n lo = mid + 1;\n } else if (c > 0) {\n // key < keys[mid]\n hi = mid;\n } else if (c === 0) {\n return mid;\n } else {\n // c is NaN or otherwise invalid\n if (key === key) {\n // at least the search key is not NaN\n return keys.length;\n }\n throw new Error('NaN was used as a key');\n }\n mid = (lo + hi) >> 1;\n }\n return mid ^ failXor;\n}\n\n// oxlint-disable-next-line @typescript-eslint/no-explicit-any\nconst emptyLeaf = new BNode<any>([]);\nemptyLeaf.isShared = true;\n"],"names":["key"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"btree-set.js","sources":["../../../../shared/src/btree-set.ts"],"sourcesContent":["import {assert} from './asserts.ts';\n\nconst MAX_NODE_SIZE = 32;\n\ntype Comparator<K> = (a: K, b: K) => number;\nexport class BTreeSet<K> {\n #root: BNode<K> = emptyLeaf as BNode<K>;\n size: number = 0;\n\n readonly comparator: Comparator<K>;\n\n constructor(comparator: Comparator<K>, entries?: IterableIterator<K>) {\n this.comparator = comparator;\n if (entries) {\n for (const key of entries) {\n this.add(key);\n }\n }\n }\n\n /** Releases the tree so that its size is 0. */\n clear() {\n this.#root = emptyLeaf as BNode<K>;\n this.size = 0;\n }\n\n clone() {\n this.#root.isShared = true;\n const ret = new BTreeSet<K>(this.comparator);\n ret.#root = this.#root;\n ret.size = this.size;\n return ret;\n }\n\n get(key: K): K | undefined {\n return this.#root.get(key, this);\n }\n\n add(key: K): this {\n if (this.#root.isShared) this.#root = this.#root.clone();\n const result = this.#root.set(key, this);\n if (result === null) return this;\n // Root node has split, so create a new root node.\n this.#root = new BNodeInternal<K>([this.#root, result]);\n return this;\n }\n\n /**\n * Returns true if the key exists in the B+ tree, false if not.\n * Use get() for best performance; use has() if you need to\n * distinguish between \"undefined value\" and \"key not present\".\n * @param key Key to detect\n * @description Computational complexity: O(log size)\n */\n has(key: K): boolean {\n return this.#root.has(key, this);\n }\n\n /**\n * Removes a single key-value pair from the B+ tree.\n * @param key Key to find\n * @returns true if a pair was found and removed, false otherwise.\n * @description Computational complexity: O(log size)\n */\n delete(key: K): boolean {\n return this.#delete(key);\n }\n\n #delete(key: K): boolean {\n let root = this.#root;\n if (root.isShared) {\n this.#root = root = root.clone();\n }\n try {\n return root.delete(key, this);\n } finally {\n let isShared;\n while (root.keys.length <= 1 && root.isInternal()) {\n isShared ||= root.isShared;\n this.#root = root =\n root.keys.length === 0 ? emptyLeaf : root.children[0];\n }\n // If any ancestor of the new root was shared, the new root must also be shared\n if (isShared) {\n root.isShared = true;\n }\n }\n }\n\n keys(): IterableIterator<K> {\n return valuesFrom(this.#root, this.comparator, undefined, true);\n }\n\n values(): IterableIterator<K> {\n return valuesFrom(this.#root, this.comparator, undefined, true);\n }\n\n valuesFrom(lowestKey?: K, inclusive: boolean = true): IterableIterator<K> {\n return valuesFrom(this.#root, this.comparator, lowestKey, inclusive);\n }\n\n valuesReversed(): IterableIterator<K> {\n return valuesFromReversed(\n this.#maxKey(),\n this.#root,\n this.comparator,\n undefined,\n true,\n );\n }\n\n valuesFromReversed(\n highestKey?: K,\n inclusive: boolean = true,\n ): IterableIterator<K> {\n return valuesFromReversed(\n this.#maxKey(),\n this.#root,\n this.comparator,\n highestKey,\n inclusive,\n );\n }\n\n /** Gets the highest key in the tree. Complexity: O(1) */\n #maxKey(): K | undefined {\n return this.#root.maxKey();\n }\n\n [Symbol.iterator](): IterableIterator<K> {\n return this.keys();\n }\n}\n\nfunction valuesFrom<K>(\n root: BNode<K>,\n comparator: Comparator<K>,\n lowestKey: K | undefined,\n inclusive: boolean,\n): IterableIterator<K> {\n const info = findPath(lowestKey, root, comparator);\n if (info === undefined) {\n return iterator<K>(() => ({done: true, value: undefined}));\n }\n\n let [nodeQueue, nodeIndex, leaf] = info;\n let i =\n lowestKey === undefined\n ? -1\n : indexOf(lowestKey, leaf.keys, 0, comparator) - 1;\n\n if (\n !inclusive &&\n i < leaf.keys.length &&\n // +1 because we did -1 above.\n comparator(leaf.keys[i + 1], lowestKey!) === 0\n ) {\n i++;\n }\n\n return iterator<K>(() => {\n for (;;) {\n if (++i < leaf.keys.length) {\n return {done: false, value: leaf.keys[i]};\n }\n\n let level = -1;\n for (;;) {\n if (++level >= nodeQueue.length) {\n return {done: true, value: undefined};\n }\n if (++nodeIndex[level] < nodeQueue[level].length) {\n break;\n }\n }\n for (; level > 0; level--) {\n nodeQueue[level - 1] = (\n nodeQueue[level][nodeIndex[level]] as BNodeInternal<K>\n ).children;\n nodeIndex[level - 1] = 0;\n }\n leaf = nodeQueue[0][nodeIndex[0]];\n i = -1;\n }\n });\n}\n\nfunction valuesFromReversed<K>(\n maxKey: K | undefined,\n root: BNode<K>,\n comparator: Comparator<K>,\n highestKey: K | undefined,\n inclusive: boolean,\n): IterableIterator<K> {\n if (highestKey === undefined) {\n highestKey = maxKey;\n if (highestKey === undefined)\n return iterator<K>(() => ({done: true, value: undefined})); // collection is empty\n }\n let [nodeQueue, nodeIndex, leaf] =\n findPath(highestKey, root, comparator) ||\n findPath(maxKey, root, comparator)!;\n assert(\n !nodeQueue[0] || leaf === nodeQueue[0][nodeIndex[0]],\n 'BTreeSet: leaf node mismatch in iteration',\n );\n let i = indexOf(highestKey, leaf.keys, 0, comparator);\n if (\n inclusive &&\n i < leaf.keys.length &&\n comparator(leaf.keys[i], highestKey) <= 0\n ) {\n i++;\n }\n\n return iterator<K>(() => {\n for (;;) {\n if (--i >= 0) {\n return {done: false, value: leaf.keys[i]};\n }\n\n let level;\n // Advance to the next leaf node\n for (level = -1; ; ) {\n if (++level >= nodeQueue.length) {\n return {done: true, value: undefined};\n }\n if (--nodeIndex[level] >= 0) {\n break;\n }\n }\n for (; level > 0; level--) {\n nodeQueue[level - 1] = (\n nodeQueue[level][nodeIndex[level]] as BNodeInternal<K>\n ).children;\n nodeIndex[level - 1] = nodeQueue[level - 1].length - 1;\n }\n leaf = nodeQueue[0][nodeIndex[0]];\n i = leaf.keys.length;\n }\n });\n}\n\nfunction findPath<K>(\n key: K | undefined,\n root: BNode<K>,\n comparator: Comparator<K>,\n): [nodeQueue: BNode<K>[][], nodeIndex: number[], leaf: BNode<K>] | undefined {\n let nextNode = root;\n const nodeQueue: BNode<K>[][] = [];\n const nodeIndex: number[] = [];\n\n if (nextNode.isInternal()) {\n for (let d = 0; nextNode.isInternal(); d++) {\n nodeQueue[d] = nextNode.children;\n nodeIndex[d] =\n key === undefined ? 0 : indexOf(key, nextNode.keys, 0, comparator);\n if (nodeIndex[d] >= nodeQueue[d].length) return; // first key > maxKey()\n nextNode = nodeQueue[d][nodeIndex[d]];\n }\n nodeQueue.reverse();\n nodeIndex.reverse();\n }\n return [nodeQueue, nodeIndex, nextNode];\n}\n\nfunction iterator<T>(next: () => IteratorResult<T>): IterableIterator<T> {\n return {\n next,\n [Symbol.iterator]() {\n return this;\n },\n };\n}\n\n/** Leaf node / base class. **************************************************/\nclass BNode<K> {\n // If this is an internal node, _keys[i] is the highest key in children[i].\n keys: K[];\n // True if this node might be within multiple `BTree`s (or have multiple parents).\n // If so, it must be cloned before being mutated to avoid changing an unrelated tree.\n // This is transitive: if it's true, children are also shared even if `isShared!=true`\n // in those children. (Certain operations will propagate isShared=true to children.)\n isShared: true | undefined;\n\n constructor(keys: K[]) {\n this.keys = keys;\n this.isShared = undefined;\n }\n\n isInternal(): this is BNodeInternal<K> {\n return false;\n }\n\n maxKey() {\n return this.keys[this.keys.length - 1];\n }\n\n minKey(): K | undefined {\n return this.keys[0];\n }\n\n clone(): BNode<K> {\n return new BNode<K>(this.keys.slice(0));\n }\n\n get(key: K, tree: BTreeSet<K>): K | undefined {\n const i = indexOf(key, this.keys, -1, tree.comparator);\n return i < 0 ? undefined : this.keys[i];\n }\n\n has(key: K, tree: BTreeSet<K>): boolean {\n const i = indexOf(key, this.keys, -1, tree.comparator);\n return i >= 0 && i < this.keys.length;\n }\n\n set(key: K, tree: BTreeSet<K>): null | BNode<K> {\n let i = indexOf(key, this.keys, -1, tree.comparator);\n if (i < 0) {\n // key does not exist yet\n i = ~i;\n tree.size++;\n\n if (this.keys.length < MAX_NODE_SIZE) {\n this.keys.splice(i, 0, key);\n return null;\n }\n // This leaf node is full and must split\n const newRightSibling = this.splitOffRightSide();\n // oxlint-disable-next-line @typescript-eslint/no-this-alias\n let target: BNode<K> = this;\n if (i > this.keys.length) {\n i -= this.keys.length;\n target = newRightSibling;\n }\n // target.#insertInLeaf(i, key);\n target.keys.splice(i, 0, key);\n\n return newRightSibling;\n }\n\n // usually this is a no-op, but some users may wish to edit the key\n this.keys[i] = key;\n return null;\n }\n\n takeFromRight(rhs: BNode<K>) {\n this.keys.push(rhs.keys.shift()!);\n }\n\n takeFromLeft(lhs: BNode<K>) {\n this.keys.unshift(lhs.keys.pop()!);\n }\n\n splitOffRightSide(): BNode<K> {\n const half = this.keys.length >> 1;\n const keys = this.keys.splice(half);\n return new BNode<K>(keys);\n }\n\n delete(key: K, tree: BTreeSet<K>): boolean {\n const cmp = tree.comparator;\n const iLow = indexOf(key, this.keys, -1, cmp);\n const iHigh = iLow + 1;\n\n if (iLow < 0) {\n return false;\n }\n\n const {keys} = this;\n for (let i = iLow; i < iHigh; i++) {\n const key = keys[i];\n\n if (key !== keys[i] || this.isShared === true) {\n throw new Error('BTree illegally changed or cloned in delete');\n }\n\n this.keys.splice(i, 1);\n tree.size--;\n return true;\n }\n\n return false;\n }\n\n mergeSibling(rhs: BNode<K>, _: number) {\n this.keys.push(...rhs.keys);\n }\n}\n\n/** Internal node (non-leaf node) ********************************************/\nclass BNodeInternal<K> extends BNode<K> {\n // Note: conventionally B+ trees have one fewer key than the number of\n // children, but I find it easier to keep the array lengths equal: each\n // keys[i] caches the value of children[i].maxKey().\n children: BNode<K>[];\n\n /**\n * This does not mark `children` as shared, so it is the responsibility of the caller\n * to ensure children are either marked shared, or aren't included in another tree.\n */\n constructor(children: BNode<K>[], keys?: K[]) {\n if (!keys) {\n keys = [];\n for (let i = 0; i < children.length; i++) {\n keys[i] = children[i].maxKey();\n }\n }\n super(keys);\n this.children = children;\n }\n\n isInternal(): this is BNodeInternal<K> {\n return true;\n }\n\n clone(): BNode<K> {\n const children = this.children.slice(0);\n for (let i = 0; i < children.length; i++) {\n children[i].isShared = true;\n }\n return new BNodeInternal<K>(children, this.keys.slice(0));\n }\n\n minKey() {\n return this.children[0].minKey();\n }\n\n get(key: K, tree: BTreeSet<K>): K | undefined {\n const i = indexOf(key, this.keys, 0, tree.comparator);\n const {children} = this;\n return i < children.length ? children[i].get(key, tree) : undefined;\n }\n\n has(key: K, tree: BTreeSet<K>): boolean {\n const i = indexOf(key, this.keys, 0, tree.comparator);\n const {children} = this;\n return i < children.length ? children[i].has(key, tree) : false;\n }\n\n set(key: K, tree: BTreeSet<K>): null | BNode<K> {\n const c = this.children;\n const cmp = tree.comparator;\n let i = Math.min(indexOf(key, this.keys, 0, cmp), c.length - 1);\n let child = c[i];\n\n if (child.isShared) {\n c[i] = child = child.clone();\n }\n if (child.keys.length >= MAX_NODE_SIZE) {\n // child is full; inserting anything else will cause a split.\n // Shifting an item to the left or right sibling may avoid a split.\n // We can do a shift if the adjacent node is not full and if the\n // current key can still be placed in the same node after the shift.\n let other: BNode<K>;\n if (\n i > 0 &&\n (other = c[i - 1]).keys.length < MAX_NODE_SIZE &&\n cmp(child.keys[0], key) < 0\n ) {\n if (other.isShared) {\n c[i - 1] = other = other.clone();\n }\n other.takeFromRight(child);\n this.keys[i - 1] = other.maxKey();\n } else if (\n (other = c[i + 1]) !== undefined &&\n other.keys.length < MAX_NODE_SIZE &&\n cmp(child.maxKey(), key) < 0\n ) {\n if (other.isShared) c[i + 1] = other = other.clone();\n other.takeFromLeft(child);\n this.keys[i] = c[i].maxKey();\n }\n }\n\n const result = child.set(key, tree);\n this.keys[i] = child.maxKey();\n if (result === null) return null;\n\n // The child has split and `result` is a new right child... does it fit?\n if (this.keys.length < MAX_NODE_SIZE) {\n // yes\n this.insert(i + 1, result);\n return null;\n }\n // no, we must split also\n const newRightSibling = this.splitOffRightSide();\n // oxlint-disable-next-line @typescript-eslint/no-this-alias\n let target: BNodeInternal<K> = this;\n if (cmp(result.maxKey(), this.maxKey()) > 0) {\n target = newRightSibling;\n i -= this.keys.length;\n }\n target.insert(i + 1, result);\n return newRightSibling;\n }\n\n /**\n * Inserts `child` at index `i`.\n * This does not mark `child` as shared, so it is the responsibility of the caller\n * to ensure that either child is marked shared, or it is not included in another tree.\n */\n insert(i: number, child: BNode<K>) {\n this.children.splice(i, 0, child);\n this.keys.splice(i, 0, child.maxKey());\n }\n\n /**\n * Split this node.\n * Modifies this to remove the second half of the items, returning a separate node containing them.\n */\n splitOffRightSide() {\n const half = this.children.length >> 1;\n return new BNodeInternal<K>(\n this.children.splice(half),\n this.keys.splice(half),\n );\n }\n\n takeFromRight(rhs: BNode<K>) {\n this.keys.push(rhs.keys.shift()!);\n this.children.push((rhs as BNodeInternal<K>).children.shift()!);\n }\n\n takeFromLeft(lhs: BNode<K>) {\n this.keys.unshift(lhs.keys.pop()!);\n this.children.unshift((lhs as BNodeInternal<K>).children.pop()!);\n }\n\n delete(key: K, tree: BTreeSet<K>): boolean {\n const cmp = tree.comparator;\n const {keys} = this;\n const {children} = this;\n let iLow = indexOf(key, this.keys, 0, cmp);\n let i = iLow;\n const iHigh = Math.min(iLow, keys.length - 1);\n if (i <= iHigh) {\n try {\n if (children[i].isShared) {\n children[i] = children[i].clone();\n }\n const result = children[i].delete(key, tree);\n // Note: if children[i] is empty then keys[i]=undefined.\n // This is an invalid state, but it is fixed below.\n keys[i] = children[i].maxKey();\n return result;\n } finally {\n // Deletions may have occurred, so look for opportunities to merge nodes.\n const half = MAX_NODE_SIZE >> 1;\n if (iLow > 0) iLow--;\n for (i = iHigh; i >= iLow; i--) {\n if (children[i].keys.length <= half) {\n if (children[i].keys.length !== 0) {\n this.tryMerge(i, MAX_NODE_SIZE);\n } else {\n // child is empty! delete it!\n keys.splice(i, 1);\n children.splice(i, 1);\n }\n }\n }\n }\n }\n return false;\n }\n\n /** Merges child i with child i+1 if their combined size is not too large */\n tryMerge(i: number, maxSize: number): boolean {\n const {children} = this;\n if (i >= 0 && i + 1 < children.length) {\n if (children[i].keys.length + children[i + 1].keys.length <= maxSize) {\n if (children[i].isShared)\n // cloned already UNLESS i is outside scan range\n children[i] = children[i].clone();\n children[i].mergeSibling(children[i + 1], maxSize);\n children.splice(i + 1, 1);\n this.keys.splice(i + 1, 1);\n this.keys[i] = children[i].maxKey();\n return true;\n }\n }\n return false;\n }\n\n /**\n * Move children from `rhs` into this.\n * `rhs` must be part of this tree, and be removed from it after this call\n * (otherwise isShared for its children could be incorrect).\n */\n mergeSibling(rhs: BNode<K>, maxNodeSize: number) {\n // assert !this.isShared;\n const oldLength = this.keys.length;\n this.keys.push(...rhs.keys);\n const rhsChildren = (rhs as unknown as BNodeInternal<K>).children;\n this.children.push(...rhsChildren);\n\n if (rhs.isShared && !this.isShared) {\n // All children of a shared node are implicitly shared, and since their new\n // parent is not shared, they must now be explicitly marked as shared.\n for (let i = 0; i < rhsChildren.length; i++) {\n rhsChildren[i].isShared = true;\n }\n }\n\n // If our children are themselves almost empty due to a mass-delete,\n // they may need to be merged too (but only the oldLength-1 and its\n // right sibling should need this).\n this.tryMerge(oldLength - 1, maxNodeSize);\n }\n}\n\n// If key not found, returns i^failXor where i is the insertion index.\n// Callers that don't care whether there was a match will set failXor=0.\nfunction indexOf<K>(\n key: K,\n keys: K[],\n failXor: number,\n comparator: Comparator<K>,\n): number {\n let lo = 0;\n let hi = keys.length;\n let mid = hi >> 1;\n while (lo < hi) {\n const c = comparator(keys[mid], key);\n if (c < 0) {\n lo = mid + 1;\n } else if (c > 0) {\n // key < keys[mid]\n hi = mid;\n } else if (c === 0) {\n return mid;\n } else {\n // c is NaN or otherwise invalid\n if (key === key) {\n // at least the search key is not NaN\n return keys.length;\n }\n throw new Error('NaN was used as a key');\n }\n mid = (lo + hi) >> 1;\n }\n return mid ^ failXor;\n}\n\n// oxlint-disable-next-line @typescript-eslint/no-explicit-any\nconst emptyLeaf = new BNode<any>([]);\nemptyLeaf.isShared = true;\n"],"names":["key"],"mappings":"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"}
|
|
@@ -103,7 +103,7 @@ function parseOptionsAdvanced(appOptions, opts = {}) {
|
|
|
103
103
|
if (terminalTypes.size > 1) {
|
|
104
104
|
throw new TypeError(`${env} has mixed types ${[...terminalTypes]}`);
|
|
105
105
|
}
|
|
106
|
-
assert(terminalTypes.size === 1);
|
|
106
|
+
assert(terminalTypes.size === 1, "Expected exactly one terminal type");
|
|
107
107
|
const terminalType = [...terminalTypes][0];
|
|
108
108
|
if (processEnv[env]) {
|
|
109
109
|
if (multiple) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"options.js","sources":["../../../../shared/src/options.ts"],"sourcesContent":["import type {OptionalLogger} from '@rocicorp/logger';\nimport {template} from 'chalk-template';\nimport type {OptionDefinition} from 'command-line-args';\nimport commandLineArgs from 'command-line-args';\nimport commandLineUsage, {type Section} from 'command-line-usage';\nimport {createDefu} from 'defu';\nimport {toKebabCase, toSnakeCase} from 'kasi';\nimport {stripVTControlCharacters as stripAnsi} from 'node:util';\nimport {assert} from './asserts.ts';\nimport {must} from './must.ts';\nimport type {\n Config,\n Group,\n Option,\n Options,\n WrappedOptionType,\n} from './options-types.ts';\nimport * as v from './valita.ts';\n\nexport type {Config, Group, Option, Options, WrappedOptionType};\n\ntype Primitive = number | string | boolean;\ntype Value = Primitive | Array<Primitive>;\n\ntype RequiredOptionType =\n | v.Type<string>\n | v.Type<number>\n | v.Type<boolean>\n | v.Type<string[]>\n | v.Type<number[]>\n | v.Type<boolean[]>;\n\ntype OptionalOptionType =\n | v.Optional<string>\n | v.Optional<number>\n | v.Optional<boolean>\n | v.Optional<string[]>\n | v.Optional<number[]>\n | v.Optional<boolean[]>;\n\ntype OptionType = RequiredOptionType | OptionalOptionType;\n\n/**\n * Creates a defu instance that overrides arrays instead of merging them.\n */\nconst defu = createDefu((obj, key, value) => {\n if (!Array.isArray(value)) return;\n\n obj[key] = value;\n return true;\n});\n\n/**\n * Converts an Options instance into its corresponding {@link Config} schema.\n */\nfunction configSchema<T extends Options>(\n options: T,\n envNamePrefix: string,\n): v.Type<Config<T>> {\n function makeObjectType(options: Options | Group, group?: string) {\n return v.object(\n Object.fromEntries(\n Object.entries(options).map(\n ([name, value]): [string, OptionType | v.Type] => {\n const addErrorMessage = (t: OptionType) => {\n const {required} = getRequiredOrDefault(t);\n if (required) {\n // Adds an error message for required options that includes the\n // actual name of the option.\n const optionName = toSnakeCase(\n `${envNamePrefix}${group ? group + '_' : ''}${name}`,\n ).toUpperCase();\n return (t as v.Type<string>)\n .optional()\n .assert(\n val => val !== undefined,\n `Missing required option ${optionName}`,\n );\n }\n return t;\n };\n // OptionType\n if (v.instanceOfAbstractType(value)) {\n return [name, addErrorMessage(value)];\n }\n // WrappedOptionType\n const {type} = value;\n if (v.instanceOfAbstractType(type)) {\n return [name, addErrorMessage(type)];\n }\n // OptionGroup\n return [name, makeObjectType(value as Group, name)];\n },\n ),\n ),\n );\n }\n return makeObjectType(options) as v.Type<Config<T>>;\n}\n\n/**\n * Converts an Options instance into an \"env schema\", which is an object with\n * ENV names as its keys, mapped to optional or required string values\n * (corresponding to the optionality of the corresponding options).\n *\n * This is used as a format for encoding options for a multi-tenant version\n * of an app, with an envSchema for each tenant.\n */\nexport function envSchema<T extends Options>(options: T, envNamePrefix = '') {\n const fields: [string, v.Type<string> | v.Optional<string>][] = [];\n\n function addField(name: string, type: OptionType, group?: string) {\n const flag = group ? `${group}_${name}` : name;\n const env = toSnakeCase(`${envNamePrefix}${flag}`).toUpperCase();\n\n const {required} = getRequiredOrDefault(type);\n fields.push([env, required ? v.string() : v.string().optional()]);\n }\n\n function addFields(o: Options | Group, group?: string) {\n Object.entries(o).forEach(([name, value]) => {\n // OptionType\n if (v.instanceOfAbstractType(value)) {\n addField(name, value, group);\n return;\n }\n // WrappedOptionType\n const {type} = value;\n if (v.instanceOfAbstractType(type)) {\n addField(name, type, group);\n return;\n }\n // OptionGroup\n addFields(value as Group, name);\n });\n }\n\n addFields(options);\n\n return v.object(Object.fromEntries(fields));\n}\n\n// type TerminalType is not exported from badrap/valita\ntype TerminalType = Parameters<\n Parameters<v.Type<unknown>['toTerminals']>[0]\n>[0];\n\nfunction getRequiredOrDefault(type: OptionType) {\n const defaultResult = v.testOptional<Value>(undefined, type);\n return {\n required: !defaultResult.ok,\n defaultValue: defaultResult.ok ? defaultResult.value : undefined,\n };\n}\n\nexport type ParseOptions = {\n /** Defaults to process.argv.slice(2) */\n argv?: string[];\n\n envNamePrefix?: string;\n\n description?: {header: string; content: string}[];\n\n /** Defaults to `false` */\n allowUnknown?: boolean;\n\n /** Defaults to `false` */\n allowPartial?: boolean;\n\n /** Defaults to `process.env`. */\n env?: NodeJS.ProcessEnv;\n\n /** Defaults to `true`. */\n emitDeprecationWarnings?: boolean;\n\n /** Defaults to `true`. When false, excludes default values from both config and env return values. */\n includeDefaults?: boolean;\n\n /** Defaults to `console` */\n logger?: OptionalLogger;\n\n /** Defaults to `process.exit` */\n exit?: (code?: number | string | null) => never;\n};\n\nexport function parseOptions<T extends Options>(\n appOptions: T,\n opts: ParseOptions = {},\n): Config<T> {\n return parseOptionsAdvanced(appOptions, opts).config;\n}\n\nexport function parseOptionsAdvanced<T extends Options>(\n appOptions: T,\n opts: ParseOptions = {},\n): {config: Config<T>; env: Record<string, string>; unknown?: string[]} {\n const {\n argv = process.argv.slice(2),\n envNamePrefix = '',\n description = [],\n allowUnknown = false,\n allowPartial = false,\n env: processEnv = process.env,\n emitDeprecationWarnings = true,\n includeDefaults = true,\n logger = console,\n exit = process.exit,\n } = opts;\n // The main logic for converting a valita Type spec to an Option (i.e. flag) spec.\n function addOption(field: string, option: WrappedOptionType, group?: string) {\n const {type, desc = [], deprecated, alias, hidden} = option;\n\n // The group name is prepended to the flag name.\n const flag = group ? toKebabCase(`${group}-${field}`) : toKebabCase(field);\n\n const {required, defaultValue} = getRequiredOrDefault(type);\n let multiple = type.name === 'array';\n const literals = new Set<string>();\n const terminalTypes = new Set<string>();\n\n type.toTerminals(getTerminalTypes);\n\n function getTerminalTypes(t: TerminalType) {\n switch (t.name) {\n case 'undefined':\n case 'optional':\n break;\n case 'array': {\n multiple = true;\n t.prefix.forEach(t => t.toTerminals(getTerminalTypes));\n t.rest?.toTerminals(getTerminalTypes);\n t.suffix.forEach(t => t.toTerminals(getTerminalTypes));\n break;\n }\n case 'literal':\n literals.add(String(t.value));\n terminalTypes.add(typeof t.value);\n break;\n default:\n terminalTypes.add(t.name);\n break;\n }\n }\n const env = toSnakeCase(`${envNamePrefix}${flag}`).toUpperCase();\n if (terminalTypes.size > 1) {\n throw new TypeError(`${env} has mixed types ${[...terminalTypes]}`);\n }\n assert(terminalTypes.size === 1);\n const terminalType = [...terminalTypes][0];\n\n if (processEnv[env]) {\n if (multiple) {\n // Technically not water-tight; assumes values for the string[] flag don't contain commas.\n envArgv.push(`--${flag}`, ...processEnv[env].split(','));\n } else {\n envArgv.push(`--${flag}`, processEnv[env]);\n }\n }\n names.set(flag, {field, env});\n\n const spec = [\n (required\n ? '{italic required}'\n : defaultValue !== undefined\n ? `default: ${JSON.stringify(defaultValue)}`\n : 'optional') + '\\n',\n ];\n if (desc) {\n spec.push(...desc);\n }\n\n const typeLabel = [\n literals.size\n ? String([...literals].map(l => `{underline ${l}}`))\n : multiple\n ? `{underline ${terminalType}[]}`\n : `{underline ${terminalType}}`,\n ` ${env} env`,\n ];\n\n const opt = {\n name: flag,\n alias,\n type: valueParser(\n env,\n terminalType,\n logger,\n emitDeprecationWarnings ? deprecated : undefined,\n ),\n multiple,\n group,\n description: spec.join('\\n') + '\\n',\n typeLabel: typeLabel.join('\\n') + '\\n',\n hidden: hidden === undefined ? deprecated !== undefined : hidden,\n };\n optsWithoutDefaults.push(opt);\n optsWithDefaults.push({...opt, defaultValue});\n }\n\n const names = new Map<string, {field: string; env: string}>();\n const optsWithDefaults: DescribedOptionDefinition[] = [];\n const optsWithoutDefaults: DescribedOptionDefinition[] = [];\n const envArgv: string[] = [];\n\n try {\n for (const [name, val] of Object.entries(appOptions)) {\n const {type} = val as {type: unknown};\n if (v.instanceOfAbstractType(val)) {\n addOption(name, {type: val});\n } else if (v.instanceOfAbstractType(type)) {\n addOption(name, val as WrappedOptionType);\n } else {\n const group = name;\n for (const [name, option] of Object.entries(val as Group)) {\n const wrapped = v.instanceOfAbstractType(option)\n ? {type: option}\n : option;\n addOption(name, wrapped, group);\n }\n }\n }\n\n const [defaults, env1, unknown] = parseArgs(optsWithDefaults, argv, names);\n const [fromEnv, env2] = parseArgs(optsWithoutDefaults, envArgv, names);\n const [withoutDefaults, env3] = parseArgs(optsWithoutDefaults, argv, names);\n\n switch (unknown?.[0]) {\n case undefined:\n break;\n case '--help':\n case '-h':\n showUsage(optsWithDefaults, description, logger);\n exit(0);\n break;\n default:\n if (!allowUnknown) {\n logger.error?.('Invalid arguments:', unknown);\n showUsage(optsWithDefaults, description, logger);\n exit(0);\n }\n break;\n }\n\n const parsedArgs = includeDefaults\n ? defu(withoutDefaults, fromEnv, defaults)\n : defu(withoutDefaults, fromEnv);\n const env = includeDefaults\n ? {...env1, ...env2, ...env3}\n : {...env2, ...env3};\n\n let schema = configSchema(appOptions, envNamePrefix);\n if (allowPartial || !includeDefaults) {\n // TODO: Type configSchema() to return a v.ObjectType<...>\n schema = v.deepPartial(schema as v.ObjectType) as v.Type<Config<T>>;\n }\n return {\n config: v.parse(parsedArgs, schema),\n env,\n ...(unknown ? {unknown} : {}),\n };\n } catch (e) {\n logger.error?.(String(e));\n showUsage(optsWithDefaults, description, logger);\n throw e;\n }\n}\n\nfunction valueParser(\n optionName: string,\n typeName: string,\n logger: OptionalLogger,\n deprecated: string[] | undefined,\n) {\n return (input: string) => {\n if (deprecated) {\n logger.warn?.(\n template(\n `\\n${optionName} is deprecated:\\n` + deprecated.join('\\n') + '\\n',\n ),\n );\n }\n switch (typeName) {\n case 'string':\n return input;\n case 'boolean':\n return parseBoolean(optionName, input);\n case 'number': {\n const val = Number(input);\n if (Number.isNaN(val)) {\n throw new TypeError(`Invalid input for ${optionName}: \"${input}\"`);\n }\n return val;\n }\n default:\n // Should be impossible given the constraints of `Option`\n throw new TypeError(\n `${optionName} option has unsupported type ${typeName}`,\n );\n }\n };\n}\n\nfunction parseArgs(\n optionDefs: DescribedOptionDefinition[],\n argv: string[],\n names: Map<string, {field: string; env: string}>,\n) {\n function normalizeFlagValue(value: unknown) {\n // A --flag without value is parsed by commandLineArgs() to `null`,\n // but this is a common convention to set a boolean flag to true.\n return value === null ? true : value;\n }\n\n const {\n _all,\n _none: ungrouped,\n _unknown: unknown,\n ...config\n } = commandLineArgs(optionDefs, {\n argv,\n partial: true,\n });\n\n // oxlint-disable-next-line @typescript-eslint/no-explicit-any\n const result: Record<string, any> = {};\n const envObj: Record<string, string> = {};\n\n function addFlag(flagName: string, value: unknown, group?: string) {\n const {field, env} = must(names.get(flagName));\n const normalized = normalizeFlagValue(value);\n if (group) {\n result[group][field] = normalized;\n } else {\n result[field] = normalized;\n }\n envObj[env] = String(normalized);\n }\n\n for (const [flagName, value] of Object.entries(ungrouped ?? {})) {\n addFlag(flagName, value);\n }\n\n // Then handle (potentially) grouped flags\n for (const [name, value] of Object.entries(config)) {\n if (typeof value !== 'object' || value === null || Array.isArray(value)) {\n addFlag(name, value); // Flag, not a group\n } else {\n const group = name;\n result[group] = {};\n for (const [flagName, flagValue] of Object.entries(value)) {\n addFlag(flagName, flagValue, group);\n }\n }\n }\n\n return [result, envObj, unknown] as const;\n}\n\nexport function flagToEnv(prefix: string, flag: string): string {\n return toSnakeCase(prefix + flag).toUpperCase();\n}\n\nexport function parseBoolean(optionName: string, input: string) {\n const bool = input.toLowerCase();\n if (['true', '1'].includes(bool)) {\n return true;\n } else if (['false', '0'].includes(bool)) {\n return false;\n }\n throw new TypeError(`Invalid input for ${optionName}: \"${input}\"`);\n}\n\nfunction showUsage(\n optionList: DescribedOptionDefinition[],\n description: {header: string; content: string}[] = [],\n logger: OptionalLogger = console,\n) {\n const hide: string[] = [];\n let leftWidth = 35;\n let rightWidth = 70;\n optionList.forEach(({name, typeLabel, description, hidden}) => {\n if (hidden) {\n hide.push(name);\n }\n const text = template(`${name} ${typeLabel ?? ''}`);\n const lines = stripAnsi(text).split('\\n');\n for (const l of lines) {\n leftWidth = Math.max(leftWidth, l.length + 2);\n }\n const desc = stripAnsi(template(description ?? '')).split('\\n');\n for (const l of desc) {\n rightWidth = Math.max(rightWidth, l.length + 2);\n }\n });\n\n const sections: Section[] = [\n {\n optionList,\n reverseNameOrder: true, // Display --flag-name before -alias\n hide,\n tableOptions: {\n columns: [\n {name: 'option', width: leftWidth},\n {name: 'description', width: rightWidth},\n ],\n noTrim: true,\n },\n },\n ];\n\n if (description) {\n sections.unshift(...description);\n }\n\n logger.info?.(commandLineUsage(sections));\n}\n\ntype DescribedOptionDefinition = OptionDefinition & {\n // Additional fields recognized by command-line-usage\n description?: string;\n typeLabel?: string | undefined;\n hidden?: boolean | undefined;\n};\n"],"names":["options","v.object","v.instanceOfAbstractType","v.testOptional","t","name","v.deepPartial","v.parse","description","stripAnsi"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"options.js","sources":["../../../../shared/src/options.ts"],"sourcesContent":["import type {OptionalLogger} from '@rocicorp/logger';\nimport {template} from 'chalk-template';\nimport type {OptionDefinition} from 'command-line-args';\nimport commandLineArgs from 'command-line-args';\nimport commandLineUsage, {type Section} from 'command-line-usage';\nimport {createDefu} from 'defu';\nimport {toKebabCase, toSnakeCase} from 'kasi';\nimport {stripVTControlCharacters as stripAnsi} from 'node:util';\nimport {assert} from './asserts.ts';\nimport {must} from './must.ts';\nimport type {\n Config,\n Group,\n Option,\n Options,\n WrappedOptionType,\n} from './options-types.ts';\nimport * as v from './valita.ts';\n\nexport type {Config, Group, Option, Options, WrappedOptionType};\n\ntype Primitive = number | string | boolean;\ntype Value = Primitive | Array<Primitive>;\n\ntype RequiredOptionType =\n | v.Type<string>\n | v.Type<number>\n | v.Type<boolean>\n | v.Type<string[]>\n | v.Type<number[]>\n | v.Type<boolean[]>;\n\ntype OptionalOptionType =\n | v.Optional<string>\n | v.Optional<number>\n | v.Optional<boolean>\n | v.Optional<string[]>\n | v.Optional<number[]>\n | v.Optional<boolean[]>;\n\ntype OptionType = RequiredOptionType | OptionalOptionType;\n\n/**\n * Creates a defu instance that overrides arrays instead of merging them.\n */\nconst defu = createDefu((obj, key, value) => {\n if (!Array.isArray(value)) return;\n\n obj[key] = value;\n return true;\n});\n\n/**\n * Converts an Options instance into its corresponding {@link Config} schema.\n */\nfunction configSchema<T extends Options>(\n options: T,\n envNamePrefix: string,\n): v.Type<Config<T>> {\n function makeObjectType(options: Options | Group, group?: string) {\n return v.object(\n Object.fromEntries(\n Object.entries(options).map(\n ([name, value]): [string, OptionType | v.Type] => {\n const addErrorMessage = (t: OptionType) => {\n const {required} = getRequiredOrDefault(t);\n if (required) {\n // Adds an error message for required options that includes the\n // actual name of the option.\n const optionName = toSnakeCase(\n `${envNamePrefix}${group ? group + '_' : ''}${name}`,\n ).toUpperCase();\n return (t as v.Type<string>)\n .optional()\n .assert(\n val => val !== undefined,\n `Missing required option ${optionName}`,\n );\n }\n return t;\n };\n // OptionType\n if (v.instanceOfAbstractType(value)) {\n return [name, addErrorMessage(value)];\n }\n // WrappedOptionType\n const {type} = value;\n if (v.instanceOfAbstractType(type)) {\n return [name, addErrorMessage(type)];\n }\n // OptionGroup\n return [name, makeObjectType(value as Group, name)];\n },\n ),\n ),\n );\n }\n return makeObjectType(options) as v.Type<Config<T>>;\n}\n\n/**\n * Converts an Options instance into an \"env schema\", which is an object with\n * ENV names as its keys, mapped to optional or required string values\n * (corresponding to the optionality of the corresponding options).\n *\n * This is used as a format for encoding options for a multi-tenant version\n * of an app, with an envSchema for each tenant.\n */\nexport function envSchema<T extends Options>(options: T, envNamePrefix = '') {\n const fields: [string, v.Type<string> | v.Optional<string>][] = [];\n\n function addField(name: string, type: OptionType, group?: string) {\n const flag = group ? `${group}_${name}` : name;\n const env = toSnakeCase(`${envNamePrefix}${flag}`).toUpperCase();\n\n const {required} = getRequiredOrDefault(type);\n fields.push([env, required ? v.string() : v.string().optional()]);\n }\n\n function addFields(o: Options | Group, group?: string) {\n Object.entries(o).forEach(([name, value]) => {\n // OptionType\n if (v.instanceOfAbstractType(value)) {\n addField(name, value, group);\n return;\n }\n // WrappedOptionType\n const {type} = value;\n if (v.instanceOfAbstractType(type)) {\n addField(name, type, group);\n return;\n }\n // OptionGroup\n addFields(value as Group, name);\n });\n }\n\n addFields(options);\n\n return v.object(Object.fromEntries(fields));\n}\n\n// type TerminalType is not exported from badrap/valita\ntype TerminalType = Parameters<\n Parameters<v.Type<unknown>['toTerminals']>[0]\n>[0];\n\nfunction getRequiredOrDefault(type: OptionType) {\n const defaultResult = v.testOptional<Value>(undefined, type);\n return {\n required: !defaultResult.ok,\n defaultValue: defaultResult.ok ? defaultResult.value : undefined,\n };\n}\n\nexport type ParseOptions = {\n /** Defaults to process.argv.slice(2) */\n argv?: string[];\n\n envNamePrefix?: string;\n\n description?: {header: string; content: string}[];\n\n /** Defaults to `false` */\n allowUnknown?: boolean;\n\n /** Defaults to `false` */\n allowPartial?: boolean;\n\n /** Defaults to `process.env`. */\n env?: NodeJS.ProcessEnv;\n\n /** Defaults to `true`. */\n emitDeprecationWarnings?: boolean;\n\n /** Defaults to `true`. When false, excludes default values from both config and env return values. */\n includeDefaults?: boolean;\n\n /** Defaults to `console` */\n logger?: OptionalLogger;\n\n /** Defaults to `process.exit` */\n exit?: (code?: number | string | null) => never;\n};\n\nexport function parseOptions<T extends Options>(\n appOptions: T,\n opts: ParseOptions = {},\n): Config<T> {\n return parseOptionsAdvanced(appOptions, opts).config;\n}\n\nexport function parseOptionsAdvanced<T extends Options>(\n appOptions: T,\n opts: ParseOptions = {},\n): {config: Config<T>; env: Record<string, string>; unknown?: string[]} {\n const {\n argv = process.argv.slice(2),\n envNamePrefix = '',\n description = [],\n allowUnknown = false,\n allowPartial = false,\n env: processEnv = process.env,\n emitDeprecationWarnings = true,\n includeDefaults = true,\n logger = console,\n exit = process.exit,\n } = opts;\n // The main logic for converting a valita Type spec to an Option (i.e. flag) spec.\n function addOption(field: string, option: WrappedOptionType, group?: string) {\n const {type, desc = [], deprecated, alias, hidden} = option;\n\n // The group name is prepended to the flag name.\n const flag = group ? toKebabCase(`${group}-${field}`) : toKebabCase(field);\n\n const {required, defaultValue} = getRequiredOrDefault(type);\n let multiple = type.name === 'array';\n const literals = new Set<string>();\n const terminalTypes = new Set<string>();\n\n type.toTerminals(getTerminalTypes);\n\n function getTerminalTypes(t: TerminalType) {\n switch (t.name) {\n case 'undefined':\n case 'optional':\n break;\n case 'array': {\n multiple = true;\n t.prefix.forEach(t => t.toTerminals(getTerminalTypes));\n t.rest?.toTerminals(getTerminalTypes);\n t.suffix.forEach(t => t.toTerminals(getTerminalTypes));\n break;\n }\n case 'literal':\n literals.add(String(t.value));\n terminalTypes.add(typeof t.value);\n break;\n default:\n terminalTypes.add(t.name);\n break;\n }\n }\n const env = toSnakeCase(`${envNamePrefix}${flag}`).toUpperCase();\n if (terminalTypes.size > 1) {\n throw new TypeError(`${env} has mixed types ${[...terminalTypes]}`);\n }\n assert(terminalTypes.size === 1, 'Expected exactly one terminal type');\n const terminalType = [...terminalTypes][0];\n\n if (processEnv[env]) {\n if (multiple) {\n // Technically not water-tight; assumes values for the string[] flag don't contain commas.\n envArgv.push(`--${flag}`, ...processEnv[env].split(','));\n } else {\n envArgv.push(`--${flag}`, processEnv[env]);\n }\n }\n names.set(flag, {field, env});\n\n const spec = [\n (required\n ? '{italic required}'\n : defaultValue !== undefined\n ? `default: ${JSON.stringify(defaultValue)}`\n : 'optional') + '\\n',\n ];\n if (desc) {\n spec.push(...desc);\n }\n\n const typeLabel = [\n literals.size\n ? String([...literals].map(l => `{underline ${l}}`))\n : multiple\n ? `{underline ${terminalType}[]}`\n : `{underline ${terminalType}}`,\n ` ${env} env`,\n ];\n\n const opt = {\n name: flag,\n alias,\n type: valueParser(\n env,\n terminalType,\n logger,\n emitDeprecationWarnings ? deprecated : undefined,\n ),\n multiple,\n group,\n description: spec.join('\\n') + '\\n',\n typeLabel: typeLabel.join('\\n') + '\\n',\n hidden: hidden === undefined ? deprecated !== undefined : hidden,\n };\n optsWithoutDefaults.push(opt);\n optsWithDefaults.push({...opt, defaultValue});\n }\n\n const names = new Map<string, {field: string; env: string}>();\n const optsWithDefaults: DescribedOptionDefinition[] = [];\n const optsWithoutDefaults: DescribedOptionDefinition[] = [];\n const envArgv: string[] = [];\n\n try {\n for (const [name, val] of Object.entries(appOptions)) {\n const {type} = val as {type: unknown};\n if (v.instanceOfAbstractType(val)) {\n addOption(name, {type: val});\n } else if (v.instanceOfAbstractType(type)) {\n addOption(name, val as WrappedOptionType);\n } else {\n const group = name;\n for (const [name, option] of Object.entries(val as Group)) {\n const wrapped = v.instanceOfAbstractType(option)\n ? {type: option}\n : option;\n addOption(name, wrapped, group);\n }\n }\n }\n\n const [defaults, env1, unknown] = parseArgs(optsWithDefaults, argv, names);\n const [fromEnv, env2] = parseArgs(optsWithoutDefaults, envArgv, names);\n const [withoutDefaults, env3] = parseArgs(optsWithoutDefaults, argv, names);\n\n switch (unknown?.[0]) {\n case undefined:\n break;\n case '--help':\n case '-h':\n showUsage(optsWithDefaults, description, logger);\n exit(0);\n break;\n default:\n if (!allowUnknown) {\n logger.error?.('Invalid arguments:', unknown);\n showUsage(optsWithDefaults, description, logger);\n exit(0);\n }\n break;\n }\n\n const parsedArgs = includeDefaults\n ? defu(withoutDefaults, fromEnv, defaults)\n : defu(withoutDefaults, fromEnv);\n const env = includeDefaults\n ? {...env1, ...env2, ...env3}\n : {...env2, ...env3};\n\n let schema = configSchema(appOptions, envNamePrefix);\n if (allowPartial || !includeDefaults) {\n // TODO: Type configSchema() to return a v.ObjectType<...>\n schema = v.deepPartial(schema as v.ObjectType) as v.Type<Config<T>>;\n }\n return {\n config: v.parse(parsedArgs, schema),\n env,\n ...(unknown ? {unknown} : {}),\n };\n } catch (e) {\n logger.error?.(String(e));\n showUsage(optsWithDefaults, description, logger);\n throw e;\n }\n}\n\nfunction valueParser(\n optionName: string,\n typeName: string,\n logger: OptionalLogger,\n deprecated: string[] | undefined,\n) {\n return (input: string) => {\n if (deprecated) {\n logger.warn?.(\n template(\n `\\n${optionName} is deprecated:\\n` + deprecated.join('\\n') + '\\n',\n ),\n );\n }\n switch (typeName) {\n case 'string':\n return input;\n case 'boolean':\n return parseBoolean(optionName, input);\n case 'number': {\n const val = Number(input);\n if (Number.isNaN(val)) {\n throw new TypeError(`Invalid input for ${optionName}: \"${input}\"`);\n }\n return val;\n }\n default:\n // Should be impossible given the constraints of `Option`\n throw new TypeError(\n `${optionName} option has unsupported type ${typeName}`,\n );\n }\n };\n}\n\nfunction parseArgs(\n optionDefs: DescribedOptionDefinition[],\n argv: string[],\n names: Map<string, {field: string; env: string}>,\n) {\n function normalizeFlagValue(value: unknown) {\n // A --flag without value is parsed by commandLineArgs() to `null`,\n // but this is a common convention to set a boolean flag to true.\n return value === null ? true : value;\n }\n\n const {\n _all,\n _none: ungrouped,\n _unknown: unknown,\n ...config\n } = commandLineArgs(optionDefs, {\n argv,\n partial: true,\n });\n\n // oxlint-disable-next-line @typescript-eslint/no-explicit-any\n const result: Record<string, any> = {};\n const envObj: Record<string, string> = {};\n\n function addFlag(flagName: string, value: unknown, group?: string) {\n const {field, env} = must(names.get(flagName));\n const normalized = normalizeFlagValue(value);\n if (group) {\n result[group][field] = normalized;\n } else {\n result[field] = normalized;\n }\n envObj[env] = String(normalized);\n }\n\n for (const [flagName, value] of Object.entries(ungrouped ?? {})) {\n addFlag(flagName, value);\n }\n\n // Then handle (potentially) grouped flags\n for (const [name, value] of Object.entries(config)) {\n if (typeof value !== 'object' || value === null || Array.isArray(value)) {\n addFlag(name, value); // Flag, not a group\n } else {\n const group = name;\n result[group] = {};\n for (const [flagName, flagValue] of Object.entries(value)) {\n addFlag(flagName, flagValue, group);\n }\n }\n }\n\n return [result, envObj, unknown] as const;\n}\n\nexport function flagToEnv(prefix: string, flag: string): string {\n return toSnakeCase(prefix + flag).toUpperCase();\n}\n\nexport function parseBoolean(optionName: string, input: string) {\n const bool = input.toLowerCase();\n if (['true', '1'].includes(bool)) {\n return true;\n } else if (['false', '0'].includes(bool)) {\n return false;\n }\n throw new TypeError(`Invalid input for ${optionName}: \"${input}\"`);\n}\n\nfunction showUsage(\n optionList: DescribedOptionDefinition[],\n description: {header: string; content: string}[] = [],\n logger: OptionalLogger = console,\n) {\n const hide: string[] = [];\n let leftWidth = 35;\n let rightWidth = 70;\n optionList.forEach(({name, typeLabel, description, hidden}) => {\n if (hidden) {\n hide.push(name);\n }\n const text = template(`${name} ${typeLabel ?? ''}`);\n const lines = stripAnsi(text).split('\\n');\n for (const l of lines) {\n leftWidth = Math.max(leftWidth, l.length + 2);\n }\n const desc = stripAnsi(template(description ?? '')).split('\\n');\n for (const l of desc) {\n rightWidth = Math.max(rightWidth, l.length + 2);\n }\n });\n\n const sections: Section[] = [\n {\n optionList,\n reverseNameOrder: true, // Display --flag-name before -alias\n hide,\n tableOptions: {\n columns: [\n {name: 'option', width: leftWidth},\n {name: 'description', width: rightWidth},\n ],\n noTrim: true,\n },\n },\n ];\n\n if (description) {\n sections.unshift(...description);\n }\n\n logger.info?.(commandLineUsage(sections));\n}\n\ntype DescribedOptionDefinition = OptionDefinition & {\n // Additional fields recognized by command-line-usage\n description?: string;\n typeLabel?: string | undefined;\n hidden?: boolean | undefined;\n};\n"],"names":["options","v.object","v.instanceOfAbstractType","v.testOptional","t","name","v.deepPartial","v.parse","description","stripAnsi"],"mappings":"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"}
|
package/out/shared/src/queue.js
CHANGED
|
@@ -33,7 +33,7 @@ class Queue {
|
|
|
33
33
|
* @returns The number of entries deleted.
|
|
34
34
|
*/
|
|
35
35
|
delete(value) {
|
|
36
|
-
assert(value !== void 0);
|
|
36
|
+
assert(value !== void 0, "Queue delete value must not be undefined");
|
|
37
37
|
let count = 0;
|
|
38
38
|
for (let i = this.#produced.length - 1; i >= 0; i--) {
|
|
39
39
|
const p = this.#produced[i];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue.js","sources":["../../../../shared/src/queue.ts"],"sourcesContent":["import {resolver, type Resolver} from '@rocicorp/resolver';\nimport {assert} from './asserts.ts';\n\n/**\n * A Queue allows the consumers to await (possibly future) values,\n * and producers to await the consumption of their values.\n */\nexport class Queue<T> {\n // Consumers waiting for entries to be produced.\n readonly #consumers: Consumer<T>[] = [];\n // Produced entries waiting to be consumed.\n readonly #produced: Produced<T>[] = [];\n\n enqueue(value: T): void {\n const consumer = this.#consumers.shift();\n if (consumer) {\n consumer.resolver.resolve(value);\n clearTimeout(consumer.timeoutID);\n return;\n }\n this.#produced.push({value});\n }\n\n enqueueRejection(reason?: unknown): void {\n const consumer = this.#consumers.shift();\n if (consumer) {\n consumer.resolver.reject(reason);\n clearTimeout(consumer.timeoutID);\n return;\n }\n this.#produced.push({rejection: reason});\n }\n\n /**\n * Deletes all unconsumed entries matching the specified `value` based on identity equality.\n * The consumed callback(s) are resolved as if the values were dequeued.\n *\n * Note: deletion of `undefined` values is not supported. This method will assert\n * if `value` is undefined.\n *\n * @returns The number of entries deleted.\n */\n delete(value: T): number {\n assert(value !== undefined);\n\n let count = 0;\n for (let i = this.#produced.length - 1; i >= 0; i--) {\n const p = this.#produced[i];\n if (p.value === value) {\n this.#produced.splice(i, 1);\n count++;\n }\n }\n return count;\n }\n\n /**\n * @param timeoutValue An optional value to resolve if `timeoutMs` is reached.\n * @param timeoutMs The milliseconds after which the `timeoutValue` is resolved\n * if nothing is produced for the consumer.\n * @returns A Promise that resolves to the next enqueued value.\n */\n dequeue(timeoutValue?: T, timeoutMs: number = 0): Promise<T> | T {\n const produced = this.#produced.shift();\n if (produced) {\n return produced.value ?? Promise.reject(produced.rejection);\n }\n const r = resolver<T>();\n const timeoutID =\n timeoutValue === undefined\n ? undefined\n : setTimeout(() => {\n const i = this.#consumers.findIndex(c => c.resolver === r);\n if (i >= 0) {\n const [consumer] = this.#consumers.splice(i, 1);\n consumer.resolver.resolve(timeoutValue);\n }\n }, timeoutMs);\n this.#consumers.push({resolver: r, timeoutID});\n return r.promise;\n }\n\n /**\n * Drains the entire queue.\n *\n * Usage example:\n * ```ts\n * // A consumer that, when awoken, drains\n * // all entries in the queue in order to\n * // process them in a batch.\n * for (;;) {\n * const value = await queue.dequeue();\n * const rest = queue.drain();\n * }\n * ```\n */\n drain(): (T | undefined)[] {\n const ret: (T | undefined)[] = [];\n for (const p of this.#produced) {\n ret.push(p.value);\n }\n this.#produced.length = 0;\n\n return ret;\n }\n\n /**\n * @returns The instantaneous number of outstanding values waiting to be\n * dequeued. Note that if a value was enqueued while a consumer\n * was waiting (with `await dequeue()`), the value is immediately\n * handed to the consumer and the Queue's size remains 0.\n */\n size(): number {\n return this.#produced.length;\n }\n\n asAsyncIterable(cleanup = NOOP): AsyncIterable<T> {\n return {[Symbol.asyncIterator]: () => this.asAsyncIterator(cleanup)};\n }\n\n asAsyncIterator(cleanup = NOOP): AsyncIterator<T> {\n return {\n next: async () => {\n try {\n const value = await this.dequeue();\n return {value};\n } catch (e) {\n cleanup();\n throw e;\n }\n },\n return: value => {\n cleanup();\n return Promise.resolve({value, done: true});\n },\n };\n }\n}\n\nconst NOOP = () => {};\n\ntype Consumer<T> = {\n resolver: Resolver<T>;\n timeoutID: ReturnType<typeof setTimeout> | undefined;\n};\n\ntype Produced<T> =\n | {value: T; rejection?: undefined}\n | {value?: undefined; rejection: unknown};\n"],"names":[],"mappings":";;AAOO,MAAM,MAAS;AAAA;AAAA,EAEX,aAA4B,CAAA;AAAA;AAAA,EAE5B,YAA2B,CAAA;AAAA,EAEpC,QAAQ,OAAgB;AACtB,UAAM,WAAW,KAAK,WAAW,MAAA;AACjC,QAAI,UAAU;AACZ,eAAS,SAAS,QAAQ,KAAK;AAC/B,mBAAa,SAAS,SAAS;AAC/B;AAAA,IACF;AACA,SAAK,UAAU,KAAK,EAAC,MAAA,CAAM;AAAA,EAC7B;AAAA,EAEA,iBAAiB,QAAwB;AACvC,UAAM,WAAW,KAAK,WAAW,MAAA;AACjC,QAAI,UAAU;AACZ,eAAS,SAAS,OAAO,MAAM;AAC/B,mBAAa,SAAS,SAAS;AAC/B;AAAA,IACF;AACA,SAAK,UAAU,KAAK,EAAC,WAAW,QAAO;AAAA,EACzC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAWA,OAAO,OAAkB;AACvB,WAAO,UAAU,
|
|
1
|
+
{"version":3,"file":"queue.js","sources":["../../../../shared/src/queue.ts"],"sourcesContent":["import {resolver, type Resolver} from '@rocicorp/resolver';\nimport {assert} from './asserts.ts';\n\n/**\n * A Queue allows the consumers to await (possibly future) values,\n * and producers to await the consumption of their values.\n */\nexport class Queue<T> {\n // Consumers waiting for entries to be produced.\n readonly #consumers: Consumer<T>[] = [];\n // Produced entries waiting to be consumed.\n readonly #produced: Produced<T>[] = [];\n\n enqueue(value: T): void {\n const consumer = this.#consumers.shift();\n if (consumer) {\n consumer.resolver.resolve(value);\n clearTimeout(consumer.timeoutID);\n return;\n }\n this.#produced.push({value});\n }\n\n enqueueRejection(reason?: unknown): void {\n const consumer = this.#consumers.shift();\n if (consumer) {\n consumer.resolver.reject(reason);\n clearTimeout(consumer.timeoutID);\n return;\n }\n this.#produced.push({rejection: reason});\n }\n\n /**\n * Deletes all unconsumed entries matching the specified `value` based on identity equality.\n * The consumed callback(s) are resolved as if the values were dequeued.\n *\n * Note: deletion of `undefined` values is not supported. This method will assert\n * if `value` is undefined.\n *\n * @returns The number of entries deleted.\n */\n delete(value: T): number {\n assert(value !== undefined, 'Queue delete value must not be undefined');\n\n let count = 0;\n for (let i = this.#produced.length - 1; i >= 0; i--) {\n const p = this.#produced[i];\n if (p.value === value) {\n this.#produced.splice(i, 1);\n count++;\n }\n }\n return count;\n }\n\n /**\n * @param timeoutValue An optional value to resolve if `timeoutMs` is reached.\n * @param timeoutMs The milliseconds after which the `timeoutValue` is resolved\n * if nothing is produced for the consumer.\n * @returns A Promise that resolves to the next enqueued value.\n */\n dequeue(timeoutValue?: T, timeoutMs: number = 0): Promise<T> | T {\n const produced = this.#produced.shift();\n if (produced) {\n return produced.value ?? Promise.reject(produced.rejection);\n }\n const r = resolver<T>();\n const timeoutID =\n timeoutValue === undefined\n ? undefined\n : setTimeout(() => {\n const i = this.#consumers.findIndex(c => c.resolver === r);\n if (i >= 0) {\n const [consumer] = this.#consumers.splice(i, 1);\n consumer.resolver.resolve(timeoutValue);\n }\n }, timeoutMs);\n this.#consumers.push({resolver: r, timeoutID});\n return r.promise;\n }\n\n /**\n * Drains the entire queue.\n *\n * Usage example:\n * ```ts\n * // A consumer that, when awoken, drains\n * // all entries in the queue in order to\n * // process them in a batch.\n * for (;;) {\n * const value = await queue.dequeue();\n * const rest = queue.drain();\n * }\n * ```\n */\n drain(): (T | undefined)[] {\n const ret: (T | undefined)[] = [];\n for (const p of this.#produced) {\n ret.push(p.value);\n }\n this.#produced.length = 0;\n\n return ret;\n }\n\n /**\n * @returns The instantaneous number of outstanding values waiting to be\n * dequeued. Note that if a value was enqueued while a consumer\n * was waiting (with `await dequeue()`), the value is immediately\n * handed to the consumer and the Queue's size remains 0.\n */\n size(): number {\n return this.#produced.length;\n }\n\n asAsyncIterable(cleanup = NOOP): AsyncIterable<T> {\n return {[Symbol.asyncIterator]: () => this.asAsyncIterator(cleanup)};\n }\n\n asAsyncIterator(cleanup = NOOP): AsyncIterator<T> {\n return {\n next: async () => {\n try {\n const value = await this.dequeue();\n return {value};\n } catch (e) {\n cleanup();\n throw e;\n }\n },\n return: value => {\n cleanup();\n return Promise.resolve({value, done: true});\n },\n };\n }\n}\n\nconst NOOP = () => {};\n\ntype Consumer<T> = {\n resolver: Resolver<T>;\n timeoutID: ReturnType<typeof setTimeout> | undefined;\n};\n\ntype Produced<T> =\n | {value: T; rejection?: undefined}\n | {value?: undefined; rejection: unknown};\n"],"names":[],"mappings":";;AAOO,MAAM,MAAS;AAAA;AAAA,EAEX,aAA4B,CAAA;AAAA;AAAA,EAE5B,YAA2B,CAAA;AAAA,EAEpC,QAAQ,OAAgB;AACtB,UAAM,WAAW,KAAK,WAAW,MAAA;AACjC,QAAI,UAAU;AACZ,eAAS,SAAS,QAAQ,KAAK;AAC/B,mBAAa,SAAS,SAAS;AAC/B;AAAA,IACF;AACA,SAAK,UAAU,KAAK,EAAC,MAAA,CAAM;AAAA,EAC7B;AAAA,EAEA,iBAAiB,QAAwB;AACvC,UAAM,WAAW,KAAK,WAAW,MAAA;AACjC,QAAI,UAAU;AACZ,eAAS,SAAS,OAAO,MAAM;AAC/B,mBAAa,SAAS,SAAS;AAC/B;AAAA,IACF;AACA,SAAK,UAAU,KAAK,EAAC,WAAW,QAAO;AAAA,EACzC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAWA,OAAO,OAAkB;AACvB,WAAO,UAAU,QAAW,0CAA0C;AAEtE,QAAI,QAAQ;AACZ,aAAS,IAAI,KAAK,UAAU,SAAS,GAAG,KAAK,GAAG,KAAK;AACnD,YAAM,IAAI,KAAK,UAAU,CAAC;AAC1B,UAAI,EAAE,UAAU,OAAO;AACrB,aAAK,UAAU,OAAO,GAAG,CAAC;AAC1B;AAAA,MACF;AAAA,IACF;AACA,WAAO;AAAA,EACT;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAQA,QAAQ,cAAkB,YAAoB,GAAmB;AAC/D,UAAM,WAAW,KAAK,UAAU,MAAA;AAChC,QAAI,UAAU;AACZ,aAAO,SAAS,SAAS,QAAQ,OAAO,SAAS,SAAS;AAAA,IAC5D;AACA,UAAM,IAAI,SAAA;AACV,UAAM,YACJ,iBAAiB,SACb,SACA,WAAW,MAAM;AACf,YAAM,IAAI,KAAK,WAAW,UAAU,CAAA,MAAK,EAAE,aAAa,CAAC;AACzD,UAAI,KAAK,GAAG;AACV,cAAM,CAAC,QAAQ,IAAI,KAAK,WAAW,OAAO,GAAG,CAAC;AAC9C,iBAAS,SAAS,QAAQ,YAAY;AAAA,MACxC;AAAA,IACF,GAAG,SAAS;AAClB,SAAK,WAAW,KAAK,EAAC,UAAU,GAAG,WAAU;AAC7C,WAAO,EAAE;AAAA,EACX;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAgBA,QAA2B;AACzB,UAAM,MAAyB,CAAA;AAC/B,eAAW,KAAK,KAAK,WAAW;AAC9B,UAAI,KAAK,EAAE,KAAK;AAAA,IAClB;AACA,SAAK,UAAU,SAAS;AAExB,WAAO;AAAA,EACT;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAQA,OAAe;AACb,WAAO,KAAK,UAAU;AAAA,EACxB;AAAA,EAEA,gBAAgB,UAAU,MAAwB;AAChD,WAAO,EAAC,CAAC,OAAO,aAAa,GAAG,MAAM,KAAK,gBAAgB,OAAO,EAAA;AAAA,EACpE;AAAA,EAEA,gBAAgB,UAAU,MAAwB;AAChD,WAAO;AAAA,MACL,MAAM,YAAY;AAChB,YAAI;AACF,gBAAM,QAAQ,MAAM,KAAK,QAAA;AACzB,iBAAO,EAAC,MAAA;AAAA,QACV,SAAS,GAAG;AACV,kBAAA;AACA,gBAAM;AAAA,QACR;AAAA,MACF;AAAA,MACA,QAAQ,CAAA,UAAS;AACf,gBAAA;AACA,eAAO,QAAQ,QAAQ,EAAC,OAAO,MAAM,MAAK;AAAA,MAC5C;AAAA,IAAA;AAAA,EAEJ;AACF;AAEA,MAAM,OAAO,MAAM;AAAC;"}
|
package/out/zero/package.json.js
CHANGED
package/out/zero/src/react.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { useConnectionState } from "../../zero-react/src/use-connection-state.js";
|
|
2
2
|
import { useQuery, useSuspenseQuery } from "../../zero-react/src/use-query.js";
|
|
3
3
|
import { useZeroOnline } from "../../zero-react/src/use-zero-online.js";
|
|
4
|
-
import { useZeroVirtualizer } from "../../zero-react/src/use-zero-virtualizer.js";
|
|
5
4
|
import { ZeroContext, ZeroProvider, createUseZero, useZero } from "../../zero-react/src/zero-provider.js";
|
|
6
5
|
export {
|
|
7
6
|
ZeroContext,
|
|
@@ -11,7 +10,6 @@ export {
|
|
|
11
10
|
useQuery,
|
|
12
11
|
useSuspenseQuery,
|
|
13
12
|
useZero,
|
|
14
|
-
useZeroOnline
|
|
15
|
-
useZeroVirtualizer
|
|
13
|
+
useZeroOnline
|
|
16
14
|
};
|
|
17
15
|
//# sourceMappingURL=react.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"react.js","sources":[],"sourcesContent":[],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"react.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migration.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/db/migration.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,QAAQ,MAAM,UAAU,CAAC;AAGrC,OAAO,KAAK,CAAC,MAAM,+BAA+B,CAAC;AACnD,OAAO,EAAC,KAAK,UAAU,EAAE,KAAK,mBAAmB,EAAC,MAAM,gBAAgB,CAAC;AAGzE,KAAK,UAAU,GAAG,CAAC,GAAG,EAAE,UAAU,EAAE,EAAE,EAAE,mBAAmB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAE9E;;;;GAIG;AACH,MAAM,MAAM,SAAS,GAAG;IACtB;;;;OAIG;IACH,aAAa,CAAC,EAAE,UAAU,CAAC;IAE3B;;;;;;;OAOG;IACH,WAAW,CAAC,EAAE,UAAU,CAAC;IAEzB;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF;;;;;;;;;;GAUG;AACH,MAAM,MAAM,uBAAuB,GAAG;IACpC,CAAC,kBAAkB,EAAE,MAAM,GAAG,SAAS,CAAC;CACzC,CAAC;AAEF;;;GAGG;AACH,wBAAsB,mBAAmB,CACvC,GAAG,EAAE,UAAU,EACf,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,EAAE,EAAE,UAAU,EACd,cAAc,EAAE,SAAS,EACzB,uBAAuB,EAAE,uBAAuB,GAC/C,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"migration.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/db/migration.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,QAAQ,MAAM,UAAU,CAAC;AAGrC,OAAO,KAAK,CAAC,MAAM,+BAA+B,CAAC;AACnD,OAAO,EAAC,KAAK,UAAU,EAAE,KAAK,mBAAmB,EAAC,MAAM,gBAAgB,CAAC;AAGzE,KAAK,UAAU,GAAG,CAAC,GAAG,EAAE,UAAU,EAAE,EAAE,EAAE,mBAAmB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAE9E;;;;GAIG;AACH,MAAM,MAAM,SAAS,GAAG;IACtB;;;;OAIG;IACH,aAAa,CAAC,EAAE,UAAU,CAAC;IAE3B;;;;;;;OAOG;IACH,WAAW,CAAC,EAAE,UAAU,CAAC;IAEzB;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF;;;;;;;;;;GAUG;AACH,MAAM,MAAM,uBAAuB,GAAG;IACpC,CAAC,kBAAkB,EAAE,MAAM,GAAG,SAAS,CAAC;CACzC,CAAC;AAEF;;;GAGG;AACH,wBAAsB,mBAAmB,CACvC,GAAG,EAAE,UAAU,EACf,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,EAAE,EAAE,UAAU,EACd,cAAc,EAAE,SAAS,EACzB,uBAAuB,EAAE,uBAAuB,GAC/C,OAAO,CAAC,IAAI,CAAC,CA6Ef;AAaD,eAAO,MAAM,cAAc;IACzB;;;;;;OAMG;;IAGH;;;;;;OAMG;;IAGH;;;;OAIG;;aAEH,CAAC;AAGH,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,cAAc,CAAC,CAAC;AAG5D,wBAAsB,yBAAyB,CAC7C,GAAG,EAAE,QAAQ,CAAC,GAAG,EACjB,UAAU,EAAE,MAAM,iBAcnB;AASD,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,QAAQ,CAAC,GAAG,EACjB,UAAU,EAAE,MAAM,EAClB,MAAM,UAAQ,GACb,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,CAuBhC"}
|
|
@@ -6,38 +6,41 @@ import { runTx } from "./run-transaction.js";
|
|
|
6
6
|
import { object, number } from "@badrap/valita";
|
|
7
7
|
async function runSchemaMigrations(log, debugName, schemaName, db, setupMigration, incrementalMigrationMap) {
|
|
8
8
|
log = log.withContext("initSchema", schemaName);
|
|
9
|
+
const versionMigrations = sorted(incrementalMigrationMap);
|
|
10
|
+
assert(
|
|
11
|
+
versionMigrations.length,
|
|
12
|
+
`Must specify at least one version migration`
|
|
13
|
+
);
|
|
14
|
+
assert(
|
|
15
|
+
versionMigrations[0][0] > 0,
|
|
16
|
+
`Versions must be non-zero positive numbers`
|
|
17
|
+
);
|
|
18
|
+
const codeVersion = versionMigrations[versionMigrations.length - 1][0];
|
|
19
|
+
log.info?.(
|
|
20
|
+
`Checking schema for compatibility with ${debugName} at schema v${codeVersion}`
|
|
21
|
+
);
|
|
9
22
|
try {
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
assert(
|
|
16
|
-
versionMigrations[0][0] > 0,
|
|
17
|
-
`Versions must be non-zero positive numbers`
|
|
18
|
-
);
|
|
19
|
-
const codeVersion = versionMigrations[versionMigrations.length - 1][0];
|
|
20
|
-
log.info?.(
|
|
21
|
-
`Checking schema for compatibility with ${debugName} at schema v${codeVersion}`
|
|
22
|
-
);
|
|
23
|
-
let versions = await runTx(db, async (tx) => {
|
|
24
|
-
const versions2 = await ensureVersionHistory(tx, schemaName);
|
|
25
|
-
if (codeVersion < versions2.minSafeVersion) {
|
|
23
|
+
await runTx(db, async (tx) => {
|
|
24
|
+
const lockName = `migrate-schema:${schemaName}`;
|
|
25
|
+
await tx`SELECT pg_advisory_xact_lock(hashtext(${lockName}))`;
|
|
26
|
+
let versions = await ensureVersionHistory(tx, schemaName);
|
|
27
|
+
if (codeVersion < versions.minSafeVersion) {
|
|
26
28
|
throw new Error(
|
|
27
|
-
`Cannot run ${debugName} at schema v${codeVersion} because rollback limit is v${
|
|
29
|
+
`Cannot run ${debugName} at schema v${codeVersion} because rollback limit is v${versions.minSafeVersion}`
|
|
28
30
|
);
|
|
29
31
|
}
|
|
30
|
-
if (
|
|
32
|
+
if (versions.dataVersion > codeVersion) {
|
|
31
33
|
log.info?.(
|
|
32
|
-
`Data is at v${
|
|
34
|
+
`Data is at v${versions.dataVersion}. Resetting to v${codeVersion}`
|
|
33
35
|
);
|
|
34
|
-
|
|
36
|
+
await updateVersionHistory(log, tx, schemaName, versions, codeVersion);
|
|
37
|
+
return;
|
|
38
|
+
}
|
|
39
|
+
if (versions.dataVersion === codeVersion) {
|
|
40
|
+
return;
|
|
35
41
|
}
|
|
36
|
-
return versions2;
|
|
37
|
-
});
|
|
38
|
-
if (versions.dataVersion < codeVersion) {
|
|
39
42
|
const migrations = versions.dataVersion === 0 ? (
|
|
40
|
-
// For
|
|
43
|
+
// For an empty database (v0), only run the setup migration.
|
|
41
44
|
[[codeVersion, setupMigration]]
|
|
42
45
|
) : versionMigrations;
|
|
43
46
|
for (const [dest, migration] of migrations) {
|
|
@@ -46,31 +49,17 @@ async function runSchemaMigrations(log, debugName, schemaName, db, setupMigratio
|
|
|
46
49
|
`Migrating schema from v${versions.dataVersion} to v${dest}`
|
|
47
50
|
);
|
|
48
51
|
void log.flush();
|
|
49
|
-
versions = await
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
dest,
|
|
58
|
-
migration
|
|
59
|
-
);
|
|
60
|
-
assert(
|
|
61
|
-
versions2.dataVersion === dest,
|
|
62
|
-
() => `Migration did not reach target version: expected ${dest}, got ${versions2.dataVersion}`
|
|
63
|
-
);
|
|
64
|
-
}
|
|
65
|
-
return versions2;
|
|
66
|
-
});
|
|
52
|
+
versions = await runMigration(
|
|
53
|
+
log,
|
|
54
|
+
schemaName,
|
|
55
|
+
tx,
|
|
56
|
+
versions,
|
|
57
|
+
dest,
|
|
58
|
+
migration
|
|
59
|
+
);
|
|
67
60
|
}
|
|
68
61
|
}
|
|
69
|
-
}
|
|
70
|
-
assert(
|
|
71
|
-
versions.dataVersion === codeVersion,
|
|
72
|
-
() => `Final dataVersion (${versions.dataVersion}) does not match codeVersion (${codeVersion})`
|
|
73
|
-
);
|
|
62
|
+
});
|
|
74
63
|
log.info?.(`Running ${debugName} at schema v${codeVersion}`);
|
|
75
64
|
} catch (e) {
|
|
76
65
|
log.error?.("Error in ensureSchemaMigrated", e);
|
|
@@ -128,7 +117,7 @@ async function ensureVersionHistory(sql, schemaName) {
|
|
|
128
117
|
}
|
|
129
118
|
async function getVersionHistory(sql, schemaName, create = false) {
|
|
130
119
|
const exists = await sql`
|
|
131
|
-
SELECT nspname, relname FROM pg_class
|
|
120
|
+
SELECT nspname, relname FROM pg_class
|
|
132
121
|
JOIN pg_namespace ON relnamespace = pg_namespace.oid
|
|
133
122
|
WHERE nspname = ${schemaName} AND relname = ${"versionHistory"}`;
|
|
134
123
|
if (exists.length === 0) {
|
|
@@ -139,7 +128,7 @@ async function getVersionHistory(sql, schemaName, create = false) {
|
|
|
139
128
|
}
|
|
140
129
|
}
|
|
141
130
|
const rows = await sql`
|
|
142
|
-
SELECT "dataVersion", "schemaVersion", "minSafeVersion"
|
|
131
|
+
SELECT "dataVersion", "schemaVersion", "minSafeVersion"
|
|
143
132
|
FROM ${sql(schemaName)}."versionHistory"`;
|
|
144
133
|
if (rows.length === 0) {
|
|
145
134
|
return create ? { schemaVersion: 0, dataVersion: 0, minSafeVersion: 0 } : null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migration.js","sources":["../../../../../zero-cache/src/db/migration.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport type postgres from 'postgres';\nimport {assert} from '../../../shared/src/asserts.ts';\nimport {must} from '../../../shared/src/must.ts';\nimport * as v from '../../../shared/src/valita.ts';\nimport {type PostgresDB, type PostgresTransaction} from '../types/pg.ts';\nimport {runTx} from './run-transaction.ts';\n\ntype Operations = (log: LogContext, tx: PostgresTransaction) => Promise<void>;\n\n/**\n * Encapsulates the logic for setting up or upgrading to a new schema. After the\n * Migration code successfully completes, {@link runSchemaMigrations}\n * will update the schema version and commit the transaction.\n */\nexport type Migration = {\n /**\n * Perform database operations that create or alter table structure. This is\n * called at most once during lifetime of the application. If a `migrateData()`\n * operation is defined, that will be performed after `migrateSchema()` succeeds.\n */\n migrateSchema?: Operations;\n\n /**\n * Perform database operations to migrate data to the new schema. This is\n * called after `migrateSchema()` (if defined), and may be called again\n * to re-migrate data after the server was rolled back to an earlier version,\n * and rolled forward again.\n *\n * Consequently, the logic in `migrateData()` must be idempotent.\n */\n migrateData?: Operations;\n\n /**\n * Sets the `minSafeVersion` to the specified value, prohibiting running\n * any earlier code versions.\n */\n minSafeVersion?: number;\n};\n\n/**\n * Mapping of incremental migrations to move from the previous old code\n * version to next one. Versions must be non-zero.\n *\n * The schema resulting from performing incremental migrations should be\n * equivalent to that of the `setupMigration` on a blank database.\n *\n * The highest destinationVersion of this map denotes the current\n * \"code version\", and is also used as the destination version when\n * running the initial setup migration on a blank database.\n */\nexport type IncrementalMigrationMap = {\n [destinationVersion: number]: Migration;\n};\n\n/**\n * Ensures that the schema is compatible with the current code, updating and\n * migrating the schema if necessary.\n */\nexport async function runSchemaMigrations(\n log: LogContext,\n debugName: string,\n schemaName: string,\n db: PostgresDB,\n setupMigration: Migration,\n incrementalMigrationMap: IncrementalMigrationMap,\n): Promise<void> {\n log = log.withContext('initSchema', schemaName);\n try {\n const versionMigrations = sorted(incrementalMigrationMap);\n assert(\n versionMigrations.length,\n `Must specify at least one version migration`,\n );\n assert(\n versionMigrations[0][0] > 0,\n `Versions must be non-zero positive numbers`,\n );\n const codeVersion = versionMigrations[versionMigrations.length - 1][0];\n log.info?.(\n `Checking schema for compatibility with ${debugName} at schema v${codeVersion}`,\n );\n\n let versions = await runTx(db, async tx => {\n const versions = await ensureVersionHistory(tx, schemaName);\n if (codeVersion < versions.minSafeVersion) {\n throw new Error(\n `Cannot run ${debugName} at schema v${codeVersion} because rollback limit is v${versions.minSafeVersion}`,\n );\n }\n\n if (versions.dataVersion > codeVersion) {\n log.info?.(\n `Data is at v${versions.dataVersion}. Resetting to v${codeVersion}`,\n );\n return updateVersionHistory(log, tx, schemaName, versions, codeVersion);\n }\n return versions;\n });\n\n if (versions.dataVersion < codeVersion) {\n const migrations =\n versions.dataVersion === 0\n ? // For the empty database v0, only run the setup migration.\n ([[codeVersion, setupMigration]] as const)\n : versionMigrations;\n\n for (const [dest, migration] of migrations) {\n if (versions.dataVersion < dest) {\n log.info?.(\n `Migrating schema from v${versions.dataVersion} to v${dest}`,\n );\n void log.flush(); // Flush logs before each migration to help debug crash-y migrations.\n\n versions = await runTx(db, async tx => {\n // Fetch meta from within the transaction to make the migration atomic.\n let versions = await ensureVersionHistory(tx, schemaName);\n if (versions.dataVersion < dest) {\n versions = await runMigration(\n log,\n schemaName,\n tx,\n versions,\n dest,\n migration,\n );\n assert(\n versions.dataVersion === dest,\n () =>\n `Migration did not reach target version: expected ${dest}, got ${versions.dataVersion}`,\n );\n }\n return versions;\n });\n }\n }\n }\n\n assert(\n versions.dataVersion === codeVersion,\n () =>\n `Final dataVersion (${versions.dataVersion}) does not match codeVersion (${codeVersion})`,\n );\n log.info?.(`Running ${debugName} at schema v${codeVersion}`);\n } catch (e) {\n log.error?.('Error in ensureSchemaMigrated', e);\n throw e;\n } finally {\n void log.flush(); // Flush the logs but do not block server progress on it.\n }\n}\n\nfunction sorted(\n incrementalMigrationMap: IncrementalMigrationMap,\n): [number, Migration][] {\n const versionMigrations: [number, Migration][] = [];\n for (const [v, m] of Object.entries(incrementalMigrationMap)) {\n versionMigrations.push([Number(v), m]);\n }\n return versionMigrations.sort(([a], [b]) => a - b);\n}\n\n// Exposed for tests.\nexport const versionHistory = v.object({\n /**\n * The `schemaVersion` is highest code version that has ever been run\n * on the database, and is used to delineate the structure of the tables\n * in the database. A schemaVersion only moves forward; rolling back to\n * an earlier (safe) code version does not revert schema changes that\n * have already been applied.\n */\n schemaVersion: v.number(),\n\n /**\n * The data version is the code version of the latest server that ran.\n * Note that this may be less than the schemaVersion in the case that\n * a server is rolled back to an earlier version after a schema change.\n * In such a case, data (but not schema), may need to be re-migrated\n * when rolling forward again.\n */\n dataVersion: v.number(),\n\n /**\n * The minimum code version that is safe to run. This is used when\n * a schema migration is not backwards compatible with an older version\n * of the code.\n */\n minSafeVersion: v.number(),\n});\n\n// Exposed for tests.\nexport type VersionHistory = v.Infer<typeof versionHistory>;\n\n// Exposed for tests.\nexport async function createVersionHistoryTable(\n sql: postgres.Sql,\n schemaName: string,\n) {\n // Note: The `lock` column transparently ensures that at most one row exists.\n await sql`\n CREATE SCHEMA IF NOT EXISTS ${sql(schemaName)};\n CREATE TABLE IF NOT EXISTS ${sql(schemaName)}.\"versionHistory\" (\n \"dataVersion\" int NOT NULL,\n \"schemaVersion\" int NOT NULL,\n \"minSafeVersion\" int NOT NULL,\n\n lock char(1) NOT NULL CONSTRAINT DF_schema_meta_lock DEFAULT 'v',\n CONSTRAINT PK_schema_meta_lock PRIMARY KEY (lock),\n CONSTRAINT CK_schema_meta_lock CHECK (lock='v')\n );`.simple();\n}\n\nasync function ensureVersionHistory(\n sql: postgres.Sql,\n schemaName: string,\n): Promise<VersionHistory> {\n return must(await getVersionHistory(sql, schemaName, true));\n}\n\nexport async function getVersionHistory(\n sql: postgres.Sql,\n schemaName: string,\n create = false,\n): Promise<VersionHistory | null> {\n const exists = await sql`\n SELECT nspname, relname FROM pg_class \n JOIN pg_namespace ON relnamespace = pg_namespace.oid\n WHERE nspname = ${schemaName} AND relname = ${'versionHistory'}`;\n\n if (exists.length === 0) {\n if (create) {\n await createVersionHistoryTable(sql, schemaName);\n } else {\n return null;\n }\n }\n const rows = await sql`\n SELECT \"dataVersion\", \"schemaVersion\", \"minSafeVersion\" \n FROM ${sql(schemaName)}.\"versionHistory\"`;\n\n if (rows.length === 0) {\n return create\n ? {schemaVersion: 0, dataVersion: 0, minSafeVersion: 0}\n : null;\n }\n return v.parse(rows[0], versionHistory);\n}\n\nasync function updateVersionHistory(\n log: LogContext,\n sql: postgres.Sql,\n schemaName: string,\n prev: VersionHistory,\n newVersion: number,\n minSafeVersion?: number,\n): Promise<VersionHistory> {\n assert(newVersion > 0, 'newVersion must be positive');\n const versions = {\n dataVersion: newVersion,\n // The schemaVersion never moves backwards.\n schemaVersion: Math.max(newVersion, prev.schemaVersion),\n minSafeVersion: getMinSafeVersion(log, prev, minSafeVersion),\n } satisfies VersionHistory;\n\n await sql`\n INSERT INTO ${sql(schemaName)}.\"versionHistory\" ${sql(versions)}\n ON CONFLICT (lock) DO UPDATE SET ${sql(versions)}\n `;\n return versions;\n}\n\nasync function runMigration(\n log: LogContext,\n schemaName: string,\n tx: PostgresTransaction,\n versions: VersionHistory,\n destinationVersion: number,\n migration: Migration,\n): Promise<VersionHistory> {\n if (versions.schemaVersion < destinationVersion) {\n await migration.migrateSchema?.(log, tx);\n }\n if (versions.dataVersion < destinationVersion) {\n await migration.migrateData?.(log, tx);\n }\n return updateVersionHistory(\n log,\n tx,\n schemaName,\n versions,\n destinationVersion,\n migration.minSafeVersion,\n );\n}\n\n/**\n * Bumps the rollback limit [[toAtLeast]] the specified version.\n * Leaves the rollback limit unchanged if it is equal or greater.\n */\nfunction getMinSafeVersion(\n log: LogContext,\n current: VersionHistory,\n proposedSafeVersion?: number,\n): number {\n if (proposedSafeVersion === undefined) {\n return current.minSafeVersion;\n }\n if (current.minSafeVersion >= proposedSafeVersion) {\n // The rollback limit must never move backwards.\n log.debug?.(\n `rollback limit is already at ${current.minSafeVersion}, ` +\n `don't need to bump to ${proposedSafeVersion}`,\n );\n return current.minSafeVersion;\n }\n log.info?.(\n `bumping rollback limit from ${current.minSafeVersion} to ${proposedSafeVersion}`,\n );\n return proposedSafeVersion;\n}\n"],"names":["versions","v","v.object","v.number","v.parse"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"migration.js","sources":["../../../../../zero-cache/src/db/migration.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport type postgres from 'postgres';\nimport {assert} from '../../../shared/src/asserts.ts';\nimport {must} from '../../../shared/src/must.ts';\nimport * as v from '../../../shared/src/valita.ts';\nimport {type PostgresDB, type PostgresTransaction} from '../types/pg.ts';\nimport {runTx} from './run-transaction.ts';\n\ntype Operations = (log: LogContext, tx: PostgresTransaction) => Promise<void>;\n\n/**\n * Encapsulates the logic for setting up or upgrading to a new schema. After the\n * Migration code successfully completes, {@link runSchemaMigrations}\n * will update the schema version and commit the transaction.\n */\nexport type Migration = {\n /**\n * Perform database operations that create or alter table structure. This is\n * called at most once during lifetime of the application. If a `migrateData()`\n * operation is defined, that will be performed after `migrateSchema()` succeeds.\n */\n migrateSchema?: Operations;\n\n /**\n * Perform database operations to migrate data to the new schema. This is\n * called after `migrateSchema()` (if defined), and may be called again\n * to re-migrate data after the server was rolled back to an earlier version,\n * and rolled forward again.\n *\n * Consequently, the logic in `migrateData()` must be idempotent.\n */\n migrateData?: Operations;\n\n /**\n * Sets the `minSafeVersion` to the specified value, prohibiting running\n * any earlier code versions.\n */\n minSafeVersion?: number;\n};\n\n/**\n * Mapping of incremental migrations to move from the previous old code\n * version to next one. Versions must be non-zero.\n *\n * The schema resulting from performing incremental migrations should be\n * equivalent to that of the `setupMigration` on a blank database.\n *\n * The highest destinationVersion of this map denotes the current\n * \"code version\", and is also used as the destination version when\n * running the initial setup migration on a blank database.\n */\nexport type IncrementalMigrationMap = {\n [destinationVersion: number]: Migration;\n};\n\n/**\n * Ensures that the schema is compatible with the current code, updating and\n * migrating the schema if necessary.\n */\nexport async function runSchemaMigrations(\n log: LogContext,\n debugName: string,\n schemaName: string,\n db: PostgresDB,\n setupMigration: Migration,\n incrementalMigrationMap: IncrementalMigrationMap,\n): Promise<void> {\n log = log.withContext('initSchema', schemaName);\n\n const versionMigrations = sorted(incrementalMigrationMap);\n assert(\n versionMigrations.length,\n `Must specify at least one version migration`,\n );\n assert(\n versionMigrations[0][0] > 0,\n `Versions must be non-zero positive numbers`,\n );\n const codeVersion = versionMigrations[versionMigrations.length - 1][0];\n\n log.info?.(\n `Checking schema for compatibility with ${debugName} at schema v${codeVersion}`,\n );\n\n try {\n await runTx(db, async tx => {\n // Acquire advisory lock to prevent concurrent migrations from racing.\n // This can happen during rolling deployments when multiple pods start\n // up simultaneously. The lock auto-releases when the transaction ends.\n const lockName = `migrate-schema:${schemaName}`;\n await tx`SELECT pg_advisory_xact_lock(hashtext(${lockName}))`;\n\n let versions = await ensureVersionHistory(tx, schemaName);\n\n if (codeVersion < versions.minSafeVersion) {\n throw new Error(\n `Cannot run ${debugName} at schema v${codeVersion} because rollback limit is v${versions.minSafeVersion}`,\n );\n }\n\n if (versions.dataVersion > codeVersion) {\n log.info?.(\n `Data is at v${versions.dataVersion}. Resetting to v${codeVersion}`,\n );\n await updateVersionHistory(log, tx, schemaName, versions, codeVersion);\n return;\n }\n\n if (versions.dataVersion === codeVersion) {\n return;\n }\n\n const migrations =\n versions.dataVersion === 0\n ? // For an empty database (v0), only run the setup migration.\n ([[codeVersion, setupMigration]] as const)\n : versionMigrations;\n\n for (const [dest, migration] of migrations) {\n if (versions.dataVersion < dest) {\n log.info?.(\n `Migrating schema from v${versions.dataVersion} to v${dest}`,\n );\n void log.flush();\n versions = await runMigration(\n log,\n schemaName,\n tx,\n versions,\n dest,\n migration,\n );\n }\n }\n });\n\n log.info?.(`Running ${debugName} at schema v${codeVersion}`);\n } catch (e) {\n log.error?.('Error in ensureSchemaMigrated', e);\n throw e;\n } finally {\n void log.flush();\n }\n}\n\nfunction sorted(\n incrementalMigrationMap: IncrementalMigrationMap,\n): [number, Migration][] {\n const versionMigrations: [number, Migration][] = [];\n for (const [v, m] of Object.entries(incrementalMigrationMap)) {\n versionMigrations.push([Number(v), m]);\n }\n return versionMigrations.sort(([a], [b]) => a - b);\n}\n\n// Exposed for tests.\nexport const versionHistory = v.object({\n /**\n * The `schemaVersion` is highest code version that has ever been run\n * on the database, and is used to delineate the structure of the tables\n * in the database. A schemaVersion only moves forward; rolling back to\n * an earlier (safe) code version does not revert schema changes that\n * have already been applied.\n */\n schemaVersion: v.number(),\n\n /**\n * The data version is the code version of the latest server that ran.\n * Note that this may be less than the schemaVersion in the case that\n * a server is rolled back to an earlier version after a schema change.\n * In such a case, data (but not schema), may need to be re-migrated\n * when rolling forward again.\n */\n dataVersion: v.number(),\n\n /**\n * The minimum code version that is safe to run. This is used when\n * a schema migration is not backwards compatible with an older version\n * of the code.\n */\n minSafeVersion: v.number(),\n});\n\n// Exposed for tests.\nexport type VersionHistory = v.Infer<typeof versionHistory>;\n\n// Exposed for tests.\nexport async function createVersionHistoryTable(\n sql: postgres.Sql,\n schemaName: string,\n) {\n // Note: The `lock` column transparently ensures that at most one row exists.\n await sql`\n CREATE SCHEMA IF NOT EXISTS ${sql(schemaName)};\n CREATE TABLE IF NOT EXISTS ${sql(schemaName)}.\"versionHistory\" (\n \"dataVersion\" int NOT NULL,\n \"schemaVersion\" int NOT NULL,\n \"minSafeVersion\" int NOT NULL,\n\n lock char(1) NOT NULL CONSTRAINT DF_schema_meta_lock DEFAULT 'v',\n CONSTRAINT PK_schema_meta_lock PRIMARY KEY (lock),\n CONSTRAINT CK_schema_meta_lock CHECK (lock='v')\n );`.simple();\n}\n\nasync function ensureVersionHistory(\n sql: postgres.Sql,\n schemaName: string,\n): Promise<VersionHistory> {\n return must(await getVersionHistory(sql, schemaName, true));\n}\n\nexport async function getVersionHistory(\n sql: postgres.Sql,\n schemaName: string,\n create = false,\n): Promise<VersionHistory | null> {\n const exists = await sql`\n SELECT nspname, relname FROM pg_class\n JOIN pg_namespace ON relnamespace = pg_namespace.oid\n WHERE nspname = ${schemaName} AND relname = ${'versionHistory'}`;\n\n if (exists.length === 0) {\n if (create) {\n await createVersionHistoryTable(sql, schemaName);\n } else {\n return null;\n }\n }\n const rows = await sql`\n SELECT \"dataVersion\", \"schemaVersion\", \"minSafeVersion\"\n FROM ${sql(schemaName)}.\"versionHistory\"`;\n\n if (rows.length === 0) {\n return create\n ? {schemaVersion: 0, dataVersion: 0, minSafeVersion: 0}\n : null;\n }\n return v.parse(rows[0], versionHistory);\n}\n\nasync function updateVersionHistory(\n log: LogContext,\n sql: postgres.Sql,\n schemaName: string,\n prev: VersionHistory,\n newVersion: number,\n minSafeVersion?: number,\n): Promise<VersionHistory> {\n assert(newVersion > 0, 'newVersion must be positive');\n const versions = {\n dataVersion: newVersion,\n // The schemaVersion never moves backwards.\n schemaVersion: Math.max(newVersion, prev.schemaVersion),\n minSafeVersion: getMinSafeVersion(log, prev, minSafeVersion),\n } satisfies VersionHistory;\n\n await sql`\n INSERT INTO ${sql(schemaName)}.\"versionHistory\" ${sql(versions)}\n ON CONFLICT (lock) DO UPDATE SET ${sql(versions)}\n `;\n return versions;\n}\n\nasync function runMigration(\n log: LogContext,\n schemaName: string,\n tx: PostgresTransaction,\n versions: VersionHistory,\n destinationVersion: number,\n migration: Migration,\n): Promise<VersionHistory> {\n if (versions.schemaVersion < destinationVersion) {\n await migration.migrateSchema?.(log, tx);\n }\n if (versions.dataVersion < destinationVersion) {\n await migration.migrateData?.(log, tx);\n }\n return updateVersionHistory(\n log,\n tx,\n schemaName,\n versions,\n destinationVersion,\n migration.minSafeVersion,\n );\n}\n\n/**\n * Bumps the rollback limit [[toAtLeast]] the specified version.\n * Leaves the rollback limit unchanged if it is equal or greater.\n */\nfunction getMinSafeVersion(\n log: LogContext,\n current: VersionHistory,\n proposedSafeVersion?: number,\n): number {\n if (proposedSafeVersion === undefined) {\n return current.minSafeVersion;\n }\n if (current.minSafeVersion >= proposedSafeVersion) {\n // The rollback limit must never move backwards.\n log.debug?.(\n `rollback limit is already at ${current.minSafeVersion}, ` +\n `don't need to bump to ${proposedSafeVersion}`,\n );\n return current.minSafeVersion;\n }\n log.info?.(\n `bumping rollback limit from ${current.minSafeVersion} to ${proposedSafeVersion}`,\n );\n return proposedSafeVersion;\n}\n"],"names":["v","v.object","v.number","v.parse"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"events.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/observability/events.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"events.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/observability/events.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAMjD,OAAO,EAAc,KAAK,UAAU,EAAC,MAAM,6BAA6B,CAAC;AAKzE,OAAO,EAAC,KAAK,SAAS,EAAC,MAAM,mCAAmC,CAAC;AACjE,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,wBAAwB,CAAC;AA+BjE;;;;GAIG;AACH,wBAAgB,aAAa,CAC3B,EAAE,EAAE,UAAU,EACd,EAAC,MAAM,EAAE,UAAU,EAAC,EAAE,IAAI,CAAC,oBAAoB,EAAE,QAAQ,GAAG,YAAY,CAAC,QAsE1E;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,GAAG,OAAa,QAO1E;AAED,wBAAgB,YAAY,CAAC,CAAC,SAAS,SAAS,EAAE,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,QAEzE;AAED,wBAAsB,oBAAoB,CAAC,CAAC,SAAS,SAAS,EAC5D,EAAE,EAAE,UAAU,EACd,KAAK,EAAE,CAAC,iBAGT;AAED,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,OAAO,GAAG,UAAU,CAevD"}
|