@danceroutine/tango-orm 1.6.0 → 1.7.0

package/dist/index.js

@@ -3,9 +3,9 @@ import { PostgresAdapter } from "./PostgresAdapter-CMiEpHya.js";
 import "./SqliteClient-CjOK9-ki.js";
 import { SqliteAdapter } from "./SqliteAdapter-CeqhyrPC.js";
 import { AdapterRegistry, connectDB, connection_exports, getDefaultAdapterRegistry } from "./connection-B_K2ZAf7.js";
-import { QBuilder, QueryCompiler, QueryResult, QuerySet, query_exports } from "./query-C6So1r6H.js";
+import { QBuilder, QueryCompiler, QueryResult, QuerySet, query_exports } from "./query-FZJoSCg4.js";
 import { TangoRuntime, getTangoRuntime, initializeTangoRuntime, resetTangoRuntime } from "./defaultRuntime-BPK9kWEW.js";
-import { ModelManager } from "./registerModelObjects-BKMpfc4Z.js";
+import { ModelManager } from "./registerModelObjects-C-1RbUHS.js";
 import { manager_exports } from "./manager-C6oJ2tAF.js";
 import { runtime_exports } from "./runtime-ByXbpVBS.js";
 import { UnitOfWork, atomic, transaction_exports } from "./transaction-Cs0Z9tbW.js";

package/dist/manager/ManagerLike.d.ts

@@ -1,3 +1,5 @@
+import type { QNode } from '../query/domain/QNode';
+import type { FilterInput } from '../query/domain/FilterInput';
 import type { QuerySet } from '../query/index';
 import type { TableMeta } from '../query/domain/index';
 /**
@@ -6,6 +8,23 @@ import type { TableMeta } from '../query/domain/index';
 export interface ManagerLike<TModelRow extends Record<string, unknown>, TSourceModel = unknown> {
     readonly meta: TableMeta;
     query(): QuerySet<TModelRow, TModelRow, TSourceModel>;
+    all(): QuerySet<TModelRow, TModelRow, TSourceModel>;
+    getOrCreate(args: {
+        where: FilterInput<TModelRow> | QNode<TModelRow>;
+        defaults?: Partial<TModelRow>;
+    }): Promise<{
+        record: TModelRow;
+        created: boolean;
+    }>;
+    updateOrCreate(args: {
+        where: FilterInput<TModelRow> | QNode<TModelRow>;
+        defaults?: Partial<TModelRow>;
+        update?: Partial<TModelRow>;
+    }): Promise<{
+        record: TModelRow;
+        created: boolean;
+        updated: boolean;
+    }>;
     findById(id: TModelRow[keyof TModelRow]): Promise<TModelRow | null>;
     getOrThrow(id: TModelRow[keyof TModelRow]): Promise<TModelRow>;
     create(input: Partial<TModelRow>): Promise<TModelRow>;

package/dist/manager/ModelManager.d.ts

@@ -1,6 +1,7 @@
+import type { QNode } from '../query/domain/QNode';
 import type { ModelWriteHooks } from '@danceroutine/tango-schema';
 import type { Model as SchemaModel } from '@danceroutine/tango-schema/domain';
-import type { TableMeta } from '../query/domain/index';
+import type { FilterInput, TableMeta } from '../query/domain/index';
 import type { QuerySet } from '../query/index';
 import type { TangoRuntime } from '../runtime/TangoRuntime';
 import type { ManagerLike } from './ManagerLike';
@@ -39,7 +40,29 @@ export declare class ModelManager<TModelRow extends Record<string, unknown>, TSo
      */
     static isModelManager<TModelRow extends Record<string, unknown>>(value: unknown): value is ModelManager<TModelRow>;
     private static createTableMeta;
+    private static mergeCreatePayloadFromWhere;
+    private static countNonPkValues;
+    private static collectPlainFieldsFromQNode;
+    private static omitLookupKeysFromAtom;
+    private static mergeCompatiblePartials;
     query(): QuerySet<TModelRow, TModelRow, TSourceModel>;
