joist-codegen 1.168.2 → 1.169.1

package/build/inheritance.js

@@ -0,0 +1,185 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getStiEntities = exports.applyInheritanceUpdates = void 0;
+const EntityDbMetadata_1 = require("./EntityDbMetadata");
+const utils_1 = require("./utils");
+function applyInheritanceUpdates(config, db) {
+    const { entities, entitiesByName } = db;
+    setClassTableInheritance(entities, entitiesByName);
+    expandSingleTableInheritance(config, entities);
+    rewriteSingleTableForeignKeys(config, entities);
+}
+exports.applyInheritanceUpdates = applyInheritanceUpdates;
+/**
+ * Ensure CTI base types have their inheritanceType set.
+ *
+ * (We automatically set `inheritanceType` for STI tables when we see their config
+ * setup, see `expandSingleTableInheritance`.)
+ */
+function setClassTableInheritance(entities, entitiesByName) {
+    const ctiBaseNames = [];
+    for (const entity of entities) {
+        if (entity.baseClassName) {
+            ctiBaseNames.push(entity.baseClassName);
+            entitiesByName[entity.baseClassName].subTypes.push(entity);
+        }
+    }
+    for (const entity of entities) {
+        if (ctiBaseNames.includes(entity.name))
+            entity.inheritanceType = "cti";
+    }
+}
+/** Expands STI tables into multiple entities, so they get separate `SubTypeCodegen.ts` & `SubType.ts` files. */
+function expandSingleTableInheritance(config, entities) {
+    for (const entity of entities) {
+        const [fieldName, stiField] = Object.entries(config.entities[entity.name]?.fields || {}).find(([, f]) => !!f.stiDiscriminator) ?? [];
+        if (fieldName && stiField && stiField.stiDiscriminator) {
+            entity.inheritanceType = "sti";
+            // Ensure we have an enum field so that we can bake the STI discriminators into the metadata.ts file
+            const enumField = entity.enums.find((e) => e.fieldName === fieldName) ??
+                (0, utils_1.fail)(`No enum column found for ${entity.name}.${fieldName}, which is required to use singleTableInheritance`);
+            entity.stiDiscriminatorField = enumField.fieldName;
+            for (const [enumCode, subTypeName] of Object.entries(stiField.stiDiscriminator)) {
+                // Find all the base entity's fields that belong to us
+                const subTypeFields = [
+                    ...Object.entries(config.entities[entity.name]?.fields ?? {}),
+                    ...Object.entries(config.entities[entity.name]?.relations ?? {}),
+                ].filter(([, f]) => f.stiType === subTypeName);
+                const subTypeFieldNames = subTypeFields.map(([name]) => name);
+                // Make fields as required
+                function maybeRequired(field) {
+                    const config = subTypeFields.find(([name]) => name === field.fieldName)?.[1];
+                    if (config.stiNotNull)
+                        field.notNull = true;
+                    return field;
+                }
+                // Synthesize an entity for this STI sub-entity
+                const subEntity = {
+                    name: subTypeName,
+                    entity: (0, EntityDbMetadata_1.makeEntity)(subTypeName),
+                    tableName: entity.tableName,
+                    primaryKey: entity.primaryKey,
+                    primitives: entity.primitives.filter((f) => subTypeFieldNames.includes(f.fieldName)).map(maybeRequired),
+                    enums: entity.enums.filter((f) => subTypeFieldNames.includes(f.fieldName)).map(maybeRequired),
+                    pgEnums: entity.pgEnums.filter((f) => subTypeFieldNames.includes(f.fieldName)).map(maybeRequired),
+                    manyToOnes: entity.manyToOnes.filter((f) => subTypeFieldNames.includes(f.fieldName)).map(maybeRequired),
+                    oneToManys: entity.oneToManys.filter((f) => subTypeFieldNames.includes(f.fieldName)),
+                    largeOneToManys: entity.largeOneToManys.filter((f) => subTypeFieldNames.includes(f.fieldName)),
+                    oneToOnes: entity.oneToOnes.filter((f) => subTypeFieldNames.includes(f.fieldName)),
+                    manyToManys: entity.manyToManys.filter((f) => subTypeFieldNames.includes(f.fieldName)),
+                    largeManyToManys: entity.largeManyToManys.filter((f) => subTypeFieldNames.includes(f.fieldName)),
+                    polymorphics: entity.polymorphics.filter((f) => subTypeFieldNames.includes(f.fieldName)),
+                    tagName: entity.tagName,
+                    createdAt: undefined,
+                    updatedAt: undefined,
+                    deletedAt: undefined,
+                    baseClassName: entity.name,
+                    subTypes: [],
+                    inheritanceType: "sti",
+                    stiDiscriminatorValue: (enumField.enumRows.find((r) => r.code === enumCode) ??
+                        (0, utils_1.fail)(`No enum row found for ${entity.name}.${fieldName}.${enumCode}`)).id,
+                    abstract: false,
+                    nonDeferredFkOrder: entity.nonDeferredFkOrder,
+                    get nonDeferredFks() {
+                        return [
+                            ...this.manyToOnes.filter((r) => !r.isDeferredAndDeferrable),
+                            ...this.polymorphics.flatMap((p) => p.components).filter((c) => !c.isDeferredAndDeferrable),
+                        ];
+                    },
+                };
+                // Now strip all the subclass fields from the base class
+                entity.primitives = entity.primitives.filter((f) => !subTypeFieldNames.includes(f.fieldName));
+                entity.enums = entity.enums.filter((f) => !subTypeFieldNames.includes(f.fieldName));
+                entity.pgEnums = entity.pgEnums.filter((f) => !subTypeFieldNames.includes(f.fieldName));
+                entity.manyToOnes = entity.manyToOnes.filter((f) => !subTypeFieldNames.includes(f.fieldName));
+                entity.oneToManys = entity.oneToManys.filter((f) => !subTypeFieldNames.includes(f.fieldName));
+                entity.largeOneToManys = entity.largeOneToManys.filter((f) => !subTypeFieldNames.includes(f.fieldName));
+                entity.oneToOnes = entity.oneToOnes.filter((f) => !subTypeFieldNames.includes(f.fieldName));
+                entity.manyToManys = entity.manyToManys.filter((f) => !subTypeFieldNames.includes(f.fieldName));
+                entity.largeManyToManys = entity.largeManyToManys.filter((f) => !subTypeFieldNames.includes(f.fieldName));
+                entity.polymorphics = entity.polymorphics.filter((f) => !subTypeFieldNames.includes(f.fieldName));
+                entities.push(subEntity);
+            }
+        }
+    }
+}
+let stiEntities;
+function getStiEntities(entities) {
+    if (stiEntities)
+        return stiEntities;
+    stiEntities = new Map();
+    for (const entity of entities) {
+        if (entity.inheritanceType === "sti" && entity.stiDiscriminatorField) {
+            const base = entity;
+            const subTypes = entities.filter((s) => s.baseClassName === entity.name && s !== entity);
+            stiEntities.set(entity.name, { base, subTypes });
+            // Allow looking up by subType name
+            for (const subType of subTypes) {
+                stiEntities.set(subType.name, { base, subTypes: [] });
+            }
+        }
+    }
+    return stiEntities;
+}
+exports.getStiEntities = getStiEntities;
+/** Finds FKs pointing to the base table and, if configured, rewrites them to point to the sub-tables. */
+function rewriteSingleTableForeignKeys(config, entities) {
+    // See if we even have any STI tables
+    const stiEntities = getStiEntities(entities);
+    if (stiEntities.size === 0)
+        return;
+    // Scan for other entities/relations that point to the STI table
+    for (const entity of entities) {
+        // m2os -- Look for `entity.task_id` FKs pointing at `Task` and, if configured, rewrite them to point at `TaskOld`
+        for (const m2o of entity.manyToOnes) {
+            const target = stiEntities.get(m2o.otherEntity.name);
+            const base = target?.base.entity.name;
+            // See if the user has pushed `Task.entities` down to a subtype
+            const stiType = base && config.entities[base]?.relations?.[m2o.otherFieldName]?.stiType;
+            if (target && stiType) {
+                const { subTypes } = target;
+                m2o.otherEntity = (subTypes.find((s) => s.name === stiType) ??
+                    (0, utils_1.fail)(`Could not find STI type '${stiType}' in ${subTypes.map((s) => s.name)}`)).entity;
+            }
+        }
+        // polys -- Look for `entity.parent_task_id` FKs pointing at `Task` and, if configured, rewrite them to point at `TaskOld`
+        for (const poly of entity.polymorphics) {
+            for (const comp of poly.components) {
+                const target = stiEntities.get(comp.otherEntity.name);
+                const base = target?.base.entity.name;
+                // See if the user has pushed `Task.entities` down to a subtype
+                const stiType = base && config.entities[base]?.relations?.[comp.otherFieldName]?.stiType;
+                if (target && stiType) {
+                    const { subTypes } = target;
+                    comp.otherEntity = (subTypes.find((s) => s.name === stiType) ??
+                        (0, utils_1.fail)(`Could not find STI type '${stiType}' in ${subTypes.map((s) => s.name)}`)).entity;
+                }
+            }
+        }
+        // o2ms -- Look for `entity.tasks` collections loading `task.entity_id`, but entity has been pushed down to `TaskOld`
+        for (const o2m of entity.oneToManys) {
+            const target = stiEntities.get(o2m.otherEntity.name);
+            if (target && target.base.inheritanceType === "sti") {
+                // Ensure the incoming FK is not in the base type, and find the 1st subtype (eventually N subtypes?)
+                const otherField = target.subTypes.find((st) => !target.base.manyToOnes.some((m) => m.fieldName === o2m.otherFieldName) &&
+                    st.manyToOnes.some((m) => m.fieldName === o2m.otherFieldName));
+                if (otherField) {
+                    o2m.otherEntity = otherField.entity;
+                }
+            }
+        }
+        // m2ms -- Look for `entity.tasks` collections loading m2m rows, but `entity` has been pushed down to `TaskOld`
+        for (const m2m of entity.manyToManys) {
+            const target = stiEntities.get(m2m.otherEntity.name);
+            if (target && target.base.inheritanceType === "sti") {
+                // Ensure the incoming FK is not in the base type, and find the 1st subtype (eventually N subtypes?)
+                const otherField = target.subTypes.find((st) => !target.base.manyToManys.some((m) => m.fieldName === m2m.otherFieldName) &&
+                    st.manyToManys.some((m) => m.fieldName === m2m.otherFieldName));
+                if (otherField) {
+                    m2m.otherEntity = otherField.entity;
+                }
+            }
+        }
+    }
+}
+//# sourceMappingURL=inheritance.js.map

