joist-core 2.3.0 → 2.4.0

package/build/utils.js

@@ -1,248 +1,179 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.maybePromiseThen = maybePromiseThen;
-exports.failIfAnyRejected = failIfAnyRejected;
-exports.getOrSet = getOrSet;
-exports.defineLazyGetter = defineLazyGetter;
-exports.tryResolve = tryResolve;
-exports.fail = fail;
-exports.remove = remove;
-exports.maybeRemove = maybeRemove;
-exports.maybeAdd = maybeAdd;
-exports.clear = clear;
-exports.zeroTo = zeroTo;
-exports.groupBy = groupBy;
-exports.indexBy = indexBy;
-exports.batched = batched;
-exports.partition = partition;
-exports.toArray = toArray;
-exports.assertNever = assertNever;
-exports.abbreviation = abbreviation;
-exports.asNew = asNew;
-exports.compareValues = compareValues;
-exports.mergeNormalizedHints = mergeNormalizedHints;
-exports.cleanStringValue = cleanStringValue;
-exports.cleanSql = cleanSql;
-exports.flatAndUnique = flatAndUnique;
-const EntityManager_1 = require("./EntityManager");
-const relations_1 = require("./relations");
+import { isReference } from "./relations/Reference.js";
+import { isReactiveField } from "./relations/ReactiveField.js";
+import "./relations/index.js";
+import { isDefined } from "./EntityManager.js";
+import "./Entity.js";
+//#region src/utils.ts
 /**
- * Given a `MaybePromise` of T, invoke `callback` against `T` either immediately or via `then`.
- *
- * This is the same as:
- *
- * ```
- * const r = await maybePromise;
- * return callback(r;;
- * ```
- *
- * But saves an `await` if `maybePromise` is not actually a promise.
- */
+* Given a `MaybePromise` of T, invoke `callback` against `T` either immediately or via `then`.
+*
+* This is the same as:
+*
+* ```
+* const r = await maybePromise;
+* return callback(r;;
+* ```
+*
+* But saves an `await` if `maybePromise` is not actually a promise.
+*/
 function maybePromiseThen(promiseOrObj, callback) {
-    return promiseOrObj instanceof Promise ? promiseOrObj.then(callback) : callback(promiseOrObj);
+	return promiseOrObj instanceof Promise ? promiseOrObj.then(callback) : callback(promiseOrObj);
 }
 function failIfAnyRejected(results) {
-    const rejects = results.filter((r) => r.status === "rejected");
-    // For now just throw the 1st rejection; this should be pretty rare
-    if (rejects.length > 0 && rejects[0].status === "rejected") {
-        throw rejects[0].reason;
-    }
-    return results.map((r) => r.value);
+	const rejects = results.filter((r) => r.status === "rejected");
+	if (rejects.length > 0 && rejects[0].status === "rejected") throw rejects[0].reason;
+	return results.map((r) => r.value);
 }
 function getOrSet(record, key, defaultValue) {
-    if (record[key] === undefined) {
-        record[key] = defaultValue instanceof Function ? defaultValue() : defaultValue;
-    }
-    return record[key];
+	if (record[key] === void 0) record[key] = defaultValue instanceof Function ? defaultValue() : defaultValue;
+	return record[key];
 }
 /** Defines a getter that replaces itself with its computed value on first access. */
 function defineLazyGetter(obj, key, build) {
-    Object.defineProperty(obj, key, {
-        configurable: true,
-        get: function getLazyProperty() {
-            const value = build();
-            Object.defineProperty(obj, key, { configurable: true, value });
-            return value;
-        },
-    });
+	Object.defineProperty(obj, key, {
+		configurable: true,
+		get: function getLazyProperty() {
+			const value = build();
+			Object.defineProperty(obj, key, {
+				configurable: true,
+				value
+			});
+			return value;
+		}
+	});
 }
 /**
- * A utility to ensure a Promise-returning method actually returns a promise and doesn't
- * early exit. Using `async function` guarantees these semantics, but sometimes we avoid
- * `async` as a likely-premature optimization to avoid the overhead.
- */
+* A utility to ensure a Promise-returning method actually returns a promise and doesn't
+* early exit. Using `async function` guarantees these semantics, but sometimes we avoid
+* `async` as a likely-premature optimization to avoid the overhead.
+*/
 function tryResolve(fn) {
-    try {
-        return Promise.resolve(fn());
-    }
-    catch (e) {
-        return Promise.reject(e);
-    }
+	try {
+		return Promise.resolve(fn());
+	} catch (e) {
+		return Promise.reject(e);
+	}
+}
+/** Returns whether `obj` has at least one key, without allocating a keys array. */
+function hasAnyKey(obj) {
+	for (const _ in obj) return true;
+	return false;
 }
 function fail(message) {
-    throw new Error(message || "Failed");
+	throw new Error(message || "Failed");
 }
 function remove(array, t) {
-    const index = array.indexOf(t);
-    if (index > -1) {
-        array.splice(index, 1);
-    }
+	const index = array.indexOf(t);
+	if (index > -1) array.splice(index, 1);
 }
 function maybeRemove(array, t) {
-    if (array)
-        remove(array, t);
+	if (array) remove(array, t);
 }
 function maybeAdd(array, t) {
-    if (!array.includes(t)) {
-        array.push(t);
-    }
+	if (!array.includes(t)) array.push(t);
 }
 function clear(array) {
-    array.splice(0, array.length);
+	array.splice(0, array.length);
 }
 /** Returns 0 inclusive to n exclusive. */
 function zeroTo(n) {
-    return [...Array(n).keys()];
+	return [...Array(n).keys()];
 }
 function groupBy(list, fn, valueFn) {
-    const result = new Map();
-    list.forEach((o) => {
-        const group = fn(o);
-        if (!result.has(group)) {
-            result.set(group, []);
-        }
-        result.get(group).push(valueFn === undefined ? o : valueFn(o));
-    });
-    return result;
+	const result = /* @__PURE__ */ new Map();
+	list.forEach((o) => {
+		const group = fn(o);
+		if (!result.has(group)) result.set(group, []);
+		result.get(group).push(valueFn === void 0 ? o : valueFn(o));
+	});
+	return result;
 }
 function indexBy(list, fn, valueFn) {
-    const result = new Map();
-    list.forEach((o) => {
-        const group = fn(o);
-        result.set(group, valueFn === undefined ? o : valueFn(o));
-    });
-    return result;
+	const result = /* @__PURE__ */ new Map();
+	list.forEach((o) => {
+		const group = fn(o);
+		result.set(group, valueFn === void 0 ? o : valueFn(o));
+	});
+	return result;
 }
 function batched(list, n) {
-    const result = [];
-    for (let i = 0; i < list.length; i += n) {
-        result.push(list.slice(i, i + n));
-    }
-    return result;
+	const result = [];
+	for (let i = 0; i < list.length; i += n) result.push(list.slice(i, i + n));
+	return result;
 }
 function partition(array, f) {
-    const trueElements = [];
-    const falseElements = [];
-    array.forEach((el) => {
-        if (f(el)) {
-            trueElements.push(el);
-        }
-        else {
-            falseElements.push(el);
-        }
-    });
-    return [trueElements, falseElements];
-}
-// Utility function to wrap an object or value in an array, unless it's already an array
+	const trueElements = [];
+	const falseElements = [];
+	array.forEach((el) => {
+		if (f(el)) trueElements.push(el);
+		else falseElements.push(el);
+	});
+	return [trueElements, falseElements];
+}
 function toArray(maybeArray) {
-    return Array.isArray(maybeArray) ? maybeArray : maybeArray === undefined || maybeArray === null ? [] : [maybeArray];
+	return Array.isArray(maybeArray) ? maybeArray : maybeArray === void 0 || maybeArray === null ? [] : [maybeArray];
 }
 function assertNever(x) {
-    throw new Error("Unexpected object: " + x);
+	throw new Error("Unexpected object: " + x);
 }
 function abbreviation(tableName) {
-    return tableName
-        .split("_")
-        .map((w) => w[0])
-        .join("");
+	return tableName.split("_").map((w) => w[0]).join("");
 }
 /**
- * Utility method for casting `entity` to a `New` entity.
- *
- * Note that we don't actually do any runtime checks; a very simple one would be if the id is undefined,
- * but we want this method to be used in tests that are post-`flush` but still "know" the entity is
- * effectively new / fully loaded.
- *
- * Granted, we could do a runtime check that all relations are loaded.
- */
+* Utility method for casting `entity` to a `New` entity.
+*
+* Note that we don't actually do any runtime checks; a very simple one would be if the id is undefined,
+* but we want this method to be used in tests that are post-`flush` but still "know" the entity is
+* effectively new / fully loaded.
+*
+* Granted, we could do a runtime check that all relations are loaded.
+*/
 function asNew(entity) {
-    return entity;
+	return entity;
 }
 function compareValues(av, bv, direction) {
-    const d = direction === "ASC" ? 1 : -1;
-    if ((0, relations_1.isReactiveField)(av)) {
-        av = !av.isSet ? -1 : av.get;
-    }
-    if ((0, relations_1.isReactiveField)(bv)) {
-        bv = !bv.isSet ? -1 : bv.get;
-    }
-    if ((0, relations_1.isReference)(av) && (0, relations_1.isReference)(bv)) {
-        const aIsNew = av.isLoaded && av.get?.isNewEntity;
-        const bIsNew = bv.isLoaded && bv.get?.isNewEntity;
-        const bothSame = (aIsNew && bIsNew) || (!aIsNew && !bIsNew);
-        if (!bothSame) {
-            if (aIsNew)
-                return 1 * d; // New entities are always "greater than" loaded entities
-            if (bIsNew)
-                return -1 * d; // Loaded entities are always "less than" new entities
-        }
-        av = av.idTaggedMaybe ?? (av.isLoaded && av.get?.toString()) ?? undefined;
-        bv = bv.idTaggedMaybe ?? (bv.isLoaded && bv.get?.toString()) ?? undefined;
-    }
-    if (!(0, EntityManager_1.isDefined)(av) || !(0, EntityManager_1.isDefined)(bv)) {
-        return !av && !bv ? 0 : (!av ? 1 : -1) * d;
-    }
-    else if (typeof av === "number" && typeof bv === "number") {
-        return (av - bv) * d;
-    }
-    else if (typeof av === "string" && typeof bv === "string") {
-        return av.localeCompare(bv) * d;
-    }
-    else if (av instanceof Date && bv instanceof Date) {
-        return (av.getTime() - bv.getTime()) * d;
-    }
-    else {
-        throw new Error(`Unsupported sortBy values ${av}, ${bv}`);
-    }
+	const d = direction === "ASC" ? 1 : -1;
+	if (isReactiveField(av)) av = !av.isSet ? -1 : av.get;
+	if (isReactiveField(bv)) bv = !bv.isSet ? -1 : bv.get;
+	if (isReference(av) && isReference(bv)) {
+		const aIsNew = av.isLoaded && av.get?.isNewEntity;
+		const bIsNew = bv.isLoaded && bv.get?.isNewEntity;
+		if (!(aIsNew && bIsNew || !aIsNew && !bIsNew)) {
+			if (aIsNew) return 1 * d;
+			if (bIsNew) return -1 * d;
+		}
+		av = av.idTaggedMaybe ?? (av.isLoaded && av.get?.toString()) ?? void 0;
+		bv = bv.idTaggedMaybe ?? (bv.isLoaded && bv.get?.toString()) ?? void 0;
+	}
+	if (!isDefined(av) || !isDefined(bv)) return !av && !bv ? 0 : (!av ? 1 : -1) * d;
+	else if (typeof av === "number" && typeof bv === "number") return (av - bv) * d;
+	else if (typeof av === "string" && typeof bv === "string") return av.localeCompare(bv) * d;
+	else if (av instanceof Date && bv instanceof Date) return (av.getTime() - bv.getTime()) * d;
+	else throw new Error(`Unsupported sortBy values ${av}, ${bv}`);
 }
 /** A ~naive deep merge that requires already-normalized hints and will mutate `source`. */
