@undefineds.co/drizzle-solid 0.2.13 → 0.3.1

package/dist/esm/core/query-builders/select-query-builder.d.ts

@@ -1,6 +1,6 @@
 import { entityKind, SQL } from 'drizzle-orm';
 import { PodTable, PodColumnBase, InferTableData } from '../schema';
-import { QueryCondition } from '../query-conditions';
+import { QueryCondition, type PublicQueryCondition, type PublicWhereObject } from '../query-conditions';
 import { SelectQueryPlan } from '../select-plan';
 import { SelectFieldMap, SessionInterface } from './types';
 import { type OrderByExpression } from '../order-by';
@@ -32,10 +32,10 @@ export declare class SelectQueryBuilder<TTable extends PodTable<any> = PodTable<
     /**
      * Add WHERE conditions to the query
      *
-     * Note: Using '@id' directly in conditions is deprecated.
-     * Use db.findByIri(table, iri) for IRI-based lookups instead.
+     * Public where() is collection-oriented.
+     * Exact-target reads must use findByLocator()/findByIri().
      */
-    where(conditions: Record<string, any> | SQL | QueryCondition): this;
+    where(conditions: PublicWhereObject | SQL | PublicQueryCondition): this;
     /**
      * Internal method that allows @id in conditions.
      * Used by *ByIri methods internally.
@@ -62,6 +62,7 @@ export declare class SelectQueryBuilder<TTable extends PodTable<any> = PodTable<
     private parseColumnReferenceString;
     private processWhereObject;
     private processQueryCondition;
+    private applyInternalQueryCondition;
     private normalizeWhereConditions;
     toIR(): SelectQueryPlan;
     private buildQueryPlan;
@@ -97,16 +98,17 @@ export declare class SelectQueryBuilder<TTable extends PodTable<any> = PodTable<
     private hasAggregateSelection;
     private hasMixedAggregateSelection;
     private applySubjectMetadata;
+    private extractSubjectValue;
     private attachSubjectMetadata;
     private normalizeBaseRows;
     private hydrateInlineColumns;
     /**
      * 处理引用字段：将 URI 转换回简单 ID
      *
-     * 对于配置了 .reference() 的列，将存储的完整 URI 转换回用户友好的 ID
+     * 对于配置了 .link() 的列，将存储的完整 URI 转换回用户友好的 ID
      * 例如：http://pod/.data/chat/chat-123/index.ttl#this -> chat-123
      */
-    private resolveReferenceIds;
+    private resolveLinkIds;
     private normalizeInlinePredicateKey;
     private normalizeInlineObjectValue;
     private normalizeInlineIri;
@@ -116,12 +118,19 @@ export declare class SelectQueryBuilder<TTable extends PodTable<any> = PodTable<
     private getOrderByValue;
     private compareOrderByValues;
     private mergeRowsBySubject;
+    private getColumnDefinitionForRowKey;
     private inferSourceFromChild;
     private isInlineObjectColumn;
     private applyJoinFallback;
     private fetchJoinRows;
+    private buildExactJoinLookupConditions;
+    private buildJoinLookupCondition;
+    private getRequiredSubjectTemplateVariables;
+    private isAbsoluteIri;
+    private buildMissingJoinLocatorError;
     private normalizeJoinRows;
     private mergeRowsWithJoin;
+    private joinRowMatchesAllConditions;
     private createEmptyJoinRow;
     private applyJoinFilters;
     private applyHavingFilter;

