@memberjunction/core-entities-server 6.2.0-edge.6 → 6.2.0-edge.7

package/dist/custom/query-extraction/childRowWriter.js

@@ -0,0 +1,277 @@
+import { RunInEntityTransaction, RunMaybeSerial } from "@memberjunction/core";
+import { EscapeSQLString, NormalizeUUID, UUIDsEqual } from "@memberjunction/global";
+/**
+ * Brings a query's child rows in line with its extracted facts, keeping what people authored.
+ *
+ * **Facts** are corrected on every row, including declared and `Manual` ones: a field's name
+ * casing, sequence, types, nullability, source and computed flag; whether a parameter exists
+ * (and its name casing); which entities and dependencies the query has.
+ *
+ * **Annotations** are never overwritten when authored (`DetectionMethod` `Manual`, or a
+ * non-empty value): descriptions, `ComputationDescription`, `IsSummary` / `SummaryDescription`,
+ * and a `Manual` parameter's type, required flag, default, sample, validation filters and
+ * server-set flag. A doc-comment description is authored too: it fills an empty description and
+ * replaces one extraction or an LLM wrote.
+ *
+ * An authored parameter the SQL no longer uses is kept (extraction flags it on the query); an
+ * auto-detected one is deleted. Rows keep their IDs. A `null` fact collection leaves its rows as
+ * they are. Existing rows are read from the database on the caller's provider, never a cache, so
+ * rows written earlier in the same transaction are seen.
+ *
+ * The writes are one unit of work: they run in an entity transaction on the caller's provider,
+ * which joins the caller's transaction when one is open (a nested scope), so a failed write rolls
+ * every write of this call back and throws. A provider without entity transactions (a client)
+ * writes without one.
+ *
+ * With `DryRun` the same changes are worked out and reported, and nothing is written.
+ */
+export async function WriteExtractedChildRows(context, result) {
+    const stored = await loadStoredChildRows(context);
+    const summary = { Added: 0, Updated: 0, Removed: 0, Changes: [], FlaggedParameters: [], FieldsWithoutDescription: [], ParametersWithoutDescription: [] };
+    const writes = [];
+    if (result.Fields)
+        writes.push(...await fieldWrites(context, stored.Fields, result.Fields, summary));
+    writes.push(...await parameterWrites(context, stored.Parameters, result.Parameters, summary));
+    if (result.Entities)
+        writes.push(...await entityWrites(context, stored.Entities, result.Entities, summary));
+    if (result.Dependencies)
+        writes.push(...await dependencyWrites(context, stored.Dependencies, result.Dependencies, summary));
+    if (context.DryRun || writes.length === 0)
+        return summary;
+    await RunInEntityTransaction(context.Provider, () => runWrites(context, writes));
+    return summary;
+}
+/** Runs the writes; throws when any of them failed, so the enclosing transaction rolls them all back. */
+async function runWrites(context, writes) {
+    const outcomes = await RunMaybeSerial(context.Provider, [...writes]);
+    const failed = outcomes.filter(ok => !ok).length;
+    if (failed > 0)
+        throw new Error(`Query ${context.QueryID}: ${failed} of ${writes.length} child-row writes failed; none of them were kept.`);
+}
+async function loadStoredChildRows(context) {
+    const filter = `QueryID='${EscapeSQLString(context.QueryID)}'`;
+    const load = async (entityName) => {
+        const result = await context.Provider.RunView({ EntityName: entityName, ExtraFilter: filter, ResultType: 'entity_object', BypassCache: true, IgnoreMaxRows: true }, context.User);
+        if (!result.Success)
+            throw new Error(`Could not read the stored ${entityName} of query ${context.QueryID}: ${result.ErrorMessage}`);
+        return result.Results ?? [];
+    };
+    const [fields, parameters, entities, dependencies] = await Promise.all([
+        load('MJ: Query Fields'),
+        load('MJ: Query Parameters'),
+        load('MJ: Query Entities'),
+        load('MJ: Query Dependencies'),
+    ]);
+    return { Fields: fields, Parameters: parameters, Entities: entities, Dependencies: dependencies };
+}
+/**
+ * A write for `row` when it has unsaved changes; counts and records it as added or updated.
+ *
+ * `alsoChanged` names columns that changed although the entity's dirty check does not see it: a
+ * nullable bit column going between `null` and `false` reads as unchanged there. Such a row is
+ * still written (ignoring the dirty state) and the column is reported.
+ */
+function saveIfDirty(row, summary, label, alsoChanged = []) {
+    if (row.IsSaved && !row.Dirty && alsoChanged.length === 0)
+        return [];
+    const action = row.IsSaved ? 'Updated' : 'Added';
+    if (row.IsSaved)
+        summary.Updated++;
+    else
+        summary.Added++;
+    const dirtyColumns = row.IsSaved ? row.Fields.filter(f => f.Dirty).map(f => f.Name) : [];
+    const changedColumns = row.IsSaved ? [...dirtyColumns, ...alsoChanged.filter(c => !dirtyColumns.includes(c))] : [];
+    summary.Changes.push({ ...changeOf(label, action), ChangedColumns: changedColumns });
+    const ignoreDirtyState = row.IsSaved && !row.Dirty;
+    return [() => row.Save(ignoreDirtyState ? { IgnoreDirtyState: true } : undefined)];
+}
+function deleteRows(rows, summary, labelOf) {
+    summary.Removed += rows.length;
+    for (const row of rows)
+        summary.Changes.push(changeOf(labelOf(row), 'Removed'));
+    return rows.map(row => () => row.Delete());
+}
+function changeOf(label, action) {
+    return { Collection: label.Collection, Action: action, Name: label.Name, ChangedColumns: [], SourceEntityFieldID: label.SourceEntityFieldID ?? null };
+}
+function fieldLabel(row) {
+    return { Collection: 'Fields', Name: row.Name, SourceEntityFieldID: row.SourceEntityFieldID };
+}
+function parameterLabel(row) {
+    return { Collection: 'Parameters', Name: row.Name };
+}
+function byLowerName(rows) {
+    return new Map(rows.map(r => [r.Name.toLowerCase(), r]));
+}
+function isEmpty(value) {
+    return !value || value.trim().length === 0;
+}
+// ─── Fields ─────────────────────────────────────────────────────────────────
+async function fieldWrites(context, stored, facts, summary) {
+    const existing = byLowerName(stored);
+    const writes = [];
+    for (const fact of facts) {
+        let row = existing.get(fact.Name.toLowerCase());
+        existing.delete(fact.Name.toLowerCase());
+        if (!row)
+            row = await newRow(context, 'MJ: Query Fields', r => newField(r, context.QueryID, fact));
+        else
+            applyFieldAnnotations(row, fact);
+        const nullabilityChanged = row.IsSaved && (row.IsNullable ?? null) !== (fact.IsNullable ?? null);
+        ApplyFieldFacts(row, fact);
+        writes.push(...saveIfDirty(row, summary, fieldLabel(row), nullabilityChanged ? ['IsNullable'] : []));
+        if (isEmpty(row.Description))
+            summary.FieldsWithoutDescription.push(row.Name);
+    }
+    return [...writes, ...deleteRows([...existing.values()], summary, fieldLabel)];
+}
+function newField(row, queryID, fact) {
+    row.QueryID = queryID;
+    row.Description = fact.DocDescription ?? fact.SourceDescription;
+    row.IsSummary = false;
+    row.DetectionMethod = 'Database';
+}
+/**
+ * Sets a field row's facts (name casing, sequence, types, nullability, computed flag, source) from
+ * the extracted fact, leaving its annotations alone.
+ */
+export function ApplyFieldFacts(row, fact) {
+    row.Name = fact.Name;
+    row.Sequence = fact.Sequence;
+    row.SQLBaseType = fact.SQLBaseType;
+    row.SQLFullType = fact.SQLFullType;
+    row.IsNullable = fact.IsNullable;
+    row.IsComputed = fact.IsComputed;
+    row.SourceEntityID = fact.SourceEntityID;
+    row.SourceEntityFieldID = fact.SourceEntityFieldID;
+    row.SourceFieldName = fact.SourceFieldName;
+    row.SourceObjectName = fact.SourceObjectName;
+}
+/** A stored field's description and detection method: authored ones kept, a doc comment applied. */
+function applyFieldAnnotations(row, fact) {
+    const authored = row.DetectionMethod === 'Manual';
+    if (fact.DocDescription !== null && (!authored || isEmpty(row.Description)))
+        row.Description = fact.DocDescription;
+    if (!authored && row.DetectionMethod !== 'AI')
+        row.DetectionMethod = 'Database';
+    if (row.DetectionMethod === 'AI' && fact.DocDescription !== null)
+        row.DetectionMethod = 'Database';
+}
+// ─── Parameters ─────────────────────────────────────────────────────────────
+async function parameterWrites(context, stored, facts, summary) {
+    const existing = byLowerName(stored);
+    const writes = [];
+    for (const fact of facts) {
+        let row = existing.get(fact.Name.toLowerCase());
+        existing.delete(fact.Name.toLowerCase());
+        if (!row)
+            row = await newRow(context, 'MJ: Query Parameters', r => newParameter(r, context.QueryID, fact));
+        else
+            applyParameterAnnotations(row, fact);
+        row.Name = fact.Name;
+        writes.push(...saveIfDirty(row, summary, parameterLabel(row)));
+        if (isEmpty(row.Description))
+            summary.ParametersWithoutDescription.push(row.Name);
+    }
+    const leftover = [...existing.values()];
+    summary.FlaggedParameters.push(...leftover.filter(row => row.DetectionMethod === 'Manual').map(row => row.Name));
+    const unused = leftover.filter(row => row.DetectionMethod !== 'Manual');
+    return [...writes, ...deleteRows(unused, summary, parameterLabel)];
+}
+function newParameter(row, queryID, fact) {
+    row.QueryID = queryID;
+    row.Type = fact.Type ?? 'string';
+    row.IsRequired = fact.IsRequired;
+    row.DefaultValue = fact.DefaultValue;
+    row.SampleValue = fact.SampleValue;
+    row.Description = fact.DocDescription ?? fact.InheritedDescription;
+    row.IsServerSet = false;
+    row.DetectionMethod = 'Parser';
+}
+/**
+ * A stored parameter: a `Manual` row keeps every annotation (only an empty description is filled);
+ * an auto-detected row takes the template's type, required flag and default, keeps a non-empty
+ * sample and description, and takes a doc comment's description.
+ */
+function applyParameterAnnotations(row, fact) {
+    if (row.DetectionMethod === 'Manual') {
+        if (isEmpty(row.Description))
+            row.Description = fact.DocDescription ?? fact.InheritedDescription ?? row.Description;
+        return;
+    }
+    if (fact.Type !== null)
+        row.Type = fact.Type;
+    row.IsRequired = fact.IsRequired;
+    row.DefaultValue = fact.DefaultValue;
+    if (isEmpty(row.SampleValue))
+        row.SampleValue = fact.SampleValue;
+    if (fact.DocDescription !== null)
+        row.Description = fact.DocDescription;
+    else if (isEmpty(row.Description))
+        row.Description = fact.InheritedDescription;
+    row.DetectionMethod = 'Parser';
+}
+// ─── Entities ───────────────────────────────────────────────────────────────
+async function entityWrites(context, stored, facts, summary) {
+    const remaining = [...stored];
+    const writes = [];
+    const unmatched = facts.filter(fact => !takeRow(remaining, r => sameEntityLink(r, fact)));
+    for (const fact of unmatched) {
+        const row = takeRow(remaining, r => UUIDsEqual(r.EntityID, fact.EntityID))
+            ?? await newRow(context, 'MJ: Query Entities', r => newEntityLink(r, context.QueryID, fact));
+        row.AlternateBaseViewID = fact.AlternateBaseViewID;
+        writes.push(...saveIfDirty(row, summary, entityLabel(context, row)));
+    }
+    return [...writes, ...deleteRows(remaining, summary, row => entityLabel(context, row))];
+}
+function entityLabel(context, row) {
+    return { Collection: 'Entities', Name: context.EntityName ? context.EntityName(row.EntityID) : (row.Entity || row.EntityID) };
+}
+function sameEntityLink(row, fact) {
+    const abv = (id) => (id ? NormalizeUUID(id) : '');
+    return UUIDsEqual(row.EntityID, fact.EntityID) && abv(row.AlternateBaseViewID) === abv(fact.AlternateBaseViewID);
+}
+function newEntityLink(row, queryID, fact) {
+    row.QueryID = queryID;
+    row.EntityID = fact.EntityID;
+    row.DetectionMethod = 'Parser';
+    row.AutoDetectConfidenceScore = 1;
+}
+/** Removes and returns the first row matching `test`. */
+function takeRow(rows, test) {
+    const index = rows.findIndex(test);
+    return index < 0 ? undefined : rows.splice(index, 1)[0];
+}
+// ─── Dependencies ───────────────────────────────────────────────────────────
+async function dependencyWrites(context, stored, facts, summary) {
+    const remaining = [...stored];
+    const writes = [];
+    const seen = new Set();
+    for (const fact of facts) {
+        const key = `${NormalizeUUID(fact.DependsOnQueryID)}|${fact.ReferencePath.toLowerCase()}`;
+        if (seen.has(key))
+            continue;
+        seen.add(key);
+        const row = takeRow(remaining, r => UUIDsEqual(r.DependsOnQueryID, fact.DependsOnQueryID) && r.ReferencePath.toLowerCase() === fact.ReferencePath.toLowerCase())
+            ?? await newRow(context, 'MJ: Query Dependencies', r => newDependency(r, context.QueryID, fact));
+        row.ReferencePath = fact.ReferencePath;
+        row.Alias = fact.Alias;
+        row.ParameterMapping = fact.ParameterMapping;
+        writes.push(...saveIfDirty(row, summary, dependencyLabel(row)));
+    }
+    return [...writes, ...deleteRows(remaining, summary, dependencyLabel)];
+}
+function dependencyLabel(row) {
+    return { Collection: 'Dependencies', Name: row.ReferencePath };
+}
+function newDependency(row, queryID, fact) {
+    row.QueryID = queryID;
+    row.DependsOnQueryID = fact.DependsOnQueryID;
+    row.DetectionMethod = 'Auto';
+}
+async function newRow(context, entityName, init) {
+    const row = await context.Provider.GetEntityObject(entityName, context.User);
+    init(row);
+    return row;
+}
+//# sourceMappingURL=childRowWriter.js.map

