@apso/cli 0.33.1 → 0.35.0

package/dist/lib/templates/entities/entity.eta

@@ -37,7 +37,7 @@ import {
    import { JSONResolver } from 'graphql-scalars';
 <% } %>
 import { Type } from 'class-transformer';
-import { CrudValidationGroups } from '@nestjsx/crud';
+import { CrudValidationGroups } from '@apso/crud';
 <% if (it.importEnums) { %>
 import * as enums from '../enums';
 <% } %>

package/dist/lib/templates/graphql/gql-dto-graphql.eta

@@ -21,7 +21,7 @@ import { Type } from 'class-transformer';
 
 import { ObjectType, Field, Int, GraphQLISODateTime, ID } from '@nestjs/graphql';
 import { JSONResolver } from 'graphql-scalars';
-import { CrudValidationGroups } from '@nestjsx/crud';
+import { CrudValidationGroups } from '@apso/crud';
 <% if (it.importEnums) { %>
 import * as enums from '../../enums';
 <% } %>

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

@@ -293,7 +293,7 @@ export class ScopeGuard implements CanActivate {
       if (scope.direct) {
         const scopeValue = this.getScopeValue(request, scope.contextKey);
         if (scopeValue) {
-          // Add filter for @nestjsx/crud
+          // Add filter for @apso/crud
           request.query[`filter.${scope.field}`] = `$eq:${scopeValue}`;
         }
       }

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

@@ -4,7 +4,7 @@ import { Test, TestingModule } from '@nestjs/testing';
 import {<%= it.entityName %>, <%= it.entityName %>Create} from './dtos/<%= it.entityName%>.dto'
 import {<%= it.ctrlName %>} from "./<%= it.entityName %>.controller";
 import {<%= it.svcName %>} from "./<%= it.entityName %>.service";
-import { CrudRequest } from '@nestjsx/crud';
+import { CrudRequest } from '@apso/crud';
 
 const baseRequest: CrudRequest = {
   parsed: {

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

@@ -1,7 +1,7 @@
 <%~ includeFile('./header.eta') %>
 
 import { Controller, Body } from "@nestjs/common";
-import { Crud, CrudController, Override, ParsedRequest, CrudRequest, ParsedBody, CreateManyDto } from '@nestjsx/crud';
+import { Crud, CrudController, Override, ParsedRequest, CrudRequest, ParsedBody, CreateManyDto } from '@apso/crud';
 import { ApiTags, ApiResponse, ApiOperation, ApiBody } from '@nestjs/swagger';
 import {<%= it.entityName %>, <%= it.entityName %>Create, <%= it.entityName %>Update} from './dtos/<%= it.entityName%>.dto'
 import {<%= it.svcName %>} from './<%= it.entityName %>.service';

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

@@ -2,9 +2,9 @@
 
 import { Injectable, NotFoundException } from "@nestjs/common";
 import { InjectRepository } from "@nestjs/typeorm";
-import { TypeOrmCrudService } from "@nestjsx/crud-typeorm";
-import { QueryOptions, CrudRequest } from '@nestjsx/crud';
-import { ParsedRequestParams } from '@nestjsx/crud-request';
+import { TypeOrmCrudService } from "@apso/crud-typeorm";
+import { QueryOptions, CrudRequest } from '@apso/crud';
+import { ParsedRequestParams } from '@apso/crud-request';
 import { Repository, DeepPartial } from 'typeorm';
 
 import {<%= it.entityName %>} from './<%= it.entityName%>.entity'

package/dist/lib/utils/relationships/parse.d.ts

@@ -10,10 +10,15 @@ import { ApsorcRelationship, Relationship, RelationshipMap, RelationshipForTempl
 export declare const parseOneToMany: (relationship: ApsorcRelationship) => RelationshipMap;
 /**
  * Parses a ManyToOne relationship definition.
- * These are treated as unidirectional from the .apsorc definition.
- * Only generates the configuration for the 'from' side.
+ * Bidirectional by default, mirroring parseOneToMany with from/to swapped:
+ * the target entity gets the inverse OneToMany collection (and with it the
+ * controller join allowlist), so `Authors?join=books` works no matter which
+ * direction the .apsorc declared the relationship in.
+ * Set `bi_directional: false` to keep the old FK-only unidirectional shape.
+ * Self-referencing relationships stay unidirectional (both sides would
+ * collide on the same RelationshipMap key).
  * @param relationship The .apsorc relationship definition.
- * @returns A RelationshipMap containing only the entry for the 'from' side.
+ * @returns A RelationshipMap with entries for both sides (or just 'from' when unidirectional).
  */
 export declare const parseManytoOne: (relationship: ApsorcRelationship) => RelationshipMap;
 /**

package/dist/lib/utils/relationships/parse.js

@@ -39,20 +39,52 @@ const parseOneToMany = (relationship) => {
 exports.parseOneToMany = parseOneToMany;
 /**
  * Parses a ManyToOne relationship definition.
- * These are treated as unidirectional from the .apsorc definition.
- * Only generates the configuration for the 'from' side.
+ * Bidirectional by default, mirroring parseOneToMany with from/to swapped:
+ * the target entity gets the inverse OneToMany collection (and with it the
+ * controller join allowlist), so `Authors?join=books` works no matter which
+ * direction the .apsorc declared the relationship in.
+ * Set `bi_directional: false` to keep the old FK-only unidirectional shape.
+ * Self-referencing relationships stay unidirectional (both sides would
+ * collide on the same RelationshipMap key).
  * @param relationship The .apsorc relationship definition.
- * @returns A RelationshipMap containing only the entry for the 'from' side.
+ * @returns A RelationshipMap with entries for both sides (or just 'from' when unidirectional).
  */
 const parseManytoOne = (relationship) => {
+    const unidirectional = relationship.bi_directional === false ||
+        relationship.from === relationship.to;
+    if (unidirectional) {
+        return {
+            [relationship.from]: [
+                {
+                    name: relationship.to,
+                    type: "ManyToOne",
+                    referenceName: relationship.to_name || null,
+                    nullable: relationship.nullable || false,
+                    index: relationship.index || false,
+                },
+            ],
+        };
+    }
     return {
         [relationship.from]: [
             {
                 name: relationship.to,
                 type: "ManyToOne",
-                referenceName: relationship.to_name || null,
                 nullable: relationship.nullable || false,
+                biDirectional: true,
                 index: relationship.index || false,
+                cascadeDelete: relationship.cascadeDelete || false,
+                referenceName: relationship.to_name || relationship.to,
+                inverseReferenceName: relationship.from,
+            },
+        ],
+        [relationship.to]: [
+            {
+                name: relationship.from,
+                type: "OneToMany",
+                biDirectional: true,
+                referenceName: relationship.from,
+                inverseReferenceName: relationship.to_name || relationship.to,
             },
         ],
     };
@@ -264,18 +296,52 @@ const parseRelationship = (relationship, allRelationships) => {
                 ],
             };
         }
-        case "ManyToOne":
+        case "ManyToOne": {
+            // Bidirectional by default, mirroring the OneToMany case with the roles
+            // swapped: the target entity gets the inverse OneToMany collection (and
+            // with it the controller join allowlist), so the collection-side embed
+            // works no matter which direction .apsorc declared the relationship in.
+            // `bi_directional: false` keeps the old FK-only shape; self-references
+            // stay unidirectional (both sides would collide on the same map key).
+            const manySideRefName = relationship.to_name || relationship.to;
+            if (relationship.bi_directional === false ||
+                relationship.from === relationship.to) {
+                return {
+                    [relationship.from]: [
+                        {
+                            name: relationship.to,
+                            type: "ManyToOne",
+                            referenceName: manySideRefName,
+                            nullable: relationship.nullable || false,
+                            index: relationship.index || false,
+                        },
+                    ],
+                };
+            }
             return {
                 [relationship.from]: [
                     {
                         name: relationship.to,
                         type: "ManyToOne",
-                        referenceName: relationship.to_name || relationship.to,
                         nullable: relationship.nullable || false,
+                        biDirectional: true,
                         index: relationship.index || false,
+                        cascadeDelete: relationship.cascadeDelete || false,
+                        referenceName: manySideRefName,
+                        inverseReferenceName: relationship.from,
+                    },
+                ],
+                [relationship.to]: [
+                    {
+                        name: relationship.from,
+                        type: "OneToMany",
+                        biDirectional: true,
+                        referenceName: relationship.from,
+                        inverseReferenceName: manySideRefName,
                     },
                 ],
             };
+        }
         case "OneToOne": {
             const inverseOnetoOneDef = allRelationships.find((def) => def.from === relationship.to &&
                 def.to === relationship.from &&

package/dist/lib/utils/template.d.ts

@@ -1,5 +1,13 @@
 import { TargetLanguage } from "../types";
 export declare const TEMPLATE_REPOS: Record<TargetLanguage, string>;
+/**
+ * Git ref (tag or branch) to clone for each template. Pinning to a tag makes
+ * the CLI-version-to-template pairing explicit instead of a date cutoff on
+ * template main. v2.0.0 is the first TS template revision on published
+ * @apso/crud ^1.0.1 (dual-dialect: nestjsx + PostgREST); the Python and Go
+ * template repos are untagged and don't carry the dialect work.
+ */
+export declare const TEMPLATE_REFS: Record<TargetLanguage, string>;
 export declare const PROJECT_NAME_PATTERN: RegExp;
 /**
  * Clone a template repository into the given project path.

package/dist/lib/utils/template.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initGitRepo = exports.ensureEnvFile = exports.cloneTemplate = exports.PROJECT_NAME_PATTERN = exports.TEMPLATE_REPOS = void 0;
+exports.initGitRepo = exports.ensureEnvFile = exports.cloneTemplate = exports.PROJECT_NAME_PATTERN = exports.TEMPLATE_REFS = exports.TEMPLATE_REPOS = void 0;
 const tslib_1 = require("tslib");
 const fs = tslib_1.__importStar(require("fs"));
 const path = tslib_1.__importStar(require("path"));
@@ -10,6 +10,18 @@ exports.TEMPLATE_REPOS = {
     python: "https://github.com/apsoai/service-template-python.git",
     go: "https://github.com/apsoai/service-template-go.git",
 };
+/**
+ * Git ref (tag or branch) to clone for each template. Pinning to a tag makes
+ * the CLI-version-to-template pairing explicit instead of a date cutoff on
+ * template main. v2.0.0 is the first TS template revision on published
+ * @apso/crud ^1.0.1 (dual-dialect: nestjsx + PostgREST); the Python and Go
+ * template repos are untagged and don't carry the dialect work.
+ */
+exports.TEMPLATE_REFS = {
+    typescript: "v2.0.0",
+    python: "main",
+    go: "main",
+};
 exports.PROJECT_NAME_PATTERN = /^[A-Za-z][\w-]*$/;
 /**
  * Clone a template repository into the given project path.
@@ -17,7 +29,8 @@ exports.PROJECT_NAME_PATTERN = /^[A-Za-z][\w-]*$/;
  */
 function cloneTemplate(projectPath, language, log) {
     const repoUrl = exports.TEMPLATE_REPOS[language];
-    log(`Cloning ${language} service template...`);
+    const templateRef = exports.TEMPLATE_REFS[language];
+    log(`Cloning ${language} service template (${templateRef})...`);
     if (fs.existsSync(projectPath)) {
         throw new Error(`Directory already exists: ${projectPath}`);
     }
@@ -27,12 +40,12 @@ function cloneTemplate(projectPath, language, log) {
     catch (error) {
         throw new Error(`Failed to create directory: ${error.message}`);
     }
-    const cloneResult = shelljs_1.default.exec(`git clone --depth=1 --branch=main "${repoUrl}" "${projectPath}"`, { silent: true });
+    const cloneResult = shelljs_1.default.exec(`git clone --depth=1 --branch="${templateRef}" "${repoUrl}" "${projectPath}"`, { silent: true });
     if (cloneResult.code !== 0) {
         shelljs_1.default.rm("-rf", projectPath);
         throw new Error(`Failed to clone the template repository from GitHub.\n` +
             `Error Output:\n${cloneResult.stderr}\n\n` +
-            `Please check your network connection and ensure the repository exists at ${repoUrl}`);
+            `Please check your network connection and ensure ref "${templateRef}" exists at ${repoUrl}`);
     }
     shelljs_1.default.rm("-rf", path.join(projectPath, ".git"));
     ensureEnvFile(projectPath, log);

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@apso/cli",
-  "version": "0.33.1",
+  "version": "0.35.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@apso/cli",
-      "version": "0.33.1",
+      "version": "0.35.0",
       "license": "Apache-2.0",
       "dependencies": {
         "@biomejs/biome": "^1.9.4",

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.33.1",
+  "version": "0.35.0",
   "commands": {
     "config": {
       "id": "config",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apso/cli",
-  "version": "0.33.1",
+  "version": "0.35.0",
   "mcpName": "io.github.apsoai/apso",
   "description": "Apso CLI",
   "author": "Apso by Mavric - @mavric",