@apso/cli 0.42.0 → 0.42.1

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/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@apso/cli",
-  "version": "0.42.0",
+  "version": "0.42.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@apso/cli",
-      "version": "0.42.0",
+      "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.42.0",
+  "version": "0.42.1",
   "commands": {
     "config": {
       "id": "config",

package/package.json

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