@apso/cli 0.6.0 → 0.7.1

package/dist/lib/controller.js

@@ -51,11 +51,13 @@ const createController = async (apiBaseDir, entity, relationshipMap) => {
     const svcName = `${entityName}Service`;
     const ctrlName = `${entityName}Controller`;
     const pluralEntityName = (0, pluralize_1.default)(entityName);
+    const primaryKeyType = entity.primaryKeyType || "serial"; // Default to 'serial' if not specified
     const data = {
         svcName,
         ctrlName,
         entityName,
         pluralEntityName,
+        primaryKeyType,
         associations: [...new Set(relationships)],
         nestedJoinsFile,
     };

package/dist/lib/guards.js

@@ -128,7 +128,7 @@ const createGuards = async (rootPath, entities, auth) => {
         console.log("[apso] No scopeBy or auth configurations found, skipping guards generation");
         return;
     }
-    const guardsDir = path.join(rootPath, "guards");
+    const guardsDir = path.join(rootPath, "autogen", "guards");
     // Ensure guards directory exists
     if (!fs.existsSync(guardsDir)) {
         fs.mkdirSync(guardsDir, { recursive: true });

package/dist/lib/templates/guards/auth.guard.eta

@@ -21,11 +21,11 @@ import { Reflector } from '@nestjs/core';
 import { InjectRepository } from '@nestjs/typeorm';
 import { Repository } from 'typeorm';
 
-// Entity imports
-import { <%= it.authConfig.sessionEntity %> } from '../autogen/<%= it.authConfig.sessionEntity %>/<%= it.authConfig.sessionEntity %>.entity';
-import { <%= it.authConfig.userEntity %> } from '../autogen/<%= it.authConfig.userEntity %>/<%= it.authConfig.userEntity %>.entity';
+// Entity imports (from sibling autogen folders)
+import { <%= it.authConfig.sessionEntity %> } from '../<%= it.authConfig.sessionEntity %>/<%= it.authConfig.sessionEntity %>.entity';
+import { <%= it.authConfig.userEntity %> } from '../<%= it.authConfig.userEntity %>/<%= it.authConfig.userEntity %>.entity';
 <% if (it.authConfig.accountUserEntity) { %>
-import { <%= it.authConfig.accountUserEntity %> } from '../autogen/<%= it.authConfig.accountUserEntity %>/<%= it.authConfig.accountUserEntity %>.entity';
+import { <%= it.authConfig.accountUserEntity %> } from '../<%= it.authConfig.accountUserEntity %>/<%= it.authConfig.accountUserEntity %>.entity';
 <% } %>
 
 /**

package/dist/lib/templates/guards/guards.module.eta

@@ -11,21 +11,21 @@ import { ScopeGuard } from './scope.guard';
 import { AuthGuard } from './auth.guard';
 <% } %>
 
-<% /* Import all entities for ScopeGuard */ %>
+<% /* Import all entities for ScopeGuard (from sibling autogen folders) */ %>
 <% if (it.scopedEntities && it.scopedEntities.length > 0) { %>
 // Entities for ScopeGuard
 <% it.scopedEntities.forEach((entity) => { %>
-import { <%= entity.name %> } from '../autogen/<%= entity.name %>/<%= entity.name %>.entity';
+import { <%= entity.name %> } from '../<%= entity.name %>/<%= entity.name %>.entity';
 <% }) %>
 <% } %>
 
-<% /* Import entities for AuthGuard */ %>
+<% /* Import entities for AuthGuard (from sibling autogen folders) */ %>
 <% if (it.authConfig) { %>
 // Entities for AuthGuard
-import { <%= it.authConfig.sessionEntity %> } from '../autogen/<%= it.authConfig.sessionEntity %>/<%= it.authConfig.sessionEntity %>.entity';
-import { <%= it.authConfig.userEntity %> } from '../autogen/<%= it.authConfig.userEntity %>/<%= it.authConfig.userEntity %>.entity';
+import { <%= it.authConfig.sessionEntity %> } from '../<%= it.authConfig.sessionEntity %>/<%= it.authConfig.sessionEntity %>.entity';
+import { <%= it.authConfig.userEntity %> } from '../<%= it.authConfig.userEntity %>/<%= it.authConfig.userEntity %>.entity';
 <% if (it.authConfig.accountUserEntity) { %>
-import { <%= it.authConfig.accountUserEntity %> } from '../autogen/<%= it.authConfig.accountUserEntity %>/<%= it.authConfig.accountUserEntity %>.entity';
+import { <%= it.authConfig.accountUserEntity %> } from '../<%= it.authConfig.accountUserEntity %>/<%= it.authConfig.accountUserEntity %>.entity';
 <% } %>
 <% } %>
 

package/dist/lib/templates/guards/scope.guard.eta

@@ -10,9 +10,9 @@ import { Reflector } from '@nestjs/core';
 import { InjectRepository } from '@nestjs/typeorm';
 import { Repository } from 'typeorm';
 
-<% /* Import all entities that have scoped relationships */ %>
+<% /* Import all entities that have scoped relationships (from sibling autogen folders) */ %>
 <% it.scopedEntities.forEach((entity) => { %>
-import { <%= entity.name %> } from '../autogen/<%= entity.name %>/<%= entity.name %>.entity';
+import { <%= entity.name %> } from '../<%= entity.name %>/<%= entity.name %>.entity';
 <% }) %>
 
 /**

package/dist/lib/templates/rest/controller-rest.eta

@@ -15,6 +15,13 @@ import {<%= it.svcName %>} from './<%= it.entityName %>.service';
         update: <%= it.entityName %>,
         replace: <%= it.entityName %>,
     },
+    params: {
+        id: {
+            field: 'id',
+            type: 'string',
+            primary: true,
+        },
+    },
     query: {
         /**
         * commenting out limit and pagination because of an issue with Crud lib: https://github.com/nestjsx/crud/issues/777

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.6.0",
+  "version": "0.7.1",
   "commands": {
     "server:new": {
       "id": "server:new",

package/package.json

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