@apso/cli 0.32.0 → 0.34.0

package/dist/lib/api/client.js

@@ -287,7 +287,14 @@ async function apiRequest(path, options = {}) {
             }
             // Handle server errors with retry
             if (response.status >= 500) {
-                lastError = new ApiClientError(errorData.message || "Server error", response.status, errorData.details);
+                // The BFF returns its message in `.error`; the backend uses `.message`.
+                const errObj = errorData;
+                const serverMsg = errorData.message ||
+                    (typeof errObj.error === "string"
+                        ? errObj.error
+                        : undefined) ||
+                    "Server error";
+                lastError = new ApiClientError(serverMsg, response.status, errorData.details);
                 await sleep(getBackoffDelay(attempt));
                 continue;
             }

package/dist/lib/api/services.d.ts

@@ -138,5 +138,16 @@ export declare const codeApi: {
         bucket?: string;
         key?: string;
     }>;
+    /**
+     * Record S3 metadata after the presigned PUT completes. Without this the
+     * service row's s3_code_key stays null and a server-side push fails with
+     * "No S3 code found". Mirrors the browser upload flow (upload-url -> PUT ->
+     * finalize).
+     */
+    finalize(serviceId: string): Promise<{
+        success: boolean;
+        version?: string;
+        size?: number;
+    }>;
 };
 export {};

package/dist/lib/api/services.js

@@ -377,4 +377,13 @@ exports.codeApi = {
     async getUploadUrl(serviceId) {
         return client_1.api.get(`/api/services/${serviceId}/code/upload-url`);
     },
+    /**
+     * Record S3 metadata after the presigned PUT completes. Without this the
+     * service row's s3_code_key stays null and a server-side push fails with
+     * "No S3 code found". Mirrors the browser upload flow (upload-url -> PUT ->
+     * finalize).
+     */
+    async finalize(serviceId) {
+        return client_1.api.post(`/api/services/${serviceId}/code/finalize`, {});
+    },
 };

package/dist/lib/deploy/server-push.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 /// <reference types="node" />
-/** Zip the project source into a buffer, skipping build/vcs/dependency dirs. */
+/** Zip the project source into a buffer, skipping build/vcs/dependency/secret files. */
 export declare function zipProject(cwd: string): Buffer;
 /**
  * Server-side push: upload the project zip to S3 and have the platform push it

package/dist/lib/deploy/server-push.js

@@ -15,12 +15,28 @@ const EXCLUDE_DIRS = new Set([
     ".apso",
     "coverage",
 ]);
-/** Zip the project source into a buffer, skipping build/vcs/dependency dirs. */
+/**
+ * Never push local secrets to the repo. `.env` and `.env.*` (e.g. `.env.local`)
+ * routinely hold DB passwords and session secrets; `.env.example` is the one
+ * env file that is meant to be committed. The backend injects real production
+ * env at runtime, so these are never needed in the pushed code.
+ */
+function isSecretEnvFile(basename) {
+    if (basename === ".env.example" || basename === ".env.sample")
+        return false;
+    return basename === ".env" || basename.startsWith(".env.");
+}
+/** Zip the project source into a buffer, skipping build/vcs/dependency/secret files. */
 function zipProject(cwd) {
     const zip = new adm_zip_1.default();
     zip.addLocalFolder(cwd, "", (filename) => {
         const parts = filename.split(path.sep);
-        return !parts.some((p) => EXCLUDE_DIRS.has(p));
+        if (parts.some((p) => EXCLUDE_DIRS.has(p)))
+            return false;
+        const base = parts[parts.length - 1];
+        if (isSecretEnvFile(base))
+            return false;
+        return true;
     });
     return zip.toBuffer();
 }
@@ -41,6 +57,11 @@ async function serverSidePush(opts) {
     if (!res.ok) {
         throw new Error(`Code upload failed (${res.status}). ${await res.text().catch(() => "")}`);
     }
+    // Record the S3 metadata (bucket/key/version) on the service row. The
+    // presigned PUT lands the zip in S3 but does NOT persist where it went; the
+    // backend push reads s3_code_key from the DB, so without this it fails with
+    // "No S3 code found". Same three-step flow the browser upload uses.
+    await services_1.codeApi.finalize(opts.serviceId);
     await services_1.githubApi.push(opts.serviceId, opts.connectionId, {
         branch: opts.branch,
         message: opts.message,

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/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.32.0",
+  "version": "0.34.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@apso/cli",
-      "version": "0.32.0",
+      "version": "0.34.0",
       "license": "Apache-2.0",
       "dependencies": {
         "@biomejs/biome": "^1.9.4",

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.32.0",
+  "version": "0.34.0",
   "commands": {
     "config": {
       "id": "config",

package/package.json

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