@apso/cli 0.40.0 → 0.41.1

package/dist/commands/generate.js

@@ -10,6 +10,7 @@ const interactive_1 = require("../lib/utils/interactive");
 const perf_hooks_1 = require("perf_hooks");
 const file_system_1 = require("../lib/utils/file-system");
 const git_hooks_1 = require("../lib/utils/git-hooks");
+const crud_deps_1 = require("../lib/utils/crud-deps");
 class Generate extends base_command_1.default {
     async run() {
         var _a, _b;
@@ -240,6 +241,15 @@ class Generate extends base_command_1.default {
         else if (generatedFileCount === 0) {
             console.log("[apso] Skipping formatting (no files were generated)");
         }
+        // Generated TS code imports @apso/crud*. Projects from the v1 template
+        // (@nestjsx/crud) don't declare those, and every entity then fails to
+        // compile with TS2307. Declare them so the next install picks them up.
+        if (language === "typescript" && generatedFileCount > 0) {
+            const added = (0, crud_deps_1.ensureCrudDeps)(process.cwd());
+            if (added.length > 0) {
+                console.log(`[apso] Added ${added.join(", ")} to package.json (the generated code imports them). Run npm install before building.`);
+            }
+        }
         const totalBuildTime = perf_hooks_1.performance.now() - totalBuildStart;
         console.log(`[apso] Finished building all entities in ${totalBuildTime.toFixed(2)} ms`);
         // Best-effort: install the commit co-author hook so commits that include

package/dist/commands/migrate/verify.d.ts

@@ -5,6 +5,7 @@ export default class MigrateVerify extends BaseCommand {
     static flags: {
         baseline: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         migration: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        "skip-build": import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<void>;

package/dist/commands/migrate/verify.js

@@ -8,7 +8,7 @@ const verify_1 = require("../../lib/verify");
 class MigrateVerify extends base_command_1.default {
     async run() {
         const { flags } = await this.parse(MigrateVerify);
-        const result = await (0, verify_1.verifyMigration)(process.cwd(), path.resolve(flags.baseline), flags.migration, (0, verify_1.cliBinPath)(this.config.root));
+        const result = await (0, verify_1.verifyMigration)(process.cwd(), path.resolve(flags.baseline), flags.migration, (0, verify_1.cliBinPath)(this.config.root), flags["skip-build"]);
         (0, verify_1.report)((s) => this.log(s), result, flags.json, result.ok ? "Migration verified." : undefined);
         if (!result.ok)
             this.exit(1);
@@ -27,6 +27,10 @@ MigrateVerify.flags = {
         description: "The migration file to run",
         required: true,
     }),
+    "skip-build": core_1.Flags.boolean({
+        description: "Use the existing dist/ build instead of building first",
+        default: false,
+    }),
     json: core_1.Flags.boolean({
         description: "Print the result as JSON",
         default: false,

package/dist/commands/test/smoke.d.ts

@@ -3,6 +3,7 @@ export default class TestSmoke extends BaseCommand {
     static description: string;
     static examples: string[];
     static flags: {
+        "skip-build": import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<void>;

package/dist/commands/test/smoke.js

@@ -11,7 +11,9 @@ class TestSmoke extends base_command_1.default {
         const { entities, auth } = (0, apsorc_parser_1.parseApsorc)();
         // With auth configured every entity route needs a session, so only /health is checked.
         const names = auth ? [] : entities.map((e) => e.name);
-        const result = await (0, verify_1.smokeTest)(process.cwd(), names);
+        const result = await (0, verify_1.smokeTest)(process.cwd(), names, {
+            skipBuild: flags["skip-build"],
+        });
         (0, verify_1.report)((s) => this.log(s), result, flags.json, result.ok ? "Smoke test passed." : undefined);
         if (!result.ok)
             this.exit(1);
@@ -20,6 +22,10 @@ class TestSmoke extends base_command_1.default {
 TestSmoke.description = "Start the service on a local PGlite database and call /health and every entity's list endpoint (TypeScript services)";
 TestSmoke.examples = [`$ apso test smoke`];
 TestSmoke.flags = {
+    "skip-build": core_1.Flags.boolean({
+        description: "Use the existing dist/ build instead of building first",
+        default: false,
+    }),
     json: core_1.Flags.boolean({
         description: "Print the result as JSON",
         default: false,

package/dist/lib/utils/crud-deps.d.ts

@@ -0,0 +1,18 @@
+/**
+ * Runtime packages the generated TypeScript code imports (entities, services,
+ * controllers, guards). Versions match the pinned service-template-ts tag
+ * (see TEMPLATE_REFS in ./template.ts); bump both together.
+ */
+export declare const APSO_CRUD_DEPS: Record<string, string>;
+/**
+ * Add any missing @apso/crud runtime packages to the project's package.json.
+ *
+ * Projects created from the v1 template (@nestjsx/crud) don't declare them, so
+ * freshly generated code fails `nest build` with TS2307 "Cannot find module
+ * '@apso/crud'" on every entity. Existing @nestjsx deps are left alone because
+ * hand-written code may still import them.
+ *
+ * @param {string} projectDir - Directory holding the project's package.json.
+ * @returns {string[]} Names added (empty when nothing changed or no package.json).
+ */
+export declare function ensureCrudDeps(projectDir: string): string[];

package/dist/lib/utils/crud-deps.js

@@ -0,0 +1,47 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ensureCrudDeps = exports.APSO_CRUD_DEPS = void 0;
+const tslib_1 = require("tslib");
+const fs = tslib_1.__importStar(require("fs"));
+const path = tslib_1.__importStar(require("path"));
+/**
+ * Runtime packages the generated TypeScript code imports (entities, services,
+ * controllers, guards). Versions match the pinned service-template-ts tag
+ * (see TEMPLATE_REFS in ./template.ts); bump both together.
+ */
+exports.APSO_CRUD_DEPS = {
+    "@apso/crud": "^1.0.1",
+    "@apso/crud-core": "^1.0.1",
+    "@apso/crud-request": "^1.0.1",
+    "@apso/crud-typeorm": "^1.0.1",
+};
+/**
+ * Add any missing @apso/crud runtime packages to the project's package.json.
+ *
+ * Projects created from the v1 template (@nestjsx/crud) don't declare them, so
+ * freshly generated code fails `nest build` with TS2307 "Cannot find module
+ * '@apso/crud'" on every entity. Existing @nestjsx deps are left alone because
+ * hand-written code may still import them.
+ *
+ * @param {string} projectDir - Directory holding the project's package.json.
+ * @returns {string[]} Names added (empty when nothing changed or no package.json).
+ */
+function ensureCrudDeps(projectDir) {
+    var _a;
+    const pkgPath = path.join(projectDir, "package.json");
+    if (!fs.existsSync(pkgPath))
+        return [];
+    const raw = fs.readFileSync(pkgPath, "utf8");
+    const pkg = JSON.parse(raw);
+    const declared = { ...pkg.devDependencies, ...pkg.dependencies };
+    const missing = Object.keys(exports.APSO_CRUD_DEPS).filter((name) => !declared[name]);
+    if (missing.length === 0)
+        return [];
+    pkg.dependencies = (_a = pkg.dependencies) !== null && _a !== void 0 ? _a : {};
+    for (const name of missing)
+        pkg.dependencies[name] = exports.APSO_CRUD_DEPS[name];
+    pkg.dependencies = Object.fromEntries(Object.entries(pkg.dependencies).sort(([a], [b]) => a.localeCompare(b)));
+    fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + (raw.endsWith("\n") ? "\n" : ""));
+    return missing;
+}
+exports.ensureCrudDeps = ensureCrudDeps;

package/dist/lib/verify/index.d.ts

@@ -46,14 +46,17 @@ export interface CheckResult {
  * Run a migration on a fresh copy of the deployed schema, then check that the
  * database matches the project's entities (a second generate finds nothing).
  */
-export declare function verifyMigration(projectDir: string, baselineApsorc: string, migrationFile: string, cliBin: string): Promise<CheckResult>;
+export declare function verifyMigration(projectDir: string, baselineApsorc: string, migrationFile: string, cliBin: string, skipBuild?: boolean): Promise<CheckResult>;
 /**
  * Start the built service on a PGlite database synced to its entities and call
  * GET /health and the list endpoint of every entity.
  * ponytail: list only, no create/read/delete; add when payloads can be built
  * from required fields and relationships.
  */
-export declare function smokeTest(projectDir: string, entityNames: string[], timeoutMs?: number): Promise<CheckResult>;
+export declare function smokeTest(projectDir: string, entityNames: string[], { skipBuild, timeoutMs }?: {
+    skipBuild?: boolean | undefined;
+    timeoutMs?: number | undefined;
+}): Promise<CheckResult>;
 /** The CLI's own entry point, for running `generate` in the baseline copy. */
 export declare const cliBinPath: (root: string) => string;
 /** Print a check's steps (or JSON) through the command's logger. */

package/dist/lib/verify/index.js

@@ -137,7 +137,7 @@ ds.initialize()
  * Run a migration on a fresh copy of the deployed schema, then check that the
  * database matches the project's entities (a second generate finds nothing).
  */
-async function verifyMigration(projectDir, baselineApsorc, migrationFile, cliBin) {
+async function verifyMigration(projectDir, baselineApsorc, migrationFile, cliBin, skipBuild = false) {
     const dataDir = fs.mkdtempSync(path.join(os.tmpdir(), "apso-pglite-"));
     const steps = [];
     const done = (s) => {
@@ -147,7 +147,7 @@ async function verifyMigration(projectDir, baselineApsorc, migrationFile, cliBin
     try {
         if (!done(await buildBaseline(projectDir, baselineApsorc, dataDir, cliBin)))
             return { ok: false, steps };
-        if (!done(step("build", await build(projectDir))))
+        if (!skipBuild && !done(step("build", await build(projectDir))))
             return { ok: false, steps };
         const compiled = path
             .join("dist", path.relative("src", migrationFile))
@@ -173,12 +173,15 @@ const freePort = () => new Promise((resolve, reject) => {
 });
 const get = (url) => new Promise((resolve) => {
     http
-        .get(url, (res) => {
+        .get(url, { timeout: 15000 }, (res) => {
         let body = "";
         res.on("data", (d) => {
             body += d;
         });
         res.on("end", () => { var _a; return resolve({ status: (_a = res.statusCode) !== null && _a !== void 0 ? _a : 0, body }); });
+    })
+        .on("timeout", function () {
+        this.destroy(new Error("No response within 15s"));
     })
         .on("error", (e) => resolve({ status: 0, body: e.message }));
 });
@@ -188,7 +191,7 @@ const get = (url) => new Promise((resolve) => {
  * ponytail: list only, no create/read/delete; add when payloads can be built
  * from required fields and relationships.
  */
-async function smokeTest(projectDir, entityNames, timeoutMs = 60000) {
+async function smokeTest(projectDir, entityNames, { skipBuild = false, timeoutMs = 60000 } = {}) {
     var _a, _b;
     const dataDir = fs.mkdtempSync(path.join(os.tmpdir(), "apso-pglite-"));
     const steps = [];
@@ -198,7 +201,7 @@ async function smokeTest(projectDir, entityNames, timeoutMs = 60000) {
     };
     let server;
     try {
-        if (!done(step("build", await build(projectDir))))
+        if (!skipBuild && !done(step("build", await build(projectDir))))
             return { ok: false, steps };
         if (!done(step("schema", await typeorm(projectDir, ["schema:sync"], (0, exports.pgliteEnv)(dataDir)))))
             return { ok: false, steps };

package/npm-shrinkwrap.json

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

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.40.0",
+  "version": "0.41.1",
   "commands": {
     "config": {
       "id": "config",
@@ -832,6 +832,12 @@
           "required": true,
           "multiple": false
         },
+        "skip-build": {
+          "name": "skip-build",
+          "type": "boolean",
+          "description": "Use the existing dist/ build instead of building first",
+          "allowNo": false
+        },
         "json": {
           "name": "json",
           "type": "boolean",
@@ -1002,6 +1008,12 @@
         "$ apso test smoke"
       ],
       "flags": {
+        "skip-build": {
+          "name": "skip-build",
+          "type": "boolean",
+          "description": "Use the existing dist/ build instead of building first",
+          "allowNo": false
+        },
         "json": {
           "name": "json",
           "type": "boolean",

package/package.json

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