pgkiln 0.72.0 → 0.74.0

package/src/builder/static-files.ts

@@ -5,6 +5,7 @@ import { icon } from '../icons.ts';
 import { readMultipart } from '../runtime/files.ts';
 import { includable, STATIC_MAX, STATIC_TYPES, staticType } from '../runtime/static-files.ts';
 import type { Session } from '../session.ts';
+import { WORKSPACE_FILES } from '../metadata.ts';
 import { appOr404 } from './forms.ts';
 import { appHeader, back, BASE, csrf, developer, flash, input, region, send, shell, type Body, type Req } from './ui.ts';
 
@@ -17,9 +18,15 @@ import { appHeader, back, BASE, csrf, developer, flash, input, region, send, she
 /** Files a list may name (every page, or one page). */
 const MAX_INCLUDES = 20;
 
-/** "a.js, b.css" → the valid, includable, distinct names, in order. */
+/**
+ * "a.js, b.css" → the valid, includable, distinct names, in order. (141) "#WORKSPACE_FILES#theme.css"
+ * is a static workspace file; "#APP_FILES#a.js" is the same as "a.js".
+ */
 export function parseIncludes(text: string | undefined) {
-  const names = (text ?? '').split(/[\s,]+/).map((n) => n.trim()).filter((n) => n && staticType(n) && includable(n));
+  const names = (text ?? '').split(/[\s,]+/).map((n) => n.trim().replace(/^#APP_FILES#/, '')).filter((n) => {
+    const file = n.startsWith(WORKSPACE_FILES) ? n.slice(WORKSPACE_FILES.length) : n;
+    return file && staticType(file) && includable(file);
+  });
   return [...new Set(names)].slice(0, MAX_INCLUDES);
 }
 
@@ -84,7 +91,7 @@ async function page(s: Session, a: any, query: Record<string, string | undefined
         <small class="help">A file with the same name is replaced.</small>
       </form>`)}
     ${region('Every page loads', html`<form method="post" action="${base}/includes">${csrf(s)}
-        <div class="form-grid">${input('includes', 'Scripts and stylesheets, in order', (a.static_includes ?? []).join(', '), { placeholder: 'e.g. library.js, app.js, app-styles.css', help: `Up to ${MAX_INCLUDES} .js and .css files, loaded in this order after pgkiln's own (scripts deferred). A page adds its own files under Page → Appearance.` })}</div>
+        <div class="form-grid">${input('includes', 'Scripts and stylesheets, in order', (a.static_includes ?? []).join(', '), { placeholder: 'e.g. library.js, app.js, app-styles.css', help: `Up to ${MAX_INCLUDES} .js and .css files, loaded in this order after pgkiln's own (scripts deferred). #WORKSPACE_FILES#name is a static workspace file (Workspace utilities). A page adds its own files under Page → Appearance.` })}</div>
         <div class="buttons"><button class="btn btn-hot">Save</button></div>
       </form>`)}`;
 }
@@ -191,7 +198,10 @@ export async function staticFileBuilderRoutes(app: FastifyInstance) {
     if (!a) return reply.code(404).send('Not found');
     const names = parseIncludes(req.body?.includes);
     await owner.query('update meta.app set static_includes = $2, updated_at = now() where id = $1', [a.id, names]);
-    const missing = (await owner.query<{ n: string }>('select n from unnest($2::text[]) n where not exists (select 1 from meta.static_file f where f.app_id = $1 and f.name = n)', [a.id, names])).rows.map((r) => r.n);
+    const missing = (await owner.query<{ n: string }>(
+      `select n from unnest($2::text[]) n
+        where not exists (select 1 from meta.static_file f where f.app_id = $1 and f.name = n)
+          and not exists (select 1 from meta.workspace_file w where w.workspace_id = meta.app_workspace($1) and $3 || w.name = n)`, [a.id, names, WORKSPACE_FILES])).rows.map((r) => r.n);
     flash(s, missing.length ? `Saved. Not uploaded yet (left out until they are): ${missing.join(', ')}.` : 'Saved.');
     return back(reply, s, `${BASE}/apps/${a.id}/static-files`);
   });

package/src/builder/websources.ts

@@ -9,6 +9,7 @@ import { runSync, syncLog, syncProblems } from '../restsync.ts';
 import { buildRequest, call, clearResponseCache, clearTokens, credentialProblems, guessColumns, loadCredential, parseJson, rowsSql, select, sourceProblems, toRows, withRest, type RestColumn, type RestSource } from '../websources.ts';
 import type { ComponentSpec } from './components.ts';
 import { back, BASE, csrf, developer, flash, type Req } from './ui.ts';
+import { resolveSource } from '../remote-servers.ts';
 
 // Shared Components → Web credentials and REST data sources: their property
 // specs, the secrets' status (never a secret), "Test" for a source (its