package/dist/custom/query-extraction/childRowWriter.js.map

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

package/dist/custom/query-extraction/compositionTargets.d.ts

@@ -0,0 +1,40 @@
+import type { DatabasePlatform, IRunViewProvider, QueryDependencySpec, UserInfo } from "@memberjunction/core";
+import type { MJQueryDependencyEntity, MJQueryParameterEntity, MJSQLDialectEntity } from "@memberjunction/core-entities";
+/** A composed query's parameter, as extraction reads it. */
+export type CompositionCandidateParameter = Pick<MJQueryParameterEntity, 'Name' | 'Type' | 'IsRequired' | 'IsServerSet' | 'SampleValue' | 'Description' | 'Query'>;
+/**
+ * A query a composition may name, as extraction reads it: identity and path, whether it may be
+ * composed, its parameters and the queries it composes in turn. A cached `MJQueryEntityExtended`
+ * is one; so is a query read from the database during a save.
+ */
+export interface CompositionCandidate {
+    readonly ID: string;
+    readonly Name: string;
+    readonly CategoryPath: string;
+    readonly Reusable: boolean;
+    readonly QueryParameters: readonly CompositionCandidateParameter[];
+    readonly QueryDependencies: readonly Pick<MJQueryDependencyEntity, 'DependsOnQueryID'>[];
+}
+/** The composed queries a save read from its own provider. */
+export interface CompositionTargetRead {
+    /** Every query named by a composition in the SQL, as stored now (in the save's transaction). */
+    readonly Candidates: readonly CompositionCandidate[];
+    /**
+     * Render specs for the candidates the given cache does not hold yet (saved earlier in the same
+     * transaction), so the describe renders can compose them before the cache hears of them.
+     */
+    readonly InlineDependencies: readonly QueryDependencySpec[];
+}
+/**
+ * Reads the queries the compositions in `sql` name from `provider`, bypassing every cache, so a
+ * query saved earlier in the same transaction (a metadata push that creates a query and one that
+ * composes it) is found. Queries are matched by name; the caller matches category paths.
+ * @param cachedIDs - IDs of the queries the shared cache already holds; the others get render specs.
+ */
+export declare function ReadCompositionTargetsAsync(sql: string, platform: DatabasePlatform, provider: Pick<IRunViewProvider, 'RunViews'>, user: UserInfo, cachedIDs: ReadonlySet<string>, dialects: readonly MJSQLDialectEntity[]): Promise<CompositionTargetRead>;
+/**
+ * The candidates extraction resolves against: the ones read from the database, then every cached
+ * query the read did not return (a query read from the database replaces its cached copy).
+ */
+export declare function MergeCompositionCandidates(read: readonly CompositionCandidate[], cached: readonly CompositionCandidate[]): CompositionCandidate[];
+//# sourceMappingURL=compositionTargets.d.ts.map