-// https://gist.github.com/ahtcx/0cd94e62691f539160b32ecda18af3d6
 function mergeNormalizedHints(target, source) {
-    for (const key of Object.keys(source)) {
-        // We assume both target & source are already normalized, i.e. we won't have
-        // source="books" and target={books: "title"}. They will both be {books: ...}.
-        if (target[key]) {
-            mergeNormalizedHints(source[key], target[key]);
-        }
-    }
-    Object.assign(target, source);
+	for (const key of Object.keys(source)) if (target[key]) mergeNormalizedHints(source[key], target[key]);
+	Object.assign(target, source);
 }
 const newLine = /\n/g;
 const doubleSpace = /  +/g;
 function cleanStringValue(value) {
-    // If this is not a string, coerce it -- or maybe fail?
-    let s = typeof value !== "string" && value !== undefined && value !== null ? String(value) : value;
-    // We always trim to remove leading/trailing spaces
-    s = typeof s === "string" ? s.trim() : s;
-    // And if it's empty string, we swap to undefined (null in the db)
-    return s === "" || s === null ? undefined : s;
+	let s = typeof value !== "string" && value !== void 0 && value !== null ? String(value) : value;
+	s = typeof s === "string" ? s.trim() : s;
+	return s === "" || s === null ? void 0 : s;
 }
 /** Strips new lines/indentation from our `UPDATE` string; doesn't do any actual SQL param escaping/etc. */
 function cleanSql(sql) {
-    return sql.trim().replace(newLine, "").replace(doubleSpace, " ");
+	return sql.trim().replace(newLine, "").replace(doubleSpace, " ");
 }
