@sqlanvil/cli 1.36.2 → 1.36.3

package/README.md

@@ -12,7 +12,7 @@ authority for the version you have installed: `sqlanvil help` lists the commands
 
 ```bash
 npm install -g @sqlanvil/cli
-sqlanvil --version    # sqlanvil 1.36.2 (Dataform core 3.1.2)
+sqlanvil --version    # sqlanvil 1.36.3 (Dataform core 3.1.2)
 ```
 
 Requires Node.js 20.19+ or 22.12+. `--version` reports the sqlanvil release and the Dataform core

package/bundle.js

@@ -55124,7 +55124,7 @@ function requireVersion () {
 	hasRequiredVersion = 1;
 	Object.defineProperty(version, "__esModule", { value: true });
 	version.dataformVersion = version.version = void 0;
-	version.version = "1.36.2";
+	version.version = "1.36.3";
 	version.dataformVersion = "3.1.2";
 	
 	return version;
@@ -62482,6 +62482,7 @@ function requireSql_lex () {
 	hasRequiredSql_lex = 1;
 	Object.defineProperty(sql_lex, "__esModule", { value: true });
 	sql_lex.tokenize = tokenize;
+	sql_lex.interpolationSpans = interpolationSpans;
 	sql_lex.significant = significant;
 	sql_lex.isWord = isWord;
 	sql_lex.matchBracket = matchBracket;
@@ -62504,16 +62505,7 @@ function requireSql_lex () {
 	        }
 	        if (ch === "$" && sql[i + 1] === "{") {
 	            const start = i;
-	            let depth = 0;
-	            for (; i < sql.length; i++) {
-	                if (sql[i] === "{") {
-	                    depth++;
-	                }
-	                else if (sql[i] === "}" && --depth === 0) {
-	                    i++;
-	                    break;
-	                }
-	            }
+	            i = templateEnd(sql, i);
 	            push("template", start, i);
 	            continue;
 	        }
@@ -62552,6 +62544,10 @@ function requireSql_lex () {
 	            const quote = sql[i];
 	            i++;
 	            for (; i < sql.length; i++) {
+	                if (sql[i] === "$" && sql[i + 1] === "{") {
+	                    i = templateEnd(sql, i) - 1;
+	                    continue;
+	                }
 	                if (sql[i] !== quote) {
 	                    continue;
 	                }
@@ -62598,6 +62594,36 @@ function requireSql_lex () {
 	    }
 	    return tokens;
 	}
+	function templateEnd(sql, start) {
+	    let depth = 0;
+	    for (let i = start; i < sql.length; i++) {
+	        if (sql[i] === "{") {
+	            depth++;
+	        }
+	        else if (sql[i] === "}" && --depth === 0) {
+	            return i + 1;
+	        }
+	    }
+	    return sql.length;
+	}
+	function interpolationSpans(sql) {
+	    const spans = [];
+	    for (const t of tokenize(sql)) {
+	        if (t.kind === "template") {
+	            spans.push({ start: t.start, end: t.end });
+	        }
+	        else if (t.kind === "string" || t.kind === "quoted-ident") {
+	            for (let i = t.start; i < t.end; i++) {
+	                if (sql[i] === "$" && sql[i + 1] === "{") {
+	                    const end = Math.min(templateEnd(sql, i), t.end);
+	                    spans.push({ start: i, end });
+	                    i = end - 1;
+	                }
+	            }
+	        }
+	    }
+	    return spans;
+	}
 	function significant(tokens) {
 	    return tokens.filter((t) => t.kind !== "whitespace" && t.kind !== "comment");
 	}
@@ -63637,11 +63663,22 @@ ${description}    columnTypes: {
 		        rewrite: (args) => (args.length === 1 ? `extract(epoch from ${args[0]})::bigint` : null),
 		    },
 		];
+		function callRuleView(text, isRewritableOffset) {
+		    const chars = Array.from(text, (c, i) => (c === "\n" || isRewritableOffset(i) ? c : " "));
+		    for (const t of (0, sql_lex_1.tokenize)(chars.join(""))) {
+		        if (t.kind === "quoted-ident" && !t.text.includes("\n")) {
+		            for (let i = t.start + 1; i < t.end - 1; i++) {
+		                chars[i] = " ";
+		            }
+		        }
+		    }
+		    return chars.join("");
+		}
 		function applyCallRules(text, isRewritableOffset) {
 		    const applied = [];
 		    let result = text;
 		    for (let pass = 0; pass < 10; pass++) {
-		        const mask = maskSql(result);
+		        const mask = maskSql(callRuleView(result, isRewritableOffset));
 		        const sites = [];
 		        for (const rule of CALL_RULES) {
 		            const finder = new RegExp(`\\b${rule.name}\\s*\\(`, "gi");
@@ -63704,9 +63741,65 @@ ${description}    columnTypes: {
 		    }
 		    return -1;
 		}
-		function applyTextRules(text, isSqlOffset, applied) {
+		function blankSpans(text, spans) {
+		    if (spans.length === 0) {
+		        return text;
+		    }
+		    return Array.from(text, (c, i) => c !== "\n" && spans.some((s) => i >= s.start && i < s.end) ? " " : c).join("");
+		}
+		const DQ_STRING_NOTE = "BigQuery \"string\" → 'string' (double quotes are identifiers in PostgreSQL)";
+		const TRIPLE_QUOTED_NOTE = 'BigQuery """string""" → $sa$string$sa$ (PostgreSQL has no triple-quoted strings)';
+		function convertDoubleQuotedStrings(text, isSqlOffset, note) {
+		    const chars = Array.from(text, (c, i) => (c === "\n" || isSqlOffset(i) ? c : " "));
+		    const edits = [];
+		    const triple = /"""[\s\S]*?"""/g;
+		    let m;
+		    while ((m = triple.exec(chars.join(""))) !== null) {
+		        const inner = text.slice(m.index + 3, m.index + m[0].length - 3);
+		        let tag = "$sa$";
+		        for (let n = 1; inner.includes(tag); n++) {
+		            tag = `$sa${n}$`;
+		        }
+		        edits.push({ start: m.index, end: m.index + m[0].length, out: `${tag}${inner}${tag}` });
+		        for (let i = m.index; i < m.index + m[0].length; i++) {
+		            chars[i] = chars[i] === "\n" ? "\n" : " ";
+		        }
+		        triple.lastIndex = m.index + m[0].length;
+		    }
+		    const toks = (0, sql_lex_1.significant)((0, sql_lex_1.tokenize)(chars.join("")));
+		    toks.forEach((t, k) => {
+		        if (t.kind !== "quoted-ident" || t.text.length < 2 || !t.text.endsWith('"')) {
+		            return;
+		        }
+		        if (t.text.includes("\n")) {
+		            return;
+		        }
+		        if ((0, sql_lex_1.isWord)(toks[k - 1], "as")) {
+		            return;
+		        }
+		        let inner = "";
+		        for (let i = t.start + 1; i < t.end - 1; i++) {
+		            if (text[i] === "\\" && text[i + 1] === "'" && isSqlOffset(i)) {
+		                inner += "''";
+		                i++;
+		            }
+		            else {
+		                inner += text[i] === "'" && isSqlOffset(i) ? "''" : text[i];
+		            }
+		        }
+		        edits.push({ start: t.start, end: t.end, out: `'${inner}'` });
+		    });
+		    let out = text;
+		    for (const e of edits.sort((a, b) => b.start - a.start)) {
+		        note(e.start, e.out.startsWith("$") ? TRIPLE_QUOTED_NOTE : DQ_STRING_NOTE);
+		        out = out.slice(0, e.start) + e.out + out.slice(e.end);
+		    }
+		    return out;
+		}
+		function applyTextRules(text, sqlOffsetsOf, applied) {
 		    const note = (offset, n) => applied.push({ line: text.slice(0, offset).split("\n").length, note: n });
 		    const rewrite = (src, mask, pattern, replace, ruleNote) => {
+		        const isSqlOffset = sqlOffsetsOf(src);
 		        const edits = [];
 		        let m;
 		        pattern.lastIndex = 0;
@@ -63729,18 +63822,13 @@ ${description}    columnTypes: {
 		    let result = text;
 		    result = rewrite(result, maskSql(result, true), /(?<![\w"'])#[^\n]*/g, (m) => `--${m[0].slice(1)}`, "# line comment → -- (PostgreSQL has no # comment)");
 		    result = rewrite(result, maskSql(result, true), /(?<![A-Za-z0-9_])[rR](?=['"])/g, () => "", "r'…' raw string → '…' (no raw-string prefix in PostgreSQL)");
-		    result = rewrite(result, maskSql(result, true), /(\bas\s+)?"([^"\n]*)"/gi, (m) => {
-		        if (m[1]) {
-		            return null;
-		        }
-		        return m[2].includes("${") || m[2].includes("'") ? null : `'${m[2]}'`;
-		    }, "BigQuery \"string\" → 'string' (double quotes are identifiers in PostgreSQL)");
+		    result = convertDoubleQuotedStrings(result, sqlOffsetsOf(result), note);
 		    result = rewrite(result, maskSql(result), /`([^`\n]+)`/g, (m) => (m[1].includes(".") || m[1].includes("${") ? null : `"${m[1]}"`), '`identifier` → "identifier"');
 		    result = rewrite(result, maskSql(result, true), /\s+collate\s+(''|"")/gi, () => "", "x COLLATE '' → x (collation stripping is a no-op in PostgreSQL)");
 		    for (;;) {
 		        const mask = maskSql(result);
 		        const m = /\bextract\s*\(\s*dayofweek\s+from\s+/i.exec(mask);
-		        if (!m || !isSqlOffset(m.index)) {
+		        if (!m || !sqlOffsetsOf(result)(m.index)) {
 		            break;
 		        }
 		        const close = matchParen(mask, mask.indexOf("(", m.index));
@@ -63752,7 +63840,7 @@ ${description}    columnTypes: {
 		        result =
 		            result.slice(0, m.index) + `(extract(dow from ${inner}) + 1)` + result.slice(close + 1);
 		    }
-		    return rewriteUnenforcedConstraints(result, isSqlOffset, applied);
+		    return rewriteUnenforcedConstraints(result, sqlOffsetsOf(result), applied);
 		}
 		const UNENFORCED_HEADER = [
 		    "BigQuery declared the constraint below NOT ENFORCED — advisory metadata for BI tools,",
@@ -63869,6 +63957,13 @@ ${description}    columnTypes: {
 		    const dialectPass = dialect === "postgres";
 		    let span = jsMode ? null : findConfigBlock(source);
 		    const findings = [];
+		    const configAndJsSpans = (text) => {
+		        if (jsMode) {
+		            return [{ start: 0, end: text.length }];
+		        }
+		        const config = findConfigBlock(text);
+		        return [...(config ? [{ start: config.start, end: config.end }] : []), ...jsBlockSpans(text)];
+		    };
 		    if (dialectPass) {
 		        const outsideConfig = (off) => {
 		            const s = jsMode ? null : findConfigBlock(source);
@@ -63882,11 +63977,12 @@ ${description}    columnTypes: {
 		            findings.push({ line: a.line, kind: "rewrite", note: a.note, class: classIdFor(a.note) });
 		        }
 		        const textApplied = [];
-		        const jsSpans = jsMode ? [{ start: 0, end: source.length }] : jsBlockSpans(source);
-		        const templates = (0, sql_lex_1.tokenize)(source).filter((t) => t.kind === "template");
-		        source = applyTextRules(source, (off) => outsideConfig(off) &&
-		            !jsSpans.some((s) => off >= s.start && off < s.end) &&
-		            !templates.some((t) => off >= t.start && off < t.end), textApplied);
+		        source = applyTextRules(source, (text) => {
+		            const notSql = configAndJsSpans(text);
+		            const templates = (0, sql_lex_1.interpolationSpans)(blankSpans(text, notSql));
+		            return (off) => !notSql.some((s) => off >= s.start && off < s.end) &&
+		                !templates.some((t) => off >= t.start && off < t.end);
+		        }, textApplied);
 		        for (const a of textApplied) {
 		            findings.push({
 		                line: a.line,
@@ -63899,6 +63995,20 @@ ${description}    columnTypes: {
 		    }
 		    const lines = source.split("\n");
 		    const jsLines = jsMode ? new Set() : jsBlockLines(source);
+		    if (!jsMode) {
+		        const sql = blankSpans(source, configAndJsSpans(source));
+		        const spans = [
+		            ...(0, sql_lex_1.interpolationSpans)(sql),
+		            ...(0, sql_lex_1.tokenize)(sql).filter((t) => t.kind === "string" || t.kind === "quoted-ident"),
+		        ];
+		        let lineStart = 0;
+		        lines.forEach((line, i) => {
+		            if (spans.some((s) => lineStart > s.start && lineStart < s.end)) {
+		                jsLines.add(i);
+		            }
+		            lineStart += line.length + 1;
+		        });
+		    }
 		    let configStartLine = -1;
 		    let configEndLine = -1;
 		    if (span) {

package/package.json

@@ -90,7 +90,7 @@
     "engines": {
         "node": "^20.19.0 || >=22.12.0"
     },
-    "version": "1.36.2",
+    "version": "1.36.3",
     "name": "@sqlanvil/cli",
     "description": "sqlanvil command line interface.",
     "main": "bundle.js"