package/dist/custom/query-extraction/compositionTargets.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"compositionTargets.d.ts","sourceRoot":"","sources":["../../../src/custom/query-extraction/compositionTargets.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,mBAAmB,EAAiB,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAC7H,OAAO,KAAK,EAER,uBAAuB,EAEvB,sBAAsB,EAEtB,kBAAkB,EACrB,MAAM,+BAA+B,CAAC;AAKvC,4DAA4D;AAC5D,MAAM,MAAM,6BAA6B,GAAG,IAAI,CAAC,sBAAsB,EAAE,MAAM,GAAG,MAAM,GAAG,YAAY,GAAG,aAAa,GAAG,aAAa,GAAG,aAAa,GAAG,OAAO,CAAC,CAAC;AAEnK;;;;GAIG;AACH,MAAM,WAAW,oBAAoB;IACjC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,eAAe,EAAE,SAAS,6BAA6B,EAAE,CAAC;IACnE,QAAQ,CAAC,iBAAiB,EAAE,SAAS,IAAI,CAAC,uBAAuB,EAAE,kBAAkB,CAAC,EAAE,CAAC;CAC5F;AAED,8DAA8D;AAC9D,MAAM,WAAW,qBAAqB;IAClC,gGAAgG;IAChG,QAAQ,CAAC,UAAU,EAAE,SAAS,oBAAoB,EAAE,CAAC;IACrD;;;OAGG;IACH,QAAQ,CAAC,kBAAkB,EAAE,SAAS,mBAAmB,EAAE,CAAC;CAC/D;AAaD;;;;;GAKG;AACH,wBAAsB,2BAA2B,CAC7C,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,gBAAgB,EAC1B,QAAQ,EAAE,IAAI,CAAC,gBAAgB,EAAE,UAAU,CAAC,EAC5C,IAAI,EAAE,QAAQ,EACd,SAAS,EAAE,WAAW,CAAC,MAAM,CAAC,EAC9B,QAAQ,EAAE,SAAS,kBAAkB,EAAE,GACxC,OAAO,CAAC,qBAAqB,CAAC,CAWhC;AAED;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,SAAS,oBAAoB,EAAE,EAAE,MAAM,EAAE,SAAS,oBAAoB,EAAE,GAAG,oBAAoB,EAAE,CAGjJ"}

