@apso/cli 0.41.0 → 0.41.2

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/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

@@ -42,6 +42,7 @@ export interface CheckResult {
     ok: boolean;
     steps: Step[];
 }
+export declare function supportsPglite(projectDir: string): boolean;
 /**
  * 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).

package/dist/lib/verify/index.js

@@ -6,7 +6,7 @@
  * the CLI in a WebContainer) share these steps.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.report = exports.cliBinPath = exports.smokeTest = exports.verifyMigration = exports.generateMigration = exports.buildBaseline = exports.pgliteEnv = exports.run = void 0;
+exports.report = exports.cliBinPath = exports.smokeTest = exports.verifyMigration = exports.supportsPglite = exports.generateMigration = exports.buildBaseline = exports.pgliteEnv = exports.run = void 0;
 const tslib_1 = require("tslib");
 const child_process_1 = require("child_process");
 const fs = tslib_1.__importStar(require("fs"));
@@ -133,11 +133,37 @@ ds.initialize()
   .then((ran) => { console.log("ran " + ran.map((m) => m.name).join(", ")); return ds.destroy(); })
   .catch((e) => { console.error(e && e.message ? e.message : e); process.exit(1); });
 `;
+/**
+ * Projects from the v1 template have no PGlite support in src/orm.config.ts,
+ * so the checks cannot run locally. They pass as skipped rather than block a
+ * deploy they cannot judge.
+ */
+const NO_PGLITE = {
+    ok: true,
+    steps: [
+        {
+            name: "skipped",
+            ok: true,
+            output: "This project's database config (src/orm.config.ts) can't use a local PGlite database, so this check was skipped. Projects created from the current template support it.",
+        },
+    ],
+};
+function supportsPglite(projectDir) {
+    try {
+        return /typeorm-pglite|PGliteDriver/.test(fs.readFileSync(path.join(projectDir, "src", "orm.config.ts"), "utf8"));
+    }
+    catch {
+        return false;
+    }
+}
+exports.supportsPglite = supportsPglite;
 /**
  * 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, skipBuild = false) {
+    if (!supportsPglite(projectDir))
+        return NO_PGLITE;
     const dataDir = fs.mkdtempSync(path.join(os.tmpdir(), "apso-pglite-"));
     const steps = [];
     const done = (s) => {
@@ -193,6 +219,8 @@ const get = (url) => new Promise((resolve) => {
  */
 async function smokeTest(projectDir, entityNames, { skipBuild = false, timeoutMs = 60000 } = {}) {
     var _a, _b;
+    if (!supportsPglite(projectDir))
+        return NO_PGLITE;
     const dataDir = fs.mkdtempSync(path.join(os.tmpdir(), "apso-pglite-"));
     const steps = [];
     const done = (s) => {

package/npm-shrinkwrap.json

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

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.41.0",
+  "version": "0.41.2",
   "commands": {
     "config": {
       "id": "config",

package/package.json

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