+    all(): QuerySet<TModelRow, TModelRow, TSourceModel>;
+    getOrCreate(args: {
+        where: FilterInput<TModelRow> | QNode<TModelRow>;
+        defaults?: Partial<TModelRow>;
+    }): Promise<{
+        record: TModelRow;
+        created: boolean;
+    }>;
+    updateOrCreate(args: {
+        where: FilterInput<TModelRow> | QNode<TModelRow>;
+        defaults?: Partial<TModelRow>;
+        update?: Partial<TModelRow>;
+    }): Promise<{
+        record: TModelRow;
+        created: boolean;
+        updated: boolean;
+    }>;
     findById(id: TModelRow[keyof TModelRow]): Promise<TModelRow | null>;
     getOrThrow(id: TModelRow[keyof TModelRow]): Promise<TModelRow>;
     create(input: Partial<TModelRow>): Promise<TModelRow>;

package/dist/manager/index.js

@@ -1,8 +1,8 @@
 import "../PostgresClient-BQJZfEOT.js";
 import "../SqliteClient-CjOK9-ki.js";
-import "../query-C6So1r6H.js";
+import "../query-FZJoSCg4.js";
 import "../defaultRuntime-BPK9kWEW.js";
-import { ModelManager, registerModelObjects } from "../registerModelObjects-BKMpfc4Z.js";
+import { ModelManager, registerModelObjects } from "../registerModelObjects-C-1RbUHS.js";
 import "../manager-C6oJ2tAF.js";
 
 export { ModelManager, registerModelObjects };

package/dist/manager-C6oJ2tAF.js

@@ -1,5 +1,5 @@
 import { __export } from "./chunk-DLY2FNSh.js";
-import { ModelManager, registerModelObjects } from "./registerModelObjects-BKMpfc4Z.js";
+import { ModelManager, registerModelObjects } from "./registerModelObjects-C-1RbUHS.js";
 
 //#region src/manager/index.ts
 var manager_exports = {};

package/dist/query/QuerySet.d.ts

@@ -68,6 +68,7 @@ export declare class QuerySet<TModel extends Record<string, unknown>, TBaseResul
      * Narrow an unknown value to `QuerySet`.
      */
     static isQuerySet<TModel extends Record<string, unknown>, TResult extends Record<string, unknown> = TModel>(value: unknown): value is QuerySet<TModel, TResult>;
+    private static invertOrderSpec;
     /**
      * Add a filter expression to the query.
      *
@@ -121,6 +122,7 @@ export declare class QuerySet<TModel extends Record<string, unknown>, TBaseResul
      * app-local registry current.
      */
     prefetchRelated<TTargetModel = undefined, const TRelationName extends RelationKeys<PrefetchRelatedRelations<TSourceModel, NoInfer<TTargetModel>>> | GeneratedPrefetchRelatedPathKeys<TSourceModel> = RelationKeys<PrefetchRelatedRelations<TSourceModel, NoInfer<TTargetModel>>> | GeneratedPrefetchRelatedPathKeys<TSourceModel>>(...rels: readonly TRelationName[]): QuerySet<TModel, TBaseResult, TSourceModel, THydrated & MaybeHydratedRelationMap<TSourceModel, PrefetchRelatedRelations<TSourceModel, NoInfer<TTargetModel>>, Extract<TRelationName, RelationKeys<PrefetchRelatedRelations<TSourceModel, NoInfer<TTargetModel>>>>, ManyRelationHydrationCardinality> & GeneratedHydratedRelationMap<TSourceModel, Extract<TRelationName, GeneratedPrefetchRelatedPathKeys<TSourceModel>>>>;
+    all(): QuerySet<TModel, TBaseResult, TSourceModel, THydrated>;
     /**
      * Execute the query and optionally shape each row.
      *
@@ -149,6 +151,15 @@ export declare class QuerySet<TModel extends Record<string, unknown>, TBaseResul
     fetchOne<Out>(shape: QueryShapeFunction<HydratedQueryResult<TBaseResult, THydrated>, Out>): Promise<Out | null>;
     fetchOne<Out>(shape: QueryShapeParser<HydratedQueryResult<TBaseResult, THydrated>, Out>): Promise<Out | null>;
     fetchOne<TShape extends QueryShape<HydratedQueryResult<TBaseResult, THydrated>> | undefined>(shape: TShape): Promise<HydratedQueryResult<TBaseResult, THydrated> | QueryShapeOutput<HydratedQueryResult<TBaseResult, THydrated>, NonNullable<TShape>> | null>;
+    first(): Promise<HydratedQueryResult<TBaseResult, THydrated> | null>;
+    first<Out>(shape: QueryShapeFunction<HydratedQueryResult<TBaseResult, THydrated>, Out>): Promise<Out | null>;
+    first<Out>(shape: QueryShapeParser<HydratedQueryResult<TBaseResult, THydrated>, Out>): Promise<Out | null>;
+    last(): Promise<HydratedQueryResult<TBaseResult, THydrated> | null>;
+    last<Out>(shape: QueryShapeFunction<HydratedQueryResult<TBaseResult, THydrated>, Out>): Promise<Out | null>;
+    last<Out>(shape: QueryShapeParser<HydratedQueryResult<TBaseResult, THydrated>, Out>): Promise<Out | null>;
+    get(q: FilterInput<TModel> | QNode<TModel>): Promise<HydratedQueryResult<TBaseResult, THydrated>>;
+    get<Out>(q: FilterInput<TModel> | QNode<TModel>, shape: QueryShapeFunction<HydratedQueryResult<TBaseResult, THydrated>, Out>): Promise<Out>;
+    get<Out>(q: FilterInput<TModel> | QNode<TModel>, shape: QueryShapeParser<HydratedQueryResult<TBaseResult, THydrated>, Out>): Promise<Out>;
     /**
      * Execute a `COUNT(*)` query for the current filtered state.
      */
