@telorun/sql 0.7.0 → 0.7.2

package/README.md

@@ -55,11 +55,11 @@ metadata:
     A complete feedback collection REST API — no code, pure YAML.
     Persists entries to SQLite and serves them over HTTP.
 imports:
-  Http: std/http-server@0.8.0
-  Sql: std/sql@0.5.1
+  Http: std/http-server@0.11.0
+  Sql: std/sql@0.9.0
 targets:
-  - Migrations
-  - Server
+  - !ref Migrations
+  - !ref Server
 ---
 # SQLite database — swap driver/host/database for PostgreSQL with zero YAML changes
 kind: Sql.Connection
@@ -72,9 +72,7 @@ file: ./tmp/feedback.db
 kind: Sql.Migrations
 metadata:
   name: Migrations
-connection:
-  kind: Sql.Connection
-  name: Db
+connection: !ref Db
 ---
 kind: Sql.Migration
 metadata:
@@ -101,7 +99,7 @@ openapi:
     version: 1.0.0
 mounts:
   - path: /v1
-    type: Http.Api.FeedbackRoutes
+    mount: !ref FeedbackRoutes
 ---
 kind: Http.Api
 metadata:
@@ -123,9 +121,7 @@ routes:
           required: [ text ]
     handler:
       kind: Sql.Exec
-      connection:
-        kind: Sql.Connection
-        name: Db
+      connection: !ref Db
     inputs:
       sql: "INSERT INTO feedback (text, source, score) VALUES (?, ?, ?)"
       bindings:
@@ -146,9 +142,7 @@ routes:
       method: GET
     handler:
       kind: Sql.Select
-      connection:
-        kind: Sql.Connection
-        name: Db
+      connection: !ref Db
       from: feedback
       columns: [ id, text, source, score, created_at ]
       orderBy:
@@ -172,9 +166,7 @@ routes:
           required: [ id ]
     handler:
       kind: Sql.Select
-      connection:
-        kind: Sql.Connection
-        name: Db
+      connection: !ref Db
       from: feedback
       columns: [ id, text, source, score, created_at ]
       where:

package/dist/sql-connection-controller.js

@@ -158,10 +158,12 @@ export async function openSqliteDatabase(file = ":memory:") {
             await mkdir(dir, { recursive: true });
         }
     }
-    if (typeof Bun !== "undefined") {
-        const { openDatabase } = await import("./sqlite-driver-bun.js");
-        return openDatabase(file);
-    }
-    const { openDatabase } = await import("./sqlite-driver-node.js");
+    // Route through the package's own `./sqlite-driver` subpath export so the
+    // resolver selects the driver per runtime (Bun → bun:sqlite, Node →
+    // better-sqlite3). A manual `typeof Bun` check with relative imports gets
+    // flattened by the controller bundler into an unconditional top-level
+    // `import "bun:sqlite"`, which Node's ESM loader rejects before the guard
+    // runs; an external `@telorun/*` specifier stays a deferred dynamic import.
+    const { openDatabase } = await import("@telorun/sql/sqlite-driver");
     return openDatabase(file);
 }

package/dist/sql-connection-ref.d.ts

@@ -2,6 +2,7 @@ import type { ResourceContext } from "@telorun/sdk";
 import type { SqlConnectionResource } from "./sql-connection-controller.js";
 interface ConnectionRef {
     name: string;
+    alias?: string;
 }
 export declare function resolveSqlConnection(value: SqlConnectionResource | ConnectionRef | undefined, ctx: ResourceContext): SqlConnectionResource | undefined;
 export {};

package/dist/sql-connection-ref.js

@@ -5,8 +5,20 @@ export function resolveSqlConnection(value, ctx) {
     if (typeof value.execute === "function") {
         return value;
     }
-    if (typeof value.name !== "string") {
+    const ref = value;
+    if (typeof ref.name !== "string") {
         throw new Error("Sql: invalid connection reference");
     }
-    return ctx.moduleContext.getInstance(value.name);
+    // Cross-module reference (`!ref Alias.Connection`): a connection resolved
+    // inside a nested library is not Phase-5-injected, so the controller receives
+    // the raw `{name, alias}` ref and must route through the import's exported
+    // scope rather than a bare local lookup.
+    if (ref.alias && ref.alias !== "Self") {
+        const instance = ctx.moduleContext.resolveImportedInstance(ref.alias, ref.name);
+        if (typeof instance?.execute !== "function") {
+            throw new Error(`Sql: connection reference '${ref.alias}.${ref.name}' did not resolve to an exported connection instance.`);
+        }
+        return instance;
+    }
+    return ctx.moduleContext.getInstance(ref.name);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@telorun/sql",
-  "version": "0.7.0",
+  "version": "0.7.2",
   "description": "Telo SQL module - SQL database resource kinds for Telo manifests.",
   "keywords": [
     "telo",
@@ -74,7 +74,7 @@
     "@types/node": "^20.0.0",
     "@types/pg": "^8.0.0",
     "typescript": "^5.0.0",
-    "@telorun/sdk": "0.21.0"
+    "@telorun/sdk": "0.26.0"
   },
   "peerDependencies": {
     "@telorun/sdk": "*"

package/src/sql-connection-controller.ts

@@ -226,11 +226,12 @@ export async function openSqliteDatabase(file = ":memory:"): Promise<SqliteDb> {
     }
   }
 
-  if (typeof Bun !== "undefined") {
-    const { openDatabase } = await import("./sqlite-driver-bun.js");
-    return openDatabase(file);
-  }
-
-  const { openDatabase } = await import("./sqlite-driver-node.js");
+  // Route through the package's own `./sqlite-driver` subpath export so the
+  // resolver selects the driver per runtime (Bun → bun:sqlite, Node →
+  // better-sqlite3). A manual `typeof Bun` check with relative imports gets
+  // flattened by the controller bundler into an unconditional top-level
+  // `import "bun:sqlite"`, which Node's ESM loader rejects before the guard
+  // runs; an external `@telorun/*` specifier stays a deferred dynamic import.
+  const { openDatabase } = await import("@telorun/sql/sqlite-driver");
   return openDatabase(file);
 }

package/src/sql-connection-ref.ts

@@ -3,6 +3,7 @@ import type { SqlConnectionResource } from "./sql-connection-controller.js";
 
 interface ConnectionRef {
   name: string;
+  alias?: string;
 }
 
 export function resolveSqlConnection(
@@ -17,9 +18,24 @@ export function resolveSqlConnection(
     return value as SqlConnectionResource;
   }
 
-  if (typeof (value as ConnectionRef).name !== "string") {
+  const ref = value as ConnectionRef;
+  if (typeof ref.name !== "string") {
     throw new Error("Sql: invalid connection reference");
   }
 
-  return ctx.moduleContext.getInstance((value as ConnectionRef).name) as SqlConnectionResource;
+  // Cross-module reference (`!ref Alias.Connection`): a connection resolved
+  // inside a nested library is not Phase-5-injected, so the controller receives
+  // the raw `{name, alias}` ref and must route through the import's exported
+  // scope rather than a bare local lookup.
+  if (ref.alias && ref.alias !== "Self") {
+    const instance = ctx.moduleContext.resolveImportedInstance(ref.alias, ref.name);
+    if (typeof (instance as SqlConnectionResource | undefined)?.execute !== "function") {
+      throw new Error(
+        `Sql: connection reference '${ref.alias}.${ref.name}' did not resolve to an exported connection instance.`,
+      );
+    }
+    return instance as unknown as SqlConnectionResource;
+  }
+
+  return ctx.moduleContext.getInstance(ref.name) as SqlConnectionResource;
 }