@ultimat3/cli 29.3.1 → 29.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ultimat3/cli",
-  "version": "29.3.1",
+  "version": "29.4.0",
   "description": "The `x` binary: new, dev, build, verify, generate, db, mcp, doctor, deploy",
   "license": "MIT",
   "type": "module",
@@ -39,33 +39,33 @@
   },
   "dependencies": {
     "@babel/core": "^8.0.7",
-    "@ultimat3/action": "29.3.1",
-    "@ultimat3/admin": "29.3.1",
-    "@ultimat3/ai": "29.3.1",
-    "@ultimat3/auth": "29.3.1",
-    "@ultimat3/cache": "29.3.1",
-    "@ultimat3/core": "29.3.1",
-    "@ultimat3/db": "29.3.1",
-    "@ultimat3/entity": "29.3.1",
-    "@ultimat3/flags": "29.3.1",
-    "@ultimat3/http": "29.3.1",
-    "@ultimat3/i18n": "29.3.1",
-    "@ultimat3/jobs": "29.3.1",
-    "@ultimat3/mail": "29.3.1",
-    "@ultimat3/manifest": "29.3.1",
-    "@ultimat3/mcp": "29.3.1",
-    "@ultimat3/money": "29.3.1",
-    "@ultimat3/notify": "29.3.1",
-    "@ultimat3/policy": "29.3.1",
-    "@ultimat3/pwa": "29.3.1",
-    "@ultimat3/query": "29.3.1",
-    "@ultimat3/realtime": "29.3.1",
-    "@ultimat3/render": "29.3.1",
-    "@ultimat3/schema": "29.3.1",
-    "@ultimat3/seo": "29.3.1",
-    "@ultimat3/storage": "29.3.1",
-    "@ultimat3/testing": "29.3.1",
-    "@ultimat3/time": "29.3.1",
+    "@ultimat3/action": "29.4.0",
+    "@ultimat3/admin": "29.4.0",
+    "@ultimat3/ai": "29.4.0",
+    "@ultimat3/auth": "29.4.0",
+    "@ultimat3/cache": "29.4.0",
+    "@ultimat3/core": "29.4.0",
+    "@ultimat3/db": "29.4.0",
+    "@ultimat3/entity": "29.4.0",
+    "@ultimat3/flags": "29.4.0",
+    "@ultimat3/http": "29.4.0",
+    "@ultimat3/i18n": "29.4.0",
+    "@ultimat3/jobs": "29.4.0",
+    "@ultimat3/mail": "29.4.0",
+    "@ultimat3/manifest": "29.4.0",
+    "@ultimat3/mcp": "29.4.0",
+    "@ultimat3/money": "29.4.0",
+    "@ultimat3/notify": "29.4.0",
+    "@ultimat3/policy": "29.4.0",
+    "@ultimat3/pwa": "29.4.0",
+    "@ultimat3/query": "29.4.0",
+    "@ultimat3/realtime": "29.4.0",
+    "@ultimat3/render": "29.4.0",
+    "@ultimat3/schema": "29.4.0",
+    "@ultimat3/seo": "29.4.0",
+    "@ultimat3/storage": "29.4.0",
+    "@ultimat3/testing": "29.4.0",
+    "@ultimat3/time": "29.4.0",
     "babel-preset-solid": "^1.9.16"
   }
 }

package/src/cmd-db.ts

@@ -166,6 +166,8 @@ async function runGen(ctx: CommandContext, root: string, name: string): Promise<
     data: {
       outcome: generated.outcome,
       migration: migration.id,
+      // The `-- transaction: false` step written beside it, when the diff needed one.
+      followUp: migration.followUp?.id ?? null,
       name: migration.name,
       files: [...generated.files],
       schemaHash: generated.schemaHash ?? null,

package/src/db-generate.ts

@@ -155,20 +155,31 @@ export async function generateAppMigration(
     };
   }
 
+  // One migration, or two: a diff that also builds or drops indexes concurrently carries that step
+  // as `followUp` — its own `.sql` marked `-- transaction: false`, its own sidecars, sorting right
+  // after this one. Each file is a ledger row of its own; see `@ultimat3/db`'s `generate-steps.ts`.
+  const steps = [migration, ...(migration.followUp === undefined ? [] : [migration.followUp])];
   const dir = join(root, MIGRATIONS_DIR);