package/dist/custom/query-extraction/compositionTargets.js

@@ -0,0 +1,99 @@
+import { QueryParameterInfo } from "@memberjunction/core";
+import { GetQueryDialect } from "@memberjunction/sql-dialect";
+import { QueryTemplate } from "@memberjunction/sql-parser";
+import { EscapeSQLString, IndexByUUID, UUIDsEqual } from "@memberjunction/global";
+const EMPTY_READ = { Candidates: [], InlineDependencies: [] };
+/**
+ * Reads the queries the compositions in `sql` name from `provider`, bypassing every cache, so a
+ * query saved earlier in the same transaction (a metadata push that creates a query and one that
+ * composes it) is found. Queries are matched by name; the caller matches category paths.
+ * @param cachedIDs - IDs of the queries the shared cache already holds; the others get render specs.
+ */
+export async function ReadCompositionTargetsAsync(sql, platform, provider, user, cachedIDs, dialects) {
+    const names = [...new Set(QueryTemplate.Parse(sql, GetQueryDialect(platform)).CompositionReferences().Value.map(r => r.Name.trim().toLowerCase()))];
+    if (names.length === 0)
+        return EMPTY_READ;
+    const rows = await readTargetRows(names, provider, user);
+    if (!rows)
+        return EMPTY_READ;
+    const candidates = rows.Queries.map(q => candidateOf(q, rows));
+    const dialectID = dialects.find(d => d.PlatformKey === platform)?.ID ?? null;
+    const inline = rows.Queries
+        .filter(q => !cachedIDs.has(q.ID.toLowerCase()))
+        .map(q => inlineSpecOf(q, rows, dialectID));
+    return { Candidates: candidates, InlineDependencies: inline };
+}
+/**
+ * The candidates extraction resolves against: the ones read from the database, then every cached
+ * query the read did not return (a query read from the database replaces its cached copy).
+ */
+export function MergeCompositionCandidates(read, cached) {
+    const readIDs = new Set(read.map(q => q.ID.toLowerCase()));
+    return [...read, ...cached.filter(q => !readIDs.has(q.ID.toLowerCase()))];
+}
+async function readTargetRows(names, provider, user) {
+    const nameList = names.map(n => `'${EscapeSQLString(n)}'`).join(', ');
+    const [queries, categories] = await provider.RunViews([
+        bypassing('MJ: Queries', `LOWER(Name) IN (${nameList})`),
+        bypassing('MJ: Query Categories', ''),
+    ], user);
+    if (!queries.Success || !categories.Success || queries.Results.length === 0)
+        return null;
+    const queryRows = queries.Results;
+    const idList = queryRows.map(q => `'${EscapeSQLString(q.ID)}'`).join(', ');
+    const [parameters, dependencies, sqls] = await provider.RunViews([
+        bypassing('MJ: Query Parameters', `QueryID IN (${idList})`),
+        bypassing('MJ: Query Dependencies', `QueryID IN (${idList})`),
+        bypassing('MJ: Query SQLs', `QueryID IN (${idList})`),
+    ], user);
+    if (!parameters.Success || !dependencies.Success || !sqls.Success)
+        return null;
+    return {
+        Queries: queryRows,
+        Categories: categories.Results,
+        Parameters: parameters.Results,
+        Dependencies: dependencies.Results,
+        SQLs: sqls.Results,
+    };
+}
+function bypassing(entityName, filter) {
+    return { EntityName: entityName, ExtraFilter: filter, ResultType: 'entity_object', BypassCache: true, IgnoreMaxRows: true };
+}
+function candidateOf(query, rows) {
+    return {
+        ID: query.ID,
+        Name: query.Name,
+        CategoryPath: categoryPathOf(query.CategoryID, rows.Categories),
+        Reusable: query.Reusable,
+        QueryParameters: rows.Parameters.filter(p => UUIDsEqual(p.QueryID, query.ID)),
+        QueryDependencies: rows.Dependencies.filter(d => UUIDsEqual(d.QueryID, query.ID)),
+    };
+}
+/** The `/`-joined names from the root category down to `categoryID`; `''` for no category. */
+function categoryPathOf(categoryID, categories) {
+    const byID = IndexByUUID(categories);
+    const segments = [];
+    const seen = new Set();
+    let current = categoryID;
+    while (current && !seen.has(current.toLowerCase())) {
+        seen.add(current.toLowerCase());
+        const category = byID.Get(current);
+        if (!category)
+            break;
+        segments.unshift(category.Name);
+        current = category.ParentID;
+    }
+    return segments.join('/');
+}
+/** A render spec for a query the cache does not hold: its SQL for the platform and its parameter definitions. */
+function inlineSpecOf(query, rows, dialectID) {
+    const variant = dialectID ? rows.SQLs.find(s => UUIDsEqual(s.QueryID, query.ID) && UUIDsEqual(s.SQLDialectID, dialectID)) : undefined;
+    return {
+        Name: query.Name,
+        CategoryPath: categoryPathOf(query.CategoryID, rows.Categories),
+        SQL: variant?.SQL ?? query.SQL ?? '',
+        UsesTemplate: query.UsesTemplate,
+        ParameterDefinitions: rows.Parameters.filter(p => UUIDsEqual(p.QueryID, query.ID)).map(p => new QueryParameterInfo(p.GetAll())),
+    };
+}
+//# sourceMappingURL=compositionTargets.js.map