package/build/inheritance.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"inheritance.js","sourceRoot":"","sources":["../src/inheritance.ts"],"names":[],"mappings":";;;AAAA,yDAM4B;AAE5B,mCAA+B;AAE/B,SAAgB,uBAAuB,CAAC,MAAc,EAAE,EAAc;IACpE,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE,GAAG,EAAE,CAAC;IACxC,wBAAwB,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;IACnD,4BAA4B,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAC/C,6BAA6B,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;AAClD,CAAC;AALD,0DAKC;AAED;;;;;GAKG;AACH,SAAS,wBAAwB,CAC/B,QAA4B,EAC5B,cAAgD;IAEhD,MAAM,YAAY,GAAa,EAAE,CAAC;IAClC,KAAK,MAAM,MAAM,IAAI,QAAQ,EAAE,CAAC;QAC9B,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;YACzB,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;YACxC,cAAc,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC7D,CAAC;IACH,CAAC;IACD,KAAK,MAAM,MAAM,IAAI,QAAQ,EAAE,CAAC;QAC9B,IAAI,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC;YAAE,MAAM,CAAC,eAAe,GAAG,KAAK,CAAC;IACzE,CAAC;AACH,CAAC;AAED,gHAAgH;AAChH,SAAS,4BAA4B,CAAC,MAAc,EAAE,QAA4B;IAChF,KAAK,MAAM,MAAM,IAAI,QAAQ,EAAE,CAAC;QAC9B,MAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,GACzB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC;QACzG,IAAI,SAAS,IAAI,QAAQ,IAAI,QAAQ,CAAC,gBAAgB,EAAE,CAAC;YACvD,MAAM,CAAC,eAAe,GAAG,KAAK,CAAC;YAC/B,oGAAoG;YACpG,MAAM,SAAS,GACb,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,SAAS,CAAC;gBACnD,IAAA,YAAI,EAAC,4BAA4B,MAAM,CAAC,IAAI,IAAI,SAAS,mDAAmD,CAAC,CAAC;YAChH,MAAM,CAAC,qBAAqB,GAAG,SAAS,CAAC,SAAS,CAAC;YACnD,KAAK,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,CAAC;gBAChF,sDAAsD;gBACtD,MAAM,aAAa,GAAG;oBACpB,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,IAAI,EAAE,CAAC;oBAC7D,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,SAAS,IAAI,EAAE,CAAC;iBACjE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,WAAW,CAAC,CAAC;gBAC/C,MAAM,iBAAiB,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;gBAE9D,0BAA0B;gBAC1B,SAAS,aAAa,CAAoD,KAAQ;oBAChF,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,IAAI,KAAK,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAE,CAAC;oBAC9E,IAAI,MAAM,CAAC,UAAU;wBAAE,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC;oBAC5C,OAAO,KAAK,CAAC;gBACf,CAAC;gBAED,+CAA+C;gBAC/C,MAAM,SAAS,GAAqB;oBAClC,IAAI,EAAE,WAAW;oBACjB,MAAM,EAAE,IAAA,6BAAU,EAAC,WAAW,CAAC;oBAC/B,SAAS,EAAE,MAAM,CAAC,SAAS;oBAC3B,UAAU,EAAE,MAAM,CAAC,UAAU;oBAC7B,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC;oBACvG,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC;oBAC7F,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC;oBACjG,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC;oBACvG,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;oBACpF,eAAe,EAAE,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;oBAC9F,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;oBAClF,WAAW,EAAE,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;oBACtF,gBAAgB,EAAE,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;oBAChG,YAAY,EAAE,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;oBACxF,OAAO,EAAE,MAAM,CAAC,OAAO;oBACvB,SAAS,EAAE,SAAS;oBACpB,SAAS,EAAE,SAAS;oBACpB,SAAS,EAAE,SAAS;oBACpB,aAAa,EAAE,MAAM,CAAC,IAAI;oBAC1B,QAAQ,EAAE,EAAE;oBACZ,eAAe,EAAE,KAAK;oBACtB,qBAAqB,EAAE,CACrB,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC;wBACnD,IAAA,YAAI,EAAC,yBAAyB,MAAM,CAAC,IAAI,IAAI,SAAS,IAAI,QAAQ,EAAE,CAAC,CACtE,CAAC,EAAE;oBACJ,QAAQ,EAAE,KAAK;oBACf,kBAAkB,EAAE,MAAM,CAAC,kBAAkB;oBAC7C,IAAI,cAAc;wBAChB,OAAO;4BACL,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,uBAAuB,CAAC;4BAC5D,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,uBAAuB,CAAC;yBAC5F,CAAC;oBACJ,CAAC;iBACF,CAAC;gBAEF,wDAAwD;gBACxD,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;gBAC9F,MAAM,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;gBACpF,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;gBACxF,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;gBAC9F,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;gBAC9F,MAAM,CAAC,eAAe,GAAG,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;gBACxG,MAAM,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;gBAC5F,MAAM,CAAC,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;gBAChG,MAAM,CAAC,gBAAgB,GAAG,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;gBAC1G,MAAM,CAAC,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;gBAElG,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC3B,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC;AAGD,IAAI,WAAyB,CAAC;AAE9B,SAAgB,cAAc,CAAC,QAA4B;IACzD,IAAI,WAAW;QAAE,OAAO,WAAW,CAAC;IACpC,WAAW,GAAG,IAAI,GAAG,EAAE,CAAC;IACxB,KAAK,MAAM,MAAM,IAAI,QAAQ,EAAE,CAAC;QAC9B,IAAI,MAAM,CAAC,eAAe,KAAK,KAAK,IAAI,MAAM,CAAC,qBAAqB,EAAE,CAAC;YACrE,MAAM,IAAI,GAAG,MAAM,CAAC;YACpB,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,KAAK,MAAM,CAAC,CAAC;YACzF,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;YACjD,mCAAmC;YACnC,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;gBAC/B,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC;YACxD,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,WAAW,CAAC;AACrB,CAAC;AAfD,wCAeC;AAED,yGAAyG;AACzG,SAAS,6BAA6B,CAAC,MAAc,EAAE,QAA4B;IACjF,qCAAqC;IACrC,MAAM,WAAW,GAAG,cAAc,CAAC,QAAQ,CAAC,CAAC;IAC7C,IAAI,WAAW,CAAC,IAAI,KAAK,CAAC;QAAE,OAAO;IACnC,gEAAgE;IAChE,KAAK,MAAM,MAAM,IAAI,QAAQ,EAAE,CAAC;QAC9B,kHAAkH;QAClH,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;YACpC,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YACrD,MAAM,IAAI,GAAG,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;YACtC,+DAA+D;YAC/D,MAAM,OAAO,GAAG,IAAI,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,OAAO,CAAC;YACxF,IAAI,MAAM,IAAI,OAAO,EAAE,CAAC;gBACtB,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;gBAC5B,GAAG,CAAC,WAAW,GAAG,CAChB,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC;oBACxC,IAAA,YAAI,EAAC,4BAA4B,OAAO,QAAQ,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAC/E,CAAC,MAAM,CAAC;YACX,CAAC;QACH,CAAC;QACD,0HAA0H;QAC1H,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;YACvC,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;gBACnC,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;gBACtD,MAAM,IAAI,GAAG,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;gBACtC,+DAA+D;gBAC/D,MAAM,OAAO,GAAG,IAAI,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,OAAO,CAAC;gBACzF,IAAI,MAAM,IAAI,OAAO,EAAE,CAAC;oBACtB,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;oBAC5B,IAAI,CAAC,WAAW,GAAG,CACjB,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC;wBACxC,IAAA,YAAI,EAAC,4BAA4B,OAAO,QAAQ,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAC/E,CAAC,MAAM,CAAC;gBACX,CAAC;YACH,CAAC;QACH,CAAC;QACD,qHAAqH;QACrH,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;YACpC,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YACrD,IAAI,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,eAAe,KAAK,KAAK,EAAE,CAAC;gBACpD,oGAAoG;gBACpG,MAAM,UAAU,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CACrC,CAAC,EAAE,EAAE,EAAE,CACL,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,GAAG,CAAC,cAAc,CAAC;oBACvE,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,GAAG,CAAC,cAAc,CAAC,CAChE,CAAC;gBACF,IAAI,UAAU,EAAE,CAAC;oBACf,GAAG,CAAC,WAAW,GAAG,UAAU,CAAC,MAAM,CAAC;gBACtC,CAAC;YACH,CAAC;QACH,CAAC;QACD,+GAA+G;QAC/G,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;YACrC,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YACrD,IAAI,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,eAAe,KAAK,KAAK,EAAE,CAAC;gBACpD,oGAAoG;gBACpG,MAAM,UAAU,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CACrC,CAAC,EAAE,EAAE,EAAE,CACL,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,GAAG,CAAC,cAAc,CAAC;oBACxE,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,GAAG,CAAC,cAAc,CAAC,CACjE,CAAC;gBACF,IAAI,UAAU,EAAE,CAAC;oBACf,GAAG,CAAC,WAAW,GAAG,UAAU,CAAC,MAAM,CAAC;gBACtC,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC"}