-  const sql = `${migration.id}.sql`;
-  const snapshot = snapshotFileName(migration.id);
-  await Bun.write(join(dir, sql), migrationSql(migration));
-  // `snapshotJson`, never `JSON.stringify`: the sidecar is the one migration artefact a scaffolded
-  // app's `biome check .` reads, and its bytes carry their own trailing newline.
-  await Bun.write(join(dir, snapshot), snapshotJson(migration.snapshot));
-  const schemaHash = await writeSchemaHash(root, migration.id);
+  const files: string[] = [];
+  let schemaHash = '';
+  for (const step of steps) {
+    const sql = `${step.id}.sql`;
+    const snapshot = snapshotFileName(step.id);
+    await Bun.write(join(dir, sql), migrationSql(step));
+    // `snapshotJson`, never `JSON.stringify`: the sidecar is the one migration artefact a
+    // scaffolded app's `biome check .` reads, and its bytes carry their own trailing newline.
+    await Bun.write(join(dir, snapshot), snapshotJson(step.snapshot));
+    schemaHash = await writeSchemaHash(root, step.id);
+    files.push(
+      ...[sql, snapshot, hashFileName(step.id)].map((file) => `${MIGRATIONS_DIR}/${file}`),
+    );
+  }
 
   return {
     outcome: 'generated',
     migration,
     schemaHash,
-    files: [sql, snapshot, hashFileName(migration.id)].map((file) => `${MIGRATIONS_DIR}/${file}`),
+    files,
     findings: [],
     unrendered: migration.unrendered,
   };

package/src/runtime-storage.ts

@@ -10,7 +10,14 @@
 import type { Actor } from '@ultimat3/core';
 import { actorOf } from '@ultimat3/core';
 import type { CacheHint, RequestContext, Route, UltimateRequest } from '@ultimat3/http';