package/dist/custom/query-extraction/compositionTargets.js.map

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

package/dist/custom/query-extraction/declared.d.ts

@@ -0,0 +1,79 @@
+import type { BaseEntity, RelatedRecordCollection } from "@memberjunction/core";
+import type { MJQueryEntityEntity, MJQueryFieldEntity, MJQueryParameterEntity } from "@memberjunction/core-entities";
+/**
+ * The child rows a query save declares, as the keys extraction matches rows by.
+ *
+ * A row is *declared* when the save writes it from one of the query's declared collections
+ * (`Parameters`, `Fields`, `Entities` on `MJQueryEntityExtended`): it is new, or it was edited.
+ * Keys are lower-cased so they compare the way the database does.
+ *
+ * Extraction treats a declared row as the caller's decision and leaves it alone: it does not add a
+ * row with the same key, update it, or delete it, even when the SQL no longer mentions it. That is
+ * how a declared row "wins" over what extraction would have written for the same key in the same
+ * save. Any later extraction (an extraction service, a refresh) that replaces the current one must
+ * honour these sets the same way; the facts it would compute for a declared row can be reported, but
+ * not written.
+ */
+export interface DeclaredQueryChildren {
+    /** Declared parameter names. */
+    ParameterNames: ReadonlySet<string>;
+    /** Declared output field names. */
+    FieldNames: ReadonlySet<string>;
+    /** Declared entity links, keyed by {@link QueryEntityKey} (the entity ID). */
+    EntityKeys: ReadonlySet<string>;
+}
+/** A declared set with nothing in it, for saves that declare no children. */
+export declare const NO_DECLARED_QUERY_CHILDREN: DeclaredQueryChildren;
+/** The three declared collections of a query, as `MJQueryEntityExtended` exposes them. */
+export interface DeclaredQueryCollections {
+    Parameters: RelatedRecordCollection<MJQueryParameterEntity>;
+    Fields: RelatedRecordCollection<MJQueryFieldEntity>;
+    Entities: RelatedRecordCollection<MJQueryEntityEntity>;
+}
+/**
+ * The key a Query Entity row is matched by: the entity it links. Extraction keeps at most one row
+ * per entity (it updates the alternate base view on that row), so a declared row for an entity
+ * stands for every link to it.
+ */
+export declare function QueryEntityKey(row: Pick<MJQueryEntityEntity, 'EntityID'>): string;
+/** The key a parameter or field row is matched by: its name, trimmed and lower-cased. */
+export declare function QueryChildNameKey(name: string | null | undefined): string;
+/**
+ * The child rows a save of the query declares, read from its declared collections before the save.
+ *
+ * @param collections - The query's declared collections.
+ * @returns The declared keys; empty sets when the collections hold nothing to write.
+ */
+export declare function CollectDeclaredQueryChildren(collections: DeclaredQueryCollections): DeclaredQueryChildren;
+/** True when the declared set holds at least one row. */
+export declare function HasDeclaredQueryChildren(declared: DeclaredQueryChildren): boolean;
+/** A stored row and its detection method, as conflict detection reads it. */
+type DetectedRow = BaseEntity & {
+    ID: string;
+    DetectionMethod: string;
+};
+/**
+ * The stored rows a declared collection item replaces: rows with the same key as a NEW item but a
+ * different ID, that extraction (not a person) created. A row whose `DetectionMethod` is `Manual`
+ * was authored and is never selected, so authored rows are never touched.
+ *
+ * @param newItems - The collection's unsaved items.
+ * @param stored - The rows stored for the query, read from the database.
+ * @param key - How rows are matched.
+ * @returns The stored rows to delete in the same save, before the new items are inserted.
+ */
+export declare function FindReplacedRows<T extends DetectedRow>(newItems: readonly T[], stored: readonly T[], key: (row: T) => string): T[];
+/**
+ * Queues a stored row for deletion through the collection, so the delete runs inside the query's
+ * graph save, before the collection's inserts (a collection's removals run first). The row is
+ * removed from the collection when the collection already holds it; otherwise it is attached and
+ * removed, which queues the same delete.
+ *
+ * @param collection - The declared collection.
+ * @param row - The stored row to delete.
+ */
+export declare function QueueReplacedRowDeletion<T extends BaseEntity & {
+    ID: string;
+}>(collection: RelatedRecordCollection<T>, row: T): void;
+export {};
+//# sourceMappingURL=declared.d.ts.map

