@protobase/server 0.68.3 → 0.68.5

package/dist/package.js

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

package/dist/user-tables/definitions-resources.js

@@ -42,7 +42,7 @@ const definitionsResources = ({ roles, taken, organizations = false }) => {
 	};
 	const tables = resource(tablesResourceName).table(`${definitionsSchema}.tables`).fields({
 		id: f.bigint().readOnly().dbDefault().filterable().sortable(),
-		name: f.text().access(createOnly).filterable().sortable(),
+		name: f.text().access(createOnly),
 		singular_label: f.text().max(maxLabelLength),
 		plural_label: f.text().max(maxLabelLength),
 		title_field: f.text().optional(),
@@ -51,7 +51,7 @@ const definitionsResources = ({ roles, taken, organizations = false }) => {
 		...organization
 	}).primaryKey((r) => r.id).explicitGrants().access(accessOf(roles, organizations)).validate((table) => [...issue("name", nameIssue(table.name)), ...issue("title_field", table.title_field ? nameProblem(table.title_field, "field") : void 0)]);
 	const fields = resource(fieldsResourceName).table(`${definitionsSchema}.fields`).fields({
-		table_id: f.relation(tablesResourceName).access(createOnly).filterable(),
+		table_id: f.relation(tablesResourceName).access(createOnly).filterable().sortable(),
 		name: f.text().access(createOnly),
 		label: f.text().max(maxLabelLength),
 		type: f.enum(definitionFieldTypes).access(createOnly),

package/dist/user-tables/definitions-views.js

@@ -30,7 +30,7 @@ const tablesView = view(tablesResourceName).names({
 	title_field: r.title_field.label("Title field").notOnCreate().help("The name of the text field that titles each record and that search looks in.")
 })).list((r) => ({
 	columns: [r.plural_label, r.name],
-	sort: [[r.name, "asc"]]
+	sort: [[r.id, "asc"]]
 })).layout((r) => [l.section("Table", [
 	r.plural_label,
 	r.singular_label,
@@ -82,7 +82,7 @@ const fieldsView = view(fieldsResourceName).names({
 		r.type,
 		r.position
 	],
-	sort: [[r.position, "asc"]]
+	sort: [[r.table_id, "asc"], [r.position, "asc"]]
 })).layout((r) => [l.section("Field", [
 	r.table_id,
 	r.label,

package/dist/user-tables/schema-sql.js

@@ -46,6 +46,11 @@ const fieldsSql = () => `create table ${definitionsSchema}.fields (
   check ((type = 'decimal') = (precision is not null and scale is not null))
 )`;
 /**
+* Serves a table's fields in position order, the order its own fields take: the admin's scan guard accepts a sort on
+* `position` only from an index that reaches it with `table_id` pinned. It also reaches a fields table made before it.
+*/
+const fieldsPositionIndexSql = () => `create index if not exists fields_position_idx on ${definitionsSchema}.fields (table_id, position)`;
+/**
 * Brings a definitions table made before organizations to the shape of `tablesSql`: a name unique per organization and
 * the served name.
 */
@@ -65,4 +70,4 @@ const schemasSql = () => [
 	`grant usage, create on schema ${userTablesSchema} to current_user`
 ];
 //#endregion
-export { fieldsOrganizationSql, fieldsSql, nameIndexesSql, organizationsSql, schemasSql, tablesSql, versionDefaultSql };
+export { fieldsOrganizationSql, fieldsPositionIndexSql, fieldsSql, nameIndexesSql, organizationsSql, schemasSql, tablesSql, versionDefaultSql };

package/dist/user-tables/schema.js

@@ -1,15 +1,16 @@
 import { migrationCommand } from "../changes/capture-schema.js";
 import { definitionsSchema, userTablesSchema } from "./names.js";
-import { fieldsOrganizationSql, fieldsSql, nameIndexesSql, organizationsSql, schemasSql, tablesSql, versionDefaultSql } from "./schema-sql.js";
+import { fieldsOrganizationSql, fieldsPositionIndexSql, fieldsSql, nameIndexesSql, organizationsSql, schemasSql, tablesSql, versionDefaultSql } from "./schema-sql.js";
 import { sql } from "kysely";
 //#region src/user-tables/schema.ts
-const current = (found) => found.tables && found.versionDefault && found.organizations && found.fields && found.data && found.trgm;
+const current = (found) => found.tables && found.versionDefault && found.organizations && found.fields && found.positionIndex && found.data && found.trgm;
 const readUserTablesSchema = async (db) => {
 	const { rows } = await sql`select
     to_regclass(${`${definitionsSchema}.tables`}) is not null as tables,
     exists (select from information_schema.columns where table_schema = ${definitionsSchema} and table_name = 'tables' and column_name = 'version' and column_default is not null) as "versionDefault",
     exists (select from information_schema.columns where table_schema = ${definitionsSchema} and table_name = 'tables' and column_name = 'table_name') as organizations,
     to_regclass(${`${definitionsSchema}.fields`}) is not null as fields,
+    to_regclass(${`${definitionsSchema}.fields_position_idx`}) is not null as "positionIndex",
     exists (select from pg_namespace where nspname = ${userTablesSchema}) as data,
     exists (select from pg_extension where extname = 'pg_trgm') as trgm`.execute(db);
 	return rows[0];
@@ -27,14 +28,15 @@ const userTablesMigration = async (db) => {
 	return `${[
 		...schemasSql(),
 		...tables,
-		...fields
+		...fields,
+		fieldsPositionIndexSql()
 	].join(";\n\n")};`;
 };
 /** Refuses to go on while the schemas of user tables are missing; the project's migrations add them. */
 const checkUserTablesSchema = async (db) => {
 	const found = await readUserTablesSchema(db);
 	if (current(found)) return;
-	throw new Error(`The ${definitionsSchema} or ${userTablesSchema} schema, the default of a definition's version, a definition's organization, or pg_trgm, is missing, and userTables keeps the tables users add there. Write it as a migration with \`${migrationCommand}\`, apply it with the project's migrations, then start again.`);
+	throw new Error(`The ${definitionsSchema} or ${userTablesSchema} schema, the default of a definition's version, a definition's organization, the position index of its fields, or pg_trgm, is missing, and userTables keeps the tables users add there. Write it as a migration with \`${migrationCommand}\`, apply it with the project's migrations, then start again.`);
 };
 //#endregion
 export { checkUserTablesSchema, userTablesMigration };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@protobase/server",
-  "version": "0.68.3",
+  "version": "0.68.5",
   "description": "The Protobase REST API as a Hono app, with Better Auth sign-in.",
   "license": "Apache-2.0",
   "repository": {
@@ -44,11 +44,11 @@
     "@better-auth/sso": "^1.7.12",
     "@livekit/protocol": "1.53.1",
     "@modelcontextprotocol/server": "^2.3.1",
-    "@protobase/layout": "0.68.3",
-    "@protobase/query": "0.68.3",
-    "@protobase/schema": "0.68.3",
-    "@protobase/workflow-plugins": "0.68.3",
-    "@protobase/workflows": "0.68.3",
+    "@protobase/layout": "0.68.5",
+    "@protobase/query": "0.68.5",
+    "@protobase/schema": "0.68.5",
+    "@protobase/workflow-plugins": "0.68.5",
+    "@protobase/workflows": "0.68.5",
     "@react-email/render": "^2.1.0",
     "@react-pdf/primitives": "^4.4.0",
     "@react-pdf/renderer": "^4.9.0",