@stardeck-customer-apps/data-store-sdk 0.3.2 → 0.4.0

package/dist/cli/generate-types.js

@@ -88,18 +88,29 @@ async function introspectSchemaSnapshot(executor) {
        ORDER BY tc.table_name, tc.constraint_name, ku.ordinal_position`
     ),
     executor.query(
-      `SELECT tc.constraint_name, tc.table_name, ku.column_name,
-              ccu.table_name AS referenced_table, ccu.column_name AS referenced_column,
-              rc.delete_rule, rc.update_rule
-       FROM information_schema.table_constraints tc
-       JOIN information_schema.key_column_usage ku
-         ON tc.constraint_name = ku.constraint_name AND tc.table_schema = ku.table_schema
-       JOIN information_schema.constraint_column_usage ccu
-         ON tc.constraint_name = ccu.constraint_name AND tc.table_schema = ccu.table_schema
-       JOIN information_schema.referential_constraints rc
-         ON tc.constraint_name = rc.constraint_name AND tc.table_schema = rc.constraint_schema
-       WHERE tc.table_schema = 'public' AND tc.constraint_type = 'FOREIGN KEY'
-       ORDER BY tc.table_name, tc.constraint_name, ku.ordinal_position`
+      // Read column pairings from pg_catalog: information_schema's
+      // constraint_column_usage is uncorrelated with key_column_usage, so
+      // joining them for a composite FK produces a cross product. Unnesting
+      // conkey/confkey together WITH ORDINALITY keeps referencing↔referenced
+      // columns paired and ordered.
+      `SELECT con.conname AS constraint_name,
+              rel.relname AS table_name,
+              att.attname AS column_name,
+              frel.relname AS referenced_table,
+              fatt.attname AS referenced_column,
+              CASE con.confdeltype WHEN 'a' THEN 'NO ACTION' WHEN 'r' THEN 'RESTRICT'
+                WHEN 'c' THEN 'CASCADE' WHEN 'n' THEN 'SET NULL' WHEN 'd' THEN 'SET DEFAULT' END AS delete_rule,
+              CASE con.confupdtype WHEN 'a' THEN 'NO ACTION' WHEN 'r' THEN 'RESTRICT'
+                WHEN 'c' THEN 'CASCADE' WHEN 'n' THEN 'SET NULL' WHEN 'd' THEN 'SET DEFAULT' END AS update_rule
+       FROM pg_constraint con
+       JOIN pg_class rel ON rel.oid = con.conrelid
+       JOIN pg_namespace ns ON ns.oid = rel.relnamespace
+       JOIN pg_class frel ON frel.oid = con.confrelid
+       JOIN LATERAL unnest(con.conkey, con.confkey) WITH ORDINALITY AS cols(conkey, confkey, ord) ON true
+       JOIN pg_attribute att ON att.attrelid = con.conrelid AND att.attnum = cols.conkey
+       JOIN pg_attribute fatt ON fatt.attrelid = con.confrelid AND fatt.attnum = cols.confkey
+       WHERE ns.nspname = 'public' AND con.contype = 'f'
+       ORDER BY rel.relname, con.conname, cols.ord`
     ),
     executor.query(
       `SELECT rel.relname AS table_name, con.conname AS name,

package/dist/cli/generate-types.mjs

@@ -65,18 +65,29 @@ async function introspectSchemaSnapshot(executor) {
        ORDER BY tc.table_name, tc.constraint_name, ku.ordinal_position`
     ),
     executor.query(
-      `SELECT tc.constraint_name, tc.table_name, ku.column_name,
-              ccu.table_name AS referenced_table, ccu.column_name AS referenced_column,
-              rc.delete_rule, rc.update_rule
-       FROM information_schema.table_constraints tc
-       JOIN information_schema.key_column_usage ku
-         ON tc.constraint_name = ku.constraint_name AND tc.table_schema = ku.table_schema
-       JOIN information_schema.constraint_column_usage ccu
-         ON tc.constraint_name = ccu.constraint_name AND tc.table_schema = ccu.table_schema
-       JOIN information_schema.referential_constraints rc
-         ON tc.constraint_name = rc.constraint_name AND tc.table_schema = rc.constraint_schema
-       WHERE tc.table_schema = 'public' AND tc.constraint_type = 'FOREIGN KEY'
-       ORDER BY tc.table_name, tc.constraint_name, ku.ordinal_position`
+      // Read column pairings from pg_catalog: information_schema's
+      // constraint_column_usage is uncorrelated with key_column_usage, so
+      // joining them for a composite FK produces a cross product. Unnesting
+      // conkey/confkey together WITH ORDINALITY keeps referencing↔referenced
+      // columns paired and ordered.
+      `SELECT con.conname AS constraint_name,
+              rel.relname AS table_name,
+              att.attname AS column_name,
+              frel.relname AS referenced_table,
+              fatt.attname AS referenced_column,
+              CASE con.confdeltype WHEN 'a' THEN 'NO ACTION' WHEN 'r' THEN 'RESTRICT'
+                WHEN 'c' THEN 'CASCADE' WHEN 'n' THEN 'SET NULL' WHEN 'd' THEN 'SET DEFAULT' END AS delete_rule,
+              CASE con.confupdtype WHEN 'a' THEN 'NO ACTION' WHEN 'r' THEN 'RESTRICT'
+                WHEN 'c' THEN 'CASCADE' WHEN 'n' THEN 'SET NULL' WHEN 'd' THEN 'SET DEFAULT' END AS update_rule
+       FROM pg_constraint con
+       JOIN pg_class rel ON rel.oid = con.conrelid
+       JOIN pg_namespace ns ON ns.oid = rel.relnamespace
+       JOIN pg_class frel ON frel.oid = con.confrelid
+       JOIN LATERAL unnest(con.conkey, con.confkey) WITH ORDINALITY AS cols(conkey, confkey, ord) ON true
+       JOIN pg_attribute att ON att.attrelid = con.conrelid AND att.attnum = cols.conkey
+       JOIN pg_attribute fatt ON fatt.attrelid = con.confrelid AND fatt.attnum = cols.confkey
+       WHERE ns.nspname = 'public' AND con.contype = 'f'
+       ORDER BY rel.relname, con.conname, cols.ord`
     ),
     executor.query(
       `SELECT rel.relname AS table_name, con.conname AS name,

package/dist/server/index.d.mts

@@ -140,7 +140,19 @@ interface DataStoreManifestEntry {
     id: string;
     name: string;
     slug: string;
-    url: string;
+    /**
+     * App-local handle for this project's connection. When present, the resolver
+     * matches it before the org-global slug/name.
+     */
+    bindingKey?: string;
+    /**
+     * Store kind. `database` stores carry a `url`; `storage` stores do not (access
+     * is API-mediated by store id). Absent on manifests emitted before this field
+     * existed — treat absent as `database`.
+     */
+    storeType?: "database" | "storage";
+    /** Connection string. Present for `database` stores only. */
+    url?: string;
     accessLevel: "read" | "write" | "admin";
 }
 /**

package/dist/server/index.d.ts

@@ -140,7 +140,19 @@ interface DataStoreManifestEntry {
     id: string;
     name: string;
     slug: string;
-    url: string;
+    /**
+     * App-local handle for this project's connection. When present, the resolver
+     * matches it before the org-global slug/name.
+     */
+    bindingKey?: string;
+    /**
+     * Store kind. `database` stores carry a `url`; `storage` stores do not (access
+     * is API-mediated by store id). Absent on manifests emitted before this field
+     * existed — treat absent as `database`.
+     */
+    storeType?: "database" | "storage";
+    /** Connection string. Present for `database` stores only. */
+    url?: string;
     accessLevel: "read" | "write" | "admin";
 }
 /**

package/dist/server/index.js

@@ -94,9 +94,14 @@ function readDataStoreManifest() {
   try {
     const parsed = JSON.parse(raw);
     if (!Array.isArray(parsed)) return [];
-    return parsed.filter(
-      (e) => typeof e === "object" && e !== null && typeof e.id === "string" && typeof e.name === "string" && typeof e.slug === "string" && typeof e.url === "string"
-    );
+    return parsed.filter((e) => {
+      if (typeof e !== "object" || e === null) return false;
+      const entry = e;
+      if (typeof entry.id !== "string" || typeof entry.name !== "string" || typeof entry.slug !== "string") {
+        return false;
+      }
+      return entry.storeType === "storage" || typeof entry.url === "string";
+    });
   } catch {
     return [];
   }
@@ -111,9 +116,13 @@ function resolveManifestEntry(entries, ref) {
   }
   if (ref.storeName) {
     const target = ref.storeName;
+    const byBindingKey = entries.find((e) => e.bindingKey === target);
+    if (byBindingKey) return byBindingKey;
     const exact = entries.find((e) => e.slug === target || e.id === target || e.name === target);
     if (exact) return exact;
     const norm = dataStoreSlug(target);
+    const byBindingKeyNorm = entries.find((e) => e.bindingKey === norm);
+    if (byBindingKeyNorm) return byBindingKeyNorm;
     return entries.find(
       (e) => e.slug === norm || typeof e.name === "string" && dataStoreSlug(e.name) === norm
     );
@@ -324,6 +333,12 @@ async function createDataStore(options) {
   if (!connectionString) {
     const name = options?.storeName ?? options?.storeId;
     const ref = name ? `data store "${name}"` : "a data store";
+    const resolved = options?.storeId || options?.storeName ? resolveDataStore({ storeId: options?.storeId, storeName: options?.storeName }) : void 0;
+    if (resolved?.storeType === "storage") {
+      throw new Error(
+        `${ref} is a storage store and has no SQL connection. Use DataStoreClient for storage operations (upload/download/list) instead of createDataStore.`
+      );
+    }
     throw new Error(
       `Could not resolve a connection string for ${ref}. Checked the STARDECK_DATA_STORES manifest, the legacy DATA_STORE_*_URL env var, and DATA_STORE_URL. Confirm the store is connected to this project, or pass connectionString in options.`
     );

package/dist/server/index.mjs

@@ -41,9 +41,14 @@ function readDataStoreManifest() {
   try {
     const parsed = JSON.parse(raw);
     if (!Array.isArray(parsed)) return [];
-    return parsed.filter(
-      (e) => typeof e === "object" && e !== null && typeof e.id === "string" && typeof e.name === "string" && typeof e.slug === "string" && typeof e.url === "string"
-    );
+    return parsed.filter((e) => {
+      if (typeof e !== "object" || e === null) return false;
+      const entry = e;
+      if (typeof entry.id !== "string" || typeof entry.name !== "string" || typeof entry.slug !== "string") {
+        return false;
+      }
+      return entry.storeType === "storage" || typeof entry.url === "string";
+    });
   } catch {
     return [];
   }
@@ -58,9 +63,13 @@ function resolveManifestEntry(entries, ref) {
   }
   if (ref.storeName) {
     const target = ref.storeName;
+    const byBindingKey = entries.find((e) => e.bindingKey === target);
+    if (byBindingKey) return byBindingKey;
     const exact = entries.find((e) => e.slug === target || e.id === target || e.name === target);
     if (exact) return exact;
     const norm = dataStoreSlug(target);
+    const byBindingKeyNorm = entries.find((e) => e.bindingKey === norm);
+    if (byBindingKeyNorm) return byBindingKeyNorm;
     return entries.find(
       (e) => e.slug === norm || typeof e.name === "string" && dataStoreSlug(e.name) === norm
     );
@@ -271,6 +280,12 @@ async function createDataStore(options) {
   if (!connectionString) {
     const name = options?.storeName ?? options?.storeId;
     const ref = name ? `data store "${name}"` : "a data store";
+    const resolved = options?.storeId || options?.storeName ? resolveDataStore({ storeId: options?.storeId, storeName: options?.storeName }) : void 0;
+    if (resolved?.storeType === "storage") {
+      throw new Error(
+        `${ref} is a storage store and has no SQL connection. Use DataStoreClient for storage operations (upload/download/list) instead of createDataStore.`
+      );
+    }
     throw new Error(
       `Could not resolve a connection string for ${ref}. Checked the STARDECK_DATA_STORES manifest, the legacy DATA_STORE_*_URL env var, and DATA_STORE_URL. Confirm the store is connected to this project, or pass connectionString in options.`
     );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stardeck-customer-apps/data-store-sdk",
-  "version": "0.3.2",
+  "version": "0.4.0",
   "description": "SDK for accessing Stardeck data stores from deployed projects",
   "main": "dist/index.js",
   "module": "dist/index.mjs",