package/dist/custom/query-extraction/declared.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"declared.d.ts","sourceRoot":"","sources":["../../../src/custom/query-extraction/declared.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAChF,OAAO,KAAK,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAGrH;;;;;;;;;;;;;GAaG;AACH,MAAM,WAAW,qBAAqB;IAClC,gCAAgC;IAChC,cAAc,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACpC,mCAAmC;IACnC,UAAU,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAChC,8EAA8E;IAC9E,UAAU,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;CACnC;AAED,6EAA6E;AAC7E,eAAO,MAAM,0BAA0B,EAAE,qBAIxC,CAAC;AAEF,0FAA0F;AAC1F,MAAM,WAAW,wBAAwB;IACrC,UAAU,EAAE,uBAAuB,CAAC,sBAAsB,CAAC,CAAC;IAC5D,MAAM,EAAE,uBAAuB,CAAC,kBAAkB,CAAC,CAAC;IACpD,QAAQ,EAAE,uBAAuB,CAAC,mBAAmB,CAAC,CAAC;CAC1D;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,mBAAmB,EAAE,UAAU,CAAC,GAAG,MAAM,CAEjF;AAED,yFAAyF;AACzF,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,CAEzE;AAkBD;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAAC,WAAW,EAAE,wBAAwB,GAAG,qBAAqB,CAMzG;AAED,yDAAyD;AACzD,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,qBAAqB,GAAG,OAAO,CAEjF;AAED,6EAA6E;AAC7E,KAAK,WAAW,GAAG,UAAU,GAAG;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,MAAM,CAAA;CAAE,CAAC;AAExE;;;;;;;;;GASG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,SAAS,WAAW,EAAE,QAAQ,EAAE,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,MAAM,GAAG,CAAC,EAAE,CAWlI;AAED;;;;;;;;GAQG;AACH,wBAAgB,wBAAwB,CAAC,CAAC,SAAS,UAAU,GAAG;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,EAAE,UAAU,EAAE,uBAAuB,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,IAAI,CAQpI"}