-// Collections return an array, so do a hot-path `.flat()`
 function flatAndUnique(list) {
-    const result = new Set();
-    for (const c of list) {
-        if (Array.isArray(c)) {
-            for (const e of c)
-                result.add(e);
-        }
-        else if (c) {
-            result.add(c);
-        }
-    }
-    return result;
-}
+	const result = /* @__PURE__ */ new Set();
+	for (const c of list) if (Array.isArray(c)) for (const e of c) result.add(e);
+	else if (c) result.add(c);
+	return result;
+}
+//#endregion
+export { abbreviation, asNew, assertNever, batched, cleanSql, cleanStringValue, clear, compareValues, defineLazyGetter, fail, failIfAnyRejected, flatAndUnique, getOrSet, groupBy, hasAnyKey, indexBy, maybeAdd, maybePromiseThen, maybeRemove, mergeNormalizedHints, partition, remove, toArray, tryResolve, zeroTo };
+
 //# sourceMappingURL=utils.js.map

package/build/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.js","names":[],"sources":["../src/utils.ts"],"sourcesContent":["import { type Entity } from \"src/Entity.ts\";\nimport { isDefined } from \"src/EntityManager.ts\";\nimport type { New } from \"src/loading/loadHints.ts\";\nimport type { OrderBy } from \"src/queries/find/EntityFilter.ts\";\nimport { isReactiveField, isReference } from \"src/relations/index.ts\";\n\nexport type MaybePromise<T> = T | Promise<T>;\n\n/**\n * Given a `MaybePromise` of T, invoke `callback` against `T` either immediately or via `then`.\n *\n * This is the same as:\n *\n * ```\n * const r = await maybePromise;\n * return callback(r;;\n * ```\n *\n * But saves an `await` if `maybePromise` is not actually a promise.\n */\nexport function maybePromiseThen<T, U>(promiseOrObj: MaybePromise<T>, callback: (obj: T) => U): MaybePromise<U> {\n  return promiseOrObj instanceof Promise ? promiseOrObj.then(callback) : callback(promiseOrObj);\n}\n\nexport function failIfAnyRejected<T>(results: PromiseSettledResult<T>[]): T[] {\n  const rejects = results.filter((r) => r.status === \"rejected\");\n  // For now just throw the 1st rejection; this should be pretty rare\n  if (rejects.length > 0 && rejects[0].status === \"rejected\") {\n    throw rejects[0].reason;\n  }\n  return results.map((r) => (r as PromiseFulfilledResult<T>).value);\n}\n\nexport function getOrSet<T extends Record<keyof unknown, unknown>>(\n  record: T,\n  key: keyof T,\n  defaultValue: T[keyof T] | (() => T[keyof T]),\n): T[keyof T] {\n  if (record[key] === undefined) {\n    record[key] = defaultValue instanceof Function ? defaultValue() : defaultValue;\n  }\n  return record[key];\n}\n\n/** Defines a getter that replaces itself with its computed value on first access. */\nexport function defineLazyGetter<T extends object, K extends keyof T>(obj: T, key: K, build: () => T[K]): void {\n  Object.defineProperty(obj, key, {\n    configurable: true,\n    get: function getLazyProperty() {\n      const value = build();\n      Object.defineProperty(obj, key, { configurable: true, value });\n      return value;\n    },\n  });\n}\n\n/**\n * A utility to ensure a Promise-returning method actually returns a promise and doesn't\n * early exit. Using `async function` guarantees these semantics, but sometimes we avoid\n * `async` as a likely-premature optimization to avoid the overhead.\n */\nexport function tryResolve<T>(fn: () => T): Promise<T> {\n  try {\n    return Promise.resolve(fn());\n  } catch (e) {\n    return Promise.reject(e);\n  }\n}\n\n/** Returns whether `obj` has at least one key, without allocating a keys array. */\nexport function hasAnyKey(obj: Record<any, any> | undefined): boolean {\n  for (const _ in obj) return true;\n  return false;\n}\n\nexport function fail(message?: string): never {\n  throw new Error(message || \"Failed\");\n}\n\nexport function remove<T>(array: T[], t: T): void {\n  const index = array.indexOf(t);\n  if (index > -1) {\n    array.splice(index, 1);\n  }\n}\n\nexport function maybeRemove<T>(array: T[] | undefined, t: T): void {\n  if (array) remove(array, t);\n}\n\nexport function maybeAdd<T>(array: T[], t: T): void {\n  if (!array.includes(t)) {\n    array.push(t);\n  }\n}\n\nexport function clear<T>(array: T[]): void {\n  array.splice(0, array.length);\n}\n\n/** Returns 0 inclusive to n exclusive. */\nexport function zeroTo(n: number): number[] {\n  return [...Array(n).keys()];\n}\n\nexport function groupBy<T, Y = T, K = string>(list: readonly T[], fn: (x: T) => K, valueFn?: (x: T) => Y): Map<K, Y[]> {\n  const result = new Map<K, Y[]>();\n  list.forEach((o) => {\n    const group = fn(o);\n    if (!result.has(group)) {\n      result.set(group, []);\n    }\n    result.get(group)!.push(valueFn === undefined ? (o as any as Y) : valueFn(o));\n  });\n  return result;\n}\n\nexport function indexBy<T, Y = T, K = string>(list: T[], fn: (x: T) => K, valueFn?: (x: T) => Y): Map<K, Y> {\n  const result = new Map<K, Y>();\n  list.forEach((o) => {\n    const group = fn(o);\n    result.set(group, valueFn === undefined ? (o as any as Y) : valueFn(o));\n  });\n  return result;\n}\n\nexport function batched<T>(list: Array<T>, n: number): T[][] {\n  const result = [] as T[][];\n  for (let i = 0; i < list.length; i += n) {\n    result.push(list.slice(i, i + n));\n  }\n  return result;\n}\n\nexport function partition<T>(array: ReadonlyArray<T>, f: (el: T) => boolean): [T[], T[]] {\n  const trueElements: T[] = [];\n  const falseElements: T[] = [];\n  array.forEach((el) => {\n    if (f(el)) {\n      trueElements.push(el);\n    } else {\n      falseElements.push(el);\n    }\n  });\n  return [trueElements, falseElements];\n}\n\n// Utility function to wrap an object or value in an array, unless it's already an array\nexport function toArray<T>(maybeArray: T | T[] | undefined | null): T[] {\n  return Array.isArray(maybeArray) ? maybeArray : maybeArray === undefined || maybeArray === null ? [] : [maybeArray];\n}\n\n// Utility type to strip off null and defined and infer only T.\nexport type NullOrDefinedOr<T> = T | null | undefined;\n\nexport function assertNever(x: never): never {\n  throw new Error(\"Unexpected object: \" + x);\n}\n\nexport function abbreviation(tableName: string): string {\n  return tableName\n    .split(\"_\")\n    .map((w) => w[0])\n    .join(\"\");\n}\n\n/**\n * Utility method for casting `entity` to a `New` entity.\n *\n * Note that we don't actually do any runtime checks; a very simple one would be if the id is undefined,\n * but we want this method to be used in tests that are post-`flush` but still \"know\" the entity is\n * effectively new / fully loaded.\n *\n * Granted, we could do a runtime check that all relations are loaded.\n */\nexport function asNew<T extends Entity>(entity: T): New<T> {\n  return entity as New<T>;\n}\n\nexport function compareValues(av: any, bv: any, direction: OrderBy): number {\n  const d = direction === \"ASC\" ? 1 : -1;\n  if (isReactiveField(av)) {\n    av = !av.isSet ? -1 : av.get;\n  }\n  if (isReactiveField(bv)) {\n    bv = !bv.isSet ? -1 : bv.get;\n  }\n  if (isReference(av) && isReference(bv)) {\n    const aIsNew = av.isLoaded && (av as any).get?.isNewEntity;\n    const bIsNew = bv.isLoaded && (bv as any).get?.isNewEntity;\n    const bothSame = (aIsNew && bIsNew) || (!aIsNew && !bIsNew);\n    if (!bothSame) {\n      if (aIsNew) return 1 * d; // New entities are always \"greater than\" loaded entities\n      if (bIsNew) return -1 * d; // Loaded entities are always \"less than\" new entities\n    }\n    av = av.idTaggedMaybe ?? (av.isLoaded && (av as any).get?.toString()) ?? undefined;\n    bv = bv.idTaggedMaybe ?? (bv.isLoaded && (bv as any).get?.toString()) ?? undefined;\n  }\n  if (!isDefined(av) || !isDefined(bv)) {\n    return !av && !bv ? 0 : (!av ? 1 : -1) * d;\n  } else if (typeof av === \"number\" && typeof bv === \"number\") {\n    return (av - bv) * d;\n  } else if (typeof av === \"string\" && typeof bv === \"string\") {\n    return av.localeCompare(bv) * d;\n  } else if (av instanceof Date && bv instanceof Date) {\n    return ((av as Date).getTime() - (bv as Date).getTime()) * d;\n  } else {\n    throw new Error(`Unsupported sortBy values ${av}, ${bv}`);\n  }\n}\n\n/** A ~naive deep merge that requires already-normalized hints and will mutate `source`. */\n// https://gist.github.com/ahtcx/0cd94e62691f539160b32ecda18af3d6\nexport function mergeNormalizedHints(target: any, source: any): void {\n  for (const key of Object.keys(source)) {\n    // We assume both target & source are already normalized, i.e. we won't have\n    // source=\"books\" and target={books: \"title\"}. They will both be {books: ...}.\n    if (target[key]) {\n      mergeNormalizedHints(source[key], target[key]);\n    }\n  }\n  Object.assign(target, source);\n}\n\nconst newLine = /\\n/g;\nconst doubleSpace = /  +/g;\n\nexport function cleanStringValue(value: unknown): string | undefined {\n  // If this is not a string, coerce it -- or maybe fail?\n  let s = typeof value !== \"string\" && value !== undefined && value !== null ? String(value) : value;\n  // We always trim to remove leading/trailing spaces\n  s = typeof s === \"string\" ? s.trim() : s;\n  // And if it's empty string, we swap to undefined (null in the db)\n  return s === \"\" || s === null ? undefined : s;\n}\n\n/** Strips new lines/indentation from our `UPDATE` string; doesn't do any actual SQL param escaping/etc. */\nexport function cleanSql(sql: string): string {\n  return sql.trim().replace(newLine, \"\").replace(doubleSpace, \" \");\n}\n\n// Collections return an array, so do a hot-path `.flat()`\nexport function flatAndUnique<T extends unknown>(list: (T | T[] | undefined)[]): Set<T> {\n  const result = new Set<T>();\n  for (const c of list) {\n    if (Array.isArray(c)) {\n      for (const e of c) result.add(e);\n    } else if (c) {\n      result.add(c);\n    }\n  }\n  return result;\n}\n"],"mappings":"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"}

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "joist-core",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "license": "MIT",
+  "type": "module",
   "repository": {
     "type": "git",
     "url": "https://github.com/joist-orm/joist-orm.git",
@@ -10,33 +11,52 @@
   "engines": {
     "node": "^12.17.0 || ^13.10.0 || ^14 || >= 16.0.0 < 16.2.0 || >= 16.3.0"
   },
-  "main": "build/index.js",
-  "types": "build/index.d.ts",
+  "main": "build/index.cjs",
+  "module": "build/index.js",
+  "types": "build/index.d.mts",
+  "exports": {
+    ".": {
+      "bun": {
+        "types": "./build/index.d.mts",
+        "default": "./build/index.js"
+      },
+      "module-sync": {
+        "types": "./build/index.d.mts",
+        "default": "./build/index.js"
+      },
+      "import": {
+        "types": "./build/index.d.mts",
+        "default": "./build/index.js"
+      },
+      "require": {
+        "types": "./build/index.d.cts",
+        "default": "./build/index.cjs"
+      },
+      "default": "./build/index.js"
+    }
+  },
   "scripts": {
-    "test": "jest",
-    "format": "prettier --ignore-path ../../.prettierignore  --write '{schema,migrations,src}/**/*.{ts,js,tsx,jsx,graphql}'"
+    "test": "jest"
   },
   "files": [
     "build"
   ],
   "peerDependencies": {
-    "joist-utils": "2.3.0"
+    "joist-utils": "2.4.0"
   },
   "dependencies": {
     "ansis": "^4.3.1",
-    "dataloader": "^2.2.3"
+    "dataloader": "^2.2.3",
+    "temporal-spec": "^1.0.1"
   },
   "devDependencies": {
-    "@swc/core": "^1.15.43",
+    "@swc/core": "^1.16.1",
     "@swc/jest": "^0.2.39",
     "@types/jest": "^30.0.0",
-    "@types/node": "^26.0.1",
+    "@types/node": "^26.2.0",
     "jest": "30.4.2",
-    "prettier": "^3.8.4",
-    "prettier-plugin-organize-imports": "^4.3.0",
-    "temporal-polyfill": "^0.3.2",
-    "ts-node-dev": "^2.0.0",
+    "temporal-polyfill": "^1.0.4",
     "tsconfig-paths": "^4.2.0",
-    "typescript": "6.0.3"
+    "typescript": "7.0.2"
   }
 }

