@protobase/cli 0.1.1 → 0.1.3

package/dist/db/introspect.js

@@ -12,12 +12,18 @@ const byTable = (rows) => {
 	}
 	return groups;
 };
-const introspect = async (sql) => {
+const kinds = {
+	r: "table",
+	p: "table",
+	v: "view",
+	m: "materialized view"
+};
+const introspect = async (sql, relations = {}) => {
 	const [columns, foreignKeys, checks, indexes] = await Promise.all([
-		selectColumns(sql),
-		selectForeignKeys(sql),
-		selectChecks(sql),
-		selectIndexes(sql)
+		selectColumns(sql, relations),
+		selectForeignKeys(sql, relations),
+		selectChecks(sql, relations),
+		selectIndexes(sql, relations)
 	]);
 	const fks = byTable(foreignKeys);
 	const chks = byTable(checks);
@@ -25,7 +31,8 @@ const introspect = async (sql) => {
 	return [...byTable(columns)].map(([key, rows]) => ({
 		schema: rows[0].schema,
 		name: rows[0].table,
-		columns: rows.map(({ schema, table, enumValues, defaultExpr, ...column }) => ({
+		kind: kinds[rows[0].relkind],
+		columns: rows.map(({ schema, table, relkind, enumValues, defaultExpr, ...column }) => ({
 			...column,
 			enumValues: enumValues ?? [],
 			...defaultExpr !== null && { defaultExpr }

package/dist/db/queries.js

@@ -1,11 +1,11 @@
 //#region src/db/queries.ts
-const userTables = `
-  c.relkind in ('r', 'p')
+const userRelations = ({ views = false }) => `
+  c.relkind in ('r', 'p'${views ? ", 'v', 'm'" : ""})
   and n.nspname not in ('pg_catalog', 'information_schema', 'pg_toast')
   and n.nspname not like 'pg_temp%'
 `;
-const selectColumns = (sql) => sql`
-  select n.nspname as schema, c.relname as table, a.attname as name, a.attnum::int as position,
+const selectColumns = (sql, relations) => sql`
+  select n.nspname as schema, c.relname as table, c.relkind as relkind, a.attname as name, a.attnum::int as position,
     bt.typname as "typeName", format_type(a.atttypid, a.atttypmod) as formatted,
     (bt.typtype = 'e') as "isEnum",
     (select array_agg(e.enumlabel::text order by e.enumsortorder) from pg_enum e where e.enumtypid = bt.oid) as "enumValues",
@@ -17,10 +17,10 @@ const selectColumns = (sql) => sql`
   join pg_type t on t.oid = a.atttypid
   join pg_type bt on bt.oid = case when t.typtype = 'd' then t.typbasetype else t.oid end
   left join pg_attrdef d on d.adrelid = a.attrelid and d.adnum = a.attnum
-  where ${sql.unsafe(userTables)} and a.attnum > 0 and not a.attisdropped
+  where ${sql.unsafe(userRelations(relations))} and a.attnum > 0 and not a.attisdropped
   order by n.nspname, c.relname, a.attnum
 `;
-const selectForeignKeys = (sql) => sql`
+const selectForeignKeys = (sql, relations) => sql`
   select n.nspname as schema, c.relname as table,
     (select array_agg(a.attname::text order by k.ord) from unnest(con.conkey) with ordinality k(attnum, ord)
       join pg_attribute a on a.attrelid = con.conrelid and a.attnum = k.attnum) as columns,
@@ -32,9 +32,9 @@ const selectForeignKeys = (sql) => sql`
   join pg_namespace n on n.oid = c.relnamespace
   join pg_class rc on rc.oid = con.confrelid
   join pg_namespace rn on rn.oid = rc.relnamespace
-  where con.contype = 'f' and ${sql.unsafe(userTables)}
+  where con.contype = 'f' and ${sql.unsafe(userRelations(relations))}
 `;
-const selectChecks = (sql) => sql`
+const selectChecks = (sql, relations) => sql`
   select n.nspname as schema, c.relname as table,
     (select array_agg(a.attname::text order by k.ord) from unnest(con.conkey) with ordinality k(attnum, ord)
       join pg_attribute a on a.attrelid = con.conrelid and a.attnum = k.attnum) as columns,
@@ -42,9 +42,9 @@ const selectChecks = (sql) => sql`
   from pg_constraint con
   join pg_class c on c.oid = con.conrelid
   join pg_namespace n on n.oid = c.relnamespace
-  where con.contype = 'c' and con.conkey is not null and ${sql.unsafe(userTables)}
+  where con.contype = 'c' and con.conkey is not null and ${sql.unsafe(userRelations(relations))}
 `;
-const selectIndexes = (sql) => sql`
+const selectIndexes = (sql, relations) => sql`
   select n.nspname as schema, c.relname as table, ic.relname as name,
     (select array_agg(case when k.attnum = 0 then null else a.attname::text end order by k.ord)
       from unnest(i.indkey::int2[]) with ordinality k(attnum, ord)
@@ -56,7 +56,7 @@ const selectIndexes = (sql) => sql`
   join pg_namespace n on n.oid = c.relnamespace
   join pg_class ic on ic.oid = i.indexrelid
   join pg_am am on am.oid = ic.relam
-  where i.indisvalid and ${sql.unsafe(userTables)}
+  where i.indisvalid and ${sql.unsafe(userRelations(relations))}
 `;
 //#endregion
 export { selectChecks, selectColumns, selectForeignKeys, selectIndexes };

package/dist/doctor/check.js

@@ -39,7 +39,7 @@ const checkField = (model, table, name) => {
 		resource: model.name,
 		message: `${name}: declared .dbDefault() but ${column.name} has no default the database computes`
 	});
-	if (field.filterable && !leadingIndex(table, column.name, model.tenant && model.fields[model.tenant]?.column)) issues.push({
+	if (field.filterable && table.kind !== "view" && !leadingIndex(table, column.name, model.tenant && model.fields[model.tenant]?.column)) issues.push({
 		severity: "warning",
 		resource: model.name,
 		message: `${name}: filterable but ${column.name} has no index`,
@@ -48,7 +48,8 @@ const checkField = (model, table, name) => {
 	return issues;
 };
 const checkKey = (model, table) => {
-	if (!keyColumns(table)) return [{
+	if (table.kind === "view") return [];
+	if (table.kind === "table" && !keyColumns(table)) return [{
 		severity: "error",
 		resource: model.name,
 		message: `${tableKey(table)} has no primary key or unique NOT NULL index`,

package/dist/doctor/run.js

@@ -8,7 +8,7 @@ const runDoctor = async (options, out) => {
 	const models = await loadResourceModels(options.configDir);
 	if (models.length === 0) throw new Error(`No resources exported from ${options.configDir}/index.ts`);
 	const sql = connect(options.url);
-	const tables = await introspect(sql).finally(() => sql.end());
+	const tables = await introspect(sql, { views: true }).finally(() => sql.end());
 	const issues = models.flatMap((model) => checkResource(model, tables));
 	for (const issue of issues) out(format(issue));
 	const errors = issues.filter((i) => i.severity === "error").length;

package/dist/package.js

@@ -1,4 +1,4 @@
 //#region package.json
-var version = "0.1.1";
+var version = "0.1.3";
 //#endregion
 export { version };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@protobase/cli",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "The protobase command: scaffold, doctor, dev, build and serve a Protobase project.",
   "license": "Apache-2.0",
   "repository": {
@@ -46,11 +46,11 @@
     "tsx": "^4.23.15",
     "vite": "^8.3.3",
     "zod": "^4.6.5",
-    "@protobase/layout": "0.1.1",
-    "@protobase/server": "0.1.1",
-    "@protobase/ui": "0.1.1",
-    "@protobase/schema": "0.1.1",
-    "@protobase/query": "0.1.1"
+    "@protobase/layout": "0.1.3",
+    "@protobase/query": "0.1.3",
+    "@protobase/server": "0.1.3",
+    "@protobase/ui": "0.1.3",
+    "@protobase/schema": "0.1.3"
   },
   "scripts": {
     "build": "tsdown"