package/dist/custom/query-extraction/declared.js

@@ -0,0 +1,91 @@
+import { NormalizeUUID, UUIDsEqual } from "@memberjunction/global";
+/** A declared set with nothing in it, for saves that declare no children. */
+export const NO_DECLARED_QUERY_CHILDREN = {
+    ParameterNames: new Set(),
+    FieldNames: new Set(),
+    EntityKeys: new Set(),
+};
+/**
+ * The key a Query Entity row is matched by: the entity it links. Extraction keeps at most one row
+ * per entity (it updates the alternate base view on that row), so a declared row for an entity
+ * stands for every link to it.
+ */
+export function QueryEntityKey(row) {
+    return row.EntityID ? NormalizeUUID(row.EntityID) : '';
+}
+/** The key a parameter or field row is matched by: its name, trimmed and lower-cased. */
+export function QueryChildNameKey(name) {
+    return (name ?? '').trim().toLowerCase();
+}
+/** True when the save will write this collection item: it is new, or it has unsaved edits. */
+function isWrittenBySave(item) {
+    return !item.IsSaved || item.Dirty;
+}
+/** The keys of the items a save writes from one collection. */
+function writtenKeys(items, key) {
+    const keys = new Set();
+    for (const item of items) {
+        if (isWrittenBySave(item)) {
+            keys.add(key(item));
+        }
+    }
+    return keys;
+}
+/**
+ * The child rows a save of the query declares, read from its declared collections before the save.
+ *
+ * @param collections - The query's declared collections.
+ * @returns The declared keys; empty sets when the collections hold nothing to write.
+ */
+export function CollectDeclaredQueryChildren(collections) {
+    return {
+        ParameterNames: writtenKeys(collections.Parameters.Items, p => QueryChildNameKey(p.Name)),
+        FieldNames: writtenKeys(collections.Fields.Items, f => QueryChildNameKey(f.Name)),
+        EntityKeys: writtenKeys(collections.Entities.Items, QueryEntityKey),
+    };
+}
+/** True when the declared set holds at least one row. */
+export function HasDeclaredQueryChildren(declared) {
+    return declared.ParameterNames.size > 0 || declared.FieldNames.size > 0 || declared.EntityKeys.size > 0;
+}
+/**
+ * The stored rows a declared collection item replaces: rows with the same key as a NEW item but a
+ * different ID, that extraction (not a person) created. A row whose `DetectionMethod` is `Manual`
+ * was authored and is never selected, so authored rows are never touched.
+ *
+ * @param newItems - The collection's unsaved items.
+ * @param stored - The rows stored for the query, read from the database.
+ * @param key - How rows are matched.
+ * @returns The stored rows to delete in the same save, before the new items are inserted.
+ */
+export function FindReplacedRows(newItems, stored, key) {
+    const newByKey = new Map();
+    for (const item of newItems) {
+        newByKey.set(key(item), item);
+    }
+    return stored.filter(row => {
+        const declared = newByKey.get(key(row));
+        return declared !== undefined
+            && !UUIDsEqual(row.ID, declared.ID)
+            && row.DetectionMethod !== 'Manual';
+    });
+}
+/**
+ * Queues a stored row for deletion through the collection, so the delete runs inside the query's
+ * graph save, before the collection's inserts (a collection's removals run first). The row is
+ * removed from the collection when the collection already holds it; otherwise it is attached and
+ * removed, which queues the same delete.
+ *
+ * @param collection - The declared collection.
+ * @param row - The stored row to delete.
+ */
+export function QueueReplacedRowDeletion(collection, row) {
+    const held = collection.Items.find(item => item.IsSaved && UUIDsEqual(item.ID, row.ID));
+    if (held) {
+        collection.Remove(held);
+        return;
+    }
+    collection.Add(row);
+    collection.Remove(row);
+}
+//# sourceMappingURL=declared.js.map

package/dist/custom/query-extraction/declared.js.map

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