package/build/sortForeignKeys.d.ts

@@ -0,0 +1,32 @@
+import { EntityDbMetadata } from "./EntityDbMetadata";
+/**
+ * Sorts entities by non-deferred foreign key order.
+ *
+ * Ideally databases/schemas will support/enable deferred FKs, which let us insert/delete rows
+ * in any arbitrary order, and the FK checks will not be applied until txn commit.
+ *
+ * However, if not enabled/support, we have to worry about two things:
+ *
+ * 1. Inserting "parents" before their children
+ *    - And if the parent has a circular reference to not-yet-inserted cycle
+ * 2. Deleting "children" before their parents
+ *    - Again if the parent has a circular reference to the child
+ *
+ * For both of these, we can just look at the FK ordering to "put the parent first",
+ * but run into two problems:
+ *
+ * - If there is a cycle for not-null FKs, that breaks both INSERTs and DELETEs, so we
+ * must warn the user about these to fix.
+ * - If there is a cycle with nullable FKs, we can work around that by using NULL as a
+ * transient/dummy value, for the initial insert, do the 2nd insert, and then "fixup" the
+ * first insert with a UPDATE to the actual column value.
+ *
+ * Given ^, we set the `entity.nonDeferredFkOrder` of each entity, and then also return
+ * two arrays of all soft-cycle (nullable, fixup-able) and hard-cycle (not-nullable, blocking)
+ * keys.
+ */
+export declare function sortByNonDeferredForeignKeys(entities: EntityDbMetadata[]): {
+    nullableCycles: string[];
+    notNullCycles: string[];
+};
+//# sourceMappingURL=sortForeignKeys.d.ts.map

