@carbonorm/carbonnode 3.7.16 → 3.7.18

package/src/__tests__/sakila-db/C6.test.ts

@@ -59,5 +59,32 @@ describe('sakila-db generated C6 bindings', () => {
             await waitForRequests();
         });
     }
+
+    it('[actor] PUT fully qualified keys', async () => {
+        const Actor = C6.ORM.Actor;
+        const testId = 1;
+
+        let result = await Actor.Get({ [Actor.ACTOR_ID]: testId } as any);
+        let data = result?.data ?? result;
+        const originalLastName = data?.rest?.[0]?.last_name;
+
+        await Actor.Put({
+            [Actor.ACTOR_ID]: testId,
+            [Actor.LAST_NAME]: 'Updated',
+        } as any);
+
+        result = await Actor.Get({
+            [Actor.ACTOR_ID]: testId,
+            cacheResults: false,
+        } as any);
+        data = result?.data ?? result;
+        expect(data?.rest?.[0]?.last_name).toBe('Updated');
+
+        await Actor.Put({
+            [Actor.ACTOR_ID]: testId,
+            [Actor.LAST_NAME]: originalLastName,
+        } as any);
+        await waitForRequests();
+    });
 });
 

package/src/__tests__/sakila-db/C6.ts

@@ -1940,7 +1940,7 @@ export type RestTableInterfaces = iActor
 
 export const C6 : iC6Object<RestTableInterfaces> = {
     ...C6Constants,
-    C6VERSION: '3.7.16',
+    C6VERSION: '3.7.18',
     IMPORT: async (tableName: string) : Promise<iDynamicApiImport> => {
 
         tableName = tableName.toLowerCase();

package/src/api/convertForRequestBody.ts

@@ -71,8 +71,8 @@ export default function <
                         }
                     }
                 }
-            } else if (Object.values(tableDefinition.COLUMNS).includes(value)) {
-                // Already a fully qualified column name
+            } else if (Object.keys(tableDefinition.COLUMNS).includes(value)) {
+                // Already using a fully qualified column name
                 const columnValue = restfulObject[value];
                 payload[value] = columnValue;
 

package/src/api/executors/HttpExecutor.ts

@@ -19,7 +19,6 @@ import {apiRequestCache, checkCache, userCustomClearCache} from "../utils/cacheM
 import {sortAndSerializeQueryObject} from "../utils/sortAndSerializeQueryObject";
 import {Executor} from "./Executor";
 import {toastOptions, toastOptionsDevs} from "variables/toastOptions";
-import {normalizeSingularRequest} from "../utils/normalizeSingularRequest";
 
 export class HttpExecutor<
     G extends OrmGenerics
@@ -334,9 +333,6 @@ export class HttpExecutor<
 
             }
 
-            let addBackPK: (() => void) | undefined;
-            let removedPrimaryKV: { key: string; value: any } | undefined;
-
             let apiResponse: G['RestTableInterface'][G['PrimaryKey']] | string | boolean | number | undefined;
 
             let returnGetNextPageFunction = false;
@@ -350,7 +346,9 @@ export class HttpExecutor<
 
             // todo - aggregate primary key check with condition check
             // check if PK exists in query, clone so pop does not affect the real data
