@syncular/typegen 0.5.0 → 0.6.0

package/dist/generate.d.ts

@@ -37,7 +37,7 @@ export declare function makeQueryDb(ir: IrDocument): {
     close: () => void;
 };
 /** Analyze every query file against the IR (SELECT-only, typed, deps). */
-export declare function analyzeQueries(ir: IrDocument, queries: readonly QueryInput[], naming?: QueryNamingOptions): AnalyzedQuery[];
+export declare function analyzeQueries(ir: IrDocument, queries: readonly QueryInput[], naming?: QueryNamingOptions, queriesRoot?: string): AnalyzedQuery[];
 /** One generated artifact: an absolute output path and its exact bytes. */
 export interface GeneratedOutput {
     readonly path: string;

package/dist/generate.js

@@ -20,7 +20,10 @@ import { buildNamingMap } from './naming.js';
 import { analyzeQueryFile, synthesizeDdl, } from './query.js';
 import { serializeQueryIr } from './query-ir.js';
 import { applyMigrationSql } from './sql.js';
-import { analyzeSyqlFile } from './syql.js';
+import { lowerSyqlQuery } from './syql-lowering.js';
+import { buildSyqlModuleGraph } from './syql-modules.js';
+import { analyzeSyqlSemantics } from './syql-semantics.js';
+import { validateSyqlProgram } from './syql-validator.js';
 /** Same grammar the server compiles (§3.1): `prefix:{variable}`. */
 const PATTERN_RE = /^([^{}]+):\{([^{}:]+)\}$/;
 /** Whole-value placeholder: `{paramName}`. */
@@ -266,17 +269,33 @@ export function makeQueryDb(ir) {
     return { db, close: () => sqlite.close() };
 }
 /** Analyze every query file against the IR (SELECT-only, typed, deps). */
-export function analyzeQueries(ir, queries, naming) {
+export function analyzeQueries(ir, queries, naming, queriesRoot = resolve('/__syncular_queries__')) {
     if (queries.length === 0)
         return [];
     const { db, close } = makeQueryDb(ir);
     try {
-        // Each file may hold multiple statements; flatten in path order (stable).
-        // Frontends dispatch on extension; both produce the same AnalyzedQuery
-        // shape (§1 — nothing downstream knows the frontend).
-        const analyzed = queries.flatMap((q) => q.file.endsWith('.syql')
-            ? analyzeSyqlFile(q.file, q.sql, ir, db, naming)
-            : analyzeQueryFile(q.file, q.sql, ir, db, naming));
+        const plain = queries
+            .filter((query) => query.file.endsWith('.sql'))
+            .flatMap((query) => analyzeQueryFile(query.file, query.sql, ir, db, naming));
+        const syqlInputs = queries.filter((query) => query.file.endsWith('.syql'));
+        let syql = [];
+        if (syqlInputs.length > 0) {
+            const root = resolve(queriesRoot);
+            const sourceByFile = new Map(syqlInputs.map((query) => [resolve(root, query.file), query.sql]));
+            const displayByFile = new Map(syqlInputs.map((query) => [resolve(root, query.file), query.file]));
+            const graph = buildSyqlModuleGraph(root, syqlInputs.map((query) => query.file), (file) => sourceByFile.get(file));
+            const validated = validateSyqlProgram(analyzeSyqlSemantics(graph), ir, db, naming);
+            syql = validated.queries
+                .map((query) => {
+                const lowered = lowerSyqlQuery(query, ir, db, naming).analysis;
+                return {
+                    ...lowered,
+                    file: displayByFile.get(query.logical.module.file) ?? lowered.file,
+                };
+            })
+                .sort((left, right) => left.file.localeCompare(right.file));
+        }
+        const analyzed = [...plain, ...syql];
         // Names must be unique across the whole manifest — the filesystem no longer
         // guarantees uniqueness once `-- name:` overrides exist. Report BOTH source
         // locations (file + statement position) on a collision.
@@ -348,7 +367,7 @@ export function generate(manifestDir) {
         kotlin?.queriesPath !== undefined ||
         dart?.queriesPath !== undefined;
     const analyzedQueries = wantsQueries
-        ? analyzeQueries(ir, loadQueries(resolve(manifestDir, manifest.queries)), naming)
+        ? analyzeQueries(ir, loadQueries(resolve(manifestDir, manifest.queries)), naming, resolve(manifestDir, manifest.queries))
         : [];
     if (wantsQueries && analyzedQueries.length === 0) {
         throw new TypegenError(resolve(manifestDir, manifest.queries), `an output requests named queries but no .sql files were found in ${manifest.queries} — add a query file or drop the queries output`);

package/dist/index.d.ts

@@ -22,9 +22,11 @@ export * from './naming.js';
 export * from './query.js';
 export * from './query-ir.js';
 export * from './sql.js';
-export * from './syql.js';
 export * from './syql-ast.js';
 export * from './syql-lexer.js';
+export * from './syql-lowering.js';
 export * from './syql-modules.js';
 export * from './syql-parser.js';
+export * from './syql-semantics.js';
 export * from './syql-template-parser.js';
+export * from './syql-validator.js';

package/dist/index.js

@@ -22,9 +22,11 @@ export * from './naming.js';
 export * from './query.js';
 export * from './query-ir.js';
 export * from './sql.js';
-export * from './syql.js';
 export * from './syql-ast.js';
 export * from './syql-lexer.js';
+export * from './syql-lowering.js';
 export * from './syql-modules.js';
 export * from './syql-parser.js';
+export * from './syql-semantics.js';
 export * from './syql-template-parser.js';
+export * from './syql-validator.js';

package/dist/lsp.d.ts

@@ -11,10 +11,8 @@ export interface RpcMessage {
 }
 export declare class SyqlLanguageServer {
     #private;
-    /** Handle one incoming message; returns the outgoing messages. */
     handle(message: RpcMessage): RpcMessage[];
-    /** Reset cached manifest contexts (e.g. after schema edits). */
     invalidateProjects(): void;
 }
-/** Run the language server over stdio until `exit`. */
+/** Run the LSP over Content-Length-framed JSON-RPC stdio. */
 export declare function runLspStdio(): Promise<void>;