package/dist/esm/core/query-builders/select-query-builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"select-query-builder.d.ts","sourceRoot":"","sources":["../../../../src/core/query-builders/select-query-builder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"select-query-builder.d.ts","sourceRoot":"","sources":["../../../../src/core/query-builders/select-query-builder.ts"],"names":[],"mappings":"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"}

package/dist/esm/core/query-builders/select-query-builder.js

@@ -1,12 +1,13 @@
 var _a;
 import { entityKind, SQL } from 'drizzle-orm';
 import { PodTable, PodColumnBase } from '../schema';
-import { inArray } from '../query-conditions';
+import { and, eq, inArray } from '../query-conditions';
 import { isAggregateExpression } from '../aggregates';
 import { createLiteralCondition, buildConditionTreeFromObject, inferSPARQLQueryType } from './helpers';
 import { UriResolverImpl } from '../uri';
 import { isOrderByExpression } from '../order-by';
 import { SelectionAliasExpression } from '../expressions';
+import { assertPublicWhereCondition, assertPublicWhereObject, conditionTargetsReservedIdentifier } from '../query-where-policy';
 export class SelectQueryBuilder {
     constructor(session, fields) {
         this.session = session;
@@ -37,23 +38,19 @@ export class SelectQueryBuilder {
     /**
      * Add WHERE conditions to the query
      *
-     * Note: Using '@id' directly in conditions is deprecated.
-     * Use db.findByIri(table, iri) for IRI-based lookups instead.
+     * Public where() is collection-oriented.
+     * Exact-target reads must use findByLocator()/findByIri().
      */
     where(conditions) {
         if (conditions instanceof SQL) {
             this.sql = conditions;
         }
         else if (this.isQueryCondition(conditions)) {
+            assertPublicWhereCondition('select', conditions);
             this.processQueryCondition(conditions);
         }
         else {
-            // Check for @id usage and warn/reject
-            if (conditions && typeof conditions === 'object' && '@id' in conditions) {
-                throw new Error(`Using '@id' in where() is not supported. ` +
-                    `Use db.findByIri(table, iri) for IRI-based lookups, ` +
-                    `or use { id: 'value' } for id-based lookups.`);
-            }
+            assertPublicWhereObject('select', conditions);
             this.processWhereObject(conditions);
         }
         return this;
@@ -262,7 +259,7 @@ export class SelectQueryBuilder {
             }
             return { table, alias, column };
         }
-        throw new Error('Unsupported column reference type');
+        throw new Error('Unsupported column link type');
     }
     parseColumnReferenceString(reference) {
         const trimmed = reference.trim();
@@ -301,6 +298,10 @@ export class SelectQueryBuilder {
             this.whereConditions = simpleConditions;
         }
     }
+    applyInternalQueryCondition(condition) {
+        this.processQueryCondition(condition);
+        return this;
+    }
     normalizeWhereConditions() {
         if (this.conditionTree) {
             return this.conditionTree;
@@ -454,9 +455,12 @@ export class SelectQueryBuilder {
                     limit: undefined,
                     offset: undefined,
                     orderBy: undefined,
+                    ...(hasJoins ? { joins: undefined, joinFilters: undefined } : {}),
                     ...(useAggregateFallback ? { groupBy: undefined, having: undefined } : {}),
                 }
-                : plan;
+                : (hasJoins
+                    ? { ...plan, joins: undefined, joinFilters: undefined }
+                    : plan);
             const operation = {
                 type: 'select',
                 table: this.selectedTable,
@@ -494,6 +498,7 @@ export class SelectQueryBuilder {
                 }
                 if (hasJoins) {
                     intermediateRows = this.normalizeBaseRows(intermediateRows);
+                    intermediateRows = this.mergeRowsBySubject(intermediateRows);
                     intermediateRows = await this.applyJoinFallback(intermediateRows);
                     intermediateRows = this.applyJoinFilters(intermediateRows);
                 }
@@ -514,7 +519,7 @@ export class SelectQueryBuilder {
             if (this.selectedTable) {
                 finalRows = await this.hydrateInlineColumns(finalRows, this.selectedTable, !hasJoins);
                 // 处理引用字段：将 URI 转换回 ID
-                finalRows = this.resolveReferenceIds(finalRows, this.selectedTable);
+                finalRows = this.resolveLinkIds(finalRows, this.selectedTable);
             }
             if (hasJoins) {
                 finalRows = this.applyDeferredOrderBy(finalRows);
@@ -910,10 +915,19 @@ export class SelectQueryBuilder {
     applySubjectMetadata(rows) {
         return rows.map((row) => this.attachSubjectMetadata(row));
     }
+    extractSubjectValue(row) {
+        const candidate = row.subject ?? row['@id'] ?? row.uri;
+        if (typeof candidate === 'object' && candidate && 'value' in candidate) {
+            const value = candidate.value;
+            return typeof value === 'string' && value.length > 0 ? value : undefined;
+        }
+        if (typeof candidate === 'string' && candidate.length > 0) {
+            return candidate;
+        }
+        return undefined;
+    }
     attachSubjectMetadata(row) {
-        const subjectValue = typeof row.subject === 'object' && row.subject && 'value' in row.subject
-            ? row.subject.value
-            : row.subject;
+        const subjectValue = this.extractSubjectValue(row);
         if (typeof subjectValue === 'string' && subjectValue.length > 0) {
             if (row['@id'] === undefined) {
                 row['@id'] = subjectValue;
@@ -943,7 +957,7 @@ export class SelectQueryBuilder {
                 }
                 result[`${alias}.${key}`] = value;
             }
-            const subjectValue = row.subject;
+            const subjectValue = this.extractSubjectValue(row);
             if (subjectValue) {
                 result.subject = subjectValue;
                 result['@id'] = subjectValue;
@@ -1069,16 +1083,16 @@ export class SelectQueryBuilder {
     /**
      * 处理引用字段：将 URI 转换回简单 ID
      *
-     * 对于配置了 .reference() 的列，将存储的完整 URI 转换回用户友好的 ID
+     * 对于配置了 .link() 的列，将存储的完整 URI 转换回用户友好的 ID
      * 例如：http://pod/.data/chat/chat-123/index.ttl#this -> chat-123
      */
-    resolveReferenceIds(rows, table) {
+    resolveLinkIds(rows, table) {
         if (!rows.length)
             return rows;
-        // 找出所有引用列
+        // 找出所有链接列
         const columns = Object.values(table.columns ?? {});
-        const referenceColumns = columns.filter(col => col.isReference?.());
-        if (referenceColumns.length === 0)
+        const linkColumns = columns.filter(col => col.isLink?.());
+        if (linkColumns.length === 0)
             return rows;
         // 获取 URI 解析器和上下文
         const dialect = this.session.getDialect?.();
@@ -1091,7 +1105,7 @@ export class SelectQueryBuilder {
         };
         return rows.map(row => {
             const result = { ...row };
-            for (const col of referenceColumns) {
+            for (const col of linkColumns) {
                 const value = row[col.name];
                 if (!value)
                     continue;
@@ -1099,13 +1113,13 @@ export class SelectQueryBuilder {
                 if (Array.isArray(value)) {
                     result[col.name] = value.map(v => {
                         if (typeof v === 'string') {
-                            return resolver.extractReferenceId(v, col, uriContext);
+                            return resolver.extractLinkId(v, col, uriContext);
                         }
                         return v;
                     });
                 }
                 else if (typeof value === 'string') {
-                    result[col.name] = resolver.extractReferenceId(value, col, uriContext);
+                    result[col.name] = resolver.extractLinkId(value, col, uriContext);
                 }
             }
             return result;
@@ -1231,7 +1245,17 @@ export class SelectQueryBuilder {
                 return;
             }
             if (!merged.has(key)) {
-                merged.set(key, { ...row });
+                const normalizedRow = { ...row };
+                Object.entries(normalizedRow).forEach(([col, value]) => {
+                    if (value === undefined)
+                        return;
+                    const colDef = this.getColumnDefinitionForRowKey(col);
+                    const isArrayType = colDef?.options?.isArray || colDef?.dataType === 'array';
+                    if (isArrayType && !Array.isArray(value)) {
+                        normalizedRow[col] = [value];
+                    }
+                });
+                merged.set(key, normalizedRow);
                 order.push(key);
                 return;
             }
@@ -1271,7 +1295,7 @@ export class SelectQueryBuilder {
                         combined.push(entry);
                     }
                 });
-                const colDef = this.selectedTable?.columns[col];
+                const colDef = this.getColumnDefinitionForRowKey(col);
                 const isArrayType = colDef?.options?.isArray || colDef?.dataType === 'array';
                 if (!isArrayType && combined.length > 1) {
                     console.warn(`[Data Integrity] Multiple values found for single-value column '${col}' on subject '${key}'. Using first value.`);
@@ -1291,6 +1315,22 @@ export class SelectQueryBuilder {
         const result = order.map((key) => merged.get(key));
         return result;
     }
+    getColumnDefinitionForRowKey(key) {
+        if (!key) {
+            return undefined;
+        }
+        if (!key.includes('.')) {
+            return this.selectedTable?.columns[key];
+        }
+        const [alias, columnName] = key.split('.', 2);
+        if (!alias || !columnName) {
+            return undefined;
+        }
+        if (alias === this.primaryAlias) {
+            return this.selectedTable?.columns[columnName];
+        }
+        return this.aliasToTable.get(alias)?.columns?.[columnName];
+    }
     inferSourceFromChild(childIri, table) {
         if (!childIri) {
             return this.session.getDialect().getPodUrl();
@@ -1354,21 +1394,154 @@ export class SelectQueryBuilder {
             return [];
         }
         const valuesArray = Array.from(uniqueValues.values());
+        const buildJoinQuery = () => this.session.select().from(join.table);
         const joinColumnInstance = join.table.getColumn(joinRef.column);
-        let joinQuery = this.session.select().from(join.table);
-        if (joinColumnInstance && joinRef.column !== 'id') {
-            joinQuery = joinQuery.where(inArray(joinColumnInstance, valuesArray));
+        const exactJoinConditions = this.buildExactJoinLookupConditions(join, baseRows);
+        if (exactJoinConditions && exactJoinConditions.length > 0) {
+            const exactJoinRows = [];
+            for (const joinCondition of exactJoinConditions) {
+                const joinQuery = buildJoinQuery();
+                const conditionedJoinQuery = conditionTargetsReservedIdentifier(joinCondition)
+                    ? joinQuery.applyInternalQueryCondition(joinCondition)
+                    : joinQuery.where(joinCondition);
+                const joinRows = await conditionedJoinQuery;
+                exactJoinRows.push(...joinRows);
+            }
+            return this.mergeRowsBySubject(this.normalizeJoinRows(join, exactJoinRows));
+        }
+        const joinLookupCondition = this.buildJoinLookupCondition(joinColumnInstance, valuesArray);
+        if (joinLookupCondition) {
+            const joinQuery = buildJoinQuery();
+            const filteredJoinQuery = conditionTargetsReservedIdentifier(joinLookupCondition)
+                ? joinQuery.applyInternalQueryCondition(joinLookupCondition)
+                : joinQuery.where(joinLookupCondition);
+            const joinRows = await filteredJoinQuery;
+            return this.normalizeJoinRows(join, joinRows);
         }
-        const joinRows = await joinQuery;
+        const joinRows = await buildJoinQuery();
         return this.normalizeJoinRows(join, joinRows);
     }
+    buildExactJoinLookupConditions(join, baseRows) {
+        const conditions = join.resolvedConditions ?? [];
+        if (conditions.length === 0) {
+            return undefined;
+        }
+        const [primaryCondition] = conditions;
+        const primaryJoinRef = primaryCondition.left.alias === join.alias ? primaryCondition.left : primaryCondition.right;
+        const primaryBaseRef = primaryJoinRef === primaryCondition.left ? primaryCondition.right : primaryCondition.left;
+        const requiredLocatorVars = this.getRequiredSubjectTemplateVariables(join.table);
+        const joinUsesTemplateScopedId = primaryJoinRef.column === 'id' && requiredLocatorVars.length > 0;
+        if (!joinUsesTemplateScopedId && conditions.length === 1) {
+            return undefined;
+        }
+        const locatorConditionMap = new Map();
+        for (const condition of conditions) {
+            const joinRef = condition.left.alias === join.alias ? condition.left : condition.right;
+            locatorConditionMap.set(joinRef.column, condition);
+        }
+        const exactConditions = [];
+        const seen = new Set();
+        for (const baseRow of baseRows) {
+            const primaryValue = this.getRowValueForColumn(baseRow, primaryBaseRef);
+            if (primaryValue === undefined || primaryValue === null) {
+                continue;
+            }
+            const primaryIsAbsoluteIri = typeof primaryValue === 'string' && this.isAbsoluteIri(primaryValue);
+            const clauses = [];
+            const dedupeParts = [];
+            let skipRow = false;
+            for (const condition of conditions) {
+                const joinRef = condition.left.alias === join.alias ? condition.left : condition.right;
+                const baseRef = joinRef === condition.left ? condition.right : condition.left;
+                const baseValue = this.getRowValueForColumn(baseRow, baseRef);
+                if (baseValue === undefined || baseValue === null) {
+                    if (joinUsesTemplateScopedId && !primaryIsAbsoluteIri && requiredLocatorVars.includes(joinRef.column)) {
+                        throw new Error(this.buildMissingJoinLocatorError(join, requiredLocatorVars.filter((variable) => {
+                            const variableCondition = locatorConditionMap.get(variable);
+                            if (!variableCondition) {
+                                return true;
+                            }
+                            const variableJoinRef = variableCondition.left.alias === join.alias ? variableCondition.left : variableCondition.right;
+                            const variableBaseRef = variableJoinRef === variableCondition.left ? variableCondition.right : variableCondition.left;
+                            const variableValue = this.getRowValueForColumn(baseRow, variableBaseRef);
+                            return variableValue === undefined || variableValue === null;
+                        })));
+                    }
+                    skipRow = true;
+                    break;
+                }
+                const joinColumn = join.table.getColumn(joinRef.column);
+                if (!joinColumn) {
+                    skipRow = true;
+                    break;
+                }
+                clauses.push(eq(joinColumn, baseValue));
+                dedupeParts.push(`${joinRef.column}:${this.serializeValueForKey(baseValue)}`);
+            }
+            if (skipRow) {
+                continue;
+            }
+            if (joinUsesTemplateScopedId && !primaryIsAbsoluteIri) {
+                const missingLocatorVars = requiredLocatorVars.filter((variable) => {
+                    const variableCondition = locatorConditionMap.get(variable);
+                    if (!variableCondition) {
+                        return true;
+                    }
+                    const variableJoinRef = variableCondition.left.alias === join.alias ? variableCondition.left : variableCondition.right;
+                    const variableBaseRef = variableJoinRef === variableCondition.left ? variableCondition.right : variableCondition.left;
+                    const variableValue = this.getRowValueForColumn(baseRow, variableBaseRef);
+                    return variableValue === undefined || variableValue === null;
+                });
+                if (missingLocatorVars.length > 0) {
+                    throw new Error(this.buildMissingJoinLocatorError(join, missingLocatorVars));
+                }
+            }
+            if (clauses.length === 0) {
+                continue;
+            }
+            const dedupeKey = dedupeParts.join('|');
+            if (seen.has(dedupeKey)) {
+                continue;
+            }
+            seen.add(dedupeKey);
+            exactConditions.push(clauses.length === 1 ? clauses[0] : and(...clauses));
+        }
+        return exactConditions.length > 0 ? exactConditions : undefined;
+    }
+    buildJoinLookupCondition(joinColumnInstance, valuesArray) {
+        if (!joinColumnInstance || valuesArray.length === 0) {
+            return undefined;
+        }
+        if (valuesArray.length === 1) {
+            return eq(joinColumnInstance, valuesArray[0]);
+        }
+        return inArray(joinColumnInstance, valuesArray);
+    }
+    getRequiredSubjectTemplateVariables(table) {
+        const template = table.getSubjectTemplate?.() ?? table.config?.subjectTemplate ?? '';
+        return Array.from(template.matchAll(/\{([^}]+)\}/g))
+            .map((match) => match[1])
+            .filter((variable) => variable !== 'id' && variable !== 'index');
+    }
+    isAbsoluteIri(value) {
+        return /^[a-zA-Z][\w+.-]*:\/\//.test(value);
+    }
+    buildMissingJoinLocatorError(join, missingVariables) {
+        const template = join.table.getSubjectTemplate?.() ?? join.table.config?.subjectTemplate ?? '{id}';
+        const uniqueMissingVariables = Array.from(new Set(missingVariables));
+        const exampleVariable = uniqueMissingVariables[0] ?? '...';
+        return (`Cannot join table "${join.table.config.name ?? 'unknown'}" by id with subjectTemplate "${template}" ` +
+            `because locator variable(s) [${uniqueMissingVariables.join(', ')}] are missing. ` +
+            `Add join conditions for all required template variables (for example eq(base.${exampleVariable}, join.${exampleVariable})) ` +
+            `or join via full IRI values.`);
+    }
     normalizeJoinRows(join, rows) {
         return rows.map((row) => {
             const normalized = {};
             for (const [key, value] of Object.entries(row)) {
                 normalized[`${join.alias}.${key}`] = value;
             }
-            const subjectValue = row.subject;
+            const subjectValue = this.extractSubjectValue(row);
             if (subjectValue) {
                 normalized.subject = subjectValue;
                 normalized['@id'] = subjectValue;
@@ -1420,7 +1593,8 @@ export class SelectQueryBuilder {
         for (const baseRow of baseRows) {
             const baseValue = this.getRowValueForColumn(baseRow, baseRef);
             const key = this.serializeValueForKey(baseValue);
-            const matches = baseValue !== undefined && baseValue !== null ? joinValueMap.get(key) ?? [] : [];
+            const primaryMatches = baseValue !== undefined && baseValue !== null ? joinValueMap.get(key) ?? [] : [];
+            const matches = primaryMatches.filter((joinRow) => this.joinRowMatchesAllConditions(baseRow, joinRow, join.alias, conditions));
             if (matches.length === 0) {
                 if (join.type === 'innerJoin') {
                     continue;
@@ -1434,6 +1608,18 @@ export class SelectQueryBuilder {
         }
         return merged;
     }
+    joinRowMatchesAllConditions(baseRow, joinRow, joinAlias, conditions) {
+        return conditions.every((condition) => {
+            const joinRef = condition.left.alias === joinAlias ? condition.left : condition.right;
+            const baseRef = joinRef === condition.left ? condition.right : condition.left;
+            const baseValue = this.getRowValueForColumn(baseRow, baseRef);
+            const joinValue = this.getRowValueForColumn(joinRow, joinRef);
+            if (baseValue === undefined || baseValue === null || joinValue === undefined || joinValue === null) {
+                return false;
+            }
+            return this.serializeValueForKey(baseValue) === this.serializeValueForKey(joinValue);
+        });
+    }
     createEmptyJoinRow(join) {
         const empty = {};
         for (const columnName of Object.keys(join.table.columns)) {