@apso/cli 0.43.3 → 0.43.4

package/dist/commands/generate.js

@@ -66,6 +66,15 @@ class Generate extends base_command_1.default {
             console.log("[apso] No entities found in .apsorc — nothing to generate. Check that the file exists and defines an `entities` array.");
         }
         let generatedFileCount = 0;
+        // Every path this run writes. After generation, anything else under
+        // autogen/ that carries the Apso header belongs to an entity that was
+        // removed or renamed in .apsorc and gets deleted (apsoai/cli#157).
+        const generatedPaths = new Set();
+        const writeGenerated = (filePath, content) => {
+            const fullPath = path.join(autogenPath, filePath);
+            generatedPaths.add(fullPath);
+            return (0, file_system_1.createFile)(fullPath, content);
+        };
         const generatorConfig = {
             language,
             rootFolder,
@@ -87,17 +96,15 @@ class Generate extends base_command_1.default {
         // Generate enums
         const enumFiles = await generator.generateEnums(entities, lowerCaseApiType);
         for (const file of enumFiles) {
-            const fullPath = path.join(autogenPath, file.path);
             // eslint-disable-next-line no-await-in-loop
-            await (0, file_system_1.createFile)(fullPath, file.content);
+            await writeGenerated(file.path, file.content);
         }
         generatedFileCount += enumFiles.length;
         // Generate shared query utilities
         const queryUtilFiles = await generator.generateQueryUtils(entities, lowerCaseApiType);
         for (const file of queryUtilFiles) {
-            const fullPath = path.join(autogenPath, file.path);
             // eslint-disable-next-line no-await-in-loop
-            await (0, file_system_1.createFile)(fullPath, file.content);
+            await writeGenerated(file.path, file.content);
         }
         generatedFileCount += queryUtilFiles.length;
         // Generate per-entity files
@@ -173,9 +180,8 @@ class Generate extends base_command_1.default {
             // eslint-disable-next-line no-await-in-loop
             for (const files of allFiles) {
                 for (const file of files) {
-                    const fullPath = path.join(autogenPath, file.path);
                     // eslint-disable-next-line no-await-in-loop
-                    await (0, file_system_1.createFile)(fullPath, file.content);
+                    await writeGenerated(file.path, file.content);
                     generatedFileCount += 1;
                 }
             }
@@ -185,26 +191,30 @@ class Generate extends base_command_1.default {
         // Generate guards
         const guardFiles = await generator.generateGuards(entities, auth);
         for (const file of guardFiles) {
-            const fullPath = path.join(autogenPath, file.path);
             // eslint-disable-next-line no-await-in-loop
-            await (0, file_system_1.createFile)(fullPath, file.content);
+            await writeGenerated(file.path, file.content);
         }
         generatedFileCount += guardFiles.length;
         // Generate domain-event spine (only when at least one entity opts in)
         const domainEventFiles = await generator.generateDomainEvents(entities, lowerCaseApiType, { emitEvents });
         for (const file of domainEventFiles) {
-            const fullPath = path.join(autogenPath, file.path);
             // eslint-disable-next-line no-await-in-loop
-            await (0, file_system_1.createFile)(fullPath, file.content);
+            await writeGenerated(file.path, file.content);
         }
         // Generate index module
         const indexFiles = await generator.generateIndexModule(entities, lowerCaseApiType, { emitEvents, http });
         for (const file of indexFiles) {
-            const fullPath = path.join(autogenPath, file.path);
             // eslint-disable-next-line no-await-in-loop
-            await (0, file_system_1.createFile)(fullPath, file.content);
+            await writeGenerated(file.path, file.content);
         }
         generatedFileCount += indexFiles.length;
+        // Skip cleanup when nothing was generated: an empty or missing .apsorc
+        // would otherwise wipe every generated file.
+        if (entities.length > 0) {
+            for (const removed of (0, file_system_1.removeStaleGeneratedFiles)(autogenPath, generatedPaths)) {
+                console.log(`[apso] Removed stale ${path.relative(process.cwd(), removed)}`);
+            }
+        }
         // Format generated files (TypeScript only) with Biome — bundled with the
         // CLI and invoked directly, so it's a fast native pass (~ms) with no npx
         // download and no dependence on the project having a formatter installed.

package/dist/lib/utils/file-system.d.ts

@@ -1,4 +1,12 @@
 export declare const createFile: (file: string, content: string) => Promise<void>;
+/**
+ * Delete files under `dir` that carry the Apso header but are not in `keep`,
+ * i.e. files left over from entities removed or renamed in .apsorc. Files
+ * without the header (template seeds like .gitkeep, hand-written code) are
+ * never touched. Directories emptied this way are removed too. Returns the
+ * deleted paths.
+ */
+export declare const removeStaleGeneratedFiles: (dir: string, keep: Set<string>) => string[];
 export declare const createDirectoryContents: (templatePath: string, newProjectPath: string, apiType: string) => void;
 export declare function withGeneratedMeta<T extends object>(data: T): T & {
     generatedAt: string;

package/dist/lib/utils/file-system.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.withGeneratedMeta = exports.createDirectoryContents = exports.createFile = void 0;
+exports.withGeneratedMeta = exports.createDirectoryContents = exports.removeStaleGeneratedFiles = exports.createFile = void 0;
 const tslib_1 = require("tslib");
 const path = tslib_1.__importStar(require("path"));
 const fs = tslib_1.__importStar(require("fs"));
@@ -15,6 +15,36 @@ const createFile = async (file, content) => {
     await fs.promises.writeFile(file, content);
 };
 exports.createFile = createFile;
+// Every file the CLI generates starts with this line (see templates/header.eta).
+const APSO_HEADER = "Generated with Apso";
+/**
+ * Delete files under `dir` that carry the Apso header but are not in `keep`,
+ * i.e. files left over from entities removed or renamed in .apsorc. Files
+ * without the header (template seeds like .gitkeep, hand-written code) are
+ * never touched. Directories emptied this way are removed too. Returns the
+ * deleted paths.
+ */
+const removeStaleGeneratedFiles = (dir, keep) => {
+    if (!fs.existsSync(dir))
+        return [];
+    const removed = [];
+    for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+        const fullPath = path.join(dir, entry.name);
+        if (entry.isDirectory()) {
+            removed.push(...(0, exports.removeStaleGeneratedFiles)(fullPath, keep));
+            if (fs.readdirSync(fullPath).length === 0)
+                fs.rmdirSync(fullPath);
+        }
+        else if (entry.isFile() &&
+            !keep.has(fullPath) &&
+            fs.readFileSync(fullPath, "utf8").includes(APSO_HEADER)) {
+            fs.unlinkSync(fullPath);
+            removed.push(fullPath);
+        }
+    }
+    return removed;
+};
+exports.removeStaleGeneratedFiles = removeStaleGeneratedFiles;
 const createDirectoryContents = (templatePath, newProjectPath, apiType) => {
     const filesToCreate = fs.readdirSync(templatePath);
     const CURR_DIR = process.cwd();

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@apso/cli",
-  "version": "0.43.3",
+  "version": "0.43.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@apso/cli",
-      "version": "0.43.3",
+      "version": "0.43.4",
       "license": "Apache-2.0",
       "dependencies": {
         "@apso/schema-tools": "^0.2.0",

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.43.3",
+  "version": "0.43.4",
   "commands": {
     "config": {
       "id": "config",

package/package.json

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