@@ -75,7 +76,7 @@ export const REST_SOURCE_SPEC: ComponentSpec = {
     if (v.sync_time_zone === null) v.sync_time_zone = 'UTC';
     if (v.sync_mode === null) v.sync_mode = 'merge';
     const problems = [
-      ...sourceProblems({ url: v.url, params: json(v.params), columns: json(v.columns), headers: json(v.headers), row_selector: v.row_selector, key_columns: v.key_columns, operations: json(v.operations) }),
+      ...sourceProblems({ url: v.url, server: v.server, params: json(v.params), columns: json(v.columns), headers: json(v.headers), row_selector: v.row_selector, key_columns: v.key_columns, operations: json(v.operations) }),
       ...syncProblems(v),
     ];
     return problems.length ? problems.join(' ') : null;
@@ -88,10 +89,12 @@ export const REST_SOURCE_SPEC: ComponentSpec = {
   fields: [
     { name: 'name', label: 'Name', kind: 'upper', group: 'Identification', help: 'Regions and lists of values use it by this name, e.g. COUNTRIES.' },
     { name: 'description', label: 'Description', kind: 'text', wide: true, group: 'Identification' },
+    { name: 'server', label: 'Remote server', kind: 'upper', group: 'Request',
+      help: 'Optional: the static id of a remote server of the workspace (Workspace utilities → Remote servers), e.g. CRM. The URL is then the path after the server\'s base URL, and changing the server moves every source on it.' },
     { name: 'url', label: 'URL', kind: 'text', wide: true, group: 'Request',
-      help: 'e.g. https://api.example.com/v1/cities/{city}/weather — {name} is a path parameter. The host must be on the server\'s allow-list (PGKILN_REST_ALLOWED_HOSTS).' },
+      help: 'e.g. https://api.example.com/v1/cities/{city}/weather — {name} is a path parameter. With a remote server: the path, e.g. /v1/cities/{city}/weather. The host must be on the server\'s allow-list (PGKILN_REST_ALLOWED_HOSTS).' },
     { name: 'method', label: 'Method', kind: 'select', options: ['GET', 'POST', 'PUT', 'PATCH', 'DELETE'], group: 'Request' },
-    { name: 'credential', label: 'Web credential', kind: 'upper', group: 'Request', help: 'The name of a web credential, or empty.' },
+    { name: 'credential', label: 'Web credential', kind: 'upper', group: 'Request', help: 'The name of a web credential (the application\'s, else one of the workspace\'s), or empty: on a remote server, the server\'s default credential.' },
     { name: 'params', label: 'Parameters (JSON)', kind: 'json', wide: true, group: 'Request',
       help: '[{"name": "city", "in": "path", "default": "&P1_CITY.", "required": true}, {"name": "units", "in": "query", "default": "metric"}] · in: path, query, header, body. Defaults may use &ITEM. substitutions; regions override them with {"rest_params": {…}}.' },
     { name: 'headers', label: 'Headers (JSON)', kind: 'json', group: 'Request', help: '{"Accept-Language": "en"} — not for secrets: use a web credential.' },
@@ -267,11 +270,14 @@ export async function webSourceRoutes(app: FastifyInstance) {
   app.post(`${BASE}/apps/:id(^\\d+$)/rest-sources/:sid(^\\d+$)/test`, async (req: Req, reply) => {
     const s = await developer(req, reply);
     if (!s) return;
-    const src = await owner.one<RestSource>('select * from meta.rest_source where id = $1 and app_id = $2', [req.params.sid, req.params.id]);
-    if (!src) return reply.code(404).send('Not found');
-    const result: TestResult = { id: src.id, ok: false, message: '' };
+    const stored = await owner.one<RestSource>('select * from meta.rest_source where id = $1 and app_id = $2', [req.params.sid, req.params.id]);
+    if (!stored) return reply.code(404).send('Not found');
+    const result: TestResult = { id: stored.id, ok: false, message: '' };
     const started = Date.now();
+    let src = stored;
     try {
+      // (141) on a remote server: its URL now
+      src = await resolveSource(stored);
       const values: Record<string, string> = {};
       for (const p of src.params) values[p.name] = String(req.body?.[`p_${p.name}`] ?? '');
       const r = buildRequest(src, values);

package/src/builder/workflows.ts

@@ -73,7 +73,8 @@ export async function workflowExtras(appId: number, row: Definition, s: Session,
   const shown = dev ? (row.dev_steps ?? []) : row.steps;
   const refs = {
     sources: new Map((await owner.query('select name, params, columns from meta.rest_source where app_id = $1', [appId])).rows.map((r) => [r.name as string, r])),
-    credentials: new Set((await owner.query('select name from meta.web_credential where app_id = $1', [appId])).rows.map((r) => r.name as string)),
+    // (141) the application's credentials and its workspace's
+    credentials: new Set((await owner.query('select name from meta.web_credential where app_id = $1 union select name from meta.workspace_credential where workspace_id = meta.app_workspace($1)', [appId])).rows.map((r) => r.name as string)),
     startVars: [...String((row as { title?: string }).title ?? '').matchAll(/&([A-Za-z][A-Za-z0-9_]*)\./g)].map((m) => m[1]),
   };
   const invokeRefs = invokeStepReferences(shown, refs);