package/build/sortForeignKeys.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sortForeignKeys.d.ts","sourceRoot":"","sources":["../src/sortForeignKeys.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAA6C,MAAM,oBAAoB,CAAC;AAEjG;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAgB,4BAA4B,CAAC,QAAQ,EAAE,gBAAgB,EAAE,GAAG;IAC1E,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAiEA"}

package/build/sortForeignKeys.js

@@ -0,0 +1,128 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sortByNonDeferredForeignKeys = void 0;
+/**
+ * Sorts entities by non-deferred foreign key order.
+ *
+ * Ideally databases/schemas will support/enable deferred FKs, which let us insert/delete rows
+ * in any arbitrary order, and the FK checks will not be applied until txn commit.
+ *
+ * However, if not enabled/support, we have to worry about two things:
+ *
+ * 1. Inserting "parents" before their children
+ *    - And if the parent has a circular reference to not-yet-inserted cycle
+ * 2. Deleting "children" before their parents
+ *    - Again if the parent has a circular reference to the child
+ *
+ * For both of these, we can just look at the FK ordering to "put the parent first",
+ * but run into two problems:
+ *
+ * - If there is a cycle for not-null FKs, that breaks both INSERTs and DELETEs, so we
+ * must warn the user about these to fix.
+ * - If there is a cycle with nullable FKs, we can work around that by using NULL as a
+ * transient/dummy value, for the initial insert, do the 2nd insert, and then "fixup" the
+ * first insert with a UPDATE to the actual column value.
+ *
+ * Given ^, we set the `entity.nonDeferredFkOrder` of each entity, and then also return
+ * two arrays of all soft-cycle (nullable, fixup-able) and hard-cycle (not-nullable, blocking)
+ * keys.
+ */
+function sortByNonDeferredForeignKeys(entities) {
+    // Kahn's algorithm, O(V + E)
+    const graph = Object.fromEntries(entities.map((e) => [
+        e.name,
+        {
+            entity: e,
+            upstreamFks: new Set(),
+            downstreamFks: new Set(),
+        },
+    ]));
+    // Add all not-null deps first, as they are most important, cannot be fixed up.
+    // - Failures here are fatal-ish
+    // Then add nullable deps next, as they can be fixed-up
+    const nullableCycles = [];
+    const notNullCycles = [];
+    // If we see `books.author_id`, mark `author.inDegree++`
+    entities.forEach((entity) => {
+        entity.nonDeferredFks
+            .filter((m2o) => m2o.notNull)
+            .forEach((m2o) => {
+            const added = addDependency(graph, entity, m2o);
+            if (Array.isArray(added))
+                notNullCycles.push(added.join(" -> "));
+        });
+    });
+    // Do it again for nullable
+    entities.forEach((entity) => {
+        entity.nonDeferredFks
+            .filter((m2o) => !m2o.notNull)
+            .forEach((m2o) => {
+            const added = addDependency(graph, entity, m2o);
+            if (Array.isArray(added))
+                nullableCycles.push(added.join(" -> "));
+        });
+    });
+    // Topological Sort
+    // Enqueue entities with 0 out-degree (reverse Kahn), i.e. `authors`, they'll be at the top of the tree
+    let queue = Object.values(graph).filter((n) => n.upstreamFks.size === 0);
+    let level = 1;
+    while (queue.length > 0) {
+        // console.log(`Queue: ${queue.map((n) => n.entity.name)}`);
+        const nextLevel = [];
+        for (const current of queue) {
+            current.entity.nonDeferredFkOrder = level;
+            current.downstreamFks.forEach((node) => {
+                if (node.upstreamFks.delete(current) && node.upstreamFks.size === 0) {
+                    nextLevel.push(node);
+                }
+            });
+        }
+        queue = nextLevel;
+        level++;
+    }
+    // Anything left with a -1 value means there is a cycle
+    // Use a marker value for "cyclic"
+    entities.filter((e) => e.nonDeferredFkOrder === -1).forEach((e) => (e.nonDeferredFkOrder = 100_000));
+    return { nullableCycles, notNullCycles: notNullCycles };
+}
+exports.sortByNonDeferredForeignKeys = sortByNonDeferredForeignKeys;
+function addDependency(graph, entity, m2o) {
+    const from = graph[entity.name]; // i.e. books
+    const to = graph[m2o.otherEntity.name]; // i.e. authors
+    const cycle = willCreateCycle(graph, from, to);
+    if (cycle) {
+        // console.log(`Skipped ${entity.name}.${m2o.columnName} -> ${m2o.otherEntity.name}`);
+        return cycle;
+    }
+    // console.log(`Added ${entity.name}.${m2o.columnName} -> ${m2o.otherEntity.name}`);
+    from.upstreamFks.add(to);
+    to.downstreamFks.add(from);
+    return true;
+}
+function willCreateCycle(graph, from, to) {
+    const visited = new Set();
+    const stack = new Set();
+    const path = [];
+    // If `from=books[.author_id]` pointing at `to=authors`, we want to do `to.downstreamFks.add(from)`,
+    // but first make sure that none of from's dowstreams are to, because if so it would make a cycle.
+    return dfs(graph, visited, stack, path, from, to);
+}
+function dfs(graph, visited, stack, path, current, target) {
+    visited.add(current);
+    stack.add(current);
+    path.push(current);
+    for (const neighbor of current.downstreamFks) {
+        if (neighbor === target) {
+            return [...path, neighbor].map((n) => n.entity.name);
+        }
+        if (!visited.has(neighbor)) {
+            const cycle = dfs(graph, visited, stack, path, neighbor, target);
+            if (cycle)
+                return cycle;
+        }
+    }
+    stack.delete(current);
+    path.pop();
+    return false;
+}
+//# sourceMappingURL=sortForeignKeys.js.map

package/build/sortForeignKeys.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sortForeignKeys.js","sourceRoot":"","sources":["../src/sortForeignKeys.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "joist-codegen",
-  "version": "1.168.2",
+  "version": "1.169.1",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -25,7 +25,7 @@
     "change-case": "^4.1.2",
     "fast-glob": "^3.3.2",
     "inquirer": "^8.2.6",
-    "joist-utils": "1.168.2",
+    "joist-utils": "1.169.1",
     "jscodeshift": "^0.15.2",
     "knex": "^3.1.0",
     "pg": "^8.11.5",