-import { asCtx, unauthenticated } from '@ultimat3/http';
+import {
+  asCtx,
+  byteWindow,
+  contentRangeOf,
+  parseByteRange,
+  RANGE_UNSATISFIABLE,
+  unauthenticated,
+} from '@ultimat3/http';
 import type { KnownPermission } from '@ultimat3/policy';
 import {
   can,
@@ -174,46 +181,6 @@ export async function readStorageObject(
   return { object, open: () => driver.stream(key) };
 }
 
-/** Inclusive, as `Range` and `Content-Range` both are. */
-export interface ByteRange {
-  readonly start: number;
-  readonly end: number;
-}
-
-const UNSATISFIABLE = 'unsatisfiable';
-
-/**
- * One range or none. A multi-range or malformed header is ignored rather than refused — RFC 9110
- * lets a server answer the whole representation, and `multipart/byteranges` is a body format no
- * caller of this route asks for. Ranges exist here for one reason: Safari will not play a `<video>`
- * from a source that answers 200 to a `Range` probe, so an uploaded video would be a dead player.
- */
-export function parseByteRange(
-  header: string | null,
-  size: number,
-): ByteRange | typeof UNSATISFIABLE | undefined {
-  if (header === null) return undefined;
-  const match = /^bytes=(\d*)-(\d*)$/.exec(header.trim());
-  if (match === null) return undefined;
-  const from = match[1] ?? '';
-  const to = match[2] ?? '';
-  if (from === '' && to === '') return undefined;
-  if (from === '') {
-    const wanted = Number(to);
-    // A suffix longer than the object is the whole object, not a refusal — but there is no whole
-    // object to fall back to at `size === 0`, and the arithmetic below answers `{ start: 0, end:
-    // -1 }`, which the route renders as `content-range: bytes 0--1/0` with status 206. RFC 9110
-    // requires 416. The non-suffix branch already gets this right through `start >= size`; this
-    // one had no equivalent test.
-    return size === 0 || wanted === 0
-      ? UNSATISFIABLE
-      : { start: Math.max(size - wanted, 0), end: size - 1 };
-  }
-  const start = Number(from);
-  const end = to === '' ? size - 1 : Math.min(Number(to), size - 1);
-  return start >= size || end < start ? UNSATISFIABLE : { start, end };
-}
-
 /** `*`, a weak validator and a comma list all count — the etag is what has to match. */
 export function etagMatches(header: string | null, etag: string): boolean {
   if (header === null) return false;
@@ -221,31 +188,6 @@ export function etagMatches(header: string | null, etag: string): boolean {
   return header.split(',').some((candidate) => candidate.trim().replace(/^W\//, '') === etag);
 }
 
-/**
- * The inclusive window `[start, end]` of a stream, as a stream. A disk streams from byte 0 (the
- * driver contract has no ranged read), so the bytes before `start` are read and dropped: bounded
- * memory, at the cost of reading the prefix — the trade a `Range` probe on a video wants over
- * buffering the whole object.
- */
-function windowOf(
-  source: ReadableStream<Uint8Array>,
-  start: number,
-  end: number,
-): ReadableStream<Uint8Array> {
-  let offset = 0;
-  return source.pipeThrough(
-    new TransformStream<Uint8Array, Uint8Array>({
-      transform(chunk, controller) {
-        const from = Math.max(start - offset, 0);
-        const to = Math.min(end + 1 - offset, chunk.byteLength);
-        offset += chunk.byteLength;
-        if (to > from) controller.enqueue(chunk.subarray(from, to));
-        if (offset > end) controller.terminate();
-      },
-    }),
-  );
-}
-
 /**
  * The content type is the STORED one — the upload gate sniffed those bytes and `put` recorded the
  * answer, so an extension in the URL is the only party that can lie. The validator is the driver's
@@ -277,7 +219,7 @@ export async function storageResponse(
 
   const size = object.size;
   const range = parseByteRange(request.header('range'), size);
-  if (range === UNSATISFIABLE) {
+  if (range === RANGE_UNSATISFIABLE) {
     headers.set('content-range', `bytes */${size}`);
     return new Response(null, { status: 416, headers });
   }
@@ -287,9 +229,11 @@ export async function storageResponse(
     headers.set('content-length', String(size));
     return new Response(await served.open(), { headers });
   }
-  headers.set('content-range', `bytes ${range.start}-${range.end}/${size}`);
+  // A disk could serve the window itself (`get(key, { range })`), but `get` buffers and is bounded
+  // by `maxGetBytes`; a video's `bytes=0-` probe is the whole object, which only a stream holds.
+  headers.set('content-range', contentRangeOf(range, size));
   headers.set('content-length', String(range.end - range.start + 1));
-  return new Response(windowOf(await served.open(), range.start, range.end), {
+  return new Response(byteWindow(await served.open(), range), {
     status: 206,
     headers,
   });

package/src/site-asset-routes.ts

@@ -5,7 +5,13 @@
 
 import { isUltimateError } from '@ultimat3/core';
 import type { CacheHint, Route, UltimateRequest } from '@ultimat3/http';
-import { applyCacheHeaders, jsonResponse } from '@ultimat3/http';
+import {
+  applyCacheHeaders,
+  contentRangeOf,
+  jsonResponse,
+  parseByteRange,
+  RANGE_UNSATISFIABLE,
+} from '@ultimat3/http';
 import type { SiteAsset, SiteAssetTable } from './site-assets';
 import { parseHashedAssetUrl, SITE_ASSET_BASE_PATH } from './site-assets';
 
@@ -15,36 +21,14 @@ export const SITE_ASSET_CACHE: CacheHint = { mode: 'immutable' };
 const notFound = (code: string, cause: string, fix: string): Response =>
   jsonResponse({ ok: false, error: { code, cause, fix } }, { status: 404 });
 
-/** One `bytes=` range, resolved against the file's size; `null` when it cannot be satisfied. */
-export function byteRange(
-  header: string | null,
-  size: number,
-): { readonly start: number; readonly end: number } | null | undefined {
-  if (header === null) return undefined;
-  const match = /^bytes=(\d*)-(\d*)$/.exec(header.trim());
-  // A multi-range or a unit we do not speak: RFC 9110 lets a server ignore Range and send it all.
-  if (match === null) return undefined;
-  const [, from = '', to = ''] = match;
-  if (from === '' && to === '') return null;
-  if (from === '') {
-    const suffix = Number(to);
-    if (suffix === 0) return null;
-    return { start: Math.max(0, size - suffix), end: size - 1 };
-  }
-  const start = Number(from);
-  const end = to === '' ? size - 1 : Math.min(Number(to), size - 1);
-  if (start >= size || end < start) return null;
-  return { start, end };
-}
-
 function assetResponse(asset: SiteAsset, range: string | null): Response {
   const file = Bun.file(asset.file);
   const headers: Record<string, string> = {
     'content-type': asset.contentType,
     'accept-ranges': 'bytes',
   };
-  const wanted = byteRange(range, asset.bytes);
-  if (wanted === null) {
+  const wanted = parseByteRange(range, asset.bytes);
+  if (wanted === RANGE_UNSATISFIABLE) {
     return new Response(null, {
       status: 416,
       headers: { ...headers, 'content-range': `bytes */${String(asset.bytes)}` },
@@ -58,7 +42,7 @@ function assetResponse(asset: SiteAsset, range: string | null): Response {
       status: 206,
       headers: {
         ...headers,
-        'content-range': `bytes ${String(wanted.start)}-${String(wanted.end)}/${String(asset.bytes)}`,
+        'content-range': contentRangeOf(wanted, asset.bytes),
       },
     }),
     SITE_ASSET_CACHE,