@an5/orm 1.0.8 → 1.0.9

package/dist/scripts/release-cli.d.ts

@@ -1,3 +1,3 @@
-#!/usr/bin/env tsx
-export {};
+#!/usr/bin/env tsx
+export {};
 //# sourceMappingURL=release-cli.d.ts.map

package/dist/scripts/release-cli.js

@@ -1,116 +1,116 @@
-#!/usr/bin/env tsx
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const child_process_1 = require("child_process");
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-function run(cmd, allowFail = false) {
-    try {
-        return (0, child_process_1.execSync)(cmd, { encoding: 'utf8' }).trim();
-    }
-    catch (error) {
-        if (allowFail)
-            return error.stdout?.toString()?.trim() || '';
-        throw error;
-    }
-}
-function inferComponent(file) {
-    const normalized = file.replace('\\', '/').toLowerCase();
-    if (normalized.includes('/generator/'))
-        return 'generator';
-    if (normalized.includes('/an5client/'))
-        return 'client';
-    if (normalized.includes('/an5schema/'))
-        return 'schema';
-    if (normalized.includes('/.github/'))
-        return 'ci';
-    if (normalized.includes('package.json') || normalized.includes('tsconfig'))
-        return 'build';
-    if (normalized.includes('.md'))
-        return 'docs';
-    return 'misc';
-}
-function collectChanges() {
-    const status = run('git status --porcelain');
-    const files = status
-        .split('\n')
-        .map(l => l.trim())
-        .filter(Boolean)
-        .map(l => l.slice(3).trim())
-        .filter(Boolean);
-    const groups = new Map();
-    for (const file of files) {
-        const component = inferComponent(file);
-        if (!groups.has(component)) {
-            groups.set(component, { component, files: [], summary: '' });
-        }
-        groups.get(component).files.push(file);
-    }
-    return Array.from(groups.values()).map(group => ({
-        ...group,
-        summary: `${group.component} updates`
-    }));
-}
-function generateChangelog(groups) {
-    const lines = ['# Changelog', ''];
-    for (const group of groups) {
-        lines.push(`## ${group.component}`);
-        lines.push(`- ${group.summary}`);
-        for (const file of group.files) {
-            lines.push(`  - ${file}`);
-        }
-        lines.push('');
-    }
-    return lines.join('\n').trim();
-}
-async function maybeUseLLM(summary) {
-    let apiKey = '';
-    try {
-        const configPath = require('path').join(__dirname, '..', '..', 'an5Adapters', 'typescript', 'config');
-        const mod = require(configPath);
-        if (mod?.getLlmConfig) {
-            const db = await mod.getLlmConfig();
-            if (db)
-                apiKey = db.apiKey;
-        }
-    }
-    catch { }
-    if (!apiKey)
-        return summary;
-    try {
-        const prompt = `Summarize these changes into one concise release note in English:\n${summary}`;
-        const payload = JSON.stringify({ model: 'gpt-4o-mini', messages: [{ role: 'system', content: 'You are a helpful release note writer.' }, { role: 'user', content: prompt }] });
-        const response = run(`curl -s https://api.openai.com/v1/chat/completions -H "Authorization: Bearer ${apiKey}" -H "Content-Type: application/json" -d '${payload}'`, true);
-        const parsed = JSON.parse(response);
-        return parsed.choices?.[0]?.message?.content?.trim() || summary;
-    }
-    catch {
-        return summary;
-    }
-}
-async function main() {
-    const groups = collectChanges();
-    if (groups.length === 0) {
-        console.log('No modified files detected.');
-        process.exit(0);
-    }
-    const changelog = generateChangelog(groups);
-    const outputPath = path_1.default.resolve(process.cwd(), 'CHANGELOG.md');
-    fs_1.default.writeFileSync(outputPath, changelog + '\n');
-    const summary = groups.map(g => `${g.component}: ${g.files.join(', ')}`).join('\n');
-    const llmSummary = await maybeUseLLM(summary);
-    console.log('\nGenerated changelog:\n');
-    console.log(changelog);
-    console.log('\nLLM summary:\n');
-    console.log(llmSummary);
-    const message = groups.map(g => g.component).join(', ');
-    const commitMessage = `chore: update ${message}`;
-    run(`git add -A`);
-    run(`git commit -m "${commitMessage}"`, true);
-    console.log(`\nCommitted with: ${commitMessage}`);
-}
-main().catch(console.error);
+#!/usr/bin/env tsx
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const child_process_1 = require("child_process");
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+function run(cmd, allowFail = false) {
+    try {
+        return (0, child_process_1.execSync)(cmd, { encoding: 'utf8' }).trim();
+    }
+    catch (error) {
+        if (allowFail)
+            return error.stdout?.toString()?.trim() || '';
+        throw error;
+    }
+}
+function inferComponent(file) {
+    const normalized = file.replace('\\', '/').toLowerCase();
+    if (normalized.includes('/generator/'))
+        return 'generator';
+    if (normalized.includes('/an5client/'))
+        return 'client';
+    if (normalized.includes('/an5schema/'))
+        return 'schema';
+    if (normalized.includes('/.github/'))
+        return 'ci';
+    if (normalized.includes('package.json') || normalized.includes('tsconfig'))
+        return 'build';
+    if (normalized.includes('.md'))
+        return 'docs';
+    return 'misc';
+}
+function collectChanges() {
+    const status = run('git status --porcelain');
+    const files = status
+        .split('\n')
+        .map(l => l.trim())
+        .filter(Boolean)
+        .map(l => l.slice(3).trim())
+        .filter(Boolean);
+    const groups = new Map();
+    for (const file of files) {
+        const component = inferComponent(file);
+        if (!groups.has(component)) {
+            groups.set(component, { component, files: [], summary: '' });
+        }
+        groups.get(component).files.push(file);
+    }
+    return Array.from(groups.values()).map(group => ({
+        ...group,
+        summary: `${group.component} updates`
+    }));
+}
+function generateChangelog(groups) {
+    const lines = ['# Changelog', ''];
+    for (const group of groups) {
+        lines.push(`## ${group.component}`);
+        lines.push(`- ${group.summary}`);
+        for (const file of group.files) {
+            lines.push(`  - ${file}`);
+        }
+        lines.push('');
+    }
+    return lines.join('\n').trim();
+}
+async function maybeUseLLM(summary) {
+    let apiKey = '';
+    try {
+        const configPath = require('path').join(__dirname, '..', '..', 'an5Adapters', 'typescript', 'config');
+        const mod = require(configPath);
+        if (mod?.getLlmConfig) {
+            const db = await mod.getLlmConfig();
+            if (db)
+                apiKey = db.apiKey;
+        }
+    }
+    catch { }
+    if (!apiKey)
+        return summary;
+    try {
+        const prompt = `Summarize these changes into one concise release note in English:\n${summary}`;
+        const payload = JSON.stringify({ model: 'gpt-4o-mini', messages: [{ role: 'system', content: 'You are a helpful release note writer.' }, { role: 'user', content: prompt }] });
+        const response = run(`curl -s https://api.openai.com/v1/chat/completions -H "Authorization: Bearer ${apiKey}" -H "Content-Type: application/json" -d '${payload}'`, true);
+        const parsed = JSON.parse(response);
+        return parsed.choices?.[0]?.message?.content?.trim() || summary;
+    }
+    catch {
+        return summary;
+    }
+}
+async function main() {
+    const groups = collectChanges();
+    if (groups.length === 0) {
+        console.log('No modified files detected.');
+        process.exit(0);
+    }
+    const changelog = generateChangelog(groups);
+    const outputPath = path_1.default.resolve(process.cwd(), 'CHANGELOG.md');
+    fs_1.default.writeFileSync(outputPath, changelog + '\n');
+    const summary = groups.map(g => `${g.component}: ${g.files.join(', ')}`).join('\n');
+    const llmSummary = await maybeUseLLM(summary);
+    console.log('\nGenerated changelog:\n');
+    console.log(changelog);
+    console.log('\nLLM summary:\n');
+    console.log(llmSummary);
+    const message = groups.map(g => g.component).join(', ');
+    const commitMessage = `chore: update ${message}`;
+    run(`git add -A`);
+    run(`git commit -m "${commitMessage}"`, true);
+    console.log(`\nCommitted with: ${commitMessage}`);
+}
+main().catch(console.error);
 //# sourceMappingURL=release-cli.js.map