@@ -157,6 +168,7 @@ export declare class QuerySet<TModel extends Record<string, unknown>, TBaseResul
      * Return whether at least one row matches the current query state.
      */
     exists(): Promise<boolean>;
+    private shapeFetchedRow;
     private getOrCreateEvaluationCache;
     private evaluateRows;
     private normalizeHydratedRowsForParserShape;

package/dist/query/index.js

@@ -1,3 +1,3 @@
-import { QBuilder, QueryCompiler, QueryResult, QuerySet, compiler_exports, domain_exports } from "../query-C6So1r6H.js";
+import { QBuilder, QueryCompiler, QueryResult, QuerySet, compiler_exports, domain_exports } from "../query-FZJoSCg4.js";
 
 export { QBuilder as Q, QBuilder, QueryCompiler, QueryResult, QuerySet, compiler_exports as compiler, domain_exports as domain };

package/dist/query/internal/isQNodeLike.d.ts

@@ -0,0 +1,3 @@
+import type { FilterInput } from '../domain/FilterInput';
+import type { QNode } from '../domain/QNode';
+export declare function isQNodeLike<T>(value: FilterInput<T> | QNode<T>): value is QNode<T>;

package/dist/{query-C6So1r6H.js → query-FZJoSCg4.js}

@@ -1,7 +1,16 @@
 import { __export } from "./chunk-DLY2FNSh.js";
-import { SqlSafetyEngine, getLogger, isError } from "@danceroutine/tango-core";
+import { MultipleObjectsReturned, NotFoundError, SqlSafetyEngine, getLogger, isError } from "@danceroutine/tango-core";
 import { ModelRegistry } from "@danceroutine/tango-schema";
 
