@rex0220/kintone-sql-tools 3.68.0 → 3.69.0

package/README.md

@@ -259,6 +259,44 @@ Options:
 6. Windows で `ksql --help` 実行時にエディタが開いてしまう
 - `.js` 関連付けの影響の可能性があります。`ksql.cmd --help` または `node dist-cli/ksql.js --help` で確認してください。
 
+## 公式 API（プログラムから使う）
+
+npm パッケージは 2 つのサブパスを **semver 対象の公開 API** として提供します。
+ここに載る export のシグネチャ・挙動の互換性は semver（破壊的変更＝メジャー、追加＝マイナー）で管理します。
+
+| サブパス | 用途 | 主な export |
+|---|---|---|
+| `@rex0220/kintone-sql-tools/engine` | **read-only** のクエリ実行（ダッシュボード等）。書込 API は構造的に遮断 | `runQuery` / `runBatch` / `explainQuery` / `createReadonlyKintoneClient` / `KsqlEngineError` / `version` |
+| `@rex0220/kintone-sql-tools/flow` | **Flow dialect 1**（→ [言語リファレンス §27](docs/ksql_language_reference.md)）のスクリプト解析・検証・**文単位実行**（バッチランナー向け・書込可能） | `parseScript` / `validateScript` / `explainScript` / `createExecutionContext` / `executeStatement` / `disposeExecutionContext` / `createKintoneClient` / `version` |
+
+`/flow` の典型的な使い方（1 文ずつ実行して結果で継続判断する）:
+
+```ts
+import { parseScript, createExecutionContext, executeStatement, disposeExecutionContext, createKintoneClient } from "@rex0220/kintone-sql-tools/flow";
+
+const client = createKintoneClient({ baseUrl, auth: { type: "apiToken", apiToken } });
+const { statements, meta, diagnostics } = parseScript(source, { apps: { 受注: 100 } });
+const ctx = createExecutionContext({ client, script: source, apps: { 受注: 100, 顧客マスタ: 200 }, asOf: new Date("2026-08-01T00:00:00+09:00"), timezone: "Asia/Tokyo" });
+try {
+  for (const stmt of statements) {
+    const result = await executeStatement(stmt, ctx);
+    // result で ASSERT 違反 / EXIT 成立 / skipped を判別して継続を判断する
+  }
+} finally {
+  await disposeExecutionContext(ctx);
+}
+```
+
+### エンジンバージョン × dialect 対応表
+
+| エンジン | dialect 0（既定・宣言なし） | dialect 1（`-- @ksql dialect: 1`） |
+|---|---|---|
+| 〜 v3.67.0 | ✅ | —（未実装） |
+| v3.68.0 | ✅ | 解析のみ（エンジン内部 API。実行できる出荷面なし・実験的） |
+| v3.69.0 〜 | ✅ | ✅ CLI / MCP / プラグイン / `/flow` で実行可 |
+
+dialect は後方互換で管理します: dialect 0 のスクリプトはどのエンジン版でも挙動不変・破壊的変更は dialect 番号の繰り上げでのみ導入します。変更履歴は [CHANGELOG.md](CHANGELOG.md) を参照してください。
+
 ## 機密情報の取り扱い
 
 - token / password は直書きせず、環境変数または `env:` 参照を推奨します。

package/dist-cli/ksql.js

@@ -677,6 +677,75 @@ function resolveGroupingSpec(stmt, resolve2) {
   };
 }
 
