@apso/cli 0.4.1 → 0.4.2

package/dist/commands/server/scaffold.d.ts

@@ -14,7 +14,7 @@ export default class Scaffold extends BaseCommand {
         apiType: string;
         allEntities: Entity[];
     }): Promise<void>;
-    setupRestFiles(dir: string, entity: Entity, relationshipMap: RelationshipMap, apiType: string): Promise<void>;
+    setupRestFiles(dir: string, entity: Entity, relationshipMap: RelationshipMap, apiType: string, allEntities: Entity[]): Promise<void>;
     setupGraphqlFiles(dir: string, entity: Entity, relationshipMap: RelationshipMap): Promise<void>;
     run(): Promise<void>;
 }

package/dist/commands/server/scaffold.js

@@ -32,7 +32,7 @@ class Scaffold extends base_command_1.default {
                 await this.setupGraphqlFiles(dir, entity, relationshipMap);
                 break;
             case apsorc_parser_1.ApiType.Rest:
-                await this.setupRestFiles(dir, entity, relationshipMap, apiType);
+                await this.setupRestFiles(dir, entity, relationshipMap, apiType, allEntities);
                 break;
             default:
                 break;
@@ -41,11 +41,11 @@ class Scaffold extends base_command_1.default {
         const entityBuildTime = perf_hooks_1.performance.now() - entityBuildStart;
         console.log(`[apso] Finished building entity '${entity.name}' in ${entityBuildTime.toFixed(2)} ms`);
     }
-    async setupRestFiles(dir, entity, relationshipMap, apiType) {
+    async setupRestFiles(dir, entity, relationshipMap, apiType, allEntities) {
         const filePath = path.join(dir, entity.name);
         const entityRelationships = relationshipMap[entity.name] || [];
         const tDto = perf_hooks_1.performance.now();
-        await (0, lib_1.createDto)(filePath, entity, entityRelationships, { apiType });
+        await (0, lib_1.createDto)(filePath, entity, entityRelationships, { apiType, allEntities });
         if (process.env.DEBUG) {
             console.log(`[timing] createDto for ${entity.name}: ${(perf_hooks_1.performance.now() - tDto).toFixed(2)}ms`);
             const used = process.memoryUsage();

package/dist/lib/dto.d.ts

@@ -7,8 +7,10 @@ import { Entity } from "./types/entity";
  * @param relationships The relationships array from the parsed .apsorc.
  * @param options Optional configuration flags.
  * @param options.apiType The type of API being generated (default: "rest").
+ * @param options.allEntities Optional array of all entities, used to determine foreign key types.
  * @returns {Promise<void>} A promise that resolves when the DTO files are created.
  */
 export declare const createDto: (apiBaseDir: string, entity: Entity, relationships: any[], options?: {
     apiType?: string;
+    allEntities?: Entity[];
 }) => Promise<void>;

package/dist/lib/dto.js

@@ -16,6 +16,7 @@ const casing_1 = require("./utils/casing");
  * @param relationships The relationships array from the parsed .apsorc.
  * @param options Optional configuration flags.
  * @param options.apiType The type of API being generated (default: "rest").
+ * @param options.allEntities Optional array of all entities, used to determine foreign key types.
  * @returns {Promise<void>} A promise that resolves when the DTO files are created.
  */
 const createDto = async (apiBaseDir, entity, relationships, // Relationship[]
@@ -32,22 +33,30 @@ options) => {
     // }
     // Add foreign key columns for ManyToOne relationships if not present
     relationshipsTemplate.forEach(rel => {
+        var _a;
         if (rel.type === 'ManyToOne') {
             const fkName = (0, casing_1.camelCase)(rel.referenceName || rel.name) + 'Id';
+            // Look up the referenced entity to determine the foreign key type
+            const referencedEntity = (_a = options === null || options === void 0 ? void 0 : options.allEntities) === null || _a === void 0 ? void 0 : _a.find(e => e.name === rel.name);
+            const referencedPrimaryKeyType = (referencedEntity === null || referencedEntity === void 0 ? void 0 : referencedEntity.primaryKeyType) || 'serial';
+            const fkDataType = referencedPrimaryKeyType === 'uuid' ? 'string' : 'number';
+            const fkType = referencedPrimaryKeyType === 'uuid' ? 'text' : 'integer';
             // if (process.env.DEBUG) {
             //   console.log('[DTO DEBUG]', {
             //     relType: rel.type,
             //     relName: rel.name,
             //     referenceName: rel.referenceName,
             //     fkName,
+            //     referencedPrimaryKeyType,
+            //     fkDataType,
             //     columns: columns.map(c => c.name)
             //   });
             // }
             if (!columns.some(col => col.name === fkName)) {
                 columns.push({
                     name: fkName,
-                    dataType: 'number',
-                    type: 'integer',
+                    dataType: fkDataType,
+                    type: fkType,
                 });
             }
         }

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.4.1",
+  "version": "0.4.2",
   "commands": {
     "server:new": {
       "id": "server:new",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apso/cli",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "Apso CLI",
   "author": "Apso by Mavric - @mavric",
   "bin": {