+//#region src/query/domain/internal/InternalQNodeType.ts
+const InternalQNodeType = {
+	ATOM: "atom",
+	AND: "and",
+	OR: "or",
+	NOT: "not"
+};
+
+//#endregion
 //#region src/query/domain/internal/InternalRelationKind.ts
 const InternalRelationKind = {
 	HAS_MANY: "hasMany",
@@ -83,15 +92,6 @@ const InternalDialect = {
 	SQLITE: "sqlite"
 };
 
-//#endregion
-//#region src/query/domain/internal/InternalQNodeType.ts
-const InternalQNodeType = {
-	ATOM: "atom",
-	AND: "and",
-	OR: "or",
-	NOT: "not"
-};
-
 //#endregion
 //#region src/query/domain/internal/InternalLookupType.ts
 const InternalLookupType = {
@@ -821,6 +821,19 @@ const InternalDirection = {
 	DESC: "desc"
 };
 
+//#endregion
+//#region src/query/internal/isQNodeLike.ts
+function isQNodeLike(value) {
+	if (typeof value !== "object" || value === null || "__tangoBrand" in value) return false;
+	switch (value.kind) {
+		case InternalQNodeType.ATOM: return "where" in value;
+		case InternalQNodeType.AND:
+		case InternalQNodeType.OR: return Array.isArray(value.nodes);
+		case InternalQNodeType.NOT: return "node" in value;
+		default: return false;
+	}
+}
+
 //#endregion
 //#region src/query/QBuilder.ts
 var QBuilder = class QBuilder {
@@ -860,7 +873,7 @@ var QBuilder = class QBuilder {
 		};
 	}
 	static wrapNode(input) {
-		if (input.kind) return input;
+		if (isQNodeLike(input)) return input;
 		return {
 			kind: InternalQNodeType.ATOM,
 			where: input
@@ -884,13 +897,20 @@ var QuerySet = class QuerySet {
 	static isQuerySet(value) {
 		return typeof value === "object" && value !== null && value.__tangoBrand === QuerySet.BRAND;
 	}
+	static invertOrderSpec(order) {
+		if (!order?.length) return [];
+		return order.map((spec) => ({
+			by: spec.by,
+			dir: spec.dir === InternalDirection.ASC ? InternalDirection.DESC : InternalDirection.ASC
+		}));
+	}
 	/**
 	* Add a filter expression to the query.
 	*
 	* Multiple `filter()` calls are composed with `AND`.
 	*/
 	filter(q) {
-		const wrapped = q.kind ? q : {
+		const wrapped = isQNodeLike(q) ? q : {
 			kind: InternalQNodeType.ATOM,
 			where: q
 		};
@@ -906,7 +926,7 @@ var QuerySet = class QuerySet {
 	* Exclusions are translated to `NOT (...)` predicates.
 	*/
 	exclude(q) {
-		const wrapped = q.kind ? q : {
+		const wrapped = isQNodeLike(q) ? q : {
 			kind: InternalQNodeType.ATOM,
 			where: q
 		};
@@ -989,6 +1009,9 @@ var QuerySet = class QuerySet {
 			prefetchRelated: [...rels]
 		});
 	}
+	all() {
+		return new QuerySet(this.executor, { ...this.state });
+	}
 	async fetch(shape) {
 		const baseResult = await this.getOrCreateEvaluationCache();
 		if (!shape) return baseResult;
@@ -1012,6 +1035,36 @@ var QuerySet = class QuerySet {
 		for (const row of result) return row;
 		return null;
 	}
+	async first(shape) {
+		return this.fetchOne(shape);
+	}
+	async last(shape) {
+		if (this.state.limit !== undefined || this.state.offset !== undefined) {
+			const page = await this.fetch();
+			const row = page.at(-1);
+			if (!row) return null;
+			return this.shapeFetchedRow(row, shape);
+		}
+		const invertedOrder = QuerySet.invertOrderSpec(this.state.order);
+		const effectiveOrder = invertedOrder.length > 0 ? invertedOrder : [{
+			by: this.executor.meta.pk,
+			dir: InternalDirection.DESC
+		}];
+		const qs = new QuerySet(this.executor, {
+			...this.state,
+			order: effectiveOrder
+		});
+		return qs.limit(1).fetchOne(shape);
+	}
+	async get(q, shape) {
+		const limited = this.filter(q).limit(2);
+		const page = await limited.fetch();
+		const rows = page.items;
+		const count = rows.length;
+		if (count === 0) throw new NotFoundError(`${this.executor.meta.table}: no matching record`);
+		if (count > 1) throw new MultipleObjectsReturned(`${this.executor.meta.table}: more than one matching record`);
+		return this.shapeFetchedRow(rows[0], shape);
+	}
 	/**
 	* Execute a `COUNT(*)` query for the current filtered state.
 	*/
@@ -1029,6 +1082,12 @@ var QuerySet = class QuerySet {
 		const count = await this.count();
 		return count > 0;
 	}
+	shapeFetchedRow(row, shape) {
+		if (!shape) return row;
+		if (typeof shape === "function") return shape(row);
+		const normalizedRow = this.normalizeHydratedRowsForParserShape([row])[0] ?? row;
+		return shape.parse(normalizedRow);
+	}
 	getOrCreateEvaluationCache() {
 		if (!this.evaluationCache) this.evaluationCache = this.evaluateRows().catch((error) => {
 			this.evaluationCache = undefined;
@@ -1194,5 +1253,5 @@ __export(query_exports, {
 });
 
 //#endregion
-export { OrmSqlSafetyAdapter, QBuilder, QueryCompiler, QueryResult, QuerySet, TableMetaFactory, compiler_exports, domain_exports, query_exports };
-//# sourceMappingURL=query-C6So1r6H.js.map
+export { InternalQNodeType, OrmSqlSafetyAdapter, QBuilder, QueryCompiler, QueryResult, QuerySet, TableMetaFactory, compiler_exports, domain_exports, isQNodeLike, query_exports };
+//# sourceMappingURL=query-FZJoSCg4.js.map