+// src/core/asOfClock.ts
+var AS_OF_FUNCTION_NAMES = [
+  "NOW",
+  "TODAY",
+  "MONTH_START",
+  "NEXT_MONTH_START"
+];
+var AS_OF_VARIABLE_PREFIX = "\0as-of:";
+function asOfVariableName(name) {
+  return `${AS_OF_VARIABLE_PREFIX}${name}`;
+}
+function asOfFunctionNameFromVariable(name) {
+  if (!name.startsWith(AS_OF_VARIABLE_PREFIX)) return null;
+  const candidate = name.slice(AS_OF_VARIABLE_PREFIX.length);
+  return isAsOfFunctionName(candidate) ? candidate : null;
+}
+function isAsOfFunctionName(name) {
+  return AS_OF_FUNCTION_NAMES.includes(name);
+}
+function createAsOfClock(asOf = /* @__PURE__ */ new Date(), timezone) {
+  if (!(asOf instanceof Date) || !Number.isFinite(asOf.getTime())) {
+    throw new Error("ArgumentError: asOf must be a valid Date.");
+  }
+  let formatter;
+  try {
+    formatter = new Intl.DateTimeFormat("en-CA", {
+      ...timezone === void 0 ? {} : { timeZone: timezone },
+      year: "numeric",
+      month: "2-digit",
+      day: "2-digit"
+    });
+    formatter.format(asOf);
+  } catch {
+    throw new Error(`ArgumentError: invalid IANA timezone: ${timezone ?? ""}.`);
+  }
+  const parts = formatter.formatToParts(asOf);
+  const year = partNumber(parts, "year");
+  const month = partNumber(parts, "month");
+  const day = partNumber(parts, "day");
+  const today = `${pad4(year)}-${pad2(month)}-${pad2(day)}`;
+  const monthStart = `${pad4(year)}-${pad2(month)}-01`;
+  const nextYear = month === 12 ? year + 1 : year;
+  const nextMonth = month === 12 ? 1 : month + 1;
+  return {
+    asOf: new Date(asOf.getTime()),
+    ...timezone === void 0 ? {} : { timezone },
+    values: {
+      NOW: asOf.toISOString(),
+      TODAY: today,
+      MONTH_START: monthStart,
+      NEXT_MONTH_START: `${pad4(nextYear)}-${pad2(nextMonth)}-01`
+    }
+  };
+}
+function partNumber(parts, type) {
+  const value = parts.find((part) => part.type === type)?.value;
+  const parsed = Number(value);
+  if (!Number.isInteger(parsed)) {
+    throw new Error(`InternalError: Intl.DateTimeFormat did not return ${type}.`);
+  }
+  return parsed;
+}
+function pad2(value) {
+  return String(value).padStart(2, "0");
+}
+function pad4(value) {
+  return String(value).padStart(4, "0");
+}
+
 // src/core/aggregateExpression.ts
 function quote(value) {
   return `'${value.replace(/'/g, "''")}'`;
@@ -1095,6 +1164,19 @@ var Parser = class {
     this.activeCteDefinition = null;
     this.provisionalRecursiveCte = null;
     this.allowSelectArithVariable = false;
+    if (capabilities.dialect1) {
+      for (let index = 0; index + 1 < tokens.length; index++) {
+        const token = tokens[index];
+        if (token.kind !== "VARIABLE" /* VARIABLE */ || tokens[index + 1].kind !== "(" /* LPAREN */) continue;
+        const name = token.value.slice(1).toUpperCase();
+        if (!isAsOfFunctionName(name)) {
+          throw new ParseError(
+            `\u4F7F\u7528\u53EF\u80FD\u306A as-of \u95A2\u6570\u306F ${AS_OF_FUNCTION_NAMES.map((item) => `@${item}`).join("/")} \u3067\u3059`,
+            token
+          );
+        }
+      }
+    }
   }
   // ----------------------------------------------------------
   // 公開 API
@@ -1264,6 +1346,10 @@ var Parser = class {
   parseScalarExpr(context, allowScalarSubquery) {
     const tok = this.peek();
     if (tok.kind === "VARIABLE" /* VARIABLE */) {
+      if (this.peekAt(1).kind === "(" /* LPAREN */ && this.capabilities.dialect1) {
+        this.advance();
+        return this.finishVariableReference(tok);
+      }
       throw new ParseError(`${context} \u306E\u53F3\u8FBA\u3067\u306F\u4ED6\u306E\u5909\u6570\u3092\u53C2\u7167\u3067\u304D\u307E\u305B\u3093`, tok);
     }
     if (tok.kind === "NULL" /* NULL */) {
@@ -1803,12 +1889,28 @@ var Parser = class {
       throw new ParseError("\u3053\u306E\u69CB\u6587\u306B\u306F -- @ksql dialect: 1 \u306E\u5BA3\u8A00\u304C\u5FC5\u8981\u3067\u3059", tok);
     }
   }
+  /** VARIABLE + `()` is the dialect-1 as-of call syntax; a bare VARIABLE stays unchanged. */
+  finishVariableReference(tok) {
+    const ordinary = { type: "VARIABLE", name: tok.value.slice(1).toLowerCase() };
+    if (this.peek().kind !== "(" /* LPAREN */) return ordinary;
+    if (!this.capabilities.dialect1) return ordinary;
+    const name = tok.value.slice(1).toUpperCase();
+    if (!isAsOfFunctionName(name)) {
+      throw new ParseError(
+        `\u4F7F\u7528\u53EF\u80FD\u306A as-of \u95A2\u6570\u306F ${AS_OF_FUNCTION_NAMES.map((item) => `@${item}`).join("/")} \u3067\u3059`,
+        tok
+      );
+    }
+    this.advance();
+    this.expect(")" /* RPAREN */, `@${name} \u306F\u5F15\u6570\u306A\u3057\u306E () \u3067\u547C\u3073\u51FA\u3057\u3066\u304F\u3060\u3055\u3044`);
+    return { type: "VARIABLE", name: asOfVariableName(name) };
+  }
   /** ASSERT のオペランド: 文字列 / スカラーサブクエリ / 数値算術式 */
   parseAssertOperand() {
     const tok = this.peek();
     if (tok.kind === "VARIABLE" /* VARIABLE */) {
       this.advance();
-      return { type: "VARIABLE", name: tok.value.slice(1).toLowerCase() };
+      return this.finishVariableReference(tok);
     }
     if (tok.kind === "STRING" /* STRING */) {
       this.advance();
@@ -2182,7 +2284,7 @@ var Parser = class {
         }
         if (tok.kind === "VARIABLE" /* VARIABLE */) {
           this.advance();
-          args.push({ type: "VARIABLE", name: tok.value.slice(1).toLowerCase() });
+          args.push(this.finishVariableReference(tok));
           continue;
         }
         let sign = "";
@@ -2267,15 +2369,21 @@ var Parser = class {
       return this.withAliasDisplay({ type: "SCALAR_VALUE_COL", expr, alias: parsedAlias2?.alias ?? null }, parsedAlias2);
     }
     if (this.peek().kind === "VARIABLE" /* VARIABLE */) {
-      const variable = this.advance();
-      if (!this.consume("AS" /* AS */)) {
-        throw new ParseError("SELECT \u5217\u306E\u30D0\u30C3\u30C1\u5909\u6570\u306B\u306F AS alias \u304C\u5FC5\u8981\u3067\u3059", this.peek());
+      const variable = this.finishVariableReference(this.advance());
+      const asOfFunction = asOfFunctionNameFromVariable(variable.name);
+      let parsedAlias2 = null;
+      if (asOfFunction === null) {
+        if (!this.consume("AS" /* AS */)) {
+          throw new ParseError("SELECT \u5217\u306E\u30D0\u30C3\u30C1\u5909\u6570\u306B\u306F AS alias \u304C\u5FC5\u8981\u3067\u3059", this.peek());
+        }
+        parsedAlias2 = this.parseAliasName();
+      } else if (this.consume("AS" /* AS */)) {
+        parsedAlias2 = this.parseAliasName();
       }
-      const parsedAlias2 = this.parseAliasName();
       return this.withAliasDisplay({
         type: "VARIABLE_COL",
-        name: variable.value.slice(1).toLowerCase(),
-        alias: parsedAlias2.alias
+        name: variable.name,
+        alias: parsedAlias2?.alias ?? null
       }, parsedAlias2);
     }
     const windowFunc = this.tryWindowFunc();
@@ -2611,7 +2719,7 @@ var Parser = class {
     }
     if (this.peek().kind === "VARIABLE" /* VARIABLE */) {
       const tok = this.advance();
-      return { type: "VARIABLE", name: tok.value.slice(1).toLowerCase() };
+      return this.finishVariableReference(tok);
     }
     const aggFunc = this.tryAggregateFunc();
     if (aggFunc !== null) {
@@ -2771,7 +2879,7 @@ var Parser = class {
     }
     if (tok.kind === "VARIABLE" /* VARIABLE */) {
       this.advance();
-      return { type: "VARIABLE", name: tok.value.slice(1).toLowerCase() };
+      return this.finishVariableReference(tok);
     }
     if (tok.kind === "CASE" /* CASE */) {
       if (!allowCase) throw new ParseError("\u3053\u306E\u30B9\u30AB\u30E9\u30FC\u5024\u5F0F\u3067\u306F CASE \u3092\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093", tok);
@@ -2871,7 +2979,7 @@ var Parser = class {
     }
     if (this.allowSelectArithVariable && tok.kind === "VARIABLE" /* VARIABLE */) {
       this.advance();
-      return { type: "VARIABLE", name: tok.value.slice(1).toLowerCase() };
+      return this.finishVariableReference(tok);
     }
     if (tok.kind === "IDENT" /* IDENT */ || tok.kind === "BIDENT" /* BIDENT */) {
       this.advance();
@@ -3479,7 +3587,7 @@ var Parser = class {
     }
     if (tok.kind === "VARIABLE" /* VARIABLE */) {
       this.advance();
-      return { type: "VARIABLE", name: tok.value.slice(1).toLowerCase() };
+      return this.finishVariableReference(tok);
     }
     throw new ParseError(
       "KLIKE / NOT KLIKE \u306E\u53F3\u8FBA\u306B\u306F\u6587\u5B57\u5217\u30EA\u30C6\u30E9\u30EB\u307E\u305F\u306F\u30D0\u30C3\u30C1\u5909\u6570\u304C\u5FC5\u8981\u3067\u3059",
@@ -3672,7 +3780,7 @@ var Parser = class {
     const tok = this.peek();
     if (tok.kind === "VARIABLE" /* VARIABLE */) {
       this.advance();
-      return { type: "VARIABLE", name: tok.value.slice(1).toLowerCase() };
+      return this.finishVariableReference(tok);
     }
     if (tok.kind === "STRING" /* STRING */) {
       this.advance();
@@ -3728,6 +3836,9 @@ var Parser = class {
       "VARIABLE" /* VARIABLE */,
       "IN / NOT IN \u306E\u5F8C\u306B\u306F (\u5024\u30EA\u30B9\u30C8\u307E\u305F\u306F SELECT) \u304B\u914D\u5217\u5909\u6570\u304C\u5FC5\u8981\u3067\u3059"
     );
+    if (this.peek().kind === "(" /* LPAREN */ && this.capabilities.dialect1) {
+      return { type: "IN_LIST", values: [this.finishVariableReference(variable)] };
+    }
     return { type: "VARIABLE_IN_LIST", name: variable.value.slice(1).toLowerCase() };
   }
   parseInListOrSubquery() {
@@ -3759,7 +3870,7 @@ var Parser = class {
         const sign = tok.kind === "-" /* MINUS */ ? "-" : "+";
         values.push(makeNumberLiteral(`${sign}${number.value}`));
       } else if (tok.kind === "VARIABLE" /* VARIABLE */) {
-        values.push({ type: "VARIABLE", name: tok.value.slice(1).toLowerCase() });
+        values.push(this.finishVariableReference(tok));
       } else if (tok.kind === "LOGINUSER" /* LOGINUSER */) {
         if (values.length > 0) {
           throw new ParseError(mixedLoginUserMessage, tok);
@@ -9282,6 +9393,7 @@ function collectVariableRefs(node, refs, inWhere = false) {
     const obj = node;
     const type = obj["type"];
     if ((type === "VARIABLE" || type === "VARIABLE_COL" || type === "VARIABLE_IN_LIST") && typeof obj["name"] === "string") {
+      if (asOfFunctionNameFromVariable(obj["name"]) !== null) return;
       refs.push({
         name: obj["name"],
         kind: type === "VARIABLE" ? "scalar" : type === "VARIABLE_COL" ? "select-column" : "array-in-list",
@@ -16465,7 +16577,14 @@ var DiagnosticCodes = {
   HEADER_INVALID_DIALECT: "KSQL1006",
   LOGICAL_APP_UNRESOLVED: "KSQL1101",
   LEX_ERROR: "KSQL1201",
-  PARSE_ERROR: "KSQL1202"
+  PARSE_ERROR: "KSQL1202",
+  DIALECT1_REQUIRED: "KSQL1203",
+  UPDATE_KEY_COMPOSITE: "KSQL1301",
+  UPDATE_KEY_FIELD_TYPE: "KSQL1302",
+  UPDATE_KEY_NOT_UNIQUE: "KSQL1303",
+  SUBTABLE_DML_FORBIDDEN: "KSQL1304",
+  BARE_INSERT_NOT_IDEMPOTENT: "KSQL1305",
+  SERVER_TIME_FUNCTION_NOT_AS_OF: "KSQL1306"
 };
 function sourceLocationAt(source, offset) {
   const target = Math.max(0, Math.min(offset, source.length));
@@ -16596,6 +16715,86 @@ function findLineEnd(source, start) {
   return { contentEnd, next: i };
 }
 
+// src/core/sql.ts
+function parseSqlStatements(sql, capabilities = {}) {
+  const tokens = new Lexer(sql).tokenize();
+  const statements = new Parser(tokens, capabilities).parseStatements();
+  statements.forEach(validateStatementStatic);
+  return statements;
+}
+function parseSqlStatementsForScript(sql, capabilities = {}) {
+  const header = parseScriptHeader(sql);
+  const headerError = header.diagnostics.find((diagnostic2) => diagnostic2.severity === "error");
+  if (header.hasDirectives && headerError) {
+    throw new Error(`${headerError.code}: ${headerError.message} (${headerError.line}:${headerError.column})`);
+  }
+  const scriptSql = header.hasDirectives ? sql.slice(header.headerEnd) : sql;
+  const scriptCapabilities = header.hasDirectives ? { ...capabilities, dialect1: header.meta.dialect === 1 } : capabilities;
+  return {
+    statements: parseSqlStatements(scriptSql, scriptCapabilities),
+    meta: header.meta
+  };
+}
+
+// src/core/dialect1Validation.ts
+var DIALECT1_SERVER_TIME_FUNCTION_WARNING = "bare \u306E\u6642\u523B\u4F9D\u5B58\u95A2\u6570\u306F kintone \u30B5\u30FC\u30D0\u30FC\u8A55\u4FA1\u306E\u305F\u3081 as-of \u306E\u5BFE\u8C61\u5916\u3067\u3059\u3002\u518D\u73FE\u6027\u304C\u5FC5\u8981\u306A\u3089 @ \u4ED8\u304D\u95A2\u6570\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044\u3002";
+function validateDialect1UpdateKey(statement, fieldInfos) {
+  if (fieldInfos === void 0) {
+    return statement.keyFields.length === 1 ? [] : [{
+      code: DiagnosticCodes.UPDATE_KEY_COMPOSITE,
+      severity: "error",
+      message: "dialect 1 \u306E UPSERT / MERGE \u306E\u30AD\u30FC\u306F\u5358\u4E00\u30D5\u30A3\u30FC\u30EB\u30C9\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\u8907\u5408\u30AD\u30FC\u306E\u4EE3\u308F\u308A\u306B\u3001\u9023\u7D50\u30AD\u30FC\u30D5\u30A3\u30FC\u30EB\u30C9\uFF08\u4F8B: \u9867\u5BA2\u30B3\u30FC\u30C9_\u5E74\u6708\uFF09\u3092\u30A2\u30D7\u30EA\u5074\u306B\u7528\u610F\u3057\u3066\u304F\u3060\u3055\u3044\u3002"
+    }];
+  }
+  if (statement.keyFields.length !== 1) return [];
+  const key = statement.keyFields[0];
+  const field = fieldInfos.find((candidate) => candidate.code === key);
+  const issues = [];
+  if (field === void 0 || field.fieldType !== "SINGLE_LINE_TEXT" && field.fieldType !== "NUMBER") {
+    issues.push({
+      code: DiagnosticCodes.UPDATE_KEY_FIELD_TYPE,
+      severity: "error",
+      message: field === void 0 ? `UPSERT / MERGE \u306E\u30AD\u30FC\u300C${key}\u300D\u304C APP${statement.appId} \u306E\u30D5\u30A9\u30FC\u30E0\u306B\u5B58\u5728\u3057\u307E\u305B\u3093\u3002\u91CD\u8907\u7981\u6B62\u3092\u8A2D\u5B9A\u3057\u305F\u6587\u5B57\u5217\uFF081\u884C\uFF09\u307E\u305F\u306F\u6570\u5024\u30D5\u30A3\u30FC\u30EB\u30C9\u3092\u30AD\u30FC\u306B\u3057\u3066\u304F\u3060\u3055\u3044\u3002` : `UPSERT / MERGE \u306E\u30AD\u30FC\u300C${key}\u300D\u306E\u578B ${field.fieldType} \u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002\u91CD\u8907\u7981\u6B62\u3092\u8A2D\u5B9A\u3057\u305F\u6587\u5B57\u5217\uFF081\u884C\uFF09\u307E\u305F\u306F\u6570\u5024\u30D5\u30A3\u30FC\u30EB\u30C9\u3092\u30AD\u30FC\u306B\u3057\u3066\u304F\u3060\u3055\u3044\u3002`
+    });
+  }
+  if (field?.isUnique === false) {
+    issues.push({
+      code: DiagnosticCodes.UPDATE_KEY_NOT_UNIQUE,
+      severity: "error",
+      message: `UPSERT / MERGE \u306E\u30AD\u30FC\u300C${key}\u300D\u306F\u91CD\u8907\u7981\u6B62\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002\u30A2\u30D7\u30EA\u306E\u30D5\u30A3\u30FC\u30EB\u30C9\u8A2D\u5B9A\u3067\u300C\u5024\u306E\u91CD\u8907\u3092\u7981\u6B62\u3059\u308B\u300D\u3092\u6709\u52B9\u306B\u3057\u3066\u304F\u3060\u3055\u3044\u3002`
+    });
+  } else if (field !== void 0 && field.isUnique === void 0) {
+    issues.push({
+      code: DiagnosticCodes.UPDATE_KEY_NOT_UNIQUE,
+      severity: "warning",
+      message: `UPSERT / MERGE \u306E\u30AD\u30FC\u300C${key}\u300D\u306E\u91CD\u8907\u7981\u6B62\u8A2D\u5B9A\u3092 schema resolver \u304B\u3089\u78BA\u8A8D\u3067\u304D\u307E\u305B\u3093\u3002isUnique \u3092\u8FD4\u3059 resolver \u3092\u4F7F\u7528\u3057\u3001\u30A2\u30D7\u30EA\u5074\u3067\u300C\u5024\u306E\u91CD\u8907\u3092\u7981\u6B62\u3059\u308B\u300D\u304C\u6709\u52B9\u304B\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002`
+    });
+  }
+  return issues;
+}
+function statementHasBareServerTimeFunctionInWhere(statement) {
+  let found = false;
+  const visit = (node) => {
+    if (found || node === null || typeof node !== "object") return;
+    if (Array.isArray(node)) {
+      node.forEach(visit);
+      return;
+    }
+    const value = node;
+    const where = value["where"];
+    if (where !== null && typeof where === "object") {
+      const names = serverOnlyFunctionOccurrencesInWhere(where);
+      if (names.some((name) => name === "TODAY" || name === "NOW" || isRelativeDateFunctionName(name))) {
+        found = true;
+        return;
+      }
+    }
+    Object.values(value).forEach(visit);
+  };
+  visit(statement);
+  return found;
+}
+
 // src/core/dmlPrevalidation.ts
 function collectDmlPrevalidationSnapshotFields(fieldIndex) {
   return [
@@ -18885,17 +19084,10 @@ var BatchTimeoutError = class extends Error {
   }
 };
 async function executeBatch(sql, client, options = {}) {
+  const asOfClock = createAsOfClock(options.asOf ?? /* @__PURE__ */ new Date(), options.timezone);
   resolveRecursiveCteLimits(options);
-  const header = parseScriptHeader(sql);
-  const headerError = header.diagnostics.find((diagnostic2) => diagnostic2.severity === "error");
-  if (header.hasDirectives && headerError) {
-    throw new Error(`${headerError.code}: ${headerError.message} (${headerError.line}:${headerError.column})`);
-  }
-  const statements = parseSqlBatch(
-    header.hasDirectives ? sql.slice(header.headerEnd) : sql,
-    options.enableImport === true,
-    header.hasDirectives && header.meta.dialect === 1
-  );
+  const { statements, meta } = parseSqlStatementsForScript(sql, { import: options.enableImport === true });
+  const dialect1Warnings = meta.dialect === 1 && statements.some(statementHasBareServerTimeFunctionInWhere) ? [DIALECT1_SERVER_TIME_FUNCTION_WARNING] : [];
   const analysis = analyzeBatch(statements);
   statements.forEach((statement) => assertApplyExecutionScope("phase15b", statement));
   if (options.allowApplyMutation !== true && statements.some(
@@ -18929,6 +19121,9 @@ async function executeBatch(sql, client, options = {}) {
   try {
     const tempTables = /* @__PURE__ */ new Map();
     const variables = /* @__PURE__ */ new Map();
+    for (const [name, value] of Object.entries(asOfClock.values)) {
+      variables.set(asOfVariableName(name), { type: "string", value });
+    }
     const results = [];
     const failed = /* @__PURE__ */ new Set();
     let aborted = null;
@@ -18985,7 +19180,8 @@ async function executeBatch(sql, client, options = {}) {
           tempTables,
           variables,
           relativeDateVariables,
-          clock: statementEvaluationContext(boundOptions)
+          clock: statementEvaluationContext(boundOptions),
+          dialect: meta.dialect
         };
         const outcome = await runWithDeadline(
           executeBatchStatement(statementContext),
@@ -18994,6 +19190,9 @@ async function executeBatch(sql, client, options = {}) {
         );
         if (outcome.result) {
           outcome.result = attachSearchAbortWarning(outcome.result, searchAbortCollector);
+          if (dialect1Warnings.length > 0 && statementHasBareServerTimeFunctionInWhere(statements[i]) && outcome.result.type === "SELECT") {
+            outcome.result = mergeSelectWarnings(outcome.result, dialect1Warnings);
+          }
         }
         const { exitTriggered, ...statementOutcome } = outcome;
         results.push({ ...base, status: "success", ...statementOutcome });
@@ -19023,7 +19222,8 @@ async function executeBatch(sql, client, options = {}) {
       statementCount: statements.length,
       statements: results,
       analysis,
-      metrics
+      metrics,
+      ...dialect1Warnings.length > 0 ? { warnings: dialect1Warnings } : {}
     };
   } finally {
     releaseMetadataCacheScope(cacheContext);
@@ -19045,7 +19245,8 @@ async function executeBatchStatement(context) {
     tempTables,
     variables,
     relativeDateVariables,
-    clock
+    clock,
+    dialect
   } = context;
   if (stmt.type === "SET_VARIABLE") {
     const resolvedStmt2 = resolveBatchVariableReferences(stmt, variables);
@@ -19117,6 +19318,18 @@ async function executeBatchStatement(context) {
   assertApplyScope("phase15b", resolvedStmt);
   assertApplyExecutionScope("phase15b", resolvedStmt);
   validateStatementStatic(resolvedStmt);
+  if (dialect === 1 && (resolvedStmt.type === "INSERT" || resolvedStmt.type === "UPDATE" || resolvedStmt.type === "DELETE") && resolvedStmt.subtableCode) {
+    throw new Error(
+      "ArgumentError: dialect 1 \u3067\u306F\u30B5\u30D6\u30C6\u30FC\u30D6\u30EB\u4EEE\u60F3\u30C6\u30FC\u30D6\u30EB\u3078\u306E DML \u306F\u3067\u304D\u307E\u305B\u3093\u3002SELECT \u306F\u53EF\u80FD\u3067\u3059\u3002\u89AA\u30A2\u30D7\u30EA\u3092\u5BFE\u8C61\u306B\u3057\u3066\u304F\u3060\u3055\u3044\u3002"
+    );
+  }
+  if (dialect === 1 && (resolvedStmt.type === "UPSERT" || resolvedStmt.type === "UPSERT_SELECT")) {
+    const staticIssue = validateDialect1UpdateKey(resolvedStmt)[0];
+    if (staticIssue) throw new Error(`ArgumentError: ${staticIssue.message}`);
+    const fieldInfos = await getFieldsCached(resolvedStmt.appId, client, cacheContext);
+    const schemaIssue = validateDialect1UpdateKey(resolvedStmt, fieldInfos)[0];
+    if (schemaIssue) throw new Error(`ArgumentError: ${schemaIssue.message}`);
+  }
   await assertRelativeDateExecutionPlan(resolvedStmt, client, cacheContext);
   if (resolvedStmt.type === "VALIDATE") {
     const result = await executeExistingRecordValidationCore(
@@ -19377,6 +19590,8 @@ function evaluateScalarExpr(expr, evaluationContext = {}) {
       }
       return { type: "number", value, raw: String(value) };
     }
+    case "VARIABLE":
+      throw new Error(`InternalError: unresolved variable @${expr.name} reached scalar evaluation.`);
   }
 }
 function resolveBatchVariableReferences(node, variables) {
@@ -19412,7 +19627,7 @@ function resolveBatchVariableReferencesInternal(node, variables, numericArithmet
         raw: numericArithmeticOperand === "AGG_ARITH" ? `@${obj["name"]}` : value.raw ?? String(value.value)
       } : { type: "STRING", value: value.value, fromVariable: true };
     }
-    if (obj["type"] === "VARIABLE_COL" && typeof obj["name"] === "string" && typeof obj["alias"] === "string") {
+    if (obj["type"] === "VARIABLE_COL" && typeof obj["name"] === "string" && (typeof obj["alias"] === "string" || obj["alias"] === null)) {
       const value = variables.get(obj["name"]);
       if (value === void 0) throw new Error(`ParseError: variable @${obj["name"]} is not defined in this batch.`);
       if (value.type === "array") throw new Error(`ParseError: array variable @${obj["name"]} cannot be used as a SELECT column.`);
@@ -26894,16 +27109,7 @@ async function buildBatchExplainPlans(sql, client, injectedVariables, cacheConte
   });
   const invocationCacheContext = createInvocationCacheContext(cacheContext);
   try {
-    const header = parseScriptHeader(sql);
-    const headerError = header.diagnostics.find((diagnostic2) => diagnostic2.severity === "error");
-    if (header.hasDirectives && headerError) {
-      throw new Error(`${headerError.code}: ${headerError.message} (${headerError.line}:${headerError.column})`);
-    }
-    const statements = parseSqlBatch(
-      header.hasDirectives ? sql.slice(header.headerEnd) : sql,
-      enableImport,
-      header.hasDirectives && header.meta.dialect === 1
-    );
+    const { statements, meta } = parseSqlStatementsForScript(sql, { import: enableImport });
     const analysis = analyzeBatch(statements);
     const normalizedInjectedVariables = validateDeclaredBatchVariables(statements, injectedVariables);
     const relativeDateVariables = prepareRelativeDateVariables(statements, normalizedInjectedVariables);
@@ -26984,10 +27190,16 @@ async function buildBatchExplainPlans(sql, client, injectedVariables, cacheConte
         ), cursorMaxActive)
       ];
       const metadataPlan = explainMetadataLines(whereAnalysis);
+      const dialect1Estimate = meta.dialect === 1 ? buildDialect1ApiEstimateLines(
+        planStmt,
+        analysis.statements[i],
+        maxRecords,
+        dmlMaxRows
+      ) : [];
       plans.push({
         index: i,
         type: analysis.statements[i].statementType,
-        plan: statementPlan.length === 0 ? metadataPlan : [statementPlan[0], ...metadataPlan, ...statementPlan.slice(1)]
+        plan: statementPlan.length === 0 ? [...metadataPlan, ...dialect1Estimate] : [statementPlan[0], ...metadataPlan, ...statementPlan.slice(1), ...dialect1Estimate]
       });
       fetchStatements.push({
         index: i,
@@ -27012,6 +27224,63 @@ async function buildBatchExplainPlans(sql, client, injectedVariables, cacheConte
     releaseMetadataCacheScope(invocationCacheContext);
   }
 }
+function buildDialect1ApiEstimateLines(statement, analysis, maxRecords, dmlMaxRows) {
+  const lines = ["  estimated API consumption (dialect 1):"];
+  const sources = collectPhysicalExplainSources(statement);
+  if ((statement.type === "UPDATE" || statement.type === "DELETE") && !sources.includes(`APP${statement.appId}`)) {
+    sources.unshift(`APP${statement.appId}`);
+  }
+  const maxReadRequests = Math.ceil(maxRecords / 500);
+  for (const source of sources) {
+    lines.push(
+      `    read ${source}: \u4E0D\u660E\uFF08\u4E0A\u9650 maxRecords=${maxRecords} \u3068\u4EEE\u5B9A: \u6700\u5927 ${maxReadRequests} \u56DE\u3001500 \u4EF6/\u56DE\uFF09`
+    );
+  }
+  const metadataApps = [.../* @__PURE__ */ new Set([
+    ...analysis.appIds,
+    ...analysis.targetAppId === null ? [] : [analysis.targetAppId]
+  ])];
+  lines.push(
+    `    metadata: GET form fields \xD7 ${metadataApps.length} \u30A2\u30D7\u30EA\uFF08\u30AD\u30E3\u30C3\u30B7\u30E5\u6E08\u307F\u306F\u8FFD\u52A0 0 \u56DE\uFF09`
+  );
+  if (statement.type === "UPSERT" || statement.type === "UPSERT_SELECT") {
+    if (statement.type === "UPSERT") {
+      lines.push(
+        `    UPSERT pre-read: ${Math.ceil(statement.values.length / UPSERT_IN_CHUNK_SIZE)} \u56DE\uFF08${statement.values.length} \u884C\u3001${UPSERT_IN_CHUNK_SIZE} \u30AD\u30FC/\u56DE\uFF09`
+      );
+    } else {
+      lines.push(
+        `    UPSERT pre-read: \u4E0D\u660E\uFF08\u4E0A\u9650 dmlMaxRows=${dmlMaxRows} \u3068\u4EEE\u5B9A: \u6700\u5927 ${Math.ceil(dmlMaxRows / UPSERT_IN_CHUNK_SIZE)} \u56DE\u3001${UPSERT_IN_CHUNK_SIZE} \u30AD\u30FC/\u56DE\uFF09`
+      );
+    }
+  }
+  const knownRows = statement.type === "INSERT" || statement.type === "UPSERT" ? statement.values.length : null;
+  if (statement.type === "INSERT" || statement.type === "INSERT_SELECT" || statement.type === "UPSERT" || statement.type === "UPSERT_SELECT" || statement.type === "UPDATE" || statement.type === "DELETE") {
+    lines.push(knownRows === null ? `    write: \u4E0D\u660E\uFF08\u4E0A\u9650 dmlMaxRows=${dmlMaxRows} \u3068\u4EEE\u5B9A: \u6700\u5927 ${Math.ceil(dmlMaxRows / 100)} \u56DE\u3001100 \u4EF6/HTTP \u30EA\u30AF\u30A8\u30B9\u30C8\uFF09` : `    write: ${Math.ceil(knownRows / 100)} \u56DE\uFF08${knownRows} \u884C\u3001100 \u4EF6/HTTP \u30EA\u30AF\u30A8\u30B9\u30C8\uFF09`);
+    lines.push("    reference: bulkRequest \u306F\u672A\u5B9F\u88C5\u3002\u66F8\u8FBC\u30B5\u30D6\u30EA\u30AF\u30A8\u30B9\u30C8\u6570\u306F HTTP \u66F8\u8FBC\u56DE\u6570\u3068\u540C\u3058");
+  }
+  return lines;
+}
+function collectPhysicalExplainSources(statement) {
+  const sources = [];
+  const visit = (node) => {
+    if (Array.isArray(node)) {
+      node.forEach(visit);
+      return;
+    }
+    if (node === null || typeof node !== "object") return;
+    const value = node;
+    if (typeof value["appId"] === "number" && Object.prototype.hasOwnProperty.call(value, "alias") && Object.prototype.hasOwnProperty.call(value, "cteName") && value["cteName"] === null && value["appId"] > 0) {
+      const app = `APP${value["appId"]}`;
+      const subtable = typeof value["subtableCode"] === "string" ? `$${value["subtableCode"]}` : "";
+      const alias = typeof value["alias"] === "string" && value["alias"] !== app ? ` AS ${value["alias"]}` : "";
+      sources.push(`${app}${subtable}${alias}`);
+    }
+    Object.values(value).forEach(visit);
+  };
+  visit(statement);
+  return sources;
+}
 function buildBatchStatementPlan(stmt, info, capabilities, orderPlans, plainGroupByPlans, dmlMaxRows = 100, dmlMaxSubtableRows = DEFAULT_APPLY_MAX_SUBTABLE_ROWS, collector = { sources: [] }, tempSchemaLedger = /* @__PURE__ */ new Map(), createdSchema, explainContext = defaultRecursiveExplainContext()) {
   if (stmt.type === "CREATE_TEMP_TABLE") {
     return [
@@ -28491,20 +28760,6 @@ var OperationCancelledError = class extends Error {
   }
 };
 
-// src/core/sql.ts
-function parseSqlStatement(sql, capabilities = {}) {
-  const tokens = new Lexer(sql).tokenize();
-  const stmt = new Parser(tokens, capabilities).parse();
-  validateStatementStatic(stmt);
-  return stmt;
-}
-function parseSqlStatements(sql, capabilities = {}) {
-  const tokens = new Lexer(sql).tokenize();
-  const statements = new Parser(tokens, capabilities).parseStatements();
-  statements.forEach(validateStatementStatic);
-  return statements;
-}
-
 // src/core/displayFormat.ts
 var DATE_RE = /^\d{4}-\d{2}-\d{2}$/;
 var DATETIME_RE = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}/;
@@ -30217,7 +30472,7 @@ function toParseInput(sql) {
 }
 function tryParseStatements(sql) {
   try {
-    const stmts = new Parser(new Lexer(toParseInput(sql)).tokenize()).parseStatements();
+    const { statements: stmts } = parseSqlStatementsForScript(toParseInput(sql));
     return {
       kind: "ok",
       count: stmts.length,
@@ -30232,7 +30487,11 @@ function tryParseStatements(sql) {
     if (e instanceof ParseError) {
       return { kind: "fail", continuable: e.token.kind === "EOF" /* EOF */, message: e.message };
     }
-    throw e;
+    return {
+      kind: "fail",
+      continuable: false,
+      message: e instanceof Error ? e.message : String(e)
+    };
   }
 }
 
@@ -31421,7 +31680,7 @@ async function confirmDmlInConsole(sql, opts, queue, defaultProfile = "dev", res
   if (!opts.allowDml || opts.yes || opts.dryRun) return true;
   try {
     const normalized = normalizeSqlAppProfiles(sql, defaultProfile, resolutionContext);
-    const statements = parseSqlStatements(normalized.normalizedSql);
+    const { statements } = parseSqlStatementsForScript(normalized.normalizedSql);
     if (statements.length > 1) {
       const analysis = analyzeBatch(statements);
       if (!analysis.containsDml) return true;
@@ -31871,7 +32130,7 @@ async function run() {
     }
     const importEnabled = Object.keys(args.importCsv).length > 0 || Object.keys(args.importJson).length > 0;
     try {
-      const statements = parseSqlStatements(sql, { import: importEnabled });
+      const { statements } = parseSqlStatementsForScript(sql, { import: importEnabled });
       parsedStatements = statements;
       const hasApply = (statement) => statement.type === "UPDATE" || statement.type === "INSERT" ? (statement.applyBlocks?.length ?? 0) > 0 : statement.type === "UPSERT" ? (statement.onInsertApplyBlocks?.length ?? 0) > 0 || (statement.onUpdateApplyBlocks?.length ?? 0) > 0 : false;
       containsApplyStatement = statements.some(hasApply);
@@ -31892,7 +32151,7 @@ async function run() {
         isBatchSql = true;
         batchContainsDml = batchAnalysis.containsDml;
       } else {
-        const stmt = parseSqlStatement(sql, { import: importEnabled });
+        const stmt = statements[0];
         parsedStmt = stmt;
         stmtType = getStatementType(stmt);
         isDmlStatement = writesKintone(stmt);