@apso/cli 0.41.2 → 0.42.1

package/dist/commands/generate.js

@@ -11,6 +11,7 @@ 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");
+const pglite_upgrade_1 = require("../lib/utils/pglite-upgrade");
 class Generate extends base_command_1.default {
     async run() {
         var _a, _b;
@@ -249,6 +250,10 @@ class Generate extends base_command_1.default {
             if (added.length > 0) {
                 console.log(`[apso] Added ${added.join(", ")} to package.json (the generated code imports them). Run npm install before building.`);
             }
+            // The pre-deploy checks run on PGlite; give a stock v1 config support.
+            if ((0, pglite_upgrade_1.upgradeOrmConfigForPglite)(process.cwd())) {
+                console.log("[apso] Updated src/orm.config.ts so `apso migrate verify` and `apso test smoke` can run on a local PGlite database. 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`);

package/dist/lib/apsorc-parser.d.ts

@@ -71,6 +71,17 @@ export declare class ApsorcNamingError extends Error {
  * schema builder runs the same rules, so a schema that passes there passes here.
  */
 export declare const assertCodegenSafeNames: (apsorc: Pick<ApsorcType, "entities" | "relationships">) => void;
+/**
+ * Drop indexes the database cannot create alongside another. TypeORM names an
+ * index from its table and columns only, so a plain and a unique index on the
+ * same columns get one name and the second CREATE fails, rolling back the
+ * schema (prod svc 52: Warehouse.manager_email). The unique index also serves
+ * lookups, so it is kept; exact duplicates are dropped too.
+ *
+ * @param {Entity} entity - An entity from .apsorc.
+ * @returns {Entity} The entity, with a filtered copy of its indexes when needed.
+ */
+export declare const dedupeIndexes: (entity: Entity) => Entity;
 export declare const parseApsorcV2: (apsorc: ApsorcType) => ParsedApsorcData;
 export declare const parseApsorc: () => ParsedApsorc;
 /**

package/dist/lib/apsorc-parser.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findConfigPath = exports.readApsorcFile = exports.parseApsorc = exports.parseApsorcV2 = exports.assertCodegenSafeNames = exports.ApsorcNamingError = exports.parseApsorcV1 = exports.ApiType = void 0;
+exports.findConfigPath = exports.readApsorcFile = exports.parseApsorc = exports.parseApsorcV2 = exports.dedupeIndexes = exports.assertCodegenSafeNames = exports.ApsorcNamingError = exports.parseApsorcV1 = exports.ApiType = void 0;
 const tslib_1 = require("tslib");
 const fs = tslib_1.__importStar(require("fs"));
 const path = tslib_1.__importStar(require("path"));
@@ -55,11 +55,46 @@ const assertCodegenSafeNames = (apsorc) => {
     throw new ApsorcNamingError(`${error.message}${more > 0 ? ` (${more} more error${more === 1 ? "" : "s"})` : ""} Run "apso schema lint" to see every issue, or "apso schema lint --fix" to apply the safe fixes.`, error.rule, error.entity || "", error.field);
 };
 exports.assertCodegenSafeNames = assertCodegenSafeNames;
+const columns = (fields) => fields.join(",");
+/**
+ * Drop indexes the database cannot create alongside another. TypeORM names an
+ * index from its table and columns only, so a plain and a unique index on the
+ * same columns get one name and the second CREATE fails, rolling back the
+ * schema (prod svc 52: Warehouse.manager_email). The unique index also serves
+ * lookups, so it is kept; exact duplicates are dropped too.
+ *
+ * @param {Entity} entity - An entity from .apsorc.
+ * @returns {Entity} The entity, with a filtered copy of its indexes when needed.
+ */
+const dedupeIndexes = (entity) => {
+    var _a;
+    if (!((_a = entity.indexes) === null || _a === void 0 ? void 0 : _a.length))
+        return entity;
+    const uniqueColumns = new Set(entity.indexes
+        .filter((index) => index.unique)
+        .map((index) => columns(index.fields)));
+    const seen = new Set();
+    const indexes = entity.indexes.filter((index) => {
+        const key = `${columns(index.fields)}|${index.unique ? "unique" : ""}`;
+        if (seen.has(key) ||
+            (!index.unique && uniqueColumns.has(columns(index.fields))))
+            return false;
+        seen.add(key);
+        return true;
+    });
+    return indexes.length === entity.indexes.length
+        ? entity
+        : { ...entity, indexes };
+};
+exports.dedupeIndexes = dedupeIndexes;
 const parseApsorcV2 = (apsorc) => {
     const { entities, relationships: apsoRelationships } = apsorc;
     (0, exports.assertCodegenSafeNames)(apsorc);
     const relationshipMap = (0, relationships_1.parseRelationships)(apsoRelationships);
-    return { entities, relationshipMap };
+    return {
+        entities: entities.map((entity) => (0, exports.dedupeIndexes)(entity)),
+        relationshipMap,
+    };
 };
 exports.parseApsorcV2 = parseApsorcV2;
 const parseRc = () => {
@@ -156,7 +191,10 @@ const readApsorcFile = () => {
     if (!configPath) {
         throw new Error("No .apsorc found in this directory or any parent.");
     }
-    return { configPath, apsorc: JSON.parse(fs.readFileSync(configPath).toString()) };
+    return {
+        configPath,
+        apsorc: JSON.parse(fs.readFileSync(configPath).toString()),
+    };
 };
 exports.readApsorcFile = readApsorcFile;
 const findConfigPath = () => {

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

@@ -16,3 +16,11 @@ export declare const APSO_CRUD_DEPS: Record<string, string>;
  * @returns {string[]} Names added (empty when nothing changed or no package.json).
  */
 export declare function ensureCrudDeps(projectDir: string): string[];
+/**
+ * Add the given dependencies to package.json where it doesn't declare them.
+ *
+ * @param {string} projectDir - Directory holding the project's package.json.
+ * @param {Record<string, string>} deps - Package names and version ranges.
+ * @returns {string[]} Names added (empty when nothing changed or no package.json).
+ */
+export declare function addMissingDeps(projectDir: string, deps: Record<string, string>): string[];

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureCrudDeps = exports.APSO_CRUD_DEPS = void 0;
+exports.addMissingDeps = 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"));
@@ -27,6 +27,17 @@ exports.APSO_CRUD_DEPS = {
  * @returns {string[]} Names added (empty when nothing changed or no package.json).
  */
 function ensureCrudDeps(projectDir) {
+    return addMissingDeps(projectDir, exports.APSO_CRUD_DEPS);
+}
+exports.ensureCrudDeps = ensureCrudDeps;
+/**
+ * Add the given dependencies to package.json where it doesn't declare them.
+ *
+ * @param {string} projectDir - Directory holding the project's package.json.
+ * @param {Record<string, string>} deps - Package names and version ranges.
+ * @returns {string[]} Names added (empty when nothing changed or no package.json).
+ */
+function addMissingDeps(projectDir, deps) {
     var _a;
     const pkgPath = path.join(projectDir, "package.json");
     if (!fs.existsSync(pkgPath))
@@ -34,14 +45,14 @@ function ensureCrudDeps(projectDir) {
     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]);
+    const missing = Object.keys(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[name] = 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;
+exports.addMissingDeps = addMissingDeps;

package/dist/lib/utils/pglite-upgrade.d.ts

@@ -0,0 +1,22 @@
+/**
+ * PGlite packages the upgraded orm.config.ts loads. Versions match the pinned
+ * service-template-ts tag (see TEMPLATE_REFS in ./template.ts).
+ */
+export declare const PGLITE_DEPS: Record<string, string>;
+/** src/orm.config.ts as the v1 template shipped it (no PGlite support). */
+export declare const ORM_CONFIG_V1 = "import { ConfigModule, ConfigService } from '@nestjs/config';\nimport { DataSource } from 'typeorm';\nimport {\n  TypeOrmModuleAsyncOptions,\n  TypeOrmModuleOptions,\n} from '@nestjs/typeorm';\nimport { join } from 'path';\nimport AppConfig from './config';\n\nconst sslConfig = process.env.DB_SSL\n  ? {\n      ssl: true,\n      extra: {\n        ssl: {\n          rejectUnauthorized: false,\n        },\n      },\n    }\n  : {};\n\nconst ormConfig = {\n  type: AppConfig.database.type as any,\n  host: AppConfig.database.host,\n  port: parseInt(AppConfig.database.port, 10),\n  username: AppConfig.database.username,\n  database: AppConfig.database.database,\n  password: AppConfig.database.password,\n  schema: AppConfig.database.schema,\n  entities: [join(__dirname, '**', '*.entity.js')],\n  migrations: [join(__dirname, '**', 'migrations/*-migration.js')],\n  synchronize: AppConfig.database.synchronize,\n  logging: AppConfig.database.logging,\n  ...sslConfig,\n};\n\nexport const typeOrmAsyncConfig: TypeOrmModuleAsyncOptions = {\n  imports: [ConfigModule],\n  inject: [ConfigService],\n  useFactory: async (): Promise<TypeOrmModuleOptions> => {\n    console.log('ORM CONFIG', ormConfig);\n    return ormConfig;\n  },\n};\n\nexport default new DataSource(ormConfig);\n";
+/**
+ * The v1 orm.config.ts with a PGlite branch for DATABASE_TYPE=pglite. Same
+ * exports and same behavior for every other database type.
+ */
+export declare const ORM_CONFIG_V1_PGLITE = "import { ConfigModule, ConfigService } from '@nestjs/config';\nimport { DataSource } from 'typeorm';\nimport {\n  TypeOrmModuleAsyncOptions,\n  TypeOrmModuleOptions,\n} from '@nestjs/typeorm';\nimport { join } from 'path';\nimport AppConfig from './config';\n\n// DATABASE_TYPE=pglite runs on an in-process Postgres (PGlite) for local\n// checks: apso migrate verify, apso test smoke, and the in-browser editor.\n// PGLITE_DATA_DIR keeps the database on disk between commands.\nconst usePGlite = process.env.DATABASE_TYPE === 'pglite';\n\nconst sslConfig = process.env.DB_SSL\n  ? {\n      ssl: true,\n      extra: {\n        ssl: {\n          rejectUnauthorized: false,\n        },\n      },\n    }\n  : {};\n\nconst ormConfig = {\n  ...(usePGlite\n    ? {\n        type: 'postgres' as const,\n        // Loaded only for PGlite so production installs never need it.\n        // eslint-disable-next-line @typescript-eslint/no-var-requires\n        driver: new (require('typeorm-pglite').PGliteDriver)({\n          dataDir: process.env.PGLITE_DATA_DIR,\n        }).driver,\n      }\n    : {\n        type: AppConfig.database.type as any,\n        host: AppConfig.database.host,\n        port: parseInt(AppConfig.database.port, 10),\n        username: AppConfig.database.username,\n        database: AppConfig.database.database,\n        password: AppConfig.database.password,\n        schema: AppConfig.database.schema,\n        ...sslConfig,\n      }),\n  entities: [join(__dirname, '**', '*.entity.js')],\n  migrations: [join(__dirname, '**', 'migrations/*-migration.js')],\n  synchronize: AppConfig.database.synchronize,\n  logging: AppConfig.database.logging,\n};\n\nexport const typeOrmAsyncConfig: TypeOrmModuleAsyncOptions = {\n  imports: [ConfigModule],\n  inject: [ConfigService],\n  useFactory: async (): Promise<TypeOrmModuleOptions> => {\n    console.log('ORM CONFIG', { ...ormConfig, driver: usePGlite ? '[PGliteDriver]' : undefined });\n    return ormConfig;\n  },\n};\n\nexport default new DataSource(ormConfig);\n";
+/**
+ * Give a v1-template project PGlite support so the pre-deploy checks (apso
+ * migrate verify, apso test smoke) can run. Replaces src/orm.config.ts only
+ * when it is still the stock v1 file, so a customized config is never
+ * overwritten, and declares the PGlite packages.
+ *
+ * @param {string} projectDir - The service project root.
+ * @returns {boolean} True when orm.config.ts was upgraded.
+ */
+export declare function upgradeOrmConfigForPglite(projectDir: string): boolean;

package/dist/lib/utils/pglite-upgrade.js

@@ -0,0 +1,158 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.upgradeOrmConfigForPglite = exports.ORM_CONFIG_V1_PGLITE = exports.ORM_CONFIG_V1 = exports.PGLITE_DEPS = void 0;
+const tslib_1 = require("tslib");
+const fs = tslib_1.__importStar(require("fs"));
+const path = tslib_1.__importStar(require("path"));
+const crud_deps_1 = require("./crud-deps");
+/**
+ * PGlite packages the upgraded orm.config.ts loads. Versions match the pinned
+ * service-template-ts tag (see TEMPLATE_REFS in ./template.ts).
+ */
+exports.PGLITE_DEPS = {
+    "@electric-sql/pglite": "^0.5.2",
+    "typeorm-pglite": "^0.3.2",
+};
+/** src/orm.config.ts as the v1 template shipped it (no PGlite support). */
+exports.ORM_CONFIG_V1 = `import { ConfigModule, ConfigService } from '@nestjs/config';
+import { DataSource } from 'typeorm';
+import {
+  TypeOrmModuleAsyncOptions,
+  TypeOrmModuleOptions,
+} from '@nestjs/typeorm';
+import { join } from 'path';
+import AppConfig from './config';
+
+const sslConfig = process.env.DB_SSL
+  ? {
+      ssl: true,
+      extra: {
+        ssl: {
+          rejectUnauthorized: false,
+        },
+      },
+    }
+  : {};
+
+const ormConfig = {
+  type: AppConfig.database.type as any,
+  host: AppConfig.database.host,
+  port: parseInt(AppConfig.database.port, 10),
+  username: AppConfig.database.username,
+  database: AppConfig.database.database,
+  password: AppConfig.database.password,
+  schema: AppConfig.database.schema,
+  entities: [join(__dirname, '**', '*.entity.js')],
+  migrations: [join(__dirname, '**', 'migrations/*-migration.js')],
+  synchronize: AppConfig.database.synchronize,
+  logging: AppConfig.database.logging,
+  ...sslConfig,
+};
+
+export const typeOrmAsyncConfig: TypeOrmModuleAsyncOptions = {
+  imports: [ConfigModule],
+  inject: [ConfigService],
+  useFactory: async (): Promise<TypeOrmModuleOptions> => {
+    console.log('ORM CONFIG', ormConfig);
+    return ormConfig;
+  },
+};
+
+export default new DataSource(ormConfig);
+`;
+/**
+ * The v1 orm.config.ts with a PGlite branch for DATABASE_TYPE=pglite. Same
+ * exports and same behavior for every other database type.
+ */
+exports.ORM_CONFIG_V1_PGLITE = `import { ConfigModule, ConfigService } from '@nestjs/config';
+import { DataSource } from 'typeorm';
+import {
+  TypeOrmModuleAsyncOptions,
+  TypeOrmModuleOptions,
+} from '@nestjs/typeorm';
+import { join } from 'path';
+import AppConfig from './config';
+
+// DATABASE_TYPE=pglite runs on an in-process Postgres (PGlite) for local
+// checks: apso migrate verify, apso test smoke, and the in-browser editor.
+// PGLITE_DATA_DIR keeps the database on disk between commands.
+const usePGlite = process.env.DATABASE_TYPE === 'pglite';
+
+const sslConfig = process.env.DB_SSL
+  ? {
+      ssl: true,
+      extra: {
+        ssl: {
+          rejectUnauthorized: false,
+        },
+      },
+    }
+  : {};
+
+const ormConfig = {
+  ...(usePGlite
+    ? {
+        type: 'postgres' as const,
+        // Loaded only for PGlite so production installs never need it.
+        // eslint-disable-next-line @typescript-eslint/no-var-requires
+        driver: new (require('typeorm-pglite').PGliteDriver)({
+          dataDir: process.env.PGLITE_DATA_DIR,
+        }).driver,
+      }
+    : {
+        type: AppConfig.database.type as any,
+        host: AppConfig.database.host,
+        port: parseInt(AppConfig.database.port, 10),
+        username: AppConfig.database.username,
+        database: AppConfig.database.database,
+        password: AppConfig.database.password,
+        schema: AppConfig.database.schema,
+        ...sslConfig,
+      }),
+  entities: [join(__dirname, '**', '*.entity.js')],
+  migrations: [join(__dirname, '**', 'migrations/*-migration.js')],
+  synchronize: AppConfig.database.synchronize,
+  logging: AppConfig.database.logging,
+};
+
+export const typeOrmAsyncConfig: TypeOrmModuleAsyncOptions = {
+  imports: [ConfigModule],
+  inject: [ConfigService],
+  useFactory: async (): Promise<TypeOrmModuleOptions> => {
+    console.log('ORM CONFIG', { ...ormConfig, driver: usePGlite ? '[PGliteDriver]' : undefined });
+    return ormConfig;
+  },
+};
+
+export default new DataSource(ormConfig);
+`;
+const squash = (s) => s.replace(/\s+/g, "");
+/**
+ * Give a v1-template project PGlite support so the pre-deploy checks (apso
+ * migrate verify, apso test smoke) can run. Replaces src/orm.config.ts only
+ * when it is still the stock v1 file, so a customized config is never
+ * overwritten, and declares the PGlite packages.
+ *
+ * @param {string} projectDir - The service project root.
+ * @returns {boolean} True when orm.config.ts was upgraded.
+ */
+function upgradeOrmConfigForPglite(projectDir) {
+    const file = path.join(projectDir, "src", "orm.config.ts");
+    if (!fs.existsSync(file))
+        return false;
+    const current = fs.readFileSync(file, "utf8");
+    if (squash(current) === squash(exports.ORM_CONFIG_V1)) {
+        fs.writeFileSync(file, exports.ORM_CONFIG_V1_PGLITE);
+        (0, crud_deps_1.addMissingDeps)(projectDir, exports.PGLITE_DEPS);
+        return true;
+    }
+    // typeorm-pglite 0.3.4 takes an options object; given the data dir as a
+    // string it runs in memory, so each command starts from an empty database.
+    // { dataDir } works with 0.3.2 too.
+    const fixed = current.replace(/new PGliteDriver\(\s*process\.env\.PGLITE_DATA_DIR(?:\s*\|\|\s*undefined)?\s*\)/g, "new PGliteDriver({ dataDir: process.env.PGLITE_DATA_DIR })");
+    if (fixed === current)
+        return false;
+    fs.writeFileSync(file, fixed);
+    return true;
+}
+exports.upgradeOrmConfigForPglite = upgradeOrmConfigForPglite;

package/dist/lib/verify/index.js

@@ -173,11 +173,13 @@ async function verifyMigration(projectDir, baselineApsorc, migrationFile, cliBin
     try {
         if (!done(await buildBaseline(projectDir, baselineApsorc, dataDir, cliBin)))
             return { ok: false, steps };
-        if (!skipBuild && !done(step("build", await build(projectDir))))
-            return { ok: false, steps };
         const compiled = path
             .join("dist", path.relative("src", migrationFile))
             .replace(/\.ts$/, ".js");
+        // --skip-build still builds when the migration isn't compiled yet.
+        const needsBuild = !skipBuild || !fs.existsSync(path.join(projectDir, compiled));
+        if (needsBuild && !done(step("build", await build(projectDir))))
+            return { ok: false, steps };
         const migrate = await run(process.execPath, ["-e", RUN_ONE_MIGRATION, compiled], projectDir, (0, exports.pgliteEnv)(dataDir));
         if (!done({ ...step("migrate", migrate), output: tail(migrate.output) }))
             return { ok: false, steps };

package/npm-shrinkwrap.json

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

package/oclif.manifest.json

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

package/package.json

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