package/dist/sql-utils.d.ts

@@ -8,6 +8,8 @@ import type { RelationDef } from "./metadata";
  * user-supplied column / alias names.
  */
 export declare function quoteIdentifier(name: string): string;
+/** Quotes one-part or multipart SQL Server table identifiers safely. */
+export declare function quoteTableIdentifier(name: string): string;
 /** Sanitizes a parameter name to a safe T-SQL identifier fragment. */
 export declare function sanitizeParamName(name: string): string;
 /** Validates a direction token, defaulting to ASC. */
@@ -20,7 +22,7 @@ export interface QueryContext {
 }
 export declare function buildOrderBy(orderBy: any): string;
 /**
- * Recursively builds a WHERE clause from a Prisma-style filter object.
+ * Recursively builds a WHERE clause from a structured filter object.
  *
  * Values are always bound as parameters (`@name`); only identifiers are
  * interpolated directly, and they are run through {@link quoteIdentifier}.

package/dist/sql-utils.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.quoteIdentifier = quoteIdentifier;
+exports.quoteTableIdentifier = quoteTableIdentifier;
 exports.sanitizeParamName = sanitizeParamName;
 exports.normalizeSortDirection = normalizeSortDirection;
 exports.toNonNegativeInt = toNonNegativeInt;
@@ -18,6 +19,48 @@ function quoteIdentifier(name) {
     const s = String(name);
     return `[${s.replace(/\]/g, "]]")}]`;
 }
+function unquoteBracketIdentifier(part) {
+    const trimmed = String(part).trim();
+    if (trimmed.startsWith("[") && trimmed.endsWith("]")) {
+        return trimmed.slice(1, -1).replace(/\]\]/g, "]");
+    }
+    return trimmed;
+}
+function splitMultipartIdentifier(name) {
+    const parts = [];
+    let current = "";
+    let inBracket = false;
+    const input = String(name).trim();
+    for (let i = 0; i < input.length; i += 1) {
+        const ch = input[i];
+        if (ch === "[")
+            inBracket = true;
+        if (ch === "]") {
+            if (input[i + 1] === "]") {
+                current += "]]";
+                i += 1;
+                continue;
+            }
+            inBracket = false;
+        }
+        if (ch === "." && !inBracket) {
+            if (current.trim())
+                parts.push(current.trim());
+            current = "";
+            continue;
+        }
+        current += ch;
+    }
+    if (current.trim())
+        parts.push(current.trim());
+    return parts.length > 0 ? parts : [input];
+}
+/** Quotes one-part or multipart SQL Server table identifiers safely. */
+function quoteTableIdentifier(name) {
+    return splitMultipartIdentifier(name)
+        .map(part => quoteIdentifier(unquoteBracketIdentifier(part)))
+        .join(".");
+}
 /** Sanitizes a parameter name to a safe T-SQL identifier fragment. */
 function sanitizeParamName(name) {
     const s = String(name);
@@ -34,7 +77,7 @@ function toNonNegativeInt(value, fallback = 0) {
     const n = Number.parseInt(String(value), 10);
     return Number.isFinite(n) && n >= 0 ? n : fallback;
 }
-const OPERATOR_KEYS = ["in", "notIn", "contains", "startsWith", "endsWith", "not", "gte", "lte", "gt", "lt"];
+const OPERATOR_KEYS = ["equals", "in", "notIn", "contains", "startsWith", "endsWith", "not", "gte", "lte", "gt", "lt"];
 function isOperatorValue(value) {
     if (!value || typeof value !== "object" || value instanceof Date)
         return false;
@@ -55,7 +98,7 @@ function buildOrderBy(orderBy) {
     return orderClauses.length > 0 ? ` ORDER BY ${orderClauses.join(", ")}` : "";
 }
 /**
- * Recursively builds a WHERE clause from a Prisma-style filter object.
+ * Recursively builds a WHERE clause from a structured filter object.
  *
  * Values are always bound as parameters (`@name`); only identifiers are
  * interpolated directly, and they are run through {@link quoteIdentifier}.
@@ -83,18 +126,27 @@ function parseWhere(modelName, where, params, prefix = "", ctx = {}) {
                 conditions.push(`(${filtered.join(" OR ")})`);
             }
         }
-        else if (key === "AND" && Array.isArray(value)) {
-            const andConditions = value.map((subWhere, idx) => parseWhere(modelName, subWhere, params, `${prefix}and_${idx}_`, ctx));
+        else if (key === "AND") {
+            const andItems = Array.isArray(value) ? value : [value];
+            const andConditions = andItems.map((subWhere, idx) => parseWhere(modelName, subWhere, params, `${prefix}and_${idx}_`, ctx));
             const filtered = andConditions.filter(Boolean);
             if (filtered.length > 0) {
                 conditions.push(`(${filtered.join(" AND ")})`);
             }
         }
+        else if (key === "NOT") {
+            const notItems = Array.isArray(value) ? value : [value];
+            const notConditions = notItems.map((subWhere, idx) => parseWhere(modelName, subWhere, params, `${prefix}not_${idx}_`, ctx));
+            const filtered = notConditions.filter(Boolean);
+            if (filtered.length > 0) {
+                conditions.push(`NOT (${filtered.join(" AND ")})`);
+            }
+        }
         else {
             const modelRelations = relationMap[modelName];
             const relation = modelRelations?.[key];
             if (relation) {
-                const relationTable = modelToTable[relation.modelName] || relation.modelName;
+                const relationTable = quoteTableIdentifier(modelToTable[relation.modelName] || relation.modelName);
                 const subParams = {};
                 let subWhere = value;
                 let op = "some";
@@ -114,26 +166,23 @@ function parseWhere(modelName, where, params, prefix = "", ctx = {}) {
                 }
                 const subWhereSql = parseWhere(relation.modelName, subWhere, subParams, `${prefix}${key}_`, ctx);
                 Object.assign(params, subParams);
-                if (subWhereSql) {
-                    const fk = quoteIdentifier(relation.foreignKey);
-                    const lk = quoteIdentifier(relation.localKey);
-                    if (relation.relationType === "one") {
-                        if (op === "none") {
-                            conditions.push(`${fk} NOT IN (SELECT ${lk} FROM ${relationTable} WITH (NOLOCK) WHERE ${subWhereSql})`);
-                        }
-                        else {
-                            conditions.push(`${fk} IN (SELECT ${lk} FROM ${relationTable} WITH (NOLOCK) WHERE ${subWhereSql})`);
-                        }
+                const fk = quoteIdentifier(relation.foreignKey);
+                const lk = quoteIdentifier(relation.localKey);
+                const outerKey = relation.relationType === "one" ? fk : lk;
+                const innerKey = relation.relationType === "one" ? lk : fk;
+                if (op === "every") {
+                    if (subWhereSql) {
+                        conditions.push(`${outerKey} NOT IN (SELECT ${innerKey} FROM ${relationTable} WITH (NOLOCK) WHERE NOT (${subWhereSql}))`);
                     }
                     else {
-                        if (op === "none") {
-                            conditions.push(`${lk} NOT IN (SELECT ${fk} FROM ${relationTable} WITH (NOLOCK) WHERE ${subWhereSql})`);
-                        }
-                        else {
-                            conditions.push(`${lk} IN (SELECT ${fk} FROM ${relationTable} WITH (NOLOCK) WHERE ${subWhereSql})`);
-                        }
+                        conditions.push("1 = 1");
                     }
                 }
+                else {
+                    const relationPredicate = subWhereSql ? ` WHERE ${subWhereSql}` : "";
+                    const operator = op === "none" ? "NOT IN" : "IN";
+                    conditions.push(`${outerKey} ${operator} (SELECT ${innerKey} FROM ${relationTable} WITH (NOLOCK)${relationPredicate})`);
+                }
             }
             else {
                 const col = quoteIdentifier(key);
@@ -141,7 +190,16 @@ function parseWhere(modelName, where, params, prefix = "", ctx = {}) {
                 if (value && typeof value === "object" && !(value instanceof Date)) {
                     const ops = Object.entries(value);
                     for (const [op, opVal] of ops) {
-                        if (op === "in" && Array.isArray(opVal)) {
+                        if (op === "equals") {
+                            if (opVal === null) {
+                                conditions.push(`${col} IS NULL`);
+                            }
+                            else {
+                                conditions.push(`${col} = @${paramName}_equals`);
+                                params[`${paramName}_equals`] = opVal;
+                            }
+                        }
+                        else if (op === "in" && Array.isArray(opVal)) {
                             if (opVal.length === 0) {
                                 conditions.push("1 = 0");
                             }
@@ -182,8 +240,20 @@ function parseWhere(modelName, where, params, prefix = "", ctx = {}) {
                             params[`${paramName}_endsWith`] = `%${opVal}`;
                         }
                         else if (op === "not") {
-                            conditions.push(`${col} <> @${paramName}_not`);
-                            params[`${paramName}_not`] = opVal;
+                            if (opVal === null) {
+                                conditions.push(`${col} IS NOT NULL`);
+                            }
+                            else if (opVal && typeof opVal === "object" && !(opVal instanceof Date) && !Array.isArray(opVal)) {
+                                const nestedParams = {};
+                                const nestedSql = parseWhere(modelName, { [key]: opVal }, nestedParams, `${prefix}${key}_not_`, ctx);
+                                Object.assign(params, nestedParams);
+                                if (nestedSql)
+                                    conditions.push(`NOT (${nestedSql})`);
+                            }
+                            else {
+                                conditions.push(`${col} <> @${paramName}_not`);
+                                params[`${paramName}_not`] = opVal;
+                            }
                         }
                         else if (op === "gte") {
                             conditions.push(`${col} >= @${paramName}_gte`);