@loomcore/api 0.2.19 → 0.2.21

package/dist/controllers/auth.controller.js

@@ -1,4 +1,4 @@
-import { EmptyUserContext, passwordValidator, TokenResponseSpec, } from "@loomcore/common/models";
+import { EmptyUserContext, passwordValidator, TokenResponseSpec, UserSpec, } from "@loomcore/common/models";
 import { entityUtils } from "@loomcore/common/utils";
 import { config } from "../config/base-api-config.js";
 import { BadRequestError, UnauthenticatedError } from "../errors/index.js";
@@ -16,8 +16,12 @@ export class AuthController {
     loginResponseSpec;
     constructor(app, database, options = {}) {
         this.database = database;
+        const userSpecFromService = options.userService?.getModelSpec();
+        const inheritedUserSpec = userSpecFromService && userSpecFromService !== UserSpec
+            ? userSpecFromService
+            : undefined;
         const resolved = resolveAuthUserSpecs({
-            userSpec: options.userSpec,
+            userSpec: options.userSpec ?? inheritedUserSpec,
             publicUserSpec: options.publicUserSpec,
         });
         this.userSpec = resolved.userSpec;
@@ -27,8 +31,9 @@ export class AuthController {
         this.userService =
             options.userService ?? new UserService(database, this.userSpec);
         this.organizationService = new OrganizationService(database);
-        if (options.userSpec) {
-            setAuthUserContextSpec(createUserContextSpec(this.userSpec));
+        const jwtUserModelSpec = options.userSpec ?? inheritedUserSpec ?? options.publicUserSpec;
+        if (jwtUserModelSpec) {
+            setAuthUserContextSpec(createUserContextSpec(jwtUserModelSpec));
         }
         this.mapRoutes(app);
     }

package/dist/databases/postgres/commands/postgres-full-update-by-id.command.js

@@ -1,5 +1,9 @@
+import { LeftJoin } from "../../operations/left-join.operation.js";
+import { InnerJoin } from "../../operations/inner-join.operation.js";
+import { LeftJoinMany } from "../../operations/left-join-many.operation.js";
 import { BadRequestError, IdNotFoundError } from "../../../errors/index.js";
 import { buildJoinClauses } from '../utils/build-join-clauses.js';
+import { buildSelectClause } from '../utils/build-select-clause.js';
 export async function fullUpdateById(client, operations, id, entity, pluralResourceName) {
     try {
         const tableColumns = await client.query(`
@@ -49,16 +53,25 @@ export async function fullUpdateById(client, operations, id, entity, pluralResou
         if (result.rowCount === 0) {
             throw new IdNotFoundError();
         }
-        const joinClauses = buildJoinClauses(operations, pluralResourceName);
+        const hasJoins = operations.some(op => op instanceof LeftJoin || op instanceof InnerJoin || op instanceof LeftJoinMany);
+        const joinClauses = hasJoins
+            ? buildJoinClauses(operations, pluralResourceName, { oneToOneOnly: true })
+            : buildJoinClauses(operations, pluralResourceName);
+        const selectClause = hasJoins
+            ? await buildSelectClause(client, pluralResourceName, operations)
+            : '*';
+        const idColumn = hasJoins ? `"${pluralResourceName}"."_id"` : '"_id"';
         const selectQuery = `
-            SELECT * FROM "${pluralResourceName}" ${joinClauses}
-            WHERE "_id" = $1 LIMIT 1
+            SELECT ${selectClause} FROM "${pluralResourceName}" ${joinClauses}
+            WHERE ${idColumn} = $1 LIMIT 1
         `;
         const selectResult = await client.query(selectQuery, [id]);
         if (selectResult.rows.length === 0) {
             throw new IdNotFoundError();
         }
-        return selectResult.rows[0];
+        return hasJoins
+            ? selectResult.rows[0].entity
+            : selectResult.rows[0];
     }
     catch (err) {
         if (err instanceof IdNotFoundError) {

package/dist/databases/postgres/commands/postgres-partial-update-by-id.command.js

@@ -1,5 +1,9 @@
+import { LeftJoin } from "../../operations/left-join.operation.js";
+import { InnerJoin } from "../../operations/inner-join.operation.js";
+import { LeftJoinMany } from "../../operations/left-join-many.operation.js";
 import { BadRequestError, IdNotFoundError } from "../../../errors/index.js";
 import { buildJoinClauses } from '../utils/build-join-clauses.js';
+import { buildSelectClause } from '../utils/build-select-clause.js';
 import { columnsAndValuesFromEntity } from '../utils/columns-and-values-from-entity.js';
 export async function partialUpdateById(client, operations, id, entity, pluralResourceName) {
     try {
@@ -19,16 +23,25 @@ export async function partialUpdateById(client, operations, id, entity, pluralRe
         if (result.rowCount === 0) {
             throw new IdNotFoundError();
         }
-        const joinClauses = buildJoinClauses(operations, pluralResourceName);
+        const hasJoins = operations.some(op => op instanceof LeftJoin || op instanceof InnerJoin || op instanceof LeftJoinMany);
+        const joinClauses = hasJoins
+            ? buildJoinClauses(operations, pluralResourceName, { oneToOneOnly: true })
+            : buildJoinClauses(operations, pluralResourceName);
+        const selectClause = hasJoins
+            ? await buildSelectClause(client, pluralResourceName, operations)
+            : '*';
+        const idColumn = hasJoins ? `"${pluralResourceName}"."_id"` : '"_id"';
         const selectQuery = `
-            SELECT * FROM "${pluralResourceName}" ${joinClauses}
-            WHERE "_id" = $1 LIMIT 1
+            SELECT ${selectClause} FROM "${pluralResourceName}" ${joinClauses}
+            WHERE ${idColumn} = $1 LIMIT 1
         `;
         const selectResult = await client.query(selectQuery, [id]);
         if (selectResult.rows.length === 0) {
             throw new IdNotFoundError();
         }
-        return selectResult.rows[0];
+        return hasJoins
+            ? selectResult.rows[0].entity
+            : selectResult.rows[0];
     }
     catch (err) {
         if (err instanceof IdNotFoundError) {

package/dist/databases/postgres/commands/postgres-update.command.js

@@ -1,7 +1,11 @@
+import { LeftJoin } from "../../operations/left-join.operation.js";
+import { InnerJoin } from "../../operations/inner-join.operation.js";
+import { LeftJoinMany } from "../../operations/left-join-many.operation.js";
 import { BadRequestError, NotFoundError } from "../../../errors/index.js";
 import { buildWhereClause } from '../utils/build-where-clause.js';
 import { buildJoinClauses } from '../utils/build-join-clauses.js';
 import { buildOrderByClause } from '../utils/build-order-by-clause.js';
+import { buildSelectClause } from '../utils/build-select-clause.js';
 import { columnsAndValuesFromEntity } from '../utils/columns-and-values-from-entity.js';
 export async function update(client, queryObject, entity, operations, pluralResourceName) {
     try {
@@ -27,14 +31,24 @@ export async function update(client, queryObject, entity, operations, pluralReso
         if (result.rowCount === 0) {
             throw new NotFoundError('No records found matching update query');
         }
-        const joinClauses = buildJoinClauses(operations, pluralResourceName);
-        const orderByClause = buildOrderByClause(queryObject);
+        const hasJoins = operations.some(op => op instanceof LeftJoin || op instanceof InnerJoin || op instanceof LeftJoinMany);
+        const joinClauses = hasJoins
+            ? buildJoinClauses(operations, pluralResourceName, { oneToOneOnly: true })
+            : buildJoinClauses(operations, pluralResourceName);
+        const orderByClause = buildOrderByClause(queryObject, hasJoins ? { tablePrefix: pluralResourceName } : undefined);
+        const tablePrefix = hasJoins ? pluralResourceName : undefined;
+        const { whereClause: selectWhereClause, values: selectWhereValues } = buildWhereClause(queryObject, [], tablePrefix);
+        const selectClause = hasJoins
+            ? await buildSelectClause(client, pluralResourceName, operations)
+            : '*';
         const selectQuery = `
-            SELECT * FROM "${pluralResourceName}" ${joinClauses}
-            ${whereClause} ${orderByClause}
+            SELECT ${selectClause} FROM "${pluralResourceName}" ${joinClauses}
+            ${selectWhereClause} ${orderByClause}
         `.trim();
-        const selectResult = await client.query(selectQuery, whereValues);
-        return selectResult.rows;
+        const selectResult = await client.query(selectQuery, selectWhereValues);
+        return hasJoins
+            ? selectResult.rows.map(r => r.entity)
+            : selectResult.rows;
     }
     catch (err) {
         if (err instanceof NotFoundError) {

package/dist/services/generic-api-service/generic-api-service.interface.d.ts

@@ -1,10 +1,11 @@
-import type { IEntity, IPagedResult, IQueryOptions, IUserContext } from "@loomcore/common/models";
+import type { IEntity, IModelSpec, IPagedResult, IQueryOptions, IUserContext } from "@loomcore/common/models";
 import type { AppIdType } from "@loomcore/common/types";
 import type { ValueError } from "@sinclair/typebox/errors";
 import type { PostProcessEntityCustomFunction, PrepareQueryCustomFunction } from "../../controllers/types.js";
 import type { DeleteResult } from "../../databases/models/delete-result.js";
 import type { Operation } from "../../databases/operations/operation.js";
 export interface IGenericApiService<T extends IEntity> {
+    getModelSpec(): IModelSpec;
     validate(doc: any, isPartial?: boolean): ValueError[] | null;
     validateMany(docs: any[], isPartial?: boolean): ValueError[] | null;
     prepareQuery(userContext: IUserContext | undefined, queryObject: IQueryOptions, operations: Operation[]): {

package/dist/services/generic-api-service/generic-api.service.d.ts

@@ -12,6 +12,7 @@ export declare class GenericApiService<T extends IEntity> implements IGenericApi
     protected singularResourceName: string;
     protected modelSpec: IModelSpec;
     constructor(database: IDatabase, pluralResourceName: string, singularResourceName: string, modelSpec: IModelSpec);
+    getModelSpec(): IModelSpec;
     getAll(userContext: IUserContext): Promise<T[]>;
     getAll<TCustom extends IEntity>(userContext: IUserContext, prepareQueryCustom: PrepareQueryCustomFunction, postProcessEntityCustom: PostProcessEntityCustomFunction<T, TCustom>): Promise<TCustom[]>;
     prepareQuery(userContext: IUserContext | undefined, queryObject: IQueryOptions, operations: Operation[]): {

package/dist/services/generic-api-service/generic-api.service.js

@@ -16,6 +16,9 @@ export class GenericApiService {
         this.modelSpec = modelSpec;
         this.database = database;
     }
+    getModelSpec() {
+        return this.modelSpec;
+    }
     async getAll(userContext, prepareQueryCustom, postProcessEntityCustom) {
         let operations = [];
         if (prepareQueryCustom) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loomcore/api",
-  "version": "0.2.19",
+  "version": "0.2.21",
   "private": false,
   "description": "Loom Core Api - An opinionated Node.js api using Typescript, Express, and MongoDb or PostgreSQL",
   "scripts": {