-            const primaryKey = structuredClone(TABLES[operatingTable]?.PRIMARY)?.pop()?.split('.')?.pop();
+            const primaryKeyList = structuredClone(TABLES[operatingTable]?.PRIMARY);
+            const primaryKeyFullyQualified = primaryKeyList?.pop();
+            const primaryKey = primaryKeyFullyQualified?.split('.')?.pop();
 
             if (needsConditionOrPrimaryCheck) {
 
@@ -374,7 +372,7 @@ export class HttpExecutor<
 
                     if (undefined === query
                         || null === query
-                        || false === primaryKey in query) {
+                        || (!(primaryKey! in query) && !(primaryKeyFullyQualified && primaryKeyFullyQualified in query))) {
 
                         if (true === debug && isLocal()) {
 
@@ -386,8 +384,8 @@ export class HttpExecutor<
 
                     }
 
-                    if (undefined === query?.[primaryKey]
-                        || null === query?.[primaryKey]) {
+                    const providedPrimary = query?.[primaryKey!] ?? (primaryKeyFullyQualified ? query?.[primaryKeyFullyQualified] : undefined);
+                    if (undefined === providedPrimary || null === providedPrimary) {
 
                         toast.error('The primary key (' + primaryKey + ') provided is undefined or null explicitly!!')
 
@@ -405,27 +403,21 @@ export class HttpExecutor<
             if (POST !== requestMethod
                 && undefined !== query
                 && null !== query
-                && undefined !== primaryKey
-                && primaryKey in query) {
-
-                restRequestUri += query[primaryKey] + '/'
-
-                const removedPkValue = query[primaryKey];
-                removedPrimaryKV = { key: primaryKey, value: removedPkValue };
-
-                addBackPK = () => {
-                    query ??= {} as RequestQueryBody<
-                        G['RequestMethod'],
-                        G['RestTableInterface'],
-                        G['CustomAndRequiredFields'],
-                        G['RequestTableOverrides']
-                    >;
-                    query[primaryKey] = removedPkValue;
-                }
+                && undefined !== primaryKey) {
+
+                const primaryVal = query[primaryKey!] ?? (primaryKeyFullyQualified ? query[primaryKeyFullyQualified] : undefined);
+
+                if (undefined !== primaryVal) {
+
+                    restRequestUri += primaryVal + '/'
+
+                    console.log('query', query, 'primaryKey', primaryKey)
 
-                delete query[primaryKey]
+                } else {
+
+                    console.log('query', query)
 
-                console.log('query', query, 'primaryKey', primaryKey, 'removedPkValue', removedPkValue)
+                }
 
             } else {
 
@@ -473,19 +465,11 @@ export class HttpExecutor<
                             withCredentials: withCredentials,
                         };
 
-                        // Normalize singular request (GET/PUT/DELETE) into complex ORM shape
-                        const normalizedQuery = normalizeSingularRequest(
-                            requestMethod as any,
-                            query as any,
-                            restModel as any,
-                            removedPrimaryKV
-                        ) as typeof query;
-
                         switch (requestMethod) {
                             case GET:
                                 return [{
                                     ...baseConfig,
-                                    params: normalizedQuery
+                                    params: query
                                 }];
 
                             case POST:
@@ -498,12 +482,12 @@ export class HttpExecutor<
                                 return [convert(query), baseConfig];
 
                             case PUT:
-                                return [convert(normalizedQuery), baseConfig];
+                                return [convert(query), baseConfig];
 
                             case DELETE:
                                 return [{
                                     ...baseConfig,
-                                    data: convert(normalizedQuery)
+                                    data: convert(query)
                                 }];
 
                             default:
@@ -523,10 +507,6 @@ export class HttpExecutor<
 
                 }
 
-                // todo - wip verify this works
-                // we had removed the value from the request to add to the URI.
-                addBackPK?.();  // adding back so post-processing methods work
-
                 // returning the promise with this then is important for tests. todo - we could make that optional.
                 // https://rapidapi.com/guides/axios-async-await
                 return axiosActiveRequest.then(async (response: AxiosResponse<ResponseDataType, any>): Promise<AxiosResponse<ResponseDataType, any>> => {

package/src/api/handlers/ExpressHandler.ts

@@ -35,30 +35,17 @@ export function ExpressHandler({C6, mysqlPool}: { C6: iC6Object, mysqlPool: Pool
             }
 
             const primaryKeyName = primaryKeys[0];
-            const primaryKeyShort = primaryKeyName.split('.')[1];
 
-            if (!(payload[C6C.WHERE]?.[primaryKeyName] ?? undefined)
-                && !(payload[C6C.WHERE]?.[primaryKeyShort] ?? undefined)) {
-                // 👇 Call restRequest for the resolved method
-                switch (method) {
-                    case 'GET':
-                        if (primary) {
-                            payload[C6C.WHERE][primaryKeyName] = primary;
-                        }
-                        break;
-                    case 'PUT':
-                    case 'DELETE':
-                        if (primary) {
-                            payload[C6C.WHERE][primaryKeyName] = primary;
-                        } else {
-                            res.status(400).json({error: `Invalid request: ${method} requires a primary key (${primaryKeyName}).`});
-                        }
-                        break;
-                    case 'POST':
-                        break;
-                    default:
-                        res.status(405).json({error: `Method ${method} not allowed`});
-                        return;
+            // If a primary key was provided in the URL, merge it into the payload.
+            // Support both complex requests using WHERE and singular requests
+            // where the primary key lives at the root of the payload.
+            if (primary) {
+                if (payload[C6C.WHERE]) {
+                    payload[C6C.WHERE][primaryKeyName] =
+                        payload[C6C.WHERE][primaryKeyName] ?? primary;
+                } else {
+                    (payload as any)[primaryKeyName] =
+                        (payload as any)[primaryKeyName] ?? primary;
                 }
             }
 

package/src/api/utils/normalizeSingularRequest.ts

@@ -60,7 +60,9 @@ export function normalizeSingularRequest<
     if (value === undefined) {
       // 2) fully-qualified key matching this short key (from PRIMARY list or by concatenation)
       const fqCandidate = `${restModel.TABLE_NAME}.${pkShort}`;
-      const fqKey = pkFulls.find(fq => fq === fqCandidate || fq.endsWith(`.${pkShort}`)) ?? fqCandidate;
+      const fqKey = pkFulls.find(
+        fq => fq === fqCandidate || fq.endsWith(`.${pkShort}`)
+      ) ?? fqCandidate;
       value = requestObj[fqKey];
     }
     if (value === undefined && removedPrimary) {
@@ -93,9 +95,18 @@ export function normalizeSingularRequest<
     ...rest
   } = request as any;
 
+  // Map short primary keys to fully-qualified column names
+  const shortToFull: Record<string, string> = {};
+  for (const [full, short] of Object.entries(restModel.COLUMNS || {})) {
+    shortToFull[short as string] = full;
+  }
+  const pkFullValues = Object.fromEntries(
+    Object.entries(pkValues).map(([k, v]) => [shortToFull[k] ?? k, v])
+  );
+
   if (requestMethod === C6C.GET) {
     const normalized: any = {
-      WHERE: { ...pkValues },
+      WHERE: { ...pkFullValues },
     };
     // Preserve pagination if any was added previously
     if ((request as any)[C6C.PAGINATION]) {
@@ -115,7 +126,7 @@ export function normalizeSingularRequest<
   if (requestMethod === C6C.DELETE) {
     const normalized: any = {
       [C6C.DELETE]: true,
-      WHERE: { ...pkValues },
+      WHERE: { ...pkFullValues },
     };
     return {
       ...normalized,
@@ -143,7 +154,7 @@ export function normalizeSingularRequest<
 
   const normalized: any = {
     [C6C.UPDATE]: updateBody,
-    WHERE: { ...pkValues },
+    WHERE: { ...pkFullValues },
   };
 
   return {