package/build/AliasAssigner.d.ts

@@ -1,10 +0,0 @@
-import { ParsedFindQuery } from "./QueryParser";
-export declare class AliasAssigner {
-    #private;
-    constructor(query?: ParsedFindQuery);
-    /** Returns an abbreviated alias for a table name, e.g. `"books"` → `"b"`, `"book_reviews"` → `"br"`. */
-    getAlias(tableName: string): string;
-    /** Returns an alias using the name as-is (no abbreviation), e.g. `"prequel"` → `"prequel"`. */
-    getLiteralAlias(name: string): string;
-}
-//# sourceMappingURL=AliasAssigner.d.ts.map

package/build/AliasAssigner.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"AliasAssigner.d.ts","sourceRoot":"","sources":["../src/AliasAssigner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAGhD,qBAAa,aAAa;;gBAGZ,KAAK,CAAC,EAAE,eAAe;IAgBnC,wGAAwG;IACxG,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAKnC,+FAA+F;IAC/F,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;CAStC"}

package/build/AliasAssigner.js

@@ -1,39 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AliasAssigner = void 0;
-const utils_1 = require("./utils");
-class AliasAssigner {
-    #aliases = {};
-    constructor(query) {
-        this.getAlias = this.getAlias.bind(this);
-        this.getLiteralAlias = this.getLiteralAlias.bind(this);
-        // If we're assigning aliases into an existing query, get the current assignments
-        if (query) {
-            for (const table of query.tables) {
-                // Ignore CTI base/sub aliases
-                if (table.alias.includes("_"))
-                    continue;
-                const abbrev = (0, utils_1.abbreviation)(table.table);
-                const i = this.#aliases[abbrev] || 0;
-                const j = Number(table.alias.replace(abbrev, "")) + 1;
-                this.#aliases[abbrev] = Math.max(i, j);
-            }
-        }
-    }
-    /** Returns an abbreviated alias for a table name, e.g. `"books"` → `"b"`, `"book_reviews"` → `"br"`. */
-    getAlias(tableName) {
-        const abbrev = (0, utils_1.abbreviation)(tableName);
-        return this.#nextAlias(abbrev);
-    }
-    /** Returns an alias using the name as-is (no abbreviation), e.g. `"prequel"` → `"prequel"`. */
-    getLiteralAlias(name) {
-        return this.#nextAlias(name);
-    }
-    #nextAlias(key) {
-        const i = this.#aliases[key] || 0;
-        this.#aliases[key] = i + 1;
-        return i === 0 ? key : `${key}${i}`;
-    }
-}
-exports.AliasAssigner = AliasAssigner;
-//# sourceMappingURL=AliasAssigner.js.map

