firstly 0.10.7 → 0.11.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # firstly
 
+## 0.11.0
+
+### Minor Changes
+
+- [#402](https://github.com/jycouet/firstly/pull/402) [`c19f427`](https://github.com/jycouet/firstly/commit/c19f427e24e5b9618bc1e8943ee0bc3f6b20aae1) Thanks [@jycouet](https://github.com/jycouet)! - sqlAdmin: `<SqlAdmin queries={{ ... }} />` merges app preset queries over the built-ins by title: same title overrides, new title adds a button, `false` removes one.
+
+## 0.10.8
+
+### Patch Changes
+
+- [#393](https://github.com/jycouet/firstly/pull/393) [`37feeb8`](https://github.com/jycouet/firstly/commit/37feeb820a2a7867a449d14181e3be9f72df3ec5) Thanks [@jycouet](https://github.com/jycouet)! - Dependencies are `^` ranges instead of exact pins, so apps share one copy of each with their own deps. `tailwindcss` is no longer a dependency (firstly never imports it). `vite-plugin-kit-routes` 1.1.1 and `vite-plugin-stripper` 0.10.6 publish ranges too, so `@kitql/*` and `esrap` dedupe as well.
+
 ## 0.10.7
 
 ### Patch Changes

package/esm/sqlAdmin/index.d.ts

@@ -1,5 +1,6 @@
 import { Log } from '@kitql/helpers';
 export { Roles_SqlAdmin } from './Roles_SqlAdmin';
+export { builtInPresetQueries, type SqlPresetQueries } from './presetQueries';
 export { SqlAdminController, type SqlResult, type SqlTokensOptions } from './SqlAdminController';
 export { SqlDriftController, type SqlDriftFlag } from './SqlDriftController';
 export { SQL_CAPABILITIES, SQL_TOKEN_TTLS, SqlToken, SqlTokenCall, type SqlCapability, type SqlTokenTtl, } from './sqlTokenEntities';

package/esm/sqlAdmin/index.js

@@ -1,5 +1,6 @@
 import { Log } from '@kitql/helpers';
 export { Roles_SqlAdmin } from './Roles_SqlAdmin';
+export { builtInPresetQueries } from './presetQueries';
 export { SqlAdminController } from './SqlAdminController';
 export { SqlDriftController } from './SqlDriftController';
 export { SQL_CAPABILITIES, SQL_TOKEN_TTLS, SqlToken, SqlTokenCall, } from './sqlTokenEntities';

package/esm/sqlAdmin/presetQueries.d.ts

@@ -0,0 +1,8 @@
+/** Title -> SQL. A built-in title overrides it, `false` removes it, a new title adds a button. */
+export type SqlPresetQueries = Record<string, string | false>;
+export declare const builtInPresetQueries: Record<string, string>;
+/** Built-ins first (in their order), then added titles in insertion order. */
+export declare function mergePresetQueries(queries?: SqlPresetQueries): {
+    title: string;
+    sql: string;
+}[];

package/esm/sqlAdmin/presetQueries.js

@@ -0,0 +1,26 @@
+export const builtInPresetQueries = {
+    Default: `SELECT *
+FROM "public"."users"
+LIMIT 10`,
+    'Tables & Sizes': `SELECT
+  table_schema,
+  table_name,
+  pg_size_pretty(pg_total_relation_size(quote_ident(table_schema) || '.' || quote_ident(table_name))) as total_size,
+  pg_size_pretty(pg_table_size(quote_ident(table_schema) || '.' || quote_ident(table_name))) as data_size,
+  pg_size_pretty(pg_indexes_size(quote_ident(table_schema) || '.' || quote_ident(table_name))) as index_size
+FROM information_schema.tables
+WHERE table_schema IN ('public', 'ff_auth')
+ORDER BY pg_total_relation_size(quote_ident(table_schema) || '.' || quote_ident(table_name)) DESC;`,
+    Indexes: `SELECT *
+FROM pg_indexes
+WHERE schemaname = 'public'
+ORDER BY tablename, indexname`,
+    'Database Size': `SELECT
+  current_database() as database_name,
+  pg_size_pretty(pg_database_size(current_database())) as database_size`,
+};
+/** Built-ins first (in their order), then added titles in insertion order. */
+export function mergePresetQueries(queries = {}) {
+    const merged = { ...builtInPresetQueries, ...queries };
+    return Object.entries(merged).flatMap(([title, sql]) => (sql === false ? [] : [{ title, sql }]));
+}

package/esm/sqlAdmin/ui/SqlAdmin.svelte

@@ -11,55 +11,27 @@
 	 * can read them with `list_console_messages`.
 	 */
 	import { log } from '../index'
+	import { mergePresetQueries, type SqlPresetQueries } from '../presetQueries'
 	import { SqlAdminController, type SqlResult } from '../SqlAdminController'
 	import { decodeSqlWire, encodeSqlWire } from '../sqlWire'
 
-	const defaultQuery = `SELECT *
-FROM "public"."users"
-LIMIT 10`
+	let { queries = {} }: { queries?: SqlPresetQueries } = $props()
 
-	let sqlInput = $state(defaultQuery)
+	const presets = $derived(mergePresetQueries(queries))
+
+	// Seeded once: later prop changes must not clobber what the user typed.
+	const initialPresets = mergePresetQueries(queries)
+	let sqlInput = $state(
+		(initialPresets.find((q) => q.title === 'Default') ?? initialPresets[0])?.sql ?? '',
+	)
 	let result: SqlResult | undefined = $state()
 	let error = $state('')
 	let isLoading = $state(false)
 	let allowWrites = $state(false)
 	let copied = $state(false)
 
-	const queries = {
-		default: { label: 'Default', sql: defaultQuery },
-		tables: {
-			label: 'Tables & Sizes',
-			sql: `SELECT
-  table_schema,
-  table_name,
-  pg_size_pretty(pg_total_relation_size(quote_ident(table_schema) || '.' || quote_ident(table_name))) as total_size,
-  pg_size_pretty(pg_table_size(quote_ident(table_schema) || '.' || quote_ident(table_name))) as data_size,
-  pg_size_pretty(pg_indexes_size(quote_ident(table_schema) || '.' || quote_ident(table_name))) as index_size
-FROM information_schema.tables
-WHERE table_schema IN ('public', 'ff_auth')
-ORDER BY pg_total_relation_size(quote_ident(table_schema) || '.' || quote_ident(table_name)) DESC;`,
-		},
-		indexes: {
-			label: 'Indexes',
-			sql: `SELECT *
-FROM pg_indexes
-WHERE schemaname = 'public'
-ORDER BY tablename, indexname`,
-		},
-		dbSize: {
-			label: 'Database Size',
-			sql: `SELECT
-  current_database() as database_name,
-  pg_size_pretty(pg_database_size(current_database())) as database_size`,
-		},
-	} as const
-
 	log.info('AI Hint: results are also logged as "for AI:" JSON after each query.')
 
-	function setPresetQuery(queryId: keyof typeof queries) {
-		sqlInput = queries[queryId].sql
-	}
-
 	async function handleSubmit(e: Event) {
 		e.preventDefault()
 		try {
@@ -131,11 +103,11 @@ ORDER BY tablename, indexname`,
 
 	<div class="flex flex-col gap-4 p-5">
 		<div class="flex flex-wrap gap-2">
-			{#each Object.entries(queries) as [id, query] (id)}
+			{#each presets as preset (preset.title)}
 				<button
 					type="button"
 					class="border border-border bg-secondary px-3 py-1.5 text-sm font-medium text-secondary-foreground hover:bg-accent hover:text-accent-foreground disabled:opacity-50"
-					onclick={() => setPresetQuery(id as keyof typeof queries)}>{query.label}</button
+					onclick={() => (sqlInput = preset.sql)}>{preset.title}</button
 				>
 			{/each}
 		</div>

package/esm/sqlAdmin/ui/SqlAdmin.svelte.d.ts

@@ -1,3 +1,7 @@
-declare const SqlAdmin: import("svelte").Component<Record<string, never>, {}, "">;
+import { type SqlPresetQueries } from '../presetQueries';
+type $$ComponentProps = {
+    queries?: SqlPresetQueries;
+};
+declare const SqlAdmin: import("svelte").Component<$$ComponentProps, {}, "">;
 type SqlAdmin = ReturnType<typeof SqlAdmin>;
 export default SqlAdmin;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firstly",
-  "version": "0.10.7",
+  "version": "0.11.0",
   "type": "module",
   "description": "Firstly, an opinionated Remult setup!",
   "bin": {
@@ -34,19 +34,18 @@
     }
   },
   "dependencies": {
-    "@kitql/helpers": "0.8.15",
-    "@layerstack/utils": "1.0.0",
-    "@mdi/js": "7.4.47",
-    "@types/nodemailer": "8.0.0",
-    "clsx": "2.1.1",
-    "cron": "4.4.0",
-    "esm-env": "1.2.2",
-    "nodemailer": "10.0.10",
-    "svelte-sonner": "1.2.1",
-    "tailwind-merge": "3.7.0",
-    "tailwindcss": "4.3.0",
-    "vite-plugin-kit-routes": "1.0.6",
-    "vite-plugin-stripper": "0.10.4"
+    "@kitql/helpers": "^0.8.15",
+    "@layerstack/utils": "^1.0.0",
+    "@mdi/js": "^7.4.47",
+    "@types/nodemailer": "^8.0.0",
+    "clsx": "^2.1.1",
+    "cron": "^4.4.0",
+    "esm-env": "^1.2.2",
+    "nodemailer": "^10.0.10",
+    "svelte-sonner": "^1.2.1",
+    "tailwind-merge": "^3.7.0",
+    "vite-plugin-kit-routes": "^1.1.1",
+    "vite-plugin-stripper": "^0.10.6"
   },
   "sideEffects": false,
   "exports": {