package/build/AliasAssigner.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"AliasAssigner.js","sourceRoot":"","sources":["../src/AliasAssigner.ts"],"names":[],"mappings":";;;AACA,mCAAuC;AAEvC,MAAa,aAAa;IACxB,QAAQ,GAA2B,EAAE,CAAC;IAEtC,YAAY,KAAuB;QACjC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvD,iFAAiF;QACjF,IAAI,KAAK,EAAE,CAAC;YACV,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;gBACjC,8BAA8B;gBAC9B,IAAI,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC;oBAAE,SAAS;gBACxC,MAAM,MAAM,GAAG,IAAA,oBAAY,EAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBACzC,MAAM,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBACrC,MAAM,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC;gBACtD,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YACzC,CAAC;QACH,CAAC;IACH,CAAC;IAED,wGAAwG;IACxG,QAAQ,CAAC,SAAiB;QACxB,MAAM,MAAM,GAAG,IAAA,oBAAY,EAAC,SAAS,CAAC,CAAC;QACvC,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IACjC,CAAC;IAED,+FAA+F;IAC/F,eAAe,CAAC,IAAY;QAC1B,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC;IAED,UAAU,CAAC,GAAW;QACpB,MAAM,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAClC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC3B,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,EAAE,CAAC;IACtC,CAAC;CACF;AAnCD,sCAmCC"}